The Grand Font Selection Redesign:
* lib/lyx2lyx/LyX.py (format_relation): add file format 247 (from Georg BAUM).
* lib/lyx2lyx/lyx_1_5.py: add convert_font_settings, revert_font_settings (from Georg BAUM).
* lib/chkconfig.ltx: Test for newly supported font packages
* lib/doc/LaTeXConfig.lyx.in: document newly supported font packages
* lib/doc/UserGuide.lyx: document new UI.
* lib/doc/Extended.lyx: update PostScript font documentation
* development/FORMAT: document file format change 246->247.
* src/tex-strings.[Ch]: new strings tex_fonts_roman, tex_fonts_sans,
tex_fonts_monospaced (with GUI equivalents).
* src/buffer.C: Format up to 247.
* src/bufferparams.C:
new params fontsRoman, fontsSans, fontsTypewriter, fontsDefaultFamily,
fontsSC, fontsOSF, fontsSansScale and fontsTypewriterScale
(LyXFont const BufferParams::getFont): consider switch of default family.
(string const BufferParams::loadFonts): new method to get all the LaTeX
font stuff done.
* src/paragraph.C
(LyXFont const Paragraph::getFont):
(LyXFont const Paragraph::getLabelFont):
(LyXFont const Paragraph::getLayoutFont): user buffer's not textclass's
default font
* src/text.C
(int LyXText::leftMargin):
(int LyXText::rightMargin): user buffer's not textclass's default font
* src/text2.C
(LyXFont LyXText::getFont):
(LyXFont LyXText::getLayoutFont):
(LyXFont LyXText::getLabelFont): check if the family of the default document
font has been customized.
* src/frontends/gtk/GDocument.[Ch]: implement new font ui (from Georg BAUM).
* src/frontends/gtk/glade/document.glade: implement new font ui (from Georg BAUM).
* src/frontends/qt3/Makefile.dialogs: add new FontModuleBase
* src/frontends/qt3/ui/FontModuleBase.ui: new File
* src/frontends/qt3/ui/TextLayoutModuleBase.ui: remove font widgets
* src/frontends/qt3/QDocument.C
* src/frontends/qt3/QDocumentDialog.[Ch]: implement new font ui
* src/frontends/qt4/Makefile.dialogs: add new FontUi
* src/frontends/qt4/QDocumentDialog.[Ch]: implement new font ui
* src/frontends/qt4/ui/FontUi.ui: new File
* src/frontends/qt4/ui/TextLayoutUi.ui: remove font widgets
* src/frontends/qt4/ui/compile_uic.sh: add new FontUi
* src/frontends/xforms/FormDocument.[Ch]: implement new font ui
* src/frontends/xforms/forms/form_document.fd: add new font tab.
* src/frontends/controllers/ControlDocument.[Ch]
(char ControlDocument::fontfamilies):
(char ControlDocument::fontfamilies_gui):
(bool ControlDocument::isFontAvailable):
(bool ControlDocument::providesSC):
(bool ControlDocument::providesOSF):
(bool ControlDocument::providesScale): new methods, providing font info.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14143 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 08:10:17 +00:00
|
|
|
<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>
|
|
|
|
|
</rect>
|
|
|
|
|
</property>
|
|
|
|
|
<property name="windowTitle" >
|
|
|
|
|
<string>FontUi</string>
|
|
|
|
|
</property>
|
|
|
|
|
<layout class="QGridLayout" >
|
|
|
|
|
<property name="margin" >
|
|
|
|
|
<number>9</number>
|
|
|
|
|
</property>
|
|
|
|
|
<property name="spacing" >
|
|
|
|
|
<number>6</number>
|
|
|
|
|
</property>
|
|
|
|
|
<item row="3" column="0" >
|
|
|
|
|
<spacer>
|
|
|
|
|
<property name="orientation" >
|
|
|
|
|
<enum>Qt::Vertical</enum>
|
|
|
|
|
</property>
|
|
|
|
|
<property name="sizeType" >
|
|
|
|
|
<enum>QSizePolicy::Expanding</enum>
|
|
|
|
|
</property>
|
|
|
|
|
<property name="sizeHint" >
|
|
|
|
|
<size>
|
|
|
|
|
<width>326</width>
|
|
|
|
|
<height>16</height>
|
|
|
|
|
</size>
|
|
|
|
|
</property>
|
|
|
|
|
</spacer>
|
|
|
|
|
</item>
|
|
|
|
|
<item row="2" column="0" >
|
|
|
|
|
<widget class="QGroupBox" name="fontAdvancedGB" >
|
|
|
|
|
<property name="title" >
|
|
|
|
|
<string>Advanced Options</string>
|
|
|
|
|
</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&mall Caps</string>
|
|
|
|
|
</property>
|
|
|
|
|
</widget>
|
|
|
|
|
</item>
|
|
|
|
|
<item row="1" column="0" >
|
|
|
|
|
<widget class="QCheckBox" name="fontOsfCB" >
|
|
|
|
|
<property name="text" >
|
|
|
|
|
<string>Use &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>
|
|
|
|
|
</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>&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&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&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>
|
|
|
|
|
</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>&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>&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>&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>&Roman:</string>
|
|
|
|
|
</property>
|
|
|
|
|
<property name="buddy" >
|
|
|
|
|
<cstring>fontsRomanCO</cstring>
|
|
|
|
|
</property>
|
|
|
|
|
</widget>
|
|
|
|
|
</item>
|
|
|
|
|
</layout>
|
|
|
|
|
</widget>
|
|
|
|
|
</item>
|
|
|
|
|
</layout>
|
|
|
|
|
</widget>
|
|
|
|
|
<layoutdefault spacing="6" margin="11" />
|
2006-08-24 19:37:40 +00:00
|
|
|
<pixmapfunction></pixmapfunction>
|
2006-11-07 17:56:32 +00:00
|
|
|
<includes>
|
|
|
|
|
<include location="local" >qt_helpers.h</include>
|
|
|
|
|
</includes>
|
The Grand Font Selection Redesign:
* lib/lyx2lyx/LyX.py (format_relation): add file format 247 (from Georg BAUM).
* lib/lyx2lyx/lyx_1_5.py: add convert_font_settings, revert_font_settings (from Georg BAUM).
* lib/chkconfig.ltx: Test for newly supported font packages
* lib/doc/LaTeXConfig.lyx.in: document newly supported font packages
* lib/doc/UserGuide.lyx: document new UI.
* lib/doc/Extended.lyx: update PostScript font documentation
* development/FORMAT: document file format change 246->247.
* src/tex-strings.[Ch]: new strings tex_fonts_roman, tex_fonts_sans,
tex_fonts_monospaced (with GUI equivalents).
* src/buffer.C: Format up to 247.
* src/bufferparams.C:
new params fontsRoman, fontsSans, fontsTypewriter, fontsDefaultFamily,
fontsSC, fontsOSF, fontsSansScale and fontsTypewriterScale
(LyXFont const BufferParams::getFont): consider switch of default family.
(string const BufferParams::loadFonts): new method to get all the LaTeX
font stuff done.
* src/paragraph.C
(LyXFont const Paragraph::getFont):
(LyXFont const Paragraph::getLabelFont):
(LyXFont const Paragraph::getLayoutFont): user buffer's not textclass's
default font
* src/text.C
(int LyXText::leftMargin):
(int LyXText::rightMargin): user buffer's not textclass's default font
* src/text2.C
(LyXFont LyXText::getFont):
(LyXFont LyXText::getLayoutFont):
(LyXFont LyXText::getLabelFont): check if the family of the default document
font has been customized.
* src/frontends/gtk/GDocument.[Ch]: implement new font ui (from Georg BAUM).
* src/frontends/gtk/glade/document.glade: implement new font ui (from Georg BAUM).
* src/frontends/qt3/Makefile.dialogs: add new FontModuleBase
* src/frontends/qt3/ui/FontModuleBase.ui: new File
* src/frontends/qt3/ui/TextLayoutModuleBase.ui: remove font widgets
* src/frontends/qt3/QDocument.C
* src/frontends/qt3/QDocumentDialog.[Ch]: implement new font ui
* src/frontends/qt4/Makefile.dialogs: add new FontUi
* src/frontends/qt4/QDocumentDialog.[Ch]: implement new font ui
* src/frontends/qt4/ui/FontUi.ui: new File
* src/frontends/qt4/ui/TextLayoutUi.ui: remove font widgets
* src/frontends/qt4/ui/compile_uic.sh: add new FontUi
* src/frontends/xforms/FormDocument.[Ch]: implement new font ui
* src/frontends/xforms/forms/form_document.fd: add new font tab.
* src/frontends/controllers/ControlDocument.[Ch]
(char ControlDocument::fontfamilies):
(char ControlDocument::fontfamilies_gui):
(bool ControlDocument::isFontAvailable):
(bool ControlDocument::providesSC):
(bool ControlDocument::providesOSF):
(bool ControlDocument::providesScale): new methods, providing font info.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14143 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 08:10:17 +00:00
|
|
|
<tabstops>
|
|
|
|
|
<tabstop>fontsRomanCO</tabstop>
|
|
|
|
|
<tabstop>fontsizeCO</tabstop>
|
|
|
|
|
</tabstops>
|
|
|
|
|
<resources/>
|
|
|
|
|
<connections/>
|
|
|
|
|
</ui>
|
