From 0d8b67e2b751c2c314331db49925c2feb4e14e86 Mon Sep 17 00:00:00 2001
From: Edwin Leuven <e.leuven@gmail.com>
Date: Tue, 25 Mar 2008 13:26:32 +0000
Subject: [PATCH] small layout tweaks

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23946 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/ui/HSpaceUi.ui | 236 ++++++++++++-------------------
 src/frontends/qt4/ui/VSpaceUi.ui | 181 +++++++++---------------
 2 files changed, 153 insertions(+), 264 deletions(-)

diff --git a/src/frontends/qt4/ui/HSpaceUi.ui b/src/frontends/qt4/ui/HSpaceUi.ui
index 94a0980254..2f9c4e951f 100644
--- a/src/frontends/qt4/ui/HSpaceUi.ui
+++ b/src/frontends/qt4/ui/HSpaceUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>263</width>
-    <height>198</height>
+    <width>259</width>
+    <height>146</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,26 +22,6 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="3" column="1" >
-    <widget class="QCheckBox" name="keepCB" >
-     <property name="toolTip" >
-      <string>Insert the spacing even after a line break</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="fillPatternL" >
-     <property name="text" >
-      <string>&amp;Fill Pattern:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>fillPatternCO</cstring>
-     </property>
-    </widget>
-   </item>
    <item row="2" column="1" >
     <widget class="QComboBox" name="fillPatternCO" >
      <property name="toolTip" >
@@ -74,127 +54,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0" >
-    <widget class="QLabel" name="keepL" >
-     <property name="toolTip" >
-      <string/>
-     </property>
-     <property name="text" >
-      <string>&amp;Protect:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>keepCB</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="2" >
-    <widget class="LengthCombo" native="1" name="unitCO" />
-   </item>
-   <item row="0" column="1" >
+   <item row="0" column="1" colspan="2" >
     <widget class="QComboBox" name="spacingCO" >
      <property name="toolTip" >
       <string>Supported spacing types</string>
@@ -241,6 +101,16 @@
      </item>
     </widget>
    </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="valueL" >
+     <property name="text" >
+      <string>&amp;Value:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>valueLE</cstring>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="1" >
     <widget class="QLineEdit" name="valueLE" >
      <property name="enabled" >
@@ -251,29 +121,97 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="valueL" >
+   <item row="1" column="2" >
+    <widget class="LengthCombo" name="unitCO" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="fillPatternL" >
      <property name="text" >
-      <string>&amp;Value:</string>
+      <string>&amp;Fill Pattern:</string>
      </property>
      <property name="buddy" >
-      <cstring>valueLE</cstring>
+      <cstring>fillPatternCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="keepL" >
+     <property name="toolTip" >
+      <string/>
+     </property>
+     <property name="text" >
+      <string>&amp;Protect:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>keepCB</cstring>
      </property>
     </widget>
    </item>
+   <item row="3" column="1" colspan="2" >
+    <widget class="QCheckBox" name="keepCB" >
+     <property name="toolTip" >
+      <string>Insert the spacing even after a line break</string>
+     </property>
+     <property name="text" >
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="okPB" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyPB" >
+       <property name="text" >
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closePB" >
+       <property name="text" >
+        <string>&amp;Close</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends>QWidget</extends>
+   <extends>QComboBox</extends>
    <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>spacingCO</tabstop>
   <tabstop>valueLE</tabstop>
-  <tabstop>unitCO</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>applyPB</tabstop>
   <tabstop>closePB</tabstop>
diff --git a/src/frontends/qt4/ui/VSpaceUi.ui b/src/frontends/qt4/ui/VSpaceUi.ui
index f8b942a438..01ea84a1c5 100644
--- a/src/frontends/qt4/ui/VSpaceUi.ui
+++ b/src/frontends/qt4/ui/VSpaceUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>233</width>
-    <height>140</height>
+    <width>259</width>
+    <height>120</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -17,11 +17,54 @@
   </property>
   <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
+   <item row="3" column="0" colspan="3" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="okPB" >
+       <property name="text" >
+        <string>&amp;OK</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+       <property name="default" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="applyPB" >
+       <property name="text" >
+        <string>&amp;Apply</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="closePB" >
+       <property name="text" >
+        <string>&amp;Close</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item row="0" column="0" >
     <widget class="QLabel" name="spacingL" >
      <property name="text" >
@@ -32,13 +75,13 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="valueL" >
-     <property name="text" >
-      <string>&amp;Value:</string>
+   <item row="2" column="1" colspan="2" >
+    <widget class="QCheckBox" name="keepCB" >
+     <property name="toolTip" >
+      <string>Insert the spacing even after a page break</string>
      </property>
-     <property name="buddy" >
-      <cstring>valueLE</cstring>
+     <property name="text" >
+      <string/>
      </property>
     </widget>
    </item>
@@ -55,15 +98,8 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="1" >
-    <widget class="QCheckBox" name="keepCB" >
-     <property name="toolTip" >
-      <string>Insert the spacing even after a page break</string>
-     </property>
-     <property name="text" >
-      <string/>
-     </property>
-    </widget>
+   <item row="1" column="2" >
+    <widget class="LengthCombo" name="unitCO" />
    </item>
    <item row="1" column="1" >
     <widget class="QLineEdit" name="valueLE" >
@@ -75,7 +111,17 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
+   <item row="1" column="0" >
+    <widget class="QLabel" name="valueL" >
+     <property name="text" >
+      <string>&amp;Value:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>valueLE</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
     <widget class="QComboBox" name="spacingCO" >
      <property name="toolTip" >
       <string>Supported spacing types</string>
@@ -112,113 +158,18 @@
      </item>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="LengthCombo" native="1" name="unitCO" />
-   </item>
-   <item row="3" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="0" colspan="3" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends>QWidget</extends>
+   <extends>QComboBox</extends>
    <header>LengthCombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>spacingCO</tabstop>
   <tabstop>valueLE</tabstop>
-  <tabstop>unitCO</tabstop>
   <tabstop>okPB</tabstop>
   <tabstop>applyPB</tabstop>
   <tabstop>closePB</tabstop>
-- 
2.39.2