-rw-r--r-- | libkcal/phoneformat.cpp | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp index 1a9ccbc..7e1c9cd 100644 --- a/libkcal/phoneformat.cpp +++ b/libkcal/phoneformat.cpp | |||
@@ -41,30 +41,16 @@ | |||
41 | #include "recurrence.h" | 41 | #include "recurrence.h" |
42 | #include "calendarlocal.h" | 42 | #include "calendarlocal.h" |
43 | 43 | ||
44 | #include "phoneformat.h" | 44 | #include "phoneformat.h" |
45 | #include "syncdefines.h" | 45 | #include "syncdefines.h" |
46 | 46 | ||
47 | using namespace KCal; | 47 | using namespace KCal; |
48 | 48 | ||
49 | //CARDID,CATEGORY,DSRP,PLCE,MEM1,TIM1,TIM2,ADAY,ARON,ARMN,ARSD,RTYP,RFRQ,RPOS,RDYS,REND,REDT,ALSD,ALED,MDAY | ||
50 | // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | ||
51 | |||
52 | //ARSD silentalarm = 0 | ||
53 | // 11 RTYP 225 no /0 dialy/ 1 weekly/ 3 month by date/ 2 month by day(pos)/ yearly | ||
54 | // 12 RFRQ | ||
55 | // 13 RPOS pos = 4. monday in month | ||
56 | // 14 RDYS days: 1 mon/ 2 tue .. 64 sun | ||
57 | // 15 REND 0 = no end/ 1 = end | ||
58 | // 16 REDT rec end dt | ||
59 | //ALSD | ||
60 | //ALED | ||
61 | //MDAY | ||
62 | |||
63 | class PhoneParser : public QObject | 49 | class PhoneParser : public QObject |
64 | { | 50 | { |
65 | public: | 51 | public: |
66 | PhoneParser( Calendar *calendar, QString profileName ) : mCalendar( calendar ), mProfileName ( profileName ) { | 52 | PhoneParser( Calendar *calendar, QString profileName ) : mCalendar( calendar ), mProfileName ( profileName ) { |
67 | ; | 53 | ; |
68 | } | 54 | } |
69 | bool readTodo( Calendar *existingCalendar,GSM_ToDoEntry *ToDo, GSM_StateMachine* s) | 55 | bool readTodo( Calendar *existingCalendar,GSM_ToDoEntry *ToDo, GSM_StateMachine* s) |
70 | { | 56 | { |
@@ -168,17 +154,16 @@ public: | |||
168 | #if 0 | 154 | #if 0 |
169 | // not supported | 155 | // not supported |
170 | printmsg("Phone : \"%s\"\n",DecodeUnicodeConsole(ToDo->Entries[j].Text)); | 156 | printmsg("Phone : \"%s\"\n",DecodeUnicodeConsole(ToDo->Entries[j].Text)); |
171 | #endif | 157 | #endif |
172 | break; | 158 | break; |
173 | } | 159 | } |
174 | } | 160 | } |
175 | QString alarmString = ""; | 161 | QString alarmString = ""; |
176 | // strange 0 semms to mean: alarm enabled | ||
177 | if ( alarm ) { | 162 | if ( alarm ) { |
178 | Alarm *alarm; | 163 | Alarm *alarm; |
179 | if ( todo->alarms().count() > 0 ) | 164 | if ( todo->alarms().count() > 0 ) |
180 | alarm = todo->alarms().first(); | 165 | alarm = todo->alarms().first(); |
181 | else { | 166 | else { |
182 | alarm = new Alarm( todo ); | 167 | alarm = new Alarm( todo ); |
183 | todo->addAlarm( alarm ); | 168 | todo->addAlarm( alarm ); |
184 | } | 169 | } |
@@ -658,17 +643,16 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal ,QString profi | |||
658 | {break;} | 643 | {break;} |
659 | } | 644 | } |
660 | 645 | ||
661 | #endif | 646 | #endif |
662 | setlocale(LC_ALL, ""); | 647 | setlocale(LC_ALL, ""); |
663 | GSM_ReadConfig(NULL, &s.Config[0], 0); | 648 | GSM_ReadConfig(NULL, &s.Config[0], 0); |
664 | s.ConfigNum = 1; | 649 | s.ConfigNum = 1; |
665 | GSM_Config *cfg = &s.Config[0]; | 650 | GSM_Config *cfg = &s.Config[0]; |
666 | di.coding = "utf8"; | ||
667 | if ( ! connection.isEmpty() ) { | 651 | if ( ! connection.isEmpty() ) { |
668 | cfg->Connection = strdup(connection.latin1()); | 652 | cfg->Connection = strdup(connection.latin1()); |
669 | cfg->DefaultConnection = false; | 653 | cfg->DefaultConnection = false; |
670 | qDebug("Connection set %s ", cfg->Connection ); | 654 | qDebug("Connection set %s ", cfg->Connection ); |
671 | 655 | ||
672 | } | 656 | } |
673 | if ( ! device.isEmpty() ) { | 657 | if ( ! device.isEmpty() ) { |
674 | cfg->Device = strdup(device.latin1()); | 658 | cfg->Device = strdup(device.latin1()); |
@@ -679,44 +663,44 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal ,QString profi | |||
679 | if ( ! model.isEmpty() ) { | 663 | if ( ! model.isEmpty() ) { |
680 | strcpy(cfg->Model,model.latin1() ); | 664 | strcpy(cfg->Model,model.latin1() ); |
681 | cfg->DefaultModel = false; | 665 | cfg->DefaultModel = false; |
682 | qDebug("Model set %s ",cfg->Model ); | 666 | qDebug("Model set %s ",cfg->Model ); |
683 | 667 | ||
684 | 668 | ||
685 | } | 669 | } |
686 | int error=GSM_InitConnection(&s,3); | 670 | int error=GSM_InitConnection(&s,3); |
687 | qDebug(" init %d %d", error, ERR_NONE); | 671 | qDebug("GSM Init %d (no error is %d)", error, ERR_NONE); |
688 | if ( error != ERR_NONE ) | 672 | if ( error != ERR_NONE ) |
689 | return false; | 673 | return false; |
690 | // fromString2Cal( calendar, existngCal, &s, "Event" ); | ||
691 | GSM_Phone_Functions*Phone; | 674 | GSM_Phone_Functions*Phone; |
692 | GSM_CalendarEntrynote; | 675 | GSM_CalendarEntrynote; |
693 | bool start = true; | 676 | bool start = true; |
694 | Phone=s.Phone.Functions; | 677 | Phone=s.Phone.Functions; |
695 | bool gshutdown = false; | 678 | bool gshutdown = false; |
696 | PhoneParser handler( calendar, profileName ); | 679 | PhoneParser handler( calendar, profileName ); |
697 | int ccc = 0; | 680 | int ccc = 0; |
698 | while (!gshutdown && ccc++ < 3) { | 681 | qDebug("Debug: only 10 calender items are downloaded "); |
682 | while (!gshutdown && ccc++ < 10) { | ||
699 | 683 | ||
700 | qDebug("readEvent %d ", ccc); | 684 | qDebug("readEvent %d ", ccc); |
701 | error=Phone->GetNextCalendar(&s,¬e,start); | 685 | error=Phone->GetNextCalendar(&s,¬e,start); |
702 | if (error == ERR_EMPTY) break; | 686 | if (error == ERR_EMPTY) break; |
703 | start = false; | 687 | start = false; |
704 | handler.readEvent( existingCal, ¬e ); | 688 | handler.readEvent( existingCal, ¬e ); |
705 | } | 689 | } |
706 | 690 | ||
707 | start = true; | 691 | start = true; |
708 | GSM_ToDoEntry ToDo; | 692 | GSM_ToDoEntry ToDo; |
709 | ccc = 0; | 693 | ccc = 0; |
710 | while (!gshutdown) { | 694 | while (!gshutdown) { |
711 | error = Phone->GetNextToDo(&s, &ToDo, start); | 695 | error = Phone->GetNextToDo(&s, &ToDo, start); |
712 | if (error == ERR_EMPTY) break; | 696 | if (error == ERR_EMPTY) break; |
713 | start = false; | 697 | start = false; |
714 | qDebug("readTodo %d ", ++ccc); | 698 | qDebug("ReadTodo %d ", ++ccc); |
715 | handler.readTodo( existingCal, &ToDo, &s); | 699 | handler.readTodo( existingCal, &ToDo, &s); |
716 | 700 | ||
717 | } | 701 | } |
718 | 702 | ||
719 | error=GSM_TerminateConnection(&s); | 703 | error=GSM_TerminateConnection(&s); |
720 | 704 | ||
721 | return true; | 705 | return true; |
722 | } | 706 | } |