From 9b0f90787112cf7d00f915bdeb9648747f92348a Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Sat, 2 Mar 2013 16:23:51 +0100
Subject: [PATCH] Minor UI polishment

---
 src/frontends/qt4/ui/PrefColorsUi.ui      | 108 ++++++----
 src/frontends/qt4/ui/PrefDisplayUi.ui     | 106 +++++-----
 src/frontends/qt4/ui/PrefDocHandlingUi.ui |   4 +-
 src/frontends/qt4/ui/PrefEditUi.ui        | 213 ++++++++++----------
 src/frontends/qt4/ui/PrefFileformatsUi.ui | 229 ++++++++++++----------
 src/frontends/qt4/ui/PrefLatexUi.ui       |  34 +++-
 src/frontends/qt4/ui/PrefUi.ui            |   4 +-
 7 files changed, 393 insertions(+), 305 deletions(-)

diff --git a/src/frontends/qt4/ui/PrefColorsUi.ui b/src/frontends/qt4/ui/PrefColorsUi.ui
index 239f4f551a..e7c89c2e5e 100644
--- a/src/frontends/qt4/ui/PrefColorsUi.ui
+++ b/src/frontends/qt4/ui/PrefColorsUi.ui
@@ -1,54 +1,93 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefColorsUi</class>
- <widget class="QWidget" name="PrefColorsUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefColorsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>231</width>
+    <width>339</width>
     <height>254</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <item rowspan="2" row="0" column="0" >
-    <widget class="QListWidget" name="lyxObjectsLW" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0" rowspan="2">
+      <widget class="QListWidget" name="lyxObjectsLW">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="horizontalScrollBarPolicy">
+        <enum>Qt::ScrollBarAsNeeded</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="colorChangePB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>A&amp;lter...</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
-   <item row="1" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>40</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="0" column="1" >
-    <widget class="QPushButton" name="colorChangePB" >
-     <property name="text" >
-      <string>A&amp;lter...</string>
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="syscolorsCB">
+     <property name="text">
+      <string>&amp;Use system colors</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
-    <spacer>
-     <property name="orientation" >
+   <item row="1" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
@@ -56,17 +95,10 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QCheckBox" name="syscolorsCB" >
-     <property name="text" >
-      <string>&amp;Use system colors</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>
diff --git a/src/frontends/qt4/ui/PrefDisplayUi.ui b/src/frontends/qt4/ui/PrefDisplayUi.ui
index 1a813930ba..b430fe290d 100644
--- a/src/frontends/qt4/ui/PrefDisplayUi.ui
+++ b/src/frontends/qt4/ui/PrefDisplayUi.ui
@@ -1,37 +1,43 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefDisplayUi</class>
- <widget class="QWidget" name="PrefDisplayUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefDisplayUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>362</width>
+    <height>164</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QCheckBox" name="displayGraphicsCB" >
-     <property name="text" >
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="displayGraphicsCB">
+     <property name="text">
       <string>Display &amp;Graphics</string>
      </property>
     </widget>
    </item>
-   <item rowspan="4" row="0" column="4" >
+   <item row="0" column="4" rowspan="4">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>57</width>
        <height>20</height>
@@ -39,94 +45,92 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="instantPreviewLA" >
-     <property name="text" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="instantPreviewLA">
+     <property name="text">
       <string>Instant &amp;Preview:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>instantPreviewCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QComboBox" name="instantPreviewCO" >
+   <item row="1" column="1">
+    <widget class="QComboBox" name="instantPreviewCO">
      <item>
-      <property name="text" >
+      <property name="text">
        <string>Off</string>
       </property>
      </item>
      <item>
-      <property name="text" >
+      <property name="text">
        <string>No math</string>
       </property>
      </item>
      <item>
-      <property name="text" >
+      <property name="text">
        <string>On</string>
       </property>
      </item>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="QLabel" name="previewSizeLA" >
-     <property name="text" >
+   <item row="1" column="2">
+    <widget class="QLabel" name="previewSizeLA">
+     <property name="text">
       <string>Preview Si&amp;ze:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>instantPreviewCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="3" >
-    <widget class="QDoubleSpinBox" name="previewSizeSB" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
+   <item row="1" column="3">
+    <widget class="QDoubleSpinBox" name="previewSizeSB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Factor for the preview size</string>
      </property>
-     <property name="decimals" >
+     <property name="decimals">
       <number>1</number>
      </property>
-     <property name="maximum" >
-      <double>10.000000000000000</double>
-     </property>
-     <property name="minimum" >
+     <property name="minimum">
       <double>0.100000000000000</double>
      </property>
