-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 307027a..e45240a 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1611,97 +1611,97 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1611 | //QPtrList<Event> el = local->rawEvents(); | 1611 | //QPtrList<Event> el = local->rawEvents(); |
1612 | Event* eventR; | 1612 | Event* eventR; |
1613 | QString uid; | 1613 | QString uid; |
1614 | int take; | 1614 | int take; |
1615 | Event* eventRSync; | 1615 | Event* eventRSync; |
1616 | Event* eventLSync; | 1616 | Event* eventLSync; |
1617 | clearAllViews(); | 1617 | clearAllViews(); |
1618 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); | 1618 | QPtrList<Event> eventRSyncSharp = remote->getExternLastSyncEvents(); |
1619 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); | 1619 | QPtrList<Event> eventLSyncSharp = local->getExternLastSyncEvents(); |
1620 | bool fullDateRange = false; | 1620 | bool fullDateRange = false; |
1621 | local->resetTempSyncStat(); | 1621 | local->resetTempSyncStat(); |
1622 | mLastCalendarSync = QDateTime::currentDateTime(); | 1622 | mLastCalendarSync = QDateTime::currentDateTime(); |
1623 | if ( mSyncManager->syncWithDesktop() ) { | 1623 | if ( mSyncManager->syncWithDesktop() ) { |
1624 | remote->resetPilotStat(1); | 1624 | remote->resetPilotStat(1); |
1625 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { | 1625 | if ( KSyncManager::mRequestedSyncEvent.isValid() ) { |
1626 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; | 1626 | mLastCalendarSync = KSyncManager::mRequestedSyncEvent; |
1627 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); | 1627 | qDebug("KO: using extern time for calendar sync: %s ", mLastCalendarSync.toString().latin1() ); |
1628 | } else { | 1628 | } else { |
1629 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); | 1629 | qDebug("KSyncManager::mRequestedSyncEvent has invalid datatime "); |
1630 | } | 1630 | } |
1631 | } | 1631 | } |
1632 | QDateTime modifiedCalendar = mLastCalendarSync; | 1632 | QDateTime modifiedCalendar = mLastCalendarSync; |
1633 | eventLSync = getLastSyncEvent(); | 1633 | eventLSync = getLastSyncEvent(); |
1634 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); | 1634 | eventR = remote->event("last-syncEvent-"+mCurrentSyncName ); |
1635 | if ( eventR ) { | 1635 | if ( eventR ) { |
1636 | qDebug("last-syncEvent on remote found "); | 1636 | qDebug("last-syncEvent on remote found "); |
1637 | eventRSync = (Event*) eventR->clone(); | 1637 | eventRSync = (Event*) eventR->clone(); |
1638 | remote->deleteEvent(eventR ); | 1638 | remote->deleteEvent(eventR ); |
1639 | 1639 | ||
1640 | } else { | 1640 | } else { |
1641 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { | 1641 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL || mSyncManager->syncWithDesktop()) { |
1642 | eventRSync = (Event*)eventLSync->clone(); | 1642 | eventRSync = (Event*)eventLSync->clone(); |
1643 | } else { | 1643 | } else { |
1644 | fullDateRange = true; | 1644 | fullDateRange = true; |
1645 | eventRSync = new Event(); | 1645 | eventRSync = new Event(); |
1646 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); | 1646 | eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event")); |
1647 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); | 1647 | eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); |
1648 | eventRSync->setDtStart( mLastCalendarSync ); | 1648 | eventRSync->setDtStart( mLastCalendarSync ); |
1649 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); | 1649 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) ); |
1650 | eventRSync->setCategories( i18n("SyncEvent") ); | 1650 | eventRSync->setCategories( i18n("SyncEvent") ); |
1651 | } | 1651 | } |
1652 | } | 1652 | } |
1653 | if ( eventLSync->dtStart() == mLastCalendarSync ) | 1653 | if ( eventLSync->dtStart() == mLastCalendarSync ) |
1654 | fullDateRange = true; | 1654 | fullDateRange = true; |
1655 | 1655 | ||
1656 | if ( ! fullDateRange ) { | 1656 | if ( ! fullDateRange ) { |
1657 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { | 1657 | if ( eventLSync->dtStart() != eventRSync->dtStart() ) { |
1658 | 1658 | ||
1659 | qDebug("set fulldate to true %s %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); | 1659 | qDebug("KO: Sync: Set fulldate to true! Local: %s --- Remote: %s" ,eventLSync->dtStart().toString().latin1(), eventRSync->dtStart().toString().latin1() ); |
1660 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); | 1660 | //qDebug("%d %d %d %d ", eventLSync->dtStart().time().second(), eventLSync->dtStart().time().msec() , eventRSync->dtStart().time().second(), eventRSync->dtStart().time().msec()); |
1661 | fullDateRange = true; | 1661 | fullDateRange = true; |
1662 | } | 1662 | } |
1663 | } | 1663 | } |
1664 | if ( mSyncManager->syncWithDesktop() ) { | 1664 | if ( mSyncManager->syncWithDesktop() ) { |
1665 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); | 1665 | fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync ); |
1666 | } | 1666 | } |
1667 | if ( fullDateRange ) | 1667 | if ( fullDateRange ) |
1668 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); | 1668 | mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365); |
1669 | else | 1669 | else |
1670 | mLastCalendarSync = eventLSync->dtStart(); | 1670 | mLastCalendarSync = eventLSync->dtStart(); |
1671 | // for resyncing if own file has changed | 1671 | // for resyncing if own file has changed |
1672 | if ( mCurrentSyncDevice == "deleteaftersync" ) { | 1672 | if ( mCurrentSyncDevice == "deleteaftersync" ) { |
1673 | mLastCalendarSync = loadedFileVersion; | 1673 | mLastCalendarSync = loadedFileVersion; |
1674 | //qDebug("setting mLastCalendarSync "); | 1674 | //qDebug("setting mLastCalendarSync "); |
1675 | } | 1675 | } |
1676 | //qDebug("*************************** "); | 1676 | //qDebug("*************************** "); |
1677 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); | 1677 | qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange); |
1678 | QPtrList<Incidence> er = remote->rawIncidences(); | 1678 | QPtrList<Incidence> er = remote->rawIncidences(); |
1679 | Incidence* inR = er.first(); | 1679 | Incidence* inR = er.first(); |
1680 | Incidence* inL; | 1680 | Incidence* inL; |
1681 | QProgressBar bar( er.count(),0 ); | 1681 | QProgressBar bar( er.count(),0 ); |
1682 | bar.setCaption (i18n("Syncing - close to abort!") ); | 1682 | bar.setCaption (i18n("Syncing - close to abort!") ); |
1683 | 1683 | ||
1684 | // ************** setting up filter ************* | 1684 | // ************** setting up filter ************* |
1685 | CalFilter *filterIN = 0; | 1685 | CalFilter *filterIN = 0; |
1686 | CalFilter *filterOUT = 0; | 1686 | CalFilter *filterOUT = 0; |
1687 | CalFilter *filter = mFilters.first(); | 1687 | CalFilter *filter = mFilters.first(); |
1688 | while(filter) { | 1688 | while(filter) { |
1689 | if ( filter->name() == mSyncManager->mFilterInCal ) | 1689 | if ( filter->name() == mSyncManager->mFilterInCal ) |
1690 | filterIN = filter; | 1690 | filterIN = filter; |
1691 | if ( filter->name() == mSyncManager->mFilterOutCal ) | 1691 | if ( filter->name() == mSyncManager->mFilterOutCal ) |
1692 | filterOUT = filter; | 1692 | filterOUT = filter; |
1693 | filter = mFilters.next(); | 1693 | filter = mFilters.next(); |
1694 | } | 1694 | } |
1695 | int w = 300; | 1695 | int w = 300; |
1696 | if ( QApplication::desktop()->width() < 320 ) | 1696 | if ( QApplication::desktop()->width() < 320 ) |
1697 | w = 220; | 1697 | w = 220; |
1698 | int h = bar.sizeHint().height() ; | 1698 | int h = bar.sizeHint().height() ; |
1699 | int dw = QApplication::desktop()->width(); | 1699 | int dw = QApplication::desktop()->width(); |
1700 | int dh = QApplication::desktop()->height(); | 1700 | int dh = QApplication::desktop()->height(); |
1701 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1701 | bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
1702 | bar.show(); | 1702 | bar.show(); |
1703 | int modulo = (er.count()/10)+1; | 1703 | int modulo = (er.count()/10)+1; |
1704 | int incCounter = 0; | 1704 | int incCounter = 0; |
1705 | while ( inR ) { | 1705 | while ( inR ) { |
1706 | if ( ! bar.isVisible() ) | 1706 | if ( ! bar.isVisible() ) |
1707 | return false; | 1707 | return false; |