alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* I hope the normal standard of service is resumed in the plasma trunk, sorry..

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1013796
This commit is contained in:
Richard Dale 2009-08-20 19:05:14 +00:00
parent fdd07bf6d2
commit 415a82ccfc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
applet.cpp
View File

@ -1585,15 +1585,14 @@ void Applet::showConfigurationInterface()
} }
d->addGlobalShortcutsPage(dialog); d->addGlobalShortcutsPage(dialog);
connect(dialog, SIGNAL(applyClicked()), this, SLOT(configDialogFinished()));
connect(dialog, SIGNAL(okClicked()), this, SLOT(configDialogFinished()));
dialog->show(); dialog->show();
} else if (d->script) { } else if (d->script) {
d->script->showConfigurationInterface(); d->script->showConfigurationInterface();
} else { } else {
KConfigDialog *dialog = d->generateGenericConfigDialog()->show(); KConfigDialog *dialog = d->generateGenericConfigDialog();
createConfigurationInterface(dialog); createConfigurationInterface(dialog);
d->addGlobalShortcutsPage(dialog); d->addGlobalShortcutsPage(dialog);
dialog->show();
} }
emit releaseVisualFocus(); emit releaseVisualFocus();
@ -1643,6 +1642,7 @@ KConfigDialog *AppletPrivate::generateGenericConfigDialog()
dialog->setFaceType(KPageDialog::Auto); dialog->setFaceType(KPageDialog::Auto);
dialog->setWindowTitle(configWindowTitle()); dialog->setWindowTitle(configWindowTitle());
dialog->setAttribute(Qt::WA_DeleteOnClose, true); dialog->setAttribute(Qt::WA_DeleteOnClose, true);
QObject::connect(dialog, SIGNAL(finished()), nullManager, SLOT(deleteLater()));
return dialog; return dialog;
} }
@ -1669,7 +1669,6 @@ void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog)
dialog->showButton(KDialog::Apply, false); dialog->showButton(KDialog::Apply, false);
QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished())); QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()));
QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished())); QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()));
QObject::connect(dialog, SIGNAL(finished()), nullManager, SLOT(deleteLater()));
} }
void AppletPrivate::clearShortcutEditorPtr() void AppletPrivate::clearShortcutEditorPtr()