Skip to content
Permalink
Browse files

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

This reverts commit ebee6f0.

Unix window managers do not have a reliable way of hinting buttons,
so we need the close button.
  • Loading branch information...
danimo committed Oct 22, 2015
1 parent 91525a7 commit 899f52be4f1168923a6ea4556cfdf9f55fc5a866
Showing with 27 additions and 2 deletions.
  1. +3 −0 src/gui/settingsdialog.cpp
  2. +24 −2 src/gui/settingsdialog.ui
@@ -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()));
@@ -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>

0 comments on commit 899f52b

Please sign in to comment.
You can’t perform that action at this time.