New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 17 insertions, 9 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.h b/SQLiteStudio3/guiSQLiteStudio/mainwindow.h
index fbc3317..cedbc20 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.h
@@ -49,6 +49,7 @@ CFG_KEY_LIST(MainWindow, QObject::tr("Main window"),
      CFG_KEY_ENTRY(OPEN_CONFIG,        Qt::Key_F2,                  QObject::tr("Open configuration dialog"))
      CFG_KEY_ENTRY(OPEN_DEBUG_CONSOLE, Qt::Key_F12,                 QObject::tr("Open Debug Console"))
      CFG_KEY_ENTRY(OPEN_CSS_CONSOLE,   Qt::Key_F11,                 QObject::tr("Open CSS Console"))
+     CFG_KEY_ENTRY(QUIT,               Qt::CTRL + Qt::Key_Q,        QObject::tr("Quit the application"))
 )
 
 class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
@@ -83,14 +84,15 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
             OPEN_CSS_CONSOLE,
             LICENSES,
             HOMEPAGE,
-            FORUM,
             USER_MANUAL,
             SQLITE_DOCS,
             REPORT_BUG,
             FEATURE_REQUEST,
             ABOUT,
+            DONATE,
             BUG_REPORT_HISTORY,
-            CHECK_FOR_UPDATES
+            CHECK_FOR_UPDATES,
+            QUIT
         };
 
         enum ToolBar
@@ -124,6 +126,8 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         ThemeTuner* getThemeTuner() const;
         EditorWindow* openSqlEditor(Db* dbToSet, const QString& sql);
 
+        static_char* ALLOW_MULTIPLE_SESSIONS_SETTING = "AllowMultipleSessions";
+
     protected:
         void closeEvent(QCloseEvent *event);
 
@@ -177,6 +181,13 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         void updateWindowActions();
         void updateCornerDocking();
         void messageFromSecondaryInstance(quint32 instanceId, QByteArray message);
+        void licenses();
+        void homepage();
+        void githubReleases();
+        void userManual();
+        void sqliteDocs();
+        void reportHistory();
+        void donate();
 
     private slots:
         void notifyAboutLanguageChange();
@@ -201,18 +212,15 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         void reportBug();
         void requestFeature();
         void aboutSqlitestudio();
-        void licenses();
-        void homepage();
-        void forum();
-        void userManual();
-        void sqliteDocs();
-        void reportHistory();
 #ifdef PORTABLE_CONFIG
-        void updatesAvailable(const QList<UpdateManager::UpdateEntry>& updates);
+        void updateAvailable(const QString& version, const QString& url);
         void noUpdatesAvailable();
         void checkForUpdates();
 #endif
         void statusFieldLinkClicked(const QString& link);
+        void quit();
+        void updateMultipleSessionsSetting();
+        void updateMultipleSessionsSetting(const QVariant& newValue);
 };
 
 template <class T>