author | harlekin <harlekin> | 2002-10-22 23:34:24 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-22 23:34:24 (UTC) |
commit | a4dccc9ce6de0bf75d11688b01f2cc010da3647e (patch) (side-by-side diff) | |
tree | 80c6c360b67bad9af77d79888bef97fa6feabc76 /core/launcher/desktop.cpp | |
parent | e4297ff151693e07313ea036de91ad3c788c5e26 (diff) | |
download | opie-a4dccc9ce6de0bf75d11688b01f2cc010da3647e.zip opie-a4dccc9ce6de0bf75d11688b01f2cc010da3647e.tar.gz opie-a4dccc9ce6de0bf75d11688b01f2cc010da3647e.tar.bz2 |
timer is now more separated from warnings
-rw-r--r-- | core/launcher/desktop.cpp | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 4926b97..33bea36 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp @@ -404,10 +404,10 @@ DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) - //FIXME, need also a method for setting different timer ( changed runtime ) m_timer = new QTimer( this ); - connect( m_timer, SIGNAL( timeout() ), this, SLOT( psTimeout() ) ); - Config cfg( "qpe" ); - cfg.setGroup( "APM" ); - m_timer->start( cfg.readNumEntry( "check_interval", 10000 ) ); - m_powerVeryLow = cfg.readNumEntry( "power_verylow", 10 ); - m_powerCritical = cfg.readNumEntry( "power_critical", 5 ); + connect( m_timer, SIGNAL( timeout() ), this, SLOT( apmTimeout() ) ); + Config cfg( "apm" ); + cfg.setGroup( "Warnings" ); + m_timer->start( 5000 ); + //cfg.readNumEntry( "checkinterval", 10000 ) + m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 ); + m_powerCritical = cfg.readNumEntry( "powercritical", 5 ); ps = new PowerStatus; @@ -498,3 +498,3 @@ void DesktopApplication::reloadPowerWarnSettings() { - m_timer->changeInterval( cfg.readNumEntry( "checkinterval", 10000 ) ); + // m_timer->changeInterval( cfg.readNumEntry( "checkinterval", 10000 ) ); m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 ); @@ -634,10 +634,9 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) -void DesktopApplication::psTimeout() +void DesktopApplication::psTimeout( int batRemaining ) { - qpedesktop->checkMemory(); // in case no events are being generated - *ps = PowerStatusManager::readStatus(); + // maybe now since its triggered by apm change there might be to few warnings // if ( ( ps->batteryStatus() == PowerStatus::VeryLow ) ) { - if ( ( ps->batteryPercentRemaining() == m_powerVeryLow ) ) { + if ( ( batRemaining == m_powerVeryLow ) ) { pa->alert( tr( "Battery is running very low." ), 6 ); @@ -646,3 +645,3 @@ void DesktopApplication::psTimeout() // if ( ps->batteryStatus() == PowerStatus::Critical ) { - if ( ps->batteryPercentRemaining() == m_powerCritical ) { + if ( batRemaining == m_powerCritical ) { pa->alert( tr( "Battery level is critical!\n" @@ -656,2 +655,14 @@ void DesktopApplication::psTimeout() +void DesktopApplication::apmTimeout() +{ + qpedesktop->checkMemory(); // in case no events are being generated + + *ps = PowerStatusManager::readStatus(); + + if ( m_currentPowerLevel != ps->batteryPercentRemaining() ) { + // not very nice, since psTimeout parses the again + m_currentPowerLevel = ps->batteryPercentRemaining(); + psTimeout( m_currentPowerLevel ); + } +} |