-rw-r--r-- | core/pim/today/changelog | 7 | ||||
-rw-r--r-- | core/pim/today/clickablelabel.cpp | 31 | ||||
-rw-r--r-- | core/pim/today/clickablelabel.h | 20 | ||||
-rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
-rw-r--r-- | core/pim/today/today.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/today.h | 6 | ||||
-rw-r--r-- | core/pim/today/today.pro | 4 |
7 files changed, 15 insertions, 59 deletions
diff --git a/core/pim/today/changelog b/core/pim/today/changelog index 0bc5fe0..c687cea 100644 --- a/core/pim/today/changelog +++ b/core/pim/today/changelog | |||
@@ -1,2 +1,9 @@ | |||
1 | 0.3.3 | ||
2 | |||
3 | * Changed the logo so it better scales to bigger display and also | ||
4 | made the "Today" string translatable. | ||
5 | * some am/pm fixes | ||
6 | * clickable labels now in libopie | ||
7 | |||
1 | 0.3.2 | 8 | 0.3.2 |
2 | 9 | ||
diff --git a/core/pim/today/clickablelabel.cpp b/core/pim/today/clickablelabel.cpp deleted file mode 100644 index e11cef6..0000000 --- a/core/pim/today/clickablelabel.cpp +++ b/dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | #include "clickablelabel.h" | ||
2 | |||
3 | ClickableLabel::ClickableLabel(QWidget* parent, | ||
4 | const char* name, | ||
5 | WFlags fl) : | ||
6 | QLabel(parent,name,fl) | ||
7 | { | ||
8 | setFrameShape(NoFrame); | ||
9 | setFrameShadow(Sunken); | ||
10 | } | ||
11 | |||
12 | void ClickableLabel::mousePressEvent( QMouseEvent *e ) { | ||
13 | setFrameShape(Panel); | ||
14 | repaint(); | ||
15 | } | ||
16 | |||
17 | void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) { | ||
18 | setFrameShape(NoFrame); | ||
19 | repaint(); | ||
20 | if (rect().contains(e->pos())) { | ||
21 | emit clicked(); | ||
22 | } | ||
23 | } | ||
24 | |||
25 | void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) { | ||
26 | if (rect().contains(e->pos())) { | ||
27 | setFrameShape(Panel); | ||
28 | } else { | ||
29 | setFrameShape(NoFrame); | ||
30 | } | ||
31 | } | ||
diff --git a/core/pim/today/clickablelabel.h b/core/pim/today/clickablelabel.h deleted file mode 100644 index b6d33ad..0000000 --- a/core/pim/today/clickablelabel.h +++ b/dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | #ifndef CLICKABLELABEL | ||
2 | #define CLICKABLELABEL | ||
3 | |||
4 | #include <qlabel.h> | ||
5 | |||
6 | class ClickableLabel: public QLabel | ||
7 | { | ||
8 | Q_OBJECT | ||
9 | public: | ||
10 | ClickableLabel(QWidget* parent = 0, const char* name = 0, | ||
11 | WFlags fl = 0); | ||
12 | protected: | ||
13 | void mousePressEvent( QMouseEvent *e ); | ||
14 | void mouseReleaseEvent( QMouseEvent *e ); | ||
15 | void mouseMoveEvent( QMouseEvent *e ); | ||
16 | signals: | ||
17 | void clicked(); | ||
18 | }; | ||
19 | |||
20 | #endif | ||
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index cf982fd..da9d9fa 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control | |||
@@ -4,5 +4,5 @@ Section: opie/applications | |||
4 | Maintainer: Maximilian Reiß <max.reiss@gmx.de> | 4 | Maintainer: Maximilian Reiß <max.reiss@gmx.de> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: 0.3.2-$SUB_VERSION | 6 | Version: 0.3.3-$SUB_VERSION |
7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) | 7 | Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION) |
8 | License: GPL | 8 | License: GPL |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 1b4408c..0f4cbdb 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -474,5 +474,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
474 | const char* name, | 474 | const char* name, |
475 | WFlags fl) : | 475 | WFlags fl) : |
476 | ClickableLabel(parent,name,fl), event(ev) { | 476 | OClickableLabel(parent,name,fl), event(ev) { |
477 | 477 | ||
478 | QString msg; | 478 | QString msg; |
@@ -541,5 +541,5 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, | |||
541 | const char* name, | 541 | const char* name, |
542 | WFlags fl) : | 542 | WFlags fl) : |
543 | ClickableLabel(parent,name,fl), event(ev) { | 543 | OClickableLabel(parent,name,fl), event(ev) { |
544 | 544 | ||
545 | QString msg; | 545 | QString msg; |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index d265d67..32bb4a3 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -26,4 +26,5 @@ | |||
26 | 26 | ||
27 | #include <opie/tododb.h> | 27 | #include <opie/tododb.h> |
28 | #include <opie/oclickablelabel.h> | ||
28 | 29 | ||
29 | #include <qdatetime.h> | 30 | #include <qdatetime.h> |
@@ -32,5 +33,4 @@ | |||
32 | #include "todayconfig.h" | 33 | #include "todayconfig.h" |
33 | #include "todaybase.h" | 34 | #include "todaybase.h" |
34 | #include "clickablelabel.h" | ||
35 | 35 | ||
36 | class QVBoxLayout; | 36 | class QVBoxLayout; |
@@ -75,5 +75,5 @@ class Today : public TodayBase { | |||
75 | }; | 75 | }; |
76 | 76 | ||
77 | class DateBookEvent: public ClickableLabel { | 77 | class DateBookEvent: public OClickableLabel { |
78 | Q_OBJECT | 78 | Q_OBJECT |
79 | public: | 79 | public: |
@@ -94,5 +94,5 @@ private: | |||
94 | }; | 94 | }; |
95 | 95 | ||
96 | class DateBookEventLater: public ClickableLabel { | 96 | class DateBookEventLater: public OClickableLabel { |
97 | Q_OBJECT | 97 | Q_OBJECT |
98 | public: | 98 | public: |
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index 2d37b5d..f40edca 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro | |||
@@ -2,6 +2,6 @@ TEMPLATE = app | |||
2 | #CONFIG = qt warn_on debug | 2 | #CONFIG = qt warn_on debug |
3 | CONFIG = qt warn_on release | 3 | CONFIG = qt warn_on release |
4 | HEADERS = today.h todaybase.h todayconfig.h clickablelabel.h | 4 | HEADERS = today.h todaybase.h todayconfig.h |
5 | SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp clickablelabel.cpp | 5 | SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp |
6 | 6 | ||
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |