layout tweaks

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

diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui
index e4799ad4b527e3d592514cffe82024b7b6fa3c85..45574777f180f3c37ae4fa1d7b4c9e0d14faed0c 100644 (file)
--- a/src/frontends/qt4/ui/GraphicsUi.ui
+++ b/src/frontends/qt4/ui/GraphicsUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>379</height>
+    <width>481</width>
+    <height>354</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -50,6 +50,13 @@
         <number>6</number>
        </property>
        <item row="0" column="4" >
+        <widget class="QCheckBox" name="embedCB" >
+         <property name="text" >
+          <string>E&amp;mbed</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="3" >
         <widget class="QPushButton" name="editPB" >
          <property name="text" >
           <string>&amp;Edit</string>
@@ -62,7 +69,7 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="3" >
+       <item row="0" column="2" >
         <widget class="QPushButton" name="browsePB" >
          <property name="toolTip" >
           <string>Select an image file</string>
@@ -71,33 +78,6 @@
           <string>&amp;Browse...</string>
          </property>
         </widget>
-       </item>
-           <item row="0" column="2">
-           <widget class="QCheckBox" name="embedCB" >
-            <property name="text" >
-             <string></string>
-            </property>
-           </widget>
-       </item>
-       <item row="0" column="1" >
-        <widget class="QLineEdit" name="filename" >
-         <property name="toolTip" >
-          <string>File name of image</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="0" >
-        <widget class="QLabel" name="filenameL" >
-         <property name="toolTip" >
-          <string>File name of image</string>
-         </property>
-         <property name="text" >
-          <string>&amp;File:</string>
-         </property>
-         <property name="buddy" >
-          <cstring>filename</cstring>
-         </property>
-        </widget>
        </item>
        <item row="1" column="0" colspan="5" >
         <widget class="QGroupBox" name="sizeGB" >
@@ -105,7 +85,7 @@
           <string>Output Size</string>
          </property>
          <property name="flat" >
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
@@ -227,7 +207,7 @@
           <string>Rotate Graphics</string>
          </property>
          <property name="flat" >
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
          <layout class="QGridLayout" >
           <property name="margin" >
@@ -297,6 +277,26 @@
          </layout>
         </widget>
        </item>
+       <item row="0" column="0" >
+        <widget class="QLabel" name="filenameL" >
+         <property name="toolTip" >
+          <string>File name of image</string>
+         </property>
+         <property name="text" >
+          <string>&amp;File:</string>
+         </property>
+         <property name="buddy" >
+          <cstring>filename</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="filename" >
+         <property name="toolTip" >
+          <string>File name of image</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Clipping" >
@@ -474,98 +474,7 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <item row="3" column="1" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>21</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="6" column="2" >
-        <spacer>
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" >
-          <size>
-           <width>20</width>
-           <height>41</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="2" column="0" colspan="3" >
-        <widget class="QCheckBox" name="unzipCB" >
-         <property name="toolTip" >
-          <string>Don't uncompress image before exporting to LaTeX</string>
-         </property>
-         <property name="text" >
-          <string>Don't un&amp;zip on export</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="0" colspan="3" >
-        <widget class="QGroupBox" name="subfigure" >
-         <property name="focusPolicy" >
-          <enum>Qt::StrongFocus</enum>
-         </property>
-         <property name="title" >
-          <string>S&amp;ubfigure</string>
-         </property>
-         <property name="flat" >
-          <bool>false</bool>
-         </property>
-         <property name="checkable" >
-          <bool>true</bool>
-         </property>
-         <property name="checked" >
-          <bool>false</bool>
-         </property>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="CaptionLA" >
-            <property name="toolTip" >
-             <string>The caption for the sub-figure</string>
-            </property>
-            <property name="text" >
-             <string>Ca&amp;ption:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>subcaption</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="subcaption" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>3</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip" >
-             <string>The caption for the sub-figure</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="5" column="0" colspan="3" >
+       <item row="4" column="0" colspan="2" >
         <widget class="QGroupBox" name="displayGB" >
          <property name="focusPolicy" >
           <enum>Qt::StrongFocus</enum>
@@ -574,7 +483,7 @@
           <string>Sho&amp;w in LyX</string>
          </property>
          <property name="flat" >
-          <bool>false</bool>
+          <bool>true</bool>
          </property>
          <property name="checkable" >
           <bool>true</bool>
