fixx

2 files changed, 23 insertions, 17 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 8fab725..2ce78c7 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,85 +1,89 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.14 ************
 
 Added some buttons to the KO/Pi Quick-todo line to make it possible to quickly access some todo view layout settings like display all flat/open/close and hide/show running/done.
 Added a button to add a subtodo quickly.
 
 Added a possibility to search for conflicting events. (In the Action menu. Keyboard shortcut "q", shift+q or ctrl +q ).
 Added an option to change the layout of the list week to column mode.
 
 Fixed some usability problems in pi-sync mode by adding some progress information about file transfer.
 
 Fixed pi-sync problems with the new multi calendar feature.
 Now pi-sync behaviour should be:
 1) Local sends file request ( as usual )
 2) Remote sends file which contains data of all enabled ( the calendar where the "eye" column is checked ) calendars.
 3) Local syncs with data, adds new entries to default calendar and sends file back ( as usual ).
+   If the data which local receives contains entries which are on disabled calendars on local this entries are updated and not added as duplicates to the default calendar.
 4) Remote updates the data and adds new entries to default calendar. Readonly entries are not changed on remote.
    If the data which remote receives contains entries which are on disabled calendars on remote this entries are updated and not added as duplicates to the default calendar.
 
-Summary: If you have different calendars on remote and local and some of them disabled you may get some "strange" bahaviour.
+Summary: 
+No new item ( new created after the last sync ) in a disabled calendar is propagated to the sync partner. Readonly items are synced and added/changed on the sync partner if it is not readonly on the sync partner.
+If you have different calendars on remote and local and some of them disabled you may get some "strange" bahaviour.
+Well, the syncing has become quite complicated ... you should have no problems if you enable all calendars. 
 
 ********** VERSION 2.1.13 ************
 
 Fixed a problem in KA/Pi search.
 Fixed some minor problems in KO/Pi.
 Added calendar selection possibility to the todo view popup and to the event/todo/journal editor.
 
 Fixed memory usage problems in KA/Pi:
 When loading data KA/Pi did load the file data twice.
 Example:
   A 600k file did consume 1200k memory during loading process.
   This is fixed, it does now consume only  600k during loading process.
 When saving data KA/Pi did consume a lot of memory for the data parsing during the save process.
 This is fixed.
 Example:
   Before saving a 600k file KA/Pi did consume 21.7 Meg of Ram.
   When saving  KA/Pi did consume 28.6 Meg of Ram. That causes a crash on the Zaurus because there was no memeory left in the system.
   Now  KA/Pi is consuming on saving the same data 22.0 Meg of Ram during the save process. 
 Note: The memory usage of KA/Pi after the data is loaded/saved has not changed.
 The saving of data may be a bit slower now.
 
 Fixed memory usage problems in KO/Pi:
 When KO/Pi did save the data to file, it did not release the used buffers after saving.
 The used buffer was released after saving the next time, but there was new buffer space allocated again on that save operation.
 This is fixed.
 Example:
   When saving a 400k file KO/Pi do now use 400k less memory now.
 
 Optimized memory usage in KO/Pi Agenda view:
 KO/Pi is storing some paint information in extra buffers for faster repainting of the agenda view.
 These buffers were not made smaller (i.e. downsized)  because of performance reasons.
 The handling of these buffers are now much smarter:
 Two (of six) buffers are removed completely.
 The remaing four buffers are now downsized after not using the agenda view for 45 seconds.
 Such that the memory usage of KO/Pi is smaller now in general ( because 2 buffers are removed) and is much smaller when not using the agenda view. That is very important when using fastload for KO/Pi.
 
 Worst case example ( for a maximum size agenda content):
   When resizing the agenda content to a large scale, KO/Pi did use 17Meg of mem ( and did not use less memory until it was stopped). Now KO/Pi is using on the same operation only 14.3 Meg of mem and after 45 seconds not using the agenda view it uses only 9.4 Meg of mem.
 
 When switching to an unused Agenda view now KO/Pi is upizing the buffers again. This takes less than a second. Such that switching to Agenda view (after not using it for more than 45 seconds) is now a bit slower. 
 
 Summary:
 Many memory wasting problems of KA/Pi and KO/Pi fixed such that it is better to use on the Zaurus.
 
 ********** VERSION 2.1.12 ************
 
 KO/Pi:
 Many small usability fixes, e.g. rearranged the popup menus such that they are better to use on the Zaurus.
 Fixed a problem with the month view when file was saved but KO/Pi was not the active window.
 Fixed some problems in the resource config dialog (e.g. added a warning if you set all calendars to read-only).
 Fixed some other small problems.
 
 ********** VERSION 2.1.11 ************
 
 KO/Pi:
 Because we can have many calendars now in KO/Pi we can have more than one journal entry per day.
 Added features to handle (and add ) more than one journal entry per day.
 Added option for a journal title.
 
 Added info about the calendar, the item belongs to, to the event/todo/journal viewer. 
 Fixed a problem of the alarm of completed recurring todos.
 Added to the event/todo editor to set quickly the category of an item.
 
 
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index a350c3b..7044e90 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1380,237 +1380,239 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         fullDateRange = true;
    
     if ( ! fullDateRange  ) {
         if ( eventLSync->dtStart() != eventRSync->dtStart() ) {
             
             qDebug("set fulldate to true %s %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());
             fullDateRange = true;
         } 
     }
     if ( mSyncManager->syncWithDesktop() ) {
         fullDateRange = ( eventLSync->dtStart() <= mLastCalendarSync && eventLSync->dtStart().addSecs(1) >= mLastCalendarSync  ); 
     }
     if ( fullDateRange )
         mLastCalendarSync = QDateTime::currentDateTime().addDays( -100*365);
     else
         mLastCalendarSync = eventLSync->dtStart();
     // for resyncing if own file has changed
     if ( mCurrentSyncDevice == "deleteaftersync" ) {
         mLastCalendarSync = loadedFileVersion;
         //qDebug("setting mLastCalendarSync ");
     }
     //qDebug("*************************** ");
     qDebug("KO: mLastCalendarSync %s .Full: %d",mLastCalendarSync.toString().latin1(), fullDateRange);
     QPtrList<Incidence> er = remote->rawIncidences(); 
     Incidence* inR = er.first();
     Incidence* inL;
     QProgressBar bar( er.count(),0 );
     bar.setCaption (i18n("Syncing - close to abort!") );
     
     // ************** setting up filter *************
     CalFilter *filterIN = 0;
     CalFilter *filterOUT = 0;
     CalFilter *filter = mFilters.first();
     while(filter) {
         if ( filter->name() == mSyncManager->mFilterInCal )
             filterIN = filter;
         if ( filter->name() == mSyncManager->mFilterOutCal )
             filterOUT = filter;
         filter = mFilters.next();
     }
     int w = 300;
     if ( QApplication::desktop()->width() < 320 )
         w = 220;
     int h = bar.sizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     bar.show();
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( inR ) {
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inR->uid(); 
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         QString idS;
         qApp->processEvents();
         if ( !skipIncidence ) {
-            inL = local->incidence( uid );
+            inL = local->incidenceForUid( uid , false );
             if ( inL ) { // maybe conflict - same uid in both calendars
                 if ( (take = takeEvent( inL, inR, mode, fullDateRange )) > 0 ) {
                     //qDebug("take %d %s ", take, inL->summary().latin1());
                     if ( take == 3 )
                         return false;
                     if ( take == 1  ) {// take local **********************
                         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL )
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                         else
                             idS = inR->IDStr();
                         int calID = inR->calID();
                         remote->deleteIncidence( inR );
                         inR = inL->clone();
                         inR->setCalID( calID );
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                         if ( mGlobalSyncMode != SYNC_MODE_EXTERNAL )
                             inR->setIDStr( idS );
                         remote->addIncidence(  inR );
                         if ( mSyncManager->syncWithDesktop() )
                             inR->setPilotId( 2 );
                         ++changedRemote;
                     } else {// take remote  **********************
-                        idS = inL->IDStr();
-                        int pid = inL->pilotId();
-                        int calID = inL->calID();
-                        local->deleteIncidence( inL );
-                        inL = inR->clone();
-                        inL->setCalID( calID );
-                        if ( mSyncManager->syncWithDesktop() )
-                            inL->setPilotId( pid  );
-                        inL->setIDStr( idS );
-                        if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
-                            inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
-                            inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
+                        if ( !inL->isReadOnly() ) {
+                            idS = inL->IDStr();
+                            int pid = inL->pilotId();
+                            int calID = inL->calID();
+                            local->deleteIncidence( inL );
+                            inL = inR->clone();
+                            inL->setCalID( calID );
+                            if ( mSyncManager->syncWithDesktop() )
+                                inL->setPilotId( pid  );
+                            inL->setIDStr( idS );
+                            if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
+                                inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
+                                inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
+                            }
+                            local->addIncidence(  inL  );
+                            ++changedLocal;
                         }
-                        local->addIncidence(  inL  );
-                        ++changedLocal;
                     }
                 }
             } else { //  no conflict ********** add or delete remote 
                 if ( !filterIN || filterIN->filterCalendarItem( inR  ) ){
                     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                         QString des = eventLSync->description(); 
                         QString pref = "e";
                         if ( inR->typeID() == todoID )
                             pref = "t";
                         if ( des.find(pref+ inR->getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                             inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                             //remote->deleteIncidence( inR );
                             ++deletedEventR; 
                         } else {
                             inR->setLastModified( modifiedCalendar );
                             inL = inR->clone();
                             inL->setIDStr( ":" );
                             inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
                             
                             inL->setCalID( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
                         
                         }
                     } else {
                         if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
                             inR->setLastModified( modifiedCalendar );
                             inL = inR->clone();
                             inL->setIDStr( ":" );
                             inL->setCalID( 0 );// add to default cal
                             local->addIncidence( inL );
                             ++addedEvent;
                         
                         } else {
                             checkExternSyncEvent(eventRSyncSharp, inR);
                             remote->deleteIncidence( inR );
                             ++deletedEventR; 
                         }
                     }
                 } else {
                     ++filteredIN;
                 }
             }
         }
         inR =  er.next();
     }
     QPtrList<Incidence> el = local->rawIncidences(); 
     inL = el.first();
     modulo = (el.count()/10)+1;
     bar.setCaption (i18n("Add / remove events") ); 
     bar.setTotalSteps (  el.count()  ) ;
     bar.show();
     incCounter = 0;
    
     while ( inL ) {
            
         qApp->processEvents();
         if ( ! bar.isVisible() )
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inL->uid();
         bool skipIncidence = false;
         if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->typeID() == journalID )
             skipIncidence = true;
         if ( !skipIncidence )  {
-            inR = remote->incidence( uid );
+            inR = remote->incidenceForUid( uid , true );
             if ( ! inR ) { 
                 if ( !filterOUT ||  filterOUT->filterCalendarItem( inL ) ){
                     //  no conflict ********** add or delete local
                     if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) {
                         if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                             checkExternSyncEvent(eventLSyncSharp, inL);
                             local->deleteIncidence( inL );
                             ++deletedEventL; 
                         } else {
                             if ( ! mSyncManager->mWriteBackExistingOnly ) {
                                 inL->removeID(mCurrentSyncDevice );
                                 ++addedEventR; 
                                 //qDebug("remote added Incidence %s ", inL->summary().latin1());
                                 inL->setLastModified( modifiedCalendar );
                                 inR = inL->clone();
                                 inR->setIDStr( ":" );
                                 inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
                                 inR->setCalID( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
                         }
                     } else {
                         if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
                             checkExternSyncEvent(eventLSyncSharp, inL);
                             local->deleteIncidence( inL );
                             ++deletedEventL; 
                         } else {
                             if ( ! mSyncManager->mWriteBackExistingOnly ) {
                                 ++addedEventR; 
                                 inL->setLastModified( modifiedCalendar );
                                 inR = inL->clone();
                                 inR->setIDStr( ":" );
                                 inR->setCalID( 0 );// add to default cal
                                 remote->addIncidence(  inR );
                             }
                         }
                     }
                 } else {
                     ++filteredOUT;
                 }
             }
         }
         inL = el.next();
     }
     int delFut = 0;
     int remRem = 0;
     if ( mSyncManager->mWriteBackInFuture ) {
         er = remote->rawIncidences(); 
         remRem = er.count();
         inR = er.first();
         QDateTime dt;
         QDateTime cur = QDateTime::currentDateTime().addDays( -(mSyncManager->mWriteBackInPast * 7) );
         QDateTime end = QDateTime::currentDateTime().addDays( (mSyncManager->mWriteBackInFuture ) *7 );
         while ( inR ) {
             if ( inR->typeID() == todoID ) {
                 Todo * t = (Todo*)inR;
                 if ( t->hasDueDate() )
                     dt = t->dtDue();
                 else
                     dt = cur.addSecs( 62 );
             }
             else if (inR->typeID() == eventID ) {
                 bool ok;
                 dt =  inR->getNextOccurence( cur, &ok );