X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt2%2FQDocumentDialog.C;h=960167b63edc0278e400cf202e89af3882ace76b;hb=1fcedd4b635807e7046342f324d054c04c37f054;hp=47b3a4578e7614cba3f8b03a46e77e25097c3aa6;hpb=fabd5d2057d25290bc9cc997142ebac940031b9b;p=lyx.git diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 47b3a4578e..960167b63e 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -14,9 +14,6 @@ #include "ControlDocument.h" #include "QDocument.h" -#ifdef __GNUG__ -#pragma implementation -#endif #include "QDocumentDialog.h" @@ -64,13 +61,13 @@ QDocumentDialog::QDocumentDialog(QDocument * form) moduleLB->clear(); moduleLB->insertItem(qt_("Layout"), LAYOUT); - moduleLB->insertItem(qt_("Packages"), PACKAGES); moduleLB->insertItem(qt_("Paper"), PAPER); moduleLB->insertItem(qt_("Margins"), MARGINS); moduleLB->insertItem(qt_("Language"), LANGUAGE); moduleLB->insertItem(qt_("Bullets"), BULLETS); moduleLB->insertItem(qt_("Numbering"), NUMBERING); moduleLB->insertItem(qt_("Bibliography"), BIBLIOGRAPHY); + moduleLB->insertItem(qt_("Packages"), PACKAGES); moduleLB->insertItem(qt_("Preamble"), PREAMBLE); moduleLB->setCurrentItem(LAYOUT); moduleLB->setMinimumSize(moduleLB->sizeHint()); @@ -78,21 +75,21 @@ QDocumentDialog::QDocumentDialog(QDocument * form) layoutModule = new ClassModuleBase(this); paperModule = new PaperModuleBase(this); marginsModule = new MarginsModuleBase(this); - packagesModule = new PackagesModuleBase(this); langModule = new LanguageModuleBase(this); bulletsModule = new BulletsModule(this); numberingModule = new NumberingModuleBase(this); biblioModule = new BiblioModuleBase(this); + packagesModule = new PackagesModuleBase(this); preambleModule = new PreambleModuleBase(this); moduleStack->addWidget(layoutModule, LAYOUT); moduleStack->addWidget(paperModule, PAPER); moduleStack->addWidget(marginsModule, MARGINS); - moduleStack->addWidget(packagesModule, PACKAGES); moduleStack->addWidget(langModule, LANGUAGE); moduleStack->addWidget(bulletsModule, BULLETS); moduleStack->addWidget(numberingModule, NUMBERING); moduleStack->addWidget(biblioModule, BIBLIOGRAPHY); + moduleStack->addWidget(packagesModule, PACKAGES); moduleStack->addWidget(preambleModule, PREAMBLE); moduleStack->raiseWidget(LAYOUT); @@ -106,143 +103,147 @@ QDocumentDialog::QDocumentDialog(QDocument * form) // preamble connect(preambleModule->preambleMLE, SIGNAL(textChanged()), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); // biblio connect(biblioModule->natbibCB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(biblioModule->citeStyleCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); // language & quote connect(langModule->singleQuoteRB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(langModule->doubleQuoteRB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(langModule->languageCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + 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())); + this, SLOT(change_adaptor())); // numbering connect(numberingModule->sectionnrDepthSB, SIGNAL(valueChanged(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(numberingModule->tocDepthSB, SIGNAL(valueChanged(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); // packages - connect(packagesModule->lspacingCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); - connect(packagesModule->lspacingCO, SIGNAL(activated(int)), - this , SLOT(setLSpacing(int))); - connect(packagesModule->lspacingLE, - SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); - connect(packagesModule->encodingCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); connect(packagesModule->amsCB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(packagesModule->psdriverCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); // layout connect(layoutModule->classCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->optionsLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->pagestyleCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->fontsCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->fontsizeCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); + connect(layoutModule->lspacingCO, SIGNAL(activated(int)), + this, SLOT(change_adaptor())); + connect(layoutModule->lspacingCO, SIGNAL(activated(int)), + this, SLOT(setLSpacing(int))); + connect(layoutModule->lspacingLE, + SIGNAL(textChanged(const QString&)), + this, SLOT(change_adaptor())); connect(layoutModule->floatPlacementLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->skipRB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->indentRB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->skipCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->skipLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->skipLengthCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(layoutModule->classCO, SIGNAL(activated(int)), - this , SLOT(classChanged())); + this, SLOT(classChanged())); connect(layoutModule->skipCO, SIGNAL(activated(int)), - this , SLOT(setSkip(int))); + this, SLOT(setSkip(int))); connect(layoutModule->skipRB, SIGNAL(toggled(bool)), - this , SLOT(enableSkip(bool))); + this, SLOT(enableSkip(bool))); // margins connect(marginsModule->marginCO, SIGNAL(activated(int)), - this , SLOT(setCustomMargins(int))); + this, SLOT(setCustomMargins(int))); connect(marginsModule->marginCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->topLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->topUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->bottomLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->bottomUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->innerLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->innerUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->outerLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->outerUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->headheightLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->headheightUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->headsepLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->headsepUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(marginsModule->footskipUnit, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); // paper connect(paperModule->papersizeCO, SIGNAL(activated(int)), - this , SLOT(setMargins(int))); + this, SLOT(setMargins(int))); connect(paperModule->papersizeCO, SIGNAL(activated(int)), - this , SLOT(setCustomPapersize(int))); + this, SLOT(setCustomPapersize(int))); connect(paperModule->papersizeCO, SIGNAL(activated(int)), - this , SLOT(setCustomPapersize(int))); + this, SLOT(setCustomPapersize(int))); + connect(paperModule->portraitRB, SIGNAL(toggled(bool)), + this, SLOT(portraitChanged())); connect(paperModule->papersizeCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->paperheightLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->paperwidthLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->paperwidthUnitCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->paperheightUnitCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->portraitRB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->landscapeRB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->twoColumnCB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(paperModule->facingPagesCB, SIGNAL(toggled(bool)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); - // bullets + // bullets connect(bulletsModule->bulletsizeCO, SIGNAL(activated(int)), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); connect(bulletsModule->bulletsLV, SIGNAL(selectionChanged()), - this , SLOT(change_adaptor())); + this, SLOT(change_adaptor())); } @@ -257,9 +258,6 @@ void QDocumentDialog::setTitle(int item) case LAYOUT: titleL->setText(qt_("Document Style")); break; - case PACKAGES: - titleL->setText(qt_("LaTeX Packages")); - break; case PAPER: titleL->setText(qt_("Papersize and Orientation")); break; @@ -278,6 +276,9 @@ void QDocumentDialog::setTitle(int item) case BIBLIOGRAPHY: titleL->setText(qt_("Bibliography Settings")); break; + case PACKAGES: + titleL->setText(qt_("LaTeX Packages and Options")); + break; case PREAMBLE: titleL->setText(qt_("LaTeX Preamble")); break; @@ -312,7 +313,7 @@ void QDocumentDialog::closeEvent(QCloseEvent * e) void QDocumentDialog::setLSpacing(int item) { - packagesModule->lspacingLE->setEnabled(item == 3); + layoutModule->lspacingLE->setEnabled(item == 3); } @@ -333,6 +334,10 @@ void QDocumentDialog::enableSkip(bool skip) setSkip(layoutModule->skipCO->currentItem()); } +void QDocumentDialog::portraitChanged() +{ + setMargins(paperModule->papersizeCO->currentItem()); +} void QDocumentDialog::setMargins(int papersize) { @@ -340,7 +345,9 @@ void QDocumentDialog::setMargins(int papersize) marginsModule->marginCO->clear(); marginsModule->marginCO->insertItem(qt_("Default")); marginsModule->marginCO->insertItem(qt_("Custom")); - if (papersize == 6) { + bool a4size = (papersize == 6 || papersize == 0 + && lyxrc.default_papersize == BufferParams::PAPER_A4PAPER); + if (a4size && paperModule->portraitRB->isChecked()) { marginsModule->marginCO->insertItem(qt_("Small margins")); marginsModule->marginCO->insertItem(qt_("Very small margins")); marginsModule->marginCO->insertItem(qt_("Very wide margins"));