-rw-r--r-- | core/launcher/screensaver.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp index 741591e..45da9ed 100644 --- a/core/launcher/screensaver.cpp +++ b/core/launcher/screensaver.cpp @@ -106,41 +106,41 @@ bool OpieScreenSaver::save( int level ) } return false; } void OpieScreenSaver::setIntervals ( int i1, int i2, int i3 ) { Config config ( "apm" ); config. setGroup ( m_on_ac ? "AC" : "Battery" ); int v[ 4 ]; if ( i1 < 0 ) - i1 = config. readNumEntry ( "Dim", 30 ); + i1 = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 ); if ( i2 < 0 ) - i2 = config. readNumEntry ( "LightOff", 20 ); + i2 = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 ); if ( i3 < 0 ) - i3 = config. readNumEntry ( "Suspend", 60 ); + i3 = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 ); if ( m_on_ac ) { m_enable_dim_ac = ( i1 > 0 ); m_enable_lightoff_ac = ( i2 > 0 ); m_enable_suspend_ac = ( i3 > 0 ); - m_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnly", 0 ); + m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false ); } else { m_enable_dim = ( i1 > 0 ); m_enable_lightoff = ( i2 > 0 ); m_enable_suspend = ( i3 > 0 ); - m_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 ); + m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); } qDebug("screen saver intervals: %d %d %d", i1, i2, i3); v [ 0 ] = QMAX( 1000 * i1, 100 ); v [ 1 ] = QMAX( 1000 * i2, 100 ); v [ 2 ] = QMAX( 1000 * i3, 100 ); v [ 3 ] = 0; if ( !i1 && !i2 && !i3 ) QWSServer::setScreenSaverInterval( 0 ); else @@ -158,29 +158,29 @@ void OpieScreenSaver::setMode ( int mode ) { if ( mode > m_disable_suspend ) setInterval ( -1 ); m_disable_suspend = mode; } void OpieScreenSaver::setBacklight ( int bright ) { // Read from config Config config ( "apm" ); config. setGroup ( m_on_ac ? "AC" : "Battery" ); - m_backlight_normal = config. readNumEntry ( "Brightness", 255 ); + m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 ); m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); - qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); +// qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); killTimers ( ); if ( m_use_light_sensor ) { QStringList sl = config. readListEntry ( "LightSensorData", ';' ); m_sensordata [LS_SensorMin] = 40; m_sensordata [LS_SensorMax] = 215; m_sensordata [LS_LightMin] = 1; m_sensordata [LS_LightMax] = 255; m_sensordata [LS_Steps] = 12; m_sensordata [LS_Interval] = 2000; |