From 14efd07a82e5b001ec39716a92666886800f4711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Tue, 14 Jul 2009 01:38:15 +0000
Subject: [PATCH] PageLayoutUi.ui: group everything into boxes for a consistent
 layout with the other document settings UI

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30554 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/ui/PageLayoutUi.ui | 570 +++++++++++++--------------
 1 file changed, 264 insertions(+), 306 deletions(-)

diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui
index bb337efb75..174bcfd6d8 100644
--- a/src/frontends/qt4/ui/PageLayoutUi.ui
+++ b/src/frontends/qt4/ui/PageLayoutUi.ui
@@ -1,279 +1,292 @@
 <ui version="4.0" >
  <class>PageLayoutUi</class>
- <widget class="QWidget" name="PageLayoutUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PageLayoutUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>407</width>
-    <height>377</height>
+    <width>362</width>
+    <height>308</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="1" colspan="13" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="paperFormatGB">
+     <property name="title">
+      <string>Paper Format</string>
      </property>
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>Paper Format</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QFrame" name="frame_2" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape" >
-        <enum>QFrame::HLine</enum>
-       </property>
-       <property name="frameShadow" >
-        <enum>QFrame::Sunken</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QLabel" name="papersizeL" >
-     <property name="text" >
-      <string>&amp;Format:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>papersizeCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="5" colspan="8" >
-    <widget class="QComboBox" name="papersizeCO" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="toolTip" >
-      <string>Choose a particular paper size, or set your own with "Custom"</string>
-     </property>
-     <property name="maxVisibleItems" >
-      <number>20</number>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="13" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QLabel" name="paperheightL" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-     <property name="text" >
-      <string>&amp;Height:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>paperheightLE</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="5" >
-    <widget class="QLineEdit" name="paperheightLE" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="12" >
-    <widget class="LengthCombo" name="paperheightUnitCO" />
-   </item>
-   <item row="3" column="1" >
-    <widget class="QLabel" name="paperwidthL" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-     <property name="text" >
-      <string>&amp;Width:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>paperwidthLE</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="5" >
-    <widget class="QLineEdit" name="paperwidthLE" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="12" >
-    <widget class="LengthCombo" name="paperwidthUnitCO" />
-   </item>
-   <item row="4" column="1" >
-    <widget class="QLabel" name="label_3" >
-     <property name="text" >
-      <string>&amp;Orientation:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>portraitRB</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="5" colspan="8" >
-    <widget class="QRadioButton" name="portraitRB" >
-     <property name="text" >
-      <string>&amp;Portrait</string>
-     </property>
-     <property name="checked" >
+     <property name="flat">
       <bool>true</bool>
      </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="papersizeL">
+        <property name="text">
+         <string>&amp;Format:</string>
+        </property>
+        <property name="buddy">
+         <cstring>papersizeCO</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="papersizeCO">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Choose a particular paper size, or set your own with &quot;Custom&quot;</string>
+        </property>
+        <property name="maxVisibleItems">
+         <number>20</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>43</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="paperheightL">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>&amp;Height:</string>
+        </property>
+        <property name="buddy">
+         <cstring>paperheightLE</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="paperheightLE">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="LengthCombo" name="paperheightUnitCO"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="paperwidthL">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>&amp;Width:</string>
+        </property>
+        <property name="buddy">
+         <cstring>paperwidthLE</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="paperwidthLE">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="LengthCombo" name="paperwidthUnitCO"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>&amp;Orientation:</string>
+        </property>
+        <property name="buddy">
+         <cstring>portraitRB</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QRadioButton" name="portraitRB">
+        <property name="text">
+         <string>&amp;Portrait</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QRadioButton" name="landscapeRB">
+        <property name="text">
+         <string>&amp;Landscape</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="5" column="5" colspan="8" >
-    <widget class="QRadioButton" name="landscapeRB" >
-     <property name="text" >
-      <string>&amp;Landscape</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1" colspan="13" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Page Layout</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QFrame" name="frame" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="frameShape" >
-        <enum>QFrame::HLine</enum>
-       </property>
-       <property name="frameShadow" >
-        <enum>QFrame::Sunken</enum>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="7" column="1" colspan="2" >
-    <widget class="QLabel" name="pagestyleL" >
-     <property name="text" >
-      <string>Headings &amp;style:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>pagestyleCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="5" colspan="8" >
-    <widget class="QComboBox" name="pagestyleCO" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="pageLayoutGB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
-      <string>Style used for the page header and footer</string>
+     <property name="title">
+      <string>Page Layout</string>
      </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="pagestyleL">
+        <property name="text">
+         <string>Headings &amp;style:</string>
+        </property>
+        <property name="buddy">
+         <cstring>pagestyleCO</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2">
+       <widget class="QComboBox" name="pagestyleCO">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Style used for the page header and footer</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>168</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0" colspan="3">
+       <widget class="QCheckBox" name="facingPagesCB">
+        <property name="toolTip">
+         <string>Lay out the page for double-sided printing</string>
+        </property>
+        <property name="text">
+         <string>&amp;Two-sided document</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Background Color:</string>
+        </property>
+        <property name="buddy">
+         <cstring></cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" colspan="2">
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QPushButton" name="backgroundPB">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>16777215</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="text">
+           <string>&amp;Change...</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="delbackgroundTB">
+          <property name="minimumSize">
+           <size>
+            <width>23</width>
+            <height>23</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string>Revert the color to the default</string>
+          </property>
+          <property name="text">
+           <string>R&amp;eset</string>
+          </property>
+          <property name="toolButtonStyle">
+           <enum>Qt::ToolButtonTextOnly</enum>
+          </property>
+          <property name="arrowType">
+           <enum>Qt::LeftArrow</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="7" column="13" >
+   <item row="2" column="0">
     <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="8" column="1" colspan="12" >
-    <widget class="QCheckBox" name="facingPagesCB" >
-     <property name="toolTip" >
-      <string>Lay out the page for double-sided printing</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Two-sided document</string>
-     </property>
-    </widget>
-   </item>
-   <item row="9" column="1" colspan="3" >
-    <widget class="QLabel" name="label_4" >
-     <property name="text" >
-      <string>Background Color:</string>
-     </property>
-     <property name="buddy" >
-      <cstring></cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="10" column="5" >
-    <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>51</width>
        <height>131</height>
@@ -281,61 +294,6 @@
      </property>
     </spacer>
    </item>
-   <item row="9" column="5" colspan="4" >
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
-     <item>
-      <widget class="QPushButton" name="backgroundPB" >
-       <property name="maximumSize" >
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;Change...</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="delbackgroundTB" >
-       <property name="minimumSize" >
-        <size>
-         <width>23</width>
-         <height>23</height>
-        </size>
-       </property>
-       <property name="toolTip" >
-        <string>Revert the color to the default</string>
-       </property>
-       <property name="text" >
-        <string>R&amp;eset</string>
-       </property>
-       <property name="toolButtonStyle" >
-        <enum>Qt::ToolButtonTextOnly</enum>
-       </property>
-       <property name="arrowType" >
-        <enum>Qt::LeftArrow</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -357,7 +315,7 @@
   <tabstop>facingPagesCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>