4 files changed, 18 insertions, 14 deletions
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index d4e8e1e..c37813b 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -22,9 +22,8 @@ | |||
22 | 22 | ||
23 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | 23 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, |
24 | QWidget* parent, | 24 | QWidget* parent, |
25 | int show_location, | 25 | bool show_location, |
26 | int show_notes, | 26 | bool show_notes, |
27 | // int onlyLater, | ||
28 | int maxCharClip, | 27 | int maxCharClip, |
29 | const char* name, | 28 | const char* name, |
30 | WFlags fl) : | 29 | WFlags fl) : |
@@ -45,7 +44,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
45 | } | 44 | } |
46 | 45 | ||
47 | // include location or not | 46 | // include location or not |
48 | if ( show_location == 1) { | 47 | if ( show_location ) { |
49 | msg += "<BR><i>" + (ev).location() + "</i>"; | 48 | msg += "<BR><i>" + (ev).location() + "</i>"; |
50 | } | 49 | } |
51 | 50 | ||
@@ -60,16 +59,21 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
60 | } | 59 | } |
61 | 60 | ||
62 | // include possible note or not | 61 | // include possible note or not |
63 | if ( show_notes == 1) { | 62 | if ( show_notes ) { |
64 | msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); | 63 | msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip ); |
65 | } | 64 | } |
66 | 65 | ||
67 | setText( msg ); | 66 | setText( msg ); |
68 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); | 67 | connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); |
69 | setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); | 68 | // setAlignment( int( QLabel::WordBreak | QLabel::AlignLeft ) ); |
70 | } | 69 | } |
71 | 70 | ||
72 | 71 | ||
72 | /** | ||
73 | * AM/PM timestring conversion. | ||
74 | * @param tm the timestring | ||
75 | * @return formatted to am/pm is system is set to it | ||
76 | */ | ||
73 | QString DateBookEvent::ampmTime( QTime tm ) { | 77 | QString DateBookEvent::ampmTime( QTime tm ) { |
74 | 78 | ||
75 | QString s; | 79 | QString s; |
@@ -92,7 +96,7 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
92 | } | 96 | } |
93 | 97 | ||
94 | 98 | ||
95 | /* | 99 | /** |
96 | * starts the edit dialog as known from datebook | 100 | * starts the edit dialog as known from datebook |
97 | */ | 101 | */ |
98 | void DateBookEvent::editEventSlot( const Event &e ) { | 102 | void DateBookEvent::editEventSlot( const Event &e ) { |
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 1168f7c..61c64f1 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -28,9 +28,8 @@ class DateBookEvent: public OClickableLabel { | |||
28 | public: | 28 | public: |
29 | DateBookEvent(const EffectiveEvent &ev, | 29 | DateBookEvent(const EffectiveEvent &ev, |
30 | QWidget* parent = 0, | 30 | QWidget* parent = 0, |
31 | int show_location = 0, | 31 | bool show_location = 0, |
32 | int show_notes = 0, | 32 | bool show_notes = 0, |
33 | // int onlyLater = 0, | ||
34 | int maxCharClip = 0, | 33 | int maxCharClip = 0, |
35 | const char* name = 0, | 34 | const char* name = 0, |
36 | WFlags fl = 0); | 35 | WFlags fl = 0); |
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 9800e61..07f5005 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp | |||
@@ -1,3 +1,4 @@ | |||
1 | |||
1 | /* | 2 | /* |
2 | * datebookplugin.cpp | 3 | * datebookplugin.cpp |
3 | * | 4 | * |
@@ -33,7 +34,7 @@ QString DatebookPlugin::pluginName() const { | |||
33 | } | 34 | } |
34 | 35 | ||
35 | double DatebookPlugin::versionNumber() const { | 36 | double DatebookPlugin::versionNumber() const { |
36 | return 0.1; | 37 | return 1.0; |
37 | } | 38 | } |
38 | 39 | ||
39 | QString DatebookPlugin::pixmapNameWidget() const { | 40 | QString DatebookPlugin::pixmapNameWidget() const { |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index e0213ec..1720bb2 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -41,11 +41,11 @@ private: | |||
41 | // how many lines should be showed in the datebook section | 41 | // how many lines should be showed in the datebook section |
42 | int m_max_lines_meet; | 42 | int m_max_lines_meet; |
43 | // If location is to be showed too, 1 to activate it. | 43 | // If location is to be showed too, 1 to activate it. |
44 | int m_show_location; | 44 | bool m_show_location; |
45 | // if notes should be shown | 45 | // if notes should be shown |
46 | int m_show_notes; | 46 | bool m_show_notes; |
47 | // should only later appointments be shown or all for the current day. | 47 | // should only later appointments be shown or all for the current day. |
48 | int m_onlyLater; | 48 | bool m_onlyLater; |
49 | 49 | ||
50 | }; | 50 | }; |
51 | 51 | ||