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 8c55c8a..1e9b098 100644 (file)
--- 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" >
    <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>
    <property name="sizePolicy" >
     <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
      <horstretch>0</horstretch>


@@ -20,19 +28,7 @@
     </sizepolicy>
    </property>
    <layout class="QVBoxLayout" >
     </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>
      <number>0</number>
     </property>
     <item>


@@ -46,7 +42,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
      <x>0</x>
      <y>0</y>
      <width>800</width>

-     <height>27</height>
+     <height>22</height>

     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >
     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >


@@ -63,9 +59,7 @@
     <addaction name="actionDisconnectCore" />
     <addaction name="separator" />
     <addaction name="menuNetworks" />
     <addaction name="actionDisconnectCore" />
     <addaction name="separator" />
     <addaction name="menuNetworks" />

-    <addaction name="separator" />

     <addaction name="actionJoinChannel" />
     <addaction name="actionJoinChannel" />

-    <addaction name="separator" />

     <addaction name="actionSetAwayGlobally" />
     <addaction name="separator" />
     <addaction name="actionQuit" />
     <addaction name="actionSetAwayGlobally" />
     <addaction name="separator" />
     <addaction name="actionQuit" />


@@ -80,8 +74,16 @@
     <property name="title" >
      <string>&amp;Views</string>
     </property>
     <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="separator" />

+    <addaction name="actionLockDockPositions" />

    </widget>
    <widget class="QMenu" name="menuHelp" >
     <property name="title" >
    </widget>
    <widget class="QMenu" name="menuHelp" >
     <property name="title" >


@@ -90,25 +92,21 @@
     <addaction name="actionAboutQuassel" />
     <addaction name="actionAboutQt" />
    </widget>
     <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>
-   <widget class="QMenu" name="menuCore" >
-    <property name="title" >
-     <string>&amp;Core</string>
-    </property>
-   </widget>

    <addaction name="menuFile" />
    <addaction name="menuViews" />
    <addaction name="menuFile" />
    <addaction name="menuViews" />

-   <addaction name="menuCore" />

    <addaction name="menuSettings" />
    <addaction name="menuSettings" />

-   <addaction name="menuDebug" />

    <addaction name="menuHelp" />
   </widget>
    <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>
   <action name="actionNetworkList" >
    <property name="enabled" >
     <bool>false</bool>


@@ -151,6 +149,9 @@
    <property name="text" >
     <string>Join Channel...</string>
    </property>
    <property name="text" >
     <string>Join Channel...</string>
    </property>

+   <property name="visible" >
+    <bool>false</bool>
+   </property>

   </action>
   <action name="actionSetAwayGlobally" >
    <property name="enabled" >
   </action>
   <action name="actionSetAwayGlobally" >
    <property name="enabled" >


@@ -159,10 +160,14 @@
    <property name="text" >
     <string>Set Away globally</string>
    </property>
    <property name="text" >
     <string>Set Away globally</string>
    </property>

+   <property name="visible" >
+    <bool>false</bool>
+   </property>

   </action>
   <action name="actionQuit" >
    <property name="icon" >
   </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>
    <property name="text" >
     <string>Quit...</string>


@@ -178,7 +183,8 @@
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >
   </action>
   <action name="actionSettingsDlg" >
    <property name="icon" >

-    <iconset/>
+    <iconset resource="../../icons/icons.qrc" >
+     <normaloff>:/16x16/actions/configure</normaloff>:/16x16/actions/configure</iconset>

    </property>
    <property name="text" >
     <string>Configure Quassel...</string>
    </property>
    <property name="text" >
     <string>Configure Quassel...</string>


@@ -187,9 +193,13 @@
     <string>F7</string>
    </property>
   </action>
     <string>F7</string>
    </property>
   </action>

-  <action name="actionManageViews" >
+  <action name="actionManageViews2" >

    <property name="enabled" >
    <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>
    </property>
    <property name="text" >
     <string>Manage Views...</string>


@@ -205,7 +215,8 @@
     <bool>true</bool>
    </property>
    <property name="icon" >
     <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="text" >
     <string>About Quassel IRC...</string>


@@ -236,7 +247,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
     <bool>false</bool>
    </property>
    <property name="icon" >

-    <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>
    </property>
    <property name="text" >
     <string>Disconnect from Core</string>


@@ -247,7 +259,8 @@
     <bool>false</bool>
    </property>
    <property name="icon" >
     <bool>false</bool>
    </property>
    <property name="icon" >

-    <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>
    </property>
    <property name="text" >
     <string>Connect to Core...</string>


@@ -271,6 +284,23 @@
     <string>&amp;Edit Networks...</string>
    </property>
   </action>
     <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>
  </widget>
  <customwidgets>
   <customwidget>


@@ -281,6 +311,7 @@
  </customwidgets>
  <resources>
   <include location="../../icons/icons.qrc" />
  </customwidgets>
  <resources>
   <include location="../../icons/icons.qrc" />

+  <include location="../../icons/quassel-icons.qrc" />

  </resources>
  <connections/>
 </ui>
  </resources>
  <connections/>
 </ui>