Merged changes from branch "sput" r56:61 back into trunk.

[quassel.git] / gui / ui / mainwin.ui

diff --git a/gui/ui/mainwin.ui b/gui/ui/mainwin.ui
index 32f9fa8..9e25be8 100644 (file)
--- a/gui/ui/mainwin.ui
+++ b/gui/ui/mainwin.ui
@@ -12,14 +12,34 @@
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>

-  <widget class="QWidget" name="centralwidget" />
+  <widget class="QWidget" name="centralwidget" >
+   <property name="sizePolicy" >
+    <sizepolicy>
+     <hsizetype>7</hsizetype>
+     <vsizetype>7</vsizetype>
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="margin" >
+     <number>9</number>
+    </property>
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="BufferWidget" native="1" name="bufferWidget" />
+    </item>
+   </layout>
+  </widget>

   <widget class="QMenuBar" name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
      <width>800</width>
   <widget class="QMenuBar" name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
      <y>0</y>
      <width>800</width>

-     <height>32</height>
+     <height>28</height>

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


@@ -38,11 +58,6 @@
     <addaction name="separator" />
     <addaction name="actionQuit" />
    </widget>
     <addaction name="separator" />
     <addaction name="actionQuit" />
    </widget>

-   <widget class="QMenu" name="menuViews" >
-    <property name="title" >
-     <string>Views</string>
-    </property>
-   </widget>

    <widget class="QMenu" name="menuSettings" >
     <property name="title" >
      <string>Settings</string>
    <widget class="QMenu" name="menuSettings" >
     <property name="title" >
      <string>Settings</string>


@@ -53,10 +68,19 @@
     <addaction name="separator" />
     <addaction name="actionSettingsDlg" />
    </widget>
     <addaction name="separator" />
     <addaction name="actionSettingsDlg" />
    </widget>

+   <widget class="QMenu" name="menuViews" >
+    <property name="title" >
+     <string>Views</string>
+    </property>
+    <addaction name="actionManageViews" />
+    <addaction name="separator" />
+   </widget>

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

+    <addaction name="actionAboutQuassel" />
+    <addaction name="actionAboutQt" />

    </widget>
    <addaction name="menuConnection" />
    <addaction name="menuViews" />
    </widget>
    <addaction name="menuConnection" />
    <addaction name="menuViews" />


@@ -130,7 +154,32 @@
     <string>F7</string>
    </property>
   </action>
     <string>F7</string>
    </property>
   </action>

+  <action name="actionManageViews" >
+   <property name="enabled" >
+    <bool>false</bool>
+   </property>
+   <property name="text" >
+    <string>Manage Views...</string>
+   </property>
+  </action>
+  <action name="actionAboutQt" >
+   <property name="text" >
+    <string>About Qt...</string>
+   </property>
+  </action>
+  <action name="actionAboutQuassel" >
+   <property name="text" >
+    <string>About Quassel IRC...</string>
+   </property>
+  </action>

  </widget>
  </widget>

+ <customwidgets>
+  <customwidget>
+   <class>BufferWidget</class>
+   <extends>QWidget</extends>
+   <header>bufferwidget.h</header>
+  </customwidget>
+ </customwidgets>

  <resources/>
  <connections>
   <connection>
  <resources/>
  <connections>
   <connection>