author | deller <deller> | 2005-04-03 17:03:30 (UTC) |
---|---|---|
committer | deller <deller> | 2005-04-03 17:03:30 (UTC) |
commit | 5929a5467aacf1b95a570bdb560d03b28d9ae679 (patch) (unidiff) | |
tree | b06e2fc2dfae46812d70c9917376a3fa25df4c39 /core/pim/today | |
parent | a5020219d43b9dd788cc090ae565c28f27dd6a58 (diff) | |
download | opie-5929a5467aacf1b95a570bdb560d03b28d9ae679.zip opie-5929a5467aacf1b95a570bdb560d03b28d9ae679.tar.gz opie-5929a5467aacf1b95a570bdb560d03b28d9ae679.tar.bz2 |
- fix bug #1535 (Missing line break and unnecessary location shown with Today-Calendar plugin)
- document bugs 1535 and my last commits in the Changelog
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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 | |||
@@ -47,28 +47,30 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
47 | msg += "<B>" + (ev).description() + "</B>"; | 47 | msg += "<B>" + (ev).description() + "</B>"; |
48 | if ( (ev).event().hasAlarm() ) { | 48 | if ( (ev).event().hasAlarm() ) { |
49 | msg += " <b>" + tr("[with alarm]") +"</b>"; | 49 | msg += " <b>" + tr("[with alarm]") +"</b>"; |
50 | } | 50 | } |
51 | 51 | ||
52 | // include location or not | 52 | // include location or not |
53 | if ( show_location ) { | 53 | if ( show_location && !(ev).location().isEmpty() ) { |
54 | msg += "<BR><i>" + (ev).location() + "</i>"; | 54 | if ( (ev).location() != tr("(Unknown)") ) |
55 | msg += "<BR><i>" + (ev).location() + "</i>"; | ||
55 | } | 56 | } |
56 | 57 | ||
57 | QString timeSpacer = " "; | 58 | QString timeSpacer = " "; |
58 | if ( timeExtraLine ) { | 59 | if ( timeExtraLine ) { |
59 | timeSpacer = "<br>"; | 60 | timeSpacer = "<br>"; |
60 | } | 61 | } |
61 | 62 | ||
63 | msg += timeSpacer; | ||
64 | |||
62 | if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) | 65 | if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) |
63 | && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) { | 66 | && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59" ) ) { |
64 | msg += tr ( "All day" ); | 67 | msg += tr ( "All day" ); |
65 | } else { | 68 | } else { |
66 | // start time of event | 69 | // start time of event |
67 | // QDate tempDate = (ev).event().start().date(); | 70 | // QDate tempDate = (ev).event().start().date(); |
68 | msg += timeSpacer; | ||
69 | msg += ampmTime( QTime( (ev).event().start().time() ) ) | 71 | msg += ampmTime( QTime( (ev).event().start().time() ) ) |
70 | // end time of event | 72 | // end time of event |
71 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ); | 73 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ); |
72 | } | 74 | } |
73 | 75 | ||
74 | if ( (ev).date() != QDate::currentDate() ) { | 76 | if ( (ev).date() != QDate::currentDate() ) { |