Diffstat (limited to 'core/launcher/screensaver.cpp') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -115,23 +115,23 @@ void OpieScreenSaver::setIntervals ( int i1, int i2, int i3 ) | |||
115 | 115 | ||
116 | int v[ 4 ]; | 116 | int v[ 4 ]; |
117 | if ( i1 < 0 ) | 117 | if ( i1 < 0 ) |
118 | i1 = config. readNumEntry ( "Dim", 30 ); | 118 | i1 = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 ); |
119 | if ( i2 < 0 ) | 119 | if ( i2 < 0 ) |
120 | i2 = config. readNumEntry ( "LightOff", 20 ); | 120 | i2 = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 ); |
121 | if ( i3 < 0 ) | 121 | if ( i3 < 0 ) |
122 | i3 = config. readNumEntry ( "Suspend", 60 ); | 122 | i3 = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 ); |
123 | 123 | ||
124 | if ( m_on_ac ) { | 124 | if ( m_on_ac ) { |
125 | m_enable_dim_ac = ( i1 > 0 ); | 125 | m_enable_dim_ac = ( i1 > 0 ); |
126 | m_enable_lightoff_ac = ( i2 > 0 ); | 126 | m_enable_lightoff_ac = ( i2 > 0 ); |
127 | m_enable_suspend_ac = ( i3 > 0 ); | 127 | m_enable_suspend_ac = ( i3 > 0 ); |
128 | m_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnly", 0 ); | 128 | m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false ); |
129 | } | 129 | } |
130 | else { | 130 | else { |
131 | m_enable_dim = ( i1 > 0 ); | 131 | m_enable_dim = ( i1 > 0 ); |
132 | m_enable_lightoff = ( i2 > 0 ); | 132 | m_enable_lightoff = ( i2 > 0 ); |
133 | m_enable_suspend = ( i3 > 0 ); | 133 | m_enable_suspend = ( i3 > 0 ); |
134 | m_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 ); | 134 | m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); |
135 | } | 135 | } |
136 | 136 | ||
137 | qDebug("screen saver intervals: %d %d %d", i1, i2, i3); | 137 | qDebug("screen saver intervals: %d %d %d", i1, i2, i3); |
@@ -167,11 +167,11 @@ void OpieScreenSaver::setBacklight ( int bright ) | |||
167 | // Read from config | 167 | // Read from config |
168 | Config config ( "apm" ); | 168 | Config config ( "apm" ); |
169 | config. setGroup ( m_on_ac ? "AC" : "Battery" ); | 169 | config. setGroup ( m_on_ac ? "AC" : "Battery" ); |
170 | m_backlight_normal = config. readNumEntry ( "Brightness", 255 ); | 170 | m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 ); |
171 | 171 | ||
172 | m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); | 172 | m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); |
173 | 173 | ||
174 | qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); | 174 | //qDebug ( "setBacklight: %d (ls: %d)", m_backlight_normal, m_use_light_sensor ? 1 : 0 ); |
175 | 175 | ||
176 | killTimers ( ); | 176 | killTimers ( ); |
177 | if ( m_use_light_sensor ) { | 177 | if ( m_use_light_sensor ) { |