From 860eb49b45703d939196e92ba6e6d99f54ed3088 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 2 Jun 2019 13:14:21 -0400
Subject: removed actionToToolButton(), which was replacing QAction's in the
 toolbar with QToolButton's, making it very difficult to have an equivalent in
 the main menu. QAction's can have a menu, so use that instead. the only place
 this doesn't work is with the nexus button, which can be replaced by a menu
 if there are IPluginModPage plugins adding items to it; registerModPage()
 works fine with the toolbar, but doesn't handle the main menu yet

---
 src/mainwindow.ui | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

(limited to 'src/mainwindow.ui')

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 84d3c9e4..a3eb8504 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1418,14 +1418,14 @@ p, li { white-space: pre-wrap; }
     </property>
     <addaction name="actionNexus"/>
     <addaction name="actionModify_Executables"/>
-    <addaction name="actionToolMenu"/>
+    <addaction name="actionTool"/>
     <addaction name="actionSettings"/>
    </widget>
    <widget class="QMenu" name="menu_Help">
     <property name="title">
      <string>&amp;Help</string>
     </property>
-    <addaction name="actionHelpMenu"/>
+    <addaction name="actionHelp"/>
     <addaction name="actionUpdate"/>
     <addaction name="actionEndorseMOMenu"/>
    </widget>
@@ -1621,7 +1621,10 @@ p, li { white-space: pre-wrap; }
     <string>&amp;Help</string>
    </property>
    <property name="toolTip">
-    <string>Help</string>
+    <string>Show help options</string>
+   </property>
+   <property name="statusTip">
+    <string>Show help options</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+H</string>
@@ -1691,26 +1694,6 @@ p, li { white-space: pre-wrap; }
     <string>Exits Mod Organizer</string>
    </property>
   </action>
-  <action name="actionToolMenu">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="resources.qrc">
-     <normaloff>:/MO/gui/plugins</normaloff>:/MO/gui/plugins</iconset>
-   </property>
-   <property name="text">
-    <string>&amp;Tools</string>
-   </property>
-  </action>
-  <action name="actionHelpMenu">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="text">
-    <string>&amp;Help menu</string>
-   </property>
-  </action>
   <action name="actionEndorseMOMenu">
    <property name="enabled">
     <bool>false</bool>
-- 
cgit v1.3.1