author | harlekin <harlekin> | 2002-10-27 17:50:28 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-27 17:50:28 (UTC) |
commit | 17888d7ee97ec67c3f8c0f69fa30930b5a634ace (patch) (side-by-side diff) | |
tree | f5873f98647c1ac2fbb7b3fbab051d698f849c01 /core/settings | |
parent | 3bdf11c7117e28cda91a1447b8510d7deba94b99 (diff) | |
download | opie-17888d7ee97ec67c3f8c0f69fa30930b5a634ace.zip opie-17888d7ee97ec67c3f8c0f69fa30930b5a634ace.tar.gz opie-17888d7ee97ec67c3f8c0f69fa30930b5a634ace.tar.bz2 |
updated to new config entries
-rw-r--r-- | core/settings/light-and-power/light.cpp | 115 |
1 files changed, 64 insertions, 51 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index fb40adc..d2618d9 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -73,4 +73,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) - Config config( "qpe" ); - config.setGroup( "Screensaver" ); + Config config( "apm" ); + config.setGroup( "Battery" ); + int interval; @@ -93,7 +94,28 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs) - interval_suspend->setValue( interval ); + if ( config.readNumEntry("NoApm", 0) == 0 ) { + interval_suspend->setSpecialValueText( tr("never") ); + } else { + interval_suspend->setValue( interval ); + } + + // battery check and slider + 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 ); + + // light sensor + auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 ); + + + + config.setGroup( "AC" ); // ac spinboxes - interval = config.readNumEntry( "Interval_DimAC", 20 ); - if ( config.readNumEntry("DimAC",1) == 0 ) { + interval = config.readNumEntry( "Interval_Dim", 20 ); + if ( config.readNumEntry("Dim",1) == 0 ) { interval_dim_ac_3->setSpecialValueText( tr("never") ); @@ -103,4 +125,4 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) - interval = config.readNumEntry( "Interval_LightOffAC", 30 ); - if ( config.readNumEntry("LightOffAC",1) == 0 ) { + interval = config.readNumEntry( "Interval_LightOff", 30 ); + if ( config.readNumEntry("LightOff",1) == 0 ) { interval_lightoff_ac_3->setSpecialValueText( tr("never") ); @@ -110,3 +132,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) - interval = config.readNumEntry( "IntervalAC", 60 ); + interval = config.readNumEntry( "Interval", 60 ); if ( interval > 3600 ) { @@ -114,3 +136,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) } - if ( config.readNumEntry("NoApmAC", 0) == 0 ) { + if ( config.readNumEntry("NoApm", 0) == 0 ) { interval_suspend_ac_3->setSpecialValueText( tr("never") ); @@ -120,17 +142,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) - - // battery check and slider - 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 - LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 ); + LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 ); int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); - initbright_ac = config.readNumEntry("BrightnessAC",255); + initbright_ac = config.readNumEntry("Brightness",255); brightness_ac_3->setMaxValue( maxbright_ac ); @@ -141,7 +152,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) + // light sensor + auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensor",0) != 0 ); + - // ipaq sensor - config.setGroup( "lightsensor" ); - auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 ); - auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",0) != 0 ); //LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); @@ -152,7 +162,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) // 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 ) ); + config.setGroup( "Warnings" ); + warnintervalBox->setValue( config.readNumEntry("checkinterval", 10000)/1000 ); + lowSpinBox->setValue( config.readNumEntry("powerverylow", 10 ) ); + criticalSpinBox->setValue( config.readNumEntry("powercritical", 5 ) ); @@ -204,4 +213,5 @@ void LightSettings::accept() - Config config( "qpe" ); - config.setGroup( "Screensaver" ); + Config config( "apm" ); + + config.setGroup( "Battery" ); @@ -211,2 +221,3 @@ void LightSettings::accept() config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() ); + config.writeEntry( "NoAPm", interval_suspend->specialValueText() == tr("never") ); config.writeEntry( "Interval_Dim", interval_dim->value() ); @@ -218,10 +229,11 @@ void LightSettings::accept() // ac - config.writeEntry( "DimAC", interval_dim_ac_3->specialValueText() == tr("never") ); - config.writeEntry( "LightOffAC", interval_lightoff_ac_3->specialValueText() == tr("never") ); - config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); - config.writeEntry( "NoAPmAC", interval_suspend_ac_3->specialValueText() == tr("never") ); - 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", + config.setGroup( "AC" ); + config.writeEntry( "Dim", interval_dim_ac_3->specialValueText() == tr("never") ); + config.writeEntry( "LightOff", interval_lightoff_ac_3->specialValueText() == tr("never") ); + config.writeEntry( "LcdOffOnly", (int)LcdOffOnly_2_3->isChecked() ); + config.writeEntry( "NoAPm", interval_suspend_ac_3->specialValueText() == tr("never") ); + config.writeEntry( "Interval_Dim", interval_dim_ac_3->value() ); + config.writeEntry( "Interval_LightOff", interval_lightoff_ac_3->value() ); + config.writeEntry( "Interval", interval_suspend_ac_3->value() ); + config.writeEntry( "Brightness", ( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() ); @@ -232,4 +244,6 @@ void LightSettings::accept() config.setGroup( "lightsensor" ); + config.setGroup( "Battery" ); config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); - config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); + config.setGroup( "AC" ); + config.writeEntry( "LightSensor", (int)auto_brightness_ac_3->isChecked() ); //config.writeEntry( "Steps", LightStepSpin->value() ); @@ -239,12 +253,11 @@ void LightSettings::accept() - 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() ); + config.setGroup( "Warnings" ); + 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()"); - conf.write(); + + config.write(); @@ -255,3 +268,3 @@ void LightSettings::applyBrightness() { - if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { + if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { int bright = ( brightness->value() ) * 255 / brightness->maxValue(); @@ -273,3 +286,3 @@ void LightSettings::done(int r) QDialog::done(r); - close (); + close(); } |