More QDialogButtonBox transformation

GuiDelimiter through GuiIndex

See #11003

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();
 }
 

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);
 

src/frontends/qt4/GuiDocument.cpp

@@ -765,20 +765,18 @@ GuiDocument::GuiDocument(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
-	connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
+		this, SLOT(slotButtonBox(QAbstractButton *)));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-	connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
 
 	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().setOK(buttonBox->button(QDialogButtonBox::Ok));
-	bc().setApply(applyPB);
+	bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
-	bc().setCancel(closePB);
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
-	bc().setRestore(restorePB);
+	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."),

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();

src/frontends/qt4/GuiErrorList.cpp

@@ -62,8 +62,8 @@ GuiErrorList::GuiErrorList(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(closePB, SIGNAL(clicked()),
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
-		this, SLOT(slotClose()));
+			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));
 }
 
 

src/frontends/qt4/GuiExternal.cpp

@@ -88,9 +88,8 @@ GuiExternal::GuiExternal(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
-	connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
+			this, SLOT(slotButtonBox(QAbstractButton *)));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
 
 	/*
 	connect(displayGB, SIGNAL(toggled(bool)),
@@ -159,9 +158,9 @@ GuiExternal::GuiExternal(GuiView & lv)
 
 	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
 
-	bc().setOK(okPB);
+	bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
-	bc().setApply(applyPB);
+	bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
-	bc().setCancel(closePB);
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 
 	bc().addReadOnly(fileED);
 	bc().addReadOnly(browsePB);

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(buttonBox, SIGNAL(clicked(QAbstractButton *)),
-	connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
+			this, SLOT(slotButtonBox(QAbstractButton *)));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-	connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
 
 	//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().setOK(buttonBox->button(QDialogButtonBox::Ok));
-	bc().setApply(applyPB);
+	bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
-	bc().setRestore(restorePB);
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
-	bc().setCancel(closePB);
+	bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
 
 	bc().addReadOnly(latexoptions);
 	bc().addReadOnly(filenameL);

src/frontends/qt4/GuiInclude.cpp

@@ -51,8 +51,8 @@ GuiInclude::GuiInclude(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+		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().setOK(buttonBox->button(QDialogButtonBox::Ok));
-	bc().setCancel(closePB);
+	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);
 }
 
 

src/frontends/qt4/GuiIndex.cpp

@@ -35,13 +35,13 @@ GuiIndex::GuiIndex(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
-	connect(cancelPB, SIGNAL(clicked()), this, SLOT(slotClose()));
+		this, SLOT(slotButtonBox(QAbstractButton *)));
 	connect(indicesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
 	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-	bc().setOK(okPB);
+	bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
-	bc().setCancel(cancelPB);
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 }
 
 

src/frontends/qt4/ui/DelimiterUi.ui

@@ -56,31 +56,9 @@
         </spacer>
        </item>
        <item>
-        <widget class="QPushButton" name="insertPB">
+        <widget class="QDialogButtonBox" name="buttonBox">
-         <property name="sizePolicy">
+         <property name="standardButtons">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>Insert the delimiters</string>
-         </property>
-         <property name="text">
-          <string>&amp;Insert</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="closePB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>&amp;Close</string>
          </property>
         </widget>
        </item>
@@ -275,8 +253,6 @@
  <layoutdefault spacing="6" margin="9"/>
  <tabstops>
   <tabstop>sizeCO</tabstop>
-  <tabstop>insertPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

src/frontends/qt4/ui/DocumentUi.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DocumentUi</class>
  <widget class="QDialog" name="DocumentUi">
@@ -10,9 +11,7 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy>
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
@@ -24,7 +23,16 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout">
-   <property name="margin" >
+   <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">
@@ -32,59 +40,25 @@
    </property>
    <item row="2" column="0">
     <layout class="QHBoxLayout">
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <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>
+     </property>
      <item>
-      <widget class="QPushButton" name="restorePB" >
+      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="text" >
+       <property name="standardButtons">
-        <string>&amp;Restore</string>
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
-       </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="text" >
-        <string>&amp;OK</string>
-       </property>
-       <property name="default" >
-        <bool>true</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>&amp;Cancel</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -92,18 +66,25 @@
    </item>
    <item row="1" column="0">
     <layout class="QHBoxLayout">
-     <property name="margin" >
-      <number>0</number>
-     </property>
      <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>
+     </property>
      <item>
       <widget class="QPushButton" name="defaultPB">
        <property name="sizePolicy">
-        <sizepolicy>
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -119,9 +100,7 @@
      <item>
       <widget class="QPushButton" name="savePB">
        <property name="sizePolicy">
-        <sizepolicy>
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-         <hsizetype>3</hsizetype>
-         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -142,7 +121,7 @@
        <property name="sizeType">
         <enum>QSizePolicy::Expanding</enum>
        </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
          <height>20</height>
@@ -153,7 +132,7 @@
     </layout>
    </item>
    <item row="0" column="0">
-    <widget class="lyx::frontend::PanelStack" native="1" name="docPS" />
+    <widget class="lyx::frontend::PanelStack" name="docPS" native="true"/>
    </item>
   </layout>
  </widget>
@@ -169,10 +148,6 @@
   <tabstop>docPS</tabstop>
   <tabstop>defaultPB</tabstop>
   <tabstop>savePB</tabstop>
-  <tabstop>restorePB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

src/frontends/qt4/ui/ErrorListUi.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ErrorListUi</class>
  <widget class="QDialog" name="ErrorListUi">
@@ -5,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>274</width>
+    <width>447</width>
     <height>422</height>
    </rect>
   </property>
@@ -16,18 +17,32 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout">
-   <property name="margin" >
+   <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="3" column="0" colspan="4" >
+   <item row="1" column="0" colspan="5">
+    <widget class="QListWidget" name="errorsLW">
+     <property name="toolTip">
+      <string>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.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="5">
     <widget class="QTextBrowser" name="descriptionTB">
      <property name="sizePolicy">
-      <sizepolicy>
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-       <hsizetype>3</hsizetype>
-       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -37,6 +52,13 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="descriptionLabel">
+     <property name="text">
+      <string>Description:</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="errorsLabel">
      <property name="text">
@@ -47,17 +69,13 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="2" >
+   <item row="4" column="0">
-    <widget class="QLabel" name="descriptionLabel" >
+    <widget class="QPushButton" name="viewLogPB">
-     <property name="text" >
+     <property name="toolTip">
-      <string>Description:</string>
+      <string>Open the LaTeX Log File dialog</string>
      </property>
-    </widget>
-   </item>
-   <item row="4" column="3" >
-    <widget class="QPushButton" name="closePB" >
      <property name="text">
-      <string>&amp;Close</string>
+      <string>View Complete &amp;Log...</string>
      </property>
     </widget>
    </item>
@@ -69,7 +87,7 @@
      <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>121</width>
        <height>30</height>
@@ -77,16 +95,6 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" >
-    <widget class="QPushButton" name="viewLogPB" >
-     <property name="toolTip" >
-      <string>Open the LaTeX Log File dialog</string>
-     </property>
-     <property name="text" >
-      <string>View Complete &amp;Log...</string>
-     </property>
-    </widget>
-   </item>
    <item row="4" column="1">
     <widget class="QPushButton" name="showAnywayPB">
      <property name="toolTip">
@@ -97,10 +105,10 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="4" >
+   <item row="4" column="3">
-    <widget class="QListWidget" name="errorsLW" >
+    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="toolTip" >
+     <property name="standardButtons">
-      <string>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.</string>
+      <set>QDialogButtonBox::Cancel</set>
      </property>
     </widget>
    </item>
@@ -109,7 +117,6 @@
  <tabstops>
   <tabstop>errorsLW</tabstop>
   <tabstop>descriptionTB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

src/frontends/qt4/ui/ExternalUi.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ExternalUi</class>
  <widget class="QDialog" name="ExternalUi">
@@ -5,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>386</width>
+    <width>574</width>
-    <height>453</height>
+    <height>601</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -16,7 +17,16 @@
    <bool>true</bool>
   </property>
   <layout class="QGridLayout">
-   <property name="margin" >
+   <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">
@@ -35,7 +45,16 @@
        <string>F&amp;ile</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin" >
+       <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">
@@ -84,7 +103,16 @@
           <string>&amp;Template</string>
          </property>
          <layout class="QGridLayout">
-          <property name="margin" >
+          <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">
@@ -112,7 +140,7 @@
           <item row="0" column="0">
            <widget class="QComboBox" name="externalCO">
             <property name="sizePolicy">
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -135,7 +163,16 @@
        <property name="spacing">
         <number>6</number>
        </property>
-       <property name="margin" >
+       <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>
        <item>
@@ -147,7 +184,16 @@
           <bool>true</bool>
          </property>
          <layout class="QGridLayout">
-          <property name="margin" >
+          <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">
@@ -172,7 +218,7 @@
           <item row="0" column="0">
            <widget class="QLabel" name="formatLA">
             <property name="text">
-             <string>Forma&amp;t:</string>
+             <string>For&amp;mat:</string>
             </property>
             <property name="textFormat">
              <enum>Qt::AutoText</enum>
@@ -200,7 +246,16 @@
           <bool>true</bool>
          </property>
          <layout class="QGridLayout">
-          <property name="margin" >
+          <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">
@@ -225,7 +280,7 @@
              <bool>true</bool>
             </property>
             <property name="sizePolicy">
-             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -271,7 +326,16 @@
        <string>Si&amp;ze and Rotation</string>
       </attribute>
       <layout class="QGridLayout">
-       <property name="margin" >
+       <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">
@@ -286,7 +350,16 @@
           <bool>true</bool>
          </property>
          <layout class="QGridLayout">
-          <property name="margin" >
+          <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">
@@ -310,7 +383,16 @@
           </item>
           <item row="0" column="0">
            <layout class="QGridLayout">
-            <property name="margin" >
+            <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>
             </property>
             <property name="spacing">
@@ -319,7 +401,7 @@
             <item row="0" column="1">
              <widget class="QLineEdit" name="angleED">
               <property name="sizePolicy">
-               <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
@@ -379,7 +461,16 @@
           <bool>true</bool>
          </property>
          <layout class="QGridLayout">
-          <property name="margin" >
+          <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">
@@ -462,7 +553,16 @@
           <bool>true</bool>
          </property>
          <layout class="QGridLayout">
-          <property name="margin" >
+          <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">
@@ -481,7 +581,7 @@
           <item row="3" column="0">
            <widget class="QLabel" name="lbLA">
             <property name="text">
-             <string>&amp;Left bottom:</string>
+             <string>Left botto&amp;m:</string>
             </property>
             <property name="buddy">
              <cstring>xlED</cstring>
@@ -575,55 +675,22 @@
      <property name="spacing">
       <number>6</number>
      </property>
-     <property name="margin" >
+     <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>
      </property>
      <item>
-      <spacer>
+      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation" >
+       <property name="standardButtons">
-        <enum>Qt::Horizontal</enum>
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-       </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="okPB" >
-       <property name="text" >
-        <string>&amp;OK</string>
-       </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="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>
-       </property>
-       <property name="default" >
-        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -647,9 +714,6 @@
   <tabstop>draftCB</tabstop>
   <tabstop>angleED</tabstop>
   <tabstop>originCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

src/frontends/qt4/ui/GraphicsUi.ui

@@ -387,7 +387,7 @@
           <item row="0" column="0" colspan="6">
            <widget class="QLabel" name="lbL">
             <property name="text">
-             <string>&amp;Left bottom:</string>
+             <string>Left botto&amp;m:</string>
             </property>
             <property name="buddy">
              <cstring>lbX</cstring>
@@ -739,79 +739,9 @@
       <number>0</number>
      </property>
      <item>
-      <widget class="QPushButton" name="restorePB">
+      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="text">
+       <property name="standardButtons">
-        <string>&amp;Restore</string>
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </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::MinimumExpanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <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>true</bool>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="applyPB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <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="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -842,10 +772,6 @@
   <tabstop>angle</tabstop>
   <tabstop>origin</tabstop>
   <tabstop>rotateOrderCB</tabstop>
-  <tabstop>restorePB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
   <tabstop>clip</tabstop>
   <tabstop>lbX</tabstop>
   <tabstop>lbXunit</tabstop>

src/frontends/qt4/ui/IncludeUi.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>363</width>
+    <width>369</width>
     <height>470</height>
    </rect>
   </property>
@@ -37,7 +37,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="4">
+   <item row="0" column="3">
     <widget class="QPushButton" name="browsePB">
      <property name="toolTip">
       <string>Select a file</string>
@@ -47,17 +47,17 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2">
+   <item row="1" column="0" rowspan="2" colspan="2">
     <widget class="QLabel" name="TextLabel1">
      <property name="text">
-      <string>&amp;Include Type:</string>
+      <string>I&amp;nclude Type:</string>
      </property>
      <property name="buddy">
       <cstring>typeCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
+   <item row="1" column="2" rowspan="3">
     <widget class="QComboBox" name="typeCO">
      <item>
       <property name="text">
@@ -82,6 +82,16 @@
     </widget>
    </item>
    <item row="1" column="3">
+    <widget class="QPushButton" name="editPB">
+     <property name="toolTip">
+      <string>Edit the file</string>
+     </property>
+     <property name="text">
+      <string>&amp;Edit</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -97,17 +107,7 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="4">
+   <item row="4" column="0" colspan="4">
-    <widget class="QPushButton" name="editPB">
-     <property name="toolTip">
-      <string>Edit the file</string>
-     </property>
-     <property name="text">
-      <string>&amp;Edit</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="5">
     <layout class="QHBoxLayout">
      <property name="spacing">
       <number>6</number>
@@ -158,7 +158,7 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="5">
+   <item row="5" column="0" colspan="4">
     <widget class="QGroupBox" name="listingsGB">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -302,64 +302,13 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0" colspan="3">
+   <item row="6" column="2" colspan="2">
-    <layout class="QHBoxLayout">
+    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="spacing">
+     <property name="standardButtons">
-      <number>6</number>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </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>
-     </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="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="closePB">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <tabstops>
@@ -373,8 +322,6 @@
   <tabstop>labelLE</tabstop>
   <tabstop>listingsTB</tabstop>
   <tabstop>listingsED</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>

src/frontends/qt4/ui/IndexUi.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>IndexUi</class>
  <widget class="QDialog" name="IndexUi">
@@ -6,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>262</width>
-    <height>108</height>
+    <height>121</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,48 +16,28 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QGridLayout" name="gridLayout">
-   <property name="margin" >
+   <item row="0" column="0">
-    <number>9</number>
+    <layout class="QVBoxLayout">
-   </property>
      <property name="spacing">
       <number>6</number>
      </property>
-   <item row="1" column="0" >
+     <property name="leftMargin">
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>71</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QPushButton" name="okPB" >
-     <property name="text" >
-      <string>&amp;OK</string>
-     </property>
-     <property name="default" >
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="3" >
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
       <number>0</number>
      </property>
-     <property name="spacing" >
+     <property name="topMargin">
-      <number>6</number>
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
      </property>
      <item>
       <widget class="QLabel" name="indicesLA">
        <property name="text">
-        <string>A&amp;vailable Indexes:</string>
+        <string>Available I&amp;ndexes:</string>
        </property>
        <property name="buddy">
         <cstring>indicesCO</cstring>
@@ -72,13 +53,10 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="2" >
+   <item row="1" column="0">
-    <widget class="QPushButton" name="cancelPB" >
+    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="text" >
+     <property name="standardButtons">
-      <string>&amp;Cancel</string>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
      </property>
     </widget>
    </item>
@@ -86,8 +64,6 @@
  </widget>
  <tabstops>
   <tabstop>indicesCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>cancelPB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>