From: Juergen Spitzmueller <spitz@lyx.org>
Date: Tue, 10 Jul 2018 07:04:42 +0000 (+0200)
Subject: More QDialogButtonBox
X-Git-Tag: lyx-2.4.0dev-acb2ca7b~3298
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b5c5083c6c035294e8a762bd5bd737a56d27317a;p=features.git

More QDialogButtonBox

Listings through Prefs.
---

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index 2720922deb..4fcff16a23 100644
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -102,6 +102,7 @@ void GuiDialog::slotButtonBox(QAbstractButton * button)
 		slotApply();
 		break;
 	case QDialogButtonBox::Cancel:
+	case QDialogButtonBox::Close:
 		slotClose();
 		break;
 	case QDialogButtonBox::Reset:
diff --git a/src/frontends/qt4/GuiListings.cpp b/src/frontends/qt4/GuiListings.cpp
index 573b8cd0c5..85a79b5d3e 100644
--- a/src/frontends/qt4/GuiListings.cpp
+++ b/src/frontends/qt4/GuiListings.cpp
@@ -167,9 +167,8 @@ GuiListings::GuiListings(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(languageCO, SIGNAL(currentIndexChanged(int)),
 		this, SLOT(change_adaptor()));
@@ -234,9 +233,9 @@ GuiListings::GuiListings(GuiView & lv)
 	placementLE->setValidator(new QRegExpValidator(QRegExp("[\\*tbph]*"), this));
 
 	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));
 	listingsTB->setPlainText(
 		qt_("Input listing parameters on the right. Enter ? for a list of parameters."));
 
diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 0a922ea0b6..81c05d3a70 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -120,7 +120,8 @@ GuiLog::GuiLog(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+		this, SLOT(slotButtonBox(QAbstractButton *)));
 	connect(updatePB, SIGNAL(clicked()), this, SLOT(updateContents()));
 	connect(findPB, SIGNAL(clicked()), this, SLOT(find()));
 	// FIXME: find via returnPressed() does not work!
diff --git a/src/frontends/qt4/GuiMathMatrix.cpp b/src/frontends/qt4/GuiMathMatrix.cpp
index e4e3f8878b..3a9768b094 100644
--- a/src/frontends/qt4/GuiMathMatrix.cpp
+++ b/src/frontends/qt4/GuiMathMatrix.cpp
@@ -74,9 +74,6 @@ GuiMathMatrix::GuiMathMatrix(GuiView & lv)
 	valignCO->setCurrentIndex(1);
 	decorationCO->setCurrentIndex(0);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-
 	connect(table, SIGNAL(rowsChanged(int)),
 		rowsSB, SLOT(setValue(int)));
 	connect(table, SIGNAL(colsChanged(int)),
@@ -124,6 +121,21 @@ void GuiMathMatrix::change_adaptor()
 }
 
 
+void GuiMathMatrix::on_buttonBox_clicked(QAbstractButton * button)
+{
+	switch (buttonBox->standardButton(button)) {
+	case QDialogButtonBox::Ok:
+		slotOK();
+		break;
+	case QDialogButtonBox::Cancel:
+		slotClose();
+		break;
+	default:
+		break;
+	}
+}
+
+
 void GuiMathMatrix::slotOK()
 {
 	int const nx = columnsSB->value();
diff --git a/src/frontends/qt4/GuiMathMatrix.h b/src/frontends/qt4/GuiMathMatrix.h
index 8f2f036eab..532bdef5c4 100644
--- a/src/frontends/qt4/GuiMathMatrix.h
+++ b/src/frontends/qt4/GuiMathMatrix.h
@@ -34,6 +34,7 @@ public:
 	bool isBufferDependent() const { return true; }
 
 public Q_SLOTS:
+	void on_buttonBox_clicked(QAbstractButton *);
 	void slotOK();
 	void slotClose();
 	void columnsChanged(int);
diff --git a/src/frontends/qt4/GuiNote.cpp b/src/frontends/qt4/GuiNote.cpp
index f0e6fcb617..6c87850d40 100644
--- a/src/frontends/qt4/GuiNote.cpp
+++ b/src/frontends/qt4/GuiNote.cpp
@@ -27,16 +27,16 @@ GuiNote::GuiNote(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+		this, SLOT(slotButtonBox(QAbstractButton *)));
 
 	connect(noteRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(greyedoutRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(commentRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 
 	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-	bc().setOK(okPB);
-	bc().setCancel(closePB);
+	bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 }
 
 
diff --git a/src/frontends/qt4/GuiParagraph.cpp b/src/frontends/qt4/GuiParagraph.cpp
index 3cf4127fdb..c3f7a94759 100644
--- a/src/frontends/qt4/GuiParagraph.cpp
+++ b/src/frontends/qt4/GuiParagraph.cpp
@@ -32,6 +32,7 @@
 #include "support/gettext.h"
 
 #include <QCheckBox>
+#include <QDialogButtonBox>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QSettings>
@@ -154,13 +155,13 @@ LyXAlignment GuiParagraph::getAlignmentFromDialog() const
 void GuiParagraph::on_synchronizedViewCB_toggled()
 {
 	bool in_sync = synchronizedViewCB->isChecked();
-	restorePB->setEnabled(!in_sync);
-	applyPB->setEnabled(!in_sync);
-	okPB->setEnabled(!in_sync);
+	buttonBox->button(QDialogButtonBox::Reset)->setEnabled(!in_sync);
+	buttonBox->button(QDialogButtonBox::Apply)->setEnabled(!in_sync);
+	buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!in_sync);
 	if (!in_sync)
-		closePB->setText(qt_("&Cancel"));
+		buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("&Cancel"));
 	else
-		closePB->setText(qt_("&Close"));
+		buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("&Close"));
 }
 
 
@@ -174,32 +175,29 @@ void GuiParagraph::changed()
 	    && (linespacing->currentIndex() != 4
 		|| (!linespacingValue->text().endsWith(loc.decimalPoint())
 		    && linespacingValue->hasAcceptableInput())))
-		on_applyPB_clicked();
+		applyView();
 }
 
 