-     <property name="singleStep" >
+     <property name="maximum">
+      <double>10.000000000000000</double>
+     </property>
+     <property name="singleStep">
       <double>0.100000000000000</double>
      </property>
-     <property name="value" >
+     <property name="value">
       <double>1.000000000000000</double>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QCheckBox" name="paragraphMarkerCB" >
-     <property name="toolTip" >
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="paragraphMarkerCB">
+     <property name="toolTip">
       <string>Mark end of paragraphs on screen with a pilcrow character.</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>&amp;Mark end of paragraphs</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" >
+   <item row="3" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
@@ -140,7 +144,7 @@
   <tabstop>instantPreviewCO</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>
diff --git a/src/frontends/qt4/ui/PrefDocHandlingUi.ui b/src/frontends/qt4/ui/PrefDocHandlingUi.ui
index 6f9987f04a..5c15ae4cb9 100644
--- a/src/frontends/qt4/ui/PrefDocHandlingUi.ui
+++ b/src/frontends/qt4/ui/PrefDocHandlingUi.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>524</width>
+    <width>403</width>
     <height>416</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
diff --git a/src/frontends/qt4/ui/PrefEditUi.ui b/src/frontends/qt4/ui/PrefEditUi.ui
index 73fb2016ed..98e5b507b2 100644
--- a/src/frontends/qt4/ui/PrefEditUi.ui
+++ b/src/frontends/qt4/ui/PrefEditUi.ui
@@ -1,122 +1,145 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefEditUi</class>
- <widget class="QWidget" name="PrefEditUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefEditUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>384</width>
+    <width>385</width>
     <height>435</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="scrollGB" >
-     <property name="title" >
+    <widget class="QGroupBox" name="scrollGB">
+     <property name="title">
       <string>Editing</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="cursorFollowsCB" >
-        <property name="text" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="cursorFollowsCB">
+        <property name="text">
          <string>Cursor &amp;follows scrollbar</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <layout class="QGridLayout" name="gridLayout_4" >
-        <item row="0" column="0" >
-         <widget class="QLabel" name="label_3" >
-          <property name="toolTip" >
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="label_3">
+          <property name="toolTip">
            <string>Configure the width of the text cursor. Automatic zoom-controlled cursor width used when set to 0.</string>
           </property>
-          <property name="text" >
+          <property name="text">
            <string>Cursor width (&amp;pixels):</string>
           </property>
-          <property name="buddy" >
+          <property name="buddy">
            <cstring>cursorWidthSB</cstring>
           </property>
          </widget>
         </item>
-        <item row="0" column="1" >
-         <widget class="QSpinBox" name="cursorWidthSB" >
-          <property name="minimum" >
+        <item>
+         <widget class="QSpinBox" name="cursorWidthSB">
+          <property name="minimum">
            <number>0</number>
           </property>
-          <property name="maximum" >
+          <property name="maximum">
            <number>10</number>
           </property>
-          <property name="singleStep" >
+          <property name="singleStep">
            <number>1</number>
           </property>
-          <property name="value" >
+          <property name="value">
            <number>1</number>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="scrollBelowCB" >
-        <property name="text" >
+      <item row="1" column="1" colspan="2">
+       <spacer name="horizontalSpacer_3">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>200</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="scrollBelowCB">
+        <property name="text">
          <string>Scroll &amp;below end of document</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QCheckBox" name="sortEnvironmentsCB" >
-        <property name="text" >
+      <item row="3" column="0" colspan="2">
+       <widget class="QCheckBox" name="macLikeWordMovementCB">
+        <property name="toolTip">
+         <string>Skip trailing non-word characters</string>
+        </property>
+        <property name="text">
+         <string>Use Mac-style for cursor moving between &amp;words</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="2">
+       <widget class="QCheckBox" name="sortEnvironmentsCB">
+        <property name="text">
          <string>Sort &amp;environments alphabetically</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0" >
-       <widget class="QCheckBox" name="groupEnvironmentsCB" >
-        <property name="text" >
+      <item row="5" column="0" colspan="2">
+       <widget class="QCheckBox" name="groupEnvironmentsCB">
+        <property name="text">
          <string>&amp;Group environments by their category</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0" >
-       <widget class="QComboBox" name="macroEditStyleCO" >
+      <item row="6" column="0" colspan="2">
+       <widget class="QComboBox" name="macroEditStyleCO">
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Edit Math Macros inline with a box around</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Edit Math Macros inline with the name in the status bar</string>
          </property>
         </item>
         <item>
