-rw-r--r-- | core/pim/datebook/datebook.pro | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 1 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklstdayhdr.ui | 8 | ||||
-rw-r--r-- | core/pim/datebook/dateentry.ui | 6 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 1 | ||||
-rw-r--r-- | core/pim/datebook/namespace_hack.h | 20 |
6 files changed, 31 insertions, 9 deletions
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index 2b2efaa..dbdd31b 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro | |||
@@ -1,38 +1,38 @@ | |||
1 | CONFIG += qt warn_on release quick-app | 1 | CONFIG += qt warn_on release quick-app |
2 | HEADERS= datebookday.h \ | 2 | HEADERS= datebookday.h \ |
3 | datebook.h \ | 3 | datebook.h \ |
4 | dateentryimpl.h \ | 4 | dateentryimpl.h \ |
5 | datebookdayheaderimpl.h \ | 5 | datebookdayheaderimpl.h \ |
6 | datebooksettings.h \ | 6 | datebooksettings.h \ |
7 | datebookweek.h \ | 7 | datebookweek.h \ |
8 | datebookweeklst.h \ | 8 | datebookweeklst.h \ |
9 | datebookweekheaderimpl.h \ | 9 | datebookweekheaderimpl.h \ |
10 | repeatentry.h \ | 10 | repeatentry.h \ |
11 | noteentryimpl.h \ | 11 | noteentryimpl.h \ |
12 | onoteedit.h \ | 12 | onoteedit.h \ |
13 | datebookdayallday.h | 13 | datebookdayallday.h |
14 | SOURCES= main.cpp \ | 14 | SOURCES= main.cpp \ |
15 | datebookday.cpp \ | 15 | datebookday.cpp \ |
16 | datebook.cpp \ | 16 | datebook.cpp \ |
17 | dateentryimpl.cpp \ | 17 | dateentryimpl.cpp \ |
18 | datebookdayheaderimpl.cpp \ | 18 | datebookdayheaderimpl.cpp \ |
19 | datebooksettings.cpp \ | 19 | datebooksettings.cpp \ |
20 | datebookweek.cpp \ | 20 | datebookweek.cpp \ |
21 | datebookweeklst.cpp \ | 21 | datebookweeklst.cpp \ |
22 | datebookweekheaderimpl.cpp \ | 22 | datebookweekheaderimpl.cpp \ |
23 | repeatentry.cpp \ | 23 | repeatentry.cpp \ |
24 | noteentryimpl.cpp \ | 24 | noteentryimpl.cpp \ |
25 | onoteedit.cpp \ | 25 | onoteedit.cpp \ |
26 | datebookdayallday.cpp | 26 | datebookdayallday.cpp |
27 | INTERFACES= dateentry.ui \ | 27 | INTERFACES= dateentry.ui \ |
28 | datebookdayheader.ui \ | 28 | datebookdayheader.ui \ |
29 | datebookweekheader.ui \ | 29 | datebookweekheader.ui \ |
30 | datebookweeklstheader.ui \ | 30 | datebookweeklstheader.ui \ |
31 | datebookweeklstdayhdr.ui \ | 31 | datebookweeklstdayhdr.ui \ |
32 | repeatentrybase.ui \ | 32 | repeatentrybase.ui \ |
33 | datebooksettingsbase.ui \ | 33 | datebooksettingsbase.ui \ |
34 | noteentry.ui | 34 | noteentry.ui |
35 | INCLUDEPATH += $(OPIEDIR)/include | 35 | INCLUDEPATH += $(OPIEDIR)/include |
36 | DEPENDPATH+= $(OPIEDIR)/include | 36 | DEPENDPATH+= $(OPIEDIR)/include |
37 | LIBS += -lqpe -lopieui2 | 37 | LIBS += -lqpe -lopieui2 |
38 | TARGET = datebook | 38 | TARGET = datebook |
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 30c925d..abaf3ea 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -1,12 +1,13 @@ | |||
1 | #include "namespace_hack.h" | ||
1 | #include "datebookweeklst.h" | 2 | #include "datebookweeklst.h" |
2 | 3 | ||
3 | 4 | ||
4 | #include "datebook.h" | 5 | #include "datebook.h" |
5 | 6 | ||
6 | #include <qpe/datebookmonth.h> | 7 | #include <qpe/datebookmonth.h> |
7 | #include <qpe/config.h> | 8 | #include <qpe/config.h> |
8 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
9 | 10 | ||
10 | #include <qlayout.h> | 11 | #include <qlayout.h> |
11 | #include <qtoolbutton.h> | 12 | #include <qtoolbutton.h> |
12 | #include <qtl.h> | 13 | #include <qtl.h> |
diff --git a/core/pim/datebook/datebookweeklstdayhdr.ui b/core/pim/datebook/datebookweeklstdayhdr.ui index 9499726..74ea584 100644 --- a/core/pim/datebook/datebookweeklstdayhdr.ui +++ b/core/pim/datebook/datebookweeklstdayhdr.ui | |||
@@ -51,25 +51,25 @@ | |||
51 | <name>maximumSize</name> | 51 | <name>maximumSize</name> |
52 | <size> | 52 | <size> |
53 | <width>32767</width> | 53 | <width>32767</width> |
54 | <height>32767</height> | 54 | <height>32767</height> |
55 | </size> | 55 | </size> |
56 | </property> | 56 | </property> |
57 | <property stdset="1"> | 57 | <property stdset="1"> |
58 | <name>orientation</name> | 58 | <name>orientation</name> |
59 | <enum>Horizontal</enum> | 59 | <enum>Horizontal</enum> |
60 | </property> | 60 | </property> |
61 | </widget> | 61 | </widget> |
62 | <widget> | 62 | <widget> |
63 | <class>OClickableLabel</class> | 63 | <class>ClickableLabel</class> |
64 | <property stdset="1"> | 64 | <property stdset="1"> |
65 | <name>name</name> | 65 | <name>name</name> |
66 | <cstring>label</cstring> | 66 | <cstring>label</cstring> |
67 | </property> | 67 | </property> |
68 | <property stdset="1"> | 68 | <property stdset="1"> |
69 | <name>sizePolicy</name> | 69 | <name>sizePolicy</name> |
70 | <sizepolicy> | 70 | <sizepolicy> |
71 | <hsizetype>0</hsizetype> | 71 | <hsizetype>0</hsizetype> |
72 | <vsizetype>0</vsizetype> | 72 | <vsizetype>0</vsizetype> |
73 | </sizepolicy> | 73 | </sizepolicy> |
74 | </property> | 74 | </property> |
75 | <property stdset="1"> | 75 | <property stdset="1"> |
@@ -96,43 +96,43 @@ | |||
96 | <name>maximumSize</name> | 96 | <name>maximumSize</name> |
97 | <size> | 97 | <size> |
98 | <width>32767</width> | 98 | <width>32767</width> |
99 | <height>32767</height> | 99 | <height>32767</height> |
100 | </size> | 100 | </size> |
101 | </property> | 101 | </property> |
102 | <property stdset="1"> | 102 | <property stdset="1"> |
103 | <name>orientation</name> | 103 | <name>orientation</name> |
104 | <enum>Horizontal</enum> | 104 | <enum>Horizontal</enum> |
105 | </property> | 105 | </property> |
106 | </widget> | 106 | </widget> |
107 | <widget> | 107 | <widget> |
108 | <class>OClickableLabel</class> | 108 | <class>ClickableLabel</class> |
109 | <property stdset="1"> | 109 | <property stdset="1"> |
110 | <name>name</name> | 110 | <name>name</name> |
111 | <cstring>add</cstring> | 111 | <cstring>add</cstring> |
112 | </property> | 112 | </property> |
113 | <property stdset="1"> | 113 | <property stdset="1"> |
114 | <name>sizePolicy</name> | 114 | <name>sizePolicy</name> |
115 | <sizepolicy> | 115 | <sizepolicy> |
116 | <hsizetype>0</hsizetype> | 116 | <hsizetype>0</hsizetype> |
117 | <vsizetype>0</vsizetype> | 117 | <vsizetype>0</vsizetype> |
118 | </sizepolicy> | 118 | </sizepolicy> |
119 | </property> | 119 | </property> |
120 | </widget> | 120 | </widget> |
121 | </hbox> | 121 | </hbox> |
122 | </widget> | 122 | </widget> |
123 | <customwidgets> | 123 | <customwidgets> |
124 | <customwidget> | 124 | <customwidget> |
125 | <class>OClickableLabel</class> | 125 | <class>ClickableLabel</class> |
126 | <header location="global">opie/oclickablelabel.h</header> | 126 | <header location="local">namespace_hack.h</header> |
127 | <sizehint> | 127 | <sizehint> |
128 | <width>-1</width> | 128 | <width>-1</width> |
129 | <height>-1</height> | 129 | <height>-1</height> |
130 | </sizehint> | 130 | </sizehint> |
131 | <container>0</container> | 131 | <container>0</container> |
132 | <sizepolicy> | 132 | <sizepolicy> |
133 | <hordata>5</hordata> | 133 | <hordata>5</hordata> |
134 | <verdata>5</verdata> | 134 | <verdata>5</verdata> |
135 | </sizepolicy> | 135 | </sizepolicy> |
136 | <pixmap>image0</pixmap> | 136 | <pixmap>image0</pixmap> |
137 | </customwidget> | 137 | </customwidget> |
138 | </customwidgets> | 138 | </customwidgets> |
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui index acc607c..f776911 100644 --- a/core/pim/datebook/dateentry.ui +++ b/core/pim/datebook/dateentry.ui | |||
@@ -292,25 +292,25 @@ | |||
292 | <name>sizeType</name> | 292 | <name>sizeType</name> |
293 | <enum>Expanding</enum> | 293 | <enum>Expanding</enum> |
294 | </property> | 294 | </property> |
295 | <property> | 295 | <property> |
296 | <name>sizeHint</name> | 296 | <name>sizeHint</name> |
297 | <size> | 297 | <size> |
298 | <width>20</width> | 298 | <width>20</width> |
299 | <height>20</height> | 299 | <height>20</height> |
300 | </size> | 300 | </size> |
301 | </property> | 301 | </property> |
302 | </spacer> | 302 | </spacer> |
303 | <widget row="5" column="1" rowspan="1" colspan="3" > | 303 | <widget row="5" column="1" rowspan="1" colspan="3" > |
304 | <class>OTimePicker</class> | 304 | <class>TimePicker</class> |
305 | <property stdset="1"> | 305 | <property stdset="1"> |
306 | <name>name</name> | 306 | <name>name</name> |
307 | <cstring>timePickerStart</cstring> | 307 | <cstring>timePickerStart</cstring> |
308 | </property> | 308 | </property> |
309 | <property stdset="1"> | 309 | <property stdset="1"> |
310 | <name>sizePolicy</name> | 310 | <name>sizePolicy</name> |
311 | <sizepolicy> | 311 | <sizepolicy> |
312 | <hsizetype>3</hsizetype> | 312 | <hsizetype>3</hsizetype> |
313 | <vsizetype>1</vsizetype> | 313 | <vsizetype>1</vsizetype> |
314 | </sizepolicy> | 314 | </sizepolicy> |
315 | </property> | 315 | </property> |
316 | </widget> | 316 | </widget> |
@@ -565,26 +565,26 @@ | |||
565 | <sizehint> | 565 | <sizehint> |
566 | <width>-1</width> | 566 | <width>-1</width> |
567 | <height>-1</height> | 567 | <height>-1</height> |
568 | </sizehint> | 568 | </sizehint> |
569 | <container>0</container> | 569 | <container>0</container> |
570 | <sizepolicy> | 570 | <sizepolicy> |
571 | <hordata>7</hordata> | 571 | <hordata>7</hordata> |
572 | <verdata>1</verdata> | 572 | <verdata>1</verdata> |
573 | </sizepolicy> | 573 | </sizepolicy> |
574 | <pixmap>image1</pixmap> | 574 | <pixmap>image1</pixmap> |
575 | </customwidget> | 575 | </customwidget> |
576 | <customwidget> | 576 | <customwidget> |
577 | <class>OTimePicker</class> | 577 | <class>TimePicker</class> |
578 | <header location="local">opie/otimepicker.h</header> | 578 | <header location="local">namespace_hack.h</header> |
579 | <sizehint> | 579 | <sizehint> |
580 | <width>-1</width> | 580 | <width>-1</width> |
581 | <height>-1</height> | 581 | <height>-1</height> |
582 | </sizehint> | 582 | </sizehint> |
583 | <container>0</container> | 583 | <container>0</container> |
584 | <sizepolicy> | 584 | <sizepolicy> |
585 | <hordata>7</hordata> | 585 | <hordata>7</hordata> |
586 | <verdata>1</verdata> | 586 | <verdata>1</verdata> |
587 | </sizepolicy> | 587 | </sizepolicy> |
588 | <pixmap>image1</pixmap> | 588 | <pixmap>image1</pixmap> |
589 | </customwidget> | 589 | </customwidget> |
590 | </customwidgets> | 590 | </customwidgets> |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index dbff18f..7b4716f 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -9,24 +9,25 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** 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. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "namespace_hack.h" | ||
21 | #include "dateentryimpl.h" | 22 | #include "dateentryimpl.h" |
22 | #include "repeatentry.h" | 23 | #include "repeatentry.h" |
23 | 24 | ||
24 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/categoryselect.h> | 26 | #include <qpe/categoryselect.h> |
26 | #include <qpe/datebookmonth.h> | 27 | #include <qpe/datebookmonth.h> |
27 | #include <qpe/tzselect.h> | 28 | #include <qpe/tzselect.h> |
28 | 29 | ||
29 | #include <qlineedit.h> | 30 | #include <qlineedit.h> |
30 | #include <qspinbox.h> | 31 | #include <qspinbox.h> |
31 | 32 | ||
32 | #include <opie2/otimepicker.h> | 33 | #include <opie2/otimepicker.h> |
diff --git a/core/pim/datebook/namespace_hack.h b/core/pim/datebook/namespace_hack.h new file mode 100644 index 0000000..c15b5ed --- a/dev/null +++ b/core/pim/datebook/namespace_hack.h | |||
@@ -0,0 +1,20 @@ | |||
1 | #ifndef NAME_SPACE_HACK_H | ||
2 | #define NAME_SPACE_HACK_H | ||
3 | |||
4 | #include <opie2/otimepicker.h> | ||
5 | #include <opie2/oclickablelabel.h> | ||
6 | |||
7 | class TimePicker : public Opie::Ui::OTimePicker { | ||
8 | public: | ||
9 | TimePicker( QWidget* p = 0, const char* name = 0, WFlags fl = 0 ) | ||
10 | : Opie::Ui::OTimePicker(p,name,fl){} | ||
11 | |||
12 | }; | ||
13 | class ClickableLabel : public Opie::Ui::OClickableLabel { | ||
14 | public: | ||
15 | ClickableLabel(QWidget *p=0,const char* name=0, WFlags fl = 0 ) | ||
16 | : Opie::Ui::OClickableLabel(p,name,fl){} | ||
17 | }; | ||
18 | |||
19 | |||
20 | #endif | ||