@@ -586,6 +495,19 @@
           <property name="spacing" >
            <number>6</number>
           </property>
+          <item row="0" column="4" >
+           <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="0" column="3" >
            <widget class="QLineEdit" name="displayscale" >
             <property name="enabled" >
@@ -660,7 +582,30 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2" >
+       <item row="5" column="1" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>41</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="QCheckBox" name="unzipCB" >
+         <property name="toolTip" >
+          <string>Don't uncompress image before exporting to LaTeX</string>
+         </property>
+         <property name="text" >
+          <string>Don't un&amp;zip on export</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
         <widget class="QLineEdit" name="latexoptions" >
          <property name="sizePolicy" >
           <sizepolicy>
@@ -688,7 +633,7 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="3" >
+       <item row="1" column="0" colspan="2" >
         <widget class="QCheckBox" name="draftCB" >
          <property name="toolTip" >
           <string>Draft mode</string>
@@ -698,6 +643,61 @@
          </property>
         </widget>
        </item>
+       <item row="3" column="0" colspan="2" >
+        <widget class="QGroupBox" name="subfigure" >
+         <property name="focusPolicy" >
+          <enum>Qt::StrongFocus</enum>
+         </property>
+         <property name="title" >
+          <string>S&amp;ubfigure</string>
+         </property>
+         <property name="flat" >
+          <bool>true</bool>
+         </property>
+         <property name="checkable" >
+          <bool>true</bool>
+         </property>
+         <property name="checked" >
+          <bool>false</bool>
+         </property>
+         <layout class="QHBoxLayout" >
+          <property name="margin" >
+           <number>9</number>
+          </property>
+          <property name="spacing" >
+           <number>6</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="CaptionLA" >
+            <property name="toolTip" >
+             <string>The caption for the sub-figure</string>
+            </property>
+            <property name="text" >
+             <string>Ca&amp;ption:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>subcaption</cstring>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLineEdit" name="subcaption" >
+            <property name="sizePolicy" >
+             <sizepolicy>
+              <hsizetype>3</hsizetype>
+              <vsizetype>0</vsizetype>
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="toolTip" >
+             <string>The caption for the sub-figure</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>

diff --git a/src/frontends/qt4/ui/PageLayoutUi.ui b/src/frontends/qt4/ui/PageLayoutUi.ui
index 7261b5f3bdc471e842e8ea655db6b063aa9d4962..d0322d5e8eb5ad4de9c6c1bf3db122d029589836 100644 (file)
--- a/src/frontends/qt4/ui/PageLayoutUi.ui
+++ b/src/frontends/qt4/ui/PageLayoutUi.ui
@@ -5,153 +5,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>388</width>
-    <height>448</height>
+    <width>287</width>
+    <height>264</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
-    <number>11</number>
+    <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
-    <widget class="QGroupBox" name="psizeGB" >
-     <property name="title" >
-      <string>Paper Size</string>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>11</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <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="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="0" column="1" colspan="2" >
-       <widget class="QComboBox" name="papersizeCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>1</hsizetype>
-          <vsizetype>0</vsizetype>
-          <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>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QLineEdit" name="paperheightLE" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </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>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="LengthCombo" name="paperheightUnitCO" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" >
-       <widget class="LengthCombo" name="paperwidthUnitCO" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="orientationBG" >
-     <property name="title" >
-      <string>Orientation</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>11</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item>
-       <widget class="QRadioButton" name="portraitRB" >
-        <property name="text" >
-         <string>&amp;Portrait</string>
-        </property>
-        <property name="checked" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="landscapeRB" >
-        <property name="text" >
-         <string>&amp;Landscape</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
+   <item row="6" column="0" colspan="4" >
     <layout class="QHBoxLayout" >
      <property name="margin" >
       <number>0</number>
@@ -160,43 +28,207 @@
       <number>6</number>
      </property>
      <item>
-      <widget class="QLabel" name="pagestyleL" >
+      <widget class="QLabel" name="label" >
        <property name="text" >
-        <string>Page &amp;style:</string>
+        <string>Page Layout</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShape" >
+        <enum>QFrame::HLine</enum>
        </property>
-       <property name="buddy" >
-        <cstring>pagestyleCO</cstring>
+       <property name="frameShadow" >
+        <enum>QFrame::Sunken</enum>
        </property>
       </widget>
      </item>
