summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/kabcore.cpp134
-rw-r--r--kaddressbook/kabcore.h42
2 files changed, 162 insertions, 14 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 2a54900..d891b07 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -64,48 +64,49 @@
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#include <kcmkabconfig.h> 79#include <kcmkabconfig.h>
80 80
81//#include <qlabel.h> 81//#include <qlabel.h>
82 82
83 83
84#ifdef Q_WS_QWS 84#ifdef Q_WS_QWS
85#include <qtopia/services.h> 85#include <qtopia/services.h>
86#include <qtopia/qcopenvelope_qws.h> 86#include <qtopia/qcopenvelope_qws.h>
87#endif 87#endif
88#include <qpe/ir.h>
88 89
89#endif // KAB_EMBEDDED 90#endif // KAB_EMBEDDED
90#include <kcmkabconfig.h> 91#include <kcmkabconfig.h>
91 92
92 93
93#include <kresources/selectdialog.h> 94#include <kresources/selectdialog.h>
94#include <kmessagebox.h> 95#include <kmessagebox.h>
95 96
96#include <picture.h> 97#include <picture.h>
97#include <resource.h> 98#include <resource.h>
98 99
99//US#include <qsplitter.h> 100//US#include <qsplitter.h>
100#include <qmap.h> 101#include <qmap.h>
101#include <qdir.h> 102#include <qdir.h>
102#include <qfile.h> 103#include <qfile.h>
103#include <qvbox.h> 104#include <qvbox.h>
104#include <qlayout.h> 105#include <qlayout.h>
105#include <qclipboard.h> 106#include <qclipboard.h>
106#include <qtextstream.h> 107#include <qtextstream.h>
107 108
108#include <libkdepim/categoryselectdialog.h> 109#include <libkdepim/categoryselectdialog.h>
109#include <kabc/vcardconverter.h> 110#include <kabc/vcardconverter.h>
110 111
111 112
@@ -428,84 +429,92 @@ void KABCore::setContactSelected( const QString &uid )
428 { 429 {
429 px.convertFromImage(pic.data()); 430 px.convertFromImage(pic.data());
430 } 431 }
431 432
432 emit contactSelected( px ); 433 emit contactSelected( px );
433 } 434 }
434 } 435 }
435 436
436 437
437 mExtensionManager->setSelectionChanged(); 438 mExtensionManager->setSelectionChanged();
438 439
439 // update the actions 440 // update the actions
440 bool selected = !uid.isEmpty(); 441 bool selected = !uid.isEmpty();
441 442
442 if ( mReadWrite ) { 443 if ( mReadWrite ) {
443 mActionCut->setEnabled( selected ); 444 mActionCut->setEnabled( selected );
444 mActionPaste->setEnabled( selected ); 445 mActionPaste->setEnabled( selected );
445 } 446 }
446 447
447 mActionCopy->setEnabled( selected ); 448 mActionCopy->setEnabled( selected );
448 mActionDelete->setEnabled( selected ); 449 mActionDelete->setEnabled( selected );
449 mActionEditAddressee->setEnabled( selected ); 450 mActionEditAddressee->setEnabled( selected );
450 mActionMail->setEnabled( selected ); 451 mActionMail->setEnabled( selected );
451 mActionMailVCard->setEnabled( selected ); 452 mActionMailVCard->setEnabled( selected );
453 if (mActionBeam)
454 mActionBeam->setEnabled( selected );
455
456 if (mActionBeam)
457 mActionBeamVCard->setEnabled( selected );
458
452 mActionWhoAmI->setEnabled( selected ); 459 mActionWhoAmI->setEnabled( selected );
453 mActionCategories->setEnabled( selected ); 460 mActionCategories->setEnabled( selected );
454} 461}
455 462
456void KABCore::sendMail() 463void KABCore::sendMail()
457{ 464{
458 sendMail( mViewManager->selectedEmails().join( ", " ) ); 465 sendMail( mViewManager->selectedEmails().join( ", " ) );
459} 466}
460 467
461void KABCore::sendMail( const QString& email ) 468void KABCore::sendMail( const QString& email )
462{ 469{
463//US original kde implementation : kapp->invokeMailer( email, "" ); 470//US original kde implementation : kapp->invokeMailer( email, "" );
464 471
465/*US original qtopia implementation 472/*US original qtopia implementation
466 PimContact c = abList->currentEntry(); 473 PimContact c = abList->currentEntry();
467 QString name = c.fileAs(); 474 QString name = c.fileAs();
468 QString email = c.defaultEmail(); 475 QString email = c.defaultEmail();
469#ifndef QT_NO_COP 476#ifndef QT_NO_COP
470 QCopEnvelope e(Service::channel("Email"), "writeMail(QString,QString)"); 477 QCopEnvelope e(Service::channel("Email"), "writeMail(QString,QString)");
471 e << name << email; 478 e << name << email;
472#else 479#else
473*/ 480*/
474 481
475 482
476#ifndef QT_NO_COP 483#ifndef QT_NO_COP
477 QCString channel = KABPrefs::instance()->mEmailChannel.latin1(); 484 QCString channel = KABPrefs::instance()->mEmailChannel.latin1();
478 qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")"); 485 qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")");
479 486
480 QCopEnvelope e(channel, "writeMail(QString,QString)"); 487 QCopEnvelope e(channel, "writeMail(QString,QString)");
481 //US we need no names in the To field. The emailadresses are enough 488 //US we need no names in the To field. The emailadresses are enough
482 e << "" << email; 489 e << "" << email;
483#else 490#else
484 KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) ); 491 KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) );
485#endif 492#endif
486} 493}
487 494
495
496
488void KABCore::mailVCard() 497void KABCore::mailVCard()
489{ 498{
490 QStringList uids = mViewManager->selectedUids(); 499 QStringList uids = mViewManager->selectedUids();
491 if ( !uids.isEmpty() ) 500 if ( !uids.isEmpty() )
492 mailVCard( uids ); 501 mailVCard( uids );
493} 502}
494 503
495void KABCore::mailVCard( const QStringList& uids ) 504void KABCore::mailVCard( const QStringList& uids )
496{ 505{
497 QStringList urls; 506 QStringList urls;
498 507
499 QString tmpdir = locateLocal("tmp", KGlobal::getAppName()); 508 QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
500 509
501/*US 510/*US
502 // Create a temp dir, so that we can put the files in it with proper names 511 // Create a temp dir, so that we can put the files in it with proper names
503 KTempFile tempDir; 512 KTempFile tempDir;
504 if ( tempDir.status() != 0 ) { 513 if ( tempDir.status() != 0 ) {
505 kdWarning() << strerror( tempDir.status() ) << endl; 514 kdWarning() << strerror( tempDir.status() ) << endl;
506 return; 515 return;
507 } 516 }
508 517
509 QString dirName = tempDir.name(); 518 QString dirName = tempDir.name();
510 tempDir.unlink(); 519 tempDir.unlink();
511*/ 520*/
@@ -543,48 +552,154 @@ void KABCore::mailVCard( const QStringList& uids )
543 } 552 }
544/*US 553/*US
545 kapp->invokeMailer( QString::null, QString::null, QString::null, 554 kapp->invokeMailer( QString::null, QString::null, QString::null,
546 QString::null, // subject 555 QString::null, // subject
547 QString::null, // body 556 QString::null, // body
548 QString::null, 557 QString::null,
549 urls ); // attachments 558 urls ); // attachments
550*/ 559*/
551#ifndef QT_NO_COP 560#ifndef QT_NO_COP
552 QCString channel = KABPrefs::instance()->mEmailChannel.latin1(); 561 QCString channel = KABPrefs::instance()->mEmailChannel.latin1();
553 qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")"); 562 qDebug("Using QCopEnvelope e(\"" + channel + "\", \"writeMail(QMap(QString,QString))\")");
554 563
555 QMap<QString, QString> parameterMap; 564 QMap<QString, QString> parameterMap;
556 parameterMap.insert("ATTACHMENT<n>", urls.join(", ")); 565 parameterMap.insert("ATTACHMENT<n>", urls.join(", "));
557 566
558 QCopEnvelope e(channel, "writeMail(QMap(QString,QString))"); 567 QCopEnvelope e(channel, "writeMail(QMap(QString,QString))");
559 e << parameterMap; 568 e << parameterMap;
560#else 569#else
561 KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) ); 570 KMessageBox::sorry( this, i18n( "This version does not support sending emails." ) );
562#endif 571#endif
563 572
564 573
565} 574}
566 575
576/**
577 Beams the "WhoAmI contact.
578*/
579void KABCore::beamMySelf()
580{
581 KABC::Addressee a = KABC::StdAddressBook::self()->whoAmI();
582 if (!a.isEmpty())
583 {
584 QStringList uids;
585 uids << a.uid();
586
587 beamVCard(uids);
588 }
589}
590
591void KABCore::beamVCard()
592{
593 QStringList uids = mViewManager->selectedUids();
594 if ( !uids.isEmpty() )
595 beamVCard( uids );
596}
597
598
599void KABCore::beamVCard(const QStringList& uids)
600{
601/*US
602 QString beamFilename;
603 Opie::OPimContact c;
604 if ( actionPersonal->isOn() ) {
605 beamFilename = addressbookPersonalVCardName();
606 if ( !QFile::exists( beamFilename ) )
607 return; // can't beam a non-existent file
608 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
609 beamFilename );
610 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
611 Opie::OPimContactAccess::List allList = access->allRecords();
612 Opie::OPimContactAccess::List::Iterator it = allList.begin(); // Just take first
613 c = *it;
614
615 delete access;
616 } else {
617 unlink( beamfile ); // delete if exists
618 mkdir("/tmp/obex/", 0755);
619 c = m_abView -> currentEntry();
620 Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
621 beamfile );
622 Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
623 access->add( c );
624 access->save();
625 delete access;
626
627 beamFilename = beamfile;
628 }
629
630 owarn << "Beaming: " << beamFilename << oendl;
631*/
632 QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
633
634 QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
635
636 QString name = "contact.vcf";
637
638 QString fileName = dirName + "/" + name;
639
640
641 QDir().mkdir( dirName, true );
642
643 QFile outFile(fileName);
644 KABC::VCardConverter converter;
645 QString description;
646
647 if ( outFile.open(IO_WriteOnly) ) { // file opened successfully
648
649 QTextStream t( &outFile ); // use a text stream
650 t.setEncoding( QTextStream::UnicodeUTF8 );
651
652 for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
653 KABC::Addressee a = mAddressBook->findByUid( *it );
654
655 if ( a.isEmpty() )
656 continue;
657
658 if (description.isEmpty())
659 description = a.formattedName();
660
661 QString vcard;
662 converter.addresseeToVCard( a, vcard );
663 t << vcard;
664
665 }
666 }
667
668 outFile.close();
669
670 Ir *ir = new Ir( this );
671 connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
672 ir->send( fileName, description, "text/x-vCard" );
673
674}
675
676void KABCore::beamDone( Ir *ir )
677{
678 delete ir;
679}
680
681
567void KABCore::browse( const QString& url ) 682void KABCore::browse( const QString& url )
568{ 683{
569#ifndef KAB_EMBEDDED 684#ifndef KAB_EMBEDDED
570 kapp->invokeBrowser( url ); 685 kapp->invokeBrowser( url );
571#else //KAB_EMBEDDED 686#else //KAB_EMBEDDED
572 qDebug("KABCore::browse must be fixed"); 687 qDebug("KABCore::browse must be fixed");
573#endif //KAB_EMBEDDED 688#endif //KAB_EMBEDDED
574} 689}
575 690
576void KABCore::selectAllContacts() 691void KABCore::selectAllContacts()
577{ 692{
578 mViewManager->setSelected( QString::null, true ); 693 mViewManager->setSelected( QString::null, true );
579} 694}
580 695
581void KABCore::deleteContacts() 696void KABCore::deleteContacts()
582{ 697{
583 QStringList uidList = mViewManager->selectedUids(); 698 QStringList uidList = mViewManager->selectedUids();
584 deleteContacts( uidList ); 699 deleteContacts( uidList );
585} 700}
586 701
587void KABCore::deleteContacts( const QStringList &uids ) 702void KABCore::deleteContacts( const QStringList &uids )
588{ 703{
589 if ( uids.count() > 0 ) { 704 if ( uids.count() > 0 ) {
590 PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids ); 705 PwDeleteCommand *command = new PwDeleteCommand( mAddressBook, uids );
@@ -1342,58 +1457,67 @@ void KABCore::initGUI()
1342 1457
1343} 1458}
1344void KABCore::initActions() 1459void KABCore::initActions()
1345{ 1460{
1346//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart); 1461//US qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
1347 1462
1348#ifndef KAB_EMBEDDED 1463#ifndef KAB_EMBEDDED
1349 connect( QApplication::clipboard(), SIGNAL( dataChanged() ), 1464 connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
1350 SLOT( clipboardDataChanged() ) ); 1465 SLOT( clipboardDataChanged() ) );
1351#endif //KAB_EMBEDDED 1466#endif //KAB_EMBEDDED
1352 1467
1353 // file menu 1468 // file menu
1354 if ( mIsPart ) { 1469 if ( mIsPart ) {
1355 mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this, 1470 mActionMail = new KAction( i18n( "&Mail" ), "mail_generic", 0, this,
1356 SLOT( sendMail() ), actionCollection(), 1471 SLOT( sendMail() ), actionCollection(),
1357 "kaddressbook_mail" ); 1472 "kaddressbook_mail" );
1358 mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this, 1473 mActionPrint = new KAction( i18n( "&Print" ), "fileprint", CTRL + Key_P, this,
1359 SLOT( print() ), actionCollection(), "kaddressbook_print" ); 1474 SLOT( print() ), actionCollection(), "kaddressbook_print" );
1360 1475
1361 } else { 1476 } else {
1362 mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); 1477 mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
1363 mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); 1478 mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
1364 } 1479 }
1365 1480
1481
1366 mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, 1482 mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this,
1367 SLOT( save() ), actionCollection(), "file_sync" ); 1483 SLOT( save() ), actionCollection(), "file_sync" );
1368 1484
1369 mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, 1485 mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this,
1370 SLOT( newContact() ), actionCollection(), "file_new_contact" ); 1486 SLOT( newContact() ), actionCollection(), "file_new_contact" );
1371 1487
1372 mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, 1488 mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0,
1373 this, SLOT( mailVCard() ), 1489 this, SLOT( mailVCard() ),
1374 actionCollection(), "file_mail_vcard"); 1490 actionCollection(), "file_mail_vcard");
1375 1491
1492 mActionBeamVCard = 0;
1493 if ( Ir::supported() ) {
1494 mActionBeamVCard = new KAction( i18n( "Beam v&Card" ), "beam", 0, this,
1495 SLOT( beamVCard() ), actionCollection(),
1496 "kaddressbook_beam_vcard" );
1497 }
1498
1499
1376 mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, 1500 mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0,
1377 this, SLOT( editContact2() ), 1501 this, SLOT( editContact2() ),
1378 actionCollection(), "file_properties" ); 1502 actionCollection(), "file_properties" );
1379 1503
1380#ifdef KAB_EMBEDDED 1504#ifdef KAB_EMBEDDED
1381 // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); 1505 // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() );
1382 mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, 1506 mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0,
1383 mMainWindow, SLOT( exit() ), 1507 mMainWindow, SLOT( exit() ),
1384 actionCollection(), "quit" ); 1508 actionCollection(), "quit" );
1385#endif //KAB_EMBEDDED 1509#endif //KAB_EMBEDDED
1386 1510
1387 // edit menu 1511 // edit menu
1388 if ( mIsPart ) { 1512 if ( mIsPart ) {
1389 mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, 1513 mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this,
1390 SLOT( copyContacts() ), actionCollection(), 1514 SLOT( copyContacts() ), actionCollection(),
1391 "kaddressbook_copy" ); 1515 "kaddressbook_copy" );
1392 mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this, 1516 mActionCut = new KAction( i18n( "Cu&t" ), "editcut", CTRL + Key_X, this,
1393 SLOT( cutContacts() ), actionCollection(), 1517 SLOT( cutContacts() ), actionCollection(),
1394 "kaddressbook_cut" ); 1518 "kaddressbook_cut" );
1395 mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this, 1519 mActionPaste = new KAction( i18n( "&Paste" ), "editpaste", CTRL + Key_V, this,
1396 SLOT( pasteContacts() ), actionCollection(), 1520 SLOT( pasteContacts() ), actionCollection(),
1397 "kaddressbook_paste" ); 1521 "kaddressbook_paste" );
1398 mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this, 1522 mActionSelectAll = new KAction( i18n( "Select &All" ), CTRL + Key_A, this,
1399 SLOT( selectAllContacts() ), actionCollection(), 1523 SLOT( selectAllContacts() ), actionCollection(),
@@ -1452,48 +1576,56 @@ void KABCore::initActions()
1452 actionCollection(), "options_show_jump_bar" ); 1576 actionCollection(), "options_show_jump_bar" );
1453 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) ); 1577 connect( mActionJumpBar, SIGNAL( toggled( bool ) ), SLOT( setJumpButtonBarVisible( bool ) ) );
1454 1578
1455 mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0, 1579 mActionDetails = new KToggleAction( i18n( "Show Details" ), 0, 0,
1456 actionCollection(), "options_show_details" ); 1580 actionCollection(), "options_show_details" );
1457 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) ); 1581 connect( mActionDetails, SIGNAL( toggled( bool ) ), SLOT( setDetailsVisible( bool ) ) );
1458 1582
1459 // misc 1583 // misc
1460 // only enable LDAP lookup if we can handle the protocol 1584 // only enable LDAP lookup if we can handle the protocol
1461#ifndef KAB_EMBEDDED 1585#ifndef KAB_EMBEDDED
1462 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) { 1586 if ( KProtocolInfo::isKnownProtocol( KURL( "ldap://localhost" ) ) ) {
1463 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0, 1587 new KAction( i18n( "&Lookup Addresses in Directory" ), "find", 0,
1464 this, SLOT( openLDAPDialog() ), actionCollection(), 1588 this, SLOT( openLDAPDialog() ), actionCollection(),
1465 "ldap_lookup" ); 1589 "ldap_lookup" );
1466 } 1590 }
1467#else //KAB_EMBEDDED 1591#else //KAB_EMBEDDED
1468 //qDebug("KABCore::initActions() LDAP has to be implemented"); 1592 //qDebug("KABCore::initActions() LDAP has to be implemented");
1469#endif //KAB_EMBEDDED 1593#endif //KAB_EMBEDDED
1470 1594
1471 1595
1472 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this, 1596 mActionWhoAmI = new KAction( i18n( "Set Who Am I" ), "personal", 0, this,
1473 SLOT( setWhoAmI() ), actionCollection(), 1597 SLOT( setWhoAmI() ), actionCollection(),
1474 "set_personal" ); 1598 "set_personal" );
1475 1599
1600 mActionBeam = 0;
1601 if ( Ir::supported() ) {
1602 mActionBeam = new KAction( i18n( "&Beam Who Am I" ), "beam", 0, this,
1603 SLOT( beamMySelf() ), actionCollection(),
1604 "kaddressbook_beam_myself" );
1605 }
1606
1607
1476 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this, 1608 mActionCategories = new KAction( i18n( "Set Categories" ), 0, this,
1477 SLOT( setCategories() ), actionCollection(), 1609 SLOT( setCategories() ), actionCollection(),
1478 "edit_set_categories" ); 1610 "edit_set_categories" );
1479 1611
1480 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this, 1612 mActionRemoveVoice = new KAction( i18n( "Remove \"voice\"..." ), 0, this,
1481 SLOT( removeVoice() ), actionCollection(), 1613 SLOT( removeVoice() ), actionCollection(),
1482 "remove_voice" ); 1614 "remove_voice" );
1483 mActionImportOL = new KAction( i18n( "Import from OL..." ), 0, this, 1615 mActionImportOL = new KAction( i18n( "Import from OL..." ), 0, this,
1484 SLOT( importFromOL() ), actionCollection(), 1616 SLOT( importFromOL() ), actionCollection(),
1485 "import_OL" ); 1617 "import_OL" );
1486#ifdef KAB_EMBEDDED 1618#ifdef KAB_EMBEDDED
1487 1619
1488 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, 1620 mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0,
1489 this, SLOT( createAboutData() ), actionCollection(), 1621 this, SLOT( createAboutData() ), actionCollection(),
1490 "kaddressbook_about_data" ); 1622 "kaddressbook_about_data" );
1491#endif //KAB_EMBEDDED 1623#endif //KAB_EMBEDDED
1492 1624
1493 clipboardDataChanged(); 1625 clipboardDataChanged();
1494 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1626 connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1495 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); 1627 connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) );
1496} 1628}
1497 1629
1498//US we need this function, to plug all actions into the correct menues. 1630//US we need this function, to plug all actions into the correct menues.
1499// KDE uses a XML format to plug the actions, but we work her without this overhead. 1631// KDE uses a XML format to plug the actions, but we work her without this overhead.
@@ -1540,88 +1672,90 @@ void KABCore::addActionsManually()
1540 popupBarTB->insertItem( "&Help", helpMenu ); 1672 popupBarTB->insertItem( "&Help", helpMenu );
1541 if (QApplication::desktop()->width() > 320 ) { 1673 if (QApplication::desktop()->width() > 320 ) {
1542 // mViewManager->getFilterAction()->plug ( tb); 1674 // mViewManager->getFilterAction()->plug ( tb);
1543 } 1675 }
1544#endif 1676#endif
1545 // mActionQuit->plug ( mMainWindow->toolBar()); 1677 // mActionQuit->plug ( mMainWindow->toolBar());
1546 1678
1547 1679
1548 1680
1549 //US Now connect the actions with the menue entries. 1681 //US Now connect the actions with the menue entries.
1550 mActionPrint->plug( fileMenu ); 1682 mActionPrint->plug( fileMenu );
1551 mActionMail->plug( fileMenu ); 1683 mActionMail->plug( fileMenu );
1552 fileMenu->insertSeparator(); 1684 fileMenu->insertSeparator();
1553 1685
1554 mActionNewContact->plug( fileMenu ); 1686 mActionNewContact->plug( fileMenu );
1555 mActionNewContact->plug( tb ); 1687 mActionNewContact->plug( tb );
1556 1688
1557 mActionEditAddressee->plug( fileMenu ); 1689 mActionEditAddressee->plug( fileMenu );
1558 fileMenu->insertSeparator(); 1690 fileMenu->insertSeparator();
1559 mActionSave->plug( fileMenu ); 1691 mActionSave->plug( fileMenu );
1560 fileMenu->insertItem( "&Import", ImportMenu ); 1692 fileMenu->insertItem( "&Import", ImportMenu );
1561 fileMenu->insertItem( "&Emport", ExportMenu ); 1693 fileMenu->insertItem( "&Emport", ExportMenu );
1562 fileMenu->insertSeparator(); 1694 fileMenu->insertSeparator();
1563 mActionMailVCard->plug( fileMenu ); 1695 mActionMailVCard->plug( fileMenu );
1696 if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu );
1564 fileMenu->insertSeparator(); 1697 fileMenu->insertSeparator();
1565 mActionQuit->plug( fileMenu ); 1698 mActionQuit->plug( fileMenu );
1566#ifdef _WIN32_ 1699#ifdef _WIN32_
1567 mActionImportOL->plug( ImportMenu ); 1700 mActionImportOL->plug( ImportMenu );
1568#endif 1701#endif
1569 // edit menu 1702 // edit menu
1570 mActionUndo->plug( editMenu ); 1703 mActionUndo->plug( editMenu );
1571 mActionRedo->plug( editMenu ); 1704 mActionRedo->plug( editMenu );
1572 editMenu->insertSeparator(); 1705 editMenu->insertSeparator();
1573 mActionCut->plug( editMenu ); 1706 mActionCut->plug( editMenu );
1574 mActionCopy->plug( editMenu ); 1707 mActionCopy->plug( editMenu );
1575 mActionPaste->plug( editMenu ); 1708 mActionPaste->plug( editMenu );
1576 mActionDelete->plug( editMenu ); 1709 mActionDelete->plug( editMenu );
1577 editMenu->insertSeparator(); 1710 editMenu->insertSeparator();
1578 mActionSelectAll->plug( editMenu ); 1711 mActionSelectAll->plug( editMenu );
1579 1712
1580 mActionRemoveVoice->plug( changeMenu ); 1713 mActionRemoveVoice->plug( changeMenu );
1581 // settings menu 1714 // settings menu
1582//US special menuentry to configure the addressbook resources. On KDE 1715//US special menuentry to configure the addressbook resources. On KDE
1583// you do that through the control center !!! 1716// you do that through the control center !!!
1584 mActionConfigResources->plug( settingsMenu ); 1717 mActionConfigResources->plug( settingsMenu );
1585 settingsMenu->insertSeparator(); 1718 settingsMenu->insertSeparator();
1586 1719
1587 mActionConfigKAddressbook->plug( settingsMenu ); 1720 mActionConfigKAddressbook->plug( settingsMenu );
1588 1721
1589 if ( mIsPart ) { 1722 if ( mIsPart ) {
1590 mActionConfigShortcuts->plug( settingsMenu ); 1723 mActionConfigShortcuts->plug( settingsMenu );
1591 mActionConfigureToolbars->plug( settingsMenu ); 1724 mActionConfigureToolbars->plug( settingsMenu );
1592 1725
1593 } else { 1726 } else {
1594 mActionKeyBindings->plug( settingsMenu ); 1727 mActionKeyBindings->plug( settingsMenu );
1595 } 1728 }
1596 1729
1597 settingsMenu->insertSeparator(); 1730 settingsMenu->insertSeparator();
1598 1731
1599 mActionJumpBar->plug( settingsMenu ); 1732 mActionJumpBar->plug( settingsMenu );
1600 mActionDetails->plug( settingsMenu ); 1733 mActionDetails->plug( settingsMenu );
1601 settingsMenu->insertSeparator(); 1734 settingsMenu->insertSeparator();
1602 1735
1603 mActionWhoAmI->plug( settingsMenu ); 1736 mActionWhoAmI->plug( settingsMenu );
1737 if ( Ir::supported() ) mActionBeam->plug( settingsMenu );
1604 mActionCategories->plug( settingsMenu ); 1738 mActionCategories->plug( settingsMenu );
1605 1739
1606 mActionAboutKAddressbook->plug( helpMenu ); 1740 mActionAboutKAddressbook->plug( helpMenu );
1607 1741
1608 1742
1609 if (QApplication::desktop()->width() > 320 ) { 1743 if (QApplication::desktop()->width() > 320 ) {
1610 1744
1611 mActionEditAddressee->plug( tb ); 1745 mActionEditAddressee->plug( tb );
1612 mActionSave->plug( tb ); 1746 mActionSave->plug( tb );
1613 mViewManager->getFilterAction()->plug ( tb); 1747 mViewManager->getFilterAction()->plug ( tb);
1614 if (QApplication::desktop()->width() > 480 ) { 1748 if (QApplication::desktop()->width() > 480 ) {
1615 mActionUndo->plug( tb ); 1749 mActionUndo->plug( tb );
1616 mActionDelete->plug( tb ); 1750 mActionDelete->plug( tb );
1617 mActionRedo->plug( tb ); 1751 mActionRedo->plug( tb );
1618 } 1752 }
1619 } 1753 }
1620 //mActionQuit->plug ( tb ); 1754 //mActionQuit->plug ( tb );
1621 // tb->insertWidget(-1, 0, mIncSearchWidget, 6); 1755 // tb->insertWidget(-1, 0, mIncSearchWidget, 6);
1622 1756
1623 //US link the searchwidget first to this. 1757 //US link the searchwidget first to this.
1624 // The real linkage to the toolbar happens later. 1758 // The real linkage to the toolbar happens later.
1625//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE); 1759//US mIncSearchWidget->reparent(tb, 0, QPoint(50,0), TRUE);
1626//US tb->insertItem( mIncSearchWidget ); 1760//US tb->insertItem( mIncSearchWidget );
1627/*US 1761/*US
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 6446974..be39148 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -43,57 +43,58 @@ class KConfig;
43 43
44class KAddressBookService; 44class KAddressBookService;
45class LDAPSearchDialog; 45class LDAPSearchDialog;
46#else //KAB_EMBEDDED 46#else //KAB_EMBEDDED
47class KAddressBookMain; 47class KAddressBookMain;
48//US class QAction; 48//US class QAction;
49#endif //KAB_EMBEDDED 49#endif //KAB_EMBEDDED
50class KCMultiDialog; 50class KCMultiDialog;
51class KXMLGUIClient; 51class KXMLGUIClient;
52class ExtensionManager; 52class ExtensionManager;
53class XXPortManager; 53class XXPortManager;
54class JumpButtonBar; 54class JumpButtonBar;
55class IncSearchWidget; 55class IncSearchWidget;
56class KDGanttMinimizeSplitter; 56class KDGanttMinimizeSplitter;
57class KAction; 57class KAction;
58class KActionCollection; 58class KActionCollection;
59class KToggleAction; 59class KToggleAction;
60 60
61class QAction; 61class QAction;
62class QMenuBar; 62class QMenuBar;
63class QSplitter; 63class QSplitter;
64class ViewContainer; 64class ViewContainer;
65class ViewManager; 65class ViewManager;
66class AddresseeEditorDialog; 66class AddresseeEditorDialog;
67class Ir;
67 68
68class KABCore : public QWidget 69class KABCore : public QWidget
69{ 70{
70 Q_OBJECT 71 Q_OBJECT
71 72
72 public: 73 public:
73 KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 ); 74 KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name = 0 );
74 75
75 76
76 ~KABCore(); 77 ~KABCore();
77 78
78 79
79#ifdef KAB_EMBEDDED 80#ifdef KAB_EMBEDDED
80 //US added functionality 81 //US added functionality
81 QPopupMenu* getViewMenu() {return viewMenu;} 82 QPopupMenu* getViewMenu() {return viewMenu;}
82 QPopupMenu* getFilterMenu() {return filterMenu;} 83 QPopupMenu* getFilterMenu() {return filterMenu;}
83 QPopupMenu* getSettingsMenu() {return settingsMenu;} 84 QPopupMenu* getSettingsMenu() {return settingsMenu;}
84 void addActionsManually(); 85 void addActionsManually();
85#endif //KAB_EMBEDDED 86#endif //KAB_EMBEDDED
86 /** 87 /**
87 Restores the global settings. 88 Restores the global settings.
88 */ 89 */
89 void restoreSettings(); 90 void restoreSettings();
90 91
91 /** 92 /**
92 Saves the global settings. 93 Saves the global settings.
93 */ 94 */
94 void saveSettings(); 95 void saveSettings();
95 96
96 /** 97 /**
97 Returns a pointer to the StdAddressBook of the application. 98 Returns a pointer to the StdAddressBook of the application.
98 */ 99 */
99 KABC::AddressBook *addressBook() const; 100 KABC::AddressBook *addressBook() const;
@@ -118,72 +119,82 @@ class KABCore : public QWidget
118 Returns the uid list of the currently selected contacts. 119 Returns the uid list of the currently selected contacts.
119 */ 120 */
120 QStringList selectedUIDs() const; 121 QStringList selectedUIDs() const;
121 122
122 /** 123 /**
123 Displays the ResourceSelectDialog and returns the selected 124 Displays the ResourceSelectDialog and returns the selected
124 resource or a null pointer if no resource was selected by 125 resource or a null pointer if no resource was selected by
125 the user. 126 the user.
126 */ 127 */
127 KABC::Resource *requestResource( QWidget *parent ); 128 KABC::Resource *requestResource( QWidget *parent );
128 129
129#ifndef KAB_EMBEDDED 130#ifndef KAB_EMBEDDED
130 static KAboutData *createAboutData(); 131 static KAboutData *createAboutData();
131#endif //KAB_EMBEDDED 132#endif //KAB_EMBEDDED
132 133
133#ifdef KAB_EMBEDDED 134#ifdef KAB_EMBEDDED
134 inline QPopupMenu* getImportMenu() { return ImportMenu;} 135 inline QPopupMenu* getImportMenu() { return ImportMenu;}
135 inline QPopupMenu* getExportMenu() { return ExportMenu;} 136 inline QPopupMenu* getExportMenu() { return ExportMenu;}
136#endif //KAB_EMBEDDED 137#endif //KAB_EMBEDDED
137 138
138 public slots: 139 public slots:
139#ifdef KAB_EMBEDDED 140#ifdef KAB_EMBEDDED
140 void createAboutData(); 141 void createAboutData();
141#endif //KAB_EMBEDDED 142#endif //KAB_EMBEDDED
142 143
143 void statusMessage(QString, int time = 0 ); 144 void statusMessage(QString, int time = 0 );
144 /** 145 /**
145 Is called whenever a contact is selected in the view. 146 Is called whenever a contact is selected in the view.
146 */ 147 */
147 void setContactSelected( const QString &uid ); 148 void setContactSelected( const QString &uid );
148 149
149 /** 150 /**
150 Opens the preferred mail composer with all selected contacts as 151 Opens the preferred mail composer with all selected contacts as
151 arguments. 152 arguments.
152 */ 153 */
153 void sendMail(); 154 void sendMail();
154 155
155 /** 156 /**
156 Opens the preferred mail composer with the given contacts as 157 Opens the preferred mail composer with the given contacts as
157 arguments. 158 arguments.
158 */ 159 */
159 void sendMail( const QString& email ); 160 void sendMail( const QString& email );
160 161
161 162
162 void mailVCard(); 163 void mailVCard();
163 void mailVCard(const QStringList& uids); 164 void mailVCard(const QStringList& uids);
164 165
165 /** 166 /**
167 Beams the "WhoAmI contact.
168 */
169 void beamMySelf();
170
171 void beamVCard();
172 void beamVCard(const QStringList& uids);
173 void beamDone( Ir *ir );
174
175
176 /**
166 Starts the preferred web browser with the given URL as argument. 177 Starts the preferred web browser with the given URL as argument.
167 */ 178 */
168 void browse( const QString& url ); 179 void browse( const QString& url );
169 180
170 /** 181 /**
171 Select all contacts in the view. 182 Select all contacts in the view.
172 */ 183 */
173 void selectAllContacts(); 184 void selectAllContacts();
174 185
175 /** 186 /**
176 Deletes all selected contacts from the address book. 187 Deletes all selected contacts from the address book.
177 */ 188 */
178 void deleteContacts(); 189 void deleteContacts();
179 190
180 /** 191 /**
181 Deletes given contacts from the address book. 192 Deletes given contacts from the address book.
182 193
183 @param uids The uids of the contacts, which shall be deleted. 194 @param uids The uids of the contacts, which shall be deleted.
184 */ 195 */
185 void deleteContacts( const QStringList &uids ); 196 void deleteContacts( const QStringList &uids );
186 197
187 /** 198 /**
188 Copys the selected contacts into clipboard for later pasting. 199 Copys the selected contacts into clipboard for later pasting.
189 */ 200 */
@@ -265,160 +276,163 @@ class KABCore : public QWidget
265 /** 276 /**
266 END DCOP METHODS 277 END DCOP METHODS
267 */ 278 */
268 279
269 /** 280 /**
270 Saves the contents of the AddressBook back to disk. 281 Saves the contents of the AddressBook back to disk.
271 */ 282 */
272 void save(); 283 void save();
273 284
274 /** 285 /**
275 Undos the last command using the undo stack. 286 Undos the last command using the undo stack.
276 */ 287 */
277 void undo(); 288 void undo();
278 289
279 /** 290 /**
280 Redos the last command that was undone, using the redo stack. 291 Redos the last command that was undone, using the redo stack.
281 */ 292 */
282 void redo(); 293 void redo();
283 294
284 /** 295 /**
285 Shows the edit dialog for the given uid. If the uid is QString::null, 296 Shows the edit dialog for the given uid. If the uid is QString::null,
286 the method will try to find a selected addressee in the view. 297 the method will try to find a selected addressee in the view.
287 */ 298 */
288 void editContact( const QString &uid /*US = QString::null*/ ); 299 void editContact( const QString &uid /*US = QString::null*/ );
289//US added a second method without defaultparameter 300//US added a second method without defaultparameter
290 void editContact2(); 301 void editContact2();
291 302
292 /** 303 /**
293 Launches the configuration dialog. 304 Launches the configuration dialog.
294 */ 305 */
295 void openConfigDialog(); 306 void openConfigDialog();
296 307
297 /** 308 /**
298 Launches the ldap search dialog. 309 Launches the ldap search dialog.
299 */ 310 */
300 void openLDAPDialog(); 311 void openLDAPDialog();
301 312
302 /** 313 /**
303 Creates a KAddressBookPrinter, which will display the print 314 Creates a KAddressBookPrinter, which will display the print
304 dialog and do the printing. 315 dialog and do the printing.
305 */ 316 */
306 void print(); 317 void print();
307 318
308 /** 319 /**
309 Registers a new GUI client, so plugins can register its actions. 320 Registers a new GUI client, so plugins can register its actions.
310 */ 321 */
311 void addGUIClient( KXMLGUIClient *client ); 322 void addGUIClient( KXMLGUIClient *client );
312 323
313 signals: 324 signals:
314 void contactSelected( const QString &name ); 325 void contactSelected( const QString &name );
315 void contactSelected( const QPixmap &pixmap ); 326 void contactSelected( const QPixmap &pixmap );
316 public slots: 327 public slots:
317 void setDetailsVisible( bool visible ); 328 void setDetailsVisible( bool visible );
318 void setDetailsToState(); 329 void setDetailsToState();
319 private slots: 330 private slots:
320 void setJumpButtonBarVisible( bool visible ); 331 void setJumpButtonBarVisible( bool visible );
321 void importFromOL(); 332 void importFromOL();
322 void extensionModified( const KABC::Addressee::List &list ); 333 void extensionModified( const KABC::Addressee::List &list );
323 void clipboardDataChanged(); 334 void clipboardDataChanged();
324 void updateActionMenu(); 335 void updateActionMenu();
325 void configureKeyBindings(); 336 void configureKeyBindings();
326 void removeVoice(); 337 void removeVoice();
327#ifdef KAB_EMBEDDED 338#ifdef KAB_EMBEDDED
328 void configureResources(); 339 void configureResources();
329#endif //KAB_EMBEDDED 340#endif //KAB_EMBEDDED
330 341
331 void slotEditorDestroyed( const QString &uid ); 342 void slotEditorDestroyed( const QString &uid );
332 void configurationChanged(); 343 void configurationChanged();
333 void addressBookChanged(); 344 void addressBookChanged();
334 345
335 private: 346 private:
336 void initGUI(); 347 void initGUI();
337 void initActions(); 348 void initActions();
338 349
339 AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent, 350 AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
340 const char *name = 0 ); 351 const char *name = 0 );
341 352
342 KXMLGUIClient *mGUIClient; 353 KXMLGUIClient *mGUIClient;
343 354
344 KABC::AddressBook *mAddressBook; 355 KABC::AddressBook *mAddressBook;
345 356
346 ViewManager *mViewManager; 357 ViewManager *mViewManager;
347 // QSplitter *mDetailsSplitter; 358 // QSplitter *mDetailsSplitter;
348 KDGanttMinimizeSplitter *mExtensionBarSplitter; 359 KDGanttMinimizeSplitter *mExtensionBarSplitter;
349 ViewContainer *mDetails; 360 ViewContainer *mDetails;
350 KDGanttMinimizeSplitter* mMiniSplitter; 361 KDGanttMinimizeSplitter* mMiniSplitter;
351 XXPortManager *mXXPortManager; 362 XXPortManager *mXXPortManager;
352 JumpButtonBar *mJumpButtonBar; 363 JumpButtonBar *mJumpButtonBar;
353 IncSearchWidget *mIncSearchWidget; 364 IncSearchWidget *mIncSearchWidget;
354 ExtensionManager *mExtensionManager; 365 ExtensionManager *mExtensionManager;
355 366
356 KCMultiDialog *mConfigureDialog; 367 KCMultiDialog *mConfigureDialog;
357 368
358#ifndef KAB_EMBEDDED 369#ifndef KAB_EMBEDDED
359 LDAPSearchDialog *mLdapSearchDialog; 370 LDAPSearchDialog *mLdapSearchDialog;
360#endif //KAB_EMBEDDED 371#endif //KAB_EMBEDDED
361 // QDict<AddresseeEditorDialog> mEditorDict; 372 // QDict<AddresseeEditorDialog> mEditorDict;
362 AddresseeEditorDialog *mEditorDialog; 373 AddresseeEditorDialog *mEditorDialog;
363 bool mReadWrite; 374 bool mReadWrite;
364 bool mModified; 375 bool mModified;
365 bool mIsPart; 376 bool mIsPart;
366 377
367 //US file menu 378 //US file menu
368 KAction *mActionMail; 379 KAction *mActionMail;
380 KAction *mActionBeam;
369 KAction* mActionPrint; 381 KAction* mActionPrint;
370 KAction* mActionNewContact; 382 KAction* mActionNewContact;
371 KAction *mActionSave; 383 KAction *mActionSave;
372 KAction *mActionEditAddressee; 384 KAction *mActionEditAddressee;
373 KAction *mActionMailVCard; 385 KAction *mActionMailVCard;
386 KAction *mActionBeamVCard;
387
374 KAction *mActionQuit; 388 KAction *mActionQuit;
375 389
376 //US edit menu 390 //US edit menu
377 KAction *mActionCopy; 391 KAction *mActionCopy;
378 KAction *mActionCut; 392 KAction *mActionCut;
379 KAction *mActionPaste; 393 KAction *mActionPaste;
380 KAction *mActionSelectAll; 394 KAction *mActionSelectAll;
381 KAction *mActionUndo; 395 KAction *mActionUndo;
382 KAction *mActionRedo; 396 KAction *mActionRedo;
383 KAction *mActionDelete; 397 KAction *mActionDelete;
384 398
385 //US settings menu 399 //US settings menu
386 KAction *mActionConfigResources; 400 KAction *mActionConfigResources;
387 KAction *mActionConfigKAddressbook; 401 KAction *mActionConfigKAddressbook;
388 KAction *mActionConfigShortcuts; 402 KAction *mActionConfigShortcuts;
389 KAction *mActionConfigureToolbars; 403 KAction *mActionConfigureToolbars;
390 KAction *mActionKeyBindings; 404 KAction *mActionKeyBindings;
391 KToggleAction *mActionJumpBar; 405 KToggleAction *mActionJumpBar;
392 KToggleAction *mActionDetails; 406 KToggleAction *mActionDetails;
393 KAction *mActionWhoAmI; 407 KAction *mActionWhoAmI;
394 KAction *mActionCategories; 408 KAction *mActionCategories;
395 KAction *mActionAboutKAddressbook; 409 KAction *mActionAboutKAddressbook;
396 410
397 KAction *mActionDeleteView; 411 KAction *mActionDeleteView;
398 412
399 QPopupMenu *viewMenu; 413 QPopupMenu *viewMenu;
400 QPopupMenu *filterMenu; 414 QPopupMenu *filterMenu;
401 QPopupMenu *settingsMenu; 415 QPopupMenu *settingsMenu;
402 QPopupMenu *changeMenu; 416 QPopupMenu *changeMenu;
403 417
404//US QAction *mActionSave; 418//US QAction *mActionSave;
405 QPopupMenu *ImportMenu; 419 QPopupMenu *ImportMenu;
406 QPopupMenu *ExportMenu; 420 QPopupMenu *ExportMenu;
407 //LR additional methods 421 //LR additional methods
408 KAction *mActionRemoveVoice; 422 KAction *mActionRemoveVoice;
409 KAction * mActionImportOL; 423 KAction * mActionImportOL;
410 424
411#ifndef KAB_EMBEDDED 425#ifndef KAB_EMBEDDED
412 KAddressBookService *mAddressBookService; 426 KAddressBookService *mAddressBookService;
413#endif //KAB_EMBEDDED 427#endif //KAB_EMBEDDED
414 428
415 class KABCorePrivate; 429 class KABCorePrivate;
416 KABCorePrivate *d; 430 KABCorePrivate *d;
417 431
418#ifdef KAB_EMBEDDED 432#ifdef KAB_EMBEDDED
419 KAddressBookMain *mMainWindow; // should be the same like mGUIClient 433 KAddressBookMain *mMainWindow; // should be the same like mGUIClient
420#endif //KAB_EMBEDDED 434#endif //KAB_EMBEDDED
421 435
422}; 436};
423 437
424#endif 438#endif