Diffstat (limited to 'core/pim/today/plugins/datebook') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/today/plugins/datebook/config.in | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/datebook/datebookevent.h | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in index 7a14438..413e0b8 100644 --- a/core/pim/today/plugins/datebook/config.in +++ b/core/pim/today/plugins/datebook/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config TODAY_DATEBOOK | 1 | config TODAY_DATEBOOK |
2 | boolean "datebook" | 2 | boolean "datebook" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2 |
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index 9a820f2..f5b0d0a 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -1,49 +1,50 @@ | |||
1 | /* | 1 | /* |
2 | * datebookevent.cpp | 2 | * datebookevent.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "datebookevent.h" | 17 | #include "datebookevent.h" |
18 | 18 | ||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
21 | #include <qpe/calendar.h> | 21 | #include <qpe/calendar.h> |
22 | 22 | ||
23 | #include <opie2/odevice.h> | 23 | #include <opie2/odevice.h> |
24 | 24 | ||
25 | using namespace Opie; | 25 | using namespace Opie::Ui; |
26 | using namespace Opie::Core; | ||
26 | 27 | ||
27 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | 28 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, |
28 | QWidget* parent, | 29 | QWidget* parent, |
29 | bool show_location, | 30 | bool show_location, |
30 | bool show_notes, | 31 | bool show_notes, |
31 | bool timeExtraLine, | 32 | bool timeExtraLine, |
32 | int maxCharClip, | 33 | int maxCharClip, |
33 | const char* name, | 34 | const char* name, |
34 | WFlags fl) : | 35 | WFlags fl) : |
35 | OClickableLabel(parent,name,fl), event(ev) { | 36 | OClickableLabel(parent,name,fl), event(ev) { |
36 | 37 | ||
37 | // setAlignment( AlignTop ); | 38 | // setAlignment( AlignTop ); |
38 | 39 | ||
39 | QString msg; | 40 | QString msg; |
40 | 41 | ||
41 | Config config( "qpe" ); | 42 | Config config( "qpe" ); |
42 | config.setGroup( "Time" ); | 43 | config.setGroup( "Time" ); |
43 | // if 24 h format | 44 | // if 24 h format |
44 | ampm = config.readBoolEntry( "AMPM", TRUE ); | 45 | ampm = config.readBoolEntry( "AMPM", TRUE ); |
45 | 46 | ||
46 | msg += "<B>" + (ev).description() + "</B>"; | 47 | msg += "<B>" + (ev).description() + "</B>"; |
47 | if ( (ev).event().hasAlarm() ) { | 48 | if ( (ev).event().hasAlarm() ) { |
48 | msg += " <b>" + tr("[with alarm]") +"</b>"; | 49 | msg += " <b>" + tr("[with alarm]") +"</b>"; |
49 | } | 50 | } |
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index e2ee077..973efe4 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -1,50 +1,49 @@ | |||
1 | /* | 1 | /* |
2 | * datebookplugin.h | 2 | * datebookplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß | 4 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
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 <opie2/oclickablelabel.h> | 20 | #include <opie2/oclickablelabel.h> |
21 | 21 | ||
22 | #include <qpe/datebookdb.h> | 22 | #include <qpe/datebookdb.h> |
23 | 23 | ||
24 | using namespace Opie; | ||
25 | 24 | ||
26 | class DateBookEvent: public OClickableLabel { | 25 | class DateBookEvent: public Opie::Ui::OClickableLabel { |
27 | 26 | ||
28 | Q_OBJECT | 27 | Q_OBJECT |
29 | 28 | ||
30 | public: | 29 | public: |
31 | DateBookEvent( const EffectiveEvent &ev, | 30 | DateBookEvent( const EffectiveEvent &ev, |
32 | QWidget* parent = 0, | 31 | QWidget* parent = 0, |
33 | bool show_location = 0, | 32 | bool show_location = 0, |
34 | bool show_notes = 0, | 33 | bool show_notes = 0, |
35 | bool timeExtraLine = 0, | 34 | bool timeExtraLine = 0, |
36 | int maxCharClip = 0, | 35 | int maxCharClip = 0, |
37 | const char* name = 0, | 36 | const char* name = 0, |
38 | WFlags fl = 0 ); | 37 | WFlags fl = 0 ); |
39 | ~DateBookEvent(); | 38 | ~DateBookEvent(); |
40 | 39 | ||
41 | signals: | 40 | signals: |
42 | void editEvent( const Event &e ); | 41 | void editEvent( const Event &e ); |
43 | 42 | ||
44 | private slots: | 43 | private slots: |
45 | void editEventSlot( const Event &e ); | 44 | void editEventSlot( const Event &e ); |
46 | void editMe(); | 45 | void editMe(); |
47 | 46 | ||
48 | private: | 47 | private: |
49 | 48 | ||
50 | QString ampmTime( QTime ); | 49 | QString ampmTime( QTime ); |