[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2003-09-04 16:20:00
[Download RAW message or body]

CVS commit by tokoe: 

Make use of the new KSettings class, really cool code :)


  M +10 -12    kabcore.cpp   1.38
  M +5 -2      kabcore.h   1.18
  M +4 -3      kcmconfigs/kabconfig.desktop   1.26
  M +4 -4      kcmconfigs/kabldapconfig.desktop   1.21


--- kdepim/kaddressbook/kabcore.cpp  #1.37:1.38
@@ -34,4 +34,5 @@
 #include <kabc/stdaddressbook.h>
 #include <kabc/vcardtool.h>
+#include <kaboutdata.h>
 #include <kapplication.h>
 #include <kactionclasses.h>
@@ -45,8 +46,9 @@
 #include <kprotocolinfo.h>
 #include <kresources/selectdialog.h>
+#include <ksettings/dialog.h>
+#include <ksettings/dispatcher.h>
 #include <kstandarddirs.h>
 #include <ktempfile.h>
 #include <kxmlguiclient.h>
-#include <kaboutdata.h>
 #include <libkdepim/categoryselectdialog.h>
 
@@ -821,19 +823,15 @@ QString KABCore::getNameByPhone( const Q
 void KABCore::openConfigDialog()
 {
-  if ( !mConfigureDialog ) {
-    mConfigureDialog = new KCMultiDialog( "PIM", mWidget );
-    mConfigureDialog->addModule( "PIM/kabconfig.desktop" );
-    mConfigureDialog->addModule( "PIM/kabldapconfig.desktop" );
-    connect( mConfigureDialog, SIGNAL( applyClicked() ),
-             this, SLOT( configurationChanged() ) );
-    connect( mConfigureDialog, SIGNAL( okClicked() ),
-             this, SLOT( configurationChanged() ) );
-  }
-
   // Save the current config so we do not loose anything if the user accepts
   saveSettings();
 
+  if ( !mConfigureDialog ) {
+    mConfigureDialog = new KSettings::Dialog( mWidget );
+
+    KSettings::Dispatcher::self()->registerInstance( KGlobal::instance(), this,
+                                                     SLOT( configurationChanged() ) );
+  }
+
   mConfigureDialog->show();
-  mConfigureDialog->raise();
 }
 

--- kdepim/kaddressbook/kabcore.h  #1.17:1.18
@@ -37,8 +37,11 @@ class Ticket;
 }
 
+namespace KSettings {
+class Dialog;
+}
+
 class KAboutData;
 class KAction;
 class KActionCollection;
-class KCMultiDialog;
 class KConfig;
 class KToggleAction;
@@ -334,5 +337,5 @@ class KABCore : public KAB::Core
     QSplitter *mExtensionBarSplitter;
 
-    KCMultiDialog *mConfigureDialog;
+    KSettings::Dialog *mConfigureDialog;
     LDAPSearchDialog *mLdapSearchDialog;
     QDict<AddresseeEditorDialog> mEditorDict;

--- kdepim/kaddressbook/kcmconfigs/kabconfig.desktop  #1.25:1.26
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kabconfig
 Icon=kaddressbook
-Type=Application
-Terminal=0
+Type=Service
+ServiceTypes=KCModule
 
 X-KDE-ModuleType=Library
@@ -10,4 +9,6 @@
 X-KDE-FactoryName=kabconfig
 X-KDE-HasReadOnlyMode=false
+X-KDE-ParentApp=kaddressbook
+X-KDE-ParentComponents=kaddressbook,kaddressbookpart
 
 Name=Address Book

--- kdepim/kaddressbook/kcmconfigs/kabldapconfig.desktop  #1.20:1.21
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell kabldapconfig
 Icon=find
-Type=Application
-Terminal=0
+Type=Service
+ServiceTypes=KCModule
 
 X-KDE-ModuleType=Library
 X-KDE-Library=kabldapconfig
 X-KDE-FactoryName=kabldapconfig
-X-KDE-HasReadOnlyMode=false
+X-KDE-ParentApp=kaddressbook
+X-KDE-ParentComponents=kaddressbook,kaddressbookpart
 
 Name=LDAP Lookup


[prev in list] [next in list] [prev in thread] [next in thread]