From 016003905ca0e8e459e3dc33e786beda8ec92f45 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@ubuntu.com>
Date: Fri, 30 Jan 2015 17:00:07 -0500
Subject: Imported Upstream version 3.0.2

---
 .../guiSQLiteStudio/dialogs/configdialog.cpp       | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp')

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
index 932036e..b22ee6e 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/configdialog.cpp
@@ -21,6 +21,7 @@
 #include "configmapper.h"
 #include "datatype.h"
 #include "uiutils.h"
+#include "translations.h"
 #include <QSignalMapper>
 #include <QLineEdit>
 #include <QSpinBox>
@@ -186,6 +187,7 @@ void ConfigDialog::init()
     initFormatterPlugins();
     initDataEditors();
     initShortcuts();
+    initLangs();
 
     connect(ui->categoriesTree, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(switchPage(QTreeWidgetItem*)));
     connect(ui->previewTabs, SIGNAL(currentChanged(int)), this, SLOT(updateStylePreview()));
@@ -959,6 +961,7 @@ void ConfigDialog::initInternalCustomConfigWidgets()
     QList<CustomConfigWidgetPlugin*> customWidgets;
     customWidgets << new StyleConfigWidget();
     customWidgets << new ListToStringListHash(&CFG_UI.General.DataEditorsOrder);
+    customWidgets << new ComboDataWidget(&CFG_CORE.General.Language);
     configMapper->setInternalCustomConfigWidgets(customWidgets);
 }
 
@@ -1235,7 +1238,7 @@ void ConfigDialog::initPluginsPage()
             builtIn = PLUGINS->isBuiltIn(pluginName);
             title = PLUGINS->getTitle(pluginName);
             if (builtIn)
-                title += tr(" (built-in)", "plugins manager in configuration dialog");
+                title += tr("%1 (built-in)", "plugins manager in configuration dialog").arg(title);
 
             item = new QTreeWidgetItem({title});
             item->setCheckState(0, PLUGINS->isLoaded(pluginName) ? Qt::Checked : Qt::Unchecked);
@@ -1489,6 +1492,23 @@ void ConfigDialog::initShortcuts(CfgCategory *cfgCategory)
     category->setExpanded(true);
 }
 
+void ConfigDialog::initLangs()
+{
+    QMap<QString, QString> langs = getAvailableLanguages();
+    int idx = 0;
+    int selected = -1;
+    for (const QString& lang : langs.keys())
+    {
+        ui->langCombo->addItem(lang, langs[lang]);
+        if (langs[lang] == SQLITESTUDIO->getCurrentLang())
+            selected = idx;
+
+        idx++;
+    }
+
+    ui->langCombo->setCurrentIndex(selected);
+}
+
 bool ConfigDialog::isPluginCategoryItem(QTreeWidgetItem *item) const
 {
     return item->parent() && item->parent()->parent() && item->parent()->parent() == getPluginsCategoryItem();
-- 
cgit v1.2.3