Fixes: Add "Apply" button to Preferences dialog

RevBy:   con

src/plugins/coreplugin/dialogs/settingsdialog.cpp

@@ -47,6 +47,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, const QString &initialCategory,
     setupUi(this);
     buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
 
+    connect(buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()), this, SLOT(apply()));
+
     splitter->setCollapsible(1, false);
     pageTree->header()->setVisible(false);
 
@@ -135,3 +137,9 @@ void SettingsDialog::reject()
         page->finished(false);
     done(QDialog::Rejected);
 }
+
+void SettingsDialog::apply()
+{
+    foreach (IOptionsPage *page, m_pages)
+        page->finished(true);
+}

src/plugins/coreplugin/dialogs/settingsdialog.h

@@ -57,6 +57,7 @@ private slots:
     void pageSelected(QTreeWidgetItem *cat);
     void accept();
     void reject();
+    void apply();
 
 private:
     QList<Core::IOptionsPage*> m_pages;

src/plugins/coreplugin/dialogs/settingsdialog.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SettingsDialog</class>
  <widget class="QDialog" name="SettingsDialog">
@@ -13,12 +14,12 @@
    <string>Options</string>
   </property>
   <layout class="QVBoxLayout">
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing">
     <number>6</number>
    </property>
+   <property name="margin">
+    <number>9</number>
+   </property>
    <item>
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
@@ -26,9 +27,7 @@
      </property>
      <widget class="QTreeWidget" name="pageTree">
       <property name="sizePolicy">
-       <sizepolicy>
-        <hsizetype>7</hsizetype>
-        <vsizetype>7</vsizetype>
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -44,12 +43,12 @@
      </widget>
      <widget class="QWidget" name="layoutWidget">
       <layout class="QVBoxLayout">
-       <property name="margin" >
-        <number>0</number>
-       </property>
        <property name="spacing">
         <number>6</number>
        </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
        <item>
         <widget class="QStackedWidget" name="stackedPages">
          <property name="minimumSize">
@@ -77,7 +76,7 @@
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>