Changed the menu to be non-hierarchical. Closes ticket #16.

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index e83cb0a7000cda4acf4747264211e06e78d18d61..9cd4fde4ffe0180713a04ecf43867db1439da5e4 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -106,20 +106,14 @@
      <height>23</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuMenu">
-    <property name="title">
-     <string>Menu</string>
-    </property>
-    <addaction name="settingsAction"/>
-    <addaction name="aboutAction"/>
-    <addaction name="conferencesAction"/>
-    <addaction name="quitAction"/>
-   </widget>
-   <addaction name="menuMenu"/>
+   <addaction name="conferencesAction"/>
+   <addaction name="settingsAction"/>
+   <addaction name="aboutAction"/>
+   <addaction name="quitAction"/>
   </widget>
-  <action name="actionSettings">
+  <action name="conferencesAction">
    <property name="text">
-    <string>Settings</string>
+    <string>Conferences</string>
    </property>
   </action>
   <action name="settingsAction">
@@ -132,11 +126,6 @@
     <string>About</string>
    </property>
   </action>
-  <action name="conferencesAction">
-   <property name="text">
-    <string>Conferences</string>
-   </property>
-  </action>
   <action name="quitAction">
    <property name="text">
     <string>&amp;Quit</string>