summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp2
-rw-r--r--core/pim/todo/todoentry.ui630
-rw-r--r--core/pim/todo/todoentryimpl.cpp4
3 files changed, 340 insertions, 296 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index fa9c221..d419166 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -185,49 +185,49 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f ) :
185 edit->insertSeparator(); 185 edit->insertSeparator();
186 a = new QAction( QString::null, tr("Duplicate" ), 0, this, 0 ); 186 a = new QAction( QString::null, tr("Duplicate" ), 0, this, 0 );
187 connect(a, SIGNAL( activated() ), 187 connect(a, SIGNAL( activated() ),
188 this, SLOT( slotDuplicate() ) ); 188 this, SLOT( slotDuplicate() ) );
189 a->addTo(edit ); 189 a->addTo(edit );
190 a->setEnabled( FALSE ); 190 a->setEnabled( FALSE );
191 duplicateAction = a; 191 duplicateAction = a;
192 edit->insertSeparator(); 192 edit->insertSeparator();
193 193
194 194
195 195
196 if ( Ir::supported() ) { 196 if ( Ir::supported() ) {
197 a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ), 197 a = new QAction( tr( "Beam" ), Resource::loadPixmap( "beam" ),
198 QString::null, 0, this, 0 ); 198 QString::null, 0, this, 0 );
199 connect( a, SIGNAL( activated() ), 199 connect( a, SIGNAL( activated() ),
200 this, SLOT( slotBeam() ) ); 200 this, SLOT( slotBeam() ) );
201 a->addTo( edit ); 201 a->addTo( edit );
202 a->addTo( bar ); 202 a->addTo( bar );
203 } 203 }
204 204
205 a = new QAction( tr( "Find" ), Resource::loadIconSet( "mag" ), 205 a = new QAction( tr( "Find" ), Resource::loadIconSet( "mag" ),
206 QString::null, 0, this, 0 ); 206 QString::null, 0, this, 0 );
207 connect( a, SIGNAL( activated() ), 207 connect( a, SIGNAL( activated() ),
208 this, SLOT( slotFind() ) ); 208 this, SLOT( slotFind() ) );
209 a->addTo( bar ); 209// a->addTo( bar );
210 a->addTo( options ); 210 a->addTo( options );
211 options->insertSeparator(); 211 options->insertSeparator();
212 212
213 if ( table->numRows() ) 213 if ( table->numRows() )
214 a->setEnabled( TRUE ); 214 a->setEnabled( TRUE );
215 else 215 else
216 a->setEnabled( FALSE ); 216 a->setEnabled( FALSE );
217 217
218 //a->setEnabled( FALSE ); 218 //a->setEnabled( FALSE );
219 findAction = a; 219 findAction = a;
220// qDebug("mainwindow #2: t=%d", t.elapsed() ); 220// qDebug("mainwindow #2: t=%d", t.elapsed() );
221 221
222 completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE ); 222 completedAction = new QAction( QString::null, tr("Completed tasks"), 0, this, 0, TRUE );
223 223
224 showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE ); 224 showdeadlineAction = new QAction( QString::null, tr( "Show Deadline" ), 0, this, 0, TRUE );
225 225
226 catMenu->setCheckable( true ); 226 catMenu->setCheckable( true );
227 populateCategories(); 227 populateCategories();
228 228
229 229
230 completedAction->addTo( options ); 230 completedAction->addTo( options );
231 completedAction->setOn( table->showCompleted() ); 231 completedAction->setOn( table->showCompleted() );
232 showdeadlineAction->addTo( options ); 232 showdeadlineAction->addTo( options );
233 showdeadlineAction->setOn( table->showDeadline() ); 233 showdeadlineAction->setOn( table->showDeadline() );
diff --git a/core/pim/todo/todoentry.ui b/core/pim/todo/todoentry.ui
index 9ffa89b..1091852 100644
--- a/core/pim/todo/todoentry.ui
+++ b/core/pim/todo/todoentry.ui
@@ -9,405 +9,445 @@
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>425</width> 33 <width>262</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 <widget> 47 <grid>
48 <class>QLayoutWidget</class>
49 <property stdset="1"> 48 <property stdset="1">
50 <name>name</name> 49 <name>margin</name>
51 <cstring>Layout31</cstring> 50 <number>11</number>
52 </property> 51 </property>
53 <property stdset="1"> 52 <property stdset="1">
54 <name>geometry</name> 53 <name>spacing</name>
55 <rect> 54 <number>6</number>
56 <x>1</x>
57 <y>6</y>
58 <width>240</width>
59 <height>310</height>
60 </rect>
61 </property> 55 </property>
62 <grid> 56 <widget row="2" column="0" >
57 <class>QLayoutWidget</class>
63 <property stdset="1"> 58 <property stdset="1">
64 <name>margin</name> 59 <name>name</name>
65 <number>0</number> 60 <cstring>Layout19</cstring>
66 </property> 61 </property>
67 <property stdset="1"> 62 <hbox>
68 <name>spacing</name> 63 <property stdset="1">
69 <number>6</number> 64 <name>margin</name>
70 </property> 65 <number>0</number>
71 <widget row="2" column="0" > 66 </property>
72 <class>QLayoutWidget</class>
73 <property stdset="1"> 67 <property stdset="1">
74 <name>name</name> 68 <name>spacing</name>
75 <cstring>Layout19</cstring> 69 <number>6</number>
76 </property> 70 </property>
77 <hbox> 71 <widget>
72 <class>QLabel</class>
78 <property stdset="1"> 73 <property stdset="1">
79 <name>margin</name> 74 <name>name</name>
80 <number>0</number> 75 <cstring>txtProg</cstring>
81 </property> 76 </property>
82 <property stdset="1"> 77 <property stdset="1">
83 <name>spacing</name> 78 <name>sizePolicy</name>
84 <number>6</number> 79 <sizepolicy>
80 <hsizetype>1</hsizetype>
81 <vsizetype>0</vsizetype>
82 </sizepolicy>
85 </property> 83 </property>
86 <widget> 84 <property stdset="1">
87 <class>QLabel</class> 85 <name>text</name>
88 <property stdset="1"> 86 <string>Progress:</string>
89 <name>name</name> 87 </property>
90 <cstring>txtProg</cstring> 88 </widget>
89 <widget>
90 <class>QComboBox</class>
91 <item>
92 <property>
93 <name>text</name>
94 <string>0%</string>
91 </property> 95 </property>
92 <property stdset="1"> 96 </item>
97 <item>
98 <property>
93 <name>text</name> 99 <name>text</name>
94 <string>Progress:</string> 100 <string>20%</string>
95 </property> 101 </property>
96 </widget> 102 </item>
97 <widget> 103 <item>
98 <class>QComboBox</class> 104 <property>
99 <item> 105 <name>text</name>
100 <property> 106 <string>40%</string>
101 <name>text</name> 107 </property>
102 <string>0%</string> 108 </item>
103 </property> 109 <item>
104 </item> 110 <property>
105 <item> 111 <name>text</name>
106 <property> 112 <string>60%</string>
107 <name>text</name>
108 <string>20%</string>
109 </property>
110 </item>
111 <item>
112 <property>
113 <name>text</name>
114 <string>40%</string>
115 </property>
116 </item>
117 <item>
118 <property>
119 <name>text</name>
120 <string>60%</string>
121 </property>
122 </item>
123 <item>
124 <property>
125 <name>text</name>
126 <string>80%</string>
127 </property>
128 </item>
129 <item>
130 <property>
131 <name>text</name>
132 <string>100%</string>
133 </property>
134 </item>
135 <property stdset="1">
136 <name>name</name>
137 <cstring>cmbProg</cstring>
138 </property> 113 </property>
139 <property stdset="1"> 114 </item>
140 <name>maximumSize</name> 115 <item>
141 <size> 116 <property>
142 <width>45</width> 117 <name>text</name>
143 <height>32767</height> 118 <string>80%</string>
144 </size> 119 </property>
120 </item>
121 <item>
122 <property>
123 <name>text</name>
124 <string>100%</string>
145 </property> 125 </property>
146 </widget> 126 </item>
147 </hbox> 127 <property stdset="1">
148 </widget> 128 <name>name</name>
149 <widget row="3" column="0" > 129 <cstring>cmbProg</cstring>
150 <class>QLayoutWidget</class> 130 </property>
131 <property stdset="1">
132 <name>sizePolicy</name>
133 <sizepolicy>
134 <hsizetype>0</hsizetype>
135 <vsizetype>0</vsizetype>
136 </sizepolicy>
137 </property>
138 <property stdset="1">
139 <name>maximumSize</name>
140 <size>
141 <width>45</width>
142 <height>32767</height>
143 </size>
144 </property>
145 </widget>
146 </hbox>
147 </widget>
148 <widget row="0" column="0" >
149 <class>QLayoutWidget</class>
150 <property stdset="1">
151 <name>name</name>
152 <cstring>Layout20</cstring>
153 </property>
154 <hbox>
155 <property stdset="1">
156 <name>margin</name>
157 <number>0</number>
158 </property>
151 <property stdset="1"> 159 <property stdset="1">
152 <name>name</name> 160 <name>spacing</name>
153 <cstring>Layout18</cstring> 161 <number>6</number>
154 </property> 162 </property>
155 <hbox> 163 <widget>
164 <class>QLabel</class>
156 <property stdset="1"> 165 <property stdset="1">
157 <name>margin</name> 166 <name>name</name>
158 <number>0</number> 167 <cstring>TextLabel2</cstring>
159 </property> 168 </property>
160 <property stdset="1"> 169 <property stdset="1">
161 <name>spacing</name> 170 <name>sizePolicy</name>
162 <number>6</number> 171 <sizepolicy>
172 <hsizetype>1</hsizetype>
173 <vsizetype>0</vsizetype>
174 </sizepolicy>
163 </property> 175 </property>
164 <widget> 176 <property stdset="1">
165 <class>QLabel</class> 177 <name>text</name>
166 <property stdset="1"> 178 <string>Priority:</string>
167 <name>name</name> 179 </property>
168 <cstring>TextLabel3</cstring> 180 </widget>
181 <widget>
182 <class>QComboBox</class>
183 <item>
184 <property>
185 <name>text</name>
186 <string>1 - Very High</string>
169 </property> 187 </property>
170 <property stdset="1"> 188 </item>
171 <name>frameShape</name> 189 <item>
172 <enum>NoFrame</enum> 190 <property>
191 <name>text</name>
192 <string>2 - High</string>
173 </property> 193 </property>
174 <property stdset="1"> 194 </item>
195 <item>
196 <property>
175 <name>text</name> 197 <name>text</name>
176 <string>Category:</string> 198 <string>3 - Normal</string>
177 </property> 199 </property>
178 </widget> 200 </item>
179 <widget> 201 <item>
180 <class>CategorySelect</class> 202 <property>
181 <property stdset="1"> 203 <name>text</name>
182 <name>name</name> 204 <string>4 - Low</string>
183 <cstring>comboCategory</cstring>
184 </property> 205 </property>
185 <property stdset="1"> 206 </item>
186 <name>minimumSize</name> 207 <item>
187 <size> 208 <property>
188 <width>60</width> 209 <name>text</name>
189 <height>0</height> 210 <string>5 - Very Low</string>
190 </size>
191 </property> 211 </property>
192 </widget> 212 </item>
193 </hbox> 213 <property stdset="1">
194 </widget> 214 <name>name</name>
195 <widget row="0" column="0" > 215 <cstring>comboPriority</cstring>
196 <class>QLayoutWidget</class> 216 </property>
217 <property stdset="1">
218 <name>sizePolicy</name>
219 <sizepolicy>
220 <hsizetype>0</hsizetype>
221 <vsizetype>0</vsizetype>
222 </sizepolicy>
223 </property>
224 <property stdset="1">
225 <name>currentItem</name>
226 <number>2</number>
227 </property>
228 </widget>
229 </hbox>
230 </widget>
231 <widget row="4" column="0" >
232 <class>QLayoutWidget</class>
233 <property stdset="1">
234 <name>name</name>
235 <cstring>Layout30</cstring>
236 </property>
237 <hbox>
238 <property stdset="1">
239 <name>margin</name>
240 <number>0</number>
241 </property>
197 <property stdset="1"> 242 <property stdset="1">
198 <name>name</name> 243 <name>spacing</name>
199 <cstring>Layout20</cstring> 244 <number>6</number>
200 </property> 245 </property>
201 <hbox> 246 <widget>
247 <class>QLabel</class>
202 <property stdset="1"> 248 <property stdset="1">
203 <name>margin</name> 249 <name>name</name>
204 <number>0</number> 250 <cstring>TextLabel1</cstring>
205 </property> 251 </property>
206 <property stdset="1"> 252 <property stdset="1">
207 <name>spacing</name> 253 <name>sizePolicy</name>
208 <number>6</number> 254 <sizepolicy>
255 <hsizetype>1</hsizetype>
256 <vsizetype>0</vsizetype>
257 </sizepolicy>
209 </property> 258 </property>
210 <widget> 259 <property stdset="1">
211 <class>QLabel</class> 260 <name>text</name>
212 <property stdset="1"> 261 <string>Summary:</string>
213 <name>name</name> 262 </property>
214 <cstring>TextLabel2</cstring> 263 </widget>
215 </property> 264 <widget>
216 <property stdset="1"> 265 <class>QLineEdit</class>
217 <name>text</name> 266 <property stdset="1">
218 <string>Priority:</string> 267 <name>name</name>
219 </property> 268 <cstring>lneSum</cstring>
220 </widget> 269 </property>
221 <widget> 270 </widget>
222 <class>QComboBox</class> 271 <widget>
223 <item> 272 <class>OClickableLabel</class>
224 <property> 273 <property stdset="1">
225 <name>text</name> 274 <name>name</name>
226 <string>1 - Very High</string> 275 <cstring>lblDown</cstring>
227 </property> 276 </property>
228 </item> 277 <property stdset="1">
229 <item> 278 <name>sizePolicy</name>
230 <property> 279 <sizepolicy>
231 <name>text</name> 280 <hsizetype>0</hsizetype>
232 <string>2 - High</string> 281 <vsizetype>0</vsizetype>
233 </property> 282 </sizepolicy>
234 </item> 283 </property>
235 <item> 284 <property stdset="1">
236 <property> 285 <name>minimumSize</name>
237 <name>text</name> 286 <size>
238 <string>3 - Normal</string> 287 <width>20</width>
239 </property> 288 <height>20</height>
240 </item> 289 </size>
241 <item> 290 </property>
242 <property> 291 <property stdset="1">
243 <name>text</name> 292 <name>maximumSize</name>
244 <string>4 - Low</string> 293 <size>
245 </property> 294 <width>20</width>
246 </item> 295 <height>20</height>
247 <item> 296 </size>
248 <property> 297 </property>
249 <name>text</name> 298 </widget>
250 <string>5 - Very Low</string> 299 </hbox>
251 </property> 300 </widget>
252 </item> 301 <widget row="1" column="0" >
253 <property stdset="1"> 302 <class>QLayoutWidget</class>
254 <name>name</name> 303 <property stdset="1">
255 <cstring>comboPriority</cstring> 304 <name>name</name>
256 </property> 305 <cstring>Layout21</cstring>
257 <property stdset="1"> 306 </property>
258 <name>sizePolicy</name> 307 <hbox>
259 <sizepolicy>
260 <hsizetype>7</hsizetype>
261 <vsizetype>0</vsizetype>
262 </sizepolicy>
263 </property>
264 <property stdset="1">
265 <name>currentItem</name>
266 <number>2</number>
267 </property>
268 </widget>
269 </hbox>
270 </widget>
271 <widget row="5" column="0" >
272 <class>QMultiLineEdit</class>
273 <property stdset="1"> 308 <property stdset="1">
274 <name>name</name> 309 <name>margin</name>
275 <cstring>txtTodo</cstring> 310 <number>0</number>
276 </property> 311 </property>
277 </widget>
278 <widget row="1" column="0" >
279 <class>QLayoutWidget</class>
280 <property stdset="1"> 312 <property stdset="1">
281 <name>name</name> 313 <name>spacing</name>
282 <cstring>Layout21</cstring> 314 <number>6</number>
283 </property> 315 </property>
284 <hbox> 316 <widget>
317 <class>QCheckBox</class>
285 <property stdset="1"> 318 <property stdset="1">
286 <name>margin</name> 319 <name>name</name>
287 <number>0</number> 320 <cstring>checkCompleted</cstring>
288 </property> 321 </property>
289 <property stdset="1"> 322 <property stdset="1">
290 <name>spacing</name> 323 <name>text</name>
291 <number>6</number> 324 <string>&amp;Completed</string>
292 </property> 325 </property>
293 <widget> 326 </widget>
294 <class>QCheckBox</class> 327 <widget>
295 <property stdset="1"> 328 <class>QCheckBox</class>
296 <name>name</name> 329 <property stdset="1">
297 <cstring>checkCompleted</cstring> 330 <name>name</name>
298 </property> 331 <cstring>checkDate</cstring>
299 <property stdset="1"> 332 </property>
300 <name>text</name> 333 <property stdset="1">
301 <string>&amp;Completed</string> 334 <name>text</name>
302 </property> 335 <string>D&amp;ue</string>
303 </widget> 336 </property>
304 <widget> 337 </widget>
305 <class>QCheckBox</class> 338 <widget>
306 <property stdset="1"> 339 <class>QPushButton</class>
307 <name>name</name> 340 <property stdset="1">
308 <cstring>checkDate</cstring> 341 <name>name</name>
309 </property> 342 <cstring>buttonDate</cstring>
310 <property stdset="1"> 343 </property>
311 <name>text</name> 344 <property stdset="1">
312 <string>D&amp;ue</string> 345 <name>enabled</name>
313 </property> 346 <bool>false</bool>
314 </widget> 347 </property>
315 <widget> 348 <property stdset="1">
316 <class>QPushButton</class> 349 <name>text</name>
317 <property stdset="1"> 350 <string>1 Jan 2001</string>
318 <name>name</name> 351 </property>
319 <cstring>buttonDate</cstring> 352 </widget>
320 </property> 353 </hbox>
321 <property stdset="1"> 354 </widget>
322 <name>enabled</name> 355 <widget row="5" column="0" >
323 <bool>false</bool> 356 <class>QMultiLineEdit</class>
324 </property> 357 <property stdset="1">
325 <property stdset="1"> 358 <name>name</name>
326 <name>text</name> 359 <cstring>txtTodo</cstring>
327 <string>1 Jan 2001</string> 360 </property>
328 </property> 361 <property stdset="1">
329 </widget> 362 <name>sizePolicy</name>
330 </hbox> 363 <sizepolicy>
331 </widget> 364 <hsizetype>7</hsizetype>
332 <widget row="4" column="0" > 365 <vsizetype>7</vsizetype>
333 <class>QLayoutWidget</class> 366 </sizepolicy>
367 </property>
368 </widget>
369 <widget row="3" column="0" >
370 <class>QLayoutWidget</class>
371 <property stdset="1">
372 <name>name</name>
373 <cstring>Layout33</cstring>
374 </property>
375 <hbox>
334 <property stdset="1"> 376 <property stdset="1">
335 <name>name</name> 377 <name>margin</name>
336 <cstring>Layout30</cstring> 378 <number>0</number>
337 </property> 379 </property>
338 <hbox> 380 <property stdset="1">
381 <name>spacing</name>
382 <number>6</number>
383 </property>
384 <widget>
385 <class>QLabel</class>
339 <property stdset="1"> 386 <property stdset="1">
340 <name>margin</name> 387 <name>name</name>
341 <number>0</number> 388 <cstring>TextLabel3</cstring>
342 </property> 389 </property>
343 <property stdset="1"> 390 <property stdset="1">
344 <name>spacing</name> 391 <name>sizePolicy</name>
345 <number>6</number> 392 <sizepolicy>
393 <hsizetype>1</hsizetype>
394 <vsizetype>0</vsizetype>
395 </sizepolicy>
346 </property> 396 </property>
347 <widget> 397 <property stdset="1">
348 <class>QLabel</class> 398 <name>frameShape</name>
349 <property stdset="1"> 399 <enum>NoFrame</enum>
350 <name>name</name> 400 </property>
351 <cstring>TextLabel1</cstring> 401 <property stdset="1">
352 </property> 402 <name>text</name>
353 <property stdset="1"> 403 <string>Category:</string>
354 <name>text</name> 404 </property>
355 <string>Summary:</string> 405 </widget>
356 </property> 406 <widget>
357 </widget> 407 <class>CategorySelect</class>
358 <widget> 408 <property stdset="1">
359 <class>QLineEdit</class> 409 <name>name</name>
360 <property stdset="1"> 410 <cstring>comboCategory</cstring>
361 <name>name</name> 411 </property>
362 <cstring>lneSum</cstring> 412 <property stdset="1">
363 </property> 413 <name>sizePolicy</name>
364 </widget> 414 <sizepolicy>
365 <widget> 415 <hsizetype>7</hsizetype>
366 <class>OClickableLabel</class> 416 <vsizetype>0</vsizetype>
367 <property stdset="1"> 417 </sizepolicy>
368 <name>name</name> 418 </property>
369 <cstring>lblDown</cstring> 419 <property stdset="1">
370 </property> 420 <name>minimumSize</name>
371 <property stdset="1"> 421 <size>
372 <name>minimumSize</name> 422 <width>60</width>
373 <size> 423 <height>20</height>
374 <width>20</width> 424 </size>
375 <height>20</height> 425 </property>
376 </size> 426 </widget>
377 </property> 427 </hbox>
378 <property stdset="1"> 428 </widget>
379 <name>maximumSize</name> 429 </grid>
380 <size>
381 <width>20</width>
382 <height>20</height>
383 </size>
384 </property>
385 </widget>
386 </hbox>
387 </widget>
388 </grid>
389 </widget>
390</widget> 430</widget>
391<customwidgets> 431<customwidgets>
392 <customwidget> 432 <customwidget>
393 <class>CategorySelect</class> 433 <class>CategorySelect</class>
394 <header location="global">qpe/categoryselect.h</header> 434 <header location="global">qpe/categoryselect.h</header>
395 <sizehint> 435 <sizehint>
396 <width>-1</width> 436 <width>-1</width>
397 <height>-1</height> 437 <height>-1</height>
398 </sizehint> 438 </sizehint>
399 <container>0</container> 439 <container>0</container>
400 <sizepolicy> 440 <sizepolicy>
401 <hordata>7</hordata> 441 <hordata>7</hordata>
402 <verdata>1</verdata> 442 <verdata>1</verdata>
403 </sizepolicy> 443 </sizepolicy>
404 <pixmap>image0</pixmap> 444 <pixmap>image0</pixmap>
405 </customwidget> 445 </customwidget>
406 <customwidget> 446 <customwidget>
407 <class>OClickableLabel</class> 447 <class>OClickableLabel</class>
408 <header location="global">opie/oclickablelabel.h</header> 448 <header location="global">opie/oclickablelabel.h</header>
409 <sizehint> 449 <sizehint>
410 <width>-1</width> 450 <width>-1</width>
411 <height>-1</height> 451 <height>-1</height>
412 </sizehint> 452 </sizehint>
413 <container>0</container> 453 <container>0</container>
diff --git a/core/pim/todo/todoentryimpl.cpp b/core/pim/todo/todoentryimpl.cpp
index dd01130..6af229c 100644
--- a/core/pim/todo/todoentryimpl.cpp
+++ b/core/pim/todo/todoentryimpl.cpp
@@ -12,48 +12,49 @@
12** 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
13** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 13** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
14** 14**
15** See http://www.trolltech.com/gpl/ for GPL licensing information. 15** See http://www.trolltech.com/gpl/ for GPL licensing information.
16** 16**
17** Contact info@trolltech.com if any conditions of this licensing are 17** Contact info@trolltech.com if any conditions of this licensing are
18** not clear to you. 18** not clear to you.
19** 19**
20**********************************************************************/ 20**********************************************************************/
21 21
22#include "todoentryimpl.h" 22#include "todoentryimpl.h"
23 23
24#include <opie/oclickablelabel.h> 24#include <opie/oclickablelabel.h>
25#include <opie/todoevent.h> 25#include <opie/todoevent.h>
26#include <opie/tododb.h> 26#include <opie/tododb.h>
27 27
28#include <qpe/categoryselect.h> 28#include <qpe/categoryselect.h>
29#include <qpe/datebookmonth.h> 29#include <qpe/datebookmonth.h>
30#include <qpe/global.h> 30#include <qpe/global.h>
31#include <qpe/resource.h> 31#include <qpe/resource.h>
32#include <qpe/imageedit.h> 32#include <qpe/imageedit.h>
33#include <qpe/timestring.h> 33#include <qpe/timestring.h>
34#include <qpe/palmtoprecord.h> 34#include <qpe/palmtoprecord.h>
35 35
36#include <qlayout.h>
36#include <qmessagebox.h> 37#include <qmessagebox.h>
37#include <qpopupmenu.h> 38#include <qpopupmenu.h>
38#include <qtoolbutton.h> 39#include <qtoolbutton.h>
39#include <qcombobox.h> 40#include <qcombobox.h>
40#include <qcheckbox.h> 41#include <qcheckbox.h>
41#include <qlineedit.h> 42#include <qlineedit.h>
42#include <qmultilineedit.h> 43#include <qmultilineedit.h>
43#include <qlabel.h> 44#include <qlabel.h>
44#include <qtimer.h> 45#include <qtimer.h>
45#include <qapplication.h> 46#include <qapplication.h>
46 47
47 48
48NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent, 49NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent,
49 const char *name, bool modal, WFlags fl ) 50 const char *name, bool modal, WFlags fl )
50 : NewTaskDialogBase( parent, name, modal, fl ), 51 : NewTaskDialogBase( parent, name, modal, fl ),
51 todo( task ) 52 todo( task )
52{ 53{
53 todo.setCategories( task.allCategories() ); 54 todo.setCategories( task.allCategories() );
54 if ( todo.hasDate() ) 55 if ( todo.hasDate() )
55 date = todo.date(); 56 date = todo.date();
56 else 57 else
57 date = QDate::currentDate(); 58 date = QDate::currentDate();
58 59
59 init(); 60 init();
@@ -69,48 +70,51 @@ NewTaskDialog::NewTaskDialog( const ToDoEvent& task, QWidget *parent,
69} 70}
70 71
71/* 72/*
72 * Constructs a NewTaskDialog which is a child of 'parent', with the 73 * Constructs a NewTaskDialog which is a child of 'parent', with the
73 * name 'name' and widget flags set to 'f' 74 * name 'name' and widget flags set to 'f'
74 * 75 *
75 * The dialog will by default be modeless, unless you set 'modal' to 76 * The dialog will by default be modeless, unless you set 'modal' to
76 * TRUE to construct a modal dialog. 77 * TRUE to construct a modal dialog.
77 */ 78 */
78NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool modal, 79NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool modal,
79 WFlags fl ) 80 WFlags fl )
80 : NewTaskDialogBase( parent, name, modal, fl ), 81 : NewTaskDialogBase( parent, name, modal, fl ),
81 date( QDate::currentDate() ) 82 date( QDate::currentDate() )
82{ 83{
83 if ( id != -1 ) { 84 if ( id != -1 ) {
84 QArray<int> ids( 1 ); 85 QArray<int> ids( 1 );
85 ids[0] = id; 86 ids[0] = id;
86 todo.setCategory( Qtopia::Record::idsToString( ids ) ); 87 todo.setCategory( Qtopia::Record::idsToString( ids ) );
87 } 88 }
88 init(); 89 init();
89} 90}
90 91
91void NewTaskDialog::init() 92void NewTaskDialog::init()
92{ 93{
94 if( layout() != 0 ){
95 layout()->setMargin( 0 );
96 }
93 QPopupMenu *m1 = new QPopupMenu( this ); 97 QPopupMenu *m1 = new QPopupMenu( this );
94 picker = new DateBookMonth( m1, 0, TRUE ); 98 picker = new DateBookMonth( m1, 0, TRUE );
95 m1->insertItem( picker ); 99 m1->insertItem( picker );
96 buttonDate->setPopup( m1 ); 100 buttonDate->setPopup( m1 );
97 comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") ); 101 comboCategory->setCategories( todo.categories(), "Todo List", tr("Todo List") );
98 102
99 connect( picker, SIGNAL( dateClicked( int, int, int ) ), 103 connect( picker, SIGNAL( dateClicked( int, int, int ) ),
100 this, SLOT( dateChanged( int, int, int ) ) ); 104 this, SLOT( dateChanged( int, int, int ) ) );
101 105
102 buttonDate->setText( TimeString::longDateString( date ) ); 106 buttonDate->setText( TimeString::longDateString( date ) );
103 picker->setDate( date.year(), date.month(), date.day() ); 107 picker->setDate( date.year(), date.month(), date.day() );
104 lblDown->setPixmap(Resource::loadPixmap("down") ); 108 lblDown->setPixmap(Resource::loadPixmap("down") );
105} 109}
106 110
107/* 111/*
108 * Destroys the object and frees any allocated resources 112 * Destroys the object and frees any allocated resources
109 */ 113 */
110NewTaskDialog::~NewTaskDialog() 114NewTaskDialog::~NewTaskDialog()
111{ 115{
112 // no need to delete child widgets, Qt does it all for us 116 // no need to delete child widgets, Qt does it all for us
113} 117}
114void NewTaskDialog::dateChanged( int y, int m, int d ) 118void NewTaskDialog::dateChanged( int y, int m, int d )
115{ 119{
116 date = QDate( y, m, d ); 120 date = QDate( y, m, d );