| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | libkcal/calendar.h | 1 | ||||
| -rw-r--r-- | libkcal/calendarlocal.cpp | 25 | ||||
| -rw-r--r-- | libkcal/calendarlocal.h | 1 | ||||
| -rw-r--r-- | libkdepim/ksyncmanager.cpp | 5 |
5 files changed, 29 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 307027a..e45240a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1658,3 +1658,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int - qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); + qDebug("KO: Sync: Set fulldate to true! Local: %s --- Remote: %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); diff --git a/libkcal/calendar.h b/libkcal/calendar.h index 0a94914..66836a1 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h @@ -318,2 +318,3 @@ public: virtual void setCalendarEnabled( int id, bool enable ) = 0; + virtual void setAllCalendarEnabled( bool enable ) = 0; virtual void setAlarmEnabled( int id, bool enable ) = 0; diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 45e3128..2a57724 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp @@ -192,3 +192,2 @@ void CalendarLocal::setSyncEventsReadOnly() ev->setReadOnly( true ); - ev->setCalID( 1 ); } @@ -197,2 +196,3 @@ void CalendarLocal::setSyncEventsReadOnly() } + void CalendarLocal::addCalendar( Calendar* cal ) @@ -200,6 +200,13 @@ void CalendarLocal::addCalendar( Calendar* cal ) cal->setDontDeleteIncidencesOnClose(); + setSyncEventsEnabled(); { QPtrList<Event> EventList = cal->rawEvents(); + QPtrList<Event> el; Event * ev = EventList.first(); while ( ev ) { + if ( ev->uid().left( 15 ) == QString("last-syncEvent-") ) { + Event * se = event( ev->uid() ); + if ( se ) + el.append( se ); + } ev->unRegisterObserver( cal ); @@ -209,2 +216,5 @@ void CalendarLocal::addCalendar( Calendar* cal ) } + for ( ev = el.first(); ev; ev = el.next() ) { + deleteIncidence ( ev ); + } } @@ -1005,2 +1015,15 @@ void CalendarLocal::setCalendarRemove( int id ) +void CalendarLocal::setAllCalendarEnabled( bool enable ) +{ + for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() ) + it->setCalEnabled( enable ); + + for ( Event *it = mEventList.first(); it; it = mEventList.next() ) + it->setCalEnabled( enable ); + + for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() ) + it->setCalEnabled( enable ); + + +} void CalendarLocal::setCalendarEnabled( int id, bool enable ) diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index eb7bf34..b70f0c9 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h @@ -196,2 +196,3 @@ public slots: void setCalendarRemove( int id ); + void setAllCalendarEnabled( bool enable ); diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 795cd30..d2cb71b 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -1142,3 +1142,2 @@ void KSyncManager::syncPi() mCurrentResourceRemote = ""; - qDebug ( "KSM: sync pi %d",mSpecificResources.count() ); if ( mSpecificResources.count() ) { @@ -1149,3 +1148,3 @@ void KSyncManager::syncPi() --lastSyncRes; - qDebug ( "KSM: sync pi %d",ccc ); + //qDebug ( "KSM: sync pi %d",ccc ); } @@ -1160,3 +1159,3 @@ void KSyncManager::syncPi() mCurrentResourceRemote = mSpecificResources[ startRemote ]; - qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); + //qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); if ( !mCurrentResourceRemote.isEmpty() ) { |