-rw-r--r-- | korganizer/calendarview.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index e45240a..6128137 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1492,24 +1492,24 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
1492 | break; | 1492 | break; |
1493 | case SYNC_PREF_NEWEST: | 1493 | case SYNC_PREF_NEWEST: |
1494 | if ( localMod >= remoteMod ) | 1494 | if ( localMod >= remoteMod ) |
1495 | return 1; | 1495 | return 1; |
1496 | else | 1496 | else |
1497 | return 2; | 1497 | return 2; |
1498 | break; | 1498 | break; |
1499 | case SYNC_PREF_ASK: | 1499 | case SYNC_PREF_ASK: |
1500 | qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 1500 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
1501 | if ( lastSync > remoteMod && lastSync > localMod) | 1501 | if ( lastSync > remoteMod && lastSync > localMod) |
1502 | return 0; | 1502 | return 0; |
1503 | if ( lastSync > remoteMod ) | 1503 | if ( lastSync > remoteMod ) |
1504 | return 1; | 1504 | return 1; |
1505 | if ( lastSync > localMod ) | 1505 | if ( lastSync > localMod ) |
1506 | return 2; | 1506 | return 2; |
1507 | qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); | 1507 | //qDebug("lsy %s --- lo %s --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1() ); |
1508 | localIsNew = localMod >= remoteMod; | 1508 | localIsNew = localMod >= remoteMod; |
1509 | if ( localIsNew ) | 1509 | if ( localIsNew ) |
1510 | getEventViewerDialog()->setColorMode( 1 ); | 1510 | getEventViewerDialog()->setColorMode( 1 ); |
1511 | else | 1511 | else |
1512 | getEventViewerDialog()->setColorMode( 2 ); | 1512 | getEventViewerDialog()->setColorMode( 2 ); |
1513 | getEventViewerDialog()->setIncidence(local); | 1513 | getEventViewerDialog()->setIncidence(local); |
1514 | if ( localIsNew ) | 1514 | if ( localIsNew ) |
1515 | getEventViewerDialog()->setColorMode( 2 ); | 1515 | getEventViewerDialog()->setColorMode( 2 ); |
@@ -1536,31 +1536,34 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b | |||
1536 | break; | 1536 | break; |
1537 | } | 1537 | } |
1538 | return 0; | 1538 | return 0; |
1539 | } | 1539 | } |
1540 | Event* CalendarView::getLastSyncEvent() | 1540 | Event* CalendarView::getLastSyncEvent() |
1541 | { | 1541 | { |
1542 | Event* lse; | 1542 | Event* lse; |
1543 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); | 1543 | //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() ); |
1544 | mCalendar->setSyncEventsEnabled(); | ||
1544 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); | 1545 | lse = mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice ); |
1545 | if (!lse) { | 1546 | if (!lse) { |
1547 | qDebug("KO: New last Syncevent created for local: %s",mCurrentSyncDevice.latin1() ); | ||
1546 | lse = new Event(); | 1548 | lse = new Event(); |
1547 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); | 1549 | lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); |
1548 | QString sum = ""; | 1550 | QString sum = ""; |
1549 | if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) | 1551 | if ( mSyncManager->mExternSyncProfiles.contains( mCurrentSyncDevice ) ) |
1550 | sum = "E: "; | 1552 | sum = "E: "; |
1551 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); | 1553 | lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event")); |
1552 | lse->setDtStart( mLastCalendarSync ); | 1554 | lse->setDtStart( mLastCalendarSync ); |
1553 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 1555 | lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
1554 | lse->setCategories( i18n("SyncEvent") ); | 1556 | lse->setCategories( i18n("SyncEvent") ); |
1555 | lse->setReadOnly( true ); | 1557 | lse->setReadOnly( true ); |
1556 | lse->setCalID( 1 ); | 1558 | lse->setCalID( 1 ); |
1557 | mCalendar->addEvent( lse ); | 1559 | mCalendar->addEvent( lse ); |
1558 | } | 1560 | } else |
1561 | qDebug("KO: Last Syncevent on local found"); | ||
1559 | 1562 | ||
1560 | return lse; | 1563 | return lse; |
1561 | 1564 | ||
1562 | } | 1565 | } |
1563 | 1566 | ||
1564 | // we check, if the to delete event has a id for a profile | 1567 | // we check, if the to delete event has a id for a profile |
1565 | // if yes, we set this id in the profile to delete | 1568 | // if yes, we set this id in the profile to delete |
1566 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) | 1569 | void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete ) |
@@ -1628,17 +1631,17 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1628 | } else { | 1631 | } else { |
1629 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 1632 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); |
1630 | } | 1633 | } |
1631 | } | 1634 | } |
1632 | QDateTime modifiedCalendar = mLastCalendarSync; | 1635 | QDateTime modifiedCalendar = mLastCalendarSync; |
1633 | eventLSync = getLastSyncEvent(); | 1636 | eventLSync = getLastSyncEvent(); |
1634 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 1637 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
1635 | if ( eventR ) { | 1638 | if ( eventR ) { |
1636 | qDebug("last-syncEvent on remote found "); | 1639 | qDebug("KO: Last-syncEvent on remote found "); |
1637 | eventRSync = (Event*) eventR->clone(); | 1640 | eventRSync = (Event*) eventR->clone(); |
1638 | remote->deleteEvent(eventR ); | 1641 | remote->deleteEvent(eventR ); |
1639 | 1642 | ||
1640 | } else { | 1643 | } else { |
1641 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { | 1644 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { |
1642 | eventRSync = (Event*)eventLSync->clone(); | 1645 | eventRSync = (Event*)eventLSync->clone(); |
1643 | } else { | 1646 | } else { |
1644 | fullDateRange = true; | 1647 | fullDateRange = true; |