| -rw-r--r-- | core/settings/light-and-power/light.cpp | 7 | ||||
| -rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 55 |
2 files changed, 58 insertions, 4 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 0193a7b..04d2249 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -110,27 +110,28 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) 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 ); + noApmAC->setChecked( config.readNumEntry("NoApmAC",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 ); // ipaq sensor - config.setGroup( "Ipaq_light_sensor" ); + config.setGroup( "Ipaqlightsensor" ); 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 @@ -201,31 +202,32 @@ void LightSettings::accept() config.writeEntry( "Interval", interval_suspend->value() ); config.writeEntry( "Brightness", ( 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( "NoAPmAC", (int)noApmAC->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->value()) * 255 / brightness_ac_3->maxValue() ); // 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.setGroup( "Ipaqlightsensor" ); 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() ); } @@ -235,17 +237,16 @@ void LightSettings::accept() 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); diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index be096ac..2d0457f 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui @@ -6,17 +6,17 @@ <name>name</name> <cstring>LightSettingsBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>415</width> + <width>411</width> <height>532</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Light and Power Settings</string> </property> <property stdset="1"> @@ -688,16 +688,27 @@ <name>name</name> <cstring>LcdOffOnly_2_3</cstring> </property> <property stdset="1"> <name>text</name> <string>Deactivate LCD only (does not suspend)</string> </property> </widget> + <widget> + <class>QCheckBox</class> + <property stdset="1"> + <name>name</name> + <cstring>noApmAC</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>No power saving features</string> + </property> + </widget> </vbox> </widget> <widget> <class>QGroupBox</class> <property stdset="1"> <name>name</name> <cstring>GroupBox8</cstring> </property> @@ -1337,16 +1348,58 @@ warning at</string> <slot>setEnabled(bool)</slot> </connection> <connection> <sender>screensaver_lightoff</sender> <signal>toggled(bool)</signal> <receiver>interval_lightoff</receiver> <slot>setEnabled(bool)</slot> </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>screensaver_dim_ac_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>interval_dim_ac_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>screensaver_lightoff_ac_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>interval_lightoff_ac_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>interval_suspend_ac_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>LcdOffOnly_2_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> + <connection> + <sender>noApmAC</sender> + <signal>toggled(bool)</signal> + <receiver>TextLabel1_2_2_3</receiver> + <slot>setDisabled(bool)</slot> + </connection> </connections> <tabstops> <tabstop>auto_brightness</tabstop> <tabstop>screensaver_dim</tabstop> <tabstop>interval_dim</tabstop> <tabstop>screensaver_lightoff</tabstop> <tabstop>interval_lightoff</tabstop> <tabstop>interval_suspend</tabstop> |