1 files changed, 22 insertions, 3 deletions

diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index e43a507..11c68c5 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -709,366 +709,385 @@ ulong PhoneFormat::getCsumEvent( Event* event )
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
        
         default:
             list.append( "255" );
             list.append( QString() );
             list.append( "0" );
             list.append( QString() );
             list.append( "0" );
             list.append( "20991231T000000" );
             break;
         }
     if  ( writeEndDate ) {
         
         if ( rec->endDate().isValid() ) { // 15 + 16
             list.append( "1" );
             list.append( PhoneParser::dtToString( rec->endDate()) );
         } else {
             list.append( "0" );
             list.append( "20991231T000000" );
         }
         
     }
     attList << list.join("");
     attList << event->categoriesStr();
     attList << event->secrecyStr();
     return PhoneFormat::getCsum(attList );  
 }
 ulong PhoneFormat::getCsum( const QStringList &  attList)
 {
     int max = attList.count() -1;
     ulong cSum = 0;
     int j,k,i;
     int add;
     for ( i = 1; i < max ; ++i ) {
         QString s = attList[i];
         if ( ! s.isEmpty() ){
             j = s.length();
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
                 add = add * mul *i*i*i;
                 cSum += add;
             }
         }
     }
     return cSum;
 
 }
 //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
 #include <stdlib.h>
 #define DEBUGMODE false
 bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
 {
             GSM_StateMachines;
     qDebug(" load ");
                 s.opened = false;
                 s.msg    = NULL;
                 s.ConfigNum = 0;
+    QLabel status ( i18n("Reading data. Opening device ..."), 0 );
+    int w = status.sizeHint().width()+20 ;
+    if ( w < 200 ) w = 200;
+    int h = status.sizeHint().height()+20 ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    status.setCaption(i18n("Reading Phone Data") );
+    status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    status.show();
+    status.raise();
+    qApp->processEvents();
 #if 0
             static      char*cp; 
             static INI_Section          *cfg            = NULL;
         cfg=GSM_FindGammuRC();
     int i;
         for (i = 0; i <= MAX_CONFIG_NUM; i++) {
                 if (cfg!=NULL) {
             cp = (char *)INI_GetValue(cfg, (unsigned  char*) "gammu", (unsigned   char*)"gammucoding", false);
             if (cp) di.coding = cp;
 
             s.Config[i].Localize = (char *)INI_GetValue(cfg,  (unsigned  char*) "gammu",  (unsigned  char*) "gammuloc", false);
             if (s.Config[i].Localize) {
                                 s.msg=INI_ReadFile(s.Config[i].Localize, true);
                         } else {
 #if !defined(WIN32) && defined(LOCALE_PATH)
                                 locale = setlocale(LC_MESSAGES, NULL);
                                 if (locale != NULL) {
                                         snprintf(locale_file, 200, "%s/gammu_%c%c.txt",
                              LOCALE_PATH,
                              tolower(locale[0]),
                              tolower(locale[1]));
                                         s.msg = INI_ReadFile(locale_file, true);
                                 }
 #endif
                         }
                 }
 
                 /* Wanted user specific configuration? */
         
         if (!GSM_ReadConfig(cfg, &s.Config[i], i) && i != 0) break;
 
                 s.ConfigNum++;
 
         /* We want to use only one file descriptor for global and state machine debug output */
         s.Config[i].UseGlobalDebugFile = true;
                 
 
 
                 /* We wanted to read just user specified configuration. */
         {break;}
          }
 
 #endif
     int error=initDevice(&s);
     qDebug("GSM Init %d (no error is %d)",  error, ERR_NONE);
     if ( error != ERR_NONE )
         return false;
                 GSM_Phone_Functions*Phone;
                 GSM_CalendarEntrynote;
         bool start = true;
         Phone=s.Phone.Functions;
     bool gshutdown = false;
     PhoneParser handler( calendar, mProfileName );
     int ccc = 0;
+    QString message = i18n("Processing event # ");
+    int procCount = 0;
     qDebug("Debug: only 10 calender items are downloaded ");
         while (!gshutdown && ccc++ < 10) {
-      
+        status.setText ( message + QString::number ( ++procCount ) );
+        qApp->processEvents();
         qDebug("readEvent %d   ", ccc);
                 error=Phone->GetNextCalendar(&s,&note,start);
                 if (error == ERR_EMPTY) break;
                 start = false;
         handler.readEvent( existingCal, &note );
     }
 
         start = true;
                 GSM_ToDoEntry   ToDo;
     ccc = 0;
+    message = i18n("Processing todo # ");
+    procCount = 0;
         while (!gshutdown) {
+        status.setText ( message + QString::number ( ++procCount ) );
+        qApp->processEvents();
                 error = Phone->GetNextToDo(&s, &ToDo, start);
                 if (error == ERR_EMPTY) break;
                 start = false;
         qDebug("ReadTodo %d   ", ++ccc);
         handler.readTodo( existingCal, &ToDo, &s);
 
         }
 
         error=GSM_TerminateConnection(&s);
 
     return true;
 }
 void PhoneFormat::event2GSM( Event* ev, GSM_CalendarEntry*Note )
 {
 
 }
 void PhoneFormat::todo2GSM( Todo* todo, GSM_ToDoEntry *gsm )
 {
 #if 0
     QStringList list;
     list.append( QString::number( todo->zaurusId()  ) );
     list.append( todo->categories().join(",") );
 
     if ( todo->hasStartDate() ) {
         list.append( dtToString( todo->dtStart()) );
     } else
         list.append( QString() );
 
     if ( todo->hasDueDate() ) {
         QTime tim;
         if ( todo->doesFloat()) {
             list.append( dtToString( QDateTime(todo->dtDue().date(),QTime( 0,0,0  )), false)) ;
         } else {
             list.append( dtToString(todo->dtDue() ) );
         }
     } else
         list.append( QString() );
 
     if ( todo->isCompleted() ) {  
         list.append( dtToString( todo->completed()) );
         list.append( "0" ); // yes 0 == completed
     } else {
         list.append( dtToString( todo->completed()) );
         list.append( "1" );
     }
     list.append( QString::number( todo->priority() ));
     if( ! todo->summary().isEmpty() )
         list.append( todo->summary() );
     else
         list.append( "" );
     if (! todo->description().isEmpty()  )
         list.append( todo->description() );
     else
         list.append( "" );
         for(QStringList::Iterator it=list.begin();
         it!=list.end(); ++it){
         QString& s = (*it);
         s.replace(QRegExp("\""), "\"\"");
         if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){
             s.prepend('\"');
             s.append('\"');
         } else if(s.isEmpty() && !s.isNull()){
             s = "\"\"";
         }
     }
     return list.join(",");
 #endif
 }
 void PhoneFormat::afterSave( Incidence* inc)
 {
     uint csum;
     if ( inc->type() == "Event")
         csum = PhoneFormat::getCsumEvent( (Event*) inc );
     else
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
 }
 bool PhoneFormat::save( Calendar *calendar)
 {
             GSM_StateMachines;
     qDebug(" save ");
                 s.opened = false;
                 s.msg    = NULL;
                 s.ConfigNum = 0; 
     QLabel status ( i18n("Writing data. Opening device ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 200;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
-    status.setCaption(i18n("Writing DTM Data") );
+    status.setCaption(i18n("Writing Phone Data") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     
     int error=initDevice(&s);
     qDebug("GSM Init %d (no error is %d)",  error, ERR_NONE);
     if ( error != ERR_NONE )
         return false;
             GSM_Phone_Functions*Phone;
                 GSM_CalendarEntryNote;
         bool start = true;
         Phone=s.Phone.Functions;
     bool gshutdown = false;
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     QString message = i18n("Processing event # ");
     int procCount = 0;
     while ( ev ) {
         //qDebug("i %d ", ++i);
         if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { // event was changed during sync or is a new one
 
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             event2GSM( ev, &Note );
             if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                        error = Phone->DeleteCalendar(&s, &Note);
             }
             else  if ( ev->getID(mProfileName).isEmpty()  ) {       // add new 
                 // we have to do this later after deleting
                 
             }
             else { // change existing
                        error = Phone->SetCalendar(&s, &Note);
             }
         } 
         ev =  er.next();
     }
     ev = er.first(); 
     // pending get empty slots
     while ( ev ) {
         if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL &&  ev->tempSyncStat() != SYNC_TEMPSTATE_DELETE) { 
             if ( ev->getID(mProfileName).isEmpty() ) {
                 status.setText ( message + QString::number ( ++procCount ) );
                 qApp->processEvents();
                 //int newID ;//= pending
                 //ev->setID(mProfileName, QString::number( newID  ));
                 event2GSM( ev, &Note );
                 Note.Location = 0;
                 error = Phone->AddCalendar(&s, &Note);
                 ev->setID( mProfileName, QString::number( Note.Location ) );
+                qDebug("New Calendar. Location %d ",Note.Location );
                 afterSave( ev );
             } else {
                 afterSave( ev ); // setting temp sync stat for changed items
             }
         }
         ev =  er.next();
     }
     GSM_ToDoEntry ToDoEntry; 
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
 
     message = i18n("Processing todo # ");
     procCount = 0;
     while ( to ) {
        if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) {
              status.setText ( message + QString::number ( ++procCount ) );
              qApp->processEvents();
             todo2GSM( to, &ToDoEntry );
             if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete
                       error=Phone->DeleteToDo(&s,&ToDoEntry);
             }
             else  if ( to->getID("Sharp_DTM").isEmpty() ) {       // add new 
                 ;
             }
             else { // change existing
-                      error=Phone->AddToDo(&s,&ToDoEntry);
+                      error=Phone->SetToDo(&s,&ToDoEntry);
             }
         } 
         to = tl.next();
     }
 
     // pending get empty slots
     to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL &&  to->tempSyncStat() != SYNC_TEMPSTATE_DELETE) { 
             if ( to->getID(mProfileName).isEmpty() ) {
                 status.setText ( message + QString::number ( ++procCount ) );
                 qApp->processEvents();
                 //int newID ;//= pending
                 //to->setID(mProfileName, QString::number( newID  ));
                 todo2GSM( to, &ToDoEntry );
                         ToDoEntry.Location = 0;
                       error=Phone->AddToDo(&s,&ToDoEntry);
                 to->setID(mProfileName, QString::number( ToDoEntry.Location  ));
                 afterSave( to );
                 qDebug("New Todo. Location %d ",ToDoEntry.Location );
             } else {
                 afterSave( to );
             }
         }
         to = tl.next();
     }
     return true;
 }
 QString PhoneFormat::dtToGSM( const QDateTime& dti, bool useTZ )
 {
         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;
 }
 QString PhoneFormat::getEventString( Event* event )
 {
 #if 0
     QStringList list;
     list.append( QString::number(event->zaurusId()  ) );
     list.append( event->categories().join(",") );
     if ( !event->summary().isEmpty() )
         list.append( event->summary() );
     else
         list.append("" );
     if ( !event->location().isEmpty() )
         list.append( event->location() );
     else
         list.append("" );