+    </layout>
+   </item>
+   <item row="0" column="0" colspan="4" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
-      <widget class="QComboBox" name="pagestyleCO" >
+      <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>5</hsizetype>
+         <hsizetype>7</hsizetype>
          <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="toolTip" >
-        <string>Style used for the page header and footer</string>
+       <property name="frameShape" >
+        <enum>QFrame::HLine</enum>
+       </property>
+       <property name="frameShadow" >
+        <enum>QFrame::Sunken</enum>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QCheckBox" name="facingPagesCB" >
+   <item row="1" column="1" colspan="2" >
+    <widget class="QComboBox" name="papersizeCO" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="toolTip" >
-      <string>Lay out the page for double-sided printing</string>
+      <string>Choose a particular paper size, or set your own with "Custom"</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" colspan="2" >
+    <widget class="QComboBox" name="pagestyleCO" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>7</hsizetype>
+       <vsizetype>0</vsizetype>
+       <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="7" column="0" >
+    <widget class="QLabel" name="pagestyleL" >
      <property name="text" >
-      <string>&amp;Two-sided document</string>
+      <string>Headings &amp;style:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>pagestyleCO</cstring>
      </property>
     </widget>
    </item>
-   <item>
+   <item row="5" column="1" colspan="2" >
+    <widget class="QRadioButton" name="landscapeRB" >
+     <property name="text" >
+      <string>&amp;Landscape</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1" colspan="2" >
+    <widget class="QRadioButton" name="portraitRB" >
+     <property name="text" >
+      <string>&amp;Portrait</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2" >
+    <widget class="LengthCombo" name="paperwidthUnitCO" />
+   </item>
+   <item row="2" column="2" >
+    <widget class="LengthCombo" name="paperheightUnitCO" />
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="paperwidthLE" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QLineEdit" name="paperheightLE" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" 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="2" 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="3" 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="4" 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="9" column="1" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -206,7 +238,43 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
+       <width>51</width>
+       <height>131</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="8" 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="7" 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="1" column="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>40</width>
        <height>20</height>
       </size>
      </property>
@@ -214,28 +282,27 @@
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends></extends>
-   <header>LengthCombo.h</header>
-   <container>0</container>
-   <pixmap></pixmap>
+   <extends>QComboBox</extends>
+   <header>lengthcombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>papersizeCO</tabstop>
   <tabstop>paperheightLE</tabstop>
+  <tabstop>paperheightUnitCO</tabstop>
   <tabstop>paperwidthLE</tabstop>
+  <tabstop>paperwidthUnitCO</tabstop>
   <tabstop>portraitRB</tabstop>
   <tabstop>landscapeRB</tabstop>
   <tabstop>pagestyleCO</tabstop>
   <tabstop>facingPagesCB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>

diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui
index a0ec721117f2ed26d90aaf26c0a5ac339d652138..862da70a1876e085dbb9775c7235cbd7794fa171 100644 (file)
--- a/src/frontends/qt4/ui/TextLayoutUi.ui
+++ b/src/frontends/qt4/ui/TextLayoutUi.ui
@@ -5,202 +5,91 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>415</width>
-    <height>398</height>
+    <width>418</width>
+    <height>328</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QGridLayout" >
    <property name="margin" >
     <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item>
