summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-23 22:00:05 (UTC)
committer harlekin <harlekin>2002-10-23 22:00:05 (UTC)
commitf5ee7b6584fe8c6e03494a241e30854cd658bb71 (patch) (unidiff)
tree4b0a8769cc8fc82813802f75316f24a069489431
parent3c9835537b2fdccab4c0f720a4d77a98ad8bba10 (diff)
downloadopie-f5ee7b6584fe8c6e03494a241e30854cd658bb71.zip
opie-f5ee7b6584fe8c6e03494a241e30854cd658bb71.tar.gz
opie-f5ee7b6584fe8c6e03494a241e30854cd658bb71.tar.bz2
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 33bea36..c4c6050 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -21,7 +21,6 @@
21#include "desktop.h" 21#include "desktop.h"
22#include "info.h" 22#include "info.h"
23#include "launcher.h" 23#include "launcher.h"
24//#include "mrulist.h"
25#include "qcopbridge.h" 24#include "qcopbridge.h"
26#include "shutdownimpl.h" 25#include "shutdownimpl.h"
27#include "startmenu.h" 26#include "startmenu.h"
@@ -169,6 +168,7 @@ public:
169 m_enable_dim_ac = false; 168 m_enable_dim_ac = false;
170 m_enable_lightoff_ac = false; 169 m_enable_lightoff_ac = false;
171 m_enable_onlylcdoff_ac = false; 170 m_enable_onlylcdoff_ac = false;
171 m_disable_apm_ac = false;
172 172
173 m_lcd_status = true; 173 m_lcd_status = true;
174 174
@@ -215,6 +215,10 @@ public:
215 return true; 215 return true;
216 break; 216 break;
217 case 2: 217 case 2:
218 if ( m_disable_apm_ac && onAC ) {
219 return true;
220 }
221
218 if ( m_enable_onlylcdoff_ac && onAC ) { 222 if ( m_enable_onlylcdoff_ac && onAC ) {
219 ODevice::inst ( ) -> setDisplayStatus ( false ); 223 ODevice::inst ( ) -> setDisplayStatus ( false );
220 m_lcd_status = false; 224 m_lcd_status = false;
@@ -273,7 +277,7 @@ public:
273 v [ 3 ] = 0; 277 v [ 3 ] = 0;
274 m_enable_dim = ( ( i1 != 0 ) ? config. readNumEntry ( "Dim", 1 ) : false ); 278 m_enable_dim = ( ( i1 != 0 ) ? config. readNumEntry ( "Dim", 1 ) : false );
275 m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false ); 279 m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false );
276 m_enable_onlylcdoff = config. readNumEntry ( "LcdOffOnly", 0 ); 280 m_enable_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 );
277 281
278 if ( !i1 && !i2 && !i3 ) 282 if ( !i1 && !i2 && !i3 )
279 QWSServer::setScreenSaverInterval( 0 ); 283 QWSServer::setScreenSaverInterval( 0 );
@@ -300,6 +304,7 @@ public:
300 m_enable_dim_ac = ( ( i1 != 0 ) ? config.readNumEntry ( "DimAC", 1 ) : false ); 304 m_enable_dim_ac = ( ( i1 != 0 ) ? config.readNumEntry ( "DimAC", 1 ) : false );
301 m_enable_lightoff_ac = ( ( i2 != 0 ) ? config.readNumEntry ( "LightOffAC", 1 ) : false ); 305 m_enable_lightoff_ac = ( ( i2 != 0 ) ? config.readNumEntry ( "LightOffAC", 1 ) : false );
302 m_enable_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnlyAC", 0 ); 306 m_enable_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnlyAC", 0 );
307 m_disable_apm_ac = config.readNumEntry ( "NoApmAC", 0 );
303 308
304 if ( !i1 && !i2 && !i3 ) 309 if ( !i1 && !i2 && !i3 )
305 QWSServer::setScreenSaverInterval( 0 ); 310 QWSServer::setScreenSaverInterval( 0 );
@@ -372,6 +377,7 @@ private:
372 bool m_enable_dim_ac; 377 bool m_enable_dim_ac;
373 bool m_enable_lightoff_ac; 378 bool m_enable_lightoff_ac;
374 bool m_enable_onlylcdoff_ac; 379 bool m_enable_onlylcdoff_ac;
380 bool m_disable_apm_ac;
375 381
376 bool m_lcd_status; 382 bool m_lcd_status;
377 383