summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp31
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
@@ -123,11 +123,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
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" );
@@ -138,6 +133,15 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
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}
@@ -208,13 +212,6 @@ void LightSettings::accept()
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 ||
@@ -234,6 +231,16 @@ void LightSettings::accept()
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