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,3 +1,10 @@
+0.3.3
+
+* Changed the logo so it better scales to bigger display and also
+  made the "Today" string translatable.
+* some am/pm fixes
+* clickable labels now in libopie
+
 0.3.2
 
 * Autostart is now more configurable. You can decide how long
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 @@
-#include "clickablelabel.h"
-
-ClickableLabel::ClickableLabel(QWidget* parent,
-			       const char* name,
-			       WFlags fl) :
-  QLabel(parent,name,fl)
-{
-    setFrameShape(NoFrame);
-    setFrameShadow(Sunken);
-}
-
-void ClickableLabel::mousePressEvent( QMouseEvent *e ) {
-    setFrameShape(Panel);
-    repaint();
-}
-
-void ClickableLabel::mouseReleaseEvent( QMouseEvent *e ) {
-    setFrameShape(NoFrame);
-    repaint();
-    if (rect().contains(e->pos())) {
-	emit clicked();
-    }
-}
-
-void ClickableLabel::mouseMoveEvent( QMouseEvent *e ) {
-    if (rect().contains(e->pos())) {
-	setFrameShape(Panel);
-    } else {
-	setFrameShape(NoFrame);
-    }
-}
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 @@
-#ifndef CLICKABLELABEL
-#define CLICKABLELABEL
-
-#include <qlabel.h> 
-
-class ClickableLabel: public QLabel 
-{
-  Q_OBJECT
-public:
-    ClickableLabel(QWidget* parent = 0, const char* name = 0, 
-		   WFlags fl = 0);
- protected:
-    void mousePressEvent( QMouseEvent *e );
-    void mouseReleaseEvent( QMouseEvent *e );
-    void mouseMoveEvent( QMouseEvent *e );
- signals:
-    void clicked();
-};
-
-#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
@@ -3,7 +3,7 @@ Priority: optional
 Section: opie/applications
 Maintainer: Maximilian Reiß <max.reiss@gmx.de>
 Architecture: arm
-Version: 0.3.2-$SUB_VERSION
+Version: 0.3.3-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), libopie ($QPE_VERSION)
 License: GPL
 Description: today screen
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
@@ -473,7 +473,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 			     int SHOW_NOTES,
 			     const char* name,
 			     WFlags fl) :
-  ClickableLabel(parent,name,fl), event(ev) {
+  OClickableLabel(parent,name,fl), event(ev) {
 
   QString msg;
   //QTime time = QTime::currentTime();
@@ -540,7 +540,7 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
 				       int SHOW_NOTES,
 				       const char* name,
 				       WFlags fl) :
-  ClickableLabel(parent,name,fl), event(ev) {
+  OClickableLabel(parent,name,fl), event(ev) {
 
   QString msg;
   QTime time = QTime::currentTime();
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
@@ -25,13 +25,13 @@
 #include <qpe/event.h>
 
 #include <opie/tododb.h>
+#include <opie/oclickablelabel.h>
 
 #include <qdatetime.h>
 #include <qlist.h>
 
 #include "todayconfig.h"
 #include "todaybase.h"
-#include "clickablelabel.h"
 
 class QVBoxLayout;
 
@@ -74,7 +74,7 @@ class Today : public TodayBase {
     int SHOW_NOTES;
 };
 
-class DateBookEvent: public ClickableLabel {
+class DateBookEvent: public OClickableLabel {
   Q_OBJECT
 public:
   DateBookEvent(const EffectiveEvent &ev,
@@ -93,7 +93,7 @@ private:
     bool ampm;
 };
 
-class DateBookEventLater: public ClickableLabel {
+class DateBookEventLater: public OClickableLabel {
   Q_OBJECT
 public:
     DateBookEventLater(const EffectiveEvent &ev,
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
@@ -1,8 +1,8 @@
 TEMPLATE	= app
 #CONFIG		= qt warn_on debug
 CONFIG		= qt warn_on release
-HEADERS		= today.h todaybase.h todayconfig.h clickablelabel.h
-SOURCES		= main.cpp today.cpp todaybase.cpp todayconfig.cpp clickablelabel.cpp
+HEADERS		= today.h todaybase.h todayconfig.h 
+SOURCES		= main.cpp today.cpp todaybase.cpp todayconfig.cpp 
 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include