1 files changed, 51 insertions, 25 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index cfc6b10..9160e1d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -847,43 +847,69 @@ int  CalendarView::takeEvent( Incidence* local,  Incidence* remote, int mode , b
     return 0;
 }
 Event* CalendarView::getLastSyncEvent()
 {
     Event* lse; 
     //qDebug("CurrentSyncDevice %s ",mCurrentSyncDevice .latin1() );
-    lse =   mCalendar->event( "last-syncEvent-device-"+mCurrentSyncDevice );
+    lse =   mCalendar->event( "last-syncEvent-"+mCurrentSyncDevice );
     if (!lse) {
         lse = new Event();
-        lse->setUid( "last-syncEvent-device-"+mCurrentSyncDevice ); 
-        lse->setSummary(mCurrentSyncDevice + i18n(" - sync event"));
+        lse->setUid( "last-syncEvent-"+mCurrentSyncDevice ); 
+        QString sum = "";
+        if ( KOPrefs::instance()->mExternSyncProfiles.contains( mCurrentSyncDevice ) )
+            sum = "E: ";
+        lse->setSummary(sum+mCurrentSyncDevice + i18n(" - sync event"));
         lse->setDtStart( mLastCalendarSync );
         lse->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         lse->setCategories( i18n("SyncEvent") );
         lse->setReadOnly( true );
         mCalendar->addEvent( lse );
     }
 
     return lse;
 
 }
-void CalendarView::checkSharpEvent( Event* lastSync, Incidence* toDelete )
+void CalendarView::setupExternSyncProfiles()
 {
-    if ( ! lastSync )
-        return;
-    if ( toDelete->zaurusId() < 0 )
+    Event* lse; 
+    mExternLastSyncEvent.clear();
+    int i;
+    for ( i = 0; i < KOPrefs::instance()->mExternSyncProfiles.count(); ++i ) {
+        lse = mCalendar->event( "last-syncEvent-"+ KOPrefs::instance()->mExternSyncProfiles[i] );
+        if ( lse )
+            mExternLastSyncEvent.append( lse );
+        else
+            qDebug("Last Sync event not found for %s ",  KOPrefs::instance()->mExternSyncProfiles[i].latin1());
+    }
+
+}
+// we check, if the to delete event has a id for a profile
+//  if yes, we set this id in the profile to delete
+void CalendarView::checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete )
+{
+    if ( ! lastSync.count() == 0 )
         return;
     if ( toDelete->type() == "Journal" )
         return;
-    QString des = lastSync->description();
-    QString pref = "e";
-    if ( toDelete->type() == "Todo" )
-        pref = "t";
-    des += pref+ QString::number ( toDelete->zaurusId() ) + ",";
-    lastSync->setReadOnly( false );
-    lastSync->setDescription( des );
-    lastSync->setReadOnly( true );
+
+    Event* eve = lastSync.first();
+
+    while ( eve ) {
+        int id = toDelete->getID( eve->uid().mid( 15 ) ); // this is the sync profile name
+        if ( id >=  0 ) {
+            QString des = eve->description();
+            QString pref = "e";
+            if ( toDelete->type() == "Todo" )
+                pref = "t";
+            des += pref+ QString::number ( id ) + ",";
+            eve->setReadOnly( false );
+            eve->setDescription( des );
+            eve->setReadOnly( true );
+        }
+        eve = lastSync.next();
+    }
 
 }
 bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int mode )
 {
     bool syncOK = true;
     int addedEvent = 0;
@@ -896,27 +922,27 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     Event* eventR;
     QString uid;
     int take;
     Event* eventL;
     Event* eventRSync;
     Event* eventLSync;
-    Event* eventRSyncSharp = remote->event( "last-syncEvent-device-Sharp-DTM");
-    Event* eventLSyncSharp = local->event( "last-syncEvent-device-Sharp-DTM");
+    QPtrList<Event>  eventRSyncSharp = remote->getExternLastSyncEvents();
+    QPtrList<Event>  eventLSyncSharp = local->getExternLastSyncEvents();
     bool fullDateRange = false;
     mLastCalendarSync = QDateTime::currentDateTime();
     QDateTime modifiedCalendar = mLastCalendarSync;;
-    eventR = remote->event("last-syncEvent-device-"+mCurrentSyncName );
+    eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
         eventRSync = (Event*) eventR->clone();
         remote->deleteEvent(eventR );
 
     } else {
         fullDateRange = true;
         eventRSync = new Event();
         eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event"));
-        eventRSync->setUid("last-syncEvent-device-"+mCurrentSyncName ); 
+        eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); 
         eventRSync->setDtStart( mLastCalendarSync );
         eventRSync->setDtEnd( mLastCalendarSync.addSecs( 7200 ) );
         eventRSync->setCategories( i18n("SyncEvent") );
     }
     eventLSync = getLastSyncEvent();
     if ( eventLSync->dtStart() == mLastCalendarSync )
@@ -962,13 +988,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inR->uid(); 
         bool skipIncidence = false;
-        if ( uid.left(21) == QString("last-syncEvent-device") )
+        if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
        
         qApp->processEvents();
         if ( !skipIncidence ) {
             inL = local->incidence( uid );
             if ( inL ) { // maybe conflict - same uid in both calendars
@@ -1012,13 +1038,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                 } else {
                     if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
                         inR->setLastModified( modifiedCalendar );
                         local->addIncidence( inR->clone() );
                         ++addedEvent;
                     } else {
-                        checkSharpEvent(eventRSyncSharp, inR);
+                        checkExternSyncEvent(eventRSyncSharp, inR);
                         remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     }
                 }
             }
         }
@@ -1039,13 +1065,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
             return false;
         if ( incCounter % modulo == 0 )
             bar.setProgress( incCounter );
         ++incCounter;
         uid = inL->uid();
         bool skipIncidence = false;
-        if ( uid.left(21) == QString("last-syncEvent-device") )
+        if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
         if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" )
             skipIncidence = true;
         if ( !skipIncidence )  {
             inR = remote->incidence( uid );
             if ( ! inR ) { 
@@ -1060,13 +1086,13 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL->setLastModified( modifiedCalendar );
                             remote->addIncidence(  inL->clone() );
                         }
                     }
                 } else {
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
-                        checkSharpEvent(eventLSyncSharp, inL);
+                        checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! KOPrefs::instance()->mWriteBackExistingOnly ) {
                             ++addedEventR; 
                             inL->setLastModified( modifiedCalendar );
@@ -1339,13 +1365,13 @@ bool CalendarView::importQtopia( const QString &categories,
 void CalendarView::setSyncEventsReadOnly()
 {
     Event * ev;
     QPtrList<Event> eL = mCalendar->rawEvents(); 
     ev = eL.first();
     while ( ev ) {
-        if ( ev->uid().left(21) == QString("last-syncEvent-device") )
+        if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setReadOnly( true );
         ev =  eL.next();
     } 
 }
 bool CalendarView::openCalendar(QString filename, bool merge)
 {
@@ -1803,13 +1829,13 @@ void CalendarView::changeTodoDisplay(Todo *which, int action)
 {
     changeIncidenceDisplay((Incidence *)which,  action);
 }
 void CalendarView::checkZaurusId( int id, bool todo )
 {
     if ( id >= 0 ) { 
-        Incidence* lse = mCalendar->event( "last-syncEvent-device-Sharp-DTM");
+        Incidence* lse = mCalendar->event( "last-syncEvent-Sharp-DTM");
         if ( lse ) {
             QString des = lse->description();
             QString pref = "e";
             if ( todo )
                 pref = "t";
             des += pref+ QString::number ( id ) + ",";