2006-03-05 17:24:44 +00:00
|
|
|
/**
|
|
|
|
* \file QDocumentDialog.C
|
|
|
|
* This file is part of LyX, the document processor.
|
|
|
|
* Licence details can be found in the file COPYING.
|
|
|
|
*
|
|
|
|
* \author Edwin Leuven
|
|
|
|
* \author Abdelrazak Younes
|
|
|
|
*
|
|
|
|
* Full author contact details are available in file CREDITS.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
|
|
#include "QDocument.h"
|
|
|
|
#include "QDocumentDialog.h"
|
|
|
|
|
|
|
|
#include <QCloseEvent>
|
|
|
|
|
|
|
|
#include "floatplacement.h"
|
|
|
|
#include "lengthcombo.h"
|
|
|
|
#include "validators.h"
|
|
|
|
#include "panelstack.h"
|
|
|
|
#include "Qt2BC.h"
|
|
|
|
#include "checkedwidgets.h"
|
|
|
|
#include "qt_helpers.h"
|
|
|
|
|
|
|
|
#include "bufferparams.h"
|
|
|
|
#include "gettext.h"
|
|
|
|
#include "helper_funcs.h" // getSecond()
|
|
|
|
#include "language.h"
|
|
|
|
#include "lyxrc.h" // defaultUnit
|
|
|
|
#include "lyxtextclasslist.h"
|
|
|
|
#include "tex-strings.h" // tex_graphics
|
|
|
|
#include "Spacing.h"
|
|
|
|
|
|
|
|
#include "controllers/ControlDocument.h"
|
|
|
|
#include "controllers/frnt_lang.h"
|
|
|
|
|
|
|
|
#include "support/lstrings.h"
|
|
|
|
|
|
|
|
#include "controllers/ControlDocument.h"
|
|
|
|
#include "controllers/frnt_lang.h"
|
|
|
|
|
|
|
|
|
|
|
|
using lyx::support::token;
|
|
|
|
using lyx::support::bformat;
|
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
|
|
|
using lyx::support::findToken;
|
2006-03-05 17:24:44 +00:00
|
|
|
using lyx::support::getVectorFromString;
|
|
|
|
|
|
|
|
using std::distance;
|
|
|
|
using std::vector;
|
|
|
|
using std::string;
|
|
|
|
|
|
|
|
|
|
|
|
namespace lyx {
|
|
|
|
namespace frontend {
|
|
|
|
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
char const * encodings[] = { "LaTeX default", "latin1", "latin2",
|
|
|
|
"latin3", "latin4", "latin5", "latin9",
|
|
|
|
"koi8-r", "koi8-u", "cp866", "cp1251",
|
|
|
|
"iso88595", "pt154", 0
|
|
|
|
};
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
QDocumentDialog::QDocumentDialog(QDocument * form)
|
2006-04-05 23:56:29 +00:00
|
|
|
: form_(form),
|
2006-03-05 17:24:44 +00:00
|
|
|
lang_(getSecond(getLanguageData(false)))
|
|
|
|
{
|
|
|
|
setupUi(this);
|
|
|
|
|
|
|
|
connect(okPB, SIGNAL(clicked()),
|
|
|
|
form, SLOT(slotOK()));
|
|
|
|
connect(applyPB, SIGNAL(clicked()),
|
|
|
|
form, SLOT(slotApply()));
|
|
|
|
connect(closePB, SIGNAL(clicked()),
|
|
|
|
form, SLOT(slotClose()));
|
|
|
|
connect(restorePB, SIGNAL(clicked()),
|
|
|
|
form, SLOT(slotRestore()));
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
|
2006-05-04 07:31:46 +00:00
|
|
|
connect(savePB, SIGNAL( clicked() ),
|
|
|
|
this, SLOT( saveDefaultClicked() ) );
|
|
|
|
connect(defaultPB, SIGNAL( clicked() ),
|
|
|
|
this, SLOT( useDefaultsClicked() ) );
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// Manage the restore, ok, apply, restore and cancel/close buttons
|
|
|
|
form_->bcview().setOK(okPB);
|
|
|
|
form_->bcview().setApply(applyPB);
|
|
|
|
form_->bcview().setCancel(closePB);
|
|
|
|
form_->bcview().setRestore(restorePB);
|
|
|
|
|
|
|
|
|
|
|
|
textLayoutModule = new UiWidget<Ui::TextLayoutUi>;
|
|
|
|
// text layout
|
|
|
|
connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)), this, SLOT(setLSpacing(int)));
|
|
|
|
connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->skipLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->skipLengthCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(textLayoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(setSkip(int)));
|
|
|
|
connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(enableSkip(bool)));
|
|
|
|
connect(textLayoutModule->twoColumnCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
|
|
|
|
textLayoutModule->lspacingLE));
|
|
|
|
textLayoutModule->skipLE->setValidator(unsignedLengthValidator(
|
|
|
|
textLayoutModule->skipLE));
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
textLayoutModule->skipCO->addItem(qt_("SmallSkip"));
|
|
|
|
textLayoutModule->skipCO->addItem(qt_("MedSkip"));
|
|
|
|
textLayoutModule->skipCO->addItem(qt_("BigSkip"));
|
|
|
|
textLayoutModule->skipCO->addItem(qt_("Length"));
|
2006-03-05 17:24:44 +00:00
|
|
|
// remove the %-items from the unit choice
|
|
|
|
textLayoutModule->skipLengthCO->noPercents();
|
|
|
|
textLayoutModule->lspacingCO->insertItem(
|
2006-08-17 08:53:44 +00:00
|
|
|
Spacing::Single, qt_("Single"));
|
2006-03-05 17:24:44 +00:00
|
|
|
textLayoutModule->lspacingCO->insertItem(
|
2006-08-17 08:53:44 +00:00
|
|
|
Spacing::Onehalf, qt_("OneHalf"));
|
2006-03-05 17:24:44 +00:00
|
|
|
textLayoutModule->lspacingCO->insertItem(
|
2006-08-17 08:53:44 +00:00
|
|
|
Spacing::Double, qt_("Double"));
|
2006-03-05 17:24:44 +00:00
|
|
|
textLayoutModule->lspacingCO->insertItem(
|
2006-08-17 08:53:44 +00:00
|
|
|
Spacing::Other, qt_("Custom"));
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
// initialize the length validator
|
|
|
|
addCheckedLineEdit(form_->bcview(), textLayoutModule->skipLE);
|
|
|
|
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
|
|
|
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
|
|
|
fontModule = new UiWidget<Ui::FontUi>;
|
|
|
|
// fonts
|
|
|
|
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)), this, SLOT(romanChanged(int)));
|
|
|
|
connect(fontModule->fontsSansCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->fontsSansCO, SIGNAL(activated(int)), this, SLOT(sansChanged(int)));
|
|
|
|
connect(fontModule->fontsTypewriterCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->fontsTypewriterCO, SIGNAL(activated(int)), this, SLOT(ttChanged(int)));
|
|
|
|
connect(fontModule->fontsDefaultCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->fontsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->scaleSansSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->scaleTypewriterSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->fontScCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(fontModule->fontOsfCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
|
|
|
|
for (int n = 0; tex_fonts_roman[n][0]; ++n) {
|
|
|
|
QString font = toqstr(tex_fonts_roman_gui[n]);
|
|
|
|
if (!form_->controller().isFontAvailable(tex_fonts_roman[n]))
|
|
|
|
font += qt_(" (not installed)");
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsRomanCO->addItem(font);
|
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
|
|
|
}
|
|
|
|
for (int n = 0; tex_fonts_sans[n][0]; ++n) {
|
|
|
|
QString font = toqstr(tex_fonts_sans_gui[n]);
|
|
|
|
if (!form_->controller().isFontAvailable(tex_fonts_sans[n]))
|
|
|
|
font += qt_(" (not installed)");
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsSansCO->addItem(font);
|
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
|
|
|
}
|
|
|
|
for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
|
|
|
|
QString font = toqstr(tex_fonts_monospaced_gui[n]);
|
|
|
|
if (!form_->controller().isFontAvailable(tex_fonts_monospaced[n]))
|
|
|
|
font += qt_(" (not installed)");
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsTypewriterCO->addItem(font);
|
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
|
|
|
}
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsizeCO->addItem(qt_("default"));
|
|
|
|
fontModule->fontsizeCO->addItem(qt_("10"));
|
|
|
|
fontModule->fontsizeCO->addItem(qt_("11"));
|
|
|
|
fontModule->fontsizeCO->addItem(qt_("12"));
|
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
|
|
|
|
|
|
|
for (int n = 0; ControlDocument::fontfamilies_gui[n][0]; ++n)
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsDefaultCO->addItem(
|
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
|
|
|
qt_(ControlDocument::fontfamilies_gui[n]));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
|
|
|
|
// page layout
|
|
|
|
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setCustomPapersize(int)));
|
|
|
|
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setCustomPapersize(int)));
|
|
|
|
connect(pageLayoutModule->portraitRB, SIGNAL(toggled(bool)), this, SLOT(portraitChanged()));
|
|
|
|
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->paperheightLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->paperwidthLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->paperwidthUnitCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->paperheightUnitCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->portraitRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->landscapeRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->facingPagesCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
2006-08-17 08:53:44 +00:00
|
|
|
pageLayoutModule->pagestyleCO->addItem(qt_("default"));
|
|
|
|
pageLayoutModule->pagestyleCO->addItem(qt_("empty"));
|
|
|
|
pageLayoutModule->pagestyleCO->addItem(qt_("plain"));
|
|
|
|
pageLayoutModule->pagestyleCO->addItem(qt_("headings"));
|
|
|
|
pageLayoutModule->pagestyleCO->addItem(qt_("fancy"));
|
2006-03-05 17:24:44 +00:00
|
|
|
addCheckedLineEdit(form_->bcview(), pageLayoutModule->paperheightLE,
|
|
|
|
pageLayoutModule->paperheightL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), pageLayoutModule->paperwidthLE,
|
|
|
|
pageLayoutModule->paperwidthL);
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
// paper
|
|
|
|
QComboBox * cb = pageLayoutModule->papersizeCO;
|
2006-08-17 08:53:44 +00:00
|
|
|
cb->addItem(qt_("Default"));
|
|
|
|
cb->addItem(qt_("Custom"));
|
|
|
|
cb->addItem(qt_("US letter"));
|
|
|
|
cb->addItem(qt_("US legal"));
|
|
|
|
cb->addItem(qt_("US executive"));
|
|
|
|
cb->addItem(qt_("A3"));
|
|
|
|
cb->addItem(qt_("A4"));
|
|
|
|
cb->addItem(qt_("A5"));
|
|
|
|
cb->addItem(qt_("B3"));
|
|
|
|
cb->addItem(qt_("B4"));
|
|
|
|
cb->addItem(qt_("B5"));
|
2006-03-05 17:24:44 +00:00
|
|
|
// remove the %-items from the unit choice
|
|
|
|
pageLayoutModule->paperwidthUnitCO->noPercents();
|
|
|
|
pageLayoutModule->paperheightUnitCO->noPercents();
|
|
|
|
pageLayoutModule->paperheightLE->setValidator(unsignedLengthValidator(
|
|
|
|
pageLayoutModule->paperheightLE));
|
|
|
|
pageLayoutModule->paperwidthLE->setValidator(unsignedLengthValidator(
|
|
|
|
pageLayoutModule->paperwidthLE));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
marginsModule = new UiWidget<Ui::MarginsUi>;
|
|
|
|
// margins
|
|
|
|
connect(marginsModule->marginCB, SIGNAL(toggled(bool)), this, SLOT(setCustomMargins(bool)));
|
|
|
|
connect(marginsModule->marginCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->topLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->topUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->bottomUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->innerLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->innerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->outerLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->outerUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->headheightUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->headsepUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
2006-04-05 23:56:29 +00:00
|
|
|
connect(marginsModule->footskipUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
2006-03-05 17:24:44 +00:00
|
|
|
marginsModule->topLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->topLE));
|
|
|
|
marginsModule->bottomLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->bottomLE));
|
|
|
|
marginsModule->innerLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->innerLE));
|
|
|
|
marginsModule->outerLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->outerLE));
|
|
|
|
marginsModule->headsepLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->headsepLE));
|
|
|
|
marginsModule->headheightLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->headheightLE));
|
|
|
|
marginsModule->footskipLE->setValidator(unsignedLengthValidator(
|
|
|
|
marginsModule->footskipLE));
|
|
|
|
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->topLE,
|
|
|
|
marginsModule->topL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->bottomLE,
|
|
|
|
marginsModule->bottomL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->innerLE,
|
|
|
|
marginsModule->innerL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->outerLE,
|
|
|
|
marginsModule->outerL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->headsepLE,
|
|
|
|
marginsModule->headsepL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->headheightLE,
|
|
|
|
marginsModule->headheightL);
|
|
|
|
addCheckedLineEdit(form_->bcview(), marginsModule->footskipLE,
|
|
|
|
marginsModule->footskipL);
|
|
|
|
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
|
|
|
|
langModule = new UiWidget<Ui::LanguageUi>;
|
|
|
|
connect( langModule->defaultencodingCB, SIGNAL( toggled(bool) ), langModule->encodingL, SLOT( setDisabled(bool) ) );
|
|
|
|
connect( langModule->defaultencodingCB, SIGNAL( toggled(bool) ), langModule->encodingCO, SLOT( setDisabled(bool) ) );
|
|
|
|
// language & quote
|
|
|
|
connect(langModule->languageCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(langModule->defaultencodingCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(langModule->encodingCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(langModule->quoteStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
// language & quotes
|
|
|
|
vector<LanguagePair> const langs = getLanguageData(false);
|
|
|
|
vector<LanguagePair>::const_iterator lit = langs.begin();
|
|
|
|
vector<LanguagePair>::const_iterator lend = langs.end();
|
|
|
|
for (; lit != lend; ++lit) {
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->languageCO->addItem(
|
2006-03-05 17:24:44 +00:00
|
|
|
toqstr(lit->first));
|
|
|
|
}
|
|
|
|
|
|
|
|
int k = 0;
|
|
|
|
while (encodings[k]) {
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->encodingCO->addItem(qt_(encodings[k++]));
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->quoteStyleCO->addItem(qt_("``text''"));
|
|
|
|
langModule->quoteStyleCO->addItem(qt_("''text''"));
|
|
|
|
langModule->quoteStyleCO->addItem(qt_(",,text``"));
|
|
|
|
langModule->quoteStyleCO->addItem(qt_(",,text''"));
|
|
|
|
langModule->quoteStyleCO->addItem(qt_("<<text>>"));
|
|
|
|
langModule->quoteStyleCO->addItem(qt_(">>text<<"));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
numberingModule = new UiWidget<Ui::NumberingUi>;
|
|
|
|
// numbering
|
|
|
|
connect(numberingModule->depthSL, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(numberingModule->tocSL, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(numberingModule->depthSL, SIGNAL(valueChanged(int)), this, SLOT(updateNumbering()));
|
|
|
|
connect(numberingModule->tocSL, SIGNAL(valueChanged(int)), this, SLOT(updateNumbering()));
|
2006-05-04 07:31:46 +00:00
|
|
|
numberingModule->tocTW->setColumnCount(3);
|
|
|
|
numberingModule->tocTW->headerItem()->setText(0, qt_("Example"));
|
|
|
|
numberingModule->tocTW->headerItem()->setText(1, qt_("Numbered"));
|
|
|
|
numberingModule->tocTW->headerItem()->setText(2, qt_("Appears in TOC"));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
|
|
|
|
biblioModule = new UiWidget<Ui::BiblioUi>;
|
2006-05-04 07:31:46 +00:00
|
|
|
connect( biblioModule->citeNatbibRB, SIGNAL( toggled(bool) ), biblioModule->citationStyleL, SLOT( setEnabled(bool) ) );
|
|
|
|
connect( biblioModule->citeNatbibRB, SIGNAL( toggled(bool) ), biblioModule->citeStyleCO, SLOT( setEnabled(bool) ) );
|
2006-03-05 17:24:44 +00:00
|
|
|
// biblio
|
|
|
|
connect(biblioModule->citeDefaultRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(biblioModule->citeStyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(biblioModule->citeJurabibRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(biblioModule->bibtopicCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
// biblio
|
2006-08-17 08:53:44 +00:00
|
|
|
biblioModule->citeStyleCO->addItem(qt_("Author-year"));
|
|
|
|
biblioModule->citeStyleCO->addItem(qt_("Numerical"));
|
|
|
|
biblioModule->citeStyleCO->setCurrentIndex(0);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
mathsModule = new UiWidget<Ui::MathsUi>;
|
|
|
|
connect( mathsModule->amsautoCB, SIGNAL( toggled(bool) ), mathsModule->amsCB, SLOT( setDisabled(bool) ) );
|
|
|
|
// maths
|
|
|
|
connect(mathsModule->amsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
connect(mathsModule->amsautoCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor()));
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
latexModule = new UiWidget<Ui::LaTeXUi>;
|
|
|
|
// latex class
|
|
|
|
connect(latexModule->classCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(latexModule->optionsLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
|
|
|
|
connect(latexModule->psdriverCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
|
|
|
|
connect(latexModule->classCO, SIGNAL(activated(int)), this, SLOT(classChanged()));
|
|
|
|
// packages
|
|
|
|
for (int n = 0; tex_graphics[n][0]; ++n) {
|
|
|
|
QString enc = tex_graphics[n];
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->psdriverCO->addItem(enc);
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
// latex
|
|
|
|
for (LyXTextClassList::const_iterator cit = textclasslist.begin();
|
|
|
|
cit != textclasslist.end(); ++cit) {
|
|
|
|
if (cit->isTeXClassAvailable()) {
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->classCO->addItem(toqstr(cit->description()));
|
2006-03-05 17:24:44 +00:00
|
|
|
} else {
|
|
|
|
string item =
|
|
|
|
bformat(_("Unavailable: %1$s"), cit->description());
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->classCO->addItem(toqstr(item));
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
branchesModule = new QBranches;
|
2006-03-20 17:25:02 +00:00
|
|
|
connect(branchesModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// preamble
|
2006-08-13 15:44:05 +00:00
|
|
|
preambleModule = new UiWidget<Ui::PreambleUi>;
|
2006-03-24 16:37:06 +00:00
|
|
|
connect(preambleModule->preambleTE, SIGNAL(textChanged()), this, SLOT(change_adaptor()));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
|
|
|
|
// bullets
|
2006-08-13 15:44:05 +00:00
|
|
|
bulletsModule = new BulletsModule;
|
2006-03-05 17:24:44 +00:00
|
|
|
connect(bulletsModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
|
|
|
|
|
2006-04-05 23:56:29 +00:00
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
// float
|
2006-08-13 15:44:05 +00:00
|
|
|
floatModule = new FloatPlacement;
|
2006-03-05 17:24:44 +00:00
|
|
|
connect(floatModule, SIGNAL(changed()), this, SLOT(change_adaptor()));
|
|
|
|
|
|
|
|
docPS->addPanel(latexModule, _("Document Class"));
|
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
|
|
|
docPS->addPanel(fontModule, _("Fonts"));
|
2006-03-05 17:24:44 +00:00
|
|
|
docPS->addPanel(textLayoutModule, _("Text Layout"));
|
|
|
|
docPS->addPanel(pageLayoutModule, _("Page Layout"));
|
|
|
|
docPS->addPanel(marginsModule, _("Page Margins"));
|
|
|
|
docPS->addPanel(langModule, _("Language"));
|
|
|
|
docPS->addPanel(numberingModule, _("Numbering & TOC"));
|
|
|
|
docPS->addPanel(biblioModule, _("Bibliography"));
|
|
|
|
docPS->addPanel(mathsModule, _("Math Options"));
|
|
|
|
docPS->addPanel(floatModule, _("Float Placement"));
|
|
|
|
docPS->addPanel(bulletsModule, _("Bullets"));
|
|
|
|
docPS->addPanel(branchesModule, _("Branches"));
|
|
|
|
docPS->addPanel(preambleModule, _("LaTeX Preamble"));
|
|
|
|
docPS->setCurrentPanel(_("Document Class"));
|
2006-04-05 23:56:29 +00:00
|
|
|
}
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
|
|
|
|
QDocumentDialog::~QDocumentDialog()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::showPreamble()
|
|
|
|
{
|
|
|
|
docPS->setCurrentPanel(_("LaTeX Preamble"));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::saveDefaultClicked()
|
|
|
|
{
|
|
|
|
form_->saveDocDefault();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::useDefaultsClicked()
|
|
|
|
{
|
|
|
|
form_->useClassDefaults();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::change_adaptor()
|
|
|
|
{
|
|
|
|
form_->changed();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::closeEvent(QCloseEvent * e)
|
|
|
|
{
|
|
|
|
form_->slotWMHide();
|
|
|
|
e->accept();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::setLSpacing(int item)
|
|
|
|
{
|
|
|
|
textLayoutModule->lspacingLE->setEnabled(item == 3);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::setSkip(int item)
|
|
|
|
{
|
|
|
|
bool const enable = (item == 3);
|
|
|
|
textLayoutModule->skipLE->setEnabled(enable);
|
|
|
|
textLayoutModule->skipLengthCO->setEnabled(enable);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::enableSkip(bool skip)
|
|
|
|
{
|
|
|
|
textLayoutModule->skipCO->setEnabled(skip);
|
|
|
|
textLayoutModule->skipLE->setEnabled(skip);
|
|
|
|
textLayoutModule->skipLengthCO->setEnabled(skip);
|
|
|
|
if (skip)
|
2006-08-17 08:53:44 +00:00
|
|
|
setSkip(textLayoutModule->skipCO->currentIndex());
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void QDocumentDialog::portraitChanged()
|
|
|
|
{
|
2006-08-17 08:53:44 +00:00
|
|
|
setMargins(pageLayoutModule->papersizeCO->currentIndex());
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void QDocumentDialog::setMargins(bool custom)
|
|
|
|
{
|
|
|
|
marginsModule->marginCB->setChecked(custom);
|
|
|
|
setCustomMargins(custom);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::setCustomPapersize(int papersize)
|
|
|
|
{
|
|
|
|
bool const custom = (papersize == 1);
|
|
|
|
|
|
|
|
pageLayoutModule->paperwidthL->setEnabled(custom);
|
|
|
|
pageLayoutModule->paperwidthLE->setEnabled(custom);
|
|
|
|
pageLayoutModule->paperwidthUnitCO->setEnabled(custom);
|
|
|
|
pageLayoutModule->paperheightL->setEnabled(custom);
|
|
|
|
pageLayoutModule->paperheightLE->setEnabled(custom);
|
|
|
|
pageLayoutModule->paperheightLE->setFocus();
|
|
|
|
pageLayoutModule->paperheightUnitCO->setEnabled(custom);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::setCustomMargins(bool custom)
|
|
|
|
{
|
|
|
|
marginsModule->topL->setEnabled(!custom);
|
|
|
|
marginsModule->topLE->setEnabled(!custom);
|
|
|
|
marginsModule->topUnit->setEnabled(!custom);
|
|
|
|
|
|
|
|
marginsModule->bottomL->setEnabled(!custom);
|
|
|
|
marginsModule->bottomLE->setEnabled(!custom);
|
|
|
|
marginsModule->bottomUnit->setEnabled(!custom);
|
|
|
|
|
|
|
|
marginsModule->innerL->setEnabled(!custom);
|
|
|
|
marginsModule->innerLE->setEnabled(!custom);
|
|
|
|
marginsModule->innerUnit->setEnabled(!custom);
|
|
|
|
|
|
|
|
marginsModule->outerL->setEnabled(!custom);
|
|
|
|
marginsModule->outerLE->setEnabled(!custom);
|
|
|
|
marginsModule->outerUnit->setEnabled(!custom);
|
|
|
|
|
|
|
|
marginsModule->headheightL->setEnabled(!custom);
|
|
|
|
marginsModule->headheightLE->setEnabled(!custom);
|
|
|
|
marginsModule->headheightUnit->setEnabled(!custom);
|
|
|
|
|
|
|
|
marginsModule->headsepL->setEnabled(!custom);
|
|
|
|
marginsModule->headsepLE->setEnabled(!custom);
|
|
|
|
marginsModule->headsepUnit->setEnabled(!custom);
|
|
|
|
|
|
|
|
marginsModule->footskipL->setEnabled(!custom);
|
|
|
|
marginsModule->footskipLE->setEnabled(!custom);
|
|
|
|
marginsModule->footskipUnit->setEnabled(!custom);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::updateFontsize(string const & items, string const & sel)
|
|
|
|
{
|
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
|
|
|
fontModule->fontsizeCO->clear();
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsizeCO->addItem(qt_("default"));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
for (int n = 0; !token(items,'|',n).empty(); ++n)
|
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
|
|
|
fontModule->fontsizeCO->
|
2006-08-17 08:53:44 +00:00
|
|
|
addItem(toqstr(token(items,'|',n)));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
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
|
|
|
for (int n = 0; n < fontModule->fontsizeCO->count(); ++n) {
|
2006-08-17 08:53:44 +00:00
|
|
|
if (fromqstr(fontModule->fontsizeCO->itemText(n)) == sel) {
|
|
|
|
fontModule->fontsizeCO->setCurrentIndex(n);
|
2006-03-05 17:24:44 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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
|
|
|
void QDocumentDialog::romanChanged(int item)
|
|
|
|
{
|
|
|
|
string const font = tex_fonts_roman[item];
|
|
|
|
|
|
|
|
fontModule->fontScCB->setEnabled(
|
|
|
|
form_->controller().providesSC(font));
|
|
|
|
fontModule->fontOsfCB->setEnabled(
|
|
|
|
form_->controller().providesOSF(font));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::sansChanged(int item)
|
|
|
|
{
|
|
|
|
string const font = tex_fonts_sans[item];
|
|
|
|
|
|
|
|
fontModule->scaleSansSB->setEnabled(
|
|
|
|
form_->controller().providesScale(font));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::ttChanged(int item)
|
|
|
|
{
|
|
|
|
string const font = tex_fonts_monospaced[item];
|
|
|
|
|
|
|
|
fontModule->scaleTypewriterSB->setEnabled(
|
|
|
|
form_->controller().providesScale(font));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
void QDocumentDialog::updatePagestyle(string const & items, string const & sel)
|
|
|
|
{
|
|
|
|
pageLayoutModule->pagestyleCO->clear();
|
2006-08-17 08:53:44 +00:00
|
|
|
pageLayoutModule->pagestyleCO->addItem("default");
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
for (int n=0; !token(items,'|',n).empty(); ++n)
|
|
|
|
pageLayoutModule->pagestyleCO->
|
2006-08-17 08:53:44 +00:00
|
|
|
addItem(toqstr(token(items,'|',n)));
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
for (int n = 0; n<pageLayoutModule->pagestyleCO->count(); ++n) {
|
2006-08-17 08:53:44 +00:00
|
|
|
if (fromqstr(pageLayoutModule->pagestyleCO->itemText(n))==sel) {
|
|
|
|
pageLayoutModule->pagestyleCO->setCurrentIndex(n);
|
2006-03-05 17:24:44 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::classChanged()
|
|
|
|
{
|
|
|
|
ControlDocument & cntrl = form_->controller();
|
|
|
|
BufferParams & params = cntrl.params();
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
lyx::textclass_type const tc = latexModule->classCO->currentIndex();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
if (form_->controller().loadTextclass(tc)) {
|
|
|
|
params.textclass = tc;
|
|
|
|
if (lyxrc.auto_reset_options)
|
|
|
|
params.useClassDefaults();
|
|
|
|
form_->update_contents();
|
|
|
|
} else {
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->classCO->setCurrentIndex(params.textclass);
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::updateNumbering()
|
|
|
|
{
|
|
|
|
LyXTextClass const & tclass =
|
|
|
|
form_->controller().params().getLyXTextClass();
|
|
|
|
|
2006-05-04 07:31:46 +00:00
|
|
|
numberingModule->tocTW->setUpdatesEnabled(false);
|
|
|
|
numberingModule->tocTW->clear();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
int const depth = numberingModule->depthSL->value();
|
|
|
|
int const toc = numberingModule->tocSL->value();
|
|
|
|
QString const no = qt_("No");
|
|
|
|
QString const yes = qt_("Yes");
|
|
|
|
LyXTextClass::const_iterator end = tclass.end();
|
|
|
|
LyXTextClass::const_iterator cit = tclass.begin();
|
2006-05-04 07:31:46 +00:00
|
|
|
QTreeWidgetItem * item = 0;
|
2006-03-05 17:24:44 +00:00
|
|
|
for ( ; cit != end ; ++cit) {
|
|
|
|
int const toclevel = (*cit)->toclevel;
|
|
|
|
if (toclevel != LyXLayout::NOT_IN_TOC) {
|
2006-05-04 07:31:46 +00:00
|
|
|
item = new QTreeWidgetItem(numberingModule->tocTW);
|
|
|
|
item->setText(0, qt_((*cit)->name()));
|
2006-03-05 17:24:44 +00:00
|
|
|
item->setText(1, (toclevel <= depth) ? yes : no);
|
|
|
|
item->setText(2, (toclevel <= toc) ? yes : no);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-05-04 07:31:46 +00:00
|
|
|
numberingModule->tocTW->setUpdatesEnabled(true);
|
|
|
|
numberingModule->tocTW->update();
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void QDocumentDialog::apply(BufferParams & params)
|
|
|
|
{
|
|
|
|
// preamble
|
|
|
|
params.preamble =
|
2006-03-24 16:37:06 +00:00
|
|
|
fromqstr(preambleModule->preambleTE->document()->toPlainText());
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// biblio
|
|
|
|
params.cite_engine = biblio::ENGINE_BASIC;
|
|
|
|
|
|
|
|
if (biblioModule->citeNatbibRB->isChecked()) {
|
|
|
|
bool const use_numerical_citations =
|
2006-08-17 08:53:44 +00:00
|
|
|
biblioModule->citeStyleCO->currentIndex();
|
2006-03-05 17:24:44 +00:00
|
|
|
if (use_numerical_citations)
|
|
|
|
params.cite_engine = biblio::ENGINE_NATBIB_NUMERICAL;
|
|
|
|
else
|
|
|
|
params.cite_engine = biblio::ENGINE_NATBIB_AUTHORYEAR;
|
|
|
|
|
|
|
|
} else if (biblioModule->citeJurabibRB->isChecked())
|
|
|
|
params.cite_engine = biblio::ENGINE_JURABIB;
|
|
|
|
|
|
|
|
params.use_bibtopic =
|
|
|
|
biblioModule->bibtopicCB->isChecked();
|
|
|
|
|
|
|
|
// language & quotes
|
|
|
|
if (langModule->defaultencodingCB->isChecked()) {
|
|
|
|
params.inputenc = "auto";
|
|
|
|
} else {
|
2006-08-17 08:53:44 +00:00
|
|
|
int i = langModule->encodingCO->currentIndex();
|
2006-03-05 17:24:44 +00:00
|
|
|
if (i == 0) {
|
|
|
|
params.inputenc = "default";
|
|
|
|
} else {
|
|
|
|
params.inputenc = encodings[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
InsetQuotes::quote_language lga = InsetQuotes::EnglishQ;
|
2006-08-17 08:53:44 +00:00
|
|
|
switch (langModule->quoteStyleCO->currentIndex()) {
|
2006-03-05 17:24:44 +00:00
|
|
|
case 0:
|
|
|
|
lga = InsetQuotes::EnglishQ;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
lga = InsetQuotes::SwedishQ;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
lga = InsetQuotes::GermanQ;
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
lga = InsetQuotes::PolishQ;
|
|
|
|
break;
|
|
|
|
case 4:
|
|
|
|
lga = InsetQuotes::FrenchQ;
|
|
|
|
break;
|
|
|
|
case 5:
|
|
|
|
lga = InsetQuotes::DanishQ;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
params.quotes_language = lga;
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
int const pos = langModule->languageCO->currentIndex();
|
2006-03-05 17:24:44 +00:00
|
|
|
params.language = languages.getLanguage(lang_[pos]);
|
|
|
|
|
|
|
|
// numbering
|
2006-03-24 16:37:06 +00:00
|
|
|
if (params.getLyXTextClass().hasTocLevels()) {
|
|
|
|
params.tocdepth = numberingModule->tocSL->value();
|
|
|
|
params.secnumdepth = numberingModule->depthSL->value();
|
|
|
|
}
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// bullets
|
|
|
|
params.user_defined_bullet(0) = bulletsModule->getBullet(0);
|
|
|
|
params.user_defined_bullet(1) = bulletsModule->getBullet(1);
|
|
|
|
params.user_defined_bullet(2) = bulletsModule->getBullet(2);
|
|
|
|
params.user_defined_bullet(3) = bulletsModule->getBullet(3);
|
|
|
|
|
|
|
|
// packages
|
|
|
|
params.graphicsDriver =
|
|
|
|
fromqstr(latexModule->psdriverCO->currentText());
|
|
|
|
|
|
|
|
if (mathsModule->amsautoCB->isChecked()) {
|
|
|
|
params.use_amsmath = BufferParams::AMS_AUTO;
|
|
|
|
} else {
|
|
|
|
if (mathsModule->amsCB->isChecked())
|
|
|
|
params.use_amsmath = BufferParams::AMS_ON;
|
|
|
|
else
|
|
|
|
params.use_amsmath = BufferParams::AMS_OFF;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// text layout
|
2006-03-05 17:24:44 +00:00
|
|
|
params.textclass =
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->classCO->currentIndex();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
params.pagestyle =
|
|
|
|
fromqstr(pageLayoutModule->pagestyleCO->currentText());
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
switch (textLayoutModule->lspacingCO->currentIndex()) {
|
2006-03-05 17:24:44 +00:00
|
|
|
case 0:
|
|
|
|
params.spacing().set(Spacing::Single);
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
params.spacing().set(Spacing::Onehalf);
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
params.spacing().set(Spacing::Double);
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
params.spacing().set(Spacing::Other,
|
|
|
|
fromqstr(textLayoutModule->lspacingLE->text()));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (textLayoutModule->twoColumnCB->isChecked())
|
|
|
|
params.columns = 2;
|
|
|
|
else
|
|
|
|
params.columns = 1;
|
|
|
|
|
|
|
|
if (textLayoutModule->indentRB->isChecked())
|
|
|
|
params.paragraph_separation = BufferParams::PARSEP_INDENT;
|
|
|
|
else
|
|
|
|
params.paragraph_separation = BufferParams::PARSEP_SKIP;
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
switch (textLayoutModule->skipCO->currentIndex()) {
|
2006-03-05 17:24:44 +00:00
|
|
|
case 0:
|
|
|
|
params.setDefSkip(VSpace(VSpace::SMALLSKIP));
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
params.setDefSkip(VSpace(VSpace::MEDSKIP));
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
params.setDefSkip(VSpace(VSpace::BIGSKIP));
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
{
|
|
|
|
VSpace vs = VSpace(
|
|
|
|
widgetsToLength(textLayoutModule->skipLE,
|
|
|
|
textLayoutModule->skipLengthCO)
|
|
|
|
);
|
|
|
|
params.setDefSkip(vs);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
// DocumentDefskipCB assures that this never happens
|
|
|
|
// so Assert then !!! - jbl
|
|
|
|
params.setDefSkip(VSpace(VSpace::MEDSKIP));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
params.options =
|
|
|
|
fromqstr(latexModule->optionsLE->text());
|
|
|
|
|
|
|
|
params.float_placement = floatModule->get();
|
|
|
|
|
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
|
|
|
// fonts
|
|
|
|
params.fontsRoman =
|
2006-08-17 08:53:44 +00:00
|
|
|
tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
|
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
|
|
|
|
|
|
|
params.fontsSans =
|
2006-08-17 08:53:44 +00:00
|
|
|
tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
|
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
|
|
|
|
|
|
|
params.fontsTypewriter =
|
2006-08-17 08:53:44 +00:00
|
|
|
tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
|
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
|
|
|
|
|
|
|
params.fontsSansScale = fontModule->scaleSansSB->value();
|
|
|
|
|
|
|
|
params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
|
|
|
|
|
|
|
|
params.fontsSC = fontModule->fontScCB->isChecked();
|
|
|
|
|
|
|
|
params.fontsOSF = fontModule->fontOsfCB->isChecked();
|
|
|
|
|
|
|
|
params.fontsDefaultFamily = ControlDocument::fontfamilies[
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsDefaultCO->currentIndex()];
|
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
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
if (fontModule->fontsizeCO->currentIndex() == 0)
|
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
|
|
|
params.fontsize = "default";
|
|
|
|
else
|
|
|
|
params.fontsize =
|
|
|
|
fromqstr(fontModule->fontsizeCO->currentText());
|
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
// paper
|
|
|
|
params.papersize = PAPER_SIZE(
|
2006-08-17 08:53:44 +00:00
|
|
|
pageLayoutModule->papersizeCO->currentIndex());
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// custom, A3, B3 and B4 paper sizes need geometry
|
2006-08-17 08:53:44 +00:00
|
|
|
int psize = pageLayoutModule->papersizeCO->currentIndex();
|
2006-03-05 17:24:44 +00:00
|
|
|
bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
|
|
|
|
|
|
|
|
params.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
|
|
|
|
pageLayoutModule->paperwidthUnitCO);
|
|
|
|
|
|
|
|
params.paperheight = widgetsToLength(pageLayoutModule->paperheightLE,
|
|
|
|
pageLayoutModule->paperheightUnitCO);
|
|
|
|
|
|
|
|
if (pageLayoutModule->facingPagesCB->isChecked())
|
|
|
|
params.sides = LyXTextClass::TwoSides;
|
|
|
|
else
|
|
|
|
params.sides = LyXTextClass::OneSide;
|
|
|
|
|
|
|
|
if (pageLayoutModule->landscapeRB->isChecked())
|
|
|
|
params.orientation = ORIENTATION_LANDSCAPE;
|
|
|
|
else
|
|
|
|
params.orientation = ORIENTATION_PORTRAIT;
|
|
|
|
|
|
|
|
// margins
|
|
|
|
params.use_geometry =
|
|
|
|
(!marginsModule->marginCB->isChecked()
|
|
|
|
|| geom_papersize);
|
|
|
|
|
|
|
|
Ui::MarginsUi const * m(marginsModule);
|
|
|
|
|
|
|
|
params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
|
|
|
|
|
|
|
|
params.topmargin = widgetsToLength(m->topLE, m->topUnit);
|
|
|
|
|
|
|
|
params.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
|
|
|
|
|
|
|
|
params.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
|
|
|
|
|
|
|
|
params.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
|
|
|
|
|
|
|
|
params.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
|
|
|
|
|
|
|
|
params.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
|
|
|
|
|
|
|
|
branchesModule->apply(params);
|
|
|
|
}
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
/** Return the position of val in the vector if found.
|
|
|
|
If not found, return 0.
|
|
|
|
*/
|
|
|
|
template<class A>
|
|
|
|
typename std::vector<A>::size_type
|
|
|
|
findPos(std::vector<A> const & vec, A const & val)
|
|
|
|
{
|
|
|
|
typename std::vector<A>::const_iterator it =
|
|
|
|
std::find(vec.begin(), vec.end(), val);
|
|
|
|
if (it == vec.end())
|
|
|
|
return 0;
|
|
|
|
return distance(vec.begin(), it);
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace anom
|
|
|
|
|
|
|
|
|
|
|
|
void QDocumentDialog::update(BufferParams const & params)
|
|
|
|
{
|
|
|
|
// set the default unit
|
|
|
|
// FIXME: move to controller
|
|
|
|
LyXLength::UNIT defaultUnit = LyXLength::CM;
|
|
|
|
switch (lyxrc.default_papersize) {
|
|
|
|
case PAPER_DEFAULT: break;
|
|
|
|
|
|
|
|
case PAPER_USLETTER:
|
|
|
|
case PAPER_USLEGAL:
|
|
|
|
case PAPER_USEXECUTIVE:
|
|
|
|
defaultUnit = LyXLength::IN;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PAPER_A3:
|
|
|
|
case PAPER_A4:
|
|
|
|
case PAPER_A5:
|
|
|
|
case PAPER_B3:
|
|
|
|
case PAPER_B4:
|
|
|
|
case PAPER_B5:
|
|
|
|
defaultUnit = LyXLength::CM;
|
|
|
|
break;
|
|
|
|
case PAPER_CUSTOM:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// preamble
|
|
|
|
QString preamble = toqstr(params.preamble);
|
2006-03-24 16:37:06 +00:00
|
|
|
preambleModule->preambleTE->document()->setPlainText(preamble);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// biblio
|
|
|
|
biblioModule->citeDefaultRB->setChecked(
|
|
|
|
params.cite_engine == biblio::ENGINE_BASIC);
|
|
|
|
|
|
|
|
biblioModule->citeNatbibRB->setChecked(
|
|
|
|
params.cite_engine == biblio::ENGINE_NATBIB_NUMERICAL ||
|
|
|
|
params.cite_engine == biblio::ENGINE_NATBIB_AUTHORYEAR);
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
biblioModule->citeStyleCO->setCurrentIndex(
|
2006-03-05 17:24:44 +00:00
|
|
|
params.cite_engine == biblio::ENGINE_NATBIB_NUMERICAL);
|
|
|
|
|
|
|
|
biblioModule->citeJurabibRB->setChecked(
|
|
|
|
params.cite_engine == biblio::ENGINE_JURABIB);
|
|
|
|
|
|
|
|
biblioModule->bibtopicCB->setChecked(
|
|
|
|
params.use_bibtopic);
|
|
|
|
|
|
|
|
// language & quotes
|
|
|
|
int const pos = int(findPos(lang_,
|
|
|
|
params.language->lang()));
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->languageCO->setCurrentIndex(pos);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->quoteStyleCO->setCurrentIndex(
|
2006-03-05 17:24:44 +00:00
|
|
|
params.quotes_language);
|
|
|
|
|
|
|
|
langModule->defaultencodingCB->setChecked(true);
|
|
|
|
|
|
|
|
if (params.inputenc != "auto") {
|
|
|
|
langModule->defaultencodingCB->setChecked(false);
|
|
|
|
if (params.inputenc == "default") {
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->encodingCO->setCurrentIndex(0);
|
2006-03-05 17:24:44 +00:00
|
|
|
} else {
|
|
|
|
int i = 0;
|
|
|
|
while (encodings[i]) {
|
|
|
|
if (encodings[i] == params.inputenc)
|
2006-08-17 08:53:44 +00:00
|
|
|
langModule->encodingCO->setCurrentIndex(i);
|
2006-03-05 17:24:44 +00:00
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// numbering
|
|
|
|
int const min_toclevel = form_->controller().textClass().min_toclevel();
|
|
|
|
int const max_toclevel = form_->controller().textClass().max_toclevel();
|
2006-03-24 17:37:44 +00:00
|
|
|
if (form_->controller().textClass().hasTocLevels()) {
|
2006-03-05 17:24:44 +00:00
|
|
|
numberingModule->setEnabled(true);
|
2006-08-17 08:53:44 +00:00
|
|
|
numberingModule->depthSL->setMinimum(min_toclevel - 1);
|
|
|
|
numberingModule->depthSL->setMaximum(max_toclevel);
|
2006-03-24 16:37:06 +00:00
|
|
|
numberingModule->depthSL->setValue(params.secnumdepth);
|
2006-08-17 08:53:44 +00:00
|
|
|
numberingModule->tocSL->setMaximum(min_toclevel - 1);
|
|
|
|
numberingModule->tocSL->setMaximum(max_toclevel);
|
2006-03-24 16:37:06 +00:00
|
|
|
numberingModule->tocSL->setValue(params.tocdepth);
|
|
|
|
updateNumbering();
|
|
|
|
} else {
|
2006-03-05 17:24:44 +00:00
|
|
|
numberingModule->setEnabled(false);
|
2006-05-04 07:31:46 +00:00
|
|
|
numberingModule->tocTW->clear();
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// bullets
|
2006-08-13 15:44:05 +00:00
|
|
|
bulletsModule->setBullet(0, params.user_defined_bullet(0));
|
|
|
|
bulletsModule->setBullet(1, params.user_defined_bullet(1));
|
|
|
|
bulletsModule->setBullet(2, params.user_defined_bullet(2));
|
|
|
|
bulletsModule->setBullet(3, params.user_defined_bullet(3));
|
|
|
|
bulletsModule->init();
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
// packages
|
|
|
|
QString text = toqstr(params.graphicsDriver);
|
|
|
|
int nitem = latexModule->psdriverCO->count();
|
|
|
|
for (int n = 0; n < nitem ; ++n) {
|
|
|
|
QString enc = tex_graphics[n];
|
|
|
|
if (enc == text) {
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->psdriverCO->setCurrentIndex(n);
|
2006-03-05 17:24:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
mathsModule->amsCB->setChecked(
|
|
|
|
params.use_amsmath == BufferParams::AMS_ON);
|
|
|
|
mathsModule->amsautoCB->setChecked(
|
|
|
|
params.use_amsmath == BufferParams::AMS_AUTO);
|
|
|
|
|
|
|
|
switch (params.spacing().getSpace()) {
|
|
|
|
case Spacing::Other: nitem = 3; break;
|
|
|
|
case Spacing::Double: nitem = 2; break;
|
|
|
|
case Spacing::Onehalf: nitem = 1; break;
|
|
|
|
case Spacing::Default: case Spacing::Single: nitem = 0; break;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// text layout
|
2006-08-17 08:53:44 +00:00
|
|
|
latexModule->classCO->setCurrentIndex(params.textclass);
|
2006-03-05 17:24:44 +00:00
|
|
|
|
|
|
|
updatePagestyle(form_->controller().textClass().opt_pagestyle(),
|
|
|
|
params.pagestyle);
|
|
|
|
|
2006-08-17 08:53:44 +00:00
|
|
|
textLayoutModule->lspacingCO->setCurrentIndex(nitem);
|
2006-03-05 17:24:44 +00:00
|
|
|
if (params.spacing().getSpace() == Spacing::Other) {
|
|
|
|
textLayoutModule->lspacingLE->setText(
|
|
|
|
toqstr(params.spacing().getValueAsString()));
|
|
|
|
}
|
|
|
|
setLSpacing(nitem);
|
|
|
|
|
|
|
|
if (params.paragraph_separation
|
|
|
|
== BufferParams::PARSEP_INDENT) {
|
|
|
|
textLayoutModule->indentRB->setChecked(true);
|
|
|
|
} else {
|
|
|
|
textLayoutModule->skipRB->setChecked(true);
|
|
|
|
}
|
|
|
|
|
|
|
|
int skip = 0;
|
|
|
|
switch (params.getDefSkip().kind()) {
|
|
|
|
case VSpace::SMALLSKIP:
|
|
|
|
skip = 0;
|
|
|
|
break;
|
|
|
|
case VSpace::MEDSKIP:
|
|
|
|
skip = 1;
|
|
|
|
break;
|
|
|
|
case VSpace::BIGSKIP:
|
|
|
|
skip = 2;
|
|
|
|
break;
|
|
|
|
case VSpace::LENGTH:
|
|
|
|
{
|
|
|
|
skip = 3;
|
|
|
|
string const length = params.getDefSkip().asLyXCommand();
|
|
|
|
lengthToWidgets(textLayoutModule->skipLE,
|
|
|
|
textLayoutModule->skipLengthCO,
|
|
|
|
length, defaultUnit);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
skip = 0;
|
|
|
|
break;
|
|
|
|
}
|
2006-08-17 08:53:44 +00:00
|
|
|
textLayoutModule->skipCO->setCurrentIndex(skip);
|
2006-03-05 17:24:44 +00:00
|
|
|
setSkip(skip);
|
|
|
|
|
|
|
|
textLayoutModule->twoColumnCB->setChecked(
|
|
|
|
params.columns == 2);
|
|
|
|
|
|
|
|
if (!params.options.empty()) {
|
|
|
|
latexModule->optionsLE->setText(
|
|
|
|
toqstr(params.options));
|
|
|
|
} else {
|
|
|
|
latexModule->optionsLE->setText("");
|
|
|
|
}
|
|
|
|
|
|
|
|
floatModule->set(params.float_placement);
|
|
|
|
|
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
|
|
|
//fonts
|
|
|
|
updateFontsize(form_->controller().textClass().opt_fontsize(),
|
|
|
|
params.fontsize);
|
|
|
|
|
|
|
|
int n = findToken(tex_fonts_roman, params.fontsRoman);
|
|
|
|
if (n >= 0)
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsRomanCO->setCurrentIndex(n);
|
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
|
|
|
|
|
|
|
n = findToken(tex_fonts_sans, params.fontsSans);
|
|
|
|
if (n >= 0)
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsSansCO->setCurrentIndex(n);
|
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
|
|
|
|
|
|
|
n = findToken(tex_fonts_monospaced, params.fontsTypewriter);
|
|
|
|
if (n >= 0)
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsTypewriterCO->setCurrentIndex(n);
|
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
|
|
|
|
|
|
|
fontModule->fontScCB->setChecked(params.fontsSC);
|
|
|
|
fontModule->fontOsfCB->setChecked(params.fontsOSF);
|
|
|
|
fontModule->fontScCB->setEnabled(
|
|
|
|
form_->controller().providesSC(params.fontsRoman));
|
|
|
|
fontModule->fontOsfCB->setEnabled(
|
|
|
|
form_->controller().providesOSF(params.fontsRoman));
|
|
|
|
fontModule->scaleSansSB->setValue(params.fontsSansScale);
|
|
|
|
fontModule->scaleTypewriterSB->setValue(
|
|
|
|
params.fontsTypewriterScale);
|
|
|
|
fontModule->scaleSansSB->setEnabled(
|
|
|
|
form_->controller().providesScale(params.fontsSans));
|
|
|
|
fontModule->scaleTypewriterSB->setEnabled(
|
|
|
|
form_->controller().providesScale(params.fontsTypewriter));
|
|
|
|
n = findToken(ControlDocument::fontfamilies, params.fontsDefaultFamily);
|
|
|
|
if (n >= 0)
|
2006-08-17 08:53:44 +00:00
|
|
|
fontModule->fontsDefaultCO->setCurrentIndex(n);
|
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
|
|
|
|
2006-03-05 17:24:44 +00:00
|
|
|
// paper
|
|
|
|
int const psize = params.papersize;
|
2006-08-17 08:53:44 +00:00
|
|
|
pageLayoutModule->papersizeCO->setCurrentIndex(psize);
|
2006-03-05 17:24:44 +00:00
|
|
|
setCustomPapersize(psize);
|
|
|
|
|
|
|
|
bool const landscape =
|
|
|
|
params.orientation == ORIENTATION_LANDSCAPE;
|
|
|
|
pageLayoutModule->landscapeRB->setChecked(landscape);
|
|
|
|
pageLayoutModule->portraitRB->setChecked(!landscape);
|
|
|
|
|
|
|
|
pageLayoutModule->facingPagesCB->setChecked(
|
|
|
|
params.sides == LyXTextClass::TwoSides);
|
|
|
|
|
|
|
|
|
|
|
|
lengthToWidgets(pageLayoutModule->paperwidthLE,
|
|
|
|
pageLayoutModule->paperwidthUnitCO, params.paperwidth, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(pageLayoutModule->paperheightLE,
|
|
|
|
pageLayoutModule->paperheightUnitCO, params.paperheight, defaultUnit);
|
|
|
|
|
|
|
|
// margins
|
|
|
|
Ui::MarginsUi * m = marginsModule;
|
|
|
|
|
|
|
|
setMargins(!params.use_geometry);
|
|
|
|
|
|
|
|
lengthToWidgets(m->topLE, m->topUnit,
|
|
|
|
params.topmargin, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(m->bottomLE, m->bottomUnit,
|
|
|
|
params.bottommargin, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(m->innerLE, m->innerUnit,
|
|
|
|
params.leftmargin, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(m->outerLE, m->outerUnit,
|
|
|
|
params.rightmargin, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(m->headheightLE, m->headheightUnit,
|
|
|
|
params.headheight, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(m->headsepLE, m->headsepUnit,
|
|
|
|
params.headsep, defaultUnit);
|
|
|
|
|
|
|
|
lengthToWidgets(m->footskipLE, m->footskipUnit,
|
|
|
|
params.footskip, defaultUnit);
|
|
|
|
|
|
|
|
branchesModule->update(params);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace frontend
|
|
|
|
} // namespace lyx
|
2006-05-18 08:51:12 +00:00
|
|
|
|
|
|
|
#include "QDocumentDialog_moc.cpp"
|