export to phone added

2 files changed, 44 insertions, 26 deletions

diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 29c1ae6..b2a62b1 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -81,14 +81,25 @@ public:
 
   
 
 PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model )
 {
     mProfileName = profileName;
-   
+    writeConfig( device, connection, model );
+}
+
+PhoneFormat::~PhoneFormat()
+{
+}
+void PhoneFormat::writeConfig( QString device, QString connection, QString model )
+{
+#ifdef _WIN32_
+    QString fileName = qApp->applicationDirPath () +"\\gammurc";
+#else
     QString fileName = QDir::homeDirPath() +"/.gammurc";
+#endif
     //qDebug("save %d ", load );
     QString content;
     bool write = false;
     bool addPort = true, addConnection = true, addModel = true;
     QFile file( fileName );
     if ( QFile::exists(  fileName) ) {
@@ -173,16 +184,13 @@ PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection,
         } 
         qDebug("Writing file  %s ", fileName.latin1() );
         QTextStream ts( &file );
         ts << content ;
         file.close();
     }
-}
 
-PhoneFormat::~PhoneFormat()
-{
 }
 #if 0
 int PhoneFormat::initDevice(GSM_StateMachine *s)
 {
     GSM_ReadConfig(NULL, &s->Config[0], 0);
                 s->ConfigNum = 1;
@@ -566,12 +574,41 @@ void PhoneFormat::afterSave( Incidence* inc)
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
 
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
 }
+
+bool PhoneFormat::writeToPhone( Calendar *  calendar)
+{
+#ifdef _WIN32_
+    QString  fileName = locateLocal("tmp", "tempfile.vcs");
+#else
+    QString  fileName = "/tmp/kdepimtemp.vcs";
+#endif
+
+    VCalFormat vfsave;
+    vfsave.setLocalTime ( true ); 
+    if ( ! vfsave.save( calendar, fileName ) )
+        return false;
+    // 4 call kammu
+#ifdef DESKTOP_VERSION
+    QString command ="./kammu --restore " + fileName ;
+#else
+    QString command ="kammu --restore " + fileName ;
+#endif
+    int ret;
+    while ( (ret = system (  command.latin1())) != 0 ) {
+        qDebug("Error S::command returned %d. asking users", ret); 
+        int retval = KMessageBox::warningContinueCancel(0,
+                                                        i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone access"),i18n("Retry"),i18n("Cancel"));
+        if ( retval != KMessageBox::Continue )
+            return false;
+    }
+    return true;
+}
 bool PhoneFormat::save( Calendar *calendar)
 {
     QLabel status ( i18n(" Opening device ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 230;
     int h = status.sizeHint().height()+20 ;
@@ -580,17 +617,12 @@ bool PhoneFormat::save( Calendar *calendar)
     status.setCaption(i18n("Writing to phone...") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     QString message;
-#ifdef _WIN32_
-    QString  fileName = locateLocal("tmp", "tempfile.vcs");
-#else
-    QString  fileName = "/tmp/kdepimtemp.vcs";
-#endif
 
     // 1 remove events which should be deleted
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { 
@@ -611,30 +643,14 @@ bool PhoneFormat::save( Calendar *calendar)
                 calendar->deleteTodo( to );   
             }
         }
         to = tl.next();
     } 
     //  3 save file 
-    VCalFormat vfsave;
-    vfsave.setLocalTime ( true ); 
-    if ( ! vfsave.save( calendar, fileName ) )
+    if ( !writeToPhone( calendar ) )
         return false;
-    // 4 call kammu
-#ifdef DESKTOP_VERSION
-    QString command ="./kammu --restore " + fileName ;
-#else
-    QString command ="kammu --restore " + fileName ;
-#endif
-    int ret;
-    while ( (ret = system (  command.latin1())) != 0 ) {
-        qDebug("Error S::command returned %d. asking users", ret); 
-        int retval = KMessageBox::warningContinueCancel(0,
-                                                        i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel"));
-        if ( retval != KMessageBox::Continue )
-            return false;
-    }
     
     // 5 reread data
     message = i18n(" Rereading all data ... ");
     status.setText ( message  );
     qApp->processEvents();
     CalendarLocal* calendarTemp = new CalendarLocal(); 
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index 2d1ff79..61e8160 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -45,12 +45,14 @@ class PhoneFormat : public QObject {
     bool save( Calendar * );
     bool fromString( Calendar *, const QString & );  
     QString toString( Calendar * );
     static ulong getCsum( const QStringList & );
     static ulong getCsumTodo( Todo* to );
     static ulong getCsumEvent( Event* ev );
+    static void writeConfig( QString device,QString connection, QString model );
+    static bool writeToPhone( Calendar * );
   private:
     void copyEvent( Event* to,  Event* from );
     void copyTodo( Todo* to,  Todo* from );
     //int initDevice(GSM_StateMachine *s);
     QString mProfileName;
     void afterSave( Incidence* );