summaryrefslogtreecommitdiff
authoralwin <alwin>2005-03-12 23:25:49 (UTC)
committer alwin <alwin>2005-03-12 23:25:49 (UTC)
commit69962e7b69ebf91c01a1354d7870f4ca7a81aa06 (patch) (side-by-side diff)
tree584f0f658f16936c1fa5493d2940651ba4170d5f
parent3cb4c3983ee738f3221ecb4cb154ea1252d69d64 (diff)
downloadopie-69962e7b69ebf91c01a1354d7870f4ca7a81aa06.zip
opie-69962e7b69ebf91c01a1354d7870f4ca7a81aa06.tar.gz
opie-69962e7b69ebf91c01a1354d7870f4ca7a81aa06.tar.bz2
some reworks
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp93
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.h2
2 files changed, 45 insertions, 50 deletions
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index ce1e7ac..b777ecf 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -22,7 +22,4 @@ MailApplet::MailApplet( QWidget *parent )
- m_config = new Config( "mail" );
- m_config->setGroup( "Applet" );
-
- //setFixedWidth( AppLnk::smallIconSize() );
- setFixedHeight( AppLnk::smallIconSize() );
+ setFixedHeight(AppLnk::smallIconSize());
+ setMinimumWidth(AppLnk::smallIconSize());
@@ -40,7 +37,3 @@ MailApplet::MailApplet( QWidget *parent )
- if ( !m_config->readBoolEntry( "Disabled", false ) ) {
- // delay 5 sec until the whole mail backend gets started .-)
- QTimer::singleShot( 5000, this, SLOT( startup() ) );
- }
- repaint( true );
+ QTimer::singleShot( 5000, this, SLOT( startup() ) );
}
@@ -51,4 +44,2 @@ MailApplet::~MailApplet() {
delete m_statusMail;
- if ( m_config )
- delete m_config;
}
@@ -74,12 +65,10 @@ void MailApplet::mouseReleaseEvent( QMouseEvent* e ) {
-void MailApplet::slotClicked() {
- 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 );
+void MailApplet::slotClicked()
+{
+ {
+ QCopEnvelope e( "QPE/System", "execute(QString)" );
+ e << QString( "opiemail" );
}
+
+ ledOnOff(false);
if (m_statusMail)
@@ -103,2 +92,11 @@ void MailApplet::startup()
+void MailApplet::ledOnOff(bool how)
+{
+ ODevice *device = ODevice::inst();
+ if ( !device->ledList().isEmpty() ) {
+ OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
+ device->setLedState( led, (how?(device->ledStateList( led ).contains( Led_BlinkSlow )?Led_BlinkSlow:Led_On):Led_Off) );
+ }
+}
+
void MailApplet::slotCheck() {
@@ -106,3 +104,6 @@ void MailApplet::slotCheck() {
odebug << "MailApplet::slotCheck()" << oendl;
- int newIntervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
+ Config m_config( "mail" );
+ m_config.setGroup( "Applet" );
+
+ int newIntervalMs = m_config.readNumEntry( "CheckEvery", 5 ) * 60000;
if ( newIntervalMs != m_intervalMs ) {
@@ -111,7 +112,12 @@ void MailApplet::slotCheck() {
}
-
+ if ( m_config.readBoolEntry( "Disabled", false ) ) {
+ hide();
+ ledOnOff(false);
+ odebug << "MailApplet::slotCheck() - disabled" << oendl;
+ return;
+ }
if (m_statusMail == 0) {
+ odebug << "MailApplet::slotCheck() - no mailhandle" << oendl;
return;
}
-
folderStat stat;
@@ -125,21 +131,15 @@ void MailApplet::slotCheck() {
if (newMailsOld != m_newMails) {
- ODevice *device = ODevice::inst();
- 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( "BlinkLed", true ) ) {
+ ledOnOff(true);
}
- if ( m_config->readBoolEntry( "PlaySound", false ) )
- device->playAlarmSound();
- }
- Config cfg( "mail" );
- cfg.setGroup( "Status" );
- cfg.writeEntry( "newMails", m_newMails );
- {
- QCopEnvelope env( "QPE/Pim", "newMails(int)" );
- env << m_newMails;
+ if ( m_config.readBoolEntry( "PlaySound", false ) )
+ ODevice::inst()->playAlarmSound();
+ m_config.setGroup( "Status" );
+ m_config.writeEntry( "newMails", m_newMails );
+ {
+ QCopEnvelope env( "QPE/Pim", "newMails(int)" );
+ env << m_newMails;
+ }
+ setText(QString::number( m_newMails ));
}
- setText(QString::number( m_newMails ));
-// repaint( true );
} else {
@@ -148,11 +148,6 @@ void MailApplet::slotCheck() {
hide();
- if ( !device->ledList().isEmpty() ) {
- OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
- device->setLedState( led, Led_Off );
- }
-
if ( newMailsOld != m_newMails ) {
- Config cfg( "mail" );
- cfg.setGroup( "Status" );
- cfg.writeEntry( "newMails", m_newMails );
+ ledOnOff(false);
+ m_config.setGroup( "Status" );
+ m_config.writeEntry( "newMails", m_newMails );
QCopEnvelope env( "QPE/Pim", "newMails(int)" );
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.h b/noncore/net/mail/taskbarapplet/mailapplet.h
index f28f274..f46bf19 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.h
+++ b/noncore/net/mail/taskbarapplet/mailapplet.h
@@ -23,2 +23,3 @@ protected:
void paintEvent( QPaintEvent* );
+ static void ledOnOff(bool);
@@ -29,3 +30,2 @@ protected slots:
private:
- Config *m_config;
QTimer *m_intervalTimer;