| -rw-r--r-- | core/pim/today/today.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 7a2d0c9..bed3a74 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -23,22 +23,24 @@ #include <qpe/datebookdb.h> #include <qpe/timestring.h> #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/qprocess.h> +#include <qpe/resource.h> #include <qdir.h> #include <qfile.h> #include <qdatetime.h> #include <qtextstream.h> #include <qcheckbox.h> #include <qspinbox.h> #include <qpushbutton.h> #include <qlabel.h> #include <qtimer.h> +#include <qpixmap.h> //#include <iostream.h> //#include <unistd.h> #include <stdlib.h> int MAX_LINES_TASK; @@ -55,36 +57,37 @@ int ONLY_LATER; Today::Today( QWidget* parent, const char* name, WFlags fl ) : TodayBase( parent, name, fl ) { QObject::connect( (QObject*)PushButton1, SIGNAL( clicked() ), this, SLOT(startConfig() ) ); QObject::connect( (QObject*)TodoButton, SIGNAL( clicked() ), this, SLOT(startTodo() ) ); QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); - QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); - - QDate date = QDate::currentDate(); - QString time = (date.toString()); - TextLabel1->setText(time); - db = new DateBookDB; + QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); draw(); } void Today::draw() { init(); getDates(); getMail(); getTodo(); // how often refresh - QTimer::singleShot( 30*1000, this, SLOT(draw()) ); + QTimer::singleShot( 5*1000, this, SLOT(draw()) ); } void Today::init() { + QDate date = QDate::currentDate(); + QString time = (date.toString()); + + TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>"); + db = new DateBookDB; + // read config Config cfg("today"); cfg.setGroup("BaseConfig"); // how many lines should be showed in the task section MAX_LINES_TASK = cfg.readNumEntry("maxlinestask",5); @@ -144,12 +147,13 @@ void Today::startConfig() cfg.write(); draw(); } + /* * Get all events that are in the datebook xml file for today */ void Today::getDates() { QDate date = QDate::currentDate(); @@ -178,12 +182,16 @@ void Today::getDates() // still some bug in here, 1 h off // 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>" + (*it).location(); } msg += "<BR>" @@ -198,12 +206,16 @@ void Today::getDates() 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>" + (*it).location(); } msg += "<BR>" @@ -227,13 +239,12 @@ void Today::getDates() DatesField->setText(msg); } } /* * Parse in the todolist.xml - * */ QList<TodoItem> Today::loadTodo(const char *filename) { DOM *todo; ELE *tasks; ELE **tasklist; @@ -259,13 +270,14 @@ QList<TodoItem> Today::loadTodo(const char *filename) j = 0; description = NULL; priority = -1; completed = -1; while((attlist) && (attlist[j])) { - if(!attlist[i]->name) continue; + // SEGFAULT HERE WITH MORE THAN 7 ENTRIES + if(!attlist[j]->name) continue; if(!strcmp(attlist[j]->name, "Description")) { description = attlist[j]->value; } // get Completed tag (0 or 1) if(!strcmp(attlist[j]->name, "Completed")) |