| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
@@ -1,17 +1,19 @@ 2005-??-?? Opie 1.2.1 Fixed Bugs ---------- * 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) 2005-03-25 Opie 1.2.0 Fixed Bugs ---------- * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) * n.a. - make qpeglobal.h include qglobal.h (zecke) 2005-03-20 Opie 1.2.0-rc1 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 @@ -41,40 +41,42 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, Config config( "qpe" ); config.setGroup( "Time" ); // if 24 h format ampm = config.readBoolEntry( "AMPM", TRUE ); msg += "<B>" + (ev).description() + "</B>"; if ( (ev).event().hasAlarm() ) { msg += " <b>" + tr("[with alarm]") +"</b>"; } // include location or not - if ( show_location ) { + if ( show_location && !(ev).location().isEmpty() ) { + if ( (ev).location() != tr("(Unknown)") ) msg += "<BR><i>" + (ev).location() + "</i>"; } QString timeSpacer = " "; if ( timeExtraLine ) { timeSpacer = "<br>"; } + msg += timeSpacer; + if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) { msg += tr ( "All day" ); } else { // start time of event // QDate tempDate = (ev).event().start().date(); - msg += timeSpacer; msg += ampmTime( QTime( (ev).event().start().time() ) ) // end time of event + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ); } if ( (ev).date() != QDate::currentDate() ) { msg += differDate( (ev).date() /* tempDate*/ ); } // include possible note or not if ( show_notes ) { msg += "<br> <i>" + tr("note") + "</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); |