-rw-r--r-- | korganizer/calendarview.cpp | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 9160e1d..cbe2a10 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -909,6 +909,12 @@ void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* t | |||
909 | } | 909 | } |
910 | 910 | ||
911 | } | 911 | } |
912 | void CalendarView::checkExternalId( Incidence * inc ) | ||
913 | { | ||
914 | QPtrList<Event> lastSync = mCalendar->getExternLastSyncEvents() ; | ||
915 | checkExternSyncEvent( lastSync, inc ); | ||
916 | |||
917 | } | ||
912 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) | 918 | bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int mode ) |
913 | { | 919 | { |
914 | bool syncOK = true; | 920 | bool syncOK = true; |
@@ -1026,7 +1032,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1026 | QString pref = "e"; | 1032 | QString pref = "e"; |
1027 | if ( inR->type() == "Todo" ) | 1033 | if ( inR->type() == "Todo" ) |
1028 | pref = "t"; | 1034 | pref = "t"; |
1029 | if ( des.find(pref+QString::number( inR->zaurusId() ) +"," ) >= 0 && mode != 5) { // delete it | 1035 | if ( des.find(pref+QString::number( inR->getID(mCurrentSyncDevice) ) +"," ) >= 0 && mode != 5) { // delete it |
1030 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1036 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1031 | //remote->deleteIncidence( inR ); | 1037 | //remote->deleteIncidence( inR ); |
1032 | ++deletedEventR; | 1038 | ++deletedEventR; |
@@ -1076,12 +1082,12 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1076 | inR = remote->incidence( uid ); | 1082 | inR = remote->incidence( uid ); |
1077 | if ( ! inR ) { | 1083 | if ( ! inR ) { |
1078 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1084 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1079 | if ( inL->zaurusId() >= 0 && mode != 4 ) { | 1085 | if ( inL->getID(mCurrentSyncDevice) >= 0 && mode != 4 ) { |
1080 | local->deleteIncidence( inL ); | 1086 | local->deleteIncidence( inL ); |
1081 | ++deletedEventL; | 1087 | ++deletedEventL; |
1082 | } else { | 1088 | } else { |
1083 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { | 1089 | if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) { |
1084 | inL->setZaurusId( -1 ); | 1090 | inL->setID(mCurrentSyncDevice, -1 ); |
1085 | ++addedEventR; | 1091 | ++addedEventR; |
1086 | inL->setLastModified( modifiedCalendar ); | 1092 | inL->setLastModified( modifiedCalendar ); |
1087 | remote->addIncidence( inL->clone() ); | 1093 | remote->addIncidence( inL->clone() ); |
@@ -1200,7 +1206,7 @@ void CalendarView::syncSharp() | |||
1200 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { | 1206 | if ( inc->tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) { |
1201 | loc = mCalendar->incidence(inc->uid() ); | 1207 | loc = mCalendar->incidence(inc->uid() ); |
1202 | if ( loc ) { | 1208 | if ( loc ) { |
1203 | loc->setZaurusId( inc->zaurusId() ); | 1209 | loc->setID(mCurrentSyncDevice, inc->getID(mCurrentSyncDevice) ); |
1204 | loc->setZaurusUid( inc->zaurusUid() ); | 1210 | loc->setZaurusUid( inc->zaurusUid() ); |
1205 | } | 1211 | } |
1206 | } | 1212 | } |
@@ -1829,22 +1835,7 @@ void CalendarView::changeTodoDisplay(Todo *which, int action) | |||
1829 | { | 1835 | { |
1830 | changeIncidenceDisplay((Incidence *)which, action); | 1836 | changeIncidenceDisplay((Incidence *)which, action); |
1831 | } | 1837 | } |
1832 | void CalendarView::checkZaurusId( int id, bool todo ) | 1838 | |
1833 | { | ||
1834 | if ( id >= 0 ) { | ||
1835 | Incidence* lse = mCalendar->event( "last-syncEvent-Sharp-DTM"); | ||
1836 | if ( lse ) { | ||
1837 | QString des = lse->description(); | ||
1838 | QString pref = "e"; | ||
1839 | if ( todo ) | ||
1840 | pref = "t"; | ||
1841 | des += pref+ QString::number ( id ) + ","; | ||
1842 | lse->setReadOnly( false ); | ||
1843 | lse->setDescription( des ); | ||
1844 | lse->setReadOnly( true ); | ||
1845 | } | ||
1846 | } | ||
1847 | } | ||
1848 | void CalendarView::changeIncidenceDisplay(Incidence *which, int action) | 1839 | void CalendarView::changeIncidenceDisplay(Incidence *which, int action) |
1849 | { | 1840 | { |
1850 | updateUnmanagedViews(); | 1841 | updateUnmanagedViews(); |
@@ -2576,7 +2567,7 @@ void CalendarView::deleteTodo(Todo *todo) | |||
2576 | KMessageBox::sorry(this,i18n("Cannot delete To-Do\nwhich has children."), | 2567 | KMessageBox::sorry(this,i18n("Cannot delete To-Do\nwhich has children."), |
2577 | i18n("Delete To-Do")); | 2568 | i18n("Delete To-Do")); |
2578 | } else { | 2569 | } else { |
2579 | checkZaurusId( todo->zaurusId(), true ); | 2570 | checkExternalId( todo ); |
2580 | calendar()->deleteTodo(todo); | 2571 | calendar()->deleteTodo(todo); |
2581 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); | 2572 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); |
2582 | updateView(); | 2573 | updateView(); |
@@ -2588,7 +2579,7 @@ void CalendarView::deleteTodo(Todo *todo) | |||
2588 | KMessageBox::sorry(this,i18n("Cannot delete To-Do\nwhich has children."), | 2579 | KMessageBox::sorry(this,i18n("Cannot delete To-Do\nwhich has children."), |
2589 | i18n("Delete To-Do")); | 2580 | i18n("Delete To-Do")); |
2590 | } else { | 2581 | } else { |
2591 | checkZaurusId( todo->zaurusId(), true ); | 2582 | checkExternalId( todo ); |
2592 | mCalendar->deleteTodo(todo); | 2583 | mCalendar->deleteTodo(todo); |
2593 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); | 2584 | changeTodoDisplay( todo,KOGlobals::EVENTDELETED ); |
2594 | updateView(); | 2585 | updateView(); |
@@ -2650,7 +2641,7 @@ void CalendarView::deleteEvent(Event *anEvent) | |||
2650 | if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) | 2641 | if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) |
2651 | schedule(Scheduler::Cancel,anEvent); | 2642 | schedule(Scheduler::Cancel,anEvent); |
2652 | 2643 | ||
2653 | checkZaurusId( anEvent->zaurusId()); | 2644 | checkExternalId( anEvent); |
2654 | mCalendar->deleteEvent(anEvent); | 2645 | mCalendar->deleteEvent(anEvent); |
2655 | changeEventDisplay(anEvent,KOGlobals::EVENTDELETED); | 2646 | changeEventDisplay(anEvent,KOGlobals::EVENTDELETED); |
2656 | break; | 2647 | break; |
@@ -2684,7 +2675,7 @@ void CalendarView::deleteEvent(Event *anEvent) | |||
2684 | case KMessageBox::Continue: // OK | 2675 | case KMessageBox::Continue: // OK |
2685 | if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) | 2676 | if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) |
2686 | schedule(Scheduler::Cancel,anEvent); | 2677 | schedule(Scheduler::Cancel,anEvent); |
2687 | checkZaurusId( anEvent->zaurusId()); | 2678 | checkExternalId( anEvent); |
2688 | mCalendar->deleteEvent(anEvent); | 2679 | mCalendar->deleteEvent(anEvent); |
2689 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); | 2680 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); |
2690 | break; | 2681 | break; |
@@ -2692,7 +2683,7 @@ void CalendarView::deleteEvent(Event *anEvent) | |||
2692 | } else { | 2683 | } else { |
2693 | if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) | 2684 | if (anEvent->organizer()==KOPrefs::instance()->email() && anEvent->attendeeCount()>0) |
2694 | schedule(Scheduler::Cancel,anEvent); | 2685 | schedule(Scheduler::Cancel,anEvent); |
2695 | checkZaurusId( anEvent->zaurusId()); | 2686 | checkExternalId( anEvent); |
2696 | mCalendar->deleteEvent(anEvent); | 2687 | mCalendar->deleteEvent(anEvent); |
2697 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); | 2688 | changeEventDisplay(anEvent, KOGlobals::EVENTDELETED); |
2698 | } | 2689 | } |
@@ -3446,7 +3437,7 @@ bool CalendarView::removeCompletedSubTodos( Todo* t ) | |||
3446 | } | 3437 | } |
3447 | if ( deleteTodo ) { | 3438 | if ( deleteTodo ) { |
3448 | if ( t->isCompleted() ) { | 3439 | if ( t->isCompleted() ) { |
3449 | checkZaurusId( t->zaurusId(), true ); | 3440 | checkExternalId( t ); |
3450 | mCalendar->deleteTodo( t ); | 3441 | mCalendar->deleteTodo( t ); |
3451 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); | 3442 | changeTodoDisplay( t,KOGlobals::EVENTDELETED ); |
3452 | } | 3443 | } |