-rw-r--r-- | bin/kdepim/storagehowto.txt | 80 | ||||
-rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
-rw-r--r-- | kaddressbook/kabcore.cpp | 13 | ||||
-rw-r--r-- | kaddressbook/kabcore.h | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 8 | ||||
-rw-r--r-- | korganizer/mainwindow.h | 1 | ||||
-rw-r--r-- | version | 2 |
7 files changed, 105 insertions, 3 deletions
diff --git a/bin/kdepim/storagehowto.txt b/bin/kdepim/storagehowto.txt new file mode 100644 index 0000000..4bb036b --- a/dev/null +++ b/bin/kdepim/storagehowto.txt | |||
@@ -0,0 +1,80 @@ | |||
1 | |||
2 | KDE-Pim/Pi Storage HowTo | ||
3 | |||
4 | As a default KDE-Pim/Pi is storing it's configuration and application (contacts and calendar) data in the directory <yourHome>/kdepim/. | ||
5 | This Howto is about to change these settings. | ||
6 | |||
7 | CONTENT: | ||
8 | |||
9 | 0) General problems | ||
10 | 1) Zaurus and desktop settings | ||
11 | 2) Additional settings for the desktop | ||
12 | 3) Technical background information | ||
13 | |||
14 | ******************************************** | ||
15 | 0) General problems | ||
16 | ******************************************** | ||
17 | |||
18 | There is no problem if you start KDE-Pim/Pi, set the storage dir and restart KDE-Pim/Pi and import all your data. | ||
19 | In general you can copy your data to another directory and set this a the new storage dir. The only problem are the absolute paths in the KA/Pi resource configuration. | ||
20 | KA/Pi stores it's resource information in the file <storageDir>/config/kabcrc. | ||
21 | Change the absolute paths there if you changed your storageDir or (that is recommended) change the path of the resources in the KA/Pi resource configuration directly. | ||
22 | |||
23 | ******************************************** | ||
24 | 1) Zaurus and desktop settings | ||
25 | ******************************************** | ||
26 | |||
27 | You can access the global settings from KA/Pi and from KO/Pi. | ||
28 | To change the storage dir go to configure dialog. Choose there the "Global" TAB and there the "Data storage path" TAB. | ||
29 | Change the value of the current storage path to a new (absolute) path and press the button "Save settings". | ||
30 | Restart the application. | ||
31 | Import your data to the application or copy the old storage dir to the new dir. Solve the KA/Pi resource path problem as in 0). | ||
32 | |||
33 | ******************************************** | ||
34 | 2) Additional settings for the desktop | ||
35 | ******************************************** | ||
36 | |||
37 | The LOCAL option: | ||
38 | In the desktop versions (NOT on the Zaurus) you have the possibility to set the storage dir relative to the executable binary. | ||
39 | That does mean: You can copy all the data (binaries, config data, application data) of the directory where the binaries are to another directory and it will find all files without needing to change anything. NO resource path change is needed. | ||
40 | In this LOCAL mode only resource files are supported (no resource directories) and only in the <storageDir>/apps/kabc/ directory (the default directory). | ||
41 | |||
42 | To set the LOCAL mode go to configure dialog. Choose there the "Global" TAB and there the "Data storage path" TAB. | ||
43 | Press there the button "Save using LOCAL storage". | ||
44 | Restart the application. | ||
45 | |||
46 | This LOCAL mode makes it possible to run KO/Pi and KA/Pi from a USB stick: | ||
47 | All data is read from and written to the stick. | ||
48 | Just put KDE-Pim/Pi on a memory stick and you can access all your PIM data on every computer with Windows XP. It will work with the ME and Linux versions as well. | ||
49 | |||
50 | ******************************************** | ||
51 | 3) Technical background information | ||
52 | ******************************************** | ||
53 | |||
54 | Directly after the start KDE-Pim/Pi looks for the evironment variable MICROKDEHOME. | ||
55 | If the variable is set, the path in the MICROKDEHOME is used as the storage dir. End. | ||
56 | |||
57 | If MICROKDEHOME is not set ( what is usually the case ), then | ||
58 | |||
59 | ###DESKTOP_VERSION ONLY### | ||
60 | It looks for the file .microkdehome in the directory of the binary. | ||
61 | (That file is written by pressing the "Save using LOCAL storage" button in the "Data storage path" TAB ). | ||
62 | If this file is found, it sets the path in the this file as the storage dir.End. | ||
63 | If the path starts with a LOCAL: | ||
64 | it sets the environment variable LOCALMICROKDEHOME to the path of the binary | ||
65 | and takes that path as storage dir.End. | ||
66 | |||
67 | If the file .microkdehome in the directory of the binary is not found: | ||
68 | ###DESKTOP_VERSION ONLY END### | ||
69 | |||
70 | It looks for the file .microkdehome in the home directory of the user. | ||
71 | (That file is written by pressing the "Save settings" button in the "Data storage path" TAB ). | ||
72 | If this file is found, it sets the path in this file as the storage dir.End. | ||
73 | |||
74 | If the file .microkdehome in the home directory of the user is not found, it sets the | ||
75 | <yourHome>/kdepim/ directory as the storage dir. | ||
76 | End of setting the storage dir. | ||
77 | |||
78 | If KA/Pi opens a resource it looks for the environment variable LOCALMICROKDEHOME. | ||
79 | If the variable is set, the file resource takes the path in LOCALMICROKDEHOME to find it's file. | ||
80 | |||
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index 088d3fe..5e7783b 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm | |||
@@ -1,27 +1,27 @@ | |||
1 | Summary: A collection of PIM programs | 1 | Summary: A collection of PIM programs |
2 | Name: KDE-Pim-Pi | 2 | Name: KDE-Pim-Pi |
3 | Version: 2.0.23 | 3 | Version: 2.0.24 |
4 | Release: SuSE_9.2 | 4 | Release: SuSE_9.2 |
5 | Copyright:GPL | 5 | Copyright:GPL |
6 | Group: Productivity/Pim | 6 | Group: Productivity/Pim |
7 | Source:http://sourceforge.net/projects/kdepimpi/ | 7 | Source:http://sourceforge.net/projects/kdepimpi/ |
8 | URL:http://sourceforge.net/projects/kdepimpi/ | 8 | URL:http://sourceforge.net/projects/kdepimpi/ |
9 | Packager: zautrix | 9 | Packager: zautrix |
10 | 10 | ||
11 | %description | 11 | %description |
12 | This package contains the platform-independent PIM programs from | 12 | This package contains the platform-independent PIM programs from |
13 | www.pi-sync.info, compiled for SuSE 9.2: | 13 | www.pi-sync.info, compiled for SuSE 9.2: |
14 | KTimeTacker/Pi | 14 | KTimeTacker/Pi |
15 | KPhone/Pi | 15 | KPhone/Pi |
16 | KAddressbook/Pi | 16 | KAddressbook/Pi |
17 | KOrganizer/Pi | 17 | KOrganizer/Pi |
18 | PasswordManager/Pi | 18 | PasswordManager/Pi |
19 | KOPieMail/Pi | 19 | KOPieMail/Pi |
20 | 20 | ||
21 | These applications do not need anything from the KDE-desktop | 21 | These applications do not need anything from the KDE-desktop |
22 | at all to run on Linux. However, there is a dependency from | 22 | at all to run on Linux. However, there is a dependency from |
23 | two KDE libs, because a small command line program is included | 23 | two KDE libs, because a small command line program is included |
24 | to make it possible to sync with the KDE-desktop applications. | 24 | to make it possible to sync with the KDE-desktop applications. |
25 | 25 | ||
26 | These applications are independent from the KDE-desktop | 26 | These applications are independent from the KDE-desktop |
27 | environment. That means, nothing of your existing | 27 | environment. That means, nothing of your existing |
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() |
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 4cef73a..80dbf08 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h | |||
@@ -128,48 +128,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
128 | resource or a null pointer if no resource was selected by | 128 | resource or a null pointer if no resource was selected by |
129 | the user. | 129 | the user. |
130 | */ | 130 | */ |
131 | KABC::Resource *requestResource( QWidget *parent ); | 131 | KABC::Resource *requestResource( QWidget *parent ); |
132 | 132 | ||
133 | #ifndef KAB_EMBEDDED | 133 | #ifndef KAB_EMBEDDED |
134 | static KAboutData *createAboutData(); | 134 | static KAboutData *createAboutData(); |
135 | #endif //KAB_EMBEDDED | 135 | #endif //KAB_EMBEDDED |
136 | 136 | ||
137 | #ifdef KAB_EMBEDDED | 137 | #ifdef KAB_EMBEDDED |
138 | inline QPopupMenu* getImportMenu() { return ImportMenu;} | 138 | inline QPopupMenu* getImportMenu() { return ImportMenu;} |
139 | inline QPopupMenu* getExportMenu() { return ExportMenu;} | 139 | inline QPopupMenu* getExportMenu() { return ExportMenu;} |
140 | #endif //KAB_EMBEDDED | 140 | #endif //KAB_EMBEDDED |
141 | 141 | ||
142 | public slots: | 142 | public slots: |
143 | #ifdef KAB_EMBEDDED | 143 | #ifdef KAB_EMBEDDED |
144 | void createAboutData(); | 144 | void createAboutData(); |
145 | #endif //KAB_EMBEDDED | 145 | #endif //KAB_EMBEDDED |
146 | void setDetailsToggle(); | 146 | void setDetailsToggle(); |
147 | 147 | ||
148 | void showLicence(); | 148 | void showLicence(); |
149 | void faq(); | 149 | void faq(); |
150 | void whatsnew() ; | 150 | void whatsnew() ; |
151 | void synchowto() ; | 151 | void synchowto() ; |
152 | void storagehowto() ; | ||
152 | void multisynchowto() ; | 153 | void multisynchowto() ; |
153 | void kdesynchowto() ; | 154 | void kdesynchowto() ; |
154 | void writeToPhone(); | 155 | void writeToPhone(); |
155 | 156 | ||
156 | /** | 157 | /** |
157 | Is called whenever a contact is selected in the view. | 158 | Is called whenever a contact is selected in the view. |
158 | */ | 159 | */ |
159 | void setContactSelected( const QString &uid ); | 160 | void setContactSelected( const QString &uid ); |
160 | 161 | ||
161 | /** | 162 | /** |
162 | Opens the preferred mail composer with all selected contacts as | 163 | Opens the preferred mail composer with all selected contacts as |
163 | arguments. | 164 | arguments. |
164 | */ | 165 | */ |
165 | void sendMail(); | 166 | void sendMail(); |
166 | 167 | ||
167 | /** | 168 | /** |
168 | Opens the preferred mail composer with the given contacts as | 169 | Opens the preferred mail composer with the given contacts as |
169 | arguments. | 170 | arguments. |
170 | */ | 171 | */ |
171 | void sendMail( const QString& email ); | 172 | void sendMail( const QString& email ); |
172 | 173 | ||
173 | 174 | ||
174 | void mailVCard(); | 175 | void mailVCard(); |
175 | void mailVCard(const QStringList& uids); | 176 | void mailVCard(const QStringList& uids); |
@@ -451,48 +452,49 @@ class KABCore : public QWidget, public KSyncInterface | |||
451 | KAction *mActionCut; | 452 | KAction *mActionCut; |
452 | KAction *mActionPaste; | 453 | KAction *mActionPaste; |
453 | KAction *mActionSelectAll; | 454 | KAction *mActionSelectAll; |
454 | KAction *mActionUndo; | 455 | KAction *mActionUndo; |
455 | KAction *mActionRedo; | 456 | KAction *mActionRedo; |
456 | KAction *mActionDelete; | 457 | KAction *mActionDelete; |
457 | 458 | ||
458 | //US settings menu | 459 | //US settings menu |
459 | KAction *mActionConfigResources; | 460 | KAction *mActionConfigResources; |
460 | KAction *mActionConfigKAddressbook; | 461 | KAction *mActionConfigKAddressbook; |
461 | KAction *mActionConfigShortcuts; | 462 | KAction *mActionConfigShortcuts; |
462 | KAction *mActionConfigureToolbars; | 463 | KAction *mActionConfigureToolbars; |
463 | KAction *mActionKeyBindings; | 464 | KAction *mActionKeyBindings; |
464 | KToggleAction *mActionJumpBar; | 465 | KToggleAction *mActionJumpBar; |
465 | KToggleAction *mActionDetails; | 466 | KToggleAction *mActionDetails; |
466 | KAction *mActionWhoAmI; | 467 | KAction *mActionWhoAmI; |
467 | KAction *mActionCategories; | 468 | KAction *mActionCategories; |
468 | KAction *mActionEditCategories; | 469 | KAction *mActionEditCategories; |
469 | KAction *mActionManageCategories; | 470 | KAction *mActionManageCategories; |
470 | KAction *mActionAboutKAddressbook; | 471 | KAction *mActionAboutKAddressbook; |
471 | KAction *mActionLicence; | 472 | KAction *mActionLicence; |
472 | KAction *mActionFaq; | 473 | KAction *mActionFaq; |
473 | KAction *mActionWN; | 474 | KAction *mActionWN; |
474 | KAction *mActionSyncHowto; | 475 | KAction *mActionSyncHowto; |
476 | KAction *mActionStorageHowto; | ||
475 | KAction *mActionKdeSyncHowto; | 477 | KAction *mActionKdeSyncHowto; |
476 | KAction *mActionMultiSyncHowto; | 478 | KAction *mActionMultiSyncHowto; |
477 | 479 | ||
478 | KAction *mActionDeleteView; | 480 | KAction *mActionDeleteView; |
479 | 481 | ||
480 | QPopupMenu *viewMenu; | 482 | QPopupMenu *viewMenu; |
481 | QPopupMenu *filterMenu; | 483 | QPopupMenu *filterMenu; |
482 | QPopupMenu *settingsMenu; | 484 | QPopupMenu *settingsMenu; |
483 | QPopupMenu *changeMenu; | 485 | QPopupMenu *changeMenu; |
484 | QPopupMenu *beamMenu; | 486 | QPopupMenu *beamMenu; |
485 | //US QAction *mActionSave; | 487 | //US QAction *mActionSave; |
486 | QPopupMenu *ImportMenu; | 488 | QPopupMenu *ImportMenu; |
487 | QPopupMenu *ExportMenu; | 489 | QPopupMenu *ExportMenu; |
488 | //LR additional methods | 490 | //LR additional methods |
489 | KAction *mActionRemoveVoice; | 491 | KAction *mActionRemoveVoice; |
490 | KAction *mActionSetFormattedName; | 492 | KAction *mActionSetFormattedName; |
491 | KAction * mActionImportOL; | 493 | KAction * mActionImportOL; |
492 | 494 | ||
493 | #ifndef KAB_EMBEDDED | 495 | #ifndef KAB_EMBEDDED |
494 | KAddressBookService *mAddressBookService; | 496 | KAddressBookService *mAddressBookService; |
495 | #endif //KAB_EMBEDDED | 497 | #endif //KAB_EMBEDDED |
496 | 498 | ||
497 | class KABCorePrivate; | 499 | class KABCorePrivate; |
498 | KABCorePrivate *d; | 500 | KABCorePrivate *d; |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 357154e..7aa3b60 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -1062,48 +1062,52 @@ void MainWindow::initActions() | |||
1062 | this ); | 1062 | this ); |
1063 | action->addTo( importMenu ); | 1063 | action->addTo( importMenu ); |
1064 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); | 1064 | connect( action, SIGNAL( activated() ), this, SLOT( save() ) ); |
1065 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, | 1065 | action = new QAction( "beam all", i18n("Exit (+save)"), 0, |
1066 | this ); | 1066 | this ); |
1067 | action->addTo( importMenu ); | 1067 | action->addTo( importMenu ); |
1068 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); | 1068 | connect( action, SIGNAL( activated() ), this, SLOT( close() ) ); |
1069 | 1069 | ||
1070 | //menuBar->insertItem( "Configure",configureMenu ); | 1070 | //menuBar->insertItem( "Configure",configureMenu ); |
1071 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); | 1071 | //configureMenu->insertItem( "Toolbar",configureToolBarMenu ); |
1072 | icon = loadPixmap( "korganizer/korganizer" ); | 1072 | icon = loadPixmap( "korganizer/korganizer" ); |
1073 | 1073 | ||
1074 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); | 1074 | action = new QAction( "Whats New", i18n("What's new?"), 0,this ); |
1075 | action->addTo( helpMenu ); | 1075 | action->addTo( helpMenu ); |
1076 | connect( action, SIGNAL( activated() ), | 1076 | connect( action, SIGNAL( activated() ), |
1077 | SLOT( whatsNew() ) ); | 1077 | SLOT( whatsNew() ) ); |
1078 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); | 1078 | action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this ); |
1079 | action->addTo( helpMenu ); | 1079 | action->addTo( helpMenu ); |
1080 | connect( action, SIGNAL( activated() ), | 1080 | connect( action, SIGNAL( activated() ), |
1081 | SLOT( features() ) ); | 1081 | SLOT( features() ) ); |
1082 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); | 1082 | action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this ); |
1083 | action->addTo( helpMenu ); | 1083 | action->addTo( helpMenu ); |
1084 | connect( action, SIGNAL( activated() ), | 1084 | connect( action, SIGNAL( activated() ), |
1085 | SLOT( keyBindings() ) ); | 1085 | SLOT( keyBindings() ) ); |
1086 | action = new QAction( "Storage Howto", i18n("Storage HowTo..."), 0,this ); | ||
1087 | action->addTo( helpMenu ); | ||
1088 | connect( action, SIGNAL( activated() ), | ||
1089 | SLOT( storagehowto() ) ); | ||
1086 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); | 1090 | action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this ); |
1087 | action->addTo( helpMenu ); | 1091 | action->addTo( helpMenu ); |
1088 | connect( action, SIGNAL( activated() ), | 1092 | connect( action, SIGNAL( activated() ), |
1089 | SLOT( synchowto() ) ); | 1093 | SLOT( synchowto() ) ); |
1090 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); | 1094 | action = new QAction( "KDE Sync Howto", i18n("KDE Sync HowTo..."), 0,this ); |
1091 | action->addTo( helpMenu ); | 1095 | action->addTo( helpMenu ); |
1092 | connect( action, SIGNAL( activated() ), | 1096 | connect( action, SIGNAL( activated() ), |
1093 | SLOT( kdesynchowto() ) ); | 1097 | SLOT( kdesynchowto() ) ); |
1094 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); | 1098 | action = new QAction( "Multi Sync Howto", i18n("Multi Sync HowTo..."), 0,this ); |
1095 | action->addTo( helpMenu ); | 1099 | action->addTo( helpMenu ); |
1096 | connect( action, SIGNAL( activated() ), | 1100 | connect( action, SIGNAL( activated() ), |
1097 | SLOT( multisynchowto() ) ); | 1101 | SLOT( multisynchowto() ) ); |
1098 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); | 1102 | action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this ); |
1099 | action->addTo( helpMenu ); | 1103 | action->addTo( helpMenu ); |
1100 | connect( action, SIGNAL( activated() ), | 1104 | connect( action, SIGNAL( activated() ), |
1101 | SLOT( aboutAutoSaving() ) ); | 1105 | SLOT( aboutAutoSaving() ) ); |
1102 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); | 1106 | action = new QAction( "Problemd", i18n("Known Problems..."), 0,this ); |
1103 | action->addTo( helpMenu ); | 1107 | action->addTo( helpMenu ); |
1104 | connect( action, SIGNAL( activated() ), | 1108 | connect( action, SIGNAL( activated() ), |
1105 | SLOT( aboutKnownBugs() ) ); | 1109 | SLOT( aboutKnownBugs() ) ); |
1106 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); | 1110 | action = new QAction( "Translate Howto", i18n("User translation..."), 0,this ); |
1107 | action->addTo( helpMenu ); | 1111 | action->addTo( helpMenu ); |
1108 | connect( action, SIGNAL( activated() ), | 1112 | connect( action, SIGNAL( activated() ), |
1109 | SLOT( usertrans() ) ); | 1113 | SLOT( usertrans() ) ); |
@@ -1372,48 +1376,52 @@ void MainWindow::displayText( QString text ,QString cap ) | |||
1372 | lay->setMargin( 3 ); | 1376 | lay->setMargin( 3 ); |
1373 | QTextBrowser tb ( &dia ); | 1377 | QTextBrowser tb ( &dia ); |
1374 | lay->addWidget( &tb ); | 1378 | lay->addWidget( &tb ); |
1375 | tb.setText( text ); | 1379 | tb.setText( text ); |
1376 | #ifdef DESKTOP_VERSION | 1380 | #ifdef DESKTOP_VERSION |
1377 | dia.resize( 640, 480); | 1381 | dia.resize( 640, 480); |
1378 | #else | 1382 | #else |
1379 | dia.showMaximized(); | 1383 | dia.showMaximized(); |
1380 | #endif | 1384 | #endif |
1381 | dia.exec(); | 1385 | dia.exec(); |
1382 | } | 1386 | } |
1383 | 1387 | ||
1384 | void MainWindow::features() | 1388 | void MainWindow::features() |
1385 | { | 1389 | { |
1386 | 1390 | ||
1387 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); | 1391 | KApplication::showFile( i18n("KO/Pi Features and hints"), "kdepim/korganizer/featuresKOPI.txt" ); |
1388 | } | 1392 | } |
1389 | 1393 | ||
1390 | void MainWindow::usertrans() | 1394 | void MainWindow::usertrans() |
1391 | { | 1395 | { |
1392 | 1396 | ||
1393 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); | 1397 | KApplication::showFile( i18n("KO/Pi User translation HowTo"), "kdepim/korganizer/usertranslationHOWTO.txt" ); |
1394 | } | 1398 | } |
1395 | 1399 | ||
1400 | void MainWindow::storagehowto() | ||
1401 | { | ||
1402 | KApplication::showFile( "KDE-Pim/Pi Storage HowTo", "kdepim/storagehowto.txt" ); | ||
1403 | } | ||
1396 | void MainWindow::kdesynchowto() | 1404 | void MainWindow::kdesynchowto() |
1397 | { | 1405 | { |
1398 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); | 1406 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/Zaurus-KDE_syncHowTo.txt" ); |
1399 | } | 1407 | } |
1400 | void MainWindow::multisynchowto() | 1408 | void MainWindow::multisynchowto() |
1401 | { | 1409 | { |
1402 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); | 1410 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/MultiSyncHowTo.txt" ); |
1403 | } | 1411 | } |
1404 | void MainWindow::synchowto() | 1412 | void MainWindow::synchowto() |
1405 | { | 1413 | { |
1406 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); | 1414 | KApplication::showFile( "KDE-Pim/Pi Synchronization HowTo", "kdepim/SyncHowto.txt" ); |
1407 | } | 1415 | } |
1408 | void MainWindow::faq() | 1416 | void MainWindow::faq() |
1409 | { | 1417 | { |
1410 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); | 1418 | KApplication::showFile( i18n("KO/Pi FAQ"), "kdepim/korganizer/kopiFAQ.txt" ); |
1411 | 1419 | ||
1412 | } | 1420 | } |
1413 | void MainWindow::whatsNew() | 1421 | void MainWindow::whatsNew() |
1414 | { | 1422 | { |
1415 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); | 1423 | KApplication::showFile( "KDE-Pim/Pi Version Info", "kdepim/WhatsNew.txt" ); |
1416 | 1424 | ||
1417 | } | 1425 | } |
1418 | void MainWindow::licence() | 1426 | void MainWindow::licence() |
1419 | { | 1427 | { |
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h index 4d1753f..3151f50 100644 --- a/korganizer/mainwindow.h +++ b/korganizer/mainwindow.h | |||
@@ -46,48 +46,49 @@ class MainWindow : public QMainWindow | |||
46 | public: | 46 | public: |
47 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); | 47 | MainWindow( QWidget *parent = 0, const char *name = 0, QString command = ""); |
48 | ~MainWindow(); | 48 | ~MainWindow(); |
49 | bool beamReceiveEnabled(); | 49 | bool beamReceiveEnabled(); |
50 | static QString defaultFileName(); | 50 | static QString defaultFileName(); |
51 | static QString syncFileName(); | 51 | static QString syncFileName(); |
52 | static QString resourcePath(); | 52 | static QString resourcePath(); |
53 | public slots: | 53 | public slots: |
54 | void setCaption ( const QString & ); | 54 | void setCaption ( const QString & ); |
55 | void updateWeekNum(const KCal::DateList &); | 55 | void updateWeekNum(const KCal::DateList &); |
56 | void updateWeek(QDate); | 56 | void updateWeek(QDate); |
57 | void updateFilterToolbar(); | 57 | void updateFilterToolbar(); |
58 | virtual void showMaximized (); | 58 | virtual void showMaximized (); |
59 | void configureAgenda( int ); | 59 | void configureAgenda( int ); |
60 | void recieve( const QCString& msg, const QByteArray& data ); | 60 | void recieve( const QCString& msg, const QByteArray& data ); |
61 | protected slots: | 61 | protected slots: |
62 | void setCaptionToDates(); | 62 | void setCaptionToDates(); |
63 | void weekAction(); | 63 | void weekAction(); |
64 | void about(); | 64 | void about(); |
65 | void licence(); | 65 | void licence(); |
66 | void faq(); | 66 | void faq(); |
67 | void usertrans(); | 67 | void usertrans(); |
68 | void features(); | 68 | void features(); |
69 | void synchowto(); | 69 | void synchowto(); |
70 | void storagehowto(); | ||
70 | void kdesynchowto(); | 71 | void kdesynchowto(); |
71 | void multisynchowto(); | 72 | void multisynchowto(); |
72 | void whatsNew(); | 73 | void whatsNew(); |
73 | void keyBindings(); | 74 | void keyBindings(); |
74 | void aboutAutoSaving();; | 75 | void aboutAutoSaving();; |
75 | void aboutKnownBugs(); | 76 | void aboutKnownBugs(); |
76 | 77 | ||
77 | void processIncidenceSelection( Incidence * ); | 78 | void processIncidenceSelection( Incidence * ); |
78 | 79 | ||
79 | void importQtopia(); | 80 | void importQtopia(); |
80 | void importBday(); | 81 | void importBday(); |
81 | void importOL(); | 82 | void importOL(); |
82 | void importIcal(); | 83 | void importIcal(); |
83 | void importFile( QString, bool ); | 84 | void importFile( QString, bool ); |
84 | void quickImportIcal(); | 85 | void quickImportIcal(); |
85 | 86 | ||
86 | void slotModifiedChanged( bool ); | 87 | void slotModifiedChanged( bool ); |
87 | 88 | ||
88 | void save(); | 89 | void save(); |
89 | void saveStopTimer(); | 90 | void saveStopTimer(); |
90 | void configureToolBar( int ); | 91 | void configureToolBar( int ); |
91 | void printSel(); | 92 | void printSel(); |
92 | void printCal(); | 93 | void printCal(); |
93 | void saveCalendar(); | 94 | void saveCalendar(); |
@@ -1 +1 @@ | |||
version = "2.0.23"; | version = "2.0.24"; | ||