author | harlekin <harlekin> | 2002-10-23 22:30:45 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-23 22:30:45 (UTC) |
commit | fc14573b3327d3087416fe158efaf09568260e55 (patch) (unidiff) | |
tree | 0bfa334fe27f9967c8432f5bc4c8481cea526e49 | |
parent | f5ee7b6584fe8c6e03494a241e30854cd658bb71 (diff) | |
download | opie-fc14573b3327d3087416fe158efaf09568260e55.zip opie-fc14573b3327d3087416fe158efaf09568260e55.tar.gz opie-fc14573b3327d3087416fe158efaf09568260e55.tar.bz2 |
thanks go to the programming god to point some bool alg stuff to me .-)
-rw-r--r-- | core/launcher/desktop.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index c4c6050..986ae5d 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -200,5 +200,5 @@ public: | |||
200 | if ( m_backlight_current > 1 ) | 200 | if ( m_backlight_current > 1 ) |
201 | setBacklight( 1 ); // lowest non-off | 201 | setBacklight( 1 ); // lowest non-off |
202 | } else if ( m_disable_suspend > 0 && m_enable_dim ) { | 202 | } else if ( !onAC && m_disable_suspend > 0 && m_enable_dim ) { |
203 | if ( m_backlight_current > 1 ) | 203 | if ( m_backlight_current > 1 ) |
204 | setBacklightInternal( 1 ); // lowest non-off | 204 | setBacklightInternal( 1 ); // lowest non-off |
@@ -210,5 +210,5 @@ public: | |||
210 | if ( m_disable_suspend_ac > 1 && m_enable_lightoff_ac && onAC ) { | 210 | if ( m_disable_suspend_ac > 1 && m_enable_lightoff_ac && onAC ) { |
211 | setBacklightInternal( 0 ); // off | 211 | setBacklightInternal( 0 ); // off |
212 | } else if ( m_disable_suspend > 1 && m_enable_lightoff ) { | 212 | } else if ( !onAC && m_disable_suspend > 1 && m_enable_lightoff ) { |
213 | setBacklightInternal( 0 ); // off | 213 | setBacklightInternal( 0 ); // off |
214 | } | 214 | } |
@@ -225,5 +225,5 @@ public: | |||
225 | return true; | 225 | return true; |
226 | } | 226 | } |
227 | else if ( m_enable_onlylcdoff ) { | 227 | else if ( !onAC && m_enable_onlylcdoff ) { |
228 | ODevice::inst ( ) -> setDisplayStatus ( false ); | 228 | ODevice::inst ( ) -> setDisplayStatus ( false ); |
229 | m_lcd_status = false; | 229 | m_lcd_status = false; |
@@ -236,5 +236,5 @@ public: | |||
236 | return true; | 236 | return true; |
237 | } | 237 | } |
238 | if ( ( m_disable_suspend > 2 ) && ( !Network::networkOnline ( ) ) ) { | 238 | if ( !onAC && ( m_disable_suspend > 2 ) && ( !Network::networkOnline ( ) ) ) { |
239 | QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); | 239 | QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); |
240 | return true; | 240 | return true; |
@@ -646,5 +646,5 @@ void DesktopApplication::psTimeout( int batRemaining ) | |||
646 | // if ( ( ps->batteryStatus() == PowerStatus::VeryLow ) ) { | 646 | // if ( ( ps->batteryStatus() == PowerStatus::VeryLow ) ) { |
647 | if ( ( batRemaining == m_powerVeryLow ) ) { | 647 | if ( ( batRemaining == m_powerVeryLow ) ) { |
648 | pa->alert( tr( "Battery is running very low." ), 6 ); | 648 | pa->alert( tr( "Battery is running very low." ), 2 ); |
649 | } | 649 | } |
650 | 650 | ||
@@ -656,5 +656,5 @@ void DesktopApplication::psTimeout( int batRemaining ) | |||
656 | 656 | ||
657 | if ( ps->backupBatteryStatus() == PowerStatus::VeryLow ) { | 657 | if ( ps->backupBatteryStatus() == PowerStatus::VeryLow ) { |
658 | pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 3 ); | 658 | pa->alert( tr( "The Back-up battery is very low.\nPlease charge the back-up battery." ), 2 ); |
659 | } | 659 | } |
660 | } | 660 | } |