fix layout

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33824 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui
index 5bbee9b207d60fdd2b7f95d836538b32bc763d2e..5b2edfed40ee5dc3d9a91f9a2e81e57e72280a62 100644 (file)
--- a/src/frontends/qt4/ui/TextLayoutUi.ui
+++ b/src/frontends/qt4/ui/TextLayoutUi.ui
@@ -1,104 +1,62 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>TextLayoutUi</class>
- <widget class="QWidget" name="TextLayoutUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="TextLayoutUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>421</width>
-    <height>310</height>
+    <height>280</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="2" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>403</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="separateGB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="separateGB">
+     <property name="title">
       <string>Separate paragraphs with</string>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="indentRB" >
-        <property name="minimumSize" >
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="indentRB">
+        <property name="minimumSize">
          <size>
           <width>91</width>
           <height>18</height>
          </size>
         </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string>Indent consecutive paragraphs</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Indentation</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="indentCO" >
-        <property name="enabled" >
+      <item row="0" column="1">
+       <widget class="QComboBox" name="indentCO">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string>Size of the indentation</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" colspan="2" >
+      <item row="0" column="2" colspan="2">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>135</width>
           <height>26</height>
@@ -106,72 +64,77 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="indentLE" >
-        <property name="enabled" >
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="indentLE">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string/>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" >
-       <widget class="LengthCombo" name="indentLengthCO" >
-        <property name="enabled" >
+      <item row="1" column="2">
+       <widget class="LengthCombo" name="indentLengthCO">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QRadioButton" name="skipRB" >
-        <property name="minimumSize" >
+      <item row="1" column="3">
+       <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="0">
+       <widget class="QRadioButton" name="skipRB">
+        <property name="minimumSize">
          <size>
           <width>91</width>
           <height>18</height>
          </size>
         </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string/>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Vertical space</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="1" >
-       <widget class="QComboBox" name="skipCO" >
-        <property name="enabled" >
+      <item row="2" column="1">
+       <widget class="QComboBox" name="skipCO">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string>Size of the vertical space</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" colspan="2" >
+      <item row="2" column="2" colspan="2">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>137</width>
           <height>26</height>
@@ -179,53 +142,32 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="1" >
-       <widget class="QLineEdit" name="skipLE" >
-        <property name="enabled" >
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="skipLE">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="2" >
-       <widget class="LengthCombo" name="skipLengthCO" >
-        <property name="enabled" >
+      <item row="3" column="2">
+       <widget class="LengthCombo" name="skipLengthCO">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" >
-       <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="3" >
+      <item row="3" column="3">
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -236,104 +178,79 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="spacingGB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="spacingGB">
+     <property name="minimumSize">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Spacing</string>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>false</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="lspacingL" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize" >
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="lspacingL">
+        <property name="minimumSize">
          <size>
           <width>91</width>
           <height>18</height>
          </size>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Line spacing:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>lspacingCO</cstring>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="lspacingCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip" >
+      <item row="0" column="1">
+       <widget class="QComboBox" name="lspacingCO">
+        <property name="toolTip">
          <string>Spacing type</string>
         </property>
-        <property name="duplicatesEnabled" >
+        <property name="duplicatesEnabled">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="lspacingLE" >
-        <property name="enabled" >
+      <item row="0" column="2">
+       <widget class="QLineEdit" name="lspacingLE">
+        <property name="enabled">
          <bool>false</bool>
         </property>
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="toolTip" >
+        <property name="toolTip">
          <string>Number of lines</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QCheckBox" name="twoColumnCB" >
-        <property name="toolTip" >
+      <item row="0" column="3">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>69</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="twoColumnCB">
+        <property name="toolTip">
          <string>Format text into two columns</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Two-&amp;column document</string>
         </property>
        </widget>
@@ -341,6 +258,22 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>403</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -360,7 +293,7 @@
   <tabstop>twoColumnCB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>