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 +++- SQLiteStudio3/sqlitestudio/sqlitestudio.pro | 107 +++++++++++---------- SQLiteStudio3/sqlitestudio/sqlitestudio.qrc | 5 + .../sqlitestudio/translations/sqlitestudio_pl.qm | Bin 0 -> 1942 bytes .../sqlitestudio/translations/sqlitestudio_pl.ts | 51 ++++++++++ 5 files changed, 131 insertions(+), 52 deletions(-) create mode 100644 SQLiteStudio3/sqlitestudio/sqlitestudio.qrc create mode 100644 SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm create mode 100644 SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts (limited to 'SQLiteStudio3/sqlitestudio') 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(); diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro index 3293122..d1528aa 100644 --- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro +++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro @@ -1,51 +1,56 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2014-09-06T00:39:26 -# -#------------------------------------------------- - -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -include($$PWD/../dirs.pri) -include($$PWD/../utils.pri) - -OBJECTS_DIR = $$OBJECTS_DIR/sqlitestudio -MOC_DIR = $$MOC_DIR/sqlitestudio -UI_DIR = $$UI_DIR/sqlitestudio - -linux: { - TARGET = sqlitestudio -} -!linux: { - TARGET = SQLiteStudio -} -TEMPLATE = app - -CONFIG += c++11 -QMAKE_CXXFLAGS += -pedantic -linux|portable { - QMAKE_LFLAGS += -Wl,-rpath,./lib -} - -LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio - -SOURCES += main.cpp - -win32: { - RC_FILE = windows.rc -} - -macx: { - ICON = ../guiSQLiteStudio/img/sqlitestudio.icns -} - -OTHER_FILES += \ - windows.rc \ - SQLiteStudio.exe.manifest - -unix: { - target.path = $$BINDIR - INSTALLS += target -} +#------------------------------------------------- +# +# Project created by QtCreator 2014-09-06T00:39:26 +# +#------------------------------------------------- + +QT += core gui + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + +include($$PWD/../dirs.pri) +include($$PWD/../utils.pri) + +OBJECTS_DIR = $$OBJECTS_DIR/sqlitestudio +MOC_DIR = $$MOC_DIR/sqlitestudio +UI_DIR = $$UI_DIR/sqlitestudio + +linux: { + TARGET = sqlitestudio +} +!linux: { + TARGET = SQLiteStudio +} +TEMPLATE = app + +CONFIG += c++11 +QMAKE_CXXFLAGS += -pedantic +linux|portable { + QMAKE_LFLAGS += -Wl,-rpath,./lib +} + +LIBS += -lcoreSQLiteStudio -lguiSQLiteStudio + +SOURCES += main.cpp + +TRANSLATIONS += translations/sqlitestudio_pl.ts + +win32: { + RC_FILE = windows.rc +} + +macx: { + ICON = ../guiSQLiteStudio/img/sqlitestudio.icns +} + +OTHER_FILES += \ + windows.rc \ + SQLiteStudio.exe.manifest + +unix: { + target.path = $$BINDIR + INSTALLS += target +} + +RESOURCES += \ + sqlitestudio.qrc diff --git a/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc b/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc new file mode 100644 index 0000000..5cc74d2 --- /dev/null +++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.qrc @@ -0,0 +1,5 @@ + + + translations/sqlitestudio_pl.qm + + diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm new file mode 100644 index 0000000..610ec3f Binary files /dev/null and b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.qm differ diff --git a/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts new file mode 100644 index 0000000..cc2f9ca --- /dev/null +++ b/SQLiteStudio3/sqlitestudio/translations/sqlitestudio_pl.ts @@ -0,0 +1,51 @@ + + + + + QObject + + GUI interface to SQLiteStudio, a SQLite manager. + Interfejs graficzny dla SQLiteStudio, menadżera SQLite. + + + Enables debug messages in console (accessible with F12). + Włącza wiadomości debugujące w konsoli (dostępnej przez F12). + + + Redirects debug messages into standard output (forces debug mode). + Przekierowuje wiadomości debugujące na standardowe wyjście (wymusza tryb debugujący). + + + Enables Lemon parser debug messages for SQL code assistant. + Włącza wiadomości debugujące analizatora Lemon dla asystenta kodu SQL. + + + Enables debugging of every single SQL query being sent to any database. + Włacza debugowanie każdego pojedynczego zapytania SQL, wykonywanego na dowolnej bazie danych. + + + Limits SQL query messages to only the given <database>. + Ogranicze wiadomości zapytań SQL do podanej <bazy danych>. + + + database + baza danych + + + file + plik + + + Database file to open + Baza danych do otwarcia + + + Error + Błąd + + + Lists plugins installed in the SQLiteStudio and quits. + Wypisuje listę zainstalowanych w SQLiteStudio wtyczek i wychodzi. + + + -- cgit v1.2.3