-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 8 |
2 files changed, 7 insertions, 3 deletions
@@ -1,29 +1,31 @@ | |||
1 | 2005-??-??Opie 1.2.1 | 1 | 2005-??-??Opie 1.2.1 |
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 |
10 | ---------- | 12 | ---------- |
11 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) | 13 | * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) |
12 | * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) | 14 | * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) |
13 | * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) | 15 | * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) |
14 | * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) | 16 | * n.a. - PackageManager - fix bug where messages show up multiple times in install dialog (drw) |
15 | * n.a. - make qpeglobal.h include qglobal.h (zecke) | 17 | * n.a. - make qpeglobal.h include qglobal.h (zecke) |
16 | 18 | ||
17 | 2005-03-20Opie 1.2.0-rc1 | 19 | 2005-03-20Opie 1.2.0-rc1 |
18 | 20 | ||
19 | 21 | ||
20 | New Features | 22 | New Features |
21 | ------------ | 23 | ------------ |
22 | * Launcher: Support a static background pixmap (mickeyl) | 24 | * Launcher: Support a static background pixmap (mickeyl) |
23 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) | 25 | * LauncherSettings: Choose whether to have a static background pixmap (mickeyl) |
24 | * PackageManager supports the 'lists_dir' ipkg configuration option (drw) | 26 | * PackageManager supports the 'lists_dir' ipkg configuration option (drw) |
25 | * Added hi-res inline images for large resolution devices (drw) | 27 | * Added hi-res inline images for large resolution devices (drw) |
26 | * Improved launcher icons for consistency (ar) | 28 | * Improved launcher icons for consistency (ar) |
27 | * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin) | 29 | * Datebook: Added plugin system to datebook so holidays and birthdays from contacts may displayed in datebook (alwin) |
28 | 30 | ||
29 | Fixed Bugs | 31 | 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 | |||
@@ -29,64 +29,66 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
29 | QWidget* parent, | 29 | QWidget* parent, |
30 | bool show_location, | 30 | bool show_location, |
31 | bool show_notes, | 31 | bool show_notes, |
32 | bool timeExtraLine, | 32 | bool timeExtraLine, |
33 | int maxCharClip, | 33 | int maxCharClip, |
34 | const char* name, | 34 | const char* name, |
35 | WFlags fl) : | 35 | WFlags fl) : |
36 | OClickableLabel(parent,name,fl), event(ev) { | 36 | OClickableLabel(parent,name,fl), event(ev) { |
37 | 37 | ||
38 | // setAlignment( AlignTop ); | 38 | // setAlignment( AlignTop ); |
39 | 39 | ||
40 | QString msg; | 40 | QString msg; |
41 | 41 | ||
42 | Config config( "qpe" ); | 42 | Config config( "qpe" ); |
43 | config.setGroup( "Time" ); | 43 | config.setGroup( "Time" ); |
44 | // if 24 h format | 44 | // if 24 h format |
45 | ampm = config.readBoolEntry( "AMPM", TRUE ); | 45 | ampm = config.readBoolEntry( "AMPM", TRUE ); |
46 | 46 | ||
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() ) { |
75 | msg += differDate( (ev).date() /* tempDate*/ ); | 77 | msg += differDate( (ev).date() /* tempDate*/ ); |
76 | } | 78 | } |
77 | 79 | ||
78 | // include possible note or not | 80 | // include possible note or not |
79 | if ( show_notes ) { | 81 | if ( show_notes ) { |
80 | msg += "<br> <i>" + tr("note") + "</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); | 82 | msg += "<br> <i>" + tr("note") + "</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); |
81 | } | 83 | } |
82 | setText( msg ); | 84 | setText( msg ); |
83 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); | 85 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); |
84 | } | 86 | } |
85 | 87 | ||
86 | DateBookEvent::~DateBookEvent() { | 88 | DateBookEvent::~DateBookEvent() { |
87 | } | 89 | } |
88 | 90 | ||
89 | /** | 91 | /** |
90 | * AM/PM timestring conversion. | 92 | * AM/PM timestring conversion. |
91 | * @param tm the timestring | 93 | * @param tm the timestring |
92 | * @return formatted to am/pm is system is set to it | 94 | * @return formatted to am/pm is system is set to it |