-rw-r--r-- | core/pim/today/today.cpp | 58 |
1 files changed, 35 insertions, 23 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 @@ -25,8 +25,9 @@ #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> @@ -35,8 +36,9 @@ #include <qspinbox.h> #include <qpushbutton.h> #include <qlabel.h> #include <qtimer.h> +#include <qpixmap.h> //#include <iostream.h> //#include <unistd.h> #include <stdlib.h> @@ -57,14 +59,9 @@ Today::Today( QWidget* parent, const char* name, WFlags 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(); } @@ -75,14 +72,20 @@ void Today::draw() 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"); @@ -146,8 +149,9 @@ void Today::startConfig() draw(); } + /* * Get all events that are in the datebook xml file for today */ void Today::getDates() @@ -157,9 +161,9 @@ void Today::getDates() QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date); Config config( "qpe" ); // if 24 h format - // bool ampm = config.readBoolEntry( "AMPM", TRUE ); + //bool ampm = config.readBoolEntry( "AMPM", TRUE ); int count=0; if ( list.count() > 0 ) { @@ -179,29 +183,37 @@ void Today::getDates() // decide if to get all day or only later appointments if (!ONLY_LATER) { - msg += "<B>" + (*it).description() + "</B>"; - // include location or not - if (SHOW_LOCATION == 1) - { + 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>" - // start time of event - + TimeString::timeString(QTime((*it).event().start().time()) ) - // end time of event - + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) - + "<BR>"; - // include possible note or not - if (SHOW_NOTES == 1) + } + msg += "<BR>" + // start time of event + + TimeString::timeString(QTime((*it).event().start().time()) ) + // end time of event + + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) + + "<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>" + (*it).location(); @@ -229,9 +241,8 @@ void Today::getDates() } /* * Parse in the todolist.xml - * */ QList<TodoItem> Today::loadTodo(const char *filename) { DOM *todo; @@ -261,9 +272,10 @@ QList<TodoItem> Today::loadTodo(const char *filename) 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; } |