-rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 7 | ||||
-rw-r--r-- | microkde/kutils/kcmultidialog.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index 6c82e4f..e7aa9d1 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp @@ -68,55 +68,58 @@ void KCMultiDialog::slotDefault() { int curPageIndex = mMainWidget->activePageIndex(); QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) { if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) { (*it)->defaults(); clientChanged(true); return; } } } - +void KCMultiDialog::accept() +{ + slotOk(); +} void KCMultiDialog::slotApply() { qDebug("KCMultiDialog::slotApply clicked"); QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) (*it)->save(); clientChanged(false); emit applyClicked(); } void KCMultiDialog::slotOk() { qDebug("KCMultiDialog::slotOk clicked"); QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) (*it)->save(); - accept(); + QDialog::accept(); emit okClicked(); } void KCMultiDialog::slotHelp() { /*US KURL url( KURL("help:/"), _docPath ); if (url.protocol() == "help" || url.protocol() == "man" || url.protocol() == "info") { KProcess process; process << "khelpcenter" << url.url(); process.start(KProcess::DontCare); process.detach(); } else { diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h index 1aa66b2..768faea 100644 --- a/microkde/kutils/kcmultidialog.h +++ b/microkde/kutils/kcmultidialog.h @@ -99,32 +99,34 @@ protected slots: /** * This slot is called when the user presses the "OK" Button * You can reimplement it if needed * * @note Make sure you call the original implementation! **/ virtual void slotOk(); /** * This slot is called when the user presses the "Help" Button * You can reimplement it if needed * * @note Make sure you call the original implementation! **/ virtual void slotHelp(); + void accept(); + private slots: void slotAboutToShow(QWidget *); void clientChanged(bool state); private: /*US struct LoadInfo { LoadInfo(const QString &_path, bool _withfallback) : path(_path), withfallback(_withfallback) { } QString path; bool withfallback; }; */ |