From 92b7cb5473da5b37ba82eb74fe217d77ad3afefb Mon Sep 17 00:00:00 2001 From: John Levon Date: Fri, 28 Mar 2003 17:19:49 +0000 Subject: [PATCH] Big doc dialog reorganisation git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6609 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 30 ++ src/frontends/qt2/Makefile.dialogs | 8 +- src/frontends/qt2/QDocument.C | 157 +++---- src/frontends/qt2/QDocumentDialog.C | 167 +++---- src/frontends/qt2/QDocumentDialog.h | 16 +- src/frontends/qt2/QFloat.C | 90 +--- src/frontends/qt2/QFloatDialog.C | 48 +- src/frontends/qt2/QFloatDialog.h | 6 +- src/frontends/qt2/floatplacement.C | 229 ++++++++++ src/frontends/qt2/floatplacement.h | 56 +++ src/frontends/qt2/ui/BiblioModuleBase.ui | 183 +++++--- src/frontends/qt2/ui/BulletsModuleBase.ui | 2 +- src/frontends/qt2/ui/ClassModuleBase.ui | 348 -------------- src/frontends/qt2/ui/LaTeXModuleBase.ui | 245 ++++++++++ src/frontends/qt2/ui/LanguageModuleBase.ui | 230 ++++++---- src/frontends/qt2/ui/MarginsModuleBase.ui | 9 +- src/frontends/qt2/ui/MathsModuleBase.ui | 93 ++++ src/frontends/qt2/ui/NumberingModuleBase.ui | 2 +- src/frontends/qt2/ui/PackagesModuleBase.ui | 148 ------ ...rModuleBase.ui => PageLayoutModuleBase.ui} | 166 ++++--- src/frontends/qt2/ui/QFloatDialogBase.ui | 318 ++----------- src/frontends/qt2/ui/TextLayoutModuleBase.ui | 432 ++++++++++++++++++ 22 files changed, 1685 insertions(+), 1298 deletions(-) create mode 100644 src/frontends/qt2/floatplacement.C create mode 100644 src/frontends/qt2/floatplacement.h delete mode 100644 src/frontends/qt2/ui/ClassModuleBase.ui create mode 100644 src/frontends/qt2/ui/LaTeXModuleBase.ui create mode 100644 src/frontends/qt2/ui/MathsModuleBase.ui delete mode 100644 src/frontends/qt2/ui/PackagesModuleBase.ui rename src/frontends/qt2/ui/{PaperModuleBase.ui => PageLayoutModuleBase.ui} (83%) create mode 100644 src/frontends/qt2/ui/TextLayoutModuleBase.ui diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 91e3032c82..06007d30ba 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,33 @@ +2003-03-28 John Levon + + * QFloat.C: + * QFloatDialog.h: + * QFloatDialog.C: + * ui/QFloatDialog.ui: + * Makefile.dialogs: + * moc/Makefile.am: + * floatplacement.h: + * floatplacement.C: move the float code into its + own widget + + * QDocument.C: + * QDocumentDialog.h: + * QDocumentDialog.C: use that widget + + * Makefile.dialogs: + * QDocument.C: + * QDocumentDialog.h: + * QDocumentDialog.C: + * ui/QDocumentDialogBase.ui: + * ui/ClassModuleBase.ui: + * ui/PaperModuleBase.ui: + * ui/PackagesModuleBase.ui: + * ui/MathsModuleBase.ui: + * ui/LatexModuleBase.ui: + * ui/PageLayoutModuleBase.ui: + * ui/TextLayoutModuleBase.ui: big re-organisation + of the doc dialog panes + 2003-03-28 John Levon * panelstack.C: make sure the first panel is visible diff --git a/src/frontends/qt2/Makefile.dialogs b/src/frontends/qt2/Makefile.dialogs index e5f366670c..0417c8489b 100644 --- a/src/frontends/qt2/Makefile.dialogs +++ b/src/frontends/qt2/Makefile.dialogs @@ -3,12 +3,13 @@ UIFILES = \ BiblioModuleBase.ui \ BulletsModuleBase.ui \ - ClassModuleBase.ui \ + TextLayoutModuleBase.ui \ LanguageModuleBase.ui \ + LaTeXModuleBase.ui \ MarginsModuleBase.ui \ NumberingModuleBase.ui \ - PackagesModuleBase.ui \ - PaperModuleBase.ui \ + MathsModuleBase.ui \ + PageLayoutModuleBase.ui \ PreambleModuleBase.ui \ QAboutDialogBase.ui \ QAskForTextDialog.ui \ @@ -66,6 +67,7 @@ MOCFILES = \ BulletsModule.C BulletsModule.h \ emptytable.C emptytable.h \ FileDialog_private.C FileDialog_private.h \ + floatplacement.C floatplacement.h \ iconpalette.C iconpalette.h \ io_callback.C io_callback.h \ lengthcombo.C lengthcombo.h \ diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index e4ce2caff6..62ae825dfa 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -30,6 +30,7 @@ #include "vspace.h" #include "bufferparams.h" #include "qt_helpers.h" +#include "floatplacement.h" #include #include @@ -101,11 +102,11 @@ void QDocument::build_dialog() // packages for (int n = 0; tex_graphics[n][0]; ++n) { QString enc = tex_graphics[n]; - dialog_->packagesModule->psdriverCO->insertItem(enc); + dialog_->latexModule->psdriverCO->insertItem(enc); } // paper - QComboBox * cb = dialog_->paperModule->papersizeCO; + QComboBox * cb = dialog_->pageLayoutModule->papersizeCO; cb->insertItem(qt_("Default")); cb->insertItem(qt_("Custom")); cb->insertItem(qt_("US letter")); @@ -121,37 +122,37 @@ void QDocument::build_dialog() // layout for (LyXTextClassList::const_iterator cit = textclasslist.begin(); cit != textclasslist.end(); ++cit) { - dialog_->layoutModule->classCO->insertItem(toqstr(cit->description())); + dialog_->latexModule->classCO->insertItem(toqstr(cit->description())); } for (int n = 0; tex_fonts[n][0]; ++n) { QString font = tex_fonts[n]; - dialog_->layoutModule->fontsCO->insertItem(font); + dialog_->textLayoutModule->fontsCO->insertItem(font); } - dialog_->layoutModule->fontsizeCO->insertItem(qt_("default")); - dialog_->layoutModule->fontsizeCO->insertItem(qt_("10")); - dialog_->layoutModule->fontsizeCO->insertItem(qt_("11")); - dialog_->layoutModule->fontsizeCO->insertItem(qt_("12")); + dialog_->textLayoutModule->fontsizeCO->insertItem(qt_("default")); + dialog_->textLayoutModule->fontsizeCO->insertItem(qt_("10")); + dialog_->textLayoutModule->fontsizeCO->insertItem(qt_("11")); + dialog_->textLayoutModule->fontsizeCO->insertItem(qt_("12")); - dialog_->layoutModule->skipCO->insertItem(qt_("SmallSkip")); - dialog_->layoutModule->skipCO->insertItem(qt_("MedSkip")); - dialog_->layoutModule->skipCO->insertItem(qt_("BigSkip")); - dialog_->layoutModule->skipCO->insertItem(qt_("Length")); + dialog_->textLayoutModule->skipCO->insertItem(qt_("SmallSkip")); + dialog_->textLayoutModule->skipCO->insertItem(qt_("MedSkip")); + dialog_->textLayoutModule->skipCO->insertItem(qt_("BigSkip")); + dialog_->textLayoutModule->skipCO->insertItem(qt_("Length")); - dialog_->layoutModule->pagestyleCO->insertItem(qt_("default")); - dialog_->layoutModule->pagestyleCO->insertItem(qt_("empty")); - dialog_->layoutModule->pagestyleCO->insertItem(qt_("plain")); - dialog_->layoutModule->pagestyleCO->insertItem(qt_("headings")); - dialog_->layoutModule->pagestyleCO->insertItem(qt_("fancy")); + dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("default")); + dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("empty")); + dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("plain")); + dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("headings")); + dialog_->pageLayoutModule->pagestyleCO->insertItem(qt_("fancy")); - dialog_->layoutModule->lspacingCO->insertItem( + dialog_->textLayoutModule->lspacingCO->insertItem( qt_("Single"), Spacing::Single); - dialog_->layoutModule->lspacingCO->insertItem( + dialog_->textLayoutModule->lspacingCO->insertItem( qt_("OneHalf"), Spacing::Onehalf); - dialog_->layoutModule->lspacingCO->insertItem( + dialog_->textLayoutModule->lspacingCO->insertItem( qt_("Double"), Spacing::Double); - dialog_->layoutModule->lspacingCO->insertItem( + dialog_->textLayoutModule->lspacingCO->insertItem( qt_("Custom"), Spacing::Other); // margins @@ -242,12 +243,12 @@ void QDocument::apply() // packages params.graphicsDriver = - fromqstr(dialog_->packagesModule->psdriverCO->currentText()); + fromqstr(dialog_->latexModule->psdriverCO->currentText()); - if (dialog_->packagesModule->amsautoCB->isChecked()) { + if (dialog_->mathsModule->amsautoCB->isChecked()) { params.use_amsmath = BufferParams::AMS_AUTO; } else { - if (dialog_->packagesModule->amsCB->isChecked()) + if (dialog_->mathsModule->amsCB->isChecked()) params.use_amsmath = BufferParams::AMS_ON; else params.use_amsmath = BufferParams::AMS_OFF; @@ -255,18 +256,18 @@ void QDocument::apply() // layout params.textclass = - dialog_->layoutModule->classCO->currentItem(); + dialog_->latexModule->classCO->currentItem(); params.fonts = - fromqstr(dialog_->layoutModule->fontsCO->currentText()); + fromqstr(dialog_->textLayoutModule->fontsCO->currentText()); params.fontsize = - fromqstr(dialog_->layoutModule->fontsizeCO->currentText()); + fromqstr(dialog_->textLayoutModule->fontsizeCO->currentText()); params.pagestyle = - fromqstr(dialog_->layoutModule->pagestyleCO->currentText()); + fromqstr(dialog_->pageLayoutModule->pagestyleCO->currentText()); - switch (dialog_->layoutModule->lspacingCO->currentItem()) { + switch (dialog_->textLayoutModule->lspacingCO->currentItem()) { case 0: params.spacing.set(Spacing::Single); break; @@ -278,18 +279,23 @@ void QDocument::apply() break; case 3: params.spacing.set(Spacing::Other, - dialog_->layoutModule-> + dialog_->textLayoutModule-> lspacingLE->text().toFloat() ); break; } - if (dialog_->layoutModule->indentRB->isChecked()) + if (dialog_->textLayoutModule->twoColumnCB->isChecked()) + params.columns = 2; + else + params.columns = 1; + + if (dialog_->textLayoutModule->indentRB->isChecked()) params.paragraph_separation = BufferParams::PARSEP_INDENT; else params.paragraph_separation = BufferParams::PARSEP_SKIP; - switch (dialog_->layoutModule->skipCO->currentItem()) { + switch (dialog_->textLayoutModule->skipCO->currentItem()) { case 0: params.setDefSkip(VSpace(VSpace::SMALLSKIP)); break; @@ -302,10 +308,10 @@ void QDocument::apply() case 3: { LyXLength::UNIT unit = - dialog_->layoutModule->skipLengthCO-> + dialog_->textLayoutModule->skipLengthCO-> currentLengthItem(); double length = - dialog_->layoutModule->skipLE->text().toDouble(); + dialog_->textLayoutModule->skipLE->text().toDouble(); VSpace vs = VSpace(LyXGlueLength(LyXLength(length,unit))); params.setDefSkip(vs); break; @@ -318,32 +324,26 @@ void QDocument::apply() } params.options = - fromqstr(dialog_->layoutModule->optionsLE->text()); + fromqstr(dialog_->latexModule->optionsLE->text()); - params.float_placement = - fromqstr(dialog_->layoutModule->floatPlacementLE->text()); + params.float_placement = dialog_->floatModule->get(); // paper params.papersize2 = - dialog_->paperModule->papersizeCO->currentItem(); - - params.paperwidth = widgetsToLength(dialog_->paperModule->paperwidthLE, - dialog_->paperModule->paperwidthUnitCO); + dialog_->pageLayoutModule->papersizeCO->currentItem(); - params.paperheight = widgetsToLength(dialog_->paperModule->paperheightLE, - dialog_->paperModule->paperheightUnitCO); + params.paperwidth = widgetsToLength(dialog_->pageLayoutModule->paperwidthLE, + dialog_->pageLayoutModule->paperwidthUnitCO); - if (dialog_->paperModule->twoColumnCB->isChecked()) - params.columns = 2; - else - params.columns = 1; + params.paperheight = widgetsToLength(dialog_->pageLayoutModule->paperheightLE, + dialog_->pageLayoutModule->paperheightUnitCO); - if (dialog_->paperModule->facingPagesCB->isChecked()) + if (dialog_->pageLayoutModule->facingPagesCB->isChecked()) params.sides = LyXTextClass::TwoSides; else params.sides = LyXTextClass::OneSide; - if (dialog_->paperModule->landscapeRB->isChecked()) + if (dialog_->pageLayoutModule->landscapeRB->isChecked()) params.orientation = BufferParams::ORIENTATION_LANDSCAPE; else params.orientation = BufferParams::ORIENTATION_PORTRAIT; @@ -479,18 +479,18 @@ void QDocument::update_contents() // packages QString text = toqstr(params.graphicsDriver); - int nitem = dialog_->packagesModule->psdriverCO->count(); + int nitem = dialog_->latexModule->psdriverCO->count(); for (int n = 0; n < nitem ; ++n) { QString enc = tex_graphics[n]; if (enc == text) { - dialog_->packagesModule->psdriverCO->setCurrentItem(n); + dialog_->latexModule->psdriverCO->setCurrentItem(n); } } - dialog_->packagesModule->amsCB->setChecked( + dialog_->mathsModule->amsCB->setChecked( params.use_amsmath == BufferParams::AMS_ON); - dialog_->packagesModule->amsautoCB->setChecked( + dialog_->mathsModule->amsautoCB->setChecked( params.use_amsmath == BufferParams::AMS_AUTO); switch (params.spacing.getSpace()) { @@ -502,10 +502,10 @@ void QDocument::update_contents() // layout - for (int n = 0; nlayoutModule->classCO->count(); ++n) { - if (dialog_->layoutModule->classCO->text(n) == + for (int n = 0; nlatexModule->classCO->count(); ++n) { + if (dialog_->latexModule->classCO->text(n) == toqstr(controller().textClass().description())) { - dialog_->layoutModule->classCO->setCurrentItem(n); + dialog_->latexModule->classCO->setCurrentItem(n); break; } } @@ -518,23 +518,23 @@ void QDocument::update_contents() for (int n = 0; tex_fonts[n][0]; ++n) { if (tex_fonts[n] == params.fonts) { - dialog_->layoutModule->fontsCO->setCurrentItem(n); + dialog_->textLayoutModule->fontsCO->setCurrentItem(n); break; } } - dialog_->layoutModule->lspacingCO->setCurrentItem(nitem); + dialog_->textLayoutModule->lspacingCO->setCurrentItem(nitem); if (params.spacing.getSpace() == Spacing::Other) { - dialog_->layoutModule->lspacingLE->setText( + dialog_->textLayoutModule->lspacingLE->setText( toqstr(tostr(params.spacing.getValue()))); dialog_->setLSpacing(3); } if (params.paragraph_separation == BufferParams::PARSEP_INDENT) { - dialog_->layoutModule->indentRB->setChecked(true); + dialog_->textLayoutModule->indentRB->setChecked(true); } else { - dialog_->layoutModule->skipRB->setChecked(true); + dialog_->textLayoutModule->skipRB->setChecked(true); } int skip = 0; @@ -552,47 +552,50 @@ void QDocument::update_contents() { skip = 3; string const length = params.getDefSkip().asLyXCommand(); - dialog_->layoutModule->skipLengthCO->setCurrentItem(LyXLength(length).unit()); - dialog_->layoutModule->skipLE->setText(toqstr(tostr(LyXLength(length).value()))); + dialog_->textLayoutModule->skipLengthCO->setCurrentItem(LyXLength(length).unit()); + dialog_->textLayoutModule->skipLE->setText(toqstr(tostr(LyXLength(length).value()))); break; } default: skip = 0; break; } - dialog_->layoutModule->skipCO->setCurrentItem(skip); + dialog_->textLayoutModule->skipCO->setCurrentItem(skip); dialog_->setSkip(skip); + dialog_->textLayoutModule->twoColumnCB->setChecked( + params.columns == 2); + if (!params.options.empty()) { - dialog_->layoutModule->optionsLE->setText( + dialog_->latexModule->optionsLE->setText( toqstr(params.options)); } else { - dialog_->layoutModule->optionsLE->setText(""); + dialog_->latexModule->optionsLE->setText(""); } + dialog_->floatModule->set(params.float_placement); + // paper int const psize = params.papersize2; - dialog_->paperModule->papersizeCO->setCurrentItem(psize); + dialog_->pageLayoutModule->papersizeCO->setCurrentItem(psize); dialog_->setMargins(psize); dialog_->setCustomPapersize(psize); bool const landscape = params.orientation == BufferParams::ORIENTATION_LANDSCAPE; - dialog_->paperModule->landscapeRB->setChecked(landscape); - dialog_->paperModule->portraitRB->setChecked(!landscape); + dialog_->pageLayoutModule->landscapeRB->setChecked(landscape); + dialog_->pageLayoutModule->portraitRB->setChecked(!landscape); - dialog_->paperModule->facingPagesCB->setChecked( + dialog_->pageLayoutModule->facingPagesCB->setChecked( params.sides == LyXTextClass::TwoSides); - dialog_->paperModule->twoColumnCB->setChecked( - params.columns == 2); - lengthToWidgets(dialog_->paperModule->paperwidthLE, - dialog_->paperModule->paperwidthUnitCO, params.paperwidth, defaultUnit); + lengthToWidgets(dialog_->pageLayoutModule->paperwidthLE, + dialog_->pageLayoutModule->paperwidthUnitCO, params.paperwidth, defaultUnit); - lengthToWidgets(dialog_->paperModule->paperheightLE, - dialog_->paperModule->paperheightUnitCO, params.paperheight, defaultUnit); + lengthToWidgets(dialog_->pageLayoutModule->paperheightLE, + dialog_->pageLayoutModule->paperheightUnitCO, params.paperheight, defaultUnit); // margins @@ -642,7 +645,7 @@ void QDocument::useClassDefaults() { BufferParams & params = controller().params(); - params.textclass = dialog_->layoutModule->classCO->currentItem(); + params.textclass = dialog_->latexModule->classCO->currentItem(); params.useClassDefaults(); update_contents(); } diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 481a15091b..85077234f8 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -17,9 +17,10 @@ #include "QDocumentDialog.h" -#include "ui/ClassModuleBase.h" -#include "ui/PackagesModuleBase.h" -#include "ui/PaperModuleBase.h" +#include "ui/TextLayoutModuleBase.h" +#include "ui/MathsModuleBase.h" +#include "ui/LaTeXModuleBase.h" +#include "ui/PageLayoutModuleBase.h" #include "ui/LanguageModuleBase.h" #include "ui/BulletsModuleBase.h" #include "BulletsModule.h" @@ -28,6 +29,7 @@ #include "ui/MarginsModuleBase.h" #include "ui/PreambleModuleBase.h" #include "panelstack.h" +#include "floatplacement.h" #include "Spacing.h" #include "support/lstrings.h" @@ -60,26 +62,30 @@ QDocumentDialog::QDocumentDialog(QDocument * form) connect(restorePB, SIGNAL(clicked()), form, SLOT(slotRestore())); - layoutModule = new ClassModuleBase(this); - paperModule = new PaperModuleBase(this); + textLayoutModule = new TextLayoutModuleBase(this); + pageLayoutModule = new PageLayoutModuleBase(this); marginsModule = new MarginsModuleBase(this); langModule = new LanguageModuleBase(this); bulletsModule = new BulletsModule(this); numberingModule = new NumberingModuleBase(this); biblioModule = new BiblioModuleBase(this); - packagesModule = new PackagesModuleBase(this); + mathsModule = new MathsModuleBase(this); + floatModule = new FloatPlacement(this, "floatplacement"); + latexModule = new LaTeXModuleBase(this); preambleModule = new PreambleModuleBase(this); - docPS->addPanel(layoutModule, _("Layout")); - docPS->addPanel(paperModule, _("Paper")); - docPS->addPanel(marginsModule, _("Margins")); + docPS->addPanel(latexModule, _("Document Class")); + docPS->addPanel(textLayoutModule, _("Text Layout")); + docPS->addPanel(pageLayoutModule, _("Page Layout")); + docPS->addPanel(marginsModule, _("Page Margins")); docPS->addPanel(langModule, _("Language")); docPS->addPanel(numberingModule, _("Table of Contents")); docPS->addPanel(biblioModule, _("Bibliography")); - docPS->addPanel(packagesModule, _("LaTeX packages")); + docPS->addPanel(mathsModule, _("Math options")); + docPS->addPanel(floatModule, _("Float Placement")); docPS->addPanel(bulletsModule, _("Bullets")); docPS->addPanel(preambleModule, _("LaTeX Preamble")); - docPS->setCurrentPanel(_("Layout")); + docPS->setCurrentPanel(_("Document Class")); // preamble connect(preambleModule->preambleMLE, SIGNAL(textChanged()), this, SLOT(change_adaptor())); @@ -96,28 +102,30 @@ QDocumentDialog::QDocumentDialog(QDocument * form) // numbering connect(numberingModule->sectionnrDepthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor())); connect(numberingModule->tocDepthSB, SIGNAL(valueChanged(int)), this, SLOT(change_adaptor())); - // packages - connect(packagesModule->amsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(packagesModule->psdriverCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - // layout - connect(layoutModule->classCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(layoutModule->optionsLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); - connect(layoutModule->pagestyleCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(layoutModule->fontsCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(layoutModule->fontsizeCO, SIGNAL(activated(int)), 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())); - connect(layoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(layoutModule->indentRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(layoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(layoutModule->skipLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); - connect(layoutModule->skipLengthCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - - connect(layoutModule->classCO, SIGNAL(activated(int)), this, SLOT(classChanged())); - connect(layoutModule->skipCO, SIGNAL(activated(int)), this, SLOT(setSkip(int))); - connect(layoutModule->skipRB, SIGNAL(toggled(bool)), this, SLOT(enableSkip(bool))); + // maths + connect(mathsModule->amsCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); + connect(mathsModule->amsautoCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); + // float + connect(floatModule, SIGNAL(changed()), this, SLOT(change_adaptor())); + // 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())); + // text layout + connect(textLayoutModule->fontsCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + connect(textLayoutModule->fontsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); + 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())); // margins connect(marginsModule->marginCO, SIGNAL(activated(int)), this, SLOT(setCustomMargins(int))); @@ -137,21 +145,20 @@ QDocumentDialog::QDocumentDialog(QDocument * form) connect(marginsModule->footskipLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); connect(marginsModule->footskipUnit, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - // paper - connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setMargins(int))); - connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setCustomPapersize(int))); - connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setCustomPapersize(int))); - connect(paperModule->portraitRB, SIGNAL(toggled(bool)), this, SLOT(portraitChanged())); - - connect(paperModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(paperModule->paperheightLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); - connect(paperModule->paperwidthLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor())); - connect(paperModule->paperwidthUnitCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(paperModule->paperheightUnitCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(paperModule->portraitRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(paperModule->landscapeRB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(paperModule->twoColumnCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); - connect(paperModule->facingPagesCB, SIGNAL(toggled(bool)), this, SLOT(change_adaptor())); + // page layout + connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)), this, SLOT(setMargins(int))); + 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())); // bullets connect(bulletsModule->bulletsizeCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); @@ -197,30 +204,30 @@ void QDocumentDialog::closeEvent(QCloseEvent * e) void QDocumentDialog::setLSpacing(int item) { - layoutModule->lspacingLE->setEnabled(item == 3); + textLayoutModule->lspacingLE->setEnabled(item == 3); } void QDocumentDialog::setSkip(int item) { bool const enable = (item == 3); - layoutModule->skipLE->setEnabled(enable); - layoutModule->skipLengthCO->setEnabled(enable); + textLayoutModule->skipLE->setEnabled(enable); + textLayoutModule->skipLengthCO->setEnabled(enable); } void QDocumentDialog::enableSkip(bool skip) { - layoutModule->skipCO->setEnabled(skip); - layoutModule->skipLE->setEnabled(skip); - layoutModule->skipLengthCO->setEnabled(skip); + textLayoutModule->skipCO->setEnabled(skip); + textLayoutModule->skipLE->setEnabled(skip); + textLayoutModule->skipLengthCO->setEnabled(skip); if (skip) - setSkip(layoutModule->skipCO->currentItem()); + setSkip(textLayoutModule->skipCO->currentItem()); } void QDocumentDialog::portraitChanged() { - setMargins(paperModule->papersizeCO->currentItem()); + setMargins(pageLayoutModule->papersizeCO->currentItem()); } void QDocumentDialog::setMargins(int papersize) @@ -231,7 +238,7 @@ void QDocumentDialog::setMargins(int papersize) marginsModule->marginCO->insertItem(qt_("Custom")); bool a4size = (papersize == 6 || papersize == 0 && lyxrc.default_papersize == BufferParams::PAPER_A4PAPER); - if (a4size && paperModule->portraitRB->isChecked()) { + if (a4size && pageLayoutModule->portraitRB->isChecked()) { marginsModule->marginCO->insertItem(qt_("Small margins")); marginsModule->marginCO->insertItem(qt_("Very small margins")); marginsModule->marginCO->insertItem(qt_("Very wide margins")); @@ -247,13 +254,13 @@ void QDocumentDialog::setCustomPapersize(int papersize) { bool const custom = (papersize == 1); - paperModule->paperwidthL->setEnabled(custom); - paperModule->paperwidthLE->setEnabled(custom); - paperModule->paperwidthUnitCO->setEnabled(custom); - paperModule->paperheightL->setEnabled(custom); - paperModule->paperheightLE->setEnabled(custom); - paperModule->paperheightLE->setFocus(); - paperModule->paperheightUnitCO->setEnabled(custom); + 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); } @@ -294,16 +301,16 @@ void QDocumentDialog::setCustomMargins(int margin) void QDocumentDialog::updateFontsize(string const & items, string const & sel) { - layoutModule->fontsizeCO->clear(); - layoutModule->fontsizeCO->insertItem("default"); + textLayoutModule->fontsizeCO->clear(); + textLayoutModule->fontsizeCO->insertItem("default"); for (int n=0; !token(items,'|',n).empty(); ++n) - layoutModule->fontsizeCO-> + textLayoutModule->fontsizeCO-> insertItem(toqstr(token(items,'|',n))); - for (int n = 0; nfontsizeCO->count(); ++n) { - if (fromqstr(layoutModule->fontsizeCO->text(n)) == sel) { - layoutModule->fontsizeCO->setCurrentItem(n); + for (int n = 0; nfontsizeCO->count(); ++n) { + if (fromqstr(textLayoutModule->fontsizeCO->text(n)) == sel) { + textLayoutModule->fontsizeCO->setCurrentItem(n); break; } } @@ -312,16 +319,16 @@ void QDocumentDialog::updateFontsize(string const & items, string const & sel) void QDocumentDialog::updatePagestyle(string const & items, string const & sel) { - layoutModule->pagestyleCO->clear(); - layoutModule->pagestyleCO->insertItem("default"); + pageLayoutModule->pagestyleCO->clear(); + pageLayoutModule->pagestyleCO->insertItem("default"); for (int n=0; !token(items,'|',n).empty(); ++n) - layoutModule->pagestyleCO-> + pageLayoutModule->pagestyleCO-> insertItem(toqstr(token(items,'|',n))); - for (int n = 0; npagestyleCO->count(); ++n) { - if (fromqstr(layoutModule->pagestyleCO->text(n))==sel) { - layoutModule->pagestyleCO->setCurrentItem(n); + for (int n = 0; npagestyleCO->count(); ++n) { + if (fromqstr(pageLayoutModule->pagestyleCO->text(n))==sel) { + pageLayoutModule->pagestyleCO->setCurrentItem(n); break; } } @@ -333,7 +340,7 @@ void QDocumentDialog::classChanged() ControlDocument & cntrl = form_->controller(); BufferParams & params = cntrl.params(); - lyx::textclass_type const tc = layoutModule->classCO->currentItem(); + lyx::textclass_type const tc = latexModule->classCO->currentItem(); if (form_->controller().loadTextclass(tc)) { params.textclass = tc; @@ -349,10 +356,10 @@ void QDocumentDialog::classChanged() params.pagestyle); } } else { - for (int n = 0; nclassCO->count(); ++n) { - if (layoutModule->classCO->text(n) == + for (int n = 0; nclassCO->count(); ++n) { + if (latexModule->classCO->text(n) == toqstr(cntrl.textClass().description())) { - layoutModule->classCO->setCurrentItem(n); + latexModule->classCO->setCurrentItem(n); break; } } diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h index 2e825d1d9f..2620a39edf 100644 --- a/src/frontends/qt2/QDocumentDialog.h +++ b/src/frontends/qt2/QDocumentDialog.h @@ -19,9 +19,10 @@ #include "ui/BulletsModuleBase.h" #include "BulletsModule.h" -#include "ui/ClassModuleBase.h" -#include "ui/PackagesModuleBase.h" -#include "ui/PaperModuleBase.h" +#include "ui/TextLayoutModuleBase.h" +#include "ui/MathsModuleBase.h" +#include "ui/LaTeXModuleBase.h" +#include "ui/PageLayoutModuleBase.h" #include "ui/LanguageModuleBase.h" #include "ui/BiblioModuleBase.h" #include "ui/NumberingModuleBase.h" @@ -29,6 +30,7 @@ #include "ui/PreambleModuleBase.h" class QDocument; +class FloatPlacement; class QDocumentDialog : public QDocumentDialogBase { Q_OBJECT @@ -62,15 +64,17 @@ protected: void closeEvent(QCloseEvent * e); private: - ClassModuleBase * layoutModule; - PaperModuleBase * paperModule; + TextLayoutModuleBase * textLayoutModule; + PageLayoutModuleBase * pageLayoutModule; MarginsModuleBase * marginsModule; LanguageModuleBase * langModule; BulletsModule * bulletsModule; NumberingModuleBase * numberingModule; BiblioModuleBase * biblioModule; - PackagesModuleBase * packagesModule; + MathsModuleBase * mathsModule; + LaTeXModuleBase * latexModule; PreambleModuleBase * preambleModule; + FloatPlacement * floatModule; QDocument * form_; }; diff --git a/src/frontends/qt2/QFloat.C b/src/frontends/qt2/QFloat.C index bec143567b..af279acf5c 100644 --- a/src/frontends/qt2/QFloat.C +++ b/src/frontends/qt2/QFloat.C @@ -15,6 +15,7 @@ #include "QFloat.h" #include "Qt2BC.h" #include "qt_helpers.h" +#include "floatplacement.h" #include "insets/insetfloat.h" #include "support/lstrings.h" @@ -40,68 +41,13 @@ void QFloat::build_dialog() bcview().setOK(dialog_->okPB); bcview().setRestore(dialog_->restorePB); - bcview().addReadOnly(dialog_->topCB); - bcview().addReadOnly(dialog_->bottomCB); - bcview().addReadOnly(dialog_->herepossiblyCB); - bcview().addReadOnly(dialog_->heredefinitelyCB); - bcview().addReadOnly(dialog_->pageCB); - bcview().addReadOnly(dialog_->ignoreCB); - bcview().addReadOnly(dialog_->defaultsCB); - bcview().addReadOnly(dialog_->spanCB); + bcview().addReadOnly(dialog_->floatFP); } void QFloat::update_contents() { - bool def_placement = false; - bool top = false; - bool bottom = false; - bool page = false; - bool here = false; - bool force = false; - bool here_definitely = false; - - InsetFloatParams const & params = controller().params(); - - string const & placement = params.placement; - - if (placement.empty()) { - def_placement = true; - } else if (contains(placement, "H")) { - here_definitely = true; - } else { - if (contains(placement, "!")) { - force = true; - } - if (contains(placement, "t")) { - top = true; - } - if (contains(placement, "b")) { - bottom = true; - } - if (contains(placement, "p")) { - page = true; - } - if (contains(placement, "h")) { - here = true; - } - } - - dialog_->defaultsCB->setChecked(def_placement); - dialog_->topCB->setChecked(top); - dialog_->bottomCB->setChecked(bottom); - dialog_->pageCB->setChecked(page); - dialog_->herepossiblyCB->setChecked(here); - dialog_->ignoreCB->setChecked(force); - dialog_->ignoreCB->setEnabled(top || bottom || page || here); - dialog_->heredefinitelyCB->setChecked(here_definitely); - - if (params.wide) { - dialog_->herepossiblyCB->setChecked(false); - dialog_->bottomCB->setChecked(false); - } - - dialog_->spanCB->setChecked(params.wide); + dialog_->floatFP->set(controller().params()); } @@ -109,33 +55,5 @@ void QFloat::apply() { InsetFloatParams & params = controller().params(); - params.wide = dialog_->spanCB->isChecked(); - - if (dialog_->defaultsCB->isChecked()) { - params.placement.erase(); - return; - } - - string placement; - - if (dialog_->heredefinitelyCB->isChecked()) { - placement += 'H'; - } else { - if (dialog_->ignoreCB->isChecked()) { - placement += '!'; - } - if (dialog_->topCB->isChecked()) { - placement += 't'; - } - if (dialog_->bottomCB->isChecked()) { - placement += 'b'; - } - if (dialog_->pageCB->isChecked()) { - placement += 'p'; - } - if (dialog_->herepossiblyCB->isChecked()) { - placement += 'h'; - } - } - params.placement = placement; + params.placement = dialog_->floatFP->get(params.wide); } diff --git a/src/frontends/qt2/QFloatDialog.C b/src/frontends/qt2/QFloatDialog.C index 245d1ba427..e94c7adea1 100644 --- a/src/frontends/qt2/QFloatDialog.C +++ b/src/frontends/qt2/QFloatDialog.C @@ -15,6 +15,8 @@ #include "ControlFloat.h" +#include "floatplacement.h" + #include #include @@ -34,6 +36,12 @@ QFloatDialog::QFloatDialog(QFloat * form) form, SLOT(slotApply())); connect(closePB, SIGNAL(clicked()), form, SLOT(slotClose())); + + // enable span columns checkbox + floatFP->useWide(); + + connect(floatFP, SIGNAL(changed()), + this, SLOT(change_adaptor())); } @@ -48,43 +56,3 @@ void QFloatDialog::closeEvent(QCloseEvent * e) form_->slotWMHide(); e->accept(); } - -void QFloatDialog::tbhpClicked() -{ - heredefinitelyCB->setChecked(false); - bool allow(topCB->isChecked()); - allow |= bottomCB->isChecked(); - allow |= pageCB->isChecked(); - allow |= herepossiblyCB->isChecked(); - ignoreCB->setEnabled(allow); -} - - -void QFloatDialog::heredefinitelyClicked() -{ - if (heredefinitelyCB->isChecked()); - ignoreCB->setEnabled(false); - - topCB->setChecked(false); - bottomCB->setChecked(false); - pageCB->setChecked(false); - herepossiblyCB->setChecked(false); - ignoreCB->setChecked(false); -} - - -void QFloatDialog::spanClicked() -{ - bool const span(spanCB->isChecked()); - - if (!defaultsCB->isChecked()) { - herepossiblyCB->setEnabled(!span); - heredefinitelyCB->setEnabled(!span); - } - - if (!span) - return; - - herepossiblyCB->setChecked(false); - heredefinitelyCB->setChecked(false); -} diff --git a/src/frontends/qt2/QFloatDialog.h b/src/frontends/qt2/QFloatDialog.h index 708024687f..b61626e225 100644 --- a/src/frontends/qt2/QFloatDialog.h +++ b/src/frontends/qt2/QFloatDialog.h @@ -21,13 +21,13 @@ class QFloatDialog : public QFloatDialogBase { Q_OBJECT public: QFloatDialog(QFloat * form); + protected slots: virtual void change_adaptor(); - virtual void tbhpClicked(); - virtual void heredefinitelyClicked(); - virtual void spanClicked(); + protected: virtual void closeEvent(QCloseEvent * e); + private: QFloat * form_; }; diff --git a/src/frontends/qt2/floatplacement.C b/src/frontends/qt2/floatplacement.C new file mode 100644 index 0000000000..a5dcf74eb1 --- /dev/null +++ b/src/frontends/qt2/floatplacement.C @@ -0,0 +1,229 @@ +/** + * \file floatplacement.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Edwin Leuven + * \author John Levon + * + * Full author contact details are available in file CREDITS + */ + +#include + +#include "floatplacement.h" +#include "qt_helpers.h" + +#include "insets/insetfloat.h" +#include "support/lstrings.h" + +#include +#include +#include + +// FIXME: set disabled doesn't work properly + +FloatPlacement::FloatPlacement(QWidget * parent, char * name) + : QWidget(parent, name) +{ + QHBoxLayout * toplayout = new QHBoxLayout(this, 11, 6); + layout = new QVBoxLayout(0, 0, 6); + QGroupBox * options = new QGroupBox(qt_("Advanced Placement Options"), this); + + defaultsCB = new QCheckBox(qt_("Use &default placement"), this); + ignoreCB = new QCheckBox(qt_("&Ignore LaTeX rules"), options); + pageCB = new QCheckBox(qt_("&Page of floats"), options); + heredefinitelyCB = new QCheckBox(qt_("Here definitely"), options); + herepossiblyCB = new QCheckBox(qt_("&Here if possible"), options); + bottomCB = new QCheckBox(qt_("&Bottom of page"), options); + topCB = new QCheckBox(qt_("&Top of page"), options); + spanCB = 0; + + layout->addWidget(defaultsCB); + + QVBoxLayout * optlay = new QVBoxLayout(options, 10, 6); + optlay->addSpacing(6); + optlay->addWidget(topCB); + optlay->addWidget(bottomCB); + optlay->addWidget(pageCB); + optlay->addWidget(herepossiblyCB); + optlay->addWidget(heredefinitelyCB); + optlay->addWidget(ignoreCB); + + layout->addWidget(options); + + toplayout->addLayout(layout); + + connect(defaultsCB, SIGNAL(toggled(bool)), options, SLOT(setDisabled(bool))); + connect(defaultsCB, SIGNAL(toggled(bool)), ignoreCB, SLOT(setDisabled(bool))); + connect(defaultsCB, SIGNAL(toggled(bool)), pageCB, SLOT(setDisabled(bool))); + connect(defaultsCB, SIGNAL(toggled(bool)), heredefinitelyCB, SLOT(setDisabled(bool))); + connect(defaultsCB, SIGNAL(toggled(bool)), herepossiblyCB, SLOT(setDisabled(bool))); + connect(defaultsCB, SIGNAL(toggled(bool)), bottomCB, SLOT(setDisabled(bool))); + connect(defaultsCB, SIGNAL(toggled(bool)), topCB, SLOT(setDisabled(bool))); + + connect(heredefinitelyCB, SIGNAL(clicked()), this, SLOT(heredefinitelyClicked())); + connect(topCB, SIGNAL(clicked()), this, SLOT(tbhpClicked())); + connect(bottomCB, SIGNAL(clicked()), this, SLOT(tbhpClicked())); + connect(pageCB, SIGNAL(clicked()), this, SLOT(tbhpClicked())); + connect(herepossiblyCB, SIGNAL(clicked()), this, SLOT(tbhpClicked())); + connect(defaultsCB, SIGNAL(clicked()), this, SLOT(tbhpClicked())); + + connect(defaultsCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); + connect(ignoreCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); + connect(pageCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); + connect(heredefinitelyCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); + connect(herepossiblyCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); + connect(bottomCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); + connect(topCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); +} + + +void FloatPlacement::useWide() +{ + spanCB = new QCheckBox(qt_("&Span columns"), this); + layout->addWidget(spanCB); + connect(spanCB, SIGNAL(clicked()), this, SLOT(spanClicked())); + connect(spanCB, SIGNAL(toggled(bool)), this, SLOT(changedSlot())); +} + + +void FloatPlacement::changedSlot() +{ + emit changed(); +} + + +void FloatPlacement::set(string const & placement) +{ + bool def_placement = false; + bool top = false; + bool bottom = false; + bool page = false; + bool here = false; + bool force = false; + bool here_definitely = false; + + if (placement.empty()) { + def_placement = true; + } else if (contains(placement, "H")) { + here_definitely = true; + } else { + if (contains(placement, "!")) { + force = true; + } + if (contains(placement, "t")) { + top = true; + } + if (contains(placement, "b")) { + bottom = true; + } + if (contains(placement, "p")) { + page = true; + } + if (contains(placement, "h")) { + here = true; + } + } + + defaultsCB->setChecked(def_placement); + topCB->setChecked(top); + bottomCB->setChecked(bottom); + pageCB->setChecked(page); + herepossiblyCB->setChecked(here); + ignoreCB->setChecked(force); + ignoreCB->setEnabled(top || bottom || page || here); + heredefinitelyCB->setChecked(here_definitely); +} + + +void FloatPlacement::set(InsetFloatParams const & params) +{ + set(params.placement); + + if (params.wide) { + herepossiblyCB->setChecked(false); + bottomCB->setChecked(false); + } + + spanCB->setChecked(params.wide); +} + + +string const FloatPlacement::get(bool & wide) const +{ + wide = spanCB->isChecked(); + + return get(); +} + + +string const FloatPlacement::get() const +{ + string placement; + + if (defaultsCB->isChecked()) + return placement; + + if (heredefinitelyCB->isChecked()) { + placement += 'H'; + } else { + if (ignoreCB->isChecked()) { + placement += '!'; + } + if (topCB->isChecked()) { + placement += 't'; + } + if (bottomCB->isChecked()) { + placement += 'b'; + } + if (pageCB->isChecked()) { + placement += 'p'; + } + if (herepossiblyCB->isChecked()) { + placement += 'h'; + } + } + return placement; +} + + +void FloatPlacement::tbhpClicked() +{ + heredefinitelyCB->setChecked(false); + bool allow(topCB->isChecked()); + allow |= bottomCB->isChecked(); + allow |= pageCB->isChecked(); + allow |= herepossiblyCB->isChecked(); + ignoreCB->setEnabled(allow); +} + + +void FloatPlacement::heredefinitelyClicked() +{ + if (heredefinitelyCB->isChecked()); + ignoreCB->setEnabled(false); + + topCB->setChecked(false); + bottomCB->setChecked(false); + pageCB->setChecked(false); + herepossiblyCB->setChecked(false); + ignoreCB->setChecked(false); +} + + +void FloatPlacement::spanClicked() +{ + bool const span(spanCB->isChecked()); + + if (!defaultsCB->isChecked()) { + herepossiblyCB->setEnabled(!span); + heredefinitelyCB->setEnabled(!span); + } + + if (!span) + return; + + herepossiblyCB->setChecked(false); + heredefinitelyCB->setChecked(false); +} diff --git a/src/frontends/qt2/floatplacement.h b/src/frontends/qt2/floatplacement.h new file mode 100644 index 0000000000..8c1c053b95 --- /dev/null +++ b/src/frontends/qt2/floatplacement.h @@ -0,0 +1,56 @@ +/** + * \file floatplacement.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Edwin Leuven + * \author John Levon + * + * Full author contact details are available in file CREDITS + */ + +#include + +#include "LString.h" + +#include + +class QCheckBox; +class QVBoxLayout; +class InsetFloatParams; + +class FloatPlacement : public QWidget { + Q_OBJECT + +public: + FloatPlacement(QWidget * parent, char * name); + + void useWide(); + + void set(InsetFloatParams const & params); + void set(string const & placement); + + string const get(bool & wide) const; + string const get() const; + +public slots: + void tbhpClicked(); + void heredefinitelyClicked(); + void spanClicked(); + void changedSlot(); + +signals: + void changed(); + +private: + QVBoxLayout * layout; + + QCheckBox * defaultsCB; + QCheckBox * spanCB; + QCheckBox * ignoreCB; + QCheckBox * pageCB; + QCheckBox * heredefinitelyCB; + QCheckBox * herepossiblyCB; + QCheckBox * bottomCB; + QCheckBox * topCB; +}; diff --git a/src/frontends/qt2/ui/BiblioModuleBase.ui b/src/frontends/qt2/ui/BiblioModuleBase.ui index 9764f184ad..7bf60817d4 100644 --- a/src/frontends/qt2/ui/BiblioModuleBase.ui +++ b/src/frontends/qt2/ui/BiblioModuleBase.ui @@ -13,15 +13,15 @@ 0 0 - 180 - 130 + 450 + 376 caption Form1 - + margin 11 @@ -30,83 +30,152 @@ spacing 6 - - QGroupBox + + QLayoutWidget name - GroupBox3 + Layout4 - - sizePolicy - - 7 - 5 - - - - title - Style - - + margin - 11 + 0 spacing 6 - - QCheckBox + + QLayoutWidget name - natbibCB - - - text - Use &NatBib + Layout3 + + + margin + 0 + + + spacing + 6 + + + QCheckBox + + name + natbibCB + + + text + Use &NatBib + + + toolTip + Use the LaTeX natbib package + + + + QLayoutWidget + + name + Layout2 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + citationStyleL + + + enabled + false + + + text + Cite &style: + + + buddy + citeStyleCO + + + + QComboBox + + name + citeStyleCO + + + enabled + false + + + sizePolicy + + 5 + 0 + + + + + + - - QLabel - + + name - citationStyleL + Spacer1 - enabled - false + orientation + Horizontal - text - Cite &Style: + sizeType + Minimum - buddy - citeStyleCO - - - - QComboBox - - name - citeStyleCO + sizeHint + + 20 + 20 + - - enabled - false - - - sizePolicy - - 7 - 0 - - - - + + - + + + name + Spacer2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + diff --git a/src/frontends/qt2/ui/BulletsModuleBase.ui b/src/frontends/qt2/ui/BulletsModuleBase.ui index cebd93ed19..b72ddfc9ae 100644 --- a/src/frontends/qt2/ui/BulletsModuleBase.ui +++ b/src/frontends/qt2/ui/BulletsModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 300 + 296 329 diff --git a/src/frontends/qt2/ui/ClassModuleBase.ui b/src/frontends/qt2/ui/ClassModuleBase.ui deleted file mode 100644 index cea4ea3657..0000000000 --- a/src/frontends/qt2/ui/ClassModuleBase.ui +++ /dev/null @@ -1,348 +0,0 @@ - -ClassModuleBase -config.h -qt_helpers.h - - QWidget - - name - ClassModuleBase - - - geometry - - 0 - 0 - 411 - 396 - - - - caption - Form2 - - - - margin - 11 - - - spacing - 6 - - - QLabel - - name - classL - - - text - Document &class: - - - buddy - classCO - - - - QComboBox - - name - classCO - - - sizePolicy - - 3 - 0 - - - - - QLineEdit - - name - optionsLE - - - - QLabel - - name - optionsL - - - text - Op&tions: - - - buddy - optionsLE - - - - QComboBox - - name - pagestyleCO - - - sizePolicy - - 3 - 0 - - - - - QLabel - - name - pagestyleL - - - text - Page &style: - - - buddy - pagestyleCO - - - - QComboBox - - name - fontsizeCO - - - - QButtonGroup - - name - separationG - - - title - Separation - - - - margin - 11 - - - spacing - 6 - - - QComboBox - - name - skipCO - - - enabled - false - - - - QLineEdit - - name - skipLE - - - enabled - false - - - sizePolicy - - 1 - 0 - - - - - QRadioButton - - name - indentRB - - - text - &Indent - - - - QRadioButton - - name - skipRB - - - text - S&kip - - - - LengthCombo - - name - skipLengthCO - - - enabled - false - - - - - - QLabel - - name - floatPlacementL - - - enabled - true - - - text - Float &placement: - - - buddy - floatPlacementLE - - - - QLineEdit - - name - floatPlacementLE - - - - QLineEdit - - name - lspacingLE - - - enabled - false - - - sizePolicy - - 1 - 0 - - - - - QLabel - - name - fontsL - - - text - &Font && size: - - - buddy - fontsCO - - - - QLabel - - name - lspacingL - - - text - &Line spacing: - - - buddy - lspacingCO - - - - QComboBox - - name - fontsCO - - - sizePolicy - - 3 - 0 - - - - - QComboBox - - name - lspacingCO - - - sizePolicy - - 3 - 0 - - - - duplicatesEnabled - false - - - - - - - LengthCombo -
lengthcombo.h
- - -1 - -1 - - 0 - - 5 - 5 - - image0 - selectionChanged(LyXLength::UNIT) - - - - - image0 - 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 - - - - classCO - optionsLE - pagestyleCO - fontsCO - fontsizeCO - lspacingCO - lspacingLE - floatPlacementLE - indentRB - skipRB - skipCO - skipLE - - diff --git a/src/frontends/qt2/ui/LaTeXModuleBase.ui b/src/frontends/qt2/ui/LaTeXModuleBase.ui new file mode 100644 index 0000000000..a1aa572feb --- /dev/null +++ b/src/frontends/qt2/ui/LaTeXModuleBase.ui @@ -0,0 +1,245 @@ + +LaTeXModuleBase +config.h +qt_helpers.h + + QWidget + + name + LaTeXModuleBase + + + geometry + + 0 + 0 + 456 + 273 + + + + caption + Form1 + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout3 + + + + margin + 0 + + + spacing + 6 + + + QLayoutWidget + + name + Layout20 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + classL + + + text + Document &class: + + + buddy + classCO + + + + QComboBox + + name + classCO + + + sizePolicy + + 5 + 0 + + + + + + + + name + Spacer19 + + + orientation + Vertical + + + sizeType + Fixed + + + sizeHint + + 20 + 21 + + + + + QLayoutWidget + + name + Layout19 + + + + margin + 0 + + + spacing + 6 + + + QGroupBox + + name + GroupBox4 + + + title + Class Settings + + + + margin + 11 + + + spacing + 6 + + + QLabel + + name + optionsL + + + text + &Options: + + + buddy + optionsLE + + + + QLineEdit + + name + optionsLE + + + sizePolicy + + 5 + 0 + + + + + QComboBox + + name + psdriverCO + + + sizePolicy + + 5 + 0 + + + + duplicatesEnabled + false + + + + QLabel + + name + psdriverL + + + text + Postscript &driver: + + + buddy + psdriverCO + + + + + + + + + name + Spacer9 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + + + classCO + optionsLE + psdriverCO + + diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui index e7f373adba..a171de5304 100644 --- a/src/frontends/qt2/ui/LanguageModuleBase.ui +++ b/src/frontends/qt2/ui/LanguageModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 448 + 444 451 @@ -34,7 +34,7 @@ QLayoutWidget name - Layout1 + Layout18 @@ -69,11 +69,32 @@ sizePolicy - 7 + 5 0 + + + name + Spacer32 + + + orientation + Horizontal + + + sizeType + MinimumExpanding + + + sizeHint + + 20 + 20 + + + @@ -91,7 +112,7 @@ QLayoutWidget name - Layout2 + Layout17 @@ -126,7 +147,7 @@ sizePolicy - 7 + 5 0 @@ -135,6 +156,27 @@ false + + + name + Spacer31 + + + orientation + Horizontal + + + sizeType + MinimumExpanding + + + sizeHint + + 20 + 20 + + + @@ -151,93 +193,105 @@ exclusive true - - QRadioButton - - name - singleQuoteRB - - - geometry - - 11 - 26 - 65 - 26 - - - - text - &Single - - - - QRadioButton - - name - doubleQuoteRB - - - geometry - - 11 - 58 - 65 - 26 - - - - text - &Double - - - - QComboBox - - name - quoteStyleCO - + - geometry - - 82 - 90 - 337 - 34 - - - - sizePolicy - - 7 - 0 - - - - - QLabel - - name - typeL - - - geometry - - 11 - 90 - 65 - 34 - + margin + 11 - text - &Type: - - - buddy - quoteStyleCO + spacing + 6 - + + QRadioButton + + name + singleQuoteRB + + + text + &Single + + + + QRadioButton + + name + doubleQuoteRB + + + text + &Double + + + + QLayoutWidget + + name + Layout19 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + typeL + + + text + &Type: + + + buddy + quoteStyleCO + + + + QComboBox + + name + quoteStyleCO + + + sizePolicy + + 5 + 0 + + + + + + name + Spacer33 + + + orientation + Horizontal + + + sizeType + MinimumExpanding + + + sizeHint + + 20 + 20 + + + + + + diff --git a/src/frontends/qt2/ui/MarginsModuleBase.ui b/src/frontends/qt2/ui/MarginsModuleBase.ui index 30f05417a3..d8ec01c51b 100644 --- a/src/frontends/qt2/ui/MarginsModuleBase.ui +++ b/src/frontends/qt2/ui/MarginsModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 341 + 337 370 @@ -384,6 +384,13 @@ name marginCO + + sizePolicy + + 5 + 0 + + diff --git a/src/frontends/qt2/ui/MathsModuleBase.ui b/src/frontends/qt2/ui/MathsModuleBase.ui new file mode 100644 index 0000000000..e268c0b12f --- /dev/null +++ b/src/frontends/qt2/ui/MathsModuleBase.ui @@ -0,0 +1,93 @@ + +MathsModuleBase +config.h +qt_helpers.h + + QWidget + + name + MathsModuleBase + + + geometry + + 0 + 0 + 351 + 233 + + + + caption + Form1 + + + + margin + 11 + + + spacing + 6 + + + QCheckBox + + name + amsautoCB + + + text + &Use AMS math package automatically + + + checked + false + + + + QCheckBox + + name + amsCB + + + text + Use AMS &math package + + + + + name + Spacer1 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + + amsautoCB + toggled(bool) + amsCB + setDisabled(bool) + + + + amsautoCB + + diff --git a/src/frontends/qt2/ui/NumberingModuleBase.ui b/src/frontends/qt2/ui/NumberingModuleBase.ui index 067c30f175..387d30b47a 100644 --- a/src/frontends/qt2/ui/NumberingModuleBase.ui +++ b/src/frontends/qt2/ui/NumberingModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 236 + 234 217 diff --git a/src/frontends/qt2/ui/PackagesModuleBase.ui b/src/frontends/qt2/ui/PackagesModuleBase.ui deleted file mode 100644 index 506db62c03..0000000000 --- a/src/frontends/qt2/ui/PackagesModuleBase.ui +++ /dev/null @@ -1,148 +0,0 @@ - -PackagesModuleBase -config.h -qt_helpers.h - - QWidget - - name - PackagesModuleBase - - - geometry - - 0 - 0 - 353 - 231 - - - - caption - Form1 - - - - margin - 11 - - - spacing - 6 - - - QGroupBox - - name - packagesG - - - title - AMS - - - - margin - 11 - - - spacing - 6 - - - QCheckBox - - name - amsautoCB - - - text - &Use AMS math package automatically - - - checked - false - - - - QCheckBox - - name - amsCB - - - text - Use AMS &math package - - - - - - QGroupBox - - name - packagesoptionsG - - - title - Options - - - - margin - 11 - - - spacing - 6 - - - QLabel - - name - psdriverL - - - text - Postscript &driver: - - - buddy - psdriverCO - - - - QComboBox - - name - psdriverCO - - - sizePolicy - - 3 - 0 - - - - duplicatesEnabled - false - - - - - - - - - amsautoCB - toggled(bool) - amsCB - setDisabled(bool) - - - - amsautoCB - psdriverCO - - diff --git a/src/frontends/qt2/ui/PaperModuleBase.ui b/src/frontends/qt2/ui/PageLayoutModuleBase.ui similarity index 83% rename from src/frontends/qt2/ui/PaperModuleBase.ui rename to src/frontends/qt2/ui/PageLayoutModuleBase.ui index 9f803f307c..63685dc7d6 100644 --- a/src/frontends/qt2/ui/PaperModuleBase.ui +++ b/src/frontends/qt2/ui/PageLayoutModuleBase.ui @@ -1,27 +1,27 @@ -PaperModuleBase +PageLayoutModuleBase config.h qt_helpers.h QWidget name - PaperModuleBase + PageLayoutModuleBase geometry 0 0 - 231 - 269 + 392 + 448 caption Form1 - + margin 11 @@ -30,50 +30,7 @@ spacing 6 - - - name - Spacer24 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QCheckBox - - name - twoColumnCB - - - text - Two-&column document - - - - QCheckBox - - name - facingPagesCB - - - text - &Two-sided document - - - + QGroupBox name @@ -134,21 +91,6 @@ paperwidthLE - - QLabel - - name - psizeL - - - text - Paper &size: - - - buddy - papersizeCO - - QComboBox @@ -162,6 +104,10 @@ 0 + + toolTip + Choose a particular paper size, or set your own with "Custom" + QLineEdit @@ -223,7 +169,7 @@ - + QButtonGroup name @@ -270,7 +216,93 @@ - + + QLayoutWidget + + name + Layout23 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + pagestyleL + + + text + Page &style: + + + buddy + pagestyleCO + + + + QComboBox + + name + pagestyleCO + + + sizePolicy + + 5 + 0 + + + + toolTip + Set the style used for the page header and footer + + + + + + QCheckBox + + name + facingPagesCB + + + text + &Two-sided document + + + toolTip + Layout the page for double-sided printing + + + + + name + Spacer24 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + @@ -301,7 +333,7 @@ paperwidthLE portraitRB landscapeRB - twoColumnCB + pagestyleCO facingPagesCB diff --git a/src/frontends/qt2/ui/QFloatDialogBase.ui b/src/frontends/qt2/ui/QFloatDialogBase.ui index 3839f55486..96f1c3111d 100644 --- a/src/frontends/qt2/ui/QFloatDialogBase.ui +++ b/src/frontends/qt2/ui/QFloatDialogBase.ui @@ -13,8 +13,8 @@ 0 0 - 376 - 259 + 410 + 336 @@ -35,199 +35,10 @@ 6 - QCheckBox + FloatPlacement name - defaultsCB - - - text - Use &default placement - - - toolTip - Use LaTeX default settings - - - - QGroupBox - - name - placement - - - title - Advanced Placement Options - - - - margin - 11 - - - spacing - 6 - - - QLayoutWidget - - name - Layout6 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - topCB - - - text - &Top of page - - - toolTip - Prefer top of page - - - - QCheckBox - - name - bottomCB - - - text - &Bottom of page - - - toolTip - Prefer bottom of page - - - - QCheckBox - - name - pageCB - - - text - &Page of floats - - - toolTip - Separate page for multiple floats - - - - QCheckBox - - name - herepossiblyCB - - - text - &Here if possible - - - toolTip - Place float at current position if possible - - - - QCheckBox - - name - ignoreCB - - - text - &Ignore LaTeX rules - - - toolTip - Ignore the internal LaTeX placement rules - - - - - - QLayoutWidget - - name - Layout7 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - heredefinitelyCB - - - text - Here definitely - - - toolTip - Place float at current position - - - - - name - Spacer7 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - - QCheckBox - - name - spanCB - - - text - &Span columns - - - toolTip - Span columns in multi-column documents + floatFP @@ -322,107 +133,30 @@ + + + FloatPlacement +
floatplacement.h
+ + -1 + -1 + + 1 + + 5 + 5 + + image0 + + + + + image0 + 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 + + - - defaultsCB - toggled(bool) - placement - setDisabled(bool) - - - defaultsCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - defaultsCB - toggled(bool) - QFloatDialogBase - tbhpClicked() - - - topCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - topCB - clicked() - QFloatDialogBase - tbhpClicked() - - - bottomCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - bottomCB - clicked() - QFloatDialogBase - tbhpClicked() - - - pageCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - pageCB - clicked() - QFloatDialogBase - tbhpClicked() - - - herepossiblyCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - herepossiblyCB - clicked() - QFloatDialogBase - tbhpClicked() - - - ignoreCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - spanCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - spanCB - clicked() - QFloatDialogBase - spanClicked() - - - heredefinitelyCB - toggled(bool) - QFloatDialogBase - change_adaptor() - - - heredefinitelyCB - clicked() - QFloatDialogBase - heredefinitelyClicked() - change_adaptor() - heredefinitelyClicked() - spanClicked() - tbhpClicked() restorePB diff --git a/src/frontends/qt2/ui/TextLayoutModuleBase.ui b/src/frontends/qt2/ui/TextLayoutModuleBase.ui new file mode 100644 index 0000000000..e9c4ba2609 --- /dev/null +++ b/src/frontends/qt2/ui/TextLayoutModuleBase.ui @@ -0,0 +1,432 @@ + +TextLayoutModuleBase +config.h +qt_helpers.h + + QWidget + + name + TextLayoutModuleBase + + + geometry + + 0 + 0 + 441 + 440 + + + + caption + Form2 + + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout22 + + + + margin + 0 + + + spacing + 6 + + + QGroupBox + + name + GroupBox3 + + + title + Document Font + + + + margin + 11 + + + spacing + 6 + + + QLabel + + name + TextLabel2 + + + text + &Font: + + + buddy + fontsCO + + + + QComboBox + + name + fontsizeCO + + + sizePolicy + + 5 + 0 + + + + + QComboBox + + name + fontsCO + + + sizePolicy + + 5 + 0 + + + + + QLabel + + name + TextLabel2_2 + + + text + &Size: + + + buddy + fontsizeCO + + + + + + + + QButtonGroup + + name + ButtonGroup6 + + + title + Separate Paragraphs With + + + + margin + 11 + + + spacing + 6 + + + QRadioButton + + name + indentRB + + + text + &Indentation + + + toolTip + Indent consecutive paragraphs + + + + QRadioButton + + name + skipRB + + + text + &Vertical space + + + toolTip + + + + + QLayoutWidget + + name + Layout2 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer1 + + + orientation + Horizontal + + + sizeType + Fixed + + + sizeHint + + 31 + 20 + + + + + QLayoutWidget + + name + Layout1 + + + + margin + 0 + + + spacing + 6 + + + QComboBox + + name + skipCO + + + enabled + false + + + + QLineEdit + + name + skipLE + + + enabled + false + + + sizePolicy + + 1 + 0 + + + + + LengthCombo + + name + skipLengthCO + + + enabled + false + + + + + + + + + + QLayoutWidget + + name + Layout21 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + lspacingL + + + text + &Line spacing: + + + buddy + lspacingCO + + + + QLayoutWidget + + name + Layout4 + + + + margin + 0 + + + spacing + 6 + + + QComboBox + + name + lspacingCO + + + sizePolicy + + 5 + 0 + + + + duplicatesEnabled + false + + + + QLineEdit + + name + lspacingLE + + + enabled + false + + + sizePolicy + + 1 + 0 + + + + + + + + + QCheckBox + + name + twoColumnCB + + + text + Two-&column document + + + toolTip + Format text into two columns + + + + + name + Spacer3 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + + LengthCombo +
lengthcombo.h
+ + -1 + -1 + + 0 + + 5 + 5 + + image0 + selectionChanged(LyXLength::UNIT) + + + + + image0 + 789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758 + + + + lspacingCO + lspacingLE + fontsCO + fontsizeCO + indentRB + skipRB + skipCO + skipLE + twoColumnCB + + -- 2.39.5