Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 34 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
new file mode 100644
index 0000000..38f6fe0
--- /dev/null
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
@@ -0,0 +1,34 @@
+#include "languagedialog.h"
+#include "ui_languagedialog.h"
+
+LanguageDialog::LanguageDialog(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::LanguageDialog)
+{
+    ui->setupUi(this);
+}
+
+LanguageDialog::~LanguageDialog()
+{
+    delete ui;
+}
+
+void LanguageDialog::setLanguages(const QMap<QString, QString>& langs)
+{
+    for (const QString& langName : langs.keys())
+        ui->comboBox->addItem(langName, langs[langName]);
+}
+
+QString LanguageDialog::getSelectedLang() const
+{
+    return ui->comboBox->currentData().toString();
+}
+
+void LanguageDialog::setSelectedLang(const QString& lang)
+{
+    int idx = ui->comboBox->findData(lang);
+    if (idx < 0)
+        idx = 0;
+
+    ui->comboBox->setCurrentIndex(idx);
+}