From: Julien Rioux Date: Sat, 24 Sep 2011 16:39:20 +0000 (+0000) Subject: Rename QLineEdit widgets to have a LE suffix (consistent within GuiDocument). X-Git-Tag: 2.1.0beta1~2666 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f24b24464adfd288252463c5ba03f68d1f4cff59;p=features.git Rename QLineEdit widgets to have a LE suffix (consistent within GuiDocument). bibtexOptionsED -> bibtexOptionsLE indexOptionsED -> indexOptionsLE languagePackageED -> languagePackageLE git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39744 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index d4c88b506b..a21f02b4eb 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -1007,7 +1007,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(langModule->languagePackageCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); - connect(langModule->languagePackageED, SIGNAL(textChanged(QString)), + connect(langModule->languagePackageLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); connect(langModule->languagePackageCO, SIGNAL(currentIndexChanged(int)), this, SLOT(languagePackageChanged(int))); @@ -1102,7 +1102,7 @@ GuiDocument::GuiDocument(GuiView & lv) this, SLOT(change_adaptor())); connect(biblioModule->bibtexCO, SIGNAL(activated(int)), this, SLOT(bibtexChanged(int))); - connect(biblioModule->bibtexOptionsED, SIGNAL(textChanged(QString)), + connect(biblioModule->bibtexOptionsLE, SIGNAL(textChanged(QString)), this, SLOT(change_adaptor())); biblioModule->citeStyleCO->addItem(qt_("Author-year")); @@ -1945,14 +1945,14 @@ void GuiDocument::classChanged() void GuiDocument::languagePackageChanged(int i) { - langModule->languagePackageED->setEnabled( + langModule->languagePackageLE->setEnabled( langModule->languagePackageCO->itemData(i).toString() == "custom"); } void GuiDocument::bibtexChanged(int n) { - biblioModule->bibtexOptionsED->setEnabled( + biblioModule->bibtexOptionsLE->setEnabled( biblioModule->bibtexCO->itemData(n).toString() != "default"); changed(); } @@ -2210,7 +2210,7 @@ void GuiDocument::applyView() fromqstr(biblioModule->bibtexCO->itemData( biblioModule->bibtexCO->currentIndex()).toString()); string const bibtex_options = - fromqstr(biblioModule->bibtexOptionsED->text()); + fromqstr(biblioModule->bibtexOptionsLE->text()); if (bibtex_command == "default" || bibtex_options.empty()) bp_.bibtex_command = bibtex_command; else @@ -2278,7 +2278,7 @@ void GuiDocument::applyView() langModule->languagePackageCO->currentIndex()).toString(); if (pack == "custom") bp_.lang_package = - fromqstr(langModule->languagePackageED->text()); + fromqstr(langModule->languagePackageLE->text()); else bp_.lang_package = fromqstr(pack); @@ -2638,15 +2638,15 @@ void GuiDocument::paramsToDialog() int const bpos = biblioModule->bibtexCO->findData(toqstr(command)); if (bpos != -1) { biblioModule->bibtexCO->setCurrentIndex(bpos); - biblioModule->bibtexOptionsED->setText(toqstr(options).trimmed()); + biblioModule->bibtexOptionsLE->setText(toqstr(options).trimmed()); } else { // We reset to default if we do not know the specified compiler // This is for security reasons biblioModule->bibtexCO->setCurrentIndex( biblioModule->bibtexCO->findData(toqstr("default"))); - biblioModule->bibtexOptionsED->clear(); + biblioModule->bibtexOptionsLE->clear(); } - biblioModule->bibtexOptionsED->setEnabled( + biblioModule->bibtexOptionsLE->setEnabled( biblioModule->bibtexCO->currentIndex() != 0); // indices @@ -2691,10 +2691,10 @@ void GuiDocument::paramsToDialog() if (p == -1) { langModule->languagePackageCO->setCurrentIndex( langModule->languagePackageCO->findData("custom")); - langModule->languagePackageED->setText(toqstr(bp_.lang_package)); + langModule->languagePackageLE->setText(toqstr(bp_.lang_package)); } else { langModule->languagePackageCO->setCurrentIndex(p); - langModule->languagePackageED->clear(); + langModule->languagePackageLE->clear(); } //color diff --git a/src/frontends/qt4/GuiIndices.cpp b/src/frontends/qt4/GuiIndices.cpp index 7c21e70acb..02d021014b 100644 --- a/src/frontends/qt4/GuiIndices.cpp +++ b/src/frontends/qt4/GuiIndices.cpp @@ -82,14 +82,14 @@ void GuiIndices::update(BufferParams const & params) int const pos = indexCO->findData(toqstr(command)); if (pos != -1) { indexCO->setCurrentIndex(pos); - indexOptionsED->setText(toqstr(options).trimmed()); + indexOptionsLE->setText(toqstr(options).trimmed()); } else { // We reset to default if we do not know the specified compiler // This is for security reasons indexCO->setCurrentIndex(indexCO->findData(toqstr("default"))); - indexOptionsED->clear(); + indexOptionsLE->clear(); } - indexOptionsED->setEnabled( + indexOptionsLE->setEnabled( indexCO->currentIndex() != 0); updateView(); @@ -145,7 +145,7 @@ void GuiIndices::apply(BufferParams & params) const string const index_command = fromqstr(indexCO->itemData( indexCO->currentIndex()).toString()); - string const index_options = fromqstr(indexOptionsED->text()); + string const index_options = fromqstr(indexOptionsLE->text()); if (index_command == "default" || index_options.empty()) params.index_command = index_command; else @@ -155,13 +155,13 @@ void GuiIndices::apply(BufferParams & params) const void GuiIndices::on_indexCO_activated(int n) { - indexOptionsED->setEnabled( + indexOptionsLE->setEnabled( indexCO->itemData(n).toString() != "default"); changed(); } -void GuiIndices::on_indexOptionsED_textChanged(QString) +void GuiIndices::on_indexOptionsLE_textChanged(QString) { changed(); } diff --git a/src/frontends/qt4/GuiIndices.h b/src/frontends/qt4/GuiIndices.h index 7e833edb42..a78d07e513 100644 --- a/src/frontends/qt4/GuiIndices.h +++ b/src/frontends/qt4/GuiIndices.h @@ -45,7 +45,7 @@ protected: protected Q_SLOTS: void on_indexCO_activated(int n); - void on_indexOptionsED_textChanged(QString); + void on_indexOptionsLE_textChanged(QString); void on_addIndexPB_pressed(); void on_renamePB_clicked(); void on_removePB_pressed(); diff --git a/src/frontends/qt4/ui/BiblioUi.ui b/src/frontends/qt4/ui/BiblioUi.ui index cc11229491..6c6d5b8cb0 100644 --- a/src/frontends/qt4/ui/BiblioUi.ui +++ b/src/frontends/qt4/ui/BiblioUi.ui @@ -168,12 +168,12 @@ &Options: - bibtexOptionsED + bibtexOptionsLE - + Define options such as --min-crossrefs (see the documentation of BibTeX) diff --git a/src/frontends/qt4/ui/IndicesUi.ui b/src/frontends/qt4/ui/IndicesUi.ui index ce398b17db..81d014538d 100644 --- a/src/frontends/qt4/ui/IndicesUi.ui +++ b/src/frontends/qt4/ui/IndicesUi.ui @@ -54,12 +54,12 @@ &Options: - indexOptionsED + indexOptionsLE - + Define program options of the selected processor. diff --git a/src/frontends/qt4/ui/LanguageUi.ui b/src/frontends/qt4/ui/LanguageUi.ui index 3f9b05124a..f42c1c609e 100644 --- a/src/frontends/qt4/ui/LanguageUi.ui +++ b/src/frontends/qt4/ui/LanguageUi.ui @@ -138,7 +138,7 @@ - + Enter the command to load the language package (default: \usepackage{babel})