author | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-03-01 15:47:43 (UTC) |
commit | 87676b131aad1bfe979570a48107527db4040020 (patch) (unidiff) | |
tree | 9f7ee88adc4b8987e8d3387e2370719078f7ff5e /core/pim/today | |
parent | c50e4c32d34a0550f167480b6306aac632fb201c (diff) | |
download | opie-87676b131aad1bfe979570a48107527db4040020.zip opie-87676b131aad1bfe979570a48107527db4040020.tar.gz opie-87676b131aad1bfe979570a48107527db4040020.tar.bz2 |
today plus datebook, mail, todolist plugins libopie1->libopie2
33 files changed, 109 insertions, 98 deletions
diff --git a/core/pim/today/main.cpp b/core/pim/today/main.cpp index d4ec3ce..974c050 100644 --- a/core/pim/today/main.cpp +++ b/core/pim/today/main.cpp | |||
@@ -1,23 +1,24 @@ | |||
1 | /* | 1 | /* |
2 | * main.cpp | 2 | * main.cpp |
3 | * | 3 | * |
4 | * --------------------- | 4 | * --------------------- |
5 | * | 5 | * |
6 | * begin : Sun 10 17:20:00 CEST 2002 | 6 | * begin : Sun 10 17:20:00 CEST 2002 |
7 | * copyright : (c) 2002 by Maximilian Reiß | 7 | * copyright : (c) 2002, 2003, 2004 by Maximilian Reiß |
8 | * email : max.reiss@gmx.de | 8 | * email : max.reiss@gmx.de |
9 | * | 9 | * |
10 | */ | 10 | */ |
11 | /*************************************************************************** | 11 | /*************************************************************************** |
12 | * * | 12 | * * |
13 | * This program is free software; you can redistribute it and/or modify * | 13 | * This program is free software; you can redistribute it and/or modify * |
14 | * it under the terms of the GNU General Public License as published by * | 14 | * it under the terms of the GNU General Public License as published by * |
15 | * the Free Software Foundation; either version 2 of the License, or * | 15 | * the Free Software Foundation; either version 2 of the License, or * |
16 | * (at your option) any later version. * | 16 | * (at your option) any later version. * |
17 | * * | 17 | * * |
18 | ***************************************************************************/ | 18 | ***************************************************************************/ |
19 | 19 | ||
20 | #include "today.h" | 20 | #include "today.h" |
21 | #include <opie/oapplicationfactory.h> | 21 | |
22 | #include <opie2/oapplicationfactory.h> | ||
22 | 23 | ||
23 | OPIE_EXPORT_APP( OApplicationFactory<Today> ) | 24 | OPIE_EXPORT_APP( OApplicationFactory<Today> ) |
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 | |||
@@ -4,25 +4,25 @@ CONFIG += qt plugin release | |||
4 | # Input | 4 | # Input |
5 | HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ | 5 | HEADERS = datebookplugin.h datebookpluginimpl.h datebookpluginconfig.h \ |
6 | datebookevent.h datebookpluginwidget.h | 6 | datebookevent.h datebookpluginwidget.h |
7 | SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ | 7 | SOURCES = datebookplugin.cpp datebookpluginimpl.cpp datebookpluginconfig.cpp \ |
8 | datebookevent.cpp datebookpluginwidget.cpp | 8 | datebookevent.cpp datebookpluginwidget.cpp |
9 | INTERFACES = datebookpluginconfigbase.ui | 9 | INTERFACES = datebookpluginconfigbase.ui |
10 | 10 | ||
11 | INCLUDEPATH += $(OPIEDIR)/include \ | 11 | INCLUDEPATH += $(OPIEDIR)/include \ |
12 | ../ ../library | 12 | ../ ../library |
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 |
20 | 20 | ||
21 | TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \ | 21 | TRANSLATIONS = ../../../../../i18n/de/libtodaydatebookplugin.ts \ |
22 | ../../../../../i18n/nl/libtodaydatebookplugin.ts \ | 22 | ../../../../../i18n/nl/libtodaydatebookplugin.ts \ |
23 | ../../../../../i18n/xx/libtodaydatebookplugin.ts \ | 23 | ../../../../../i18n/xx/libtodaydatebookplugin.ts \ |
24 | ../../../../../i18n/en/libtodaydatebookplugin.ts \ | 24 | ../../../../../i18n/en/libtodaydatebookplugin.ts \ |
25 | ../../../../../i18n/es/libtodaydatebookplugin.ts \ | 25 | ../../../../../i18n/es/libtodaydatebookplugin.ts \ |
26 | ../../../../../i18n/fr/libtodaydatebookplugin.ts \ | 26 | ../../../../../i18n/fr/libtodaydatebookplugin.ts \ |
27 | ../../../../../i18n/hu/libtodaydatebookplugin.ts \ | 27 | ../../../../../i18n/hu/libtodaydatebookplugin.ts \ |
28 | ../../../../../i18n/ja/libtodaydatebookplugin.ts \ | 28 | ../../../../../i18n/ja/libtodaydatebookplugin.ts \ |
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,34 +1,35 @@ | |||
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 | */ |
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 | #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 | ||
26 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, | 27 | DateBookEvent::DateBookEvent(const EffectiveEvent &ev, |
27 | QWidget* parent, | 28 | QWidget* parent, |
28 | bool show_location, | 29 | bool show_location, |
29 | bool show_notes, | 30 | bool show_notes, |
30 | bool timeExtraLine, | 31 | bool timeExtraLine, |
31 | int maxCharClip, | 32 | int maxCharClip, |
32 | const char* name, | 33 | const char* name, |
33 | WFlags fl) : | 34 | WFlags fl) : |
34 | OClickableLabel(parent,name,fl), event(ev) { | 35 | OClickableLabel(parent,name,fl), event(ev) { |
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,34 +1,36 @@ | |||
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 | */ |
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 <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 | ||
26 | Q_OBJECT | 28 | Q_OBJECT |
27 | 29 | ||
28 | public: | 30 | public: |
29 | DateBookEvent( const EffectiveEvent &ev, | 31 | DateBookEvent( const EffectiveEvent &ev, |
30 | QWidget* parent = 0, | 32 | QWidget* parent = 0, |
31 | bool show_location = 0, | 33 | bool show_location = 0, |
32 | bool show_notes = 0, | 34 | bool show_notes = 0, |
33 | bool timeExtraLine = 0, | 35 | bool timeExtraLine = 0, |
34 | int maxCharClip = 0, | 36 | int maxCharClip = 0, |
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,31 +1,28 @@ | |||
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 | */ |
9 | /*************************************************************************** | 8 | /*************************************************************************** |
10 | * * | 9 | * * |
11 | * 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 * |
12 | * 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 * |
13 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
14 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
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 | ||
23 | 20 | ||
24 | DatebookPlugin::DatebookPlugin() { | 21 | DatebookPlugin::DatebookPlugin() { |
25 | } | 22 | } |
26 | 23 | ||
27 | DatebookPlugin::~DatebookPlugin() { | 24 | DatebookPlugin::~DatebookPlugin() { |
28 | delete (DatebookPluginWidget*)m_widget; | 25 | delete (DatebookPluginWidget*)m_widget; |
29 | } | 26 | } |
30 | 27 | ||
31 | QString DatebookPlugin::pluginName() const { | 28 | QString DatebookPlugin::pluginName() const { |
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 | |||
@@ -8,30 +8,30 @@ | |||
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 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 | ||
29 | public: | 29 | public: |
30 | DatebookPlugin(); | 30 | DatebookPlugin(); |
31 | ~DatebookPlugin(); | 31 | ~DatebookPlugin(); |
32 | 32 | ||
33 | QString pluginName() const; | 33 | QString pluginName() const; |
34 | double versionNumber() const; | 34 | double versionNumber() const; |
35 | QString pixmapNameWidget() const; | 35 | QString pixmapNameWidget() const; |
36 | QWidget* widget( QWidget *); | 36 | QWidget* widget( QWidget *); |
37 | QString pixmapNameConfig() const; | 37 | QString pixmapNameConfig() const; |
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,16 +1,16 @@ | |||
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 | */ |
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 | ||
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,38 +1,41 @@ | |||
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 | */ |
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 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 | ||
30 | Q_OBJECT | 33 | Q_OBJECT |
31 | 34 | ||
32 | 35 | ||
33 | public: | 36 | public: |
34 | DatebookPluginConfig( QWidget *parent, const char *name ); | 37 | DatebookPluginConfig( QWidget *parent, const char *name ); |
35 | ~DatebookPluginConfig(); | 38 | ~DatebookPluginConfig(); |
36 | 39 | ||
37 | void writeConfig(); | 40 | void writeConfig(); |
38 | private: | 41 | private: |
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,16 +1,16 @@ | |||
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 | */ |
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 | ||
@@ -26,20 +26,20 @@ DatebookPluginImpl::~DatebookPluginImpl() { | |||
26 | } | 26 | } |
27 | 27 | ||
28 | TodayPluginObject* DatebookPluginImpl::guiPart() { | 28 | TodayPluginObject* DatebookPluginImpl::guiPart() { |
29 | return datebookPlugin; | 29 | return datebookPlugin; |
30 | } | 30 | } |
31 | 31 | ||
32 | QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { | 32 | QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { |
33 | *iface = 0; | 33 | *iface = 0; |
34 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { | 34 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { |
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 | } |
42 | 42 | ||
43 | Q_EXPORT_INTERFACE() { | 43 | Q_EXPORT_INTERFACE() { |
44 | Q_CREATE_INSTANCE( DatebookPluginImpl ); | 44 | Q_CREATE_INSTANCE( DatebookPluginImpl ); |
45 | } | 45 | } |
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,32 +1,32 @@ | |||
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 | */ |
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 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 | ||
24 | class DatebookPluginImpl : public TodayPluginInterface{ | 24 | class DatebookPluginImpl : public TodayPluginInterface{ |
25 | 25 | ||
26 | public: | 26 | public: |
27 | DatebookPluginImpl(); | 27 | DatebookPluginImpl(); |
28 | virtual ~DatebookPluginImpl(); | 28 | virtual ~DatebookPluginImpl(); |
29 | 29 | ||
30 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); | 30 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); |
31 | Q_REFCOUNT | 31 | Q_REFCOUNT |
32 | 32 | ||
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,16 +1,16 @@ | |||
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 | */ |
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 | ||
@@ -91,36 +91,36 @@ void DatebookPluginWidget::getDates() { | |||
91 | 91 | ||
92 | if ( list.count() > 0 ) { | 92 | if ( list.count() > 0 ) { |
93 | 93 | ||
94 | for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) { | 94 | for ( QValueList<EffectiveEvent>::ConstIterator it = list.begin(); it != list.end(); ++it ) { |
95 | 95 | ||
96 | if ( count < m_max_lines_meet ) { | 96 | if ( count < m_max_lines_meet ) { |
97 | if ( !m_onlyLater ) { | 97 | if ( !m_onlyLater ) { |
98 | count++; | 98 | count++; |
99 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); | 99 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); |
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 |
118 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); | 118 | DateBookEvent *l = new DateBookEvent( *it, this, m_show_location, m_show_notes, m_timeExtraLine ); |
119 | m_eventsList.append( l ); | 119 | m_eventsList.append( l ); |
120 | l->show(); | 120 | l->show(); |
121 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); | 121 | QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) ); |
122 | } | 122 | } |
123 | } | 123 | } |
124 | } | 124 | } |
125 | } | 125 | } |
126 | if ( m_onlyLater && count == 0 ) { | 126 | if ( m_onlyLater && count == 0 ) { |
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 | |||
@@ -8,32 +8,35 @@ | |||
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 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 | ||
31 | Q_OBJECT | 34 | Q_OBJECT |
32 | 35 | ||
33 | public: | 36 | public: |
34 | DatebookPluginWidget( QWidget *parent, const char *name ); | 37 | DatebookPluginWidget( QWidget *parent, const char *name ); |
35 | ~DatebookPluginWidget(); | 38 | ~DatebookPluginWidget(); |
36 | void refresh(); | 39 | void refresh(); |
37 | void reinitialize(); | 40 | void reinitialize(); |
38 | 41 | ||
39 | private: | 42 | private: |
diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro index 70c484d..1c3555b 100644 --- a/core/pim/today/plugins/mail/mail.pro +++ b/core/pim/today/plugins/mail/mail.pro | |||
@@ -2,25 +2,25 @@ TEMPLATE = lib | |||
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += qt release | 3 | CONFIG += qt release |
4 | 4 | ||
5 | # Input | 5 | # Input |
6 | HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h | 6 | HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h |
7 | SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp | 7 | SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp |
8 | 8 | ||
9 | INCLUDEPATH += $(OPIEDIR)/include \ | 9 | INCLUDEPATH += $(OPIEDIR)/include \ |
10 | ../ ../library | 10 | ../ ../library |
11 | DEPENDPATH += $(OPIEDIR)/include \ | 11 | DEPENDPATH += $(OPIEDIR)/include \ |
12 | ../ ../library | 12 | ../ ../library |
13 | 13 | ||
14 | LIBS+= -lqpe -lopie | 14 | LIBS+= -lqpe -lopiecore2 -opiepim2 |
15 | 15 | ||
16 | DESTDIR = $(OPIEDIR)/plugins/today | 16 | DESTDIR = $(OPIEDIR)/plugins/today |
17 | TARGET = todaymailplugin | 17 | TARGET = todaymailplugin |
18 | 18 | ||
19 | TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \ | 19 | TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \ |
20 | ../../../../../i18n/nl/libtodaymailplugin.ts \ | 20 | ../../../../../i18n/nl/libtodaymailplugin.ts \ |
21 | ../../../../../i18n/xx/libtodaymailplugin.ts \ | 21 | ../../../../../i18n/xx/libtodaymailplugin.ts \ |
22 | ../../../../../i18n/en/libtodaymailplugin.ts \ | 22 | ../../../../../i18n/en/libtodaymailplugin.ts \ |
23 | ../../../../../i18n/es/libtodaymailplugin.ts \ | 23 | ../../../../../i18n/es/libtodaymailplugin.ts \ |
24 | ../../../../../i18n/fr/libtodaymailplugin.ts \ | 24 | ../../../../../i18n/fr/libtodaymailplugin.ts \ |
25 | ../../../../../i18n/hu/libtodaymailplugin.ts \ | 25 | ../../../../../i18n/hu/libtodaymailplugin.ts \ |
26 | ../../../../../i18n/ja/libtodaymailplugin.ts \ | 26 | ../../../../../i18n/ja/libtodaymailplugin.ts \ |
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h index 7d6d5e8..1edffef 100644 --- a/core/pim/today/plugins/mail/mailplugin.h +++ b/core/pim/today/plugins/mail/mailplugin.h | |||
@@ -9,31 +9,34 @@ | |||
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 | 17 | ||
18 | #ifndef MAIL_PLUGIN_H | 18 | #ifndef MAIL_PLUGIN_H |
19 | #define MAIL_PLUGIN_H | 19 | #define MAIL_PLUGIN_H |
20 | 20 | ||
21 | #include "mailpluginwidget.h" | ||
22 | |||
23 | #include <opie2/todayplugininterface.h> | ||
24 | #include <opie2/todayconfigwidget.h> | ||
25 | |||
21 | #include <qwidget.h> | 26 | #include <qwidget.h> |
22 | #include <qguardedptr.h> | 27 | #include <qguardedptr.h> |
23 | 28 | ||
24 | #include <opie/todayplugininterface.h> | ||
25 | #include <opie/todayconfigwidget.h> | ||
26 | 29 | ||
27 | #include "mailpluginwidget.h" | 30 | |
28 | 31 | ||
29 | class MailPlugin : public TodayPluginObject { | 32 | class MailPlugin : public TodayPluginObject { |
30 | 33 | ||
31 | public: | 34 | public: |
32 | MailPlugin(); | 35 | MailPlugin(); |
33 | ~MailPlugin(); | 36 | ~MailPlugin(); |
34 | 37 | ||
35 | QString pluginName() const; | 38 | QString pluginName() const; |
36 | double versionNumber() const; | 39 | double versionNumber() const; |
37 | QString pixmapNameWidget() const; | 40 | QString pixmapNameWidget() const; |
38 | QWidget* widget(QWidget *); | 41 | QWidget* widget(QWidget *); |
39 | QString pixmapNameConfig() const; | 42 | QString pixmapNameConfig() const; |
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.cpp b/core/pim/today/plugins/mail/mailpluginimpl.cpp index dfd3a64..fac27f4 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.cpp +++ b/core/pim/today/plugins/mail/mailpluginimpl.cpp | |||
@@ -1,16 +1,16 @@ | |||
1 | /* | 1 | /* |
2 | * mailpluginimpl.cpp | 2 | * mailpluginimpl.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 | */ |
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 | ||
@@ -29,20 +29,20 @@ MailPluginImpl::~MailPluginImpl() { | |||
29 | 29 | ||
30 | 30 | ||
31 | TodayPluginObject* MailPluginImpl::guiPart() { | 31 | TodayPluginObject* MailPluginImpl::guiPart() { |
32 | return mailPlugin; | 32 | return mailPlugin; |
33 | } | 33 | } |
34 | 34 | ||
35 | QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { | 35 | QRESULT MailPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { |
36 | *iface = 0; | 36 | *iface = 0; |
37 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { | 37 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { |
38 | *iface = this, (*iface)->addRef(); | 38 | *iface = this, (*iface)->addRef(); |
39 | }else | 39 | }else |
40 | return QS_FALSE; | 40 | return QS_FALSE; |
41 | 41 | ||
42 | return QS_OK; | 42 | return QS_OK; |
43 | 43 | ||
44 | } | 44 | } |
45 | 45 | ||
46 | Q_EXPORT_INTERFACE() { | 46 | Q_EXPORT_INTERFACE() { |
47 | Q_CREATE_INSTANCE( MailPluginImpl ); | 47 | Q_CREATE_INSTANCE( MailPluginImpl ); |
48 | } | 48 | } |
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h index 72e1760..35b3805 100644 --- a/core/pim/today/plugins/mail/mailpluginimpl.h +++ b/core/pim/today/plugins/mail/mailpluginimpl.h | |||
@@ -1,32 +1,32 @@ | |||
1 | /* | 1 | /* |
2 | * mailpluginimpl.h | 2 | * mailpluginimpl.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 | */ |
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 MAIL_PLUGIN_IMPL_H | 17 | #ifndef MAIL_PLUGIN_IMPL_H |
18 | #define MAIL_PLUGIN_IMPL_H | 18 | #define MAIL_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class MailPlugin; | 22 | class MailPlugin; |
23 | 23 | ||
24 | class MailPluginImpl : public TodayPluginInterface{ | 24 | class MailPluginImpl : public TodayPluginInterface{ |
25 | 25 | ||
26 | public: | 26 | public: |
27 | MailPluginImpl(); | 27 | MailPluginImpl(); |
28 | virtual ~MailPluginImpl(); | 28 | virtual ~MailPluginImpl(); |
29 | 29 | ||
30 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); | 30 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); |
31 | Q_REFCOUNT | 31 | Q_REFCOUNT |
32 | 32 | ||
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp index feecd81..4194270 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.cpp +++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp | |||
@@ -4,30 +4,29 @@ | |||
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 | #include "mailpluginwidget.h" | ||
16 | 17 | ||
17 | #include <qpe/config.h> | 18 | #include <qpe/config.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
19 | 20 | ||
20 | #include "mailpluginwidget.h" | ||
21 | |||
22 | MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | 21 | MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) |
23 | : QWidget(parent, name ) { | 22 | : QWidget(parent, name ) { |
24 | 23 | ||
25 | m_mailLabel = 0l; | 24 | m_mailLabel = 0l; |
26 | m_layout = 0l; | 25 | m_layout = 0l; |
27 | 26 | ||
28 | if ( m_mailLabel ) { | 27 | if ( m_mailLabel ) { |
29 | delete m_mailLabel; | 28 | delete m_mailLabel; |
30 | } | 29 | } |
31 | m_mailLabel = new OClickableLabel( this ); | 30 | m_mailLabel = new OClickableLabel( this ); |
32 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); | 31 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); |
33 | 32 | ||
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h index 6d16d2c..0ad8738 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.h +++ b/core/pim/today/plugins/mail/mailpluginwidget.h | |||
@@ -10,25 +10,27 @@ | |||
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 MAIL_PLUGIN_WIDGET_H | 17 | #ifndef MAIL_PLUGIN_WIDGET_H |
18 | #define MAIL_PLUGIN_WIDGET_H | 18 | #define MAIL_PLUGIN_WIDGET_H |
19 | 19 | ||
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | 21 | ||
22 | #include <opie/oclickablelabel.h> | 22 | #include <opie2/oclickablelabel.h> |
23 | |||
24 | using namespace Opie; | ||
23 | 25 | ||
24 | class MailPluginWidget : public QWidget { | 26 | class MailPluginWidget : public QWidget { |
25 | 27 | ||
26 | Q_OBJECT | 28 | Q_OBJECT |
27 | 29 | ||
28 | public: | 30 | public: |
29 | MailPluginWidget( QWidget *parent, const char *name ); | 31 | MailPluginWidget( QWidget *parent, const char *name ); |
30 | ~MailPluginWidget(); | 32 | ~MailPluginWidget(); |
31 | 33 | ||
32 | void refresh(); | 34 | void refresh(); |
33 | 35 | ||
34 | protected slots: | 36 | protected slots: |
diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro index 095247f..8f2f898 100644 --- a/core/pim/today/plugins/todolist/todolist.pro +++ b/core/pim/today/plugins/todolist/todolist.pro | |||
@@ -5,25 +5,25 @@ CONFIG += qt plugin release | |||
5 | # Input | 5 | # Input |
6 | HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ | 6 | HEADERS = todoplugin.h todopluginimpl.h todopluginconfig.h \ |
7 | todopluginwidget.h | 7 | todopluginwidget.h |
8 | SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ | 8 | SOURCES = todoplugin.cpp todopluginimpl.cpp todopluginconfig.cpp \ |
9 | todopluginwidget.cpp | 9 | todopluginwidget.cpp |
10 | INTERFACES= todopluginconfigbase.ui | 10 | INTERFACES= todopluginconfigbase.ui |
11 | 11 | ||
12 | INCLUDEPATH += $(OPIEDIR)/include \ | 12 | INCLUDEPATH += $(OPIEDIR)/include \ |
13 | ../ ../library | 13 | ../ ../library |
14 | DEPENDPATH += $(OPIEDIR)/include \ | 14 | DEPENDPATH += $(OPIEDIR)/include \ |
15 | ../ ../library | 15 | ../ ../library |
16 | 16 | ||
17 | LIBS+= -lqpe -lopie | 17 | LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2 |
18 | 18 | ||
19 | DESTDIR = $(OPIEDIR)/plugins/today | 19 | DESTDIR = $(OPIEDIR)/plugins/today |
20 | TARGET = todaytodolistplugin | 20 | TARGET = todaytodolistplugin |
21 | 21 | ||
22 | TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ | 22 | TRANSLATIONS = ../../../../../i18n/de/libtodaytodolistplugin.ts \ |
23 | ../../../../../i18n/nl/libtodaytodolistplugin.ts \ | 23 | ../../../../../i18n/nl/libtodaytodolistplugin.ts \ |
24 | ../../../../../i18n/xx/libtodaytodolistplugin.ts \ | 24 | ../../../../../i18n/xx/libtodaytodolistplugin.ts \ |
25 | ../../../../../i18n/en/libtodaytodolistplugin.ts \ | 25 | ../../../../../i18n/en/libtodaytodolistplugin.ts \ |
26 | ../../../../../i18n/es/libtodaytodolistplugin.ts \ | 26 | ../../../../../i18n/es/libtodaytodolistplugin.ts \ |
27 | ../../../../../i18n/fr/libtodaytodolistplugin.ts \ | 27 | ../../../../../i18n/fr/libtodaytodolistplugin.ts \ |
28 | ../../../../../i18n/hu/libtodaytodolistplugin.ts \ | 28 | ../../../../../i18n/hu/libtodaytodolistplugin.ts \ |
29 | ../../../../../i18n/ja/libtodaytodolistplugin.ts \ | 29 | ../../../../../i18n/ja/libtodaytodolistplugin.ts \ |
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp index 801de9d..5783814 100644 --- a/core/pim/today/plugins/todolist/todoplugin.cpp +++ b/core/pim/today/plugins/todolist/todoplugin.cpp | |||
@@ -1,34 +1,31 @@ | |||
1 | /* | 1 | /* |
2 | * todoplugin.cpp | 2 | * todoplugin.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 | */ |
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 | |||
18 | |||
19 | #include "todoplugin.h" | 17 | #include "todoplugin.h" |
20 | #include "todopluginconfig.h" | 18 | #include "todopluginconfig.h" |
21 | 19 | ||
22 | |||
23 | TodolistPlugin::TodolistPlugin() { | 20 | TodolistPlugin::TodolistPlugin() { |
24 | } | 21 | } |
25 | 22 | ||
26 | TodolistPlugin::~TodolistPlugin() { | 23 | TodolistPlugin::~TodolistPlugin() { |
27 | delete (TodolistPluginWidget*)m_widget; | 24 | delete (TodolistPluginWidget*)m_widget; |
28 | } | 25 | } |
29 | 26 | ||
30 | QString TodolistPlugin::pluginName() const { | 27 | QString TodolistPlugin::pluginName() const { |
31 | return QObject::tr( "Todolist plugin" ); | 28 | return QObject::tr( "Todolist plugin" ); |
32 | } | 29 | } |
33 | 30 | ||
34 | double TodolistPlugin::versionNumber() const { | 31 | double TodolistPlugin::versionNumber() const { |
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h index f68162f..bea15d5 100644 --- a/core/pim/today/plugins/todolist/todoplugin.h +++ b/core/pim/today/plugins/todolist/todoplugin.h | |||
@@ -1,39 +1,42 @@ | |||
1 | /* | 1 | /* |
2 | * todoplugin.h | 2 | * todoplugin.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 | */ |
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 TODOLIST_PLUGIN_H | 17 | #ifndef TODOLIST_PLUGIN_H |
18 | #define TODOLIST_PLUGIN_H | 18 | #define TODOLIST_PLUGIN_H |
19 | 19 | ||
20 | |||
21 | #include "todopluginwidget.h" | ||
22 | |||
23 | #include <opie2/oclickablelabel.h> | ||
24 | #include <opie2/todayplugininterface.h> | ||
25 | |||
20 | #include <qstring.h> | 26 | #include <qstring.h> |
21 | #include <qguardedptr.h> | 27 | #include <qguardedptr.h> |
22 | #include <qwidget.h> | 28 | #include <qwidget.h> |
23 | 29 | ||
24 | #include <opie/oclickablelabel.h> | 30 | using namespace Opie; |
25 | #include <opie/todayplugininterface.h> | ||
26 | |||
27 | #include "todopluginwidget.h" | ||
28 | 31 | ||
29 | class TodolistPlugin : public TodayPluginObject { | 32 | class TodolistPlugin : public TodayPluginObject { |
30 | 33 | ||
31 | public: | 34 | public: |
32 | TodolistPlugin(); | 35 | TodolistPlugin(); |
33 | ~TodolistPlugin(); | 36 | ~TodolistPlugin(); |
34 | 37 | ||
35 | QString pluginName() const; | 38 | QString pluginName() const; |
36 | double versionNumber() const; | 39 | double versionNumber() const; |
37 | QString pixmapNameWidget() const; | 40 | QString pixmapNameWidget() const; |
38 | QWidget* widget(QWidget *); | 41 | QWidget* widget(QWidget *); |
39 | QString pixmapNameConfig() const; | 42 | QString pixmapNameConfig() const; |
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h index a2d7d2c..7040369 100644 --- a/core/pim/today/plugins/todolist/todopluginconfig.h +++ b/core/pim/today/plugins/todolist/todopluginconfig.h | |||
@@ -8,29 +8,29 @@ | |||
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 TODOLIST_PLUGIN_CONFIG_H | 17 | #ifndef TODOLIST_PLUGIN_CONFIG_H |
18 | #define TODOLIST_PLUGIN_CONFIG_H | 18 | #define TODOLIST_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | #include <qspinbox.h> | 20 | #include "todopluginconfigbase.h" |
21 | 21 | ||
22 | #include <opie/todayconfigwidget.h> | 22 | #include <opie2/todayconfigwidget.h> |
23 | 23 | ||
24 | #include "todopluginconfigbase.h" | 24 | #include <qspinbox.h> |
25 | 25 | ||
26 | class TodolistPluginConfig : public TodayConfigWidget { | 26 | class TodolistPluginConfig : public TodayConfigWidget { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | 28 | ||
29 | public: | 29 | public: |
30 | 30 | ||
31 | TodolistPluginConfig( QWidget *parent, const char *name ); | 31 | TodolistPluginConfig( QWidget *parent, const char *name ); |
32 | ~TodolistPluginConfig(); | 32 | ~TodolistPluginConfig(); |
33 | 33 | ||
34 | private: | 34 | private: |
35 | /** | 35 | /** |
36 | * if changed then save | 36 | * if changed then save |
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.cpp b/core/pim/today/plugins/todolist/todopluginimpl.cpp index 639587f..1a6189f 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.cpp +++ b/core/pim/today/plugins/todolist/todopluginimpl.cpp | |||
@@ -1,16 +1,16 @@ | |||
1 | /* | 1 | /* |
2 | * todopluginimpl.cpp | 2 | * todopluginimpl.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 | */ |
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 | ||
@@ -27,20 +27,20 @@ TodolistPluginImpl::~TodolistPluginImpl() { | |||
27 | 27 | ||
28 | 28 | ||
29 | TodayPluginObject* TodolistPluginImpl::guiPart() { | 29 | TodayPluginObject* TodolistPluginImpl::guiPart() { |
30 | return todolistPlugin; | 30 | return todolistPlugin; |
31 | } | 31 | } |
32 | 32 | ||
33 | QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { | 33 | QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid, QUnknownInterface **iface ) { |
34 | *iface = 0; | 34 | *iface = 0; |
35 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { | 35 | if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) ) { |
36 | *iface = this, (*iface)->addRef(); | 36 | *iface = this, (*iface)->addRef(); |
37 | }else | 37 | }else |
38 | return QS_FALSE; | 38 | return QS_FALSE; |
39 | 39 | ||
40 | return QS_OK; | 40 | return QS_OK; |
41 | 41 | ||
42 | } | 42 | } |
43 | 43 | ||
44 | Q_EXPORT_INTERFACE() { | 44 | Q_EXPORT_INTERFACE() { |
45 | Q_CREATE_INSTANCE( TodolistPluginImpl ); | 45 | Q_CREATE_INSTANCE( TodolistPluginImpl ); |
46 | } | 46 | } |
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h index ca62fdb..f9b0b37 100644 --- a/core/pim/today/plugins/todolist/todopluginimpl.h +++ b/core/pim/today/plugins/todolist/todopluginimpl.h | |||
@@ -1,32 +1,32 @@ | |||
1 | /* | 1 | /* |
2 | * todopluginimpl.h | 2 | * todopluginimpl.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 | */ |
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 TODOLIST_PLUGIN_IMPL_H | 17 | #ifndef TODOLIST_PLUGIN_IMPL_H |
18 | #define TODOLIST_PLUGIN_IMPL_H | 18 | #define TODOLIST_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class TodolistPlugin; | 22 | class TodolistPlugin; |
23 | 23 | ||
24 | class TodolistPluginImpl : public TodayPluginInterface{ | 24 | class TodolistPluginImpl : public TodayPluginInterface{ |
25 | 25 | ||
26 | public: | 26 | public: |
27 | TodolistPluginImpl(); | 27 | TodolistPluginImpl(); |
28 | virtual ~TodolistPluginImpl(); | 28 | virtual ~TodolistPluginImpl(); |
29 | 29 | ||
30 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); | 30 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); |
31 | Q_REFCOUNT | 31 | Q_REFCOUNT |
32 | 32 | ||
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp index 0364f94..567c70f 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.cpp +++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp | |||
@@ -20,25 +20,25 @@ | |||
20 | #include <qpe/qcopenvelope_qws.h> | 20 | #include <qpe/qcopenvelope_qws.h> |
21 | 21 | ||
22 | TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) | 22 | TodolistPluginWidget::TodolistPluginWidget( QWidget *parent, const char* name ) |
23 | : QWidget( parent, name ) { | 23 | : QWidget( parent, name ) { |
24 | 24 | ||
25 | todo = 0l; | 25 | todo = 0l; |
26 | layoutTodo = 0l; | 26 | layoutTodo = 0l; |
27 | todoLabel = 0l; | 27 | todoLabel = 0l; |
28 | 28 | ||
29 | if ( todo ) { | 29 | if ( todo ) { |
30 | delete todo; | 30 | delete todo; |
31 | } | 31 | } |
32 | todo = new OTodoAccess(); | 32 | todo = new OPimTodoAccess(); |
33 | todo->load(); | 33 | todo->load(); |
34 | 34 | ||
35 | if ( layoutTodo ) { | 35 | if ( layoutTodo ) { |
36 | delete layoutTodo; | 36 | delete layoutTodo; |
37 | } | 37 | } |
38 | layoutTodo = new QVBoxLayout( this ); | 38 | layoutTodo = new QVBoxLayout( this ); |
39 | layoutTodo->setAutoAdd( true ); | 39 | layoutTodo->setAutoAdd( true ); |
40 | 40 | ||
41 | if ( todoLabel ) { | 41 | if ( todoLabel ) { |
42 | delete todoLabel; | 42 | delete todoLabel; |
43 | } | 43 | } |
44 | todoLabel = new OClickableLabel( this ); | 44 | todoLabel = new OClickableLabel( this ); |
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h index 9cac43d..a020cf4 100644 --- a/core/pim/today/plugins/todolist/todopluginwidget.h +++ b/core/pim/today/plugins/todolist/todopluginwidget.h | |||
@@ -10,45 +10,46 @@ | |||
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 TODOLIST_PLUGIN_WIDGET_H | 17 | #ifndef TODOLIST_PLUGIN_WIDGET_H |
18 | #define TODOLIST_PLUGIN_WIDGET_H | 18 | #define TODOLIST_PLUGIN_WIDGET_H |
19 | 19 | ||
20 | #include <qlayout.h> | 20 | #include <qlayout.h> |
21 | 21 | ||
22 | #include <opie/otodoaccess.h> | 22 | #include <opie2/otodoaccess.h> |
23 | #include <opie/oclickablelabel.h> | 23 | #include <opie2/oclickablelabel.h> |
24 | 24 | ||
25 | using namespace Opie; | ||
25 | 26 | ||
26 | class TodolistPluginWidget : public QWidget { | 27 | class TodolistPluginWidget : public QWidget { |
27 | 28 | ||
28 | Q_OBJECT | 29 | Q_OBJECT |
29 | 30 | ||
30 | public: | 31 | public: |
31 | TodolistPluginWidget( QWidget *parent, const char *name ); | 32 | TodolistPluginWidget( QWidget *parent, const char *name ); |
32 | ~TodolistPluginWidget(); | 33 | ~TodolistPluginWidget(); |
33 | 34 | ||
34 | void refresh(); | 35 | void refresh(); |
35 | void reinitialize(); | 36 | void reinitialize(); |
36 | 37 | ||
37 | protected slots: | 38 | protected slots: |
38 | void startTodolist(); | 39 | void startTodolist(); |
39 | 40 | ||
40 | private: | 41 | private: |
41 | OClickableLabel *todoLabel; | 42 | OClickableLabel *todoLabel; |
42 | QVBoxLayout* layoutTodo; | 43 | QVBoxLayout* layoutTodo; |
43 | 44 | ||
44 | OTodoAccess *todo; | 45 | OPimTodoAccess *todo; |
45 | OTodoAccess::List m_list; | 46 | OPimTodoAccess::List m_list; |
46 | OTodoAccess::List::Iterator m_it; | 47 | OPimTodoAccess::List::Iterator m_it; |
47 | 48 | ||
48 | void readConfig(); | 49 | void readConfig(); |
49 | void getTodo(); | 50 | void getTodo(); |
50 | int m_maxLinesTask; | 51 | int m_maxLinesTask; |
51 | int m_maxCharClip; | 52 | int m_maxCharClip; |
52 | }; | 53 | }; |
53 | 54 | ||
54 | #endif | 55 | #endif |
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp index c83a5df..b55a4a7 100644 --- a/core/pim/today/today.cpp +++ b/core/pim/today/today.cpp | |||
@@ -1,30 +1,28 @@ | |||
1 | /* | 1 | /* |
2 | * today.cpp | 2 | * today.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 | */ |
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 | |||
18 | |||
19 | #define QTOPIA_INTERNAL_LANGLIST | 17 | #define QTOPIA_INTERNAL_LANGLIST |
20 | 18 | ||
21 | #include "today.h" | 19 | #include "today.h" |
22 | 20 | ||
23 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
24 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
26 | #include <qpe/global.h> | 24 | #include <qpe/global.h> |
27 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
28 | #include <qpe/contact.h> | 26 | #include <qpe/contact.h> |
29 | 27 | ||
30 | #include <qdir.h> | 28 | #include <qdir.h> |
diff --git a/core/pim/today/today.h b/core/pim/today/today.h index bf2293a..972731c 100644 --- a/core/pim/today/today.h +++ b/core/pim/today/today.h | |||
@@ -1,45 +1,45 @@ | |||
1 | /* | 1 | /* |
2 | * today.h | 2 | * today.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 | */ |
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 | |||
17 | |||
18 | #ifndef TODAY_H | 16 | #ifndef TODAY_H |
19 | #define TODAY_H | 17 | #define TODAY_H |
20 | 18 | ||
21 | #include <qscrollview.h> | ||
22 | #include <qvbox.h> | ||
23 | |||
24 | #include <qpe/qlibrary.h> | ||
25 | 19 | ||
26 | #include "todayconfig.h" | 20 | #include "todayconfig.h" |
27 | #include "todaybase.h" | 21 | #include "todaybase.h" |
28 | 22 | ||
29 | #include <opie/todayplugininterface.h> | 23 | #include <opie2/todayplugininterface.h> |
24 | #include <opie2/oclickablelabel.h> | ||
30 | 25 | ||
31 | class QVBoxLayout; | 26 | #include <qpe/qlibrary.h> |
32 | class OClickableLabel; | 27 | |
28 | #include <qscrollview.h> | ||
29 | #include <qvbox.h> | ||
33 | 30 | ||
31 | using namespace Opie; | ||
32 | |||
33 | class QVBoxLayout; | ||
34 | 34 | ||
35 | class Today : public TodayBase { | 35 | class Today : public TodayBase { |
36 | 36 | ||
37 | Q_OBJECT | 37 | Q_OBJECT |
38 | 38 | ||
39 | public: | 39 | public: |
40 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 40 | Today( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
41 | ~Today(); | 41 | ~Today(); |
42 | static QString appName() { return QString::fromLatin1("today"); } | 42 | static QString appName() { return QString::fromLatin1("today"); } |
43 | 43 | ||
44 | private slots: | 44 | private slots: |
45 | void startConfig(); | 45 | void startConfig(); |
diff --git a/core/pim/today/today.pro b/core/pim/today/today.pro index 2968e6a..b55a812 100644 --- a/core/pim/today/today.pro +++ b/core/pim/today/today.pro | |||
@@ -1,14 +1,15 @@ | |||
1 | CONFIG += qt warn on release quick-app | 1 | CONFIG += qt warn on release quick-app |
2 | 2 | ||
3 | HEADERS = today.h todaybase.h todayconfig.h | 3 | HEADERS = today.h todaybase.h todayconfig.h |
4 | SOURCES = today.cpp todaybase.cpp todayconfig.cpp main.cpp | 4 | SOURCES = today.cpp todaybase.cpp todayconfig.cpp main.cpp |
5 | INTERFACES = todayconfigmiscbase.ui | 5 | INTERFACES = todayconfigmiscbase.ui |
6 | 6 | ||
7 | INCLUDEPATH+= $(OPIEDIR)/include | 7 | INCLUDEPATH+= $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 8 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2 |
10 | 10 | ||
11 | TARGET = today | 11 | TARGET = today |
12 | 12 | ||
13 | include ( $(OPIEDIR)/include.pro ) | 13 | include ( $(OPIEDIR)/include.pro ) |
14 | } | 14 | } |
15 | |||
diff --git a/core/pim/today/todaybase.cpp b/core/pim/today/todaybase.cpp index f2958ad..14cdfd9 100644 --- a/core/pim/today/todaybase.cpp +++ b/core/pim/today/todaybase.cpp | |||
@@ -1,35 +1,34 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.cpp | 2 | * todaybase.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 | */ |
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 "todaybase.h" | 17 | #include "todaybase.h" |
18 | 18 | ||
19 | #include <qvbox.h> | ||
20 | #include <qwhatsthis.h> | ||
21 | |||
22 | #include <qpe/resource.h> | 19 | #include <qpe/resource.h> |
23 | 20 | ||
21 | #include <qvbox.h> | ||
22 | #include <qwhatsthis.h> | ||
24 | 23 | ||
25 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) | 24 | TodayBase::TodayBase( QWidget* parent, const char* name, WFlags ) |
26 | : QWidget( parent, name, WStyle_ContextHelp ) { | 25 | : QWidget( parent, name, WStyle_ContextHelp ) { |
27 | 26 | ||
28 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo | 27 | QPixmap logo = Resource::loadPixmap( "today/today_logo"); // logo |
29 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla | 28 | QPixmap opiezilla = Resource::loadPixmap("today/opiezilla" ); //the opiezilla |
30 | QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon | 29 | QPixmap config = Resource::loadPixmap( "SettingsIcon" ); // config icon |
31 | 30 | ||
32 | layout = 0L; | 31 | layout = 0L; |
33 | 32 | ||
34 | QPalette pal = this->palette(); | 33 | QPalette pal = this->palette(); |
35 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); | 34 | QColor col = pal.color( QPalette::Active, QColorGroup::Background ); |
diff --git a/core/pim/today/todaybase.h b/core/pim/today/todaybase.h index b0b2e14..b737351 100644 --- a/core/pim/today/todaybase.h +++ b/core/pim/today/todaybase.h | |||
@@ -1,55 +1,56 @@ | |||
1 | /* | 1 | /* |
2 | * todaybase.h | 2 | * todaybase.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 | */ |
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 TODAYBASE_H | 17 | #ifndef TODAYBASE_H |
18 | #define TODAYBASE_H | 18 | #define TODAYBASE_H |
19 | 19 | ||
20 | #include <opie2/oclickablelabel.h> | ||
21 | |||
20 | #include <qlayout.h> | 22 | #include <qlayout.h> |
21 | #include <opie/oclickablelabel.h> | ||
22 | 23 | ||
23 | class QVBox; | 24 | class QVBox; |
24 | class QGridLayout; | 25 | class QGridLayout; |
25 | class QFrame; | 26 | class QFrame; |
26 | class QLabel; | 27 | class QLabel; |
27 | class QPushButton; | 28 | class QPushButton; |
28 | class QBoxLayout; | 29 | class QBoxLayout; |
29 | 30 | ||
30 | 31 | ||
32 | using namespace Opie; | ||
33 | |||
34 | |||
31 | class TodayBase : public QWidget | 35 | class TodayBase : public QWidget |
32 | { | 36 | { |
33 | Q_OBJECT | 37 | Q_OBJECT |
34 | 38 | ||
35 | public: | 39 | public: |
36 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); | 40 | TodayBase( QWidget* parent = 0, const char* name = 0, WFlags = 0 ); |
37 | ~TodayBase(); | 41 | ~TodayBase(); |
38 | 42 | ||
39 | QFrame* Frame4; | 43 | QFrame* Frame4; |
40 | QPushButton* DatesButton; | 44 | QPushButton* DatesButton; |
41 | QVBoxLayout* layout; | 45 | QVBoxLayout* layout; |
42 | OClickableLabel* OwnerField; | 46 | Opie::OClickableLabel* OwnerField; |
43 | QLabel* Frame; | 47 | QLabel* Frame; |
44 | QLabel* DateLabel; | 48 | QLabel* DateLabel; |
45 | QFrame* Frame15; | 49 | QFrame* Frame15; |
46 | QLabel* Opiezilla; | 50 | QLabel* Opiezilla; |
47 | QLabel* TodayLabel; | 51 | QLabel* TodayLabel; |
48 | OClickableLabel* ConfigButton; | 52 | OClickableLabel* ConfigButton; |
49 | 53 | ||
50 | protected: | ||
51 | |||
52 | |||
53 | }; | 54 | }; |
54 | 55 | ||
55 | #endif | 56 | #endif |
diff --git a/core/pim/today/todayconfig.cpp b/core/pim/today/todayconfig.cpp index 9ced0d8..5c51515 100644 --- a/core/pim/today/todayconfig.cpp +++ b/core/pim/today/todayconfig.cpp | |||
@@ -1,16 +1,16 @@ | |||
1 | /* | 1 | /* |
2 | * todayconfig.cpp | 2 | * todayconfig.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 | */ |
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 | ||
diff --git a/core/pim/today/todayconfig.h b/core/pim/today/todayconfig.h index 0a7687c..3b585c9 100644 --- a/core/pim/today/todayconfig.h +++ b/core/pim/today/todayconfig.h | |||
@@ -1,38 +1,38 @@ | |||
1 | /* | 1 | /* |
2 | * todayconfig.h | 2 | * todayconfig.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 | */ |
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 TODAYCONFIG_H | 17 | #ifndef TODAYCONFIG_H |
18 | #define TODAYCONFIG_H | 18 | #define TODAYCONFIG_H |
19 | 19 | ||
20 | #include "todayconfigmiscbase.h" | ||
21 | |||
22 | #include <opie2/otabwidget.h> | ||
23 | |||
20 | #include <qvariant.h> | 24 | #include <qvariant.h> |
21 | #include <qdialog.h> | 25 | #include <qdialog.h> |
22 | #include <qlistview.h> | 26 | #include <qlistview.h> |
23 | #include <opie/otabwidget.h> | ||
24 | |||
25 | |||
26 | #include "todayconfigmiscbase.h" | ||
27 | 27 | ||
28 | class QCheckBox; | 28 | class QCheckBox; |
29 | class QLabel; | 29 | class QLabel; |
30 | class QSpinBox; | 30 | class QSpinBox; |
31 | class QTabWidget; | 31 | class QTabWidget; |
32 | 32 | ||
33 | class TodayConfig : public QDialog { | 33 | class TodayConfig : public QDialog { |
34 | 34 | ||
35 | Q_OBJECT | 35 | Q_OBJECT |
36 | 36 | ||
37 | public: | 37 | public: |
38 | TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); | 38 | TodayConfig( QWidget* parent = 0, const char* name = 0, bool modal = FALSE ); |