| -rw-r--r-- | core/pim/today/today.cpp | 44 |
1 files changed, 39 insertions, 5 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index eb8b50c..0f6e598 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp @@ -44,13 +44,13 @@ int MAX_LINES_TASK; int MAX_CHAR_CLIP; int MAX_LINES_MEET; int SHOW_LOCATION; int SHOW_NOTES; // show only later dates -int ONLY_LATER = 1; +int ONLY_LATER; /* * Constructs a Example which is a child of 'parent', with the * name 'name' and widget flags set to 'f' */ Today::Today( QWidget* parent, const char* name, WFlags fl ) : TodayBase( parent, name, fl ) @@ -72,13 +72,14 @@ Today::Today( QWidget* parent, const char* name, WFlags fl ) void Today::draw() { init(); getDates(); getMail(); getTodo(); - QTimer::singleShot( 60*1000, this, SLOT(draw()) ); + // how often refresh + QTimer::singleShot( 30*1000, this, SLOT(draw()) ); } void Today::init() { // read config @@ -92,12 +93,14 @@ void Today::init() // how many lines should be showed in the datebook section MAX_LINES_MEET = cfg.readNumEntry("maxlinesmeet",5); // If location is to be showed too, 1 to activate it. SHOW_LOCATION = cfg.readNumEntry("showlocation",1); // if notes should be shown SHOW_NOTES = cfg.readNumEntry("shownotes",0); + ONLY_LATER = cfg.readNumEntry("onlylater",1); + } void Today::startConfig() { conf = new todayconfig ( this, "", true ); @@ -116,26 +119,30 @@ void Today::startConfig() // notes show box conf->CheckBox2->setChecked(SHOW_NOTES); // task lines conf->SpinBox2->setValue(MAX_LINES_TASK); // clip when? conf->SpinBox7->setValue(MAX_CHAR_CLIP); - + // only later + conf->CheckBox3->setChecked(ONLY_LATER); + conf->exec(); int maxlinestask = conf->SpinBox2->value(); int maxmeet = conf->SpinBox1->value(); int location = conf->CheckBox1->isChecked(); int notes = conf->CheckBox2->isChecked(); int maxcharclip = conf->SpinBox7->value(); - + int onlylater = conf->CheckBox3->isChecked(); + cfg.writeEntry("maxlinestask",maxlinestask); 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(); } @@ -166,13 +173,35 @@ void Today::getDates() 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 - if ((time.toString() <= TimeString::dateString((*it).event().end())) && ONLY_LATER ) + + // 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+= "<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())) && ONLY_LATER ) { msg += "<B>" + (*it).description() + "</B>"; // include location or not if (SHOW_LOCATION == 1) { msg+= "<BR>" + (*it).location(); @@ -187,12 +216,17 @@ void Today::getDates() if (SHOW_NOTES == 1) { msg += " <i>note</i>:" +((*it).notes()).mid(0, MAX_CHAR_CLIP) + "<br>"; } } } + + if (msg.isEmpty()) + { + msg = "No more appointments today"; + } } DatesField->setText(msg); } } /* |