QDialogButtonBox for the remaining dialogs.

diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 3873ef3f2f8b72e0c7f89091a0abc0df379679f2..f79d4d3f2893c76ad3e1beacc2fd2b54aadfcc03 100644 (file)
--- 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 00b876b095f31275afde21f261adae91735e5a87..1244c62e495d4ad00eb6f9aae057969a9debd086 100644 (file)
--- 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 907568761a224fbf06830fb0e3bff5dead70feb2..6ccb8ef6c46ec49710113598110af68e8a242b27 100644 (file)
--- 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 46d9a6d076607a71d96aa4f9b8ac138221e14945..f7e007724a6a3bfc9ea5e7a9389428f31dfdb12f 100644 (file)
--- 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 a24690465c4b0bbc4d1729ce2b55dd540f37eb50..dd1a002fed95990f038070484ed845d2c4a93673 100644 (file)
--- 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 470852efc373b8a7429d93c01063cf8d16826cc9..a42bbb472cc03bdca08c88367cb5f83039702232 100644 (file)
--- 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 d845455af8bc25429c0859e0c3312bb3141f2d2e..4126045410b36c3895585162fa69235d2f26b3f0 100644 (file)
--- 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 d08689cd3cc85fcddfce113ae913bf8ee138fe6b..93f21740623ce895adebc4efe07e00889addd00c 100644 (file)
--- a/src/frontends/qt4/GuiSymbols.cpp
+++ b/src/frontends/qt4/GuiSymbols.cpp
@@ -27,6 +27,8 @@
 #include "support/gettext.h"
 
 #include <QChar>
+#include <QDialogButtonBox>
+#include <QPushButton>
 #include <QString>
 
 #include <cstdio>
