-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 | |||
@@ -28,2 +28,3 @@ | |||
28 | #include <qpe/qprocess.h> | 28 | #include <qpe/qprocess.h> |
29 | #include <qpe/resource.h> | ||
29 | 30 | ||
@@ -38,2 +39,3 @@ | |||
38 | #include <qtimer.h> | 39 | #include <qtimer.h> |
40 | #include <qpixmap.h> | ||
39 | 41 | ||
@@ -60,8 +62,3 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) | |||
60 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); | 62 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startDatebook() ) ); |
61 | QObject::connect( (QObject*)DatesButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); | 63 | QObject::connect( (QObject*)MailButton, SIGNAL( clicked() ), this, SLOT(startMail() ) ); |
62 | |||
63 | QDate date = QDate::currentDate(); | ||
64 | QString time = (date.toString()); | ||
65 | TextLabel1->setText(time); | ||
66 | db = new DateBookDB; | ||
67 | 64 | ||
@@ -78,3 +75,3 @@ void Today::draw() | |||
78 | // how often refresh | 75 | // how often refresh |
79 | QTimer::singleShot( 30*1000, this, SLOT(draw()) ); | 76 | QTimer::singleShot( 5*1000, this, SLOT(draw()) ); |
80 | 77 | ||
@@ -84,2 +81,8 @@ void Today::init() | |||
84 | { | 81 | { |
82 | QDate date = QDate::currentDate(); | ||
83 | QString time = (date.toString()); | ||
84 | |||
85 | TextLabel1->setText("<qt><font color=white>" +time + "<font></qt>"); | ||
86 | db = new DateBookDB; | ||
87 | |||
85 | // read config | 88 | // read config |
@@ -149,2 +152,3 @@ void Today::startConfig() | |||
149 | 152 | ||
153 | |||
150 | /* | 154 | /* |
@@ -160,3 +164,3 @@ void Today::getDates() | |||
160 | // if 24 h format | 164 | // if 24 h format |
161 | // bool ampm = config.readBoolEntry( "AMPM", TRUE ); | 165 | //bool ampm = config.readBoolEntry( "AMPM", TRUE ); |
162 | 166 | ||
@@ -182,16 +186,20 @@ void Today::getDates() | |||
182 | { | 186 | { |
183 | msg += "<B>" + (*it).description() + "</B>"; | 187 | msg += "<B>" + (*it).description() + "</B>"; |
184 | // include location or not | 188 | if ( (*it).event().hasAlarm() ) |
185 | if (SHOW_LOCATION == 1) | 189 | { |
186 | { | 190 | msg += " <b>[with alarm]</b>"; |
191 | } | ||
192 | // include location or not | ||
193 | if (SHOW_LOCATION == 1) | ||
194 | { | ||
187 | msg+= "<BR>" + (*it).location(); | 195 | msg+= "<BR>" + (*it).location(); |
188 | } | 196 | } |
189 | msg += "<BR>" | 197 | msg += "<BR>" |
190 | // start time of event | 198 | // start time of event |
191 | + TimeString::timeString(QTime((*it).event().start().time()) ) | 199 | + TimeString::timeString(QTime((*it).event().start().time()) ) |
192 | // end time of event | 200 | // end time of event |
193 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) | 201 | + "<b> - </b>" + TimeString::timeString(QTime((*it).event().end().time()) ) |
194 | + "<BR>"; | 202 | + "<BR>"; |
195 | // include possible note or not | 203 | // include possible note or not |
196 | if (SHOW_NOTES == 1) | 204 | if (SHOW_NOTES == 1) |
197 | { | 205 | { |
@@ -203,2 +211,6 @@ void Today::getDates() | |||
203 | msg += "<B>" + (*it).description() + "</B>"; | 211 | msg += "<B>" + (*it).description() + "</B>"; |
212 | if ( (*it).event().hasAlarm() ) | ||
213 | { | ||
214 | msg += " <b>[with alarm]</b>"; | ||
215 | } | ||
204 | // include location or not | 216 | // include location or not |
@@ -232,3 +244,2 @@ void Today::getDates() | |||
232 | * Parse in the todolist.xml | 244 | * Parse in the todolist.xml |
233 | * | ||
234 | */ | 245 | */ |
@@ -264,3 +275,4 @@ QList<TodoItem> Today::loadTodo(const char *filename) | |||
264 | { | 275 | { |
265 | if(!attlist[i]->name) continue; | 276 | // SEGFAULT HERE WITH MORE THAN 7 ENTRIES |
277 | if(!attlist[j]->name) continue; | ||
266 | if(!strcmp(attlist[j]->name, "Description")) | 278 | if(!strcmp(attlist[j]->name, "Description")) |