Merge pull request #744 from isanae/standard-menu-and-toolbar

Standard menu and toolbars

1 files changed, 23 insertions, 7 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index b4ad0bdb..a0cce858 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -153,6 +153,8 @@ public:
 
   void displayModInformation(ModInfo::Ptr modInfo, unsigned int index, int tab);
 
+  bool exit();
+
   virtual bool closeWindow();
   virtual void setWindowEnabled(bool enabled);
 
@@ -204,9 +206,16 @@ private:
 
   void cleanup();
 
-  void actionToToolButton(QAction *&sourceAction);
+  void setupActionMenu(QAction* a);
+  void createHelpMenu();
+  void createEndorseMenu();
 
   void updateToolBar();
+  void setToolbarSize(const QSize& s);
+  void setToolbarButtonStyle(Qt::ToolButtonStyle s);
+  void toolbarMenu_aboutToShow();
+
+  QMenu* createPopupMenu() override;
   void activateSelectedProfile();
 
   void setExecutableIndex(int index);
@@ -253,9 +262,6 @@ private:
   // remove invalid category-references from mods
   void fixCategories();
 
-  void createEndorseWidget();
-  void createHelpWidget();
-
   bool extractProgress(QProgressDialog &extractProgress, int percentage, std::string fileName);
 
   size_t checkForProblems();
@@ -315,8 +321,6 @@ private:
 
   Ui::MainWindow *ui;
 
-  QAction *m_Sep; // Executable Shortcuts are added after this. Non owning.
-
   bool m_WasVisible;
 
   MOBase::TutorialControl m_Tutorial;
@@ -341,6 +345,8 @@ private:
   QTreeWidgetItem *m_ContextItem;
   QAction *m_ContextAction;
 
+  QAction* m_browseModPage;
+
   CategoryFactory &m_CategoryFactory;
 
   bool m_LoginAttempted;
@@ -591,7 +597,7 @@ private slots:
    */
   void allowListResize();
 
-  void toolBar_customContextMenuRequested(const QPoint &point);
+  void linksToolBar_customContextMenuRequested(const QPoint &point);
   void removeFromToolbar();
   void overwriteClosed(int);
 
@@ -626,6 +632,16 @@ private slots: // ui slots
   void on_actionNotifications_triggered();
   void on_actionSettings_triggered();
   void on_actionUpdate_triggered();
+  void on_actionExit_triggered();
+  void on_actionToolBarMainToggle_triggered();
+  void on_actionToolBarLinksToggle_triggered();
+  void on_actionToolBarSmallIcons_triggered();
+  void on_actionToolBarMediumIcons_triggered();
+  void on_actionToolBarLargeIcons_triggered();
+  void on_actionToolBarIconsOnly_triggered();
+  void on_actionToolBarTextOnly_triggered();
+  void on_actionToolBarIconsAndText_triggered();
+
 
   void on_bsaList_customContextMenuRequested(const QPoint &pos);
   void on_clearFiltersButton_clicked();