-rw-r--r-- | kaddressbook/kabcore.cpp | 29 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 1 |
2 files changed, 19 insertions, 11 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index a6fc677..3c97ce9 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -675,12 +675,8 @@ void KABCore::setContactSelected( const QString &uid ) | |||
675 | mActionMail->setEnabled( selected ); | 675 | mActionMail->setEnabled( selected ); |
676 | mActionMailVCard->setEnabled( selected ); | 676 | mActionMailVCard->setEnabled( selected ); |
677 | //if (mActionBeam) | 677 | //if (mActionBeam) |
678 | //mActionBeam->setEnabled( selected ); | 678 | //mActionBeam->setEnabled( selected ); |
679 | |||
680 | if (mActionBeamVCard) | ||
681 | mActionBeamVCard->setEnabled( selected ); | ||
682 | |||
683 | mActionWhoAmI->setEnabled( selected ); | 679 | mActionWhoAmI->setEnabled( selected ); |
684 | } | 680 | } |
685 | 681 | ||
686 | void KABCore::sendMail() | 682 | void KABCore::sendMail() |
@@ -867,11 +863,17 @@ void KABCore::writeToPhone( ) | |||
867 | else | 863 | else |
868 | qDebug(i18n("Error exporting to phone")); | 864 | qDebug(i18n("Error exporting to phone")); |
869 | } | 865 | } |
870 | void KABCore::beamVCard() | 866 | void KABCore::beamVCard() |
871 | { | 867 | { |
872 | QStringList uids = mViewManager->selectedUids(); | 868 | QStringList uids; |
873 | if ( !uids.isEmpty() ) | 869 | XXPortSelectDialog dlg( this, false, this ); |
870 | if ( dlg.exec() ) | ||
871 | uids = dlg.uids(); | ||
872 | else | ||
873 | return; | ||
874 | if ( uids.isEmpty() ) | ||
875 | return; | ||
874 | beamVCard( uids ); | 876 | beamVCard( uids ); |
875 | } | 877 | } |
876 | 878 | ||
877 | 879 | ||
@@ -1695,8 +1697,9 @@ void KABCore::initGUI() | |||
1695 | ImportMenu = new QPopupMenu( this ); | 1697 | ImportMenu = new QPopupMenu( this ); |
1696 | ExportMenu = new QPopupMenu( this ); | 1698 | ExportMenu = new QPopupMenu( this ); |
1697 | syncMenu = new QPopupMenu( this ); | 1699 | syncMenu = new QPopupMenu( this ); |
1698 | changeMenu= new QPopupMenu( this ); | 1700 | changeMenu= new QPopupMenu( this ); |
1701 | beamMenu= new QPopupMenu( this ); | ||
1699 | 1702 | ||
1700 | //US since we have no splitter for the embedded system, setup | 1703 | //US since we have no splitter for the embedded system, setup |
1701 | // a layout with two frames. One left and one right. | 1704 | // a layout with two frames. One left and one right. |
1702 | 1705 | ||
@@ -1860,9 +1863,9 @@ void KABCore::initActions() | |||
1860 | mActionBeam = 0; | 1863 | mActionBeam = 0; |
1861 | 1864 | ||
1862 | #ifndef DESKTOP_VERSION | 1865 | #ifndef DESKTOP_VERSION |
1863 | if ( Ir::supported() ) { | 1866 | if ( Ir::supported() ) { |
1864 | mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, | 1867 | mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this, |
1865 | SLOT( beamVCard() ), actionCollection(), | 1868 | SLOT( beamVCard() ), actionCollection(), |
1866 | "kaddressbook_beam_vcard" ); | 1869 | "kaddressbook_beam_vcard" ); |
1867 | 1870 | ||
1868 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, | 1871 | mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, |
@@ -2102,13 +2105,15 @@ void KABCore::addActionsManually() | |||
2102 | mActionSave->plug( fileMenu ); | 2105 | mActionSave->plug( fileMenu ); |
2103 | fileMenu->insertItem( "&Import", ImportMenu ); | 2106 | fileMenu->insertItem( "&Import", ImportMenu ); |
2104 | fileMenu->insertItem( "&Export", ExportMenu ); | 2107 | fileMenu->insertItem( "&Export", ExportMenu ); |
2105 | fileMenu->insertItem( i18n("&Change"), changeMenu ); | 2108 | fileMenu->insertItem( i18n("&Change"), changeMenu ); |
2109 | fileMenu->insertItem( i18n("&Beam"), beamMenu ); | ||
2106 | fileMenu->insertSeparator(); | 2110 | fileMenu->insertSeparator(); |
2107 | mActionMailVCard->plug( fileMenu ); | 2111 | mActionMailVCard->plug( fileMenu ); |
2108 | #ifndef DESKTOP_VERSION | 2112 | #ifndef DESKTOP_VERSION |
2109 | if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); | 2113 | if ( Ir::supported() ) mActionBR->plug( beamMenu ); |
2110 | if ( Ir::supported() ) mActionBeam->plug(fileMenu ); | 2114 | if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); |
2115 | if ( Ir::supported() ) mActionBeam->plug( beamMenu ); | ||
2111 | #endif | 2116 | #endif |
2112 | fileMenu->insertSeparator(); | 2117 | fileMenu->insertSeparator(); |
2113 | mActionQuit->plug( fileMenu ); | 2118 | mActionQuit->plug( fileMenu ); |
2114 | #ifdef _WIN32_ | 2119 | #ifdef _WIN32_ |
@@ -2150,9 +2155,11 @@ void KABCore::addActionsManually() | |||
2150 | mActionDetails->plug( settingsMenu ); | 2155 | mActionDetails->plug( settingsMenu ); |
2151 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2156 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2152 | mActionDetails->plug( tb ); | 2157 | mActionDetails->plug( tb ); |
2153 | settingsMenu->insertSeparator(); | 2158 | settingsMenu->insertSeparator(); |
2154 | mActionBR->plug(settingsMenu ); | 2159 | #ifndef DESKTOP_VERSION |
2160 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | ||
2161 | #endif | ||
2155 | settingsMenu->insertSeparator(); | 2162 | settingsMenu->insertSeparator(); |
2156 | 2163 | ||
2157 | mActionWhoAmI->plug( settingsMenu ); | 2164 | mActionWhoAmI->plug( settingsMenu ); |
2158 | mActionEditCategories->plug( settingsMenu ); | 2165 | mActionEditCategories->plug( settingsMenu ); |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 88e83f0..c7c12ff 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -471,8 +471,9 @@ class KABCore : public QWidget, public KSyncInterface | |||
471 | QPopupMenu *viewMenu; | 471 | QPopupMenu *viewMenu; |
472 | QPopupMenu *filterMenu; | 472 | QPopupMenu *filterMenu; |
473 | QPopupMenu *settingsMenu; | 473 | QPopupMenu *settingsMenu; |
474 | QPopupMenu *changeMenu; | 474 | QPopupMenu *changeMenu; |
475 | QPopupMenu *beamMenu; | ||
475 | //US QAction *mActionSave; | 476 | //US QAction *mActionSave; |
476 | QPopupMenu *ImportMenu; | 477 | QPopupMenu *ImportMenu; |
477 | QPopupMenu *ExportMenu; | 478 | QPopupMenu *ExportMenu; |
478 | //LR additional methods | 479 | //LR additional methods |