From 0570d16a3b211869b78255712ee82ca2d1905a00 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 8 Jul 2018 16:35:38 +0200 Subject: [PATCH] Start using QDialogButtonGroup rather than manual OK etc. buttons This assures the OK/Apply/Cancel/Restore buttons use the layout/style of the OS (button order, icons). The goal is to move all dialogs to this for 2.4. See #11003 --- src/frontends/qt4/GuiAbout.cpp | 2 +- src/frontends/qt4/GuiAbout.h | 2 +- src/frontends/qt4/GuiBibtex.cpp | 43 ++- src/frontends/qt4/GuiBibtex.h | 1 + src/frontends/qt4/GuiChanges.cpp | 5 +- src/frontends/qt4/GuiCharacter.cpp | 11 +- src/frontends/qt4/GuiCitation.cpp | 41 +-- src/frontends/qt4/GuiCitation.h | 7 +- src/frontends/qt4/GuiCompare.cpp | 30 +- src/frontends/qt4/GuiCompare.h | 2 + src/frontends/qt4/GuiCompareHistory.cpp | 11 +- src/frontends/qt4/GuiDialog.cpp | 24 ++ src/frontends/qt4/GuiDialog.h | 3 + src/frontends/qt4/ui/AboutUi.ui | 97 ++++-- src/frontends/qt4/ui/BibtexAddUi.ui | 46 +-- src/frontends/qt4/ui/BibtexUi.ui | 31 +- src/frontends/qt4/ui/ChangesUi.ui | 149 +++++---- src/frontends/qt4/ui/CharacterUi.ui | 37 +-- src/frontends/qt4/ui/CitationUi.ui | 61 +--- src/frontends/qt4/ui/CompareHistoryUi.ui | 161 ++++------ src/frontends/qt4/ui/CompareUi.ui | 378 +++++++++++------------ 21 files changed, 521 insertions(+), 621 deletions(-) diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp index c2fa90e4d9..747723ff06 100644 --- a/src/frontends/qt4/GuiAbout.cpp +++ b/src/frontends/qt4/GuiAbout.cpp @@ -273,7 +273,7 @@ GuiAbout::GuiAbout(GuiView & lv) } -void GuiAbout::on_closePB_clicked() +void GuiAbout::on_buttonBox_rejected() { close(); } diff --git a/src/frontends/qt4/GuiAbout.h b/src/frontends/qt4/GuiAbout.h index a8a3b7996d..200f0b7837 100644 --- a/src/frontends/qt4/GuiAbout.h +++ b/src/frontends/qt4/GuiAbout.h @@ -26,7 +26,7 @@ public: GuiAbout(GuiView & lv); private Q_SLOTS: - void on_closePB_clicked(); + void on_buttonBox_rejected(); private: /// Controller stuff diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp index d22c42e2a1..6d1c8c12a5 100644 --- a/src/frontends/qt4/GuiBibtex.cpp +++ b/src/frontends/qt4/GuiBibtex.cpp @@ -39,6 +39,7 @@ #include "support/gettext.h" #include "support/lstrings.h" +#include #include #include #include @@ -60,12 +61,8 @@ GuiBibtex::GuiBibtex(GuiView & lv) QDialog::setModal(true); setWindowModality(Qt::WindowModal); - connect(okPB, SIGNAL(clicked()), - this, SLOT(slotOK())); - connect(applyPB, SIGNAL(clicked()), - this, SLOT(slotApply())); - connect(closePB, SIGNAL(clicked()), - this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(stylePB, SIGNAL(clicked()), this, SLOT(browsePressed())); connect(deletePB, SIGNAL(clicked()), @@ -93,16 +90,14 @@ GuiBibtex::GuiBibtex(GuiView & lv) add_ = new GuiBibtexAddDialog(this); add_bc_.setPolicy(ButtonPolicy::OkCancelPolicy); - add_bc_.setOK(add_->addPB); - add_bc_.setCancel(add_->closePB); + add_bc_.setOK(add_->buttonBox->button(QDialogButtonBox::Ok)); + add_bc_.setCancel(add_->buttonBox->button(QDialogButtonBox::Cancel)); add_bc_.addCheckedLineEdit(add_->bibED, 0); connect(add_->bibED, SIGNAL(textChanged(QString)), this, SLOT(bibEDChanged())); - connect(add_->addPB, SIGNAL(clicked()), - this, SLOT(addDatabase())); - connect(add_->addPB, SIGNAL(clicked()), - add_, SLOT(accept())); + connect(add_->buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(addBBClicked(QAbstractButton *))); connect(add_->rescanPB, SIGNAL(clicked()), this, SLOT(rescanClicked())); connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)), @@ -113,17 +108,15 @@ GuiBibtex::GuiBibtex(GuiView & lv) this, SLOT(availableChanged())); connect(add_->browsePB, SIGNAL(clicked()), this, SLOT(browseBibPressed())); - connect(add_->closePB, SIGNAL(clicked()), - add_, SLOT(reject())); add_->bibLW->setToolTip(formatToolTip(qt_("This list consists of all databases that are indexed by LaTeX and thus are found without a file path. " "This is usually everything in the bib/ subdirectory of LaTeX's texmf tree. " "If you want to reuse your own database, this is the place you should store it."))); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setOK(okPB); - bc().setApply(applyPB); - bc().setCancel(closePB); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); + bc().setApply(buttonBox->button(QDialogButtonBox::Apply)); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); bc().addReadOnly(databaseLW); bc().addReadOnly(stylePB); bc().addReadOnly(styleCB); @@ -151,6 +144,22 @@ GuiBibtex::GuiBibtex(GuiView & lv) } +void GuiBibtex::addBBClicked(QAbstractButton * button) +{ + switch (add_->buttonBox->standardButton(button)) { + case QDialogButtonBox::Ok: + addDatabase(); + add_->accept(); + break; + case QDialogButtonBox::Cancel: + add_->reject(); + break; + default: + break; + } +} + + void GuiBibtex::bibEDChanged() { // Indicate to the button controller that the contents have diff --git a/src/frontends/qt4/GuiBibtex.h b/src/frontends/qt4/GuiBibtex.h index f5a95ffdf2..4dbe107fa6 100644 --- a/src/frontends/qt4/GuiBibtex.h +++ b/src/frontends/qt4/GuiBibtex.h @@ -44,6 +44,7 @@ public: explicit GuiBibtex(GuiView & lv); private Q_SLOTS: + void addBBClicked(QAbstractButton * button); void change_adaptor(); void browsePressed(); void browseBibPressed(); diff --git a/src/frontends/qt4/GuiChanges.cpp b/src/frontends/qt4/GuiChanges.cpp index c168d3591b..b8d12ceda1 100644 --- a/src/frontends/qt4/GuiChanges.cpp +++ b/src/frontends/qt4/GuiChanges.cpp @@ -40,14 +40,15 @@ GuiChanges::GuiChanges(GuiView & lv) { setupUi(this); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(nextPB, SIGNAL(clicked()), this, SLOT(nextChange())); connect(previousPB, SIGNAL(clicked()), this, SLOT(previousChange())); connect(rejectPB, SIGNAL(clicked()), this, SLOT(rejectChange())); connect(acceptPB, SIGNAL(clicked()), this, SLOT(acceptChange())); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setCancel(closePB); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); bc().addReadOnly(acceptPB); bc().addReadOnly(rejectPB); } diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp index e506b98dbb..8b7f3e83d3 100644 --- a/src/frontends/qt4/GuiCharacter.cpp +++ b/src/frontends/qt4/GuiCharacter.cpp @@ -211,9 +211,8 @@ GuiCharacter::GuiCharacter(GuiView & lv) { setupUi(this); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(autoapplyCB, SIGNAL(stateChanged(int)), this, SLOT(slotAutoApply())); @@ -249,9 +248,9 @@ GuiCharacter::GuiCharacter(GuiView & lv) fillCombo(langCO, language); bc().setPolicy(ButtonPolicy::OkApplyCancelAutoReadOnlyPolicy); - bc().setOK(okPB); - bc().setApply(applyPB); - bc().setCancel(closePB); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); + bc().setApply(buttonBox->button(QDialogButtonBox::Apply)); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); bc().setAutoApply(autoapplyCB); bc().addReadOnly(familyCO); bc().addReadOnly(seriesCO); diff --git a/src/frontends/qt4/GuiCitation.cpp b/src/frontends/qt4/GuiCitation.cpp index cc1e7e5c93..19028be896 100644 --- a/src/frontends/qt4/GuiCitation.cpp +++ b/src/frontends/qt4/GuiCitation.cpp @@ -136,9 +136,9 @@ GuiCitation::GuiCitation(GuiView & lv) connect(textAfterED, SIGNAL(textChanged(QString)), this, SLOT(updateStyles())); connect(textBeforeED, SIGNAL(returnPressed()), - this, SLOT(on_okPB_clicked())); + this, SLOT(on_buttonBox_accepted())); connect(textAfterED, SIGNAL(returnPressed()), - this, SLOT(on_okPB_clicked())); + this, SLOT(on_buttonBox_accepted())); selectionManager = new GuiSelectionManager(this, availableLV, selectedLV, addPB, deletePB, upPB, downPB, &available_model_, &selected_model_, 1); @@ -147,7 +147,7 @@ GuiCitation::GuiCitation(GuiView & lv) connect(selectionManager, SIGNAL(updateHook()), this, SLOT(updateControls())); connect(selectionManager, SIGNAL(okHook()), - this, SLOT(on_okPB_clicked())); + this, SLOT(on_buttonBox_accepted())); connect(filter_, SIGNAL(rightButtonClicked()), this, SLOT(resetFilter())); @@ -208,7 +208,7 @@ void GuiCitation::showEvent(QShowEvent * e) } -void GuiCitation::on_okPB_clicked() +void GuiCitation::on_buttonBox_accepted() { applyView(); clearSelection(); @@ -216,24 +216,27 @@ void GuiCitation::on_okPB_clicked() } -void GuiCitation::on_cancelPB_clicked() +void GuiCitation::on_buttonBox_rejected() { clearSelection(); hide(); } -void GuiCitation::on_applyPB_clicked() +void GuiCitation::on_buttonBox_clicked(QAbstractButton * button) { - applyView(); -} - - -void GuiCitation::on_restorePB_clicked() -{ - init(); - updateFilterHint(); - filterPressed(); + switch (buttonBox->standardButton(button)) { + case QDialogButtonBox::Apply: + applyView(); + break; + case QDialogButtonBox::Reset: + init(); + updateFilterHint(); + filterPressed(); + break; + default: + break; + } } @@ -452,8 +455,8 @@ bool GuiCitation::isSelected(QModelIndex const & idx) void GuiCitation::setButtons() { int const srows = selectedLV->model()->rowCount(); - applyPB->setEnabled(srows > 0); - okPB->setEnabled(srows > 0); + buttonBox->button(QDialogButtonBox::Apply)->setEnabled(srows > 0); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(srows > 0); } @@ -802,8 +805,8 @@ void GuiCitation::init() } else availableLV->setFocus(); - applyPB->setEnabled(false); - okPB->setEnabled(false); + buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); } diff --git a/src/frontends/qt4/GuiCitation.h b/src/frontends/qt4/GuiCitation.h index 4d85c0315a..428ea50a97 100644 --- a/src/frontends/qt4/GuiCitation.h +++ b/src/frontends/qt4/GuiCitation.h @@ -47,10 +47,9 @@ public: GuiCitation(GuiView & lv); private Q_SLOTS: - void on_okPB_clicked(); - void on_cancelPB_clicked(); - void on_restorePB_clicked(); - void on_applyPB_clicked(); + void on_buttonBox_accepted(); + void on_buttonBox_rejected(); + void on_buttonBox_clicked(QAbstractButton *); void on_literalCB_clicked(); void filterPressed(); void filterChanged(const QString & text); diff --git a/src/frontends/qt4/GuiCompare.cpp b/src/frontends/qt4/GuiCompare.cpp index f7a8132577..d282df9526 100644 --- a/src/frontends/qt4/GuiCompare.cpp +++ b/src/frontends/qt4/GuiCompare.cpp @@ -29,6 +29,7 @@ #include "support/FileName.h" #include "support/gettext.h" +#include #include @@ -46,8 +47,8 @@ GuiCompare::GuiCompare(GuiView & lv) setupUi(this); setModal(Qt::WindowModal); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotCancel())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(newFilePB, SIGNAL(clicked()), this, SLOT(selectNewFile())); connect(oldFilePB, SIGNAL(clicked()), this, SLOT(selectOldFile())); @@ -64,10 +65,10 @@ GuiCompare::GuiCompare(GuiView & lv) newSettingsRB->setChecked(true); trackingCB->setChecked(true); - closePB->setCursor(Qt::ArrowCursor); + buttonBox->button(QDialogButtonBox::Ok)->setCursor(Qt::ArrowCursor); bc().setPolicy(ButtonPolicy::OkApplyCancelPolicy); - bc().setOK(okPB); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); } GuiCompare::~GuiCompare() @@ -182,14 +183,14 @@ void GuiCompare::enableControls(bool enable) oldFileLA->setEnabled(enable); oldFilePB->setEnabled(enable); oldFileCB->setEnabled(enable); - okPB->setEnabled(enable); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable); groupBox->setEnabled(enable); progressBar->setEnabled(!enable); if (enable) - closePB->setText(qt_("Close")); + buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Close")); else - closePB->setText(qt_("Cancel")); + buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Cancel")); } @@ -270,6 +271,21 @@ void GuiCompare::slotCancel() } +void GuiCompare::slotButtonBox(QAbstractButton * button) +{ + switch (buttonBox->standardButton(button)) { + case QDialogButtonBox::Ok: + slotOK(); + break; + case QDialogButtonBox::Cancel: + slotCancel(); + break; + default: + break; + } +} + + Buffer const * GuiCompare::bufferFromFileName(string const & file) const { FileName fname; diff --git a/src/frontends/qt4/GuiCompare.h b/src/frontends/qt4/GuiCompare.h index 9a482d0814..c6f8eaa26d 100644 --- a/src/frontends/qt4/GuiCompare.h +++ b/src/frontends/qt4/GuiCompare.h @@ -40,6 +40,8 @@ private Q_SLOTS: /// void slotCancel(); /// + void slotButtonBox(QAbstractButton *); + /// void changeAdaptor(); /// void selectNewFile(); diff --git a/src/frontends/qt4/GuiCompareHistory.cpp b/src/frontends/qt4/GuiCompareHistory.cpp index d176a387c4..0934c3daf1 100644 --- a/src/frontends/qt4/GuiCompareHistory.cpp +++ b/src/frontends/qt4/GuiCompareHistory.cpp @@ -23,7 +23,8 @@ #include "support/convert.h" #include "support/lstrings.h" - +#include +#include using namespace std; using namespace lyx::support; @@ -39,8 +40,8 @@ GuiCompareHistory::GuiCompareHistory(GuiView & lv) setupUi(this); setModal(Qt::WindowModal); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(cancelPB, SIGNAL(clicked()), this, SLOT(slotCancel())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(revbackRB, SIGNAL(clicked()), this, SLOT(selectRevback())); connect(betweenrevRB, SIGNAL(clicked()), this, SLOT(selectBetweenrev())); @@ -49,7 +50,7 @@ GuiCompareHistory::GuiCompareHistory(GuiView & lv) bool GuiCompareHistory::initialiseParams(std::string const &) { string revstring = lyxview().currentBufferView()->buffer().lyxvc().revisionInfo(LyXVC::File); - int rev=0; + int rev = 0; string tmp; bool enableBetween = true; @@ -69,7 +70,7 @@ bool GuiCompareHistory::initialiseParams(std::string const &) // later we can provide comparison between two hashes betweenrevRB->setEnabled(enableBetween); - okPB->setEnabled(rev); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(rev); rev1SB->setMaximum(rev); rev2SB->setMaximum(rev); revbackSB->setMaximum(rev-1); diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp index 2f57dc8280..2720922deb 100644 --- a/src/frontends/qt4/GuiDialog.cpp +++ b/src/frontends/qt4/GuiDialog.cpp @@ -18,6 +18,7 @@ #include "support/debug.h" #include +#include using namespace std; @@ -90,6 +91,29 @@ void GuiDialog::slotRestore() } +void GuiDialog::slotButtonBox(QAbstractButton * button) +{ + QDialogButtonBox * bbox = qobject_cast(sender()); + switch (bbox->standardButton(button)) { + case QDialogButtonBox::Ok: + slotOK(); + break; + case QDialogButtonBox::Apply: + slotApply(); + break; + case QDialogButtonBox::Cancel: + slotClose(); + break; + case QDialogButtonBox::Reset: + case QDialogButtonBox::RestoreDefaults: + slotRestore(); + break; + default: + break; + } +} + + void GuiDialog::changed() { if (updating_) diff --git a/src/frontends/qt4/GuiDialog.h b/src/frontends/qt4/GuiDialog.h index b579e3f038..de71a780e0 100644 --- a/src/frontends/qt4/GuiDialog.h +++ b/src/frontends/qt4/GuiDialog.h @@ -15,6 +15,7 @@ #include "Dialog.h" #include "ButtonController.h" +#include #include @@ -56,6 +57,8 @@ public Q_SLOTS: void slotAutoApply(); // Close button clicked or closed from WindowManager void slotClose(); + // A collectiong slot for QDialogButtonBox + void slotButtonBox(QAbstractButton *); /// void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt4/ui/AboutUi.ui b/src/frontends/qt4/ui/AboutUi.ui index 53cdd18893..a7eecc02ec 100644 --- a/src/frontends/qt4/ui/AboutUi.ui +++ b/src/frontends/qt4/ui/AboutUi.ui @@ -17,7 +17,16 @@ true - + + 9 + + + 9 + + + 9 + + 9 @@ -36,7 +45,16 @@ 6 - + + 11 + + + 11 + + + 11 + + 11 @@ -68,7 +86,16 @@ Credits - + + 9 + + + 9 + + + 9 + + 9 @@ -84,7 +111,16 @@ Copyright - + + 9 + + + 9 + + + 9 + + 9 @@ -100,7 +136,16 @@ Build Info - + + 9 + + + 9 + + + 9 + + 9 @@ -128,38 +173,22 @@ 6 - + + 0 + + + 0 + + + 0 + + 0 - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - 0 - 0 - - - - &Close - - - true + + + QDialogButtonBox::Close diff --git a/src/frontends/qt4/ui/BibtexAddUi.ui b/src/frontends/qt4/ui/BibtexAddUi.ui index e3fe11a1a0..a8eb3fc541 100644 --- a/src/frontends/qt4/ui/BibtexAddUi.ui +++ b/src/frontends/qt4/ui/BibtexAddUi.ui @@ -7,7 +7,7 @@ 0 0 328 - 377 + 385 @@ -28,7 +28,7 @@ - &Databases found by LaTeX: + Databases fou&nd by LaTeX: bibLW @@ -81,7 +81,7 @@ Here you can enter a local BibTeX database name or browse your directory. - &Local databases: + Lo&cal databases: bibED @@ -141,41 +141,9 @@ 0 - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Add - - - false - - - true - - - - - - - Cancel - - - false + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -187,8 +155,6 @@ bibLW bibED browsePB - addPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/BibtexUi.ui b/src/frontends/qt4/ui/BibtexUi.ui index 54b22b52a8..847cb53923 100644 --- a/src/frontends/qt4/ui/BibtexUi.ui +++ b/src/frontends/qt4/ui/BibtexUi.ui @@ -299,32 +299,9 @@ - - - &OK - - - false - - - true - - - - - - - App&ly - - - - - - - Cancel - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -339,8 +316,6 @@ stylePB bibtocCB btPrintCO - okPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/ChangesUi.ui b/src/frontends/qt4/ui/ChangesUi.ui index 0a31087d96..db487f1b8f 100644 --- a/src/frontends/qt4/ui/ChangesUi.ui +++ b/src/frontends/qt4/ui/ChangesUi.ui @@ -1,83 +1,106 @@ - - - - + + ChangesUi - - + + 0 0 - 298 + 355 264 - + - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Change: - - + + - - - - 0 - - + + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - + + Go to previous change - + &Previous change - + false - - + + Go to next change - + &Next change - + true + + + + QDialogButtonBox::Cancel + + + - + Qt::Horizontal - + QSizePolicy::Expanding - + 20 20 @@ -85,58 +108,60 @@ - - - - Cancel - - - - - - - 0 - - + + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - + + Accept this change - + &Accept - + false - - + + Reject this change - + &Reject - + false - + Qt::Horizontal - + QSizePolicy::Expanding - + 20 20 @@ -148,17 +173,15 @@ - - - qt_i18n.h - changeTB acceptPB rejectPB nextPB - closePB + + qt_i18n.h + diff --git a/src/frontends/qt4/ui/CharacterUi.ui b/src/frontends/qt4/ui/CharacterUi.ui index ca07dd0e31..d22868fefc 100644 --- a/src/frontends/qt4/ui/CharacterUi.ui +++ b/src/frontends/qt4/ui/CharacterUi.ui @@ -7,7 +7,7 @@ 0 0 523 - 412 + 372 @@ -61,35 +61,9 @@ - - - &OK - - - true - - - - - - - &Apply - - - false - - - - - - - Close - - - false - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -403,9 +377,6 @@ shapeCO colorCO langCO - okPB - applyPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/CitationUi.ui b/src/frontends/qt4/ui/CitationUi.ui index 23c9535a67..9def5a3c5e 100644 --- a/src/frontends/qt4/ui/CitationUi.ui +++ b/src/frontends/qt4/ui/CitationUi.ui @@ -7,7 +7,7 @@ 0 0 614 - 506 + 522 @@ -425,58 +425,9 @@ 0 - - - &Restore - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - &OK - - - false - - - false - - - - - - - App&ly - - - false - - - - - - - &Cancel - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset @@ -498,10 +449,6 @@ textAfterED forceuppercaseCB starredCB - restorePB - okPB - applyPB - cancelPB infoML diff --git a/src/frontends/qt4/ui/CompareHistoryUi.ui b/src/frontends/qt4/ui/CompareHistoryUi.ui index 3729a34c4e..1900133c7f 100644 --- a/src/frontends/qt4/ui/CompareHistoryUi.ui +++ b/src/frontends/qt4/ui/CompareHistoryUi.ui @@ -1,64 +1,65 @@ - + + CompareHistoryUi - - + + 0 0 - 375 - 162 + 444 + 184 - + - + true - + - - + + Compare Revisions - + - + - - - &Revisions back + + + Revisions ba&ck - + true - - - + + + 0 0 - + 80 0 - + 0 - - + + Qt::Horizontal - + 40 20 @@ -69,84 +70,84 @@ - - + + Qt::Horizontal - + - - + + &Between revisions - - - + + + 0 0 - + Old: - - - + + + 0 0 - + 80 0 - + 1 - + 1 - - - + + + 0 0 - + New: - - - + + + 0 0 - + 80 0 - + 1 @@ -157,74 +158,20 @@ - + - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - &OK - - - false - - - true - - - false + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - 0 - 0 - - - - &Cancel - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/CompareUi.ui b/src/frontends/qt4/ui/CompareUi.ui index 31573c3dde..2893772a3f 100644 --- a/src/frontends/qt4/ui/CompareUi.ui +++ b/src/frontends/qt4/ui/CompareUi.ui @@ -1,200 +1,184 @@ - - CompareUi - - - - 0 - 0 - 450 - 294 - - - - - - - - 0 - - - - - 10 + + + CompareUi + + + + 0 + 0 + 450 + 354 + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 10 + + + 10 + + + 10 + + + 10 + + + + + &New Document: + + + newFileCB + + + + + + + + 0 + 0 + + + + true + + + + + + + &Browse... + + + false + + + + + + + Old Do&cument: + + + oldFileCB + + + + + + + + 0 + 0 + + + + true + + + + + + + Bro&wse... + + + false + + + + + + + + 0 + 0 + + + + Copy Document Settings from: + + + + + + New Docu&ment - - - - &New Document: - - - newFileCB - - - - - - - - 0 - 0 - - - - true - - - - - - - &Browse... - - - false - - - - - - - &Old Document: - - - oldFileCB - - - - - - - - 0 - 0 - - - - true - - - - - - - Bro&wse... - - - false - - - - - - - - 0 - 0 - - - - Copy Document Settings from: - - - - - - N&ew Document - - - - - - - Ol&d Document - - - - - - - - - - 24 - - - Qt::Horizontal - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - - - &OK - - - true - - - - - - - &Close - - - false - - - false - - - - - - - - - Turns on the change tracking and showing changes in LaTeX output for the resulting document - - - Enable &change tracking features in the output - - - false - - - - - - - - + + + + + + Ol&d Document + + + + + + + + + + 24 + + + Qt::Horizontal + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + Turns on the change tracking and showing changes in LaTeX output for the resulting document + + + Enable &change tracking features in the output + + + false + + + - - - qt_i18n.h - - - + + + + + + + + qt_i18n.h + + +