summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/screensaver.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index f818d62..094f388 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -131,97 +131,97 @@ bool OpieScreenSaver::save( int level )
131 * @param lightoff time in seconds to turn LCD backlight off, -1 to 131 * @param lightoff time in seconds to turn LCD backlight off, -1 to
132 * read value from config file, 0 to disable 132 * read value from config file, 0 to disable
133 * @param suspend time in seconds to do an APM suspend, -1 to 133 * @param suspend time in seconds to do an APM suspend, -1 to
134 * read value from config file, 0 to disable 134 * read value from config file, 0 to disable
135 */ 135 */
136void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend ) 136void OpieScreenSaver::setIntervals ( int dim, int lightoff, int suspend )
137{ 137{
138 Config config ( "apm" ); 138 Config config ( "apm" );
139 config. setGroup ( m_on_ac ? "AC" : "Battery" ); 139 config. setGroup ( m_on_ac ? "AC" : "Battery" );
140 140
141 int v[ 4 ]; 141 int v[ 4 ];
142 if ( dim < 0 ) 142 if ( dim < 0 )
143 dim = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 ); 143 dim = config. readNumEntry ( "Dim", m_on_ac ? 60 : 30 );
144 if ( lightoff < 0 ) 144 if ( lightoff < 0 )
145 lightoff = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 ); 145 lightoff = config. readNumEntry ( "LightOff", m_on_ac ? 120 : 20 );
146 if ( suspend < 0 ) 146 if ( suspend < 0 )
147 suspend = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 ); 147 suspend = config. readNumEntry ( "Suspend", m_on_ac ? 0 : 60 );
148 148
149 if ( m_on_ac ) { 149 if ( m_on_ac ) {
150 m_enable_dim_ac = ( dim > 0 ); 150 m_enable_dim_ac = ( dim > 0 );
151 m_enable_lightoff_ac = ( lightoff > 0 ); 151 m_enable_lightoff_ac = ( lightoff > 0 );
152 m_enable_suspend_ac = ( suspend > 0 ); 152 m_enable_suspend_ac = ( suspend > 0 );
153 m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false ); 153 m_onlylcdoff_ac = config.readBoolEntry ( "LcdOffOnly", false );
154 } 154 }
155 else { 155 else {
156 m_enable_dim = ( dim > 0 ); 156 m_enable_dim = ( dim > 0 );
157 m_enable_lightoff = ( lightoff > 0 ); 157 m_enable_lightoff = ( lightoff > 0 );
158 m_enable_suspend = ( suspend > 0 ); 158 m_enable_suspend = ( suspend > 0 );
159 m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false ); 159 m_onlylcdoff = config.readBoolEntry ( "LcdOffOnly", false );
160 } 160 }
161 161
162 //odebug << "screen saver intervals: " << dim << " " << lightoff << " " << suspend << "" << oendl; 162 //odebug << "screen saver intervals: " << dim << " " << lightoff << " " << suspend << "" << oendl;
163 163
164 v [ 0 ] = QMAX( 1000 * dim, 100 ); 164 v [ 0 ] = QMAX( 1000 * dim, 100 );
165 v [ 1 ] = QMAX( 1000 * lightoff, 100 ); 165 v [ 1 ] = QMAX( 1000 * lightoff, 100 );
166 v [ 2 ] = QMAX( 1000 * suspend, 100 ); 166 v [ 2 ] = QMAX( 1000 * suspend, 100 );
167 v [ 3 ] = 0; 167 v [ 3 ] = 0;
168 168
169 if ( !dim && !lightoff && !suspend ) 169 if ( !dim && !lightoff && !suspend )
170 QWSServer::setScreenSaverInterval( 0 ); 170 QWSServer::setScreenSaverInterval( 0 );
171 else 171 else
172 QWSServer::setScreenSaverIntervals( v ); 172 QWSServer::setScreenSaverIntervals( v );
173} 173}
174 174
175 175
176/** 176/**
177 * Set suspend time. Will read the dim and lcd-off times from the config file. 177 * Set suspend time. Will read the dim and lcd-off times from the config file.
178 * 178 *
179 * @param suspend time in seconds to go into APM suspend, -1 to 179 * @param interval time in seconds to go into APM suspend, -1 to
180 * read value from config file, 0 to disable 180 * read value from config file, 0 to disable
181 */ 181 */
182void OpieScreenSaver::setInterval ( int interval ) 182void OpieScreenSaver::setInterval ( int interval )
183{ 183{
184 setIntervals ( -1, -1, interval ); 184 setIntervals ( -1, -1, interval );
185} 185}
186 186
187 187
188void OpieScreenSaver::setMode ( int mode ) 188void OpieScreenSaver::setMode ( int mode )
189{ 189{
190 if ( mode > m_disable_suspend ) 190 if ( mode > m_disable_suspend )
191 setInterval ( -1 ); 191 setInterval ( -1 );
192 m_disable_suspend = mode; 192 m_disable_suspend = mode;
193} 193}
194 194
195 195
196/** 196/**
197 * Set display brightness 197 * Set display brightness
198 * 198 *
199 * Get's default values for backlight, contrast and light sensor from config file. 199 * Get's default values for backlight, contrast and light sensor from config file.
200 * 200 *
201 * @param bright desired brighness (-1 to use automatic sensor data or value 201 * @param bright desired brighness (-1 to use automatic sensor data or value
202 * from config file, -2 to toggle backlight on and off, -3 to 202 * from config file, -2 to toggle backlight on and off, -3 to
203 * force backlight off) 203 * force backlight off)
204 */ 204 */
205void OpieScreenSaver::setBacklight ( int bright ) 205void OpieScreenSaver::setBacklight ( int bright )
206{ 206{
207 // Read from config 207 // Read from config
208 Config config ( "apm" ); 208 Config config ( "apm" );
209 config. setGroup ( m_on_ac ? "AC" : "Battery" ); 209 config. setGroup ( m_on_ac ? "AC" : "Battery" );
210 m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 ); 210 m_backlight_normal = config. readNumEntry ( "Brightness", m_on_ac ? 255 : 127 );
211 int contrast = config. readNumEntry ( "Contrast", 127); 211 int contrast = config. readNumEntry ( "Contrast", 127);
212 m_use_light_sensor = config. readBoolEntry ( "LightSensor", false ); 212 m_use_light_sensor = config. readBoolEntry ( "LightSensor", false );
213 213
214 //odebug << "setBacklight: " << bright << " (norm: " << m_backlight_normal << ") (ls: " 214 //odebug << "setBacklight: " << bright << " (norm: " << m_backlight_normal << ") (ls: "
215 // << ( m_use_light_sensor ? 1 : 0 ) << ")" << oendl; 215 // << ( m_use_light_sensor ? 1 : 0 ) << ")" << oendl;
216 216
217 killTimers ( ); 217 killTimers ( );
218 if (( bright < 0 ) && m_use_light_sensor ) { 218 if (( bright < 0 ) && m_use_light_sensor ) {
219 QStringList sl = config. readListEntry ( "LightSensorData", ';' ); 219 QStringList sl = config. readListEntry ( "LightSensorData", ';' );
220 220
221 m_sensordata [LS_SensorMin] = 40; 221 m_sensordata [LS_SensorMin] = 40;
222 m_sensordata [LS_SensorMax] = 215; 222 m_sensordata [LS_SensorMax] = 215;
223 m_sensordata [LS_LightMin] = 1; 223 m_sensordata [LS_LightMin] = 1;
224 m_sensordata [LS_LightMax] = 255; 224 m_sensordata [LS_LightMax] = 255;
225 m_sensordata [LS_Steps] = 12; 225 m_sensordata [LS_Steps] = 12;
226 m_sensordata [LS_Interval] = 2000; 226 m_sensordata [LS_Interval] = 2000;
227 227