Changeset 148 in tspsg-svn for trunk/src/mainwindow.cpp

Timestamp:

Dec 20, 2010, 8:01:03 PM (14 years ago)

Author:

laleppa

Message:

• Removed a prompt about turning off language autodetection when selecting a language.
• Language name was not loaded in its menu item's status tip which caused status tip to be "Set application language to ".

File:

• trunk/src/mainwindow.cpp (modified) (3 diffs)

trunk/src/mainwindow.cpp

@@ -386 +386 @@
 {
 #ifndef Q_WS_MAEMO_5
-        if (actionSettingsLanguageAutodetect->isChecked()) {
-                // We have language autodetection. It needs to be disabled to change language.
-                if (QMessageBox::question(this, tr("Language change"), tr("You have language autodetection turned on.\nIt needs to be off.\nDo you wish to turn it off?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes) {
-                        actionSettingsLanguageAutodetect->trigger();
-                } else
-                        return;
-        }
+        if (actionSettingsLanguageAutodetect->isChecked())
+                actionSettingsLanguageAutodetect->trigger();
 #endif
 bool untitled = (fileName == tr("Untitled") + ".tspt");
@@ -1223 +1218 @@
 QFileInfoList langs;
 QFileInfo lang;
-QString name;
 QStringList language, dirs;
 QTranslator t;
@@ -1244 +1238 @@
                                         language.append(t.translate("--------", "COUNTRY", "Please, provide an ISO 3166-1 alpha-2 country code for this translation language here (eg., UA).").toLower());
                                         language.append(t.translate("--------", "LANGNAME", "Please, provide a native name of your translation language here."));
-                                        language.append(t.translate("MainWindow", "Set application language to %1", "").arg(name));
+                                        language.append(t.translate("MainWindow", "Set application language to %1", "").arg(language.at(2)));
 
                                         langlist.insert(language.at(0), language);