-void GuiParagraph::on_applyPB_clicked()
+void GuiParagraph::on_buttonBox_clicked(QAbstractButton * button)
 {
-	applyView();
-}
-
-
-void GuiParagraph::on_okPB_clicked()
-{
-	applyView();
-	hide();
-}
-
-
-void GuiParagraph::on_closePB_clicked()
-{
-	hide();
-}
-
-
-void GuiParagraph::on_restorePB_clicked()
-{
-	updateView();
+	switch (buttonBox->standardButton(button)) {
+	case QDialogButtonBox::Ok:
+		applyView();
+		hide();
+		break;
+	case QDialogButtonBox::Apply:
+		applyView();
+		break;
+	case QDialogButtonBox::Cancel:
+		hide();
+		break;
+	case QDialogButtonBox::Reset:
+		updateView();
+		break;
+	default:
+		break;
+	}
 }
 
 
@@ -316,8 +314,8 @@ void GuiParagraph::enableView(bool enable)
 	linespacing->setEnabled(enable);
 	labelWidth->setEnabled(enable);
 	synchronizedViewCB->setEnabled(enable);
-	applyPB->setEnabled(enable);
-	restorePB->setEnabled(enable);
+	buttonBox->button(QDialogButtonBox::Apply)->setEnabled(enable);
+	buttonBox->button(QDialogButtonBox::Reset)->setEnabled(enable);
 	if (!enable)
 		synchronizedViewCB->setChecked(true);
 	RadioMap::const_iterator it = radioMap_.begin();
diff --git a/src/frontends/qt4/GuiParagraph.h b/src/frontends/qt4/GuiParagraph.h
index 735d58ca8f..132e916509 100644
--- a/src/frontends/qt4/GuiParagraph.h
+++ b/src/frontends/qt4/GuiParagraph.h
@@ -69,15 +69,9 @@ private Q_SLOTS:
 	///
 	void on_synchronizedViewCB_toggled();
 	///
-	void on_restorePB_clicked();
-	///
 	void on_linespacing_activated(int);
 	/// Apply changes
-	void on_applyPB_clicked();
-	/// Apply changes and close
-	void on_okPB_clicked();
-	/// Close/Cancel dialog
-	void on_closePB_clicked();
+	void on_buttonBox_clicked(QAbstractButton * button);
 
 private:
 	///
diff --git a/src/frontends/qt4/GuiPhantom.cpp b/src/frontends/qt4/GuiPhantom.cpp
index 2db43413fc..973ec823c0 100644
--- a/src/frontends/qt4/GuiPhantom.cpp
+++ b/src/frontends/qt4/GuiPhantom.cpp
@@ -26,16 +26,16 @@ GuiPhantom::GuiPhantom(GuiView & lv)
 {
 	setupUi(this);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+		this, SLOT(slotButtonBox(QAbstractButton *)));
 
 	connect(phantomRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(hphantomRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 	connect(vphantomRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
 
 	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
-	bc().setOK(okPB);
-	bc().setCancel(closePB);
+	bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
 }
 
 
diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp
index 615c7dabdf..3873ef3f2f 100644
--- a/src/frontends/qt4/GuiPrefs.cpp
+++ b/src/frontends/qt4/GuiPrefs.cpp
@@ -3417,10 +3417,8 @@ GuiPreferences::GuiPreferences(GuiView & lv)
 
 	QDialog::setModal(false);
 
-	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
-	connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
-	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
-	connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
+	connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
+		this, SLOT(slotButtonBox(QAbstractButton *)));
 
 	addModule(new PrefUserInterface(this));
 	addModule(new PrefDocHandling(this));
@@ -3462,10 +3460,10 @@ GuiPreferences::GuiPreferences(GuiView & lv)
 #endif
 
 	bc().setPolicy(ButtonPolicy::PreferencesPolicy);
-	bc().setOK(okPB);
-	bc().setApply(applyPB);
-	bc().setCancel(closePB);
-	bc().setRestore(restorePB);
+	bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
+	bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
+	bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
+	bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
 
 	// initialize the strftime validator
 	bc().addCheckedLineEdit(output->DateED);
diff --git a/src/frontends/qt4/InsetParamsDialog.cpp b/src/frontends/qt4/InsetParamsDialog.cpp
index fd0044acdb..9a4177fe87 100644
--- a/src/frontends/qt4/InsetParamsDialog.cpp
+++ b/src/frontends/qt4/InsetParamsDialog.cpp
@@ -42,6 +42,8 @@
 #include "support/debug.h"
 #include "support/lstrings.h"
 
+#include <QDialogButtonBox>
+
 using namespace std;
 using namespace lyx::support;
 
@@ -82,6 +84,8 @@ InsetParamsDialog::InsetParamsDialog(GuiView & lv, InsetParamsWidget * widget)
 	synchronizedCB->setChecked(true);
 	on_immediateApplyCB_stateChanged(false);
 	setFocusProxy(widget);
+	newPB = buttonBox->addButton(qt_("Ne&w Inset"),
+			     QDialogButtonBox::ActionRole);
 }
 
 InsetParamsDialog::~InsetParamsDialog()
@@ -93,7 +97,7 @@ InsetParamsDialog::~InsetParamsDialog()
 bool InsetParamsDialog::initialiseParams(std::string const & sdata)
 {
 	if (!d->widget_->initialiseParams(sdata))
-		on_restorePB_clicked();
+		resetDialog();
 	return true;
 }
 
@@ -107,23 +111,43 @@ void InsetParamsDialog::setInsetParamsWidget(InsetParamsWidget * widget)
 }
 
 
-void InsetParamsDialog::on_restorePB_clicked()
+void InsetParamsDialog::on_buttonBox_clicked(QAbstractButton * button)
 {
-	updateView(true);
-	restorePB->setEnabled(false);
-	d->changed_ = false;
-	d->inset_ = inset(d->widget_->insetCode());
+	switch (buttonBox->buttonRole(button)) {
+	case QDialogButtonBox::AcceptRole: {// OK
+		Inset const * i = inset(d->widget_->insetCode());
+		if (i)
+			applyView();
+		else
+			newInset();
+		hide();
+		break;
+	}
+	case QDialogButtonBox::ApplyRole:
+		applyView();
+		break;
+	case QDialogButtonBox::RejectRole:// Cancel or Close
+		hide();
+		break;
+	case QDialogButtonBox::ResetRole: {
+		resetDialog();
+		break;
+	}
+	case QDialogButtonBox::ActionRole:// New Inset
+		newInset();
+		break;
+	default:
+		break;
+	}
 }
 
 
