-rw-r--r-- | core/settings/light-and-power/light.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 77c6b40..fb40adc 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -136,17 +136,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
136 | brightness_ac_3->setMaxValue( maxbright_ac ); | 136 | brightness_ac_3->setMaxValue( maxbright_ac ); |
137 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); | 137 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); |
138 | brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); | 138 | brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); |
139 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); | 139 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); |
140 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); | 140 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); |
141 | 141 | ||
142 | 142 | ||
143 | // ipaq sensor | 143 | // ipaq sensor |
144 | config.setGroup( "Ipaqlightsensor" ); | 144 | config.setGroup( "lightsensor" ); |
145 | auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 ); | 145 | auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 ); |
146 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",0) != 0 ); | 146 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",0) != 0 ); |
147 | //LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); | 147 | //LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); |
148 | //LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); | 148 | //LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); |
149 | //connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; | 149 | //connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; |
150 | //LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); | 150 | //LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); |
151 | 151 | ||
152 | // advanced settings | 152 | // advanced settings |
@@ -222,20 +222,19 @@ void LightSettings::accept() | |||
222 | config.writeEntry( "NoAPmAC", interval_suspend_ac_3->specialValueText() == tr("never") ); | 222 | config.writeEntry( "NoAPmAC", interval_suspend_ac_3->specialValueText() == tr("never") ); |
223 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); | 223 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); |
224 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); | 224 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); |
225 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); | 225 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); |
226 | config.writeEntry( "BrightnessAC", | 226 | config.writeEntry( "BrightnessAC", |
227 | ( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() ); | 227 | ( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() ); |
228 | 228 | ||
229 | 229 | ||
230 | // only make ipaq light sensor entries in config file if on an ipaq | 230 | // only make light sensor stuff appear if the unit has a sensor |
231 | if ( ODevice::inst()->hasLightSensor() ) { | 231 | if ( ODevice::inst()->hasLightSensor() ) { |
232 | // ipaq sensor | 232 | config.setGroup( "lightsensor" ); |
233 | config.setGroup( "Ipaqlightsensor" ); | ||
234 | config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); | 233 | config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); |
235 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); | 234 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); |
236 | //config.writeEntry( "Steps", LightStepSpin->value() ); | 235 | //config.writeEntry( "Steps", LightStepSpin->value() ); |
237 | //onfig.writeEntry( "MinValue", LightMinValueSlider->value() ); | 236 | //onfig.writeEntry( "MinValue", LightMinValueSlider->value() ); |
238 | //config.writeEntry( "Shift", LightShiftSpin->value() ); | 237 | //config.writeEntry( "Shift", LightShiftSpin->value() ); |
239 | } | 238 | } |
240 | 239 | ||
241 | config.write(); | 240 | config.write(); |
@@ -264,15 +263,13 @@ void LightSettings::applyBrightnessAC() | |||
264 | { | 263 | { |
265 | // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting | 264 | // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting |
266 | if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) { | 265 | if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) { |
267 | int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue(); | 266 | int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue(); |
268 | set_fl(bright); | 267 | set_fl(bright); |
269 | } | 268 | } |
270 | } | 269 | } |
271 | 270 | ||
272 | |||
273 | |||
274 | void LightSettings::done(int r) | 271 | void LightSettings::done(int r) |
275 | { | 272 | { |
276 | QDialog::done(r); | 273 | QDialog::done(r); |
277 | close (); | 274 | close (); |
278 | } | 275 | } |