Merge pull request sqlitebrowser#187 from samir-aguiar/master

Add language combobox to the Preferences menu

Author: MKleusberg

CMakeLists.txt

@@ -109,7 +109,7 @@ set(SQLB_MISC
 
 # Translation files
 set(SQLB_TSS
-	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_cn.ts"
+	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_zh.ts"
 	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_de.ts"
 	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_fr.ts"
 	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_ru.ts"

src/Application.cpp

@@ -8,6 +8,7 @@
 
 #include "Application.h"
 #include "MainWindow.h"
+#include "PreferencesDialog.h"
 
 Application::Application(int& argc, char** argv) :
     QApplication(argc, argv)
@@ -25,12 +26,15 @@ Application::Application(int& argc, char** argv) :
 
     // Load translations
     bool ok;
-    QString name = QLocale::system().name();
+    QString name = PreferencesDialog::getSettingsValue("General", "language").toString();
 
     // First of all try to load the application translation file.
     m_translatorApp = new QTranslator(this);
-    ok = m_translatorApp->load("sqlb_" + name, "translations");
+    ok = m_translatorApp->load("sqlb_" + name,
+                               QCoreApplication::applicationDirPath() + "/translations");
+
     if (ok == true) {
+        PreferencesDialog::setSettingsValue("General", "language", name);
         installTranslator(m_translatorApp);
 
         // The application translation file has been found and loaded.
@@ -47,6 +51,12 @@ Application::Application(int& argc, char** argv) :
         if (ok == true)
             installTranslator(m_translatorQt);
     }
+    else {
+        // Set the correct locale so that the program won't erroneously detect
+        // a language change when the user toggles settings for the first time.
+        // (it also prevents the program from always looking for a translation on launch)
+        PreferencesDialog::setSettingsValue("General", "language", "en_US");
+    }
 
     // Parse command line
     QString fileToOpen;

src/PreferencesDialog.cpp

@@ -6,6 +6,8 @@
 #include <QSettings>
 #include <QFileDialog>
 #include <QColorDialog>
+#include <QMessageBox>
+#include <QSortFilterProxyModel>
 
 QHash<QString, QVariant> PreferencesDialog::m_hCache;
 
@@ -16,6 +18,15 @@ PreferencesDialog::PreferencesDialog(QWidget* parent)
     ui->setupUi(this);
     ui->treeSyntaxHighlighting->setColumnHidden(0, true);
 
+    // Model to sort the languages in the language combo box
+    QSortFilterProxyModel *proxy = new QSortFilterProxyModel(ui->languageComboBox);
+    proxy->setSourceModel(ui->languageComboBox->model());
+
+    // Prevent setModel() from deleting the current model (now source of the proxy model)
+    ui->languageComboBox->model()->setParent(proxy);
+
+    ui->languageComboBox->setModel(proxy);
+
     loadSettings();
 }
 
@@ -63,6 +74,7 @@ void PreferencesDialog::loadSettings()
     ui->spinLogFontSize->setValue(getSettingsValue("log", "fontsize").toInt());
 
     ui->listExtensions->addItems(getSettingsValue("extensions", "list").toStringList());
+    fillLanguageBox();
 }
 
 void PreferencesDialog::saveSettings()
@@ -89,6 +101,14 @@ void PreferencesDialog::saveSettings()
         extList.append(item->text());
     setSettingsValue("extensions", "list", extList);
 
+    // Warn about restarting to change language
+    QVariant newLanguage = ui->languageComboBox->itemData(ui->languageComboBox->currentIndex());
+    if (newLanguage != getSettingsValue("General", "language"))
+        QMessageBox::information(this, QApplication::applicationName(),
+                                 tr("The language will change after you restart the application."));
+
+    setSettingsValue("General", "language", newLanguage);
+
     accept();
 }
 
@@ -160,6 +180,10 @@ QVariant PreferencesDialog::getSettingsDefaultValue(const QString& group, const
     if(group == "General" && name == "recentFileList")
         return QStringList();
 
+    // General/language?
+    if(group == "General" && name == "language")
+        return QLocale::system().name();
+
     // syntaxhighlighter?
     if(group == "syntaxhighlighter")
     {
@@ -238,3 +262,39 @@ void PreferencesDialog::removeExtension()
     if(ui->listExtensions->currentIndex().isValid())
         ui->listExtensions->takeItem(ui->listExtensions->currentIndex().row());
 }
+
+void PreferencesDialog::fillLanguageBox()
+{
+    // Use the path relative to the main executable
+    QDir translationsDir(QCoreApplication::applicationDirPath() + "/translations",
+                         "sqlb_*.qm");
+
+    // Add default language
+    ui->languageComboBox->addItem("English (United States)", "en_US");
+
+    foreach(const QFileInfo &file, translationsDir.entryInfoList())
+    {
+        QLocale locale(file.baseName().remove("sqlb_"));
+
+        // Prevent invalid locales from being added to the box
+        if(locale.name() == "C")
+            continue;
+
+        QString language = QLocale::languageToString(locale.language()) + " (" +
+                           QLocale::countryToString(locale.country()) + ")";
+
+        ui->languageComboBox->addItem(language, locale.name());
+    }
+
+    ui->languageComboBox->model()->sort(0);
+
+    // Try to select the language for the stored locale
+    int index = ui->languageComboBox->findData(getSettingsValue("General", "language"),
+                                               Qt::UserRole, Qt::MatchExactly);
+
+    // If there's no translation for the current locale, default to English
+    if(index < 0)
+        index = ui->languageComboBox->findData("en_US", Qt::UserRole, Qt::MatchExactly);
+
+    ui->languageComboBox->setCurrentIndex(index);
+}

src/PreferencesDialog.h

@@ -38,6 +38,8 @@ private slots:
     // This works similar to getSettingsValue but returns the default value instead of the value set by the user
     static QVariant getSettingsDefaultValue(const QString& group, const QString& name);
 
+    void fillLanguageBox();
+
     // Cache for storing the settings to avoid repeatedly reading the settings file all the time
     static QHash<QString, QVariant> m_hCache;
 };