X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fmainwin.ui;h=3e49f7c5b0f366007ca2f0042d8f1033c948ba7e;hb=920feae12b62b749299014ce85241165e09b7f4b;hp=5d5e5adf8c0a6d5183dbdc15c061eedbd7eea318;hpb=d1f2e1324046ad4108d30434c92fc0a2d688ef09;p=quassel.git

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 5d5e5adf..3e49f7c5 100644
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -20,9 +20,6 @@
     </sizepolicy>
    </property>
    <layout class="QVBoxLayout" >
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <property name="leftMargin" >
      <number>0</number>
     </property>
@@ -46,21 +43,23 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>26</height>
+     <height>22</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuConnection" >
+   <widget class="QMenu" name="menuFile" >
     <property name="title" >
-     <string>Connection</string>
+     <string>&amp;File</string>
     </property>
+    <widget class="QMenu" name="menuNetworks" >
+     <property name="title" >
+      <string>&amp;Networks</string>
+     </property>
+     <addaction name="separator" />
+    </widget>
     <addaction name="actionConnectCore" />
     <addaction name="actionDisconnectCore" />
     <addaction name="separator" />
-    <addaction name="actionNetworkList" />
-    <addaction name="actionQuickConnect" />
-    <addaction name="separator" />
-    <addaction name="actionDisconnect" />
-    <addaction name="actionReconnect" />
+    <addaction name="menuNetworks" />
     <addaction name="separator" />
     <addaction name="actionJoinChannel" />
     <addaction name="separator" />
@@ -70,48 +69,41 @@
    </widget>
    <widget class="QMenu" name="menuSettings" >
     <property name="title" >
-     <string>Settings</string>
+     <string>&amp;Settings</string>
     </property>
-    <addaction name="separator" />
-    <addaction name="actionEditIdentities" />
-    <addaction name="separator" />
-    <addaction name="separator" />
     <addaction name="actionSettingsDlg" />
    </widget>
    <widget class="QMenu" name="menuViews" >
     <property name="title" >
-     <string>Views</string>
+     <string>&amp;Views</string>
     </property>
     <addaction name="actionManageViews" />
     <addaction name="separator" />
    </widget>
    <widget class="QMenu" name="menuHelp" >
     <property name="title" >
-     <string>Help</string>
+     <string>&amp;Help</string>
     </property>
     <addaction name="actionAboutQuassel" />
     <addaction name="actionAboutQt" />
    </widget>
    <widget class="QMenu" name="menuDebug" >
     <property name="title" >
-     <string>Debug</string>
+     <string>&amp;Debug</string>
     </property>
     <addaction name="actionDebug_Console" />
    </widget>
-   <widget class="QMenu" name="menuCore" >
-    <property name="title" >
-     <string>Core</string>
-    </property>
-   </widget>
-   <addaction name="menuConnection" />
+   <addaction name="menuFile" />
    <addaction name="menuViews" />
-   <addaction name="menuCore" />
    <addaction name="menuSettings" />
    <addaction name="menuDebug" />
    <addaction name="menuHelp" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
   <action name="actionNetworkList" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
    <property name="text" >
     <string>&amp;Network List...</string>
    </property>
@@ -160,18 +152,24 @@
    </property>
   </action>
   <action name="actionQuit" >
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/application-exit.png</iconset>
+   </property>
    <property name="text" >
     <string>Quit...</string>
    </property>
   </action>
   <action name="actionEditIdentities" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
    <property name="text" >
     <string>Edit Identities...</string>
    </property>
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >
-    <iconset resource="../../icons/icons.qrc" >:/16x16/actions/oxygen/16x16/actions/configure.png</iconset>
+    <iconset/>
    </property>
    <property name="text" >
     <string>Configure Quassel...</string>
@@ -182,7 +180,7 @@
   </action>
   <action name="actionManageViews" >
    <property name="enabled" >
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="text" >
     <string>Manage Views...</string>
@@ -194,6 +192,12 @@
    </property>
   </action>
   <action name="actionAboutQuassel" >
+   <property name="enabled" >
+    <bool>true</bool>
+   </property>
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >:/icons/quassel-icon.png</iconset>
+   </property>
    <property name="text" >
     <string>About Quassel IRC...</string>
    </property>
@@ -222,6 +226,9 @@
    <property name="enabled" >
     <bool>false</bool>
    </property>
+   <property name="icon" >
+    <iconset/>
+   </property>
    <property name="text" >
     <string>Disconnect from Core</string>
    </property>
@@ -230,6 +237,9 @@
    <property name="enabled" >
     <bool>false</bool>
    </property>
+   <property name="icon" >
+    <iconset/>
+   </property>
    <property name="text" >
     <string>Connect to Core...</string>
    </property>
@@ -239,6 +249,19 @@
     <string>Debug &amp;Console</string>
    </property>
   </action>
+  <action name="actionDisconnectNet" >
+   <property name="text" >
+    <string>Disconnect from Network...</string>
+   </property>
+  </action>
+  <action name="actionEditNetworks" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>&amp;Edit Networks...</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -250,22 +273,5 @@
  <resources>
   <include location="../../icons/icons.qrc" />
  </resources>
- <connections>
-  <connection>
-   <sender>actionQuit</sender>
-   <signal>triggered()</signal>
-   <receiver>MainWin</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>-1</x>
-     <y>-1</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>399</x>
-     <y>299</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>