X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fmainwin.ui;h=9fd8c73ab1e9382adba0e9047a78c8c7e86421f8;hb=c3f487c53eb663ba9d06176b093d928351bee78d;hp=6f61c66ff9d9f8c0b77fe3acf87f83196303647b;hpb=8a863642c897762cbf5361a9f2998db568b7e23b;p=quassel.git

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 6f61c66f..9fd8c73a 100644
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -54,14 +54,13 @@
       <string>&amp;Networks</string>
      </property>
      <addaction name="separator" />
+     <addaction name="actionEditNetworks" />
     </widget>
     <addaction name="actionConnectCore" />
     <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 +75,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 +93,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 +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,6 +161,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 +184,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 +194,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 +248,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 +260,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>
@@ -270,12 +277,30 @@
     <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="enabled" >
-    <bool>false</bool>
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>
    </property>
    <property name="text" >
-    <string>&amp;Edit Networks...</string>
+    <string>Edit &amp;Networks...</string>
    </property>
   </action>
  </widget>