| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
@@ -5,2 +5,4 @@ * n.a. - scale O-Menu-Applets appropriately (mickeyl) + * #1535 - Missing line break and unnecessary location shown with Today-Calendar plugin (deller) + * n.a. - always show volume and wireless applet popups inside visible screen (deller) diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index f5b0d0a..a540327 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp @@ -52,4 +52,5 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, // include location or not - if ( show_location ) { - msg += "<BR><i>" + (ev).location() + "</i>"; + if ( show_location && !(ev).location().isEmpty() ) { + if ( (ev).location() != tr("(Unknown)") ) + msg += "<BR><i>" + (ev).location() + "</i>"; } @@ -61,2 +62,4 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, + msg += timeSpacer; + if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) @@ -67,3 +70,2 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, // QDate tempDate = (ev).event().start().date(); - msg += timeSpacer; msg += ampmTime( QTime( (ev).event().start().time() ) ) |