fix layout

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

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index c406f7b8bb00fabb7df472447a84e717da08ec72..da00a60c5151f93779a17dbff073d9c5bb8dd2d3 100644 (file)
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -5,12 +5,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>413</width>
-    <height>533</height>
+    <width>430</width>
+    <height>582</height>
    </rect>
   </property>
   <property name="sizePolicy" >
-   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+   <sizepolicy>
+    <hsizetype>0</hsizetype>
+    <vsizetype>0</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -19,81 +21,14 @@
    <string/>
   </property>
   <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="uiFileLA" >
-     <property name="text" >
-      <string>&amp;User interface file:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>uiFileED</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="uiFileED" />
-   </item>
-   <item row="0" column="2" colspan="2" >
-    <widget class="QPushButton" name="uiFilePB" >
-     <property name="text" >
-      <string>Bro&amp;wse...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="4" >
-    <widget class="QGroupBox" name="pixmapCacheGB_2" >
-     <property name="title" >
-      <string>Automatic help</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="flat" >
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>9</number>
-      </property>
-      <property name="topMargin" >
-       <number>0</number>
-      </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>4</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="tooltipCB" >
-        <property name="toolTip" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Checking this allow the automatic display of helpful comments for insets in the main work area of an edited document.&lt;/p>
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-        <property name="text" >
-         <string>Enable &amp;tool tips in main work area</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="2" column="0" colspan="3" >
     <widget class="QGroupBox" name="GeometryGB" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="title" >
       <string>Session</string>
      </property>
@@ -101,8 +36,11 @@ p, li { white-space: pre-wrap; }
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
-      <property name="topMargin" >
-       <number>0</number>
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>4</number>
       </property>
       <item row="0" column="0" >
        <widget class="QCheckBox" name="allowGeometrySessionCB" >
@@ -134,117 +72,114 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="4" >
-    <widget class="QGroupBox" name="documentsGB" >
+   <item row="5" column="0" colspan="3" >
+    <widget class="QGroupBox" name="fullscreenGB" >
      <property name="title" >
-      <string>Documents</string>
+      <string>Fullscreen</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
      <property name="flat" >
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
-      <property name="topMargin" >
-       <number>1</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>13</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>-1</number>
+      <property name="margin" >
+       <number>9</number>
       </property>
-      <property name="verticalSpacing" >
-       <number>-1</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="autoSaveCB" >
-        <property name="text" >
-         <string>B&amp;ackup documents, every</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QSpinBox" name="autoSaveSB" >
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-        <property name="maximum" >
-         <number>300</number>
+      <item rowspan="3" row="0" column="2" >
+       <widget class="QGroupBox" name="fullscreenLimitGB" >
+        <property name="title" >
+         <string>&amp;Limit text width</string>
         </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="text" >
-         <string>minutes</string>
+        <property name="checkable" >
+         <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="1" >
+          <widget class="QSpinBox" name="fullscreenWidthSB" >
+           <property name="maximum" >
+            <number>10000</number>
+           </property>
+           <property name="minimum" >
+            <number>0</number>
+           </property>
+           <property name="singleStep" >
+            <number>10</number>
+           </property>
+           <property name="value" >
+            <number>700</number>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0" >
+          <widget class="QLabel" name="label_2" >
+           <property name="text" >
+            <string>Screen us&amp;ed (pixels):</string>
+           </property>
+           <property name="buddy" >
+            <cstring>fullscreenWidthSB</cstring>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="0" column="3" >
+      <item row="1" column="1" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" >
          <size>
-          <width>61</width>
-          <height>21</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
-      <item row="1" column="0" colspan="4" >
-       <layout class="QHBoxLayout" >
-        <property name="spacing" >
-         <number>6</number>
-        </property>
-        <property name="leftMargin" >
-         <number>0</number>
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="toggleTabbarCB" >
+        <property name="text" >
+         <string>Toggle tabba&amp;r</string>
         </property>
-        <property name="topMargin" >
-         <number>0</number>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="toggleScrollbarCB" >
+        <property name="text" >
+         <string>To&amp;ggle scrollbar</string>
         </property>
-        <property name="rightMargin" >
-         <number>0</number>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="toggleToolbarsCB" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
-        <property name="bottomMargin" >
-         <number>0</number>
+        <property name="text" >
+         <string>T&amp;oggle toolbars</string>
         </property>
-        <item>
-         <widget class="QLabel" name="lastfilesLA" >
-          <property name="text" >
-           <string>&amp;Maximum last files:</string>
-          </property>
-          <property name="buddy" >
-           <cstring>lastfilesSB</cstring>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="lastfilesSB" >
-          <property name="maximum" >
-           <number>9</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" >
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" colspan="4" >
+   <item row="4" column="0" colspan="3" >
     <widget class="QGroupBox" name="scrollGB" >
      <property name="title" >
       <string>Editing</string>
