-rw-r--r-- | core/settings/light-and-power/light.cpp | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index d93b0af..da36826 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -118,31 +118,35 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) | |||
118 | int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); | 118 | int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); |
119 | initbright_ac = config.readNumEntry("BrightnessAC",255); | 119 | initbright_ac = config.readNumEntry("BrightnessAC",255); |
120 | brightness_ac_3->setMaxValue( maxbright_ac ); | 120 | brightness_ac_3->setMaxValue( maxbright_ac ); |
121 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); | 121 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); |
122 | brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); | 122 | brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); |
123 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); | 123 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); |
124 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); | 124 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); |
125 | 125 | ||
126 | // advanced settings | ||
127 | config.setGroup( "APM" ); | ||
128 | warnintervalBox->setValue( config.readNumEntry("check_interval", 10000)/1000 ); | ||
129 | lowSpinBox->setValue( config.readNumEntry("power_verylow", 10 ) ); | ||
130 | criticalSpinBox->setValue( config.readNumEntry("power_critical", 5 ) ); | ||
131 | 126 | ||
132 | // ipaq sensor | 127 | // ipaq sensor |
133 | config.setGroup( "Ipaq_light_sensor" ); | 128 | config.setGroup( "Ipaq_light_sensor" ); |
134 | auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); | 129 | auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); |
135 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); | 130 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); |
136 | LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); | 131 | LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); |
137 | LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); | 132 | LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); |
138 | connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; | 133 | connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; |
139 | LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); | 134 | LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); |
140 | 135 | ||
136 | // advanced settings | ||
137 | Config conf("apm"); | ||
138 | conf.setGroup( "warnings" ); | ||
139 | warnintervalBox->setValue( conf.readNumEntry("checkinterval", 10000)/1000 ); | ||
140 | lowSpinBox->setValue( conf.readNumEntry("powerverylow", 10 ) ); | ||
141 | criticalSpinBox->setValue( conf.readNumEntry("powercritical", 5 ) ); | ||
142 | |||
143 | |||
144 | |||
141 | connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) ); | 145 | connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) ); |
142 | connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) ); | 146 | connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) ); |
143 | } | 147 | } |
144 | 148 | ||
145 | LightSettings::~LightSettings() | 149 | LightSettings::~LightSettings() |
146 | { | 150 | { |
147 | } | 151 | } |
148 | 152 | ||
@@ -203,23 +207,16 @@ void LightSettings::accept() | |||
203 | config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); | 207 | config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); |
204 | config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); | 208 | config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); |
205 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); | 209 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); |
206 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); | 210 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); |
207 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); | 211 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); |
208 | config.writeEntry( "BrightnessAC", | 212 | config.writeEntry( "BrightnessAC", |
209 | (brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() ); | 213 | (brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() ); |
210 | 214 | ||
211 | // advanced | ||
212 | config.setGroup( "APM" ); | ||
213 | config.writeEntry( "check_interval", warnintervalBox->value()*1000 ); | ||
214 | config.writeEntry( "power_verylow", lowSpinBox->value() ); | ||
215 | config.writeEntry( "power_critical", criticalSpinBox->value() ); | ||
216 | QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); | ||
217 | |||
218 | 215 | ||
219 | // only make ipaq light sensor entries in config file if on an ipaq | 216 | // only make ipaq light sensor entries in config file if on an ipaq |
220 | if ( ODevice::inst()->model() == Model_iPAQ_H31xx || | 217 | if ( ODevice::inst()->model() == Model_iPAQ_H31xx || |
221 | ODevice::inst()->model() == Model_iPAQ_H36xx || | 218 | ODevice::inst()->model() == Model_iPAQ_H36xx || |
222 | ODevice::inst()->model() == Model_iPAQ_H37xx || | 219 | ODevice::inst()->model() == Model_iPAQ_H37xx || |
223 | ODevice::inst()->model() == Model_iPAQ_H38xx ) { | 220 | ODevice::inst()->model() == Model_iPAQ_H38xx ) { |
224 | 221 | ||
225 | // ipaq sensor | 222 | // ipaq sensor |
@@ -229,16 +226,26 @@ void LightSettings::accept() | |||
229 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); | 226 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); |
230 | config.writeEntry( "Steps", LightStepSpin->value() ); | 227 | config.writeEntry( "Steps", LightStepSpin->value() ); |
231 | config.writeEntry( "MinValue", LightMinValueSlider->value() ); | 228 | config.writeEntry( "MinValue", LightMinValueSlider->value() ); |
232 | config.writeEntry( "Shift", LightShiftSpin->value() ); | 229 | config.writeEntry( "Shift", LightShiftSpin->value() ); |
233 | } | 230 | } |
234 | 231 | ||
235 | config.write(); | 232 | config.write(); |
236 | 233 | ||
234 | // advanced | ||
235 | Config conf("apm"); | ||
236 | conf.setGroup( "Warnings" ); | ||
237 | conf.writeEntry( "check_interval", warnintervalBox->value()*1000 ); | ||
238 | conf.writeEntry( "power_verylow", lowSpinBox->value() ); | ||
239 | conf.writeEntry( "power_critical", criticalSpinBox->value() ); | ||
240 | QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); | ||
241 | conf.write(); | ||
242 | |||
243 | |||
237 | QDialog::accept(); | 244 | QDialog::accept(); |
238 | } | 245 | } |
239 | 246 | ||
240 | void LightSettings::applyBrightness() | 247 | void LightSettings::applyBrightness() |
241 | { | 248 | { |
242 | if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { | 249 | if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { |
243 | int bright = ( brightness->value() ) * 255 / brightness->maxValue(); | 250 | int bright = ( brightness->value() ) * 255 / brightness->maxValue(); |
244 | set_fl(bright); | 251 | set_fl(bright); |