From 895cfa4a9920f07758e17c46abd23f7f19508994 Mon Sep 17 00:00:00 2001 From: Edwin Leuven Date: Thu, 16 Jan 2003 10:56:49 +0000 Subject: [PATCH] jurgen's improvements to the doc dialog in qt git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5965 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 9 + src/frontends/qt2/QDocument.C | 106 +++++----- src/frontends/qt2/QDocumentDialog.C | 32 +-- src/frontends/qt2/QDocumentDialog.h | 4 +- src/frontends/qt2/ui/ClassModuleBase.ui | 165 +++++++++------ src/frontends/qt2/ui/LanguageModuleBase.ui | 97 ++++++--- src/frontends/qt2/ui/PackagesModuleBase.ui | 81 +------- src/frontends/qt2/ui/QDocumentDialogBase.ui | 216 +++++++++++--------- 8 files changed, 377 insertions(+), 333 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index f3d41f98fa..3542caa4cb 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,12 @@ +2003-01-16 Juergen Spitzmueller + + * ui/QDocumentDialogBase.ui: + * ui/ClassModuleBase.ui: + * ui/LanguageModuleBase.ui: + * ui/PackagesModuleBase.ui: + * QDocument.C: + * QDocumentDialog.[Ch]: Rearrangement. + 2003-01-15 Juergen Spitzmueller * QIndex.C: diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 6339dd4cd1..4736cf27f3 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -79,6 +79,12 @@ void QDocument::build_dialog() toqstr(lit->first)); } + char const * items[] = {"default", "auto", "latin1", "latin2", + "latin3", "latin4", "latin5", "latin9", + "koi8-r", "koi8-u", "cp866", "cp1251", + "iso88595", "pt154", 0}; + dialog_->langModule->encodingCO->insertStrList(items); + dialog_->langModule->quoteStyleCO->insertItem(qt_("``text''")); dialog_->langModule->quoteStyleCO->insertItem(qt_("''text''")); dialog_->langModule->quoteStyleCO->insertItem(qt_(",,text``")); @@ -87,21 +93,6 @@ void QDocument::build_dialog() dialog_->langModule->quoteStyleCO->insertItem(qt_("»text«")); // packages - char const * items[] = {"default", "auto", "latin1", "latin2", - "latin3", "latin4", "latin5", "latin9", - "koi8-r", "koi8-u", "cp866", "cp1251", - "iso88595", "pt154", 0}; - dialog_->packagesModule->encodingCO->insertStrList(items); - - dialog_->packagesModule->lspacingCO->insertItem( - qt_("Single"), Spacing::Single); - dialog_->packagesModule->lspacingCO->insertItem( - qt_("OneHalf"), Spacing::Onehalf); - dialog_->packagesModule->lspacingCO->insertItem( - qt_("Double"), Spacing::Double); - dialog_->packagesModule->lspacingCO->insertItem( - qt_("Custom"), Spacing::Other); - for (int n = 0; tex_graphics[n][0]; ++n) { QString enc = tex_graphics[n]; dialog_->packagesModule->psdriverCO->insertItem(enc); @@ -147,6 +138,15 @@ void QDocument::build_dialog() dialog_->layoutModule->pagestyleCO->insertItem(qt_("plain")); dialog_->layoutModule->pagestyleCO->insertItem(qt_("headings")); dialog_->layoutModule->pagestyleCO->insertItem(qt_("fancy")); + + dialog_->layoutModule->lspacingCO->insertItem( + qt_("Single"), Spacing::Single); + dialog_->layoutModule->lspacingCO->insertItem( + qt_("OneHalf"), Spacing::Onehalf); + dialog_->layoutModule->lspacingCO->insertItem( + qt_("Double"), Spacing::Double); + dialog_->layoutModule->lspacingCO->insertItem( + qt_("Custom"), Spacing::Other); // margins dialog_->setMargins(0); @@ -179,6 +179,8 @@ void QDocument::apply() else params.quotes_times = InsetQuotes::DoubleQ; + params.inputenc = + fromqstr(dialog_->langModule->encodingCO->currentText()); InsetQuotes::quote_language lga = InsetQuotes::EnglishQ; switch (dialog_->langModule->quoteStyleCO->currentItem()) { @@ -219,39 +221,16 @@ void QDocument::apply() params.user_defined_bullets[3] = dialog_->bulletsModule->getBullet(3); // packages - switch (dialog_->packagesModule->lspacingCO->currentItem()) { - 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, - dialog_->packagesModule-> - lspacingLE->text().toFloat() - ); - break; - } - params.graphicsDriver = fromqstr(dialog_->packagesModule->psdriverCO->currentText()); params.use_amsmath = dialog_->packagesModule->amsCB->isChecked(); - params.inputenc = - fromqstr(dialog_->packagesModule->encodingCO->currentText()); - // layout params.textclass = dialog_->layoutModule->classCO->currentItem(); - - //bool succes = controller().classApply(); - + params.fonts = fromqstr(dialog_->layoutModule->fontsCO->currentText()); @@ -260,6 +239,24 @@ void QDocument::apply() params.pagestyle = fromqstr(dialog_->layoutModule->pagestyleCO->currentText()); + + switch (dialog_->layoutModule->lspacingCO->currentItem()) { + 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, + dialog_->layoutModule-> + lspacingLE->text().toFloat() + ); + break; + } if (dialog_->layoutModule->indentRB->isChecked()) params.paragraph_separation = BufferParams::PARSEP_INDENT; @@ -421,6 +418,15 @@ void QDocument::update_contents() dialog_->langModule->quoteStyleCO->setCurrentItem( params.quotes_language); + + char const * enc[] = { + "default" , "auto" , "latin1" , "latin2" , "latin3" , + "latin4" , "latin5" , "latin9" , "koi8-r" , "koi8-u" , + "cp866" , "cp1251" , "iso88595" , "pt154" }; + for (size_t i = 0; i < sizeof(enc)/sizeof(char *); ++i) { + if (params.inputenc == enc[i]) + dialog_->langModule->encodingCO->setCurrentItem(i); + } // numbering dialog_->numberingModule->tocDepthSB->setValue( @@ -435,15 +441,6 @@ void QDocument::update_contents() dialog_->bulletsModule->setBullet(3,params.user_defined_bullets[3]); // packages - char const * enc[] = { - "default" , "auto" , "latin1" , "latin2" , "latin3" , - "latin4" , "latin5" , "latin9" , "koi8-r" , "koi8-u" , - "cp866" , "cp1251" , "iso88595" , "pt154" }; - for (size_t i = 0; i < sizeof(enc)/sizeof(char *); ++i) { - if (params.inputenc == enc[i]) - dialog_->packagesModule->encodingCO->setCurrentItem(i); - } - QString text = toqstr(params.graphicsDriver); int nitem = dialog_->packagesModule->psdriverCO->count(); for (int n = 0; n < nitem ; ++n) { @@ -464,12 +461,6 @@ void QDocument::update_contents() case Spacing::Default: case Spacing::Single: nitem = 0; break; } - dialog_->packagesModule->lspacingCO->setCurrentItem(nitem); - if (params.spacing.getSpace() == Spacing::Other) { - dialog_->packagesModule->lspacingLE->setText( - toqstr(tostr(params.spacing.getValue()))); - dialog_->setLSpacing(3); - } // layout for (int n = 0; nlayoutModule->classCO->count(); ++n) { @@ -493,6 +484,13 @@ void QDocument::update_contents() } } + dialog_->layoutModule->lspacingCO->setCurrentItem(nitem); + if (params.spacing.getSpace() == Spacing::Other) { + dialog_->layoutModule->lspacingLE->setText( + toqstr(tostr(params.spacing.getValue()))); + dialog_->setLSpacing(3); + } + if (params.paragraph_separation == BufferParams::PARSEP_INDENT) { dialog_->layoutModule->indentRB->setChecked(true); diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 47b3a4578e..369b389e98 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -64,13 +64,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 +78,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); @@ -119,6 +119,8 @@ QDocumentDialog::QDocumentDialog(QDocument * form) this , SLOT(change_adaptor())); connect(langModule->languageCO, SIGNAL(activated(int)), this , SLOT(change_adaptor())); + connect(langModule->encodingCO, SIGNAL(activated(int)), + this , SLOT(change_adaptor())); connect(langModule->quoteStyleCO, SIGNAL(activated(int)), this , SLOT(change_adaptor())); // numbering @@ -129,15 +131,6 @@ QDocumentDialog::QDocumentDialog(QDocument * form) SIGNAL(valueChanged(int)), 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())); connect(packagesModule->psdriverCO, SIGNAL(activated(int)), @@ -154,6 +147,13 @@ QDocumentDialog::QDocumentDialog(QDocument * form) 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())); @@ -257,9 +257,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 +275,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 +312,7 @@ void QDocumentDialog::closeEvent(QCloseEvent * e) void QDocumentDialog::setLSpacing(int item) { - packagesModule->lspacingLE->setEnabled(item == 3); + layoutModule->lspacingLE->setEnabled(item == 3); } diff --git a/src/frontends/qt2/QDocumentDialog.h b/src/frontends/qt2/QDocumentDialog.h index 129426f32c..3e93638951 100644 --- a/src/frontends/qt2/QDocumentDialog.h +++ b/src/frontends/qt2/QDocumentDialog.h @@ -65,24 +65,24 @@ protected: private: enum Module { LAYOUT, - PACKAGES, PAPER, MARGINS, LANGUAGE, BULLETS, NUMBERING, BIBLIOGRAPHY, + PACKAGES, PREAMBLE }; ClassModuleBase * layoutModule; - PackagesModuleBase * packagesModule; PaperModuleBase * paperModule; MarginsModuleBase * marginsModule; LanguageModuleBase * langModule; BulletsModule * bulletsModule; NumberingModuleBase * numberingModule; BiblioModuleBase * biblioModule; + PackagesModuleBase * packagesModule; PreambleModuleBase * preambleModule; QDocument * form_; diff --git a/src/frontends/qt2/ui/ClassModuleBase.ui b/src/frontends/qt2/ui/ClassModuleBase.ui index c9c6f8e5fd..e7f8eb5520 100644 --- a/src/frontends/qt2/ui/ClassModuleBase.ui +++ b/src/frontends/qt2/ui/ClassModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 317 + 313 287 @@ -110,20 +110,6 @@ pagestyleCO - - QComboBox - - name - fontsCO - - - sizePolicy - - 3 - 0 - - - QComboBox @@ -131,48 +117,7 @@ fontsizeCO - - QLabel - - name - fontsL - - - text - &Font && size : - - - buddy - fontsCO - - - - QLabel - - name - floatPlacementL - - - enabled - true - - - text - Float &placement: - - - buddy - floatPlacementLE - - - - QLineEdit - - name - floatPlacementLE - - - + QButtonGroup name @@ -255,6 +200,112 @@ + + 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 + + diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui index 3f97e65d3f..85b830a4a5 100644 --- a/src/frontends/qt2/ui/LanguageModuleBase.ui +++ b/src/frontends/qt2/ui/LanguageModuleBase.ui @@ -13,8 +13,8 @@ 0 0 - 286 - 170 + 282 + 190 @@ -30,36 +30,7 @@ spacing 6 - - QLabel - - name - languageL - - - text - &Language: - - - buddy - languageCO - - - - QComboBox - - name - languageCO - - - sizePolicy - - 7 - 0 - - - - + QButtonGroup name @@ -156,6 +127,68 @@ + + QComboBox + + name + languageCO + + + sizePolicy + + 7 + 0 + + + + + QLabel + + name + languageL + + + text + &Language: + + + buddy + languageCO + + + + QLabel + + name + encodingL + + + text + &Encoding: + + + buddy + encodingCO + + + + QComboBox + + name + encodingCO + + + sizePolicy + + 7 + 0 + + + + duplicatesEnabled + false + + diff --git a/src/frontends/qt2/ui/PackagesModuleBase.ui b/src/frontends/qt2/ui/PackagesModuleBase.ui index 2bee6ffc40..2c92a38b81 100644 --- a/src/frontends/qt2/ui/PackagesModuleBase.ui +++ b/src/frontends/qt2/ui/PackagesModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 361 + 357 231 @@ -49,24 +49,6 @@ spacing 6 - - QLineEdit - - name - lspacingLE - - - enabled - false - - - sizePolicy - - 1 - 0 - - - QCheckBox @@ -78,64 +60,6 @@ Use AMS &math - - QComboBox - - name - encodingCO - - - sizePolicy - - 7 - 0 - - - - duplicatesEnabled - false - - - - QComboBox - - name - lspacingCO - - - sizePolicy - - 3 - 0 - - - - duplicatesEnabled - false - - - - QLabel - - name - lspacingL - - - text - Line spacing : - - - - QLabel - - name - encodingL - - - text - Encoding: - - @@ -195,9 +119,6 @@ - lspacingCO - lspacingLE - encodingCO amsCB psdriverCO diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui index e6457f92d0..c3a8ca0621 100644 --- a/src/frontends/qt2/ui/QDocumentDialogBase.ui +++ b/src/frontends/qt2/ui/QDocumentDialogBase.ui @@ -13,10 +13,17 @@ 0 0 - 465 - 363 + 410 + 230 + + sizePolicy + + 1 + 1 + + caption Form1 @@ -34,71 +41,6 @@ spacing 6 - - QLayoutWidget - - name - Layout2 - - - caption - - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - defaultPB - - - sizePolicy - - 3 - 0 - - - - text - Use Class Defaults - - - toolTip - Reset default params of the current class - - - - QPushButton - - name - savePB - - - sizePolicy - - 3 - 0 - - - - text - Save as Document Defaults - - - toolTip - Save settings as LyX's default template - - - - QLayoutWidget @@ -181,27 +123,13 @@ - - QListBox - - name - moduleLB - - - sizePolicy - - 5 - 7 - - - QLayoutWidget name - Layout3 + Layout4 - + margin 0 @@ -210,7 +138,21 @@ spacing 6 - + + QWidgetStack + + name + moduleStack + + + sizePolicy + + 5 + 7 + + + + QLabel name @@ -219,7 +161,7 @@ sizePolicy - 7 + 5 0 @@ -228,7 +170,7 @@ title here - + Line name @@ -246,21 +188,111 @@ Horizontal + + + + QListBox + + name + moduleLB + + + sizePolicy + + 5 + 7 + + + + vScrollBarMode + AlwaysOff + + + variableWidth + false + + + + QLayoutWidget + + name + Layout4 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer3 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + - QWidgetStack + QPushButton name - moduleStack + defaultPB sizePolicy - 7 - 7 + 3 + 0 + + text + Use Class Defaults + + + toolTip + Reset default params of the current class + - + + QPushButton + + name + savePB + + + sizePolicy + + 3 + 0 + + + + text + Save as Document Defaults + + + toolTip + Save settings as LyX's default template + + + @@ -269,7 +301,7 @@ QWidgetStack
qwidgetstack.h
- -1 + 0 -1 0 -- 2.39.5