X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fui%2Fmainwin.ui;h=ea93b308ba0fc69135b931b6d7c50f79b886634f;hb=fb145023a2911da4ff8323b9885f635bcb9fdf43;hp=152f3bd4d09d5d947e5be1704d782f25ed681cad;hpb=3e7ed151306ef44a9be5ca7e3f37c89408d4a6d1;p=quassel.git

diff --git a/gui/ui/mainwin.ui b/gui/ui/mainwin.ui
index 152f3bd4..ea93b308 100644
--- a/gui/ui/mainwin.ui
+++ b/gui/ui/mainwin.ui
@@ -12,26 +12,43 @@
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
-  <widget class="QWidget" name="centralwidget" />
+  <widget class="QWidget" name="centralwidget" >
+   <property name="sizePolicy" >
+    <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <layout class="QVBoxLayout" >
+    <property name="spacing" >
+     <number>6</number>
+    </property>
+    <property name="leftMargin" >
+     <number>9</number>
+    </property>
+    <property name="topMargin" >
+     <number>9</number>
+    </property>
+    <property name="rightMargin" >
+     <number>9</number>
+    </property>
+    <property name="bottomMargin" >
+     <number>9</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>
-     <height>29</height>
+     <height>28</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuViews" >
-    <property name="title" >
-     <string>Views</string>
-    </property>
-   </widget>
-   <widget class="QMenu" name="menuHelp" >
-    <property name="title" >
-     <string>Help</string>
-    </property>
-   </widget>
    <widget class="QMenu" name="menuConnection" >
     <property name="title" >
      <string>Connection</string>
@@ -52,12 +69,37 @@
     <property name="title" >
      <string>Settings</string>
     </property>
+    <addaction name="separator" />
     <addaction name="actionEditIdentities" />
+    <addaction name="separator" />
+    <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>
+    <addaction name="actionAboutQuassel" />
+    <addaction name="actionAboutQt" />
+   </widget>
+   <widget class="QMenu" name="menuDebug" >
+    <property name="title" >
+     <string>Debug</string>
+    </property>
+    <addaction name="actionImportBacklog" />
    </widget>
    <addaction name="menuConnection" />
-   <addaction name="menuSettings" />
    <addaction name="menuViews" />
+   <addaction name="menuSettings" />
    <addaction name="menuHelp" />
+   <addaction name="menuDebug" />
   </widget>
   <widget class="QStatusBar" name="statusbar" />
   <action name="actionNetworkList" >
@@ -118,7 +160,45 @@
     <string>Edit Identities...</string>
    </property>
   </action>
+  <action name="actionSettingsDlg" >
+   <property name="text" >
+    <string>Configure Quassel...</string>
+   </property>
+   <property name="shortcut" >
+    <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>
+  <action name="actionImportBacklog" >
+   <property name="text" >
+    <string>Import Backlog</string>
+   </property>
+  </action>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>BufferWidget</class>
+   <extends>QWidget</extends>
+   <header>bufferwidget.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections>
   <connection>