From 016003905ca0e8e459e3dc33e786beda8ec92f45 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 30 Jan 2015 17:00:07 -0500 Subject: Imported Upstream version 3.0.2 --- SQLiteStudio3/sqlitestudio/main.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'SQLiteStudio3/sqlitestudio/main.cpp') diff --git a/SQLiteStudio3/sqlitestudio/main.cpp b/SQLiteStudio3/sqlitestudio/main.cpp index b2d7b94..a5f297b 100644 --- a/SQLiteStudio3/sqlitestudio/main.cpp +++ b/SQLiteStudio3/sqlitestudio/main.cpp @@ -22,6 +22,8 @@ #include "coreSQLiteStudio_global.h" #include "log.h" #include "qio.h" +#include "translations.h" +#include "dialogs/languagedialog.h" #include "services/pluginmanager.h" #include #include @@ -46,7 +48,7 @@ QString uiHandleCmdLineArgs() QCommandLineOption lemonDebugOption("debug-lemon", QObject::tr("Enables Lemon parser debug messages for SQL code assistant.")); QCommandLineOption sqlDebugOption("debug-sql", QObject::tr("Enables debugging of every single SQL query being sent to any database.")); QCommandLineOption sqlDebugDbNameOption("debug-sql-db", QObject::tr("Limits SQL query messages to only the given ."), QObject::tr("database")); - QCommandLineOption listPluginsOption("list-plugins", QObject::tr("Lists plugins installed in the SQLiteStudio end exists.")); + QCommandLineOption listPluginsOption("list-plugins", QObject::tr("Lists plugins installed in the SQLiteStudio and quits.")); parser.addOption(debugOption); parser.addOption(debugStdOutOption); parser.addOption(lemonDebugOption); @@ -104,6 +106,7 @@ int main(int argc, char *argv[]) SqlQueryModelColumn::initMeta(); SqlQueryModel::staticInit(); + SQLITESTUDIO->setInitialTranslationFiles({"coreSQLiteStudio", "guiSQLiteStudio", "sqlitestudio"}); SQLITESTUDIO->init(a.arguments(), true); IconManager::getInstance()->init(); DbTree::staticInit(); @@ -130,6 +133,21 @@ int main(int argc, char *argv[]) IconManager::getInstance()->rescanResources(); + if (!CFG_UI.General.LanguageAsked.get()) + { + CFG_UI.General.LanguageAsked.set(true); + QMap langs = getAvailableLanguages(); + + LanguageDialog dialog; + dialog.setLanguages(langs); + dialog.setSelectedLang(CFG_CORE.General.Language.getDefultValue().toString()); + if (dialog.exec() == QDialog::Accepted) + CFG_CORE.General.Language.set(dialog.getSelectedLang()); + + QProcess::startDetached(a.applicationFilePath(), QStringList()); + return 0; + } + MainWindow::getInstance()->restoreSession(); MainWindow::getInstance()->show(); -- cgit v1.2.3