[Pkg-owncloud-commits] [owncloud-client] 42/218: Settings dialog: remove the close button #3713

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit ebee6f0bc266bd68809a3f553bce14bde5116fdf
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Tue Sep 1 11:32:59 2015 +0200

    Settings dialog: remove the close button #3713
---
 src/gui/settingsdialog.cpp |  3 ---
 src/gui/settingsdialog.ui  | 26 ++------------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index d798bd8..f00fd7a 100644
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -111,9 +111,6 @@ 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 cdabf66..83590c2 100644
--- a/src/gui/settingsdialog.ui
+++ b/src/gui/settingsdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>693</width>
-    <height>457</height>
+    <width>488</width>
+    <height>342</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,28 +29,6 @@
    <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>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git