-         <property name="text" >
+         <property name="text">
           <string>Edit Math Macros with a parameter list (like in LyX &lt; 1.6)</string>
          </property>
         </item>
        </widget>
       </item>
-      <item row="6" column="1" >
-       <spacer name="horizontalSpacer" >
-        <property name="orientation" >
+      <item row="6" column="2">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -124,99 +147,89 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="0" >
-       <widget class="QCheckBox" name="macLikeWordMovementCB" >
-        <property name="toolTip" >
-         <string>Skip trailing non-word characters</string>
-        </property>
-        <property name="text" >
-         <string>Use Mac-style for cursor moving between &amp;words</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="fullscreenGB" >
-     <property name="title" >
+    <widget class="QGroupBox" name="fullscreenGB">
+     <property name="title">
       <string>Fullscreen</string>
      </property>
-     <property name="alignment" >
+     <property name="alignment">
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2" >
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="toggleToolbarsCB" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="toggleToolbarsCB">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Hide toolbars</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="toggleScrollbarCB" >
-        <property name="text" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="toggleScrollbarCB">
+        <property name="text">
          <string>Hide scr&amp;ollbar</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" >
-       <widget class="QCheckBox" name="toggleTabbarCB" >
-        <property name="text" >
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="toggleTabbarCB">
+        <property name="text">
          <string>Hide &amp;tabbar</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" >
-       <widget class="QCheckBox" name="toggleMenubarCB" >
-        <property name="text" >
+      <item row="3" column="0">
+       <widget class="QCheckBox" name="toggleMenubarCB">
+        <property name="text">
          <string>Hide &amp;menubar</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" >
-       <widget class="QGroupBox" name="fullscreenLimitGB" >
-        <property name="title" >
+      <item row="4" column="0">
+       <widget class="QGroupBox" name="fullscreenLimitGB">
+        <property name="title">
          <string>&amp;Limit text width</string>
         </property>
-        <property name="flat" >
+        <property name="flat">
          <bool>true</bool>
         </property>
-        <property name="checkable" >
+        <property name="checkable">
          <bool>true</bool>
         </property>
-        <layout class="QGridLayout" name="gridLayout_3" >
-         <item row="0" column="0" >
-          <widget class="QLabel" name="label_2" >
-           <property name="text" >
+        <layout class="QGridLayout" name="gridLayout_3">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
             <string>Screen used (&amp;pixels):</string>
            </property>
-           <property name="buddy" >
+           <property name="buddy">
             <cstring>fullscreenWidthSB</cstring>
            </property>
           </widget>
          </item>
-         <item row="0" column="1" >
-          <widget class="QSpinBox" name="fullscreenWidthSB" >
-           <property name="minimum" >
+         <item row="0" column="1">
+          <widget class="QSpinBox" name="fullscreenWidthSB">
+           <property name="minimum">
             <number>0</number>
            </property>
-           <property name="maximum" >
+           <property name="maximum">
             <number>10000</number>
            </property>
-           <property name="singleStep" >
+           <property name="singleStep">
             <number>10</number>
            </property>
-           <property name="value" >
+           <property name="value">
             <number>700</number>
            </property>
           </widget>
@@ -224,12 +237,12 @@
         </layout>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <spacer name="horizontalSpacer_2" >
-        <property name="orientation" >
+      <item row="4" column="1">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>157</width>
           <height>20</height>
@@ -242,10 +255,10 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>0</width>
        <height>0</height>
@@ -255,7 +268,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="4" margin="9" />
+ <layoutdefault spacing="4" margin="9"/>
  <tabstops>
   <tabstop>cursorFollowsCB</tabstop>
   <tabstop>cursorWidthSB</tabstop>
@@ -266,7 +279,7 @@
   <tabstop>macroEditStyleCO</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>
diff --git a/src/frontends/qt4/ui/PrefFileformatsUi.ui b/src/frontends/qt4/ui/PrefFileformatsUi.ui
index cfbad46b31..fd60ec2794 100644
--- a/src/frontends/qt4/ui/PrefFileformatsUi.ui
+++ b/src/frontends/qt4/ui/PrefFileformatsUi.ui
@@ -1,7 +1,7 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefFileformatsUi</class>
- <widget class="QWidget" name="PrefFileformatsUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefFileformatsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,200 +9,184 @@
     <height>381</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="formatsLA" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="8" column="2" colspan="2">
