summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -120,27 +120,31 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
brightness_ac_3->setMaxValue( maxbright_ac );
brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) );
brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) );
brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) );
brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 );
- // advanced settings
- config.setGroup( "APM" );
- warnintervalBox->setValue( config.readNumEntry("check_interval", 10000)/1000 );
- lowSpinBox->setValue( config.readNumEntry("power_verylow", 10 ) );
- criticalSpinBox->setValue( config.readNumEntry("power_critical", 5 ) );
// ipaq sensor
config.setGroup( "Ipaq_light_sensor" );
auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 );
auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 );
LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) );
LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) );
connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ;
LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) );
+ // advanced settings
+ Config conf("apm");
+ conf.setGroup( "warnings" );
+ warnintervalBox->setValue( conf.readNumEntry("checkinterval", 10000)/1000 );
+ lowSpinBox->setValue( conf.readNumEntry("powerverylow", 10 ) );
+ criticalSpinBox->setValue( conf.readNumEntry("powercritical", 5 ) );
+
+
+
connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) );
}
LightSettings::~LightSettings()
{
@@ -205,19 +209,12 @@ void LightSettings::accept()
config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() );
config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() );
config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() );
config.writeEntry( "BrightnessAC",
(brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() );
- // advanced
- config.setGroup( "APM" );
- config.writeEntry( "check_interval", warnintervalBox->value()*1000 );
- config.writeEntry( "power_verylow", lowSpinBox->value() );
- config.writeEntry( "power_critical", criticalSpinBox->value() );
- QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()");
-
// only make ipaq light sensor entries in config file if on an ipaq
if ( ODevice::inst()->model() == Model_iPAQ_H31xx ||
ODevice::inst()->model() == Model_iPAQ_H36xx ||
ODevice::inst()->model() == Model_iPAQ_H37xx ||
ODevice::inst()->model() == Model_iPAQ_H38xx ) {
@@ -231,12 +228,22 @@ void LightSettings::accept()
config.writeEntry( "MinValue", LightMinValueSlider->value() );
config.writeEntry( "Shift", LightShiftSpin->value() );
}
config.write();
+ // advanced
+ Config conf("apm");
+ conf.setGroup( "Warnings" );
+ conf.writeEntry( "check_interval", warnintervalBox->value()*1000 );
+ conf.writeEntry( "power_verylow", lowSpinBox->value() );
+ conf.writeEntry( "power_critical", criticalSpinBox->value() );
+ QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()");
+ conf.write();
+
+
QDialog::accept();
}
void LightSettings::applyBrightness()
{
if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {