layout tweak

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

diff --git a/src/frontends/qt4/ui/QParagraphUi.ui b/src/frontends/qt4/ui/QParagraphUi.ui
index b578f4df2f5cae18681c43c1d986117c812cec32..b0a4e3612124864f88724bbd84f5bcbafdb64fd8 100644 (file)
--- a/src/frontends/qt4/ui/QParagraphUi.ui
+++ b/src/frontends/qt4/ui/QParagraphUi.ui
@@ -8,8 +8,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>482</width>
-    <height>322</height>
+    <width>373</width>
+    <height>203</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -29,337 +29,281 @@
   <property name="sizeGripEnabled" >
    <bool>true</bool>
   </property>
-   <layout class="QVBoxLayout" >
-    <property name="margin" >
-     <number>5</number>
-    </property>
-    <property name="spacing" >
-     <number>6</number>
-    </property>
-    <item>
-     <layout class="QHBoxLayout" >
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="4" column="0" colspan="2" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="restorePB" >
+       <property name="text" >
+        <string>&amp;Restore</string>
+       </property>
+       <property name="autoDefault" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <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>
+      <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="3" column="1" >
+    <widget class="QGroupBox" name="labelwidthGB" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="title" >
+      <string>Label Width</string>
+     </property>
+     <layout class="QGridLayout" >
       <property name="margin" >
-       <number>0</number>
+       <number>11</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
-        </property>
-        <property name="spacing" >
-         <number>6</number>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="labelWidth" >
+        <property name="toolTip" >
+         <string>This text defines the width of the paragraph label</string>
         </property>
-        <item>
-         <widget class="QGroupBox" name="aligmentGB" >
-          <property name="title" >
-           <string>Alignment</string>
-          </property>
-          <layout class="QVBoxLayout" >
-           <property name="margin" >
-            <number>9</number>
-           </property>
-           <property name="spacing" >
-            <number>6</number>
-           </property>
-           <item>
-            <widget class="QCheckBox" name="alignDefaultCB" >
-             <property name="font" >
-              <font>
-               <weight>50</weight>
-               <italic>true</italic>
-               <bold>false</bold>
-               <kerning>true</kerning>
-              </font>
-             </property>
-             <property name="text" >
-              <string>&amp;Default</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="alignJustRB" >
-             <property name="text" >
-              <string>&amp;Justified</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="alignLeftRB" >
-             <property name="text" >
-              <string>&amp;Left</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="alignRightRB" >
-             <property name="text" >
-              <string>&amp;Right</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QRadioButton" name="alignCenterRB" >
-             <property name="text" >
-              <string>&amp;Center</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer>
-             <property name="orientation" >
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" >
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </widget>
-        </item>
-       </layout>
+       </widget>
       </item>
-      <item>
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="toolTip" >
+         <string>This text defines the width of the paragraph label</string>
         </property>
-        <property name="sizeHint" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <layout class="QVBoxLayout" >
-        <property name="margin" >
-         <number>0</number>
+        <property name="text" >
+         <string>&amp;Longest label</string>
         </property>
-        <property name="spacing" >
-         <number>6</number>
+        <property name="buddy" >
+         <cstring>labelWidth</cstring>
         </property>
-        <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="linespacingL" >
-            <property name="text" >
-             <string>L&amp;ine spacing:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>linespacing</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="linespacing" >
-            <item>
-             <property name="text" >
-              <string>Default</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>Single</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>1.5</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>Double</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>Custom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="linespacingValue" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QCheckBox" name="indentCB" >
-            <property name="text" >
-             <string>Indent &amp;Paragraph</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <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>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="labelwidthGB" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="title" >
-           <string>Label Width</string>
-          </property>
-          <layout class="QGridLayout" >
-           <property name="margin" >
-            <number>11</number>
-           </property>
-           <property name="spacing" >
-            <number>6</number>
-           </property>
-           <item row="0" column="1" >
-            <widget class="QLineEdit" name="labelWidth" >
-             <property name="toolTip" >
-              <string>This text defines the width of the paragraph label</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0" >
-            <widget class="QLabel" name="TextLabel2" >
-             <property name="toolTip" >
-              <string>This text defines the width of the paragraph label</string>
-             </property>
-             <property name="text" >
-              <string>&amp;Longest label</string>
-             </property>
-             <property name="buddy" >
-              <cstring>labelWidth</cstring>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       </widget>
       </item>
      </layout>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" >
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QCheckBox" name="indentCB" >
+       <property name="text" >
+        <string>Indent &amp;Paragraph</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <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>
+   </item>
+   <item row="2" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>249</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="linespacingL" >
+       <property name="text" >
+        <string>L&amp;ine spacing:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>linespacing</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="linespacing" >
+       <item>
+        <property name="text" >
+         <string>Default</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Single</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>1.5</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Double</string>
+        </property>
+       </item>
+       <item>
+        <property name="text" >
+         <string>Custom</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="linespacingValue" >
+       <property name="enabled" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item rowspan="4" row="0" column="0" >
+    <widget class="QGroupBox" name="aligmentGB" >
+     <property name="title" >
+      <string>Alignment</string>
+     </property>
+     <layout class="QVBoxLayout" >
       <property name="margin" >
-       <number>0</number>
+       <number>9</number>
       </property>
       <property name="spacing" >
        <number>6</number>
       </property>
       <item>
-       <widget class="QPushButton" name="restorePB" >
-        <property name="text" >
-         <string>&amp;Restore</string>
+       <widget class="QCheckBox" name="alignDefaultCB" >
+        <property name="font" >
+         <font>
+          <weight>50</weight>
+          <italic>true</italic>
+          <bold>false</bold>
+          <kerning>true</kerning>
+         </font>
         </property>
-        <property name="autoDefault" >
-         <bool>false</bool>
+        <property name="text" >
+         <string>&amp;Default</string>
         </property>
        </widget>
       </item>
       <item>
-       <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>
+       <widget class="QRadioButton" name="alignJustRB" >
+        <property name="text" >
+         <string>&amp;Justified</string>
         </property>
-       </spacer>
+       </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="okPB" >
+       <widget class="QRadioButton" name="alignLeftRB" >
         <property name="text" >
-         <string>&amp;OK</string>
-        </property>
-        <property name="autoDefault" >
-         <bool>false</bool>
-        </property>
-        <property name="default" >
-         <bool>true</bool>
+         <string>&amp;Left</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="applyPB" >
+       <widget class="QRadioButton" name="alignRightRB" >
         <property name="text" >
-         <string>&amp;Apply</string>
-        </property>
-        <property name="autoDefault" >
-         <bool>false</bool>
+         <string>&amp;Right</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="closePB" >
+       <widget class="QRadioButton" name="alignCenterRB" >
         <property name="text" >
-         <string>&amp;Close</string>
-        </property>
-        <property name="autoDefault" >
-         <bool>false</bool>
+         <string>&amp;Center</string>
         </property>
        </widget>
       </item>
      </layout>
-    </item>
-   </layout>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <tabstops>
   <tabstop>linespacing</tabstop>