added missing sync featute

4 files changed, 47 insertions, 12 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index db07713..cfd9290 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -726,25 +726,27 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
     // 2 take remote
     // 3 cancel 
     QDateTime lastSync = mLastCalendarSync;
     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
         bool remCh, locCh;
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
+        if ( remCh )        
+            qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( local->lastModified() > mLastCalendarSync );
         //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
         if ( !remCh && ! locCh ) {
-            //qDebug("both not changed ");
+            qDebug("both not changed ");
             lastSync = local->lastModified().addDays(1);
         } else {
             if ( locCh ) {
-                //qDebug("loc changed %d %d", local->zaurusStat(), local->revision() );
+                qDebug("loc changed %d", local->revision() );
                 lastSync = local->lastModified().addDays( -1 );
                 if ( !remCh )
                     remote->setLastModified( lastSync.addDays( -1 ) );
             } else {
-                //qDebug(" not loc changed ");
+                qDebug(" not loc changed ");
                 lastSync = local->lastModified().addDays( 1 );
                 if ( remCh )
                     remote->setLastModified( lastSync.addDays( 1 ) );
                 
             }
         }
@@ -781,12 +783,14 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
               
         }//else //debug only
         //qDebug("not equal %s %s ", local->summary().latin1(), remote->summary().latin1());
     }
     int result;
     bool localIsNew;
+    qDebug("mLastCalendarSync %s lastsync %s --- local %s remote %s ",mLastCalendarSync.toString().latin1() ,lastSync.toString().latin1()  ,  local->lastModified().toString().latin1() , remote->lastModified().toString().latin1()  );
+
     if ( full && mode < SYNC_PREF_NEWEST )
         mode = SYNC_PREF_ASK;
 
     switch( mode ) {
     case SYNC_PREF_LOCAL:
         if ( lastSync > remote->lastModified() )
@@ -812,13 +816,13 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
         if ( lastSync > remote->lastModified() )
             return 1;
         if ( lastSync > local->lastModified() )
             return 2;
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), local->lastModified().toString().latin1(), remote->lastModified().toString().latin1()  );
-        localIsNew = local->lastModified() > remote->lastModified();
+        localIsNew = local->lastModified() >= remote->lastModified();
         if ( localIsNew )
             getEventViewerDialog()->setColorMode( 1 );
          else 
             getEventViewerDialog()->setColorMode( 2 );
         getEventViewerDialog()->setIncidence(local);
         if ( localIsNew )
@@ -939,27 +943,31 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
     QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     local->resetTempSyncStat();
     mLastCalendarSync = QDateTime::currentDateTime();
     QDateTime modifiedCalendar = mLastCalendarSync;;
+    eventLSync = getLastSyncEvent();
     eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } else {
+        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+            eventRSync = (Event*)eventLSync->clone();
+        } else {
         fullDateRange = true;
         eventRSync = new Event();
         eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event"));
         eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); 
         eventRSync->setDtStart( mLastCalendarSync );
         eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         eventRSync->setCategories( i18n("SyncEvent") );
     }
-    eventLSync = getLastSyncEvent();
+    }
     if ( eventLSync->dtStart() == mLastCalendarSync )
         fullDateRange = true;
    
     if ( ! fullDateRange  ) {
         if ( eventLSync->dtStart() != eventRSync->dtStart() ) {
             
@@ -1113,13 +1121,32 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     }
                 }
             }
         }
         inL = el.next();
     }
-     
+    if ( KOPrefs::instance()->mWriteBackInFuture ) {
+        er = remote->rawIncidences(); 
+        inR = er.first();
+        QDateTime dt;
+        QDateTime cur = QDateTime::currentDateTime();
+        QDateTime end = cur.addSecs( KOPrefs::instance()->mWriteBackInFuture * 3600 *24 *7 );
+        while ( inR ) {
+            if ( inR->type() == "Todo" ) {
+                Todo * t = (Todo*)inR;
+                if ( t->hasDueDate() )
+                    dt = t->dtDue();
+                else
+                    dt = cur.addSecs( 62 );
+            }
+            else dt = inR->dtStart();
+            if ( dt < cur || dt > end )
+                remote->deleteIncidence( inR );
+            inR =  er.next();
+        }
+    }
     bar.hide();
     mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
     eventLSync->setReadOnly( false );
     eventLSync->setDtStart( mLastCalendarSync );
     eventRSync->setDtStart( mLastCalendarSync );
     eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 446fe2e..a9ac52f 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -196,12 +196,13 @@ class KOPrefs : public KPimPrefs
     bool mToolBarUp;
     bool mToolBarMiniIcons;
 
     bool mAskForQuit;
     bool mUsePassWd;
     bool mWriteBackFile;
