Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[features.git] / src / frontends / qt4 / ui / PrefUi.ui

diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 5cd70b34e0f6ee69f463dddaedf7059ad9ba8cd4..a9d1beab0c9964a59defe54cf1a03c1cf7de7c28 100644 (file)
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -6,11 +6,13 @@
     <x>0</x>
     <y>0</y>
     <width>459</width>
-    <height>596</height>
+    <height>459</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,6 +21,12 @@
    <string/>
   </property>
   <layout class="QGridLayout" >
+   <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="title" >
@@ -28,10 +36,10 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
-      <property name="horizontalSpacing" >
-       <number>4</number>
+      <property name="margin" >
+       <number>9</number>
       </property>
-      <property name="verticalSpacing" >
+      <property name="spacing" >
        <number>4</number>
       </property>
       <item row="0" column="0" >
@@ -64,160 +72,6 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QGroupBox" name="fullscreenGB" >
-     <property name="title" >
-      <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" >
-      <item rowspan="3" row="0" column="2" >
-       <widget class="QGroupBox" name="fullscreenLimitGB" >
-        <property name="title" >
-         <string>&amp;Limit text width</string>
-        </property>
-        <property name="checkable" >
-         <bool>true</bool>
-        </property>
-        <layout class="QGridLayout" >
-         <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>
-         <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="1" column="1" >
-       <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="2" column="0" >
-       <widget class="QCheckBox" name="toggleTabbarCB" >
-        <property name="text" >
-         <string>Toggle tabba&amp;r</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="toggleScrollbarCB" >
-        <property name="text" >
-         <string>To&amp;ggle scrollbar</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="toggleToolbarsCB" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>T&amp;oggle toolbars</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="3" >
-    <widget class="QGroupBox" name="scrollGB" >
-     <property name="title" >
-      <string>Editing</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="horizontalSpacing" >
-       <number>4</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>4</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="cursorFollowsCB" >
-        <property name="text" >
-         <string>Cursor follows &amp;scrollbar</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="sortEnvironmentsCB" >
-        <property name="text" >
-         <string>Sort &amp;environments alphabetically</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QComboBox" name="macroEditStyleCO" >
-        <item>
-         <property name="text" >
-          <string>Edit Math Macros inline with a box around</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Edit Math Macros inline with the name in the status bar</string>
-         </property>
-        </item>
-        <item>
-         <property name="text" >
-          <string>Edit Math Macros with a parameter list (like in LyX &lt; 1.6)</string>
-         </property>
-        </item>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="groupEnvironmentsCB" >
-        <property name="text" >
-         <string>&amp;Group environments by their category</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item row="3" column="0" colspan="3" >
     <widget class="QGroupBox" name="documentsGB" >
      <property name="title" >
@@ -227,8 +81,20 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
       <item row="1" column="0" colspan="4" >
        <layout class="QHBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
+        </property>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
         <item>
          <widget class="QLabel" name="lastfilesLA" >
           <property name="text" >
@@ -283,12 +149,12 @@
       </item>
       <item row="0" column="1" >
        <widget class="QSpinBox" name="autoSaveSB" >
-        <property name="minimum" >
-         <number>1</number>
-        </property>
         <property name="maximum" >
          <number>300</number>
         </property>
+        <property name="minimum" >
+         <number>1</number>
+        </property>
        </widget>
       </item>
       <item row="0" column="0" >
@@ -298,6 +164,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="0" colspan="4" >
+       <widget class="QCheckBox" name="openDocumentsInTabsCB" >
+        <property name="text" >
+         <string>Open documents in &amp;tabs</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -326,10 +199,10 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" >
-      <property name="horizontalSpacing" >
-       <number>4</number>
+      <property name="margin" >
+       <number>9</number>
       </property>
-      <property name="verticalSpacing" >
+      <property name="spacing" >
        <number>4</number>
       </property>
       <item row="0" column="0" >
@@ -378,9 +251,8 @@
   <tabstop>autoSaveCB</tabstop>
   <tabstop>autoSaveSB</tabstop>
   <tabstop>lastfilesSB</tabstop>
-  <tabstop>cursorFollowsCB</tabstop>
-  <tabstop>sortEnvironmentsCB</tabstop>
-  <tabstop>macroEditStyleCO</tabstop>
+  <tabstop>openDocumentsInTabsCB</tabstop>
+  <tabstop>useBundledCB</tabstop>
  </tabstops>
  <includes>
   <include location="local" >qt_helpers.h</include>