Merge pull request #750 from isanae/more-menu-toolbar

Menu bar can be hidden, also shows executable shortcuts

1 files changed, 27 insertions, 19 deletions

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 9656cbf2..e093fd3f 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -30,6 +30,9 @@
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
+   <property name="contextMenuPolicy">
+    <enum>Qt::CustomContextMenu</enum>
+   </property>
    <layout class="QHBoxLayout" name="horizontalLayout_8">
     <property name="leftMargin">
      <number>6</number>
@@ -1389,7 +1392,7 @@ p, li { white-space: pre-wrap; }
      <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File">
+   <widget class="QMenu" name="menuFile">
     <property name="title">
      <string>&amp;File</string>
     </property>
@@ -1399,7 +1402,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="separator"/>
     <addaction name="actionExit"/>
    </widget>
-   <widget class="QMenu" name="menu_Tools">
+   <widget class="QMenu" name="menuTools">
     <property name="title">
      <string>&amp;Tools</string>
     </property>
@@ -1410,7 +1413,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="separator"/>
     <addaction name="actionSettings"/>
    </widget>
-   <widget class="QMenu" name="menu_Help">
+   <widget class="QMenu" name="menuHelp">
     <property name="title">
      <string>&amp;Help</string>
     </property>
@@ -1418,7 +1421,7 @@ p, li { white-space: pre-wrap; }
     <addaction name="actionUpdate"/>
     <addaction name="actionEndorseMO"/>
    </widget>
-   <widget class="QMenu" name="menu_Edit">
+   <widget class="QMenu" name="menuEdit">
     <property name="title">
      <string>&amp;Edit</string>
     </property>
@@ -1432,6 +1435,7 @@ p, li { white-space: pre-wrap; }
      <property name="title">
       <string>&amp;Toolbars</string>
      </property>
+     <addaction name="actionMainMenuToggle"/>
      <addaction name="actionToolBarMainToggle"/>
      <addaction name="actionToolBarLinksToggle"/>
      <addaction name="separator"/>
@@ -1446,11 +1450,17 @@ p, li { white-space: pre-wrap; }
     <addaction name="menuToolbars"/>
     <addaction name="actionNotifications"/>
    </widget>
-   <addaction name="menu_File"/>
-   <addaction name="menu_Edit"/>
+   <widget class="QMenu" name="menuRun">
+    <property name="title">
+     <string>&amp;Run</string>
+    </property>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuEdit"/>
    <addaction name="menuView"/>
-   <addaction name="menu_Tools"/>
-   <addaction name="menu_Help"/>
+   <addaction name="menuTools"/>
+   <addaction name="menuRun"/>
+   <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="linksToolBar">
    <property name="contextMenuPolicy">
@@ -1719,22 +1729,12 @@ p, li { white-space: pre-wrap; }
     <string>Exits Mod Organizer</string>
    </property>
   </action>
-  <action name="actionToolbar_Size">
-   <property name="text">
-    <string>Toolbar Size</string>
-   </property>
-  </action>
-  <action name="actionToolbar_style">
-   <property name="text">
-    <string>Toolbar Buttons</string>
-   </property>
-  </action>
   <action name="actionToolBarMainToggle">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>&amp;Main</string>
+    <string>M&amp;ain</string>
    </property>
   </action>
   <action name="actionToolBarLinksToggle">
@@ -1793,6 +1793,14 @@ p, li { white-space: pre-wrap; }
     <string>M&amp;edium Icons</string>
    </property>
   </action>
+  <action name="actionMainMenuToggle">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Menu</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>