More sync hacking

8 files changed, 87 insertions, 43 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index cfc6b10..9160e1d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -852,7 +852,10 @@ Event* CalendarView::getLastSyncEvent()
     //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 );
@@ -867,7 +870,21 @@ Event* CalendarView::getLastSyncEvent()
 }
-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;
@@ -875,10 +892,19 @@ void CalendarView::checkSharpEvent( Event* lastSync, Incidence* toDelete )
         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();
+    }
 
@@ -901,4 +927,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     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;
@@ -906,3 +932,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
     QDateTime modifiedCalendar = mLastCalendarSync;;
-    eventR = remote->event("last-syncEvent-device-"+mCurrentSyncName );
+    eventR = remote->event("last-syncEvent-"+mCurrentSyncName );
     if ( eventR ) {
@@ -915,3 +941,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         eventRSync->setSummary(mCurrentSyncName + i18n(" - sync event"));
-        eventRSync->setUid("last-syncEvent-device-"+mCurrentSyncName ); 
+        eventRSync->setUid("last-syncEvent-"+mCurrentSyncName ); 
         eventRSync->setDtStart( mLastCalendarSync );
@@ -967,3 +993,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         bool skipIncidence = false;
-        if ( uid.left(21) == QString("last-syncEvent-device") )
+        if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
@@ -1017,3 +1043,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     } else {
-                        checkSharpEvent(eventRSyncSharp, inR);
+                        checkExternSyncEvent(eventRSyncSharp, inR);
                         remote->deleteIncidence( inR );
@@ -1044,3 +1070,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
         bool skipIncidence = false;
-        if ( uid.left(21) == QString("last-syncEvent-device") )
+        if ( uid.left(15) == QString("last-syncEvent-") )
             skipIncidence = true;
@@ -1065,3 +1091,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
-                        checkSharpEvent(eventLSyncSharp, inL);
+                        checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
@@ -1344,3 +1370,3 @@ void CalendarView::setSyncEventsReadOnly()
     while ( ev ) {
-        if ( ev->uid().left(21) == QString("last-syncEvent-device") )
+        if ( ev->uid().left(15) == QString("last-syncEvent-") )
             ev->setReadOnly( true );
@@ -1808,3 +1834,3 @@ 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 ) {
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 8aa5e1c..557554f 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -115,2 +115,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     Incidence *currentSelection();
+    void setupExternSyncProfiles();
 
@@ -483,3 +484,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     QDateTime loadedFileVersion;
-    void checkSharpEvent( Event* lastSync, Incidence* toDelete );
+    void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
     void checkZaurusId( int id, bool todo = false );
@@ -536,3 +537,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
     Incidence *mMoveIncidence;
-
+    QPtrList<Event> mExternLastSyncEvent;
     KOTodoView *mTodoList;
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 3ba5ab2..f3231ff 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -179,12 +179,13 @@ KOPrefs::KOPrefs() :
 
-  KPrefs::setCurrentGroup("SyncProfiles");
-  addItemString("LocalMachineName",&mLocalMachineName, "undefined");
-  addItemStringList("SyncProfileNames",&mSyncProfileNames);
+//   KPrefs::setCurrentGroup("SyncProfiles");
+//   addItemString("LocalMachineName",&mLocalMachineName, "undefined");
+//   addItemStringList("SyncProfileNames",&mSyncProfileNames);
+//   addItemStringList("ExternSyncProfiles",&mExternSyncProfileNames);
 
   KPrefs::setCurrentGroup("RemoteSyncing");
-  addItemBool("UsePasswd",&mUsePassWd,false); 
-  addItemBool("WriteBackFile",&mWriteBackFile,true);
-  addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
-  addItemBool("AskForPreferences",&mAskForPreferences,true); 
-  addItemBool("ShowSyncSummary",&mShowSyncSummary,true); 
+//   addItemBool("UsePasswd",&mUsePassWd,false); 
+//   addItemBool("WriteBackFile",&mWriteBackFile,true);
+//   addItemBool("WriteBackExistingOnly",&mWriteBackExistingOnly,false);
+//   addItemBool("AskForPreferences",&mAskForPreferences,true); 
+//   addItemBool("ShowSyncSummary",&mShowSyncSummary,true); 
   addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
@@ -199,7 +200,7 @@ KOPrefs::KOPrefs() :
 #endif
-  addItemString("RemoteIP",&mRemoteIP, "192.168.0.65");
-  addItemString("RemoteUser",&mRemoteUser, "zaurus");
-  addItemString("RemotePassWd",&mRemotePassWd, "");
-  addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics");
-  addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" );
+//   addItemString("RemoteIP",&mRemoteIP, "192.168.0.65");
+//   addItemString("RemoteUser",&mRemoteUser, "zaurus");
+//   addItemString("RemotePassWd",&mRemotePassWd, "");
+//   addItemString("RemoteFile", &mRemoteFile, hdp+"mycalendar.ics");
+//   addItemString("LocalTempFile",&mLocalTempFile, "/tmp/tempsyncfile.ics" );
 
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index fe044e6..424fa98 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -217,2 +217,3 @@ class KOPrefs : public KPimPrefs
     QStringList mSyncProfileNames;
+    QStringList mExternSyncProfiles;
     QString mLocalMachineName;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 44b1264..6020a46 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -838,2 +838,3 @@ void MainWindow::fillSyncMenu()
         config.writeEntry("SyncProfileNames",prof);
+        config.writeEntry("ExternSyncProfiles","Sharp_DTM");
         config.sync();
@@ -841,2 +842,3 @@ void MainWindow::fillSyncMenu()
     }
+    KOPrefs::instance()->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
     KOPrefs::instance()->mSyncProfileNames = prof;
@@ -853,2 +855,3 @@ void MainWindow::fillSyncMenu()
     }
+    mView->setupExternSyncProfiles();
 } 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 7d23619..df5bbcf 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -77,3 +77,3 @@ public:
     virtual void save() = 0;
-
+    virtual QPtrList<Event> getExternLastSyncEvents() = 0;
     virtual bool isSaving() { return false; }
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 3c572f0..09ce9f0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -224,2 +224,15 @@ Todo *CalendarLocal::todo( int id )
 
+QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
+{
+    QPtrList<Event> el;
+    Event *todo;
+    for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
+        if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
+            if ( todo->summary().left(3) == "E: " )
+                el.append( todo );
+    }
+
+    return el;
+
+}
 Event *CalendarLocal::event( int id )
@@ -322,3 +335,2 @@ QString CalendarLocal:: getAlarmNotification()
 }
-
 void CalendarLocal::registerAlarm()
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index a2e50e3..3257198 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -87,3 +87,3 @@ class CalendarLocal : public Calendar
     QPtrList<Event> rawEvents();
-
+    QPtrList<Event> getExternLastSyncEvents();
     /**