New upstream version 3.2.1+dfsg1upstream/3.2.1+dfsg1

1 files changed, 6 insertions, 7 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.h b/SQLiteStudio3/guiSQLiteStudio/mainwindow.h
index be96af1..fbc3317 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.h
@@ -31,6 +31,7 @@ class WidgetCover;
 class QProgressBar;
 class QLabel;
 class ThemeTuner;
+class SqliteExtensionEditor;
 
 #ifdef Q_OS_MACX
 #define PREV_TASK_KEY_SEQ Qt::CTRL + Qt::ALT + Qt::Key_Left
@@ -70,6 +71,7 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
             OPEN_DDL_HISTORY,
             OPEN_FUNCTION_EDITOR,
             OPEN_COLLATION_EDITOR,
+            OPEN_EXTENSION_MANAGER,
             EXPORT,
             IMPORT,
             CLOSE_WINDOW,
@@ -140,7 +142,7 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         DdlHistoryWindow* openDdlHistory();
         FunctionsEditor* openFunctionEditor();
         CollationsEditor* openCollationEditor();
-        BugReportHistoryWindow* openReportHistory();
+        SqliteExtensionEditor* openExtensionManager();
         void fixFonts();
 
         template <class T>
@@ -168,15 +170,13 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         QPointer<NewVersionDialog> newVersionDialog;
 #endif
         WidgetCover* widgetCover = nullptr;
-        QLabel* updatingLabel = nullptr;
-        QProgressBar* updatingBusyBar = nullptr;
-        QProgressBar* updatingSubBar = nullptr;
         bool manualUpdatesChecking = false;
 
     public slots:
         EditorWindow* openSqlEditor();
         void updateWindowActions();
         void updateCornerDocking();
+        void messageFromSecondaryInstance(quint32 instanceId, QByteArray message);
 
     private slots:
         void notifyAboutLanguageChange();
@@ -188,6 +188,7 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         void openDdlHistorySlot();
         void openFunctionEditorSlot();
         void openCollationEditorSlot();
+        void openExtensionManagerSlot();
         void exportAnything();
         void importAnything();
         void closeAllWindows();
@@ -210,8 +211,6 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer
         void updatesAvailable(const QList<UpdateManager::UpdateEntry>& updates);
         void noUpdatesAvailable();
         void checkForUpdates();
-        void handleUpdatingProgress(const QString& jobTitle, int jobPercent, int totalPercent);
-        void handleUpdatingError();
 #endif
         void statusFieldLinkClicked(const QString& link);
 };
@@ -220,7 +219,7 @@ template <class T>
 T* MainWindow::openMdiWindow()
 {
     T* win = nullptr;
-    foreach (MdiWindow* mdiWin, ui->mdiArea->getWindows())
+    for (MdiWindow* mdiWin : ui->mdiArea->getWindows())
     {
         win = dynamic_cast<T*>(mdiWin->getMdiChild());
         if (win)