author | harlekin <harlekin> | 2004-01-03 20:47:29 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-03 20:47:29 (UTC) |
commit | a89470252ffae1670e12ef5d81db08d0e27af265 (patch) (unidiff) | |
tree | a00495b5427fe8b3d7f482bd9d61c80083c71ba4 | |
parent | 047436e254964558bfdbb1d84a79a2686f8e0b09 (diff) | |
download | opie-a89470252ffae1670e12ef5d81db08d0e27af265.zip opie-a89470252ffae1670e12ef5d81db08d0e27af265.tar.gz opie-a89470252ffae1670e12ef5d81db08d0e27af265.tar.bz2 |
apdated to new mailer
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginwidget.cpp | 38 | ||||
-rw-r--r-- | core/pim/today/plugins/mail/mailpluginwidget.h | 8 |
2 files changed, 35 insertions, 11 deletions
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp index 646996a..f717116 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.cpp +++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp | |||
@@ -2,5 +2,5 @@ | |||
2 | * mailpluginwidget.cpp | 2 | * mailpluginwidget.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 | * |
@@ -30,5 +30,4 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | |||
30 | } | 30 | } |
31 | m_mailLabel = new OClickableLabel( this ); | 31 | m_mailLabel = new OClickableLabel( this ); |
32 | //m_mailLabel->setMaximumHeight( 15 ); | ||
33 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); | 32 | connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); |
34 | 33 | ||
@@ -39,8 +38,27 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) | |||
39 | m_layout->setAutoAdd( true ); | 38 | m_layout->setAutoAdd( true ); |
40 | 39 | ||
40 | |||
41 | #if defined(Q_WS_QWS) | ||
42 | #if !defined(QT_NO_COP) | ||
43 | QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this ); | ||
44 | connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ), | ||
45 | this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); | ||
46 | #endif | ||
47 | #endif | ||
48 | |||
41 | readConfig(); | 49 | readConfig(); |
42 | getInfo(); | 50 | getInfo(); |
43 | } | 51 | } |
44 | 52 | ||
53 | |||
54 | void MailPluginWidget::channelReceived( const QCString &msg, const QByteArray & data ) { | ||
55 | QDataStream stream( data, IO_ReadOnly ); | ||
56 | if ( msg == "outgoingMails(int)" ) { | ||
57 | stream >> m_outgoing; | ||
58 | } else if ( msg == "newMails(int)" ) { | ||
59 | stream >> m_newMails; | ||
60 | } | ||
61 | getInfo(); | ||
62 | } | ||
45 | MailPluginWidget::~MailPluginWidget() { | 63 | MailPluginWidget::~MailPluginWidget() { |
46 | delete m_mailLabel; | 64 | delete m_mailLabel; |
@@ -52,4 +70,10 @@ void MailPluginWidget::readConfig() { | |||
52 | Config cfg( "todaymailplugin" ); | 70 | Config cfg( "todaymailplugin" ); |
53 | cfg.setGroup( "config" ); | 71 | cfg.setGroup( "config" ); |
72 | |||
73 | Config cfg2( "mail" ); | ||
74 | cfg2.setGroup( "Status" ); | ||
75 | |||
76 | m_newMails = cfg2.readNumEntry( "newmails", 0 ); | ||
77 | m_outgoing = cfg2.readNumEntry( "outgoing", 0 ); | ||
54 | } | 78 | } |
55 | 79 | ||
@@ -61,13 +85,7 @@ void MailPluginWidget::refresh() { | |||
61 | void MailPluginWidget::getInfo() { | 85 | void MailPluginWidget::getInfo() { |
62 | 86 | ||
63 | Config cfg( "opiemail" ); | ||
64 | cfg.setGroup( "today" ); | ||
65 | |||
66 | int NEW_MAILS = cfg.readNumEntry( "newmails", 0 ); | ||
67 | int OUTGOING = cfg.readNumEntry( "outgoing", 0 ); | ||
68 | 87 | ||
69 | //QString output = QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING ); | ||
70 | 88 | ||
71 | m_mailLabel->setText( QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( NEW_MAILS ).arg( OUTGOING ) ); | 89 | m_mailLabel->setText( QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( m_newMails ).arg( m_outgoing ) ); |
72 | } | 90 | } |
73 | 91 | ||
@@ -77,4 +95,4 @@ void MailPluginWidget::getInfo() { | |||
77 | void MailPluginWidget::startMail() { | 95 | void MailPluginWidget::startMail() { |
78 | QCopEnvelope e("QPE/System", "execute(QString)"); | 96 | QCopEnvelope e("QPE/System", "execute(QString)"); |
79 | e << QString( "mail" ); | 97 | e << QString( "opiemail" ); |
80 | } | 98 | } |
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h index a3b1388..6d16d2c 100644 --- a/core/pim/today/plugins/mail/mailpluginwidget.h +++ b/core/pim/today/plugins/mail/mailpluginwidget.h | |||
@@ -2,5 +2,5 @@ | |||
2 | * mailpluginwidget.h | 2 | * mailpluginwidget.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 | * |
@@ -40,4 +40,10 @@ private: | |||
40 | void readConfig(); | 40 | void readConfig(); |
41 | void getInfo(); | 41 | void getInfo(); |
42 | |||
43 | int m_newMails; | ||
44 | int m_outgoing; | ||
45 | |||
46 | private slots: | ||
47 | void channelReceived(const QCString &msg, const QByteArray & data); | ||
42 | }; | 48 | }; |
43 | 49 | ||