-rw-r--r-- | kaddressbook/kabcore.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index ce5c755..eba74a6 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2077,48 +2077,55 @@ void KABCore::initActions() | |||
2077 | SLOT( removeVoice() ), actionCollection(), | 2077 | SLOT( removeVoice() ), actionCollection(), |
2078 | "remove_voice" ); | 2078 | "remove_voice" ); |
2079 | mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this, | 2079 | mActionSetFormattedName = new KAction( i18n( "Set formatted name..." ), 0, this, |
2080 | SLOT( setFormattedName() ), actionCollection(), | 2080 | SLOT( setFormattedName() ), actionCollection(), |
2081 | "set_formatted" ); | 2081 | "set_formatted" ); |
2082 | 2082 | ||
2083 | mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this, | 2083 | mActionManageCategories= new KAction( i18n( "Manage new categories..." ), 0, this, |
2084 | SLOT( manageCategories() ), actionCollection(), | 2084 | SLOT( manageCategories() ), actionCollection(), |
2085 | "remove_voice" ); | 2085 | "remove_voice" ); |
2086 | 2086 | ||
2087 | 2087 | ||
2088 | mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, | 2088 | mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, |
2089 | SLOT( importFromOL() ), actionCollection(), | 2089 | SLOT( importFromOL() ), actionCollection(), |
2090 | "import_OL" ); | 2090 | "import_OL" ); |
2091 | #ifdef KAB_EMBEDDED | 2091 | #ifdef KAB_EMBEDDED |
2092 | mActionLicence = new KAction( i18n( "Licence" ), 0, | 2092 | mActionLicence = new KAction( i18n( "Licence" ), 0, |
2093 | this, SLOT( showLicence() ), actionCollection(), | 2093 | this, SLOT( showLicence() ), actionCollection(), |
2094 | "licence_about_data" ); | 2094 | "licence_about_data" ); |
2095 | mActionFaq = new KAction( i18n( "Faq" ), 0, | 2095 | mActionFaq = new KAction( i18n( "Faq" ), 0, |
2096 | this, SLOT( faq() ), actionCollection(), | 2096 | this, SLOT( faq() ), actionCollection(), |
2097 | "faq_about_data" ); | 2097 | "faq_about_data" ); |
2098 | mActionWN = new KAction( i18n( "What's New?" ), 0, | 2098 | mActionWN = new KAction( i18n( "What's New?" ), 0, |
2099 | this, SLOT( whatsnew() ), actionCollection(), | 2099 | this, SLOT( whatsnew() ), actionCollection(), |
2100 | "wn" ); | 2100 | "wn" ); |
2101 | |||
2102 | |||
2103 | |||
2104 | mActionStorageHowto = new KAction( i18n( "Storage HowTo" ), 0, | ||
2105 | this, SLOT( storagehowto() ), actionCollection(), | ||
2106 | "storage" ); | ||
2107 | |||
2101 | mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, | 2108 | mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, |
2102 | this, SLOT( synchowto() ), actionCollection(), | 2109 | this, SLOT( synchowto() ), actionCollection(), |
2103 | "sync" ); | 2110 | "sync" ); |
2104 | mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0, | 2111 | mActionKdeSyncHowto = new KAction( i18n( "Kde Sync HowTo" ), 0, |
2105 | this, SLOT( kdesynchowto() ), actionCollection(), | 2112 | this, SLOT( kdesynchowto() ), actionCollection(), |
2106 | "kdesync" ); | 2113 | "kdesync" ); |
2107 | mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0, | 2114 | mActionMultiSyncHowto = new KAction( i18n( "Multi Sync HowTo" ), 0, |
2108 | this, SLOT( multisynchowto() ), actionCollection(), | 2115 | this, SLOT( multisynchowto() ), actionCollection(), |
2109 | "multisync" ); | 2116 | "multisync" ); |
2110 | 2117 | ||
2111 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, | 2118 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, |
2112 | this, SLOT( createAboutData() ), actionCollection(), | 2119 | this, SLOT( createAboutData() ), actionCollection(), |
2113 | "kaddressbook_about_data" ); | 2120 | "kaddressbook_about_data" ); |
2114 | #endif //KAB_EMBEDDED | 2121 | #endif //KAB_EMBEDDED |
2115 | 2122 | ||
2116 | clipboardDataChanged(); | 2123 | clipboardDataChanged(); |
2117 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 2124 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
2118 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 2125 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
2119 | } | 2126 | } |
2120 | 2127 | ||
2121 | //US we need this function, to plug all actions into the correct menues. | 2128 | //US we need this function, to plug all actions into the correct menues. |
2122 | // KDE uses a XML format to plug the actions, but we work her without this overhead. | 2129 | // KDE uses a XML format to plug the actions, but we work her without this overhead. |
2123 | void KABCore::addActionsManually() | 2130 | void KABCore::addActionsManually() |
2124 | { | 2131 | { |
@@ -2252,48 +2259,49 @@ void KABCore::addActionsManually() | |||
2252 | //mActionKeyBindings->plug( settingsMenu ); | 2259 | //mActionKeyBindings->plug( settingsMenu ); |
2253 | } | 2260 | } |
2254 | 2261 | ||
2255 | mActionEditCategories->plug( settingsMenu ); | 2262 | mActionEditCategories->plug( settingsMenu ); |
2256 | mActionManageCategories->plug( settingsMenu ); | 2263 | mActionManageCategories->plug( settingsMenu ); |
2257 | mActionJumpBar->plug( viewMenu,0 ); | 2264 | mActionJumpBar->plug( viewMenu,0 ); |
2258 | mActionDetails->plug( viewMenu,0 ); | 2265 | mActionDetails->plug( viewMenu,0 ); |
2259 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 2266 | //if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
2260 | mActionDetails->plug( tb ); | 2267 | mActionDetails->plug( tb ); |
2261 | settingsMenu->insertSeparator(); | 2268 | settingsMenu->insertSeparator(); |
2262 | #ifndef DESKTOP_VERSION | 2269 | #ifndef DESKTOP_VERSION |
2263 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); | 2270 | if ( Ir::supported() ) mActionBR->plug(settingsMenu ); |
2264 | settingsMenu->insertSeparator(); | 2271 | settingsMenu->insertSeparator(); |
2265 | #endif | 2272 | #endif |
2266 | 2273 | ||
2267 | mActionWhoAmI->plug( settingsMenu ); | 2274 | mActionWhoAmI->plug( settingsMenu ); |
2268 | //mActionEditCategories->plug( changeMenu ); | 2275 | //mActionEditCategories->plug( changeMenu ); |
2269 | mActionCategories->plug( changeMenu ); | 2276 | mActionCategories->plug( changeMenu ); |
2270 | //mActionManageCategories->plug( changeMenu ); | 2277 | //mActionManageCategories->plug( changeMenu ); |
2271 | 2278 | ||
2272 | //mActionCategories->plug( settingsMenu ); | 2279 | //mActionCategories->plug( settingsMenu ); |
2273 | 2280 | ||
2274 | 2281 | ||
2275 | mActionWN->plug( helpMenu ); | 2282 | mActionWN->plug( helpMenu ); |
2283 | mActionStorageHowto->plug( helpMenu ); | ||
2276 | mActionSyncHowto->plug( helpMenu ); | 2284 | mActionSyncHowto->plug( helpMenu ); |
2277 | mActionKdeSyncHowto->plug( helpMenu ); | 2285 | mActionKdeSyncHowto->plug( helpMenu ); |
2278 | mActionMultiSyncHowto->plug( helpMenu ); | 2286 | mActionMultiSyncHowto->plug( helpMenu ); |
2279 | mActionFaq->plug( helpMenu ); | 2287 | mActionFaq->plug( helpMenu ); |
2280 | mActionLicence->plug( helpMenu ); | 2288 | mActionLicence->plug( helpMenu ); |
2281 | mActionAboutKAddressbook->plug( helpMenu ); | 2289 | mActionAboutKAddressbook->plug( helpMenu ); |
2282 | 2290 | ||
2283 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2291 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
2284 | 2292 | ||
2285 | mActionSave->plug( tb ); | 2293 | mActionSave->plug( tb ); |
2286 | mViewManager->getFilterAction()->plug ( tb); | 2294 | mViewManager->getFilterAction()->plug ( tb); |
2287 | //LR hide filteraction on started in 480x640 | 2295 | //LR hide filteraction on started in 480x640 |
2288 | if (QApplication::desktop()->width() == 480 ) { | 2296 | if (QApplication::desktop()->width() == 480 ) { |
2289 | mViewManager->getFilterAction()->setComboWidth( 0 ); | 2297 | mViewManager->getFilterAction()->setComboWidth( 0 ); |
2290 | } | 2298 | } |
2291 | mActionUndo->plug( tb ); | 2299 | mActionUndo->plug( tb ); |
2292 | mActionDelete->plug( tb ); | 2300 | mActionDelete->plug( tb ); |
2293 | mActionRedo->plug( tb ); | 2301 | mActionRedo->plug( tb ); |
2294 | } else { | 2302 | } else { |
2295 | mActionSave->plug( tb ); | 2303 | mActionSave->plug( tb ); |
2296 | tb->enableMoving(false); | 2304 | tb->enableMoving(false); |
2297 | } | 2305 | } |
2298 | //mActionQuit->plug ( tb ); | 2306 | //mActionQuit->plug ( tb ); |
2299 | //tb->insertWidget(-1, 0, mIncSearchWidget, 6); | 2307 | //tb->insertWidget(-1, 0, mIncSearchWidget, 6); |
@@ -2705,49 +2713,52 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses | |||
2705 | { | 2713 | { |
2706 | 2714 | ||
2707 | // raise Ka/Pi if it is in the background | 2715 | // raise Ka/Pi if it is in the background |
2708 | #ifndef DESKTOP_VERSION | 2716 | #ifndef DESKTOP_VERSION |
2709 | #ifndef KORG_NODCOP | 2717 | #ifndef KORG_NODCOP |
2710 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); | 2718 | //QCopEnvelope e("QPE/Application/kapi", "raise()"); |
2711 | #endif | 2719 | #endif |
2712 | #endif | 2720 | #endif |
2713 | 2721 | ||
2714 | mMainWindow->showMaximized(); | 2722 | mMainWindow->showMaximized(); |
2715 | mMainWindow-> raise(); | 2723 | mMainWindow-> raise(); |
2716 | 2724 | ||
2717 | mViewManager->setSelected( "", false); | 2725 | mViewManager->setSelected( "", false); |
2718 | mViewManager->refreshView( "" ); | 2726 | mViewManager->refreshView( "" ); |
2719 | mViewManager->setSelected( foundUid, true ); | 2727 | mViewManager->setSelected( foundUid, true ); |
2720 | mViewManager->refreshView( foundUid ); | 2728 | mViewManager->refreshView( foundUid ); |
2721 | 2729 | ||
2722 | if ( !mMultipleViewsAtOnce ) | 2730 | if ( !mMultipleViewsAtOnce ) |
2723 | { | 2731 | { |
2724 | setDetailsVisible( true ); | 2732 | setDetailsVisible( true ); |
2725 | mActionDetails->setChecked(true); | 2733 | mActionDetails->setChecked(true); |
2726 | } | 2734 | } |
2727 | } | 2735 | } |
2728 | } | 2736 | } |
2729 | 2737 | void KABCore::storagehowto() | |
2738 | { | ||
2739 | KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" ); | ||
2740 | } | ||
2730 | void KABCore::whatsnew() | 2741 | void KABCore::whatsnew() |
2731 | { | 2742 | { |
2732 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 2743 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
2733 | } | 2744 | } |
2734 | void KABCore::synchowto() | 2745 | void KABCore::synchowto() |
2735 | { | 2746 | { |
2736 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 2747 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
2737 | } | 2748 | } |
2738 | void KABCore::kdesynchowto() | 2749 | void KABCore::kdesynchowto() |
2739 | { | 2750 | { |
2740 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | 2751 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); |
2741 | } | 2752 | } |
2742 | void KABCore::multisynchowto() | 2753 | void KABCore::multisynchowto() |
2743 | { | 2754 | { |
2744 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | 2755 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); |
2745 | } | 2756 | } |
2746 | void KABCore::faq() | 2757 | void KABCore::faq() |
2747 | { | 2758 | { |
2748 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); | 2759 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); |
2749 | } | 2760 | } |
2750 | 2761 | ||
2751 | #include <libkcal/syncdefines.h> | 2762 | #include <libkcal/syncdefines.h> |
2752 | 2763 | ||
2753 | KABC::Addressee KABCore::getLastSyncAddressee() | 2764 | KABC::Addressee KABCore::getLastSyncAddressee() |