+    int  mWriteBackInFuture;
     bool mAskForPreferences;
     bool mShowSyncSummary;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mWriteBackExistingOnly;
 
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index d8aa43a..aa30b52 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -911,12 +911,15 @@ int MainWindow::ringSync()
         if ( temp->getIncludeInRingSync() && ( i < 1 || i > 2  )) {
             setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
             // KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
             KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
             KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
+            KOPrefs::instance()->mWriteBackInFuture = 0;
+            if ( temp->getWriteBackFuture() )
+                KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
             KOPrefs::instance()->mShowSyncSummary = false;
             mView->setSyncDevice(syncProfileNames[i] );
             mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
             if ( i == 0 ) {
                 syncSharp();
             } else {
@@ -1014,12 +1017,15 @@ void MainWindow::slotSyncMenu( int action )
     temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
     temp->readConfig(&config);
     KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
     KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
     KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
     KOPrefs::instance()->mWriteBackExistingOnly = temp->getWriteBackExisting();
+    KOPrefs::instance()->mWriteBackInFuture = 0;
+    if ( temp->getWriteBackFuture() )
+        KOPrefs::instance()->mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     KOPrefs::instance()->mShowSyncSummary = temp->getShowSummaryAfterSync();
     if ( action == 1000  ) {
         syncSharp();
 
     } else if ( action == 1001 ) {
         syncLocalFile();
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index ef69bce..6d0da5c 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -272,14 +272,12 @@ ulong PhoneFormat::getCsum( const QStringList &  attList)
                     mul = mul * mul;
                 int ii = i+1;
                 add = add * mul *ii*ii*ii;
                 cSum += add;
             }
         }
-        if ( i == 0 )
-            qDebug("csum: i == 0 %d ", cSum); 
             
     }
     QString dump = attList.join(",");
     qDebug("csum: %d %s", cSum,dump.latin1()); 
     
     return cSum;
@@ -464,19 +462,18 @@ void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 #include <qcstring.h>
 
 void PhoneFormat::afterSave( Incidence* inc)
 {
     uint csum;
     inc->removeID( mProfileName );
-#if 0
     if ( inc->type() == "Event")
         csum = PhoneFormat::getCsumEvent( (Event*) inc );
     else
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
-#endif
+
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
 }
 bool PhoneFormat::save( Calendar *calendar)
 {
     QLabel status ( i18n(" Opening device ..."), 0 );
@@ -511,12 +508,16 @@ bool PhoneFormat::save( Calendar *calendar)
     //  2 remove todos which should be deleted
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
             calendar->deleteTodo( to );   
+        } else {
+            if ( to->isCompleted()) {
+                calendar->deleteTodo( to );   
+            }
         } 
         to = tl.next();
     } 
     //  3 save file 
     VCalFormat vfsave;
     vfsave.setLocalTime ( true ); 
@@ -560,13 +561,13 @@ bool PhoneFormat::save( Calendar *calendar)
         //qDebug("event new ID %s",ev->summary().latin1()); 
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             uint csum;
             csum = PhoneFormat::getCsumEvent( ev );
             QString cSum = QString::number( csum );
-            ev->setCsum( mProfileName,  cSum );
+            //ev->setCsum( mProfileName,  cSum );
             //qDebug("Event cSum %s ", cSum.latin1());
             ev1 = er1.first(); 
             while ( ev1 ) {
                 if (  ev1->getCsum( mProfileName ) == cSum ) {
                     er1.remove( ev1 );
                     afterSave( ev );
@@ -596,13 +597,13 @@ bool PhoneFormat::save( Calendar *calendar)
         qDebug("todo2 %d ", procCount);
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             uint csum;
             csum = PhoneFormat::getCsumTodo( to );
             QString cSum = QString::number( csum );
-            to->setCsum( mProfileName,  cSum );
+            //to->setCsum( mProfileName,  cSum );
             qDebug("Todo cSum %s ", cSum.latin1());
             Todo* to1 = tl1.first(); 
             while ( to1 ) {
                 if (  to1->getCsum( mProfileName ) == cSum ) {
                     tl1.remove( to1 );
                     afterSave( to );