author | harlekin <harlekin> | 2004-01-05 21:13:38 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-05 21:13:38 (UTC) |
commit | 0c41bcb3472b013a55b990bc45280043dfcf4986 (patch) (side-by-side diff) | |
tree | 1136f4580b5f8f8a2a699545f8e9fb0006a0e054 /noncore/net/mail | |
parent | 3804209658d051d197526a28561bbd2e31b6f439 (diff) | |
download | opie-0c41bcb3472b013a55b990bc45280043dfcf4986.zip opie-0c41bcb3472b013a55b990bc45280043dfcf4986.tar.gz opie-0c41bcb3472b013a55b990bc45280043dfcf4986.tar.bz2 |
update
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 163 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.h | 28 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailappletimpl.cpp | 29 | ||||
-rw-r--r-- | noncore/net/mail/taskbarapplet/mailappletimpl.h | 16 |
4 files changed, 120 insertions, 116 deletions
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index 5d98783..35198d1 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp @@ -17,20 +17,20 @@ using namespace Opie; MailApplet::MailApplet( QWidget *parent ) - : QWidget( parent ) { +: QWidget( parent ) { - m_config = new Config( "mail" ); - m_config->setGroup( "Applet" ); + m_config = new Config( "mail" ); + m_config->setGroup( "Applet" ); - setFixedWidth( AppLnk::smallIconSize() ); - setFixedHeight( AppLnk::smallIconSize() ); + setFixedWidth( AppLnk::smallIconSize() ); + setFixedHeight( AppLnk::smallIconSize() ); - hide(); + hide(); - m_newMails = 0; - m_statusMail = 0l; + m_newMails = 0; + m_statusMail = 0l; - if ( !m_config->readBoolEntry( "Disabled", false ) ) { - // delay 5 sec until the whole mail backend gets started .-) - QTimer::singleShot( 5000, this, SLOT( startup() ) ); - } - repaint( true ); + if ( !m_config->readBoolEntry( "Disabled", false ) ) { + // delay 5 sec until the whole mail backend gets started .-) + QTimer::singleShot( 5000, this, SLOT( startup() ) ); + } + repaint( true ); } @@ -39,4 +39,6 @@ MailApplet::MailApplet( QWidget *parent ) MailApplet::~MailApplet() { - if (m_statusMail) delete m_statusMail; - if (m_config) delete m_config; + if ( m_statusMail ) + delete m_statusMail; + if ( m_config ) + delete m_config; } @@ -44,9 +46,9 @@ MailApplet::~MailApplet() { 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; + 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; @@ -54,4 +56,4 @@ void MailApplet::paintEvent( QPaintEvent* ) { -void MailApplet::mouseReleaseEvent( QMouseEvent* e) { - slotClicked(); +void MailApplet::mouseReleaseEvent( QMouseEvent* e ) { + slotClicked(); } @@ -59,14 +61,13 @@ void MailApplet::mouseReleaseEvent( QMouseEvent* e) { void MailApplet::slotClicked() { - qDebug( " CLICKED" ); - QCopEnvelope e( "QPE/System", "execute(QString)" ); - e << QString( "opiemail" ); + 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]; + 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 ); - } + device->setLedState( led, Led_Off ); + } - // m_statusMails->reset_status(); + // m_statusMails->reset_status(); } @@ -74,12 +75,11 @@ void MailApplet::slotClicked() { 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() ) ); - + 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() ) ); } @@ -87,41 +87,42 @@ void MailApplet::startup() { 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 ( 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(); - - Config cfg( "mail" ); + // 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( m_newMails ) ); + 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(); + + Config cfg( "mail" ); cfg.setGroup( "Status" ); - 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 ); - } - } + 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 ); + } + } } diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h index 25f0652..b4d3742 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.h +++ b/noncore/net/mail/taskbarapplet/mailapplet.h @@ -12,23 +12,23 @@ class MailApplet : public QWidget { - Q_OBJECT + Q_OBJECT public: - MailApplet( QWidget *parent = 0 ); - ~MailApplet(); + MailApplet( QWidget *parent = 0 ); + ~MailApplet(); protected: - void gotNewMail(); - void mouseReleaseEvent( QMouseEvent* ); - void paintEvent( QPaintEvent* ); + void gotNewMail(); + void mouseReleaseEvent( QMouseEvent* ); + void paintEvent( QPaintEvent* ); protected slots: - void startup(); - void slotCheck(); - void slotClicked(); + void startup(); + void slotCheck(); + void slotClicked(); private: - Config *m_config; - QTimer *m_intervalTimer; - int m_intervalMs; - StatusMail* m_statusMail; - int m_newMails; + Config *m_config; + QTimer *m_intervalTimer; + int m_intervalMs; + StatusMail* m_statusMail; + int m_newMails; diff --git a/noncore/net/mail/taskbarapplet/mailappletimpl.cpp b/noncore/net/mail/taskbarapplet/mailappletimpl.cpp index 26f6a6f..c01a674 100644 --- a/noncore/net/mail/taskbarapplet/mailappletimpl.cpp +++ b/noncore/net/mail/taskbarapplet/mailappletimpl.cpp @@ -4,4 +4,3 @@ MailAppletImpl::MailAppletImpl() - : m_mailApplet(0), ref(0) { - +: m_mailApplet(0), ref(0) { } @@ -9,3 +8,3 @@ MailAppletImpl::MailAppletImpl() MailAppletImpl::~MailAppletImpl() { - delete m_mailApplet; + delete m_mailApplet; } @@ -13,4 +12,5 @@ MailAppletImpl::~MailAppletImpl() { QWidget *MailAppletImpl::applet(QWidget *parent) { - if (!m_mailApplet) m_mailApplet = new MailApplet(parent); - return m_mailApplet; + if (!m_mailApplet) + m_mailApplet = new MailApplet(parent); + return m_mailApplet; } @@ -18,3 +18,3 @@ QWidget *MailAppletImpl::applet(QWidget *parent) { int MailAppletImpl::position() const { - return 4; + return 4; } @@ -22,8 +22,11 @@ int MailAppletImpl::position() const { QRESULT MailAppletImpl::queryInterface(const QUuid &uuid, QUnknownInterface **iface) { - *iface = 0; - if (uuid == IID_QUnknown) *iface = this; - else if (uuid == IID_TaskbarApplet) *iface = this; - - if (*iface) (*iface)->addRef(); - return QS_OK; + *iface = 0; + if (uuid == IID_QUnknown) + *iface = this; + else if (uuid == IID_TaskbarApplet) + *iface = this; + + if (*iface) + (*iface)->addRef(); + return QS_OK; } @@ -31,3 +34,3 @@ QRESULT MailAppletImpl::queryInterface(const QUuid &uuid, QUnknownInterface **if Q_EXPORT_INTERFACE() { - Q_CREATE_INSTANCE( MailAppletImpl ) + Q_CREATE_INSTANCE( MailAppletImpl ) } diff --git a/noncore/net/mail/taskbarapplet/mailappletimpl.h b/noncore/net/mail/taskbarapplet/mailappletimpl.h index 4f27eb3..4809053 100644 --- a/noncore/net/mail/taskbarapplet/mailappletimpl.h +++ b/noncore/net/mail/taskbarapplet/mailappletimpl.h @@ -10,14 +10,14 @@ class MailAppletImpl : public TaskbarAppletInterface { public: - MailAppletImpl(); - virtual ~MailAppletImpl(); + MailAppletImpl(); + virtual ~MailAppletImpl(); - QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ); - Q_REFCOUNT + QRESULT queryInterface( const QUuid &uuid, QUnknownInterface **iface ); + Q_REFCOUNT - virtual QWidget *applet( QWidget *parent ); - virtual int position() const; + virtual QWidget *applet( QWidget *parent ); + virtual int position() const; private: - MailApplet *m_mailApplet; - ulong ref; + MailApplet *m_mailApplet; + ulong ref; |