author | zautrix <zautrix> | 2004-11-08 23:57:27 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-11-08 23:57:27 (UTC) |
commit | 48b2ccf53b1821598c6f18aab57e6e626047c262 (patch) (side-by-side diff) | |
tree | 10e4f0123debd92ed06f037dc9212c88a6046bc3 /kaddressbook/kabcore.cpp | |
parent | a102330ef5acb7346aa811378eaf9dbcdeabd4c4 (diff) | |
download | kdepimpi-48b2ccf53b1821598c6f18aab57e6e626047c262.zip kdepimpi-48b2ccf53b1821598c6f18aab57e6e626047c262.tar.gz kdepimpi-48b2ccf53b1821598c6f18aab57e6e626047c262.tar.bz2 |
more menu cleanup in kapi
-rw-r--r-- | kaddressbook/kabcore.cpp | 29 |
1 files changed, 18 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 ) mActionMail->setEnabled( selected ); mActionMailVCard->setEnabled( selected ); //if (mActionBeam) //mActionBeam->setEnabled( selected ); - - if (mActionBeamVCard) - mActionBeamVCard->setEnabled( selected ); - mActionWhoAmI->setEnabled( selected ); } void KABCore::sendMail() @@ -867,11 +863,17 @@ void KABCore::writeToPhone( ) else qDebug(i18n("Error exporting to phone")); } void KABCore::beamVCard() -{ - QStringList uids = mViewManager->selectedUids(); - if ( !uids.isEmpty() ) +{ + QStringList uids; + XXPortSelectDialog dlg( this, false, this ); + if ( dlg.exec() ) + uids = dlg.uids(); + else + return; + if ( uids.isEmpty() ) + return; beamVCard( uids ); } @@ -1695,8 +1697,9 @@ void KABCore::initGUI() ImportMenu = new QPopupMenu( this ); ExportMenu = new QPopupMenu( this ); syncMenu = new QPopupMenu( this ); changeMenu= new QPopupMenu( this ); + beamMenu= new QPopupMenu( this ); //US since we have no splitter for the embedded system, setup // a layout with two frames. One left and one right. @@ -1860,9 +1863,9 @@ void KABCore::initActions() mActionBeam = 0; #ifndef DESKTOP_VERSION if ( Ir::supported() ) { - mActionBeamVCard = new KAction( i18n( "Beam selected v&Card(s)" ), "beam", 0, this, + mActionBeamVCard = new KAction( i18n( "Beam v&Card(s)..." ), "beam", 0, this, SLOT( beamVCard() ), actionCollection(), "kaddressbook_beam_vcard" ); mActionBeam = new KAction( i18n( "&Beam personal vCard" ), "beam", 0, this, @@ -2102,13 +2105,15 @@ void KABCore::addActionsManually() mActionSave->plug( fileMenu ); fileMenu->insertItem( "&Import", ImportMenu ); fileMenu->insertItem( "&Export", ExportMenu ); fileMenu->insertItem( i18n("&Change"), changeMenu ); + fileMenu->insertItem( i18n("&Beam"), beamMenu ); fileMenu->insertSeparator(); mActionMailVCard->plug( fileMenu ); #ifndef DESKTOP_VERSION - if ( Ir::supported() ) mActionBeamVCard->plug( fileMenu ); - if ( Ir::supported() ) mActionBeam->plug(fileMenu ); + if ( Ir::supported() ) mActionBR->plug( beamMenu ); + if ( Ir::supported() ) mActionBeamVCard->plug( beamMenu ); + if ( Ir::supported() ) mActionBeam->plug( beamMenu ); #endif fileMenu->insertSeparator(); mActionQuit->plug( fileMenu ); #ifdef _WIN32_ @@ -2150,9 +2155,11 @@ void KABCore::addActionsManually() mActionDetails->plug( settingsMenu ); //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) mActionDetails->plug( tb ); settingsMenu->insertSeparator(); - mActionBR->plug(settingsMenu ); +#ifndef DESKTOP_VERSION + if ( Ir::supported() ) mActionBR->plug(settingsMenu ); +#endif settingsMenu->insertSeparator(); mActionWhoAmI->plug( settingsMenu ); mActionEditCategories->plug( settingsMenu ); |