kapi sync

4 files changed, 87 insertions, 4 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 59be506..f376e6c 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -844,12 +844,14 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
     }
   } else {
     proc->addArgument(message );
 
   }
   parameters = translateMessage(parameters, name, emailadress);
+
+  //KMessageBox::information(0,parameters);
   proc->addArgument( parameters );
   proc->launch("");
 #endif
 
   return true;
 }
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index b7929ec..5708dfc 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -109,13 +109,13 @@ void KSyncManager::fillSyncMenu()
     mLocalMachineName = config.readEntry("LocalMachineName","undefined");
     if ( prof.count() < 2 ) {
         prof.clear();
         QString externalName;
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
-        externalName = "OutLook(not_implemented)";
+        externalName = "OutLook";
 #else
         externalName = "KDE_Desktop";
 #endif
 #else
         externalName = "Sharp_DTM";
 #endif
@@ -140,13 +140,13 @@ void KSyncManager::fillSyncMenu()
     unsigned int i;
     for ( i = 0; i < prof.count(); ++i ) {
         QString insertText = prof[i];
         if ( i == 0 ) {
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
-        insertText = "OutLook(not_implemented)";
+        insertText = "OutLook";
 #else
         insertText = "KDE_Desktop";
 #endif
 #else
         insertText = "Sharp_DTM";
 #endif
@@ -931,14 +931,80 @@ void KSyncManager::confSync()
     for ( ii = 0; ii < oldSyncProfileNames.count(); ++ii ) {
         if ( ! mSyncProfileNames.contains( oldSyncProfileNames[ii] ) )
             mImplementation->removeSyncInfo( oldSyncProfileNames[ii]  );
     }
     QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
 }
+void KSyncManager::syncOL()
+{
+  mSyncWithDesktop = true;
+    emit save();
+    switch(mTargetApp)
+        {
+        case (KAPI):
+            {
+                syncExternalApplication("ol");
+            }
+            break;
+        case (KOPI):
+            {
+#ifdef DESKTOP_VERSION
+                QString command = "kdecaldump33";  
+                QString commandfile = "kdecaldump33";  
+                QString commandpath = qApp->applicationDirPath () + "/";
+#else
+                QString command = "kdecaldump33";  
+                QString commandfile = "kdecaldump33";  
+                QString commandpath =  QDir::homeDirPath ()+"/";
+#endif
+                if ( ! QFile::exists ( commandpath+commandfile ) )
+                    command = commandfile;
+                else
+                    command  = commandpath+commandfile;
+
+                QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
+                int result = system (  command.latin1());
+                qDebug("Cal dump 33 command call result result: %d ", result);
+                if ( result != 0 ) {
+                    qDebug("Calling CAL dump version 33 failed. Trying 34... ");
+                    commandfile = "kdecaldump34";  
+                    if ( ! QFile::exists ( commandpath+commandfile ) )
+                        command = commandfile;
+                    else
+                        command  = commandpath+commandfile;
+                    result = system (  command.latin1());
+                    qDebug("Cal dump 34 command call result result: %d ", result);
+                    if ( result != 0 ) {
+                        KMessageBox::error( 0, i18n("Error accessing KDE calendar data.\nMake sure the file\n%1kdecaldump3x\nexists ( x = 3 or 4 ).\nSupported KDE versions are 3.3 and 3.4.\nUsed version should be auto detected.\n").arg( commandpath ));
+                        return;
+                    }
+                }
+                if ( syncWithFile( fileName,true ) ) {
+                    if ( mWriteBackFile ) {
+                        command += " --read";
+                        system (  command.latin1());
+                    }
+                }
+                
+            }
+            break;
+        case (PWMPI):
+
+            break;
+        default:
+            qDebug("KSM::slotSyncMenu: invalid apptype selected");
+            break;
+              
+        }
+}
 void KSyncManager::syncKDE()
 {
+#ifdef _WIN32_
+        syncOL();
+#else
+
     mSyncWithDesktop = true;
     emit save();
     switch(mTargetApp)
         {
         case (KAPI):
             {
@@ -1029,12 +1095,13 @@ void KSyncManager::syncKDE()
             break;
         default:
             qDebug("KSM::slotSyncMenu: invalid apptype selected");
             break;
               
         }
+#endif
 }
 
 void KSyncManager::syncSharp()
 {
 
     if ( ! syncExternalApplication("sharp") )
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 04cdade..71d17e9 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -200,12 +200,13 @@ class KSyncManager : public QObject
     void quickSyncLocalFile();
     bool syncWithFile( QString fn , bool quick );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
     void syncKDE();
+    void syncOL();
     bool syncExternalApplication(QString);
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     bool edit_sync_options();
     bool edit_pisync_options();
     int ringSync();
@@ -238,12 +239,10 @@ class KSyncInterface
     virtual bool syncExternal(KSyncManager* /*manager*/, QString /*resource*/)
     {
         // empty implementation, because some syncable applications do not 
         // have an external(sharpdtm)  syncmode, like pwmanager.
         return false;
     }
-
-   
 };
 
 
 #endif
diff --git a/libkdepim/libkdepim.pro b/libkdepim/libkdepim.pro
index 84af7ad..7160d0e 100644
--- a/libkdepim/libkdepim.pro
+++ b/libkdepim/libkdepim.pro
@@ -55,7 +55,22 @@ SOURCES = \
  ksyncprofile.cpp \
  ksyncprefsdialog.cpp \
  kcmconfigs/kcmkdepimconfig.cpp \
  kcmconfigs/kdepimconfigwidget.cpp \
  phoneaccess.cpp  
 
+win32: {
 
+#olimport section 
+importol {
+debug: {
+LIBS += mfc71ud.lib
+}
+release: {
+LIBS += mfc71u.lib
+}
+DEFINES +=  _OL_IMPORT_
+HEADERS += ol_access.h 
+SOURCES += ol_access.cpp 
+#olimport section end
+}
+}