-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 @@ | |||
76 | #include <kresources/kcmkresources.h> | 76 | #include <kresources/kcmkresources.h> |
77 | #include <ktoolbar.h> | 77 | #include <ktoolbar.h> |
78 | 78 | ||
79 | #include <kcmkabconfig.h> | ||
80 | 79 | ||
81 | //#include <qlabel.h> | 80 | //#include <qlabel.h> |
82 | 81 | ||
@@ -88,7 +87,8 @@ | |||
88 | #include <qpe/ir.h> | 87 | #include <qpe/ir.h> |
89 | 88 | ||
90 | #endif // KAB_EMBEDDED | 89 | #endif // KAB_EMBEDDED |
91 | #include <kcmkabconfig.h> | 90 | #include "kcmconfigs/kcmkabconfig.h" |
91 | #include "kcmconfigs/kcmkdepimconfig.h" | ||
92 | 92 | ||
93 | 93 | ||
94 | #include <kresources/selectdialog.h> | 94 | #include <kresources/selectdialog.h> |
@@ -1197,9 +1197,15 @@ QString KABCore::getNameByPhone( const QString &phone ) | |||
1197 | 1197 | ||
1198 | void KABCore::openConfigDialog() | 1198 | void KABCore::openConfigDialog() |
1199 | { | 1199 | { |
1200 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); | 1200 | KABPrefs* prefs = KABPrefs::instance(); |
1201 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( prefs, "PIM", this ,"kabconfigdialog", true ); | ||
1201 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); | 1202 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); |
1202 | ConfigureDialog->addModule(kabcfg ); | 1203 | ConfigureDialog->addModule(kabcfg ); |
1204 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Pim")) , "KCMKdeLibConfig" ); | ||
1205 | ConfigureDialog->addModule(kdelibcfg ); | ||
1206 | |||
1207 | |||
1208 | |||
1203 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | 1209 | connect( ConfigureDialog, SIGNAL( applyClicked() ), |
1204 | this, SLOT( configurationChanged() ) ); | 1210 | this, SLOT( configurationChanged() ) ); |
1205 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1211 | connect( ConfigureDialog, SIGNAL( okClicked() ), |
@@ -1514,7 +1520,7 @@ void KABCore::initActions() | |||
1514 | mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, | 1520 | mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, |
1515 | SLOT( beamVCard() ), actionCollection(), | 1521 | SLOT( beamVCard() ), actionCollection(), |
1516 | "kaddressbook_beam_vcard" ); | 1522 | "kaddressbook_beam_vcard" ); |
1517 | 1523 | ||
1518 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, | 1524 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, |
1519 | SLOT( beamMySelf() ), actionCollection(), | 1525 | SLOT( beamMySelf() ), actionCollection(), |
1520 | "kaddressbook_beam_myself" ); | 1526 | "kaddressbook_beam_myself" ); |
@@ -1621,7 +1627,7 @@ void KABCore::initActions() | |||
1621 | SLOT( setWhoAmI() ), actionCollection(), | 1627 | SLOT( setWhoAmI() ), actionCollection(), |
1622 | "set_personal" ); | 1628 | "set_personal" ); |
1623 | 1629 | ||
1624 | 1630 | ||
1625 | 1631 | ||
1626 | 1632 | ||
1627 | mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, | 1633 | mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, |