From b21c512e140ee0f81db212bcd361c38fb184ad9d Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Tue, 10 Jul 2018 13:04:02 +0200 Subject: [PATCH] QDialogButtonBox for the remaining dialogs. --- src/frontends/qt4/GuiPrefs.cpp | 12 +- src/frontends/qt4/GuiPrintindex.cpp | 8 +- src/frontends/qt4/GuiRef.cpp | 37 ++- src/frontends/qt4/GuiRef.h | 1 + src/frontends/qt4/GuiSearch.cpp | 5 +- src/frontends/qt4/GuiSendto.cpp | 13 +- src/frontends/qt4/GuiShowFile.cpp | 5 +- src/frontends/qt4/GuiSymbols.cpp | 45 +-- src/frontends/qt4/GuiSymbols.h | 5 +- src/frontends/qt4/GuiTabularCreate.cpp | 12 +- src/frontends/qt4/GuiTexinfo.cpp | 5 +- src/frontends/qt4/GuiThesaurus.cpp | 7 +- src/frontends/qt4/GuiWrap.cpp | 14 +- src/frontends/qt4/ui/PrintindexUi.ui | 46 +--- src/frontends/qt4/ui/RefUi.ui | 88 ++---- src/frontends/qt4/ui/SearchUi.ui | 144 +++++----- src/frontends/qt4/ui/SendtoUi.ui | 126 ++++----- src/frontends/qt4/ui/ShortcutUi.ui | 151 ++++------ src/frontends/qt4/ui/ShowFileUi.ui | 65 +---- src/frontends/qt4/ui/SymbolsUi.ui | 134 ++++----- src/frontends/qt4/ui/TabularCreateUi.ui | 72 ++--- src/frontends/qt4/ui/TexinfoUi.ui | 156 ++++------- src/frontends/qt4/ui/ThesaurusUi.ui | 72 ++--- src/frontends/qt4/ui/ToggleWarningUi.ui | 109 +++----- src/frontends/qt4/ui/WrapUi.ui | 351 +++++++++--------------- 25 files changed, 637 insertions(+), 1046 deletions(-) diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 3873ef3f2f..f79d4d3f28 100644 --- a/src/frontends/qt4/GuiPrefs.cpp +++ b/src/frontends/qt4/GuiPrefs.cpp @@ -2818,20 +2818,20 @@ PrefShortcuts::PrefShortcuts(GuiPreferences * form) shortcut_ = new GuiShortcutDialog(this); shortcut_bc_.setPolicy(ButtonPolicy::OkCancelPolicy); - shortcut_bc_.setOK(shortcut_->okPB); - shortcut_bc_.setCancel(shortcut_->cancelPB); + shortcut_bc_.setOK(shortcut_->buttonBox->button(QDialogButtonBox::Ok)); + shortcut_bc_.setCancel(shortcut_->buttonBox->button(QDialogButtonBox::Cancel)); - connect(shortcut_->okPB, SIGNAL(clicked()), + connect(shortcut_->buttonBox, SIGNAL(accepted()), this, SIGNAL(changed())); - connect(shortcut_->cancelPB, SIGNAL(clicked()), + connect(shortcut_->buttonBox, SIGNAL(rejected()), shortcut_, SLOT(reject())); connect(shortcut_->clearPB, SIGNAL(clicked()), this, SLOT(shortcutClearPressed())); connect(shortcut_->removePB, SIGNAL(clicked()), this, SLOT(shortcutRemovePressed())); - connect(shortcut_->okPB, SIGNAL(clicked()), + connect(shortcut_->buttonBox, SIGNAL(accepted()), this, SLOT(shortcutOkPressed())); - connect(shortcut_->cancelPB, SIGNAL(clicked()), + connect(shortcut_->buttonBox, SIGNAL(rejected()), this, SLOT(shortcutCancelPressed())); } diff --git a/src/frontends/qt4/GuiPrintindex.cpp b/src/frontends/qt4/GuiPrintindex.cpp index 00b876b095..1244c62e49 100644 --- a/src/frontends/qt4/GuiPrintindex.cpp +++ b/src/frontends/qt4/GuiPrintindex.cpp @@ -39,15 +39,15 @@ GuiPrintindex::GuiPrintindex(GuiView & lv) { setupUi(this); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(cancelPB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(indicesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(subindexCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(literalCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setOK(okPB); - bc().setCancel(cancelPB); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); } diff --git a/src/frontends/qt4/GuiRef.cpp b/src/frontends/qt4/GuiRef.cpp index 907568761a..6ccb8ef6c4 100644 --- a/src/frontends/qt4/GuiRef.cpp +++ b/src/frontends/qt4/GuiRef.cpp @@ -76,13 +76,12 @@ GuiRef::GuiRef(GuiView & lv) sortingCO->addItem(qt_("Alphabetically (Case-Insensitive)"), "nocase"); sortingCO->addItem(qt_("Alphabetically (Case-Sensitive)"), "case"); + buttonBox->button(QDialogButtonBox::Reset)->setText(qt_("&Update")); + buttonBox->button(QDialogButtonBox::Reset)->setToolTip(qt_("Update the label list")); + refsTW->setColumnCount(1); refsTW->header()->setVisible(false); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); - connect(closePB, SIGNAL(clicked()), this, SLOT(resetDialog())); connect(this, SIGNAL(rejected()), this, SLOT(dialogRejected())); connect(typeCO, SIGNAL(activated(int)), @@ -111,8 +110,6 @@ GuiRef::GuiRef(GuiView & lv) this, SLOT(groupToggled())); connect(gotoPB, SIGNAL(clicked()), this, SLOT(gotoClicked())); - connect(updatePB, SIGNAL(clicked()), - this, SLOT(updateClicked())); connect(bufferCO, SIGNAL(activated(int)), this, SLOT(updateClicked())); connect(pluralCB, SIGNAL(clicked()), @@ -125,9 +122,9 @@ GuiRef::GuiRef(GuiView & lv) enableBoxes(); 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(typeCO); restored_buffer_ = -1; @@ -263,6 +260,28 @@ void GuiRef::groupToggled() } +void GuiRef::on_buttonBox_clicked(QAbstractButton * button) +{ + switch (buttonBox->standardButton(button)) { + case QDialogButtonBox::Ok: + slotOK(); + break; + case QDialogButtonBox::Apply: + slotApply(); + break; + case QDialogButtonBox::Cancel: + slotClose(); + resetDialog(); + break; + case QDialogButtonBox::Reset: + updateClicked(); + break; + default: + break; + } +} + + void GuiRef::updateClicked() { updateRefs(); diff --git a/src/frontends/qt4/GuiRef.h b/src/frontends/qt4/GuiRef.h index 46d9a6d076..f7e007724a 100644 --- a/src/frontends/qt4/GuiRef.h +++ b/src/frontends/qt4/GuiRef.h @@ -47,6 +47,7 @@ private Q_SLOTS: void refSelected(QTreeWidgetItem *); void sortToggled(); void groupToggled(); + void on_buttonBox_clicked(QAbstractButton *); void updateClicked(); void resetDialog(); void dialogRejected(); diff --git a/src/frontends/qt4/GuiSearch.cpp b/src/frontends/qt4/GuiSearch.cpp index a24690465c..dd1a002fed 100644 --- a/src/frontends/qt4/GuiSearch.cpp +++ b/src/frontends/qt4/GuiSearch.cpp @@ -47,7 +47,8 @@ GuiSearch::GuiSearch(GuiView & lv) { setupUi(this); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(findPB, SIGNAL(clicked()), this, SLOT(findClicked())); connect(replacePB, SIGNAL(clicked()), this, SLOT(replaceClicked())); connect(replaceallPB, SIGNAL(clicked()), this, SLOT(replaceallClicked())); @@ -57,7 +58,7 @@ GuiSearch::GuiSearch(GuiView & lv) setFocusProxy(findCO); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setCancel(closePB); + bc().setCancel(buttonBox->button(QDialogButtonBox::Close)); bc().addReadOnly(replaceCO); bc().addReadOnly(replacePB); bc().addReadOnly(replaceallPB); diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp index 470852efc3..a42bbb472c 100644 --- a/src/frontends/qt4/GuiSendto.cpp +++ b/src/frontends/qt4/GuiSendto.cpp @@ -42,9 +42,8 @@ GuiSendTo::GuiSendTo(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(formatLW, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(slotFormatHighlighted(QListWidgetItem *))); @@ -58,9 +57,9 @@ GuiSendTo::GuiSendTo(GuiView & lv) this, SLOT(changed_adaptor())); bc().setPolicy(ButtonPolicy::OkApplyCancelPolicy); - 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)); } @@ -113,7 +112,7 @@ bool GuiSendTo::isValid() { int const line = formatLW->currentRow(); - if (line < 0 || line > int(formatLW->count())) + if (line < 0 || (line > int(formatLW->count()))) return false; return (formatLW->selectedItems().size() > 0 diff --git a/src/frontends/qt4/GuiShowFile.cpp b/src/frontends/qt4/GuiShowFile.cpp index d845455af8..4126045410 100644 --- a/src/frontends/qt4/GuiShowFile.cpp +++ b/src/frontends/qt4/GuiShowFile.cpp @@ -31,10 +31,11 @@ GuiShowFile::GuiShowFile(GuiView & lv) { setupUi(this); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); bc().setPolicy(ButtonPolicy::OkCancelPolicy); - bc().setCancel(closePB); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); } diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp index d08689cd3c..93f2174062 100644 --- a/src/frontends/qt4/GuiSymbols.cpp +++ b/src/frontends/qt4/GuiSymbols.cpp @@ -27,6 +27,8 @@ #include "support/gettext.h" #include +#include +#include #include #include @@ -288,7 +290,7 @@ GuiSymbols::GuiSymbols(GuiView & lv) { setupUi(this); - //Translate names + // Translate names for (int i = 0 ; i < no_blocks; ++i) unicode_blocks[i].qname = qt_(unicode_blocks[i].name); @@ -338,47 +340,58 @@ void GuiSymbols::updateView() void GuiSymbols::enableView(bool enable) { chosenLE->setEnabled(enable); - okPB->setEnabled(enable); - applyPB->setEnabled(enable); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable); + buttonBox->button(QDialogButtonBox::Apply)->setEnabled(enable); + if (enable) + buttonBox->button(QDialogButtonBox::Close)->setText(qt_("Cancel")); + else + buttonBox->button(QDialogButtonBox::Close)->setText(qt_("Close")); } -void GuiSymbols::on_applyPB_clicked() +void GuiSymbols::on_buttonBox_clicked(QAbstractButton * button) { - dispatchParams(); + QDialogButtonBox * bbox = qobject_cast(sender()); + switch (bbox->standardButton(button)) { + case QDialogButtonBox::Ok: + slotOK(); + break; + case QDialogButtonBox::Apply: + dispatchParams(); + break; + case QDialogButtonBox::Close: + hide(); + break; + default: + break; + } } -void GuiSymbols::on_okPB_clicked() +void GuiSymbols::slotOK() { dispatchParams(); hide(); } -void GuiSymbols::on_closePB_clicked() -{ - hide(); -} - - void GuiSymbols::on_symbolsLW_activated(QModelIndex const &) { - on_okPB_clicked(); + slotOK(); } void GuiSymbols::on_chosenLE_textChanged(QString const & text) { bool const empty_sel = text.isEmpty(); - okPB->setEnabled(!empty_sel); - applyPB->setEnabled(!empty_sel); + buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!empty_sel); + buttonBox->button(QDialogButtonBox::Apply)->setEnabled(!empty_sel); } void GuiSymbols::on_chosenLE_returnPressed() { - on_okPB_clicked(); + slotOK(); } diff --git a/src/frontends/qt4/GuiSymbols.h b/src/frontends/qt4/GuiSymbols.h index 1ddcc1413c..dde0623688 100644 --- a/src/frontends/qt4/GuiSymbols.h +++ b/src/frontends/qt4/GuiSymbols.h @@ -39,9 +39,8 @@ public: //@} public Q_SLOTS: - void on_applyPB_clicked(); - void on_okPB_clicked(); - void on_closePB_clicked(); + void slotOK(); + void on_buttonBox_clicked(QAbstractButton *); void on_symbolsLW_activated(QModelIndex const & index); void on_symbolsLW_clicked(QModelIndex const & index); void on_categoryCO_activated(QString const & text); diff --git a/src/frontends/qt4/GuiTabularCreate.cpp b/src/frontends/qt4/GuiTabularCreate.cpp index 20b5c90497..f2c4f98264 100644 --- a/src/frontends/qt4/GuiTabularCreate.cpp +++ b/src/frontends/qt4/GuiTabularCreate.cpp @@ -43,17 +43,19 @@ GuiTabularCreate::GuiTabularCreate(GuiView & lv) connect(columnsSB, SIGNAL(valueChanged(int)), table, SLOT(setNumberColumns(int))); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(rowsSB, SIGNAL(valueChanged(int)), this, SLOT(rowsChanged(int))); connect(columnsSB, SIGNAL(valueChanged(int)), this, SLOT(columnsChanged(int))); - bc().setPolicy(ButtonPolicy::IgnorantPolicy); - bc().setOK(okPB); - bc().setCancel(closePB); + bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); + bc().setApply(buttonBox->button(QDialogButtonBox::Apply)); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); + bc().setValid(isValid()); } diff --git a/src/frontends/qt4/GuiTexinfo.cpp b/src/frontends/qt4/GuiTexinfo.cpp index 7b4574c9e6..554b874095 100644 --- a/src/frontends/qt4/GuiTexinfo.cpp +++ b/src/frontends/qt4/GuiTexinfo.cpp @@ -54,7 +54,8 @@ GuiTexInfo::GuiTexInfo(GuiView & lv) warningPosted_ = false; activeStyle_ = ClsType; - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(viewPB, SIGNAL(clicked()), this, SLOT(viewClicked())); connect(whatStyleCO, SIGNAL(activated(QString)), @@ -69,7 +70,7 @@ GuiTexInfo::GuiTexInfo(GuiView & lv) this, SLOT(enableViewPB())); bc().setPolicy(ButtonPolicy::OkCancelPolicy); - bc().setCancel(closePB); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); } diff --git a/src/frontends/qt4/GuiThesaurus.cpp b/src/frontends/qt4/GuiThesaurus.cpp index 2bda2485c3..dba1836813 100644 --- a/src/frontends/qt4/GuiThesaurus.cpp +++ b/src/frontends/qt4/GuiThesaurus.cpp @@ -30,6 +30,7 @@ #include #include +#include #include #include #include @@ -51,8 +52,8 @@ GuiThesaurus::GuiThesaurus(GuiView & lv) meaningsTV->setColumnCount(1); meaningsTV->header()->hide(); - connect(closePB, SIGNAL(clicked()), - this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(replaceED, SIGNAL(returnPressed()), this, SLOT(replaceClicked())); connect(replaceED, SIGNAL(textChanged(QString)), @@ -85,7 +86,7 @@ GuiThesaurus::GuiThesaurus(GuiView & lv) if (entryCO->completer()) entryCO->completer()->setCompletionMode(QCompleter::PopupCompletion); - bc().setCancel(closePB); + bc().setCancel(buttonBox->button(QDialogButtonBox::Close)); bc().setApply(replacePB); bc().addReadOnly(replaceED); bc().addReadOnly(replacePB); diff --git a/src/frontends/qt4/GuiWrap.cpp b/src/frontends/qt4/GuiWrap.cpp index 27a5259788..e22be0898c 100644 --- a/src/frontends/qt4/GuiWrap.cpp +++ b/src/frontends/qt4/GuiWrap.cpp @@ -33,10 +33,8 @@ GuiWrap::GuiWrap(GuiView & lv) { setupUi(this); - connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore())); - 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(valignCO, SIGNAL(highlighted(QString)), this, SLOT(change_adaptor())); @@ -63,10 +61,10 @@ GuiWrap::GuiWrap(GuiView & lv) overhangED->setValidator(unsignedLengthValidator(overhangED)); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setRestore(restorePB); - 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().setRestore(buttonBox->button(QDialogButtonBox::Reset)); bc().addReadOnly(valignCO); bc().addReadOnly(floatCB); diff --git a/src/frontends/qt4/ui/PrintindexUi.ui b/src/frontends/qt4/ui/PrintindexUi.ui index 74fa0a8a84..8f5ea1d3c9 100644 --- a/src/frontends/qt4/ui/PrintindexUi.ui +++ b/src/frontends/qt4/ui/PrintindexUi.ui @@ -7,7 +7,7 @@ 0 0 287 - 148 + 150 @@ -37,7 +37,7 @@ - Avai&lable indexes: + Available i&ndexes: indicesCO @@ -78,48 +78,16 @@ - - - - - Qt::Horizontal - - - - 78 - 29 - - - - - - - - &OK - - - false - - - - - - - &Cancel - - - true - - - - + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + indicesCO - okPB - cancelPB qt_i18n.h diff --git a/src/frontends/qt4/ui/RefUi.ui b/src/frontends/qt4/ui/RefUi.ui index 049a8fd3d4..5631836346 100644 --- a/src/frontends/qt4/ui/RefUi.ui +++ b/src/frontends/qt4/ui/RefUi.ui @@ -312,70 +312,9 @@ 0 - - - - 0 - 0 - - - - Update the label list - - - &Update - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 31 - 30 - - - - - - - - &OK - - - true - - - true - - - - - - - &Apply - - - false - - - false - - - - - - - &Close - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset @@ -385,8 +324,8 @@ - - Use plural form of formatted reference. (Works only for formatted references, and only if you are using refstyle.) + + Use plural form of formatted reference. (Works only for formatted references, and only if you are using refstyle.) Plural @@ -413,6 +352,19 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + @@ -424,10 +376,6 @@ referenceED typeCO nameED - updatePB - okPB - applyPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/SearchUi.ui b/src/frontends/qt4/ui/SearchUi.ui index 7fc1e31739..ebc00e3cfc 100644 --- a/src/frontends/qt4/ui/SearchUi.ui +++ b/src/frontends/qt4/ui/SearchUi.ui @@ -1,3 +1,4 @@ + SearchUi @@ -5,8 +6,8 @@ 0 0 - 357 - 152 + 416 + 197 @@ -15,24 +16,18 @@ true - - - 11 - - - 6 - + - &Find: + Fi&nd: findCO - + @@ -60,17 +55,61 @@ - + + + + + + false + + + Find &Next + + + true + + + + + + + false + + + &Replace + + + + + + + false + + + Replace &All + + + + + + + QDialogButtonBox::Close + + + + + + - Replace &with: + Repla&ce with: replaceCO - + @@ -95,21 +134,14 @@ - + Case &sensitive[[search]] - - - - Match w&hole words only - - - - + Qt::Horizontal @@ -125,7 +157,21 @@ - + + + + Match w&hole words only + + + + + + + Search &backwards + + + + Qt::Vertical @@ -141,7 +187,7 @@ - + Qt::Vertical @@ -157,53 +203,6 @@ - - - - false - - - Find &Next - - - true - - - - - - - false - - - &Replace - - - - - - - false - - - Replace &All - - - - - - - Search &backwards - - - - - - - &Close - - - @@ -215,7 +214,6 @@ findPB replacePB replaceallPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/SendtoUi.ui b/src/frontends/qt4/ui/SendtoUi.ui index 7626a855ca..4cd8ef4f75 100644 --- a/src/frontends/qt4/ui/SendtoUi.ui +++ b/src/frontends/qt4/ui/SendtoUi.ui @@ -1,116 +1,113 @@ - + + SendtoUi - - + + 0 0 - 282 + 296 262 - + - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - + + - - - - - 3 - 0 + + + + 0 0 - + Qt::StrongFocus - + Process the converted file with this command ($$FName = file name) - + true - + 666 - + QComboBox::NoInsert - + true - + false - - - + + + + 6 + + 0 - - 6 + + 0 + + + 0 + + + 0 - - - &OK - - - true - - - false - - - - - - - &Apply - - - - - - - Cancel + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - &Export formats: + + + + Export for&mats: - + formatLW - - - - &Send exported file to command: + + + + Send exported file to &command: - + commandCO @@ -120,12 +117,9 @@ formatLW commandCO - okPB - applyPB - closePB - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ShortcutUi.ui b/src/frontends/qt4/ui/ShortcutUi.ui index bf191752d4..b7fed3f0d2 100644 --- a/src/frontends/qt4/ui/ShortcutUi.ui +++ b/src/frontends/qt4/ui/ShortcutUi.ui @@ -1,136 +1,89 @@ - + + shortcutUi - - + + 0 0 421 - 111 + 137 - + Edit shortcut - + true - - - 9 - - - 6 - - - - - 0 + + + + + Fu&nction: - - 6 + + lfunLE - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - false - - - true - - - - - - - Cancel - - - false - - - - + - - - + + + Enter LyX function or command sequence - + - - - - Remove last key from the shortcut sequence + + + + Short&cut: - - &Delete Key + + shortcutWG - - - - Clear current shortcut + + + + true - - C&lear + + Type shortcut after clicking on this field. You can reset the content with the 'Clear' button + + + - - - - &Shortcut: + + + + Remove last key from the shortcut sequence - - shortcutWG + + &Delete Key - - - - &Function: + + + + Clear current shortcut - - lfunLE + + C&lear - - - - true - - - Type shortcut after clicking on this field. You can reset the content with the 'Clear' button - - - + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -145,11 +98,9 @@ lfunLE - okPB - cancelPB - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ShowFileUi.ui b/src/frontends/qt4/ui/ShowFileUi.ui index 9aaaaf2b27..6b9c1e9d89 100644 --- a/src/frontends/qt4/ui/ShowFileUi.ui +++ b/src/frontends/qt4/ui/ShowFileUi.ui @@ -1,7 +1,8 @@ - + + ShowFileUi - - + + 0 0 @@ -9,63 +10,27 @@ 259 - + - + true - - - 9 - - - 6 - - - + + + - - - - 0 + + + + QDialogButtonBox::Close - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Close - - - true - - - - + - - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/SymbolsUi.ui b/src/frontends/qt4/ui/SymbolsUi.ui index fa3df70595..b15078c47d 100644 --- a/src/frontends/qt4/ui/SymbolsUi.ui +++ b/src/frontends/qt4/ui/SymbolsUi.ui @@ -1,7 +1,8 @@ - + + SymbolsUi - - + + 0 0 @@ -9,100 +10,56 @@ 296 - + - + true - - - 9 - - - 6 - - - - + + + + + 6 + + 0 - - 6 + + 0 - - - - Qt::Horizontal - - - - 221 - 20 - - - - - - - - &OK - - - - - - - Insert the delimiters - - - &Apply - - - - - - - &Close - - - - - - - - + 0 - - 6 + + 0 - - + + Available categories depend on the document encoding. Select UTF-8 for the full range. - + Ca&tegory: - + categoryCO - - + + 20 - + Qt::Horizontal - + 191 20 @@ -111,52 +68,55 @@ - - + + Select this to display all available characters at once - + &Display all - - - + + + Qt::ScrollBarAlwaysOff - + 16 16 - + QListView::Adjust - + 0 - - - + + + false + + + + QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Ok + + + - - - applyPB - closePB - + - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/TabularCreateUi.ui b/src/frontends/qt4/ui/TabularCreateUi.ui index b709feeb71..11dbf5bfe6 100644 --- a/src/frontends/qt4/ui/TabularCreateUi.ui +++ b/src/frontends/qt4/ui/TabularCreateUi.ui @@ -6,7 +6,7 @@ 0 0 - 349 + 374 298 @@ -16,7 +16,7 @@ true - + @@ -87,7 +87,20 @@ - + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -101,54 +114,11 @@ - - - 0 + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - - - - - Close - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - + @@ -162,8 +132,6 @@ rowsSB columnsSB - okPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/TexinfoUi.ui b/src/frontends/qt4/ui/TexinfoUi.ui index 181c011670..1a411d76cd 100644 --- a/src/frontends/qt4/ui/TexinfoUi.ui +++ b/src/frontends/qt4/ui/TexinfoUi.ui @@ -6,7 +6,7 @@ 0 0 - 294 + 373 290 @@ -16,26 +16,8 @@ true - - - 9 - - - 9 - - - 9 - - - 9 - - - 6 - - - - - + + 6 @@ -52,6 +34,43 @@ 0 + + + + Selected classes or styles + + + + LaTeX classes + + + + + LaTeX styles + + + + + BibTeX styles + + + + + BibTeX databases + + + + + Biblatex bibliography styles + + + + + Biblatex citation styles + + + + @@ -69,17 +88,20 @@ - + - Close this dialog + Toggles view of the file list - &Close + Show &path + + + @@ -138,87 +160,12 @@ - - - - 6 - - - 0 - - - 0 - - - 0 - - - 0 + + + + QDialogButtonBox::Close - - - - Selected classes or styles - - - - LaTeX classes - - - - - LaTeX styles - - - - - BibTeX styles - - - - - BibTeX databases - - - - - Biblatex bibliography styles - - - - - Biblatex citation styles - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - Toggles view of the file list - - - Show &path - - - - + @@ -228,7 +175,6 @@ fileListLW rescanPB viewPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/ThesaurusUi.ui b/src/frontends/qt4/ui/ThesaurusUi.ui index a9f340f429..52a05e66aa 100644 --- a/src/frontends/qt4/ui/ThesaurusUi.ui +++ b/src/frontends/qt4/ui/ThesaurusUi.ui @@ -1,3 +1,4 @@ + ThesaurusUi @@ -26,7 +27,7 @@ - + Language of the thesaurus @@ -46,17 +47,7 @@ - - - - Word to look up - - - true - - - - + @@ -72,21 +63,21 @@ The selected entry - &Selection: + Sele&ction: replaceED - + The selected entry - + Replace the entry with the selection @@ -96,7 +87,7 @@ - + Click to select a proposal, double click to look it up. @@ -108,38 +99,22 @@ - - - - 6 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Close - - - - + + + + QDialogButtonBox::Close + + + + + + + Word to look up + + + true + + @@ -150,7 +125,6 @@ replaceED replacePB meaningsTV - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/ToggleWarningUi.ui b/src/frontends/qt4/ui/ToggleWarningUi.ui index 992edb3a2c..47562f5560 100644 --- a/src/frontends/qt4/ui/ToggleWarningUi.ui +++ b/src/frontends/qt4/ui/ToggleWarningUi.ui @@ -1,7 +1,8 @@ - + + ToggleWarningUi - - + + 0 0 @@ -9,28 +10,22 @@ 140 - + LyX: Enter text - + true - - - 9 - - - 6 - - + + - + Qt::Vertical - + QSizePolicy::Expanding - + 247 16 @@ -38,32 +33,22 @@ - - - - If you check this, LyX will not warn you again in the given case. - - - &Do not show this warning again! - - - - - - + + + - + - + Qt::Vertical - + QSizePolicy::Expanding - + 247 16 @@ -71,62 +56,46 @@ - - - - Qt::Horizontal + + + + If you check this, LyX will not warn you again in the given case. - - - 81 - 20 - + + &Do not show this warning again! - + - - - - &OK + + + + QDialogButtonBox::Ok - + true - - - - Qt::Horizontal - - - - 81 - 20 - - - - - qt_i18n.h + qt_i18n.h - okPB - clicked() + buttonBox + accepted() ToggleWarningUi accept() - - 134 - 116 + + 98 + 114 - - 134 - 69 + + 80 + 805 diff --git a/src/frontends/qt4/ui/WrapUi.ui b/src/frontends/qt4/ui/WrapUi.ui index b9cff4291a..0075ba2d0d 100644 --- a/src/frontends/qt4/ui/WrapUi.ui +++ b/src/frontends/qt4/ui/WrapUi.ui @@ -1,286 +1,205 @@ - + + WrapUi - - + + 0 0 - 359 - 167 + 405 + 219 - + - + true - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - 40 - 22 - - - - Qt::StrongFocus + + + + + Pla&cement: - - Unit of width value + + valignCO - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - number of needed lines + + + + Vertical alignment + + + Outer (default) + + + + + Inner + + + + + Left + + + + + Right + + - - - - use number of lines + + + + Check this to allow flexible placement - - &Line span: + + Allow &floating - - - - &Width: + + + + Wid&th: - + widthED - - - - - 0 - 0 + + + + 0 0 - + Width value - - - - 0 - - - 6 + + + + + 0 + 0 + - - - - - - - &Restore - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - - - - &OK - - - false - - - - - - - - - - &Apply - - - false - - - - - - - &Close - - - true - - - - - - - - - &Placement: + + + 40 + 22 + - - valignCO + + Qt::StrongFocus - - - - - - Vertical alignment + + Unit of width value - - - Outer (default) - - - - - Inner - - - - - Left - - - - - Right - - - - - + + + use overhang - + Over&hang: - + false - - - + + + false - - - 0 - 0 + + 0 0 - + Overhang value - - - + + + false - - - 0 - 0 + + 0 0 - + 0 0 - + Qt::StrongFocus - + Unit of overhang value - - - - Check this to allow flexible placement + + + + use number of lines - - Allow &floating + + &Line span: + + + + + + + false + + + number of needed lines + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset @@ -303,13 +222,9 @@ overhangUnitLC linesCB linesSB - okPB - applyPB - closePB - restorePB - qt_i18n.h + qt_i18n.h @@ -319,11 +234,11 @@ overhangED setEnabled(bool) - + 52 71 - + 124 70 @@ -335,11 +250,11 @@ overhangUnitLC setEnabled(bool) - + 54 80 - + 259 80 @@ -351,11 +266,11 @@ linesSB setEnabled(bool) - + 13 93 - + 132 108 -- 2.39.2