-rw-r--r-- | korganizer/calendarview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 6128137..538325e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1888,49 +1888,49 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1888 | if ( t->hasDueDate() ) | 1888 | if ( t->hasDueDate() ) |
1889 | dt = t->dtDue(); | 1889 | dt = t->dtDue(); |
1890 | else | 1890 | else |
1891 | dt = cur.addSecs( 62 ); | 1891 | dt = cur.addSecs( 62 ); |
1892 | } | 1892 | } |
1893 | else if (inR->typeID() == eventID ) { | 1893 | else if (inR->typeID() == eventID ) { |
1894 | bool ok; | 1894 | bool ok; |
1895 | dt = inR->getNextOccurence( cur, &ok ); | 1895 | dt = inR->getNextOccurence( cur, &ok ); |
1896 | if ( !ok ) | 1896 | if ( !ok ) |
1897 | dt = cur.addSecs( -62 ); | 1897 | dt = cur.addSecs( -62 ); |
1898 | } | 1898 | } |
1899 | else | 1899 | else |
1900 | dt = inR->dtStart(); | 1900 | dt = inR->dtStart(); |
1901 | if ( dt < cur || dt > end ) { | 1901 | if ( dt < cur || dt > end ) { |
1902 | remote->deleteIncidence( inR ); | 1902 | remote->deleteIncidence( inR ); |
1903 | ++delFut; | 1903 | ++delFut; |
1904 | } | 1904 | } |
1905 | inR = er.next(); | 1905 | inR = er.next(); |
1906 | } | 1906 | } |
1907 | } | 1907 | } |
1908 | bar.hide(); | 1908 | bar.hide(); |
1909 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1909 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1910 | if ( mMultiResourceSync ) { | 1910 | if ( mMultiResourceSync ) { |
1911 | remote->removeSyncInfo( "" ); //all | 1911 | remote->removeSyncInfo( "" ); //all |
1912 | 1912 | qDebug("KO: Remoing all sync info on remote "); | |
1913 | } else { | 1913 | } else { |
1914 | eventLSync->setReadOnly( false ); | 1914 | eventLSync->setReadOnly( false ); |
1915 | eventLSync->setDtStart( mLastCalendarSync ); | 1915 | eventLSync->setDtStart( mLastCalendarSync ); |
1916 | eventRSync->setDtStart( mLastCalendarSync ); | 1916 | eventRSync->setDtStart( mLastCalendarSync ); |
1917 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1917 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1918 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1918 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1919 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1919 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1920 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1920 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1921 | eventLSync->setReadOnly( true ); | 1921 | eventLSync->setReadOnly( true ); |
1922 | } | 1922 | } |
1923 | qDebug("KO: Normal sync: %d ",mGlobalSyncMode == SYNC_MODE_NORMAL ); | 1923 | qDebug("KO: Normal sync: %d ",mGlobalSyncMode == SYNC_MODE_NORMAL ); |
1924 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop() && !mMultiResourceSync ) // kde is abnormal... | 1924 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop() && !mMultiResourceSync ) // kde is abnormal... |
1925 | remote->addEvent( eventRSync ); | 1925 | remote->addEvent( eventRSync ); |
1926 | else | 1926 | else |
1927 | delete eventRSync; | 1927 | delete eventRSync; |
1928 | qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() ); | 1928 | qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() ); |
1929 | QString mes; | 1929 | QString mes; |
1930 | 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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); | 1930 | 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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); |
1931 | QString delmess; | 1931 | QString delmess; |
1932 | if ( delFut ) { | 1932 | if ( delFut ) { |
1933 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); | 1933 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); |
1934 | mes += delmess; | 1934 | mes += delmess; |
1935 | } | 1935 | } |
1936 | mes = i18n("Local calendar changed!\n") +mes; | 1936 | mes = i18n("Local calendar changed!\n") +mes; |