Replace some tabs with the usual spaces.

[toast/confclerk.git] / src / gui / mainwindow.ui

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index e83cb0a7000cda4acf4747264211e06e78d18d61..63b56a48ec74fcf6292130c23164dbc85a91def9 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -19,6 +19,10 @@
   <property name="windowTitle">
    <string>ConfClerk</string>
   </property>
+  <property name="windowIcon">
+   <iconset resource="../../data/data.qrc">
+    <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
+  </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QGridLayout" name="gridLayout">
     <item row="0" column="0">
@@ -106,20 +110,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 +130,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>
@@ -177,6 +170,7 @@
  </customwidgets>
  <resources>
   <include location="../icons.qrc"/>
+  <include location="../../data/data.qrc"/>
  </resources>
  <connections>
   <connection>