summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-22 16:00:59 (UTC)
committer harlekin <harlekin>2002-10-22 16:00:59 (UTC)
commitdca783a6564d7d0d8c857cef8586167bc0609647 (patch) (side-by-side diff)
tree7ed0c4c8fd873ffbb7b33eb9947ac35134bb4677
parent4fbca156e2bede574f458f9d96cc650c75219973 (diff)
downloadopie-dca783a6564d7d0d8c857cef8586167bc0609647.zip
opie-dca783a6564d7d0d8c857cef8586167bc0609647.tar.gz
opie-dca783a6564d7d0d8c857cef8586167bc0609647.tar.bz2
apm warning config now extra
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
@@ -102,63 +102,67 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
// battery check and slider
screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 );
screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 );
LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( );
initbright = config.readNumEntry("Brightness",255);
brightness->setMaxValue( maxbright );
brightness->setTickInterval( QMAX(1,maxbright/16) );
brightness->setLineStep( QMAX(1,maxbright/16) );
brightness->setPageStep( QMAX(1,maxbright/16) );
brightness->setValue( (maxbright*255 - initbright*maxbright)/255 );
// ac check and slider
screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 );
screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 );
LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 );
int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
initbright_ac = config.readNumEntry("BrightnessAC",255);
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()
{
}
void LightSettings::slotSliderTicks( int steps ) {
LightMinValueSlider->setTickInterval( steps );
}
static void set_fl(int bright)
{
qDebug ( QString( "Brightness" ).arg( bright ) );
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << bright;
}
void LightSettings::reject()
{
set_fl(initbright);
QDialog::reject();
@@ -187,74 +191,77 @@ void LightSettings::accept()
Config config( "qpe" );
config.setGroup( "Screensaver" );
// bat
config.writeEntry( "Dim", (int)screensaver_dim->isChecked() );
config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() );
config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
config.writeEntry( "Interval_Dim", interval_dim->value() );
config.writeEntry( "Interval_LightOff", interval_lightoff->value() );
config.writeEntry( "Interval", interval_suspend->value() );
config.writeEntry( "Brightness",
(brightness->maxValue()-brightness->value())*255/brightness->maxValue() );
// ac
config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() );
config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() );
config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() );
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 ) {
// ipaq sensor
config.setGroup( "Ipaq_light_sensor" );
config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() );
config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() );
config.writeEntry( "Steps", LightStepSpin->value() );
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 ) {
int bright = ( brightness->value() ) * 255 / brightness->maxValue();
set_fl(bright);
}
}
void LightSettings::applyBrightnessAC()
{
// if ac is attached, set directly that sliders setting, else the "on battery" sliders setting
if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) {
int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue();
set_fl(bright);
}
}
void LightSettings::done(int r)
{