summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-04 09:34:08 (UTC)
committer zautrix <zautrix>2005-04-04 09:34:08 (UTC)
commit69a388bdef8d4a31063f983735d2b7d25775f3cf (patch) (side-by-side diff)
treea7b9bfe175a9f396c44b5eee4b9321a1061d3b76
parent98db9169fcd69b1d20e6785278312e0d88722435 (diff)
downloadkdepimpi-69a388bdef8d4a31063f983735d2b7d25775f3cf.zip
kdepimpi-69a388bdef8d4a31063f983735d2b7d25775f3cf.tar.gz
kdepimpi-69a388bdef8d4a31063f983735d2b7d25775f3cf.tar.bz2
fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/README_Memorystick.txt5
-rw-r--r--libkdepim/ksyncmanager.cpp16
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
@@ -5,6 +5,7 @@ and the addressbook application KAddressbook/Platform-independent (KA/Pi)
for Windows 2000/XP, Windows 98/Me and Suse Linux 9.2.
It needs nothing be installed, just run the binaries from this directory.
+(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.
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.
The Windows 98/Me version is like the Windows 2000/XP version, but has not the "Import from Outlook" feature.
@@ -12,7 +13,3 @@ The Windows 98/Me version is like the Windows 2000/XP version, but has not the "
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.
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.
-
-Started on windows, the "Sync with KDE" feature does nothing.
-(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.
-
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 85a2aeb..db815d6 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -138,8 +138,20 @@ void KSyncManager::fillSyncMenu()
mSyncProfileNames = prof;
unsigned int i;
for ( i = 0; i < prof.count(); ++i ) {
- mSyncMenu->insertItem( prof[i], 1000+i );
- clearMenu->insertItem( prof[i], 1000+i );
+ QString insertText = prof[i];
+ if ( i == 0 ) {
+#ifdef DESKTOP_VERSION
+#ifdef _WIN32_
+ insertText = "OutLook(not_implemented)";
+#else
+ insertText = "KDE_Desktop";
+#endif
+#else
+ insertText = "Sharp_DTM";
+#endif
+ }
+ mSyncMenu->insertItem( insertText, 1000+i );
+ clearMenu->insertItem( insertText, 1000+i );
if ( i == 2 )
mSyncMenu->insertSeparator();
}