author | alwin <alwin> | 2005-03-12 02:17:12 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-12 02:17:12 (UTC) |
commit | c30ae1086dfe8bebe1790161ba7df6c5472ded9f (patch) (unidiff) | |
tree | 2d98b84fd3fd3aa0e78eec5eb039bbd9088008da /noncore/net/mail/taskbarapplet/mailapplet.cpp | |
parent | f6fa2808753f84a66037d8ca4f62f7ce412a386b (diff) | |
download | opie-c30ae1086dfe8bebe1790161ba7df6c5472ded9f.zip opie-c30ae1086dfe8bebe1790161ba7df6c5472ded9f.tar.gz opie-c30ae1086dfe8bebe1790161ba7df6c5472ded9f.tar.bz2 |
if there are new mails the taskbar icon stays 'cause not all
machines have a (working) mail-LED and users wonders why them don't
get a notification.
Inserted a block for SIGPIPE - that would let opie crash otherwise if
happen.
Diffstat (limited to 'noncore/net/mail/taskbarapplet/mailapplet.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 16 |
1 files changed, 9 insertions, 7 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 | |||
@@ -15,18 +15,18 @@ | |||
15 | /* UNIX */ | 15 | /* UNIX */ |
16 | #include <signal.h> | 16 | #include <signal.h> |
17 | 17 | ||
18 | using namespace Opie::Core; | 18 | using namespace Opie::Core; |
19 | 19 | ||
20 | MailApplet::MailApplet( QWidget *parent ) | 20 | MailApplet::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; |
@@ -50,22 +50,25 @@ MailApplet::~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 | ||
56 | void MailApplet::paintEvent( QPaintEvent* ) { | 56 | void 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 | ||
68 | void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { | 71 | void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { |
69 | slotClicked(); | 72 | slotClicked(); |
70 | } | 73 | } |
71 | 74 | ||
@@ -131,18 +134,17 @@ void MailApplet::slotCheck() { | |||
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]; |