summaryrefslogtreecommitdiff
path: root/core/pim/today/today.cpp
Side-by-side diff
Diffstat (limited to 'core/pim/today/today.cpp') (more/less context) (show whitespace changes)
-rw-r--r--core/pim/today/today.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index bed3a74..9e5c27e 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -141,25 +141,24 @@ void Today::startConfig()
cfg.writeEntry("maxcharclip", maxcharclip);
cfg.writeEntry("maxlinesmeet",maxmeet);
cfg.writeEntry("showlocation",location);
cfg.writeEntry("shownotes", notes);
cfg.writeEntry("onlylater", onlylater);
// sync it to "disk"
cfg.write();
draw();
}
-
/*
* Get all events that are in the datebook xml file for today
*/
void Today::getDates()
{
QDate date = QDate::currentDate();
QTime time = QTime::currentTime();
QValueList<EffectiveEvent> list = db->getEffectiveEvents(date, date);
Config config( "qpe" );
// if 24 h format
//bool ampm = config.readBoolEntry( "AMPM", TRUE );
@@ -167,43 +166,42 @@ void Today::getDates()
int count=0;
if ( list.count() > 0 ) {
QString msg;
for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin();
it!=list.end(); ++it ) {
count++;
if ( count <= MAX_LINES_MEET )
{
- //only get events past current time (start or end??)
//cout << time.toString() << endl;
//cout << TimeString::dateString((*it).event().end()) << endl;
- // 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>"
+
// 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())) )