Merging r730:732 from trunk to branches/0.3. Forwardports fancy bufferviews.

[quassel.git] / src / qtui / ui / mainwin.ui

diff --git a/src/qtui/ui/mainwin.ui b/src/qtui/ui/mainwin.ui
index 8c55c8a..3e49f7c 100644 (file)
--- a/src/qtui/ui/mainwin.ui
+++ b/src/qtui/ui/mainwin.ui
@@ -20,9 +20,6 @@
     </sizepolicy>
    </property>
    <layout class="QVBoxLayout" >
-    <property name="spacing" >
-     <number>6</number>
-    </property>
     <property name="leftMargin" >
      <number>0</number>
     </property>
@@ -46,7 +43,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>27</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile" >
@@ -96,14 +93,8 @@
     </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="menuCore" />
    <addaction name="menuSettings" />
    <addaction name="menuDebug" />
    <addaction name="menuHelp" />
@@ -189,7 +180,7 @@
   </action>
   <action name="actionManageViews" >
    <property name="enabled" >
-    <bool>false</bool>
+    <bool>true</bool>
    </property>
    <property name="text" >
     <string>Manage Views...</string>