summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/todo/mainwindow.cpp2
-rw-r--r--core/pim/todo/todoentry.ui214
-rw-r--r--core/pim/todo/todoentryimpl.cpp4
3 files changed, 132 insertions, 88 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
@@ -206,7 +206,7 @@ TodoWindow::TodoWindow( QWidget *parent, const char *name, WFlags f ) :
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
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
@@ -30,7 +30,7 @@
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>
@@ -44,25 +44,10 @@
44 <property> 44 <property>
45 <name>layoutSpacing</name> 45 <name>layoutSpacing</name>
46 </property> 46 </property>
47 <widget>
48 <class>QLayoutWidget</class>
49 <property stdset="1">
50 <name>name</name>
51 <cstring>Layout31</cstring>
52 </property>
53 <property stdset="1">
54 <name>geometry</name>
55 <rect>
56 <x>1</x>
57 <y>6</y>
58 <width>240</width>
59 <height>310</height>
60 </rect>
61 </property>
62 <grid> 47 <grid>
63 <property stdset="1"> 48 <property stdset="1">
64 <name>margin</name> 49 <name>margin</name>
65 <number>0</number> 50 <number>11</number>
66 </property> 51 </property>
67 <property stdset="1"> 52 <property stdset="1">
68 <name>spacing</name> 53 <name>spacing</name>
@@ -90,6 +75,13 @@
90 <cstring>txtProg</cstring> 75 <cstring>txtProg</cstring>
91 </property> 76 </property>
92 <property stdset="1"> 77 <property stdset="1">
78 <name>sizePolicy</name>
79 <sizepolicy>
80 <hsizetype>1</hsizetype>
81 <vsizetype>0</vsizetype>
82 </sizepolicy>
83 </property>
84 <property stdset="1">
93 <name>text</name> 85 <name>text</name>
94 <string>Progress:</string> 86 <string>Progress:</string>
95 </property> 87 </property>
@@ -137,6 +129,13 @@
137 <cstring>cmbProg</cstring> 129 <cstring>cmbProg</cstring>
138 </property> 130 </property>
139 <property stdset="1"> 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">
140 <name>maximumSize</name> 139 <name>maximumSize</name>
141 <size> 140 <size>
142 <width>45</width> 141 <width>45</width>
@@ -146,52 +145,6 @@
146 </widget> 145 </widget>
147 </hbox> 146 </hbox>
148 </widget> 147 </widget>
149 <widget row="3" column="0" >
150 <class>QLayoutWidget</class>
151 <property stdset="1">
152 <name>name</name>
153 <cstring>Layout18</cstring>
154 </property>
155 <hbox>
156 <property stdset="1">
157 <name>margin</name>
158 <number>0</number>
159 </property>
160 <property stdset="1">
161 <name>spacing</name>
162 <number>6</number>
163 </property>
164 <widget>
165 <class>QLabel</class>
166 <property stdset="1">
167 <name>name</name>
168 <cstring>TextLabel3</cstring>
169 </property>
170 <property stdset="1">
171 <name>frameShape</name>
172 <enum>NoFrame</enum>
173 </property>
174 <property stdset="1">
175 <name>text</name>
176 <string>Category:</string>
177 </property>
178 </widget>
179 <widget>
180 <class>CategorySelect</class>
181 <property stdset="1">
182 <name>name</name>
183 <cstring>comboCategory</cstring>
184 </property>
185 <property stdset="1">
186 <name>minimumSize</name>
187 <size>
188 <width>60</width>
189 <height>0</height>
190 </size>
191 </property>
192 </widget>
193 </hbox>
194 </widget>
195 <widget row="0" column="0" > 148 <widget row="0" column="0" >
196 <class>QLayoutWidget</class> 149 <class>QLayoutWidget</class>
197 <property stdset="1"> 150 <property stdset="1">
@@ -214,6 +167,13 @@
214 <cstring>TextLabel2</cstring> 167 <cstring>TextLabel2</cstring>
215 </property> 168 </property>
216 <property stdset="1"> 169 <property stdset="1">
170 <name>sizePolicy</name>
171 <sizepolicy>
172 <hsizetype>1</hsizetype>
173 <vsizetype>0</vsizetype>
174 </sizepolicy>
175 </property>
176 <property stdset="1">
217 <name>text</name> 177 <name>text</name>
218 <string>Priority:</string> 178 <string>Priority:</string>
219 </property> 179 </property>
@@ -257,7 +217,7 @@
257 <property stdset="1"> 217 <property stdset="1">
258 <name>sizePolicy</name> 218 <name>sizePolicy</name>
259 <sizepolicy> 219 <sizepolicy>
260 <hsizetype>7</hsizetype> 220 <hsizetype>0</hsizetype>
261 <vsizetype>0</vsizetype> 221 <vsizetype>0</vsizetype>
262 </sizepolicy> 222 </sizepolicy>
263 </property> 223 </property>
@@ -268,13 +228,76 @@
268 </widget> 228 </widget>
269 </hbox> 229 </hbox>
270 </widget> 230 </widget>
271 <widget row="5" column="0" > 231 <widget row="4" column="0" >
272 <class>QMultiLineEdit</class> 232 <class>QLayoutWidget</class>
273 <property stdset="1"> 233 <property stdset="1">
274 <name>name</name> 234 <name>name</name>
275 <cstring>txtTodo</cstring> 235 <cstring>Layout30</cstring>
236 </property>
237 <hbox>
238 <property stdset="1">
239 <name>margin</name>
240 <number>0</number>
241 </property>
242 <property stdset="1">
243 <name>spacing</name>
244 <number>6</number>
245 </property>
246 <widget>
247 <class>QLabel</class>
248 <property stdset="1">
249 <name>name</name>
250 <cstring>TextLabel1</cstring>
251 </property>
252 <property stdset="1">
253 <name>sizePolicy</name>
254 <sizepolicy>
255 <hsizetype>1</hsizetype>
256 <vsizetype>0</vsizetype>
257 </sizepolicy>
258 </property>
259 <property stdset="1">
260 <name>text</name>
261 <string>Summary:</string>
276 </property> 262 </property>
277 </widget> 263 </widget>
264 <widget>
265 <class>QLineEdit</class>
266 <property stdset="1">
267 <name>name</name>
268 <cstring>lneSum</cstring>
269 </property>
270 </widget>
271 <widget>
272 <class>OClickableLabel</class>
273 <property stdset="1">
274 <name>name</name>
275 <cstring>lblDown</cstring>
276 </property>
277 <property stdset="1">
278 <name>sizePolicy</name>
279 <sizepolicy>
280 <hsizetype>0</hsizetype>
281 <vsizetype>0</vsizetype>
282 </sizepolicy>
283 </property>
284 <property stdset="1">
285 <name>minimumSize</name>
286 <size>
287 <width>20</width>
288 <height>20</height>
289 </size>
290 </property>
291 <property stdset="1">
292 <name>maximumSize</name>
293 <size>
294 <width>20</width>
295 <height>20</height>
296 </size>
297 </property>
298 </widget>
299 </hbox>
300 </widget>
278 <widget row="1" column="0" > 301 <widget row="1" column="0" >
279 <class>QLayoutWidget</class> 302 <class>QLayoutWidget</class>
280 <property stdset="1"> 303 <property stdset="1">
@@ -329,11 +352,25 @@
329 </widget> 352 </widget>
330 </hbox> 353 </hbox>
331 </widget> 354 </widget>
332 <widget row="4" column="0" > 355 <widget row="5" column="0" >
356 <class>QMultiLineEdit</class>
357 <property stdset="1">
358 <name>name</name>
359 <cstring>txtTodo</cstring>
360 </property>
361 <property stdset="1">
362 <name>sizePolicy</name>
363 <sizepolicy>
364 <hsizetype>7</hsizetype>
365 <vsizetype>7</vsizetype>
366 </sizepolicy>
367 </property>
368 </widget>
369 <widget row="3" column="0" >
333 <class>QLayoutWidget</class> 370 <class>QLayoutWidget</class>
334 <property stdset="1"> 371 <property stdset="1">
335 <name>name</name> 372 <name>name</name>
336 <cstring>Layout30</cstring> 373 <cstring>Layout33</cstring>
337 </property> 374 </property>
338 <hbox> 375 <hbox>
339 <property stdset="1"> 376 <property stdset="1">
@@ -348,37 +385,41 @@
348 <class>QLabel</class> 385 <class>QLabel</class>
349 <property stdset="1"> 386 <property stdset="1">
350 <name>name</name> 387 <name>name</name>
351 <cstring>TextLabel1</cstring> 388 <cstring>TextLabel3</cstring>
352 </property> 389 </property>
353 <property stdset="1"> 390 <property stdset="1">
354 <name>text</name> 391 <name>sizePolicy</name>
355 <string>Summary:</string> 392 <sizepolicy>
393 <hsizetype>1</hsizetype>
394 <vsizetype>0</vsizetype>
395 </sizepolicy>
356 </property> 396 </property>
357 </widget>
358 <widget>
359 <class>QLineEdit</class>
360 <property stdset="1"> 397 <property stdset="1">
361 <name>name</name> 398 <name>frameShape</name>
362 <cstring>lneSum</cstring> 399 <enum>NoFrame</enum>
400 </property>
401 <property stdset="1">
402 <name>text</name>
403 <string>Category:</string>
363 </property> 404 </property>
364 </widget> 405 </widget>
365 <widget> 406 <widget>
366 <class>OClickableLabel</class> 407 <class>CategorySelect</class>
367 <property stdset="1"> 408 <property stdset="1">
368 <name>name</name> 409 <name>name</name>
369 <cstring>lblDown</cstring> 410 <cstring>comboCategory</cstring>
370 </property> 411 </property>
371 <property stdset="1"> 412 <property stdset="1">
372 <name>minimumSize</name> 413 <name>sizePolicy</name>
373 <size> 414 <sizepolicy>
374 <width>20</width> 415 <hsizetype>7</hsizetype>
375 <height>20</height> 416 <vsizetype>0</vsizetype>
376 </size> 417 </sizepolicy>
377 </property> 418 </property>
378 <property stdset="1"> 419 <property stdset="1">
379 <name>maximumSize</name> 420 <name>minimumSize</name>
380 <size> 421 <size>
381 <width>20</width> 422 <width>60</width>
382 <height>20</height> 423 <height>20</height>
383 </size> 424 </size>
384 </property> 425 </property>
@@ -387,7 +428,6 @@
387 </widget> 428 </widget>
388 </grid> 429 </grid>
389 </widget> 430 </widget>
390</widget>
391<customwidgets> 431<customwidgets>
392 <customwidget> 432 <customwidget>
393 <class>CategorySelect</class> 433 <class>CategorySelect</class>
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
@@ -33,6 +33,7 @@
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>
@@ -90,6 +91,9 @@ NewTaskDialog::NewTaskDialog( int id, QWidget* parent, const char* name, bool m
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 );