author | zautrix <zautrix> | 2005-04-04 09:34:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-04 09:34:08 (UTC) |
commit | 69a388bdef8d4a31063f983735d2b7d25775f3cf (patch) (unidiff) | |
tree | a7b9bfe175a9f396c44b5eee4b9321a1061d3b76 | |
parent | 98db9169fcd69b1d20e6785278312e0d88722435 (diff) | |
download | kdepimpi-69a388bdef8d4a31063f983735d2b7d25775f3cf.zip kdepimpi-69a388bdef8d4a31063f983735d2b7d25775f3cf.tar.gz kdepimpi-69a388bdef8d4a31063f983735d2b7d25775f3cf.tar.bz2 |
fixes
-rw-r--r-- | bin/README_Memorystick.txt | 5 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 16 |
2 files changed, 15 insertions, 6 deletions
diff --git a/bin/README_Memorystick.txt b/bin/README_Memorystick.txt index cd19b42..3500c87 100644 --- a/bin/README_Memorystick.txt +++ b/bin/README_Memorystick.txt | |||
@@ -1,18 +1,15 @@ | |||
1 | 1 | ||
2 | This package contains the versions of | 2 | This package contains the versions of |
3 | the calendar application KOrganizer/Platform-independent (KO/Pi) | 3 | the calendar application KOrganizer/Platform-independent (KO/Pi) |
4 | and the addressbook application KAddressbook/Platform-independent (KA/Pi) | 4 | and the addressbook application KAddressbook/Platform-independent (KA/Pi) |
5 | for Windows 2000/XP, Windows 98/Me and Suse Linux 9.2. | 5 | for Windows 2000/XP, Windows 98/Me and Suse Linux 9.2. |
6 | 6 | ||
7 | It needs nothing be installed, just run the binaries from this directory. | 7 | It needs nothing be installed, just run the binaries from this directory. |
8 | (Note: On Linux it seems not to be possible to run an executable program fom a MS-Dos formatted memory stick. In that case you have to copy the complete content of the KDE-Pim/Pi dir to th local device and copy your data changes ( data is stored in <KDE-Pim/Pi dir>/kdepimpi )back to the stick. | ||
8 | That does mean you can put all the files on a memory stick and run it from the stich on every computer with Windows 2000/XP, Windows 98/Me or Suse Linux 9.2. | 9 | That does mean you can put all the files on a memory stick and run it from the stich on every computer with Windows 2000/XP, Windows 98/Me or Suse Linux 9.2. |
9 | 10 | ||
10 | The Windows 98/Me version is like the Windows 2000/XP version, but has not the "Import from Outlook" feature. | 11 | The Windows 98/Me version is like the Windows 2000/XP version, but has not the "Import from Outlook" feature. |
11 | 12 | ||
12 | The Windows 2000/XP version has an "Import from Outlook" feature in the import menu which makes it easy to get the data from Outlook into KDE-Pim/Pi. | 13 | The Windows 2000/XP version has an "Import from Outlook" feature in the import menu which makes it easy to get the data from Outlook into KDE-Pim/Pi. |
13 | 14 | ||
14 | The Suse Linux 9.2 version has a "Sync with KDE" feature in the sync menu which makes it easy to sync the data from KDE with KDE-Pim/Pi. | 15 | The Suse Linux 9.2 version has a "Sync with KDE" feature in the sync menu which makes it easy to sync the data from KDE with KDE-Pim/Pi. |
15 | |||
16 | Started on windows, the "Sync with KDE" feature does nothing. | ||
17 | (Actually that text is usually on Windows a "Sync with Outlook(not implemented)" but because the version are started with the same config file, the wrong "Sync with KDE" is displayed in the sync menu. | ||
18 | |||
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 85a2aeb..db815d6 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -133,18 +133,30 @@ void KSyncManager::fillSyncMenu() | |||
133 | config.writeEntry("ExternSyncProfiles",externalName); | 133 | config.writeEntry("ExternSyncProfiles",externalName); |
134 | config.sync(); | 134 | config.sync(); |
135 | delete temp; | 135 | delete temp; |
136 | } | 136 | } |
137 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); | 137 | mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); |
138 | mSyncProfileNames = prof; | 138 | mSyncProfileNames = prof; |
139 | unsigned int i; | 139 | unsigned int i; |
140 | for ( i = 0; i < prof.count(); ++i ) { | 140 | for ( i = 0; i < prof.count(); ++i ) { |
141 | mSyncMenu->insertItem( prof[i], 1000+i ); | 141 | QString insertText = prof[i]; |
142 | clearMenu->insertItem( prof[i], 1000+i ); | 142 | if ( i == 0 ) { |
143 | #ifdef DESKTOP_VERSION | ||
144 | #ifdef _WIN32_ | ||
145 | insertText = "OutLook(not_implemented)"; | ||
146 | #else | ||
147 | insertText = "KDE_Desktop"; | ||
148 | #endif | ||
149 | #else | ||
150 | insertText = "Sharp_DTM"; | ||
151 | #endif | ||
152 | } | ||
153 | mSyncMenu->insertItem( insertText, 1000+i ); | ||
154 | clearMenu->insertItem( insertText, 1000+i ); | ||
143 | if ( i == 2 ) | 155 | if ( i == 2 ) |
144 | mSyncMenu->insertSeparator(); | 156 | mSyncMenu->insertSeparator(); |
145 | } | 157 | } |
146 | QDir app_dir; | 158 | QDir app_dir; |
147 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available | 159 | //US do not display SharpDTM if app is pwmpi, or no sharpfiles available |
148 | if ( mTargetApp == PWMPI) { | 160 | if ( mTargetApp == PWMPI) { |
149 | mSyncMenu->removeItem( 1000 ); | 161 | mSyncMenu->removeItem( 1000 ); |
150 | clearMenu->removeItem( 1000 ); | 162 | clearMenu->removeItem( 1000 ); |