author | zautrix <zautrix> | 2004-09-18 16:32:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-18 16:32:35 (UTC) |
commit | a355a58898d0d08d797f872751254cfa958387c1 (patch) (unidiff) | |
tree | ce338c8cc9785d6351a8a8b66fb8e5c1602ceab0 /kaddressbook | |
parent | bf18a7b4edb4121fd2ea974ac1ec634167c9b993 (diff) | |
download | kdepimpi-a355a58898d0d08d797f872751254cfa958387c1.zip kdepimpi-a355a58898d0d08d797f872751254cfa958387c1.tar.gz kdepimpi-a355a58898d0d08d797f872751254cfa958387c1.tar.bz2 |
time fixes
-rw-r--r-- | kaddressbook/kabcore.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 226d5e4..215ce83 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2881,48 +2881,51 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo | |||
2881 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); | 2881 | // pending checkExternSyncAddressee(addresseeLSyncSharp, inL); |
2882 | local->removeAddressee( inL ); | 2882 | local->removeAddressee( inL ); |
2883 | ++deletedAddresseeL; | 2883 | ++deletedAddresseeL; |
2884 | } else { | 2884 | } else { |
2885 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { | 2885 | if ( ! KABPrefs::instance()->mWriteBackExistingOnly ) { |
2886 | ++addedAddresseeR; | 2886 | ++addedAddresseeR; |
2887 | inL.setRevision( modifiedCalendar ); | 2887 | inL.setRevision( modifiedCalendar ); |
2888 | local->insertAddressee( inL, false ); | 2888 | local->insertAddressee( inL, false ); |
2889 | inR = inL; | 2889 | inR = inL; |
2890 | inR.setResource( 0 ); | 2890 | inR.setResource( 0 ); |
2891 | remote->insertAddressee( inR, false ); | 2891 | remote->insertAddressee( inR, false ); |
2892 | } | 2892 | } |
2893 | } | 2893 | } |
2894 | } | 2894 | } |
2895 | } | 2895 | } |
2896 | } | 2896 | } |
2897 | ++incCounter; | 2897 | ++incCounter; |
2898 | } | 2898 | } |
2899 | el.clear(); | 2899 | el.clear(); |
2900 | 2900 | ||
2901 | 2901 | ||
2902 | 2902 | ||
2903 | bar.hide(); | 2903 | bar.hide(); |
2904 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); | 2904 | mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 ); |
2905 | // get rid of micro seconds | ||
2906 | QTime t = mLastAddressbookSync.time(); | ||
2907 | mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | ||
2905 | addresseeLSync.setRevision( mLastAddressbookSync ); | 2908 | addresseeLSync.setRevision( mLastAddressbookSync ); |
2906 | addresseeRSync.setRevision( mLastAddressbookSync ); | 2909 | addresseeRSync.setRevision( mLastAddressbookSync ); |
2907 | addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; | 2910 | addresseeRSync.setGivenName( i18n("Remote from: ")+mCurrentSyncName ) ; |
2908 | addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); | 2911 | addresseeLSync.setGivenName(i18n("Local from: ") + mCurrentSyncName ); |
2909 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 2912 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
2910 | remote->insertAddressee( addresseeRSync, false ); | 2913 | remote->insertAddressee( addresseeRSync, false ); |
2911 | local->insertAddressee( addresseeLSync, false ); | 2914 | local->insertAddressee( addresseeLSync, false ); |
2912 | QString mes; | 2915 | QString mes; |
2913 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); | 2916 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR ); |
2914 | if ( KABPrefs::instance()->mShowSyncSummary ) { | 2917 | if ( KABPrefs::instance()->mShowSyncSummary ) { |
2915 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 2918 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); |
2916 | } | 2919 | } |
2917 | qDebug( mes ); | 2920 | qDebug( mes ); |
2918 | return syncOK; | 2921 | return syncOK; |
2919 | } | 2922 | } |
2920 | 2923 | ||
2921 | bool KABCore::syncAB(QString filename, int mode) | 2924 | bool KABCore::syncAB(QString filename, int mode) |
2922 | { | 2925 | { |
2923 | 2926 | ||
2924 | //pending prepare addresseeview for output | 2927 | //pending prepare addresseeview for output |
2925 | //pending detect, if remote file has REV field. if not switch to external sync | 2928 | //pending detect, if remote file has REV field. if not switch to external sync |
2926 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 2929 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
2927 | AddressBook abLocal(filename,"syncContact"); | 2930 | AddressBook abLocal(filename,"syncContact"); |
2928 | bool syncOK = false; | 2931 | bool syncOK = false; |