mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 22:40:26 +00:00
clean up the clean up of the font panel in document dialog (roman family combo has to come first, not last).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16215 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
aff98b305c
commit
a2dd2953fa
@ -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,138 +19,6 @@
|
||||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="1" >
|
||||
<widget class="QComboBox" name="fontsDefaultCO" />
|
||||
</item>
|
||||
<item row="4" column="1" >
|
||||
<widget class="QComboBox" name="fontsRomanCO" />
|
||||
</item>
|
||||
<item row="2" column="1" >
|
||||
<widget class="QComboBox" name="fontsSansCO" />
|
||||
</item>
|
||||
<item row="3" column="2" >
|
||||
<widget class="QLabel" name="scaleTypewriterLA" >
|
||||
<property name="text" >
|
||||
<string>Sc&ale (%):</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>scaleTypewriterSB</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2" >
|
||||
<widget class="QLabel" name="scaleSansLA" >
|
||||
<property name="text" >
|
||||
<string>S&cale (%):</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>scaleSansSB</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2" >
|
||||
<widget class="QLabel" name="TextLabel2_2" >
|
||||
<property name="text" >
|
||||
<string>&Base Size:</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>fontsizeCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" 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="0" column="3" >
|
||||
<widget class="QComboBox" name="fontsizeCO" />
|
||||
</item>
|
||||
<item row="2" column="0" >
|
||||
<widget class="QLabel" name="fontsSansLA" >
|
||||
<property name="text" >
|
||||
<string>&Sans Serif:</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>fontsSansCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" >
|
||||
<widget class="QLabel" name="fontsTypewriterLA" >
|
||||
<property name="text" >
|
||||
<string>&Typewriter:</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>fontsTypewriterCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="fontsDefaultLA" >
|
||||
<property name="text" >
|
||||
<string>&Default Family:</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>fontsDefaultCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" >
|
||||
<widget class="QLabel" name="fontsRomanLA" >
|
||||
<property name="text" >
|
||||
<string>&Roman:</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>fontsRomanCO</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1" >
|
||||
<widget class="QCheckBox" name="fontScCB" >
|
||||
<property name="text" >
|
||||
<string>Use true S&mall Caps</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1" >
|
||||
<widget class="QCheckBox" name="fontOsfCB" >
|
||||
<property name="text" >
|
||||
<string>Use &Old Style Figures</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" 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="1" >
|
||||
<widget class="QComboBox" name="fontsTypewriterCO" />
|
||||
</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="7" column="0" colspan="4" >
|
||||
<spacer>
|
||||
<property name="orientation" >
|
||||
@ -170,10 +35,154 @@
|
||||
</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&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>&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="QLabel" name="fontsRomanLA" >
|
||||
<property name="text" >
|
||||
<string>&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&cale (%):</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<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="fontsSansLA" >
|
||||
<property name="text" >
|
||||
<string>&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 &Old Style Figures</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1" >
|
||||
<widget class="QCheckBox" name="fontScCB" >
|
||||
<property name="text" >
|
||||
<string>Use true S&mall Caps</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="fontsDefaultLA" >
|
||||
<property name="text" >
|
||||
<string>&Default Family:</string>
|
||||
</property>
|
||||
<property name="buddy" >
|
||||
<cstring>fontsDefaultCO</cstring>
|
||||
</property>
|
||||
</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>&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>
|
||||
<tabstops>
|
||||
<tabstop>fontsDefaultCO</tabstop>
|
||||
<tabstop>fontsizeCO</tabstop>
|
||||
|
Loading…
Reference in New Issue
Block a user