-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 | |||
@@ -770,6 +770,17 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | |||
770 | s.opened = false; | 770 | s.opened = false; |
771 | s.msg = NULL; | 771 | s.msg = NULL; |
772 | s.ConfigNum = 0; | 772 | s.ConfigNum = 0; |
773 | QLabel status ( i18n("Reading data. Opening device ..."), 0 ); | ||
774 | int w = status.sizeHint().width()+20 ; | ||
775 | if ( w < 200 ) w = 200; | ||
776 | int h = status.sizeHint().height()+20 ; | ||
777 | int dw = QApplication::desktop()->width(); | ||
778 | int dh = QApplication::desktop()->height(); | ||
779 | status.setCaption(i18n("Reading Phone Data") ); | ||
780 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | ||
781 | status.show(); | ||
782 | status.raise(); | ||
783 | qApp->processEvents(); | ||
773 | #if 0 | 784 | #if 0 |
774 | static char*cp; | 785 | static char*cp; |
775 | static INI_Section *cfg = NULL; | 786 | static INI_Section *cfg = NULL; |
@@ -824,9 +835,12 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | |||
824 | bool gshutdown = false; | 835 | bool gshutdown = false; |
825 | PhoneParser handler( calendar, mProfileName ); | 836 | PhoneParser handler( calendar, mProfileName ); |
826 | int ccc = 0; | 837 | int ccc = 0; |
838 | QString message = i18n("Processing event # "); | ||
839 | int procCount = 0; | ||
827 | qDebug("Debug: only 10 calender items are downloaded "); | 840 | qDebug("Debug: only 10 calender items are downloaded "); |
828 | while (!gshutdown && ccc++ < 10) { | 841 | while (!gshutdown && ccc++ < 10) { |
829 | 842 | status.setText ( message + QString::number ( ++procCount ) ); | |
843 | qApp->processEvents(); | ||
830 | qDebug("readEvent %d ", ccc); | 844 | qDebug("readEvent %d ", ccc); |
831 | error=Phone->GetNextCalendar(&s,¬e,start); | 845 | error=Phone->GetNextCalendar(&s,¬e,start); |
832 | if (error == ERR_EMPTY) break; | 846 | if (error == ERR_EMPTY) break; |
@@ -837,7 +851,11 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | |||
837 | start = true; | 851 | start = true; |
838 | GSM_ToDoEntry ToDo; | 852 | GSM_ToDoEntry ToDo; |
839 | ccc = 0; | 853 | ccc = 0; |
854 | message = i18n("Processing todo # "); | ||
855 | procCount = 0; | ||
840 | while (!gshutdown) { | 856 | while (!gshutdown) { |
857 | status.setText ( message + QString::number ( ++procCount ) ); | ||
858 | qApp->processEvents(); | ||
841 | error = Phone->GetNextToDo(&s, &ToDo, start); | 859 | error = Phone->GetNextToDo(&s, &ToDo, start); |
842 | if (error == ERR_EMPTY) break; | 860 | if (error == ERR_EMPTY) break; |
843 | start = false; | 861 | start = false; |
@@ -930,7 +948,7 @@ bool PhoneFormat::save( Calendar *calendar) | |||
930 | int h = status.sizeHint().height()+20 ; | 948 | int h = status.sizeHint().height()+20 ; |
931 | int dw = QApplication::desktop()->width(); | 949 | int dw = QApplication::desktop()->width(); |
932 | int dh = QApplication::desktop()->height(); | 950 | int dh = QApplication::desktop()->height(); |
933 | status.setCaption(i18n("Writing DTM Data") ); | 951 | status.setCaption(i18n("Writing Phone Data") ); |
934 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 952 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
935 | status.show(); | 953 | status.show(); |
936 | status.raise(); | 954 | status.raise(); |
@@ -982,6 +1000,7 @@ bool PhoneFormat::save( Calendar *calendar) | |||
982 | Note.Location = 0; | 1000 | Note.Location = 0; |
983 | error = Phone->AddCalendar(&s, &Note); | 1001 | error = Phone->AddCalendar(&s, &Note); |
984 | ev->setID( mProfileName, QString::number( Note.Location ) ); | 1002 | ev->setID( mProfileName, QString::number( Note.Location ) ); |
1003 | qDebug("New Calendar. Location %d ",Note.Location ); | ||
985 | afterSave( ev ); | 1004 | afterSave( ev ); |
986 | } else { | 1005 | } else { |
987 | afterSave( ev ); // setting temp sync stat for changed items | 1006 | afterSave( ev ); // setting temp sync stat for changed items |
@@ -1007,7 +1026,7 @@ bool PhoneFormat::save( Calendar *calendar) | |||
1007 | ; | 1026 | ; |
1008 | } | 1027 | } |
1009 | else { // change existing | 1028 | else { // change existing |
1010 | error=Phone->AddToDo(&s,&ToDoEntry); | 1029 | error=Phone->SetToDo(&s,&ToDoEntry); |
1011 | } | 1030 | } |
1012 | } | 1031 | } |
1013 | to = tl.next(); | 1032 | to = tl.next(); |