summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/TODO11
-rw-r--r--core/pim/today/changelog4
-rw-r--r--core/pim/today/today.cpp159
-rw-r--r--core/pim/today/today.h25
-rw-r--r--core/pim/today/today.pro5
-rw-r--r--core/pim/today/todaybase.cpp16
-rw-r--r--core/pim/today/todaybase.h6
-rw-r--r--core/pim/today/todayconfig.h2
8 files changed, 147 insertions, 81 deletions
diff --git a/core/pim/today/TODO b/core/pim/today/TODO
index 5876e2b..a3b01d2 100644
--- a/core/pim/today/TODO
+++ b/core/pim/today/TODO
@@ -1,13 +1,14 @@
TODO for today:
-* start the app on "resume"
+* start the app on "resume" (partly done)
-* show alarm icons on alarm events
+* show alarm icons on alarm events (partly done)
* add am/pm mode instead of 24 h, take system default
-* fix 23 pm bug (done??)
-
* qcop integration for updating events?
-* sort todos by pri. \ No newline at end of file
+* sort todos by pri.
+
+* make Opiezilla a clickable label wich is allway on the far right side of
+the screen , klick will open credits ,) \ No newline at end of file
diff --git a/core/pim/today/changelog b/core/pim/today/changelog
index 7111154..333326d 100644
--- a/core/pim/today/changelog
+++ b/core/pim/today/changelog
@@ -1,2 +1,6 @@
+
+* Appointments are now clickable (connection to datebook still missing)
+* autostart support (opie only)
+
0.2.7
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index d715fc1..69bcb68 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -40,4 +40,5 @@
#include <qpixmap.h>
#include <qfileinfo.h>
+#include <qlayout.h>
//#include <iostream.h>
@@ -46,4 +47,5 @@
+
int MAX_LINES_TASK;
int MAX_CHAR_CLIP;
@@ -54,4 +56,6 @@ int SHOW_NOTES;
int ONLY_LATER;
int AUTOSTART;
+
+int NEW_START=1;
/*
* Constructs a Example which is a child of 'parent', with the
@@ -70,5 +74,4 @@ Today::Today( QWidget* parent, const char* name, WFlags fl )
}
-
void Today::autoStart() {
Config cfg("today");
@@ -204,5 +207,8 @@ void Today::startConfig() {
void Today::getDates() {
QDate date = QDate::currentDate();
- QTime time = QTime::currentTime();
+ QWidget* AllDateBookEvents = new QWidget( );
+ QVBoxLayout* layoutDates = new QVBoxLayout(AllDateBookEvents);
+ //QTime time = QTime::currentTime();
+
QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
@@ -222,66 +228,23 @@ void Today::getDates() {
if ( count <= MAX_LINES_MEET ) {
- //cout << time.toString() << endl;
- //cout << TimeString::dateString((*it).event().end()) << endl;
-
- // decide if to get all day or only later appointments
- if (!ONLY_LATER) {
- msg += "<B>" + (*it).description() + "</B>";
- if ( (*it).event().hasAlarm() ) {
- msg += " <b>[with alarm]</b>";
- }
- // include location or not
- if (SHOW_LOCATION == 1) {
- msg += "<BR><i>" + (*it).location();
- msg += "</i>";
- }
-
- if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
- msg += "<br>All day";
- } else {
- // start time of event
- msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
- // end time of event
- + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
- }
- msg += "<BR>";
- // include possible note or not
- if (SHOW_NOTES == 1) {
- msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
- }
- } else if ((time.toString() <= TimeString::dateString((*it).event().end())) ) {
- msg += "<B>" + (*it).description() + "</B>";
- if ( (*it).event().hasAlarm() ) {
- msg += " <b>[with alarm]</b>";
- }
- // include location or not
- if (SHOW_LOCATION == 1) {
- msg+= "<BR><i>" + (*it).location();
- msg += "</i>";
- }
-
- if ( (TimeString::timeString(QTime((*it).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((*it).event().end().time()) ) == "23:59") ) {
- msg += "<br>All day";
- } else {
- // start time of event
- msg += "<br>" + TimeString::timeString(QTime((*it).event().start().time()) )
- // end time of event
- + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) );
- }
- msg += "<BR>";
- // include possible note or not
- if (SHOW_NOTES == 1) {
- msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
- }
- }
+
+
+ DateBookEvent *l=new DateBookEvent(*it, AllDateBookEvents);
+ layoutDates->addWidget(l);
+ connect (l, SIGNAL(editEvent(const Event &)),
+ this, SIGNAL(editEvent(const Event &)));
}
- }
- if (msg.isEmpty()) {
- msg = tr("No more appointments today");
- }
- DatesField->setText(msg);
+
+ }
+ layoutDates->addItem(new QSpacerItem(1,1, QSizePolicy::Minimum, QSizePolicy::Expanding));
+ sv1->addChild(AllDateBookEvents);
+
+ //if (msg.isEmpty()) {
+ // msg = tr("No more appointments today");
+ //}
+ //DatesField->setText(msg);
}
}
-
+
/*
* Parse in the todolist.xml
@@ -372,7 +335,8 @@ void Today::getTodo() {
// if the todolist.xml file was not modified in between, do not parse it.
- if (!checkIfModified()) {
+ if (!checkIfModified() && !NEW_START) {
return;
}
+ NEW_START=0;
QString output;
@@ -442,2 +406,73 @@ Today::~Today() {
// no need to delete child widgets, Qt does it all for us
}
+
+
+DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
+ QWidget* parent = 0,
+ const char* name = 0,
+ WFlags fl = 0) :
+ ClickableLabel(parent,name,fl), event(ev) {
+
+ QString msg;
+ QTime time = QTime::currentTime();
+
+ if (!ONLY_LATER) {
+ msg += "<B>" + (ev).description() + "</B>";
+ if ( (ev).event().hasAlarm() ) {
+ msg += " <b>[with alarm]</b>";
+ }
+ // include location or not
+ if (SHOW_LOCATION == 1) {
+ msg += "<BR><i>" + (ev).location();
+ msg += "</i>";
+ }
+
+ if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
+ msg += "<br>All day";
+ } else {
+ // start time of event
+ msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+ // end time of event
+ + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+ }
+ msg += "<BR>";
+ // include possible note or not
+ if (SHOW_NOTES == 1) {
+ msg += " <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+ }
+ } else if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
+ msg += "<B>" + (ev).description() + "</B>";
+ if ( (ev).event().hasAlarm() ) {
+ msg += " <b>[with alarm]</b>";
+ }
+ // include location or not
+ if (SHOW_LOCATION == 1) {
+ msg+= "<BR><i>" + (ev).location();
+ msg += "</i>";
+ }
+
+ if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
+ msg += "<br>All day";
+ } else {
+ // start time of event
+ msg += "<br>" + TimeString::timeString(QTime((ev).event().start().time()) )
+ // end time of event
+ + "<b> - </b>" + TimeString::timeString(QTime((ev).event().end().time()) );
+ }
+ // include possible note or not
+ if (SHOW_NOTES == 1) {
+ msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP) + "<br>";
+ }
+ }
+
+ setText(msg);
+ connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
+ setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
+}
+
+void DateBookEvent::editMe() {
+ emit editEvent(event.event());
+}
+
+
+
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index b3b7d01..0a0837c 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -21,15 +21,19 @@
#ifndef TODAY_H
#define TODAY_H
-#include "todaybase.h"
#include <qpe/datebookdb.h>
+#include <qpe/event.h>
#include <qdatetime.h>
#include <qlist.h>
+
#include "TodoItem.h"
#include "todayconfig.h"
+#include "todaybase.h"
+#include "clickablelabel.h"
+
+class QVBoxLayout;
-class Today : public TodayBase
-{
+class Today : public TodayBase {
Q_OBJECT
@@ -62,4 +66,19 @@ class Today : public TodayBase
int SHOW_NOTES;
};
+
+class DateBookEvent: public ClickableLabel {
+ Q_OBJECT
+public:
+ DateBookEvent(const EffectiveEvent &ev,
+ QWidget* parent = 0, const char* name = 0,
+ WFlags fl = 0);
+signals:
+ void editEvent(const Event &e);
+private slots:
+ void editMe();
+private:
+ const EffectiveEvent event;
+};
+
#endif // TODAY_H
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro
index 7d56e71..454b3ff 100644
--- a/core/pim/today/today.pro
+++ b/core/pim/today/today.pro
@@ -2,6 +2,7 @@ TEMPLATE = app
#CONFIG = qt warn_on debug
CONFIG = qt warn_on release
-HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h
-SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp
+HEADERS = today.h TodoItem.h minidom.h todaybase.h todayconfig.h clickablelabel.h
+SOURCES = main.cpp today.cpp todaybase.cpp todayconfig.cpp minidom.c TodoItem.cpp clickablelabel.cpp
+
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp
index 5c1dc24..552e2eb 100644
--- a/core/pim/today/todaybase.cpp
+++ b/core/pim/today/todaybase.cpp
@@ -52,4 +52,5 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
this->setPalette(pal);
+
QWidget *d = QApplication::desktop();
int w=d->width();
@@ -96,5 +97,6 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
Frame4->setGeometry (QRect( 0, 0, this->width() , this->height()) );
- QScrollView* sv1 = new QScrollView( Frame4 );
+ // QScrollView* sv1 = new QScrollView( Frame4 );
+ sv1 = new QScrollView( Frame4 );
sv1->setResizePolicy(QScrollView::AutoOneFit);
sv1->setHScrollBarMode( QScrollView::AlwaysOff );
@@ -110,11 +112,13 @@ TodayBase::TodayBase( QWidget* parent, const char* name, WFlags fl )
DatesButton->setFlat( TRUE );
- DatesField = new QLabel( sv1->viewport(), "DatesField" );
- sv1->addChild(DatesField);
- DatesField->setText( tr( "No appointments today" ) );
- DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
+ //DatesField = new QLabel( sv1->viewport(), "DatesField" );
+ //DatesField = new QVBox(sv1->viewport());
+ //QWidget *dummy = new QWidget(sv1->viewport());
+ //sv1->addChild(DatesField);
+ //DatesField->setText( tr( "No appointments today" ) );
+ // DatesField->setAlignment( int( QLabel::AlignTop | QLabel::AlignLeft ) );
- // --- mail section ---
+ // --- mail section ---)
MailFrame = new QFrame( this ,"MailFrame" );
MailFrame->setBackgroundOrigin( QScrollView::ParentOrigin );
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h
index 13fbb8d..8840125 100644
--- a/core/pim/today/todaybase.h
+++ b/core/pim/today/todaybase.h
@@ -15,5 +15,5 @@
#include <qsplitter.h>
-class QVBoxLayout;
+class QVBox;
class QHBoxLayout;
class QGridLayout;
@@ -33,8 +33,10 @@ public:
QFrame* Frame4;
QPushButton* DatesButton;
- QLabel* DatesField;
+ //QLabel* DatesField;
QLabel* Frame;
QFrame* MailFrame;
QLabel* TextLabel1;
+ QScrollView* sv1;
+ QVBox* DatesField;
QFrame* Frame15;
QLabel* TodoField;
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h
index 020097d..4739b5a 100644
--- a/core/pim/today/todayconfig.h
+++ b/core/pim/today/todayconfig.h
@@ -12,5 +12,5 @@
#include <qvariant.h>
#include <qdialog.h>
-class QVBoxLayout;
+//class QVBoxLayout;
class QHBoxLayout;
class QGridLayout;