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,126 +1,127 @@
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qlabel.h>
-#include <qsound.h>
+#include <qpainter.h>
#include <qtimer.h>
-#include <qdir.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/resource.h>
#include <qpe/config.h>
+#include <qpe/applnk.h>
#include <opie/odevice.h>
-#include <qlist.h>
#include <libmailwrapper/settings.h>
#include "mailapplet.h"
using namespace Opie;
-MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl )
- : QButton( parent, name, fl ) {
+MailApplet::MailApplet( QWidget *parent )
+ : QWidget( parent ) {
m_config = new Config( "mail" );
m_config->setGroup( "Applet" );
- 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() );
hide();
- 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 .-)
QTimer::singleShot( 5000, this, SLOT( startup() ) );
}
+ 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();
+}
void MailApplet::slotClicked() {
qDebug( " CLICKED" );
QCopEnvelope e( "QPE/System", "execute(QString)" );
e << QString( "opiemail" );
ODevice *device = ODevice::inst();
if ( !device-> ledList ( ). isEmpty ( ) ) {
OLed led = ( device-> ledList ( ). contains ( Led_Mail )) ? Led_Mail : device-> ledList ( ) [0];
device->setLedState( led, Led_Off );
}
// m_statusMails->reset_status();
}
void MailApplet::startup() {
Settings *settings = new Settings();
QList<Account> ma = settings->getAccounts();
StatusMail m_statusMail = StatusMail( ma );
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() ) );
+
}
void MailApplet::slotCheck() {
// Check wether the check interval has been changed.
int newIntervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
if ( newIntervalMs != m_intervalMs ) {
m_intervalTimer->changeInterval( newIntervalMs );
m_intervalMs = newIntervalMs;
}
folderStat stat;
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();
if ( isHidden() ) show();
if ( m_config->readBoolEntry( "BlinkLed", true ) ) {
if ( !device-> ledList ( ).isEmpty( ) ) {
OLed led = ( device->ledList( ).contains( Led_Mail ) ) ? Led_Mail : device->ledList( ) [0];
device->setLedState( led, device->ledStateList( led ).contains( Led_BlinkSlow ) ? Led_BlinkSlow : Led_On );
}
}
if ( m_config->readBoolEntry( "PlaySound", false ) )
device->alarmSound();
- 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 );
} else {
ODevice *device = ODevice::inst();
if ( !isHidden() ) hide();
if ( !device-> ledList( ).isEmpty( ) ) {
OLed led = ( device->ledList( ).contains( Led_Mail ) ) ? Led_Mail : device->ledList( ) [0];
device->setLedState( led, Led_Off );
}
}
-
- // 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
@@ -1,37 +1,38 @@
#ifndef MAILAPPLET_H
#define MAILAPPLET_H
#include <qbutton.h>
#include <libmailwrapper/statusmail.h>
class Config;
class QTimer;
-class MailApplet : public QButton {
+class MailApplet : public QWidget {
Q_OBJECT
public:
- MailApplet( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 );
+ MailApplet( QWidget *parent = 0 );
~MailApplet();
protected:
- void drawButton(QPainter *);
- void drawButtonText(QPainter *);
void gotNewMail();
+ void mouseReleaseEvent( QMouseEvent* );
+ void paintEvent( QPaintEvent* );
protected slots:
void startup();
void slotCheck();
void slotClicked();
private:
Config *m_config;
QTimer *m_intervalTimer;
int m_intervalMs;
StatusMail* m_statusMail;
+ int m_newMails;
};
#endif