Add preferences dialog and app language option

ragnar-lodbrok · Feb 12, 2023 · 09b7c82 · 09b7c82
1 parent c5f70e6
commit 09b7c82
Show file tree

Hide file tree

Showing 35 changed files with 1,322 additions and 455 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,6 +60,7 @@ set(HEADER_FILES
     app/actions.h
     app/app.h
     app/log.h
+    app/language.h
     db/collation_fetcher.h
     db/common.h
     db/connection.h
@@ -128,6 +129,7 @@ set(HEADER_FILES
     settings/settings_icons.h
     settings/settings_text.h
     settings/data_editors.h
+    settings/general.h
     settings/queries_storage.h
     settings/query_data_export_storage.h
     settings/table_filters_storage.h
@@ -234,6 +236,8 @@ set(HEADER_FILES
     ui/models/user_privileges_model.h
     ui/models/variables_table_model.h
     ui/models/session_objects_tree_model.h
+    ui/preferences/general_tab.h
+    ui/preferences/preferences_dialog.h
     ui/presenters/central_right_host_widget_model.h
     ui/presenters/central_right_widget_model.h
     ui/presenters/central_right_data_filter_form.h
@@ -245,6 +249,7 @@ set(HEADER_FILES
     ui/presenters/editable_data_context_menu_presenter.h
     ui/presenters/export_database_form.h
     ui/presenters/export_query_presenter.h
+    ui/presenters/preferences_presenter.h
     ui/presenters/routine_form.h
     ui/presenters/select_db_object_form.h
     ui/presenters/table_info_form.h
@@ -360,6 +365,7 @@ set(SOURCE_FILES
     settings/settings_icons.cpp
     settings/settings_text.cpp
     settings/data_editors.cpp
+    settings/general.cpp
     settings/queries_storage.cpp
     settings/query_data_export_storage.cpp
     settings/table_filters_storage.cpp
@@ -461,6 +467,8 @@ set(SOURCE_FILES
     ui/models/user_privileges_model.cpp
     ui/models/variables_table_model.cpp
     ui/models/session_objects_tree_model.cpp
+    ui/preferences/general_tab.cpp
+    ui/preferences/preferences_dialog.cpp
     ui/presenters/central_right_host_widget_model.cpp
     ui/presenters/central_right_widget_model.cpp
     ui/presenters/central_right_data_filter_form.cpp
@@ -472,6 +480,7 @@ set(SOURCE_FILES
     ui/presenters/editable_data_context_menu_presenter.cpp
     ui/presenters/export_database_form.cpp
     ui/presenters/export_query_presenter.cpp
+    ui/presenters/preferences_presenter.cpp
     ui/presenters/routine_form.cpp
     ui/presenters/select_db_object_form.cpp
     ui/presenters/table_info_form.cpp

diff --git a/README.md b/README.md
@@ -94,7 +94,23 @@ Mac OS:
 
 This project is licensed under the GPL 2.0 License
 
+## Translations
+
+If you want to translate MeowSQL to your language, open corresponding `resources/translations/meowsql_*.ts` file.
+
+Use either Qt Linguist or in any text editor remove (` type="unfinished"`) from translation section:
+
+`<translation type="unfinished">ADD TRANSLATION HERE</translation>`
+
+Then create merge request (see also resources/translations/README.txt).
+
 ## Acknowledgments
 * HeidiSQL developers - now on [github](https://github.com/HeidiSQL/HeidiSQL)
 * [peek](https://github.com/phw/peek) was used for GIF recording
 * [linuxdeployqt](https://github.com/probonopd/linuxdeployqt) was used for AppImage creation
+
+## Donation
+* One time (any amount + message): https://www.donationalerts.com/r/ragnar_lodbro
+* Recurring: https://boosty.to/ragnar_lodbro
+* Recurring: https://patreon.com/ragnar_lodbrok
+
diff --git a/app/actions.cpp b/app/actions.cpp
@@ -134,6 +134,11 @@ void Actions::createActions(App * app)
                               tr("Export database as SQL"), this);
     _exportDatabase->setStatusTip(tr("Dump database objects to an SQL file"));
 
+    // -------------------------------------------------------------------------
+
+    _preferences = new QAction(QIcon(":/icons/wrench_orange.png"),
+                              tr("Preferences"), this);
+
 }
 
 } // namespace meow
diff --git a/app/actions.h b/app/actions.h
@@ -41,6 +41,8 @@ class Actions : public QObject
 
     QAction * exportDatabase() const { return _exportDatabase; }
 
+    QAction * preferences() const { return _preferences; }
+
 private:
 
     void createActions(App * app);
@@ -65,6 +67,7 @@ class Actions : public QObject
     QAction * _logClear;
 
     QAction * _exportDatabase;
+    QAction * _preferences;
 };
 
 } // namespace meow

diff --git a/app/app.cpp b/app/app.cpp
@@ -9,13 +9,17 @@ App::App()
     , _dbConnectionParamsManager()
     , _dbConnectionsManager(db::ConnectionsManager::create())
     , _settingsCore()
-    , _actions(this) // after settings
 {
     g_app = this;
     _dbConnectionParamsManager.load();
     _dbConnectionsManager->init();
 }
 
+App::~App()
+{
+    delete _actions;
+}
+
 db::ConnectionParamsManager * App::dbConnectionParamsManager()
 {
     return &_dbConnectionParamsManager;

diff --git a/app/app.h b/app/app.h
@@ -16,12 +16,18 @@ class App
 {
 public:
     App();
+    ~App();
     db::ConnectionParamsManager * dbConnectionParamsManager();
     db::ConnectionsManager * dbConnectionsManager();
 
     meow::settings::Core * settings() { return &_settingsCore; }
 
-    Actions * actions() { return &_actions; }
+    Actions * actions() {
+        if (!_actions) {
+            _actions = new Actions(this);
+        }
+        return _actions;
+    }
 
     Log * log() { return &_log; }
 
@@ -34,7 +40,7 @@ class App
 
     meow::settings::Core _settingsCore;
 
-    Actions _actions;
+    Actions * _actions = nullptr;
 };
 
 App * app();

diff --git a/app/language.h b/app/language.h
@@ -0,0 +1,48 @@
+#ifndef MEOW_APP_LANGUAGE_H
+#define MEOW_APP_LANGUAGE_H
+
+#include <QString>
+#include <QVector>
+#include <QObject>
+
+namespace meow {
+
+using LanguageCode = QString;
+
+struct Language
+{
+    LanguageCode code;
+    QString name;
+    QString nameTranslated;
+};
+
+static inline LanguageCode defaultLanguage()
+{
+    return "en";
+}
+
+static inline QVector<Language> allLanguages()
+{
+    static QVector<Language> langs = {
+        {"bg", "Bulgarian",  QObject::tr("Bulgarian")},
+        {"zh", "Chinese",    QObject::tr("Chinese")},
+        {"cs", "Czech",      QObject::tr("Czech")},
+        {"en", "English",    QObject::tr("English")},
+        {"fr", "French",     QObject::tr("French")},
+        {"de", "German",     QObject::tr("German")},
+        {"hu", "Hungarian",  QObject::tr("Hungarian")},
+        {"it", "Italian",    QObject::tr("Italian")},
+        {"ko", "Korean",     QObject::tr("Korean")},
+        {"pt", "Portuguese", QObject::tr("Portuguese")},
+        {"ro", "Romanian",   QObject::tr("Romanian")},
+        {"ru", "Russian",    QObject::tr("Russian")},
+        {"es", "Spanish",    QObject::tr("Spanish")},
+        {"sv", "Swedish",    QObject::tr("Swedish")},
+    };
+
+    return langs;
+}
+
+} // namespace meow
+
+#endif // MEOW_APP_LANGUAGE_H
diff --git a/icons.qrc b/icons.qrc
@@ -100,7 +100,7 @@
         <file>resources/icons/delimiter.png</file>
         <file>resources/icons/execute_selection.png</file>
         <file alias="execute_line.png">resources/icons/execute_line.png</file>
-        <file>resources/icons/wrench_orange.png</file>
+        <file alias="wrench_orange.png">resources/icons/wrench_orange.png</file>
         <file alias="wordwrap.png">resources/icons/wordwrap.png</file>
         <file>resources/icons/view_highlight.png</file>
         <file>resources/icons/view_edit.png</file>

diff --git a/main.cpp b/main.cpp
@@ -33,14 +33,14 @@ int main(int argc, char *argv[])
     );
 #endif
 
-    // test translations TODO
-    //QTranslator translator;
-    //translator.load(":translations/meowsql_fr.qm");
-    //a.installTranslator(&translator);
-    // test translations
-
     meow::App app;
 
+    QString language = app.settings()->generalSettings()->language();
+    QTranslator translator;
+    if (translator.load(QString(":translations/meowsql_%1.qm").arg(language))) {
+        a.installTranslator(&translator);
+    }
+
     meow::ui::main_window::Window w;
     w.show();