X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fmainwin.ui;h=2152eb8b1c39024ce0ba38f1c26fcfab2ffb77f6;hb=3dc3a2e7f8cfb2387bf34b38dd6efadbd2ae4b1c;hp=9a35511e33d966b7095bebeefbe0473c83ec4c5e;hpb=9fd4619e9aca7d53d7c5df156a0b25956a1bf682;p=quassel.git

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 9a35511e..2152eb8b 100644
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -24,16 +24,16 @@
      <number>6</number>
     </property>
     <property name="leftMargin" >
-     <number>9</number>
+     <number>0</number>
     </property>
     <property name="topMargin" >
-     <number>9</number>
+     <number>0</number>
     </property>
     <property name="rightMargin" >
-     <number>9</number>
+     <number>0</number>
     </property>
     <property name="bottomMargin" >
-     <number>9</number>
+     <number>0</number>
     </property>
     <item>
      <widget class="BufferWidget" native="1" name="bufferWidget" />
@@ -46,21 +46,23 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>32</height>
+     <height>27</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 +72,47 @@
    </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="actionImportBacklog" />
+    <addaction name="actionDebug_Console" />
    </widget>
    <widget class="QMenu" name="menuCore" >
     <property name="title" >
-     <string>Core</string>
+     <string>&amp;Core</string>
     </property>
    </widget>
-   <addaction name="menuConnection" />
+   <addaction name="menuFile" />
    <addaction name="menuViews" />
    <addaction name="menuCore" />
    <addaction name="menuSettings" />
-   <addaction name="menuHelp" />
    <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,16 +161,25 @@
    </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/>
+   </property>
    <property name="text" >
     <string>Configure Quassel...</string>
    </property>
@@ -191,6 +201,12 @@
    </property>
   </action>
   <action name="actionAboutQuassel" >
+   <property name="enabled" >
+    <bool>false</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>
@@ -219,6 +235,9 @@
    <property name="enabled" >
     <bool>false</bool>
    </property>
+   <property name="icon" >
+    <iconset/>
+   </property>
    <property name="text" >
     <string>Disconnect from Core</string>
    </property>
@@ -227,10 +246,31 @@
    <property name="enabled" >
     <bool>false</bool>
    </property>
+   <property name="icon" >
+    <iconset/>
+   </property>
    <property name="text" >
     <string>Connect to Core...</string>
    </property>
   </action>
+  <action name="actionDebug_Console" >
+   <property name="text" >
+    <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>
@@ -239,23 +279,8 @@
    <header>bufferwidget.h</header>
   </customwidget>
  </customwidgets>
- <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>
+ <resources>
+  <include location="../../icons/icons.qrc" />
+ </resources>
+ <connections/>
 </ui>