author | eilers <eilers> | 2003-11-10 08:28:38 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-11-10 08:28:38 (UTC) |
commit | f3326a60ba002b420f33b6132dc1740c0fc4ffef (patch) (unidiff) | |
tree | 6809f30857a241cf3334f7d25f60edc6fbb83901 | |
parent | efa3f9a756fb5a9afd0d35bc783e1331bf40bc6a (diff) | |
download | opie-f3326a60ba002b420f33b6132dc1740c0fc4ffef.zip opie-f3326a60ba002b420f33b6132dc1740c0fc4ffef.tar.gz opie-f3326a60ba002b420f33b6132dc1740c0fc4ffef.tar.bz2 |
Platform MacOS-X: Disable backtrce in odebug..
Libopie PIM: Finishing SQL-Backend for Todo. Recurrance events are supported now.
What is still missing: Custom entries currently not stored. It isn't easy to
implement them with enabled prefetch-cache.
LibopieDB2: Adding -lsqlite here instead linking it to libopie
-rw-r--r-- | libopie/libopie.pro | 2 | ||||
-rw-r--r-- | libopie/pim/orecur.cpp | 147 | ||||
-rw-r--r-- | libopie/pim/orecur.h | 12 | ||||
-rw-r--r-- | libopie/pim/otodoaccesssql.cpp | 31 | ||||
-rw-r--r-- | libopie2/opiecore/oglobalsettings.h | 2 | ||||
-rw-r--r-- | libopie2/opiedb/opiedb.pro | 4 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccesssql.cpp | 31 | ||||
-rw-r--r-- | libopie2/opiepim/core/orecur.cpp | 147 | ||||
-rw-r--r-- | libopie2/opiepim/core/orecur.h | 12 | ||||
-rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 6 |
10 files changed, 306 insertions, 88 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index bf6b78f..94434ae 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -55,78 +55,78 @@ SOURCES = ofontmenu.cc \ | |||
55 | ocheckitem.cpp \ | 55 | ocheckitem.cpp \ |
56 | colordialog.cpp \ | 56 | colordialog.cpp \ |
57 | colorpopupmenu.cpp oclickablelabel.cpp \ | 57 | colorpopupmenu.cpp oclickablelabel.cpp \ |
58 | oprocctrl.cpp oprocess.cpp \ | 58 | oprocctrl.cpp oprocess.cpp \ |
59 | odevice.cpp odevicebutton.cpp otimepicker.cpp \ | 59 | odevice.cpp odevicebutton.cpp otimepicker.cpp \ |
60 | otabwidget.cpp otabbar.cpp \ | 60 | otabwidget.cpp otabbar.cpp \ |
61 | ofontselector.cpp \ | 61 | ofontselector.cpp \ |
62 | pim/otodo.cpp \ | 62 | pim/otodo.cpp \ |
63 | pim/opimrecord.cpp \ | 63 | pim/opimrecord.cpp \ |
64 | pim/otodoaccess.cpp \ | 64 | pim/otodoaccess.cpp \ |
65 | pim/otodoaccessbackend.cpp \ | 65 | pim/otodoaccessbackend.cpp \ |
66 | pim/otodoaccessxml.cpp \ | 66 | pim/otodoaccessxml.cpp \ |
67 | pim/oconversion.cpp \ | 67 | pim/oconversion.cpp \ |
68 | pim/ocontact.cpp \ | 68 | pim/ocontact.cpp \ |
69 | pim/ocontactfields.cpp \ | 69 | pim/ocontactfields.cpp \ |
70 | pim/ocontactaccess.cpp \ | 70 | pim/ocontactaccess.cpp \ |
71 | pim/ocontactaccessbackend_vcard.cpp \ | 71 | pim/ocontactaccessbackend_vcard.cpp \ |
72 | pim/ocontactaccessbackend_xml.cpp \ | 72 | pim/ocontactaccessbackend_xml.cpp \ |
73 | pim/otodoaccessvcal.cpp \ | 73 | pim/otodoaccessvcal.cpp \ |
74 | pim/orecur.cpp \ | 74 | pim/orecur.cpp \ |
75 | pim/opimstate.cpp \ | 75 | pim/opimstate.cpp \ |
76 | pim/opimxrefpartner.cpp \ | 76 | pim/opimxrefpartner.cpp \ |
77 | pim/opimxref.cpp \ | 77 | pim/opimxref.cpp \ |
78 | pim/opimxrefmanager.cpp \ | 78 | pim/opimxrefmanager.cpp \ |
79 | pim/opimmaintainer.cpp \ | 79 | pim/opimmaintainer.cpp \ |
80 | pim/opimnotify.cpp \ | 80 | pim/opimnotify.cpp \ |
81 | pim/opimnotifymanager.cpp \ | 81 | pim/opimnotifymanager.cpp \ |
82 | pim/opimmainwindow.cpp \ | 82 | pim/opimmainwindow.cpp \ |
83 | pim/opimresolver.cpp \ | 83 | pim/opimresolver.cpp \ |
84 | pim/oevent.cpp \ | 84 | pim/oevent.cpp \ |
85 | pim/otimezone.cpp \ | 85 | pim/otimezone.cpp \ |
86 | pim/odatebookaccess.cpp \ | 86 | pim/odatebookaccess.cpp \ |
87 | pim/odatebookaccessbackend.cpp \ | 87 | pim/odatebookaccessbackend.cpp \ |
88 | pim/odatebookaccessbackend_xml.cpp \ | 88 | pim/odatebookaccessbackend_xml.cpp \ |
89 | orecurrancewidget.cpp \ | 89 | orecurrancewidget.cpp \ |
90 | oticker.cpp owait.cpp | 90 | oticker.cpp owait.cpp |
91 | 91 | ||
92 | TARGET = opie | 92 | TARGET = opie |
93 | INCLUDEPATH += $(OPIEDIR)/include | 93 | INCLUDEPATH += $(OPIEDIR)/include |
94 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 94 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
95 | 95 | ||
96 | LIBS += -lqpe | 96 | LIBS += -lqpe |
97 | 97 | ||
98 | # Add SQL-Support if selected by config (eilers) | 98 | # Add SQL-Support if selected by config (eilers) |
99 | CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) | 99 | CONFTEST = $$system( echo $CONFIG_SQL_PIM_BACKEND ) |
100 | contains( CONFTEST, y ){ | 100 | contains( CONFTEST, y ){ |
101 | 101 | ||
102 | DEFINES += __USE_SQL | 102 | DEFINES += __USE_SQL |
103 | LIBS += -lopiedb2 -lsqlite | 103 | LIBS += -lopiedb2 |
104 | HEADERS += pim/otodoaccesssql.h pim/ocontactaccessbackend_sql.h | 104 | HEADERS += pim/otodoaccesssql.h pim/ocontactaccessbackend_sql.h |
105 | SOURCES += pim/otodoaccesssql.cpp pim/ocontactaccessbackend_sql.cpp | 105 | SOURCES += pim/otodoaccesssql.cpp pim/ocontactaccessbackend_sql.cpp |
106 | 106 | ||
107 | } | 107 | } |
108 | 108 | ||
109 | INTERFACES = otimepickerbase.ui orecurrancebase.ui | 109 | INTERFACES = otimepickerbase.ui orecurrancebase.ui |
110 | TARGET = opie | 110 | TARGET = opie |
111 | 111 | ||
112 | TRANSLATIONS = ../i18n/de/libopie.ts \ | 112 | TRANSLATIONS = ../i18n/de/libopie.ts \ |
113 | ../i18n/nl/libopie.ts \ | 113 | ../i18n/nl/libopie.ts \ |
114 | ../i18n/xx/libopie.ts \ | 114 | ../i18n/xx/libopie.ts \ |
115 | ../i18n/en/libopie.ts \ | 115 | ../i18n/en/libopie.ts \ |
116 | ../i18n/es/libopie.ts \ | 116 | ../i18n/es/libopie.ts \ |
117 | ../i18n/fr/libopie.ts \ | 117 | ../i18n/fr/libopie.ts \ |
118 | ../i18n/hu/libopie.ts \ | 118 | ../i18n/hu/libopie.ts \ |
119 | ../i18n/ja/libopie.ts \ | 119 | ../i18n/ja/libopie.ts \ |
120 | ../i18n/ko/libopie.ts \ | 120 | ../i18n/ko/libopie.ts \ |
121 | ../i18n/no/libopie.ts \ | 121 | ../i18n/no/libopie.ts \ |
122 | ../i18n/pl/libopie.ts \ | 122 | ../i18n/pl/libopie.ts \ |
123 | ../i18n/pt/libopie.ts \ | 123 | ../i18n/pt/libopie.ts \ |
124 | ../i18n/pt_BR/libopie.ts \ | 124 | ../i18n/pt_BR/libopie.ts \ |
125 | ../i18n/sl/libopie.ts \ | 125 | ../i18n/sl/libopie.ts \ |
126 | ../i18n/zh_CN/libopie.ts \ | 126 | ../i18n/zh_CN/libopie.ts \ |
127 | ../i18n/zh_TW/libopie.ts \ | 127 | ../i18n/zh_TW/libopie.ts \ |
128 | ../i18n/da/libopie.ts | 128 | ../i18n/da/libopie.ts |
129 | 129 | ||
130 | include ( big-screen/big-screen.pro ) | 130 | include ( big-screen/big-screen.pro ) |
131 | 131 | ||
132 | include ( $(OPIEDIR)/include.pro ) | 132 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/libopie/pim/orecur.cpp b/libopie/pim/orecur.cpp index eae1fdc..8c9ad46 100644 --- a/libopie/pim/orecur.cpp +++ b/libopie/pim/orecur.cpp | |||
@@ -411,100 +411,175 @@ void ORecur::setPosition( int pos ) { | |||
411 | void ORecur::setDays( char c ) { | 411 | void ORecur::setDays( char c ) { |
412 | checkOrModify(); | 412 | checkOrModify(); |
413 | data->days = c; | 413 | data->days = c; |
414 | } | 414 | } |
415 | void ORecur::setEndDate( const QDate& dt) { | 415 | void ORecur::setEndDate( const QDate& dt) { |
416 | checkOrModify(); | 416 | checkOrModify(); |
417 | data->end = dt; | 417 | data->end = dt; |
418 | } | 418 | } |
419 | void ORecur::setCreatedDateTime( const QDateTime& t) { | 419 | void ORecur::setCreatedDateTime( const QDateTime& t) { |
420 | checkOrModify(); | 420 | checkOrModify(); |
421 | data->create = t; | 421 | data->create = t; |
422 | } | 422 | } |
423 | void ORecur::setHasEndDate( bool b) { | 423 | void ORecur::setHasEndDate( bool b) { |
424 | checkOrModify(); | 424 | checkOrModify(); |
425 | data->hasEnd = b; | 425 | data->hasEnd = b; |
426 | } | 426 | } |
427 | void ORecur::setRepitition( int rep ) { | 427 | void ORecur::setRepitition( int rep ) { |
428 | checkOrModify(); | 428 | checkOrModify(); |
429 | data->rep = rep; | 429 | data->rep = rep; |
430 | } | 430 | } |
431 | void ORecur::setService( const QString& app ) { | 431 | void ORecur::setService( const QString& app ) { |
432 | checkOrModify(); | 432 | checkOrModify(); |
433 | data->app = app; | 433 | data->app = app; |
434 | } | 434 | } |
435 | void ORecur::setStart( const QDate& dt ) { | 435 | void ORecur::setStart( const QDate& dt ) { |
436 | checkOrModify(); | 436 | checkOrModify(); |
437 | data->start = dt; | 437 | data->start = dt; |
438 | } | 438 | } |
439 | void ORecur::checkOrModify() { | 439 | void ORecur::checkOrModify() { |
440 | if ( data->count != 1 ) { | 440 | if ( data->count != 1 ) { |
441 | data->deref(); | 441 | data->deref(); |
442 | Data* d2 = new Data; | 442 | Data* d2 = new Data; |
443 | d2->days = data->days; | 443 | d2->days = data->days; |
444 | d2->type = data->type; | 444 | d2->type = data->type; |
445 | d2->freq = data->freq; | 445 | d2->freq = data->freq; |
446 | d2->pos = data->pos; | 446 | d2->pos = data->pos; |
447 | d2->hasEnd = data->hasEnd; | 447 | d2->hasEnd = data->hasEnd; |
448 | d2->end = data->end; | 448 | d2->end = data->end; |
449 | d2->create = data->create; | 449 | d2->create = data->create; |
450 | d2->rep = data->rep; | 450 | d2->rep = data->rep; |
451 | d2->app = data->app; | 451 | d2->app = data->app; |
452 | d2->list = data->list; | 452 | d2->list = data->list; |
453 | d2->start = data->start; | 453 | d2->start = data->start; |
454 | data = d2; | 454 | data = d2; |
455 | } | 455 | } |
456 | } | 456 | } |
457 | QString ORecur::toString()const { | 457 | QString ORecur::toString()const { |
458 | QString buf; | 458 | QString buf; |
459 | QMap<int, QString> recMap = toMap(); | ||
459 | 460 | ||
460 | buf += " rtype=\""; | 461 | buf += " rtype=\""; |
461 | switch ( data->type ) { | 462 | buf += recMap[ORecur::RType]; |
462 | case ORecur::Daily: | ||
463 | buf += "Daily"; | ||
464 | break; | ||
465 | case ORecur::Weekly: | ||
466 | buf += "Weekly"; | ||
467 | break; | ||
468 | case ORecur::MonthlyDay: | ||
469 | buf += "MonthlyDay"; | ||
470 | break; | ||
471 | case ORecur::MonthlyDate: | ||
472 | buf += "MonthlyDate"; | ||
473 | break; | ||
474 | case ORecur::Yearly: | ||
475 | buf += "Yearly"; | ||
476 | break; | ||
477 | default: | ||
478 | buf += "NoRepeat"; | ||
479 | break; | ||
480 | } | ||
481 | buf += "\""; | 463 | buf += "\""; |
482 | if (data->days > 0 ) | 464 | if (data->days > 0 ) |
483 | buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\""; | 465 | buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\""; |
484 | if ( data->pos != 0 ) | 466 | if ( data->pos != 0 ) |
485 | buf += " rposition=\"" + QString::number(data->pos ) + "\""; | 467 | buf += " rposition=\"" + recMap[ORecur::RPosition] + "\""; |
486 | 468 | ||
487 | buf += " rfreq=\"" + QString::number( data->freq ) + "\""; | 469 | buf += " rfreq=\"" + recMap[ORecur::RFreq] + "\""; |
488 | buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\""; | 470 | buf += " rhasenddate=\"" + recMap[ORecur::RHasEndDate]+ "\""; |
489 | if ( data->hasEnd ) | 471 | if ( data->hasEnd ) |
490 | buf += " enddt=\"" | 472 | buf += " enddt=\"" |
491 | + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) | 473 | + recMap[ORecur::EndDate] |
492 | + "\""; | 474 | + "\""; |
493 | buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\""; | 475 | buf += " created=\"" + recMap[ORecur::Created] + "\""; |
494 | 476 | ||
495 | if ( data->list.isEmpty() ) return buf; | 477 | if ( data->list.isEmpty() ) return buf; |
496 | // save exceptions list here!! | ||
497 | ExceptionList::ConstIterator it; | ||
498 | ExceptionList list = data->list; | ||
499 | buf += " exceptions=\""; | 478 | buf += " exceptions=\""; |
500 | QDate date; | 479 | buf += recMap[ORecur::Exceptions]; |
501 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
502 | date = (*it); | ||
503 | if ( it != list.begin() ) buf += " "; | ||
504 | |||
505 | buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); | ||
506 | } | ||
507 | buf += "\" "; | 480 | buf += "\" "; |
508 | 481 | ||
509 | return buf; | 482 | return buf; |
510 | } | 483 | } |
484 | |||
485 | QString ORecur::rTypeString() const | ||
486 | { | ||
487 | QString retString; | ||
488 | switch ( data->type ) { | ||
489 | case ORecur::Daily: | ||
490 | retString = "Daily"; | ||
491 | break; | ||
492 | case ORecur::Weekly: | ||
493 | retString = "Weekly"; | ||
494 | break; | ||
495 | case ORecur::MonthlyDay: | ||
496 | retString = "MonthlyDay"; | ||
497 | break; | ||
498 | case ORecur::MonthlyDate: | ||
499 | retString = "MonthlyDate"; | ||
500 | break; | ||
501 | case ORecur::Yearly: | ||
502 | retString = "Yearly"; | ||
503 | break; | ||
504 | default: | ||
505 | retString = "NoRepeat"; | ||
506 | break; | ||
507 | |||
508 | } | ||
509 | |||
510 | return retString; | ||
511 | } | ||
512 | |||
513 | QMap<QString, ORecur::RepeatType> ORecur::rTypeValueConvertMap() const | ||
514 | { | ||
515 | QMap<QString, RepeatType> convertMap; | ||
516 | |||
517 | convertMap.insert( QString( "Daily" ), ORecur::Daily ); | ||
518 | convertMap.insert( QString( "Weekly" ), ORecur::Weekly ); | ||
519 | convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay ); | ||
520 | convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate ); | ||
521 | convertMap.insert( QString( "Yearly" ), ORecur::Yearly ); | ||
522 | convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat ); | ||
523 | |||
524 | return convertMap; | ||
525 | } | ||
526 | |||
527 | |||
528 | QMap<int, QString> ORecur::toMap() const | ||
529 | { | ||
530 | QMap<int, QString> retMap; | ||
531 | |||
532 | retMap.insert( ORecur::RType, rTypeString() ); | ||
533 | retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) ); | ||
534 | retMap.insert( ORecur::RPosition, QString::number(data->pos ) ); | ||
535 | retMap.insert( ORecur::RFreq, QString::number( data->freq ) ); | ||
536 | retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) ); | ||
537 | if( data -> hasEnd ) | ||
538 | retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) ); | ||
539 | retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) ); | ||
540 | |||
541 | if ( data->list.isEmpty() ) return retMap; | ||
542 | |||
543 | // save exceptions list here!! | ||
544 | ExceptionList::ConstIterator it; | ||
545 | ExceptionList list = data->list; | ||
546 | QString exceptBuf; | ||
547 | QDate date; | ||
548 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
549 | date = (*it); | ||
550 | if ( it != list.begin() ) exceptBuf += " "; | ||
551 | |||
552 | exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); | ||
553 | } | ||
554 | |||
555 | retMap.insert( ORecur::Exceptions, exceptBuf ); | ||
556 | |||
557 | return retMap; | ||
558 | } | ||
559 | |||
560 | void ORecur::fromMap( const QMap<int, QString>& map ) | ||
561 | { | ||
562 | QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); | ||
563 | |||
564 | data -> type = repTypeMap[ map [ORecur::RType] ]; | ||
565 | data -> days = (char) map[ ORecur::RWeekdays ].toInt(); | ||
566 | data -> pos = map[ ORecur::RPosition ].toInt(); | ||
567 | data -> freq = map[ ORecur::RFreq ].toInt(); | ||
568 | data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false; | ||
569 | OTimeZone utc = OTimeZone::utc(); | ||
570 | if ( data -> hasEnd ){ | ||
571 | data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date(); | ||
572 | } | ||
573 | data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date(); | ||
574 | |||
575 | #if 0 | ||
576 | // FIXME: Exceptions currently not supported... | ||
577 | // Convert the list of exceptions from QString into ExceptionList | ||
578 | data -> list.clear(); | ||
579 | QString exceptStr = map[ ORecur::Exceptions ]; | ||
580 | QStringList exceptList = QStringList::split( " ", exceptStr ); | ||
581 | ... | ||
582 | #endif | ||
583 | |||
584 | |||
585 | } | ||
diff --git a/libopie/pim/orecur.h b/libopie/pim/orecur.h index b214b3f..47901b0 100644 --- a/libopie/pim/orecur.h +++ b/libopie/pim/orecur.h | |||
@@ -1,91 +1,101 @@ | |||
1 | /* | 1 | /* |
2 | * GPL from TT | 2 | * GPL from TT |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef OPIE_RECUR_H | 5 | #ifndef OPIE_RECUR_H |
6 | #define OPIE_RECUR_H | 6 | #define OPIE_RECUR_H |
7 | 7 | ||
8 | #include <sys/types.h> | 8 | #include <sys/types.h> |
9 | 9 | ||
10 | #include <qdatetime.h> | 10 | #include <qdatetime.h> |
11 | #include <qvaluelist.h> | 11 | #include <qvaluelist.h> |
12 | 12 | #include <qmap.h> | |
13 | 13 | ||
14 | class ORecur { | 14 | class ORecur { |
15 | public: | 15 | public: |
16 | typedef QValueList<QDate> ExceptionList; | 16 | typedef QValueList<QDate> ExceptionList; |
17 | enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay, | 17 | enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay, |
18 | MonthlyDate, Yearly }; | 18 | MonthlyDate, Yearly }; |
19 | enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08, | 19 | enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08, |
20 | FRI = 0x10, SAT = 0x20, SUN = 0x40 }; | 20 | FRI = 0x10, SAT = 0x20, SUN = 0x40 }; |
21 | enum Fields{ RType = 0, RWeekdays, RPosition, RFreq, RHasEndDate, | ||
22 | EndDate, Created, Exceptions }; | ||
23 | |||
21 | ORecur(); | 24 | ORecur(); |
22 | ORecur( const ORecur& ); | 25 | ORecur( const ORecur& ); |
23 | ~ORecur(); | 26 | ~ORecur(); |
24 | 27 | ||
25 | ORecur &operator=( const ORecur& ); | 28 | ORecur &operator=( const ORecur& ); |
26 | bool operator==(const ORecur& )const; | 29 | bool operator==(const ORecur& )const; |
27 | 30 | ||
28 | bool doesRecur()const; | 31 | bool doesRecur()const; |
29 | /* if it recurrs on that day */ | 32 | /* if it recurrs on that day */ |
30 | bool doesRecur( const QDate& ); | 33 | bool doesRecur( const QDate& ); |
31 | RepeatType type()const; | 34 | RepeatType type()const; |
32 | int frequency()const; | 35 | int frequency()const; |
33 | int position()const; | 36 | int position()const; |
34 | char days()const; | 37 | char days()const; |
35 | bool hasEndDate()const; | 38 | bool hasEndDate()const; |
36 | QDate start()const; | 39 | QDate start()const; |
37 | QDate endDate()const; | 40 | QDate endDate()const; |
38 | QDateTime createdDateTime()const; | 41 | QDateTime createdDateTime()const; |
39 | /** | 42 | /** |
40 | * starting on monday=0, sunday=6 | 43 | * starting on monday=0, sunday=6 |
41 | * for convience | 44 | * for convience |
42 | */ | 45 | */ |
43 | bool repeatOnWeekDay( int day )const; | 46 | bool repeatOnWeekDay( int day )const; |
44 | 47 | ||
45 | /** | 48 | /** |
46 | * FromWhereToStart is not included!!! | 49 | * FromWhereToStart is not included!!! |
47 | */ | 50 | */ |
48 | bool nextOcurrence( const QDate& FromWhereToStart, QDate &recurDate ); | 51 | bool nextOcurrence( const QDate& FromWhereToStart, QDate &recurDate ); |
49 | 52 | ||
50 | /** | 53 | /** |
51 | * The module this ORecur belongs to | 54 | * The module this ORecur belongs to |
52 | */ | 55 | */ |
53 | QString service()const; | 56 | QString service()const; |
54 | 57 | ||
55 | /* | 58 | /* |
56 | * reference to the exception list | 59 | * reference to the exception list |
57 | */ | 60 | */ |
58 | ExceptionList &exceptions(); | 61 | ExceptionList &exceptions(); |
59 | 62 | ||
60 | /** | 63 | /** |
61 | * the current repetition | 64 | * the current repetition |
62 | */ | 65 | */ |
63 | int repetition()const; | 66 | int repetition()const; |
64 | 67 | ||
65 | void setType( const RepeatType& ); | 68 | void setType( const RepeatType& ); |
66 | void setFrequency( int freq ); | 69 | void setFrequency( int freq ); |
67 | void setPosition( int pos ); | 70 | void setPosition( int pos ); |
68 | void setDays( char c); | 71 | void setDays( char c); |
69 | void setEndDate( const QDate& dt ); | 72 | void setEndDate( const QDate& dt ); |
70 | void setStart( const QDate& dt ); | 73 | void setStart( const QDate& dt ); |
71 | void setCreatedDateTime( const QDateTime& ); | 74 | void setCreatedDateTime( const QDateTime& ); |
72 | void setHasEndDate( bool b ); | 75 | void setHasEndDate( bool b ); |
73 | void setRepitition(int ); | 76 | void setRepitition(int ); |
74 | 77 | ||
75 | void setService( const QString& ser ); | 78 | void setService( const QString& ser ); |
79 | |||
80 | QMap<int, QString> toMap() const; | ||
81 | void fromMap( const QMap<int, QString>& map ); | ||
76 | 82 | ||
77 | /* almost internal */ | 83 | /* almost internal */ |
78 | QString toString()const; | 84 | QString toString()const; |
79 | private: | 85 | private: |
80 | bool p_nextOccurrence( const QDate& from, QDate& next ); | 86 | bool p_nextOccurrence( const QDate& from, QDate& next ); |
81 | void deref(); | 87 | void deref(); |
82 | inline void checkOrModify(); | 88 | inline void checkOrModify(); |
83 | 89 | ||
90 | /* Converts rType to String */ | ||
91 | QString rTypeString() const; | ||
92 | /* Returns a map to convert Stringname for RType to RepeatType */ | ||
93 | QMap<QString, RepeatType> rTypeValueConvertMap() const; | ||
84 | 94 | ||
85 | class Data; | 95 | class Data; |
86 | Data* data; | 96 | Data* data; |
87 | class ORecurPrivate; | 97 | class ORecurPrivate; |
88 | ORecurPrivate *d; | 98 | ORecurPrivate *d; |
89 | }; | 99 | }; |
90 | 100 | ||
91 | #endif | 101 | #endif |
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp index ebd03bb..3913661 100644 --- a/libopie/pim/otodoaccesssql.cpp +++ b/libopie/pim/otodoaccesssql.cpp | |||
@@ -78,160 +78,170 @@ namespace { | |||
78 | 78 | ||
79 | }; | 79 | }; |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * a find query | 82 | * a find query |
83 | */ | 83 | */ |
84 | class FindQuery : public OSQLQuery { | 84 | class FindQuery : public OSQLQuery { |
85 | public: | 85 | public: |
86 | FindQuery(int uid); | 86 | FindQuery(int uid); |
87 | FindQuery(const QArray<int>& ); | 87 | FindQuery(const QArray<int>& ); |
88 | ~FindQuery(); | 88 | ~FindQuery(); |
89 | QString query()const; | 89 | QString query()const; |
90 | private: | 90 | private: |
91 | QString single()const; | 91 | QString single()const; |
92 | QString multi()const; | 92 | QString multi()const; |
93 | QArray<int> m_uids; | 93 | QArray<int> m_uids; |
94 | int m_uid; | 94 | int m_uid; |
95 | }; | 95 | }; |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * overdue query | 98 | * overdue query |
99 | */ | 99 | */ |
100 | class OverDueQuery : public OSQLQuery { | 100 | class OverDueQuery : public OSQLQuery { |
101 | public: | 101 | public: |
102 | OverDueQuery(); | 102 | OverDueQuery(); |
103 | ~OverDueQuery(); | 103 | ~OverDueQuery(); |
104 | QString query()const; | 104 | QString query()const; |
105 | }; | 105 | }; |
106 | class EffQuery : public OSQLQuery { | 106 | class EffQuery : public OSQLQuery { |
107 | public: | 107 | public: |
108 | EffQuery( const QDate&, const QDate&, bool inc ); | 108 | EffQuery( const QDate&, const QDate&, bool inc ); |
109 | ~EffQuery(); | 109 | ~EffQuery(); |
110 | QString query()const; | 110 | QString query()const; |
111 | private: | 111 | private: |
112 | QString with()const; | 112 | QString with()const; |
113 | QString out()const; | 113 | QString out()const; |
114 | QDate m_start; | 114 | QDate m_start; |
115 | QDate m_end; | 115 | QDate m_end; |
116 | bool m_inc :1; | 116 | bool m_inc :1; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | 119 | ||
120 | CreateQuery::CreateQuery() : OSQLQuery() {} | 120 | CreateQuery::CreateQuery() : OSQLQuery() {} |
121 | CreateQuery::~CreateQuery() {} | 121 | CreateQuery::~CreateQuery() {} |
122 | QString CreateQuery::query()const { | 122 | QString CreateQuery::query()const { |
123 | QString qu; | 123 | QString qu; |
124 | qu += "create table todolist( uid PRIMARY KEY, categories, completed, "; | 124 | qu += "create table todolist( uid PRIMARY KEY, categories, completed, "; |
125 | qu += "description, summary, priority, DueDate, progress , state, "; | 125 | qu += "description, summary, priority, DueDate, progress , state, "; |
126 | qu += "Recurrence, reminders, alarms, maintainer, startdate, completeddate);"; | 126 | // This is the recurrance-stuff .. Exceptions are currently not supported (see ORecur.cpp) ! (eilers) |
127 | qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, "; | ||
128 | qu += "reminders, alarms, maintainer, startdate, completeddate);"; | ||
127 | qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );"; | 129 | qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );"; |
128 | return qu; | 130 | return qu; |
129 | } | 131 | } |
130 | 132 | ||
131 | LoadQuery::LoadQuery() : OSQLQuery() {} | 133 | LoadQuery::LoadQuery() : OSQLQuery() {} |
132 | LoadQuery::~LoadQuery() {} | 134 | LoadQuery::~LoadQuery() {} |
133 | QString LoadQuery::query()const { | 135 | QString LoadQuery::query()const { |
134 | QString qu; | 136 | QString qu; |
135 | // We do not need "distinct" here. The primary key is always unique.. | 137 | // We do not need "distinct" here. The primary key is always unique.. |
136 | //qu += "select distinct uid from todolist"; | 138 | //qu += "select distinct uid from todolist"; |
137 | qu += "select uid from todolist"; | 139 | qu += "select uid from todolist"; |
138 | 140 | ||
139 | return qu; | 141 | return qu; |
140 | } | 142 | } |
141 | 143 | ||
142 | InsertQuery::InsertQuery( const OTodo& todo ) | 144 | InsertQuery::InsertQuery( const OTodo& todo ) |
143 | : OSQLQuery(), m_todo( todo ) { | 145 | : OSQLQuery(), m_todo( todo ) { |
144 | } | 146 | } |
145 | InsertQuery::~InsertQuery() { | 147 | InsertQuery::~InsertQuery() { |
146 | } | 148 | } |
147 | /* | 149 | /* |
148 | * converts from a OTodo to a query | 150 | * converts from a OTodo to a query |
149 | * we leave out X-Ref + Alarms | 151 | * we leave out X-Ref + Alarms |
150 | */ | 152 | */ |
151 | QString InsertQuery::query()const{ | 153 | QString InsertQuery::query()const{ |
152 | 154 | ||
153 | int year, month, day; | 155 | int year, month, day; |
154 | year = month = day = 0; | 156 | year = month = day = 0; |
155 | if (m_todo.hasDueDate() ) { | 157 | if (m_todo.hasDueDate() ) { |
156 | QDate date = m_todo.dueDate(); | 158 | QDate date = m_todo.dueDate(); |
157 | year = date.year(); | 159 | year = date.year(); |
158 | month = date.month(); | 160 | month = date.month(); |
159 | day = date.day(); | 161 | day = date.day(); |
160 | } | 162 | } |
161 | int sYear = 0, sMonth = 0, sDay = 0; | 163 | int sYear = 0, sMonth = 0, sDay = 0; |
162 | if( m_todo.hasStartDate() ){ | 164 | if( m_todo.hasStartDate() ){ |
163 | QDate sDate = m_todo.startDate(); | 165 | QDate sDate = m_todo.startDate(); |
164 | sYear = sDate.year(); | 166 | sYear = sDate.year(); |
165 | sMonth= sDate.month(); | 167 | sMonth= sDate.month(); |
166 | sDay = sDate.day(); | 168 | sDay = sDate.day(); |
167 | } | 169 | } |
168 | 170 | ||
169 | int eYear = 0, eMonth = 0, eDay = 0; | 171 | int eYear = 0, eMonth = 0, eDay = 0; |
170 | if( m_todo.hasCompletedDate() ){ | 172 | if( m_todo.hasCompletedDate() ){ |
171 | QDate eDate = m_todo.completedDate(); | 173 | QDate eDate = m_todo.completedDate(); |
172 | eYear = eDate.year(); | 174 | eYear = eDate.year(); |
173 | eMonth= eDate.month(); | 175 | eMonth= eDate.month(); |
174 | eDay = eDate.day(); | 176 | eDay = eDate.day(); |
175 | } | 177 | } |
176 | QString qu; | 178 | QString qu; |
179 | QMap<int, QString> recMap = m_todo.recurrence().toMap(); | ||
177 | qu = "insert into todolist VALUES(" | 180 | qu = "insert into todolist VALUES(" |
178 | + QString::number( m_todo.uid() ) + "," | 181 | + QString::number( m_todo.uid() ) + "," |
179 | + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + "," | 182 | + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + "," |
180 | + QString::number( m_todo.isCompleted() ) + "," | 183 | + QString::number( m_todo.isCompleted() ) + "," |
181 | + "'" + m_todo.description() + "'" + "," | 184 | + "'" + m_todo.description() + "'" + "," |
182 | + "'" + m_todo.summary() + "'" + "," | 185 | + "'" + m_todo.summary() + "'" + "," |
183 | + QString::number(m_todo.priority() ) + "," | 186 | + QString::number(m_todo.priority() ) + "," |
184 | + "'" + QString::number(year) + "-" | 187 | + "'" + QString::number(year) + "-" |
185 | + QString::number(month) | 188 | + QString::number(month) |
186 | + "-" + QString::number( day ) + "'" + "," | 189 | + "-" + QString::number( day ) + "'" + "," |
187 | + QString::number( m_todo.progress() ) + "," | 190 | + QString::number( m_todo.progress() ) + "," |
188 | + QString::number( m_todo.state().state() ) + "," | 191 | + QString::number( m_todo.state().state() ) + "," |
189 | + "'" + m_todo.recurrence().toString() + "'"+ ","; | 192 | + "'" + recMap[ ORecur::RType ] + "'" + "," |
193 | + "'" + recMap[ ORecur::RWeekdays ] + "'" + "," | ||
194 | + "'" + recMap[ ORecur::RPosition ] + "'" + "," | ||
195 | + "'" + recMap[ ORecur::RFreq ] + "'" + "," | ||
196 | + "'" + recMap[ ORecur::RHasEndDate ] + "'" + "," | ||
197 | + "'" + recMap[ ORecur::EndDate ] + "'" + "," | ||
198 | + "'" + recMap[ ORecur::Created ] + "'" + "," | ||
199 | + "'" + recMap[ ORecur::Exceptions ] + "'" + ","; | ||
190 | 200 | ||
191 | if ( m_todo.hasNotifiers() ) { | 201 | if ( m_todo.hasNotifiers() ) { |
192 | OPimNotifyManager manager = m_todo.notifiers(); | 202 | OPimNotifyManager manager = m_todo.notifiers(); |
193 | qu += "'" + manager.remindersToString() + "'" + "," | 203 | qu += "'" + manager.remindersToString() + "'" + "," |
194 | + "'" + manager.alarmsToString() + "'" + ","; | 204 | + "'" + manager.alarmsToString() + "'" + ","; |
195 | } | 205 | } |
196 | else{ | 206 | else{ |
197 | qu += QString( "''" ) + "," | 207 | qu += QString( "''" ) + "," |
198 | + "''" + ","; | 208 | + "''" + ","; |
199 | } | 209 | } |
200 | 210 | ||
201 | qu += QString( "''" ) + QString( "," ) // Maintainers (cur. not supported !) | 211 | qu += QString( "''" ) + QString( "," ) // Maintainers (cur. not supported !) |
202 | + "'" + QString::number(sYear) + "-" | 212 | + "'" + QString::number(sYear) + "-" |
203 | + QString::number(sMonth) | 213 | + QString::number(sMonth) |
204 | + "-" + QString::number(sDay) + "'" + "," | 214 | + "-" + QString::number(sDay) + "'" + "," |
205 | + "'" + QString::number(eYear) + "-" | 215 | + "'" + QString::number(eYear) + "-" |
206 | + QString::number(eMonth) | 216 | + QString::number(eMonth) |
207 | + "-"+QString::number(eDay) + "'" | 217 | + "-"+QString::number(eDay) + "'" |
208 | + ")"; | 218 | + ")"; |
209 | 219 | ||
210 | qWarning("add %s", qu.latin1() ); | 220 | qWarning("add %s", qu.latin1() ); |
211 | return qu; | 221 | return qu; |
212 | } | 222 | } |
213 | 223 | ||
214 | RemoveQuery::RemoveQuery(int uid ) | 224 | RemoveQuery::RemoveQuery(int uid ) |
215 | : OSQLQuery(), m_uid( uid ) {} | 225 | : OSQLQuery(), m_uid( uid ) {} |
216 | RemoveQuery::~RemoveQuery() {} | 226 | RemoveQuery::~RemoveQuery() {} |
217 | QString RemoveQuery::query()const { | 227 | QString RemoveQuery::query()const { |
218 | QString qu = "DELETE from todolist where uid = " + QString::number(m_uid); | 228 | QString qu = "DELETE from todolist where uid = " + QString::number(m_uid); |
219 | return qu; | 229 | return qu; |
220 | } | 230 | } |
221 | 231 | ||
222 | 232 | ||
223 | ClearQuery::ClearQuery() | 233 | ClearQuery::ClearQuery() |
224 | : OSQLQuery() {} | 234 | : OSQLQuery() {} |
225 | ClearQuery::~ClearQuery() {} | 235 | ClearQuery::~ClearQuery() {} |
226 | QString ClearQuery::query()const { | 236 | QString ClearQuery::query()const { |
227 | QString qu = "drop table todolist"; | 237 | QString qu = "drop table todolist"; |
228 | return qu; | 238 | return qu; |
229 | } | 239 | } |
230 | FindQuery::FindQuery(int uid) | 240 | FindQuery::FindQuery(int uid) |
231 | : OSQLQuery(), m_uid(uid ) { | 241 | : OSQLQuery(), m_uid(uid ) { |
232 | } | 242 | } |
233 | FindQuery::FindQuery(const QArray<int>& ints) | 243 | FindQuery::FindQuery(const QArray<int>& ints) |
234 | : OSQLQuery(), m_uids(ints){ | 244 | : OSQLQuery(), m_uids(ints){ |
235 | } | 245 | } |
236 | FindQuery::~FindQuery() { | 246 | FindQuery::~FindQuery() { |
237 | } | 247 | } |
@@ -479,126 +489,139 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder, | |||
479 | 489 | ||
480 | if ( !asc ) { | 490 | if ( !asc ) { |
481 | qWarning("not ascending!"); | 491 | qWarning("not ascending!"); |
482 | query += " DESC"; | 492 | query += " DESC"; |
483 | } | 493 | } |
484 | 494 | ||
485 | qWarning( query ); | 495 | qWarning( query ); |
486 | OSQLRawQuery raw(query ); | 496 | OSQLRawQuery raw(query ); |
487 | return uids( m_driver->query(&raw) ); | 497 | return uids( m_driver->query(&raw) ); |
488 | } | 498 | } |
489 | bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ | 499 | bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ |
490 | if ( str == "0-0-0" ) | 500 | if ( str == "0-0-0" ) |
491 | return false; | 501 | return false; |
492 | else{ | 502 | else{ |
493 | int day, year, month; | 503 | int day, year, month; |
494 | QStringList list = QStringList::split("-", str ); | 504 | QStringList list = QStringList::split("-", str ); |
495 | year = list[0].toInt(); | 505 | year = list[0].toInt(); |
496 | month = list[1].toInt(); | 506 | month = list[1].toInt(); |
497 | day = list[2].toInt(); | 507 | day = list[2].toInt(); |
498 | da.setYMD( year, month, day ); | 508 | da.setYMD( year, month, day ); |
499 | return true; | 509 | return true; |
500 | } | 510 | } |
501 | } | 511 | } |
502 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ | 512 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ |
503 | if ( res.state() == OSQLResult::Failure ) { | 513 | if ( res.state() == OSQLResult::Failure ) { |
504 | OTodo to; | 514 | OTodo to; |
505 | return to; | 515 | return to; |
506 | } | 516 | } |
507 | 517 | ||
508 | OSQLResultItem::ValueList list = res.results(); | 518 | OSQLResultItem::ValueList list = res.results(); |
509 | OSQLResultItem::ValueList::Iterator it = list.begin(); | 519 | OSQLResultItem::ValueList::Iterator it = list.begin(); |
510 | qWarning("todo1"); | 520 | qWarning("todo1"); |
511 | OTodo to = todo( (*it) ); | 521 | OTodo to = todo( (*it) ); |
512 | cache( to ); | 522 | cache( to ); |
513 | ++it; | 523 | ++it; |
514 | 524 | ||
515 | for ( ; it != list.end(); ++it ) { | 525 | for ( ; it != list.end(); ++it ) { |
516 | qWarning("caching"); | 526 | qWarning("caching"); |
517 | cache( todo( (*it) ) ); | 527 | cache( todo( (*it) ) ); |
518 | } | 528 | } |
519 | return to; | 529 | return to; |
520 | } | 530 | } |
521 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { | 531 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { |
522 | qWarning("todo"); | 532 | qWarning("todo"); |
523 | bool hasDueDate = false; QDate dueDate = QDate::currentDate(); | 533 | bool hasDueDate = false; QDate dueDate = QDate::currentDate(); |
524 | hasDueDate = date( dueDate, item.data("DueDate") ); | 534 | hasDueDate = date( dueDate, item.data("DueDate") ); |
525 | QStringList cats = QStringList::split(";", item.data("categories") ); | 535 | QStringList cats = QStringList::split(";", item.data("categories") ); |
526 | 536 | ||
537 | qWarning("Item is completed: %d", item.data("completed").toInt() ); | ||
538 | |||
527 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), | 539 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), |
528 | cats, item.data("summary"), item.data("description"), | 540 | cats, item.data("summary"), item.data("description"), |
529 | item.data("progress").toUShort(), hasDueDate, dueDate, | 541 | item.data("progress").toUShort(), hasDueDate, dueDate, |
530 | item.data("uid").toInt() ); | 542 | item.data("uid").toInt() ); |
531 | 543 | ||
532 | bool isOk; | 544 | bool isOk; |
533 | int prioInt = QString( item.data("priority") ).toInt( &isOk ); | 545 | int prioInt = QString( item.data("priority") ).toInt( &isOk ); |
534 | if ( isOk ) | 546 | if ( isOk ) |
535 | to.setPriority( prioInt ); | 547 | to.setPriority( prioInt ); |
536 | 548 | ||
537 | bool hasStartDate = false; QDate startDate = QDate::currentDate(); | 549 | bool hasStartDate = false; QDate startDate = QDate::currentDate(); |
538 | hasStartDate = date( startDate, item.data("startdate") ); | 550 | hasStartDate = date( startDate, item.data("startdate") ); |
539 | bool hasCompletedDate = false; QDate completedDate = QDate::currentDate(); | 551 | bool hasCompletedDate = false; QDate completedDate = QDate::currentDate(); |
540 | hasCompletedDate = date( completedDate, item.data("completeddate") ); | 552 | hasCompletedDate = date( completedDate, item.data("completeddate") ); |
541 | 553 | ||
542 | if ( hasStartDate ) | 554 | if ( hasStartDate ) |
543 | to.setStartDate( startDate ); | 555 | to.setStartDate( startDate ); |
544 | if ( hasCompletedDate ) | 556 | if ( hasCompletedDate ) |
545 | to.setCompletedDate( completedDate ); | 557 | to.setCompletedDate( completedDate ); |
546 | 558 | ||
547 | OPimNotifyManager& manager = to.notifiers(); | 559 | OPimNotifyManager& manager = to.notifiers(); |
548 | manager.alarmsFromString( item.data("alarms") ); | 560 | manager.alarmsFromString( item.data("alarms") ); |
549 | manager.remindersFromString( item.data("reminders") ); | 561 | manager.remindersFromString( item.data("reminders") ); |
550 | 562 | ||
551 | OPimState pimState; | 563 | OPimState pimState; |
552 | pimState.setState( QString( item.data("state") ).toInt() ); | 564 | pimState.setState( QString( item.data("state") ).toInt() ); |
553 | to.setState( pimState ); | 565 | to.setState( pimState ); |
554 | 566 | ||
555 | // Recurrence not supported yet | 567 | QMap<int, QString> recMap; |
556 | // to.setRecurrence( | 568 | recMap.insert( ORecur::RType , item.data("RType") ); |
569 | recMap.insert( ORecur::RWeekdays , item.data("RWeekdays") ); | ||
570 | recMap.insert( ORecur::RPosition , item.data("RPosition") ); | ||
571 | recMap.insert( ORecur::RFreq , item.data("RFreq") ); | ||
572 | recMap.insert( ORecur::RHasEndDate, item.data("RHasEndDate") ); | ||
573 | recMap.insert( ORecur::EndDate , item.data("EndDate") ); | ||
574 | recMap.insert( ORecur::Created , item.data("Created") ); | ||
575 | recMap.insert( ORecur::Exceptions , item.data("Exceptions") ); | ||
576 | |||
577 | ORecur recur; | ||
578 | recur.fromMap( recMap ); | ||
579 | to.setRecurrence( recur ); | ||
557 | 580 | ||
558 | return to; | 581 | return to; |
559 | } | 582 | } |
560 | OTodo OTodoAccessBackendSQL::todo( int uid )const { | 583 | OTodo OTodoAccessBackendSQL::todo( int uid )const { |
561 | FindQuery find( uid ); | 584 | FindQuery find( uid ); |
562 | return todo( m_driver->query(&find) ); | 585 | return todo( m_driver->query(&find) ); |
563 | } | 586 | } |
564 | /* | 587 | /* |
565 | * update the dict | 588 | * update the dict |
566 | */ | 589 | */ |
567 | void OTodoAccessBackendSQL::fillDict() { | 590 | void OTodoAccessBackendSQL::fillDict() { |
568 | /* initialize dict */ | 591 | /* initialize dict */ |
569 | /* | 592 | /* |
570 | * UPDATE dict if you change anything!!! | 593 | * UPDATE dict if you change anything!!! |
571 | * FIXME: Isn't this dict obsolete ? (eilers) | 594 | * FIXME: Isn't this dict obsolete ? (eilers) |
572 | */ | 595 | */ |
573 | m_dict.setAutoDelete( TRUE ); | 596 | m_dict.setAutoDelete( TRUE ); |
574 | m_dict.insert("Categories" , new int(OTodo::Category) ); | 597 | m_dict.insert("Categories" , new int(OTodo::Category) ); |
575 | m_dict.insert("Uid" , new int(OTodo::Uid) ); | 598 | m_dict.insert("Uid" , new int(OTodo::Uid) ); |
576 | m_dict.insert("HasDate" , new int(OTodo::HasDate) ); | 599 | m_dict.insert("HasDate" , new int(OTodo::HasDate) ); |
577 | m_dict.insert("Completed" , new int(OTodo::Completed) ); | 600 | m_dict.insert("Completed" , new int(OTodo::Completed) ); |
578 | m_dict.insert("Description" , new int(OTodo::Description) ); | 601 | m_dict.insert("Description" , new int(OTodo::Description) ); |
579 | m_dict.insert("Summary" , new int(OTodo::Summary) ); | 602 | m_dict.insert("Summary" , new int(OTodo::Summary) ); |
580 | m_dict.insert("Priority" , new int(OTodo::Priority) ); | 603 | m_dict.insert("Priority" , new int(OTodo::Priority) ); |
581 | m_dict.insert("DateDay" , new int(OTodo::DateDay) ); | 604 | m_dict.insert("DateDay" , new int(OTodo::DateDay) ); |
582 | m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); | 605 | m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); |
583 | m_dict.insert("DateYear" , new int(OTodo::DateYear) ); | 606 | m_dict.insert("DateYear" , new int(OTodo::DateYear) ); |
584 | m_dict.insert("Progress" , new int(OTodo::Progress) ); | 607 | m_dict.insert("Progress" , new int(OTodo::Progress) ); |
585 | m_dict.insert("Completed", new int(OTodo::Completed) ); // Why twice ? (eilers) | 608 | m_dict.insert("Completed", new int(OTodo::Completed) ); // Why twice ? (eilers) |
586 | m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); | 609 | m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); |
587 | // m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers) | 610 | // m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers) |
588 | // m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); // old stuff (eilers) | 611 | // m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); // old stuff (eilers) |
589 | } | 612 | } |
590 | /* | 613 | /* |
591 | * need to be const so let's fool the | 614 | * need to be const so let's fool the |
592 | * compiler :( | 615 | * compiler :( |
593 | */ | 616 | */ |
594 | void OTodoAccessBackendSQL::update()const { | 617 | void OTodoAccessBackendSQL::update()const { |
595 | ((OTodoAccessBackendSQL*)this)->m_dirty = false; | 618 | ((OTodoAccessBackendSQL*)this)->m_dirty = false; |
596 | LoadQuery lo; | 619 | LoadQuery lo; |
597 | OSQLResult res = m_driver->query(&lo); | 620 | OSQLResult res = m_driver->query(&lo); |
598 | if ( res.state() != OSQLResult::Success ) | 621 | if ( res.state() != OSQLResult::Success ) |
599 | return; | 622 | return; |
600 | 623 | ||
601 | ((OTodoAccessBackendSQL*)this)->m_uids = uids( res ); | 624 | ((OTodoAccessBackendSQL*)this)->m_uids = uids( res ); |
602 | } | 625 | } |
603 | QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ | 626 | QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ |
604 | 627 | ||
diff --git a/libopie2/opiecore/oglobalsettings.h b/libopie2/opiecore/oglobalsettings.h index d3f357e..e3ac148 100644 --- a/libopie2/opiecore/oglobalsettings.h +++ b/libopie2/opiecore/oglobalsettings.h | |||
@@ -159,97 +159,97 @@ class OGlobalSettings | |||
159 | * See <a href="http://opie.handhelds.org/documentation/standards/opie/style/keys/completion.html"> | 159 | * See <a href="http://opie.handhelds.org/documentation/standards/opie/style/keys/completion.html"> |
160 | * the styleguide</a>. | 160 | * the styleguide</a>. |
161 | **/ | 161 | **/ |
162 | enum Completion { | 162 | enum Completion { |
163 | /** | 163 | /** |
164 | * No completion is used. | 164 | * No completion is used. |
165 | */ | 165 | */ |
166 | CompletionNone=1, | 166 | CompletionNone=1, |
167 | /** | 167 | /** |
168 | * Text is automatically filled in whenever possible. | 168 | * Text is automatically filled in whenever possible. |
169 | */ | 169 | */ |
170 | CompletionAuto, | 170 | CompletionAuto, |
171 | /** | 171 | /** |
172 | * Same as automatic except shortest match is used for completion. | 172 | * Same as automatic except shortest match is used for completion. |
173 | */ | 173 | */ |
174 | CompletionMan, | 174 | CompletionMan, |
175 | /** | 175 | /** |
176 | * Complete text much in the same way as a typical *nix shell would. | 176 | * Complete text much in the same way as a typical *nix shell would. |
177 | */ | 177 | */ |
178 | CompletionShell, | 178 | CompletionShell, |
179 | /** | 179 | /** |
180 | * Lists all possible matches in a popup list-box to choose from. | 180 | * Lists all possible matches in a popup list-box to choose from. |
181 | */ | 181 | */ |
182 | CompletionPopup, | 182 | CompletionPopup, |
183 | /** | 183 | /** |
184 | * Lists all possible matches in a popup list-box to choose from, and automatically | 184 | * Lists all possible matches in a popup list-box to choose from, and automatically |
185 | * fill the result whenever possible. | 185 | * fill the result whenever possible. |
186 | */ | 186 | */ |
187 | CompletionPopupAuto | 187 | CompletionPopupAuto |
188 | }; | 188 | }; |
189 | /** | 189 | /** |
190 | * Returns the preferred completion mode setting. | 190 | * Returns the preferred completion mode setting. |
191 | * | 191 | * |
192 | * @return @ref Completion. Default is @p CompletionPopup. | 192 | * @return @ref Completion. Default is @p CompletionPopup. |
193 | */ | 193 | */ |
194 | static Completion completionMode(); | 194 | static Completion completionMode(); |
195 | 195 | ||
196 | /** | 196 | /** |
197 | * This enum describes the debug mode used for by the @ref odbgstream class. | 197 | * This enum describes the debug mode used for by the @ref odbgstream class. |
198 | * See <a href="http://opie.handhelds.org/documentation/standards/opie/style/debug/debug.html"> | 198 | * See <a href="http://opie.handhelds.org/documentation/standards/opie/style/debug/debug.html"> |
199 | * the styleguide</a>. | 199 | * the styleguide</a>. |
200 | **/ | 200 | **/ |
201 | enum Debug { | 201 | enum Debug { |
202 | /** | 202 | /** |
203 | * Debug messages are ignored. | 203 | * Debug messages are ignored. |
204 | */ | 204 | */ |
205 | DebugNone=-1, | 205 | DebugNone=-1, |
206 | /** | 206 | /** |
207 | * Debug output is sent to files /var/log/***. | 207 | * Debug output is sent to files /var/log/. |
208 | */ | 208 | */ |
209 | DebugFiles=0, | 209 | DebugFiles=0, |
210 | /** | 210 | /** |
211 | * Debug output is written in a QMessageBox. | 211 | * Debug output is written in a QMessageBox. |
212 | */ | 212 | */ |
213 | DebugMsgBox=1, | 213 | DebugMsgBox=1, |
214 | /** | 214 | /** |
215 | * Debug output is sent to stderr. | 215 | * Debug output is sent to stderr. |
216 | */ | 216 | */ |
217 | DebugStdErr=2, | 217 | DebugStdErr=2, |
218 | /** | 218 | /** |
219 | * Debug output is sent to syslog. | 219 | * Debug output is sent to syslog. |
220 | */ | 220 | */ |
221 | DebugSysLog=3, | 221 | DebugSysLog=3, |
222 | /** | 222 | /** |
223 | * Debug output is sent via udp over a socket. | 223 | * Debug output is sent via udp over a socket. |
224 | */ | 224 | */ |
225 | DebugSocket=4 | 225 | DebugSocket=4 |
226 | }; | 226 | }; |
227 | /** | 227 | /** |
228 | * Returns the preferred debug mode setting. | 228 | * Returns the preferred debug mode setting. |
229 | * | 229 | * |
230 | * @return @ref Debug. Default is @p DebugStdErr. | 230 | * @return @ref Debug. Default is @p DebugStdErr. |
231 | */ | 231 | */ |
232 | static Debug debugMode(); | 232 | static Debug debugMode(); |
233 | 233 | ||
234 | /** | 234 | /** |
235 | * Returns additional information for debug output (dependent on the debug mode). | 235 | * Returns additional information for debug output (dependent on the debug mode). |
236 | * | 236 | * |
237 | * @return Additional debug output information. | 237 | * @return Additional debug output information. |
238 | */ | 238 | */ |
239 | static QString debugOutput(); | 239 | static QString debugOutput(); |
240 | /** | 240 | /** |
241 | * This is a structure containing the possible mouse settings. | 241 | * This is a structure containing the possible mouse settings. |
242 | */ | 242 | */ |
243 | struct OMouseSettings | 243 | struct OMouseSettings |
244 | { | 244 | { |
245 | enum { RightHanded = 0, LeftHanded = 1 }; | 245 | enum { RightHanded = 0, LeftHanded = 1 }; |
246 | int handed; // left or right | 246 | int handed; // left or right |
247 | }; | 247 | }; |
248 | 248 | ||
249 | /** | 249 | /** |
250 | * This returns the current mouse settings. | 250 | * This returns the current mouse settings. |
251 | */ | 251 | */ |
252 | static OMouseSettings & mouseSettings(); | 252 | static OMouseSettings & mouseSettings(); |
253 | 253 | ||
254 | /** | 254 | /** |
255 | * The path to the desktop directory of the current user. | 255 | * The path to the desktop directory of the current user. |
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro index bf547ab..6a4e8f1 100644 --- a/libopie2/opiedb/opiedb.pro +++ b/libopie2/opiedb/opiedb.pro | |||
@@ -1,39 +1,41 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG += qt warn_on debug | 2 | #CONFIG += qt warn_on debug |
3 | CONFIG += qt warn_on release | 3 | CONFIG += qt warn_on release |
4 | DESTDIR = $(OPIEDIR)/lib | 4 | DESTDIR = $(OPIEDIR)/lib |
5 | HEADERS = osqlbackend.h \ | 5 | HEADERS = osqlbackend.h \ |
6 | osqldriver.h \ | 6 | osqldriver.h \ |
7 | osqlerror.h \ | 7 | osqlerror.h \ |
8 | osqlmanager.h \ | 8 | osqlmanager.h \ |
9 | osqlquery.h \ | 9 | osqlquery.h \ |
10 | osqlresult.h \ | 10 | osqlresult.h \ |
11 | osqltable.h \ | 11 | osqltable.h \ |
12 | osqlbackendmanager.h \ | 12 | osqlbackendmanager.h \ |
13 | osqlitedriver.h | 13 | osqlitedriver.h |
14 | SOURCES = osqlbackend.cpp \ | 14 | SOURCES = osqlbackend.cpp \ |
15 | osqldriver.cpp \ | 15 | osqldriver.cpp \ |
16 | osqlerror.cpp \ | 16 | osqlerror.cpp \ |
17 | osqlmanager.cpp \ | 17 | osqlmanager.cpp \ |
18 | osqlquery.cpp \ | 18 | osqlquery.cpp \ |
19 | osqlresult.cpp \ | 19 | osqlresult.cpp \ |
20 | osqltable.cpp \ | 20 | osqltable.cpp \ |
21 | osqlbackendmanager.cpp \ | 21 | osqlbackendmanager.cpp \ |
22 | osqlitedriver.cpp | 22 | osqlitedriver.cpp |
23 | INTERFACES = | 23 | INTERFACES = |
24 | TARGET = opiedb2 | 24 | TARGET = opiedb2 |
25 | VERSION = 1.8.1 | 25 | VERSION = 1.8.1 |
26 | INCLUDEPATH += $(OPIEDIR)/include | 26 | INCLUDEPATH += $(OPIEDIR)/include |
27 | DEPENDPATH += $(OPIEDIR)/include | 27 | DEPENDPATH += $(OPIEDIR)/include |
28 | 28 | ||
29 | MOC_DIR = moc | 29 | MOC_DIR = moc |
30 | OBJECTS_DIR = obj | 30 | OBJECTS_DIR = obj |
31 | 31 | ||
32 | LIBS += -lsqlite -lqpe | ||
33 | |||
32 | !contains( platform, x11 ) { | 34 | !contains( platform, x11 ) { |
33 | include ( $(OPIEDIR)/include.pro ) | 35 | include ( $(OPIEDIR)/include.pro ) |
34 | } | 36 | } |
35 | 37 | ||
36 | contains( platform, x11 ) { | 38 | contains( platform, x11 ) { |
37 | LIBS = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 39 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
38 | } | 40 | } |
39 | 41 | ||
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp index ebd03bb..3913661 100644 --- a/libopie2/opiepim/backend/otodoaccesssql.cpp +++ b/libopie2/opiepim/backend/otodoaccesssql.cpp | |||
@@ -78,160 +78,170 @@ namespace { | |||
78 | 78 | ||
79 | }; | 79 | }; |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * a find query | 82 | * a find query |
83 | */ | 83 | */ |
84 | class FindQuery : public OSQLQuery { | 84 | class FindQuery : public OSQLQuery { |
85 | public: | 85 | public: |
86 | FindQuery(int uid); | 86 | FindQuery(int uid); |
87 | FindQuery(const QArray<int>& ); | 87 | FindQuery(const QArray<int>& ); |
88 | ~FindQuery(); | 88 | ~FindQuery(); |
89 | QString query()const; | 89 | QString query()const; |
90 | private: | 90 | private: |
91 | QString single()const; | 91 | QString single()const; |
92 | QString multi()const; | 92 | QString multi()const; |
93 | QArray<int> m_uids; | 93 | QArray<int> m_uids; |
94 | int m_uid; | 94 | int m_uid; |
95 | }; | 95 | }; |
96 | 96 | ||
97 | /** | 97 | /** |
98 | * overdue query | 98 | * overdue query |
99 | */ | 99 | */ |
100 | class OverDueQuery : public OSQLQuery { | 100 | class OverDueQuery : public OSQLQuery { |
101 | public: | 101 | public: |
102 | OverDueQuery(); | 102 | OverDueQuery(); |
103 | ~OverDueQuery(); | 103 | ~OverDueQuery(); |
104 | QString query()const; | 104 | QString query()const; |
105 | }; | 105 | }; |
106 | class EffQuery : public OSQLQuery { | 106 | class EffQuery : public OSQLQuery { |
107 | public: | 107 | public: |
108 | EffQuery( const QDate&, const QDate&, bool inc ); | 108 | EffQuery( const QDate&, const QDate&, bool inc ); |
109 | ~EffQuery(); | 109 | ~EffQuery(); |
110 | QString query()const; | 110 | QString query()const; |
111 | private: | 111 | private: |
112 | QString with()const; | 112 | QString with()const; |
113 | QString out()const; | 113 | QString out()const; |
114 | QDate m_start; | 114 | QDate m_start; |
115 | QDate m_end; | 115 | QDate m_end; |
116 | bool m_inc :1; | 116 | bool m_inc :1; |
117 | }; | 117 | }; |
118 | 118 | ||
119 | 119 | ||
120 | CreateQuery::CreateQuery() : OSQLQuery() {} | 120 | CreateQuery::CreateQuery() : OSQLQuery() {} |
121 | CreateQuery::~CreateQuery() {} | 121 | CreateQuery::~CreateQuery() {} |
122 | QString CreateQuery::query()const { | 122 | QString CreateQuery::query()const { |
123 | QString qu; | 123 | QString qu; |
124 | qu += "create table todolist( uid PRIMARY KEY, categories, completed, "; | 124 | qu += "create table todolist( uid PRIMARY KEY, categories, completed, "; |
125 | qu += "description, summary, priority, DueDate, progress , state, "; | 125 | qu += "description, summary, priority, DueDate, progress , state, "; |
126 | qu += "Recurrence, reminders, alarms, maintainer, startdate, completeddate);"; | 126 | // This is the recurrance-stuff .. Exceptions are currently not supported (see ORecur.cpp) ! (eilers) |
127 | qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, "; | ||
128 | qu += "reminders, alarms, maintainer, startdate, completeddate);"; | ||
127 | qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );"; | 129 | qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );"; |
128 | return qu; | 130 | return qu; |
129 | } | 131 | } |
130 | 132 | ||
131 | LoadQuery::LoadQuery() : OSQLQuery() {} | 133 | LoadQuery::LoadQuery() : OSQLQuery() {} |
132 | LoadQuery::~LoadQuery() {} | 134 | LoadQuery::~LoadQuery() {} |
133 | QString LoadQuery::query()const { | 135 | QString LoadQuery::query()const { |
134 | QString qu; | 136 | QString qu; |
135 | // We do not need "distinct" here. The primary key is always unique.. | 137 | // We do not need "distinct" here. The primary key is always unique.. |
136 | //qu += "select distinct uid from todolist"; | 138 | //qu += "select distinct uid from todolist"; |
137 | qu += "select uid from todolist"; | 139 | qu += "select uid from todolist"; |
138 | 140 | ||
139 | return qu; | 141 | return qu; |
140 | } | 142 | } |
141 | 143 | ||
142 | InsertQuery::InsertQuery( const OTodo& todo ) | 144 | InsertQuery::InsertQuery( const OTodo& todo ) |
143 | : OSQLQuery(), m_todo( todo ) { | 145 | : OSQLQuery(), m_todo( todo ) { |
144 | } | 146 | } |
145 | InsertQuery::~InsertQuery() { | 147 | InsertQuery::~InsertQuery() { |
146 | } | 148 | } |
147 | /* | 149 | /* |
148 | * converts from a OTodo to a query | 150 | * converts from a OTodo to a query |
149 | * we leave out X-Ref + Alarms | 151 | * we leave out X-Ref + Alarms |
150 | */ | 152 | */ |
151 | QString InsertQuery::query()const{ | 153 | QString InsertQuery::query()const{ |
152 | 154 | ||
153 | int year, month, day; | 155 | int year, month, day; |
154 | year = month = day = 0; | 156 | year = month = day = 0; |
155 | if (m_todo.hasDueDate() ) { | 157 | if (m_todo.hasDueDate() ) { |
156 | QDate date = m_todo.dueDate(); | 158 | QDate date = m_todo.dueDate(); |
157 | year = date.year(); | 159 | year = date.year(); |
158 | month = date.month(); | 160 | month = date.month(); |
159 | day = date.day(); | 161 | day = date.day(); |
160 | } | 162 | } |
161 | int sYear = 0, sMonth = 0, sDay = 0; | 163 | int sYear = 0, sMonth = 0, sDay = 0; |
162 | if( m_todo.hasStartDate() ){ | 164 | if( m_todo.hasStartDate() ){ |
163 | QDate sDate = m_todo.startDate(); | 165 | QDate sDate = m_todo.startDate(); |
164 | sYear = sDate.year(); | 166 | sYear = sDate.year(); |
165 | sMonth= sDate.month(); | 167 | sMonth= sDate.month(); |
166 | sDay = sDate.day(); | 168 | sDay = sDate.day(); |
167 | } | 169 | } |
168 | 170 | ||
169 | int eYear = 0, eMonth = 0, eDay = 0; | 171 | int eYear = 0, eMonth = 0, eDay = 0; |
170 | if( m_todo.hasCompletedDate() ){ | 172 | if( m_todo.hasCompletedDate() ){ |
171 | QDate eDate = m_todo.completedDate(); | 173 | QDate eDate = m_todo.completedDate(); |
172 | eYear = eDate.year(); | 174 | eYear = eDate.year(); |
173 | eMonth= eDate.month(); | 175 | eMonth= eDate.month(); |
174 | eDay = eDate.day(); | 176 | eDay = eDate.day(); |
175 | } | 177 | } |
176 | QString qu; | 178 | QString qu; |
179 | QMap<int, QString> recMap = m_todo.recurrence().toMap(); | ||
177 | qu = "insert into todolist VALUES(" | 180 | qu = "insert into todolist VALUES(" |
178 | + QString::number( m_todo.uid() ) + "," | 181 | + QString::number( m_todo.uid() ) + "," |
179 | + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + "," | 182 | + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + "," |
180 | + QString::number( m_todo.isCompleted() ) + "," | 183 | + QString::number( m_todo.isCompleted() ) + "," |
181 | + "'" + m_todo.description() + "'" + "," | 184 | + "'" + m_todo.description() + "'" + "," |
182 | + "'" + m_todo.summary() + "'" + "," | 185 | + "'" + m_todo.summary() + "'" + "," |
183 | + QString::number(m_todo.priority() ) + "," | 186 | + QString::number(m_todo.priority() ) + "," |
184 | + "'" + QString::number(year) + "-" | 187 | + "'" + QString::number(year) + "-" |
185 | + QString::number(month) | 188 | + QString::number(month) |
186 | + "-" + QString::number( day ) + "'" + "," | 189 | + "-" + QString::number( day ) + "'" + "," |
187 | + QString::number( m_todo.progress() ) + "," | 190 | + QString::number( m_todo.progress() ) + "," |
188 | + QString::number( m_todo.state().state() ) + "," | 191 | + QString::number( m_todo.state().state() ) + "," |
189 | + "'" + m_todo.recurrence().toString() + "'"+ ","; | 192 | + "'" + recMap[ ORecur::RType ] + "'" + "," |
193 | + "'" + recMap[ ORecur::RWeekdays ] + "'" + "," | ||
194 | + "'" + recMap[ ORecur::RPosition ] + "'" + "," | ||
195 | + "'" + recMap[ ORecur::RFreq ] + "'" + "," | ||
196 | + "'" + recMap[ ORecur::RHasEndDate ] + "'" + "," | ||
197 | + "'" + recMap[ ORecur::EndDate ] + "'" + "," | ||
198 | + "'" + recMap[ ORecur::Created ] + "'" + "," | ||
199 | + "'" + recMap[ ORecur::Exceptions ] + "'" + ","; | ||
190 | 200 | ||
191 | if ( m_todo.hasNotifiers() ) { | 201 | if ( m_todo.hasNotifiers() ) { |
192 | OPimNotifyManager manager = m_todo.notifiers(); | 202 | OPimNotifyManager manager = m_todo.notifiers(); |
193 | qu += "'" + manager.remindersToString() + "'" + "," | 203 | qu += "'" + manager.remindersToString() + "'" + "," |
194 | + "'" + manager.alarmsToString() + "'" + ","; | 204 | + "'" + manager.alarmsToString() + "'" + ","; |
195 | } | 205 | } |
196 | else{ | 206 | else{ |
197 | qu += QString( "''" ) + "," | 207 | qu += QString( "''" ) + "," |
198 | + "''" + ","; | 208 | + "''" + ","; |
199 | } | 209 | } |
200 | 210 | ||
201 | qu += QString( "''" ) + QString( "," ) // Maintainers (cur. not supported !) | 211 | qu += QString( "''" ) + QString( "," ) // Maintainers (cur. not supported !) |
202 | + "'" + QString::number(sYear) + "-" | 212 | + "'" + QString::number(sYear) + "-" |
203 | + QString::number(sMonth) | 213 | + QString::number(sMonth) |
204 | + "-" + QString::number(sDay) + "'" + "," | 214 | + "-" + QString::number(sDay) + "'" + "," |
205 | + "'" + QString::number(eYear) + "-" | 215 | + "'" + QString::number(eYear) + "-" |
206 | + QString::number(eMonth) | 216 | + QString::number(eMonth) |
207 | + "-"+QString::number(eDay) + "'" | 217 | + "-"+QString::number(eDay) + "'" |
208 | + ")"; | 218 | + ")"; |
209 | 219 | ||
210 | qWarning("add %s", qu.latin1() ); | 220 | qWarning("add %s", qu.latin1() ); |
211 | return qu; | 221 | return qu; |
212 | } | 222 | } |
213 | 223 | ||
214 | RemoveQuery::RemoveQuery(int uid ) | 224 | RemoveQuery::RemoveQuery(int uid ) |
215 | : OSQLQuery(), m_uid( uid ) {} | 225 | : OSQLQuery(), m_uid( uid ) {} |
216 | RemoveQuery::~RemoveQuery() {} | 226 | RemoveQuery::~RemoveQuery() {} |
217 | QString RemoveQuery::query()const { | 227 | QString RemoveQuery::query()const { |
218 | QString qu = "DELETE from todolist where uid = " + QString::number(m_uid); | 228 | QString qu = "DELETE from todolist where uid = " + QString::number(m_uid); |
219 | return qu; | 229 | return qu; |
220 | } | 230 | } |
221 | 231 | ||
222 | 232 | ||
223 | ClearQuery::ClearQuery() | 233 | ClearQuery::ClearQuery() |
224 | : OSQLQuery() {} | 234 | : OSQLQuery() {} |
225 | ClearQuery::~ClearQuery() {} | 235 | ClearQuery::~ClearQuery() {} |
226 | QString ClearQuery::query()const { | 236 | QString ClearQuery::query()const { |
227 | QString qu = "drop table todolist"; | 237 | QString qu = "drop table todolist"; |
228 | return qu; | 238 | return qu; |
229 | } | 239 | } |
230 | FindQuery::FindQuery(int uid) | 240 | FindQuery::FindQuery(int uid) |
231 | : OSQLQuery(), m_uid(uid ) { | 241 | : OSQLQuery(), m_uid(uid ) { |
232 | } | 242 | } |
233 | FindQuery::FindQuery(const QArray<int>& ints) | 243 | FindQuery::FindQuery(const QArray<int>& ints) |
234 | : OSQLQuery(), m_uids(ints){ | 244 | : OSQLQuery(), m_uids(ints){ |
235 | } | 245 | } |
236 | FindQuery::~FindQuery() { | 246 | FindQuery::~FindQuery() { |
237 | } | 247 | } |
@@ -479,126 +489,139 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder, | |||
479 | 489 | ||
480 | if ( !asc ) { | 490 | if ( !asc ) { |
481 | qWarning("not ascending!"); | 491 | qWarning("not ascending!"); |
482 | query += " DESC"; | 492 | query += " DESC"; |
483 | } | 493 | } |
484 | 494 | ||
485 | qWarning( query ); | 495 | qWarning( query ); |
486 | OSQLRawQuery raw(query ); | 496 | OSQLRawQuery raw(query ); |
487 | return uids( m_driver->query(&raw) ); | 497 | return uids( m_driver->query(&raw) ); |
488 | } | 498 | } |
489 | bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ | 499 | bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ |
490 | if ( str == "0-0-0" ) | 500 | if ( str == "0-0-0" ) |
491 | return false; | 501 | return false; |
492 | else{ | 502 | else{ |
493 | int day, year, month; | 503 | int day, year, month; |
494 | QStringList list = QStringList::split("-", str ); | 504 | QStringList list = QStringList::split("-", str ); |
495 | year = list[0].toInt(); | 505 | year = list[0].toInt(); |
496 | month = list[1].toInt(); | 506 | month = list[1].toInt(); |
497 | day = list[2].toInt(); | 507 | day = list[2].toInt(); |
498 | da.setYMD( year, month, day ); | 508 | da.setYMD( year, month, day ); |
499 | return true; | 509 | return true; |
500 | } | 510 | } |
501 | } | 511 | } |
502 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ | 512 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ |
503 | if ( res.state() == OSQLResult::Failure ) { | 513 | if ( res.state() == OSQLResult::Failure ) { |
504 | OTodo to; | 514 | OTodo to; |
505 | return to; | 515 | return to; |
506 | } | 516 | } |
507 | 517 | ||
508 | OSQLResultItem::ValueList list = res.results(); | 518 | OSQLResultItem::ValueList list = res.results(); |
509 | OSQLResultItem::ValueList::Iterator it = list.begin(); | 519 | OSQLResultItem::ValueList::Iterator it = list.begin(); |
510 | qWarning("todo1"); | 520 | qWarning("todo1"); |
511 | OTodo to = todo( (*it) ); | 521 | OTodo to = todo( (*it) ); |
512 | cache( to ); | 522 | cache( to ); |
513 | ++it; | 523 | ++it; |
514 | 524 | ||
515 | for ( ; it != list.end(); ++it ) { | 525 | for ( ; it != list.end(); ++it ) { |
516 | qWarning("caching"); | 526 | qWarning("caching"); |
517 | cache( todo( (*it) ) ); | 527 | cache( todo( (*it) ) ); |
518 | } | 528 | } |
519 | return to; | 529 | return to; |
520 | } | 530 | } |
521 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { | 531 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { |
522 | qWarning("todo"); | 532 | qWarning("todo"); |
523 | bool hasDueDate = false; QDate dueDate = QDate::currentDate(); | 533 | bool hasDueDate = false; QDate dueDate = QDate::currentDate(); |
524 | hasDueDate = date( dueDate, item.data("DueDate") ); | 534 | hasDueDate = date( dueDate, item.data("DueDate") ); |
525 | QStringList cats = QStringList::split(";", item.data("categories") ); | 535 | QStringList cats = QStringList::split(";", item.data("categories") ); |
526 | 536 | ||
537 | qWarning("Item is completed: %d", item.data("completed").toInt() ); | ||
538 | |||
527 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), | 539 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), |
528 | cats, item.data("summary"), item.data("description"), | 540 | cats, item.data("summary"), item.data("description"), |
529 | item.data("progress").toUShort(), hasDueDate, dueDate, | 541 | item.data("progress").toUShort(), hasDueDate, dueDate, |
530 | item.data("uid").toInt() ); | 542 | item.data("uid").toInt() ); |
531 | 543 | ||
532 | bool isOk; | 544 | bool isOk; |
533 | int prioInt = QString( item.data("priority") ).toInt( &isOk ); | 545 | int prioInt = QString( item.data("priority") ).toInt( &isOk ); |
534 | if ( isOk ) | 546 | if ( isOk ) |
535 | to.setPriority( prioInt ); | 547 | to.setPriority( prioInt ); |
536 | 548 | ||
537 | bool hasStartDate = false; QDate startDate = QDate::currentDate(); | 549 | bool hasStartDate = false; QDate startDate = QDate::currentDate(); |
538 | hasStartDate = date( startDate, item.data("startdate") ); | 550 | hasStartDate = date( startDate, item.data("startdate") ); |
539 | bool hasCompletedDate = false; QDate completedDate = QDate::currentDate(); | 551 | bool hasCompletedDate = false; QDate completedDate = QDate::currentDate(); |
540 | hasCompletedDate = date( completedDate, item.data("completeddate") ); | 552 | hasCompletedDate = date( completedDate, item.data("completeddate") ); |
541 | 553 | ||
542 | if ( hasStartDate ) | 554 | if ( hasStartDate ) |
543 | to.setStartDate( startDate ); | 555 | to.setStartDate( startDate ); |
544 | if ( hasCompletedDate ) | 556 | if ( hasCompletedDate ) |
545 | to.setCompletedDate( completedDate ); | 557 | to.setCompletedDate( completedDate ); |
546 | 558 | ||
547 | OPimNotifyManager& manager = to.notifiers(); | 559 | OPimNotifyManager& manager = to.notifiers(); |
548 | manager.alarmsFromString( item.data("alarms") ); | 560 | manager.alarmsFromString( item.data("alarms") ); |
549 | manager.remindersFromString( item.data("reminders") ); | 561 | manager.remindersFromString( item.data("reminders") ); |
550 | 562 | ||
551 | OPimState pimState; | 563 | OPimState pimState; |
552 | pimState.setState( QString( item.data("state") ).toInt() ); | 564 | pimState.setState( QString( item.data("state") ).toInt() ); |
553 | to.setState( pimState ); | 565 | to.setState( pimState ); |
554 | 566 | ||
555 | // Recurrence not supported yet | 567 | QMap<int, QString> recMap; |
556 | // to.setRecurrence( | 568 | recMap.insert( ORecur::RType , item.data("RType") ); |
569 | recMap.insert( ORecur::RWeekdays , item.data("RWeekdays") ); | ||
570 | recMap.insert( ORecur::RPosition , item.data("RPosition") ); | ||
571 | recMap.insert( ORecur::RFreq , item.data("RFreq") ); | ||
572 | recMap.insert( ORecur::RHasEndDate, item.data("RHasEndDate") ); | ||
573 | recMap.insert( ORecur::EndDate , item.data("EndDate") ); | ||
574 | recMap.insert( ORecur::Created , item.data("Created") ); | ||
575 | recMap.insert( ORecur::Exceptions , item.data("Exceptions") ); | ||
576 | |||
577 | ORecur recur; | ||
578 | recur.fromMap( recMap ); | ||
579 | to.setRecurrence( recur ); | ||
557 | 580 | ||
558 | return to; | 581 | return to; |
559 | } | 582 | } |
560 | OTodo OTodoAccessBackendSQL::todo( int uid )const { | 583 | OTodo OTodoAccessBackendSQL::todo( int uid )const { |
561 | FindQuery find( uid ); | 584 | FindQuery find( uid ); |
562 | return todo( m_driver->query(&find) ); | 585 | return todo( m_driver->query(&find) ); |
563 | } | 586 | } |
564 | /* | 587 | /* |
565 | * update the dict | 588 | * update the dict |
566 | */ | 589 | */ |
567 | void OTodoAccessBackendSQL::fillDict() { | 590 | void OTodoAccessBackendSQL::fillDict() { |
568 | /* initialize dict */ | 591 | /* initialize dict */ |
569 | /* | 592 | /* |
570 | * UPDATE dict if you change anything!!! | 593 | * UPDATE dict if you change anything!!! |
571 | * FIXME: Isn't this dict obsolete ? (eilers) | 594 | * FIXME: Isn't this dict obsolete ? (eilers) |
572 | */ | 595 | */ |
573 | m_dict.setAutoDelete( TRUE ); | 596 | m_dict.setAutoDelete( TRUE ); |
574 | m_dict.insert("Categories" , new int(OTodo::Category) ); | 597 | m_dict.insert("Categories" , new int(OTodo::Category) ); |
575 | m_dict.insert("Uid" , new int(OTodo::Uid) ); | 598 | m_dict.insert("Uid" , new int(OTodo::Uid) ); |
576 | m_dict.insert("HasDate" , new int(OTodo::HasDate) ); | 599 | m_dict.insert("HasDate" , new int(OTodo::HasDate) ); |
577 | m_dict.insert("Completed" , new int(OTodo::Completed) ); | 600 | m_dict.insert("Completed" , new int(OTodo::Completed) ); |
578 | m_dict.insert("Description" , new int(OTodo::Description) ); | 601 | m_dict.insert("Description" , new int(OTodo::Description) ); |
579 | m_dict.insert("Summary" , new int(OTodo::Summary) ); | 602 | m_dict.insert("Summary" , new int(OTodo::Summary) ); |
580 | m_dict.insert("Priority" , new int(OTodo::Priority) ); | 603 | m_dict.insert("Priority" , new int(OTodo::Priority) ); |
581 | m_dict.insert("DateDay" , new int(OTodo::DateDay) ); | 604 | m_dict.insert("DateDay" , new int(OTodo::DateDay) ); |
582 | m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); | 605 | m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); |
583 | m_dict.insert("DateYear" , new int(OTodo::DateYear) ); | 606 | m_dict.insert("DateYear" , new int(OTodo::DateYear) ); |
584 | m_dict.insert("Progress" , new int(OTodo::Progress) ); | 607 | m_dict.insert("Progress" , new int(OTodo::Progress) ); |
585 | m_dict.insert("Completed", new int(OTodo::Completed) ); // Why twice ? (eilers) | 608 | m_dict.insert("Completed", new int(OTodo::Completed) ); // Why twice ? (eilers) |
586 | m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); | 609 | m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); |
587 | // m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers) | 610 | // m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers) |
588 | // m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); // old stuff (eilers) | 611 | // m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); // old stuff (eilers) |
589 | } | 612 | } |
590 | /* | 613 | /* |
591 | * need to be const so let's fool the | 614 | * need to be const so let's fool the |
592 | * compiler :( | 615 | * compiler :( |
593 | */ | 616 | */ |
594 | void OTodoAccessBackendSQL::update()const { | 617 | void OTodoAccessBackendSQL::update()const { |
595 | ((OTodoAccessBackendSQL*)this)->m_dirty = false; | 618 | ((OTodoAccessBackendSQL*)this)->m_dirty = false; |
596 | LoadQuery lo; | 619 | LoadQuery lo; |
597 | OSQLResult res = m_driver->query(&lo); | 620 | OSQLResult res = m_driver->query(&lo); |
598 | if ( res.state() != OSQLResult::Success ) | 621 | if ( res.state() != OSQLResult::Success ) |
599 | return; | 622 | return; |
600 | 623 | ||
601 | ((OTodoAccessBackendSQL*)this)->m_uids = uids( res ); | 624 | ((OTodoAccessBackendSQL*)this)->m_uids = uids( res ); |
602 | } | 625 | } |
603 | QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ | 626 | QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ |
604 | 627 | ||
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp index eae1fdc..8c9ad46 100644 --- a/libopie2/opiepim/core/orecur.cpp +++ b/libopie2/opiepim/core/orecur.cpp | |||
@@ -411,100 +411,175 @@ void ORecur::setPosition( int pos ) { | |||
411 | void ORecur::setDays( char c ) { | 411 | void ORecur::setDays( char c ) { |
412 | checkOrModify(); | 412 | checkOrModify(); |
413 | data->days = c; | 413 | data->days = c; |
414 | } | 414 | } |
415 | void ORecur::setEndDate( const QDate& dt) { | 415 | void ORecur::setEndDate( const QDate& dt) { |
416 | checkOrModify(); | 416 | checkOrModify(); |
417 | data->end = dt; | 417 | data->end = dt; |
418 | } | 418 | } |
419 | void ORecur::setCreatedDateTime( const QDateTime& t) { | 419 | void ORecur::setCreatedDateTime( const QDateTime& t) { |
420 | checkOrModify(); | 420 | checkOrModify(); |
421 | data->create = t; | 421 | data->create = t; |
422 | } | 422 | } |
423 | void ORecur::setHasEndDate( bool b) { | 423 | void ORecur::setHasEndDate( bool b) { |
424 | checkOrModify(); | 424 | checkOrModify(); |
425 | data->hasEnd = b; | 425 | data->hasEnd = b; |
426 | } | 426 | } |
427 | void ORecur::setRepitition( int rep ) { | 427 | void ORecur::setRepitition( int rep ) { |
428 | checkOrModify(); | 428 | checkOrModify(); |
429 | data->rep = rep; | 429 | data->rep = rep; |
430 | } | 430 | } |
431 | void ORecur::setService( const QString& app ) { | 431 | void ORecur::setService( const QString& app ) { |
432 | checkOrModify(); | 432 | checkOrModify(); |
433 | data->app = app; | 433 | data->app = app; |
434 | } | 434 | } |
435 | void ORecur::setStart( const QDate& dt ) { | 435 | void ORecur::setStart( const QDate& dt ) { |
436 | checkOrModify(); | 436 | checkOrModify(); |
437 | data->start = dt; | 437 | data->start = dt; |
438 | } | 438 | } |
439 | void ORecur::checkOrModify() { | 439 | void ORecur::checkOrModify() { |
440 | if ( data->count != 1 ) { | 440 | if ( data->count != 1 ) { |
441 | data->deref(); | 441 | data->deref(); |
442 | Data* d2 = new Data; | 442 | Data* d2 = new Data; |
443 | d2->days = data->days; | 443 | d2->days = data->days; |
444 | d2->type = data->type; | 444 | d2->type = data->type; |
445 | d2->freq = data->freq; | 445 | d2->freq = data->freq; |
446 | d2->pos = data->pos; | 446 | d2->pos = data->pos; |
447 | d2->hasEnd = data->hasEnd; | 447 | d2->hasEnd = data->hasEnd; |
448 | d2->end = data->end; | 448 | d2->end = data->end; |
449 | d2->create = data->create; | 449 | d2->create = data->create; |
450 | d2->rep = data->rep; | 450 | d2->rep = data->rep; |
451 | d2->app = data->app; | 451 | d2->app = data->app; |
452 | d2->list = data->list; | 452 | d2->list = data->list; |
453 | d2->start = data->start; | 453 | d2->start = data->start; |
454 | data = d2; | 454 | data = d2; |
455 | } | 455 | } |
456 | } | 456 | } |
457 | QString ORecur::toString()const { | 457 | QString ORecur::toString()const { |
458 | QString buf; | 458 | QString buf; |
459 | QMap<int, QString> recMap = toMap(); | ||
459 | 460 | ||
460 | buf += " rtype=\""; | 461 | buf += " rtype=\""; |
461 | switch ( data->type ) { | 462 | buf += recMap[ORecur::RType]; |
462 | case ORecur::Daily: | ||
463 | buf += "Daily"; | ||
464 | break; | ||
465 | case ORecur::Weekly: | ||
466 | buf += "Weekly"; | ||
467 | break; | ||
468 | case ORecur::MonthlyDay: | ||
469 | buf += "MonthlyDay"; | ||
470 | break; | ||
471 | case ORecur::MonthlyDate: | ||
472 | buf += "MonthlyDate"; | ||
473 | break; | ||
474 | case ORecur::Yearly: | ||
475 | buf += "Yearly"; | ||
476 | break; | ||
477 | default: | ||
478 | buf += "NoRepeat"; | ||
479 | break; | ||
480 | } | ||
481 | buf += "\""; | 463 | buf += "\""; |
482 | if (data->days > 0 ) | 464 | if (data->days > 0 ) |
483 | buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\""; | 465 | buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\""; |
484 | if ( data->pos != 0 ) | 466 | if ( data->pos != 0 ) |
485 | buf += " rposition=\"" + QString::number(data->pos ) + "\""; | 467 | buf += " rposition=\"" + recMap[ORecur::RPosition] + "\""; |
486 | 468 | ||
487 | buf += " rfreq=\"" + QString::number( data->freq ) + "\""; | 469 | buf += " rfreq=\"" + recMap[ORecur::RFreq] + "\""; |
488 | buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\""; | 470 | buf += " rhasenddate=\"" + recMap[ORecur::RHasEndDate]+ "\""; |
489 | if ( data->hasEnd ) | 471 | if ( data->hasEnd ) |
490 | buf += " enddt=\"" | 472 | buf += " enddt=\"" |
491 | + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) | 473 | + recMap[ORecur::EndDate] |
492 | + "\""; | 474 | + "\""; |
493 | buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\""; | 475 | buf += " created=\"" + recMap[ORecur::Created] + "\""; |
494 | 476 | ||
495 | if ( data->list.isEmpty() ) return buf; | 477 | if ( data->list.isEmpty() ) return buf; |
496 | // save exceptions list here!! | ||
497 | ExceptionList::ConstIterator it; | ||
498 | ExceptionList list = data->list; | ||
499 | buf += " exceptions=\""; | 478 | buf += " exceptions=\""; |
500 | QDate date; | 479 | buf += recMap[ORecur::Exceptions]; |
501 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
502 | date = (*it); | ||
503 | if ( it != list.begin() ) buf += " "; | ||
504 | |||
505 | buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); | ||
506 | } | ||
507 | buf += "\" "; | 480 | buf += "\" "; |
508 | 481 | ||
509 | return buf; | 482 | return buf; |
510 | } | 483 | } |
484 | |||
485 | QString ORecur::rTypeString() const | ||
486 | { | ||
487 | QString retString; | ||
488 | switch ( data->type ) { | ||
489 | case ORecur::Daily: | ||
490 | retString = "Daily"; | ||
491 | break; | ||
492 | case ORecur::Weekly: | ||
493 | retString = "Weekly"; | ||
494 | break; | ||
495 | case ORecur::MonthlyDay: | ||
496 | retString = "MonthlyDay"; | ||
497 | break; | ||
498 | case ORecur::MonthlyDate: | ||
499 | retString = "MonthlyDate"; | ||
500 | break; | ||
501 | case ORecur::Yearly: | ||
502 | retString = "Yearly"; | ||
503 | break; | ||
504 | default: | ||
505 | retString = "NoRepeat"; | ||
506 | break; | ||
507 | |||
508 | } | ||
509 | |||
510 | return retString; | ||
511 | } | ||
512 | |||
513 | QMap<QString, ORecur::RepeatType> ORecur::rTypeValueConvertMap() const | ||
514 | { | ||
515 | QMap<QString, RepeatType> convertMap; | ||
516 | |||
517 | convertMap.insert( QString( "Daily" ), ORecur::Daily ); | ||
518 | convertMap.insert( QString( "Weekly" ), ORecur::Weekly ); | ||
519 | convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay ); | ||
520 | convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate ); | ||
521 | convertMap.insert( QString( "Yearly" ), ORecur::Yearly ); | ||
522 | convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat ); | ||
523 | |||
524 | return convertMap; | ||
525 | } | ||
526 | |||
527 | |||
528 | QMap<int, QString> ORecur::toMap() const | ||
529 | { | ||
530 | QMap<int, QString> retMap; | ||
531 | |||
532 | retMap.insert( ORecur::RType, rTypeString() ); | ||
533 | retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) ); | ||
534 | retMap.insert( ORecur::RPosition, QString::number(data->pos ) ); | ||
535 | retMap.insert( ORecur::RFreq, QString::number( data->freq ) ); | ||
536 | retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) ); | ||
537 | if( data -> hasEnd ) | ||
538 | retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) ); | ||
539 | retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) ); | ||
540 | |||
541 | if ( data->list.isEmpty() ) return retMap; | ||
542 | |||
543 | // save exceptions list here!! | ||
544 | ExceptionList::ConstIterator it; | ||
545 | ExceptionList list = data->list; | ||
546 | QString exceptBuf; | ||
547 | QDate date; | ||
548 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
549 | date = (*it); | ||
550 | if ( it != list.begin() ) exceptBuf += " "; | ||
551 | |||
552 | exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); | ||
553 | } | ||
554 | |||
555 | retMap.insert( ORecur::Exceptions, exceptBuf ); | ||
556 | |||
557 | return retMap; | ||
558 | } | ||
559 | |||
560 | void ORecur::fromMap( const QMap<int, QString>& map ) | ||
561 | { | ||
562 | QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); | ||
563 | |||
564 | data -> type = repTypeMap[ map [ORecur::RType] ]; | ||
565 | data -> days = (char) map[ ORecur::RWeekdays ].toInt(); | ||
566 | data -> pos = map[ ORecur::RPosition ].toInt(); | ||
567 | data -> freq = map[ ORecur::RFreq ].toInt(); | ||
568 | data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false; | ||
569 | OTimeZone utc = OTimeZone::utc(); | ||
570 | if ( data -> hasEnd ){ | ||
571 | data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date(); | ||
572 | } | ||
573 | data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date(); | ||
574 | |||
575 | #if 0 | ||
576 | // FIXME: Exceptions currently not supported... | ||
577 | // Convert the list of exceptions from QString into ExceptionList | ||
578 | data -> list.clear(); | ||
579 | QString exceptStr = map[ ORecur::Exceptions ]; | ||
580 | QStringList exceptList = QStringList::split( " ", exceptStr ); | ||
581 | ... | ||
582 | #endif | ||
583 | |||
584 | |||
585 | } | ||
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h index b214b3f..47901b0 100644 --- a/libopie2/opiepim/core/orecur.h +++ b/libopie2/opiepim/core/orecur.h | |||
@@ -1,91 +1,101 @@ | |||
1 | /* | 1 | /* |
2 | * GPL from TT | 2 | * GPL from TT |
3 | */ | 3 | */ |
4 | 4 | ||
5 | #ifndef OPIE_RECUR_H | 5 | #ifndef OPIE_RECUR_H |
6 | #define OPIE_RECUR_H | 6 | #define OPIE_RECUR_H |
7 | 7 | ||
8 | #include <sys/types.h> | 8 | #include <sys/types.h> |
9 | 9 | ||
10 | #include <qdatetime.h> | 10 | #include <qdatetime.h> |
11 | #include <qvaluelist.h> | 11 | #include <qvaluelist.h> |
12 | 12 | #include <qmap.h> | |
13 | 13 | ||
14 | class ORecur { | 14 | class ORecur { |
15 | public: | 15 | public: |
16 | typedef QValueList<QDate> ExceptionList; | 16 | typedef QValueList<QDate> ExceptionList; |
17 | enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay, | 17 | enum RepeatType{ NoRepeat = -1, Daily, Weekly, MonthlyDay, |
18 | MonthlyDate, Yearly }; | 18 | MonthlyDate, Yearly }; |
19 | enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08, | 19 | enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08, |
20 | FRI = 0x10, SAT = 0x20, SUN = 0x40 }; | 20 | FRI = 0x10, SAT = 0x20, SUN = 0x40 }; |
21 | enum Fields{ RType = 0, RWeekdays, RPosition, RFreq, RHasEndDate, | ||
22 | EndDate, Created, Exceptions }; | ||
23 | |||
21 | ORecur(); | 24 | ORecur(); |
22 | ORecur( const ORecur& ); | 25 | ORecur( const ORecur& ); |
23 | ~ORecur(); | 26 | ~ORecur(); |
24 | 27 | ||
25 | ORecur &operator=( const ORecur& ); | 28 | ORecur &operator=( const ORecur& ); |
26 | bool operator==(const ORecur& )const; | 29 | bool operator==(const ORecur& )const; |
27 | 30 | ||
28 | bool doesRecur()const; | 31 | bool doesRecur()const; |
29 | /* if it recurrs on that day */ | 32 | /* if it recurrs on that day */ |
30 | bool doesRecur( const QDate& ); | 33 | bool doesRecur( const QDate& ); |
31 | RepeatType type()const; | 34 | RepeatType type()const; |
32 | int frequency()const; | 35 | int frequency()const; |
33 | int position()const; | 36 | int position()const; |
34 | char days()const; | 37 | char days()const; |
35 | bool hasEndDate()const; | 38 | bool hasEndDate()const; |
36 | QDate start()const; | 39 | QDate start()const; |
37 | QDate endDate()const; | 40 | QDate endDate()const; |
38 | QDateTime createdDateTime()const; | 41 | QDateTime createdDateTime()const; |
39 | /** | 42 | /** |
40 | * starting on monday=0, sunday=6 | 43 | * starting on monday=0, sunday=6 |
41 | * for convience | 44 | * for convience |
42 | */ | 45 | */ |
43 | bool repeatOnWeekDay( int day )const; | 46 | bool repeatOnWeekDay( int day )const; |
44 | 47 | ||
45 | /** | 48 | /** |
46 | * FromWhereToStart is not included!!! | 49 | * FromWhereToStart is not included!!! |
47 | */ | 50 | */ |
48 | bool nextOcurrence( const QDate& FromWhereToStart, QDate &recurDate ); | 51 | bool nextOcurrence( const QDate& FromWhereToStart, QDate &recurDate ); |
49 | 52 | ||
50 | /** | 53 | /** |
51 | * The module this ORecur belongs to | 54 | * The module this ORecur belongs to |
52 | */ | 55 | */ |
53 | QString service()const; | 56 | QString service()const; |
54 | 57 | ||
55 | /* | 58 | /* |
56 | * reference to the exception list | 59 | * reference to the exception list |
57 | */ | 60 | */ |
58 | ExceptionList &exceptions(); | 61 | ExceptionList &exceptions(); |
59 | 62 | ||
60 | /** | 63 | /** |
61 | * the current repetition | 64 | * the current repetition |
62 | */ | 65 | */ |
63 | int repetition()const; | 66 | int repetition()const; |
64 | 67 | ||
65 | void setType( const RepeatType& ); | 68 | void setType( const RepeatType& ); |
66 | void setFrequency( int freq ); | 69 | void setFrequency( int freq ); |
67 | void setPosition( int pos ); | 70 | void setPosition( int pos ); |
68 | void setDays( char c); | 71 | void setDays( char c); |
69 | void setEndDate( const QDate& dt ); | 72 | void setEndDate( const QDate& dt ); |
70 | void setStart( const QDate& dt ); | 73 | void setStart( const QDate& dt ); |
71 | void setCreatedDateTime( const QDateTime& ); | 74 | void setCreatedDateTime( const QDateTime& ); |
72 | void setHasEndDate( bool b ); | 75 | void setHasEndDate( bool b ); |
73 | void setRepitition(int ); | 76 | void setRepitition(int ); |
74 | 77 | ||
75 | void setService( const QString& ser ); | 78 | void setService( const QString& ser ); |
79 | |||
80 | QMap<int, QString> toMap() const; | ||
81 | void fromMap( const QMap<int, QString>& map ); | ||
76 | 82 | ||
77 | /* almost internal */ | 83 | /* almost internal */ |
78 | QString toString()const; | 84 | QString toString()const; |
79 | private: | 85 | private: |
80 | bool p_nextOccurrence( const QDate& from, QDate& next ); | 86 | bool p_nextOccurrence( const QDate& from, QDate& next ); |
81 | void deref(); | 87 | void deref(); |
82 | inline void checkOrModify(); | 88 | inline void checkOrModify(); |
83 | 89 | ||
90 | /* Converts rType to String */ | ||
91 | QString rTypeString() const; | ||
92 | /* Returns a map to convert Stringname for RType to RepeatType */ | ||
93 | QMap<QString, RepeatType> rTypeValueConvertMap() const; | ||
84 | 94 | ||
85 | class Data; | 95 | class Data; |
86 | Data* data; | 96 | Data* data; |
87 | class ORecurPrivate; | 97 | class ORecurPrivate; |
88 | ORecurPrivate *d; | 98 | ORecurPrivate *d; |
89 | }; | 99 | }; |
90 | 100 | ||
91 | #endif | 101 | #endif |
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index 04f1c8b..7bc67c7 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf | |||
@@ -1,81 +1,81 @@ | |||
1 | # | 1 | # |
2 | # $Id$ | 2 | # $Id$ |
3 | # | 3 | # |
4 | # qmake configuration for macx-g++ with Qt/Embedded | 4 | # qmake configuration for macx-g++ with Qt/Embedded |
5 | # | 5 | # |
6 | 6 | ||
7 | MAKEFILE_GENERATOR= UNIX | 7 | MAKEFILE_GENERATOR= UNIX |
8 | TEMPLATE = app | 8 | TEMPLATE = app |
9 | CONFIG += qt warn_on release | 9 | CONFIG += qt warn_on release |
10 | QMAKE_EXTENSION_SHLIB= dylib | 10 | QMAKE_EXTENSION_SHLIB= dylib |
11 | 11 | ||
12 | QMAKE_CC = $(TB)cc | 12 | QMAKE_CC = $(TB)cc |
13 | QMAKE_LEX = flex | 13 | QMAKE_LEX = flex |
14 | QMAKE_LEXFLAGS = | 14 | QMAKE_LEXFLAGS = |
15 | QMAKE_YACC = yacc | 15 | QMAKE_YACC = yacc |
16 | QMAKE_YACCFLAGS = -d | 16 | QMAKE_YACCFLAGS = -d |
17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) | 17 | QMAKE_CFLAGS = -pipe $(CFLAGS_EXTRA) |
18 | QMAKE_CFLAGS_WARN_ON= -Wall -W | 18 | QMAKE_CFLAGS_WARN_ON= -Wall -W |
19 | QMAKE_CFLAGS_WARN_OFF= | 19 | QMAKE_CFLAGS_WARN_OFF= |
20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) | 20 | QMAKE_CFLAGS_RELEASE= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2 -fno-default-inline) |
21 | QMAKE_CFLAGS_DEBUG= -g | 21 | QMAKE_CFLAGS_DEBUG= -g |
22 | QMAKE_CFLAGS_SHLIB= -fPIC | 22 | QMAKE_CFLAGS_SHLIB= -fPIC |
23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses | 23 | QMAKE_CFLAGS_YACC= -Wno-unused -Wno-parentheses |
24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT | 24 | QMAKE_CFLAGS_THREAD= -D_REENTRANT |
25 | 25 | ||
26 | QMAKE_CXX = $(TB)c++ | 26 | QMAKE_CXX = $(TB)c++ |
27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT | 27 | QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED -DQWS -fno-exceptions -fno-rtti $(CXXFLAGS_EXTRA) -DQ_OS_MACX -DQT_NO_SOUND -DOPIE_NO_OVERRIDE_QT -DOPIE_NO_BACKTRACE |
28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON | 28 | QMAKE_CXXFLAGS_WARN_ON= $$QMAKE_CFLAGS_WARN_ON |
29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF | 29 | QMAKE_CXXFLAGS_WARN_OFF= $$QMAKE_CFLAGS_WARN_OFF |
30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE | 30 | QMAKE_CXXFLAGS_RELEASE= $$QMAKE_CFLAGS_RELEASE |
31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG | 31 | QMAKE_CXXFLAGS_DEBUG= $$QMAKE_CFLAGS_DEBUG |
32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB | 32 | QMAKE_CXXFLAGS_SHLIB= $$QMAKE_CFLAGS_SHLIB |
33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC | 33 | QMAKE_CXXFLAGS_YACC= $$QMAKE_CFLAGS_YACC |
34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD | 34 | QMAKE_CXXFLAGS_THREAD= $$QMAKE_CFLAGS_THREAD |
35 | 35 | ||
36 | QMAKE_INCDIR = | 36 | QMAKE_INCDIR = /sw/include |
37 | QMAKE_LIBDIR = | 37 | QMAKE_LIBDIR = /sw/lib |
38 | QMAKE_INCDIR_X11= | 38 | QMAKE_INCDIR_X11= |
39 | QMAKE_LIBDIR_X11= | 39 | QMAKE_LIBDIR_X11= |
40 | QMAKE_INCDIR_QT = $(QTDIR)/include | 40 | QMAKE_INCDIR_QT = $(QTDIR)/include |
41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib | 41 | QMAKE_LIBDIR_QT = $(QTDIR)/lib |
42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include | 42 | QMAKE_INCDIR_OPENGL= /usr/X11R6/include |
43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib | 43 | QMAKE_LIBDIR_OPENGL= /usr/X11R6/lib |
44 | 44 | ||
45 | QMAKE_LINK = $$QMAKE_CXX | 45 | QMAKE_LINK = $$QMAKE_CXX |
46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX | 46 | QMAKE_LINK_SHLIB= $$QMAKE_CXX |
47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) | 47 | QMAKE_LFLAGS = $(LFLAGS_EXTRA) |
48 | QMAKE_LFLAGS_RELEASE= | 48 | QMAKE_LFLAGS_RELEASE= |
49 | QMAKE_LFLAGS_DEBUG= | 49 | QMAKE_LFLAGS_DEBUG= |
50 | QMAKE_LFLAGS_SHLIB= -dynamiclib | 50 | QMAKE_LFLAGS_SHLIB= -dynamiclib |
51 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace | 51 | QMAKE_LFLAGS_INCREMENTAL = -undefined suppress -flat_namespace |
52 | QMAKE_LFLAGS_PLUGIN= -bundle | 52 | QMAKE_LFLAGS_PLUGIN= -bundle |
53 | QMAKE_LFLAGS_SONAME= | 53 | QMAKE_LFLAGS_SONAME= |
54 | QMAKE_LFLAGS_THREAD= | 54 | QMAKE_LFLAGS_THREAD= |
55 | QMAKE_RPATH = | 55 | QMAKE_RPATH = |
56 | 56 | ||
57 | QMAKE_LIBS = $(LIBS_EXTRA) | 57 | QMAKE_LIBS = $(LIBS_EXTRA) |
58 | QMAKE_LIBS_X11 = | 58 | QMAKE_LIBS_X11 = |
59 | QMAKE_LIBS_X11SM= | 59 | QMAKE_LIBS_X11SM= |
60 | QMAKE_LIBS_QT = -lqte | 60 | QMAKE_LIBS_QT = -lqte |
61 | #QMAKE_LIBS_QT = libqte.dylib | 61 | #QMAKE_LIBS_QT = libqte.dylib |
62 | QMAKE_LIBS_QT_THREAD= -lqte-mt | 62 | QMAKE_LIBS_QT_THREAD= -lqte-mt |
63 | QMAKE_LIBS_QT_OPENGL= -lqgl | 63 | QMAKE_LIBS_QT_OPENGL= -lqgl |
64 | QMAKE_LIBS_THREAD= | 64 | QMAKE_LIBS_THREAD= |
65 | 65 | ||
66 | QMAKE_MOC = $(QTDIR)/bin/moc | 66 | QMAKE_MOC = $(QTDIR)/bin/moc |
67 | QMAKE_UIC = $(QTDIR)/bin/uic | 67 | QMAKE_UIC = $(QTDIR)/bin/uic |
68 | 68 | ||
69 | QMAKE_AR = ar cqs | 69 | QMAKE_AR = ar cqs |
70 | QMAKE_RANLIB = | 70 | QMAKE_RANLIB = |
71 | 71 | ||
72 | QMAKE_TAR = tar -cf | 72 | QMAKE_TAR = tar -cf |
73 | QMAKE_GZIP = gzip -9f | 73 | QMAKE_GZIP = gzip -9f |
74 | 74 | ||
75 | QMAKE_COPY = cp -f | 75 | QMAKE_COPY = cp -f |
76 | QMAKE_MOVE = mv -f | 76 | QMAKE_MOVE = mv -f |
77 | QMAKE_DEL_FILE = rm -f | 77 | QMAKE_DEL_FILE = rm -f |
78 | QMAKE_DEL_DIR = rmdir | 78 | QMAKE_DEL_DIR = rmdir |
79 | 79 | ||
80 | 80 | ||
81 | 81 | ||