* Add a Plasma::AppletScript::addStandardConfigurationPages() method that adds

standard pages to a configuration dialog such as the shortcuts one. In 
conjunction with standardConfigurationDialog() this will allow script engines
to use the same dialogs as C++ applets

svn path=/trunk/KDE/kdelibs/; revision=1013765
This commit is contained in:
Richard Dale 2009-08-20 18:19:44 +00:00
parent f23f4759b7
commit eb51ca9165
3 changed files with 23 additions and 7 deletions

View File

@ -1592,6 +1592,8 @@ void Applet::showConfigurationInterface()
d->script->showConfigurationInterface(); d->script->showConfigurationInterface();
} else { } else {
d->generateGenericConfigDialog()->show(); d->generateGenericConfigDialog()->show();
q->createConfigurationInterface(dialog);
addGlobalShortcutsPage(dialog);
} }
emit releaseVisualFocus(); emit releaseVisualFocus();
@ -1641,13 +1643,6 @@ 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);
q->createConfigurationInterface(dialog);
addGlobalShortcutsPage(dialog);
//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()));
QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()));
QObject::connect(dialog, SIGNAL(finished()), nullManager, SLOT(deleteLater()));
return dialog; return dialog;
} }
@ -1669,6 +1664,12 @@ void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog)
layout->addWidget(shortcutEditor); layout->addWidget(shortcutEditor);
layout->addStretch(); layout->addStretch();
dialog->addPage(page, i18n("Keyboard Shortcut"), "preferences-desktop-keyboard"); 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()));
QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()));
QObject::connect(dialog, SIGNAL(finished()), nullManager, SLOT(deleteLater()));
} }
void AppletPrivate::clearShortcutEditorPtr() void AppletPrivate::clearShortcutEditorPtr()

View File

@ -140,6 +140,15 @@ KConfigDialog *AppletScript::standardConfigurationDialog()
return 0; return 0;
} }
void AppletScript::addStandardConfigurationPages(KConfigDialog *dialog)
{
if (applet()) {
return applet()->d->addGlobalShortcutsPage(dialog);
}
return 0;
}
void AppletScript::configChanged() void AppletScript::configChanged()
{ {
} }

View File

@ -180,6 +180,12 @@ protected:
*/ */
KConfigDialog *standardConfigurationDialog(); KConfigDialog *standardConfigurationDialog();
/**
* This method should be called after a scripting applet has added
* its own pages to a configuration dialog
*/
void addStandardConfigurationPages(KConfigDialog *dialog);
private: private:
AppletScriptPrivate *const d; AppletScriptPrivate *const d;
}; };