-void InsetParamsDialog::on_okPB_clicked()
+void InsetParamsDialog::resetDialog()
 {
-	Inset const * i = inset(d->widget_->insetCode());
-	if (i)
-		applyView();
-	else
-		newInset();
-	hide();
+	updateView(true);
+	buttonBox->button(QDialogButtonBox::Reset)->setEnabled(false);
+	d->changed_ = false;
+	d->inset_ = inset(d->widget_->insetCode());
 }
 
 
@@ -134,21 +158,12 @@ void InsetParamsDialog::newInset()
 }
 
 
-void InsetParamsDialog::on_newPB_clicked()
+bool InsetParamsDialog::newInsetAllowed() const
 {
-	newInset();
-}
-
-
-void InsetParamsDialog::on_applyPB_clicked()
-{
-	applyView();
-}
-
-
-void InsetParamsDialog::on_closePB_clicked()
-{
-	hide();
+	docstring const argument = d->widget_->dialogToParams();
+	FuncRequest const fr = FuncRequest(d->widget_->creationCode(), argument);
+	FuncStatus const fs(getStatus(fr));
+	return fs.enabled();
 }
 
 
@@ -177,12 +192,22 @@ docstring InsetParamsDialog::checkWidgets(bool immediate)
 		? d->widget_->creationCode() : LFUN_INSET_MODIFY;
 	bool const lfun_ok = lyx::getStatus(FuncRequest(code, argument)).enabled();
 
-	okPB->setEnabled(!immediate && widget_ok && !read_only && valid_argument);
+	buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!immediate && widget_ok
+							    && !read_only && valid_argument);
 	bool const can_be_restored = !immediate && !read_only
 			&& ins && (ins != d->inset_ || d->changed_);
-	restorePB->setEnabled(can_be_restored);
-	applyPB->setEnabled(ins && !immediate && lfun_ok && widget_ok && !read_only && valid_argument);
-	newPB->setEnabled(widget_ok && !read_only && valid_argument);
+	buttonBox->button(QDialogButtonBox::Reset)->setEnabled(can_be_restored);
+	buttonBox->button(QDialogButtonBox::Apply)->setEnabled(ins && !immediate
+							       && lfun_ok && widget_ok
+							       && !read_only && valid_argument);
+	// This seems to be the only way to access custom buttons
+	QList<QAbstractButton*> buttons = buttonBox->buttons();
+	for (int i = 0; i < buttons.size(); ++i) {
+		if (buttonBox->buttonRole(buttons.at(i)) == QDialogButtonBox::ActionRole)
+			buttons.at(i)->setEnabled(widget_ok && !read_only
+						  && valid_argument
+						  && newInsetAllowed());
+	}
 	synchronizedCB->setEnabled(!immediate);
 	return argument;
 }
diff --git a/src/frontends/qt4/InsetParamsDialog.h b/src/frontends/qt4/InsetParamsDialog.h
index ddb912674d..2d876ba431 100644
--- a/src/frontends/qt4/InsetParamsDialog.h
+++ b/src/frontends/qt4/InsetParamsDialog.h
@@ -15,6 +15,8 @@
 #include "DialogView.h"
 #include "ui_InsetParamsUi.h"
 
