From 1f5186b2a77e53cdb9ed6009aa45df99e4106f52 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Mon, 9 Jul 2018 09:46:39 +0200 Subject: [PATCH] More QDialogButtonBox transformation GuiDelimiter through GuiIndex See #11003 --- src/frontends/qt4/GuiDelimiter.cpp | 27 +- src/frontends/qt4/GuiDelimiter.h | 3 +- src/frontends/qt4/GuiDocument.cpp | 43 +- src/frontends/qt4/GuiDocument.h | 1 + src/frontends/qt4/GuiErrorList.cpp | 6 +- src/frontends/qt4/GuiExternal.cpp | 11 +- src/frontends/qt4/GuiGraphics.cpp | 14 +- src/frontends/qt4/GuiInclude.cpp | 10 +- src/frontends/qt4/GuiIndex.cpp | 8 +- src/frontends/qt4/ui/DelimiterUi.ui | 30 +- src/frontends/qt4/ui/DocumentUi.ui | 163 ++++---- src/frontends/qt4/ui/ErrorListUi.ui | 123 +++--- src/frontends/qt4/ui/ExternalUi.ui | 616 +++++++++++++++------------- src/frontends/qt4/ui/GraphicsUi.ui | 82 +--- src/frontends/qt4/ui/IncludeUi.ui | 97 +---- src/frontends/qt4/ui/IndexUi.ui | 92 ++--- 16 files changed, 618 insertions(+), 708 deletions(-) diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp index 683168c38a..8dc97ffe17 100644 --- a/src/frontends/qt4/GuiDelimiter.cpp +++ b/src/frontends/qt4/GuiDelimiter.cpp @@ -185,7 +185,7 @@ GuiDelimiter::GuiDelimiter(GuiView & lv) { setupUi(this); - connect(closePB, SIGNAL(clicked()), this, SLOT(accept())); + connect(buttonBox, SIGNAL(rejected()), this, SLOT(accept())); setFocusProxy(leftLW); @@ -333,7 +333,25 @@ void GuiDelimiter::updateTeXCode(int size) } -void GuiDelimiter::on_insertPB_clicked() +void GuiDelimiter::on_buttonBox_clicked(QAbstractButton * button) +{ + switch (buttonBox->standardButton(button)) { + case QDialogButtonBox::Apply: + insert(); + break; + case QDialogButtonBox::Ok: + insert(); + // fall through + case QDialogButtonBox::Cancel: + accept(); + break; + default: + break; + } +} + + +void GuiDelimiter::insert() { if (sizeCO->currentIndex() == 0) dispatch(FuncRequest(LFUN_MATH_DELIM, tex_code_)); @@ -342,6 +360,7 @@ void GuiDelimiter::on_insertPB_clicked() command = support::subst(command, from_ascii(" "), from_ascii("\" \"")); dispatch(FuncRequest(LFUN_MATH_BIGDELIM, command)); } + buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Close")); } @@ -356,7 +375,7 @@ void GuiDelimiter::on_leftLW_itemActivated(QListWidgetItem *) // do not auto-apply if !matchCB->isChecked() if (!matchCB->isChecked()) return; - on_insertPB_clicked(); + insert(); accept(); } @@ -366,7 +385,7 @@ void GuiDelimiter::on_rightLW_itemActivated(QListWidgetItem *) // do not auto-apply if !matchCB->isChecked() if (!matchCB->isChecked()) return; - on_insertPB_clicked(); + insert(); accept(); } diff --git a/src/frontends/qt4/GuiDelimiter.h b/src/frontends/qt4/GuiDelimiter.h index 7bd6ee610b..3d44e224b0 100644 --- a/src/frontends/qt4/GuiDelimiter.h +++ b/src/frontends/qt4/GuiDelimiter.h @@ -34,12 +34,13 @@ public: bool isBufferDependent() const { return true; } public Q_SLOTS: + void on_buttonBox_clicked(QAbstractButton * button); void on_leftLW_itemActivated(QListWidgetItem *); void on_rightLW_itemActivated(QListWidgetItem *); void on_leftLW_currentRowChanged(int); void on_rightLW_currentRowChanged(int); void on_matchCB_stateChanged(int); - void on_insertPB_clicked(); + void insert(); void on_swapPB_clicked(); void on_sizeCO_activated(int); diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp index 70d6d617f3..d60385b041 100644 --- a/src/frontends/qt4/GuiDocument.cpp +++ b/src/frontends/qt4/GuiDocument.cpp @@ -765,20 +765,18 @@ GuiDocument::GuiDocument(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(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(savePB, SIGNAL(clicked()), this, SLOT(saveDefaultClicked())); connect(defaultPB, SIGNAL(clicked()), this, SLOT(useDefaultsClicked())); // Manage the restore, ok, apply, restore and cancel/close buttons bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setOK(okPB); - bc().setApply(applyPB); - bc().setCancel(closePB); - bc().setRestore(restorePB); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); + bc().setApply(buttonBox->button(QDialogButtonBox::Apply)); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); + bc().setRestore(buttonBox->button(QDialogButtonBox::Reset)); // text layout @@ -1692,6 +1690,28 @@ void GuiDocument::slotOK() } +void GuiDocument::slotButtonBox(QAbstractButton * button) +{ + switch (buttonBox->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 GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int) { if (item == 0) @@ -2521,7 +2541,7 @@ void GuiDocument::classChanged() return; string const classname = fromqstr(latexModule->classCO->getData(idx)); - if (applyPB->isEnabled()) { + if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) { int const ret = Alert::prompt(_("Unapplied changes"), _("Some changes in the dialog were not yet applied.\n" "If you do not apply now, they will be lost after this action."), @@ -2823,7 +2843,8 @@ void GuiDocument::modulesChanged() { modulesToParams(bp_); - if (applyPB->isEnabled() && (nonModuleChanged_ || shellescapeChanged_)) { + if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled() + && (nonModuleChanged_ || shellescapeChanged_)) { int const ret = Alert::prompt(_("Unapplied changes"), _("Some changes in the dialog were not yet applied.\n" "If you do not apply now, they will be lost after this action."), @@ -4294,7 +4315,7 @@ void GuiDocument::updateContents() void GuiDocument::useClassDefaults() { - if (applyPB->isEnabled()) { + if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) { int const ret = Alert::prompt(_("Unapplied changes"), _("Some changes in the dialog were not yet applied.\n" "If you do not apply now, they will be lost after this action."), diff --git a/src/frontends/qt4/GuiDocument.h b/src/frontends/qt4/GuiDocument.h index dd51bac8c4..8812ff91c4 100644 --- a/src/frontends/qt4/GuiDocument.h +++ b/src/frontends/qt4/GuiDocument.h @@ -94,6 +94,7 @@ public Q_SLOTS: void slotOK(); // Apply button clicked void slotApply(); + void slotButtonBox(QAbstractButton *); private Q_SLOTS: void updateNumbering(); diff --git a/src/frontends/qt4/GuiErrorList.cpp b/src/frontends/qt4/GuiErrorList.cpp index 3ab716acb1..0b625ccd51 100644 --- a/src/frontends/qt4/GuiErrorList.cpp +++ b/src/frontends/qt4/GuiErrorList.cpp @@ -62,8 +62,8 @@ GuiErrorList::GuiErrorList(GuiView & lv) { setupUi(this); - connect(closePB, SIGNAL(clicked()), - this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(viewLogPB, SIGNAL(clicked()), this, SLOT(viewLog())); connect(showAnywayPB, SIGNAL(clicked()), @@ -72,7 +72,7 @@ GuiErrorList::GuiErrorList(GuiView & lv) this, SLOT(select())); bc().setPolicy(ButtonPolicy::OkCancelPolicy); - bc().setCancel(closePB); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); } diff --git a/src/frontends/qt4/GuiExternal.cpp b/src/frontends/qt4/GuiExternal.cpp index 87005fe9d2..7be6be0954 100644 --- a/src/frontends/qt4/GuiExternal.cpp +++ b/src/frontends/qt4/GuiExternal.cpp @@ -88,9 +88,8 @@ GuiExternal::GuiExternal(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(displayGB, SIGNAL(toggled(bool)), @@ -159,9 +158,9 @@ GuiExternal::GuiExternal(GuiView & lv) 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(fileED); bc().addReadOnly(browsePB); diff --git a/src/frontends/qt4/GuiGraphics.cpp b/src/frontends/qt4/GuiGraphics.cpp index 3c6bd21376..b6bbaeac3f 100644 --- a/src/frontends/qt4/GuiGraphics.cpp +++ b/src/frontends/qt4/GuiGraphics.cpp @@ -115,10 +115,8 @@ GuiGraphics::GuiGraphics(GuiView & lv) setupUi(this); //main buttons - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); - connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); //graphics pane connect(filename, SIGNAL(textChanged(const QString &)), @@ -212,10 +210,10 @@ GuiGraphics::GuiGraphics(GuiView & lv) displayscale->setValidator(new QIntValidator(displayscale)); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); - bc().setOK(okPB); - bc().setApply(applyPB); - bc().setRestore(restorePB); - 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(latexoptions); bc().addReadOnly(filenameL); diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp index 36fb9a07f7..43f71d7344 100644 --- a/src/frontends/qt4/GuiInclude.cpp +++ b/src/frontends/qt4/GuiInclude.cpp @@ -51,8 +51,8 @@ GuiInclude::GuiInclude(GuiView & lv) { setupUi(this); - connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); - connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); + connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), + this, SLOT(slotButtonBox(QAbstractButton *))); connect(visiblespaceCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(filenameED, SIGNAL(textChanged(const QString &)), @@ -73,8 +73,8 @@ GuiInclude::GuiInclude(GuiView & lv) setFocusProxy(filenameED); bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy); - bc().setOK(okPB); - bc().setCancel(closePB); + bc().setOK(buttonBox->button(QDialogButtonBox::Ok)); + bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel)); bc().addReadOnly(filenameED); bc().addReadOnly(browsePB); bc().addReadOnly(visiblespaceCB); @@ -157,7 +157,7 @@ void GuiInclude::typeChanged(int v) //see this thread // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg118471.html //for the reason this is here. - okPB->setDefault(true); + buttonBox->button(QDialogButtonBox::Ok)->setDefault(true); } diff --git a/src/frontends/qt4/GuiIndex.cpp b/src/frontends/qt4/GuiIndex.cpp index aec568e0b0..7800bad2d4 100644 --- a/src/frontends/qt4/GuiIndex.cpp +++ b/src/frontends/qt4/GuiIndex.cpp @@ -35,13 +35,13 @@ GuiIndex::GuiIndex(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())); 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/ui/DelimiterUi.ui b/src/frontends/qt4/ui/DelimiterUi.ui index 96cdc4968c..1e58c452b8 100644 --- a/src/frontends/qt4/ui/DelimiterUi.ui +++ b/src/frontends/qt4/ui/DelimiterUi.ui @@ -56,31 +56,9 @@ - - - - 0 - 0 - - - - Insert the delimiters - - - &Insert - - - - - - - - 0 - 0 - - - - &Close + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -275,8 +253,6 @@ sizeCO - insertPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/DocumentUi.ui b/src/frontends/qt4/ui/DocumentUi.ui index 3a7b4c9ef6..fc7d3f29f0 100644 --- a/src/frontends/qt4/ui/DocumentUi.ui +++ b/src/frontends/qt4/ui/DocumentUi.ui @@ -1,7 +1,8 @@ - + + DocumentUi - - + + 0 0 @@ -9,140 +10,118 @@ 169 - - - 1 - 1 + + 0 0 - + - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - - 0 - - + + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - - &Restore - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - true - - - - - - - &Apply - - - - - - - &Cancel - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset - - - - 0 - - + + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - - - 3 - 0 + + + 0 0 - + Reset to the default settings for the document class - + Use Class Defaults - - - - 3 - 0 + + + 0 0 - + Save settings as LyX's default document settings - + Save as Document Defaults - + Qt::Horizontal - + QSizePolicy::Expanding - + 20 20 @@ -152,8 +131,8 @@ - - + + @@ -169,13 +148,9 @@ docPS defaultPB savePB - restorePB - okPB - applyPB - closePB - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ErrorListUi.ui b/src/frontends/qt4/ui/ErrorListUi.ui index ffbdd383c9..af88139a9b 100644 --- a/src/frontends/qt4/ui/ErrorListUi.ui +++ b/src/frontends/qt4/ui/ErrorListUi.ui @@ -1,75 +1,93 @@ - + + ErrorListUi - - + + 0 0 - 274 + 447 422 - + - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - - - 3 - 0 + + + + Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred. + + + + + + + 0 0 - + For more information, refer to the complete log. - - - - &Errors: - - - errorsLW - - - - - - + + + Description: - - - - &Close + + + + &Errors: + + + errorsLW - + + + + Open the LaTeX Log File dialog + + + View Complete &Log... + + + + - + Qt::Horizontal - + QSizePolicy::Expanding - + 121 30 @@ -77,30 +95,20 @@ - - - - Open the LaTeX Log File dialog + + + + Attempt to show the output even if there were compilation errors - - View Complete &Log... - - - - - - - Attempt to show the output even if there were compilation errors - - + Show Output &Anyway - - - - Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred. + + + + QDialogButtonBox::Cancel @@ -109,10 +117,9 @@ errorsLW descriptionTB - closePB - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/ExternalUi.ui b/src/frontends/qt4/ui/ExternalUi.ui index 12967c5b12..f760f11827 100644 --- a/src/frontends/qt4/ui/ExternalUi.ui +++ b/src/frontends/qt4/ui/ExternalUi.ui @@ -1,107 +1,135 @@ - + + ExternalUi - - + + 0 0 - 386 - 453 + 574 + 601 - + - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + - + 0 - - + + F&ile - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Filename - - - + + + Filename - + &File: - + fileED - - - + + + Select a file - + &Browse... - - - + + + &Draft - - - + + + &Template - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - + + - + - + Qt::Horizontal - + QSizePolicy::Preferred - + 20 20 @@ -109,15 +137,15 @@ - - - - + + + + 0 0 - + Available templates @@ -127,57 +155,75 @@ - - + + LaTe&X and LyX options - - + + 6 - + + 9 + + + 9 + + + 9 + + 9 - - + + LaTeX Options - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - + + - - - + + + O&ption: - + extraED - - + + - - - - Forma&t: + + + + For&mat: - + Qt::AutoText - + extraFormatCO @@ -186,61 +232,70 @@ - - + + Enable LyX to preview this material; only if graphics previewing is not disabled at application level (see Preference dialog). - + &Show in LyX - + true - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Percentage to scale by in LyX - + Sca&le on Screen (%): - + displayscaleED - - - + + + true - - + + 0 0 - + Percentage to scale by in LyX - + - + Qt::Horizontal - + 40 20 @@ -253,10 +308,10 @@ - + Qt::Vertical - + 81 196 @@ -266,41 +321,59 @@ - - + + Si&ze and Rotation - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Rotate - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - + - + Qt::Horizontal - + QSizePolicy::Expanding - + 20 20 @@ -308,59 +381,68 @@ - - - + + + 0 - + + 0 + + + 0 + + + 0 + + 6 - - - - + + + + 0 0 - + Angle to rotate image by - + - - - + + + The origin of the rotation - + Ori&gin: - + originCO - - - + + + The origin of the rotation - - - + + + Angle to rotate image by - + A&ngle: - + angleED @@ -370,82 +452,91 @@ - - - + + + Scale - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - + + - - + + - - - + + + true - + Height of image in output - - - + + + true - + Width of image in output - - - + + + true - + &Width: - + widthED - - - + + + true - + Maintain aspect ratio with largest dimension - + &Maintain aspect ratio - - - + + + true - + &Height: - + heightED @@ -453,84 +544,93 @@ - - - + + + Crop - + true - - + + 9 - + + 9 + + + 9 + + + 9 + + 6 - - - + + + Clip to bounding box values - + Clip to &bounding box - - - - &Left bottom: + + + + Left botto&m: - + xlED - - + + - - - + + + x - - - + + + Right &top: - + xrED - - - + + + Get bounding box from the (EPS) file - + &Get from File - - - + + + - + - + Qt::Horizontal - + 43 18 @@ -538,30 +638,30 @@ - - + + - - - + + + y - - + + - - + + - - + + - - + + - - + + @@ -570,60 +670,27 @@ - - - + + + 6 - + + 0 + + + 0 + + + 0 + + 0 - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - true - - - - - - - &Apply - - - false - - - - - - - &Close - - - false - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -647,12 +714,9 @@ draftCB angleED originCO - okPB - applyPB - closePB - qt_i18n.h + qt_i18n.h diff --git a/src/frontends/qt4/ui/GraphicsUi.ui b/src/frontends/qt4/ui/GraphicsUi.ui index 83d0d0965b..4525344265 100644 --- a/src/frontends/qt4/ui/GraphicsUi.ui +++ b/src/frontends/qt4/ui/GraphicsUi.ui @@ -387,7 +387,7 @@ - &Left bottom: + Left botto&m: lbX @@ -739,79 +739,9 @@ 0 - - - &Restore - - - false - - - false - - - - - - - Qt::Horizontal - - - QSizePolicy::MinimumExpanding - - - - 20 - 20 - - - - - - - - &OK - - - true - - - true - - - - - - - - 0 - 0 - - - - &Apply - - - false - - - false - - - - - - - - 0 - 0 - - - - Close - - - false + + + QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset @@ -842,10 +772,6 @@ angle origin rotateOrderCB - restorePB - okPB - applyPB - closePB clip lbX lbXunit diff --git a/src/frontends/qt4/ui/IncludeUi.ui b/src/frontends/qt4/ui/IncludeUi.ui index 11a8f49d92..1a9a9be95f 100644 --- a/src/frontends/qt4/ui/IncludeUi.ui +++ b/src/frontends/qt4/ui/IncludeUi.ui @@ -6,7 +6,7 @@ 0 0 - 363 + 369 470 @@ -37,7 +37,7 @@ - + Select a file @@ -47,17 +47,17 @@ - + - &Include Type: + I&nclude Type: typeCO - + @@ -82,6 +82,16 @@ + + + Edit the file + + + &Edit + + + + Qt::Horizontal @@ -97,17 +107,7 @@ - - - - Edit the file - - - &Edit - - - - + 6 @@ -158,7 +158,7 @@ - + @@ -302,63 +302,12 @@ - - - - 6 + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - 0 - - - 0 - - - 0 - - - 0 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &OK - - - true - - - true - - - - - - - &Close - - - false - - - - + @@ -373,8 +322,6 @@ labelLE listingsTB listingsED - okPB - closePB qt_i18n.h diff --git a/src/frontends/qt4/ui/IndexUi.ui b/src/frontends/qt4/ui/IndexUi.ui index 644cd75ecf..95c2a71014 100644 --- a/src/frontends/qt4/ui/IndexUi.ui +++ b/src/frontends/qt4/ui/IndexUi.ui @@ -1,84 +1,62 @@ - + + IndexUi - - + + 0 0 262 - 108 + 121 - + - + true - - - 9 - - - 6 - - - - - Qt::Horizontal - - - - 71 - 20 - - - - - - - - &OK - - - false - - - - - - - 0 - - + + + + 6 + + 0 + + + 0 + + + 0 + + + 0 + - - - A&vailable Indexes: + + + Available I&ndexes: - + indicesCO - - + + Select the index this entry should be listed in. - - - - &Cancel - - - true + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok @@ -86,11 +64,9 @@ indicesCO - okPB - cancelPB - qt_i18n.h + qt_i18n.h