yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.6'

Browse source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Kai Uwe Broulik 2016-03-21 10:29:58 +01:00
commit 376a5a15f1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcmkwin/kwinrules/ruleswidget.cpp
View file

@ -878,8 +878,8 @@ EditShortcutDialog::EditShortcutDialog(QWidget* parent, const char* name)
connect(buttons, SIGNAL(accepted()), SLOT(accept())); connect(buttons, SIGNAL(accepted()), SLOT(accept()));
connect(buttons, SIGNAL(rejected()), SLOT(reject())); connect(buttons, SIGNAL(rejected()), SLOT(reject()));
layout()->addWidget(buttons);
layout()->addWidget(widget); layout()->addWidget(widget);
layout()->addWidget(buttons);
} }
void EditShortcutDialog::setShortcut(const QString& cut) void EditShortcutDialog::setShortcut(const QString& cut)
@ -900,7 +900,7 @@ ShortcutDialog::ShortcutDialog(const QKeySequence& cut, QWidget* parent)
// It's a global shortcut so don't allow multikey shortcuts // It's a global shortcut so don't allow multikey shortcuts
widget->setMultiKeyShortcutsAllowed(false); widget->setMultiKeyShortcutsAllowed(false);
QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Close, this); QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
connect(buttons, SIGNAL(accepted()), SLOT(accept())); connect(buttons, SIGNAL(accepted()), SLOT(accept()));
connect(buttons, SIGNAL(rejected()), SLOT(reject())); connect(buttons, SIGNAL(rejected()), SLOT(reject()));