moved sync related progressbar management to ksyncmanager, and proceeded with

the sync implementation of pwmanager

7 files changed, 318 insertions, 55 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f222234..f8359de 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1079,7 +1079,8 @@ void KABCore::save()
      if (syncManager->blockSave())
         return;
-    syncManager->setBlockSave(true);
     if ( !mModified )
         return;
+
+    syncManager->setBlockSave(true);
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
@@ -2335,22 +2336,15 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     Addressee inR ;//= er.first();
     Addressee  inL;
-    QProgressBar bar( er.count(),0 );
-    bar.setCaption (i18n("Syncing - close to abort!") );
-    
-    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();
+
+    syncManager->showProgressBar(0, i18n("Syncing - close to abort!"), er.count());
+
     int modulo = (er.count()/10)+1;
     int incCounter = 0;
     while ( incCounter < er.count()) {
-        if ( ! bar.isVisible() )
+	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
-            bar.setProgress( incCounter );
+	  syncManager->showProgressBar(incCounter);
+
         uid = er[ incCounter ]; 
         bool skipIncidence = false;
@@ -2444,14 +2438,13 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     QStringList el = local->uidList(); 
     modulo = (el.count()/10)+1;
-    bar.setCaption (i18n("Add / remove addressees") ); 
-    bar.setTotalSteps (  el.count()  ) ;
-    bar.show();
+
+    syncManager->showProgressBar(0, i18n("Add / remove addressees"), el.count());
     incCounter = 0;
     while ( incCounter < el.count()) {
         qApp->processEvents();
-        if ( ! bar.isVisible() )
+	if (syncManager->isProgressBarCanceled())
             return false;
         if ( incCounter % modulo == 0 )
-            bar.setProgress( incCounter );
+	  syncManager->showProgressBar(incCounter);
         uid = el[ incCounter ]; 
         bool skipIncidence = false;
@@ -2500,5 +2493,5 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
     }
     el.clear();
-    bar.hide();
+    syncManager->hideProgressBar();
     mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
     // get rid of micro seconds
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 87f200a..07e6761 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -35,4 +35,5 @@
 
 #include <qdir.h>
+#include <qprogressbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
@@ -54,4 +55,14 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
   : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs), mSyncMenu(syncmenu)
 {
+    bar = new QProgressBar ( 1, 0 );
+    bar->setCaption ("");
+    
+    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 );
 
 }
@@ -59,5 +70,5 @@ KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, Targ
 KSyncManager::~KSyncManager()
 {
-
+  delete bar;
 }
 
@@ -79,6 +90,6 @@ void KSyncManager::fillSyncMenu()
     if ( prof.count() < 3 ) {
         prof.clear();
-        prof << i18n("Sharp_DTM");
-        prof << i18n("Local_file");
+	prof << i18n("Sharp_DTM");
+	prof << i18n("Local_file");
         prof << i18n("Last_file");
         KSyncProfile* temp = new KSyncProfile ();
@@ -99,5 +110,4 @@ void KSyncManager::fillSyncMenu()
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
-
         mSyncMenu->insertItem(  prof[i], 1000+i );
         if ( i == 2 )
@@ -105,6 +115,10 @@ void KSyncManager::fillSyncMenu()
     }
     QDir app_dir;
-    if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
-        mSyncMenu->setItemEnabled( false , 1000 );
+    //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
+    if ( mTargetApp == PWMPI) {
+        mSyncMenu->removeItem( 1000 );
+    }
+    else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
+        mSyncMenu->setItemEnabled( 1000, false );
     }
     //probaly useless
@@ -162,7 +176,23 @@ void KSyncManager::slotSyncMenu( int action )
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
-	  if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
+	  switch(mTargetApp)
+	  {
+	    case (KAPI):
+	      if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
-
+	      break;
+	    case (KOPI):
+	      if ( syncWithFile( temp->getRemoteFileName( ), false ) )
+                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
+	      break;
+	    case (PWMPI):
+	      if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
+                mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
+	      break;
+	    default:
+	      qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+	      break;
+	      
+	  }
         } else {
             if (  temp->getIsPhoneSync() ) {
@@ -184,6 +214,24 @@ void KSyncManager::syncLocalFile()
 
     QString fn =mPrefs->mLastSyncedLocalFile;
-
-    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), mParent );
+    QString ext;
+
+	  switch(mTargetApp)
+	  {
+	    case (KAPI):
+	      ext = "(*.vcf)";
+	      break;
+	    case (KOPI):
+	      ext = "(*.ics/*.vcs)";
+	      break;
+	    case (PWMPI):
+	      ext = "(*.pwm)";
+	      break;
+	    default:
+	      qDebug("KSyncManager::syncLocalFile: invalid apptype selected");
+	      break;
+	      
+	  }
+
+    fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
     if ( fn == "" )
         return;
