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, 8 insertions, 4 deletions

diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp
index a5f297b..f2284a6 100644
--- a/SQLiteStudio3/sqlitestudio/main.cpp
+++ b/SQLiteStudio3/sqlitestudio/main.cpp
@@ -133,21 +133,25 @@ int main(int argc, char *argv[])
 

     IconManager::getInstance()->rescanResources();

 

-    if (!CFG_UI.General.LanguageAsked.get())

+    if (!LanguageDialog::didAskForDefaultLanguage())

     {

-        CFG_UI.General.LanguageAsked.set(true);

+        LanguageDialog::askedForDefaultLanguage();

         QMap<QString, QString> langs = getAvailableLanguages();

 

         LanguageDialog dialog;

         dialog.setLanguages(langs);

-        dialog.setSelectedLang(CFG_CORE.General.Language.getDefultValue().toString());

+        dialog.setSelectedLang(getConfigLanguageDefault());

         if (dialog.exec() == QDialog::Accepted)

-            CFG_CORE.General.Language.set(dialog.getSelectedLang());

+            setDefaultLanguage(dialog.getSelectedLang());

 

         QProcess::startDetached(a.applicationFilePath(), QStringList());

         return 0;

     }

 

+    // Shortcuts titles needs to be retranslated, because their titles were set initially in global scope,

+    // while translation files were not loaded yet. Now they are.

+    ExtActionContainer::refreshShortcutTranslations();

+

     MainWindow::getInstance()->restoreSession();

     MainWindow::getInstance()->show();