| -rw-r--r-- | libkcal/phoneformat.cpp | 25 |
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 @@ -767,12 +767,23 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) { GSM_StateMachine s; 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++) { @@ -821,26 +832,33 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) GSM_CalendarEntry note; 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,¬e,start); if (error == ERR_EMPTY) break; start = false; handler.readEvent( existingCal, ¬e ); } 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); @@ -927,13 +945,13 @@ bool PhoneFormat::save( Calendar *calendar) 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); @@ -979,12 +997,13 @@ bool PhoneFormat::save( Calendar *calendar) //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(); @@ -1004,13 +1023,13 @@ bool PhoneFormat::save( Calendar *calendar) 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 |