-rw-r--r-- | core/pim/todo/mainwindow.cpp | 2 | ||||
-rw-r--r-- | core/pim/todo/todoentry.ui | 370 | ||||
-rw-r--r-- | core/pim/todo/todoentryimpl.cpp | 7 | ||||
-rw-r--r-- | core/pim/todo/todotable.cpp | 11 | ||||
-rw-r--r-- | core/pim/todo/todotable.h | 3 | ||||
-rw-r--r-- | libopie/tododb.cpp | 12 | ||||
-rw-r--r-- | libopie/todoevent.cpp | 43 | ||||
-rw-r--r-- | libopie/todoevent.h | 67 | ||||
-rw-r--r-- | libopie/todovcalresource.cpp | 23 |
9 files changed, 353 insertions, 185 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index b7b1da0..1358f1c 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -573,49 +573,49 @@ void TodoWindow::slotFind() | |||
573 | 573 | ||
574 | void TodoWindow::setDocument( const QString &filename ) | 574 | void TodoWindow::setDocument( const QString &filename ) |
575 | { | 575 | { |
576 | if ( filename.find(".vcs") != int(filename.length()) - 4 ) return; | 576 | if ( filename.find(".vcs") != int(filename.length()) - 4 ) return; |
577 | 577 | ||
578 | ToDoDB todoDB(filename, new ToDoVCalResource() ); | 578 | ToDoDB todoDB(filename, new ToDoVCalResource() ); |
579 | QValueList<ToDoEvent> tl = todoDB.rawToDos(); | 579 | QValueList<ToDoEvent> tl = todoDB.rawToDos(); |
580 | for( QValueList<ToDoEvent>::Iterator it = tl.begin(); it != tl.end(); ++it ) { | 580 | for( QValueList<ToDoEvent>::Iterator it = tl.begin(); it != tl.end(); ++it ) { |
581 | table->addEntry( *it ); | 581 | table->addEntry( *it ); |
582 | } | 582 | } |
583 | } | 583 | } |
584 | 584 | ||
585 | static const char * beamfile = "/tmp/obex/todo.vcs"; | 585 | static const char * beamfile = "/tmp/obex/todo.vcs"; |
586 | 586 | ||
587 | void TodoWindow::slotBeam() | 587 | void TodoWindow::slotBeam() |
588 | { | 588 | { |
589 | unlink( beamfile ); // delete if exists | 589 | unlink( beamfile ); // delete if exists |
590 | ToDoEvent c = table->currentEntry(); | 590 | ToDoEvent c = table->currentEntry(); |
591 | mkdir("/tmp/obex/", 0755); | 591 | mkdir("/tmp/obex/", 0755); |
592 | ToDoDB todoDB( beamfile, new ToDoVCalResource() ); | 592 | ToDoDB todoDB( beamfile, new ToDoVCalResource() ); |
593 | todoDB.addEvent( c ); | 593 | todoDB.addEvent( c ); |
594 | todoDB.save(); | 594 | todoDB.save(); |
595 | Ir *ir = new Ir( this ); | 595 | Ir *ir = new Ir( this ); |
596 | connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); | 596 | connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) ); |
597 | QString description = c.description(); | 597 | QString description = c.summary(); |
598 | ir->send( beamfile, description, "text/x-vCalendar" ); | 598 | ir->send( beamfile, description, "text/x-vCalendar" ); |
599 | } | 599 | } |
600 | 600 | ||
601 | void TodoWindow::beamDone( Ir *ir ) | 601 | void TodoWindow::beamDone( Ir *ir ) |
602 | { | 602 | { |
603 | delete ir; | 603 | delete ir; |
604 | unlink( beamfile ); | 604 | unlink( beamfile ); |
605 | } | 605 | } |
606 | 606 | ||
607 | void TodoWindow::showDeadline( bool s ) | 607 | void TodoWindow::showDeadline( bool s ) |
608 | { | 608 | { |
609 | table->setPaintingEnabled( false ); | 609 | table->setPaintingEnabled( false ); |
610 | table->setShowDeadline( s ); | 610 | table->setShowDeadline( s ); |
611 | table->setPaintingEnabled( true ); | 611 | table->setPaintingEnabled( true ); |
612 | } | 612 | } |
613 | void TodoWindow::slotShowDetails() | 613 | void TodoWindow::slotShowDetails() |
614 | { | 614 | { |
615 | ToDoEvent event = table->currentEntry(); | 615 | ToDoEvent event = table->currentEntry(); |
616 | slotShowDetails( event ); | 616 | slotShowDetails( event ); |
617 | } | 617 | } |
618 | void TodoWindow::slotShowDetails( const ToDoEvent &event ) | 618 | void TodoWindow::slotShowDetails( const ToDoEvent &event ) |
619 | { | 619 | { |
620 | if( mView == 0l ){ | 620 | if( mView == 0l ){ |
621 | mView = new TodoLabel(mStack); | 621 | mView = new TodoLabel(mStack); |
diff --git a/core/pim/todo/todoentry.ui b/core/pim/todo/todoentry.ui index c735e76..87ee68c 100644 --- a/core/pim/todo/todoentry.ui +++ b/core/pim/todo/todoentry.ui | |||
@@ -9,248 +9,308 @@ | |||
9 | ** GNU General Public License version 2 as published by the Free Software | 9 | ** GNU General Public License version 2 as published by the Free Software |
10 | ** Foundation and appearing in the file LICENSE.GPL included in the | 10 | ** Foundation and appearing in the file LICENSE.GPL included in the |
11 | ** packaging of this file. | 11 | ** packaging of this file. |
12 | ** | 12 | ** |
13 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 13 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
14 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 14 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
15 | ** | 15 | ** |
16 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 16 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
17 | ** | 17 | ** |
18 | ** Contact info@trolltech.com if any conditions of this licensing are | 18 | ** Contact info@trolltech.com if any conditions of this licensing are |
19 | ** not clear to you. | 19 | ** not clear to you. |
20 | ** | 20 | ** |
21 | *********************************************************************</comment> | 21 | *********************************************************************</comment> |
22 | <widget> | 22 | <widget> |
23 | <class>QDialog</class> | 23 | <class>QDialog</class> |
24 | <property stdset="1"> | 24 | <property stdset="1"> |
25 | <name>name</name> | 25 | <name>name</name> |
26 | <cstring>NewTaskDialogBase</cstring> | 26 | <cstring>NewTaskDialogBase</cstring> |
27 | </property> | 27 | </property> |
28 | <property stdset="1"> | 28 | <property stdset="1"> |
29 | <name>geometry</name> | 29 | <name>geometry</name> |
30 | <rect> | 30 | <rect> |
31 | <x>0</x> | 31 | <x>0</x> |
32 | <y>0</y> | 32 | <y>0</y> |
33 | <width>249</width> | 33 | <width>245</width> |
34 | <height>321</height> | 34 | <height>321</height> |
35 | </rect> | 35 | </rect> |
36 | </property> | 36 | </property> |
37 | <property stdset="1"> | 37 | <property stdset="1"> |
38 | <name>caption</name> | 38 | <name>caption</name> |
39 | <string>New Task</string> | 39 | <string>New Task</string> |
40 | </property> | 40 | </property> |
41 | <property> | 41 | <property> |
42 | <name>layoutMargin</name> | 42 | <name>layoutMargin</name> |
43 | </property> | 43 | </property> |
44 | <property> | 44 | <property> |
45 | <name>layoutSpacing</name> | 45 | <name>layoutSpacing</name> |
46 | </property> | 46 | </property> |
47 | <vbox> | 47 | <widget> |
48 | <class>QLayoutWidget</class> | ||
48 | <property stdset="1"> | 49 | <property stdset="1"> |
49 | <name>margin</name> | 50 | <name>name</name> |
50 | <number>0</number> | 51 | <cstring>Layout3</cstring> |
51 | </property> | 52 | </property> |
52 | <property stdset="1"> | 53 | <property stdset="1"> |
53 | <name>spacing</name> | 54 | <name>geometry</name> |
54 | <number>0</number> | 55 | <rect> |
56 | <x>1</x> | ||
57 | <y>25</y> | ||
58 | <width>243</width> | ||
59 | <height>17</height> | ||
60 | </rect> | ||
55 | </property> | 61 | </property> |
56 | <widget> | 62 | <hbox> |
57 | <class>QLayoutWidget</class> | ||
58 | <property stdset="1"> | 63 | <property stdset="1"> |
59 | <name>name</name> | 64 | <name>margin</name> |
60 | <cstring>Layout4</cstring> | 65 | <number>0</number> |
61 | </property> | 66 | </property> |
62 | <hbox> | 67 | <property stdset="1"> |
68 | <name>spacing</name> | ||
69 | <number>6</number> | ||
70 | </property> | ||
71 | <widget> | ||
72 | <class>QLabel</class> | ||
63 | <property stdset="1"> | 73 | <property stdset="1"> |
64 | <name>margin</name> | 74 | <name>name</name> |
65 | <number>0</number> | 75 | <cstring>TextLabel3</cstring> |
66 | </property> | 76 | </property> |
67 | <property stdset="1"> | 77 | <property stdset="1"> |
68 | <name>spacing</name> | 78 | <name>frameShape</name> |
69 | <number>6</number> | 79 | <enum>NoFrame</enum> |
70 | </property> | 80 | </property> |
71 | <widget> | 81 | <property stdset="1"> |
72 | <class>QLabel</class> | 82 | <name>text</name> |
83 | <string>Category:</string> | ||
84 | </property> | ||
85 | </widget> | ||
86 | <widget> | ||
87 | <class>CategorySelect</class> | ||
88 | <property stdset="1"> | ||
89 | <name>name</name> | ||
90 | <cstring>comboCategory</cstring> | ||
91 | </property> | ||
92 | </widget> | ||
93 | </hbox> | ||
94 | </widget> | ||
95 | <widget> | ||
96 | <class>QLayoutWidget</class> | ||
97 | <property stdset="1"> | ||
98 | <name>name</name> | ||
99 | <cstring>Layout6</cstring> | ||
100 | </property> | ||
101 | <property stdset="1"> | ||
102 | <name>geometry</name> | ||
103 | <rect> | ||
104 | <x>0</x> | ||
105 | <y>0</y> | ||
106 | <width>240</width> | ||
107 | <height>320</height> | ||
108 | </rect> | ||
109 | </property> | ||
110 | <grid> | ||
111 | <property stdset="1"> | ||
112 | <name>margin</name> | ||
113 | <number>0</number> | ||
114 | </property> | ||
115 | <property stdset="1"> | ||
116 | <name>spacing</name> | ||
117 | <number>6</number> | ||
118 | </property> | ||
119 | <widget row="2" column="0" > | ||
120 | <class>QLayoutWidget</class> | ||
121 | <property stdset="1"> | ||
122 | <name>name</name> | ||
123 | <cstring>Layout4</cstring> | ||
124 | </property> | ||
125 | <hbox> | ||
73 | <property stdset="1"> | 126 | <property stdset="1"> |
74 | <name>name</name> | 127 | <name>margin</name> |
75 | <cstring>TextLabel2</cstring> | 128 | <number>0</number> |
76 | </property> | 129 | </property> |
77 | <property stdset="1"> | 130 | <property stdset="1"> |
78 | <name>text</name> | 131 | <name>spacing</name> |
79 | <string>Priority:</string> | 132 | <number>6</number> |
80 | </property> | 133 | </property> |
81 | </widget> | 134 | <widget> |
82 | <widget> | 135 | <class>QLabel</class> |
83 | <class>QComboBox</class> | 136 | <property stdset="1"> |
84 | <item> | 137 | <name>name</name> |
85 | <property> | 138 | <cstring>TextLabel1</cstring> |
86 | <name>text</name> | ||
87 | <string>1 - Very High</string> | ||
88 | </property> | 139 | </property> |
89 | </item> | 140 | <property stdset="1"> |
90 | <item> | ||
91 | <property> | ||
92 | <name>text</name> | 141 | <name>text</name> |
93 | <string>2 - High</string> | 142 | <string>Summary:</string> |
94 | </property> | 143 | </property> |
95 | </item> | 144 | </widget> |
96 | <item> | 145 | <widget> |
97 | <property> | 146 | <class>QLineEdit</class> |
98 | <name>text</name> | 147 | <property stdset="1"> |
99 | <string>3 - Normal</string> | 148 | <name>name</name> |
100 | </property> | 149 | <cstring>lneSum</cstring> |
101 | </item> | ||
102 | <item> | ||
103 | <property> | ||
104 | <name>text</name> | ||
105 | <string>4 - Low</string> | ||
106 | </property> | ||
107 | </item> | ||
108 | <item> | ||
109 | <property> | ||
110 | <name>text</name> | ||
111 | <string>5 - Very Low</string> | ||
112 | </property> | 150 | </property> |
113 | </item> | 151 | </widget> |
114 | <property stdset="1"> | 152 | </hbox> |
115 | <name>name</name> | 153 | </widget> |
116 | <cstring>comboPriority</cstring> | 154 | <widget row="3" column="0" > |
117 | </property> | 155 | <class>QMultiLineEdit</class> |
118 | <property stdset="1"> | ||
119 | <name>sizePolicy</name> | ||
120 | <sizepolicy> | ||
121 | <hsizetype>7</hsizetype> | ||
122 | <vsizetype>0</vsizetype> | ||
123 | </sizepolicy> | ||
124 | </property> | ||
125 | <property stdset="1"> | ||
126 | <name>currentItem</name> | ||
127 | <number>2</number> | ||
128 | </property> | ||
129 | </widget> | ||
130 | </hbox> | ||
131 | </widget> | ||
132 | <widget> | ||
133 | <class>QLayoutWidget</class> | ||
134 | <property stdset="1"> | ||
135 | <name>name</name> | ||
136 | <cstring>Layout3</cstring> | ||
137 | </property> | ||
138 | <hbox> | ||
139 | <property stdset="1"> | 156 | <property stdset="1"> |
140 | <name>margin</name> | 157 | <name>name</name> |
141 | <number>0</number> | 158 | <cstring>txtTodo</cstring> |
142 | </property> | 159 | </property> |
160 | </widget> | ||
161 | <widget row="1" column="0" > | ||
162 | <class>QLayoutWidget</class> | ||
143 | <property stdset="1"> | 163 | <property stdset="1"> |
144 | <name>spacing</name> | 164 | <name>name</name> |
145 | <number>6</number> | 165 | <cstring>Layout4</cstring> |
146 | </property> | 166 | </property> |
147 | <widget> | 167 | <hbox> |
148 | <class>QLabel</class> | ||
149 | <property stdset="1"> | ||
150 | <name>name</name> | ||
151 | <cstring>TextLabel3</cstring> | ||
152 | </property> | ||
153 | <property stdset="1"> | ||
154 | <name>frameShape</name> | ||
155 | <enum>NoFrame</enum> | ||
156 | </property> | ||
157 | <property stdset="1"> | 168 | <property stdset="1"> |
158 | <name>text</name> | 169 | <name>margin</name> |
159 | <string>Category:</string> | 170 | <number>0</number> |
160 | </property> | 171 | </property> |
161 | </widget> | ||
162 | <widget> | ||
163 | <class>CategorySelect</class> | ||
164 | <property stdset="1"> | 172 | <property stdset="1"> |
165 | <name>name</name> | 173 | <name>spacing</name> |
166 | <cstring>comboCategory</cstring> | 174 | <number>6</number> |
167 | </property> | 175 | </property> |
168 | </widget> | 176 | <widget> |
169 | </hbox> | 177 | <class>QCheckBox</class> |
170 | </widget> | 178 | <property stdset="1"> |
171 | <widget> | 179 | <name>name</name> |
172 | <class>QLayoutWidget</class> | 180 | <cstring>checkCompleted</cstring> |
173 | <property stdset="1"> | 181 | </property> |
174 | <name>name</name> | 182 | <property stdset="1"> |
175 | <cstring>Layout4</cstring> | 183 | <name>text</name> |
176 | </property> | 184 | <string>&Completed</string> |
177 | <hbox> | 185 | </property> |
178 | <property stdset="1"> | 186 | </widget> |
179 | <name>margin</name> | 187 | <widget> |
180 | <number>0</number> | 188 | <class>QCheckBox</class> |
181 | </property> | 189 | <property stdset="1"> |
190 | <name>name</name> | ||
191 | <cstring>checkDate</cstring> | ||
192 | </property> | ||
193 | <property stdset="1"> | ||
194 | <name>text</name> | ||
195 | <string>D&ue</string> | ||
196 | </property> | ||
197 | </widget> | ||
198 | <widget> | ||
199 | <class>QPushButton</class> | ||
200 | <property stdset="1"> | ||
201 | <name>name</name> | ||
202 | <cstring>buttonDate</cstring> | ||
203 | </property> | ||
204 | <property stdset="1"> | ||
205 | <name>enabled</name> | ||
206 | <bool>false</bool> | ||
207 | </property> | ||
208 | <property stdset="1"> | ||
209 | <name>text</name> | ||
210 | <string>1 Jan 2001</string> | ||
211 | </property> | ||
212 | </widget> | ||
213 | </hbox> | ||
214 | </widget> | ||
215 | <widget row="0" column="0" > | ||
216 | <class>QLayoutWidget</class> | ||
182 | <property stdset="1"> | 217 | <property stdset="1"> |
183 | <name>spacing</name> | 218 | <name>name</name> |
184 | <number>6</number> | 219 | <cstring>Layout4</cstring> |
185 | </property> | 220 | </property> |
186 | <widget> | 221 | <hbox> |
187 | <class>QCheckBox</class> | ||
188 | <property stdset="1"> | ||
189 | <name>name</name> | ||
190 | <cstring>checkCompleted</cstring> | ||
191 | </property> | ||
192 | <property stdset="1"> | 222 | <property stdset="1"> |
193 | <name>text</name> | 223 | <name>margin</name> |
194 | <string>&Completed</string> | 224 | <number>0</number> |
195 | </property> | 225 | </property> |
196 | </widget> | ||
197 | <widget> | ||
198 | <class>QCheckBox</class> | ||
199 | <property stdset="1"> | 226 | <property stdset="1"> |
200 | <name>name</name> | 227 | <name>spacing</name> |
201 | <cstring>checkDate</cstring> | 228 | <number>6</number> |
202 | </property> | 229 | </property> |
203 | <property stdset="1"> | 230 | <widget> |
204 | <name>text</name> | 231 | <class>QLabel</class> |
205 | <string>D&ue</string> | 232 | <property stdset="1"> |
206 | </property> | 233 | <name>name</name> |
207 | </widget> | 234 | <cstring>TextLabel2</cstring> |
208 | <widget> | 235 | </property> |
209 | <class>QPushButton</class> | 236 | <property stdset="1"> |
210 | <property stdset="1"> | 237 | <name>text</name> |
211 | <name>name</name> | 238 | <string>Priority:</string> |
212 | <cstring>buttonDate</cstring> | 239 | </property> |
213 | </property> | 240 | </widget> |
214 | <property stdset="1"> | 241 | <widget> |
215 | <name>enabled</name> | 242 | <class>QComboBox</class> |
216 | <bool>false</bool> | 243 | <item> |
217 | </property> | 244 | <property> |
218 | <property stdset="1"> | 245 | <name>text</name> |
219 | <name>text</name> | 246 | <string>1 - Very High</string> |
220 | <string>1 Jan 2001</string> | 247 | </property> |
221 | </property> | 248 | </item> |
222 | </widget> | 249 | <item> |
223 | </hbox> | 250 | <property> |
224 | </widget> | 251 | <name>text</name> |
225 | <widget> | 252 | <string>2 - High</string> |
226 | <class>QMultiLineEdit</class> | 253 | </property> |
227 | <property stdset="1"> | 254 | </item> |
228 | <name>name</name> | 255 | <item> |
229 | <cstring>txtTodo</cstring> | 256 | <property> |
230 | </property> | 257 | <name>text</name> |
231 | </widget> | 258 | <string>3 - Normal</string> |
232 | </vbox> | 259 | </property> |
260 | </item> | ||
261 | <item> | ||
262 | <property> | ||
263 | <name>text</name> | ||
264 | <string>4 - Low</string> | ||
265 | </property> | ||
266 | </item> | ||
267 | <item> | ||
268 | <property> | ||
269 | <name>text</name> | ||
270 | <string>5 - Very Low</string> | ||
271 | </property> | ||
272 | </item> | ||
273 | <property stdset="1"> | ||
274 | <name>name</name> | ||
275 | <cstring>comboPriority</cstring> | ||
276 | </property> | ||
277 | <property stdset="1"> | ||
278 | <name>sizePolicy</name> | ||
279 | <sizepolicy> | ||
280 | <hsizetype>7</hsizetype> | ||
281 | <vsizetype>0</vsizetype> | ||
282 | </sizepolicy> | ||
283 | </property> | ||
284 | <property stdset="1"> | ||
285 | <name>currentItem</name> | ||
286 | <number>2</number> | ||
287 | </property> | ||
288 | </widget> | ||
289 | </hbox> | ||
290 | </widget> | ||
291 | </grid> | ||
292 | </widget> | ||
233 | </widget> | 293 | </widget> |
234 | <customwidgets> | 294 | <customwidgets> |
235 | <customwidget> | 295 | <customwidget> |
236 | <class>CategorySelect</class> | 296 | <class>CategorySelect</class> |
237 | <header location="global">qpe/categoryselect.h</header> | 297 | <header location="global">qpe/categoryselect.h</header> |
238 | <sizehint> | 298 | <sizehint> |
239 | <width>-1</width> | 299 | <width>-1</width> |
240 | <height>-1</height> | 300 | <height>-1</height> |
241 | </sizehint> | 301 | </sizehint> |
242 | <container>0</container> | 302 | <container>0</container> |
243 | <sizepolicy> | 303 | <sizepolicy> |
244 | <hordata>7</hordata> | 304 | <hordata>7</hordata> |
245 | <verdata>1</verdata> | 305 | <verdata>1</verdata> |
246 | </sizepolicy> | 306 | </sizepolicy> |
247 | <pixmap>image0</pixmap> | 307 | <pixmap>image0</pixmap> |
248 | </customwidget> | 308 | </customwidget> |
249 | </customwidgets> | 309 | </customwidgets> |
250 | <images> | 310 | <images> |
251 | <image> | 311 | <image> |
252 | <name>image0</name> | 312 | <name>image0</name> |
253 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> | 313 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> |
254 | </image> | 314 | </image> |
255 | </images> | 315 | </images> |
256 | <connections> | 316 | <connections> |
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp index 26a685c..dfaf9b4 100644 --- a/core/pim/todo/todoentryimpl.cpp +++ b/core/pim/todo/todoentryimpl.cpp | |||
@@ -1,26 +1,27 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** Copyright (C) 2002 zecke | ||
3 | ** | 4 | ** |
4 | ** This file is part of Qtopia Environment. | 5 | ** This file is part of Qtopia Environment. |
5 | ** | 6 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 10 | ** packaging of this file. |
10 | ** | 11 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 14 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 16 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 18 | ** not clear to you. |
18 | ** | 19 | ** |
19 | **********************************************************************/ | 20 | **********************************************************************/ |
20 | 21 | ||
21 | #include "todoentryimpl.h" | 22 | #include "todoentryimpl.h" |
22 | 23 | ||
23 | #include <opie/todoevent.h> | 24 | #include <opie/todoevent.h> |
24 | #include <opie/tododb.h> | 25 | #include <opie/tododb.h> |
25 | 26 | ||
26 | #include <qpe/categoryselect.h> | 27 | #include <qpe/categoryselect.h> |
@@ -40,48 +41,49 @@ | |||
40 | #include <qlabel.h> | 41 | #include <qlabel.h> |
41 | #include <qtimer.h> | 42 | #include <qtimer.h> |
42 | #include <qapplication.h> | 43 | #include <qapplication.h> |
43 | 44 | ||
44 | 45 | ||
45 | NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, | 46 | NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, |
46 | const char *name, bool modal, WFlags fl ) | 47 | const char *name, bool modal, WFlags fl ) |
47 | : NewTaskDialogBase( parent, name, modal, fl ), | 48 | : NewTaskDialogBase( parent, name, modal, fl ), |
48 | todo( task ) | 49 | todo( task ) |
49 | { | 50 | { |
50 | todo.setCategories( task.allCategories() ); | 51 | todo.setCategories( task.allCategories() ); |
51 | if ( todo.hasDate() ) | 52 | if ( todo.hasDate() ) |
52 | date = todo.date(); | 53 | date = todo.date(); |
53 | else | 54 | else |
54 | date = QDate::currentDate(); | 55 | date = QDate::currentDate(); |
55 | 56 | ||
56 | init(); | 57 | init(); |
57 | comboPriority->setCurrentItem( task.priority() - 1 ); | 58 | comboPriority->setCurrentItem( task.priority() - 1 ); |
58 | 59 | ||
59 | checkCompleted->setChecked( task.isCompleted() ); | 60 | checkCompleted->setChecked( task.isCompleted() ); |
60 | checkDate->setChecked( task.hasDate() ); | 61 | checkDate->setChecked( task.hasDate() ); |
61 | buttonDate->setText( TimeString::longDateString( date ) ); | 62 | buttonDate->setText( TimeString::longDateString( date ) ); |
62 | 63 | ||
63 | txtTodo->setText( task.description() ); | 64 | txtTodo->setText( task.description() ); |
65 | lneSum->setText( task.summary() ); | ||
64 | } | 66 | } |
65 | 67 | ||
66 | /* | 68 | /* |
67 | * Constructs a NewTaskDialog which is a child of 'parent', with the | 69 | * Constructs a NewTaskDialog which is a child of 'parent', with the |
68 | * name 'name' and widget flags set to 'f' | 70 | * name 'name' and widget flags set to 'f' |
69 | * | 71 | * |
70 | * The dialog will by default be modeless, unless you set 'modal' to | 72 | * The dialog will by default be modeless, unless you set 'modal' to |
71 | * TRUE to construct a modal dialog. | 73 | * TRUE to construct a modal dialog. |
72 | */ | 74 | */ |
73 | NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool modal, | 75 | NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool modal, |
74 | WFlags fl ) | 76 | WFlags fl ) |
75 | : NewTaskDialogBase( parent, name, modal, fl ), | 77 | : NewTaskDialogBase( parent, name, modal, fl ), |
76 | date( QDate::currentDate() ) | 78 | date( QDate::currentDate() ) |
77 | { | 79 | { |
78 | if ( id != -1 ) { | 80 | if ( id != -1 ) { |
79 | QArray<int> ids( 1 ); | 81 | QArray<int> ids( 1 ); |
80 | ids[0] = id; | 82 | ids[0] = id; |
81 | todo.setCategory( Qtopia::Record::idsToString( ids ) ); | 83 | todo.setCategory( Qtopia::Record::idsToString( ids ) ); |
82 | } | 84 | } |
83 | init(); | 85 | init(); |
84 | } | 86 | } |
85 | 87 | ||
86 | void NewTaskDialog::init() | 88 | void NewTaskDialog::init() |
87 | { | 89 | { |
@@ -109,45 +111,46 @@ void NewTaskDialog::dateChanged( int y, int m, int d ) | |||
109 | { | 111 | { |
110 | date = QDate( y, m, d ); | 112 | date = QDate( y, m, d ); |
111 | buttonDate->setText( TimeString::longDateString( date ) ); | 113 | buttonDate->setText( TimeString::longDateString( date ) ); |
112 | } | 114 | } |
113 | 115 | ||
114 | /*! | 116 | /*! |
115 | */ | 117 | */ |
116 | 118 | ||
117 | ToDoEvent NewTaskDialog::todoEntry() | 119 | ToDoEvent NewTaskDialog::todoEntry() |
118 | { | 120 | { |
119 | if( checkDate->isChecked() ){ | 121 | if( checkDate->isChecked() ){ |
120 | todo.setDate( date ); | 122 | todo.setDate( date ); |
121 | todo.setHasDate( true ); | 123 | todo.setHasDate( true ); |
122 | }else{ | 124 | }else{ |
123 | todo.setHasDate( false ); | 125 | todo.setHasDate( false ); |
124 | } | 126 | } |
125 | if ( comboCategory->currentCategory() != -1 ) { | 127 | if ( comboCategory->currentCategory() != -1 ) { |
126 | QArray<int> arr = comboCategory->currentCategories(); | 128 | QArray<int> arr = comboCategory->currentCategories(); |
127 | QStringList list; | 129 | QStringList list; |
128 | list = QStringList::split(";", Qtopia::Record::idsToString( arr )) ; | 130 | list = QStringList::split(";", Qtopia::Record::idsToString( arr )) ; |
129 | todo.setCategories( list ); | 131 | todo.setCategories( list ); |
130 | } | 132 | } |
131 | todo.setPriority( comboPriority->currentItem() + 1 ); | 133 | todo.setPriority( comboPriority->currentItem() + 1 ); |
132 | todo.setCompleted( checkCompleted->isChecked() ); | 134 | todo.setCompleted( checkCompleted->isChecked() ); |
133 | 135 | ||
134 | todo.setDescription( txtTodo->text() ); | 136 | todo.setDescription( txtTodo->text() ); |
135 | 137 | todo.setSummary( lneSum->text() ); | |
138 | |||
136 | return todo; | 139 | return todo; |
137 | } | 140 | } |
138 | 141 | ||
139 | 142 | ||
140 | /*! | 143 | /*! |
141 | 144 | ||
142 | */ | 145 | */ |
143 | 146 | ||
144 | void NewTaskDialog::accept() | 147 | void NewTaskDialog::accept() |
145 | { | 148 | { |
146 | QString strText = txtTodo->text(); | 149 | QString strText = txtTodo->text(); |
147 | if ( strText.isEmpty() ) { | 150 | if ( strText.isEmpty() ) { |
148 | // hmm... just decline it then, the user obviously didn't care about it | 151 | // hmm... just decline it then, the user obviously didn't care about it |
149 | QDialog::reject(); | 152 | QDialog::reject(); |
150 | return; | 153 | return; |
151 | } | 154 | } |
152 | QDialog::accept(); | 155 | QDialog::accept(); |
153 | } | 156 | } |
diff --git a/core/pim/todo/todotable.cpp b/core/pim/todo/todotable.cpp index 52a3087..779b28c 100644 --- a/core/pim/todo/todotable.cpp +++ b/core/pim/todo/todotable.cpp | |||
@@ -551,88 +551,92 @@ void TodoTable::slotCheckPriority(int row, int col ) | |||
551 | 551 | ||
552 | void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action ) | 552 | void TodoTable::updateJournal( const ToDoEvent &todo, journal_action action ) |
553 | { | 553 | { |
554 | QFile f( journalFileName() ); | 554 | QFile f( journalFileName() ); |
555 | if ( !f.open(IO_WriteOnly|IO_Append) ) | 555 | if ( !f.open(IO_WriteOnly|IO_Append) ) |
556 | return; | 556 | return; |
557 | QString buf; | 557 | QString buf; |
558 | QCString str; | 558 | QCString str; |
559 | buf = "<Task"; | 559 | buf = "<Task"; |
560 | // todo.save( buf ); | 560 | // todo.save( buf ); |
561 | buf += " Action=\"" + QString::number( int(action) ) + "\""; | 561 | buf += " Action=\"" + QString::number( int(action) ) + "\""; |
562 | buf += " Uid=\"" + QString::number( todo.uid() ) + "\""; // better write the id | 562 | buf += " Uid=\"" + QString::number( todo.uid() ) + "\""; // better write the id |
563 | buf += " Completed=\""+ QString::number((int)todo.isCompleted() ) + "\""; | 563 | buf += " Completed=\""+ QString::number((int)todo.isCompleted() ) + "\""; |
564 | buf += " HasDate=\""+ QString::number((int)todo.hasDate() ) +"\""; | 564 | buf += " HasDate=\""+ QString::number((int)todo.hasDate() ) +"\""; |
565 | buf += " Priority=\"" + QString::number( todo.priority() ) + "\""; | 565 | buf += " Priority=\"" + QString::number( todo.priority() ) + "\""; |
566 | QArray<int> arrat = todo.categories(); | 566 | QArray<int> arrat = todo.categories(); |
567 | QString attr; | 567 | QString attr; |
568 | for(uint i=0; i < arrat.count(); i++ ){ | 568 | for(uint i=0; i < arrat.count(); i++ ){ |
569 | attr.append(QString::number(arrat[i])+";" ); | 569 | attr.append(QString::number(arrat[i])+";" ); |
570 | } | 570 | } |
571 | if(!attr.isEmpty() ) // remove the last ; | 571 | if(!attr.isEmpty() ) // remove the last ; |
572 | attr.remove(attr.length()-1, 1 ); | 572 | attr.remove(attr.length()-1, 1 ); |
573 | buf += " Categories=\"" + attr + "\""; | 573 | buf += " Categories=\"" + attr + "\""; |
574 | buf += " Description=\"" + todo.description() + "\""; | 574 | buf += " Description=\"" + todo.description() + "\""; |
575 | buf += " Summary=\"" + todo.summary() + "\""; | ||
575 | if(todo.hasDate() ) { | 576 | if(todo.hasDate() ) { |
576 | buf += " DateYear=\""+QString::number( todo.date().year() ) + "\""; | 577 | buf += " DateYear=\""+QString::number( todo.date().year() ) + "\""; |
577 | buf += " DateMonth=\"" + QString::number( todo.date().month() ) + "\""; | 578 | buf += " DateMonth=\"" + QString::number( todo.date().month() ) + "\""; |
578 | buf += " DateDay=\"" + QString::number( todo.date().day() ) + "\""; | 579 | buf += " DateDay=\"" + QString::number( todo.date().day() ) + "\""; |
579 | } | 580 | } |
580 | buf += "/>\n"; | 581 | buf += "/>\n"; |
581 | str = buf.utf8(); | 582 | str = buf.utf8(); |
582 | f.writeBlock( str.data(), str.length() ); | 583 | f.writeBlock( str.data(), str.length() ); |
583 | f.close(); | 584 | f.close(); |
584 | } | 585 | } |
585 | 586 | ||
586 | void TodoTable::rowHeightChanged( int row ) | 587 | void TodoTable::rowHeightChanged( int row ) |
587 | { | 588 | { |
588 | if ( enablePainting ) | 589 | if ( enablePainting ) |
589 | QTable::rowHeightChanged( row ); | 590 | QTable::rowHeightChanged( row ); |
590 | } | 591 | } |
591 | 592 | ||
592 | void TodoTable::loadFile( const QString &/*we use the standard*/ ) | 593 | void TodoTable::loadFile( const QString &/*we use the standard*/ ) |
593 | { | 594 | { |
594 | 595 | ||
595 | QList<ToDoEvent> list; | 596 | QList<ToDoEvent> list; |
596 | ToDoDB todoDB; | 597 | ToDoDB todoDB; |
597 | QValueList<ToDoEvent> vaList = todoDB.rawToDos(); | 598 | QValueList<ToDoEvent> vaList = todoDB.rawToDos(); |
598 | for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){ | 599 | for(QValueList<ToDoEvent>::ConstIterator it = vaList.begin(); it != vaList.end(); ++it ){ |
599 | ToDoEvent *event = new ToDoEvent( (*it) ); | 600 | ToDoEvent *event = new ToDoEvent( (*it) ); |
600 | list.append( event ); | 601 | list.append( event ); |
601 | } | 602 | } |
602 | vaList.clear(); | 603 | vaList.clear(); |
603 | // qDebug("parsing done=%d", t.elapsed() ); | 604 | // qDebug("parsing done=%d", t.elapsed() ); |
604 | if ( list.count() > 0 ) { | 605 | if ( list.count() > 0 ) { |
605 | internalAddEntries( list ); | 606 | internalAddEntries( list ); |
606 | list.clear(); | 607 | list.clear(); |
607 | } | 608 | } |
608 | // qDebug("loading done: t=%d", t.elapsed() ); | 609 | // qDebug("loading done: t=%d", t.elapsed() ); |
609 | } | 610 | } |
610 | 611 | ||
611 | void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) | 612 | void TodoTable::journalFreeReplaceEntry( const ToDoEvent &todo, int row ) |
612 | { | 613 | { |
613 | QString strTodo; | 614 | QString strTodo = todo.summary(); |
614 | strTodo = todo.description().left(40).simplifyWhiteSpace(); | 615 | if( strTodo.isEmpty() ){ |
616 | strTodo = todo.description().left(40).simplifyWhiteSpace(); | ||
617 | //todo.setSummary(strTodo ); | ||
618 | } | ||
615 | if ( row == -1 ) { | 619 | if ( row == -1 ) { |
616 | QMapIterator<CheckItem*, ToDoEvent *> it; | 620 | QMapIterator<CheckItem*, ToDoEvent *> it; |
617 | for ( it = todoList.begin(); it != todoList.end(); ++it ) { | 621 | for ( it = todoList.begin(); it != todoList.end(); ++it ) { |
618 | if ( *(*it) == todo ) { | 622 | if ( *(*it) == todo ) { |
619 | row = it.key()->row(); | 623 | row = it.key()->row(); |
620 | it.key()->setChecked( todo.isCompleted() ); | 624 | it.key()->setChecked( todo.isCompleted() ); |
621 | static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); | 625 | static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); |
622 | item( row, 2 )->setText( strTodo ); | 626 | item( row, 2 )->setText( strTodo ); |
623 | 627 | ||
624 | if (showDeadl){ | 628 | if (showDeadl){ |
625 | static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo ); | 629 | static_cast<DueTextItem*>(item(row,3))->setToDoEvent(&todo ); |
626 | } | 630 | } |
627 | 631 | ||
628 | *(*it) = todo; | 632 | *(*it) = todo; |
629 | } | 633 | } |
630 | } | 634 | } |
631 | } else { | 635 | } else { |
632 | ToDoEvent *t = todoList[static_cast<CheckItem*>(item(row, 0))]; | 636 | ToDoEvent *t = todoList[static_cast<CheckItem*>(item(row, 0))]; |
633 | todoList.remove( static_cast<CheckItem*>(item(row, 0)) ); | 637 | todoList.remove( static_cast<CheckItem*>(item(row, 0)) ); |
634 | delete t; | 638 | delete t; |
635 | static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() ); | 639 | static_cast<CheckItem*>(item(row, 0))->setChecked( todo.isCompleted() ); |
636 | static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); | 640 | static_cast<ComboItem*>(item(row, 1))->setText( QString::number(todo.priority()) ); |
637 | item( row, 2 )->setText( strTodo ); | 641 | item( row, 2 )->setText( strTodo ); |
638 | 642 | ||
@@ -887,48 +891,51 @@ static ToDoEvent xmlToEvent( XMLElement *element ) | |||
887 | int year, day, month = 0; | 891 | int year, day, month = 0; |
888 | year = day = month; | 892 | year = day = month; |
889 | // year | 893 | // year |
890 | dummy = element->attribute("DateYear" ); | 894 | dummy = element->attribute("DateYear" ); |
891 | dumInt = dummy.toInt(&ok ); | 895 | dumInt = dummy.toInt(&ok ); |
892 | if( ok ) year = dumInt; | 896 | if( ok ) year = dumInt; |
893 | // month | 897 | // month |
894 | dummy = element->attribute("DateMonth" ); | 898 | dummy = element->attribute("DateMonth" ); |
895 | dumInt = dummy.toInt(&ok ); | 899 | dumInt = dummy.toInt(&ok ); |
896 | if(ok ) month = dumInt; | 900 | if(ok ) month = dumInt; |
897 | dummy = element->attribute("DateDay" ); | 901 | dummy = element->attribute("DateDay" ); |
898 | dumInt = dummy.toInt(&ok ); | 902 | dumInt = dummy.toInt(&ok ); |
899 | if(ok ) day = dumInt; | 903 | if(ok ) day = dumInt; |
900 | // set the date | 904 | // set the date |
901 | QDate date( year, month, day ); | 905 | QDate date( year, month, day ); |
902 | event.setDate( date); | 906 | event.setDate( date); |
903 | } | 907 | } |
904 | dummy = element->attribute("Priority" ); | 908 | dummy = element->attribute("Priority" ); |
905 | dumInt = dummy.toInt(&ok ); | 909 | dumInt = dummy.toInt(&ok ); |
906 | if(!ok ) dumInt = ToDoEvent::NORMAL; | 910 | if(!ok ) dumInt = ToDoEvent::NORMAL; |
907 | event.setPriority( dumInt ); | 911 | event.setPriority( dumInt ); |
908 | //description | 912 | //description |
909 | dummy = element->attribute("Description" ); | 913 | dummy = element->attribute("Description" ); |
910 | event.setDescription( dummy ); | 914 | event.setDescription( dummy ); |
915 | // summary | ||
916 | dummy = element->attribute("Summary" ); | ||
917 | event.setSummary( dummy ); | ||
911 | // category | 918 | // category |
912 | dummy = element->attribute("Categories" ); | 919 | dummy = element->attribute("Categories" ); |
913 | QStringList ids = QStringList::split(";", dummy ); | 920 | QStringList ids = QStringList::split(";", dummy ); |
914 | event.setCategories( ids ); | 921 | event.setCategories( ids ); |
915 | 922 | ||
916 | //uid | 923 | //uid |
917 | dummy = element->attribute("Uid" ); | 924 | dummy = element->attribute("Uid" ); |
918 | dumInt = dummy.toInt(&ok ); | 925 | dumInt = dummy.toInt(&ok ); |
919 | if(ok ) event.setUid( dumInt ); | 926 | if(ok ) event.setUid( dumInt ); |
920 | return event; | 927 | return event; |
921 | } | 928 | } |
922 | 929 | ||
923 | } | 930 | } |
924 | // int TodoTable::rowHeight( int ) const | 931 | // int TodoTable::rowHeight( int ) const |
925 | // { | 932 | // { |
926 | // return 18; | 933 | // return 18; |
927 | // } | 934 | // } |
928 | 935 | ||
929 | // int TodoTable::rowPos( int row ) const | 936 | // int TodoTable::rowPos( int row ) const |
930 | // { | 937 | // { |
931 | // return 18*row; | 938 | // return 18*row; |
932 | // } | 939 | // } |
933 | 940 | ||
934 | // int TodoTable::rowAt( int pos ) const | 941 | // int TodoTable::rowAt( int pos ) const |
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h index 7672f21..39e00d1 100644 --- a/core/pim/todo/todotable.h +++ b/core/pim/todo/todotable.h | |||
@@ -178,49 +178,50 @@ private: | |||
178 | 178 | ||
179 | QMap<CheckItem*, ToDoEvent *> todoList; | 179 | QMap<CheckItem*, ToDoEvent *> todoList; |
180 | QStringList categoryList; | 180 | QStringList categoryList; |
181 | bool showComp; | 181 | bool showComp; |
182 | QString showCat; | 182 | QString showCat; |
183 | QTimer *menuTimer; | 183 | QTimer *menuTimer; |
184 | QDate mDay; | 184 | QDate mDay; |
185 | QTimer *mDayTimer; // see if the day changed | 185 | QTimer *mDayTimer; // see if the day changed |
186 | bool enablePainting; | 186 | bool enablePainting; |
187 | Categories mCat; | 187 | Categories mCat; |
188 | int currFindRow; | 188 | int currFindRow; |
189 | bool showDeadl:1; | 189 | bool showDeadl:1; |
190 | }; | 190 | }; |
191 | 191 | ||
192 | 192 | ||
193 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) | 193 | inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) |
194 | { | 194 | { |
195 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') | 195 | QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') |
196 | + todo->priority() ) | 196 | + todo->priority() ) |
197 | + Qtopia::buildSortKey( todo->description() ); | 197 | + Qtopia::buildSortKey( todo->description() ); |
198 | CheckItem *chk = new CheckItem( this, sortKey ); | 198 | CheckItem *chk = new CheckItem( this, sortKey ); |
199 | chk->setChecked( todo->isCompleted() ); | 199 | chk->setChecked( todo->isCompleted() ); |
200 | ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); | 200 | ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); |
201 | cmb->setText( QString::number( todo->priority() ) ); | 201 | cmb->setText( QString::number( todo->priority() ) ); |
202 | QTableItem *ti = new TodoTextItem( this, todo->description().left(40).simplifyWhiteSpace() ); | 202 | QString sum = todo->summary(); |
203 | QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum ); | ||
203 | ti->setReplaceable( false ); | 204 | ti->setReplaceable( false ); |
204 | 205 | ||
205 | DueTextItem *due = new DueTextItem(this, todo ); | 206 | DueTextItem *due = new DueTextItem(this, todo ); |
206 | setItem( row, 3, due); | 207 | setItem( row, 3, due); |
207 | 208 | ||
208 | setItem( row, 0, chk ); | 209 | setItem( row, 0, chk ); |
209 | setItem( row, 1, cmb ); | 210 | setItem( row, 1, cmb ); |
210 | setItem( row, 2, ti ); | 211 | setItem( row, 2, ti ); |
211 | 212 | ||
212 | 213 | ||
213 | todoList.insert( chk, todo ); | 214 | todoList.insert( chk, todo ); |
214 | } | 215 | } |
215 | 216 | ||
216 | inline void TodoTable::realignTable( int row ) | 217 | inline void TodoTable::realignTable( int row ) |
217 | { | 218 | { |
218 | QTableItem *ti1, | 219 | QTableItem *ti1, |
219 | *ti2, | 220 | *ti2, |
220 | *ti3, | 221 | *ti3, |
221 | *ti4; | 222 | *ti4; |
222 | int totalRows = numRows(); | 223 | int totalRows = numRows(); |
223 | for ( int curr = row; curr < totalRows - 1; curr++ ) { | 224 | for ( int curr = row; curr < totalRows - 1; curr++ ) { |
224 | // this is bad, we must take the item out and then | 225 | // this is bad, we must take the item out and then |
225 | // set it. In the end, it behaves no worse (time wise) | 226 | // set it. In the end, it behaves no worse (time wise) |
226 | // then the old way of saving the entries to file, clearing | 227 | // then the old way of saving the entries to file, clearing |
diff --git a/libopie/tododb.cpp b/libopie/tododb.cpp index fe8b8bf..6b10ec2 100644 --- a/libopie/tododb.cpp +++ b/libopie/tododb.cpp | |||
@@ -1,49 +1,51 @@ | |||
1 | 1 | ||
2 | #include <qdir.h> | 2 | #include <qdir.h> |
3 | #include <opie/tododb.h> | 3 | #include <opie/tododb.h> |
4 | #include <opie/xmltree.h> | 4 | #include <opie/xmltree.h> |
5 | #include <opie/todoresource.h> | 5 | #include <opie/todoresource.h> |
6 | #include <qpe/palmtoprecord.h> | 6 | #include <qpe/palmtoprecord.h> |
7 | #include <qpe/global.h> | 7 | #include <qpe/global.h> |
8 | 8 | ||
9 | using namespace Opie; | 9 | using namespace Opie; |
10 | 10 | ||
11 | namespace { | 11 | namespace { |
12 | 12 | ||
13 | class FileToDoResource : public ToDoResource { | 13 | class FileToDoResource : public ToDoResource { |
14 | public: | 14 | public: |
15 | FileToDoResource() {}; | 15 | FileToDoResource() {}; |
16 | // FIXME better parsing | ||
16 | bool save(const QString &name, const QValueList<ToDoEvent> &m_todos ){ | 17 | bool save(const QString &name, const QValueList<ToDoEvent> &m_todos ){ |
17 | // prepare the XML | 18 | // prepare the XML |
18 | XMLElement *tasks = new XMLElement( ); | 19 | XMLElement *tasks = new XMLElement( ); |
19 | tasks->setTagName("Tasks" ); | 20 | tasks->setTagName("Tasks" ); |
20 | for( QValueList<ToDoEvent>::ConstIterator it = m_todos.begin(); it != m_todos.end(); ++it ){ | 21 | for( QValueList<ToDoEvent>::ConstIterator it = m_todos.begin(); it != m_todos.end(); ++it ){ |
21 | XMLElement::AttributeMap map; | 22 | XMLElement::AttributeMap map; |
22 | XMLElement *task = new XMLElement(); | 23 | XMLElement *task = new XMLElement(); |
23 | map.insert( "Completed", QString::number((int)(*it).isCompleted() ) ); | 24 | map.insert( "Completed", QString::number((int)(*it).isCompleted() ) ); |
24 | map.insert( "HasDate", QString::number((int)(*it).hasDate() ) ); | 25 | map.insert( "HasDate", QString::number((int)(*it).hasDate() ) ); |
25 | map.insert( "Priority", QString::number( (*it).priority() ) ); | 26 | map.insert( "Priority", QString::number( (*it).priority() ) ); |
27 | map.insert( "Summary", (*it).summary() ); | ||
26 | QArray<int> arrat = (*it).categories(); | 28 | QArray<int> arrat = (*it).categories(); |
27 | QString attr; | 29 | QString attr; |
28 | for(uint i=0; i < arrat.count(); i++ ){ | 30 | for(uint i=0; i < arrat.count(); i++ ){ |
29 | attr.append(QString::number(arrat[i])+";" ); | 31 | attr.append(QString::number(arrat[i])+";" ); |
30 | } | 32 | } |
31 | if(!attr.isEmpty() ) // remove the last ; | 33 | if(!attr.isEmpty() ) // remove the last ; |
32 | attr.remove(attr.length()-1, 1 ); | 34 | attr.remove(attr.length()-1, 1 ); |
33 | map.insert( "Categories", attr ); | 35 | map.insert( "Categories", attr ); |
34 | //else | 36 | //else |
35 | //map.insert( "Categories", QString::null ); | 37 | //map.insert( "Categories", QString::null ); |
36 | map.insert( "Description", (*it).description() ); | 38 | map.insert( "Description", (*it).description() ); |
37 | if( (*it).hasDate() ){ | 39 | if( (*it).hasDate() ){ |
38 | map.insert("DateYear", QString::number( (*it).date().year() ) ); | 40 | map.insert("DateYear", QString::number( (*it).date().year() ) ); |
39 | map.insert("DateMonth", QString::number( (*it).date().month() ) ); | 41 | map.insert("DateMonth", QString::number( (*it).date().month() ) ); |
40 | map.insert("DateDay", QString::number( (*it).date().day() ) ); | 42 | map.insert("DateDay", QString::number( (*it).date().day() ) ); |
41 | } | 43 | } |
42 | map.insert("Uid", QString::number( (*it).uid() ) ); | 44 | map.insert("Uid", QString::number( (*it).uid() ) ); |
43 | task->setTagName("Task" ); | 45 | task->setTagName("Task" ); |
44 | task->setAttributes( map ); | 46 | task->setAttributes( map ); |
45 | tasks->appendChild(task); | 47 | tasks->appendChild(task); |
46 | } | 48 | } |
47 | QFile file( name); | 49 | QFile file( name); |
48 | if( file.open(IO_WriteOnly ) ){ | 50 | if( file.open(IO_WriteOnly ) ){ |
49 | QTextStream stream(&file ); | 51 | QTextStream stream(&file ); |
@@ -90,53 +92,55 @@ public: | |||
90 | int year, day, month = 0; | 92 | int year, day, month = 0; |
91 | year = day = month; | 93 | year = day = month; |
92 | // year | 94 | // year |
93 | dummy = element->attribute("DateYear" ); | 95 | dummy = element->attribute("DateYear" ); |
94 | dumInt = dummy.toInt(&ok ); | 96 | dumInt = dummy.toInt(&ok ); |
95 | if( ok ) year = dumInt; | 97 | if( ok ) year = dumInt; |
96 | // month | 98 | // month |
97 | dummy = element->attribute("DateMonth" ); | 99 | dummy = element->attribute("DateMonth" ); |
98 | dumInt = dummy.toInt(&ok ); | 100 | dumInt = dummy.toInt(&ok ); |
99 | if(ok ) month = dumInt; | 101 | if(ok ) month = dumInt; |
100 | dummy = element->attribute("DateDay" ); | 102 | dummy = element->attribute("DateDay" ); |
101 | dumInt = dummy.toInt(&ok ); | 103 | dumInt = dummy.toInt(&ok ); |
102 | if(ok ) day = dumInt; | 104 | if(ok ) day = dumInt; |
103 | // set the date | 105 | // set the date |
104 | QDate date( year, month, day ); | 106 | QDate date( year, month, day ); |
105 | event.setDate( date); | 107 | event.setDate( date); |
106 | } | 108 | } |
107 | dummy = element->attribute("Priority" ); | 109 | dummy = element->attribute("Priority" ); |
108 | dumInt = dummy.toInt(&ok ); | 110 | dumInt = dummy.toInt(&ok ); |
109 | if(!ok ) dumInt = ToDoEvent::NORMAL; | 111 | if(!ok ) dumInt = ToDoEvent::NORMAL; |
110 | event.setPriority( dumInt ); | 112 | event.setPriority( dumInt ); |
111 | //description | 113 | //description |
112 | dummy = element->attribute("Description" ); | 114 | dummy = element->attribute("Description" ); |
113 | event.setDescription( dummy ); | 115 | event.setDescription( dummy ); |
116 | dummy = element->attribute("Summary" ); | ||
117 | event.setSummary( dummy ); | ||
114 | // category | 118 | // category |
115 | dummy = element->attribute("Categories" ); | 119 | dummy = element->attribute("Categories" ); |
116 | QStringList ids = QStringList::split(";", dummy ); | 120 | QStringList ids = QStringList::split(";", dummy ); |
117 | event.setCategories( ids ); | 121 | event.setCategories( ids ); |
118 | 122 | ||
119 | //uid | 123 | //uid |
120 | dummy = element->attribute("Uid" ); | 124 | dummy = element->attribute("Uid" ); |
121 | dumInt = dummy.toInt(&ok ); | 125 | dumInt = dummy.toInt(&ok ); |
122 | if(ok ) event.setUid( dumInt ); | 126 | if(ok ) event.setUid( dumInt ); |
123 | m_todos.append( event ); | 127 | m_todos.append( event ); |
124 | element = element->nextChild(); // next element | 128 | element = element->nextChild(); // next element |
125 | } | 129 | } |
126 | //} | 130 | //} |
127 | }else { | 131 | }else { |
128 | qWarning("could not load" ); | 132 | qWarning("could not load" ); |
129 | } | 133 | } |
130 | delete root; | 134 | delete root; |
131 | qWarning("returning" ); | 135 | qWarning("returning" ); |
132 | return m_todos; | 136 | return m_todos; |
133 | } | 137 | } |
134 | }; | 138 | }; |
135 | 139 | ||
136 | } | 140 | } |
137 | 141 | ||
138 | ToDoDB::ToDoDB(const QString &fileName, ToDoResource *res ){ | 142 | ToDoDB::ToDoDB(const QString &fileName, ToDoResource *res ){ |
139 | m_fileName = fileName; | 143 | m_fileName = fileName; |
140 | if( fileName.isEmpty() && res == 0 ){ | 144 | if( fileName.isEmpty() && res == 0 ){ |
141 | m_fileName = Global::applicationFileName("todolist","todolist.xml"); | 145 | m_fileName = Global::applicationFileName("todolist","todolist.xml"); |
142 | res = new FileToDoResource(); | 146 | res = new FileToDoResource(); |
@@ -160,49 +164,49 @@ ToDoDB::~ToDoDB() | |||
160 | delete m_res; | 164 | delete m_res; |
161 | } | 165 | } |
162 | QValueList<ToDoEvent> ToDoDB::effectiveToDos(const QDate &from, const QDate &to, | 166 | QValueList<ToDoEvent> ToDoDB::effectiveToDos(const QDate &from, const QDate &to, |
163 | bool all ) | 167 | bool all ) |
164 | { | 168 | { |
165 | QValueList<ToDoEvent> events; | 169 | QValueList<ToDoEvent> events; |
166 | for( QValueList<ToDoEvent>::Iterator it = m_todos.begin(); it!= m_todos.end(); ++it ){ | 170 | for( QValueList<ToDoEvent>::Iterator it = m_todos.begin(); it!= m_todos.end(); ++it ){ |
167 | if( (*it).hasDate() ){ | 171 | if( (*it).hasDate() ){ |
168 | if( (*it).date() >= from && (*it).date() <= to ) | 172 | if( (*it).date() >= from && (*it).date() <= to ) |
169 | events.append( (*it) ); | 173 | events.append( (*it) ); |
170 | }else if( all ){ | 174 | }else if( all ){ |
171 | events.append( (*it) ); | 175 | events.append( (*it) ); |
172 | } | 176 | } |
173 | } | 177 | } |
174 | return events; | 178 | return events; |
175 | } | 179 | } |
176 | QValueList<ToDoEvent> ToDoDB::effectiveToDos(const QDate &from, | 180 | QValueList<ToDoEvent> ToDoDB::effectiveToDos(const QDate &from, |
177 | bool all) | 181 | bool all) |
178 | { | 182 | { |
179 | return effectiveToDos( from, QDate::currentDate(), all ); | 183 | return effectiveToDos( from, QDate::currentDate(), all ); |
180 | } | 184 | } |
181 | QValueList<ToDoEvent> ToDoDB::overDue() | 185 | QValueList<ToDoEvent> ToDoDB::overDue() |
182 | { | 186 | { |
183 | QValueList<ToDoEvent> events; | 187 | QValueList<ToDoEvent> events; |
184 | for( QValueList<ToDoEvent>::Iterator it = m_todos.begin(); it!= m_todos.end(); ++it ){ | 188 | for( QValueList<ToDoEvent>::Iterator it = m_todos.begin(); it!= m_todos.end(); ++it ){ |
185 | if( (*it).isOverdue() ) | 189 | if( (*it).isOverdue() ) |
186 | events.append((*it) ); | 190 | events.append((*it) ); |
187 | } | 191 | } |
188 | return events; | 192 | return events; |
189 | } | 193 | } |
190 | QValueList<ToDoEvent> ToDoDB::rawToDos() | 194 | QValueList<ToDoEvent> ToDoDB::rawToDos() |
191 | { | 195 | { |
192 | return m_todos; | 196 | return m_todos; |
193 | } | 197 | } |
194 | void ToDoDB::addEvent( const ToDoEvent &event ) | 198 | void ToDoDB::addEvent( const ToDoEvent &event ) |
195 | { | 199 | { |
196 | m_todos.append( event ); | 200 | m_todos.append( event ); |
197 | } | 201 | } |
198 | void ToDoDB::editEvent( const ToDoEvent &event ) | 202 | void ToDoDB::editEvent( const ToDoEvent &event ) |
199 | { | 203 | { |
200 | m_todos.remove( event ); | 204 | m_todos.remove( event ); |
201 | m_todos.append( event ); | 205 | m_todos.append( event ); |
202 | } | 206 | } |
203 | void ToDoDB::removeEvent( const ToDoEvent &event ) | 207 | void ToDoDB::removeEvent( const ToDoEvent &event ) |
204 | { | 208 | { |
205 | m_todos.remove( event ); | 209 | m_todos.remove( event ); |
206 | } | 210 | } |
207 | void ToDoDB::replaceEvent(const ToDoEvent &event ) | 211 | void ToDoDB::replaceEvent(const ToDoEvent &event ) |
208 | { | 212 | { |
@@ -217,38 +221,38 @@ void ToDoDB::replaceEvent(const ToDoEvent &event ) | |||
217 | } | 221 | } |
218 | m_todos.append(event); | 222 | m_todos.append(event); |
219 | } | 223 | } |
220 | void ToDoDB::reload() | 224 | void ToDoDB::reload() |
221 | { | 225 | { |
222 | load(); | 226 | load(); |
223 | } | 227 | } |
224 | void ToDoDB::mergeWith(const QValueList<ToDoEvent>& events ) | 228 | void ToDoDB::mergeWith(const QValueList<ToDoEvent>& events ) |
225 | { | 229 | { |
226 | QValueList<ToDoEvent>::ConstIterator it; | 230 | QValueList<ToDoEvent>::ConstIterator it; |
227 | for( it = events.begin(); it != events.end(); ++it ){ | 231 | for( it = events.begin(); it != events.end(); ++it ){ |
228 | replaceEvent( (*it) ); | 232 | replaceEvent( (*it) ); |
229 | } | 233 | } |
230 | } | 234 | } |
231 | void ToDoDB::setFileName(const QString &file ) | 235 | void ToDoDB::setFileName(const QString &file ) |
232 | { | 236 | { |
233 | m_fileName =file; | 237 | m_fileName =file; |
234 | } | 238 | } |
235 | QString ToDoDB::fileName()const | 239 | QString ToDoDB::fileName()const |
236 | { | 240 | { |
237 | return m_fileName; | 241 | return m_fileName; |
238 | } | 242 | } |
239 | void ToDoDB::load() | 243 | void ToDoDB::load() |
240 | { | 244 | { |
241 | m_todos = m_res->load( m_fileName ); | 245 | m_todos = m_res->load( m_fileName ); |
242 | } | 246 | } |
243 | bool ToDoDB::save() | 247 | bool ToDoDB::save() |
244 | { | 248 | { |
245 | return m_res->save( m_fileName, m_todos ); | 249 | return m_res->save( m_fileName, m_todos ); |
246 | } | 250 | } |
247 | 251 | ||
248 | 252 | ||
249 | 253 | ||
250 | 254 | ||
251 | 255 | ||
252 | 256 | ||
253 | 257 | ||
254 | 258 | ||
diff --git a/libopie/todoevent.cpp b/libopie/todoevent.cpp index aa348a2..fb7073c 100644 --- a/libopie/todoevent.cpp +++ b/libopie/todoevent.cpp | |||
@@ -1,176 +1,198 @@ | |||
1 | 1 | ||
2 | #include <opie/todoevent.h> | 2 | #include <opie/todoevent.h> |
3 | 3 | ||
4 | 4 | ||
5 | #include <qpe/palmtopuidgen.h> | 5 | #include <qpe/palmtopuidgen.h> |
6 | #include <qpe/stringutil.h> | 6 | #include <qpe/stringutil.h> |
7 | #include <qpe/palmtoprecord.h> | 7 | #include <qpe/palmtoprecord.h> |
8 | 8 | ||
9 | #include <qpe/stringutil.h> | 9 | #include <qpe/stringutil.h> |
10 | #include <qpe/categories.h> | 10 | #include <qpe/categories.h> |
11 | #include <qpe/categoryselect.h> | 11 | #include <qpe/categoryselect.h> |
12 | 12 | ||
13 | #include <qobject.h> | 13 | #include <qobject.h> |
14 | 14 | ||
15 | ToDoEvent::ToDoEvent(const ToDoEvent &event ) | 15 | ToDoEvent::ToDoEvent(const ToDoEvent &event ) |
16 | { | 16 | { |
17 | *this = event; | 17 | *this = event; |
18 | } | 18 | } |
19 | 19 | ||
20 | ToDoEvent::ToDoEvent(bool completed, int priority, const QStringList &category, | 20 | ToDoEvent::ToDoEvent(bool completed, int priority, |
21 | const QString &description, bool hasDate, QDate date, int uid ) | 21 | const QStringList &category, |
22 | const QString& summary, | ||
23 | const QString &description, | ||
24 | bool hasDate, QDate date, int uid ) | ||
22 | { | 25 | { |
23 | m_date = date; | 26 | m_date = date; |
24 | m_isCompleted = completed; | 27 | m_isCompleted = completed; |
25 | m_hasDate = hasDate; | 28 | m_hasDate = hasDate; |
26 | m_priority = priority; | 29 | m_priority = priority; |
27 | m_category = category; | 30 | m_category = category; |
31 | m_sum = summary; | ||
28 | m_desc = Qtopia::simplifyMultiLineSpace(description ); | 32 | m_desc = Qtopia::simplifyMultiLineSpace(description ); |
29 | if (uid == -1 ) { | 33 | if (uid == -1 ) { |
30 | Qtopia::UidGen *uidgen = new Qtopia::UidGen(); | 34 | Qtopia::UidGen *uidgen = new Qtopia::UidGen(); |
31 | uid = uidgen->generate(); | 35 | uid = uidgen->generate(); |
32 | delete uidgen; | 36 | delete uidgen; |
33 | }// generate the ids | 37 | }// generate the ids |
34 | m_uid = uid; | 38 | m_uid = uid; |
35 | } | 39 | } |
36 | QArray<int> ToDoEvent::categories()const | 40 | QArray<int> ToDoEvent::categories()const |
37 | { | 41 | { |
38 | QArray<int> array(m_category.count() ); // currently the datebook can be only in one category | 42 | QArray<int> array(m_category.count() ); // currently the datebook can be only in one category |
39 | array = Qtopia::Record::idsFromString( m_category.join(";") ); | 43 | array = Qtopia::Record::idsFromString( m_category.join(";") ); |
40 | return array; | 44 | return array; |
41 | } | 45 | } |
42 | bool ToDoEvent::match( const QRegExp ®Exp )const | 46 | bool ToDoEvent::match( const QRegExp ®Exp )const |
43 | { | 47 | { |
44 | if( QString::number( m_priority ).find( regExp ) != -1 ){ | 48 | if( QString::number( m_priority ).find( regExp ) != -1 ){ |
45 | return true; | 49 | return true; |
46 | }else if( m_hasDate && m_date.toString().find( regExp) != -1 ){ | 50 | }else if( m_hasDate && m_date.toString().find( regExp) != -1 ){ |
47 | return true; | 51 | return true; |
48 | }else if(m_desc.find( regExp ) != -1 ){ | 52 | }else if(m_desc.find( regExp ) != -1 ){ |
49 | return true; | 53 | return true; |
50 | } | 54 | } |
51 | return false; | 55 | return false; |
52 | } | 56 | } |
53 | bool ToDoEvent::isCompleted() const | 57 | bool ToDoEvent::isCompleted() const |
54 | { | 58 | { |
55 | return m_isCompleted; | 59 | return m_isCompleted; |
56 | } | 60 | } |
57 | bool ToDoEvent::hasDate() const | 61 | bool ToDoEvent::hasDate() const |
58 | { | 62 | { |
59 | return m_hasDate; | 63 | return m_hasDate; |
60 | } | 64 | } |
61 | int ToDoEvent::priority()const | 65 | int ToDoEvent::priority()const |
62 | { | 66 | { |
63 | return m_priority; | 67 | return m_priority; |
64 | } | 68 | } |
65 | QStringList ToDoEvent::allCategories()const | 69 | QStringList ToDoEvent::allCategories()const |
66 | { | 70 | { |
67 | return m_category; | 71 | return m_category; |
68 | } | 72 | } |
73 | QString ToDoEvent::extra(const QString& )const | ||
74 | { | ||
75 | return QString::null; | ||
76 | } | ||
77 | QString ToDoEvent::summary() const | ||
78 | { | ||
79 | return m_sum; | ||
80 | } | ||
69 | void ToDoEvent::insertCategory(const QString &str ) | 81 | void ToDoEvent::insertCategory(const QString &str ) |
70 | { | 82 | { |
71 | m_category.append( str ); | 83 | m_category.append( str ); |
72 | } | 84 | } |
73 | void ToDoEvent::clearCategories() | 85 | void ToDoEvent::clearCategories() |
74 | { | 86 | { |
75 | m_category.clear(); | 87 | m_category.clear(); |
76 | } | 88 | } |
77 | void ToDoEvent::setCategories(const QStringList &list ) | 89 | void ToDoEvent::setCategories(const QStringList &list ) |
78 | { | 90 | { |
79 | m_category = list; | 91 | m_category = list; |
80 | } | 92 | } |
81 | QDate ToDoEvent::date()const | 93 | QDate ToDoEvent::date()const |
82 | { | 94 | { |
83 | return m_date; | 95 | return m_date; |
84 | } | 96 | } |
85 | 97 | ||
86 | QString ToDoEvent::description()const | 98 | QString ToDoEvent::description()const |
87 | { | 99 | { |
88 | return m_desc; | 100 | return m_desc; |
89 | } | 101 | } |
90 | void ToDoEvent::setCompleted( bool completed ) | 102 | void ToDoEvent::setCompleted( bool completed ) |
91 | { | 103 | { |
92 | m_isCompleted = completed; | 104 | m_isCompleted = completed; |
93 | } | 105 | } |
94 | void ToDoEvent::setHasDate( bool hasDate ) | 106 | void ToDoEvent::setHasDate( bool hasDate ) |
95 | { | 107 | { |
96 | m_hasDate = hasDate; | 108 | m_hasDate = hasDate; |
97 | } | 109 | } |
98 | void ToDoEvent::setDescription(const QString &desc ) | 110 | void ToDoEvent::setDescription(const QString &desc ) |
99 | { | 111 | { |
100 | m_desc = Qtopia::simplifyMultiLineSpace(desc ); | 112 | m_desc = Qtopia::simplifyMultiLineSpace(desc ); |
101 | } | 113 | } |
114 | void ToDoEvent::setExtra( const QString&, const QString& ) | ||
115 | { | ||
116 | |||
117 | } | ||
118 | void ToDoEvent::setSummary( const QString& sum ) | ||
119 | { | ||
120 | m_sum = sum; | ||
121 | } | ||
102 | void ToDoEvent::setCategory( const QString &cat ) | 122 | void ToDoEvent::setCategory( const QString &cat ) |
103 | { | 123 | { |
104 | qWarning("setCategory %s", cat.latin1() ); | 124 | qWarning("setCategory %s", cat.latin1() ); |
105 | m_category.clear(); | 125 | m_category.clear(); |
106 | m_category << cat; | 126 | m_category << cat; |
107 | } | 127 | } |
108 | void ToDoEvent::setPriority(int prio ) | 128 | void ToDoEvent::setPriority(int prio ) |
109 | { | 129 | { |
110 | m_priority = prio; | 130 | m_priority = prio; |
111 | } | 131 | } |
112 | void ToDoEvent::setDate( QDate date ) | 132 | void ToDoEvent::setDate( QDate date ) |
113 | { | 133 | { |
114 | m_date = date; | 134 | m_date = date; |
115 | } | 135 | } |
116 | bool ToDoEvent::isOverdue( ) | 136 | bool ToDoEvent::isOverdue( ) |
117 | { | 137 | { |
118 | if( m_hasDate ) | 138 | if( m_hasDate ) |
119 | return QDate::currentDate() > m_date; | 139 | return QDate::currentDate() > m_date; |
120 | return false; | 140 | return false; |
121 | } | 141 | } |
122 | 142 | ||
123 | /*! | 143 | /*! |
124 | Returns a richt text string | 144 | Returns a richt text string |
125 | */ | 145 | */ |
126 | QString ToDoEvent::richText() const | 146 | QString ToDoEvent::richText() const |
127 | { | 147 | { |
128 | QString text; | 148 | QString text; |
129 | QStringList catlist; | 149 | QStringList catlist; |
130 | 150 | ||
131 | // Description of the todo | 151 | // Description of the todo |
132 | if ( !description().isEmpty() ){ | 152 | if ( !description().isEmpty() ){ |
153 | text += "<b>" + QObject::tr( "Summary:") + "</b><br>"; | ||
154 | text += Qtopia::escapeString(summary() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | ||
133 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; | 155 | text += "<b>" + QObject::tr( "Description:" ) + "</b><br>"; |
134 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; | 156 | text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"), "<br>" ) + "<br>"; |
135 | } | 157 | } |
136 | text += "<b>" + QObject::tr( "Priority:") +" </b>" | 158 | text += "<b>" + QObject::tr( "Priority:") +" </b>" |
137 | + QString::number( priority() ) + "<br>"; | 159 | + QString::number( priority() ) + "<br>"; |
138 | if (hasDate() ){ | 160 | if (hasDate() ){ |
139 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; | 161 | text += "<b>" + QObject::tr( "Deadline:") + " </b>"; |
140 | text += date().toString(); | 162 | text += date().toString(); |
141 | text += "<br>"; | 163 | text += "<br>"; |
142 | } | 164 | } |
143 | 165 | ||
144 | // Open database of all categories and get the list of | 166 | // Open database of all categories and get the list of |
145 | // the categories this todoevent belongs to. | 167 | // the categories this todoevent belongs to. |
146 | // Then print them... | 168 | // Then print them... |
147 | // I am not sure whether there is no better way doing this !? | 169 | // I am not sure whether there is no better way doing this !? |
148 | Categories catdb; | 170 | Categories catdb; |
149 | bool firstloop = true; | 171 | bool firstloop = true; |
150 | catdb.load( categoryFileName() ); | 172 | catdb.load( categoryFileName() ); |
151 | catlist = allCategories(); | 173 | catlist = allCategories(); |
152 | 174 | ||
153 | text += "<b>" + QObject::tr( "Category:") + "</b> "; | 175 | text += "<b>" + QObject::tr( "Category:") + "</b> "; |
154 | for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) { | 176 | for ( QStringList::Iterator it = catlist.begin(); it != catlist.end(); ++it ) { |
155 | if (!firstloop){ | 177 | if (!firstloop){ |
156 | text += ", "; | 178 | text += ", "; |
157 | } | 179 | } |
158 | firstloop = false; | 180 | firstloop = false; |
159 | text += catdb.label ("todo", (*it).toInt()); | 181 | text += catdb.label ("todo", (*it).toInt()); |
160 | } | 182 | } |
161 | text += "<br>"; | 183 | text += "<br>"; |
162 | return text; | 184 | return text; |
163 | } | 185 | } |
164 | 186 | ||
165 | bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ | 187 | bool ToDoEvent::operator<( const ToDoEvent &toDoEvent )const{ |
166 | if( !hasDate() && !toDoEvent.hasDate() ) return true; | 188 | if( !hasDate() && !toDoEvent.hasDate() ) return true; |
167 | if( !hasDate() && toDoEvent.hasDate() ) return true; | 189 | if( !hasDate() && toDoEvent.hasDate() ) return true; |
168 | if( hasDate() && toDoEvent.hasDate() ){ | 190 | if( hasDate() && toDoEvent.hasDate() ){ |
169 | if( date() == toDoEvent.date() ){ // let's the priority decide | 191 | if( date() == toDoEvent.date() ){ // let's the priority decide |
170 | return priority() < toDoEvent.priority(); | 192 | return priority() < toDoEvent.priority(); |
171 | }else{ | 193 | }else{ |
172 | return date() < toDoEvent.date(); | 194 | return date() < toDoEvent.date(); |
173 | } | 195 | } |
174 | } | 196 | } |
175 | return false; | 197 | return false; |
176 | } | 198 | } |
@@ -194,47 +216,54 @@ bool ToDoEvent::operator>(const ToDoEvent &toDoEvent )const | |||
194 | if( hasDate() && toDoEvent.hasDate() ){ | 216 | if( hasDate() && toDoEvent.hasDate() ){ |
195 | if( date() == toDoEvent.date() ){ // let's the priority decide | 217 | if( date() == toDoEvent.date() ){ // let's the priority decide |
196 | return priority() > toDoEvent.priority(); | 218 | return priority() > toDoEvent.priority(); |
197 | }else{ | 219 | }else{ |
198 | return date() > toDoEvent.date(); | 220 | return date() > toDoEvent.date(); |
199 | } | 221 | } |
200 | } | 222 | } |
201 | return false; | 223 | return false; |
202 | } | 224 | } |
203 | bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const | 225 | bool ToDoEvent::operator>=(const ToDoEvent &toDoEvent )const |
204 | { | 226 | { |
205 | if( !hasDate() && !toDoEvent.hasDate() ) return true; | 227 | if( !hasDate() && !toDoEvent.hasDate() ) return true; |
206 | if( !hasDate() && toDoEvent.hasDate() ) return false; | 228 | if( !hasDate() && toDoEvent.hasDate() ) return false; |
207 | if( hasDate() && toDoEvent.hasDate() ){ | 229 | if( hasDate() && toDoEvent.hasDate() ){ |
208 | if( date() == toDoEvent.date() ){ // let's the priority decide | 230 | if( date() == toDoEvent.date() ){ // let's the priority decide |
209 | return priority() > toDoEvent.priority(); | 231 | return priority() > toDoEvent.priority(); |
210 | }else{ | 232 | }else{ |
211 | return date() > toDoEvent.date(); | 233 | return date() > toDoEvent.date(); |
212 | } | 234 | } |
213 | } | 235 | } |
214 | return true; | 236 | return true; |
215 | } | 237 | } |
216 | bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const | 238 | bool ToDoEvent::operator==(const ToDoEvent &toDoEvent )const |
217 | { | 239 | { |
218 | if( m_date == toDoEvent.m_date && m_isCompleted == toDoEvent.m_isCompleted && m_hasDate == toDoEvent.m_hasDate && m_priority == toDoEvent.m_priority && m_category == toDoEvent.m_category && m_desc == toDoEvent.m_desc ) | 240 | if( m_priority == toDoEvent.m_priority && |
241 | m_isCompleted == toDoEvent.m_isCompleted && | ||
242 | m_hasDate == toDoEvent.m_hasDate && | ||
243 | m_date == toDoEvent.m_date && | ||
244 | m_category == toDoEvent.m_category && | ||
245 | m_sum == toDoEvent.m_sum && | ||
246 | m_desc == toDoEvent.m_desc ) | ||
219 | return true; | 247 | return true; |
220 | return false; | 248 | return false; |
221 | } | 249 | } |
222 | ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item ) | 250 | ToDoEvent &ToDoEvent::operator=(const ToDoEvent &item ) |
223 | { | 251 | { |
224 | m_date = item.m_date; | 252 | m_date = item.m_date; |
225 | m_isCompleted = item.m_isCompleted; | 253 | m_isCompleted = item.m_isCompleted; |
226 | m_hasDate = item.m_hasDate; | 254 | m_hasDate = item.m_hasDate; |
227 | m_priority = item.m_priority; | 255 | m_priority = item.m_priority; |
228 | m_category = item.m_category; | 256 | m_category = item.m_category; |
229 | m_desc = item.m_desc; | 257 | m_desc = item.m_desc; |
230 | m_uid = item.m_uid; | 258 | m_uid = item.m_uid; |
259 | m_sum = item.m_sum; | ||
231 | return *this; | 260 | return *this; |
232 | } | 261 | } |
233 | 262 | ||
234 | 263 | ||
235 | 264 | ||
236 | 265 | ||
237 | 266 | ||
238 | 267 | ||
239 | 268 | ||
240 | 269 | ||
diff --git a/libopie/todoevent.h b/libopie/todoevent.h index 8a00f99..7454241 100644 --- a/libopie/todoevent.h +++ b/libopie/todoevent.h | |||
@@ -1,92 +1,151 @@ | |||
1 | 1 | ||
2 | #ifndef todoevent_h | 2 | #ifndef todoevent_h |
3 | #define todoevent_h | 3 | #define todoevent_h |
4 | 4 | ||
5 | #include <qmap.h> | ||
5 | #include <qregexp.h> | 6 | #include <qregexp.h> |
6 | #include <qstringlist.h> | 7 | #include <qstringlist.h> |
7 | #include <qdatetime.h> | 8 | #include <qdatetime.h> |
8 | 9 | ||
9 | class ToDoEvent { | 10 | class ToDoEvent { |
10 | friend class ToDoDB; | 11 | friend class ToDoDB; |
11 | public: | 12 | public: |
12 | // priorities from Very low to very high | 13 | // priorities from Very low to very high |
13 | enum Priority { VERYHIGH=1, HIGH, NORMAL, LOW, VERYLOW }; | 14 | enum Priority { VERYHIGH=1, HIGH, NORMAL, LOW, VERYLOW }; |
14 | /* Constructs a new ToDoEvent | 15 | /* Constructs a new ToDoEvent |
15 | @param completed Is the TodoEvent completed | 16 | @param completed Is the TodoEvent completed |
16 | @param priority What is the priority of this ToDoEvent | 17 | @param priority What is the priority of this ToDoEvent |
17 | @param category Which category does it belong( uid ) | 18 | @param category Which category does it belong( uid ) |
19 | @param summary A small summary of the todo | ||
18 | @param description What is this ToDoEvent about | 20 | @param description What is this ToDoEvent about |
19 | @param hasDate Does this Event got a deadline | 21 | @param hasDate Does this Event got a deadline |
20 | @param date what is the deadline? | 22 | @param date what is the deadline? |
21 | @param uid what is the UUID of this Event | 23 | @param uid what is the UUID of this Event |
22 | **/ | 24 | **/ |
23 | ToDoEvent( bool completed = false, int priority = NORMAL, | 25 | ToDoEvent( bool completed = false, int priority = NORMAL, |
24 | const QStringList &category = QStringList(), | 26 | const QStringList &category = QStringList(), |
25 | const QString &description = QString::null , | 27 | const QString &summary = QString::null , |
28 | const QString &description = QString::null, | ||
26 | bool hasDate = false, QDate date = QDate::currentDate(), int uid = -1 ); | 29 | bool hasDate = false, QDate date = QDate::currentDate(), int uid = -1 ); |
27 | /* Copy c'tor | 30 | /* Copy c'tor |
28 | 31 | ||
29 | **/ | 32 | **/ |
30 | ToDoEvent(const ToDoEvent & ); | 33 | ToDoEvent(const ToDoEvent & ); |
31 | 34 | ||
32 | /* | 35 | /* |
33 | Is this event completed? | 36 | Is this event completed? |
34 | **/ | 37 | **/ |
35 | bool isCompleted() const; | 38 | bool isCompleted() const; |
36 | 39 | ||
37 | /* | 40 | /* |
38 | Does this Event have a deadline | 41 | Does this Event have a deadline |
39 | **/ | 42 | **/ |
40 | bool hasDate() const; | 43 | bool hasDate() const; |
41 | 44 | ||
42 | /* | 45 | /* |
43 | What is the priority? | 46 | What is the priority? |
44 | **/ | 47 | **/ |
45 | int priority()const ; | 48 | int priority()const ; |
49 | |||
50 | /* | ||
51 | All category numbers as QString in a List | ||
52 | **/ | ||
46 | QStringList allCategories()const; | 53 | QStringList allCategories()const; |
54 | |||
55 | /* | ||
56 | * Same as above but with QArray<int> | ||
57 | */ | ||
47 | QArray<int> categories() const; | 58 | QArray<int> categories() const; |
59 | |||
60 | /** | ||
61 | * The end Date | ||
62 | */ | ||
48 | QDate date()const; | 63 | QDate date()const; |
64 | |||
65 | /** | ||
66 | * The description of the todo | ||
67 | */ | ||
49 | QString description()const; | 68 | QString description()const; |
50 | 69 | ||
70 | /** | ||
71 | * A small summary of the todo | ||
72 | */ | ||
73 | QString summary() const; | ||
74 | |||
75 | /** | ||
76 | * Return this todoevent in a RichText formatted QString | ||
77 | */ | ||
51 | QString richText() const; | 78 | QString richText() const; |
52 | 79 | ||
80 | /** | ||
81 | * Returns the UID of the Todo | ||
82 | */ | ||
53 | int uid()const { return m_uid;}; | 83 | int uid()const { return m_uid;}; |
84 | |||
85 | |||
86 | QString extra(const QString& )const; | ||
87 | /** | ||
88 | * Set if this Todo is completed | ||
89 | */ | ||
54 | void setCompleted(bool completed ); | 90 | void setCompleted(bool completed ); |
91 | |||
92 | /** | ||
93 | * set if this todo got an end data | ||
94 | */ | ||
55 | void setHasDate( bool hasDate ); | 95 | void setHasDate( bool hasDate ); |
56 | // if the category doesn't exist we will create it | 96 | // if the category doesn't exist we will create it |
57 | // this sets the the Category after this call category will be the only category | 97 | // this sets the the Category after this call category will be the only category |
58 | void setCategory( const QString &category ); | 98 | void setCategory( const QString &category ); |
59 | // adds a category to the Categories of this event | 99 | // adds a category to the Categories of this event |
60 | void insertCategory(const QString &category ); | 100 | void insertCategory(const QString &category ); |
101 | |||
102 | /** | ||
103 | * Removes this event from all categories | ||
104 | */ | ||
61 | void clearCategories(); | 105 | void clearCategories(); |
106 | |||
107 | /** | ||
108 | * This todo belongs to xxx categories | ||
109 | */ | ||
62 | void setCategories(const QStringList& ); | 110 | void setCategories(const QStringList& ); |
63 | 111 | ||
112 | /** | ||
113 | * Set the priority of the Todo | ||
114 | */ | ||
64 | void setPriority(int priority ); | 115 | void setPriority(int priority ); |
116 | |||
117 | /** | ||
118 | * set the end date | ||
119 | */ | ||
65 | void setDate( QDate date ); | 120 | void setDate( QDate date ); |
66 | void setDescription(const QString& ); | 121 | void setDescription(const QString& ); |
122 | void setSummary(const QString& ); | ||
123 | void setExtra( const QString&, const QString& ); | ||
67 | bool isOverdue(); | 124 | bool isOverdue(); |
68 | 125 | ||
69 | bool match( const QRegExp &r )const; | 126 | bool match( const QRegExp &r )const; |
70 | 127 | ||
71 | void setUid(int id) {m_uid = id; }; | 128 | void setUid(int id) {m_uid = id; }; |
72 | bool operator<(const ToDoEvent &toDoEvent )const; | 129 | bool operator<(const ToDoEvent &toDoEvent )const; |
73 | bool operator<=(const ToDoEvent &toDoEvent )const; | 130 | bool operator<=(const ToDoEvent &toDoEvent )const; |
74 | bool operator!=(const ToDoEvent &toDoEvent )const { return !(*this == toDoEvent); }; | 131 | bool operator!=(const ToDoEvent &toDoEvent )const { return !(*this == toDoEvent); }; |
75 | bool operator>(const ToDoEvent &toDoEvent )const; | 132 | bool operator>(const ToDoEvent &toDoEvent )const; |
76 | bool operator>=(const ToDoEvent &toDoEvent)const; | 133 | bool operator>=(const ToDoEvent &toDoEvent)const; |
77 | bool operator==(const ToDoEvent &toDoEvent )const; | 134 | bool operator==(const ToDoEvent &toDoEvent )const; |
78 | ToDoEvent &operator=(const ToDoEvent &toDoEvent ); | 135 | ToDoEvent &operator=(const ToDoEvent &toDoEvent ); |
79 | private: | 136 | private: |
80 | class ToDoEventPrivate; | 137 | class ToDoEventPrivate; |
81 | ToDoEventPrivate *d; | 138 | ToDoEventPrivate *d; |
82 | QDate m_date; | 139 | QDate m_date; |
83 | bool m_isCompleted:1; | 140 | bool m_isCompleted:1; |
84 | bool m_hasDate:1; | 141 | bool m_hasDate:1; |
85 | int m_priority; | 142 | int m_priority; |
86 | QStringList m_category; | 143 | QStringList m_category; |
87 | QString m_desc; | 144 | QString m_desc; |
145 | QString m_sum; | ||
146 | QMap<QString, QString> m_extra; | ||
88 | int m_uid; | 147 | int m_uid; |
89 | }; | 148 | }; |
90 | 149 | ||
91 | 150 | ||
92 | #endif | 151 | #endif |
diff --git a/libopie/todovcalresource.cpp b/libopie/todovcalresource.cpp index 75f2197..80f8c60 100644 --- a/libopie/todovcalresource.cpp +++ b/libopie/todovcalresource.cpp | |||
@@ -1,123 +1,128 @@ | |||
1 | /* | 1 | /* |
2 | =. This file is part of the OPIE Project | 2 | =. This file is part of the OPIE Project |
3 | .=l. Copyright (c) 2002 Holger Freyther <freyther@kde.org> | 3 | .=l. Copyright (c) 2002 Holger Freyther <freyther@kde.org> |
4 | .>+-= the use of vobject was inspired by libkcal | 4 | .>+-= the use of vobject was inspired by libkcal |
5 | _;:, .> :=|. This library is free software; you can | 5 | _;:, .> :=|. This library is free software; you can |
6 | .> <`_, > . <= redistribute it and/or modify it under | 6 | .> <`_, > . <= redistribute it and/or modify it under |
7 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 7 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
8 | .="- .-=="i, .._ License as published by the Free Software | 8 | .="- .-=="i, .._ License as published by the Free Software |
9 | - . .-<_> .<> Foundation; either version 2 of the License, | 9 | - . .-<_> .<> Foundation; either version 2 of the License, |
10 | ._= =} : or (at your option) any later version. | 10 | ._= =} : or (at your option) any later version. |
11 | .%`+i> _;_. | 11 | .%`+i> _;_. |
12 | .i_,=:_. -<s. This library is distributed in the hope that | 12 | .i_,=:_. -<s. This library is distributed in the hope that |
13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 13 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
14 | : .. .:, . . . without even the implied warranty of | 14 | : .. .:, . . . without even the implied warranty of |
15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 15 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 16 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
17 | ..}^=.= = ; Library General Public License for more | 17 | ..}^=.= = ; Library General Public License for more |
18 | ++= -. .` .: details. | 18 | ++= -. .` .: details. |
19 | : = ...= . :.=- | 19 | : = ...= . :.=- |
20 | -. .:....=;==+<; You should have received a copy of the GNU | 20 | -. .:....=;==+<; You should have received a copy of the GNU |
21 | -_. . . )=. = Library General Public License along with | 21 | -_. . . )=. = Library General Public License along with |
22 | -- :-=` this library; see the file COPYING.LIB. | 22 | -- :-=` this library; see the file COPYING.LIB. |
23 | If not, write to the Free Software Foundation, | 23 | If not, write to the Free Software Foundation, |
24 | Inc., 59 Temple Place - Suite 330, | 24 | Inc., 59 Temple Place - Suite 330, |
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <qfile.h> | 29 | #include <qfile.h> |
30 | #include <qvaluelist.h> | 30 | #include <qvaluelist.h> |
31 | #include <opie/todoevent.h> | 31 | #include <opie/todoevent.h> |
32 | #include <opie/todovcalresource.h> | 32 | #include <opie/todovcalresource.h> |
33 | 33 | ||
34 | #include "../library/backend/vobject_p.h" | 34 | #include "../library/backend/vobject_p.h" |
35 | #include "../library/backend/timeconversion.h" | 35 | #include "../library/backend/timeconversion.h" |
36 | #include "../library/backend/qfiledirect_p.h" | 36 | #include "../library/backend/qfiledirect_p.h" |
37 | 37 | ||
38 | static VObject *vobjByEvent( const ToDoEvent &event ) | 38 | static VObject *vobjByEvent( const ToDoEvent &event ) |
39 | { | 39 | { |
40 | VObject *task = newVObject( VCTodoProp ); | 40 | VObject *task = newVObject( VCTodoProp ); |
41 | if( task == 0 ) | 41 | if( task == 0 ) |
42 | return 0l; | 42 | return 0l; |
43 | if( event.hasDate() ) | 43 | if( event.hasDate() ) |
44 | addPropValue( task, VCDueProp, TimeConversion::toISO8601( event.date() ) ); | 44 | addPropValue( task, VCDueProp, TimeConversion::toISO8601( event.date() ) ); |
45 | 45 | ||
46 | if( event.isCompleted() ) | 46 | if( event.isCompleted() ) |
47 | addPropValue( task, VCStatusProp, "COMPLETED"); | 47 | addPropValue( task, VCStatusProp, "COMPLETED"); |
48 | 48 | ||
49 | QString string = QString::number(event.priority() ); | 49 | QString string = QString::number(event.priority() ); |
50 | addPropValue( task, VCPriorityProp, string.local8Bit() ); | 50 | addPropValue( task, VCPriorityProp, string.local8Bit() ); |
51 | addPropValue( task, VCCategoriesProp, event.allCategories().join(";").local8Bit() ); | 51 | addPropValue( task, VCCategoriesProp, event.allCategories().join(";").local8Bit() ); |
52 | addPropValue( task, VCDescriptionProp, event.description().local8Bit() ); | 52 | addPropValue( task, VCDescriptionProp, event.description().local8Bit() ); |
53 | addPropValue( task, VCSummaryProp, event.description().left(15).local8Bit() ); | 53 | addPropValue( task, VCSummaryProp, event.summary().left(15).local8Bit() ); |
54 | return task; | 54 | return task; |
55 | }; | 55 | }; |
56 | 56 | ||
57 | static ToDoEvent eventByVObj( VObject *obj ){ | 57 | static ToDoEvent eventByVObj( VObject *obj ){ |
58 | ToDoEvent event; | 58 | ToDoEvent event; |
59 | VObject *ob; | 59 | VObject *ob; |
60 | QCString name; | 60 | QCString name; |
61 | // no uid, attendees, ... and no fun | 61 | // no uid, attendees, ... and no fun |
62 | // description | 62 | // description |
63 | if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){ | 63 | if( ( ob = isAPropertyOf( obj, VCDescriptionProp )) != 0 ){ |
64 | name = vObjectStringZValue( ob ); | 64 | name = vObjectStringZValue( ob ); |
65 | event.setDescription( name ); | 65 | event.setDescription( name ); |
66 | } | 66 | } |
67 | // summary | ||
68 | if ( ( ob = isAPropertyOf( obj, VCSummaryProp ) ) != 0 ) { | ||
69 | name = vObjectStringZValue( ob ); | ||
70 | event.setSummary( name ); | ||
71 | } | ||
67 | // completed | 72 | // completed |
68 | if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){ | 73 | if( ( ob = isAPropertyOf( obj, VCStatusProp )) != 0 ){ |
69 | name = vObjectStringZValue( ob ); | 74 | name = vObjectStringZValue( ob ); |
70 | if( name == "COMPLETED" ){ | 75 | if( name == "COMPLETED" ){ |
71 | event.setCompleted( true ); | 76 | event.setCompleted( true ); |
72 | }else{ | 77 | }else{ |
73 | event.setCompleted( false ); | 78 | event.setCompleted( false ); |
74 | } | 79 | } |
75 | }else | 80 | }else |
76 | event.setCompleted( false ); | 81 | event.setCompleted( false ); |
77 | // priority | 82 | // priority |
78 | if ((ob = isAPropertyOf(obj, VCPriorityProp))) { | 83 | if ((ob = isAPropertyOf(obj, VCPriorityProp))) { |
79 | name = vObjectStringZValue( ob ); | 84 | name = vObjectStringZValue( ob ); |
80 | bool ok; | 85 | bool ok; |
81 | event.setPriority(name.toInt(&ok) ); | 86 | event.setPriority(name.toInt(&ok) ); |
82 | } | 87 | } |
83 | //due date | 88 | //due date |
84 | if((ob = isAPropertyOf(obj, VCDueProp)) ){ | 89 | if((ob = isAPropertyOf(obj, VCDueProp)) ){ |
85 | event.setHasDate( true ); | 90 | event.setHasDate( true ); |
86 | name = vObjectStringZValue( ob ); | 91 | name = vObjectStringZValue( ob ); |
87 | event.setDate( TimeConversion::fromISO8601( name).date() ); | 92 | event.setDate( TimeConversion::fromISO8601( name).date() ); |
88 | } | 93 | } |
89 | // categories | 94 | // categories |
90 | if((ob = isAPropertyOf( obj, VCCategoriesProp )) != 0 ){ | 95 | if((ob = isAPropertyOf( obj, VCCategoriesProp )) != 0 ){ |
91 | name = vObjectStringZValue( ob ); | 96 | name = vObjectStringZValue( ob ); |
92 | qWarning("Categories:%s", name.data() ); | 97 | qWarning("Categories:%s", name.data() ); |
93 | } | 98 | } |
94 | 99 | ||
95 | return event; | 100 | return event; |
96 | }; | 101 | }; |
97 | 102 | ||
98 | 103 | ||
99 | QValueList<ToDoEvent> ToDoVCalResource::load(const QString &file) | 104 | QValueList<ToDoEvent> ToDoVCalResource::load(const QString &file) |
100 | { | 105 | { |
101 | QValueList<ToDoEvent> events; | 106 | QValueList<ToDoEvent> events; |
102 | VObject *vcal = 0l; | 107 | VObject *vcal = 0l; |
103 | vcal = Parse_MIME_FromFileName( (char *)file.utf8().data() ); // from vobject | 108 | vcal = Parse_MIME_FromFileName( (char *)file.utf8().data() ); // from vobject |
104 | if(!vcal ) | 109 | if(!vcal ) |
105 | return events; | 110 | return events; |
106 | // start parsing | 111 | // start parsing |
107 | 112 | ||
108 | VObjectIterator it; | 113 | VObjectIterator it; |
109 | VObject *vobj; | 114 | VObject *vobj; |
110 | initPropIterator(&it, vcal); | 115 | initPropIterator(&it, vcal); |
111 | 116 | ||
112 | while( moreIteration( &it ) ) { | 117 | while( moreIteration( &it ) ) { |
113 | vobj = ::nextVObject( &it ); | 118 | vobj = ::nextVObject( &it ); |
114 | QCString name = ::vObjectName( vobj ); | 119 | QCString name = ::vObjectName( vobj ); |
115 | //QCString objVal = ::vObjectStringZValue( vobj ); | 120 | //QCString objVal = ::vObjectStringZValue( vobj ); |
116 | // let's find out the type | 121 | // let's find out the type |
117 | if( name == VCTodoProp ){ | 122 | if( name == VCTodoProp ){ |
118 | events.append( eventByVObj( vobj ) ); | 123 | events.append( eventByVObj( vobj ) ); |
119 | 124 | ||
120 | } // parse the value | 125 | } // parse the value |
121 | } | 126 | } |
122 | return events; | 127 | return events; |
123 | } | 128 | } |