+    <widget class="QLineEdit" name="editorED"/>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="formatsLA">
+     <property name="text">
       <string>&amp;Format:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>formatsCB</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="formatsCB" >
-     <property name="editable" >
-      <bool>true</bool>
-     </property>
-     <property name="maxVisibleItems" >
-      <number>20</number>
-     </property>
-     <property name="insertPolicy" >
-      <enum>QComboBox::InsertAtCurrent</enum>
-     </property>
-     <property name="minimumContentsLength" >
-      <number>1</number>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="3" >
-    <widget class="QPushButton" name="formatNewPB" >
-     <property name="text" >
+   <item row="0" column="3">
+    <widget class="QPushButton" name="formatNewPB">
+     <property name="text">
       <string>&amp;New...</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="4" >
-    <widget class="QPushButton" name="formatRemovePB" >
-     <property name="text" >
+   <item row="0" column="4">
+    <widget class="QPushButton" name="formatRemovePB">
+     <property name="text">
       <string>Re&amp;move</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
-    <widget class="QCheckBox" name="documentCB" >
-     <property name="text" >
+   <item row="1" column="1" colspan="2">
+    <widget class="QCheckBox" name="documentCB">
+     <property name="text">
       <string>&amp;Document format</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2" >
-    <widget class="QCheckBox" name="exportMenuCB" >
-     <property name="toolTip" >
-      <string>Check this to show the current format in the File > Export menu</string>
+   <item row="2" column="1" colspan="2">
+    <widget class="QCheckBox" name="exportMenuCB">
+     <property name="toolTip">
+      <string>Check this to show the current format in the File &gt; Export menu</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Sho&amp;w in export menu</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2" >
-    <widget class="QCheckBox" name="vectorCB" >
-     <property name="text" >
+   <item row="3" column="1" colspan="2">
+    <widget class="QCheckBox" name="vectorCB">
+     <property name="text">
       <string>Vector &amp;graphics format</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <widget class="QLabel" name="formatLA" >
-     <property name="text" >
+   <item row="4" column="0">
+    <widget class="QLabel" name="formatLA">
+     <property name="text">
       <string>S&amp;hort Name:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>formatED</cstring>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="2" >
-    <widget class="QLineEdit" name="formatED" />
+   <item row="4" column="1" colspan="2">
+    <widget class="QLineEdit" name="formatED"/>
    </item>
-   <item row="5" column="0" >
-    <widget class="QLabel" name="extensionsLA" >
-     <property name="text" >
+   <item row="5" column="0">
+    <widget class="QLabel" name="extensionsLA">
+     <property name="text">
       <string>E&amp;xtensions:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>extensionsED</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" colspan="2" >
-    <widget class="QLineEdit" name="extensionsED" />
+   <item row="5" column="1" colspan="2">
+    <widget class="QLineEdit" name="extensionsED"/>
    </item>
-   <item row="6" column="0" >
-    <widget class="QLabel" name="mimeLA" >
-     <property name="text" >
+   <item row="6" column="0">
+    <widget class="QLabel" name="mimeLA">
+     <property name="text">
       <string>&amp;MIME:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>mimeED</cstring>
      </property>
     </widget>
    </item>
-   <item row="6" column="1" >
-    <widget class="QLineEdit" name="mimeED" />
+   <item row="6" column="1" colspan="2">
+    <widget class="QLineEdit" name="mimeED"/>
    </item>
-   <item row="7" column="0" >
-    <widget class="QLabel" name="shortcutLA" >
-     <property name="text" >
+   <item row="7" column="0">
+    <widget class="QLabel" name="shortcutLA">
+     <property name="text">
       <string>Shortc&amp;ut:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>shortcutED</cstring>
      </property>
     </widget>
    </item>
-   <item row="7" column="1" colspan="2" >
-    <widget class="QLineEdit" name="shortcutED" />
+   <item row="7" column="1" colspan="2">
+    <widget class="QLineEdit" name="shortcutED"/>
    </item>
-   <item row="8" column="1" >
-    <widget class="QComboBox" name="editorCO" >
-     <property name="sizeAdjustPolicy" >
+   <item row="8" column="1">
+    <widget class="QComboBox" name="editorCO">
+     <property name="sizeAdjustPolicy">
       <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
      </property>
     </widget>
    </item>
-   <item row="8" column="2" colspan="2" >
-    <widget class="QLineEdit" name="editorED" />
-   </item>
-   <item row="9" column="0" >
-    <widget class="QLabel" name="viewerLA" >
-     <property name="text" >
+   <item row="9" column="0">
+    <widget class="QLabel" name="viewerLA">
+     <property name="text">
       <string>&amp;Viewer:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>viewerCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="9" column="1" >
-    <widget class="QComboBox" name="viewerCO" >
-     <property name="sizeAdjustPolicy" >
+   <item row="9" column="1">
+    <widget class="QComboBox" name="viewerCO">
+     <property name="sizeAdjustPolicy">
       <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
      </property>
     </widget>
    </item>
-   <item row="9" column="2" colspan="2" >
-    <widget class="QLineEdit" name="viewerED" />
+   <item row="9" column="2" colspan="2">
+    <widget class="QLineEdit" name="viewerED"/>
    </item>
-   <item row="10" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
+   <item row="10" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
       <string>Co&amp;pier:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>copierED</cstring>
      </property>
     </widget>
    </item>
-   <item row="10" column="1" colspan="2" >
-    <widget class="QLineEdit" name="copierED" />
+   <item row="10" column="1" colspan="2">
+    <widget class="QLineEdit" name="copierED"/>
    </item>
-   <item row="11" column="0" colspan="5" >
-    <widget class="QGroupBox" name="defaultFormatGB" >
-     <property name="toolTip" >
+   <item row="11" column="0" colspan="5">
+    <widget class="QGroupBox" name="defaultFormatGB">
+     <property name="toolTip">
       <string>Specify the default output format when using (PDF)LaTeX</string>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Default Format</string>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <layout class="QHBoxLayout" name="horizontalLayout" >
+     <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-       <widget class="QLabel" name="defaultFormatLA" >
-        <property name="text" >
+       <widget class="QLabel" name="defaultFormatLA">
+        <property name="text">
          <string>De&amp;fault Output Format:</string>
         </property>
-        <property name="buddy" >
+        <property name="buddy">
          <cstring>defaultFormatCB</cstring>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QComboBox" name="defaultFormatCB" />
+       <widget class="QComboBox" name="defaultFormatCB"/>
       </item>
       <item>
-       <spacer name="horizontalSpacer" >
-        <property name="orientation" >
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>148</width>
           <height>20</height>
@@ -213,12 +197,12 @@
      </layout>
     </widget>
    </item>
-   <item row="12" column="1" colspan="2" >
+   <item row="12" column="1" colspan="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>124</width>
        <height>21</height>
@@ -226,16 +210,45 @@
      </property>
     </spacer>
    </item>
-   <item row="8" column="0" >
-    <widget class="QLabel" name="editorLA" >
-     <property name="text" >
+   <item row="8" column="0">
+    <widget class="QLabel" name="editorLA">
+     <property name="text">
       <string>Ed&amp;itor:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>editorCO</cstring>
      </property>
     </widget>
    </item>
+   <item row="0" column="5">
+    <spacer name="horizontalSpacer_2">
+     <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="0" column="1" colspan="2">
+    <widget class="QComboBox" name="formatsCB">
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+     <property name="maxVisibleItems">
+      <number>20</number>
+     </property>
+     <property name="insertPolicy">
+      <enum>QComboBox::InsertAtCurrent</enum>
+     </property>
+     <property name="minimumContentsLength">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -256,7 +269,7 @@
   <tabstop>copierED</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>
diff --git a/src/frontends/qt4/ui/PrefLatexUi.ui b/src/frontends/qt4/ui/PrefLatexUi.ui
index dae935f595..c8b57fbbbe 100644
--- a/src/frontends/qt4/ui/PrefLatexUi.ui
+++ b/src/frontends/qt4/ui/PrefLatexUi.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>393</width>
-    <height>478</height>
+    <height>431</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -67,7 +67,7 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="2" column="0" colspan="2">
     <widget class="QGroupBox" name="bibtexGB">
      <property name="title">
       <string>Bibliography generation</string>
@@ -142,7 +142,20 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="5" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="indexGB">
      <property name="title">
       <string>Index generation</string>
@@ -217,7 +230,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="4" column="0" colspan="2">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string/>
@@ -292,6 +305,19 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0" colspan="2">
+    <spacer name="verticalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <includes>
diff --git a/src/frontends/qt4/ui/PrefUi.ui b/src/frontends/qt4/ui/PrefUi.ui
index 8f6280f789..1e6a7dea4f 100644
--- a/src/frontends/qt4/ui/PrefUi.ui
+++ b/src/frontends/qt4/ui/PrefUi.ui
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
+    <width>403</width>
     <height>271</height>
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
-- 
2.39.2