clean up the clean up of the font panel in document dialog (roman family combo has...

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

diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui
index a7ea9a2547ecc28eb2d56a5549091aa0c65e17cc..7f072a195a22386ada6838af3f362321d74d4258 100644 (file)
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -1,7 +1,4 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>FontUi</class>
  <widget class="QWidget" name="FontUi" >
   <property name="geometry" >
@@ -22,16 +19,46 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="fontsDefaultCO" />
+   <item row="7" column="0" colspan="4" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>391</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
    </item>
-   <item row="4" column="1" >
-    <widget class="QComboBox" name="fontsRomanCO" />
+   <item row="2" column="2" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>131</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
    </item>
-   <item row="2" column="1" >
-    <widget class="QComboBox" name="fontsSansCO" />
+   <item row="4" column="3" >
+    <widget class="QSpinBox" name="scaleTypewriterSB" >
+     <property name="maximum" >
+      <number>200</number>
+     </property>
+     <property name="minimum" >
+      <number>10</number>
+     </property>
+    </widget>
    </item>
-   <item row="3" column="2" >
+   <item row="4" column="2" >
     <widget class="QLabel" name="scaleTypewriterLA" >
      <property name="text" >
       <string>Sc&amp;ale (%):</string>
@@ -41,27 +68,33 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <widget class="QLabel" name="scaleSansLA" >
+   <item row="4" column="1" >
+    <widget class="QComboBox" name="fontsTypewriterCO" />
+   </item>
+   <item row="4" column="0" >
+    <widget class="QLabel" name="fontsTypewriterLA" >
      <property name="text" >
-      <string>S&amp;cale (%):</string>
+      <string>&amp;Typewriter:</string>
      </property>
      <property name="buddy" >
-      <cstring>scaleSansSB</cstring>
+      <cstring>fontsTypewriterCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
-    <widget class="QLabel" name="TextLabel2_2" >
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="fontsRomanCO" />
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="fontsRomanLA" >
      <property name="text" >
-      <string>&amp;Base Size:</string>
+      <string>&amp;Roman:</string>
      </property>
      <property name="buddy" >
-      <cstring>fontsizeCO</cstring>
+      <cstring>fontsRomanCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="3" >
+   <item row="3" column="3" >
     <widget class="QSpinBox" name="scaleSansSB" >
      <property name="maximum" >
       <number>200</number>
@@ -71,46 +104,46 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
-    <widget class="QComboBox" name="fontsizeCO" />
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="fontsSansLA" >
+   <item row="3" column="2" >
+    <widget class="QLabel" name="scaleSansLA" >
      <property name="text" >
-      <string>&amp;Sans Serif:</string>
+      <string>S&amp;cale (%):</string>
      </property>
      <property name="buddy" >
-      <cstring>fontsSansCO</cstring>
+      <cstring>scaleSansSB</cstring>
      </property>
     </widget>
    </item>
+   <item row="3" column="1" >
+    <widget class="QComboBox" name="fontsSansCO" />
+   </item>
    <item row="3" column="0" >
-    <widget class="QLabel" name="fontsTypewriterLA" >
+    <widget class="QLabel" name="fontsSansLA" >
      <property name="text" >
-      <string>&amp;Typewriter:</string>
+      <string>&amp;Sans Serif:</string>
      </property>
      <property name="buddy" >
-      <cstring>fontsTypewriterCO</cstring>
+      <cstring>fontsSansCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="fontsDefaultLA" >
-     <property name="text" >
-      <string>&amp;Default Family:</string>
+   <item row="1" column="1" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="buddy" >
-      <cstring>fontsDefaultCO</cstring>
+     <property name="sizeHint" >
+      <size>
+       <width>182</width>
+       <height>16</height>
+      </size>
      </property>
-    </widget>
+    </spacer>
    </item>
-   <item row="4" column="0" >
-    <widget class="QLabel" name="fontsRomanLA" >
+   <item row="6" column="1" >
+    <widget class="QCheckBox" name="fontOsfCB" >
      <property name="text" >
-      <string>&amp;Roman:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>fontsRomanCO</cstring>
+      <string>Use &amp;Old Style Figures</string>
      </property>
     </widget>
    </item>
@@ -121,59 +154,35 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="1" >
-    <widget class="QCheckBox" name="fontOsfCB" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="fontsDefaultLA" >
      <property name="text" >
-      <string>Use &amp;Old Style Figures</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="3" >
-    <widget class="QSpinBox" name="scaleTypewriterSB" >
-     <property name="maximum" >
-      <number>200</number>
+      <string>&amp;Default Family:</string>
      </property>
-     <property name="minimum" >
-      <number>10</number>
+     <property name="buddy" >
+      <cstring>fontsDefaultCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
-    <widget class="QComboBox" name="fontsTypewriterCO" />
+   <item row="0" column="3" >
+    <widget class="QComboBox" name="fontsizeCO" />
    </item>
-   <item row="1" column="1" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+   <item row="0" column="2" >
+    <widget class="QLabel" name="TextLabel2_2" >
+     <property name="text" >
+      <string>&amp;Base Size:</string>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>182</width>
-       <height>16</height>
-      </size>
+     <property name="buddy" >
+      <cstring>fontsizeCO</cstring>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="7" column="0" colspan="4" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>391</width>
-       <height>21</height>
-      </size>
-     </property>
-    </spacer>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="fontsDefaultCO" />
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
  <tabstops>
   <tabstop>fontsDefaultCO</tabstop>
   <tabstop>fontsizeCO</tabstop>