| -rw-r--r-- | microkde/kdeui/kcmodule.h | 9 | ||||
| -rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 13 | ||||
| -rw-r--r-- | microkde/kutils/kcmultidialog.h | 4 | ||||
| -rw-r--r-- | microkde/microkdeE.pro | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/microkde/kdeui/kcmodule.h b/microkde/kdeui/kcmodule.h index 90a87c9..bc020bc 100644 --- a/microkde/kdeui/kcmodule.h +++ b/microkde/kdeui/kcmodule.h @@ -25,8 +25,9 @@ #include <qwidget.h> #include <qstringlist.h> //USclass KAboutData; class KCModulePrivate; +class KPrefs; //US class KInstance; /** * The base class for control center modules. @@ -104,9 +105,9 @@ public: * center, to undo all of his changes and restore the currently valid * settings. NOTE that this is not called after the modules is loaded, * so you probably want to call this method in the constructor. */ - virtual void load() {}; + virtual void load(KPrefs* prefs) {}; /** * Save the configuration data. * @@ -117,17 +118,17 @@ public: * e.g. by restarting applications. * * save is called when the user clicks "Apply" or "Ok". */ - virtual void save() {}; + virtual void save(KPrefs* prefs) {}; /** * Sets the configuration to sensible default values. * * This method is called when the user clicks the "Default" * button. It should set the display to useful values. */ - virtual void defaults() {}; + virtual void defaults(KPrefs* prefs) {}; /** * Set the configuration to system default values. * @@ -135,9 +136,9 @@ public: * button. It should set the display to the system default values. * * NOTE: The default behaviour is to call defaults(). */ - virtual void sysdefaults() { defaults(); }; + virtual void sysdefaults(KPrefs* prefs) { defaults(prefs); }; /** * Return a quick-help text. * diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp index 13be2ce..c2378fb 100644 --- a/microkde/kutils/kcmultidialog.cpp +++ b/microkde/kutils/kcmultidialog.cpp @@ -33,14 +33,15 @@ #include <krun.h> #include <kprocess.h> #include "kcmultidialog.h" +#include "kprefs.h" //US #include "kcmultidialog.moc" //US #include "kcmoduleloader.h" -KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) +KCMultiDialog::KCMultiDialog(KPrefs* prefs, const QString& baseGroup, QWidget *parent, const char *name, bool modal) : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, - parent, name, modal, true), d(0L) + parent, name, modal, true), mPrefs(prefs), d(0L) { enableButton(Apply, false); //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); @@ -73,9 +74,9 @@ void KCMultiDialog::slotDefault() for (; it.current(); ++it) { if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) { - (*it)->defaults(); + (*it)->defaults(mPrefs); clientChanged(true); return; } } @@ -87,9 +88,9 @@ void KCMultiDialog::slotApply() qDebug("KCMultiDialog::slotApply clicked"); QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) - (*it)->save(); + (*it)->save(mPrefs); clientChanged(false); emit applyClicked(); @@ -101,9 +102,9 @@ void KCMultiDialog::slotOk() qDebug("KCMultiDialog::slotOk clicked"); QPtrListIterator<KCModule> it(modules); for (; it.current(); ++it) - (*it)->save(); + (*it)->save(mPrefs); accept(); emit okClicked(); } @@ -159,8 +160,10 @@ void KCMultiDialog::addModule(KCModule* module ) //, const QString& modulename, { modules.append(module); connect(module, SIGNAL(changed(bool)), this, SLOT(clientChanged(bool))); +//US + module->load(mPrefs); } diff --git a/microkde/kutils/kcmultidialog.h b/microkde/kutils/kcmultidialog.h index 63d5d42..a42555f 100644 --- a/microkde/kutils/kcmultidialog.h +++ b/microkde/kutils/kcmultidialog.h @@ -28,8 +28,9 @@ #include <kdialogbase.h> #include <kjanuswidget.h> #include <kcmodule.h> +class KPrefs; /** * A class that offers a @ref KDialogBase containing arbitrary KControl Modules * @@ -52,9 +53,9 @@ public: * @param baseGroup The baseGroup, if you want to call a module out of * kcontrol, just keep "settings" * @param modal If you pass true here, the dialog will be modal **/ - KCMultiDialog(const QString& baseGroup = QString::fromLatin1("settings"), + KCMultiDialog(KPrefs* prefs, const QString& baseGroup = QString::fromLatin1("settings"), QWidget *parent=0, const char *name=0, bool modal=false); /** @@ -137,8 +138,9 @@ private: QString _baseGroup; //US KJanusWidget* mMainWidget; + KPrefs* mPrefs; // For future use class KCMultiDialogPrivate; KCMultiDialogPrivate *d; diff --git a/microkde/microkdeE.pro b/microkde/microkdeE.pro index b664c9a..06b288b 100644 --- a/microkde/microkdeE.pro +++ b/microkde/microkdeE.pro @@ -94,8 +94,9 @@ osmartpointer.h \ kdecore/kconfigbase.h \ kdecore/klocale.h \ kdecore/klibloader.h \ kdecore/kcatalogue.h \ + kdecore/kprefs.h \ kdecore/ksharedptr.h \ kdecore/kshell.h \ kdecore/kstandarddirs.h \ kdecore/kstringhandler.h \ @@ -137,8 +138,9 @@ oprocess.cpp \ kdecore/kcatalogue.cpp \ kdecore/klibloader.cpp \ kdecore/klocale.cpp \ kdecore/kmdcodec.cpp \ + kdecore/kprefs.cpp \ kdecore/kshell.cpp \ kdecore/kstandarddirs.cpp \ kdecore/kstringhandler.cpp \ kdeui/kaction.cpp \ |