From 9618f0ebbf4b88045247c01ce8c8f58203508ebf Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 12 May 2015 16:19:40 -0400 Subject: Imported Upstream version 3.0.6 --- SQLiteStudio3/guiSQLiteStudio/mainwindow.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/mainwindow.h') diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.h b/SQLiteStudio3/guiSQLiteStudio/mainwindow.h index 4e9f5c0..46c729b 100644 --- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.h +++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.h @@ -30,6 +30,7 @@ class Committable; class WidgetCover; class QProgressBar; class QLabel; +class ThemeTuner; #ifdef Q_OS_MACX #define PREV_TASK_KEY_SEQ Qt::CTRL + Qt::ALT + Qt::Key_Left @@ -46,6 +47,7 @@ CFG_KEY_LIST(MainWindow, QObject::tr("Main window"), CFG_KEY_ENTRY(HIDE_STATUS_FIELD, Qt::Key_Escape, QObject::tr("Hide status area")) 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")) ) class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer @@ -76,6 +78,7 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer RESTORE_WINDOW, RENAME_WINDOW, OPEN_DEBUG_CONSOLE, + OPEN_CSS_CONSOLE, LICENSES, HOMEPAGE, FORUM, @@ -115,6 +118,8 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer QMenu* getViewMenu() const; QMenu* getToolsMenu() const; QMenu* getSQLiteStudioMenu() const; + QString currentStyle() const; + ThemeTuner* getThemeTuner() const; protected: void closeEvent(QCloseEvent *event); @@ -130,7 +135,6 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer void saveSession(MdiWindow* currWindow); void restoreWindowSessions(const QList& windowSessions); MdiWindow *restoreWindowSession(const QVariant& windowSessions); - QString currentStyle() const; void closeNonSessionWindows(); DdlHistoryWindow* openDdlHistory(); FunctionsEditor* openFunctionEditor(); @@ -158,7 +162,9 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer QMenu* viewMenu = nullptr; QMenu* toolsMenu = nullptr; QMenu* sqlitestudioMenu = nullptr; +#ifdef PORTABLE_CONFIG QPointer newVersionDialog; +#endif WidgetCover* widgetCover = nullptr; QLabel* updatingLabel = nullptr; QProgressBar* updatingBusyBar = nullptr; @@ -168,6 +174,7 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer public slots: EditorWindow* openSqlEditor(); void updateWindowActions(); + void updateCornerDocking(); private slots: void notifyAboutLanguageChange(); @@ -187,6 +194,7 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer void restoreLastClosedWindow(); void renameWindow(); void openDebugConsole(); + void openCssConsole(); void reportBug(); void requestFeature(); void aboutSqlitestudio(); @@ -196,12 +204,14 @@ class GUI_API_EXPORT MainWindow : public QMainWindow, public ExtActionContainer void userManual(); void sqliteDocs(); void reportHistory(); +#ifdef PORTABLE_CONFIG void updatesAvailable(const QList& updates); void noUpdatesAvailable(); - void statusFieldLinkClicked(const QString& link); void checkForUpdates(); void handleUpdatingProgress(const QString& jobTitle, int jobPercent, int totalPercent); void handleUpdatingError(); +#endif + void statusFieldLinkClicked(const QString& link); }; template -- cgit v1.2.3