| author | zautrix <zautrix> | 2005-12-02 08:29:35 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-12-02 08:29:35 (UTC) |
| commit | 2bd8aff44e90b6d58e2037771db8b38846addb3e (patch) (side-by-side diff) | |
| tree | 63b679b438f2ad0daa4789de5e70a9f0eb5a8c9f | |
| parent | 467b2e451511d201bfe9bef946728e5488d38e0a (diff) | |
| download | kdepimpi-2bd8aff44e90b6d58e2037771db8b38846addb3e.zip kdepimpi-2bd8aff44e90b6d58e2037771db8b38846addb3e.tar.gz kdepimpi-2bd8aff44e90b6d58e2037771db8b38846addb3e.tar.bz2 | |
more sync
| -rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 1 | ||||
| -rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 2 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 15 | ||||
| -rw-r--r-- | libkdepim/ksyncprefsdialog.cpp | 1 |
4 files changed, 12 insertions, 7 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index e03dafb..2df2ac7 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt @@ -831,6 +831,7 @@ { "Other Phone","Sonst. Telefon" },
{ "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
{ "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" },
+{ "Waiting a second before syncing next resource...",""Warte eine Sekunde vor dem Syncen der nächsten resource..." },
{ "","" },
{ "","" },
{ "","" },
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index 2dec521..ba98b00 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt @@ -1575,7 +1575,7 @@ { "Alarm disabled warning","Nichtaktiver Alarm" }, { "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, { "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, -{ "","" }, +{ "Waiting a second before syncing next resource...",""Warte eine Sekunde vor dem Syncen der nächsten resource..." }, { "","" }, { "","" }, { "","" }, diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 4d859ce..f80c2a6 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -318,12 +318,14 @@ void KSyncManager::slotSyncMenu( int action ) } else if ( temp->getIsPiSync()|| temp->getIsPiSyncSpec()) { mSpecificResources.clear(); if ( mTargetApp == KAPI ) { + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true ); mPassWordPiSync = temp->getRemotePwAB(); mActiveSyncPort = temp->getRemotePortAB(); mActiveSyncIP = temp->getRemoteIPAB(); } else if ( mTargetApp == KOPI ) { - if ( temp->getIsPiSyncSpec() ) - mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); mActiveSyncIP = temp->getRemoteIP(); @@ -660,11 +662,14 @@ int KSyncManager::ringSync() } else if ( temp->getIsPiSync() || temp->getIsPiSyncSpec()) { mSpecificResources.clear(); if ( mTargetApp == KAPI ) { + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true ); mPassWordPiSync = temp->getRemotePwAB(); mActiveSyncPort = temp->getRemotePortAB(); mActiveSyncIP = temp->getRemoteIPAB(); } else if ( mTargetApp == KOPI ) { - mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); + if ( temp->getIsPiSyncSpec() ) + mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); mActiveSyncIP = temp->getRemoteIP(); @@ -1168,10 +1173,10 @@ void KSyncManager::syncPi() qApp->processEvents(); } if ( startLocal+1 < mSpecificResources.count()/2 ) { - mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") ); + mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); QTime timer; timer.start(); - while ( timer.elapsed () < 2000 ) { + while ( timer.elapsed () < 1000 ) { qApp->processEvents(); } } diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp index 6f46d19..2b87298 100644 --- a/libkdepim/ksyncprefsdialog.cpp +++ b/libkdepim/ksyncprefsdialog.cpp @@ -503,7 +503,6 @@ void KSyncPrefsDialog::chooseFileAB() void KSyncPrefsDialog::chooseFilePWM() { QString fn = QDir::homeDirPath(); - fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.pwm)"), this ); if ( fn == "" ) return; |