author | harlekin <harlekin> | 2002-09-18 15:03:24 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-09-18 15:03:24 (UTC) |
commit | dd4b256d39e7a438a7d688471d257dd10a75d138 (patch) (unidiff) | |
tree | d2e4a84f5b150ff0dc85b47a5ac9cee82d135cff | |
parent | 6008e7d286293a87fca4ff43729bdfa66d700989 (diff) | |
download | opie-dd4b256d39e7a438a7d688471d257dd10a75d138.zip opie-dd4b256d39e7a438a7d688471d257dd10a75d138.tar.gz opie-dd4b256d39e7a438a7d688471d257dd10a75d138.tar.bz2 |
use bool where bool is ment
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 | |||
@@ -19,15 +19,14 @@ | |||
19 | #include <qpe/timestring.h> | 19 | #include <qpe/timestring.h> |
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 | 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) : |
31 | OClickableLabel(parent,name,fl), event(ev) { | 30 | OClickableLabel(parent,name,fl), event(ev) { |
32 | 31 | ||
33 | setAlignment( AlignTop ); | 32 | setAlignment( AlignTop ); |
@@ -42,13 +41,13 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
42 | msg += "<B>" + (ev).description() + "</B>"; | 41 | msg += "<B>" + (ev).description() + "</B>"; |
43 | if ( (ev).event().hasAlarm() ) { | 42 | if ( (ev).event().hasAlarm() ) { |
44 | msg += " <b>[with alarm]</b>"; | 43 | msg += " <b>[with alarm]</b>"; |
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 | ||
52 | if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) | 51 | if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" ) |
53 | && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59") ) { | 52 | && ( TimeString::timeString( QTime( (ev).event().end().time() ) ) == "23:59") ) { |
54 | msg += "<br>All day"; | 53 | msg += "<br>All day"; |
@@ -57,22 +56,27 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | |||
57 | msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) ) | 56 | msg += "<br>" + ampmTime(QTime( (ev).event().start().time() ) ) |
58 | // end time of event | 57 | // end time of event |
59 | + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) ); | 58 | + "<b> - </b>" + ampmTime(QTime( (ev).event().end().time() ) ); |
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; |
76 | if( ampm ) { | 80 | if( ampm ) { |
77 | int hour = tm.hour(); | 81 | int hour = tm.hour(); |
78 | if ( hour == 0 ) { | 82 | if ( hour == 0 ) { |
@@ -89,13 +93,13 @@ QString DateBookEvent::ampmTime( QTime tm ) { | |||
89 | return s; | 93 | return s; |
90 | } | 94 | } |
91 | 95 | ||
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 ) { |
99 | startDatebook(); | 103 | startDatebook(); |
100 | 104 | ||
101 | while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents(); | 105 | while( !QCopChannel::isRegistered( "QPE/Datebook" ) ) qApp->processEvents(); |
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 | |||
@@ -25,15 +25,14 @@ 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 | 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); |
37 | signals: | 36 | signals: |
38 | void editEvent(const Event &e); | 37 | void editEvent(const Event &e); |
39 | private slots: | 38 | private slots: |
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,6 +1,7 @@ | |||
1 | |||
1 | /* | 2 | /* |
2 | * datebookplugin.cpp | 3 | * datebookplugin.cpp |
3 | * | 4 | * |
4 | * copyright : (c) 2002 by Maximilian Reiß | 5 | * copyright : (c) 2002 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 6 | * email : harlekin@handhelds.org |
6 | * | 7 | * |
@@ -30,13 +31,13 @@ DatebookPlugin::~DatebookPlugin() { | |||
30 | 31 | ||
31 | QString DatebookPlugin::pluginName() const { | 32 | QString DatebookPlugin::pluginName() const { |
32 | return "Datebook plugin"; | 33 | return "Datebook plugin"; |
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 { |
40 | return "DateBook"; | 41 | return "DateBook"; |
41 | } | 42 | } |
42 | 43 | ||
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 | |||
@@ -38,15 +38,15 @@ private: | |||
38 | void readConfig(); | 38 | void readConfig(); |
39 | void getDates(); | 39 | void getDates(); |
40 | 40 | ||
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 | ||
52 | #endif | 52 | #endif |