From 81c7addc40ee3d4a82cae997bda61f591317416b Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Tue, 1 Feb 2011 00:52:07 -0800 Subject: [PATCH 1/2] a small hack to give us the enabled button --- applet.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/applet.cpp b/applet.cpp index 508b05aaf..8610d3e8d 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1922,8 +1922,6 @@ KConfigDialog *AppletPrivate::generateGenericConfigDialog() dialog->setWindowTitle(configWindowTitle()); dialog->setAttribute(Qt::WA_DeleteOnClose, true); q->createConfigurationInterface(dialog); - //TODO: Apply button does not correctly work for now, so do not show it - dialog->showButton(KDialog::Apply, false); dialog->showButton(KDialog::Default, false); QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished())); QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished())); @@ -1956,8 +1954,6 @@ void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog) layout->addStretch(); dialog->addPage(page, i18n("Keyboard Shortcut"), "preferences-desktop-keyboard"); - //TODO: Apply button does not correctly work for now, so do not show it - dialog->showButton(KDialog::Apply, false); QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection); QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection); } @@ -2041,6 +2037,9 @@ void AppletPrivate::configDialogFinished() if (!configLoader) { // the config loader will trigger this for us, so we don't need to. q->configChanged(); + if (KConfigDialog *dialog = qobject_cast(q->sender())) { + dialog->enableButton(KDialog::Apply, false); + } } } From 318119ef4642a85631a16e4805005cb9b6fa88cc Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Tue, 1 Feb 2011 10:07:05 -0800 Subject: [PATCH 2/2] remove some well dead code --- applet.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/applet.cpp b/applet.cpp index 8610d3e8d..39cc4c8ba 100644 --- a/applet.cpp +++ b/applet.cpp @@ -1857,7 +1857,6 @@ void Applet::showConfigurationInterface() d->script->showConfigurationInterface(); } else { KConfigDialog *dialog = d->generateGenericConfigDialog(); - //createConfigurationInterface(dialog); d->addStandardConfigurationPages(dialog); showConfigurationInterface(dialog); }