@@ -285,5 +333,25 @@ int KSyncManager::ringSync()
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
-        if ( temp->getIncludeInRingSyncAB() && ( i < 1 || i > 2  )) {
+
+	QString includeInRingSync;
+	switch(mTargetApp)
+	  {
+	  case (KAPI):
+	    includeInRingSync = temp->getIncludeInRingSyncAB();
+	      break;
+	  case (KOPI):
+	    includeInRingSync = temp->getIncludeInRingSync();
+	      break;
+	  case (PWMPI):
+	    includeInRingSync = temp->getIncludeInRingSyncPWM();
+	      break;
+	    default:
+	      qDebug("KSyncManager::ringSync: invalid apptype selected");
+	      break;
+	      
+	  }
+        
+	
+	if ( includeInRingSync && ( i < 1 || i > 2  )) {
             mParent->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
@@ -301,6 +369,22 @@ int KSyncManager::ringSync()
             } else {
                 if ( temp->getIsLocalFileSync() ) {
-                    if ( syncWithFile( temp->getRemoteFileNameAB( ), true ) )
-                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
+		  switch(mTargetApp)
+		    {
+		    case (KAPI):
+		      if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
+			mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
+		      break;
+		    case (KOPI):
+		      if ( syncWithFile( temp->getRemoteFileName( ), false ) )
+			mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
+		      break;
+		    case (PWMPI):
+		      if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
+			mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
+		      break;
+		    default:
+		      qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+		      break;
+		    }
                 } else {
                     if (  temp->getIsPhoneSync() ) {
@@ -341,9 +425,36 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
         return;
     }
-    QString command = prof->getPreSyncCommandAB();
+
+    QString preCommand;
+    QString localTempFile;
+    QString postCommand;
+
+    switch(mTargetApp)
+      {
+      case (KAPI):
+	preCommand = prof->getPreSyncCommandAB();
+	postCommand = prof->getPostSyncCommandAB();
+	localTempFile = prof->getLocalTempFileAB();
+	break;
+      case (KOPI):
+	preCommand = prof->getPreSyncCommand();
+	postCommand = prof->getPostSyncCommand();
+	localTempFile = prof->getLocalTempFile();
+	break;
+      case (PWMPI):
+	preCommand = prof->getPreSyncCommandPWM();
+	postCommand = prof->getPostSyncCommandPWM();
+	localTempFile = prof->getLocalTempFilePWM();
+	break;
+      default:
+	qDebug("KSyncManager::syncRemote: invalid apptype selected");
+	break;
+      }
+
+
     int fi;
-    if ( (fi = command.find("$PWD$")) > 0 ) {
+    if ( (fi = preCommand.find("$PWD$")) > 0 ) {
         QString pwd = getPassword();
-        command = command.left( fi )+ pwd + command.mid( fi+5 );
+        preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 );
 
     }
@@ -353,5 +464,5 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     mParent->setCaption ( i18n( "Copy remote file to local machine..." ) );
     int fileSize = 0;
-    int result = system ( command );
+    int result = system ( preCommand );
     // 0 : okay
     // 256: no such file or dir
@@ -360,9 +471,9 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     if ( result != 0 ) {
         unsigned int len = maxlen;
-        while ( len <  command.length() ) {
-            command.insert( len , "\n" );
+        while ( len <  preCommand.length() ) {
+            preCommand.insert( len , "\n" );
             len += maxlen +2;
         }
-        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
+        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ;
         QMessageBox::information( mParent, i18n("Sync - ERROR"),
                                   question,
@@ -373,5 +484,8 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     mParent->setCaption ( i18n( "Copying succeed." ) );
     //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
-    if ( syncWithFile( prof->getLocalTempFileAB(), true ) ) {
+
+
+
+    if ( syncWithFile( localTempFile, true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
@@ -379,13 +493,12 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 //         e->setReadOnly( true );
         if ( mPrefs->mWriteBackFile ) {
-            command =  prof->getPostSyncCommandAB(); 
             int fi;
-            if ( (fi = command.find("$PWD$")) > 0 ) {
+            if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                 QString pwd = getPassword();
-                command = command.left( fi )+ pwd + command.mid( fi+5 );
+                postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
             mParent->setCaption ( i18n( "Writing back file ..." ) );
-            result = system ( command );
+            result = system ( postCommand );
             qDebug("Writing back file result: %d ", result);
             if ( result != 0 ) {
@@ -528,2 +641,25 @@ void KSyncManager::syncPhone()
 
 }
+
+void KSyncManager::showProgressBar(int percentage, QString caption, int total)
+{
+  if (!bar->isVisible())
+  {
+    bar->setCaption (caption); 
+    bar->setTotalSteps (  total  ) ;
+
+    bar->show();
+  }
+
+  bar->setProgress( percentage );
+}
+
+void KSyncManager::hideProgressBar()
+{
+  bar->hide();
+}
+
+bool KSyncManager::isProgressBarCanceled()
+{
+  return !bar->isVisible();
+}
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 389a005..9761107 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -32,4 +32,5 @@ class QWidget;
 class KSyncManager;
 class KSyncInterface;
+class QProgressBar;
 
 class KSyncManager : public QObject
@@ -55,4 +56,9 @@ class KSyncManager : public QObject
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
+    void showProgressBar(int percentage, QString caption = QString::null, int total=100);
+    void hideProgressBar();
+    bool isProgressBarCanceled();
+
+
  public slots:
     void slotSyncMenu( int );
@@ -90,5 +96,5 @@ class KSyncManager : public QObject
     QPopupMenu* mSyncMenu;
 
-
+    QProgressBar* bar;
 
 
@@ -103,6 +109,10 @@ class KSyncInterface
  public:
     virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
-    virtual bool syncExternal(KSyncManager* manager, QString resource) = 0;
 
+    virtual bool syncExternal(KSyncManager* manager, QString resource)
+      {
+	// empty implementation, because some syncable applications do not have an external(sharpdtm)  syncmode, like pwmanager.
+	return false;
+      }
 
     //called by the syncmanager to indicate that the work has to be marked as dirty.
diff --git a/pwmanager/pwmanager/pwm.cpp b/pwmanager/pwmanager/pwm.cpp
index ac2e66e..014e809 100644
--- a/pwmanager/pwmanager/pwm.cpp
+++ b/pwmanager/pwmanager/pwm.cpp
@@ -1323,15 +1323,21 @@ void PwM::createAboutData_slot()
 bool PwM::sync(KSyncManager* manager, QString filename, int mode)
 {
-  return true;
-}
+  PWM_ASSERT(curDoc());
 
-bool PwM::syncExternal(KSyncManager* manager, QString resource)
-{
-  return true;
+  bool ret =  curDoc()->sync(manager, filename, mode);
+
+  if (ret == true) {
+    //US BUG: what can we call here to update the view of the current doc?
+    //mViewManager->refreshView();
+  }
+
+  return ret;
 }
 
-//called by the syncmanager to indicate that the work has to marked as dirty.
+//called by the syncmanager to indicate that the work has to be marked as dirty.
 void PwM::sync_setModified()
 {
+  PWM_ASSERT(curDoc());
+  curDoc()->sync_setModified();
 }
 
@@ -1339,4 +1345,6 @@ void PwM::sync_setModified()
 bool PwM::sync_isModified()
 {
+  PWM_ASSERT(curDoc());
+  return curDoc()->sync_isModified();
 }
 
@@ -1344,4 +1352,6 @@ bool PwM::sync_isModified()
 void PwM::sync_save()
 {
+  PWM_ASSERT(curDoc());
+  return curDoc()->sync_save();
 }
 
diff --git a/pwmanager/pwmanager/pwm.h b/pwmanager/pwmanager/pwm.h
index 2fe7352..7c6bf0d 100644
--- a/pwmanager/pwmanager/pwm.h
+++ b/pwmanager/pwmanager/pwm.h
@@ -272,5 +272,4 @@ protected:
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
-    virtual bool syncExternal(KSyncManager* manager, QString resource);
 
     //called by the syncmanager to indicate that the work has to marked as dirty.
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 1b6d36f..82fc746 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2782,4 +2782,96 @@ out_ignore:
 }
 
+
+
+#ifdef PWM_EMBEDDED
+//US ENH: this is the magic function that syncronizes the this doc with the remote doc
+PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* syncRemote, int mode )
+{
+  bool syncOK = true;
+  int addedPasswordsLocal = 0;
+  int addedPasswordsRemote = 0;
+  int deletedPasswordsRemote = 0;
+  int deletedPasswordsLocal = 0;
+  int changedLocal = 0;
+  int changedRemote = 0;
+
+  QString mCurrentSyncName = manager->getCurrentSyncName();
+  QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
+
+
+
+
+
+
+
+
+
+  return e_success;
+}
+
+
+
+//this are the overwritten callbackmethods from the syncinterface
+bool PwMDoc::sync(KSyncManager* manager, QString filename, int mode)
+{
+  QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
+
+  // construct on the stack = automatic cleanup.
+  PwMDoc syncTarget(this, "synctarget");
+
+  PwMerror err = syncTarget.openDoc(&filename, 2 /*== deeplocked*/);
+
+  if (err != e_success)
+    return false;
+  
+  qDebug("PWM file loaded %s,sync mode %d",filename.latin1(), mode );
+
+  
+  err = syncronize(manager, this, &syncTarget, mode );
+
+  if (err == e_success) {
+    if ( PWMPrefs::instance()->mWriteBackFile )	{
+      qDebug("Saving remote PWManager file");
+      err = syncTarget.saveDoc(conf()->confGlobCompression());
+      if (err != e_success)
+	return false;
+
+    }
+
+    flagDirty();
+    return true;
+  }
+  else {
+    return false;
+  }
+}
+
+//called by the syncmanager to indicate that the work has to marked as dirty.
+void PwMDoc::sync_setModified()
+{
+  flagDirty();
+}
+
+//called by the syncmanager to ask if the dirty flag is set.
+bool PwMDoc::sync_isModified()
+{
+  return isDirty();
+}
+
+//called by the syncmanager to indicate that the work has to be saved.
+void PwMDoc::sync_save()
+{
+  PwMerror ret = saveDoc(conf()->confGlobCompression());
+}
+
+#endif
+
+
+
+
+
+
+
+
 #ifndef PWM_EMBEDDED
 #include "pwmdoc.moc"
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 193247e..ea4d687 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -60,4 +60,5 @@
 #else
 #include <kapplication.h>
+#include <ksyncmanager.h>
 #endif
 
@@ -336,5 +337,8 @@ protected:
 
 /** Document class for PwM */
-class PwMDoc : public PwMDocUi
+//US ENH: derived from KSyncInterfaces, to get called by PwM when a sync is required.
+// But PwMDoc is handling the sync by itself.
+class PwMDoc : public PwMDocUi, public KSyncInterface
+
 {
 	Q_OBJECT
@@ -697,4 +701,23 @@ protected:
 	/** copy a file from src to dst */
 	bool copyFile(const QString &src, const QString &dst);
+
+
+ public:
+#ifdef PWM_EMBEDDED
+	//US ENH: this is the magic function that syncronizes the local doc with the remote doc.
+	PwMerror syncronize(KSyncManager* manager, PwMDoc* syncLocal, PwMDoc* syncRemote, int mode );
+
+
+	//the following methods are the overwritten callbackmethods from the syncinterface
+	virtual bool sync(KSyncManager* manager, QString filename, int mode);
+
+	//called by the syncmanager to indicate that the work has to be marked as dirty.
+	virtual void sync_setModified();
+	//called by the syncmanager to ask if the dirty flag is set.
+	virtual bool sync_isModified();
+	//called by the syncmanager to indicate that the work has to be saved.
+	virtual void sync_save();
+#endif
+
 };