X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fmainwin.ui;h=6fd7abd0b6c6f9ebb12dc0f2e3f9c040b17a70b9;hb=a33e42aee121185f479667b2104a15fc2033762e;hp=5b96bf559843621c1f25512ae88ab12b4daf9114;hpb=9a6a8478bdd8c7c5bb4ff1fa3de9510863d65a97;p=quassel.git

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 5b96bf55..6fd7abd0 100644
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -13,6 +13,14 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>22</y>
+     <width>800</width>
+     <height>556</height>
+    </rect>
+   </property>
    <property name="sizePolicy" >
     <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
      <horstretch>0</horstretch>
@@ -20,19 +28,7 @@
     </sizepolicy>
    </property>
    <layout class="QVBoxLayout" >
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <property name="leftMargin" >
-     <number>0</number>
-    </property>
-    <property name="topMargin" >
-     <number>0</number>
-    </property>
-    <property name="rightMargin" >
-     <number>0</number>
-    </property>
-    <property name="bottomMargin" >
+    <property name="margin" >
      <number>0</number>
     </property>
     <item>
@@ -46,72 +42,76 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>24</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" />
+     <addaction name="actionEditNetworks" />
+    </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="separator" />
+    <addaction name="menuNetworks" />
     <addaction name="actionJoinChannel" />
-    <addaction name="separator" />
     <addaction name="actionSetAwayGlobally" />
     <addaction name="separator" />
     <addaction name="actionQuit" />
    </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" />
+    <widget class="QMenu" name="menuBufferViews" >
+     <property name="title" >
+      <string>Buffer Views</string>
+     </property>
+     <addaction name="actionManageViews" />
+     <addaction name="separator" />
+    </widget>
+    <addaction name="menuBufferViews" />
     <addaction name="separator" />
+    <addaction name="actionLockDockPositions" />
    </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>
-    </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" />
+  <widget class="QStatusBar" name="statusbar" >
+   <property name="geometry" >
+    <rect>
+     <x>0</x>
+     <y>578</y>
+     <width>800</width>
+     <height>22</height>
+    </rect>
+   </property>
+  </widget>
   <action name="actionNetworkList" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
    <property name="text" >
     <string>&amp;Network List...</string>
    </property>
@@ -150,6 +150,9 @@
    <property name="text" >
     <string>Join Channel...</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionSetAwayGlobally" >
    <property name="enabled" >
@@ -158,23 +161,31 @@
    <property name="text" >
     <string>Set Away globally</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionQuit" >
    <property name="icon" >
-    <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/application-exit.png</iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/22x22/actions/oxygen/22x22/actions/application-exit.png</normaloff>:/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 resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
    </property>
    <property name="text" >
     <string>Configure Quassel...</string>
@@ -182,10 +193,17 @@
    <property name="shortcut" >
     <string>F7</string>
    </property>
+   <property name="menuRole" >
+    <enum>QAction::PreferencesRole</enum>
+   </property>
   </action>
-  <action name="actionManageViews" >
+  <action name="actionManageViews2" >
    <property name="enabled" >
-    <bool>false</bool>
+    <bool>true</bool>
+   </property>
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</iconset>
    </property>
    <property name="text" >
     <string>Manage Views...</string>
@@ -195,14 +213,24 @@
    <property name="text" >
     <string>About Qt...</string>
    </property>
+   <property name="menuRole" >
+    <enum>QAction::AboutQtRole</enum>
+   </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>
+    <iconset resource="../../icons/quassel-icons.qrc" >
+     <normaloff>:/icons/quassel-icon.png</normaloff>:/icons/quassel-icon.png</iconset>
    </property>
    <property name="text" >
     <string>About Quassel IRC...</string>
    </property>
+   <property name="menuRole" >
+    <enum>QAction::AboutRole</enum>
+   </property>
   </action>
   <action name="actionImportBacklog" >
    <property name="text" >
@@ -229,7 +257,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/network-disconnect.png</iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/network-disconnect</normaloff>:/16x16/actions/network-disconnect</iconset>
    </property>
    <property name="text" >
     <string>Disconnect from Core</string>
@@ -240,7 +269,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset resource="../../icons/icons.qrc" >:/22x22/actions/oxygen/22x22/actions/network-connect.png</iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/network-connect</normaloff>:/16x16/actions/network-connect</iconset>
    </property>
    <property name="text" >
     <string>Connect to Core...</string>
@@ -251,6 +281,37 @@
     <string>Debug &amp;Console</string>
    </property>
   </action>
+  <action name="actionDisconnectNet" >
+   <property name="text" >
+    <string>Disconnect from Network...</string>
+   </property>
+  </action>
+  <action name="actionManageViews" >
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</normaloff>:/16x16/actions/oxygen/16x16/actions/view-tree.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Manage Buffer Views</string>
+   </property>
+  </action>
+  <action name="actionLockDockPositions" >
+   <property name="checkable" >
+    <bool>true</bool>
+   </property>
+   <property name="text" >
+    <string>Lock Dock Positions</string>
+   </property>
+  </action>
+  <action name="actionEditNetworks" >
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
+   </property>
+   <property name="text" >
+    <string>Edit &amp;Networks...</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
@@ -261,23 +322,7 @@
  </customwidgets>
  <resources>
   <include location="../../icons/icons.qrc" />
+  <include location="../../icons/quassel-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>