author | ulf69 <ulf69> | 2004-08-10 01:34:22 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-10 01:34:22 (UTC) |
commit | c9d570427f3d5bead7bee1301514a2d4b82836ea (patch) (unidiff) | |
tree | 8d25f388217c591b7dac1db6c26d0777e6459352 /kaddressbook | |
parent | 4f05a9fcbb9e54184aef93883886aaf865104463 (diff) | |
download | kdepimpi-c9d570427f3d5bead7bee1301514a2d4b82836ea.zip kdepimpi-c9d570427f3d5bead7bee1301514a2d4b82836ea.tar.gz kdepimpi-c9d570427f3d5bead7bee1301514a2d4b82836ea.tar.bz2 |
enhancements to configure external apps like email and phones through a
generalized interface
-rw-r--r-- | kaddressbook/kabcore.cpp | 53 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.cpp | 20 | ||||
-rw-r--r-- | kaddressbook/kcmconfigs/kcmkabconfig.h | 10 |
3 files changed, 28 insertions, 55 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 4303cab..fe4841a 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -44,96 +44,98 @@ | |||
44 | #include <kdebug.h> | 44 | #include <kdebug.h> |
45 | #include <kdeversion.h> | 45 | #include <kdeversion.h> |
46 | #include <kkeydialog.h> | 46 | #include <kkeydialog.h> |
47 | #include <kmessagebox.h> | 47 | #include <kmessagebox.h> |
48 | #include <kprinter.h> | 48 | #include <kprinter.h> |
49 | #include <kprotocolinfo.h> | 49 | #include <kprotocolinfo.h> |
50 | #include <kresources/selectdialog.h> | 50 | #include <kresources/selectdialog.h> |
51 | #include <kstandarddirs.h> | 51 | #include <kstandarddirs.h> |
52 | #include <ktempfile.h> | 52 | #include <ktempfile.h> |
53 | #include <kxmlguiclient.h> | 53 | #include <kxmlguiclient.h> |
54 | #include <kaboutdata.h> | 54 | #include <kaboutdata.h> |
55 | #include <libkdepim/categoryselectdialog.h> | 55 | #include <libkdepim/categoryselectdialog.h> |
56 | 56 | ||
57 | #include "addresseeutil.h" | 57 | #include "addresseeutil.h" |
58 | #include "addresseeeditordialog.h" | 58 | #include "addresseeeditordialog.h" |
59 | #include "extensionmanager.h" | 59 | #include "extensionmanager.h" |
60 | #include "kstdaction.h" | 60 | #include "kstdaction.h" |
61 | #include "kaddressbookservice.h" | 61 | #include "kaddressbookservice.h" |
62 | #include "ldapsearchdialog.h" | 62 | #include "ldapsearchdialog.h" |
63 | #include "printing/printingwizard.h" | 63 | #include "printing/printingwizard.h" |
64 | #else // KAB_EMBEDDED | 64 | #else // KAB_EMBEDDED |
65 | 65 | ||
66 | #include <kapplication.h> | 66 | #include <kapplication.h> |
67 | #include "KDGanttMinimizeSplitter.h" | 67 | #include "KDGanttMinimizeSplitter.h" |
68 | #include "kaddressbookmain.h" | 68 | #include "kaddressbookmain.h" |
69 | #include "kactioncollection.h" | 69 | #include "kactioncollection.h" |
70 | #include <qapp.h> | 70 | #include <qapp.h> |
71 | #include <qmenubar.h> | 71 | #include <qmenubar.h> |
72 | //#include <qtoolbar.h> | 72 | //#include <qtoolbar.h> |
73 | #include <qmessagebox.h> | 73 | #include <qmessagebox.h> |
74 | #include <kdebug.h> | 74 | #include <kdebug.h> |
75 | #include <kiconloader.h> // needed for SmallIcon | 75 | #include <kiconloader.h> // needed for SmallIcon |
76 | #include <kresources/kcmkresources.h> | 76 | #include <kresources/kcmkresources.h> |
77 | #include <ktoolbar.h> | 77 | #include <ktoolbar.h> |
78 | 78 | ||
79 | 79 | ||
80 | //#include <qlabel.h> | 80 | //#include <qlabel.h> |
81 | 81 | ||
82 | 82 | ||
83 | #ifndef DESKTOP_VERSION | 83 | #ifndef DESKTOP_VERSION |
84 | #include <qtopia/services.h> | 84 | #include <qtopia/services.h> |
85 | #include <qtopia/qcopenvelope_qws.h> | 85 | #include <qtopia/qcopenvelope_qws.h> |
86 | #include <qpe/ir.h> | 86 | #include <qpe/ir.h> |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | #endif // KAB_EMBEDDED | 89 | #endif // KAB_EMBEDDED |
90 | #include "kcmconfigs/kcmkabconfig.h" | 90 | #include "kcmconfigs/kcmkabconfig.h" |
91 | #include "kcmconfigs/kcmkdepimconfig.h" | 91 | #include "kcmconfigs/kcmkdepimconfig.h" |
92 | #include "kpimglobalprefs.h" | ||
93 | #include "externalapphandler.h" | ||
92 | 94 | ||
93 | 95 | ||
94 | #include <kresources/selectdialog.h> | 96 | #include <kresources/selectdialog.h> |
95 | #include <kmessagebox.h> | 97 | #include <kmessagebox.h> |
96 | 98 | ||
97 | #include <picture.h> | 99 | #include <picture.h> |
98 | #include <resource.h> | 100 | #include <resource.h> |
99 | 101 | ||
100 | //US#include <qsplitter.h> | 102 | //US#include <qsplitter.h> |
101 | #include <qmap.h> | 103 | #include <qmap.h> |
102 | #include <qdir.h> | 104 | #include <qdir.h> |
103 | #include <qfile.h> | 105 | #include <qfile.h> |
104 | #include <qvbox.h> | 106 | #include <qvbox.h> |
105 | #include <qlayout.h> | 107 | #include <qlayout.h> |
106 | #include <qclipboard.h> | 108 | #include <qclipboard.h> |
107 | #include <qtextstream.h> | 109 | #include <qtextstream.h> |
108 | 110 | ||
109 | #include <libkdepim/categoryselectdialog.h> | 111 | #include <libkdepim/categoryselectdialog.h> |
110 | #include <kabc/vcardconverter.h> | 112 | #include <kabc/vcardconverter.h> |
111 | 113 | ||
112 | 114 | ||
113 | #include "addresseeutil.h" | 115 | #include "addresseeutil.h" |
114 | #include "undocmds.h" | 116 | #include "undocmds.h" |
115 | #include "addresseeeditordialog.h" | 117 | #include "addresseeeditordialog.h" |
116 | #include "viewmanager.h" | 118 | #include "viewmanager.h" |
117 | #include "details/detailsviewcontainer.h" | 119 | #include "details/detailsviewcontainer.h" |
118 | #include "kabprefs.h" | 120 | #include "kabprefs.h" |
119 | #include "xxportmanager.h" | 121 | #include "xxportmanager.h" |
120 | #include "incsearchwidget.h" | 122 | #include "incsearchwidget.h" |
121 | #include "jumpbuttonbar.h" | 123 | #include "jumpbuttonbar.h" |
122 | #include "extensionmanager.h" | 124 | #include "extensionmanager.h" |
123 | #include "addresseeconfig.h" | 125 | #include "addresseeconfig.h" |
124 | #include <kcmultidialog.h> | 126 | #include <kcmultidialog.h> |
125 | 127 | ||
126 | #ifdef _WIN32_ | 128 | #ifdef _WIN32_ |
127 | 129 | ||
128 | #include "kaimportoldialog.h" | 130 | #include "kaimportoldialog.h" |
129 | #endif | 131 | #endif |
130 | 132 | ||
131 | bool pasteWithNewUid = true; | 133 | bool pasteWithNewUid = true; |
132 | 134 | ||
133 | #ifdef KAB_EMBEDDED | 135 | #ifdef KAB_EMBEDDED |
134 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) | 136 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) |
135 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), | 137 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), |
136 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ | 138 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ |
137 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) | 139 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) |
138 | #else //KAB_EMBEDDED | 140 | #else //KAB_EMBEDDED |
139 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) | 141 | KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name ) |
@@ -422,199 +424,168 @@ void KABCore::setContactSelected( const QString &uid ) | |||
422 | emit contactSelected( addr.formattedName() ); | 424 | emit contactSelected( addr.formattedName() ); |
423 | KABC::Picture pic = addr.photo(); | 425 | KABC::Picture pic = addr.photo(); |
424 | if ( pic.isIntern() ) { | 426 | if ( pic.isIntern() ) { |
425 | //US emit contactSelected( pic.data() ); | 427 | //US emit contactSelected( pic.data() ); |
426 | //US instead use: | 428 | //US instead use: |
427 | QPixmap px; | 429 | QPixmap px; |
428 | if (pic.data().isNull() != true) | 430 | if (pic.data().isNull() != true) |
429 | { | 431 | { |
430 | px.convertFromImage(pic.data()); | 432 | px.convertFromImage(pic.data()); |
431 | } | 433 | } |
432 | 434 | ||
433 | emit contactSelected( px ); | 435 | emit contactSelected( px ); |
434 | } | 436 | } |
435 | } | 437 | } |
436 | 438 | ||
437 | 439 | ||
438 | mExtensionManager->setSelectionChanged(); | 440 | mExtensionManager->setSelectionChanged(); |
439 | 441 | ||
440 | // update the actions | 442 | // update the actions |
441 | bool selected = !uid.isEmpty(); | 443 | bool selected = !uid.isEmpty(); |
442 | 444 | ||
443 | if ( mReadWrite ) { | 445 | if ( mReadWrite ) { |
444 | mActionCut->setEnabled( selected ); | 446 | mActionCut->setEnabled( selected ); |
445 | mActionPaste->setEnabled( selected ); | 447 | mActionPaste->setEnabled( selected ); |
446 | } | 448 | } |
447 | 449 | ||
448 | mActionCopy->setEnabled( selected ); | 450 | mActionCopy->setEnabled( selected ); |
449 | mActionDelete->setEnabled( selected ); | 451 | mActionDelete->setEnabled( selected ); |
450 | mActionEditAddressee->setEnabled( selected ); | 452 | mActionEditAddressee->setEnabled( selected ); |
451 | mActionMail->setEnabled( selected ); | 453 | mActionMail->setEnabled( selected ); |
452 | mActionMailVCard->setEnabled( selected ); | 454 | mActionMailVCard->setEnabled( selected ); |
453 | //if (mActionBeam) | 455 | //if (mActionBeam) |
454 | //mActionBeam->setEnabled( selected ); | 456 | //mActionBeam->setEnabled( selected ); |
455 | 457 | ||
456 | if (mActionBeamVCard) | 458 | if (mActionBeamVCard) |
457 | mActionBeamVCard->setEnabled( selected ); | 459 | mActionBeamVCard->setEnabled( selected ); |
458 | 460 | ||
459 | mActionWhoAmI->setEnabled( selected ); | 461 | mActionWhoAmI->setEnabled( selected ); |
460 | mActionCategories->setEnabled( selected ); | 462 | mActionCategories->setEnabled( selected ); |
461 | } | 463 | } |
462 | 464 | ||
463 | void KABCore::sendMail() | 465 | void KABCore::sendMail() |
464 | { | 466 | { |
465 | sendMail( mViewManager->selectedEmails().join( ", " ) ); | 467 | sendMail( mViewManager->selectedEmails().join( ", " ) ); |
466 | } | 468 | } |
467 | 469 | ||
468 | void KABCore::sendMail( const QString& email ) | 470 | void KABCore::sendMail( const QString& email ) |
469 | { | 471 | { |
470 | //US original kde implementation : kapp->invokeMailer( email, "" ); | 472 | bool result = ExternalAppHandler::instance()->mailToContacts(email); |
471 | |||
472 | /*US original qtopia implementation | ||
473 | PimContact c = abList->currentEntry(); | ||
474 | QString name = c.fileAs(); | ||
475 | QString email = c.defaultEmail(); | ||
476 | #ifndef QT_NO_COP | ||
477 | QCopEnvelope e(Service::channel("Email"), "writeMail(QString,QString)"); | ||
478 | e << name << email; | ||
479 | #else | ||
480 | */ | ||
481 | |||
482 | |||
483 | #ifndef QT_NO_COP | ||
484 | QCString channel = KABPrefs::instance()->mEmailChannel.latin1(); | ||
485 | qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")"); | ||
486 | |||
487 | QCopEnvelope e(channel, "writeMail(QString,QString)"); | ||
488 | //US we need no names in the To field. The emailadresses are enough | ||
489 | e << "" << email; | ||
490 | #else | ||
491 | KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) ); | ||
492 | #endif | ||
493 | } | 473 | } |
494 | 474 | ||
495 | 475 | ||
496 | 476 | ||
497 | void KABCore::mailVCard() | 477 | void KABCore::mailVCard() |
498 | { | 478 | { |
499 | QStringList uids = mViewManager->selectedUids(); | 479 | QStringList uids = mViewManager->selectedUids(); |
500 | if ( !uids.isEmpty() ) | 480 | if ( !uids.isEmpty() ) |
501 | mailVCard( uids ); | 481 | mailVCard( uids ); |
502 | } | 482 | } |
503 | 483 | ||
504 | void KABCore::mailVCard( const QStringList& uids ) | 484 | void KABCore::mailVCard( const QStringList& uids ) |
505 | { | 485 | { |
506 | QStringList urls; | 486 | QStringList urls; |
507 | 487 | ||
508 | QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); | 488 | QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); |
509 | 489 | ||
510 | /*US | 490 | /*US |
511 | // Create a temp dir, so that we can put the files in it with proper names | 491 | // Create a temp dir, so that we can put the files in it with proper names |
512 | KTempFile tempDir; | 492 | KTempFile tempDir; |
513 | if ( tempDir.status() != 0 ) { | 493 | if ( tempDir.status() != 0 ) { |
514 | kdWarning() << strerror( tempDir.status() ) << endl; | 494 | kdWarning() << strerror( tempDir.status() ) << endl; |
515 | return; | 495 | return; |
516 | } | 496 | } |
517 | 497 | ||
518 | QString dirName = tempDir.name(); | 498 | QString dirName = tempDir.name(); |
519 | tempDir.unlink(); | 499 | tempDir.unlink(); |
520 | */ | 500 | */ |
521 | QString dirName = tmpdir + "/" + KApplication::randomString( 8 ); | 501 | QString dirName = tmpdir + "/" + KApplication::randomString( 8 ); |
522 | 502 | ||
523 | 503 | ||
524 | 504 | ||
525 | QDir().mkdir( dirName, true ); | 505 | QDir().mkdir( dirName, true ); |
526 | 506 | ||
527 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 507 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
528 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 508 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
529 | 509 | ||
530 | if ( a.isEmpty() ) | 510 | if ( a.isEmpty() ) |
531 | continue; | 511 | continue; |
532 | 512 | ||
533 | QString name = a.givenName() + "_" + a.familyName() + ".vcf"; | 513 | QString name = a.givenName() + "_" + a.familyName() + ".vcf"; |
534 | 514 | ||
535 | QString fileName = dirName + "/" + name; | 515 | QString fileName = dirName + "/" + name; |
536 | 516 | ||
537 | QFile outFile(fileName); | 517 | QFile outFile(fileName); |
538 | if ( outFile.open(IO_WriteOnly) ) { // file opened successfully | 518 | if ( outFile.open(IO_WriteOnly) ) { // file opened successfully |
539 | KABC::VCardConverter converter; | 519 | KABC::VCardConverter converter; |
540 | QString vcard; | 520 | QString vcard; |
541 | 521 | ||
542 | converter.addresseeToVCard( a, vcard ); | 522 | converter.addresseeToVCard( a, vcard ); |
543 | 523 | ||
544 | QTextStream t( &outFile ); // use a text stream | 524 | QTextStream t( &outFile ); // use a text stream |
545 | t.setEncoding( QTextStream::UnicodeUTF8 ); | 525 | t.setEncoding( QTextStream::UnicodeUTF8 ); |
546 | t << vcard; | 526 | t << vcard; |
547 | 527 | ||
548 | outFile.close(); | 528 | outFile.close(); |
549 | 529 | ||
550 | urls.append( fileName ); | 530 | urls.append( fileName ); |
551 | } | 531 | } |
552 | } | 532 | } |
533 | |||
534 | bool result = ExternalAppHandler::instance()->mailAttachments(urls.join(", ")); | ||
535 | |||
536 | |||
553 | /*US | 537 | /*US |
554 | kapp->invokeMailer( QString::null, QString::null, QString::null, | 538 | kapp->invokeMailer( QString::null, QString::null, QString::null, |
555 | QString::null, // subject | 539 | QString::null, // subject |
556 | QString::null, // body | 540 | QString::null, // body |
557 | QString::null, | 541 | QString::null, |
558 | urls ); // attachments | 542 | urls ); // attachments |
559 | */ | 543 | */ |
560 | #ifndef QT_NO_COP | ||
561 | QCString channel = KABPrefs::instance()->mEmailChannel.latin1(); | ||
562 | qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")"); | ||
563 | |||
564 | QMap<QString, QString> parameterMap; | ||
565 | parameterMap.insert("ATTACHMENT<n>", urls.join(", ")); | ||
566 | |||
567 | QCopEnvelope e(channel, "writeMail(QMap(QString,QString))"); | ||
568 | e << parameterMap; | ||
569 | #else | ||
570 | KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) ); | ||
571 | #endif | ||
572 | |||
573 | 544 | ||
574 | } | 545 | } |
575 | 546 | ||
576 | /** | 547 | /** |
577 | Beams the "WhoAmI contact. | 548 | Beams the "WhoAmI contact. |
578 | */ | 549 | */ |
579 | void KABCore::beamMySelf() | 550 | void KABCore::beamMySelf() |
580 | { | 551 | { |
581 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); | 552 | KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI(); |
582 | if (!a.isEmpty()) | 553 | if (!a.isEmpty()) |
583 | { | 554 | { |
584 | QStringList uids; | 555 | QStringList uids; |
585 | uids << a.uid(); | 556 | uids << a.uid(); |
586 | 557 | ||
587 | beamVCard(uids); | 558 | beamVCard(uids); |
588 | } else { | 559 | } else { |
589 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); | 560 | KMessageBox::information( this, i18n( "Your personal contact is\nnot set! Please select it\nand set it with menu:\nSettings - Set Who Am I\n" ) ); |
590 | 561 | ||
591 | 562 | ||
592 | } | 563 | } |
593 | } | 564 | } |
594 | 565 | ||
595 | void KABCore::beamVCard() | 566 | void KABCore::beamVCard() |
596 | { | 567 | { |
597 | QStringList uids = mViewManager->selectedUids(); | 568 | QStringList uids = mViewManager->selectedUids(); |
598 | if ( !uids.isEmpty() ) | 569 | if ( !uids.isEmpty() ) |
599 | beamVCard( uids ); | 570 | beamVCard( uids ); |
600 | } | 571 | } |
601 | 572 | ||
602 | 573 | ||
603 | void KABCore::beamVCard(const QStringList& uids) | 574 | void KABCore::beamVCard(const QStringList& uids) |
604 | { | 575 | { |
605 | /*US | 576 | /*US |
606 | QString beamFilename; | 577 | QString beamFilename; |
607 | Opie::OPimContact c; | 578 | Opie::OPimContact c; |
608 | if ( actionPersonal->isOn() ) { | 579 | if ( actionPersonal->isOn() ) { |
609 | beamFilename = addressbookPersonalVCardName(); | 580 | beamFilename = addressbookPersonalVCardName(); |
610 | if ( !QFile::exists( beamFilename ) ) | 581 | if ( !QFile::exists( beamFilename ) ) |
611 | return; // can't beam a non-existent file | 582 | return; // can't beam a non-existent file |
612 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, | 583 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, |
613 | beamFilename ); | 584 | beamFilename ); |
614 | Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); | 585 | Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); |
615 | Opie::OPimContactAccess::List allList = access->allRecords(); | 586 | Opie::OPimContactAccess::List allList = access->allRecords(); |
616 | Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first | 587 | Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first |
617 | c = *it; | 588 | c = *it; |
618 | 589 | ||
619 | delete access; | 590 | delete access; |
620 | } else { | 591 | } else { |
@@ -1152,101 +1123,103 @@ void KABCore::extensionModified( const KABC::Addressee::List &list ) | |||
1152 | mAddressBook->insertAddressee( *it ); | 1123 | mAddressBook->insertAddressee( *it ); |
1153 | if ( list.count() > 1 ) | 1124 | if ( list.count() > 1 ) |
1154 | setModified(); | 1125 | setModified(); |
1155 | else | 1126 | else |
1156 | setModifiedWOrefresh(); | 1127 | setModifiedWOrefresh(); |
1157 | } | 1128 | } |
1158 | if ( list.count() == 0 ) | 1129 | if ( list.count() == 0 ) |
1159 | mViewManager->refreshView(); | 1130 | mViewManager->refreshView(); |
1160 | else | 1131 | else |
1161 | mViewManager->refreshView( list[ 0 ].uid() ); | 1132 | mViewManager->refreshView( list[ 0 ].uid() ); |
1162 | 1133 | ||
1163 | 1134 | ||
1164 | 1135 | ||
1165 | } | 1136 | } |
1166 | 1137 | ||
1167 | QString KABCore::getNameByPhone( const QString &phone ) | 1138 | QString KABCore::getNameByPhone( const QString &phone ) |
1168 | { | 1139 | { |
1169 | #ifndef KAB_EMBEDDED | 1140 | #ifndef KAB_EMBEDDED |
1170 | QRegExp r( "[/*/-/ ]" ); | 1141 | QRegExp r( "[/*/-/ ]" ); |
1171 | QString localPhone( phone ); | 1142 | QString localPhone( phone ); |
1172 | 1143 | ||
1173 | bool found = false; | 1144 | bool found = false; |
1174 | QString ownerName = ""; | 1145 | QString ownerName = ""; |
1175 | KABC::AddressBook::Iterator iter; | 1146 | KABC::AddressBook::Iterator iter; |
1176 | KABC::PhoneNumber::List::Iterator phoneIter; | 1147 | KABC::PhoneNumber::List::Iterator phoneIter; |
1177 | KABC::PhoneNumber::List phoneList; | 1148 | KABC::PhoneNumber::List phoneList; |
1178 | for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { | 1149 | for ( iter = mAddressBook->begin(); !found && ( iter != mAddressBook->end() ); ++iter ) { |
1179 | phoneList = (*iter).phoneNumbers(); | 1150 | phoneList = (*iter).phoneNumbers(); |
1180 | for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); | 1151 | for ( phoneIter = phoneList.begin(); !found && ( phoneIter != phoneList.end() ); |
1181 | ++phoneIter) { | 1152 | ++phoneIter) { |
1182 | // Get rid of separator chars so just the numbers are compared. | 1153 | // Get rid of separator chars so just the numbers are compared. |
1183 | if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { | 1154 | if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { |
1184 | ownerName = (*iter).formattedName(); | 1155 | ownerName = (*iter).formattedName(); |
1185 | found = true; | 1156 | found = true; |
1186 | } | 1157 | } |
1187 | } | 1158 | } |
1188 | } | 1159 | } |
1189 | 1160 | ||
1190 | return ownerName; | 1161 | return ownerName; |
1191 | #else //KAB_EMBEDDED | 1162 | #else //KAB_EMBEDDED |
1192 | qDebug("KABCore::getNameByPhone finsih method"); | 1163 | qDebug("KABCore::getNameByPhone finsih method"); |
1193 | return ""; | 1164 | return ""; |
1194 | #endif //KAB_EMBEDDED | 1165 | #endif //KAB_EMBEDDED |
1195 | 1166 | ||
1196 | } | 1167 | } |
1197 | 1168 | ||
1198 | void KABCore::openConfigDialog() | 1169 | void KABCore::openConfigDialog() |
1199 | { | 1170 | { |
1200 | KABPrefs* prefs = KABPrefs::instance(); | 1171 | KABPrefs* kab_prefs = KABPrefs::instance(); |
1201 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( prefs, "PIM", this ,"kabconfigdialog", true ); | 1172 | KPimGlobalPrefs* kpim_prefs = KPimGlobalPrefs::instance(); |
1202 | KCMKabConfig* kabcfg = new KCMKabConfig( ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); | 1173 | |
1174 | KCMultiDialog* ConfigureDialog = new KCMultiDialog( "PIM", this ,"kabconfigdialog", true ); | ||
1175 | KCMKabConfig* kabcfg = new KCMKabConfig( kab_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Addressbook")) , "KCMKabConfig" ); | ||
1203 | ConfigureDialog->addModule(kabcfg ); | 1176 | ConfigureDialog->addModule(kabcfg ); |
1204 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( ConfigureDialog->getNewVBoxPage(i18n( "Pim")) , "KCMKdeLibConfig" ); | 1177 | KCMKdePimConfig* kdelibcfg = new KCMKdePimConfig( kpim_prefs, ConfigureDialog->getNewVBoxPage(i18n( "Global")) , "KCMKdeLibConfig" ); |
1205 | ConfigureDialog->addModule(kdelibcfg ); | 1178 | ConfigureDialog->addModule(kdelibcfg ); |
1206 | 1179 | ||
1207 | 1180 | ||
1208 | 1181 | ||
1209 | connect( ConfigureDialog, SIGNAL( applyClicked() ), | 1182 | connect( ConfigureDialog, SIGNAL( applyClicked() ), |
1210 | this, SLOT( configurationChanged() ) ); | 1183 | this, SLOT( configurationChanged() ) ); |
1211 | connect( ConfigureDialog, SIGNAL( okClicked() ), | 1184 | connect( ConfigureDialog, SIGNAL( okClicked() ), |
1212 | this, SLOT( configurationChanged() ) ); | 1185 | this, SLOT( configurationChanged() ) ); |
1213 | saveSettings(); | 1186 | saveSettings(); |
1214 | ConfigureDialog->showMaximized(); | 1187 | ConfigureDialog->showMaximized(); |
1215 | if ( ConfigureDialog->exec() ) | 1188 | if ( ConfigureDialog->exec() ) |
1216 | KMessageBox::information( this, i18n("If you configured \nExtensions,\nplease restart!\n") ); | 1189 | KMessageBox::information( this, i18n("If you configured \nExtensions,\nplease restart!\n") ); |
1217 | delete ConfigureDialog; | 1190 | delete ConfigureDialog; |
1218 | } | 1191 | } |
1219 | 1192 | ||
1220 | void KABCore::openLDAPDialog() | 1193 | void KABCore::openLDAPDialog() |
1221 | { | 1194 | { |
1222 | #ifndef KAB_EMBEDDED | 1195 | #ifndef KAB_EMBEDDED |
1223 | if ( !mLdapSearchDialog ) { | 1196 | if ( !mLdapSearchDialog ) { |
1224 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); | 1197 | mLdapSearchDialog = new LDAPSearchDialog( mAddressBook, this ); |
1225 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, | 1198 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), mViewManager, |
1226 | SLOT( refreshView() ) ); | 1199 | SLOT( refreshView() ) ); |
1227 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, | 1200 | connect( mLdapSearchDialog, SIGNAL( addresseesAdded() ), this, |
1228 | SLOT( setModified() ) ); | 1201 | SLOT( setModified() ) ); |
1229 | } else | 1202 | } else |
1230 | mLdapSearchDialog->restoreSettings(); | 1203 | mLdapSearchDialog->restoreSettings(); |
1231 | 1204 | ||
1232 | if ( mLdapSearchDialog->isOK() ) | 1205 | if ( mLdapSearchDialog->isOK() ) |
1233 | mLdapSearchDialog->exec(); | 1206 | mLdapSearchDialog->exec(); |
1234 | #else //KAB_EMBEDDED | 1207 | #else //KAB_EMBEDDED |
1235 | qDebug("KABCore::openLDAPDialog() finsih method"); | 1208 | qDebug("KABCore::openLDAPDialog() finsih method"); |
1236 | #endif //KAB_EMBEDDED | 1209 | #endif //KAB_EMBEDDED |
1237 | } | 1210 | } |
1238 | 1211 | ||
1239 | void KABCore::print() | 1212 | void KABCore::print() |
1240 | { | 1213 | { |
1241 | #ifndef KAB_EMBEDDED | 1214 | #ifndef KAB_EMBEDDED |
1242 | KPrinter printer; | 1215 | KPrinter printer; |
1243 | if ( !printer.setup( this ) ) | 1216 | if ( !printer.setup( this ) ) |
1244 | return; | 1217 | return; |
1245 | 1218 | ||
1246 | KABPrinting::PrintingWizard wizard( &printer, mAddressBook, | 1219 | KABPrinting::PrintingWizard wizard( &printer, mAddressBook, |
1247 | mViewManager->selectedUids(), this ); | 1220 | mViewManager->selectedUids(), this ); |
1248 | 1221 | ||
1249 | wizard.exec(); | 1222 | wizard.exec(); |
1250 | #else //KAB_EMBEDDED | 1223 | #else //KAB_EMBEDDED |
1251 | qDebug("KABCore::print() finsih method"); | 1224 | qDebug("KABCore::print() finsih method"); |
1252 | #endif //KAB_EMBEDDED | 1225 | #endif //KAB_EMBEDDED |
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp index 26398f8..b460a81 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp +++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp | |||
@@ -1,92 +1,92 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | 25 | ||
26 | #ifndef KAB_EMBEDDED | 26 | #ifndef KAB_EMBEDDED |
27 | #include <kaboutdata.h> | 27 | #include <kaboutdata.h> |
28 | #endif //KAB_EMBEDDED | 28 | #endif //KAB_EMBEDDED |
29 | #include <kdebug.h> | 29 | #include <kdebug.h> |
30 | //#include <klocale.h> | 30 | //#include <klocale.h> |
31 | //#include <stdlib.h> | 31 | //#include <stdlib.h> |
32 | 32 | ||
33 | #include "kabconfigwidget.h" | 33 | #include "kabconfigwidget.h" |
34 | 34 | ||
35 | #include "kcmkabconfig.h" | 35 | #include "kcmkabconfig.h" |
36 | 36 | ||
37 | #include "kabprefs.h" | 37 | #include "kabprefs.h" |
38 | #include "kprefs.h" | 38 | #include "kprefs.h" |
39 | 39 | ||
40 | extern "C" | 40 | extern "C" |
41 | { | 41 | { |
42 | KCModule *create_kabconfig( QWidget *parent, const char * ) { | 42 | KCModule *create_kabconfig( KABPrefs* prefs, QWidget *parent, const char * ) { |
43 | return new KCMKabConfig( parent, "kcmkabconfig" ); | 43 | return new KCMKabConfig( prefs, parent, "kcmkabconfig" ); |
44 | } | 44 | } |
45 | } | 45 | } |
46 | 46 | ||
47 | KCMKabConfig::KCMKabConfig( QWidget *parent, const char *name ) | 47 | KCMKabConfig::KCMKabConfig( KABPrefs* prefs, QWidget *parent, const char *name ) |
48 | : KCModule( parent, name ) | 48 | : KCModule( prefs, parent, name ) |
49 | { | 49 | { |
50 | //abort(); | 50 | //abort(); |
51 | QVBoxLayout *layout = new QVBoxLayout( this ); | 51 | QVBoxLayout *layout = new QVBoxLayout( this ); |
52 | mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); | 52 | mConfigWidget = new KABConfigWidget( this, "mConfigWidget" ); |
53 | layout->addWidget( mConfigWidget ); | 53 | layout->addWidget( mConfigWidget ); |
54 | layout->setSpacing( 0 ); | 54 | layout->setSpacing( 0 ); |
55 | layout->setMargin( 0 ); | 55 | layout->setMargin( 0 ); |
56 | 56 | ||
57 | connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); | 57 | connect( mConfigWidget, SIGNAL( changed( bool ) ), SIGNAL( changed( bool ) ) ); |
58 | } | 58 | } |
59 | 59 | ||
60 | void KCMKabConfig::load(KPrefs* prefs) | 60 | void KCMKabConfig::load() |
61 | { | 61 | { |
62 | mConfigWidget->restoreSettings((KABPrefs*)prefs); | 62 | mConfigWidget->restoreSettings((KABPrefs*)getPreferences()); |
63 | } | 63 | } |
64 | 64 | ||
65 | void KCMKabConfig::save(KPrefs* prefs) | 65 | void KCMKabConfig::save() |
66 | { | 66 | { |
67 | mConfigWidget->saveSettings((KABPrefs*)prefs); | 67 | mConfigWidget->saveSettings((KABPrefs*)getPreferences()); |
68 | } | 68 | } |
69 | 69 | ||
70 | void KCMKabConfig::defaults(KPrefs* prefs) | 70 | void KCMKabConfig::defaults() |
71 | { | 71 | { |
72 | mConfigWidget->defaults((KABPrefs*)prefs); | 72 | mConfigWidget->defaults((KABPrefs*)getPreferences()); |
73 | } | 73 | } |
74 | 74 | ||
75 | #ifndef KAB_EMBEDDED | 75 | #ifndef KAB_EMBEDDED |
76 | const KAboutData* KCMKabConfig::aboutData() const | 76 | const KAboutData* KCMKabConfig::aboutData() const |
77 | { | 77 | { |
78 | KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ), | 78 | KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ), |
79 | I18N_NOOP( "KAddressBook Configure Dialog" ), | 79 | I18N_NOOP( "KAddressBook Configure Dialog" ), |
80 | 0, 0, KAboutData::License_GPL, | 80 | 0, 0, KAboutData::License_GPL, |
81 | I18N_NOOP( "(c), 2003 Tobias Koenig" ) ); | 81 | I18N_NOOP( "(c), 2003 Tobias Koenig" ) ); |
82 | 82 | ||
83 | about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); | 83 | about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); |
84 | 84 | ||
85 | return about; | 85 | return about; |
86 | 86 | ||
87 | } | 87 | } |
88 | #endif //KAB_EMBEDDED | 88 | #endif //KAB_EMBEDDED |
89 | 89 | ||
90 | #ifndef KAB_EMBEDDED | 90 | #ifndef KAB_EMBEDDED |
91 | #include "kcmkabconfig.moc" | 91 | #include "kcmkabconfig.moc" |
92 | #endif //KAB_EMBEDDED | 92 | #endif //KAB_EMBEDDED |
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.h b/kaddressbook/kcmconfigs/kcmkabconfig.h index b4858c1..1cb6ad3 100644 --- a/kaddressbook/kcmconfigs/kcmkabconfig.h +++ b/kaddressbook/kcmconfigs/kcmkabconfig.h | |||
@@ -1,47 +1,47 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of KAddressBook. | 2 | This file is part of KAddressBook. |
3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> | 3 | Copyright (c) 2003 Tobias Koenig <tokoe@kde.org> |
4 | 4 | ||
5 | This program is free software; you can redistribute it and/or modify | 5 | This program is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published by | 6 | it under the terms of the GNU General Public License as published by |
7 | the Free Software Foundation; either version 2 of the License, or | 7 | the Free Software Foundation; either version 2 of the License, or |
8 | (at your option) any later version. | 8 | (at your option) any later version. |
9 | 9 | ||
10 | This program is distributed in the hope that it will be useful, | 10 | This program is distributed in the hope that it will be useful, |
11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifndef KCMKABCONFIG_H | 24 | #ifndef KCMKABCONFIG_H |
25 | #define KCMKABCONFIG_H | 25 | #define KCMKABCONFIG_H |
26 | 26 | ||
27 | #include <kcmodule.h> | 27 | #include <kcmodule.h> |
28 | 28 | ||
29 | class KABConfigWidget; | 29 | class KABConfigWidget; |
30 | class KPrefs; | 30 | class KABPrefs; |
31 | 31 | ||
32 | class KCMKabConfig : public KCModule | 32 | class KCMKabConfig : public KCModule |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | 35 | ||
36 | public: | 36 | public: |
37 | KCMKabConfig( QWidget *parent = 0, const char *name = 0 ); | 37 | KCMKabConfig( KABPrefs* prefs, QWidget *parent = 0, const char *name = 0 ); |
38 | 38 | ||
39 | virtual void load(KPrefs* prefs); | 39 | virtual void load(); |
40 | virtual void save(KPrefs* prefs); | 40 | virtual void save(); |
41 | virtual void defaults(KPrefs* prefs); | 41 | virtual void defaults(); |
42 | 42 | ||
43 | private: | 43 | private: |
44 | KABConfigWidget *mConfigWidget; | 44 | KABConfigWidget *mConfigWidget; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | #endif | 47 | #endif |