-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 | |||
@@ -655,52 +655,48 @@ void KABCore::setContactSelected( const QString &uid ) | |||
655 | } | 655 | } |
656 | 656 | ||
657 | emit contactSelected( px ); | 657 | emit contactSelected( px ); |
658 | } | 658 | } |
659 | } | 659 | } |
660 | 660 | ||
661 | 661 | ||
662 | mExtensionManager->setSelectionChanged(); | 662 | mExtensionManager->setSelectionChanged(); |
663 | 663 | ||
664 | // update the actions | 664 | // update the actions |
665 | bool selected = !uid.isEmpty(); | 665 | bool selected = !uid.isEmpty(); |
666 | 666 | ||
667 | if ( mReadWrite ) { | 667 | if ( mReadWrite ) { |
668 | mActionCut->setEnabled( selected ); | 668 | mActionCut->setEnabled( selected ); |
669 | mActionPaste->setEnabled( selected ); | 669 | mActionPaste->setEnabled( selected ); |
670 | } | 670 | } |
671 | 671 | ||
672 | mActionCopy->setEnabled( selected ); | 672 | mActionCopy->setEnabled( selected ); |
673 | mActionDelete->setEnabled( selected ); | 673 | mActionDelete->setEnabled( selected ); |
674 | mActionEditAddressee->setEnabled( selected ); | 674 | mActionEditAddressee->setEnabled( selected ); |
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() |
687 | { | 683 | { |
688 | sendMail( mViewManager->selectedEmails().join( ", " ) ); | 684 | sendMail( mViewManager->selectedEmails().join( ", " ) ); |
689 | } | 685 | } |
690 | 686 | ||
691 | void KABCore::sendMail( const QString& emaillist ) | 687 | void KABCore::sendMail( const QString& emaillist ) |
692 | { | 688 | { |
693 | // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " | 689 | // the parameter has the form "name1 <abc@aol.com>,name2 <abc@aol.com>;... " |
694 | if (emaillist.contains(",") > 0) | 690 | if (emaillist.contains(",") > 0) |
695 | ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); | 691 | ExternalAppHandler::instance()->mailToMultipleContacts( emaillist, QString::null ); |
696 | else | 692 | else |
697 | ExternalAppHandler::instance()->mailToOneContact( emaillist ); | 693 | ExternalAppHandler::instance()->mailToOneContact( emaillist ); |
698 | } | 694 | } |
699 | 695 | ||
700 | 696 | ||
701 | 697 | ||
702 | void KABCore::mailVCard() | 698 | void KABCore::mailVCard() |
703 | { | 699 | { |
704 | QStringList uids = mViewManager->selectedUids(); | 700 | QStringList uids = mViewManager->selectedUids(); |
705 | if ( !uids.isEmpty() ) | 701 | if ( !uids.isEmpty() ) |
706 | mailVCard( uids ); | 702 | mailVCard( uids ); |
@@ -847,51 +843,57 @@ void KABCore::export2phone() | |||
847 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) | 843 | if ( ! mAddressBook->export2PhoneFormat( uids ,fileName ) ) |
848 | return; | 844 | return; |
849 | 845 | ||
850 | message(i18n("Exporting to phone...")); | 846 | message(i18n("Exporting to phone...")); |
851 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); | 847 | QTimer::singleShot( 1, this , SLOT ( writeToPhone())); |
852 | 848 | ||
853 | } | 849 | } |
854 | QString KABCore::getPhoneFile() | 850 | QString KABCore::getPhoneFile() |
855 | { | 851 | { |
856 | #ifdef DESKTOP_VERSION | 852 | #ifdef DESKTOP_VERSION |
857 | return locateLocal("tmp", "phonefile.vcf"); | 853 | return locateLocal("tmp", "phonefile.vcf"); |
858 | #else | 854 | #else |
859 | return "/tmp/phonefile.vcf"; | 855 | return "/tmp/phonefile.vcf"; |
860 | #endif | 856 | #endif |
861 | 857 | ||
862 | } | 858 | } |
863 | void KABCore::writeToPhone( ) | 859 | void KABCore::writeToPhone( ) |
864 | { | 860 | { |
865 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) | 861 | if ( PhoneAccess::writeToPhone( getPhoneFile() ) ) |
866 | message(i18n("Export to phone finished!")); | 862 | message(i18n("Export to phone finished!")); |
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 | ||
878 | void KABCore::beamVCard(const QStringList& uids) | 880 | void KABCore::beamVCard(const QStringList& uids) |
879 | { | 881 | { |
880 | 882 | ||
881 | // LR: we should use the /tmp dir on the Zaurus, | 883 | // LR: we should use the /tmp dir on the Zaurus, |
882 | // because: /tmp = RAM, (HOME)/kdepim = flash memory | 884 | // because: /tmp = RAM, (HOME)/kdepim = flash memory |
883 | 885 | ||
884 | #ifdef DESKTOP_VERSION | 886 | #ifdef DESKTOP_VERSION |
885 | QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); | 887 | QString fileName = locateLocal("tmp", "kapibeamfile.vcf"); |
886 | #else | 888 | #else |
887 | QString fileName = "/tmp/kapibeamfile.vcf"; | 889 | QString fileName = "/tmp/kapibeamfile.vcf"; |
888 | #endif | 890 | #endif |
889 | 891 | ||
890 | KABC::VCardConverter converter; | 892 | KABC::VCardConverter converter; |
891 | QString description; | 893 | QString description; |
892 | QString datastream; | 894 | QString datastream; |
893 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { | 895 | for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) { |
894 | KABC::Addressee a = mAddressBook->findByUid( *it ); | 896 | KABC::Addressee a = mAddressBook->findByUid( *it ); |
895 | 897 | ||
896 | if ( a.isEmpty() ) | 898 | if ( a.isEmpty() ) |
897 | continue; | 899 | continue; |
@@ -1675,48 +1677,49 @@ void KABCore::initGUI() | |||
1675 | 1677 | ||
1676 | mDetails = new ViewContainer( mDetailsSplitter ); | 1678 | mDetails = new ViewContainer( mDetailsSplitter ); |
1677 | 1679 | ||
1678 | mJumpButtonBar = new JumpButtonBar( this, this ); | 1680 | mJumpButtonBar = new JumpButtonBar( this, this ); |
1679 | 1681 | ||
1680 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); | 1682 | mExtensionManager = new ExtensionManager( this, mExtensionBarSplitter ); |
1681 | 1683 | ||
1682 | topLayout->addWidget( mExtensionBarSplitter ); | 1684 | topLayout->addWidget( mExtensionBarSplitter ); |
1683 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); | 1685 | topLayout->setStretchFactor( mExtensionBarSplitter, 100 ); |
1684 | topLayout->addWidget( mJumpButtonBar ); | 1686 | topLayout->addWidget( mJumpButtonBar ); |
1685 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); | 1687 | topLayout->setStretchFactor( mJumpButtonBar, 1 ); |
1686 | 1688 | ||
1687 | mXXPortManager = new XXPortManager( this, this ); | 1689 | mXXPortManager = new XXPortManager( this, this ); |
1688 | 1690 | ||
1689 | #else //KAB_EMBEDDED | 1691 | #else //KAB_EMBEDDED |
1690 | //US initialize viewMenu before settingup viewmanager. | 1692 | //US initialize viewMenu before settingup viewmanager. |
1691 | // Viewmanager needs this menu to plugin submenues. | 1693 | // Viewmanager needs this menu to plugin submenues. |
1692 | viewMenu = new QPopupMenu( this ); | 1694 | viewMenu = new QPopupMenu( this ); |
1693 | settingsMenu = new QPopupMenu( this ); | 1695 | settingsMenu = new QPopupMenu( this ); |
1694 | //filterMenu = new QPopupMenu( this ); | 1696 | //filterMenu = new QPopupMenu( this ); |
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 | ||
1703 | QBoxLayout *topLayout; | 1706 | QBoxLayout *topLayout; |
1704 | 1707 | ||
1705 | // = new QHBoxLayout( this ); | 1708 | // = new QHBoxLayout( this ); |
1706 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); | 1709 | // QBoxLayout *topLayout = (QBoxLayout*)layout(); |
1707 | 1710 | ||
1708 | // QWidget *mainBox = new QWidget( this ); | 1711 | // QWidget *mainBox = new QWidget( this ); |
1709 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); | 1712 | // QBoxLayout * mainBoxLayout = new QHBoxLayout(mainBox); |
1710 | 1713 | ||
1711 | #ifdef DESKTOP_VERSION | 1714 | #ifdef DESKTOP_VERSION |
1712 | topLayout = new QHBoxLayout( this ); | 1715 | topLayout = new QHBoxLayout( this ); |
1713 | 1716 | ||
1714 | 1717 | ||
1715 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); | 1718 | mMiniSplitter = new KDGanttMinimizeSplitter( Qt::Horizontal, this); |
1716 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); | 1719 | mMiniSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right ); |
1717 | 1720 | ||
1718 | topLayout->addWidget(mMiniSplitter ); | 1721 | topLayout->addWidget(mMiniSplitter ); |
1719 | 1722 | ||
1720 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); | 1723 | mExtensionBarSplitter = new KDGanttMinimizeSplitter( Qt::Vertical,mMiniSplitter ); |
1721 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); | 1724 | mExtensionBarSplitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Down ); |
1722 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); | 1725 | mViewManager = new ViewManager( this, mExtensionBarSplitter ); |
@@ -1840,49 +1843,49 @@ void KABCore::initActions() | |||
1840 | mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); | 1843 | mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() ); |
1841 | mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); | 1844 | mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() ); |
1842 | } | 1845 | } |
1843 | 1846 | ||
1844 | 1847 | ||
1845 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, | 1848 | mActionSave = new KAction( i18n( "&Save" ), "filesave", CTRL+Key_S, this, |
1846 | SLOT( save() ), actionCollection(), "file_sync" ); | 1849 | SLOT( save() ), actionCollection(), "file_sync" ); |
1847 | 1850 | ||
1848 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, | 1851 | mActionNewContact = new KAction( i18n( "&New Contact..." ), "filenew", CTRL+Key_N, this, |
1849 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); | 1852 | SLOT( newContact() ), actionCollection(), "file_new_contact" ); |
1850 | 1853 | ||
1851 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, | 1854 | mActionMailVCard = new KAction(i18n("Mail &vCard..."), "mail_post_to", 0, |
1852 | this, SLOT( mailVCard() ), | 1855 | this, SLOT( mailVCard() ), |
1853 | actionCollection(), "file_mail_vcard"); | 1856 | actionCollection(), "file_mail_vcard"); |
1854 | 1857 | ||
1855 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, | 1858 | mActionExport2phone = new KAction( i18n( "Export to phone" ), "ex2phone", 0, this, |
1856 | SLOT( export2phone() ), actionCollection(), | 1859 | SLOT( export2phone() ), actionCollection(), |
1857 | "kaddressbook_ex2phone" ); | 1860 | "kaddressbook_ex2phone" ); |
1858 | 1861 | ||
1859 | mActionBeamVCard = 0; | 1862 | mActionBeamVCard = 0; |
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, |
1869 | SLOT( beamMySelf() ), actionCollection(), | 1872 | SLOT( beamMySelf() ), actionCollection(), |
1870 | "kaddressbook_beam_myself" ); | 1873 | "kaddressbook_beam_myself" ); |
1871 | } | 1874 | } |
1872 | #endif | 1875 | #endif |
1873 | 1876 | ||
1874 | mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, | 1877 | mActionEditAddressee = new KAction( i18n( "&Edit Contact..." ), "edit", 0, |
1875 | this, SLOT( editContact2() ), | 1878 | this, SLOT( editContact2() ), |
1876 | actionCollection(), "file_properties" ); | 1879 | actionCollection(), "file_properties" ); |
1877 | 1880 | ||
1878 | #ifdef KAB_EMBEDDED | 1881 | #ifdef KAB_EMBEDDED |
1879 | // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); | 1882 | // mActionQuit = KStdAction::quit( mMainWindow, SLOT( exit() ), actionCollection() ); |
1880 | mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, | 1883 | mActionQuit = new KAction( i18n( "&Exit" ), "exit", 0, |
1881 | mMainWindow, SLOT( exit() ), | 1884 | mMainWindow, SLOT( exit() ), |
1882 | actionCollection(), "quit" ); | 1885 | actionCollection(), "quit" ); |
1883 | #endif //KAB_EMBEDDED | 1886 | #endif //KAB_EMBEDDED |
1884 | 1887 | ||
1885 | // edit menu | 1888 | // edit menu |
1886 | if ( mIsPart ) { | 1889 | if ( mIsPart ) { |
1887 | mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, | 1890 | mActionCopy = new KAction( i18n( "&Copy" ), "editcopy", CTRL + Key_C, this, |
1888 | SLOT( copyContacts() ), actionCollection(), | 1891 | SLOT( copyContacts() ), actionCollection(), |
@@ -2082,97 +2085,101 @@ void KABCore::addActionsManually() | |||
2082 | } | 2085 | } |
2083 | #endif | 2086 | #endif |
2084 | // mActionQuit->plug ( mMainWindow->toolBar()); | 2087 | // mActionQuit->plug ( mMainWindow->toolBar()); |
2085 | 2088 | ||
2086 | 2089 | ||
2087 | 2090 | ||
2088 | //US Now connect the actions with the menue entries. | 2091 | //US Now connect the actions with the menue entries. |
2089 | mActionPrint->plug( fileMenu ); | 2092 | mActionPrint->plug( fileMenu ); |
2090 | mActionMail->plug( fileMenu ); | 2093 | mActionMail->plug( fileMenu ); |
2091 | fileMenu->insertSeparator(); | 2094 | fileMenu->insertSeparator(); |
2092 | 2095 | ||
2093 | mActionNewContact->plug( fileMenu ); | 2096 | mActionNewContact->plug( fileMenu ); |
2094 | mActionNewContact->plug( tb ); | 2097 | mActionNewContact->plug( tb ); |
2095 | 2098 | ||
2096 | mActionEditAddressee->plug( fileMenu ); | 2099 | mActionEditAddressee->plug( fileMenu ); |
2097 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || | 2100 | // if ((KGlobal::getDesktopSize() > KGlobal::Small ) || |
2098 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) | 2101 | // (!KABPrefs::instance()->mMultipleViewsAtOnce )) |
2099 | mActionEditAddressee->plug( tb ); | 2102 | mActionEditAddressee->plug( tb ); |
2100 | 2103 | ||
2101 | fileMenu->insertSeparator(); | 2104 | fileMenu->insertSeparator(); |
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_ |
2115 | mActionImportOL->plug( ImportMenu ); | 2120 | mActionImportOL->plug( ImportMenu ); |
2116 | #endif | 2121 | #endif |
2117 | // edit menu | 2122 | // edit menu |
2118 | mActionUndo->plug( editMenu ); | 2123 | mActionUndo->plug( editMenu ); |
2119 | mActionRedo->plug( editMenu ); | 2124 | mActionRedo->plug( editMenu ); |
2120 | editMenu->insertSeparator(); | 2125 | editMenu->insertSeparator(); |
2121 | mActionCut->plug( editMenu ); | 2126 | mActionCut->plug( editMenu ); |
2122 | mActionCopy->plug( editMenu ); | 2127 | mActionCopy->plug( editMenu ); |
2123 | mActionPaste->plug( editMenu ); | 2128 | mActionPaste->plug( editMenu ); |
2124 | mActionDelete->plug( editMenu ); | 2129 | mActionDelete->plug( editMenu ); |
2125 | editMenu->insertSeparator(); | 2130 | editMenu->insertSeparator(); |
2126 | mActionSelectAll->plug( editMenu ); | 2131 | mActionSelectAll->plug( editMenu ); |
2127 | 2132 | ||
2128 | mActionRemoveVoice->plug( changeMenu ); | 2133 | mActionRemoveVoice->plug( changeMenu ); |
2129 | // settings menu | 2134 | // settings menu |
2130 | //US special menuentry to configure the addressbook resources. On KDE | 2135 | //US special menuentry to configure the addressbook resources. On KDE |
2131 | // you do that through the control center !!! | 2136 | // you do that through the control center !!! |
2132 | mActionConfigResources->plug( settingsMenu ); | 2137 | mActionConfigResources->plug( settingsMenu ); |
2133 | settingsMenu->insertSeparator(); | 2138 | settingsMenu->insertSeparator(); |
2134 | 2139 | ||
2135 | mActionConfigKAddressbook->plug( settingsMenu ); | 2140 | mActionConfigKAddressbook->plug( settingsMenu ); |
2136 | 2141 | ||
2137 | if ( mIsPart ) { | 2142 | if ( mIsPart ) { |
2138 | //US not implemented yet | 2143 | //US not implemented yet |
2139 | //mActionConfigShortcuts->plug( settingsMenu ); | 2144 | //mActionConfigShortcuts->plug( settingsMenu ); |
2140 | //mActionConfigureToolbars->plug( settingsMenu ); | 2145 | //mActionConfigureToolbars->plug( settingsMenu ); |
2141 | 2146 | ||
2142 | } else { | 2147 | } else { |
2143 | //US not implemented yet | 2148 | //US not implemented yet |
2144 | //mActionKeyBindings->plug( settingsMenu ); | 2149 | //mActionKeyBindings->plug( settingsMenu ); |
2145 | } | 2150 | } |
2146 | 2151 | ||
2147 | settingsMenu->insertSeparator(); | 2152 | settingsMenu->insertSeparator(); |
2148 | 2153 | ||
2149 | mActionJumpBar->plug( settingsMenu ); | 2154 | mActionJumpBar->plug( settingsMenu ); |
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 ); |
2159 | mActionEditCategories->plug( changeMenu ); | 2166 | mActionEditCategories->plug( changeMenu ); |
2160 | mActionCategories->plug( changeMenu ); | 2167 | mActionCategories->plug( changeMenu ); |
2161 | mActionManageCategories->plug( changeMenu ); | 2168 | mActionManageCategories->plug( changeMenu ); |
2162 | 2169 | ||
2163 | mActionCategories->plug( settingsMenu ); | 2170 | mActionCategories->plug( settingsMenu ); |
2164 | mActionManageCategories->plug( settingsMenu ); | 2171 | mActionManageCategories->plug( settingsMenu ); |
2165 | 2172 | ||
2166 | 2173 | ||
2167 | mActionWN->plug( helpMenu ); | 2174 | mActionWN->plug( helpMenu ); |
2168 | mActionSyncHowto->plug( helpMenu ); | 2175 | mActionSyncHowto->plug( helpMenu ); |
2169 | mActionKdeSyncHowto->plug( helpMenu ); | 2176 | mActionKdeSyncHowto->plug( helpMenu ); |
2170 | mActionMultiSyncHowto->plug( helpMenu ); | 2177 | mActionMultiSyncHowto->plug( helpMenu ); |
2171 | mActionFaq->plug( helpMenu ); | 2178 | mActionFaq->plug( helpMenu ); |
2172 | mActionLicence->plug( helpMenu ); | 2179 | mActionLicence->plug( helpMenu ); |
2173 | mActionAboutKAddressbook->plug( helpMenu ); | 2180 | mActionAboutKAddressbook->plug( helpMenu ); |
2174 | 2181 | ||
2175 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2182 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
2176 | 2183 | ||
2177 | mActionSave->plug( tb ); | 2184 | mActionSave->plug( tb ); |
2178 | mViewManager->getFilterAction()->plug ( tb); | 2185 | mViewManager->getFilterAction()->plug ( tb); |