From d6819bf658b75e53b88eb347ccd09adeb5c71778 Mon Sep 17 00:00:00 2001
From: Pavel Sanda <sanda@lyx.org>
Date: Sun, 12 Apr 2009 14:25:51 +0000
Subject: [PATCH] Next ui tweaks

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

diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui
index 72ee434895..454945d703 100644
--- a/src/frontends/qt4/ui/PageLayoutUi.ui
+++ b/src/frontends/qt4/ui/PageLayoutUi.ui
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<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>
@@ -10,81 +9,81 @@
     <height>377</height>
    </rect>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
+  <layout class="QGridLayout" >
+   <property name="margin" >
     <number>9</number>
    </property>
-   <property name="spacing">
+   <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="0" column="1" colspan="13">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
+   <item row="0" column="1" colspan="13" >
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="margin">
+     <property name="margin" >
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="label_2">
-       <property name="text">
+      <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 hsizetype="Expanding" vsizetype="Fixed">
+      <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">
+       <property name="frameShape" >
         <enum>QFrame::HLine</enum>
        </property>
-       <property name="frameShadow">
+       <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">
+   <item row="1" column="1" >
+    <widget class="QLabel" name="papersizeL" >
+     <property name="text" >
       <string>&amp;Format:</string>
      </property>
-     <property name="buddy">
+     <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 hsizetype="Expanding" vsizetype="Fixed">
+   <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 &quot;Custom&quot;</string>
+     <property name="toolTip" >
+      <string>Choose a particular paper size, or set your own with "Custom"</string>
      </property>
-     <property name="maxVisibleItems">
+     <property name="maxVisibleItems" >
       <number>20</number>
      </property>
     </widget>
    </item>
-   <item row="1" column="13">
+   <item row="1" column="13" >
     <spacer>
-     <property name="orientation">
+     <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>40</width>
        <height>20</height>
@@ -92,153 +91,153 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
-    <widget class="QLabel" name="paperheightL">
-     <property name="enabled">
+   <item row="2" column="1" >
+    <widget class="QLabel" name="paperheightL" >
+     <property name="enabled" >
       <bool>false</bool>
      </property>
-     <property name="text">
+     <property name="text" >
       <string>&amp;Height:</string>
      </property>
-     <property name="buddy">
+     <property name="buddy" >
       <cstring>paperheightLE</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="5">
-    <widget class="QLineEdit" name="paperheightLE">
-     <property name="enabled">
+   <item row="2" column="5" >
+    <widget class="QLineEdit" name="paperheightLE" >
+     <property name="enabled" >
       <bool>false</bool>
      </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+     <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 row="2" column="12" >
+    <widget class="LengthCombo" name="paperheightUnitCO" />
    </item>
-   <item row="3" column="1">
-    <widget class="QLabel" name="paperwidthL">
-     <property name="enabled">
+   <item row="3" column="1" >
+    <widget class="QLabel" name="paperwidthL" >
+     <property name="enabled" >
       <bool>false</bool>
      </property>
-     <property name="text">
+     <property name="text" >
       <string>&amp;Width:</string>
      </property>
-     <property name="buddy">
+     <property name="buddy" >
       <cstring>paperwidthLE</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="5">
-    <widget class="QLineEdit" name="paperwidthLE">
-     <property name="enabled">
+   <item row="3" column="5" >
+    <widget class="QLineEdit" name="paperwidthLE" >
+     <property name="enabled" >
       <bool>false</bool>
      </property>
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+     <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 row="3" column="12" >
+    <widget class="LengthCombo" name="paperwidthUnitCO" />
    </item>
-   <item row="4" column="1">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
+   <item row="4" column="1" >
+    <widget class="QLabel" name="label_3" >
+     <property name="text" >
       <string>&amp;Orientation:</string>
      </property>
-     <property name="buddy">
+     <property name="buddy" >
       <cstring>portraitRB</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="5" colspan="8">
-    <widget class="QRadioButton" name="portraitRB">
-     <property name="text">
+   <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="checked" >
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="5" column="5" colspan="8">
-    <widget class="QRadioButton" name="landscapeRB">
-     <property name="text">
+   <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">
+   <item row="6" column="1" colspan="13" >
+    <layout class="QHBoxLayout" >
+     <property name="spacing" >
       <number>6</number>
      </property>
-     <property name="margin">
+     <property name="margin" >
       <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
+      <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 hsizetype="Expanding" vsizetype="Fixed">
+      <widget class="QFrame" name="frame" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="frameShape">
+       <property name="frameShape" >
         <enum>QFrame::HLine</enum>
        </property>
-       <property name="frameShadow">
+       <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">
+   <item row="7" column="1" colspan="2" >
+    <widget class="QLabel" name="pagestyleL" >
+     <property name="text" >
       <string>Headings &amp;style:</string>
      </property>
-     <property name="buddy">
+     <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 hsizetype="Expanding" vsizetype="Fixed">
+   <item row="7" column="5" colspan="8" >
+    <widget class="QComboBox" name="pagestyleCO" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip">
+     <property name="toolTip" >
       <string>Style used for the page header and footer</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="13">
+   <item row="7" column="13" >
     <spacer>
-     <property name="orientation">
+     <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>40</width>
        <height>20</height>
@@ -246,32 +245,35 @@
      </property>
     </spacer>
    </item>
-   <item row="8" column="1" colspan="12">
-    <widget class="QCheckBox" name="facingPagesCB">
-     <property name="toolTip">
+   <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">
+     <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>
+   <item row="9" column="1" colspan="3" >
+    <widget class="QLabel" name="label_4" >
+     <property name="text" >
+      <string>&amp;Background Color:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>backgroundPB</cstring>
      </property>
     </widget>
    </item>
-   <item row="10" column="5">
+   <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>
@@ -279,43 +281,65 @@
      </property>
     </spacer>
    </item>
-   <item row="9" column="5" colspan="2">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <item row="9" column="5" colspan="4" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2" >
      <item>
-      <widget class="QPushButton" name="backgroundPB">
-       <property name="toolTip">
+      <widget class="QPushButton" name="backgroundPB" >
+       <property name="maximumSize" >
+        <size>
+         <width>35</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="toolTip" >
         <string>press to change the color</string>
        </property>
-       <property name="text">
-        <string/>
+       <property name="text" >
+        <string>...</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="delbackgroundTB">
-       <property name="minimumSize">
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>10</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QToolButton" name="delbackgroundTB" >
+       <property name="minimumSize" >
         <size>
          <width>23</width>
          <height>23</height>
         </size>
        </property>
-       <property name="toolTip">
+       <property name="toolTip" >
         <string>Revert the color to the default</string>
        </property>
-       <property name="text">
-        <string>...</string>
+       <property name="text" >
+        <string>R&amp;eset</string>
        </property>
-       <property name="arrowType">
+       <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">
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
+       <property name="sizeHint" stdset="0" >
         <size>
          <width>40</width>
          <height>20</height>
@@ -346,7 +370,7 @@
   <tabstop>facingPagesCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local">qt_i18n.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>