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
@@ -44,55 +44,55 @@ MailPluginWidget::MailPluginWidget( QWidget *parent, const char* name)
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
@@ -86,47 +86,47 @@ void MailApplet::startup() {
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}