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

Merge branch 'Plasma/5.12' into Plasma/5.14

Browse source
This commit is contained in:
Kai Uwe Broulik 2018-10-12 13:54:24 +02:00
commit 1fe3c765cd
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwinrules/ruleswidget.cpp
View file

@ -687,6 +687,7 @@ void RulesWidget::detectClicked()
detect_dlg = new DetectDialog; detect_dlg = new DetectDialog;
connect(detect_dlg, SIGNAL(detectionDone(bool)), this, SLOT(detected(bool))); connect(detect_dlg, SIGNAL(detectionDone(bool)), this, SLOT(detected(bool)));
detect_dlg->detect(Ui::RulesWidgetBase::detection_delay->value()); detect_dlg->detect(Ui::RulesWidgetBase::detection_delay->value());
Ui::RulesWidgetBase::detect->setEnabled(false);
} }
void RulesWidget::detected(bool ok) void RulesWidget::detected(bool ok)
@ -725,6 +726,7 @@ void RulesWidget::detected(bool ok)
delete detect_dlg; delete detect_dlg;
detect_dlg = nullptr; detect_dlg = nullptr;
detect_dlg_ok = ok; detect_dlg_ok = ok;
Ui::RulesWidgetBase::detect->setEnabled(true);
} }
#define GENERIC_PREFILL( var, func, info, uimethod ) \ #define GENERIC_PREFILL( var, func, info, uimethod ) \