From 6d8174136f8a43808ff94377684ef8cd82711285 Mon Sep 17 00:00:00 2001 From: John Levon Date: Sat, 15 Feb 2003 22:17:59 +0000 Subject: [PATCH] ui improvement for encoding selection git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6170 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 18 ++ src/frontends/qt2/QDocument.C | 52 +++- src/frontends/qt2/QDocumentDialog.C | 122 ++++----- src/frontends/qt2/ui/LanguageModuleBase.ui | 286 ++++++++++++++------- 4 files changed, 304 insertions(+), 174 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index e422036d7a..c5c2a461a9 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -4,6 +4,24 @@ particular, unknown and optional+disabled elements are never seen. (disabled): remove. This is done in backend now. +2003-02-15 John Levon + + * QDocument.C: + * QDocumentDialog.C: + * ui/LanguageModuleBase.ui: improve UI of language encoding + +2003-02-15 John Levon + + * ui/BulletsModuleBase.ui: + * ui/ClassModuleBase.ui: + * ui/LanguageModuleBase.ui: + * ui/MarginsModuleBase.ui: + * ui/NumberingModuleBase.ui: + * ui/QPrefScreenFontsModule.ui: + * ui/QPrefsDialogBase.ui: tab ordering fixes + + * README: add some rules + 2003-02-15 John Levon * QPrefs.C: fix silly typo that screwed up the print diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 8e48e93503..94ce9f8d97 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -57,6 +57,16 @@ QDocument::QDocument() lang_ = getSecond(langs); } +namespace { + +char const * encodings[] = { "LaTeX default", "latin1", "latin2", + "latin3", "latin4", "latin5", "latin9", + "koi8-r", "koi8-u", "cp866", "cp1251", + "iso88595", "pt154", 0 +}; + +} + void QDocument::build_dialog() { @@ -76,11 +86,10 @@ 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); + int i = 0; + while (encodings[i]) { + dialog_->langModule->encodingCO->insertItem(qt_(encodings[i++])); + } dialog_->langModule->quoteStyleCO->insertItem(qt_("``text''")); dialog_->langModule->quoteStyleCO->insertItem(qt_("''text''")); @@ -176,8 +185,16 @@ void QDocument::apply() else params.quotes_times = InsetQuotes::DoubleQ; - params.inputenc = - fromqstr(dialog_->langModule->encodingCO->currentText()); + if (dialog_->langModule->defaultencodingCB->isChecked()) { + params.inputenc = "auto"; + } else { + int i = dialog_->langModule->encodingCO->currentItem(); + if (i == 0) { + params.inputenc = "default"; + } else { + params.inputenc = encodings[i]; + } + } InsetQuotes::quote_language lga = InsetQuotes::EnglishQ; switch (dialog_->langModule->quoteStyleCO->currentItem()) { @@ -420,13 +437,20 @@ 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); + dialog_->langModule->defaultencodingCB->setChecked(true); + + if (params.inputenc != "auto") { + dialog_->langModule->defaultencodingCB->setChecked(false); + if (params.inputenc == "default") { + dialog_->langModule->encodingCO->setCurrentItem(0); + } else { + int i = 0; + while (encodings[i]) { + if (encodings[i] == params.inputenc) + dialog_->langModule->encodingCO->setCurrentItem(i); + ++i; + } + } } // numbering diff --git a/src/frontends/qt2/QDocumentDialog.C b/src/frontends/qt2/QDocumentDialog.C index 8408ba49e2..700375ef24 100644 --- a/src/frontends/qt2/QDocumentDialog.C +++ b/src/frontends/qt2/QDocumentDialog.C @@ -103,145 +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())); + 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->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())); + this, SLOT(change_adaptor())); connect(layoutModule->lspacingCO, SIGNAL(activated(int)), - this , SLOT(setLSpacing(int))); + this, SLOT(setLSpacing(int))); connect(layoutModule->lspacingLE, SIGNAL(textChanged(const QString&)), - this , SLOT(change_adaptor())); + 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())); + 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 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())); } diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui index 51121e21f6..e7f373adba 100644 --- a/src/frontends/qt2/ui/LanguageModuleBase.ui +++ b/src/frontends/qt2/ui/LanguageModuleBase.ui @@ -13,15 +13,15 @@ 0 0 - 373 - 332 + 448 + 451 caption Form1 - + margin 11 @@ -30,56 +30,41 @@ spacing 6 - - QButtonGroup + + QLayoutWidget name - quoteBG + Layout1 - - title - Quote Style - - - exclusive - true - - + margin - 11 + 0 spacing 6 - - QRadioButton + + QLabel name - singleQuoteRB + languageL text - &Single + &Language: - - - QRadioButton - - name - doubleQuoteRB - - - text - &Double + + buddy + languageCO - + QComboBox name - quoteStyleCO + languageCO sizePolicy @@ -89,110 +74,211 @@ - + + + + QCheckBox + + name + defaultencodingCB + + + text + &Use language's default encoding + + + + QLayoutWidget + + name + Layout2 + + + + margin + 0 + + + spacing + 6 + + QLabel name - typeL + encodingL text - &Type: + &Encoding: buddy - quoteStyleCO + encodingCO - - + + QComboBox + name - Spacer7 + encodingCO - orientation - Vertical + sizePolicy + + 7 + 0 + - sizeType - Expanding - - - sizeHint - - 20 - 20 - + duplicatesEnabled + false - - + + - - QComboBox + + QButtonGroup name - languageCO - - - sizePolicy - - 7 - 0 - + quoteBG - - - QLabel - name - languageL + title + Quote Style - text - &Language: - - - buddy - languageCO + 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 + + + + text + &Type: + + + buddy + quoteStyleCO + + - - QLabel - - name - encodingL - - - text - &Encoding: - + - buddy - encodingCO - - - - QComboBox - name - encodingCO + Spacer7 - sizePolicy - - 7 - 0 - + orientation + Vertical - duplicatesEnabled - false + sizeType + Expanding - - + + sizeHint + + 20 + 20 + + + + + + + defaultencodingCB + toggled(bool) + encodingL + setDisabled(bool) + + + defaultencodingCB + toggled(bool) + encodingCO + setDisabled(bool) + + languageCO + defaultencodingCB encodingCO singleQuoteRB doubleQuoteRB -- 2.39.5