Embedding: add embedCB checkboxes to IncludeUi and ExternalUi

[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 9c8f8388da74a6ea6ba6a970a63897d3c41ef22b..7f072a195a22386ada6838af3f362321d74d4258 100644 (file)
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@@ -1,15 +1,12 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>FontUi</class>
  <widget class="QWidget" name="FontUi" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>344</width>
-    <height>394</height>
+    <width>409</width>
+    <height>232</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,7 +19,7 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="3" column="0" >
+   <item row="7" column="0" colspan="4" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -32,232 +29,174 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>326</width>
-       <height>16</height>
+       <width>391</width>
+       <height>21</height>
       </size>
      </property>
     </spacer>
    </item>
+   <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="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="4" column="2" >
+    <widget class="QLabel" name="scaleTypewriterLA" >
+     <property name="text" >
+      <string>Sc&amp;ale (%):</string>
+     </property>
+     <property name="buddy" >
+      <cstring>scaleTypewriterSB</cstring>
+     </property>
+    </widget>
+   </item>
+   <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>&amp;Typewriter:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontsTypewriterCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <widget class="QComboBox" name="fontsRomanCO" />
+   </item>
    <item row="2" column="0" >
-    <widget class="QGroupBox" name="fontAdvancedGB" >
-     <property name="title" >
-      <string>Advanced Options</string>
+    <widget class="QLabel" name="fontsRomanLA" >
+     <property name="text" >
+      <string>&amp;Roman:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontsRomanCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3" >
+    <widget class="QSpinBox" name="scaleSansSB" >
+     <property name="maximum" >
+      <number>200</number>
+     </property>
+     <property name="minimum" >
+      <number>10</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2" >
+    <widget class="QLabel" name="scaleSansLA" >
+     <property name="text" >
+      <string>S&amp;cale (%):</string>
+     </property>
+     <property name="buddy" >
+      <cstring>scaleSansSB</cstring>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="fontScCB" >
-        <property name="text" >
-         <string>Use true S&amp;mall Caps</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="fontOsfCB" >
-        <property name="text" >
-         <string>Use &amp;Old Style Figures</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="fontSizesGB" >
-     <property name="title" >
-      <string>Sizes</string>
+   <item row="3" column="1" >
+    <widget class="QComboBox" name="fontsSansCO" />
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="fontsSansLA" >
+     <property name="text" >
+      <string>&amp;Sans Serif:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontsSansCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <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="6" column="1" >
+    <widget class="QCheckBox" name="fontOsfCB" >
+     <property name="text" >
+      <string>Use &amp;Old Style Figures</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1" >
+    <widget class="QCheckBox" name="fontScCB" >
+     <property name="text" >
+      <string>Use true S&amp;mall Caps</string>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QComboBox" name="fontsizeCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel2_2" >
-        <property name="text" >
-         <string>&amp;Base Size:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>fontsizeCO</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="2" >
-       <widget class="QLabel" name="scaleTypewriterLA" >
-        <property name="text" >
-         <string>Sc&amp;ale Typewriter %:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>scaleTypewriterSB</cstring>
-        </property>
-       </widget>
-      </item>
-      <item rowspan="2" row="2" column="2" >
-       <widget class="QSpinBox" name="scaleTypewriterSB" >
-        <property name="maximum" >
-         <number>200</number>
-        </property>
-        <property name="minimum" >
-         <number>10</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QSpinBox" name="scaleSansSB" >
-        <property name="maximum" >
-         <number>200</number>
-        </property>
-        <property name="minimum" >
-         <number>10</number>
-        </property>
-       </widget>
-      </item>
-      <item rowspan="2" row="1" column="0" colspan="2" >
-       <widget class="QLabel" name="scaleSansLA" >
-        <property name="text" >
-         <string>S&amp;cale Sans Serif %:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>scaleSansSB</cstring>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
    <item row="0" column="0" >
-    <widget class="QGroupBox" name="fontsGB" >
-     <property name="title" >
-      <string>Families</string>
+    <widget class="QLabel" name="fontsDefaultLA" >
+     <property name="text" >
+      <string>&amp;Default Family:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontsDefaultCO</cstring>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="1" >
-       <widget class="QComboBox" name="fontsRomanCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QComboBox" name="fontsSansCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" >
-       <widget class="QComboBox" name="fontsDefaultCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QComboBox" name="fontsTypewriterCO" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>5</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="3" 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="2" column="0" >
-       <widget class="QLabel" name="fontsTypewriterLA" >
-        <property name="text" >
-         <string>&amp;Typewriter:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>fontsRomanCO</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="fontsSansLA" >
-        <property name="text" >
-         <string>&amp;Sans Serif:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>fontsRomanCO</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="fontsRomanLA" >
-        <property name="text" >
-         <string>&amp;Roman:</string>
-        </property>
-        <property name="buddy" >
-         <cstring>fontsRomanCO</cstring>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
+   <item row="0" column="3" >
+    <widget class="QComboBox" name="fontsizeCO" />
+   </item>
+   <item row="0" column="2" >
+    <widget class="QLabel" name="TextLabel2_2" >
+     <property name="text" >
+      <string>&amp;Base Size:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>fontsizeCO</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QComboBox" name="fontsDefaultCO" />
+   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <includes>
-  <include location="local" >qt_helpers.h</include>
- </includes>
  <tabstops>
-  <tabstop>fontsRomanCO</tabstop>
+  <tabstop>fontsDefaultCO</tabstop>
   <tabstop>fontsizeCO</tabstop>
+  <tabstop>fontsSansCO</tabstop>
+  <tabstop>scaleSansSB</tabstop>
+  <tabstop>fontsTypewriterCO</tabstop>
+  <tabstop>scaleTypewriterSB</tabstop>
+  <tabstop>fontsRomanCO</tabstop>
+  <tabstop>fontScCB</tabstop>
+  <tabstop>fontOsfCB</tabstop>
  </tabstops>
+ <includes>
+  <include location="local" >qt_helpers.h</include>
+ </includes>
  <resources/>
  <connections/>
 </ui>