From 06fb58a2dabbbc78794101ae19f30e541e944d6d Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 12 Apr 2017 12:49:38 +0200
Subject: [PATCH] FontUi: Fix layout

The old layout resulted in a too wide dialog
(especially in some localizations)
---
 src/frontends/qt4/ui/FontUi.ui | 280 +++++++++++++++++++--------------
 1 file changed, 161 insertions(+), 119 deletions(-)

diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui
index b183331f28..f0b3fb7e8b 100644
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -6,42 +6,79 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>541</width>
-    <height>319</height>
+    <width>533</width>
+    <height>447</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>FontUi</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="1">
-    <widget class="QComboBox" name="fontsDefaultCO">
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="osFontsCB">
      <property name="toolTip">
-      <string>Select the default family for the document</string>
+      <string>Use OpenType and TrueType fonts with the fontspec package (requires XeTeX or LuaTeX)</string>
+     </property>
+     <property name="text">
+      <string>&amp;Use non-TeX fonts (via XeTeX/LuaTeX)</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QLabel" name="BaseSizeLA">
+   <item row="1" column="0">
+    <widget class="QLabel" name="fontsDefaultLA">
      <property name="text">
-      <string>&amp;Base size:</string>
+      <string>&amp;Default family:</string>
      </property>
      <property name="buddy">
-      <cstring>fontsizeCO</cstring>
+      <cstring>fontsDefaultCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
-    <widget class="QComboBox" name="fontsizeCO">
-     <property name="toolTip">
-      <string/>
-     </property>
-    </widget>
+   <item row="1" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QComboBox" name="fontsDefaultCO">
+       <property name="toolTip">
+        <string>Select the default family for the document</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="BaseSizeLA">
+       <property name="text">
+        <string>&amp;Base size:</string>
+       </property>
+       <property name="buddy">
+        <cstring>fontsizeCO</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="fontsizeCO">
+       <property name="toolTip">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>59</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
    <item row="2" column="0">
     <widget class="QLabel" name="fontencLA">
      <property name="text">
-      <string>LaTe&amp;X font encoding:</string>
+      <string>&amp;LaTeX font encoding:</string>
      </property>
      <property name="buddy">
       <cstring>fontencCO</cstring>
@@ -49,14 +86,18 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QComboBox" name="fontencCO"/>
-   </item>
-   <item row="2" column="2" colspan="2">
-    <widget class="QLineEdit" name="fontencLE">
-     <property name="toolTip">
-      <string>Specify the font encoding (e.g., T1).</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QComboBox" name="fontencCO"/>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="fontencLE">
+       <property name="toolTip">
+        <string>Specify the font encoding (e.g., T1).</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="fontsRomanLA">
@@ -68,39 +109,6 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QCheckBox" name="osFontsCB">
-     <property name="toolTip">
-      <string>Use OpenType and TrueType fonts with the fontspec package (requires XeTeX or LuaTeX)</string>
-     </property>
-     <property name="text">
-      <string>&amp;Use non-TeX fonts (via XeTeX/LuaTeX)</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>59</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="fontsDefaultLA">
-     <property name="text">
-      <string>&amp;Default family:</string>
-     </property>
-     <property name="buddy">
-      <cstring>fontsDefaultCO</cstring>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="1">
     <widget class="QComboBox" name="fontsRomanCO">
      <property name="toolTip">
@@ -119,41 +127,51 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="QComboBox" name="fontsSansCO">
-     <property name="toolTip">
-      <string>Select the Sans Serif (grotesque) typeface</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="2">
-    <widget class="QLabel" name="scaleSansLA">
-     <property name="text">
-      <string>S&amp;cale (%):</string>
-     </property>
-     <property name="buddy">
-      <cstring>scaleSansSB</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QComboBox" name="fontsTypewriterCO">
-     <property name="toolTip">
-      <string>Select the typewriter (monospaced) typeface</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3">
-    <widget class="QSpinBox" name="scaleSansSB">
-     <property name="toolTip">
-      <string>Scale the Sans Serif font to match the base font's dimensions</string>
-     </property>
-     <property name="minimum">
-      <number>10</number>
-     </property>
-     <property name="maximum">
-      <number>200</number>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QComboBox" name="fontsSansCO">
+       <property name="toolTip">
+        <string>Select the Sans Serif (grotesque) typeface</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <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>
+      <widget class="QLabel" name="scaleSansLA">
+       <property name="text">
+        <string>S&amp;cale (%):</string>
+       </property>
+       <property name="buddy">
+        <cstring>scaleSansSB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="scaleSansSB">
+       <property name="toolTip">
+        <string>Scale the Sans Serif font to match the base font's dimensions</string>
+       </property>
+       <property name="minimum">
+        <number>10</number>
+       </property>
+       <property name="maximum">
+        <number>200</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="fontsTypewriterLA">
@@ -165,13 +183,60 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="2">
-    <widget class="QLabel" name="scaleTypewriterLA">
+   <item row="5" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="QComboBox" name="fontsTypewriterCO">
+       <property name="toolTip">
+        <string>Select the typewriter (monospaced) typeface</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <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>
+      <widget class="QLabel" name="scaleTypewriterLA">
+       <property name="text">
+        <string>Sc&amp;ale (%):</string>
+       </property>
+       <property name="buddy">
+        <cstring>scaleTypewriterSB</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="scaleTypewriterSB">
+       <property name="toolTip">
+        <string>Scale the Typewriter font to match the base font's dimensions</string>
+       </property>
+       <property name="minimum">
+        <number>10</number>
+       </property>
+       <property name="maximum">
+        <number>200</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="fontsMathLA">
      <property name="text">
-      <string>Sc&amp;ale (%):</string>
+      <string>&amp;Math:</string>
      </property>
      <property name="buddy">
-      <cstring>scaleTypewriterSB</cstring>
+      <cstring>fontsMathCO</cstring>
      </property>
     </widget>
    </item>
@@ -182,29 +247,6 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="3">
-    <widget class="QSpinBox" name="scaleTypewriterSB">
-     <property name="toolTip">
-      <string>Scale the Typewriter font to match the base font's dimensions</string>
-     </property>
-     <property name="minimum">
-      <number>10</number>
-     </property>
-     <property name="maximum">
-      <number>200</number>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="fontsMathLA">
-     <property name="text">
-      <string>&amp;Math:</string>
-     </property>
-     <property name="buddy">
-      <cstring>fontsMathCO</cstring>
-     </property>
-    </widget>
-   </item>
    <item row="7" column="0">
     <widget class="QLabel" name="cjkFontLA">
      <property name="text">
-- 
2.39.2