-    <widget class="QGroupBox" name="ButtonGroup6" >
-     <property name="title" >
-      <string>Separate Paragraphs With</string>
+   <item row="4" column="0" colspan="4" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="1" >
-       <widget class="QComboBox" name="skipCO" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" colspan="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>178</width>
-          <height>22</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="3" column="3" >
-       <widget class="LengthCombo" native="1" name="skipLengthCO" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QLineEdit" name="skipLE" >
-        <property name="enabled" >
-         <bool>false</bool>
-        </property>
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>1</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item rowspan="2" row="2" column="0" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType" >
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>31</width>
-          <height>58</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="1" column="0" colspan="4" >
-       <widget class="QRadioButton" name="skipRB" >
-        <property name="toolTip" >
-         <string/>
-        </property>
-        <property name="text" >
-         <string>&amp;Vertical space</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="4" >
-       <widget class="QRadioButton" name="indentRB" >
-        <property name="toolTip" >
-         <string>Indent consecutive paragraphs</string>
-        </property>
-        <property name="text" >
-         <string>&amp;Indentation</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Spacing</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>0</vsizetype>
+         <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>
-    <widget class="QGroupBox" name="groupBox" >
-     <property name="title" >
-      <string>Spacing</string>
+   <item row="0" column="0" colspan="4" >
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</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>
-        </property>
-        <item>
-         <layout class="QHBoxLayout" >
-          <property name="margin" >
-           <number>0</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item>
-           <widget class="QLabel" name="lspacingL" >
-            <property name="text" >
-             <string>&amp;Line spacing:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>lspacingCO</cstring>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QComboBox" name="lspacingCO" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>5</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="duplicatesEnabled" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLineEdit" name="lspacingLE" >
-            <property name="enabled" >
-             <bool>false</bool>
-            </property>
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>1</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="twoColumnCB" >
-          <property name="toolTip" >
-           <string>Format text into two columns</string>
-          </property>
-          <property name="text" >
-           <string>Two-&amp;column document</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Separate paragraphs with</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QFrame" name="frame_2" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>0</vsizetype>
+         <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>
+   <item row="7" column="0" colspan="4" >
     <widget class="QGroupBox" name="listingsGB" >
      <property name="sizePolicy" >
       <sizepolicy>
@@ -222,14 +111,17 @@
      <property name="title" >
       <string>Listing settings</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <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>
+      <item row="1" column="0" >
        <widget class="QCheckBox" name="bypassCB" >
         <property name="toolTip" >
          <string>Check it to enter parameters that are not recognizable by LyX</string>
@@ -239,55 +131,49 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QSplitter" name="splitter" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="1" >
+       <widget class="QTextBrowser" name="listingsTB" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>7</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="cursor" >
+         <cursor>0</cursor>
+        </property>
+        <property name="acceptDrops" >
+         <bool>false</bool>
+        </property>
+        <property name="frameShape" >
+         <enum>QFrame::Box</enum>
+        </property>
+        <property name="frameShadow" >
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="acceptRichText" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QTextEdit" name="listingsED" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>7</hsizetype>
+          <vsizetype>7</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <widget class="QTextBrowser" name="listingsTB" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="cursor" >
-          <cursor>0</cursor>
-         </property>
-         <property name="acceptDrops" >
-          <bool>false</bool>
-         </property>
-         <property name="frameShape" >
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="frameShadow" >
-          <enum>QFrame::Plain</enum>
-         </property>
-         <property name="lineWidth" >
-          <number>0</number>
-         </property>
-         <property name="acceptRichText" >
-          <bool>false</bool>
-         </property>
-        </widget>
-        <widget class="QTextEdit" name="listingsED" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>7</hsizetype>
-           <vsizetype>7</vsizetype>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="8" column="0" colspan="4" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -297,19 +183,147 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>412</width>
+       <width>400</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="3" column="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>31</width>
+       <height>26</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" 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="6" column="0" colspan="4" >
+    <widget class="QCheckBox" name="twoColumnCB" >
+     <property name="toolTip" >
+      <string>Format text into two columns</string>
+     </property>
+     <property name="text" >
+      <string>Two-&amp;column document</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QRadioButton" name="skipRB" >
+     <property name="toolTip" >
+      <string/>
+     </property>
+     <property name="text" >
+      <string>&amp;Vertical space</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QRadioButton" name="indentRB" >
+     <property name="toolTip" >
+      <string>Indent consecutive paragraphs</string>
+     </property>
+     <property name="text" >
+      <string>&amp;Indentation</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" colspan="2" >
+    <widget class="QComboBox" name="skipCO" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" >
+    <widget class="QLineEdit" name="skipLE" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2" >
+    <widget class="LengthCombo" name="skipLengthCO" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2" >
+    <widget class="QLineEdit" name="lspacingLE" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>1</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <widget class="QComboBox" name="lspacingCO" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>0</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="duplicatesEnabled" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" >
+    <widget class="QLabel" name="lspacingL" >
+     <property name="text" >
+      <string>&amp;Line spacing:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>lspacingCO</cstring>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>LengthCombo</class>
-   <extends>QWidget</extends>
-   <header>LengthCombo.h</header>
+   <extends>QComboBox</extends>
+   <header>lengthcombo.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>