-rw-r--r-- | core/launcher/desktop.cpp | 10 |
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 | |||
@@ -22,5 +22,4 @@ | |||
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" |
@@ -170,4 +169,5 @@ public: | |||
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; |
@@ -216,4 +216,8 @@ public: | |||
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 ); |
@@ -274,5 +278,5 @@ public: | |||
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 ) |
@@ -301,4 +305,5 @@ public: | |||
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 ) |
@@ -373,4 +378,5 @@ private: | |||
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; |