* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / ui / FontUi.ui

diff --git a/src/frontends/qt4/ui/FontUi.ui b/src/frontends/qt4/ui/FontUi.ui
index 20d12b553e56579839d20358107573a71e247736..da45733d7fbfc7bf32862923f29a87072ebc2d71 100644 (file)
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>414</width>
-    <height>268</height>
+    <width>543</width>
+    <height>341</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -19,80 +19,51 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="8" 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>16</height>
-      </size>
-     </property>
-    </spacer>
+   <item row="1" column="2" >
+    <widget class="QComboBox" name="fontencCO" />
    </item>
-   <item row="5" column="0" >
-    <widget class="QLabel" name="cjkFontLA" >
+   <item row="1" column="0" colspan="2" >
+    <widget class="QLabel" name="fontencLA" >
      <property name="text" >
-      <string>C&amp;JK:</string>
+      <string>LaTe&amp;X font encoding:</string>
      </property>
      <property name="buddy" >
-      <cstring>cjkFontLE</cstring>
+      <cstring>fontencCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" >
-    <widget class="QLineEdit" name="cjkFontLE" >
+   <item row="1" column="3" colspan="2" >
+    <widget class="QLineEdit" name="fontencLE" >
      <property name="toolTip" >
-      <string>Input the font to be used for Chinese, Japanese or Korean (CJK) script</string>
+      <string>Specify the font encoding (e.g., T1).</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="2" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>151</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="7" column="1" >
-    <widget class="QCheckBox" name="fontOsfCB" >
-     <property name="toolTip" >
-      <string>Use old style instead of lining figures</string>
-     </property>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="fontsDefaultLA" >
      <property name="text" >
-      <string>Use &amp;Old Style Figures</string>
+      <string>&amp;Default Family:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontsDefaultCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="6" column="1" >
-    <widget class="QCheckBox" name="fontScCB" >
+   <item row="0" column="1" colspan="2" >
+    <widget class="QComboBox" name="fontsDefaultCO" >
      <property name="toolTip" >
-      <string>Use a real small caps shape, if the font provides one</string>
-     </property>
-     <property name="text" >
-      <string>Use true S&amp;mall Caps</string>
+      <string>Select the default family for the document</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
-    <widget class="QComboBox" name="fontsDefaultCO" >
+   <item row="0" column="4" >
+    <widget class="QComboBox" name="fontsizeCO" >
      <property name="toolTip" >
-      <string>Select the default family for the document</string>
+      <string/>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
+   <item row="0" column="3" >
     <widget class="QLabel" name="TextLabel2_2" >
      <property name="text" >
       <string>&amp;Base Size:</string>
@@ -102,37 +73,66 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
-    <widget class="QComboBox" name="fontsizeCO" >
-     <property name="toolTip" >
-      <string/>
+   <item row="9" column="0" colspan="5" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
-    </widget>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>525</width>
+       <height>41</height>
+      </size>
+     </property>
+    </spacer>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="fontsDefaultLA" >
+   <item row="2" column="1" colspan="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>182</width>
+       <height>16</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="fontsRomanLA" >
      <property name="text" >
-      <string>&amp;Default Family:</string>
+      <string>&amp;Roman:</string>
      </property>
      <property name="buddy" >
-      <cstring>fontsDefaultCO</cstring>
+      <cstring>fontsRomanCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2" >
+    <widget class="QComboBox" name="fontsRomanCO" >
+     <property name="toolTip" >
+      <string>Select the roman (serif) typeface</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
+   <item row="3" column="3" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>182</width>
-       <height>16</height>
+       <width>131</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" >
+   <item row="4" column="0" >
     <widget class="QLabel" name="fontsSansLA" >
      <property name="text" >
       <string>&amp;Sans Serif:</string>
@@ -142,14 +142,14 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1" >
+   <item row="4" column="1" colspan="2" >
     <widget class="QComboBox" name="fontsSansCO" >
      <property name="toolTip" >
       <string>Select the Sans Serif (grotesque) typeface</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
+   <item row="4" column="3" >
     <widget class="QLabel" name="scaleSansLA" >
      <property name="text" >
       <string>S&amp;cale (%):</string>
@@ -159,7 +159,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="3" >
+   <item row="4" column="4" >
     <widget class="QSpinBox" name="scaleSansSB" >
      <property name="toolTip" >
       <string>Scale the Sans Serif font to match the base font's dimensions</string>
@@ -172,24 +172,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="fontsRomanLA" >
-     <property name="text" >
-      <string>&amp;Roman:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>fontsRomanCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QComboBox" name="fontsRomanCO" >
-     <property name="toolTip" >
-      <string>Select the roman (serif) typeface</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" >
+   <item row="5" column="0" >
     <widget class="QLabel" name="fontsTypewriterLA" >
      <property name="text" >
       <string>&amp;Typewriter:</string>
@@ -199,14 +182,14 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="1" >
+   <item row="5" column="1" colspan="2" >
     <widget class="QComboBox" name="fontsTypewriterCO" >
      <property name="toolTip" >
       <string>Select the typewriter (monospaced) typeface</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="2" >
+   <item row="5" column="3" >
     <widget class="QLabel" name="scaleTypewriterLA" >
      <property name="text" >
       <string>Sc&amp;ale (%):</string>
@@ -216,7 +199,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3" >
+   <item row="5" column="4" >
     <widget class="QSpinBox" name="scaleTypewriterSB" >
      <property name="toolTip" >
       <string>Scale the Typewriter font to match the base font's dimensions</string>
@@ -229,19 +212,56 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="2" colspan="2" >
+   <item row="6" column="0" >
+    <widget class="QLabel" name="cjkFontLA" >
+     <property name="text" >
+      <string>C&amp;JK:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>cjkFontLE</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1" colspan="2" >
+    <widget class="QLineEdit" name="cjkFontLE" >
+     <property name="toolTip" >
+      <string>Input the font to be used for Chinese, Japanese or Korean (CJK) script</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" >
       <size>
-       <width>131</width>
+       <width>151</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
+   <item row="7" column="1" colspan="2" >
+    <widget class="QCheckBox" name="fontScCB" >
+     <property name="toolTip" >
+      <string>Use a real small caps shape, if the font provides one</string>
+     </property>
+     <property name="text" >
+      <string>Use true S&amp;mall Caps</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="1" colspan="2" >
+    <widget class="QCheckBox" name="fontOsfCB" >
+     <property name="toolTip" >
+      <string>Use old style instead of lining figures</string>
+     </property>
+     <property name="text" >
+      <string>Use &amp;Old Style Figures</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />