-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.h | 24 |
2 files changed, 16 insertions, 12 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index 8277529..48f204e 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -20,33 +20,33 @@ | |||
20 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
21 | #include <qpe/qpeapplication.h> | 21 | #include <qpe/qpeapplication.h> |
22 | 22 | ||
23 | #include <opie/odevice.h> | 23 | #include <opie/odevice.h> |
24 | 24 | ||
25 | using namespace Opie; | 25 | using namespace Opie; |
26 | 26 | ||
27 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | 27 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, |
28 | QWidget* parent, | 28 | QWidget* parent, |
29 | bool show_location, | 29 | bool show_location, |
30 | bool show_notes, | 30 | bool show_notes, |
31 | int maxCharClip, | 31 | int maxCharClip, |
32 | const char* name, | 32 | const char* name, |
33 | WFlags fl) : | 33 | WFlags fl) : |
34 | OClickableLabel(parent,name,fl), event(ev) { | 34 | OClickableLabel(parent,name,fl), event(ev) { |
35 | 35 | ||
36 | setAlignment( AlignTop ); | 36 | // setAlignment( AlignTop ); |
37 | 37 | ||
38 | QString msg; | 38 | QString msg; |
39 | 39 | ||
40 | Config config( "qpe" ); | 40 | Config config( "qpe" ); |
41 | config.setGroup( "Time" ); | 41 | config.setGroup( "Time" ); |
42 | // if 24 h format | 42 | // if 24 h format |
43 | ampm = config.readBoolEntry( "AMPM", TRUE ); | 43 | ampm = config.readBoolEntry( "AMPM", TRUE ); |
44 | 44 | ||
45 | msg += "<B>" + (ev).description() + "</B>"; | 45 | msg += "<B>" + (ev).description() + "</B>"; |
46 | if ( (ev).event().hasAlarm() ) { | 46 | if ( (ev).event().hasAlarm() ) { |
47 | msg += " <b>[with alarm]</b>"; | 47 | msg += " <b>[with alarm]</b>"; |
48 | } | 48 | } |
49 | 49 | ||
50 | // include location or not | 50 | // include location or not |
51 | if ( show_location ) { | 51 | if ( show_location ) { |
52 | msg += "<BR><i>" + (ev).location() + "</i>"; | 52 | msg += "<BR><i>" + (ev).location() + "</i>"; |
@@ -60,32 +60,34 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
60 | QDate tempDate = (ev).event().start().date(); | 60 | QDate tempDate = (ev).event().start().date(); |
61 | msg += "<br>" | 61 | msg += "<br>" |
62 | + ampmTime( QTime( (ev).event().start().time() ) ) | 62 | + ampmTime( QTime( (ev).event().start().time() ) ) |
63 | // end time of event | 63 | // end time of event |
64 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ) | 64 | + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) ) |
65 | + differDate( tempDate ); | 65 | + differDate( tempDate ); |
66 | } | 66 | } |
67 | 67 | ||
68 | // include possible note or not | 68 | // include possible note or not |
69 | if ( show_notes ) { | 69 | if ( show_notes ) { |
70 | msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); | 70 | msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); |
71 | } | 71 | } |
72 | setText( msg ); | 72 | setText( msg ); |
73 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); | 73 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); |
74 | } | 74 | } |
75 | 75 | ||
76 | DateBookEvent::~DateBookEvent() { | ||
77 | } | ||
76 | 78 | ||
77 | /** | 79 | /** |
78 | * AM/PM timestring conversion. | 80 | * AM/PM timestring conversion. |
79 | * @param tm the timestring | 81 | * @param tm the timestring |
80 | * @return formatted to am/pm is system is set to it | 82 | * @return formatted to am/pm is system is set to it |
81 | */ | 83 | */ |
82 | QString DateBookEvent::ampmTime( QTime tm ) { | 84 | QString DateBookEvent::ampmTime( QTime tm ) { |
83 | QString s; | 85 | QString s; |
84 | if( ampm ) { | 86 | if( ampm ) { |
85 | int hour = tm.hour(); | 87 | int hour = tm.hour(); |
86 | if ( hour == 0 ) { | 88 | if ( hour == 0 ) { |
87 | hour = 12; | 89 | hour = 12; |
88 | } | 90 | } |
89 | if ( hour > 12 ) { | 91 | if ( hour > 12 ) { |
90 | hour -= 12; | 92 | hour -= 12; |
91 | } | 93 | } |
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index f8a9c03..8027809 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -13,37 +13,39 @@ | |||
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef DATEBOOKEVENT_PLUGIN_H | 17 | #ifndef DATEBOOKEVENT_PLUGIN_H |
18 | #define DATEBOOKEVENT_PLUGIN_H | 18 | #define DATEBOOKEVENT_PLUGIN_H |
19 | 19 | ||
20 | #include <opie/oclickablelabel.h> | 20 | #include <opie/oclickablelabel.h> |
21 | #include <qpe/datebookdb.h> | 21 | #include <qpe/datebookdb.h> |
22 | 22 | ||
23 | 23 | ||
24 | class DateBookEvent: public OClickableLabel { | 24 | class DateBookEvent: public OClickableLabel { |
25 | 25 | ||
26 | Q_OBJECT | 26 | Q_OBJECT |
27 | 27 | ||
28 | public: | 28 | public: |
29 | DateBookEvent( const EffectiveEvent &ev, | 29 | DateBookEvent( const EffectiveEvent &ev, |
30 | QWidget* parent = 0, | 30 | QWidget* parent = 0, |
31 | bool show_location = 0, | 31 | bool show_location = 0, |
32 | bool show_notes = 0, | 32 | bool show_notes = 0, |
33 | int maxCharClip = 0, | 33 | int maxCharClip = 0, |
34 | const char* name = 0, | 34 | const char* name = 0, |
35 | WFlags fl = 0 ); | 35 | WFlags fl = 0 ); |
36 | signals: | 36 | ~DateBookEvent(); |
37 | void editEvent( const Event &e ); | 37 | signals: |
38 | void editEvent( const Event &e ); | ||
39 | |||
38 | private slots: | 40 | private slots: |
39 | void editEventSlot( const Event &e ); | 41 | void editEventSlot( const Event &e ); |
40 | void editMe(); | 42 | void editMe(); |
41 | private: | 43 | private: |
42 | DateBookDB *db; | 44 | |
43 | QString ampmTime( QTime ); | 45 | QString ampmTime( QTime ); |
44 | QString differDate( QDate date ); | 46 | QString differDate( QDate date ); |
45 | const EffectiveEvent event; | 47 | const EffectiveEvent event; |
46 | bool ampm; | 48 | bool ampm; |
47 | }; | 49 | }; |
48 | 50 | ||
49 | #endif | 51 | #endif |