-rw-r--r-- | core/applets/vmemo/vmemo.h | 6 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 0 | ||||
-rw-r--r-- | core/pim/datebook/dateentry.ui | 360 |
3 files changed, 312 insertions, 54 deletions
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index 1bd735f..806fe0e 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h | |||
@@ -31,3 +31,5 @@ class VMemo : public QWidget | |||
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | |||
32 | public: | 33 | public: |
34 | |||
33 | VMemo( QWidget *parent, const char *name = NULL); | 35 | VMemo( QWidget *parent, const char *name = NULL); |
@@ -41,3 +43,5 @@ public: | |||
41 | bool usingIcon, useADPCM; | 43 | bool usingIcon, useADPCM; |
44 | |||
42 | public slots: | 45 | public slots: |
46 | |||
43 | bool record(); | 47 | bool record(); |
@@ -49,3 +53,5 @@ public slots: | |||
49 | void timerBreak(); | 53 | void timerBreak(); |
54 | |||
50 | private: | 55 | private: |
56 | |||
51 | bool useAlerts; | 57 | bool useAlerts; |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index ca760bb..759e440 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui index f776911..6e4ada1 100644 --- a/core/pim/datebook/dateentry.ui +++ b/core/pim/datebook/dateentry.ui | |||
@@ -34,4 +34,4 @@ | |||
34 | <y>0</y> | 34 | <y>0</y> |
35 | <width>242</width> | 35 | <width>286</width> |
36 | <height>339</height> | 36 | <height>396</height> |
37 | </rect> | 37 | </rect> |
@@ -42,2 +42,8 @@ | |||
42 | </property> | 42 | </property> |
43 | <property> | ||
44 | <name>layoutMargin</name> | ||
45 | </property> | ||
46 | <property> | ||
47 | <name>layoutSpacing</name> | ||
48 | </property> | ||
43 | <grid> | 49 | <grid> |
@@ -49,24 +55,35 @@ | |||
49 | <name>spacing</name> | 55 | <name>spacing</name> |
50 | <number>0</number> | 56 | <number>2</number> |
51 | </property> | 57 | </property> |
52 | <widget row="1" column="0" > | 58 | <widget row="0" column="0" > |
53 | <class>QLabel</class> | 59 | <class>QLayoutWidget</class> |
54 | <property stdset="1"> | 60 | <property stdset="1"> |
55 | <name>name</name> | 61 | <name>name</name> |
56 | <cstring>TextLabel2</cstring> | 62 | <cstring>Layout19</cstring> |
57 | </property> | 63 | </property> |
64 | <vbox> | ||
58 | <property stdset="1"> | 65 | <property stdset="1"> |
59 | <name>frameShape</name> | 66 | <name>margin</name> |
60 | <enum>MShape</enum> | 67 | <number>0</number> |
61 | </property> | 68 | </property> |
62 | <property stdset="1"> | 69 | <property stdset="1"> |
63 | <name>frameShadow</name> | 70 | <name>spacing</name> |
64 | <enum>MShadow</enum> | 71 | <number>6</number> |
65 | </property> | 72 | </property> |
73 | <widget> | ||
74 | <class>QLayoutWidget</class> | ||
66 | <property stdset="1"> | 75 | <property stdset="1"> |
67 | <name>text</name> | 76 | <name>name</name> |
68 | <string>Location</string> | 77 | <cstring>Layout1</cstring> |
69 | </property> | 78 | </property> |
70 | </widget> | 79 | <hbox> |
71 | <widget row="2" column="0" > | 80 | <property stdset="1"> |
81 | <name>margin</name> | ||
82 | <number>0</number> | ||
83 | </property> | ||
84 | <property stdset="1"> | ||
85 | <name>spacing</name> | ||
86 | <number>6</number> | ||
87 | </property> | ||
88 | <widget> | ||
72 | <class>QLabel</class> | 89 | <class>QLabel</class> |
@@ -74,3 +91,3 @@ | |||
74 | <name>name</name> | 91 | <name>name</name> |
75 | <cstring>TextLabel2_2</cstring> | 92 | <cstring>TextLabel1</cstring> |
76 | </property> | 93 | </property> |
@@ -78,10 +95,6 @@ | |||
78 | <name>text</name> | 95 | <name>text</name> |
79 | <string>Category</string> | 96 | <string>Description </string> |
80 | </property> | ||
81 | <property> | ||
82 | <name>buddy</name> | ||
83 | <cstring>comboPriority</cstring> | ||
84 | </property> | 97 | </property> |
85 | </widget> | 98 | </widget> |
86 | <widget row="0" column="1" rowspan="1" colspan="3" > | 99 | <widget> |
87 | <class>QComboBox</class> | 100 | <class>QComboBox</class> |
@@ -141,3 +154,20 @@ | |||
141 | </widget> | 154 | </widget> |
142 | <widget row="0" column="0" > | 155 | </hbox> |
156 | </widget> | ||
157 | <widget> | ||
158 | <class>QLayoutWidget</class> | ||
159 | <property stdset="1"> | ||
160 | <name>name</name> | ||
161 | <cstring>Layout2</cstring> | ||
162 | </property> | ||
163 | <hbox> | ||
164 | <property stdset="1"> | ||
165 | <name>margin</name> | ||
166 | <number>0</number> | ||
167 | </property> | ||
168 | <property stdset="1"> | ||
169 | <name>spacing</name> | ||
170 | <number>6</number> | ||
171 | </property> | ||
172 | <widget> | ||
143 | <class>QLabel</class> | 173 | <class>QLabel</class> |
@@ -145,3 +175,11 @@ | |||
145 | <name>name</name> | 175 | <name>name</name> |
146 | <cstring>TextLabel1</cstring> | 176 | <cstring>TextLabel2</cstring> |
177 | </property> | ||
178 | <property stdset="1"> | ||
179 | <name>frameShape</name> | ||
180 | <enum>MShape</enum> | ||
181 | </property> | ||
182 | <property stdset="1"> | ||
183 | <name>frameShadow</name> | ||
184 | <enum>MShadow</enum> | ||
147 | </property> | 185 | </property> |
@@ -149,6 +187,6 @@ | |||
149 | <name>text</name> | 187 | <name>text</name> |
150 | <string>Description </string> | 188 | <string>Location</string> |
151 | </property> | 189 | </property> |
152 | </widget> | 190 | </widget> |
153 | <widget row="1" column="1" rowspan="1" colspan="3" > | 191 | <widget> |
154 | <class>QComboBox</class> | 192 | <class>QComboBox</class> |
@@ -196,3 +234,35 @@ | |||
196 | </widget> | 234 | </widget> |
197 | <widget row="2" column="1" rowspan="1" colspan="3" > | 235 | </hbox> |
236 | </widget> | ||
237 | <widget> | ||
238 | <class>QLayoutWidget</class> | ||
239 | <property stdset="1"> | ||
240 | <name>name</name> | ||
241 | <cstring>Layout3</cstring> | ||
242 | </property> | ||
243 | <hbox> | ||
244 | <property stdset="1"> | ||
245 | <name>margin</name> | ||
246 | <number>0</number> | ||
247 | </property> | ||
248 | <property stdset="1"> | ||
249 | <name>spacing</name> | ||
250 | <number>6</number> | ||
251 | </property> | ||
252 | <widget> | ||
253 | <class>QLabel</class> | ||
254 | <property stdset="1"> | ||
255 | <name>name</name> | ||
256 | <cstring>TextLabel2_2</cstring> | ||
257 | </property> | ||
258 | <property stdset="1"> | ||
259 | <name>text</name> | ||
260 | <string>Category</string> | ||
261 | </property> | ||
262 | <property> | ||
263 | <name>buddy</name> | ||
264 | <cstring>comboPriority</cstring> | ||
265 | </property> | ||
266 | </widget> | ||
267 | <widget> | ||
198 | <class>CategorySelect</class> | 268 | <class>CategorySelect</class> |
@@ -210,3 +280,35 @@ | |||
210 | </widget> | 280 | </widget> |
211 | <widget row="3" column="0" rowspan="2" colspan="1" > | 281 | </hbox> |
282 | </widget> | ||
283 | <widget> | ||
284 | <class>QLayoutWidget</class> | ||
285 | <property stdset="1"> | ||
286 | <name>name</name> | ||
287 | <cstring>Layout18</cstring> | ||
288 | </property> | ||
289 | <hbox> | ||
290 | <property stdset="1"> | ||
291 | <name>margin</name> | ||
292 | <number>0</number> | ||
293 | </property> | ||
294 | <property stdset="1"> | ||
295 | <name>spacing</name> | ||
296 | <number>6</number> | ||
297 | </property> | ||
298 | <widget> | ||
299 | <class>QLayoutWidget</class> | ||
300 | <property stdset="1"> | ||
301 | <name>name</name> | ||
302 | <cstring>Layout17</cstring> | ||
303 | </property> | ||
304 | <vbox> | ||
305 | <property stdset="1"> | ||
306 | <name>margin</name> | ||
307 | <number>0</number> | ||
308 | </property> | ||
309 | <property stdset="1"> | ||
310 | <name>spacing</name> | ||
311 | <number>6</number> | ||
312 | </property> | ||
313 | <widget> | ||
212 | <class>QLabel</class> | 314 | <class>QLabel</class> |
@@ -221,3 +323,20 @@ | |||
221 | </widget> | 323 | </widget> |
222 | <widget row="3" column="1" > | 324 | </vbox> |
325 | </widget> | ||
326 | <widget> | ||
327 | <class>QLayoutWidget</class> | ||
328 | <property stdset="1"> | ||
329 | <name>name</name> | ||
330 | <cstring>Layout4</cstring> | ||
331 | </property> | ||
332 | <vbox> | ||
333 | <property stdset="1"> | ||
334 | <name>margin</name> | ||
335 | <number>0</number> | ||
336 | </property> | ||
337 | <property stdset="1"> | ||
338 | <name>spacing</name> | ||
339 | <number>6</number> | ||
340 | </property> | ||
341 | <widget> | ||
223 | <class>QPushButton</class> | 342 | <class>QPushButton</class> |
@@ -246,3 +365,3 @@ | |||
246 | </widget> | 365 | </widget> |
247 | <widget row="4" column="1" > | 366 | <widget> |
248 | <class>QLineEdit</class> | 367 | <class>QLineEdit</class> |
@@ -281,6 +400,8 @@ | |||
281 | </widget> | 400 | </widget> |
282 | <spacer row="3" column="2" rowspan="2" colspan="1" > | 401 | </vbox> |
402 | </widget> | ||
403 | <spacer> | ||
283 | <property> | 404 | <property> |
284 | <name>name</name> | 405 | <name>name</name> |
285 | <cstring>Spacer1_2</cstring> | 406 | <cstring>Spacer12</cstring> |
286 | </property> | 407 | </property> |
@@ -302,17 +423,18 @@ | |||
302 | </spacer> | 423 | </spacer> |
303 | <widget row="5" column="1" rowspan="1" colspan="3" > | 424 | <widget> |
304 | <class>TimePicker</class> | 425 | <class>QLayoutWidget</class> |
305 | <property stdset="1"> | 426 | <property stdset="1"> |
306 | <name>name</name> | 427 | <name>name</name> |
307 | <cstring>timePickerStart</cstring> | 428 | <cstring>Layout5</cstring> |
308 | </property> | 429 | </property> |
430 | <vbox> | ||
309 | <property stdset="1"> | 431 | <property stdset="1"> |
310 | <name>sizePolicy</name> | 432 | <name>margin</name> |
311 | <sizepolicy> | 433 | <number>0</number> |
312 | <hsizetype>3</hsizetype> | ||
313 | <vsizetype>1</vsizetype> | ||
314 | </sizepolicy> | ||
315 | </property> | 434 | </property> |
316 | </widget> | 435 | <property stdset="1"> |
317 | <widget row="3" column="3" > | 436 | <name>spacing</name> |
437 | <number>6</number> | ||
438 | </property> | ||
439 | <widget> | ||
318 | <class>QPushButton</class> | 440 | <class>QPushButton</class> |
@@ -341,3 +463,3 @@ | |||
341 | </widget> | 463 | </widget> |
342 | <widget row="4" column="3" > | 464 | <widget> |
343 | <class>QLineEdit</class> | 465 | <class>QLineEdit</class> |
@@ -376,3 +498,22 @@ | |||
376 | </widget> | 498 | </widget> |
377 | <widget row="5" column="0" > | 499 | </vbox> |
500 | </widget> | ||
501 | </hbox> | ||
502 | </widget> | ||
503 | <widget> | ||
504 | <class>QLayoutWidget</class> | ||
505 | <property stdset="1"> | ||
506 | <name>name</name> | ||
507 | <cstring>Layout7</cstring> | ||
508 | </property> | ||
509 | <hbox> | ||
510 | <property stdset="1"> | ||
511 | <name>margin</name> | ||
512 | <number>0</number> | ||
513 | </property> | ||
514 | <property stdset="1"> | ||
515 | <name>spacing</name> | ||
516 | <number>6</number> | ||
517 | </property> | ||
518 | <widget> | ||
378 | <class>QLabel</class> | 519 | <class>QLabel</class> |
@@ -387,3 +528,19 @@ | |||
387 | </widget> | 528 | </widget> |
388 | <widget row="6" column="0" > | 529 | <widget> |
530 | <class>TimePicker</class> | ||
531 | <property stdset="1"> | ||
532 | <name>name</name> | ||
533 | <cstring>timePickerStart</cstring> | ||
534 | </property> | ||
535 | <property stdset="1"> | ||
536 | <name>sizePolicy</name> | ||
537 | <sizepolicy> | ||
538 | <hsizetype>3</hsizetype> | ||
539 | <vsizetype>1</vsizetype> | ||
540 | </sizepolicy> | ||
541 | </property> | ||
542 | </widget> | ||
543 | </hbox> | ||
544 | </widget> | ||
545 | <widget> | ||
389 | <class>QCheckBox</class> | 546 | <class>QCheckBox</class> |
@@ -398,3 +555,18 @@ | |||
398 | </widget> | 555 | </widget> |
399 | <widget row="7" column="0" > | 556 | <widget> |
557 | <class>QLayoutWidget</class> | ||
558 | <property stdset="1"> | ||
559 | <name>name</name> | ||
560 | <cstring>Layout8</cstring> | ||
561 | </property> | ||
562 | <hbox> | ||
563 | <property stdset="1"> | ||
564 | <name>margin</name> | ||
565 | <number>0</number> | ||
566 | </property> | ||
567 | <property stdset="1"> | ||
568 | <name>spacing</name> | ||
569 | <number>6</number> | ||
570 | </property> | ||
571 | <widget> | ||
400 | <class>QLabel</class> | 572 | <class>QLabel</class> |
@@ -409,3 +581,3 @@ | |||
409 | </widget> | 581 | </widget> |
410 | <widget row="7" column="1" rowspan="1" colspan="3" > | 582 | <widget> |
411 | <class>TimeZoneSelector</class> | 583 | <class>TimeZoneSelector</class> |
@@ -423,3 +595,23 @@ | |||
423 | </widget> | 595 | </widget> |
424 | <widget row="8" column="0" > | 596 | </hbox> |
597 | </widget> | ||
598 | <widget> | ||
599 | <class>QLayoutWidget</class> | ||
600 | <property stdset="1"> | ||
601 | <name>name</name> | ||
602 | <cstring>Layout9</cstring> | ||
603 | </property> | ||
604 | <property> | ||
605 | <name>layoutSpacing</name> | ||
606 | </property> | ||
607 | <hbox> | ||
608 | <property stdset="1"> | ||
609 | <name>margin</name> | ||
610 | <number>0</number> | ||
611 | </property> | ||
612 | <property stdset="1"> | ||
613 | <name>spacing</name> | ||
614 | <number>1</number> | ||
615 | </property> | ||
616 | <widget> | ||
425 | <class>QCheckBox</class> | 617 | <class>QCheckBox</class> |
@@ -446,3 +638,3 @@ | |||
446 | </widget> | 638 | </widget> |
447 | <widget row="8" column="1" rowspan="1" colspan="2" > | 639 | <widget> |
448 | <class>QSpinBox</class> | 640 | <class>QSpinBox</class> |
@@ -458,3 +650,3 @@ | |||
458 | <name>suffix</name> | 650 | <name>suffix</name> |
459 | <string> minutes</string> | 651 | <string></string> |
460 | </property> | 652 | </property> |
@@ -470,3 +662,3 @@ | |||
470 | <name>lineStep</name> | 662 | <name>lineStep</name> |
471 | <number>5</number> | 663 | <number>1</number> |
472 | </property> | 664 | </property> |
@@ -477,3 +669,36 @@ | |||
477 | </widget> | 669 | </widget> |
478 | <widget row="8" column="3" > | 670 | <widget> |
671 | <class>QComboBox</class> | ||
672 | <item> | ||
673 | <property> | ||
674 | <name>text</name> | ||
675 | <string>minutes</string> | ||
676 | </property> | ||
677 | </item> | ||
678 | <item> | ||
679 | <property> | ||
680 | <name>text</name> | ||
681 | <string>hours</string> | ||
682 | </property> | ||
683 | </item> | ||
684 | <item> | ||
685 | <property> | ||
686 | <name>text</name> | ||
687 | <string>days</string> | ||
688 | </property> | ||
689 | </item> | ||
690 | <property stdset="1"> | ||
691 | <name>name</name> | ||
692 | <cstring>ComboInterval</cstring> | ||
693 | </property> | ||
694 | <property stdset="1"> | ||
695 | <name>enabled</name> | ||
696 | <bool>false</bool> | ||
697 | </property> | ||
698 | <property stdset="1"> | ||
699 | <name>currentItem</name> | ||
700 | <number>0</number> | ||
701 | </property> | ||
702 | </widget> | ||
703 | <widget> | ||
479 | <class>QComboBox</class> | 704 | <class>QComboBox</class> |
@@ -500,3 +725,20 @@ | |||
500 | </widget> | 725 | </widget> |
501 | <widget row="9" column="0" > | 726 | </hbox> |
727 | </widget> | ||
728 | <widget> | ||
729 | <class>QLayoutWidget</class> | ||
730 | <property stdset="1"> | ||
731 | <name>name</name> | ||
732 | <cstring>Layout11</cstring> | ||
733 | </property> | ||
734 | <hbox> | ||
735 | <property stdset="1"> | ||
736 | <name>margin</name> | ||
737 | <number>0</number> | ||
738 | </property> | ||
739 | <property stdset="1"> | ||
740 | <name>spacing</name> | ||
741 | <number>6</number> | ||
742 | </property> | ||
743 | <widget> | ||
502 | <class>QLabel</class> | 744 | <class>QLabel</class> |
@@ -511,3 +753,3 @@ | |||
511 | </widget> | 753 | </widget> |
512 | <widget row="9" column="1" rowspan="1" colspan="3" > | 754 | <widget> |
513 | <class>QToolButton</class> | 755 | <class>QToolButton</class> |
@@ -533,3 +775,5 @@ | |||
533 | </widget> | 775 | </widget> |
534 | <widget row="10" column="0" rowspan="1" colspan="4" > | 776 | </hbox> |
777 | </widget> | ||
778 | <widget> | ||
535 | <class>QToolButton</class> | 779 | <class>QToolButton</class> |
@@ -544,2 +788,4 @@ | |||
544 | </widget> | 788 | </widget> |
789 | </vbox> | ||
790 | </widget> | ||
545 | </grid> | 791 | </grid> |
@@ -649,2 +895,8 @@ | |||
649 | </connection> | 895 | </connection> |
896 | <connection> | ||
897 | <sender>checkAlarm</sender> | ||
898 | <signal>toggled(bool)</signal> | ||
899 | <receiver>ComboInterval</receiver> | ||
900 | <slot>setEnabled(bool)</slot> | ||
901 | </connection> | ||
650 | <slot access="public">endDateChanged( const QString & )</slot> | 902 | <slot access="public">endDateChanged( const QString & )</slot> |