diff options
| author | Al <gabriel.cortesi@outlook.com> | 2019-06-04 23:49:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 23:49:13 +0200 |
| commit | 2fb33d891f15a598b16d34960a51bff0be30bcdc (patch) | |
| tree | c815298ad5999e655d0b0ec5b9259599be700a7b /src/mainwindow.h | |
| parent | c41cda79b85f6915a994c2a6cfb2cb89d950c1ef (diff) | |
| parent | f9906825e7822771f2f3741b1c696e71bf1c76ce (diff) | |
Merge pull request #750 from isanae/more-menu-toolbar
Menu bar can be hidden, also shows executable shortcuts
Diffstat (limited to 'src/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index a0cce858..81b6a656 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -153,7 +153,7 @@ public: void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab); - bool exit(); + bool confirmExit(); virtual bool closeWindow(); virtual void setWindowEnabled(bool enabled); @@ -195,6 +195,7 @@ protected: virtual void resizeEvent(QResizeEvent *event); virtual void dragEnterEvent(QDragEnterEvent *event); virtual void dropEvent(QDropEvent *event); + void keyPressEvent(QKeyEvent *event) override; private slots: void on_actionChange_Game_triggered(); @@ -210,7 +211,7 @@ private: void createHelpMenu(); void createEndorseMenu(); - void updateToolBar(); + void updatePinnedExecutables(); void setToolbarSize(const QSize& s); void setToolbarButtonStyle(Qt::ToolButtonStyle s); void toolbarMenu_aboutToShow(); @@ -323,6 +324,10 @@ private: bool m_WasVisible; + // this has to be remembered because by the time storeSettings() is called, + // the window is closed and the menubar is hidden + bool m_menuBarVisible; + MOBase::TutorialControl m_Tutorial; int m_OldProfileIndex; @@ -633,6 +638,7 @@ private slots: // ui slots void on_actionSettings_triggered(); void on_actionUpdate_triggered(); void on_actionExit_triggered(); + void on_actionMainMenuToggle_triggered(); void on_actionToolBarMainToggle_triggered(); void on_actionToolBarLinksToggle_triggered(); void on_actionToolBarSmallIcons_triggered(); @@ -642,7 +648,7 @@ private slots: // ui slots void on_actionToolBarTextOnly_triggered(); void on_actionToolBarIconsAndText_triggered(); - + void on_centralWidget_customContextMenuRequested(const QPoint &pos); void on_bsaList_customContextMenuRequested(const QPoint &pos); void on_clearFiltersButton_clicked(); void on_btnRefreshData_clicked(); |