-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 16 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.h | 3 |
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 | |||
@@ -19,10 +19,10 @@ 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 | ||
@@ -54,7 +54,10 @@ MailApplet::~MailApplet() { | |||
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 ); |
@@ -62,6 +65,6 @@ void MailApplet::paintEvent( QPaintEvent* ) { | |||
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 | ||
@@ -135,10 +138,9 @@ void MailApplet::slotCheck() { | |||
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(); |
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 | |||
@@ -3,4 +3,5 @@ | |||
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> |
@@ -9,5 +10,5 @@ class Config; | |||
9 | class QTimer; | 10 | class QTimer; |
10 | 11 | ||
11 | class MailApplet : public QWidget { | 12 | class MailApplet : public QLabel { |
12 | 13 | ||
13 | Q_OBJECT | 14 | Q_OBJECT |