Changed the menu to be non-hierarchical. Closes ticket #16.
authorPhilipp Spitzer <philipp@spitzer.priv.at>
Wed, 13 Jul 2011 19:21:42 +0000 (19:21 +0000)
committerPhilipp Spitzer <philipp@spitzer.priv.at>
Wed, 13 Jul 2011 19:21:42 +0000 (19:21 +0000)
src/gui/mainwindow.ui

index e83cb0a..9cd4fde 100644 (file)
      <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">
     <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>