-rw-r--r-- | kaddressbook/kabcore.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 2494aa2..1667400 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -76,7 +76,6 @@ #include <kresources/kcmkresources.h> #include <ktoolbar.h> -#include <kcmkabconfig.h> //#include <qlabel.h> @@ -88,7 +87,8 @@ #include <qpe/ir.h> #endif // KAB_EMBEDDED -#include <kcmkabconfig.h> +#include "kcmconfigs/kcmkabconfig.h" +#include "kcmconfigs/kcmkdepimconfig.h" #include <kresources/selectdialog.h> @@ -1197,9 +1197,15 @@ QString KABCore::getNameByPhone( const QString &phone ) void KABCore::openConfigDialog() { - KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); + KABPrefs* prefs = KABPrefs::instance(); + KCMultiDialog* ConfigureDialog = new KCMultiDialog( prefs, "PIM", this ,"kabconfigdialog", true ); KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); ConfigureDialog->addModule(kabcfg ); + KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Pim")) , "KCMKdeLibConfig" ); + ConfigureDialog->addModule(kdelibcfg ); + + + connect( ConfigureDialog, SIGNAL( applyClicked() ), this, SLOT( configurationChanged() ) ); connect( ConfigureDialog, SIGNAL( okClicked() ), @@ -1514,7 +1520,7 @@ void KABCore::initActions() mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, SLOT( beamVCard() ), actionCollection(), "kaddressbook_beam_vcard" ); - + mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, SLOT( beamMySelf() ), actionCollection(), "kaddressbook_beam_myself" ); @@ -1621,7 +1627,7 @@ void KABCore::initActions() SLOT( setWhoAmI() ), actionCollection(), "set_personal" ); - + mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, |