From 306d6d3ca9c9ad774d19135681a7f9805f77035f Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Sun, 22 Feb 2015 14:06:29 -0500 Subject: Imported Upstream version 3.0.3 --- SQLiteStudio3/sqlitestudio/main.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'SQLiteStudio3/sqlitestudio/main.cpp') 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 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(); -- cgit v1.2.3