GUI: Add language selection panel to settings-dialog.

kimmov · kimmov · commit 29d6b443fac1 · 2011-01-10T00:52:02.000+02:00
Settings-dialog is more natural place for language selection than
the main menu. We also have more space and freedom there to have
longer text etc to make the selection easier (menus are quite limited
controls).
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -436,14 +436,18 @@ void MainWindow::CheckDone()
 
 void MainWindow::ProgramSettings()
 {
-    SettingsDialog dialog(mSettings, mApplications, this);
+    SettingsDialog dialog(mSettings, mApplications, mTranslation, this);
     if (dialog.exec() == QDialog::Accepted)
     {
         dialog.SaveSettingValues();
         mUI.mResults->UpdateSettings(dialog.ShowFullPath(),
                                      dialog.SaveFullPath(),
                                      dialog.SaveAllErrors(),
                                      dialog.ShowNoErrorsMessage());
+        const int currentLang = mTranslation->GetCurrentLanguage();
+        const int newLang = mSettings->value(SETTINGS_LANGUAGE, 0).toInt();
+        if (currentLang != newLang)
+            SetLanguage(newLang);
     }
 }
 
diff --git a/gui/settings.ui b/gui/settings.ui
@@ -254,6 +254,20 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tab_4">
+      <attribute name="title">
+       <string>Language</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <widget class="QListWidget" name="mListLanguages">
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
@@ -30,14 +30,17 @@
 #include "settingsdialog.h"
 #include "applicationdialog.h"
 #include "applicationlist.h"
+#include "translationhandler.h"
 #include "common.h"
 
 SettingsDialog::SettingsDialog(QSettings *programSettings,
                                ApplicationList *list,
+                               TranslationHandler *translator,
                                QWidget *parent) :
     QDialog(parent),
     mSettings(programSettings),
     mApplications(list),
+    mTranslator(translator),
     mTempApplications(new ApplicationList(this))
 {
     mUI.setupUi(this);
@@ -78,13 +81,25 @@ SettingsDialog::SettingsDialog(QSettings *programSettings,
         mUI.mLblIdealThreads->setText(tr("N/A"));
 
     LoadSettings();
+    InitTranslationsList();
 }
 
 SettingsDialog::~SettingsDialog()
 {
     SaveSettings();
 }
 
+void SettingsDialog::InitTranslationsList()
+{
+    QStringList languages = mTranslator->GetNames();
+    foreach(const QString lang, languages)
+    {
+        mUI.mListLanguages->addItem(lang);
+    }
+    const int current = mTranslator->GetCurrentLanguage();
+    mUI.mListLanguages->setCurrentRow(current);
+}
+
 Qt::CheckState SettingsDialog::BoolToCheckState(bool yes) const
 {
     if (yes)
@@ -133,6 +148,7 @@ void SettingsDialog::SaveSettingValues()
     SaveCheckboxValue(mUI.mShowDebugWarnings, SETTINGS_SHOW_DEBUG_WARNINGS);
     SaveCheckboxValue(mUI.mInlineSuppressions, SETTINGS_INLINE_SUPPRESSIONS);
     mSettings->setValue(SETTINGS_GLOBAL_INCLUDE_PATHS, mUI.mEditIncludePaths->text());
+    mSettings->setValue(SETTINGS_LANGUAGE, mUI.mListLanguages->currentRow());
 }
 
 void SettingsDialog::SaveCheckboxValue(QCheckBox *box, const QString &name)
diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
@@ -27,6 +27,7 @@
 class QSettings;
 class QWidget;
 class ApplicationList;
+class TranslationHandler;
 
 /// @addtogroup GUI
 /// @{
@@ -41,6 +42,7 @@ class SettingsDialog : public QDialog
 public:
     SettingsDialog(QSettings *programSettings,
                    ApplicationList *list,
+                   TranslationHandler *translator,
                    QWidget *parent = 0);
     virtual ~SettingsDialog();
 
@@ -163,6 +165,10 @@ protected slots:
     */
     bool CheckStateToBool(Qt::CheckState state) const;
 
+    /**
+    * @brief Populate the translations list.
+    */
+    void InitTranslationsList();
 
     /**
     * @brief Settings
@@ -183,6 +189,12 @@ protected slots:
     */
     ApplicationList *mTempApplications;
 
+    /**
+    * @brief List of translations.
+    *
+    */
+    TranslationHandler *mTranslator;
+
     /**
     * @brief Dialog from UI designer
     *
diff --git a/gui/translationhandler.cpp b/gui/translationhandler.cpp
@@ -16,12 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "translationhandler.h"
-
 #include <QApplication>
 #include <QFile>
 #include <QDebug>
 #include <QLocale>
+#include "translationhandler.h"
 
 TranslationHandler::TranslationHandler(QObject *parent) :
     QObject(parent),

Original file line number	Diff line number	Diff line change
`@@ -436,14 +436,18 @@ void MainWindow::CheckDone()`
`436`	`436`
`437`	`437`	`void MainWindow::ProgramSettings()`
`438`	`438`	`{`
`439`		`- SettingsDialog dialog(mSettings, mApplications, this);`
	`439`	`+ SettingsDialog dialog(mSettings, mApplications, mTranslation, this);`
`440`	`440`	`if (dialog.exec() == QDialog::Accepted)`
`441`	`441`	`{`
`442`	`442`	`dialog.SaveSettingValues();`
`443`	`443`	`mUI.mResults->UpdateSettings(dialog.ShowFullPath(),`
`444`	`444`	`dialog.SaveFullPath(),`
`445`	`445`	`dialog.SaveAllErrors(),`
`446`	`446`	`dialog.ShowNoErrorsMessage());`
	`447`	`+ const int currentLang = mTranslation->GetCurrentLanguage();`
	`448`	`+ const int newLang = mSettings->value(SETTINGS_LANGUAGE, 0).toInt();`
	`449`	`+ if (currentLang != newLang)`
	`450`	`+ SetLanguage(newLang);`
`447`	`451`	`}`
`448`	`452`	`}`
`449`	`453`