Diffstat (limited to 'core/pim/today/plugins/datebook') (more/less context) (ignore whitespace changes)
11 files changed, 38 insertions, 32 deletions
diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro index 413aa47..798c981 100644 --- a/core/pim/today/plugins/datebook/datebook.pro +++ b/core/pim/today/plugins/datebook/datebook.pro | |||
@@ -13,7 +13,7 @@ INCLUDEPATH += $(OPIEDIR)/include \ | |||
13 | DEPENDPATH += $(OPIEDIR)/include \ | 13 | DEPENDPATH += $(OPIEDIR)/include \ |
14 | ../ ../library | 14 | ../ ../library |
15 | 15 | ||
16 | LIBS+= -lqpe -lopie | 16 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 |
17 | 17 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | DESTDIR = $(OPIEDIR)/plugins/today |
19 | TARGET = todaydatebookplugin | 19 | TARGET = todaydatebookplugin |
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp index e19a690..9a820f2 100644 --- a/core/pim/today/plugins/datebook/datebookevent.cpp +++ b/core/pim/today/plugins/datebook/datebookevent.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookevent.cpp | 2 | * datebookevent.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003 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 | */ |
@@ -15,11 +15,12 @@ | |||
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "datebookevent.h" | 17 | #include "datebookevent.h" |
18 | |||
18 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
20 | #include <qpe/calendar.h> | 21 | #include <qpe/calendar.h> |
21 | 22 | ||
22 | #include <opie/odevice.h> | 23 | #include <opie2/odevice.h> |
23 | 24 | ||
24 | using namespace Opie; | 25 | using namespace Opie; |
25 | 26 | ||
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h index 1a090e3..e2ee077 100644 --- a/core/pim/today/plugins/datebook/datebookevent.h +++ b/core/pim/today/plugins/datebook/datebookevent.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookplugin.h | 2 | * datebookplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002, 2003 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 | */ |
@@ -17,9 +17,11 @@ | |||
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 <opie2/oclickablelabel.h> |
21 | |||
21 | #include <qpe/datebookdb.h> | 22 | #include <qpe/datebookdb.h> |
22 | 23 | ||
24 | using namespace Opie; | ||
23 | 25 | ||
24 | class DateBookEvent: public OClickableLabel { | 26 | class DateBookEvent: public OClickableLabel { |
25 | 27 | ||
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp index 8dfa52f..f46806f 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.cpp +++ b/core/pim/today/plugins/datebook/datebookplugin.cpp | |||
@@ -1,8 +1,7 @@ | |||
1 | |||
2 | /* | 1 | /* |
3 | * datebookplugin.cpp | 2 | * datebookplugin.cpp |
4 | * | 3 | * |
5 | * copyright : (c) 2002,2003 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003, 2004 by Maximilian Reiß |
6 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
7 | * | 6 | * |
8 | */ | 7 | */ |
@@ -15,8 +14,6 @@ | |||
15 | * * | 14 | * * |
16 | ***************************************************************************/ | 15 | ***************************************************************************/ |
17 | 16 | ||
18 | |||
19 | |||
20 | #include "datebookplugin.h" | 17 | #include "datebookplugin.h" |
21 | #include "datebookpluginconfig.h" | 18 | #include "datebookpluginconfig.h" |
22 | 19 | ||
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h index 890c59b..631d6a3 100644 --- a/core/pim/today/plugins/datebook/datebookplugin.h +++ b/core/pim/today/plugins/datebook/datebookplugin.h | |||
@@ -17,12 +17,12 @@ | |||
17 | #ifndef DATEBOOK_PLUGIN_H | 17 | #ifndef DATEBOOK_PLUGIN_H |
18 | #define DATEBOOK_PLUGIN_H | 18 | #define DATEBOOK_PLUGIN_H |
19 | 19 | ||
20 | #include <qguardedptr.h> | 20 | #include "datebookpluginwidget.h" |
21 | 21 | ||
22 | #include <opie/oclickablelabel.h> | 22 | #include <opie2/oclickablelabel.h> |
23 | #include <opie/todayplugininterface.h> | 23 | #include <opie2/todayplugininterface.h> |
24 | 24 | ||
25 | #include "datebookpluginwidget.h" | 25 | #include <qguardedptr.h> |
26 | 26 | ||
27 | class DatebookPlugin : public TodayPluginObject { | 27 | class DatebookPlugin : public TodayPluginObject { |
28 | 28 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp index 8ead40d..5fd5221 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookpluginconfig.cpp | 2 | * datebookpluginconfig.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 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 | */ |
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h index 2d303fc..4f4e3f1 100644 --- a/core/pim/today/plugins/datebook/datebookpluginconfig.h +++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookpluginconfig.h | 2 | * datebookpluginconfig.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 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 | */ |
@@ -17,13 +17,16 @@ | |||
17 | #ifndef DATEBOOK_PLUGIN_CONFIG_H | 17 | #ifndef DATEBOOK_PLUGIN_CONFIG_H |
18 | #define DATEBOOK_PLUGIN_CONFIG_H | 18 | #define DATEBOOK_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | #include "datebookpluginconfigbase.h" | ||
21 | |||
22 | #include <opie2/todayconfigwidget.h> | ||
20 | 23 | ||
21 | #include <qcheckbox.h> | 24 | #include <qcheckbox.h> |
22 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
23 | 26 | ||
24 | #include <opie/todayconfigwidget.h> | ||
25 | 27 | ||
26 | #include "datebookpluginconfigbase.h" | 28 | |
29 | |||
27 | 30 | ||
28 | class DatebookPluginConfig : public TodayConfigWidget { | 31 | class DatebookPluginConfig : public TodayConfigWidget { |
29 | 32 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp index 6baffb9..ee250db 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookpluginimpl.cpp | 2 | * datebookpluginimpl.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002 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 | */ |
@@ -35,7 +35,7 @@ QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterfa | |||
35 | *iface = this, (*iface)->addRef(); | 35 | *iface = this, (*iface)->addRef(); |
36 | }else | 36 | }else |
37 | return QS_FALSE; | 37 | return QS_FALSE; |
38 | 38 | ||
39 | return QS_OK; | 39 | return QS_OK; |
40 | 40 | ||
41 | } | 41 | } |
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h index 7c19e59..d34dd6d 100644 --- a/core/pim/today/plugins/datebook/datebookpluginimpl.h +++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookpluginimpl.h | 2 | * datebookpluginimpl.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002 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 | */ |
@@ -17,7 +17,7 @@ | |||
17 | #ifndef DATEBOOK_PLUGIN_IMPL_H | 17 | #ifndef DATEBOOK_PLUGIN_IMPL_H |
18 | #define DATEBOOK_PLUGIN_IMPL_H | 18 | #define DATEBOOK_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class DatebookPlugin; | 22 | class DatebookPlugin; |
23 | 23 | ||
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp index 1b11d1b..b6707df 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * datebookpluginwidget.cpp | 2 | * datebookpluginwidget.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003 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 | */ |
@@ -100,18 +100,18 @@ void DatebookPluginWidget::getDates() { | |||
100 | m_eventsList.append( l ); | 100 | m_eventsList.append( l ); |
101 | l->show(); | 101 | l->show(); |
102 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 102 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
103 | } else { | 103 | } else { |
104 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) | 104 | if ( ( QDateTime::currentDateTime() <= (*it).event().end() ) |
105 | // Show events which span over many days and are not elapsed. | 105 | // Show events which span over many days and are not elapsed. |
106 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) | 106 | || ( ( (*it).event().start().date() != date ) && ( QDateTime::currentDateTime() <= (*it).event().end() ) ) |
107 | // Show repeated event for today that is not elapsed. | 107 | // Show repeated event for today that is not elapsed. |
108 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | 108 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) |
109 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) | 109 | && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) |
110 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) | 110 | && ( QTime::currentTime() < (*it).event().start().time() ) ) ) |
111 | // Show repeated event for next days. | 111 | // Show repeated event for next days. |
112 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) | 112 | || ( ( (*it).event().repeatType() != Event::NoRepeat ) |
113 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) | 113 | && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) ) |
114 | ) | 114 | ) |
115 | { | 115 | { |
116 | count++; | 116 | count++; |
117 | // show only later appointments | 117 | // show only later appointments |
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h index 8988073..68af323 100644 --- a/core/pim/today/plugins/datebook/datebookpluginwidget.h +++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h | |||
@@ -17,14 +17,17 @@ | |||
17 | #ifndef DATEBOOK_PLUGIN_WIDGET_H | 17 | #ifndef DATEBOOK_PLUGIN_WIDGET_H |
18 | #define DATEBOOK_PLUGIN_WIDGET_H | 18 | #define DATEBOOK_PLUGIN_WIDGET_H |
19 | 19 | ||
20 | #include "datebookevent.h" | ||
21 | |||
22 | #include <opie2/oclickablelabel.h> | ||
23 | |||
24 | #include <qpe/datebookdb.h> | ||
25 | |||
20 | #include <qlayout.h> | 26 | #include <qlayout.h> |
21 | #include <qguardedptr.h> | 27 | #include <qguardedptr.h> |
22 | #include <qlist.h> | 28 | #include <qlist.h> |
23 | 29 | ||
24 | #include <qpe/datebookdb.h> | 30 | using namespace Opie; |
25 | #include <opie/oclickablelabel.h> | ||
26 | |||
27 | #include "datebookevent.h" | ||
28 | 31 | ||
29 | class DatebookPluginWidget : public QWidget { | 32 | class DatebookPluginWidget : public QWidget { |
30 | 33 | ||