-rw-r--r-- | core/pim/datebook/datebook.pro | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.h | 4 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklstdayhdr.ui | 8 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 8 | ||||
-rw-r--r-- | core/pim/datebook/opie-datebook.control | 2 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.cpp | 19 | ||||
-rw-r--r-- | core/pim/datebook/timepicker.h | 6 | ||||
-rw-r--r-- | libopie/libopie.pro | 4 | ||||
-rw-r--r-- | libopie/oclickablelabel.cpp (renamed from core/pim/datebook/clickablelabel.cpp) | 18 | ||||
-rw-r--r-- | libopie/oclickablelabel.h (renamed from core/pim/datebook/clickablelabel.h) | 4 |
11 files changed, 40 insertions, 39 deletions
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro index a8a9285..9383053 100644 --- a/core/pim/datebook/datebook.pro +++ b/core/pim/datebook/datebook.pro | |||
@@ -12,5 +12,4 @@ HEADERS = datebookday.h \ | |||
12 | datebookweekheaderimpl.h \ | 12 | datebookweekheaderimpl.h \ |
13 | repeatentry.h \ | 13 | repeatentry.h \ |
14 | clickablelabel.h \ | ||
15 | timepicker.h | 14 | timepicker.h |
16 | 15 | ||
@@ -25,5 +24,4 @@ SOURCES = main.cpp \ | |||
25 | datebookweekheaderimpl.cpp \ | 24 | datebookweekheaderimpl.cpp \ |
26 | repeatentry.cpp \ | 25 | repeatentry.cpp \ |
27 | clickablelabel.cpp \ | ||
28 | timepicker.cpp | 26 | timepicker.cpp |
29 | 27 | ||
@@ -38,5 +36,5 @@ INTERFACES = dateentry.ui \ | |||
38 | INCLUDEPATH += $(OPIEDIR)/include | 36 | INCLUDEPATH += $(OPIEDIR)/include |
39 | DEPENDPATH+= $(OPIEDIR)/include | 37 | DEPENDPATH+= $(OPIEDIR)/include |
40 | LIBS += -lqpe | 38 | LIBS += -lqpe -lopie |
41 | 39 | ||
42 | TARGET = datebook | 40 | TARGET = datebook |
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp index 85c745a..8e88377 100644 --- a/core/pim/datebook/datebookweeklst.cpp +++ b/core/pim/datebook/datebookweeklst.cpp | |||
@@ -144,5 +144,5 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, | |||
144 | const char* name, | 144 | const char* name, |
145 | WFlags fl) : | 145 | WFlags fl) : |
146 | ClickableLabel(parent,name,fl), | 146 | OClickableLabel(parent,name,fl), |
147 | event(ev) | 147 | event(ev) |
148 | { | 148 | { |
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h index b0b0417..24f6c83 100644 --- a/core/pim/datebook/datebookweeklst.h +++ b/core/pim/datebook/datebookweeklst.h | |||
@@ -11,5 +11,5 @@ | |||
11 | #include "datebookweeklstdayhdr.h" | 11 | #include "datebookweeklstdayhdr.h" |
12 | 12 | ||
13 | #include "clickablelabel.h" | 13 | #include <opie/oclickablelabel.h> |
14 | 14 | ||
15 | class QDateTime; | 15 | class QDateTime; |
@@ -56,5 +56,5 @@ private: | |||
56 | }; | 56 | }; |
57 | 57 | ||
58 | class DateBookWeekLstEvent: public ClickableLabel | 58 | class DateBookWeekLstEvent: public OClickableLabel |
59 | { | 59 | { |
60 | Q_OBJECT | 60 | Q_OBJECT |
diff --git a/core/pim/datebook/datebookweeklstdayhdr.ui b/core/pim/datebook/datebookweeklstdayhdr.ui index 2b68754..9499726 100644 --- a/core/pim/datebook/datebookweeklstdayhdr.ui +++ b/core/pim/datebook/datebookweeklstdayhdr.ui | |||
@@ -61,5 +61,5 @@ | |||
61 | </widget> | 61 | </widget> |
62 | <widget> | 62 | <widget> |
63 | <class>ClickableLabel</class> | 63 | <class>OClickableLabel</class> |
64 | <property stdset="1"> | 64 | <property stdset="1"> |
65 | <name>name</name> | 65 | <name>name</name> |
@@ -106,5 +106,5 @@ | |||
106 | </widget> | 106 | </widget> |
107 | <widget> | 107 | <widget> |
108 | <class>ClickableLabel</class> | 108 | <class>OClickableLabel</class> |
109 | <property stdset="1"> | 109 | <property stdset="1"> |
110 | <name>name</name> | 110 | <name>name</name> |
@@ -123,6 +123,6 @@ | |||
123 | <customwidgets> | 123 | <customwidgets> |
124 | <customwidget> | 124 | <customwidget> |
125 | <class>ClickableLabel</class> | 125 | <class>OClickableLabel</class> |
126 | <header location="local">clickablelabel.h</header> | 126 | <header location="global">opie/oclickablelabel.h</header> |
127 | <sizehint> | 127 | <sizehint> |
128 | <width>-1</width> | 128 | <width>-1</width> |
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp index e14e2f5..c4f6c68 100644 --- a/core/pim/datebook/dateentryimpl.cpp +++ b/core/pim/datebook/dateentryimpl.cpp | |||
@@ -44,4 +44,5 @@ | |||
44 | 44 | ||
45 | #include <stdlib.h> | 45 | #include <stdlib.h> |
46 | #include <stdio.h> | ||
46 | 47 | ||
47 | /* | 48 | /* |
@@ -58,5 +59,6 @@ DateEntry::DateEntry( bool startOnMonday, const QDateTime &start, | |||
58 | : DateEntryBase( parent, name ), | 59 | : DateEntryBase( parent, name ), |
59 | ampm( whichClock ), | 60 | ampm( whichClock ), |
60 | startWeekOnMonday( startOnMonday ) | 61 | startWeekOnMonday( startOnMonday ), |
62 | m_showStart(true) | ||
61 | { | 63 | { |
62 | init(); | 64 | init(); |
@@ -114,5 +116,7 @@ DateEntry::DateEntry( bool startOnMonday, const Event &event, bool whichClock, | |||
114 | : DateEntryBase( parent, name ), | 116 | : DateEntryBase( parent, name ), |
115 | ampm( whichClock ), | 117 | ampm( whichClock ), |
116 | startWeekOnMonday( startOnMonday ) | 118 | startWeekOnMonday( startOnMonday ), |
119 | m_showStart(true) | ||
120 | |||
117 | { | 121 | { |
118 | init(); | 122 | init(); |
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control index 6566d50..9bef119 100644 --- a/core/pim/datebook/opie-datebook.control +++ b/core/pim/datebook/opie-datebook.control | |||
@@ -5,5 +5,5 @@ Maintainer: Warwick Allison <warwick@trolltech.com> | |||
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION-$SUB_VERSION | 6 | Version: $QPE_VERSION-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) |
8 | Description: A datebook/appointment manager | 8 | Description: A datebook/appointment manager |
9 | A datebook/appointment manager for the Opie environment. | 9 | A datebook/appointment manager for the Opie environment. |
diff --git a/core/pim/datebook/timepicker.cpp b/core/pim/datebook/timepicker.cpp index 43e05ad..f2cb71d 100644 --- a/core/pim/datebook/timepicker.cpp +++ b/core/pim/datebook/timepicker.cpp | |||
@@ -4,5 +4,4 @@ | |||
4 | #include <qtoolbutton.h> | 4 | #include <qtoolbutton.h> |
5 | #include <qlayout.h> | 5 | #include <qlayout.h> |
6 | #include "clickablelabel.h" | ||
7 | #include <qstring.h> | 6 | #include <qstring.h> |
8 | #include <stdio.h> | 7 | #include <stdio.h> |
@@ -14,5 +13,5 @@ TimePicker::TimePicker(QWidget* parent, const char* name, | |||
14 | QVBoxLayout *vbox=new QVBoxLayout(this); | 13 | QVBoxLayout *vbox=new QVBoxLayout(this); |
15 | 14 | ||
16 | ClickableLabel *r; | 15 | OClickableLabel *r; |
17 | QString s; | 16 | QString s; |
18 | 17 | ||
@@ -24,5 +23,5 @@ TimePicker::TimePicker(QWidget* parent, const char* name, | |||
24 | 23 | ||
25 | for (int i=0; i<24; i++) { | 24 | for (int i=0; i<24; i++) { |
26 | r=new ClickableLabel(row); | 25 | r=new OClickableLabel(row); |
27 | hourLst.append(r); | 26 | hourLst.append(r); |
28 | s.sprintf("%.2d",i); | 27 | s.sprintf("%.2d",i); |
@@ -47,5 +46,5 @@ TimePicker::TimePicker(QWidget* parent, const char* name, | |||
47 | 46 | ||
48 | for (int i=0; i<60; i+=5) { | 47 | for (int i=0; i<60; i+=5) { |
49 | r=new ClickableLabel(row); | 48 | r=new OClickableLabel(row); |
50 | minuteLst.append(r); | 49 | minuteLst.append(r); |
51 | s.sprintf("%.2d",i); | 50 | s.sprintf("%.2d",i); |
@@ -61,8 +60,8 @@ TimePicker::TimePicker(QWidget* parent, const char* name, | |||
61 | void TimePicker::slotHour(bool b) { | 60 | void TimePicker::slotHour(bool b) { |
62 | 61 | ||
63 | ClickableLabel *r = (ClickableLabel *) sender(); | 62 | OClickableLabel *r = (OClickableLabel *) sender(); |
64 | 63 | ||
65 | if (b) { | 64 | if (b) { |
66 | QValueListIterator<ClickableLabel *> it; | 65 | QValueListIterator<OClickableLabel *> it; |
67 | for (it=hourLst.begin(); it!=hourLst.end(); it++) { | 66 | for (it=hourLst.begin(); it!=hourLst.end(); it++) { |
68 | if (*it != r) (*it)->setOn(false); | 67 | if (*it != r) (*it)->setOn(false); |
@@ -78,8 +77,8 @@ void TimePicker::slotHour(bool b) { | |||
78 | void TimePicker::slotMinute(bool b) { | 77 | void TimePicker::slotMinute(bool b) { |
79 | 78 | ||
80 | ClickableLabel *r = (ClickableLabel *) sender(); | 79 | OClickableLabel *r = (OClickableLabel *) sender(); |
81 | 80 | ||
82 | if (b) { | 81 | if (b) { |
83 | QValueListIterator<ClickableLabel *> it; | 82 | QValueListIterator<OClickableLabel *> it; |
84 | for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { | 83 | for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { |
85 | if (*it != r) (*it)->setOn(false); | 84 | if (*it != r) (*it)->setOn(false); |
@@ -98,5 +97,5 @@ void TimePicker::setMinute(int m) { | |||
98 | minute.sprintf("%.2d",m); | 97 | minute.sprintf("%.2d",m); |
99 | 98 | ||
100 | QValueListIterator<ClickableLabel *> it; | 99 | QValueListIterator<OClickableLabel *> it; |
101 | for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { | 100 | for (it=minuteLst.begin(); it!=minuteLst.end(); it++) { |
102 | if ((*it)->text() == minute) (*it)->setOn(true); | 101 | if ((*it)->text() == minute) (*it)->setOn(true); |
@@ -112,5 +111,5 @@ void TimePicker::setHour(int h) { | |||
112 | hour.sprintf("%.2d",h); | 111 | hour.sprintf("%.2d",h); |
113 | 112 | ||
114 | QValueListIterator<ClickableLabel *> it; | 113 | QValueListIterator<OClickableLabel *> it; |
115 | for (it=hourLst.begin(); it!=hourLst.end(); it++) { | 114 | for (it=hourLst.begin(); it!=hourLst.end(); it++) { |
116 | if ((*it)->text() == hour) (*it)->setOn(true); | 115 | if ((*it)->text() == hour) (*it)->setOn(true); |
diff --git a/core/pim/datebook/timepicker.h b/core/pim/datebook/timepicker.h index 0acadcb..1c35600 100644 --- a/core/pim/datebook/timepicker.h +++ b/core/pim/datebook/timepicker.h | |||
@@ -4,5 +4,5 @@ | |||
4 | #include <qwidget.h> | 4 | #include <qwidget.h> |
5 | #include <qvaluelist.h> | 5 | #include <qvaluelist.h> |
6 | #include "clickablelabel.h" | 6 | #include <opie/oclickablelabel.h> |
7 | #include <qdatetime.h> | 7 | #include <qdatetime.h> |
8 | 8 | ||
@@ -17,6 +17,6 @@ class TimePicker: public QWidget { | |||
17 | 17 | ||
18 | private: | 18 | private: |
19 | QValueList<ClickableLabel *> hourLst; | 19 | QValueList<OClickableLabel *> hourLst; |
20 | QValueList<ClickableLabel *> minuteLst; | 20 | QValueList<OClickableLabel *> minuteLst; |
21 | QTime tm; | 21 | QTime tm; |
22 | 22 | ||
diff --git a/libopie/libopie.pro b/libopie/libopie.pro index ba64bda..337206a 100644 --- a/libopie/libopie.pro +++ b/libopie/libopie.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qte warn_on release | 2 | CONFIG += qte warn_on release |
3 | HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h | 3 | HEADERS = ofontmenu.h ofileselector.h ofiledialog.h ofileview.h tododb.h todoevent.h todoresource.h todovcalresource.h xmltree.h colordialog.h colorpopupmenu.h oclickablelabel.h |
4 | SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp | 4 | SOURCES = ofontmenu.cc ofileselector.cc ofiledialog.cc xmltree.cc tododb.cpp todoevent.cpp todovcalresource.cpp colordialog.cpp colorpopupmenu.cpp oclickablelabel.cpp |
5 | TARGET = opie | 5 | TARGET = opie |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/core/pim/datebook/clickablelabel.cpp b/libopie/oclickablelabel.cpp index 128bebb..43a0524 100644 --- a/core/pim/datebook/clickablelabel.cpp +++ b/libopie/oclickablelabel.cpp | |||
@@ -1,6 +1,6 @@ | |||
1 | #include "clickablelabel.h" | 1 | #include "oclickablelabel.h" |
2 | #include <stdio.h> | 2 | #include <stdio.h> |
3 | 3 | ||
4 | ClickableLabel::ClickableLabel(QWidget* parent, | 4 | OClickableLabel::OClickableLabel(QWidget* parent, |
5 | const char* name, | 5 | const char* name, |
6 | WFlags fl) : | 6 | WFlags fl) : |
@@ -14,9 +14,9 @@ ClickableLabel::ClickableLabel(QWidget* parent, | |||
14 | } | 14 | } |
15 | 15 | ||
16 | void ClickableLabel::setToggleButton(bool t) { | 16 | void OClickableLabel::setToggleButton(bool t) { |
17 | isToggle=t; | 17 | isToggle=t; |
18 | } | 18 | } |
19 | 19 | ||
20 | void ClickableLabel::mousePressEvent( QMouseEvent *e ) { | 20 | void OClickableLabel::mousePressEvent( QMouseEvent *e ) { |
21 | if (isToggle && isDown) { | 21 | if (isToggle && isDown) { |
22 | showState(false); | 22 | showState(false); |
@@ -26,5 +26,5 @@ void ClickableLabel::mousePressEvent( QMouseEvent *e ) { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { | 28 | void OClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { |
29 | if (rect().contains(e->pos()) && isToggle) isDown=!isDown; | 29 | if (rect().contains(e->pos()) && isToggle) isDown=!isDown; |
30 | 30 | ||
@@ -43,5 +43,5 @@ void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { | |||
43 | } | 43 | } |
44 | 44 | ||
45 | void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { | 45 | void OClickableLabel::mouseMoveEvent( QMouseEvent *e ) { |
46 | if (rect().contains(e->pos())) { | 46 | if (rect().contains(e->pos())) { |
47 | if (isToggle && isDown) { | 47 | if (isToggle && isDown) { |
@@ -59,5 +59,5 @@ void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { | |||
59 | } | 59 | } |
60 | 60 | ||
61 | void ClickableLabel::showState(bool on) { | 61 | void OClickableLabel::showState(bool on) { |
62 | if (on) { | 62 | if (on) { |
63 | //setFrameShape(Panel); | 63 | //setFrameShape(Panel); |
@@ -72,5 +72,5 @@ void ClickableLabel::showState(bool on) { | |||
72 | } | 72 | } |
73 | 73 | ||
74 | void ClickableLabel::setInverted(bool on) { | 74 | void OClickableLabel::setInverted(bool on) { |
75 | if ( (!textInverted && on) || (textInverted && !on) ) { | 75 | if ( (!textInverted && on) || (textInverted && !on) ) { |
76 | QPalette pal=palette(); | 76 | QPalette pal=palette(); |
@@ -83,5 +83,5 @@ void ClickableLabel::setInverted(bool on) { | |||
83 | } | 83 | } |
84 | 84 | ||
85 | void ClickableLabel::setOn(bool on) { | 85 | void OClickableLabel::setOn(bool on) { |
86 | isDown=on; | 86 | isDown=on; |
87 | showState(isDown); | 87 | showState(isDown); |
diff --git a/core/pim/datebook/clickablelabel.h b/libopie/oclickablelabel.h index d00fee6..f65c440 100644 --- a/core/pim/datebook/clickablelabel.h +++ b/libopie/oclickablelabel.h | |||
@@ -4,9 +4,9 @@ | |||
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | 5 | ||
6 | class ClickableLabel: public QLabel | 6 | class OClickableLabel: public QLabel |
7 | { | 7 | { |
8 | Q_OBJECT | 8 | Q_OBJECT |
9 | public: | 9 | public: |
10 | ClickableLabel(QWidget* parent = 0, const char* name = 0, | 10 | OClickableLabel(QWidget* parent = 0, const char* name = 0, |
11 | WFlags fl = 0); | 11 | WFlags fl = 0); |
12 | void setToggleButton(bool t); | 12 | void setToggleButton(bool t); |