author | zautrix <zautrix> | 2005-12-02 10:19:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-12-02 10:19:28 (UTC) |
commit | 1bb72406b4f160efa20bf4329539543e000295a5 (patch) (unidiff) | |
tree | eb8cee9f4c79dd28443b4e7a3b2374b712c16e9b | |
parent | cba4eb3e05bee757b910f316ffab01d3849c0138 (diff) | |
download | kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.zip kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.tar.gz kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.tar.bz2 |
more sync
-rw-r--r-- | bin/kdepim/kaddressbook/germantranslation.txt | 3 | ||||
-rw-r--r-- | bin/kdepim/korganizer/germantranslation.txt | 4 | ||||
-rw-r--r-- | kabc/addressbook.cpp | 6 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 1 |
4 files changed, 8 insertions, 6 deletions
diff --git a/bin/kdepim/kaddressbook/germantranslation.txt b/bin/kdepim/kaddressbook/germantranslation.txt index 2df2ac7..e7b3927 100644 --- a/bin/kdepim/kaddressbook/germantranslation.txt +++ b/bin/kdepim/kaddressbook/germantranslation.txt | |||
@@ -831,7 +831,8 @@ | |||
831 | { "Other Phone","Sonst. Telefon" }, | 831 | { "Other Phone","Sonst. Telefon" }, |
832 | { "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, | 832 | { "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, |
833 | { "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, | 833 | { "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, |
834 | { "Waiting a second before syncing next resource...",""Warte eine Sekunde vor dem Syncen der nächsten resource..." }, | 834 | { "Waiting a second before syncing next resource...","Warte eine Sekunde vor dem Syncen der nächsten resource..." }, |
835 | { "Multi-resource Pi-sync finished","Multi-Resourcen Pi-sync beendet" }, | ||
835 | { "","" }, | 836 | { "","" }, |
836 | { "","" }, | 837 | { "","" }, |
837 | { "","" }, | 838 | { "","" }, |
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt index ba98b00..cb63a5e 100644 --- a/bin/kdepim/korganizer/germantranslation.txt +++ b/bin/kdepim/korganizer/germantranslation.txt | |||
@@ -1575,8 +1575,8 @@ | |||
1575 | { "Alarm disabled warning","Nichtaktiver Alarm" }, | 1575 | { "Alarm disabled warning","Nichtaktiver Alarm" }, |
1576 | { "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, | 1576 | { "Pi-Sync - all calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - alle Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, |
1577 | { "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, | 1577 | { "Pi-Sync - selected calendars ( direct Kx/Pi to Kx/Pi sync )","Pi-Sync - ausgewählte Kalender ( direktes Kx/Pi mit Kx/Pi syncen )" }, |
1578 | { "Waiting a second before syncing next resource...",""Warte eine Sekunde vor dem Syncen der nächsten resource..." }, | 1578 | { "Waiting a second before syncing next resource...","Warte eine Sekunde vor dem Syncen der nächsten resource..." }, |
1579 | { "","" }, | 1579 | { "Multi-resource Pi-sync finished","Multi-Resourcen Pi-sync beendet" }, |
1580 | { "","" }, | 1580 | { "","" }, |
1581 | { "","" }, | 1581 | { "","" }, |
1582 | { "","" }, | 1582 | { "","" }, |
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index ed3ac84..f9e4387 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -397,7 +397,7 @@ void AddressBook::export2File( QString fileName, QString resourceName ) | |||
397 | if ( !resourceName.isEmpty() ) | 397 | if ( !resourceName.isEmpty() ) |
398 | include = (resourceName == (*it).resource()->resourceName() ); | 398 | include = (resourceName == (*it).resource()->resourceName() ); |
399 | if ( include ) { | 399 | if ( include ) { |
400 | qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->name() ).arg( fileName ) ); | 400 | //qDebug(QString ("Exporting resource %1 to file %2").arg( (*it).resource()->resourceName() ).arg( fileName ) ); |
401 | if ( !(*it).IDStr().isEmpty() ) { | 401 | if ( !(*it).IDStr().isEmpty() ) { |
402 | (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() ); | 402 | (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() ); |
403 | } | 403 | } |
@@ -509,10 +509,10 @@ int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool remo | |||
509 | KRES::Manager<Resource>::ActiveIterator it; | 509 | KRES::Manager<Resource>::ActiveIterator it; |
510 | KRES::Manager<Resource> *manager = d->mManager; | 510 | KRES::Manager<Resource> *manager = d->mManager; |
511 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 511 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |
512 | qDebug("SaveAB::checking resource..." ); | 512 | //qDebug("SaveAB::checking resource..." ); |
513 | if ( (*it)->resourceName() == resource ) { | 513 | if ( (*it)->resourceName() == resource ) { |
514 | setRes = (*it); | 514 | setRes = (*it); |
515 | qDebug("Inserting imported contacs to resource %s", resource.latin1()); | 515 | qDebug("KA: AB: Inserting imported contacs to resource %s", resource.latin1()); |
516 | break; | 516 | break; |
517 | } | 517 | } |
518 | } | 518 | } |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7197b30..b7929ec 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1186,6 +1186,7 @@ void KSyncManager::syncPi() | |||
1186 | mAskForPreferences = false; | 1186 | mAskForPreferences = false; |
1187 | } | 1187 | } |
1188 | mPisyncFinished = true; | 1188 | mPisyncFinished = true; |
1189 | mParent->topLevelWidget()->setCaption( i18n("Multi-resource Pi-sync finished") ); | ||
1189 | } else { | 1190 | } else { |
1190 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1191 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1191 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1192 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |