summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp16
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.h3
2 files changed, 11 insertions, 8 deletions
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index 9c0d32f..ce1e7ac 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -9,30 +9,30 @@
9#include <opie2/odevice.h> 9#include <opie2/odevice.h>
10 10
11#include <libmailwrapper/settings.h> 11#include <libmailwrapper/settings.h>
12 12
13#include "mailapplet.h" 13#include "mailapplet.h"
14 14
15/* UNIX */ 15/* UNIX */
16#include <signal.h> 16#include <signal.h>
17 17
18using namespace Opie::Core; 18using namespace Opie::Core;
19 19
20MailApplet::MailApplet( QWidget *parent ) 20MailApplet::MailApplet( QWidget *parent )
21: QWidget( parent ) { 21: QLabel( parent ) {
22 22
23 m_config = new Config( "mail" ); 23 m_config = new Config( "mail" );
24 m_config->setGroup( "Applet" ); 24 m_config->setGroup( "Applet" );
25 25
26 setFixedWidth( AppLnk::smallIconSize() ); 26 //setFixedWidth( AppLnk::smallIconSize() );
27 setFixedHeight( AppLnk::smallIconSize() ); 27 setFixedHeight( AppLnk::smallIconSize() );
28 28
29 hide(); 29 hide();
30 30
31 m_newMails = 0; 31 m_newMails = 0;
32 m_statusMail = 0l; 32 m_statusMail = 0l;
33 33
34 /* for networking we must block SIGPIPE and Co. */ 34 /* for networking we must block SIGPIPE and Co. */
35 struct sigaction blocking_action,temp_action; 35 struct sigaction blocking_action,temp_action;
36 blocking_action.sa_handler = SIG_IGN; 36 blocking_action.sa_handler = SIG_IGN;
37 sigemptyset(&(blocking_action.sa_mask)); 37 sigemptyset(&(blocking_action.sa_mask));
38 blocking_action.sa_flags = 0; 38 blocking_action.sa_flags = 0;
@@ -44,34 +44,37 @@ MailApplet::MailApplet( QWidget *parent )
44 } 44 }
45 repaint( true ); 45 repaint( true );
46} 46}
47 47
48 48
49MailApplet::~MailApplet() { 49MailApplet::~MailApplet() {
50 if ( m_statusMail ) 50 if ( m_statusMail )
51 delete m_statusMail; 51 delete m_statusMail;
52 if ( m_config ) 52 if ( m_config )
53 delete m_config; 53 delete m_config;
54} 54}
55 55
56void MailApplet::paintEvent( QPaintEvent* ) { 56void MailApplet::paintEvent( QPaintEvent*ev )
57{
57 QPainter p( this ); 58 QPainter p( this );
58 p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/inbox" ) ); 59 p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/inbox" ) );
60 QLabel::paintEvent(ev);
61#if 0
59 QFont f( "vera", AppLnk::smallIconSize() ); 62 QFont f( "vera", AppLnk::smallIconSize() );
60 QFontMetrics fm( f ); 63 QFontMetrics fm( f );
61 p.setFont( f ); 64 p.setFont( f );
62 p.setPen( Qt::blue ); 65 p.setPen( Qt::blue );
63 p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) ); 66 p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) );
67#endif
64 return; 68 return;
65
66} 69}
67 70
68void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { 71void MailApplet::mouseReleaseEvent( QMouseEvent* e ) {
69 slotClicked(); 72 slotClicked();
70} 73}
71 74
72void MailApplet::slotClicked() { 75void MailApplet::slotClicked() {
73 QCopEnvelope e( "QPE/System", "execute(QString)" ); 76 QCopEnvelope e( "QPE/System", "execute(QString)" );
74 e << QString( "opiemail" ); 77 e << QString( "opiemail" );
75 78
76 ODevice *device = ODevice::inst(); 79 ODevice *device = ODevice::inst();
77 if ( !device-> ledList().isEmpty() ) { 80 if ( !device-> ledList().isEmpty() ) {
@@ -125,30 +128,29 @@ void MailApplet::slotCheck() {
125 if ( !device->ledList().isEmpty() ) { 128 if ( !device->ledList().isEmpty() ) {
126 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; 129 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
127 device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On ); 130 device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On );
128 } 131 }
129 } 132 }
130 if ( m_config->readBoolEntry( "PlaySound", false ) ) 133 if ( m_config->readBoolEntry( "PlaySound", false ) )
131 device->playAlarmSound(); 134 device->playAlarmSound();
132 } 135 }
133 Config cfg( "mail" ); 136 Config cfg( "mail" );
134 cfg.setGroup( "Status" ); 137 cfg.setGroup( "Status" );
135 cfg.writeEntry( "newMails", m_newMails ); 138 cfg.writeEntry( "newMails", m_newMails );
136 { 139 {
137 odebug << "QCop abschicken" << oendl;
138 QCopEnvelope env( "QPE/Pim", "newMails(int)" ); 140 QCopEnvelope env( "QPE/Pim", "newMails(int)" );
139 env << m_newMails; 141 env << m_newMails;
140 } 142 }
141 odebug << "QCop abschicken done" << oendl; 143 setText(QString::number( m_newMails ));
142 repaint( true ); 144// repaint( true );
143 } else { 145 } else {
144 ODevice *device = ODevice::inst(); 146 ODevice *device = ODevice::inst();
145 if ( !isHidden() ) 147 if ( !isHidden() )
146 hide(); 148 hide();
147 if ( !device->ledList().isEmpty() ) { 149 if ( !device->ledList().isEmpty() ) {
148 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0]; 150 OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
149 device->setLedState( led, Led_Off ); 151 device->setLedState( led, Led_Off );
150 } 152 }
151 153
152 if ( newMailsOld != m_newMails ) { 154 if ( newMailsOld != m_newMails ) {
153 Config cfg( "mail" ); 155 Config cfg( "mail" );
154 cfg.setGroup( "Status" ); 156 cfg.setGroup( "Status" );
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h
index b4d3742..f28f274 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.h
+++ b/noncore/net/mail/taskbarapplet/mailapplet.h
@@ -1,23 +1,24 @@
1#ifndef MAILAPPLET_H 1#ifndef MAILAPPLET_H
2#define MAILAPPLET_H 2#define MAILAPPLET_H
3 3
4#include <qbutton.h> 4#include <qbutton.h>
5#include <qlabel.h>
5 6
6#include <libmailwrapper/statusmail.h> 7#include <libmailwrapper/statusmail.h>
7 8
8class Config; 9class Config;
9class QTimer; 10class QTimer;
10 11
11class MailApplet : public QWidget { 12class MailApplet : public QLabel {
12 13
13 Q_OBJECT 14 Q_OBJECT
14 15
15public: 16public:
16 MailApplet( QWidget *parent = 0 ); 17 MailApplet( QWidget *parent = 0 );
17 ~MailApplet(); 18 ~MailApplet();
18 19
19protected: 20protected:
20 void gotNewMail(); 21 void gotNewMail();
21 void mouseReleaseEvent( QMouseEvent* ); 22 void mouseReleaseEvent( QMouseEvent* );
22 void paintEvent( QPaintEvent* ); 23 void paintEvent( QPaintEvent* );
23 24