-rw-r--r-- | core/pim/today/plugins/mail/mail.pro | 2 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailplugin.h | 9 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginimpl.cpp | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginimpl.h | 4 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginwidget.cpp | 3 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginwidget.h | 4 |
6 files changed, 15 insertions, 11 deletions
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 | |||
@@ -1,37 +1,37 @@ | |||
1 | TEMPLATE = lib | 1 | 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 \ |
27 | ../../../../../i18n/ko/libtodaymailplugin.ts \ | 27 | ../../../../../i18n/ko/libtodaymailplugin.ts \ |
28 | ../../../../../i18n/no/libtodaymailplugin.ts \ | 28 | ../../../../../i18n/no/libtodaymailplugin.ts \ |
29 | ../../../../../i18n/pl/libtodaymailplugin.ts \ | 29 | ../../../../../i18n/pl/libtodaymailplugin.ts \ |
30 | ../../../../../i18n/pt/libtodaymailplugin.ts \ | 30 | ../../../../../i18n/pt/libtodaymailplugin.ts \ |
31 | ../../../../../i18n/pt_BR/libtodaymailplugin.ts \ | 31 | ../../../../../i18n/pt_BR/libtodaymailplugin.ts \ |
32 | ../../../../../i18n/sl/libtodaymailplugin.ts \ | 32 | ../../../../../i18n/sl/libtodaymailplugin.ts \ |
33 | ../../../../../i18n/zh_CN/libtodaymailplugin.ts \ | 33 | ../../../../../i18n/zh_CN/libtodaymailplugin.ts \ |
34 | ../../../../../i18n/zh_TW/libtodaymailplugin.ts \ | 34 | ../../../../../i18n/zh_TW/libtodaymailplugin.ts \ |
35 | ../../../../../i18n/it/libtodaymailplugin.ts \ | 35 | ../../../../../i18n/it/libtodaymailplugin.ts \ |
36 | ../../../../../i18n/da/libtodaymailplugin.ts | 36 | ../../../../../i18n/da/libtodaymailplugin.ts |
37 | include ( $(OPIEDIR)/include.pro ) | 37 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -1,50 +1,53 @@ | |||
1 | /* | 1 | /* |
2 | * mailplugin.h | 2 | * mailplugin.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2004 by Maximilian Reiß | 4 | * copyright : (c) 2002,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 | 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; |
40 | TodayConfigWidget* configWidget(QWidget *); | 43 | TodayConfigWidget* configWidget(QWidget *); |
41 | QString appName() const; | 44 | QString appName() const; |
42 | bool excludeFromRefresh() const; | 45 | bool excludeFromRefresh() const; |
43 | void refresh(); | 46 | void refresh(); |
44 | void reinitialize(); | 47 | void reinitialize(); |
45 | 48 | ||
46 | private: | 49 | private: |
47 | QGuardedPtr<MailPluginWidget> m_widget; | 50 | QGuardedPtr<MailPluginWidget> m_widget; |
48 | }; | 51 | }; |
49 | 52 | ||
50 | #endif | 53 | #endif |
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,48 +1,48 @@ | |||
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 | ||
17 | 17 | ||
18 | 18 | ||
19 | #include "mailplugin.h" | 19 | #include "mailplugin.h" |
20 | #include "mailpluginimpl.h" | 20 | #include "mailpluginimpl.h" |
21 | 21 | ||
22 | MailPluginImpl::MailPluginImpl() { | 22 | MailPluginImpl::MailPluginImpl() { |
23 | mailPlugin = new MailPlugin(); | 23 | mailPlugin = new MailPlugin(); |
24 | } | 24 | } |
25 | 25 | ||
26 | MailPluginImpl::~MailPluginImpl() { | 26 | MailPluginImpl::~MailPluginImpl() { |
27 | delete mailPlugin; | 27 | delete mailPlugin; |
28 | } | 28 | } |
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,39 +1,39 @@ | |||
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 | ||
33 | virtual TodayPluginObject *guiPart(); | 33 | virtual TodayPluginObject *guiPart(); |
34 | 34 | ||
35 | private: | 35 | private: |
36 | MailPlugin *mailPlugin; | 36 | MailPlugin *mailPlugin; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | #endif | 39 | #endif |
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 | |||
@@ -1,45 +1,44 @@ | |||
1 | /* | 1 | /* |
2 | * mailpluginwidget.cpp | 2 | * mailpluginwidget.cpp |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | #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 | ||
34 | if ( m_layout ) { | 33 | if ( m_layout ) { |
35 | delete m_layout; | 34 | delete m_layout; |
36 | } | 35 | } |
37 | m_layout = new QHBoxLayout( this ); | 36 | m_layout = new QHBoxLayout( this ); |
38 | m_layout->setAutoAdd( true ); | 37 | m_layout->setAutoAdd( true ); |
39 | 38 | ||
40 | 39 | ||
41 | #if defined(Q_WS_QWS) | 40 | #if defined(Q_WS_QWS) |
42 | #if !defined(QT_NO_COP) | 41 | #if !defined(QT_NO_COP) |
43 | QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this ); | 42 | QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this ); |
44 | connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ), | 43 | connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ), |
45 | this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); | 44 | this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); |
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 | |||
@@ -1,46 +1,48 @@ | |||
1 | /* | 1 | /* |
2 | * mailpluginwidget.h | 2 | * mailpluginwidget.h |
3 | * | 3 | * |
4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß | 4 | * copyright : (c) 2002,2003,2004 by Maximilian Reiß |
5 | * email : harlekin@handhelds.org | 5 | * email : harlekin@handhelds.org |
6 | * | 6 | * |
7 | */ | 7 | */ |
8 | /*************************************************************************** | 8 | /*************************************************************************** |
9 | * * | 9 | * * |
10 | * This program is free software; you can redistribute it and/or modify * | 10 | * This program is free software; you can redistribute it and/or modify * |
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef 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: |
35 | void startMail(); | 37 | void startMail(); |
36 | 38 | ||
37 | private: | 39 | private: |
38 | OClickableLabel* m_mailLabel; | 40 | OClickableLabel* m_mailLabel; |
39 | QHBoxLayout* m_layout; | 41 | QHBoxLayout* m_layout; |
40 | void readConfig(); | 42 | void readConfig(); |
41 | void getInfo(); | 43 | void getInfo(); |
42 | 44 | ||
43 | int m_newMails; | 45 | int m_newMails; |
44 | int m_outgoing; | 46 | int m_outgoing; |
45 | 47 | ||
46 | private slots: | 48 | private slots: |