Diffstat (limited to 'core/settings/light-and-power/light.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/light-and-power/light.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 0193a7b..04d2249 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -112,23 +112,24 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) | |||
112 | brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); | 112 | brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); |
113 | 113 | ||
114 | // ac check and slider | 114 | // ac check and slider |
115 | screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 ); | 115 | screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 ); |
116 | screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 ); | 116 | screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 ); |
117 | LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 ); | 117 | LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 ); |
118 | noApmAC->setChecked( config.readNumEntry("NoApmAC",0) != 0 ); | ||
118 | int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); | 119 | int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); |
119 | initbright_ac = config.readNumEntry("BrightnessAC",255); | 120 | initbright_ac = config.readNumEntry("BrightnessAC",255); |
120 | brightness_ac_3->setMaxValue( maxbright_ac ); | 121 | brightness_ac_3->setMaxValue( maxbright_ac ); |
121 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); | 122 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); |
122 | brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); | 123 | brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); |
123 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); | 124 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); |
124 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); | 125 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); |
125 | 126 | ||
126 | 127 | ||
127 | // ipaq sensor | 128 | // ipaq sensor |
128 | config.setGroup( "Ipaq_light_sensor" ); | 129 | config.setGroup( "Ipaqlightsensor" ); |
129 | auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); | 130 | auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); |
130 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); | 131 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); |
131 | LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); | 132 | LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); |
132 | LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); | 133 | LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); |
133 | connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; | 134 | connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; |
134 | LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); | 135 | LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); |
@@ -203,12 +204,13 @@ void LightSettings::accept() | |||
203 | ( brightness->value() ) * 255 / brightness->maxValue() ); | 204 | ( brightness->value() ) * 255 / brightness->maxValue() ); |
204 | 205 | ||
205 | // ac | 206 | // ac |
206 | config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() ); | 207 | config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() ); |
207 | config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); | 208 | config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); |
208 | config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); | 209 | config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); |
210 | config.writeEntry( "NoAPmAC", (int)noApmAC->isChecked() ); | ||
209 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); | 211 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); |
210 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); | 212 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); |
211 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); | 213 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); |
212 | config.writeEntry( "BrightnessAC", | 214 | config.writeEntry( "BrightnessAC", |
213 | ( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() ); | 215 | ( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() ); |
214 | 216 | ||
@@ -217,13 +219,13 @@ void LightSettings::accept() | |||
217 | if ( ODevice::inst()->model() == Model_iPAQ_H31xx || | 219 | if ( ODevice::inst()->model() == Model_iPAQ_H31xx || |
218 | ODevice::inst()->model() == Model_iPAQ_H36xx || | 220 | ODevice::inst()->model() == Model_iPAQ_H36xx || |
219 | ODevice::inst()->model() == Model_iPAQ_H37xx || | 221 | ODevice::inst()->model() == Model_iPAQ_H37xx || |
220 | ODevice::inst()->model() == Model_iPAQ_H38xx ) { | 222 | ODevice::inst()->model() == Model_iPAQ_H38xx ) { |
221 | 223 | ||
222 | // ipaq sensor | 224 | // ipaq sensor |
223 | config.setGroup( "Ipaq_light_sensor" ); | 225 | config.setGroup( "Ipaqlightsensor" ); |
224 | 226 | ||
225 | config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); | 227 | config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); |
226 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); | 228 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); |
227 | config.writeEntry( "Steps", LightStepSpin->value() ); | 229 | config.writeEntry( "Steps", LightStepSpin->value() ); |
228 | config.writeEntry( "MinValue", LightMinValueSlider->value() ); | 230 | config.writeEntry( "MinValue", LightMinValueSlider->value() ); |
229 | config.writeEntry( "Shift", LightShiftSpin->value() ); | 231 | config.writeEntry( "Shift", LightShiftSpin->value() ); |
@@ -237,13 +239,12 @@ void LightSettings::accept() | |||
237 | conf.writeEntry( "check_interval", warnintervalBox->value()*1000 ); | 239 | conf.writeEntry( "check_interval", warnintervalBox->value()*1000 ); |
238 | conf.writeEntry( "power_verylow", lowSpinBox->value() ); | 240 | conf.writeEntry( "power_verylow", lowSpinBox->value() ); |
239 | conf.writeEntry( "power_critical", criticalSpinBox->value() ); | 241 | conf.writeEntry( "power_critical", criticalSpinBox->value() ); |
240 | QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); | 242 | QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); |
241 | conf.write(); | 243 | conf.write(); |
242 | 244 | ||
243 | |||
244 | QDialog::accept(); | 245 | QDialog::accept(); |
245 | } | 246 | } |
246 | 247 | ||
247 | void LightSettings::applyBrightness() | 248 | void LightSettings::applyBrightness() |
248 | { | 249 | { |
249 | if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { | 250 | if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { |