implemented remove sync info for kopi and kapi

11 files changed, 85 insertions, 7 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 3641c0c..2785131 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -555,2 +555,10 @@ void AddressBook::smplifyAddressees()
 }
+void AddressBook::removeSyncInfo( QString syncProfile)
+{
+    Iterator ait;
+    for ( ait = begin(); ait != end(); ++ait ) {
+        (*ait).removeID( syncProfile );
+    }
+
+}
 void AddressBook::preparePhoneSync( QString currentSyncDevice, bool isPreSync )
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 5edca06..f124dc9 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -146,2 +146,3 @@ class AddressBook : public QObject
     void smplifyAddressees(); 
+    void removeSyncInfo( QString syncProfile); 
     void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 40877ef..a660a9d 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -555,3 +555,6 @@ void Addressee::removeID(const QString &prof)
     detach();
-    mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
+    if ( prof.isEmpty() )
+        mData->mExternalId = ":";
+    else
+        mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
     
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index efae874..e56e46a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2814,4 +2814,4 @@ void  KABCore::removeSyncInfo( QString syncProfile)
 {
-    qDebug("removeSyncInfo for profile %s ", syncProfile.latin1());
-
+    qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
+    mAddressBook->removeSyncInfo( syncProfile );
 }
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index af01625..a08f243 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3770,2 +3770,3 @@ void  CalendarView::removeSyncInfo( QString syncProfile)
     qDebug("removeSyncInfo for profile %s ", syncProfile.latin1());
+    mCalendar->removeSyncInfo( syncProfile );
 
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index b801186..b7d6a1f 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -80,2 +80,3 @@ public:
     virtual QPtrList<Event> getExternLastSyncEvents() = 0;
+    virtual void removeSyncInfo( QString syncProfile) = 0; 
     virtual bool isSaving() { return false; }
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 21b4aaf..3f46d53 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -223,3 +223,24 @@ Todo *CalendarLocal::todo( QString syncProf, QString id )
 }
-
+void CalendarLocal::removeSyncInfo( QString syncProfile)
+{
+    QPtrList<Incidence> all = rawIncidences() ;
+    Incidence *inc;
+    for ( inc = all.first(); inc; inc = all.next() ) {
+        inc->removeID( syncProfile );
+    }
+    if ( syncProfile.isEmpty() ) {
+        QPtrList<Event> el;
+        Event *todo;
+        for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
+            if ( todo->uid().left( 15 ) == QString("last-syncEvent-") )
+                    el.append( todo );
+        }
+        for ( todo = el.first(); todo; todo = el.next() ) {
+           deleteIncidence ( todo );
+        }
+    } else {
+        Event *lse = event( "last-syncEvent-"+ syncProfile);
+        deleteIncidence ( lse );
+    }
+}
 QPtrList<Event> CalendarLocal::getExternLastSyncEvents()
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 5b6c64c..98ec710 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -71,2 +71,3 @@ class CalendarLocal : public Calendar
     */
+    void removeSyncInfo( QString syncProfile); 
     bool addAnniversaryNoDup( Event *event );
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index b36dc1a..9aa517c 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -355,3 +355,6 @@ void IncidenceBase::removeID(const QString &prof)
 {
-    mExternalId = KIdManager::removeId ( mExternalId, prof);
+    if ( prof.isEmpty() )
+        mExternalId = ":";
+    else
+        mExternalId = KIdManager::removeId ( mExternalId, prof);
 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 4390a06..feb184b 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -89,2 +89,8 @@ void KSyncManager::fillSyncMenu()
     mSyncMenu->insertSeparator();
+    QPopupMenu *clearMenu = new QPopupMenu ( mSyncMenu );
+    mSyncMenu->insertItem( i18n("Remove sync info"),clearMenu, 5000 );
+    clearMenu->insertItem( i18n("For all profiles"), 1 );
+    clearMenu->insertSeparator();
+    connect ( clearMenu, SIGNAL( activated ( int )  ), this, SLOT (slotClearMenu( int ) ) );
+    mSyncMenu->insertSeparator();
     if ( mServerSocket == 0 ) {
@@ -97,3 +103,2 @@ void KSyncManager::fillSyncMenu()
     mSyncMenu->insertSeparator();
-    
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
@@ -134,3 +139,4 @@ void KSyncManager::fillSyncMenu()
     for ( i = 0; i < prof.count(); ++i ) {
-        mSyncMenu->insertItem(  prof[i], 1000+i );
+        mSyncMenu->insertItem(  prof[i], 1000+i ); 
+        clearMenu->insertItem(  prof[i], 1000+i ); 
         if ( i == 2 )
@@ -142,2 +148,3 @@ void KSyncManager::fillSyncMenu()
         mSyncMenu->removeItem( 1000 );
+        clearMenu->removeItem( 1000 );
     }
@@ -146,2 +153,3 @@ void KSyncManager::fillSyncMenu()
         mSyncMenu->removeItem( 1000 );
+        clearMenu->removeItem( 1000 );
     }
@@ -149,4 +157,26 @@ void KSyncManager::fillSyncMenu()
     mSyncMenu->removeItem( 1002 );
+    clearMenu->removeItem( 1002 );
 }
+void KSyncManager::slotClearMenu( int action )
+{
+    QString syncDevice;
+    if ( action > 999 ) {
+        syncDevice = mSyncProfileNames[action - 1000] ;
+    }
 
+
+
+    int result = 0;
+    QString sd;
+    if ( syncDevice.isEmpty() )
+        sd = i18n("Do you want to\nclear all sync info\nof all profiles?");
+    else
+        sd = i18n("Do you want to\nclear the sync\ninfo of profile\n%1?\n"). arg( syncDevice );
+
+    result = QMessageBox::warning( mParent, i18n("Warning!"),sd,i18n("OK"), i18n("Cancel"), 0,
+                                   0, 1 );
+    if ( result )
+        return;
+    mImplementation->removeSyncInfo( syncDevice );
+}
 void KSyncManager::slotSyncMenu( int action )
@@ -154,2 +184,4 @@ void KSyncManager::slotSyncMenu( int action )
     qDebug("syncaction %d ", action);
+    if ( action == 5000 )
+        return;
     if ( action == 0 ) {
@@ -837,4 +869,10 @@ void KSyncManager::confSync()
     sp->exec();
+    QStringList oldSyncProfileNames = mSyncProfileNames;
     mSyncProfileNames = sp->getSyncProfileNames();
     mLocalMachineName = sp->getLocalMachineName ();
+    int ii;
+    for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) {
+        if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) )
+            mImplementation->removeSyncInfo( oldSyncProfileNames[ii]  );
+    }
     QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index af4f1ab..aa32e28 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -156,2 +156,3 @@ class KSyncManager : public QObject
     void slotSyncMenu( int );
+    void slotClearMenu( int action );
     void deleteCommandSocket(KCommandSocket*s, int state);