Merge pull request #752 from isanae/toolbar-revert

Reverted changes to the toolbar

1 files changed, 7 insertions, 3 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 81b6a656..35ac75a9 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -195,7 +195,7 @@ protected:
   virtual void resizeEvent(QResizeEvent *event);
   virtual void dragEnterEvent(QDragEnterEvent *event);
   virtual void dropEvent(QDropEvent *event);
-  void keyPressEvent(QKeyEvent *event) override;
+  void keyReleaseEvent(QKeyEvent *event) override;
 
 private slots:
   void on_actionChange_Game_triggered();
@@ -207,6 +207,7 @@ private:
 
   void cleanup();
 
+  void setupToolbar();
   void setupActionMenu(QAction* a);
   void createHelpMenu();
   void createEndorseMenu();
@@ -328,6 +329,10 @@ private:
   // the window is closed and the menubar is hidden
   bool m_menuBarVisible;
 
+  // last separator on the toolbar, used to add spacer for right-alignment and
+  // as an insert point for executables
+  QAction* m_linksSeparator;
+
   MOBase::TutorialControl m_Tutorial;
 
   int m_OldProfileIndex;
@@ -602,7 +607,7 @@ private slots:
    */
   void allowListResize();
 
-  void linksToolBar_customContextMenuRequested(const QPoint &point);
+  void toolBar_customContextMenuRequested(const QPoint &point);
   void removeFromToolbar();
   void overwriteClosed(int);
 
@@ -640,7 +645,6 @@ private slots: // ui slots
   void on_actionExit_triggered();
   void on_actionMainMenuToggle_triggered();
   void on_actionToolBarMainToggle_triggered();
-  void on_actionToolBarLinksToggle_triggered();
   void on_actionToolBarSmallIcons_triggered();
   void on_actionToolBarMediumIcons_triggered();
   void on_actionToolBarLargeIcons_triggered();