summaryrefslogtreecommitdiff
authordeller <deller>2005-04-03 17:03:30 (UTC)
committer deller <deller>2005-04-03 17:03:30 (UTC)
commit5929a5467aacf1b95a570bdb560d03b28d9ae679 (patch) (unidiff)
treeb06e2fc2dfae46812d70c9917376a3fa25df4c39
parenta5020219d43b9dd788cc090ae565c28f27dd6a58 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog2
-rw-r--r--core/pim/today/plugins/datebook/datebookevent.cpp8
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 967e68a..b917c4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,10 @@
2 2
3 Fixed Bugs 3 Fixed Bugs
4 ---------- 4 ----------
5 * n.a.- scale O-Menu-Applets appropriately (mickeyl) 5 * n.a.- scale O-Menu-Applets appropriately (mickeyl)
6 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
7 * n.a.- always show volume and wireless applet popups inside visible screen (deller)
6 8
7 2005-03-25Opie 1.2.0 9 2005-03-25Opie 1.2.0
8 10
9 Fixed Bugs 11 Fixed Bugs
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
@@ -49,24 +49,26 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
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 }