summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp12
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
@@ -199,7 +199,7 @@ public:
199 if ( m_disable_suspend_ac > 0 && m_enable_dim_ac && onAC ) { 199 if ( m_disable_suspend_ac > 0 && m_enable_dim_ac && onAC ) {
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
205 } 205 }
@@ -209,7 +209,7 @@ public:
209 209
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 }
215 return true; 215 return true;
@@ -224,7 +224,7 @@ public:
224 m_lcd_status = false; 224 m_lcd_status = false;
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;
230 return true; 230 return true;
@@ -235,7 +235,7 @@ public:
235 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE ); 235 QWSServer::sendKeyEvent( 0xffff, Qt::Key_F34, FALSE, TRUE, FALSE );
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;
241 } 241 }
@@ -645,7 +645,7 @@ void DesktopApplication::psTimeout( int batRemaining )
645 // maybe now since its triggered by apm change there might be to few warnings 645 // maybe now since its triggered by apm change there might be to few warnings
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
651 // if ( ps->batteryStatus() == PowerStatus::Critical ) { 651 // if ( ps->batteryStatus() == PowerStatus::Critical ) {
@@ -655,7 +655,7 @@ void DesktopApplication::psTimeout( int batRemaining )
655 } 655 }
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}
661 661