Diffstat (limited to 'core/settings/light-and-power/light.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/light-and-power/light.cpp | 128 |
1 files changed, 122 insertions, 6 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index ded358c..8721a95 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -18,4 +18,7 @@ ** **********************************************************************/ + +// redone by Maximilian Reiss <harlekin@handhelds.org> + #include "settings.h" @@ -25,4 +28,5 @@ #include <qpe/applnk.h> #include <qpe/qpeapplication.h> +#include <qpe/power.h> #if defined(Q_WS_QWS) && !defined(QT_NO_COP) #include <qpe/qcopenvelope_qws.h> @@ -39,4 +43,5 @@ #include <qmessagebox.h> #include <qcombobox.h> +#include <qgroupbox.h> #include <qspinbox.h> #include <qlistbox.h> @@ -53,6 +58,19 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) : LightSettingsBase( parent, name, TRUE, fl ) { - // Not supported - auto_brightness->hide(); + + 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 ) { + // Not supported yet - hide until implemented + IpaqGroupBox->setEnabled( false ); + IpaqGroupBoxAC->setEnabled( false ); + LightSensorGroupBox->setEnabled( false ); + } else { + // if ipaq no need to show the sensor box + IpaqGroupBox->hide(); + IpaqGroupBoxAC->hide(); + LightSensorGroupBox->hide(); + } Config config( "qpe" ); @@ -61,4 +79,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) int interval; + + // battery spinboxes interval = config.readNumEntry( "Interval_Dim", 20 ); interval_dim->setValue( interval ); @@ -69,4 +89,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) interval_suspend->setValue( interval ); + // ac spinboxes + interval = config.readNumEntry( "Interval_DimAC", 20 ); + interval_dim_ac_3->setValue( interval ); + interval = config.readNumEntry( "Interval_LightOffAC", 30 ); + interval_lightoff_ac_3->setValue( interval ); + interval = config.readNumEntry( "IntervalAC", 60 ); + if ( interval > 3600 ) { + interval /= 1000; // compatibility (was millisecs) + } + interval_suspend_ac_3->setValue( interval ); + + + // battery check and slider screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 ); screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 ); @@ -80,5 +113,33 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) 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 ) ); + connect(brightness, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness())); + connect(brightness_ac_3, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness())); } @@ -87,4 +148,8 @@ LightSettings::~LightSettings() } +void LightSettings::slotSliderTicks( int steps ) { + LightMinValueSlider->setTickInterval( steps ); +} + static void set_fl(int bright) { @@ -103,8 +168,9 @@ void LightSettings::accept() { if ( qApp->focusWidget() ) - qApp->focusWidget()->clearFocus(); + qApp->focusWidget()->clearFocus(); applyBrightness(); + // bat int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0); int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0); @@ -113,6 +179,15 @@ void LightSettings::accept() e << i_dim << i_lightoff << i_suspend; + // ac + int i_dim_ac = (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0); + int i_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0); + int i_suspend_ac = interval_suspend_ac_3->value(); + QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" ); + e << i_dim_ac << i_lightoff_ac << i_suspend_ac; + Config config( "qpe" ); config.setGroup( "Screensaver" ); + + // bat config.writeEntry( "Dim", (int)screensaver_dim->isChecked() ); config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() ); @@ -123,4 +198,39 @@ void LightSettings::accept() 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(); @@ -130,10 +240,16 @@ void LightSettings::accept() void LightSettings::applyBrightness() { - int bright = (brightness->maxValue()-brightness->value())*255 - / brightness->maxValue(); - set_fl(bright); + // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting + if ( PowerStatus::Online ) { + int bright = (brightness_ac_3->maxValue() - brightness_ac_3->value())*255 / brightness_ac_3->maxValue(); + set_fl(bright); + } else { + int bright = (brightness->maxValue()-brightness->value())*255 / brightness->maxValue(); + set_fl(bright); + } } + void LightSettings::done(int r) { |