author | harlekin <harlekin> | 2002-05-07 14:03:52 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-05-07 14:03:52 (UTC) |
commit | 8ba0398d93f0e70ea2de254a4090d8bd02f593cd (patch) (side-by-side diff) | |
tree | 25de91d3eb02cbc496b232676406e5c1076f0128 | |
parent | 2dc0b530ab0ced8f840064bdb4d294a243894325 (diff) | |
download | opie-8ba0398d93f0e70ea2de254a4090d8bd02f593cd.zip opie-8ba0398d93f0e70ea2de254a4090d8bd02f593cd.tar.gz opie-8ba0398d93f0e70ea2de254a4090d8bd02f593cd.tar.bz2 |
clickable label is now in libopie
-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,16 +1,23 @@ +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 the ipaq has to has been suspended, before autostart is triggered.(Opie only) * am/pm time optinal (autodetect) 0.3.1 * fixed the wrong color of the buttons * better translation (thanks carsten and others) * fixes memory leaks * bugfixes in calendar part, now location and note are working again. 0.3.0 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 @@ -1,16 +1,16 @@ Files: bin/today apps/Applications/today.desktop pics/today/* 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 This today screen app gives an overview of appointments and todos. It also shows incoming and outgoing mails from opiemail. When using Opie (opie.handhelds.org) today can be autostarted on resume. It is highly configurable. 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 @@ -460,33 +460,33 @@ void Today::startMail() { f << QString("qtmail"); } Today::~Today() { } /* * Gets the events for the current day, if it should get all dates */ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, QWidget* parent, int SHOW_LOCATION, 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(); Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); if (!ONLY_LATER) { msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } // include location or not @@ -527,33 +527,33 @@ QString DateBookEvent::ampmTime(QTime tm) { (tm.hour() >= 12) ? "PM" : "AM" ); return s; } else { s.sprintf( "%2d:%02d", tm.hour(), tm.minute() ); return s; } } DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, QWidget* parent, int SHOW_LOCATION, 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(); Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { // show only later appointments msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>[with alarm]</b>"; } 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 @@ -12,39 +12,39 @@ * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef TODAY_H #define TODAY_H #include <qpe/datebookdb.h> #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; class Today : public TodayBase { Q_OBJECT public: Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Today(); private slots: void startConfig(); void startTodo(); void startDatebook(); void startMail(); void draw(); @@ -61,52 +61,52 @@ class Today : public TodayBase { private slots: void channelReceived(const QCString &msg, const QByteArray & data); private: DateBookDB *db; ToDoDB *todo; todayconfig *conf; QWidget* AllDateBookEvents; //Config cfg; int MAX_LINES_TASK; int MAX_CHAR_CLIP; int MAX_LINES_MEET; int SHOW_LOCATION; int SHOW_NOTES; }; -class DateBookEvent: public ClickableLabel { +class DateBookEvent: public OClickableLabel { Q_OBJECT public: DateBookEvent(const EffectiveEvent &ev, QWidget* parent = 0, int SHOW_LOCATION = 0, int SHOW_NOTES = 0, const char* name = 0, WFlags fl = 0); signals: void editEvent(const Event &e); private slots: void editMe(); private: QString ampmTime(QTime); const EffectiveEvent event; bool ampm; }; -class DateBookEventLater: public ClickableLabel { +class DateBookEventLater: public OClickableLabel { Q_OBJECT public: DateBookEventLater(const EffectiveEvent &ev, QWidget* parent = 0, int SHOW_LOCATION = 0, int SHOW_NOTES = 0, const char* name = 0, WFlags fl = 0); signals: void editEvent(const Event &e); private slots: void editMe(); private: QString ampmTime(QTime); const EffectiveEvent event; bool ampm; 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,21 +1,21 @@ 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 LIBS += -lqpe -lopie INTERFACES = TARGET = today DESTDIR = $(OPIEDIR)/bin TRANSLATIONS = ../i18n/pt_BR/today.ts TRANSLATIONS += ../i18n/de/today.ts TRANSLATIONS += ../i18n/en/today.ts TRANSLATIONS += ../i18n/hu/today.ts TRANSLATIONS += ../i18n/sl/today.ts TRANSLATIONS += ../i18n/ja/today.ts TRANSLATIONS += ../i18n/ko/today.ts TRANSLATIONS += ../i18n/no/today.ts TRANSLATIONS += ../i18n/zh_CN/today.ts |