2 files changed, 94 insertions, 5 deletions

diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 178a63e..99d6a06 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -1,185 +1,274 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
-#include <qxml.h>
+#include <qdir.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kmessagebox.h>
 
 #include "calendar.h"
 #include "alarm.h"
 #include "recurrence.h"
 #include "calendarlocal.h"
 
 #include "phoneformat.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 class PhoneParser : public QObject
 {
 public:
     PhoneParser(   )  {
         ;
     }
    
     static QString dtToString( const QDateTime& dti, bool useTZ = false )
     {
         QString datestr;
         QString timestr;
         int offset =  KGlobal::locale()->localTimeOffset( dti );
         QDateTime   dt;
         if (useTZ)
             dt =  dti.addSecs ( -(offset*60));
         else
             dt =  dti;
         if(dt.date().isValid()){
             const QDate& date = dt.date();
             datestr.sprintf("%04d%02d%02d",
                             date.year(), date.month(), date.day());
         }
         if(dt.time().isValid()){
             const QTime& time = dt.time();
             timestr.sprintf("T%02d%02d%02d",
                             time.hour(), time.minute(), time.second());
         }
         return datestr + timestr;
     }
 
 
 };
 
   
 
 PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model )
 {
     mProfileName = profileName;
-    mDevice = device;
-    mConnection = connection;
-    mModel = model; 
+   
+    QString fileName = QDir::homeDirPath() +"/.gammurc";
+    //qDebug("save %d ", load );
+    QString content;
+    bool write = false;
+    bool addPort = true, addConnection = true, addModel = true;
+    QFile file( fileName );
+    if ( QFile::exists(  fileName) ) {
+        if (!file.open( IO_ReadOnly ) ) {
+            qDebug("Error: cannot open %s ", fileName.latin1() );
+            return;
+        } 
+        QString line;
+        while ( file.readLine( line, 1024 ) > 0 ) {
+            //qDebug("*%s* ", line.latin1() );
+            if ( line.left(7 ) == "[gammu]" ) {
+                ;
+            } else 
+            if ( line.left(4 ) == "port" ) {
+                if ( line == "port = " + device+"\n" ) {
+                    content += line ;
+                    addPort = false;  
+                    //qDebug("port found" );
+                }
+               
+            } else  if ( line.left(5 ) == "model" )  {
+                if ( line == "model = " + model +"\n") {
+                    content += line ;
+                    addModel = false;  
+                    //qDebug("model found" );
+                }
+              
+            } else  if ( line.left( 10 ) == "connection" )  {
+                if ( line == "connection = " + connection +"\n") {
+                    addConnection = false; 
+                    content += line ;
+                    //qDebug("con found" );
+                }
+              
+            } else {
+                content += line ;
+            }
+        }
+        file.close();
+    } else {
+        if ( ! connection.isEmpty() ) {
+            addConnection = true; 
+        }
+        if ( ! device.isEmpty() ) {
+            addPort = true; 
+
+        }
+        if ( ! model.isEmpty() ) {
+            addModel = true; 
+        }
+    }
+
+    if ( addConnection ) {
+        if ( ! write ) 
+            content += "[gammu]\n";
+        write = true;
+        content += "connection = ";
+        content += connection;
+        content += "\n";
+    }
+    if ( addPort ) {
+        if ( ! write ) 
+            content += "[gammu]\n";
+        write = true;
+        content += "port = ";
+        content += device;
+        content += "\n";
+
+    }
+    if ( addModel ) {
+        if ( ! write ) 
+            content += "[gammu]\n";
+        write = true;
+        content += "model = ";
+        content += model;
+        content += "\n";
+    }
+    if ( write ) {
+        if (!file.open( IO_WriteOnly ) ) {
+            qDebug("Error: cannot write file  %s ", fileName.latin1() );
+            return;
+        } 
+        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;
     GSM_Config *cfg = &s->Config[0];
     if ( ! mConnection.isEmpty() ) {
         cfg->Connection = strdup(mConnection.latin1());
                 cfg->DefaultConnection = false;
         qDebug("Connection set %s ", cfg->Connection );
 
     }
     if ( ! mDevice.isEmpty() ) {
         cfg->Device = strdup(mDevice.latin1());
                 cfg->DefaultDevice = false;
         qDebug("Device  set %s ", cfg->Device);
 
     }
     if ( ! mModel.isEmpty() ) {
                 strcpy(cfg->Model,mModel.latin1() );
                 cfg->DefaultModel = false;
         qDebug("Model  set %s ",cfg->Model );
     }
     int error=GSM_InitConnection(s,3);
     return error;
 }
 #endif
 ulong PhoneFormat::getCsumTodo( Todo* todo )
 {
     QStringList  attList;
     if ( todo->hasDueDate() )
         attList << PhoneParser::dtToString ( todo->dtDue() );
     attList << todo->summary();
     QString completedString = "no";
     if ( todo->isCompleted() )
         completedString = "yes";
     attList << completedString; 
     int prio = todo->priority();
     if( prio == 2 ) prio = 1;
     if (prio == 4 ) prio = 5 ;
     attList << QString::number( prio ); 
     QString alarmString = "na";
     Alarm *alarm;
     if (  todo->alarms().count() > 0 ) {
         alarm = todo->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number(alarm->offset() );
         }
     }
     attList << alarmString;
     attList << todo->categoriesStr();
     attList << todo->secrecyStr(); 
     return PhoneFormat::getCsum(attList );  
 
 }
 ulong PhoneFormat::getCsumEvent( Event* event )
 {
     QStringList  attList;
     attList << PhoneParser::dtToString ( event->dtStart() );
     attList << PhoneParser::dtToString ( event->dtEnd() );
     attList <<  event->summary();
     attList <<  event->location();
     QString alarmString = "na";
     Alarm *alarm;
     if (  event->alarms().count() > 0 ) {
         alarm = event->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number( alarm->offset() );
         }
     }
     attList <<  alarmString;
     Recurrence* rec = event->recurrence();
     QStringList  list;
     bool writeEndDate = false;
     switch ( rec->doesRecur() )
         {
         case Recurrence::rDaily: // 0
             list.append( "0" );
             list.append( QString::number( rec->frequency() ));//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
         case Recurrence::rWeekly:// 1
             list.append( "1" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             {
                 int days = 0;
                 QBitArray weekDays = rec->days(); 
                 int i;
diff --git a/libkcal/phoneformat.h b/libkcal/phoneformat.h
index 8286098..2d1ff79 100644
--- a/libkcal/phoneformat.h
+++ b/libkcal/phoneformat.h
@@ -1,61 +1,61 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 2003 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 #ifndef PHONEFORMAT_H
 #define PHONEFORMAT_H
 
 #include <qstring.h>
 
 #include "scheduler.h"
 
 #include "vcalformat.h"
 #include "calformat.h"
 
 namespace KCal {
 
 /**
   This class implements the calendar format used by Phone.
 */
     class Event;
     class Todo;
 class PhoneFormat : public QObject {
   public:
     /** Create new iCalendar format. */
     PhoneFormat(QString profileName, QString device,QString connection, QString model);
     virtual ~PhoneFormat();
 
     bool load( Calendar * ,Calendar * );
     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 );
   private:
     void copyEvent( Event* to,  Event* from );
     void copyTodo( Todo* to,  Todo* from );
     //int initDevice(GSM_StateMachine *s);
-    QString mProfileName, mDevice, mConnection, mModel;
+    QString mProfileName;
     void afterSave( Incidence* );
 };
 
 }
 
 #endif