cleaning up a bit (views menu and mainwin.cpp)

[quassel.git] / src / qtui / ui / mainwin.ui

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 6f61c66..1e9b098 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -59,9 +59,7 @@
     <addaction name="actionDisconnectCore" />
     <addaction name="separator" />
     <addaction name="menuNetworks" />
-    <addaction name="separator" />
     <addaction name="actionJoinChannel" />
-    <addaction name="separator" />
     <addaction name="actionSetAwayGlobally" />
     <addaction name="separator" />
     <addaction name="actionQuit" />
@@ -76,8 +74,16 @@
     <property name="title" >
      <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" >
@@ -86,16 +92,9 @@
     <addaction name="actionAboutQuassel" />
     <addaction name="actionAboutQt" />
    </widget>
-   <widget class="QMenu" name="menuDebug" >
-    <property name="title" >
-     <string>&amp;Debug</string>
-    </property>
-    <addaction name="actionDebug_Console" />
-   </widget>
    <addaction name="menuFile" />
    <addaction name="menuViews" />
    <addaction name="menuSettings" />
-   <addaction name="menuDebug" />
    <addaction name="menuHelp" />
   </widget>
   <widget class="QStatusBar" name="statusbar" >
@@ -150,6 +149,9 @@
    <property name="text" >
     <string>Join Channel...</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionSetAwayGlobally" >
    <property name="enabled" >
@@ -158,6 +160,9 @@
    <property name="text" >
     <string>Set Away globally</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionQuit" >
    <property name="icon" >
@@ -178,9 +183,8 @@
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >
-    <iconset>
-     <normaloff/>
-    </iconset>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
    </property>
    <property name="text" >
     <string>Configure Quassel...</string>
@@ -189,10 +193,14 @@
     <string>F7</string>
    </property>
   </action>
-  <action name="actionManageViews" >
+  <action name="actionManageViews2" >
    <property name="enabled" >
     <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>
    </property>
@@ -239,9 +247,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset>
-     <normaloff/>
-    </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>
@@ -252,9 +259,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
-    <iconset>
-     <normaloff/>
-    </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>
@@ -278,6 +284,23 @@
     <string>&amp;Edit Networks...</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>
  </widget>
  <customwidgets>
   <customwidget>