-rw-r--r-- | core/pim/today/today.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index 3d17379..6dac6d9 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -470,25 +470,25 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
470 | if ( (ev).event().hasAlarm() ) { | 470 | if ( (ev).event().hasAlarm() ) { |
471 | msg += " <b>[with alarm]</b>"; | 471 | msg += " <b>[with alarm]</b>"; |
472 | } | 472 | } |
473 | // include location or not | 473 | // include location or not |
474 | if (SHOW_LOCATION == 1) { | 474 | if (SHOW_LOCATION == 1) { |
475 | msg += "<BR><i>" + (ev).location() + "</i>"; | 475 | msg += "<BR><i>" + (ev).location() + "</i>"; |
476 | } | 476 | } |
477 | 477 | ||
478 | if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) { | 478 | if ( (TimeString::timeString(QTime((ev).event().start().time()) ) == "00:00") && (TimeString::timeString(QTime((ev).event().end().time()) ) == "23:59") ) { |
479 | msg += "<br>All day"; | 479 | msg += "<br>All day"; |
480 | } else { | 480 | } else { |
481 | // start time of event | 481 | // start time of event |
482 | msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ); | 482 | msg += "<br>" + ampmTime(QTime((ev).event().start().time()) ) |
483 | // end time of event | 483 | // end time of event |
484 | + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); | 484 | + "<b> - </b>" + ampmTime(QTime((ev).event().end().time()) ); |
485 | } | 485 | } |
486 | 486 | ||
487 | // include possible note or not | 487 | // include possible note or not |
488 | if (SHOW_NOTES == 1) { | 488 | if (SHOW_NOTES == 1) { |
489 | msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); | 489 | msg += "<br> <i>note</i>:" +((ev).notes()).mid(0, MAX_CHAR_CLIP); |
490 | } | 490 | } |
491 | } | 491 | } |
492 | setText(msg); | 492 | setText(msg); |
493 | connect(this, SIGNAL(clicked()), this, SLOT(editMe())); | 493 | connect(this, SIGNAL(clicked()), this, SLOT(editMe())); |
494 | setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); | 494 | setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); |
@@ -537,25 +537,25 @@ DateBookEventLater::DateBookEventLater(const EffectiveEvent &ev, | |||
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 ) ); |