-rw-r--r-- | kaddressbook/kabcore.cpp | 17 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 4 |
2 files changed, 21 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f2d4cd6..282560f 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -1849,24 +1849,30 @@ void KABCore::initActions() | |||
1849 | SLOT( removeVoice() ), actionCollection(), | 1849 | SLOT( removeVoice() ), actionCollection(), |
1850 | "remove_voice" ); | 1850 | "remove_voice" ); |
1851 | mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, | 1851 | mActionImportOL = new KAction( i18n( "Import from Outlook..." ), 0, this, |
1852 | SLOT( importFromOL() ), actionCollection(), | 1852 | SLOT( importFromOL() ), actionCollection(), |
1853 | "import_OL" ); | 1853 | "import_OL" ); |
1854 | #ifdef KAB_EMBEDDED | 1854 | #ifdef KAB_EMBEDDED |
1855 | mActionLicence = new KAction( i18n( "Licence" ), 0, | 1855 | mActionLicence = new KAction( i18n( "Licence" ), 0, |
1856 | this, SLOT( showLicence() ), actionCollection(), | 1856 | this, SLOT( showLicence() ), actionCollection(), |
1857 | "licence_about_data" ); | 1857 | "licence_about_data" ); |
1858 | mActionFaq = new KAction( i18n( "Faq" ), 0, | 1858 | mActionFaq = new KAction( i18n( "Faq" ), 0, |
1859 | this, SLOT( faq() ), actionCollection(), | 1859 | this, SLOT( faq() ), actionCollection(), |
1860 | "faq_about_data" ); | 1860 | "faq_about_data" ); |
1861 | mActionWN = new KAction( i18n( "What's New?" ), 0, | ||
1862 | this, SLOT( whatsnew() ), actionCollection(), | ||
1863 | "wn" ); | ||
1864 | mActionSyncHowto = new KAction( i18n( "Sync HowTo" ), 0, | ||
1865 | this, SLOT( synchowto() ), actionCollection(), | ||
1866 | "sync" ); | ||
1861 | 1867 | ||
1862 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, | 1868 | mActionAboutKAddressbook = new KAction( i18n( "&About KAddressBook" ), "kaddressbook2", 0, |
1863 | this, SLOT( createAboutData() ), actionCollection(), | 1869 | this, SLOT( createAboutData() ), actionCollection(), |
1864 | "kaddressbook_about_data" ); | 1870 | "kaddressbook_about_data" ); |
1865 | #endif //KAB_EMBEDDED | 1871 | #endif //KAB_EMBEDDED |
1866 | 1872 | ||
1867 | clipboardDataChanged(); | 1873 | clipboardDataChanged(); |
1868 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 1874 | connect( UndoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
1869 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); | 1875 | connect( RedoStack::instance(), SIGNAL( changed() ), SLOT( updateActionMenu() ) ); |
1870 | } | 1876 | } |
1871 | 1877 | ||
1872 | //US we need this function, to plug all actions into the correct menues. | 1878 | //US we need this function, to plug all actions into the correct menues. |
@@ -1980,24 +1986,27 @@ void KABCore::addActionsManually() | |||
1980 | 1986 | ||
1981 | settingsMenu->insertSeparator(); | 1987 | settingsMenu->insertSeparator(); |
1982 | 1988 | ||
1983 | mActionJumpBar->plug( settingsMenu ); | 1989 | mActionJumpBar->plug( settingsMenu ); |
1984 | mActionDetails->plug( settingsMenu ); | 1990 | mActionDetails->plug( settingsMenu ); |
1985 | if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) | 1991 | if (!KABPrefs::instance()->mMultipleViewsAtOnce || KGlobal::getDesktopSize() == KGlobal::Desktop ) |
1986 | mActionDetails->plug( tb ); | 1992 | mActionDetails->plug( tb ); |
1987 | settingsMenu->insertSeparator(); | 1993 | settingsMenu->insertSeparator(); |
1988 | 1994 | ||
1989 | mActionWhoAmI->plug( settingsMenu ); | 1995 | mActionWhoAmI->plug( settingsMenu ); |
1990 | mActionCategories->plug( settingsMenu ); | 1996 | mActionCategories->plug( settingsMenu ); |
1991 | 1997 | ||
1998 | |||
1999 | mActionWN->plug( helpMenu ); | ||
2000 | mActionSyncHowto->plug( helpMenu ); | ||
1992 | mActionLicence->plug( helpMenu ); | 2001 | mActionLicence->plug( helpMenu ); |
1993 | mActionFaq->plug( helpMenu ); | 2002 | mActionFaq->plug( helpMenu ); |
1994 | mActionAboutKAddressbook->plug( helpMenu ); | 2003 | mActionAboutKAddressbook->plug( helpMenu ); |
1995 | 2004 | ||
1996 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { | 2005 | if (KGlobal::getDesktopSize() > KGlobal::Small ) { |
1997 | 2006 | ||
1998 | mActionSave->plug( tb ); | 2007 | mActionSave->plug( tb ); |
1999 | mViewManager->getFilterAction()->plug ( tb); | 2008 | mViewManager->getFilterAction()->plug ( tb); |
2000 | if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { | 2009 | if (KGlobal::getDesktopSize() == KGlobal::Desktop ) { |
2001 | mActionUndo->plug( tb ); | 2010 | mActionUndo->plug( tb ); |
2002 | mActionDelete->plug( tb ); | 2011 | mActionDelete->plug( tb ); |
2003 | mActionRedo->plug( tb ); | 2012 | mActionRedo->plug( tb ); |
@@ -2268,24 +2277,32 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses | |||
2268 | mViewManager->refreshView( "" ); | 2277 | mViewManager->refreshView( "" ); |
2269 | mViewManager->setSelected( foundUid, true ); | 2278 | mViewManager->setSelected( foundUid, true ); |
2270 | mViewManager->refreshView( foundUid ); | 2279 | mViewManager->refreshView( foundUid ); |
2271 | 2280 | ||
2272 | if ( !mMultipleViewsAtOnce ) | 2281 | if ( !mMultipleViewsAtOnce ) |
2273 | { | 2282 | { |
2274 | setDetailsVisible( true ); | 2283 | setDetailsVisible( true ); |
2275 | mActionDetails->setChecked(true); | 2284 | mActionDetails->setChecked(true); |
2276 | } | 2285 | } |
2277 | } | 2286 | } |
2278 | } | 2287 | } |
2279 | 2288 | ||
2289 | void KABCore::whatsnew() | ||
2290 | { | ||
2291 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | ||
2292 | } | ||
2293 | void KABCore::synchowto() | ||
2294 | { | ||
2295 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | ||
2296 | } | ||
2280 | 2297 | ||
2281 | void KABCore::faq() | 2298 | void KABCore::faq() |
2282 | { | 2299 | { |
2283 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); | 2300 | KApplication::showFile( "KA/Pi FAQ", "kdepim/kaddressbook/kapiFAQ.txt" ); |
2284 | } | 2301 | } |
2285 | 2302 | ||
2286 | #include <libkcal/syncdefines.h> | 2303 | #include <libkcal/syncdefines.h> |
2287 | 2304 | ||
2288 | KABC::Addressee KABCore::getLastSyncAddressee() | 2305 | KABC::Addressee KABCore::getLastSyncAddressee() |
2289 | { | 2306 | { |
2290 | Addressee lse; | 2307 | Addressee lse; |
2291 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); | 2308 | QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice(); |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 04ce33d..3c33923 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -137,24 +137,26 @@ class KABCore : public QWidget, public KSyncInterface | |||
137 | inline QPopupMenu* getImportMenu() { return ImportMenu;} | 137 | inline QPopupMenu* getImportMenu() { return ImportMenu;} |
138 | inline QPopupMenu* getExportMenu() { return ExportMenu;} | 138 | inline QPopupMenu* getExportMenu() { return ExportMenu;} |
139 | #endif //KAB_EMBEDDED | 139 | #endif //KAB_EMBEDDED |
140 | 140 | ||
141 | public slots: | 141 | public slots: |
142 | #ifdef KAB_EMBEDDED | 142 | #ifdef KAB_EMBEDDED |
143 | void createAboutData(); | 143 | void createAboutData(); |
144 | #endif //KAB_EMBEDDED | 144 | #endif //KAB_EMBEDDED |
145 | 145 | ||
146 | void statusMessage(QString, int time = 0 ); | 146 | void statusMessage(QString, int time = 0 ); |
147 | void showLicence(); | 147 | void showLicence(); |
148 | void faq(); | 148 | void faq(); |
149 | void whatsnew() ; | ||
150 | void synchowto() ; | ||
149 | 151 | ||
150 | /** | 152 | /** |
151 | Is called whenever a contact is selected in the view. | 153 | Is called whenever a contact is selected in the view. |
152 | */ | 154 | */ |
153 | void setContactSelected( const QString &uid ); | 155 | void setContactSelected( const QString &uid ); |
154 | 156 | ||
155 | /** | 157 | /** |
156 | Opens the preferred mail composer with all selected contacts as | 158 | Opens the preferred mail composer with all selected contacts as |
157 | arguments. | 159 | arguments. |
158 | */ | 160 | */ |
159 | void sendMail(); | 161 | void sendMail(); |
160 | 162 | ||
@@ -426,24 +428,26 @@ class KABCore : public QWidget, public KSyncInterface | |||
426 | KAction *mActionConfigResources; | 428 | KAction *mActionConfigResources; |
427 | KAction *mActionConfigKAddressbook; | 429 | KAction *mActionConfigKAddressbook; |
428 | KAction *mActionConfigShortcuts; | 430 | KAction *mActionConfigShortcuts; |
429 | KAction *mActionConfigureToolbars; | 431 | KAction *mActionConfigureToolbars; |
430 | KAction *mActionKeyBindings; | 432 | KAction *mActionKeyBindings; |
431 | KToggleAction *mActionJumpBar; | 433 | KToggleAction *mActionJumpBar; |
432 | KToggleAction *mActionDetails; | 434 | KToggleAction *mActionDetails; |
433 | KAction *mActionWhoAmI; | 435 | KAction *mActionWhoAmI; |
434 | KAction *mActionCategories; | 436 | KAction *mActionCategories; |
435 | KAction *mActionAboutKAddressbook; | 437 | KAction *mActionAboutKAddressbook; |
436 | KAction *mActionLicence; | 438 | KAction *mActionLicence; |
437 | KAction *mActionFaq; | 439 | KAction *mActionFaq; |
440 | KAction *mActionWN; | ||
441 | KAction *mActionSyncHowto; | ||
438 | 442 | ||
439 | KAction *mActionDeleteView; | 443 | KAction *mActionDeleteView; |
440 | 444 | ||
441 | QPopupMenu *viewMenu; | 445 | QPopupMenu *viewMenu; |
442 | QPopupMenu *filterMenu; | 446 | QPopupMenu *filterMenu; |
443 | QPopupMenu *settingsMenu; | 447 | QPopupMenu *settingsMenu; |
444 | QPopupMenu *changeMenu; | 448 | QPopupMenu *changeMenu; |
445 | //US QAction *mActionSave; | 449 | //US QAction *mActionSave; |
446 | QPopupMenu *ImportMenu; | 450 | QPopupMenu *ImportMenu; |
447 | QPopupMenu *ExportMenu; | 451 | QPopupMenu *ExportMenu; |
448 | //LR additional methods | 452 | //LR additional methods |
449 | KAction *mActionRemoveVoice; | 453 | KAction *mActionRemoveVoice; |