summaryrefslogtreecommitdiff
authordeller <deller>2005-04-03 17:03:30 (UTC)
committer deller <deller>2005-04-03 17:03:30 (UTC)
commit5929a5467aacf1b95a570bdb560d03b28d9ae679 (patch) (side-by-side diff)
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
@@ -1,11 +1,13 @@
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)
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,
msg += "<B>" + (ev).description() + "</B>";
if ( (ev).event().hasAlarm() ) {
msg += " <b>" + tr("[with alarm]") +"</b>";
}
// 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>";
}
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() ) {