summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-01-06 11:21:52 (UTC)
committer harlekin <harlekin>2004-01-06 11:21:52 (UTC)
commit62eae1abc717f16890ca63cbd19fc7405832f8e1 (patch) (unidiff)
tree4b27d60dab3ed16ac6a62852149253cf2b7f0754
parent37ac44d5582a5c4793482ed544a38a014c5fe8a2 (diff)
downloadopie-62eae1abc717f16890ca63cbd19fc7405832f8e1.zip
opie-62eae1abc717f16890ca63cbd19fc7405832f8e1.tar.gz
opie-62eae1abc717f16890ca63cbd19fc7405832f8e1.tar.bz2
correct config entries
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/today/plugins/mail/mailpluginwidget.cpp2
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index f717116..feecd81 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -1,98 +1,98 @@
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 16
17#include <qpe/config.h> 17#include <qpe/config.h>
18#include <qpe/qcopenvelope_qws.h> 18#include <qpe/qcopenvelope_qws.h>
19 19
20#include "mailpluginwidget.h" 20#include "mailpluginwidget.h"
21 21
22MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name) 22MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
23 : QWidget(parent, name ) { 23 : QWidget(parent, name ) {
24 24
25 m_mailLabel = 0l; 25 m_mailLabel = 0l;
26 m_layout = 0l; 26 m_layout = 0l;
27 27
28 if ( m_mailLabel ) { 28 if ( m_mailLabel ) {
29 delete m_mailLabel; 29 delete m_mailLabel;
30 } 30 }
31 m_mailLabel = new OClickableLabel( this ); 31 m_mailLabel = new OClickableLabel( this );
32 connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) ); 32 connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
33 33
34 if ( m_layout ) { 34 if ( m_layout ) {
35 delete m_layout; 35 delete m_layout;
36 } 36 }
37 m_layout = new QHBoxLayout( this ); 37 m_layout = new QHBoxLayout( this );
38 m_layout->setAutoAdd( true ); 38 m_layout->setAutoAdd( true );
39 39
40 40
41#if defined(Q_WS_QWS) 41#if defined(Q_WS_QWS)
42#if !defined(QT_NO_COP) 42#if !defined(QT_NO_COP)
43 QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this ); 43 QCopChannel *qCopChannel = new QCopChannel( "QPE/Pim" , this );
44 connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ), 44 connect ( qCopChannel, SIGNAL( received( const QCString &, const QByteArray &) ),
45 this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) ); 45 this, SLOT ( channelReceived( const QCString &, const QByteArray &) ) );
46#endif 46#endif
47#endif 47#endif
48 48
49 readConfig(); 49 readConfig();
50 getInfo(); 50 getInfo();
51} 51}
52 52
53 53
54void MailPluginWidget::channelReceived( const QCString &msg, const QByteArray & data ) { 54void MailPluginWidget::channelReceived( const QCString &msg, const QByteArray & data ) {
55 QDataStream stream( data, IO_ReadOnly ); 55 QDataStream stream( data, IO_ReadOnly );
56 if ( msg == "outgoingMails(int)" ) { 56 if ( msg == "outgoingMails(int)" ) {
57 stream >> m_outgoing; 57 stream >> m_outgoing;
58 } else if ( msg == "newMails(int)" ) { 58 } else if ( msg == "newMails(int)" ) {
59 stream >> m_newMails; 59 stream >> m_newMails;
60 } 60 }
61 getInfo(); 61 getInfo();
62} 62}
63MailPluginWidget::~MailPluginWidget() { 63MailPluginWidget::~MailPluginWidget() {
64 delete m_mailLabel; 64 delete m_mailLabel;
65 delete m_layout; 65 delete m_layout;
66} 66}
67 67
68 68
69void MailPluginWidget::readConfig() { 69void MailPluginWidget::readConfig() {
70 Config cfg( "todaymailplugin" ); 70 Config cfg( "todaymailplugin" );
71 cfg.setGroup( "config" ); 71 cfg.setGroup( "config" );
72 72
73 Config cfg2( "mail" ); 73 Config cfg2( "mail" );
74 cfg2.setGroup( "Status" ); 74 cfg2.setGroup( "Status" );
75 75
76 m_newMails = cfg2.readNumEntry( "newmails", 0 ); 76 m_newMails = cfg2.readNumEntry( "newMails", 0 );
77 m_outgoing = cfg2.readNumEntry( "outgoing", 0 ); 77 m_outgoing = cfg2.readNumEntry( "outgoing", 0 );
78} 78}
79 79
80 80
81void MailPluginWidget::refresh() { 81void MailPluginWidget::refresh() {
82 getInfo(); 82 getInfo();
83} 83}
84 84
85void MailPluginWidget::getInfo() { 85void MailPluginWidget::getInfo() {
86 86
87 87
88 88
89 m_mailLabel->setText( QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( m_newMails ).arg( m_outgoing ) ); 89 m_mailLabel->setText( QObject::tr( "<b>%1</b> new mail(s), <b>%2</b> outgoing" ).arg( m_newMails ).arg( m_outgoing ) );
90} 90}
91 91
92/** 92/**
93 * launches datebook 93 * launches datebook
94 */ 94 */
95void MailPluginWidget::startMail() { 95void MailPluginWidget::startMail() {
96 QCopEnvelope e("QPE/System", "execute(QString)"); 96 QCopEnvelope e("QPE/System", "execute(QString)");
97 e << QString( "opiemail" ); 97 e << QString( "opiemail" );
98} 98}
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index 25fd400..58f068b 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -22,111 +22,111 @@ MailApplet::MailApplet( QWidget *parent )
22 22
23 setFixedWidth( AppLnk::smallIconSize() ); 23 setFixedWidth( AppLnk::smallIconSize() );
24 setFixedHeight( AppLnk::smallIconSize() ); 24 setFixedHeight( AppLnk::smallIconSize() );
25 25
26 hide(); 26 hide();
27 27
28 m_newMails = 0; 28 m_newMails = 0;
29 m_statusMail = 0l; 29 m_statusMail = 0l;
30 30
31 if ( !m_config->readBoolEntry( "Disabled", false ) ) { 31 if ( !m_config->readBoolEntry( "Disabled", false ) ) {
32 // delay 5 sec until the whole mail backend gets started .-) 32 // delay 5 sec until the whole mail backend gets started .-)
33 QTimer::singleShot( 5000, this, SLOT( startup() ) ); 33 QTimer::singleShot( 5000, this, SLOT( startup() ) );
34 } 34 }
35 repaint( true ); 35 repaint( true );
36} 36}
37 37
38 38
39MailApplet::~MailApplet() { 39MailApplet::~MailApplet() {
40 if ( m_statusMail ) 40 if ( m_statusMail )
41 delete m_statusMail; 41 delete m_statusMail;
42 if ( m_config ) 42 if ( m_config )
43 delete m_config; 43 delete m_config;
44} 44}
45 45
46void MailApplet::paintEvent( QPaintEvent* ) { 46void MailApplet::paintEvent( QPaintEvent* ) {
47 QPainter p( this ); 47 QPainter p( this );
48 p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/mailchecker" ) ); 48 p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/mailchecker" ) );
49 QFont f( "Fixed", AppLnk::smallIconSize() ); 49 QFont f( "Fixed", AppLnk::smallIconSize() );
50 QFontMetrics fm( f ); 50 QFontMetrics fm( f );
51 p.setFont( f ); 51 p.setFont( f );
52 p.drawText( AppLnk::smallIconSize()/2, AppLnk::smallIconSize()/2, QString::number( m_newMails ) ); 52 p.drawText( AppLnk::smallIconSize()/2, AppLnk::smallIconSize()/2, QString::number( m_newMails ) );
53 return; 53 return;
54 54
55} 55}
56 56
57void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { 57void MailApplet::mouseReleaseEvent( QMouseEvent* e ) {
58 slotClicked(); 58 slotClicked();
59} 59}
60 60
61void MailApplet::slotClicked() { 61void MailApplet::slotClicked() {
62 QCopEnvelope e( "QPE/System", "execute(QString)" ); 62 QCopEnvelope e( "QPE/System", "execute(QString)" );
63 e << QString( "opiemail" ); 63 e << QString( "opiemail" );
64 64
65 ODevice *device = ODevice::inst(); 65 ODevice *device = ODevice::inst();
66 if ( !device-> ledList().isEmpty() ) { 66 if ( !device-> ledList().isEmpty() ) {
67 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; 67 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
68 68
69 device->setLedState( led, Led_Off ); 69 device->setLedState( led, Led_Off );
70 } 70 }
71 71
72 // m_statusMails->reset_status(); 72 // m_statusMails->reset_status();
73} 73}
74 74
75void MailApplet::startup() { 75void MailApplet::startup() {
76 Settings *settings = new Settings(); 76 Settings *settings = new Settings();
77 QList<Account> ma = settings->getAccounts(); 77 QList<Account> ma = settings->getAccounts();
78 m_statusMail = new StatusMail( ma ); 78 m_statusMail = new StatusMail( ma );
79 delete settings; 79 delete settings;
80 80
81 m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000; 81 m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
82 m_intervalTimer = new QTimer(); 82 m_intervalTimer = new QTimer();
83 m_intervalTimer->start( m_intervalMs ); 83 m_intervalTimer->start( m_intervalMs );
84 connect( m_intervalTimer, SIGNAL( timeout() ), this, SLOT( slotCheck() ) ); 84 connect( m_intervalTimer, SIGNAL( timeout() ), this, SLOT( slotCheck() ) );
85} 85}
86 86
87void MailApplet::slotCheck() { 87void MailApplet::slotCheck() {
88 // Check wether the check interval has been changed. 88 // Check wether the check interval has been changed.
89 int newIntervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000; 89 int newIntervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
90 if ( newIntervalMs != m_intervalMs ) { 90 if ( newIntervalMs != m_intervalMs ) {
91 m_intervalTimer->changeInterval( newIntervalMs ); 91 m_intervalTimer->changeInterval( newIntervalMs );
92 m_intervalMs = newIntervalMs; 92 m_intervalMs = newIntervalMs;
93 } 93 }
94 94
95 if (m_statusMail == 0) { 95 if (m_statusMail == 0) {
96 return; 96 return;
97 } 97 }
98 98
99 folderStat stat; 99 folderStat stat;
100 m_statusMail->check_current_stat( stat ); 100 m_statusMail->check_current_stat( stat );
101 m_newMails = stat.message_unseen; 101 m_newMails = stat.message_unseen;
102 qDebug( QString( "test %1" ).arg( m_newMails ) ); 102 qDebug( QString( "test %1" ).arg( m_newMails ) );
103 if ( m_newMails > 0 ) { 103 if ( m_newMails > 0 ) {
104 ODevice *device = ODevice::inst(); 104 ODevice *device = ODevice::inst();
105 if ( isHidden() ) 105 if ( isHidden() )
106 show(); 106 show();
107 if ( m_config->readBoolEntry( "BlinkLed", true ) ) { 107 if ( m_config->readBoolEntry( "BlinkLed", true ) ) {
108 if ( !device->ledList().isEmpty() ) { 108 if ( !device->ledList().isEmpty() ) {
109 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; 109 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
110 device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On ); 110 device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On );
111 } 111 }
112 } 112 }
113 if ( m_config->readBoolEntry( "PlaySound", false ) ) 113 if ( m_config->readBoolEntry( "PlaySound", false ) )
114 device->alarmSound(); 114 device->alarmSound();
115 115
116 Config cfg( "mail" ); 116 Config cfg( "mail" );
117 cfg.setGroup( "Status" ); 117 cfg.setGroup( "Status" );
118 cfg.writeEntry( "NewMails", m_newMails ); 118 cfg.writeEntry( "newMails", m_newMails );
119 QCopEnvelope env( "QPE/Pim", "newMails(int)" ); 119 QCopEnvelope env( "QPE/Pim", "newMails(int)" );
120 env << m_newMails; 120 env << m_newMails;
121 repaint( true ); 121 repaint( true );
122 122
123 } else { 123 } else {
124 ODevice *device = ODevice::inst(); 124 ODevice *device = ODevice::inst();
125 if ( !isHidden() ) 125 if ( !isHidden() )
126 hide(); 126 hide();
127 if ( !device->ledList().isEmpty() ) { 127 if ( !device->ledList().isEmpty() ) {
128 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; 128 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
129 device->setLedState( led, Led_Off ); 129 device->setLedState( led, Led_Off );
130 } 130 }
131 } 131 }
132} 132}