X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fui%2Fmainwin.ui;h=9b77edf6a82de3cf5eca7a6bacb93c7b984858c8;hb=c00b7e45809b6f3d6d02abbc1285728fe01af374;hp=cd0480882583f7dcaf353da09d8521fc826acdd2;hpb=eb9c5e7ed502b6f01311ecb5d3066a3ac31ec24d;p=quassel.git

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index cd048088..9b77edf6 100644
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -16,9 +16,9 @@
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>27</y>
+     <y>22</y>
      <width>800</width>
-     <height>549</height>
+     <height>556</height>
     </rect>
    </property>
    <property name="sizePolicy" >
@@ -28,9 +28,6 @@
     </sizepolicy>
    </property>
    <layout class="QVBoxLayout" >
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <property name="margin" >
      <number>0</number>
     </property>
@@ -45,7 +42,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>27</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >
@@ -57,14 +54,14 @@
       <string>&amp;Networks</string>
      </property>
      <addaction name="separator" />
+     <addaction name="actionEditNetworks" />
     </widget>
     <addaction name="actionConnectCore" />
     <addaction name="actionDisconnectCore" />
+    <addaction name="actionCoreInfo" />
     <addaction name="separator" />
     <addaction name="menuNetworks" />
-    <addaction name="separator" />
     <addaction name="actionJoinChannel" />
-    <addaction name="separator" />
     <addaction name="actionSetAwayGlobally" />
     <addaction name="separator" />
     <addaction name="actionQuit" />
@@ -79,8 +76,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" >
@@ -89,25 +94,18 @@
     <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" >
    <property name="geometry" >
     <rect>
      <x>0</x>
-     <y>576</y>
+     <y>578</y>
      <width>800</width>
-     <height>24</height>
+     <height>22</height>
     </rect>
    </property>
   </widget>
@@ -153,6 +151,9 @@
    <property name="text" >
     <string>Join Channel...</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionSetAwayGlobally" >
    <property name="enabled" >
@@ -161,6 +162,9 @@
    <property name="text" >
     <string>Set Away globally</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionQuit" >
    <property name="icon" >
@@ -181,9 +185,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>
@@ -191,10 +194,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>
@@ -204,18 +214,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" >
+    <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" >
@@ -242,9 +258,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>
@@ -255,9 +270,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>
@@ -273,12 +287,39 @@
     <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>Edit &amp;Networks...</string>
+   </property>
+  </action>
+  <action name="actionCoreInfo" >
+   <property name="icon" >
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/oxygen/16x16/actions/help-about.png</normaloff>:/16x16/actions/oxygen/16x16/actions/help-about.png</iconset>
    </property>
    <property name="text" >
-    <string>&amp;Edit Networks...</string>
+    <string>Core Info</string>
    </property>
   </action>
  </widget>
@@ -291,6 +332,7 @@
  </customwidgets>
  <resources>
   <include location="../../icons/icons.qrc" />
+  <include location="../../icons/quassel-icons.qrc" />
  </resources>
  <connections/>
 </ui>