Revert "Settings dialog: remove the close button #3713"

This reverts commit ebee6f0bc266bd68809a3f553bce14bde5116fdf.

Unix window managers do not have a reliable way of hinting buttons,
so we need the close button.

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 2967027ebc5d9751636d43deec3c0f9c448ade1c..94e8867eb2e38d83aa23d2d1b9b101ce2277df9c 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -111,6 +111,9 @@ SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
 
     QTimer::singleShot(1, this, SLOT(showFirstPage()));
 
+    QPushButton *closeButton = _ui->buttonBox->button(QDialogButtonBox::Close);
+    connect(closeButton, SIGNAL(clicked()), SLOT(accept()));
+
     QAction *showLogWindow = new QAction(this);
     showLogWindow->setShortcut(QKeySequence("F12"));
     connect(showLogWindow, SIGNAL(triggered()), gui, SLOT(slotToggleLogBrowser()));

diff --git a/src/gui/settingsdialog.ui b/src/gui/settingsdialog.ui
index 83590c23bf5f0cf68d8867ec775895d32683ff11..cdabf661f9ebe920a84341b6ad6592e867abd8b2 100644 (file)
--- a/src/gui/settingsdialog.ui
+++ b/src/gui/settingsdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>488</width>
-    <height>342</height>
+    <width>693</width>
+    <height>457</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,6 +29,28 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <item row="1" column="0">
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QDialogButtonBox" name="buttonBox">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="standardButtons">
+         <set>QDialogButtonBox::Close</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item row="0" column="0">
     <widget class="QStackedWidget" name="stack"/>
    </item>