@@ -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<QDialogButtonBox*>(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 1ddcc1413c9df10673c2263cb93604632ba72671..dde0623688182144d26d237c76d27d57d6670385 100644 (file)
--- 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 20b5c90497ad5a94e27a736554dc3a9a87ed22de..f2c4f98264284d77e3cc23643c68977cfd6c8a2a 100644 (file)
--- 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 7b4574c9e6e28ad464fe148409d27ac915361c79..554b874095cde560d057c2115976fb10a8770e7e 100644 (file)
--- 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 2bda2485c3a1d255e2223faab5325fff6bb7bd05..dba18368138f219b2b052d457ddb0923a731146a 100644 (file)
--- a/src/frontends/qt4/GuiThesaurus.cpp
+++ b/src/frontends/qt4/GuiThesaurus.cpp
@@ -30,6 +30,7 @@
 
 #include <QAbstractItemModel>
 #include <QCompleter>
+#include <QDialogButtonBox>
 #include <QHeaderView>
 #include <QLineEdit>
 #include <QPushButton>
@@ -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 27a52597889d8317697dc4ee7cae5e11542b8c8c..e22be0898c2e97f599dc76aa8d8f332f3af41446 100644 (file)
--- 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 74fa0a8a84907858142c76fce52462fd34738d2d..8f5ea1d3c9cd2df9ed2480b02e82084840a58a77 100644 (file)
--- a/src/frontends/qt4/ui/PrintindexUi.ui
+++ b/src/frontends/qt4/ui/PrintindexUi.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>287</width>
-    <height>148</height>
+    <height>150</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -37,7 +37,7 @@
      <item>
       <widget class="QLabel" name="indicesLA">
        <property name="text">
-        <string>Avai&amp;lable indexes:</string>
+        <string>Available i&amp;ndexes:</string>
        </property>
        <property name="buddy">
         <cstring>indicesCO</cstring>
@@ -78,48 +78,16 @@
     </layout>
    </item>
    <item row="2" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>78</width>
-         <height>29</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-       <property name="default">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelPB">
-       <property name="text">
-        <string>&amp;Cancel</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>indicesCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>cancelPB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/RefUi.ui b/src/frontends/qt4/ui/RefUi.ui
index 049a8fd3d46f9253443374c2e2716d4b04e30fb3..56318363465db4c7872daa2764cc5df4bb842a39 100644 (file)
--- a/src/frontends/qt4/ui/RefUi.ui
+++ b/src/frontends/qt4/ui/RefUi.ui
@@ -312,70 +312,9 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="updatePB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="toolTip">
-        <string>Update the label list</string>
-       </property>
-       <property name="text">
-        <string>&amp;Update</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>31</width>
-         <height>30</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault">
-        <bool>true</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB">
-       <property name="text">
-        <string>&amp;Apply</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-       <property name="default">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
        </property>
       </widget>
      </item>
@@ -385,8 +324,8 @@
     <layout class="QHBoxLayout" name="horizontalLayout9">
      <item>
       <widget class="QCheckBox" name="pluralCB">
-        <property name="toolTip">
-          <string>Use plural form of formatted reference. (Works only for formatted references, and only if you are using refstyle.)</string>
+       <property name="toolTip">
+        <string>Use plural form of formatted reference. (Works only for formatted references, and only if you are using refstyle.)</string>
        </property>
        <property name="text">
         <string>Plural</string>
@@ -413,6 +352,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
     </layout>
    </item>
   </layout>
@@ -424,10 +376,6 @@
   <tabstop>referenceED</tabstop>
   <tabstop>typeCO</tabstop>
   <tabstop>nameED</tabstop>
-  <tabstop>updatePB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/SearchUi.ui b/src/frontends/qt4/ui/SearchUi.ui
index 7fc1e3173918e85976fb489712e7b1b24c3deb10..ebc00e3cfc2002e712a3b74376ff09137e08587e 100644 (file)
--- a/src/frontends/qt4/ui/SearchUi.ui
+++ b/src/frontends/qt4/ui/SearchUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SearchUi</class>
  <widget class="QDialog" name="SearchUi">
@@ -5,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>357</width>
-    <height>152</height>
+    <width>416</width>
+    <height>197</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,24 +16,18 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>11</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="findLA">
      <property name="text">
-      <string>&amp;Find:</string>
+      <string>Fi&amp;nd:</string>
      </property>
      <property name="buddy">
       <cstring>findCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
+   <item row="0" column="2" colspan="2">
     <widget class="QComboBox" name="findCO">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -60,17 +55,61 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="0" column="4" rowspan="5">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QPushButton" name="findPB">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Find &amp;Next</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="replacePB">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>&amp;Replace</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="replaceallPB">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Replace &amp;All</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="replaceLA">
      <property name="text">
-      <string>Replace &amp;with:</string>
+      <string>Repla&amp;ce with:</string>
      </property>
      <property name="buddy">
       <cstring>replaceCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2">
+   <item row="1" column="2" colspan="2">
     <widget class="QComboBox" name="replaceCO">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -95,21 +134,14 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2">
+   <item row="2" column="0" colspan="3">
     <widget class="QCheckBox" name="caseCB">
      <property name="text">
       <string>Case &amp;sensitive[[search]]</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" rowspan="2" colspan="2">
-    <widget class="QCheckBox" name="wordsCB">
-     <property name="text">
-      <string>Match w&amp;hole words only</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
+   <item row="2" column="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -125,7 +157,21 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="0" colspan="2">
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="wordsCB">
+     <property name="text">
+      <string>Match w&amp;hole words only</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QCheckBox" name="backwardsCB">
+     <property name="text">
+      <string>Search &amp;backwards</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -141,7 +187,7 @@
      </property>
     </spacer>
    </item>
-   <item row="6" column="3">
+   <item row="5" column="4">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -157,53 +203,6 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="3">
-    <widget class="QPushButton" name="findPB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Find &amp;Next</string>
-     </property>
-     <property name="default">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3">
-    <widget class="QPushButton" name="replacePB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>&amp;Replace</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="3" rowspan="2">
-    <widget class="QPushButton" name="replaceallPB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Replace &amp;All</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QCheckBox" name="backwardsCB">
-     <property name="text">
-      <string>Search &amp;backwards</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="3" rowspan="2">
-    <widget class="QPushButton" name="closePB">
-     <property name="text">
-      <string>&amp;Close</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <tabstops>
@@ -215,7 +214,6 @@
   <tabstop>findPB</tabstop>
   <tabstop>replacePB</tabstop>
   <tabstop>replaceallPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/SendtoUi.ui b/src/frontends/qt4/ui/SendtoUi.ui
index 7626a855caae4fe832db22dc6b4d516f26b651ac..4cd8ef4f75de135d2d7183e1f74c650e50e0f708 100644 (file)
--- a/src/frontends/qt4/ui/SendtoUi.ui
+++ b/src/frontends/qt4/ui/SendtoUi.ui
@@ -1,116 +1,113 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SendtoUi</class>
- <widget class="QDialog" name="SendtoUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SendtoUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>282</width>
+    <width>296</width>
     <height>262</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="leftMargin">
     <number>9</number>
    </property>
-   <property name="spacing" >
+   <property name="topMargin">
+    <number>9</number>
+   </property>
+   <property name="rightMargin">
+    <number>9</number>
+   </property>
+   <property name="bottomMargin">
+    <number>9</number>
+   </property>
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="1" column="0" >
-    <widget class="QListWidget" name="formatLW" />
+   <item row="1" column="0">
+    <widget class="QListWidget" name="formatLW"/>
    </item>
-   <item row="3" column="0" >
-    <widget class="QComboBox" name="commandCO" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>3</hsizetype>
-       <vsizetype>0</vsizetype>
+   <item row="3" column="0">
+    <widget class="QComboBox" name="commandCO">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="focusPolicy" >
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Process the converted file with this command ($$FName = file name)</string>
      </property>
-     <property name="editable" >
+     <property name="editable">
       <bool>true</bool>
      </property>
-     <property name="maxCount" >
+     <property name="maxCount">
       <number>666</number>
      </property>
-     <property name="insertPolicy" >
+     <property name="insertPolicy">
       <enum>QComboBox::NoInsert</enum>
      </property>
-     <property name="autoCompletion" >
+     <property name="autoCompletion">
       <bool>true</bool>
      </property>
-     <property name="duplicatesEnabled" >
+     <property name="duplicatesEnabled">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+   <item row="4" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>true</bool>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>Cancel</string>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="formatLA" >
-     <property name="text" >
-      <string>&amp;Export formats:</string>
+   <item row="0" column="0">
+    <widget class="QLabel" name="formatLA">
+     <property name="text">
+      <string>Export for&amp;mats:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>formatLW</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="commandLA" >
-     <property name="text" >
-      <string>&amp;Send exported file to command:</string>
+   <item row="2" column="0">
+    <widget class="QLabel" name="commandLA">
+     <property name="text">
+      <string>Send exported file to &amp;command:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>commandCO</cstring>
      </property>
     </widget>
@@ -120,12 +117,9 @@
  <tabstops>
   <tabstop>formatLW</tabstop>
   <tabstop>commandCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/ShortcutUi.ui b/src/frontends/qt4/ui/ShortcutUi.ui
index bf191752d4033c8d30217ebdfff2502de1be6f9a..b7fed3f0d2f35b93d23d21651b744335883ba028 100644 (file)
--- a/src/frontends/qt4/ui/ShortcutUi.ui
+++ b/src/frontends/qt4/ui/ShortcutUi.ui
@@ -1,136 +1,89 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>shortcutUi</class>
- <widget class="QDialog" name="shortcutUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="shortcutUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>421</width>
-    <height>111</height>
+    <height>137</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Edit shortcut</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="0" colspan="4" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="lfunLBL">
+     <property name="text">
+      <string>Fu&amp;nction:</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="buddy">
+      <cstring>lfunLE</cstring>
      </property>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="cancelPB" >
-       <property name="text" >
-        <string>Cancel</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
-   <item row="0" column="1" colspan="3" >
-    <widget class="QLineEdit" name="lfunLE" >
-     <property name="toolTip" >
+   <item row="0" column="1" colspan="3">
+    <widget class="QLineEdit" name="lfunLE">
+     <property name="toolTip">
       <string>Enter LyX function or command sequence</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string/>
      </property>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="QPushButton" name="removePB" >
-     <property name="toolTip" >
-      <string>Remove last key from the shortcut sequence</string>
+   <item row="1" column="0">
+    <widget class="QLabel" name="shortcutLBL">
+     <property name="text">
+      <string>Short&amp;cut:</string>
      </property>
-     <property name="text" >
-      <string>&amp;Delete Key</string>
+     <property name="buddy">
+      <cstring>shortcutWG</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="3" >
-    <widget class="QPushButton" name="clearPB" >
-     <property name="toolTip" >
-      <string>Clear current shortcut</string>
+   <item row="1" column="1">
+    <widget class="lyx::frontend::ShortcutWidget" name="shortcutWG">
+     <property name="enabled">
+      <bool>true</bool>
      </property>
-     <property name="text" >
-      <string>C&amp;lear</string>
+     <property name="toolTip">
+      <string>Type shortcut after clicking on this field. You can reset the content with the 'Clear' button</string>
+     </property>
+     <property name="text">
+      <string/>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="shortcutLBL" >
-     <property name="text" >
-      <string>&amp;Shortcut:</string>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="removePB">
+     <property name="toolTip">
+      <string>Remove last key from the shortcut sequence</string>
      </property>
-     <property name="buddy" >
-      <cstring>shortcutWG</cstring>
+     <property name="text">
+      <string>&amp;Delete Key</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="lfunLBL" >
-     <property name="text" >
-      <string>&amp;Function:</string>
+   <item row="1" column="3">
+    <widget class="QPushButton" name="clearPB">
+     <property name="toolTip">
+      <string>Clear current shortcut</string>
      </property>
-     <property name="buddy" >
-      <cstring>lfunLE</cstring>
+     <property name="text">
+      <string>C&amp;lear</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="lyx::frontend::ShortcutWidget" name="shortcutWG" >
-     <property name="enabled" >
-      <bool>true</bool>
-     </property>
-     <property name="toolTip" >
-      <string>Type shortcut after clicking on this field. You can reset the content with the 'Clear' button</string>
-     </property>
-     <property name="text" >
-      <string/>
+   <item row="2" column="2" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -145,11 +98,9 @@
  </customwidgets>
  <tabstops>
   <tabstop>lfunLE</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>cancelPB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/ShowFileUi.ui b/src/frontends/qt4/ui/ShowFileUi.ui
index 9aaaaf2b27ca7ed584382ae44c511fc9415cf4d8..6b9c1e9d8955448c1056c2a3da8e9ad864ab4bc7 100644 (file)
--- a/src/frontends/qt4/ui/ShowFileUi.ui
+++ b/src/frontends/qt4/ui/ShowFileUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ShowFileUi</class>
- <widget class="QDialog" name="ShowFileUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ShowFileUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,63 +10,27 @@
     <height>259</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QTextBrowser" name="textTB" />
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QTextBrowser" name="textTB"/>
    </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/SymbolsUi.ui b/src/frontends/qt4/ui/SymbolsUi.ui
index fa3df7059534133619857a75956b9897e10eac2b..b15078c47df8103845aeaac4b86f88a366f06411 100644 (file)
--- a/src/frontends/qt4/ui/SymbolsUi.ui
+++ b/src/frontends/qt4/ui/SymbolsUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>SymbolsUi</class>
- <widget class="QDialog" name="SymbolsUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="SymbolsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,100 +10,56 @@
     <height>296</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="3" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="topMargin">
+      <number>0</number>
      </property>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>221</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="toolTip" >
-        <string>Insert the delimiters</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
+     <property name="rightMargin">
       <number>0</number>
      </property>
-     <property name="spacing" >
-      <number>6</number>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
-      <widget class="QLabel" name="categoryLA" >
-       <property name="toolTip" >
+      <widget class="QLabel" name="categoryLA">
+       <property name="toolTip">
         <string>Available categories depend on the document encoding. Select UTF-8 for the full range.</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>Ca&amp;tegory:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>categoryCO</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="categoryCO" >
-       <property name="maxVisibleItems" >
+      <widget class="QComboBox" name="categoryCO">
+       <property name="maxVisibleItems">
         <number>20</number>
        </property>
       </widget>
      </item>
      <item>
       <spacer>
-       <property name="orientation" >
+       <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>191</width>
          <height>20</height>
@@ -111,52 +68,55 @@
       </spacer>
      </item>
      <item>
-      <widget class="QCheckBox" name="categoryFilterCB" >
-       <property name="toolTip" >
+      <widget class="QCheckBox" name="categoryFilterCB">
+       <property name="toolTip">
         <string>Select this to display all available characters at once</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>&amp;Display all</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="1" column="0" >
-    <widget class="QListView" name="symbolsLW" >
-     <property name="horizontalScrollBarPolicy" >
+   <item row="1" column="0">
+    <widget class="QListView" name="symbolsLW">
+     <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
-     <property name="iconSize" >
+     <property name="iconSize">
       <size>
        <width>16</width>
        <height>16</height>
       </size>
      </property>
-     <property name="resizeMode" >
+     <property name="resizeMode">
       <enum>QListView::Adjust</enum>
      </property>
-     <property name="spacing" >
+     <property name="spacing">
       <number>0</number>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QLineEdit" name="chosenLE" >
-     <property name="readOnly" >
+   <item row="2" column="0">
+    <widget class="QLineEdit" name="chosenLE">
+     <property name="readOnly">
       <bool>false</bool>
      </property>
     </widget>
    </item>
+   <item row="3" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="9" />
- <tabstops>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
- </tabstops>
+ <layoutdefault spacing="6" margin="9"/>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>

diff --git a/src/frontends/qt4/ui/TabularCreateUi.ui b/src/frontends/qt4/ui/TabularCreateUi.ui
index b709feeb71132a9945e42984422fb829361a86ee..11dbf5bfe6d656b2cf9511a160072cb04f260dde 100644 (file)
--- a/src/frontends/qt4/ui/TabularCreateUi.ui
+++ b/src/frontends/qt4/ui/TabularCreateUi.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>349</width>
+    <width>374</width>
     <height>298</height>
    </rect>
   </property>
@@ -16,7 +16,7 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
+  <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -87,7 +87,20 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="0" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
     <widget class="EmptyTable" name="table" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
@@ -101,54 +114,11 @@
     </widget>
    </item>
    <item row="2" column="0">
-    <layout class="QGridLayout" name="gridLayout">
-     <property name="margin">
-      <number>0</number>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
-     <item row="0" column="0">
-      <spacer name="hspacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="0" column="1">
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2">
-      <widget class="QPushButton" name="closePB">
-       <property name="text">
-        <string>Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="1">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -162,8 +132,6 @@
  <tabstops>
   <tabstop>rowsSB</tabstop>
   <tabstop>columnsSB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/TexinfoUi.ui b/src/frontends/qt4/ui/TexinfoUi.ui
index 181c0116705007c28e72675da5a2b74748b84fe3..1a411d76cd05e4d06c2d976e8fb58d86941e6fed 100644 (file)
--- a/src/frontends/qt4/ui/TexinfoUi.ui
+++ b/src/frontends/qt4/ui/TexinfoUi.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>294</width>
+    <width>373</width>
     <height>290</height>
    </rect>
   </property>
@@ -16,26 +16,8 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="leftMargin">
-    <number>9</number>
-   </property>
-   <property name="topMargin">
-    <number>9</number>
-   </property>
-   <property name="rightMargin">
-    <number>9</number>
-   </property>
-   <property name="bottomMargin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="1" column="0">
-    <widget class="QListWidget" name="fileListLW"/>
-   </item>
-   <item row="3" column="0">
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -52,6 +34,43 @@
      <property name="bottomMargin">
       <number>0</number>
      </property>
+     <item>
+      <widget class="QComboBox" name="whatStyleCO">
+       <property name="toolTip">
+        <string>Selected classes or styles</string>
+       </property>
+       <item>
+        <property name="text">
+         <string>LaTeX classes</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>LaTeX styles</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>BibTeX styles</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>BibTeX databases</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Biblatex bibliography styles</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Biblatex citation styles</string>
+        </property>
+       </item>
+      </widget>
+     </item>
      <item>
       <spacer>
        <property name="orientation">
@@ -69,17 +88,20 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="closePB">
+      <widget class="QCheckBox" name="pathCB">
        <property name="toolTip">
-        <string>Close this dialog</string>
+        <string>Toggles view of the file list</string>
        </property>
        <property name="text">
-        <string>&amp;Close</string>
+        <string>Show &amp;path</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <widget class="QListWidget" name="fileListLW"/>
+   </item>
    <item row="2" column="0">
     <layout class="QHBoxLayout">
      <property name="spacing">
@@ -138,87 +160,12 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
-     </property>
-     <property name="topMargin">
-      <number>0</number>
-     </property>
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <property name="bottomMargin">
-      <number>0</number>
+   <item row="3" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
      </property>
-     <item>
-      <widget class="QComboBox" name="whatStyleCO">
-       <property name="toolTip">
-        <string>Selected classes or styles</string>
-       </property>
-       <item>
-        <property name="text">
-         <string>LaTeX classes</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>LaTeX styles</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>BibTeX styles</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>BibTeX databases</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Biblatex bibliography styles</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Biblatex citation styles</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="pathCB">
-       <property name="toolTip">
-        <string>Toggles view of the file list</string>
-       </property>
-       <property name="text">
-        <string>Show &amp;path</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -228,7 +175,6 @@
   <tabstop>fileListLW</tabstop>
   <tabstop>rescanPB</tabstop>
   <tabstop>viewPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/ThesaurusUi.ui b/src/frontends/qt4/ui/ThesaurusUi.ui
index a9f340f429e6c8ea08946ac18c9db450dfa6c4b4..52a05e66aa767966199364c28d1d88f36c4373e4 100644 (file)
--- a/src/frontends/qt4/ui/ThesaurusUi.ui
+++ b/src/frontends/qt4/ui/ThesaurusUi.ui
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ThesaurusUi</class>
  <widget class="QDialog" name="ThesaurusUi">
@@ -26,7 +27,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2">
+   <item row="0" column="1" colspan="3">
     <widget class="QComboBox" name="languageCO">
      <property name="toolTip">
       <string>Language of the thesaurus</string>
@@ -46,17 +47,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="entryCO">
-     <property name="toolTip">
-      <string>Word to look up</string>
-     </property>
-     <property name="editable">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
+   <item row="1" column="3">
     <widget class="QPushButton" name="lookupPB">
      <property name="toolTip">
       <string/>
@@ -72,21 +63,21 @@
       <string>The selected entry</string>
      </property>
      <property name="text">
-      <string>&amp;Selection:</string>
+      <string>Sele&amp;ction:</string>
      </property>
      <property name="buddy">
       <cstring>replaceED</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="1">
+   <item row="2" column="1" colspan="2">
     <widget class="QLineEdit" name="replaceED">
      <property name="toolTip">
       <string>The selected entry</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="2">
+   <item row="2" column="3">
     <widget class="QPushButton" name="replacePB">
      <property name="toolTip">
       <string>Replace the entry with the selection</string>
@@ -96,7 +87,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="3">
+   <item row="3" column="0" colspan="4">
     <widget class="QTreeWidget" name="meaningsTV">
      <property name="toolTip">
       <string>Click to select a proposal, double click to look it up.</string>
@@ -108,38 +99,22 @@
      </column>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+   <item row="4" column="2" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" colspan="2">
+    <widget class="QComboBox" name="entryCO">
+     <property name="toolTip">
+      <string>Word to look up</string>
+     </property>
+     <property name="editable">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -150,7 +125,6 @@
   <tabstop>replaceED</tabstop>
   <tabstop>replacePB</tabstop>
   <tabstop>meaningsTV</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

diff --git a/src/frontends/qt4/ui/ToggleWarningUi.ui b/src/frontends/qt4/ui/ToggleWarningUi.ui
index 992edb3a2cee48be5665fd17cf900b5ffe027f81..47562f5560c287a52ec02ded7651bc948165ccc8 100644 (file)
--- a/src/frontends/qt4/ui/ToggleWarningUi.ui
+++ b/src/frontends/qt4/ui/ToggleWarningUi.ui
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ToggleWarningUi</class>
- <widget class="QDialog" name="ToggleWarningUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ToggleWarningUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,28 +10,22 @@
     <height>140</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>LyX: Enter text</string>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="2" column="0" colspan="3" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>247</width>
        <height>16</height>
@@ -38,32 +33,22 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="QCheckBox" name="dontShowAgainCB" >
-     <property name="toolTip" >
-      <string>If you check this, LyX will not warn you again in the given case.</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Do not show this warning again!</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="QLabel" name="messageLA" >
-     <property name="text" >
+   <item row="1" column="0">
+    <widget class="QLabel" name="messageLA">
+     <property name="text">
       <string/>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="3" >
+   <item row="2" column="0" colspan="2">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>247</width>
        <height>16</height>
@@ -71,62 +56,46 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="dontShowAgainCB">
+     <property name="toolTip">
+      <string>If you check this, LyX will not warn you again in the given case.</string>
      </property>
-     <property name="sizeHint" >
-      <size>
-       <width>81</width>
-       <height>20</height>
-      </size>
+     <property name="text">
+      <string>&amp;Do not show this warning again!</string>
      </property>
-    </spacer>
+    </widget>
    </item>
-   <item row="4" column="1" >
-    <widget class="QPushButton" name="okPB" >
-     <property name="text" >
-      <string>&amp;OK</string>
+   <item row="4" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Ok</set>
      </property>
-     <property name="default" >
+     <property name="centerButtons">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="4" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>81</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections>
   <connection>
-   <sender>okPB</sender>
-   <signal>clicked()</signal>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
    <receiver>ToggleWarningUi</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
-     <x>134</x>
-     <y>116</y>
+    <hint type="sourcelabel">
+     <x>98</x>
+     <y>114</y>
     </hint>
-    <hint type="destinationlabel" >
-     <x>134</x>
-     <y>69</y>
+    <hint type="destinationlabel">
+     <x>80</x>
+     <y>805</y>
     </hint>
    </hints>
   </connection>

diff --git a/src/frontends/qt4/ui/WrapUi.ui b/src/frontends/qt4/ui/WrapUi.ui
index b9cff4291a32aef57ef0815d5ac0c9b78e95230d..0075ba2d0db482efc53a2c1618a6903842203e76 100644 (file)
--- a/src/frontends/qt4/ui/WrapUi.ui
+++ b/src/frontends/qt4/ui/WrapUi.ui
@@ -1,286 +1,205 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>WrapUi</class>
- <widget class="QDialog" name="WrapUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="WrapUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>359</width>
-    <height>167</height>
+    <width>405</width>
+    <height>219</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <property name="sizeGripEnabled" >
+  <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="1" column="3" >
-    <widget class="lyx::frontend::LengthCombo" name="widthUnitLC" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize" >
-      <size>
-       <width>40</width>
-       <height>22</height>
-      </size>
-     </property>
-     <property name="focusPolicy" >
-      <enum>Qt::StrongFocus</enum>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="valignLA">
+     <property name="text">
+      <string>Pla&amp;cement:</string>
      </property>
-     <property name="toolTip" >
-      <string>Unit of width value</string>
+     <property name="buddy">
+      <cstring>valignCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QSpinBox" name="linesSB" >
-     <property name="enabled" >
-      <bool>false</bool>
-     </property>
-     <property name="toolTip" >
-      <string>number of needed lines</string>
+   <item row="0" column="1" colspan="2">
+    <widget class="QComboBox" name="valignCO">
+     <property name="toolTip">
+      <string>Vertical alignment</string>
      </property>
+     <item>
+      <property name="text">
+       <string>Outer (default)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Inner</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Left</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Right</string>
+      </property>
+     </item>
     </widget>
    </item>
-   <item row="3" column="0" >
-    <widget class="QCheckBox" name="linesCB" >
-     <property name="toolTip" >
-      <string>use number of lines</string>
+   <item row="0" column="3">
+    <widget class="QCheckBox" name="floatCB">
+     <property name="toolTip">
+      <string>Check this to allow flexible placement</string>
      </property>
-     <property name="text" >
-      <string>&amp;Line span:</string>
+     <property name="text">
+      <string>Allow &amp;floating</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="widthLA" >
-     <property name="text" >
-      <string>&amp;Width:</string>
+   <item row="1" column="0">
+    <widget class="QLabel" name="widthLA">
+     <property name="text">
+      <string>Wid&amp;th:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>widthED</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="1" colspan="2" >
-    <widget class="QLineEdit" name="widthED" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
+   <item row="1" column="1" colspan="2">
+    <widget class="QLineEdit" name="widthED">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Width value</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="4" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
+   <item row="1" column="3">
+    <widget class="lyx::frontend::LengthCombo" name="widthUnitLC">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <item>
-      <widget class="QPushButton" name="restorePB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;Restore</string>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB" >
-       <property name="toolTip" >
-        <string/>
-       </property>
-       <property name="text" >
-        <string>&amp;Apply</string>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Close</string>
-       </property>
-       <property name="default" >
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="valignLA" >
-     <property name="text" >
-      <string>&amp;Placement:</string>
+     <property name="minimumSize">
+      <size>
+       <width>40</width>
+       <height>22</height>
+      </size>
      </property>
-     <property name="buddy" >
-      <cstring>valignCO</cstring>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
      </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2" >
-    <widget class="QComboBox" name="valignCO" >
-     <property name="toolTip" >
-      <string>Vertical alignment</string>
+     <property name="toolTip">
+      <string>Unit of width value</string>
      </property>
-     <item>
-      <property name="text" >
-       <string>Outer (default)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Inner</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Left</string>
-      </property>
-     </item>
-     <item>
-      <property name="text" >
-       <string>Right</string>
-      </property>
-     </item>
     </widget>
    </item>
-   <item row="2" column="0" >
-    <widget class="QCheckBox" name="overhangCB" >
-     <property name="toolTip" >
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="overhangCB">
+     <property name="toolTip">
       <string>use overhang</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Over&amp;hang:</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="1" colspan="2" >
-    <widget class="QLineEdit" name="overhangED" >
-     <property name="enabled" >
+   <item row="2" column="1" colspan="2">
+    <widget class="QLineEdit" name="overhangED">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Overhang value</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="3" >
-    <widget class="lyx::frontend::LengthCombo" name="overhangUnitLC" >
-     <property name="enabled" >
+   <item row="2" column="3">
+    <widget class="lyx::frontend::LengthCombo" name="overhangUnitLC">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize" >
+     <property name="minimumSize">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
-     <property name="focusPolicy" >
+     <property name="focusPolicy">
       <enum>Qt::StrongFocus</enum>
      </property>
-     <property name="toolTip" >
+     <property name="toolTip">
       <string>Unit of overhang value</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="3" >
-    <widget class="QCheckBox" name="floatCB" >
-     <property name="toolTip" >
-      <string>Check this to allow flexible placement</string>
+   <item row="3" column="0">
+    <widget class="QCheckBox" name="linesCB">
+     <property name="toolTip">
+      <string>use number of lines</string>
      </property>
-     <property name="text" >
-      <string>Allow &amp;floating</string>
+     <property name="text">
+      <string>&amp;Line span:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QSpinBox" name="linesSB">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="toolTip">
+      <string>number of needed lines</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" colspan="4">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
      </property>
     </widget>
    </item>
@@ -303,13 +222,9 @@
   <tabstop>overhangUnitLC</tabstop>
   <tabstop>linesCB</tabstop>
   <tabstop>linesSB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
-  <tabstop>restorePB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections>
@@ -319,11 +234,11 @@
    <receiver>overhangED</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>52</x>
      <y>71</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>124</x>
      <y>70</y>
     </hint>
@@ -335,11 +250,11 @@
    <receiver>overhangUnitLC</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>54</x>
      <y>80</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>259</x>
      <y>80</y>
     </hint>
@@ -351,11 +266,11 @@
    <receiver>linesSB</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>13</x>
      <y>93</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>132</x>
      <y>108</y>
     </hint>