summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp71
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.h9
2 files changed, 41 insertions, 39 deletions
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index 31d5bfe..5d98783 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -1,7 +1,3 @@
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qlabel.h>
-#include <qsound.h>
+#include <qpainter.h>
#include <qtimer.h>
-#include <qdir.h>
@@ -10,5 +6,5 @@
#include <qpe/config.h>
+#include <qpe/applnk.h>
#include <opie/odevice.h>
-#include <qlist.h>
@@ -20,4 +16,4 @@ using namespace Opie;
-MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl )
- : QButton( parent, name, fl ) {
+MailApplet::MailApplet( QWidget *parent )
+ : QWidget( parent ) {
@@ -26,10 +22,4 @@ MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl )
- QVBoxLayout *layout = new QVBoxLayout( this );
- layout->addItem( new QSpacerItem( 0,0 ) );
-
- QLabel *pixmap = new QLabel( this );
- pixmap->setPixmap( Resource::loadPixmap( "mail/mailchecker" ) );
- layout->addWidget( pixmap );
-
- layout->addItem( new QSpacerItem( 0,0 ) );
+ setFixedWidth( AppLnk::smallIconSize() );
+ setFixedHeight( AppLnk::smallIconSize() );
@@ -37,12 +27,6 @@ MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl )
- m_statusMail = 0;
-
- connect( this, SIGNAL( clicked() ), SLOT( slotClicked() ) );
+ m_newMails = 0;
+ m_statusMail = 0l;
if ( !m_config->readBoolEntry( "Disabled", false ) ) {
- m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
- m_intervalTimer = new QTimer();
- m_intervalTimer->start( m_intervalMs );
- connect( m_intervalTimer, SIGNAL(timeout() ), SLOT( slotCheck() ) );
-
// delay 5 sec until the whole mail backend gets started .-)
@@ -50,10 +34,25 @@ MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl )
}
+ repaint( true );
}
+
MailApplet::~MailApplet() {
if (m_statusMail) delete m_statusMail;
+ if (m_config) delete m_config;
}
-void MailApplet::drawButton(QPainter *) { }
-void MailApplet::drawButtonText(QPainter *) { }
+void MailApplet::paintEvent( QPaintEvent* ) {
+ QPainter p(this);
+ p.drawPixmap( 0, 0, Resource::loadPixmap( "mail/mailchecker" ) );
+ QFont f( "Fixed", AppLnk::smallIconSize() );
+ QFontMetrics fm( f );
+ p.setFont( f );
+ p.drawText( AppLnk::smallIconSize()/2, AppLnk::smallIconSize()/2, QString::number( m_newMails ) );
+ return;
+
+}
+
+void MailApplet::mouseReleaseEvent( QMouseEvent* e) {
+ slotClicked();
+}
@@ -79,2 +78,8 @@ void MailApplet::startup() {
delete settings;
+
+ m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
+ m_intervalTimer = new QTimer();
+ m_intervalTimer->start( m_intervalMs );
+ connect( m_intervalTimer, SIGNAL(timeout() ), this, SLOT( slotCheck() ) );
+
}
@@ -92,5 +97,5 @@ void MailApplet::slotCheck() {
m_statusMail->check_current_stat( stat );
-
+ m_newMails = stat.message_unseen;
qDebug( QString( "test %1" ).arg( stat.message_unseen ) );
- if ( stat.message_unseen > 0 ) {
+ if ( m_newMails > 0 ) {
ODevice *device = ODevice::inst();
@@ -106,9 +111,8 @@ void MailApplet::slotCheck() {
- qDebug( QString( "test %1" ).arg( stat.message_unseen ) );
-
- Config cfg( "mail" );
+ Config cfg( "mail" );
cfg.setGroup( "Status" );
- cfg.writeEntry( "NewMails", ( int )stat.message_unseen );
+ cfg.writeEntry( "NewMails", m_newMails );
QCopEnvelope env( "QPE/Pim", "newMails(int)" );
env << stat.message_unseen;
+ repaint( true );
@@ -122,5 +126,2 @@ void MailApplet::slotCheck() {
}
-
- // go trough accounts and check here
- // also trigger qcop call and save status to config
}
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h
index 8369176..25f0652 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.h
+++ b/noncore/net/mail/taskbarapplet/mailapplet.h
@@ -10,3 +10,3 @@ class QTimer;
-class MailApplet : public QButton {
+class MailApplet : public QWidget {
@@ -15,3 +15,3 @@ class MailApplet : public QButton {
public:
- MailApplet( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
+ MailApplet( QWidget *parent = 0 );
~MailApplet();
@@ -19,5 +19,5 @@ public:
protected:
- void drawButton(QPainter *);
- void drawButtonText(QPainter *);
void gotNewMail();
+ void mouseReleaseEvent( QMouseEvent* );
+ void paintEvent( QPaintEvent* );
@@ -32,2 +32,3 @@ private:
StatusMail* m_statusMail;
+ int m_newMails;