| -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 @@ This package contains the versions of the calendar application KOrganizer/Platform-independent (KO/Pi) 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. 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 @@ -93,98 +93,110 @@ void KSyncManager::fillSyncMenu() clearMenu->insertItem( i18n("For all profiles"), 1 ); clearMenu->insertSeparator(); connect ( clearMenu, SIGNAL( activated ( int ) ), this, SLOT (slotClearMenu( int ) ) ); mSyncMenu->insertSeparator(); if ( mServerSocket == 0 ) { mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 ); } else { mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 ); } mSyncMenu->insertSeparator(); mSyncMenu->insertItem( i18n("Multiple sync"), 1 ); mSyncMenu->insertSeparator(); KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); config.setGroup("General"); QStringList prof = config.readListEntry("SyncProfileNames"); mLocalMachineName = config.readEntry("LocalMachineName","undefined"); if ( prof.count() < 2 ) { prof.clear(); QString externalName; #ifdef DESKTOP_VERSION #ifdef _WIN32_ externalName = "OutLook(not_implemented)"; #else externalName = "KDE_Desktop"; #endif #else externalName = "Sharp_DTM"; #endif prof << externalName; prof << i18n("Local_file"); prof << i18n("Last_file"); KSyncProfile* temp = new KSyncProfile (); temp->setName( prof[0] ); temp->writeConfig(&config); temp->setName( prof[1] ); temp->writeConfig(&config); temp->setName( prof[2] ); temp->writeConfig(&config); config.setGroup("General"); config.writeEntry("SyncProfileNames",prof); config.writeEntry("ExternSyncProfiles",externalName); config.sync(); delete temp; } mExternSyncProfiles = config.readListEntry("ExternSyncProfiles"); 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(); } QDir app_dir; //US do not display SharpDTM if app is pwmpi, or no sharpfiles available if ( mTargetApp == PWMPI) { mSyncMenu->removeItem( 1000 ); clearMenu->removeItem( 1000 ); } #ifndef DESKTOP_VERSION else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) { mSyncMenu->removeItem( 1000 ); clearMenu->removeItem( 1000 ); } #endif mSyncMenu->removeItem( 1002 ); clearMenu->removeItem( 1002 ); } void KSyncManager::slotClearMenu( int action ) { QString syncDevice; if ( action > 999 ) { syncDevice = mSyncProfileNames[action - 1000] ; } int result = 0; QString sd; if ( syncDevice.isEmpty() ) sd = i18n("Do you want to\nclear all sync info\nof all profiles?"); else sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice ); result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0, 0, 1 ); if ( result ) return; mImplementation->removeSyncInfo( syncDevice ); } void KSyncManager::slotSyncMenu( int action ) { qDebug("KSM::syncaction %d ", action); if ( action == 5000 ) return; mSyncWithDesktop = false; if ( action == 0 ) { |