Changeset 30 in tspsg-svn for trunk/src

Timestamp:

Jun 25, 2009, 3:02:11 PM (15 years ago)

Author:

laleppa

Message:

English language should always be in language menu.

Location:

trunk/src

Files:

• mainwindow.cpp (modified) (7 diffs)
• mainwindow.h (modified) (1 diff)

trunk/src/mainwindow.cpp

@@ -38 +38 @@
 #endif // Q_OS_WINCE
         groupSettingsLanguageList = new QActionGroup(this);
+        actionSettingsLanguageEnglish->setData("en");
+        actionSettingsLanguageEnglish->setActionGroup(groupSettingsLanguageList);
         loadLangList();
         spinCities->setValue(settings->value("NumCities",5).toInt());
@@ -83 +85 @@
 }
 
-bool MainWindow::loadLanguage()
+bool MainWindow::loadLanguage(QString lang)
 {
 // i18n
-bool ad = settings->value("Language","").toString().isEmpty();
-QString lang = settings->value("Language",QLocale::system().name()).toString();
+bool ad = false;
+        if (lang.isEmpty()) {
+                ad = settings->value("Language","").toString().isEmpty();
+                lang = settings->value("Language",QLocale::system().name()).toString();
+        }
 static QTranslator *qtTranslator;
         if (qtTranslator) {
@@ -95 +100 @@
         }
         qtTranslator = new QTranslator();
+static QTranslator *translator;
+        if (translator) {
+                qApp->removeTranslator(translator);
+                delete translator;
+        }
+        translator = new QTranslator();
         if (lang.compare("en") && !lang.startsWith("en_")) {
                 // Trying to load system Qt library translation...
@@ -107 +118 @@
                                 qtTranslator = NULL;
                         }
-        }
-        // Now let's load application translation.
-static QTranslator *translator;
-        if (translator) {
-                qApp->removeTranslator(translator);
-                delete translator;
-        }
-        translator = new QTranslator();
-        if (lang.compare("en") && !lang.startsWith("en_")) {
+                // Now let's load application translation.
                 if (translator->load(lang,"i18n"))
                         qApp->installTranslator(translator);
@@ -203 +206 @@
 {
         // TODO: Normal about window :-)
-QString about = QString::fromUtf8("TSPSG - TSP Solver and Generator\n\
-    Copyright (C) 2007-%1 Lёppa <contacts[at]oleksii[dot]name>\n\
-Qt library versions:\n\
-    Compile time: %2\n\
-    Runtime: %3\n\
-\n\
-TSPSG is licensed under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with TSPSG.").arg(QDate().toString("%Y"),QT_VERSION_STR,qVersion());
+QString about = QString::fromUtf8("TSPSG - TSP Solver and Generator\n");
+about += QString::fromUtf8("    Copyright (C) 2007-%1 Lёppa <contacts[at]oleksii[dot]name>\n").arg(QDate::currentDate().toString("yyyy"));
+        about += "Qt library versions:\n";
+        about += QString::fromUtf8("    Compile time: %1\n").arg(QT_VERSION_STR);
+        about += QString::fromUtf8("    Runtime: %1\n").arg(qVersion());
+        about += "\n";
+        about += "TSPSG is licensed under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with TSPSG.";
         QMessageBox(QMessageBox::Information,"About",about,QMessageBox::Ok,this).exec();
 }
@@ -223 +226 @@
         if (langs.size() <= 0)
                 return;
-        menuSettingsLanguage->addSeparator();
 QAction *a;
         for (int k = 0; k < langs.size(); k++) {
                 QFileInfo lang = langs.at(k);
-                if (!lang.completeBaseName().startsWith("qt_")) {
+                if (!lang.completeBaseName().startsWith("qt_") && lang.completeBaseName().compare("en")) {
                         a = menuSettingsLanguage->addAction(langinfo.value(lang.completeBaseName() + "/NativeName",lang.completeBaseName()).toString());
                         a->setData(lang.completeBaseName());
@@ -256 +258 @@
                         return;
         }
-        if (loadLanguage()) {
+        if (loadLanguage(action->data().toString())) {
                 settings->setValue("Language",action->data().toString());
                 retranslateUi(this);
-        } else {
         }
 }

trunk/src/mainwindow.h

@@ -59 +59 @@
         CTSPModel *tspmodel;
         QActionGroup *groupSettingsLanguageList;
-        bool loadLanguage();
+        bool loadLanguage(QString lang = "");
         void loadLangList();
 };