summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-01-03 20:47:29 (UTC)
committer harlekin <harlekin>2004-01-03 20:47:29 (UTC)
commita89470252ffae1670e12ef5d81db08d0e27af265 (patch) (unidiff)
treea00495b5427fe8b3d7f482bd9d61c80083c71ba4
parent047436e254964558bfdbb1d84a79a2686f8e0b09 (diff)
downloadopie-a89470252ffae1670e12ef5d81db08d0e27af265.zip
opie-a89470252ffae1670e12ef5d81db08d0e27af265.tar.gz
opie-a89470252ffae1670e12ef5d81db08d0e27af265.tar.bz2
apdated to new mailer
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.cpp38
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.h8
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
@@ -1,7 +1,7 @@
1/* 1/*
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 *
7 */ 7 */
@@ -29,7 +29,6 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
29 delete m_mailLabel; 29 delete m_mailLabel;
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
35 if ( m_layout ) { 34 if ( m_layout ) {
@@ -38,10 +37,29 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
38 m_layout = new QHBoxLayout( this ); 37 m_layout = new QHBoxLayout( this );
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
54void 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}
45MailPluginWidget::~MailPluginWidget() { 63MailPluginWidget::~MailPluginWidget() {
46 delete m_mailLabel; 64 delete m_mailLabel;
47 delete m_layout; 65 delete m_layout;
@@ -51,6 +69,12 @@ MailPluginWidget::~MailPluginWidget() {
51void MailPluginWidget::readConfig() { 69void 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
56 80
@@ -60,15 +84,9 @@ void MailPluginWidget::refresh() {
60 84
61void MailPluginWidget::getInfo() { 85void 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
74/** 92/**
@@ -76,5 +94,5 @@ void MailPluginWidget::getInfo() {
76 */ 94 */
77void MailPluginWidget::startMail() { 95void 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
@@ -1,7 +1,7 @@
1/* 1/*
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 *
7 */ 7 */
@@ -39,6 +39,12 @@ private:
39 QHBoxLayout* m_layout; 39 QHBoxLayout* m_layout;
40 void readConfig(); 40 void readConfig();
41 void getInfo(); 41 void getInfo();
42
43 int m_newMails;
44 int m_outgoing;
45
46private slots:
47 void channelReceived(const QCString &msg, const QByteArray & data);
42}; 48};
43 49
44#endif 50#endif