+#include <QPushButton>
+
 namespace lyx {
 
 class Inset;
@@ -36,11 +38,8 @@ public:
 protected Q_SLOTS:
 	void onWidget_changed();
 	void applyView();
-	void on_restorePB_clicked();
-	void on_newPB_clicked();
-	void on_okPB_clicked();
-	void on_applyPB_clicked();
-	void on_closePB_clicked();
+	void resetDialog();
+	void on_buttonBox_clicked(QAbstractButton *);
 	void on_immediateApplyCB_stateChanged(int state);
 	void on_synchronizedCB_stateChanged(int state);
 
@@ -56,9 +55,13 @@ private:
 	///
 	void newInset();
 	///
+	bool newInsetAllowed() const;
+	///
 	void updateView(bool update_widget);
 	///
 	docstring checkWidgets(bool immediate);
+	///
+	QPushButton * newPB;
 	/// pimpl
 	struct Private;
 	Private * d;
diff --git a/src/frontends/qt4/ui/InsetParamsUi.ui b/src/frontends/qt4/ui/InsetParamsUi.ui
index 03d7212fa9..af6312f1c4 100644
--- a/src/frontends/qt4/ui/InsetParamsUi.ui
+++ b/src/frontends/qt4/ui/InsetParamsUi.ui
@@ -1,36 +1,37 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>InsetParamsUi</class>
- <widget class="QDialog" name="InsetParamsUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="InsetParamsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>425</width>
-    <height>106</height>
+    <width>484</width>
+    <height>108</height>
    </rect>
   </property>
-  <property name="focusPolicy" >
+  <property name="focusPolicy">
    <enum>Qt::NoFocus</enum>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Inset Parameter Configuration</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" colspan="2" >
-    <widget class="QStackedWidget" name="stackedWidget" >
-     <property name="currentIndex" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="page" />
-     <widget class="QWidget" name="page_2" />
+     <widget class="QWidget" name="page"/>
+     <widget class="QWidget" name="page_2"/>
     </widget>
    </item>
-   <item row="1" column="0" >
+   <item row="1" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>31</width>
        <height>31</height>
@@ -38,107 +39,54 @@
      </property>
     </spacer>
    </item>
-   <item row="1" column="1" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
+   <item row="1" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QCheckBox" name="synchronizedCB" >
-       <property name="toolTip" >
+      <widget class="QCheckBox" name="synchronizedCB">
+       <property name="toolTip">
         <string>Update dialog when moving context</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>S&amp;ynchronize Dialog</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QCheckBox" name="immediateApplyCB" >
-       <property name="toolTip" >
+      <widget class="QCheckBox" name="immediateApplyCB">
+       <property name="toolTip">
         <string>Apply settings immediately</string>
        </property>
-       <property name="layoutDirection" >
+       <property name="layoutDirection">
         <enum>Qt::LeftToRight</enum>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>I&amp;mmediate Apply</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <property name="spacing" >
+   <item row="2" column="0" colspan="2">
+    <layout class="QHBoxLayout">
+     <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>
-      <widget class="QPushButton" name="restorePB" >
-       <property name="toolTip" >
-        <string>Restore initial values in dialog</string>
-       </property>
-       <property name="text" >
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="newPB" >
-       <property name="toolTip" >
-        <string>Push new inset into the document</string>
-       </property>
-       <property name="text" >
-        <string>New Inset</string>
-       </property>
-       <property name="autoDefault" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>31</width>
-         <height>27</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="autoDefault" >
-        <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>
@@ -148,13 +96,9 @@
  </widget>
  <tabstops>
   <tabstop>immediateApplyCB</tabstop>
-  <tabstop>restorePB</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/ListingsUi.ui b/src/frontends/qt4/ui/ListingsUi.ui
index 0c89d17270..7e001a124d 100644
--- a/src/frontends/qt4/ui/ListingsUi.ui
+++ b/src/frontends/qt4/ui/ListingsUi.ui
@@ -1,70 +1,71 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>ListingsUi</class>
- <widget class="QDialog" name="ListingsUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="ListingsUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>578</width>
-    <height>349</height>
+    <width>725</width>
+    <height>393</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Listing</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_9" >
-   <item row="0" column="0" >
-    <widget class="QTabWidget" name="listingsTW" >
-     <property name="currentIndex" >
+  <layout class="QGridLayout" name="gridLayout_9">
+   <item row="0" column="0">
+    <widget class="QTabWidget" name="listingsTW">
+     <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab">
+      <attribute name="title">
        <string>&amp;Main Settings</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_6" >
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="placementGB" >
-         <property name="title" >
+      <layout class="QGridLayout" name="gridLayout_6">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="placementGB">
+         <property name="title">
           <string>Placement</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout" >
-          <item row="0" column="0" colspan="2" >
-           <widget class="QCheckBox" name="inlineCB" >
-            <property name="toolTip" >
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="inlineCB">
+            <property name="toolTip">
              <string>Check for inline listings</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Inline listing</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" colspan="2" >
-           <widget class="QCheckBox" name="floatCB" >
-            <property name="toolTip" >
+          <item row="1" column="0" colspan="2">
+           <widget class="QCheckBox" name="floatCB">
+            <property name="toolTip">
              <string>Check for floating listings</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Float</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="captionL_5" >
-            <property name="text" >
-             <string>&amp;Placement:</string>
+          <item row="2" column="0">
+           <widget class="QLabel" name="captionL_5">
+            <property name="text">
+             <string>Pla&amp;cement:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>placementLE</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QLineEdit" name="placementLE" >
-            <property name="toolTip" >
+          <item row="2" column="1">
+           <widget class="QLineEdit" name="placementLE">
+            <property name="toolTip">
              <string>Specify placement (htbp) for floating listings</string>
             </property>
            </widget>
@@ -72,109 +73,107 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="1" >
-        <widget class="QGroupBox" name="numberstyleGB" >
-         <property name="title" >
+       <item row="0" column="1">
+        <widget class="QGroupBox" name="numberstyleGB">
+         <property name="title">
           <string>Line numbering</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_2" >
-          <item row="0" column="0" >
-           <widget class="QLabel" name="label" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
              <string>&amp;Side:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>numberSideCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QComboBox" name="numberSideCO" >
-            <property name="toolTip" >
+          <item row="0" column="1">
+           <widget class="QComboBox" name="numberSideCO">
+            <property name="toolTip">
              <string>On which side should line numbers be printed?</string>
             </property>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>None</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Left</string>
              </property>
             </item>
             <item>
-             <property name="text" >
+             <property name="text">
               <string>Right</string>
              </property>
             </item>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="stepnumberL" >
-            <property name="toolTip" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="stepnumberL">
+            <property name="toolTip">
              <string/>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>S&amp;tep:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>numberStepLE</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="numberStepLE" >
-            <property name="toolTip" >
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="numberStepLE">
+            <property name="toolTip">
              <string>Difference between two numbered lines</string>
             </property>
-            <property name="statusTip" >
+            <property name="statusTip">
              <string/>
             </property>
-            <property name="text" >
+            <property name="text">
              <string/>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignLeading</set>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="numberfontsizeL" >
-            <property name="text" >
+          <item row="2" column="0">
+           <widget class="QLabel" name="numberfontsizeL">
+            <property name="text">
              <string>Font si&amp;ze:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>numberFontSizeCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QComboBox" name="numberFontSizeCO" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="numberFontSizeCO">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Choose the font size for line numbers</string>
             </property>
-            <property name="editable" >
+            <property name="editable">
              <bool>false</bool>
             </property>
-            <property name="autoCompletion" >
+            <property name="autoCompletion">
              <bool>true</bool>
             </property>
-            <property name="duplicatesEnabled" >
+            <property name="duplicatesEnabled">
              <bool>false</bool>
             </property>
            </widget>
@@ -182,150 +181,146 @@
          </layout>
         </widget>
        </item>
-       <item rowspan="2" row="0" column="2" >
-        <widget class="QGroupBox" name="basicstyleGB" >
-         <property name="title" >
+       <item row="0" column="2" rowspan="2">
+        <widget class="QGroupBox" name="basicstyleGB">
+         <property name="title">
           <string>Style</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5" >
-          <item row="0" column="0" >
-           <widget class="QLabel" name="fontsize_label_3" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout_5">
+          <item row="0" column="0">
+           <widget class="QLabel" name="fontsize_label_3">
+            <property name="text">
              <string>F&amp;ont size:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>fontsizeCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QComboBox" name="fontsizeCO" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="fontsizeCO">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>The content's base font size</string>
             </property>
-            <property name="editable" >
+            <property name="editable">
              <bool>false</bool>
             </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="1" column="0" >
-           <widget class="QLabel" name="fontstyle_label_3" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="fontstyle_label_3">
+            <property name="text">
              <string>Font Famil&amp;y:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>fontstyleCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QComboBox" name="fontstyleCO" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="fontstyleCO">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>The content's base font style</string>
             </property>
-            <property name="editable" >
+            <property name="editable">
              <bool>false</bool>
             </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="2" column="0" colspan="2" >
-           <widget class="QCheckBox" name="breaklinesCB" >
-            <property name="toolTip" >
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="breaklinesCB">
+            <property name="toolTip">
              <string>Break lines longer than the linewidth</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Break long lines</string>
             </property>
-            <property name="shortcut" >
+            <property name="shortcut">
              <number>276824130</number>
             </property>
            </widget>
           </item>
-          <item row="3" column="0" colspan="2" >
-           <widget class="QCheckBox" name="spaceCB" >
-            <property name="toolTip" >
+          <item row="3" column="0" colspan="2">
+           <widget class="QCheckBox" name="spaceCB">
+            <property name="toolTip">
              <string>Make spaces visible by a special symbol</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>S&amp;pace as symbol</string>
             </property>
-            <property name="shortcut" >
+            <property name="shortcut">
              <number>276824147</number>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="2" >
-           <widget class="QCheckBox" name="spaceInStringCB" >
-            <property name="toolTip" >
+          <item row="4" column="0" colspan="2">
+           <widget class="QCheckBox" name="spaceInStringCB">
+            <property name="toolTip">
              <string>Make spaces in strings visible by a special symbol</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>Space i&amp;n string as symbol</string>
             </property>
-            <property name="shortcut" >
+            <property name="shortcut">
              <number>276824147</number>
             </property>
            </widget>
           </item>
-          <item row="5" column="0" >
-           <widget class="QLabel" name="tabsizeL" >
-            <property name="text" >
+          <item row="5" column="0">
+           <widget class="QLabel" name="tabsizeL">
+            <property name="text">
              <string>Tab&amp;ulator size:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>tabsizeSB</cstring>
             </property>
            </widget>
           </item>
-          <item row="5" column="1" >
-           <widget class="QSpinBox" name="tabsizeSB" />
+          <item row="5" column="1">
+           <widget class="QSpinBox" name="tabsizeSB"/>
           </item>
-          <item row="6" column="0" colspan="2" >
-           <widget class="QCheckBox" name="extendedcharsCB" >
-            <property name="enabled" >
+          <item row="6" column="0" colspan="2">
+           <widget class="QCheckBox" name="extendedcharsCB">
+            <property name="enabled">
              <bool>true</bool>
             </property>
-            <property name="toolTip" >
+            <property name="toolTip">
              <string>Use extended character table</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Extended character table</string>
             </property>
-            <property name="shortcut" >
+            <property name="shortcut">
              <number>276824133</number>
             </property>
            </widget>
@@ -333,42 +328,42 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="languageGB" >
-         <property name="title" >
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="languageGB">
+         <property name="title">
           <string>Language</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_3" >
-          <item row="0" column="0" >
-           <widget class="QLabel" name="languageLBL" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="languageLBL">
+            <property name="text">
              <string>Lan&amp;guage:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>languageCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QComboBox" name="languageCO" >
-            <property name="toolTip" >
+          <item row="0" column="1">
+           <widget class="QComboBox" name="languageCO">
+            <property name="toolTip">
              <string>Select the programming language</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="dialectLBL" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="dialectLBL">
+            <property name="text">
              <string>&amp;Dialect:</string>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>dialectCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QComboBox" name="dialectCO" >
-            <property name="toolTip" >
+          <item row="1" column="1">
+           <widget class="QComboBox" name="dialectCO">
+            <property name="toolTip">
              <string>Select the dialect of the programming language, if available</string>
             </property>
            </widget>
@@ -376,60 +371,60 @@
          </layout>
         </widget>
        </item>
-       <item row="1" column="1" >
-        <widget class="QGroupBox" name="rangeGB" >
-         <property name="title" >
+       <item row="1" column="1">
+        <widget class="QGroupBox" name="rangeGB">
+         <property name="title">
           <string>Range</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_4" >
-          <item row="0" column="0" >
-           <widget class="QLabel" name="numberfontsizeL_3" >
-            <property name="text" >
+         <layout class="QGridLayout" name="gridLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="numberfontsizeL_3">
+            <property name="text">
              <string>Fi&amp;rst line:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>firstlineLE</cstring>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QLineEdit" name="firstlineLE" >
-            <property name="toolTip" >
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="firstlineLE">
+            <property name="toolTip">
              <string>The first line to be printed</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string/>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignLeading</set>
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="numberfontsizeL_2" >
-            <property name="text" >
+          <item row="1" column="0">
+           <widget class="QLabel" name="numberfontsizeL_2">
+            <property name="text">
              <string>&amp;Last line:</string>
             </property>
-            <property name="wordWrap" >
+            <property name="wordWrap">
              <bool>false</bool>
             </property>
-            <property name="buddy" >
+            <property name="buddy">
              <cstring>lastlineLE</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="lastlineLE" >
-            <property name="toolTip" >
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="lastlineLE">
+            <property name="toolTip">
              <string>The last line to be printed</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string/>
             </property>
-            <property name="alignment" >
+            <property name="alignment">
              <set>Qt::AlignLeading</set>
             </property>
            </widget>
@@ -439,74 +434,70 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="tab_2" >
-      <attribute name="title" >
+     <widget class="QWidget" name="tab_2">
+      <attribute name="title">
        <string>Ad&amp;vanced</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_8" >
-       <item row="0" column="0" >
-        <widget class="QGroupBox" name="listingsGB" >
-         <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>0</hsizetype>
-           <vsizetype>0</vsizetype>
+      <layout class="QGridLayout" name="gridLayout_8">
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="listingsGB">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="title" >
+         <property name="title">
           <string>More Parameters</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout_7" >
-          <item row="0" column="0" >
-           <widget class="QSplitter" name="splitter" >
-            <property name="orientation" >
+         <layout class="QGridLayout" name="gridLayout_7">
+          <item row="0" column="0">
+           <widget class="QSplitter" name="splitter">
+            <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
-            <widget class="QTextBrowser" name="listingsTB" >
-             <property name="maximumSize" >
+            <widget class="QTextBrowser" name="listingsTB">
+             <property name="maximumSize">
               <size>
                <width>16777215</width>
                <height>16777215</height>
               </size>
              </property>
-             <property name="acceptDrops" >
+             <property name="acceptDrops">
               <bool>false</bool>
              </property>
-             <property name="toolTip" >
+             <property name="toolTip">
               <string>Feedback window</string>
              </property>
-             <property name="frameShape" >
+             <property name="frameShape">
               <enum>QFrame::Box</enum>
              </property>
-             <property name="frameShadow" >
+             <property name="frameShadow">
               <enum>QFrame::Plain</enum>
              </property>
-             <property name="acceptRichText" >
+             <property name="acceptRichText">
               <bool>false</bool>
              </property>
             </widget>
-            <widget class="QTextEdit" name="listingsED" >
-             <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>0</hsizetype>
-               <vsizetype>0</vsizetype>
+            <widget class="QTextEdit" name="listingsED">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
-             <property name="toolTip" >
+             <property name="toolTip">
               <string>Input listing parameters here. Enter ? for a list of parameters.</string>
              </property>
             </widget>
            </widget>
           </item>
-          <item row="1" column="0" >
-           <widget class="QCheckBox" name="bypassCB" >
-            <property name="toolTip" >
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="bypassCB">
+            <property name="toolTip">
              <string>Check it to enter parameters that are not recognizable by LyX</string>
             </property>
-            <property name="text" >
+            <property name="text">
              <string>&amp;Bypass validation</string>
             </property>
            </widget>
@@ -518,45 +509,12 @@
      </widget>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <layout class="QHBoxLayout" name="horizontalLayout" >
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <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>
-      <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>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB" >
-       <property name="text" >
-        <string>&amp;Cancel</string>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
        </property>
       </widget>
      </item>
@@ -565,9 +523,6 @@
   </layout>
  </widget>
  <tabstops>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
   <tabstop>listingsTW</tabstop>
   <tabstop>inlineCB</tabstop>
   <tabstop>floatCB</tabstop>
@@ -589,7 +544,7 @@
   <tabstop>listingsED</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/LogUi.ui b/src/frontends/qt4/ui/LogUi.ui
index 3a3db849e3..6258268b31 100644
--- a/src/frontends/qt4/ui/LogUi.ui
+++ b/src/frontends/qt4/ui/LogUi.ui
@@ -1,103 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0" >
+<ui version="4.0">
  <class>LogUi</class>
- <widget class="QDialog" name="LogUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="LogUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>421</width>
+    <width>452</width>
     <height>474</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" >
-    <widget class="QLabel" name="findLA" >
-     <property name="text" >
-      <string>&amp;Find:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>findLE</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" colspan="5" >
-    <widget class="QLineEdit" name="findLE" >
-     <property name="toolTip" >
-      <string>Hit Enter to search, or click Go!</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="logTypeLA" >
-     <property name="text" >
-      <string>Log &amp;Type:</string>
-     </property>
-     <property name="buddy" >
-      <cstring>logTypeCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4" colspan="3" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>161</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="logTypeLA">
+       <property name="text">
+        <string>Log &amp;Type:</string>
+       </property>
+       <property name="buddy">
+        <cstring>logTypeCO</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="logTypeCO"/>
+     </item>
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>161</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="1" colspan="3" >
-    <widget class="QComboBox" name="logTypeCO" />
+   <item row="1" column="0" colspan="4">
+    <widget class="QTextBrowser" name="logTB"/>
    </item>
-   <item row="1" column="0" colspan="7" >
-    <widget class="QTextBrowser" name="logTB" />
+   <item row="2" column="0" colspan="4">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>201</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="nextErrorPB">
+       <property name="toolTip">
+        <string>Jump to the next error message.</string>
+       </property>
+       <property name="text">
+        <string>Next &amp;Error</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="nextWarningPB">
+       <property name="toolTip">
+        <string>Jump to the next warning message.</string>
+       </property>
+       <property name="text">
+        <string>Next &amp;Warning</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="4" column="4" colspan="2" >
-    <widget class="QPushButton" name="updatePB" >
-     <property name="toolTip" >
-      <string>Update the display</string>
-     </property>
-     <property name="text" >
-      <string>&amp;Update</string>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
+   <item row="3" column="0" colspan="4">
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="findLA">
+       <property name="text">
+        <string>&amp;Find:</string>
+       </property>
+       <property name="buddy">
+        <cstring>findLE</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="findLE">
+       <property name="toolTip">
+        <string>Hit Enter to search, or click Go!</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="findPB">
+       <property name="text">
+        <string>&amp;Go!</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="4" column="6" >
-    <widget class="QPushButton" name="closePB" >
-     <property name="text" >
-      <string>&amp;Close</string>
+   <item row="4" column="0">
+    <widget class="QPushButton" name="openDirPB">
+     <property name="text">
+      <string>&amp;Open Containing Directory</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="2" colspan="2" >
+   <item row="4" column="1">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>111</width>
        <height>26</height>
@@ -105,50 +138,23 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2" >
-    <widget class="QPushButton" name="openDirPB" >
-     <property name="text" >
-      <string>&amp;Open Containing Directory</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>201</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="6" >
-    <widget class="QPushButton" name="findPB" >
-     <property name="text" >
-      <string>&amp;Go!</string>
+   <item row="4" column="2">
+    <widget class="QPushButton" name="updatePB">
+     <property name="toolTip">
+      <string>Update the display</string>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="5" colspan="2" >
-    <widget class="QPushButton" name="nextWarningPB" >
-     <property name="toolTip" >
-      <string>Jump to the next warning message.</string>
+     <property name="text">
+      <string>&amp;Update</string>
      </property>
-     <property name="text" >
-      <string>Next &amp;Warning</string>
+     <property name="default">
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="3" colspan="2" >
-    <widget class="QPushButton" name="nextErrorPB" >
-     <property name="toolTip" >
-      <string>Jump to the next error message.</string>
-     </property>
-     <property name="text" >
-      <string>Next &amp;Error</string>
+   <item row="4" column="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
    </item>
@@ -158,10 +164,9 @@
   <tabstop>logTB</tabstop>
   <tabstop>openDirPB</tabstop>
   <tabstop>updatePB</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/MathMatrixUi.ui b/src/frontends/qt4/ui/MathMatrixUi.ui
index b96a792f85..822b337460 100644
--- a/src/frontends/qt4/ui/MathMatrixUi.ui
+++ b/src/frontends/qt4/ui/MathMatrixUi.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>398</width>
+    <width>431</width>
     <height>372</height>
    </rect>
   </property>
@@ -22,7 +22,16 @@
      <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>
@@ -146,13 +155,22 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0">
+   <item row="3" column="0" colspan="2">
     <widget class="QGroupBox" name="alignmentGB">
      <property name="title">
       <string>Alignment</string>
      </property>
      <layout class="QGridLayout" name="grid_1">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>11</number>
+      </property>
+      <property name="topMargin">
+       <number>11</number>
+      </property>
+      <property name="rightMargin">
+       <number>11</number>
+      </property>
+      <property name="bottomMargin">
        <number>11</number>
       </property>
       <property name="spacing">
@@ -194,7 +212,7 @@
       <item row="0" column="1">
        <widget class="QLabel" name="widthLA_2">
         <property name="text">
-         <string>&amp;Horizontal:</string>
+         <string>Hori&amp;zontal:</string>
         </property>
         <property name="buddy">
          <cstring>halignED</cstring>
@@ -204,7 +222,7 @@
      </layout>
     </widget>
    </item>
-   <item row="3" column="1" colspan="2">
+   <item row="3" column="2">
     <widget class="QGroupBox" name="decorationtGB">
      <property name="title">
       <string>Decoration</string>
@@ -233,45 +251,12 @@
      </layout>
     </widget>
    </item>
-   <item row="4" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
+   <item row="4" column="1" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </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="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closePB">
-       <property name="text">
-        <string>Close</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -288,8 +273,6 @@
   <tabstop>valignCO</tabstop>
   <tabstop>halignED</tabstop>
   <tabstop>decorationCO</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>
diff --git a/src/frontends/qt4/ui/NoteUi.ui b/src/frontends/qt4/ui/NoteUi.ui
index 246a38ae10..fb68362bbb 100644
--- a/src/frontends/qt4/ui/NoteUi.ui
+++ b/src/frontends/qt4/ui/NoteUi.ui
@@ -1,85 +1,69 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>NoteUi</class>
- <widget class="QDialog" name="NoteUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="NoteUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>202</width>
-    <height>184</height>
+    <height>196</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="1" >
-    <widget class="QPushButton" name="closePB" >
-     <property name="text" >
-      <string>Close</string>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <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="2" >
-    <widget class="QGroupBox" name="NoteBG" >
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="NoteBG">
+     <property name="title">
       <string>Type</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
+     <layout class="QVBoxLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
        <number>11</number>
       </property>
-      <property name="spacing" >
-       <number>6</number>
+      <property name="topMargin">
+       <number>11</number>
+      </property>
+      <property name="rightMargin">
+       <number>11</number>
+      </property>
+      <property name="bottomMargin">
+       <number>11</number>
       </property>
       <item>
-       <widget class="QRadioButton" name="noteRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="noteRB">
+        <property name="toolTip">
          <string>LyX internal only</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>LyX &amp;Note</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="commentRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="commentRB">
+        <property name="toolTip">
          <string>Export to LaTeX/Docbook but don't print</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Comment</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="greyedoutRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="greyedoutRB">
+        <property name="toolTip">
          <string>Print as grey text</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Greyed out</string>
         </property>
        </widget>
@@ -87,17 +71,22 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>noteRB</tabstop>
   <tabstop>commentRB</tabstop>
   <tabstop>greyedoutRB</tabstop>
-  <tabstop>okPB</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/ParagraphUi.ui b/src/frontends/qt4/ui/ParagraphUi.ui
index 808af52d2e..64d7139b2f 100644
--- a/src/frontends/qt4/ui/ParagraphUi.ui
+++ b/src/frontends/qt4/ui/ParagraphUi.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>438</width>
-    <height>292</height>
+    <height>303</height>
    </rect>
   </property>
   <property name="focusPolicy">
@@ -16,77 +16,7 @@
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>9</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="4" column="0" colspan="2">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>281</width>
-       <height>31</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="2">
-    <widget class="QCheckBox" name="synchronizedViewCB">
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
-     <property name="text">
-      <string>I&amp;mmediate Apply</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QGroupBox" name="labelwidthGB">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="title">
-      <string>Label Width</string>
-     </property>
-     <property name="flat">
-      <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="QLabel" name="TextLabel2">
-        <property name="toolTip">
-         <string>This text defines the width of the paragraph label</string>
-        </property>
-        <property name="text">
-         <string>Lo&amp;ngest label</string>
-        </property>
-        <property name="buddy">
-         <cstring>labelWidth</cstring>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="labelWidth">
-        <property name="toolTip">
-         <string>This text defines the width of the paragraph label</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
+  <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
@@ -96,7 +26,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">
@@ -141,13 +80,6 @@
      </layout>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QCheckBox" name="indentCB">
-     <property name="text">
-      <string>&amp;Indent Paragraph</string>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="1" rowspan="3" colspan="2">
     <widget class="QGroupBox" name="aligmentGB">
      <property name="title">
@@ -157,7 +89,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">
@@ -180,7 +121,7 @@
       <item row="3" column="0">
        <widget class="QRadioButton" name="alignCenterRB">
         <property name="text">
-         <string>C&amp;enter</string>
+         <string>&amp;Center</string>
         </property>
        </widget>
       </item>
@@ -204,68 +145,62 @@
      </layout>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="labelwidthGB">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Label Width</string>
      </property>
-     <property name="margin">
-      <number>0</number>
+     <property name="flat">
+      <bool>true</bool>
      </property>
-     <item>
-      <widget class="QPushButton" name="restorePB">
-       <property name="text">
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>31</width>
-         <height>27</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="autoDefault">
-        <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>
-      </widget>
-     </item>
-    </layout>
+     <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="0" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="toolTip">
+         <string>This text defines the width of the paragraph label</string>
+        </property>
+        <property name="text">
+         <string>Lo&amp;ngest label</string>
+        </property>
+        <property name="buddy">
+         <cstring>labelWidth</cstring>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="labelWidth">
+        <property name="toolTip">
+         <string>This text defines the width of the paragraph label</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="indentCB">
+     <property name="text">
+      <string>&amp;Indent Paragraph</string>
+     </property>
+    </widget>
    </item>
    <item row="3" column="0" colspan="3">
     <spacer>
@@ -280,6 +215,36 @@
      </property>
     </spacer>
    </item>
+   <item row="4" column="0" rowspan="2" colspan="2">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>281</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="5" column="2">
+    <widget class="QCheckBox" name="synchronizedViewCB">
+     <property name="layoutDirection">
+      <enum>Qt::LeftToRight</enum>
+     </property>
+     <property name="text">
+      <string>I&amp;mmediate Apply</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
@@ -293,10 +258,6 @@
   <tabstop>alignCenterRB</tabstop>
   <tabstop>alignRightRB</tabstop>
   <tabstop>synchronizedViewCB</tabstop>
-  <tabstop>restorePB</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/PhantomUi.ui b/src/frontends/qt4/ui/PhantomUi.ui
index b354d1a4be..c924c0eb31 100644
--- a/src/frontends/qt4/ui/PhantomUi.ui
+++ b/src/frontends/qt4/ui/PhantomUi.ui
@@ -1,103 +1,92 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>PhantomUi</class>
- <widget class="QDialog" name="PhantomUi" >
-  <property name="geometry" >
+ <widget class="QDialog" name="PhantomUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>202</width>
-    <height>184</height>
+    <width>221</width>
+    <height>196</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="1" >
-    <widget class="QPushButton" name="closePB" >
-     <property name="text" >
-      <string>Close</string>
-     </property>
-     <property name="default" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" >
-    <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="2" >
-    <widget class="QGroupBox" name="PhantomBG" >
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="PhantomBG">
+     <property name="title">
       <string>Type</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="spacing" >
+     <layout class="QVBoxLayout">
+      <property name="spacing">
        <number>6</number>
       </property>
-      <property name="margin" >
+      <property name="leftMargin">
+       <number>11</number>
+      </property>
+      <property name="topMargin">
+       <number>11</number>
+      </property>
+      <property name="rightMargin">
+       <number>11</number>
+      </property>
+      <property name="bottomMargin">
        <number>11</number>
       </property>
       <item>
-       <widget class="QRadioButton" name="phantomRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="phantomRB">
+        <property name="toolTip">
          <string>Horizontal and vertical space of the phantom content</string>
         </property>
-        <property name="text" >
-         <string>&amp;Phantom</string>
+        <property name="text">
+         <string>Phanto&amp;m</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="hphantomRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="hphantomRB">
+        <property name="toolTip">
          <string>Horizontal space of the phantom content</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Horizontal Phantom</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="vphantomRB" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="vphantomRB">
+        <property name="toolTip">
          <string>Vertical space of the phantom content</string>
         </property>
-        <property name="text" >
-         <string>&amp;Vertical Phantom</string>
+        <property name="text">
+         <string>Verti&amp;cal Phantom</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>phantomRB</tabstop>
   <tabstop>hphantomRB</tabstop>
   <tabstop>vphantomRB</tabstop>
-  <tabstop>okPB</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/PrefsUi.ui b/src/frontends/qt4/ui/PrefsUi.ui
index ffdd011b60..a894b0f968 100644
--- a/src/frontends/qt4/ui/PrefsUi.ui
+++ b/src/frontends/qt4/ui/PrefsUi.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>650</width>
-    <height>352</height>
+    <height>266</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -22,109 +22,39 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout">
-   <property name="leftMargin">
-    <number>11</number>
-   </property>
-   <property name="topMargin">
-    <number>11</number>
-   </property>
-   <property name="rightMargin">
-    <number>11</number>
-   </property>
-   <property name="bottomMargin">
-    <number>11</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="lyx::frontend::PanelStack" name="prefsPS" native="true"/>
+   </item>
    <item row="1" column="0">
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="leftMargin">
-      <number>0</number>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="topMargin">
-      <number>0</number>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>405</width>
+       <height>20</height>
+      </size>
      </property>
-     <property name="rightMargin">
-      <number>0</number>
+    </spacer>
+   </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="tempSaveCB">
+     <property name="toolTip">
+      <string>If this is checked, pressing OK or Apply will save the changes only for the current LyX session, not permanently.</string>
      </property>
-     <property name="bottomMargin">
-      <number>0</number>
+     <property name="text">
+      <string>A&amp;pply to current session only</string>
      </property>
-     <item>
-      <widget class="QPushButton" name="restorePB">
-       <property name="text">
-        <string>&amp;Restore</string>
-       </property>
-       <property name="autoDefault">
-        <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" stdset="0">
-        <size>
-         <width>20</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QCheckBox" name="tempSaveCB">
-       <property name="toolTip">
-        <string>If this is checked, pressing OK or Apply will save the changes only for the current LyX session, not permanently.</string>
-       </property>
-       <property name="text">
-        <string>A&amp;pply to current session only</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="okPB">
-       <property name="text">
-        <string>&amp;OK</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</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>
-      </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>
+    </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="lyx::frontend::PanelStack" name="prefsPS" native="true"/>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
@@ -138,10 +68,6 @@
  </customwidgets>
  <tabstops>
   <tabstop>prefsPS</tabstop>
-  <tabstop>restorePB</tabstop>
-  <tabstop>okPB</tabstop>
-  <tabstop>applyPB</tabstop>
-  <tabstop>closePB</tabstop>
  </tabstops>
  <includes>
   <include location="local">qt_i18n.h</include>