@@ -256,8 +191,11 @@ p, li { white-space: pre-wrap; }
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
-      <property name="topMargin" >
-       <number>0</number>
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>4</number>
       </property>
       <item row="0" column="0" >
        <widget class="QCheckBox" name="cursorFollowsCB" >
@@ -295,140 +233,169 @@ p, li { white-space: pre-wrap; }
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="4" >
-    <widget class="QGroupBox" name="fullscreenGB" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="3" column="0" colspan="3" >
+    <widget class="QGroupBox" name="documentsGB" >
      <property name="title" >
-      <string>Fullscreen</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      <string>Documents</string>
      </property>
      <property name="flat" >
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
-      <property name="topMargin" >
-       <number>2</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>4</number>
+      <property name="margin" >
+       <number>9</number>
       </property>
-      <property name="verticalSpacing" >
-       <number>2</number>
+      <property name="spacing" >
+       <number>6</number>
       </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="toggleToolbarsCB" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="1" column="0" colspan="4" >
+       <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
         </property>
-        <property name="text" >
-         <string>T&amp;oggle toolbars</string>
+        <property name="spacing" >
+         <number>6</number>
         </property>
-       </widget>
+        <item>
+         <widget class="QLabel" name="lastfilesLA" >
+          <property name="text" >
+           <string>&amp;Maximum last files:</string>
+          </property>
+          <property name="buddy" >
+           <cstring>lastfilesSB</cstring>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="lastfilesSB" >
+          <property name="maximum" >
+           <number>9</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer>
+          <property name="orientation" >
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" >
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
       </item>
-      <item rowspan="3" row="0" column="2" >
-       <widget class="QGroupBox" name="fullscreenLimitGB" >
-        <property name="title" >
-         <string>&amp;Limit text width</string>
+      <item row="0" column="3" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="checkable" >
-         <bool>true</bool>
+        <property name="sizeHint" >
+         <size>
+          <width>61</width>
+          <height>21</height>
+         </size>
         </property>
-        <layout class="QGridLayout" >
-         <property name="leftMargin" >
-          <number>9</number>
-         </property>
-         <property name="topMargin" >
-          <number>4</number>
-         </property>
-         <property name="verticalSpacing" >
-          <number>-1</number>
-         </property>
-         <item row="0" column="0" >
-          <layout class="QGridLayout" >
-           <item row="0" column="0" >
-            <widget class="QLabel" name="label_2" >
-             <property name="text" >
-              <string>Screen us&amp;ed (pixels):</string>
-             </property>
-             <property name="buddy" >
-              <cstring>fullscreenWidthSB</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1" >
-            <widget class="QSpinBox" name="fullscreenWidthSB" >
-             <property name="minimum" >
-              <number>0</number>
-             </property>
-             <property name="maximum" >
-              <number>10000</number>
-             </property>
-             <property name="singleStep" >
-              <number>10</number>
-             </property>
-             <property name="value" >
-              <number>700</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </widget>
+       </spacer>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="toggleScrollbarCB" >
+      <item row="0" column="2" >
+       <widget class="QLabel" name="TextLabel1" >
         <property name="text" >
-         <string>To&amp;ggle scrollbar</string>
+         <string>minutes</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="toggleTabbarCB" >
-        <property name="text" >
-         <string>Toggle tabba&amp;r</string>
+      <item row="0" column="1" >
+       <widget class="QSpinBox" name="autoSaveSB" >
+        <property name="maximum" >
+         <number>300</number>
+        </property>
+        <property name="minimum" >
+         <number>1</number>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="autoSaveCB" >
+        <property name="text" >
+         <string>B&amp;ackup documents, every</string>
         </property>
-       </spacer>
+       </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="6" column="0" colspan="4" >
+   <item row="6" column="0" colspan="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>295</width>
+       <width>395</width>
        <height>16</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="QGroupBox" name="pixmapCacheGB_2" >
+     <property name="title" >
+      <string>Automatic help</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="flat" >
+      <bool>true</bool>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>4</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="tooltipCB" >
+        <property name="toolTip" >
+         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
+p, li { white-space: pre-wrap; }
+&lt;/style>&lt;/head>&lt;body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal; text-decoration:none;">
+&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">Checking this allow the automatic display of helpful comments for insets in the main work area of an edited document.&lt;/p>
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
+        </property>
+        <property name="text" >
+         <string>Enable &amp;tool tips in main work area</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="0" column="2" >
+    <widget class="QPushButton" name="uiFilePB" >
+     <property name="text" >
+      <string>Bro&amp;wse...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLineEdit" name="uiFileED" />
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="uiFileLA" >
+     <property name="text" >
+      <string>&amp;User interface file:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>uiFileED</cstring>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="4" margin="9" />