From 38d84409bcca83516eb816461c8b79b4cf6cbf57 Mon Sep 17 00:00:00 2001
From: ulf69 <ulf69>
Date: Fri, 06 Aug 2004 20:29:00 +0000
Subject: expanded functionality of kcmultidialog to support other applications

---
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
@@ -26,6 +26,7 @@
 #include <qstringlist.h>
 //USclass KAboutData;
 class KCModulePrivate;
+class KPrefs;
 //US class KInstance;
 
 /**
@@ -105,7 +106,7 @@ public:
    * 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.
@@ -118,7 +119,7 @@ public:
    *
    * 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.
@@ -126,7 +127,7 @@ public:
    * 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.
@@ -136,7 +137,7 @@ public:
    *
    * 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
@@ -34,12 +34,13 @@
 #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 *)));
@@ -74,7 +75,7 @@ void KCMultiDialog::slotDefault()
     {
        if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
        {
-          (*it)->defaults();
+          (*it)->defaults(mPrefs);
           clientChanged(true);
           return;
        }
@@ -88,7 +89,7 @@ qDebug("KCMultiDialog::slotApply clicked");
 
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
-      (*it)->save();
+      (*it)->save(mPrefs);
     clientChanged(false);
 
     emit applyClicked();
@@ -102,7 +103,7 @@ qDebug("KCMultiDialog::slotOk clicked");
 
     QPtrListIterator<KCModule> it(modules);
     for (; it.current(); ++it)
-      (*it)->save();
+      (*it)->save(mPrefs);
     accept();
 
     emit okClicked();
@@ -160,6 +161,8 @@ 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
@@ -29,6 +29,7 @@
 #include <kjanuswidget.h>
 #include <kcmodule.h>
 
+class KPrefs;
 
 /**
  * A class that offers a @ref KDialogBase containing arbitrary KControl Modules
@@ -53,7 +54,7 @@ public:
      *                  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);
 
@@ -77,9 +78,9 @@ public:
 //US special method for microkde. We dop noty want to load everything dynamically.
    void addModule(KCModule* module );//, const QString& modulename, const QString& iconname);
     QVBox* getNewVBoxPage(const QString & modulename) ;
-    
-    
-    
+
+
+
 protected slots:
     /**
      * This slot is called when the user presses the "Default" Button
@@ -128,17 +129,18 @@ private:
       QString path;
       bool withfallback;
     };
-*/    
+*/
     QPtrList<KCModule> modules;
-/*    
+/*
     QPtrDict<LoadInfo> moduleDict;
     QString _docPath;
-*/    
+*/
     QString _baseGroup;
 
-//US    
+//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
@@ -95,6 +95,7 @@ osmartpointer.h \
  kdecore/klocale.h \
  kdecore/klibloader.h \
  kdecore/kcatalogue.h \
+ kdecore/kprefs.h \
  kdecore/ksharedptr.h \
  kdecore/kshell.h \
  kdecore/kstandarddirs.h \
@@ -138,6 +139,7 @@ oprocess.cpp \
  kdecore/klibloader.cpp \
  kdecore/klocale.cpp \
  kdecore/kmdcodec.cpp \
+ kdecore/kprefs.cpp \
  kdecore/kshell.cpp \
  kdecore/kstandarddirs.cpp \
  kdecore/kstringhandler.cpp \
--
cgit v0.9.0.2