Merge tag 'upstream/3.0.3'

Upstream version 3.0.3

# gpg: Signature made Sun 22 Feb 2015 02:06:37 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>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 11 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
index 38f6fe0..d9f05ff 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/languagedialog.cpp
@@ -1,5 +1,6 @@
 #include "languagedialog.h"
 #include "ui_languagedialog.h"
+#include "uiconfig.h"
 
 LanguageDialog::LanguageDialog(QWidget *parent) :
     QDialog(parent),
@@ -32,3 +33,13 @@ void LanguageDialog::setSelectedLang(const QString& lang)
 
     ui->comboBox->setCurrentIndex(idx);
 }
+
+bool LanguageDialog::didAskForDefaultLanguage()
+{
+    return CFG_UI.General.LanguageAsked.get();
+}
+
+void LanguageDialog::askedForDefaultLanguage()
+{
+    CFG_UI.General.LanguageAsked.set(true);
+}