From 9acbe167d22cf1bed17a0361fdcdadf7581d8127 Mon Sep 17 00:00:00 2001 From: harlekin Date: Mon, 05 Jan 2004 16:03:29 +0000 Subject: integration of mailbox status stuff --- (limited to 'noncore/net/mail/taskbarapplet') diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index 5ba7085..f81dce8 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp @@ -10,6 +10,9 @@ #include #include +#include + +#include #include "mailapplet.h" @@ -32,7 +35,7 @@ MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl ) hide(); - connect( this, SIGNAL( clicked() ), SLOT( slotClicked() ) ); + connect( this, SIGNAL( clicked() ), SLOT( slotClicked() ) ); if ( !m_config->readBoolEntry( "Disabled", false ) ) { m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000; @@ -40,10 +43,15 @@ MailApplet::MailApplet( QWidget *parent, const char *name, WFlags fl ) m_intervalTimer->start( m_intervalMs ); connect( m_intervalTimer, SIGNAL(timeout() ), SLOT( slotCheck() ) ); - QTimer::singleShot( 0, this, SLOT( slotCheck() ) ); + // delay 5 sec until the whole mail backend gets started .-) + QTimer::singleShot( 5000, this, SLOT( startup() ) ); } } +MailApplet::~MailApplet() { + delete m_statusMail; +} + void MailApplet::drawButton(QPainter *) { } void MailApplet::drawButtonText(QPainter *) { } @@ -58,6 +66,15 @@ void MailApplet::slotClicked() { device->setLedState( led, Led_Off ); } + + // m_statusMails->reset_status(); +} + +void MailApplet::startup() { + Settings *settings = new Settings(); + QList ma = settings->getAccounts(); + StatusMail m_statusMail = StatusMail( ma ); + delete settings; } void MailApplet::slotCheck() { @@ -68,9 +85,12 @@ void MailApplet::slotCheck() { m_intervalMs = newIntervalMs; } - int newMails = 0; - if ( true ) { + folderStat stat; + m_statusMail->check_current_stat( stat ); + + qDebug( QString( "test %1" ).arg( stat.message_unseen ) ); + if ( stat.message_unseen > 0 ) { ODevice *device = ODevice::inst(); if ( isHidden() ) show(); if ( m_config->readBoolEntry( "BlinkLed", true ) ) { @@ -82,12 +102,13 @@ void MailApplet::slotCheck() { if ( m_config->readBoolEntry( "PlaySound", false ) ) device->alarmSound(); + qDebug( QString( "test %1" ).arg( stat.message_unseen ) ); + Config cfg( "mail" ); cfg.setGroup( "Status" ); - cfg.writeEntry( "NewMails", newMails ); // todo - + cfg.writeEntry( "NewMails", ( int )stat.message_unseen ); QCopEnvelope env( "QPE/Pim", "newMails(int)" ); - env << newMails; + env << stat.message_unseen; } else { ODevice *device = ODevice::inst(); diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h index 34bdc22..8369176 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.h +++ b/noncore/net/mail/taskbarapplet/mailapplet.h @@ -3,6 +3,8 @@ #include +#include + class Config; class QTimer; @@ -12,6 +14,7 @@ class MailApplet : public QButton { public: MailApplet( QWidget *parent = 0, const char *name = 0, WFlags fl = 0 ); + ~MailApplet(); protected: void drawButton(QPainter *); @@ -19,12 +22,14 @@ protected: void gotNewMail(); protected slots: + void startup(); void slotCheck(); void slotClicked(); private: Config *m_config; QTimer *m_intervalTimer; int m_intervalMs; + StatusMail* m_statusMail; }; diff --git a/noncore/net/mail/taskbarapplet/taskbarapplet.pro b/noncore/net/mail/taskbarapplet/taskbarapplet.pro index 3c658e3..c54e87f 100644 --- a/noncore/net/mail/taskbarapplet/taskbarapplet.pro +++ b/noncore/net/mail/taskbarapplet/taskbarapplet.pro @@ -4,7 +4,7 @@ HEADERS += mailapplet.h \ mailappletimpl.h SOURCES += mailapplet.cpp \ mailappletimpl.cpp -INCLUDEPATH += $(OPIEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/noncore/net/mail LIBS += -lmailwrapper -lqpe -lopie TARGET = mailapplet DESTDIR += $(OPIEDIR)/plugins/applets/ -- cgit v0.9.0.2