summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/today.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 028947d..3d17379 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -525,49 +525,49 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev,
525 525
526 QString msg; 526 QString msg;
527 QTime time = QTime::currentTime(); 527 QTime time = QTime::currentTime();
528 528
529 Config config( "qpe" ); 529 Config config( "qpe" );
530 // if 24 h format 530 // if 24 h format
531 ampm = config.readBoolEntry( "AMPM", TRUE ); 531 ampm = config.readBoolEntry( "AMPM", TRUE );
532 532
533 533
534 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) { 534 if ((time.toString() <= TimeString::dateString((ev).event().end())) ) {
535 // show only later appointments 535 // show only later appointments
536 msg += "<B>" + (ev).description() + "</B>"; 536 msg += "<B>" + (ev).description() + "</B>";
537 if ( (ev).event().hasAlarm() ) { 537 if ( (ev).event().hasAlarm() ) {
538 msg += " <b>[with alarm]</b>"; 538 msg += " <b>[with alarm]</b>";
539 } 539 }
540 // include location or not 540 // include location or not
541 if (SHOW_LOCATION == 1) { 541 if (SHOW_LOCATION == 1) {
542 msg += "<BR><i>" + (ev).location() + "</i>"; 542 msg += "<BR><i>" + (ev).location() + "</i>";
543 } 543 }
544 544
545 if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) { 545 if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) {
546 msg += "<br>All day"; 546 msg += "<br>All day";
547 } else { 547 } else {
548 // start time of event 548 // start time of event
549 msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ) 549 msg += "<br>" + ampmTime(QTime((ev).event().start().time()) );
550 // end time of event 550 // end time of event
551 + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); 551 + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) );
552 } 552 }
553 // include possible note or not 553 // include possible note or not
554 if (SHOW_NOTES == 1) { 554 if (SHOW_NOTES == 1) {
555 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); 555 msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP);
556 } 556 }
557 } 557 }
558 558
559 setText(msg); 559 setText(msg);
560 connect(this, SIGNAL(clicked()), this, SLOT(editMe())); 560 connect(this, SIGNAL(clicked()), this, SLOT(editMe()));
561 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); 561 setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) );
562} 562}
563 563
564 564
565QString DateBookEventLater::ampmTime(QTime tm) { 565QString DateBookEventLater::ampmTime(QTime tm) {
566 566
567 QString s; 567 QString s;
568 if( ampm ) { 568 if( ampm ) {
569 int hour = tm.hour(); 569 int hour = tm.hour();
570 if (hour == 0) 570 if (hour == 0)
571 hour = 12; 571 hour = 12;
572 if (hour > 12) 572 if (hour > 12)
573 hour -= 12; 573 hour -= 12;