From 1d56346f413ca9672f0dcf0cb51ec06e2bfa094c Mon Sep 17 00:00:00 2001 From: Dylan Coakley Date: Tue, 5 Jun 2018 20:36:39 +0000 Subject: [PATCH] Add Chinese option to the preferences --- assets/pixmaps/flags/Taiwan.png | Bin 0 -> 1961 bytes src/dialogs/prefsdialog.cpp | 39 ++++++++++++++++++-------------- src/dialogs/prefsdialog.h | 2 ++ src/main.cpp | 4 ++++ 4 files changed, 28 insertions(+), 17 deletions(-) create mode 100755 assets/pixmaps/flags/Taiwan.png diff --git a/assets/pixmaps/flags/Taiwan.png b/assets/pixmaps/flags/Taiwan.png new file mode 100755 index 0000000000000000000000000000000000000000..029e1226e7b02423e509c80000c6e2004e76deaa GIT binary patch literal 1961 zcmV;a2UhrrP)V?79qKFi6S!b9+xG6JS)tT>m-~BNRD$1qSeUkHIzI^AL z=R9Z5dEbvP3y27eF+@g2qPX}~TC^x9ASo$1Ej&E@S%V?K#2CZy@Q|~=zu(%{*4Et6 z(BQ1C{Tl7j>`MQvd)O zjfCiEf25}e%elGcO9p@SA&aG&z~6JU%XCub2IJa{lwtu|I|-D*iWa^%01lM{j7-Z4_C7>H=vie#6JHykzMt-*hT zR<01@FK}3(3w;kFr6CpmHsIHDEJ3GnP((?V`FTZ?s&FildW9;z+hzOaPnN(SM zVClt+gU3orYW)>Ops+BC^7H4x>AZ&p3&OB|eG>Zm#z6$AR1XVCL=&14pi%+z<`Mb$ zfL5;5t4^Q(*S@`bmlqTiJVb)LjwX`{KmK?rxxZiAP*_+K@ZNhFNKFl*^XGf;=9?)9 z57%LM*oED@TM-v$gv+I1=gwv*%EPT7aQqeL@nCWiAl`kq5ogYH;xVp5gtxd zSxMB5or7xq{kS8$SA|3DMF1*tqd5>gu|n)k5ssDxtH%)-50~5Y1Pw zI#^RvlTF0M385$g9UZ{P$bE;|R_$C9d*j@`4cKfDfDo~AbcIJ9}yDYg}F6exHUCUm6c@3R91rmZLori`zj&8Td zS)~G|TqquaEPMR=`#lv8597g|Ef^D`yj<+Lc5T}?r%wG00GL02zWUmQ3qQ+dGv`Et z1Jj$2kKhJ_;6XuxhlB_o94vTXpy2-gf@?H0`w|H`IGDFLHg+T?BxolWpCn0mW5b3u zuFpSL6vp_BL4JcNjB)p_UCQQ7o7QVInuo_MARs{X)zPCh?xLdq3kijY%S)E?^iC?*Ebgz6|K{#)w*eWjyarrLJ6tC0 z00^TIA}UJ0q0!jRG&Ed1a_rdA#vgvDmt}ca%yM_1vn&&zUn(N<*Xwkq$jHdZpuj*A v01P@DPP^T19~~PT6he#$A>>)V87A;QugyGku!*6J00000NkvXXu0mjf*e|o~ literal 0 HcmV?d00001 diff --git a/src/dialogs/prefsdialog.cpp b/src/dialogs/prefsdialog.cpp index ddac4764..7c0d610c 100644 --- a/src/dialogs/prefsdialog.cpp +++ b/src/dialogs/prefsdialog.cpp @@ -65,12 +65,13 @@ prefsDialog::prefsDialog(QWidget *parent) : ui->historySlider->setValue(SETTINGS->getHistoryLimit().toInt()); //Startup tab - QStringList list(QStringList() << "English" << "French" << "Dutch" << "German"); + QStringList list(QStringList() << "English" << "French" << "Dutch" << "German" << "Chinese"); ui->comboBoxLanguage->addItems(list); ui->comboBoxLanguage->setItemIcon(0,QIcon(flagPath+"United-kingdom.png")); ui->comboBoxLanguage->setItemIcon(1,QIcon(flagPath+"France.png")); ui->comboBoxLanguage->setItemIcon(2,QIcon(flagPath+"Netherlands.png")); ui->comboBoxLanguage->setItemIcon(3,QIcon(flagPath+"Germany.png")); + ui->comboBoxLanguage->setItemIcon(4,QIcon(flagPath+"Taiwan.png")); ui->checkBoxMaximize->setChecked(SETTINGS->isMaximizeWindow()); ui->checkBox->setChecked(SETTINGS->isMultiWindowMode()); @@ -87,6 +88,9 @@ prefsDialog::prefsDialog(QWidget *parent) : else if(SETTINGS->getUserLanguage() == "de") ui->comboBoxLanguage->setCurrentIndex(3); + else if(SETTINGS->getUserLanguage() == "zh_TW") + ui->comboBoxLanguage->setCurrentIndex(4); + ui->restartButton->hide(); } @@ -135,14 +139,8 @@ void prefsDialog::on_buttonBox_accepted() if (ui->checkBox->isChecked() != SETTINGS->isMultiWindowMode()) SETTINGS->setMultiWindowMode(ui->checkBox->isChecked()); - if(ui->comboBoxLanguage->currentIndex() == 0) - SETTINGS->setUserLanguage("en"); - else if(ui->comboBoxLanguage->currentIndex() == 1) - SETTINGS->setUserLanguage("fr"); - else if(ui->comboBoxLanguage->currentIndex() == 2) - SETTINGS->setUserLanguage("nl"); - else if(ui->comboBoxLanguage->currentIndex() == 3) - SETTINGS->setUserLanguage("de"); + // Save language when we close the dialog + set_user_language(); } void prefsDialog::on_openFolderButton_clicked() @@ -178,14 +176,7 @@ void prefsDialog::on_historySlider_sliderMoved(int position) void prefsDialog::on_restartButton_clicked() { // Save language before we quit - if(ui->comboBoxLanguage->currentIndex() == 0) - SETTINGS->setUserLanguage("en"); - else if(ui->comboBoxLanguage->currentIndex() == 1) - SETTINGS->setUserLanguage("fr"); - else if(ui->comboBoxLanguage->currentIndex() == 2) - SETTINGS->setUserLanguage("nl"); - else if(ui->comboBoxLanguage->currentIndex() == 3) - SETTINGS->setUserLanguage("de"); + set_user_language(); qApp->quit(); QProcess* proc = new QProcess(); @@ -196,3 +187,17 @@ void prefsDialog::on_comboBoxLanguage_currentIndexChanged(const QString &arg1) { ui->restartButton->show(); } + +void prefsDialog::set_user_language() +{ + if(ui->comboBoxLanguage->currentIndex() == 0) + SETTINGS->setUserLanguage("en"); + else if(ui->comboBoxLanguage->currentIndex() == 1) + SETTINGS->setUserLanguage("fr"); + else if(ui->comboBoxLanguage->currentIndex() == 2) + SETTINGS->setUserLanguage("nl"); + else if(ui->comboBoxLanguage->currentIndex() == 3) + SETTINGS->setUserLanguage("de"); + else if(ui->comboBoxLanguage->currentIndex() == 4) + SETTINGS->setUserLanguage("zh_TW"); +} diff --git a/src/dialogs/prefsdialog.h b/src/dialogs/prefsdialog.h index 80f48713..085c1a07 100644 --- a/src/dialogs/prefsdialog.h +++ b/src/dialogs/prefsdialog.h @@ -34,6 +34,8 @@ private slots: void on_restartButton_clicked(); + void set_user_language(); + void on_comboBoxLanguage_currentIndexChanged(const QString &arg1); private: diff --git a/src/main.cpp b/src/main.cpp index 196d7cae..423fdd1e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -58,6 +58,10 @@ int main(int argc, char *argv[]) { lang = "nl"; } + else if(sysLanguage == "Chinese") + { + lang = "zh_TW"; + } SETTINGS->setUserLanguage(lang); }