summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/libopie.pro2
-rw-r--r--libopie/pim/opimmaintainer.cpp37
-rw-r--r--libopie/pim/opimmaintainer.h36
-rw-r--r--libopie/pim/opimxrefmanager.cpp2
-rw-r--r--libopie/pim/otodo.cpp20
-rw-r--r--libopie/pim/otodo.h12
-rw-r--r--libopie2/opiepim/core/opimmaintainer.cpp37
-rw-r--r--libopie2/opiepim/core/opimmaintainer.h36
-rw-r--r--libopie2/opiepim/core/opimxrefmanager.cpp2
-rw-r--r--libopie2/opiepim/otodo.cpp20
-rw-r--r--libopie2/opiepim/otodo.h12
11 files changed, 214 insertions, 2 deletions
diff --git a/libopie/libopie.pro b/libopie/libopie.pro
index 3e6156e..a80a407 100644
--- a/libopie/libopie.pro
+++ b/libopie/libopie.pro
@@ -10,77 +10,79 @@ HEADERS = ofontmenu.h \
10 oprocess.h odevice.h \ 10 oprocess.h odevice.h \
11 otimepicker.h otabwidget.h \ 11 otimepicker.h otabwidget.h \
12 otabbar.h otabinfo.h \ 12 otabbar.h otabinfo.h \
13 ofontselector.h \ 13 ofontselector.h \
14 pim/opimrecord.h \ 14 pim/opimrecord.h \
15 pim/otodo.h \ 15 pim/otodo.h \
16 pim/orecordlist.h \ 16 pim/orecordlist.h \
17 pim/opimaccesstemplate.h \ 17 pim/opimaccesstemplate.h \
18 pim/opimaccessbackend.h \ 18 pim/opimaccessbackend.h \
19 pim/otodoaccess.h \ 19 pim/otodoaccess.h \
20 pim/otodoaccessbackend.h \ 20 pim/otodoaccessbackend.h \
21 pim/ocontact.h \ 21 pim/ocontact.h \
22 pim/ocontactaccess.h \ 22 pim/ocontactaccess.h \
23 pim/ocontactaccessbackend.h \ 23 pim/ocontactaccessbackend.h \
24 pim/ocontactaccessbackend_xml.h \ 24 pim/ocontactaccessbackend_xml.h \
25 pim/ocontactaccessbackend_vcard.h \ 25 pim/ocontactaccessbackend_vcard.h \
26 pim/obackendfactory.h \ 26 pim/obackendfactory.h \
27 pim/opimcache.h \ 27 pim/opimcache.h \
28 pim/otodoaccessvcal.h \ 28 pim/otodoaccessvcal.h \
29 pim/orecur.h \ 29 pim/orecur.h \
30 pim/opimstate.h \ 30 pim/opimstate.h \
31 pim/opimxrefpartner.h \ 31 pim/opimxrefpartner.h \
32 pim/opimxref.h \ 32 pim/opimxref.h \
33 pim/opimxrefmanager.h \ 33 pim/opimxrefmanager.h \
34 pim/opimmaintainer.h \
34 orecurrancewidget.h \ 35 orecurrancewidget.h \
35 oticker.h 36 oticker.h
36# pim/otodoaccesssql.h \ 37# pim/otodoaccesssql.h \
37 38
38SOURCES = ofontmenu.cc \ 39SOURCES = ofontmenu.cc \
39 ocolorbutton.cpp \ 40 ocolorbutton.cpp \
40 xmltree.cc \ 41 xmltree.cc \
41 ofiledialog.cc ofileselector.cc \ 42 ofiledialog.cc ofileselector.cc \
42 ocheckitem.cpp tododb.cpp todoevent.cpp \ 43 ocheckitem.cpp tododb.cpp todoevent.cpp \
43 todovcalresource.cpp colordialog.cpp \ 44 todovcalresource.cpp colordialog.cpp \
44 colorpopupmenu.cpp oclickablelabel.cpp \ 45 colorpopupmenu.cpp oclickablelabel.cpp \
45 oprocctrl.cpp oprocess.cpp \ 46 oprocctrl.cpp oprocess.cpp \
46 odevice.cpp otimepicker.cpp \ 47 odevice.cpp otimepicker.cpp \
47 otabwidget.cpp otabbar.cpp \ 48 otabwidget.cpp otabbar.cpp \
48 ofontselector.cpp \ 49 ofontselector.cpp \
49 pim/otodo.cpp \ 50 pim/otodo.cpp \
50 pim/opimrecord.cpp \ 51 pim/opimrecord.cpp \
51 pim/otodoaccess.cpp \ 52 pim/otodoaccess.cpp \
52 pim/otodoaccessbackend.cpp \ 53 pim/otodoaccessbackend.cpp \
53 pim/otodoaccessxml.cpp \ 54 pim/otodoaccessxml.cpp \
54 pim/ocontact.cpp \ 55 pim/ocontact.cpp \
55 pim/ocontactaccess.cpp \ 56 pim/ocontactaccess.cpp \
56 pim/ocontactaccessbackend_vcard.cpp \ 57 pim/ocontactaccessbackend_vcard.cpp \
57 pim/otodoaccessvcal.cpp \ 58 pim/otodoaccessvcal.cpp \
58 pim/orecur.cpp \ 59 pim/orecur.cpp \
59 pim/opimstate.cpp \ 60 pim/opimstate.cpp \
60 pim/opimxrefpartner.cpp \ 61 pim/opimxrefpartner.cpp \
61 pim/opimxref.cpp \ 62 pim/opimxref.cpp \
62 pim/opimxrefmanager.cpp \ 63 pim/opimxrefmanager.cpp \
64 pim/opimmaintainer.cpp \
63 orecurrancewidget.cpp \ 65 orecurrancewidget.cpp \
64 oticker.cpp 66 oticker.cpp
65# pim/otodoaccesssql.cpp \ 67# pim/otodoaccesssql.cpp \
66 68
67TARGET = opie 69TARGET = opie
68INCLUDEPATH += $(OPIEDIR)/include 70INCLUDEPATH += $(OPIEDIR)/include
69DESTDIR = $(QTDIR)/lib$(PROJMAK) 71DESTDIR = $(QTDIR)/lib$(PROJMAK)
70#VERSION = 1.0.0 72#VERSION = 1.0.0
71 73
72# LIBS += -lopiesql 74# LIBS += -lopiesql
73 75
74INTERFACES = otimepickerbase.ui orecurrancebase.ui 76INTERFACES = otimepickerbase.ui orecurrancebase.ui
75 77
76TRANSLATIONS = ../i18n/de/libopie.ts \ 78TRANSLATIONS = ../i18n/de/libopie.ts \
77 ../i18n/en/libopie.ts \ 79 ../i18n/en/libopie.ts \
78 ../i18n/es/libopie.ts \ 80 ../i18n/es/libopie.ts \
79 ../i18n/fr/libopie.ts \ 81 ../i18n/fr/libopie.ts \
80 ../i18n/hu/libopie.ts \ 82 ../i18n/hu/libopie.ts \
81 ../i18n/ja/libopie.ts \ 83 ../i18n/ja/libopie.ts \
82 ../i18n/ko/libopie.ts \ 84 ../i18n/ko/libopie.ts \
83 ../i18n/no/libopie.ts \ 85 ../i18n/no/libopie.ts \
84 ../i18n/pl/libopie.ts \ 86 ../i18n/pl/libopie.ts \
85 ../i18n/pt/libopie.ts \ 87 ../i18n/pt/libopie.ts \
86 ../i18n/pt_BR/libopie.ts \ 88 ../i18n/pt_BR/libopie.ts \
diff --git a/libopie/pim/opimmaintainer.cpp b/libopie/pim/opimmaintainer.cpp
new file mode 100644
index 0000000..e34f035
--- a/dev/null
+++ b/libopie/pim/opimmaintainer.cpp
@@ -0,0 +1,37 @@
1#include "opimmaintainer.h"
2
3OPimMaintainer::OPimMaintainer( enum Mode mode, int uid )
4 : m_mode(mode), m_uid(uid )
5{}
6OPimMaintainer::~OPimMaintainer() {
7}
8OPimMaintainer::OPimMaintainer( const OPimMaintainer& main ) {
9 *this = main;
10}
11OPimMaintainer &OPimMaintainer::operator=( const OPimMaintainer& main ) {
12 m_mode = main.m_mode;
13 m_uid = main.m_uid;
14
15 return *this;
16}
17bool OPimMaintainer::operator==( const OPimMaintainer& main ) {
18 if (m_mode != main.m_mode ) return false;
19 if (m_uid != main.m_uid ) return false;
20
21 return true;
22}
23bool OPimMaintainer::operator!=( const OPimMaintainer& main ) {
24 return !(*this == main );
25}
26OPimMaintainer::Mode OPimMaintainer::mode()const {
27 return m_mode;
28}
29int OPimMaintainer::uid()const {
30 return m_uid;
31}
32void OPimMaintainer::setMode( enum Mode mo) {
33 m_mode = mo;
34}
35void OPimMaintainer::setUid( int uid ) {
36 m_uid = uid;
37}
diff --git a/libopie/pim/opimmaintainer.h b/libopie/pim/opimmaintainer.h
new file mode 100644
index 0000000..310e15a
--- a/dev/null
+++ b/libopie/pim/opimmaintainer.h
@@ -0,0 +1,36 @@
1#ifndef OPIE_PIM_MAINTAINER_H
2#define OPIE_PIM_MAINTAINER_H
3
4#include <qstring.h>
5
6/**
7 * Who maintains what?
8 */
9class OPimMaintainer {
10public:
11 enum Mode { Undefined = -1,
12 Responsible = 0,
13 DoneBy,
14 Coordinating };
15 OPimMaintainer( enum Mode mode = Undefined, int uid = 0);
16 OPimMaintainer( const OPimMaintainer& );
17 ~OPimMaintainer();
18
19 OPimMaintainer &operator=( const OPimMaintainer& );
20 bool operator==( const OPimMaintainer& );
21 bool operator!=( const OPimMaintainer& );
22
23
24 Mode mode()const;
25 int uid()const;
26
27 void setMode( enum Mode );
28 void setUid( int uid );
29
30private:
31 Mode m_mode;
32 int m_uid;
33
34};
35
36#endif
diff --git a/libopie/pim/opimxrefmanager.cpp b/libopie/pim/opimxrefmanager.cpp
index d49f5f5..965f542 100644
--- a/libopie/pim/opimxrefmanager.cpp
+++ b/libopie/pim/opimxrefmanager.cpp
@@ -1,32 +1,34 @@
1#include "opimxrefmanager.h" 1#include "opimxrefmanager.h"
2 2
3 3
4OPimXRefManager::OPimXRefManager() { 4OPimXRefManager::OPimXRefManager() {
5} 5}
6OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) { 6OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
7 m_list = ref.m_list; 7 m_list = ref.m_list;
8} 8}
9OPimXRefManager::~OPimXRefManager() {
10}
9OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) { 11OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
10 m_list = ref.m_list; 12 m_list = ref.m_list;
11 return *this; 13 return *this;
12} 14}
13bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) { 15bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
14 // if ( m_list == ref.m_list ) return true; 16 // if ( m_list == ref.m_list ) return true;
15 17
16 return false; 18 return false;
17} 19}
18void OPimXRefManager::add( const OPimXRef& ref) { 20void OPimXRefManager::add( const OPimXRef& ref) {
19 m_list.append( ref ); 21 m_list.append( ref );
20} 22}
21void OPimXRefManager::remove( const OPimXRef& ref) { 23void OPimXRefManager::remove( const OPimXRef& ref) {
22 m_list.remove( ref ); 24 m_list.remove( ref );
23} 25}
24void OPimXRefManager::replace( const OPimXRef& ref) { 26void OPimXRefManager::replace( const OPimXRef& ref) {
25 m_list.remove( ref ); 27 m_list.remove( ref );
26 m_list.append( ref ); 28 m_list.append( ref );
27} 29}
28void OPimXRefManager::clear() { 30void OPimXRefManager::clear() {
29 m_list.clear(); 31 m_list.clear();
30} 32}
31QStringList OPimXRefManager::apps()const { 33QStringList OPimXRefManager::apps()const {
32 OPimXRef::ValueList::ConstIterator it; 34 OPimXRef::ValueList::ConstIterator it;
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 4d5cb79..6fcf9f6 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -1,59 +1,62 @@
1 1
2#include <qobject.h> 2#include <qobject.h>
3#include <qshared.h> 3#include <qshared.h>
4 4
5 5
6 6
7#include <qpe/palmtopuidgen.h> 7#include <qpe/palmtopuidgen.h>
8#include <qpe/stringutil.h> 8#include <qpe/stringutil.h>
9#include <qpe/palmtoprecord.h> 9#include <qpe/palmtoprecord.h>
10#include <qpe/stringutil.h> 10#include <qpe/stringutil.h>
11#include <qpe/categories.h> 11#include <qpe/categories.h>
12#include <qpe/categoryselect.h> 12#include <qpe/categoryselect.h>
13 13
14 14
15#include "opimstate.h" 15#include "opimstate.h"
16#include "orecur.h" 16#include "orecur.h"
17#include "opimmaintainer.h"
18
17#include "otodo.h" 19#include "otodo.h"
18 20
19 21
20struct OTodo::OTodoData : public QShared { 22struct OTodo::OTodoData : public QShared {
21 OTodoData() : QShared() { 23 OTodoData() : QShared() {
22 }; 24 };
23 25
24 QDate date; 26 QDate date;
25 bool isCompleted:1; 27 bool isCompleted:1;
26 bool hasDate:1; 28 bool hasDate:1;
27 int priority; 29 int priority;
28 QString desc; 30 QString desc;
29 QString sum; 31 QString sum;
30 QMap<QString, QString> extra; 32 QMap<QString, QString> extra;
31 ushort prog; 33 ushort prog;
32 bool hasAlarmDateTime :1; 34 bool hasAlarmDateTime :1;
33 QDateTime alarmDateTime; 35 QDateTime alarmDateTime;
34 OPimState state; 36 OPimState state;
35 ORecur recur; 37 ORecur recur;
38 OPimMaintainer maintainer;
36}; 39};
37 40
38OTodo::OTodo(const OTodo &event ) 41OTodo::OTodo(const OTodo &event )
39 : OPimRecord( event ), data( event.data ) 42 : OPimRecord( event ), data( event.data )
40{ 43{
41 data->ref(); 44 data->ref();
42// qWarning("ref up"); 45// qWarning("ref up");
43} 46}
44OTodo::~OTodo() { 47OTodo::~OTodo() {
45 48
46// qWarning("~OTodo " ); 49// qWarning("~OTodo " );
47 if ( data->deref() ) { 50 if ( data->deref() ) {
48// qWarning("OTodo::dereffing"); 51// qWarning("OTodo::dereffing");
49 delete data; 52 delete data;
50 data = 0l; 53 data = 0l;
51 } 54 }
52} 55}
53OTodo::OTodo(bool completed, int priority, 56OTodo::OTodo(bool completed, int priority,
54 const QArray<int> &category, 57 const QArray<int> &category,
55 const QString& summary, 58 const QString& summary,
56 const QString &description, 59 const QString &description,
57 ushort progress, 60 ushort progress,
58 bool hasDate, QDate date, int uid ) 61 bool hasDate, QDate date, int uid )
59 : OPimRecord( uid ) 62 : OPimRecord( uid )
@@ -132,48 +135,51 @@ QString OTodo::summary() const
132ushort OTodo::progress() const 135ushort OTodo::progress() const
133{ 136{
134 return data->prog; 137 return data->prog;
135} 138}
136QDate OTodo::dueDate()const 139QDate OTodo::dueDate()const
137{ 140{
138 return data->date; 141 return data->date;
139} 142}
140 143
141QDateTime OTodo::alarmDateTime() const 144QDateTime OTodo::alarmDateTime() const
142{ 145{
143 return data->alarmDateTime; 146 return data->alarmDateTime;
144} 147}
145 148
146QString OTodo::description()const 149QString OTodo::description()const
147{ 150{
148 return data->desc; 151 return data->desc;
149} 152}
150OPimState OTodo::state()const { 153OPimState OTodo::state()const {
151 return data->state; 154 return data->state;
152} 155}
153ORecur OTodo::recurrence()const { 156ORecur OTodo::recurrence()const {
154 return data->recur; 157 return data->recur;
155} 158}
159OPimMaintainer OTodo::maintainer()const {
160 return data->maintainer;
161}
156void OTodo::setCompleted( bool completed ) 162void OTodo::setCompleted( bool completed )
157{ 163{
158 changeOrModify(); 164 changeOrModify();
159 data->isCompleted = completed; 165 data->isCompleted = completed;
160} 166}
161void OTodo::setHasDueDate( bool hasDate ) 167void OTodo::setHasDueDate( bool hasDate )
162{ 168{
163 changeOrModify(); 169 changeOrModify();
164 data->hasDate = hasDate; 170 data->hasDate = hasDate;
165} 171}
166void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) 172void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
167{ 173{
168 changeOrModify(); 174 changeOrModify();
169 data->hasAlarmDateTime = hasAlarmDateTime; 175 data->hasAlarmDateTime = hasAlarmDateTime;
170} 176}
171void OTodo::setDescription(const QString &desc ) 177void OTodo::setDescription(const QString &desc )
172{ 178{
173// qWarning( "desc " + desc ); 179// qWarning( "desc " + desc );
174 changeOrModify(); 180 changeOrModify();
175 data->desc = Qtopia::simplifyMultiLineSpace(desc ); 181 data->desc = Qtopia::simplifyMultiLineSpace(desc );
176} 182}
177void OTodo::setSummary( const QString& sum ) 183void OTodo::setSummary( const QString& sum )
178{ 184{
179 changeOrModify(); 185 changeOrModify();
@@ -181,48 +187,52 @@ void OTodo::setSummary( const QString& sum )
181} 187}
182void OTodo::setPriority(int prio ) 188void OTodo::setPriority(int prio )
183{ 189{
184 changeOrModify(); 190 changeOrModify();
185 data->priority = prio; 191 data->priority = prio;
186} 192}
187void OTodo::setDueDate( QDate date ) 193void OTodo::setDueDate( QDate date )
188{ 194{
189 changeOrModify(); 195 changeOrModify();
190 data->date = date; 196 data->date = date;
191} 197}
192void OTodo::setAlarmDateTime( const QDateTime& alarm ) 198void OTodo::setAlarmDateTime( const QDateTime& alarm )
193{ 199{
194 changeOrModify(); 200 changeOrModify();
195 data->alarmDateTime = alarm; 201 data->alarmDateTime = alarm;
196} 202}
197void OTodo::setState( const OPimState& state ) { 203void OTodo::setState( const OPimState& state ) {
198 changeOrModify(); 204 changeOrModify();
199 data->state = state; 205 data->state = state;
200} 206}
201void OTodo::setRecurrence( const ORecur& rec) { 207void OTodo::setRecurrence( const ORecur& rec) {
202 changeOrModify(); 208 changeOrModify();
203 data->recur = rec; 209 data->recur = rec;
204} 210}
211void OTodo::setMaintainer( const OPimMaintainer& pim ) {
212 changeOrModify();
213 data->maintainer = pim;
214}
205bool OTodo::isOverdue( ) 215bool OTodo::isOverdue( )
206{ 216{
207 if( data->hasDate && !data->isCompleted) 217 if( data->hasDate && !data->isCompleted)
208 return QDate::currentDate() > data->date; 218 return QDate::currentDate() > data->date;
209 return false; 219 return false;
210} 220}
211void OTodo::setProgress(ushort progress ) 221void OTodo::setProgress(ushort progress )
212{ 222{
213 changeOrModify(); 223 changeOrModify();
214 data->prog = progress; 224 data->prog = progress;
215} 225}
216QString OTodo::toShortText() const { 226QString OTodo::toShortText() const {
217 return summary(); 227 return summary();
218} 228}
219/*! 229/*!
220 Returns a richt text string 230 Returns a richt text string
221*/ 231*/
222QString OTodo::toRichText() const 232QString OTodo::toRichText() const
223{ 233{
224 QString text; 234 QString text;
225 QStringList catlist; 235 QStringList catlist;
226 236
227 // Description of the todo 237 // Description of the todo
228 if ( !summary().isEmpty() ) { 238 if ( !summary().isEmpty() ) {
@@ -300,106 +310,114 @@ bool OTodo::operator>=(const OTodo &toDoEvent )const
300 if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; 310 if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
301 if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; 311 if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
302 if( hasDueDate() && toDoEvent.hasDueDate() ){ 312 if( hasDueDate() && toDoEvent.hasDueDate() ){
303 if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide 313 if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
304 return priority() > toDoEvent.priority(); 314 return priority() > toDoEvent.priority();
305 }else{ 315 }else{
306 return dueDate() > toDoEvent.dueDate(); 316 return dueDate() > toDoEvent.dueDate();
307 } 317 }
308 } 318 }
309 return true; 319 return true;
310} 320}
311bool OTodo::operator==(const OTodo &toDoEvent )const 321bool OTodo::operator==(const OTodo &toDoEvent )const
312{ 322{
313 if ( data->priority != toDoEvent.data->priority ) return false; 323 if ( data->priority != toDoEvent.data->priority ) return false;
314 if ( data->priority != toDoEvent.data->prog ) return false; 324 if ( data->priority != toDoEvent.data->prog ) return false;
315 if ( data->isCompleted != toDoEvent.data->isCompleted ) return false; 325 if ( data->isCompleted != toDoEvent.data->isCompleted ) return false;
316 if ( data->hasDate != toDoEvent.data->hasDate ) return false; 326 if ( data->hasDate != toDoEvent.data->hasDate ) return false;
317 if ( data->date != toDoEvent.data->date ) return false; 327 if ( data->date != toDoEvent.data->date ) return false;
318 if ( data->sum != toDoEvent.data->sum ) return false; 328 if ( data->sum != toDoEvent.data->sum ) return false;
319 if ( data->desc != toDoEvent.data->desc ) return false; 329 if ( data->desc != toDoEvent.data->desc ) return false;
320 if ( data->hasAlarmDateTime != toDoEvent.data->hasAlarmDateTime ) 330 if ( data->hasAlarmDateTime != toDoEvent.data->hasAlarmDateTime )
321 return false; 331 return false;
322 if ( data->alarmDateTime != toDoEvent.data->alarmDateTime ) 332 if ( data->alarmDateTime != toDoEvent.data->alarmDateTime )
323 return false; 333 return false;
334 if ( data->maintainer != toDoEvent.data->maintainer )
335 return false;
324 336
325 return OPimRecord::operator==( toDoEvent ); 337 return OPimRecord::operator==( toDoEvent );
326} 338}
327void OTodo::deref() { 339void OTodo::deref() {
328 340
329// qWarning("deref in ToDoEvent"); 341// qWarning("deref in ToDoEvent");
330 if ( data->deref() ) { 342 if ( data->deref() ) {
331// qWarning("deleting"); 343// qWarning("deleting");
332 delete data; 344 delete data;
333 data= 0; 345 data= 0;
334 } 346 }
335} 347}
336OTodo &OTodo::operator=(const OTodo &item ) 348OTodo &OTodo::operator=(const OTodo &item )
337{ 349{
338 OPimRecord::operator=( item ); 350 OPimRecord::operator=( item );
339 //qWarning("operator= ref "); 351 //qWarning("operator= ref ");
340 item.data->ref(); 352 item.data->ref();
341 deref(); 353 deref();
342 data = item.data; 354 data = item.data;
343 355
344 return *this; 356 return *this;
345} 357}
346 358
347QMap<int, QString> OTodo::toMap() const { 359QMap<int, QString> OTodo::toMap() const {
348 QMap<int, QString> map; 360 QMap<int, QString> map;
349 361
350 map.insert( Uid, QString::number( uid() ) ); 362 map.insert( Uid, QString::number( uid() ) );
351 map.insert( Category, idsToString( categories() ) ); 363 map.insert( Category, idsToString( categories() ) );
352 map.insert( HasDate, QString::number( data->hasDate ) ); 364 map.insert( HasDate, QString::number( data->hasDate ) );
353 map.insert( Completed, QString::number( data->isCompleted ) ); 365 map.insert( Completed, QString::number( data->isCompleted ) );
354 map.insert( Description, data->desc ); 366 map.insert( Description, data->desc );
355 map.insert( Summary, data->sum ); 367 map.insert( Summary, data->sum );
356 map.insert( Priority, QString::number( data->priority ) ); 368 map.insert( Priority, QString::number( data->priority ) );
357 map.insert( DateDay, QString::number( data->date.day() ) ); 369 map.insert( DateDay, QString::number( data->date.day() ) );
358 map.insert( DateMonth, QString::number( data->date.month() ) ); 370 map.insert( DateMonth, QString::number( data->date.month() ) );
359 map.insert( DateYear, QString::number( data->date.year() ) ); 371 map.insert( DateYear, QString::number( data->date.year() ) );
360 map.insert( Progress, QString::number( data->prog ) ); 372 map.insert( Progress, QString::number( data->prog ) );
361 map.insert( CrossReference, crossToString() ); 373// map.insert( CrossReference, crossToString() );
362 map.insert( HasAlarmDateTime, QString::number( data->hasAlarmDateTime ) ); 374 map.insert( HasAlarmDateTime, QString::number( data->hasAlarmDateTime ) );
363 map.insert( AlarmDateTime, data->alarmDateTime.toString() ); 375 map.insert( AlarmDateTime, data->alarmDateTime.toString() );
364 376
365 return map; 377 return map;
366} 378}
367 379
368QMap<QString, QString> OTodo::toExtraMap()const { 380QMap<QString, QString> OTodo::toExtraMap()const {
369 return data->extra; 381 return data->extra;
370} 382}
371/** 383/**
372 * change or modify looks at the ref count and either 384 * change or modify looks at the ref count and either
373 * creates a new QShared Object or it can modify it 385 * creates a new QShared Object or it can modify it
374 * right in place 386 * right in place
375 */ 387 */
376void OTodo::changeOrModify() { 388void OTodo::changeOrModify() {
377 if ( data->count != 1 ) { 389 if ( data->count != 1 ) {
378 qWarning("changeOrModify"); 390 qWarning("changeOrModify");
379 data->deref(); 391 data->deref();
380 OTodoData* d2 = new OTodoData(); 392 OTodoData* d2 = new OTodoData();
381 copy(data, d2 ); 393 copy(data, d2 );
382 data = d2; 394 data = d2;
383 } 395 }
384} 396}
397// WATCHOUT
398/*
399 * if you add something to the Data struct
400 * be sure to copy it here
401 */
385void OTodo::copy( OTodoData* src, OTodoData* dest ) { 402void OTodo::copy( OTodoData* src, OTodoData* dest ) {
386 dest->date = src->date; 403 dest->date = src->date;
387 dest->isCompleted = src->isCompleted; 404 dest->isCompleted = src->isCompleted;
388 dest->hasDate = src->hasDate; 405 dest->hasDate = src->hasDate;
389 dest->priority = src->priority; 406 dest->priority = src->priority;
390 dest->desc = src->desc; 407 dest->desc = src->desc;
391 dest->sum = src->sum; 408 dest->sum = src->sum;
392 dest->extra = src->extra; 409 dest->extra = src->extra;
393 dest->prog = src->prog; 410 dest->prog = src->prog;
394 dest->hasAlarmDateTime = src->hasAlarmDateTime; 411 dest->hasAlarmDateTime = src->hasAlarmDateTime;
395 dest->alarmDateTime = src->alarmDateTime; 412 dest->alarmDateTime = src->alarmDateTime;
396 dest->state = src->state; 413 dest->state = src->state;
397 dest->recur = src->recur; 414 dest->recur = src->recur;
415 dest->maintainer = src->maintainer;
398} 416}
399QString OTodo::type() const { 417QString OTodo::type() const {
400 return QString::fromLatin1("OTodo"); 418 return QString::fromLatin1("OTodo");
401} 419}
402QString OTodo::recordField(int /*id*/ )const { 420QString OTodo::recordField(int /*id*/ )const {
403 return QString::null; 421 return QString::null;
404} 422}
405 423
diff --git a/libopie/pim/otodo.h b/libopie/pim/otodo.h
index 2cdc587..70b0253 100644
--- a/libopie/pim/otodo.h
+++ b/libopie/pim/otodo.h
@@ -1,44 +1,45 @@
1 1
2#ifndef OPIE_TODO_EVENT_H 2#ifndef OPIE_TODO_EVENT_H
3#define OPIE_TODO_EVENT_H 3#define OPIE_TODO_EVENT_H
4 4
5 5
6#include <qarray.h> 6#include <qarray.h>
7#include <qmap.h> 7#include <qmap.h>
8#include <qregexp.h> 8#include <qregexp.h>
9#include <qstringlist.h> 9#include <qstringlist.h>
10#include <qdatetime.h> 10#include <qdatetime.h>
11#include <qvaluelist.h> 11#include <qvaluelist.h>
12 12
13#include <qpe/recordfields.h> 13#include <qpe/recordfields.h>
14#include <qpe/palmtopuidgen.h> 14#include <qpe/palmtopuidgen.h>
15 15
16#include <opie/opimrecord.h> 16#include <opie/opimrecord.h>
17 17
18 18
19class OPimState; 19class OPimState;
20class ORecur; 20class ORecur;
21class OPimMaintainer;
21class OTodo : public OPimRecord { 22class OTodo : public OPimRecord {
22public: 23public:
23 typedef QValueList<OTodo> ValueList; 24 typedef QValueList<OTodo> ValueList;
24 enum RecordFields { 25 enum RecordFields {
25 Uid = Qtopia::UID_ID, 26 Uid = Qtopia::UID_ID,
26 Category = Qtopia::CATEGORY_ID, 27 Category = Qtopia::CATEGORY_ID,
27 HasDate, 28 HasDate,
28 Completed, 29 Completed,
29 Description, 30 Description,
30 Summary, 31 Summary,
31 Priority, 32 Priority,
32 DateDay, 33 DateDay,
33 DateMonth, 34 DateMonth,
34 DateYear, 35 DateYear,
35 Progress, 36 Progress,
36 CrossReference, 37 CrossReference,
37 HasAlarmDateTime, 38 HasAlarmDateTime,
38 AlarmDateTime, 39 AlarmDateTime,
39 State, 40 State,
40 Recurrance, 41 Recurrance,
41 Alarms, 42 Alarms,
42 Reminders, 43 Reminders,
43 Notifiers 44 Notifiers
44 }; 45 };
@@ -107,48 +108,53 @@ public:
107 */ 108 */
108 ushort progress() const; 109 ushort progress() const;
109 110
110 /** 111 /**
111 * The due Date 112 * The due Date
112 */ 113 */
113 QDate dueDate()const; 114 QDate dueDate()const;
114 115
115 /** 116 /**
116 * Alarm Date and Time 117 * Alarm Date and Time
117 */ 118 */
118 QDateTime alarmDateTime()const; 119 QDateTime alarmDateTime()const;
119 120
120 /** 121 /**
121 * What is the state of this OTodo? 122 * What is the state of this OTodo?
122 */ 123 */
123 OPimState state()const; 124 OPimState state()const;
124 125
125 /** 126 /**
126 * the recurrance of this 127 * the recurrance of this
127 */ 128 */
128 ORecur recurrence()const; 129 ORecur recurrence()const;
129 130
130 /** 131 /**
132 * the Maintainer of this OTodo
133 */
134 OPimMaintainer maintainer()const;
135
136 /**
131 * The description of the todo 137 * The description of the todo
132 */ 138 */
133 QString description()const; 139 QString description()const;
134 140
135 /** 141 /**
136 * A small summary of the todo 142 * A small summary of the todo
137 */ 143 */
138 QString summary() const; 144 QString summary() const;
139 145
140 /** 146 /**
141 * @reimplemented 147 * @reimplemented
142 * Return this todoevent in a RichText formatted QString 148 * Return this todoevent in a RichText formatted QString
143 */ 149 */
144 QString toRichText() const; 150 QString toRichText() const;
145 151
146 /** 152 /**
147 * reimplementation 153 * reimplementation
148 */ 154 */
149 QString type()const; 155 QString type()const;
150 QString toShortText()const; 156 QString toShortText()const;
151 QMap<QString, QString> toExtraMap()const; 157 QMap<QString, QString> toExtraMap()const;
152 QString recordField(int id )const; 158 QString recordField(int id )const;
153 159
154 /** 160 /**
@@ -181,48 +187,54 @@ public:
181 * Set the progress. 187 * Set the progress.
182 */ 188 */
183 void setProgress( ushort progress ); 189 void setProgress( ushort progress );
184 190
185 /** 191 /**
186 * set the end date 192 * set the end date
187 */ 193 */
188 void setDueDate( QDate date ); 194 void setDueDate( QDate date );
189 195
190 196
191 void setRecurrence( const ORecur& ); 197 void setRecurrence( const ORecur& );
192 /** 198 /**
193 * set the alarm time 199 * set the alarm time
194 */ 200 */
195 void setAlarmDateTime ( const QDateTime& alarm ); 201 void setAlarmDateTime ( const QDateTime& alarm );
196 202
197 void setDescription(const QString& ); 203 void setDescription(const QString& );
198 void setSummary(const QString& ); 204 void setSummary(const QString& );
199 205
200 /** 206 /**
201 * set the state of a Todo 207 * set the state of a Todo
202 * @param state State what the todo should take 208 * @param state State what the todo should take
203 */ 209 */
204 void setState( const OPimState& state); 210 void setState( const OPimState& state);
211
212 /**
213 * set the Maintainer Mode
214 */
215 void setMaintainer( const OPimMaintainer& );
216
205 bool isOverdue(); 217 bool isOverdue();
206 218
207 219
208 bool match( const QRegExp &r )const; 220 bool match( const QRegExp &r )const;
209 221
210 bool operator<(const OTodo &toDoEvent )const; 222 bool operator<(const OTodo &toDoEvent )const;
211 bool operator<=(const OTodo &toDoEvent )const; 223 bool operator<=(const OTodo &toDoEvent )const;
212 bool operator!=(const OTodo &toDoEvent )const; 224 bool operator!=(const OTodo &toDoEvent )const;
213 bool operator>(const OTodo &toDoEvent )const; 225 bool operator>(const OTodo &toDoEvent )const;
214 bool operator>=(const OTodo &toDoEvent)const; 226 bool operator>=(const OTodo &toDoEvent)const;
215 bool operator==(const OTodo &toDoEvent )const; 227 bool operator==(const OTodo &toDoEvent )const;
216 OTodo &operator=(const OTodo &toDoEvent ); 228 OTodo &operator=(const OTodo &toDoEvent );
217 229
218 private: 230 private:
219 class OTodoPrivate; 231 class OTodoPrivate;
220 struct OTodoData; 232 struct OTodoData;
221 233
222 void deref(); 234 void deref();
223 inline void changeOrModify(); 235 inline void changeOrModify();
224 void copy( OTodoData* src, OTodoData* dest ); 236 void copy( OTodoData* src, OTodoData* dest );
225 OTodoPrivate *d; 237 OTodoPrivate *d;
226 OTodoData *data; 238 OTodoData *data;
227 239
228}; 240};
diff --git a/libopie2/opiepim/core/opimmaintainer.cpp b/libopie2/opiepim/core/opimmaintainer.cpp
new file mode 100644
index 0000000..e34f035
--- a/dev/null
+++ b/libopie2/opiepim/core/opimmaintainer.cpp
@@ -0,0 +1,37 @@
1#include "opimmaintainer.h"
2
3OPimMaintainer::OPimMaintainer( enum Mode mode, int uid )
4 : m_mode(mode), m_uid(uid )
5{}
6OPimMaintainer::~OPimMaintainer() {
7}
8OPimMaintainer::OPimMaintainer( const OPimMaintainer& main ) {
9 *this = main;
10}
11OPimMaintainer &OPimMaintainer::operator=( const OPimMaintainer& main ) {
12 m_mode = main.m_mode;
13 m_uid = main.m_uid;
14
15 return *this;
16}
17bool OPimMaintainer::operator==( const OPimMaintainer& main ) {
18 if (m_mode != main.m_mode ) return false;
19 if (m_uid != main.m_uid ) return false;
20
21 return true;
22}
23bool OPimMaintainer::operator!=( const OPimMaintainer& main ) {
24 return !(*this == main );
25}
26OPimMaintainer::Mode OPimMaintainer::mode()const {
27 return m_mode;
28}
29int OPimMaintainer::uid()const {
30 return m_uid;
31}
32void OPimMaintainer::setMode( enum Mode mo) {
33 m_mode = mo;
34}
35void OPimMaintainer::setUid( int uid ) {
36 m_uid = uid;
37}
diff --git a/libopie2/opiepim/core/opimmaintainer.h b/libopie2/opiepim/core/opimmaintainer.h
new file mode 100644
index 0000000..310e15a
--- a/dev/null
+++ b/libopie2/opiepim/core/opimmaintainer.h
@@ -0,0 +1,36 @@
1#ifndef OPIE_PIM_MAINTAINER_H
2#define OPIE_PIM_MAINTAINER_H
3
4#include <qstring.h>
5
6/**
7 * Who maintains what?
8 */
9class OPimMaintainer {
10public:
11 enum Mode { Undefined = -1,
12 Responsible = 0,
13 DoneBy,
14 Coordinating };
15 OPimMaintainer( enum Mode mode = Undefined, int uid = 0);
16 OPimMaintainer( const OPimMaintainer& );
17 ~OPimMaintainer();
18
19 OPimMaintainer &operator=( const OPimMaintainer& );
20 bool operator==( const OPimMaintainer& );
21 bool operator!=( const OPimMaintainer& );
22
23
24 Mode mode()const;
25 int uid()const;
26
27 void setMode( enum Mode );
28 void setUid( int uid );
29
30private:
31 Mode m_mode;
32 int m_uid;
33
34};
35
36#endif
diff --git a/libopie2/opiepim/core/opimxrefmanager.cpp b/libopie2/opiepim/core/opimxrefmanager.cpp
index d49f5f5..965f542 100644
--- a/libopie2/opiepim/core/opimxrefmanager.cpp
+++ b/libopie2/opiepim/core/opimxrefmanager.cpp
@@ -1,32 +1,34 @@
1#include "opimxrefmanager.h" 1#include "opimxrefmanager.h"
2 2
3 3
4OPimXRefManager::OPimXRefManager() { 4OPimXRefManager::OPimXRefManager() {
5} 5}
6OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) { 6OPimXRefManager::OPimXRefManager( const OPimXRefManager& ref) {
7 m_list = ref.m_list; 7 m_list = ref.m_list;
8} 8}
9OPimXRefManager::~OPimXRefManager() {
10}
9OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) { 11OPimXRefManager &OPimXRefManager::operator=( const OPimXRefManager& ref) {
10 m_list = ref.m_list; 12 m_list = ref.m_list;
11 return *this; 13 return *this;
12} 14}
13bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) { 15bool OPimXRefManager::operator==( const OPimXRefManager& /*ref*/) {
14 // if ( m_list == ref.m_list ) return true; 16 // if ( m_list == ref.m_list ) return true;
15 17
16 return false; 18 return false;
17} 19}
18void OPimXRefManager::add( const OPimXRef& ref) { 20void OPimXRefManager::add( const OPimXRef& ref) {
19 m_list.append( ref ); 21 m_list.append( ref );
20} 22}
21void OPimXRefManager::remove( const OPimXRef& ref) { 23void OPimXRefManager::remove( const OPimXRef& ref) {
22 m_list.remove( ref ); 24 m_list.remove( ref );
23} 25}
24void OPimXRefManager::replace( const OPimXRef& ref) { 26void OPimXRefManager::replace( const OPimXRef& ref) {
25 m_list.remove( ref ); 27 m_list.remove( ref );
26 m_list.append( ref ); 28 m_list.append( ref );
27} 29}
28void OPimXRefManager::clear() { 30void OPimXRefManager::clear() {
29 m_list.clear(); 31 m_list.clear();
30} 32}
31QStringList OPimXRefManager::apps()const { 33QStringList OPimXRefManager::apps()const {
32 OPimXRef::ValueList::ConstIterator it; 34 OPimXRef::ValueList::ConstIterator it;
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 4d5cb79..6fcf9f6 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -1,59 +1,62 @@
1 1
2#include <qobject.h> 2#include <qobject.h>
3#include <qshared.h> 3#include <qshared.h>
4 4
5 5
6 6
7#include <qpe/palmtopuidgen.h> 7#include <qpe/palmtopuidgen.h>
8#include <qpe/stringutil.h> 8#include <qpe/stringutil.h>
9#include <qpe/palmtoprecord.h> 9#include <qpe/palmtoprecord.h>
10#include <qpe/stringutil.h> 10#include <qpe/stringutil.h>
11#include <qpe/categories.h> 11#include <qpe/categories.h>
12#include <qpe/categoryselect.h> 12#include <qpe/categoryselect.h>
13 13
14 14
15#include "opimstate.h" 15#include "opimstate.h"
16#include "orecur.h" 16#include "orecur.h"
17#include "opimmaintainer.h"
18
17#include "otodo.h" 19#include "otodo.h"
18 20
19 21
20struct OTodo::OTodoData : public QShared { 22struct OTodo::OTodoData : public QShared {
21 OTodoData() : QShared() { 23 OTodoData() : QShared() {
22 }; 24 };
23 25
24 QDate date; 26 QDate date;
25 bool isCompleted:1; 27 bool isCompleted:1;
26 bool hasDate:1; 28 bool hasDate:1;
27 int priority; 29 int priority;
28 QString desc; 30 QString desc;
29 QString sum; 31 QString sum;
30 QMap<QString, QString> extra; 32 QMap<QString, QString> extra;
31 ushort prog; 33 ushort prog;
32 bool hasAlarmDateTime :1; 34 bool hasAlarmDateTime :1;
33 QDateTime alarmDateTime; 35 QDateTime alarmDateTime;
34 OPimState state; 36 OPimState state;
35 ORecur recur; 37 ORecur recur;
38 OPimMaintainer maintainer;
36}; 39};
37 40
38OTodo::OTodo(const OTodo &event ) 41OTodo::OTodo(const OTodo &event )
39 : OPimRecord( event ), data( event.data ) 42 : OPimRecord( event ), data( event.data )
40{ 43{
41 data->ref(); 44 data->ref();
42// qWarning("ref up"); 45// qWarning("ref up");
43} 46}
44OTodo::~OTodo() { 47OTodo::~OTodo() {
45 48
46// qWarning("~OTodo " ); 49// qWarning("~OTodo " );
47 if ( data->deref() ) { 50 if ( data->deref() ) {
48// qWarning("OTodo::dereffing"); 51// qWarning("OTodo::dereffing");
49 delete data; 52 delete data;
50 data = 0l; 53 data = 0l;
51 } 54 }
52} 55}
53OTodo::OTodo(bool completed, int priority, 56OTodo::OTodo(bool completed, int priority,
54 const QArray<int> &category, 57 const QArray<int> &category,
55 const QString& summary, 58 const QString& summary,
56 const QString &description, 59 const QString &description,
57 ushort progress, 60 ushort progress,
58 bool hasDate, QDate date, int uid ) 61 bool hasDate, QDate date, int uid )
59 : OPimRecord( uid ) 62 : OPimRecord( uid )
@@ -132,48 +135,51 @@ QString OTodo::summary() const
132ushort OTodo::progress() const 135ushort OTodo::progress() const
133{ 136{
134 return data->prog; 137 return data->prog;
135} 138}
136QDate OTodo::dueDate()const 139QDate OTodo::dueDate()const
137{ 140{
138 return data->date; 141 return data->date;
139} 142}
140 143
141QDateTime OTodo::alarmDateTime() const 144QDateTime OTodo::alarmDateTime() const
142{ 145{
143 return data->alarmDateTime; 146 return data->alarmDateTime;
144} 147}
145 148
146QString OTodo::description()const 149QString OTodo::description()const
147{ 150{
148 return data->desc; 151 return data->desc;
149} 152}
150OPimState OTodo::state()const { 153OPimState OTodo::state()const {
151 return data->state; 154 return data->state;
152} 155}
153ORecur OTodo::recurrence()const { 156ORecur OTodo::recurrence()const {
154 return data->recur; 157 return data->recur;
155} 158}
159OPimMaintainer OTodo::maintainer()const {
160 return data->maintainer;
161}
156void OTodo::setCompleted( bool completed ) 162void OTodo::setCompleted( bool completed )
157{ 163{
158 changeOrModify(); 164 changeOrModify();
159 data->isCompleted = completed; 165 data->isCompleted = completed;
160} 166}
161void OTodo::setHasDueDate( bool hasDate ) 167void OTodo::setHasDueDate( bool hasDate )
162{ 168{
163 changeOrModify(); 169 changeOrModify();
164 data->hasDate = hasDate; 170 data->hasDate = hasDate;
165} 171}
166void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) 172void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
167{ 173{
168 changeOrModify(); 174 changeOrModify();
169 data->hasAlarmDateTime = hasAlarmDateTime; 175 data->hasAlarmDateTime = hasAlarmDateTime;
170} 176}
171void OTodo::setDescription(const QString &desc ) 177void OTodo::setDescription(const QString &desc )
172{ 178{
173// qWarning( "desc " + desc ); 179// qWarning( "desc " + desc );
174 changeOrModify(); 180 changeOrModify();
175 data->desc = Qtopia::simplifyMultiLineSpace(desc ); 181 data->desc = Qtopia::simplifyMultiLineSpace(desc );
176} 182}
177void OTodo::setSummary( const QString& sum ) 183void OTodo::setSummary( const QString& sum )
178{ 184{
179 changeOrModify(); 185 changeOrModify();
@@ -181,48 +187,52 @@ void OTodo::setSummary( const QString& sum )
181} 187}
182void OTodo::setPriority(int prio ) 188void OTodo::setPriority(int prio )
183{ 189{
184 changeOrModify(); 190 changeOrModify();
185 data->priority = prio; 191 data->priority = prio;
186} 192}
187void OTodo::setDueDate( QDate date ) 193void OTodo::setDueDate( QDate date )
188{ 194{
189 changeOrModify(); 195 changeOrModify();
190 data->date = date; 196 data->date = date;
191} 197}
192void OTodo::setAlarmDateTime( const QDateTime& alarm ) 198void OTodo::setAlarmDateTime( const QDateTime& alarm )
193{ 199{
194 changeOrModify(); 200 changeOrModify();
195 data->alarmDateTime = alarm; 201 data->alarmDateTime = alarm;
196} 202}
197void OTodo::setState( const OPimState& state ) { 203void OTodo::setState( const OPimState& state ) {
198 changeOrModify(); 204 changeOrModify();
199 data->state = state; 205 data->state = state;
200} 206}
201void OTodo::setRecurrence( const ORecur& rec) { 207void OTodo::setRecurrence( const ORecur& rec) {
202 changeOrModify(); 208 changeOrModify();
203 data->recur = rec; 209 data->recur = rec;
204} 210}
211void OTodo::setMaintainer( const OPimMaintainer& pim ) {
212 changeOrModify();
213 data->maintainer = pim;
214}
205bool OTodo::isOverdue( ) 215bool OTodo::isOverdue( )
206{ 216{
207 if( data->hasDate && !data->isCompleted) 217 if( data->hasDate && !data->isCompleted)
208 return QDate::currentDate() > data->date; 218 return QDate::currentDate() > data->date;
209 return false; 219 return false;
210} 220}
211void OTodo::setProgress(ushort progress ) 221void OTodo::setProgress(ushort progress )
212{ 222{
213 changeOrModify(); 223 changeOrModify();
214 data->prog = progress; 224 data->prog = progress;
215} 225}
216QString OTodo::toShortText() const { 226QString OTodo::toShortText() const {
217 return summary(); 227 return summary();
218} 228}
219/*! 229/*!
220 Returns a richt text string 230 Returns a richt text string
221*/ 231*/
222QString OTodo::toRichText() const 232QString OTodo::toRichText() const
223{ 233{
224 QString text; 234 QString text;
225 QStringList catlist; 235 QStringList catlist;
226 236
227 // Description of the todo 237 // Description of the todo
228 if ( !summary().isEmpty() ) { 238 if ( !summary().isEmpty() ) {
@@ -300,106 +310,114 @@ bool OTodo::operator>=(const OTodo &toDoEvent )const
300 if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true; 310 if( !hasDueDate() && !toDoEvent.hasDueDate() ) return true;
301 if( !hasDueDate() && toDoEvent.hasDueDate() ) return false; 311 if( !hasDueDate() && toDoEvent.hasDueDate() ) return false;
302 if( hasDueDate() && toDoEvent.hasDueDate() ){ 312 if( hasDueDate() && toDoEvent.hasDueDate() ){
303 if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide 313 if( dueDate() == toDoEvent.dueDate() ){ // let's the priority decide
304 return priority() > toDoEvent.priority(); 314 return priority() > toDoEvent.priority();
305 }else{ 315 }else{
306 return dueDate() > toDoEvent.dueDate(); 316 return dueDate() > toDoEvent.dueDate();
307 } 317 }
308 } 318 }
309 return true; 319 return true;
310} 320}
311bool OTodo::operator==(const OTodo &toDoEvent )const 321bool OTodo::operator==(const OTodo &toDoEvent )const
312{ 322{
313 if ( data->priority != toDoEvent.data->priority ) return false; 323 if ( data->priority != toDoEvent.data->priority ) return false;
314 if ( data->priority != toDoEvent.data->prog ) return false; 324 if ( data->priority != toDoEvent.data->prog ) return false;
315 if ( data->isCompleted != toDoEvent.data->isCompleted ) return false; 325 if ( data->isCompleted != toDoEvent.data->isCompleted ) return false;
316 if ( data->hasDate != toDoEvent.data->hasDate ) return false; 326 if ( data->hasDate != toDoEvent.data->hasDate ) return false;
317 if ( data->date != toDoEvent.data->date ) return false; 327 if ( data->date != toDoEvent.data->date ) return false;
318 if ( data->sum != toDoEvent.data->sum ) return false; 328 if ( data->sum != toDoEvent.data->sum ) return false;
319 if ( data->desc != toDoEvent.data->desc ) return false; 329 if ( data->desc != toDoEvent.data->desc ) return false;
320 if ( data->hasAlarmDateTime != toDoEvent.data->hasAlarmDateTime ) 330 if ( data->hasAlarmDateTime != toDoEvent.data->hasAlarmDateTime )
321 return false; 331 return false;
322 if ( data->alarmDateTime != toDoEvent.data->alarmDateTime ) 332 if ( data->alarmDateTime != toDoEvent.data->alarmDateTime )
323 return false; 333 return false;
334 if ( data->maintainer != toDoEvent.data->maintainer )
335 return false;
324 336
325 return OPimRecord::operator==( toDoEvent ); 337 return OPimRecord::operator==( toDoEvent );
326} 338}
327void OTodo::deref() { 339void OTodo::deref() {
328 340
329// qWarning("deref in ToDoEvent"); 341// qWarning("deref in ToDoEvent");
330 if ( data->deref() ) { 342 if ( data->deref() ) {
331// qWarning("deleting"); 343// qWarning("deleting");
332 delete data; 344 delete data;
333 data= 0; 345 data= 0;
334 } 346 }
335} 347}
336OTodo &OTodo::operator=(const OTodo &item ) 348OTodo &OTodo::operator=(const OTodo &item )
337{ 349{
338 OPimRecord::operator=( item ); 350 OPimRecord::operator=( item );
339 //qWarning("operator= ref "); 351 //qWarning("operator= ref ");
340 item.data->ref(); 352 item.data->ref();
341 deref(); 353 deref();
342 data = item.data; 354 data = item.data;
343 355
344 return *this; 356 return *this;
345} 357}
346 358
347QMap<int, QString> OTodo::toMap() const { 359QMap<int, QString> OTodo::toMap() const {
348 QMap<int, QString> map; 360 QMap<int, QString> map;
349 361
350 map.insert( Uid, QString::number( uid() ) ); 362 map.insert( Uid, QString::number( uid() ) );
351 map.insert( Category, idsToString( categories() ) ); 363 map.insert( Category, idsToString( categories() ) );
352 map.insert( HasDate, QString::number( data->hasDate ) ); 364 map.insert( HasDate, QString::number( data->hasDate ) );
353 map.insert( Completed, QString::number( data->isCompleted ) ); 365 map.insert( Completed, QString::number( data->isCompleted ) );
354 map.insert( Description, data->desc ); 366 map.insert( Description, data->desc );
355 map.insert( Summary, data->sum ); 367 map.insert( Summary, data->sum );
356 map.insert( Priority, QString::number( data->priority ) ); 368 map.insert( Priority, QString::number( data->priority ) );
357 map.insert( DateDay, QString::number( data->date.day() ) ); 369 map.insert( DateDay, QString::number( data->date.day() ) );
358 map.insert( DateMonth, QString::number( data->date.month() ) ); 370 map.insert( DateMonth, QString::number( data->date.month() ) );
359 map.insert( DateYear, QString::number( data->date.year() ) ); 371 map.insert( DateYear, QString::number( data->date.year() ) );
360 map.insert( Progress, QString::number( data->prog ) ); 372 map.insert( Progress, QString::number( data->prog ) );
361 map.insert( CrossReference, crossToString() ); 373// map.insert( CrossReference, crossToString() );
362 map.insert( HasAlarmDateTime, QString::number( data->hasAlarmDateTime ) ); 374 map.insert( HasAlarmDateTime, QString::number( data->hasAlarmDateTime ) );
363 map.insert( AlarmDateTime, data->alarmDateTime.toString() ); 375 map.insert( AlarmDateTime, data->alarmDateTime.toString() );
364 376
365 return map; 377 return map;
366} 378}
367 379
368QMap<QString, QString> OTodo::toExtraMap()const { 380QMap<QString, QString> OTodo::toExtraMap()const {
369 return data->extra; 381 return data->extra;
370} 382}
371/** 383/**
372 * change or modify looks at the ref count and either 384 * change or modify looks at the ref count and either
373 * creates a new QShared Object or it can modify it 385 * creates a new QShared Object or it can modify it
374 * right in place 386 * right in place
375 */ 387 */
376void OTodo::changeOrModify() { 388void OTodo::changeOrModify() {
377 if ( data->count != 1 ) { 389 if ( data->count != 1 ) {
378 qWarning("changeOrModify"); 390 qWarning("changeOrModify");
379 data->deref(); 391 data->deref();
380 OTodoData* d2 = new OTodoData(); 392 OTodoData* d2 = new OTodoData();
381 copy(data, d2 ); 393 copy(data, d2 );
382 data = d2; 394 data = d2;
383 } 395 }
384} 396}
397// WATCHOUT
398/*
399 * if you add something to the Data struct
400 * be sure to copy it here
401 */
385void OTodo::copy( OTodoData* src, OTodoData* dest ) { 402void OTodo::copy( OTodoData* src, OTodoData* dest ) {
386 dest->date = src->date; 403 dest->date = src->date;
387 dest->isCompleted = src->isCompleted; 404 dest->isCompleted = src->isCompleted;
388 dest->hasDate = src->hasDate; 405 dest->hasDate = src->hasDate;
389 dest->priority = src->priority; 406 dest->priority = src->priority;
390 dest->desc = src->desc; 407 dest->desc = src->desc;
391 dest->sum = src->sum; 408 dest->sum = src->sum;
392 dest->extra = src->extra; 409 dest->extra = src->extra;
393 dest->prog = src->prog; 410 dest->prog = src->prog;
394 dest->hasAlarmDateTime = src->hasAlarmDateTime; 411 dest->hasAlarmDateTime = src->hasAlarmDateTime;
395 dest->alarmDateTime = src->alarmDateTime; 412 dest->alarmDateTime = src->alarmDateTime;
396 dest->state = src->state; 413 dest->state = src->state;
397 dest->recur = src->recur; 414 dest->recur = src->recur;
415 dest->maintainer = src->maintainer;
398} 416}
399QString OTodo::type() const { 417QString OTodo::type() const {
400 return QString::fromLatin1("OTodo"); 418 return QString::fromLatin1("OTodo");
401} 419}
402QString OTodo::recordField(int /*id*/ )const { 420QString OTodo::recordField(int /*id*/ )const {
403 return QString::null; 421 return QString::null;
404} 422}
405 423
diff --git a/libopie2/opiepim/otodo.h b/libopie2/opiepim/otodo.h
index 2cdc587..70b0253 100644
--- a/libopie2/opiepim/otodo.h
+++ b/libopie2/opiepim/otodo.h
@@ -1,44 +1,45 @@
1 1
2#ifndef OPIE_TODO_EVENT_H 2#ifndef OPIE_TODO_EVENT_H
3#define OPIE_TODO_EVENT_H 3#define OPIE_TODO_EVENT_H
4 4
5 5
6#include <qarray.h> 6#include <qarray.h>
7#include <qmap.h> 7#include <qmap.h>
8#include <qregexp.h> 8#include <qregexp.h>
9#include <qstringlist.h> 9#include <qstringlist.h>
10#include <qdatetime.h> 10#include <qdatetime.h>
11#include <qvaluelist.h> 11#include <qvaluelist.h>
12 12
13#include <qpe/recordfields.h> 13#include <qpe/recordfields.h>
14#include <qpe/palmtopuidgen.h> 14#include <qpe/palmtopuidgen.h>
15 15
16#include <opie/opimrecord.h> 16#include <opie/opimrecord.h>
17 17
18 18
19class OPimState; 19class OPimState;
20class ORecur; 20class ORecur;
21class OPimMaintainer;
21class OTodo : public OPimRecord { 22class OTodo : public OPimRecord {
22public: 23public:
23 typedef QValueList<OTodo> ValueList; 24 typedef QValueList<OTodo> ValueList;
24 enum RecordFields { 25 enum RecordFields {
25 Uid = Qtopia::UID_ID, 26 Uid = Qtopia::UID_ID,
26 Category = Qtopia::CATEGORY_ID, 27 Category = Qtopia::CATEGORY_ID,
27 HasDate, 28 HasDate,
28 Completed, 29 Completed,
29 Description, 30 Description,
30 Summary, 31 Summary,
31 Priority, 32 Priority,
32 DateDay, 33 DateDay,
33 DateMonth, 34 DateMonth,
34 DateYear, 35 DateYear,
35 Progress, 36 Progress,
36 CrossReference, 37 CrossReference,
37 HasAlarmDateTime, 38 HasAlarmDateTime,
38 AlarmDateTime, 39 AlarmDateTime,
39 State, 40 State,
40 Recurrance, 41 Recurrance,
41 Alarms, 42 Alarms,
42 Reminders, 43 Reminders,
43 Notifiers 44 Notifiers
44 }; 45 };
@@ -107,48 +108,53 @@ public:
107 */ 108 */
108 ushort progress() const; 109 ushort progress() const;
109 110
110 /** 111 /**
111 * The due Date 112 * The due Date
112 */ 113 */
113 QDate dueDate()const; 114 QDate dueDate()const;
114 115
115 /** 116 /**
116 * Alarm Date and Time 117 * Alarm Date and Time
117 */ 118 */
118 QDateTime alarmDateTime()const; 119 QDateTime alarmDateTime()const;
119 120
120 /** 121 /**
121 * What is the state of this OTodo? 122 * What is the state of this OTodo?
122 */ 123 */
123 OPimState state()const; 124 OPimState state()const;
124 125
125 /** 126 /**
126 * the recurrance of this 127 * the recurrance of this
127 */ 128 */
128 ORecur recurrence()const; 129 ORecur recurrence()const;
129 130
130 /** 131 /**
132 * the Maintainer of this OTodo
133 */
134 OPimMaintainer maintainer()const;
135
136 /**
131 * The description of the todo 137 * The description of the todo
132 */ 138 */
133 QString description()const; 139 QString description()const;
134 140
135 /** 141 /**
136 * A small summary of the todo 142 * A small summary of the todo
137 */ 143 */
138 QString summary() const; 144 QString summary() const;
139 145
140 /** 146 /**
141 * @reimplemented 147 * @reimplemented
142 * Return this todoevent in a RichText formatted QString 148 * Return this todoevent in a RichText formatted QString
143 */ 149 */
144 QString toRichText() const; 150 QString toRichText() const;
145 151
146 /** 152 /**
147 * reimplementation 153 * reimplementation
148 */ 154 */
149 QString type()const; 155 QString type()const;
150 QString toShortText()const; 156 QString toShortText()const;
151 QMap<QString, QString> toExtraMap()const; 157 QMap<QString, QString> toExtraMap()const;
152 QString recordField(int id )const; 158 QString recordField(int id )const;
153 159
154 /** 160 /**
@@ -181,48 +187,54 @@ public:
181 * Set the progress. 187 * Set the progress.
182 */ 188 */
183 void setProgress( ushort progress ); 189 void setProgress( ushort progress );
184 190
185 /** 191 /**
186 * set the end date 192 * set the end date
187 */ 193 */
188 void setDueDate( QDate date ); 194 void setDueDate( QDate date );
189 195
190 196
191 void setRecurrence( const ORecur& ); 197 void setRecurrence( const ORecur& );
192 /** 198 /**
193 * set the alarm time 199 * set the alarm time
194 */ 200 */
195 void setAlarmDateTime ( const QDateTime& alarm ); 201 void setAlarmDateTime ( const QDateTime& alarm );
196 202
197 void setDescription(const QString& ); 203 void setDescription(const QString& );
198 void setSummary(const QString& ); 204 void setSummary(const QString& );
199 205
200 /** 206 /**
201 * set the state of a Todo 207 * set the state of a Todo
202 * @param state State what the todo should take 208 * @param state State what the todo should take
203 */ 209 */
204 void setState( const OPimState& state); 210 void setState( const OPimState& state);
211
212 /**
213 * set the Maintainer Mode
214 */
215 void setMaintainer( const OPimMaintainer& );
216
205 bool isOverdue(); 217 bool isOverdue();
206 218
207 219
208 bool match( const QRegExp &r )const; 220 bool match( const QRegExp &r )const;
209 221
210 bool operator<(const OTodo &toDoEvent )const; 222 bool operator<(const OTodo &toDoEvent )const;
211 bool operator<=(const OTodo &toDoEvent )const; 223 bool operator<=(const OTodo &toDoEvent )const;
212 bool operator!=(const OTodo &toDoEvent )const; 224 bool operator!=(const OTodo &toDoEvent )const;
213 bool operator>(const OTodo &toDoEvent )const; 225 bool operator>(const OTodo &toDoEvent )const;
214 bool operator>=(const OTodo &toDoEvent)const; 226 bool operator>=(const OTodo &toDoEvent)const;
215 bool operator==(const OTodo &toDoEvent )const; 227 bool operator==(const OTodo &toDoEvent )const;
216 OTodo &operator=(const OTodo &toDoEvent ); 228 OTodo &operator=(const OTodo &toDoEvent );
217 229
218 private: 230 private:
219 class OTodoPrivate; 231 class OTodoPrivate;
220 struct OTodoData; 232 struct OTodoData;
221 233
222 void deref(); 234 void deref();
223 inline void changeOrModify(); 235 inline void changeOrModify();
224 void copy( OTodoData* src, OTodoData* dest ); 236 void copy( OTodoData* src, OTodoData* dest );
225 OTodoPrivate *d; 237 OTodoPrivate *d;
226 OTodoData *data; 238 OTodoData *data;
227 239
228}; 240};