-rw-r--r-- | core/settings/light-and-power/light.cpp | 99 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 606 |
2 files changed, 249 insertions, 456 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 04d2249..97120f2 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -41,12 +41,13 @@ #include <qtextstream.h> #include <qdatastream.h> #include <qmessagebox.h> #include <qcombobox.h> #include <qgroupbox.h> #include <qspinbox.h> +#include <qpushbutton.h> #include <qlistbox.h> #include <qdir.h> #if QT_VERSION >= 300 #include <qstylefactory.h> #endif @@ -55,70 +56,92 @@ using namespace Opie; LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) : LightSettingsBase( parent, name, TRUE, fl ) { - 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 ) { + if ( ODevice::inst()->hasLightSensor() ) { // Not supported yet - hide until implemented - IpaqGroupBox->setEnabled( false ); - IpaqGroupBoxAC->setEnabled( false ); - LightSensorGroupBox->setEnabled( false ); + auto_brightness->setEnabled( false ); + CalibrateLightSensor->setEnabled( false ); + auto_brightness_ac_3->setEnabled( false ); + CalibrateLightSensorAC->setEnabled( false ); } else { // if ipaq no need to show the sensor box - IpaqGroupBox->hide(); - IpaqGroupBoxAC->hide(); - LightSensorGroupBox->hide(); + auto_brightness->hide(); + CalibrateLightSensor->hide(); + auto_brightness_ac_3->hide(); + CalibrateLightSensorAC->hide(); } Config config( "qpe" ); config.setGroup( "Screensaver" ); int interval; // battery spinboxes interval = config.readNumEntry( "Interval_Dim", 20 ); + if ( config.readNumEntry("Dim",1) == 0 ) { + interval_dim->setSpecialValueText( tr("never") ); + } else { interval_dim->setValue( interval ); + } + interval = config.readNumEntry( "Interval_LightOff", 30 ); + if ( config.readNumEntry("LightOff",1) == 0 ) { + interval_lightoff->setSpecialValueText( tr("never") ); + } else { interval_lightoff->setValue( interval ); + } + interval = config.readNumEntry( "Interval", 60 ); if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs) interval_suspend->setValue( interval ); // ac spinboxes interval = config.readNumEntry( "Interval_DimAC", 20 ); + if ( config.readNumEntry("DimAC",1) == 0 ) { + interval_dim_ac_3->setSpecialValueText( tr("never") ); + } else { interval_dim_ac_3->setValue( interval ); + } + interval = config.readNumEntry( "Interval_LightOffAC", 30 ); + if ( config.readNumEntry("LightOffAC",1) == 0 ) { + interval_lightoff_ac_3->setSpecialValueText( tr("never") ); + } else { interval_lightoff_ac_3->setValue( interval ); + } + interval = config.readNumEntry( "IntervalAC", 60 ); if ( interval > 3600 ) { interval /= 1000; // compatibility (was millisecs) } + if ( config.readNumEntry("NoApmAC", 0) == 0 ) { + interval_suspend_ac_3->setSpecialValueText( tr("never") ); + } else { 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 ); + + + + 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 ); - 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) ); @@ -126,36 +149,34 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) // ipaq 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 ) ); + //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 ); +// LightMinValueSlider->setTickInterval( steps ); } static void set_fl(int bright) { qDebug ( QString( "Brightness" ).arg( bright ) ); QCopEnvelope e("QPE/System", "setBacklight(int)" ); @@ -168,70 +189,66 @@ void LightSettings::reject() QDialog::reject(); } void LightSettings::accept() { - if ( qApp->focusWidget() ) + if ( qApp->focusWidget() ) { 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); + int i_dim = ( !( interval_dim->specialValueText() == tr("never") ) ? interval_dim->value() : 0); + int i_lightoff = ( !( interval_lightoff->specialValueText() == tr("never") ) ? interval_lightoff->value() : 0); int i_suspend = interval_suspend->value(); QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" ); 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_dim_ac = ( !( interval_dim_ac_3->specialValueText() == tr("never") ) ? interval_dim_ac_3->value() : 0); + int i_lightoff_ac = ( !( interval_lightoff_ac_3->specialValueText() == tr("never") ) ? 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() ); + config.writeEntry( "Dim", interval_dim->specialValueText() == tr("never") ); + config.writeEntry( "LightOff", interval_lightoff->specialValueText() == tr("never") ); 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->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( "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", (int)noApmAC->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", ( 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 ) { - + if ( ODevice::inst()->hasLightSensor() ) { // ipaq 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() ); + //config.writeEntry( "Steps", LightStepSpin->value() ); + //onfig.writeEntry( "MinValue", LightMinValueSlider->value() ); + //config.writeEntry( "Shift", LightShiftSpin->value() ); } config.write(); // advanced Config conf("apm"); diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index 2d0457f..fee5c2c 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui @@ -8,17 +8,24 @@ </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>411</width> + <width>403</width> <height>532</height> </rect> </property> <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>5</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> <name>caption</name> <string>Light and Power Settings</string> </property> <property stdset="1"> <name>sizeGripEnabled</name> <bool>false</bool> @@ -99,32 +106,42 @@ <number>3</number> </property> <widget> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout8</cstring> + <cstring>Layout11</cstring> + </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> </property> <grid> <property stdset="1"> <name>margin</name> - <number>0</number> + <number>3</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>3</number> </property> - <widget row="0" column="1" > + <widget row="1" column="1" > <class>QSpinBox</class> <property stdset="1"> <name>name</name> - <cstring>interval_dim</cstring> + <cstring>interval_lightoff</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> + </property> + <property stdset="1"> + <name>specialValueText</name> + <string>never</string> </property> <property stdset="1"> <name>buttonSymbols</name> <enum>PlusMinus</enum> </property> <property stdset="1"> @@ -134,46 +151,57 @@ <property stdset="1"> <name>minValue</name> <number>10</number> </property> <property stdset="1"> <name>lineStep</name> - <number>15</number> + <number>10</number> </property> </widget> <widget row="1" column="0" > - <class>QCheckBox</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>screensaver_lightoff</cstring> + <cstring>TextLabel2_2</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Light off after</string> + </property> + </widget> + <widget row="0" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1_3</cstring> </property> <property stdset="1"> <name>sizePolicy</name> <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> + <hsizetype>7</hsizetype> + <vsizetype>1</vsizetype> </sizepolicy> </property> <property stdset="1"> <name>text</name> - <string>Light off after</string> - </property> - <property stdset="1"> - <name>checked</name> - <bool>true</bool> + <string>Dim light after</string> </property> </widget> - <widget row="2" column="1" > + <widget row="0" column="1" > <class>QSpinBox</class> <property stdset="1"> <name>name</name> - <cstring>interval_suspend</cstring> + <cstring>interval_dim</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> + </property> + <property stdset="1"> + <name>specialValueText</name> + <string>never</string> </property> <property stdset="1"> <name>buttonSymbols</name> <enum>PlusMinus</enum> </property> <property stdset="1"> @@ -183,24 +211,28 @@ <property stdset="1"> <name>minValue</name> <number>10</number> </property> <property stdset="1"> <name>lineStep</name> - <number>15</number> + <number>10</number> </property> </widget> - <widget row="1" column="1" > + <widget row="2" column="1" > <class>QSpinBox</class> <property stdset="1"> <name>name</name> - <cstring>interval_lightoff</cstring> + <cstring>interval_suspend</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> + </property> + <property stdset="1"> + <name>specialValueText</name> + <string>never</string> </property> <property stdset="1"> <name>buttonSymbols</name> <enum>PlusMinus</enum> </property> <property stdset="1"> @@ -210,35 +242,13 @@ <property stdset="1"> <name>minValue</name> <number>10</number> </property> <property stdset="1"> <name>lineStep</name> - <number>15</number> - </property> - </widget> - <widget row="0" column="0" > - <class>QCheckBox</class> - <property stdset="1"> - <name>name</name> - <cstring>screensaver_dim</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>text</name> - <string>Dim light after</string> - </property> - <property stdset="1"> - <name>checked</name> - <bool>true</bool> + <number>10</number> </property> </widget> <widget row="2" column="0" > <class>QLabel</class> <property stdset="1"> <name>name</name> @@ -298,13 +308,13 @@ <property stdset="1"> <name>maxValue</name> <number>255</number> </property> <property stdset="1"> <name>lineStep</name> - <number>16</number> + <number>1</number> </property> <property stdset="1"> <name>pageStep</name> <number>16</number> </property> <property stdset="1"> @@ -411,54 +421,55 @@ <name>scaledContents</name> <bool>false</bool> </property> </widget> </hbox> </widget> - </vbox> - </widget> <widget> - <class>QGroupBox</class> + <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>IpaqGroupBox</cstring> - </property> - <property stdset="1"> - <name>title</name> - <string>iPAQ</string> - </property> - <property> - <name>layoutMargin</name> - </property> - <property> - <name>layoutSpacing</name> + <cstring>Layout9</cstring> </property> - <vbox> + <hbox> <property stdset="1"> <name>margin</name> - <number>3</number> + <number>0</number> </property> <property stdset="1"> <name>spacing</name> - <number>3</number> + <number>6</number> </property> <widget> <class>QCheckBox</class> <property stdset="1"> <name>name</name> <cstring>auto_brightness</cstring> </property> <property stdset="1"> <name>text</name> - <string>Use light sensor</string> + <string>Use Light Sensor</string> </property> <property> <name>whatsThis</name> <string>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</string> </property> </widget> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>CalibrateLightSensor</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Calibrate</string> + </property> + </widget> + </hbox> + </widget> </vbox> </widget> <spacer> <property> <name>name</name> <cstring>Spacer4</cstring> @@ -530,43 +541,42 @@ <number>3</number> </property> <widget> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout9_3</cstring> + <cstring>Layout14</cstring> + </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> </property> <grid> <property stdset="1"> <name>margin</name> - <number>0</number> + <number>3</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> - </property> - <widget row="2" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel1_2_2_3</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Suspend after</string> + <number>3</number> </property> - </widget> - <widget row="0" column="1" > + <widget row="1" column="1" > <class>QSpinBox</class> <property stdset="1"> <name>name</name> - <cstring>interval_dim_ac_3</cstring> + <cstring>interval_lightoff_ac_3</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> + </property> + <property stdset="1"> + <name>specialValueText</name> + <string>never</string> </property> <property stdset="1"> <name>buttonSymbols</name> <enum>PlusMinus</enum> </property> <property stdset="1"> @@ -576,24 +586,46 @@ <property stdset="1"> <name>minValue</name> <number>10</number> </property> <property stdset="1"> <name>lineStep</name> - <number>15</number> + <number>10</number> + </property> + </widget> + <widget row="0" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1_3_2</cstring> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> + <name>text</name> + <string>Dim light after</string> </property> </widget> <widget row="2" column="1" > <class>QSpinBox</class> <property stdset="1"> <name>name</name> <cstring>interval_suspend_ac_3</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> + </property> + <property stdset="1"> + <name>specialValueText</name> + <string>never</string> </property> <property stdset="1"> <name>buttonSymbols</name> <enum>PlusMinus</enum> </property> <property stdset="1"> @@ -603,24 +635,39 @@ <property stdset="1"> <name>minValue</name> <number>10</number> </property> <property stdset="1"> <name>lineStep</name> - <number>15</number> + <number>10</number> </property> </widget> - <widget row="1" column="1" > + <widget row="2" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1_2_2_3</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Suspend after</string> + </property> + </widget> + <widget row="0" column="1" > <class>QSpinBox</class> <property stdset="1"> <name>name</name> - <cstring>interval_lightoff_ac_3</cstring> + <cstring>interval_dim_ac_3</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> + </property> + <property stdset="1"> + <name>specialValueText</name> + <string>never</string> </property> <property stdset="1"> <name>buttonSymbols</name> <enum>PlusMinus</enum> </property> <property stdset="1"> @@ -630,58 +677,25 @@ <property stdset="1"> <name>minValue</name> <number>10</number> </property> <property stdset="1"> <name>lineStep</name> - <number>15</number> + <number>10</number> </property> </widget> <widget row="1" column="0" > - <class>QCheckBox</class> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>screensaver_lightoff_ac_3</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> + <cstring>TextLabel2_2_2</cstring> </property> <property stdset="1"> <name>text</name> <string>Light off after</string> </property> - <property stdset="1"> - <name>checked</name> - <bool>true</bool> - </property> - </widget> - <widget row="0" column="0" > - <class>QCheckBox</class> - <property stdset="1"> - <name>name</name> - <cstring>screensaver_dim_ac_3</cstring> - </property> - <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> - </sizepolicy> - </property> - <property stdset="1"> - <name>text</name> - <string>Dim light after</string> - </property> - <property stdset="1"> - <name>checked</name> - <bool>true</bool> - </property> </widget> </grid> </widget> <widget> <class>QCheckBox</class> <property stdset="1"> @@ -690,23 +704,12 @@ </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> @@ -857,54 +860,55 @@ <name>scaledContents</name> <bool>false</bool> </property> </widget> </hbox> </widget> - </vbox> - </widget> <widget> - <class>QGroupBox</class> + <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>IpaqGroupBoxAC</cstring> - </property> - <property stdset="1"> - <name>title</name> - <string>iPAQ</string> - </property> - <property> - <name>layoutMargin</name> - </property> - <property> - <name>layoutSpacing</name> + <cstring>Layout10</cstring> </property> - <vbox> + <hbox> <property stdset="1"> <name>margin</name> - <number>3</number> + <number>0</number> </property> <property stdset="1"> <name>spacing</name> - <number>3</number> + <number>6</number> </property> <widget> <class>QCheckBox</class> <property stdset="1"> <name>name</name> <cstring>auto_brightness_ac_3</cstring> </property> <property stdset="1"> <name>text</name> - <string>Use light sensor</string> + <string>Use Light Sensor</string> </property> <property> <name>whatsThis</name> <string>By sensing the ambient light where you are using your device, the screen light can be adjusted automatically. The brightness setting still affects the average brightness.</string> </property> </widget> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>CalibrateLightSensorAC</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string>Calibrate</string> + </property> + </widget> + </hbox> + </widget> </vbox> </widget> <spacer> <property> <name>name</name> <cstring>Spacer5</cstring> @@ -962,43 +966,55 @@ <property> <name>layoutSpacing</name> </property> <vbox> <property stdset="1"> <name>margin</name> - <number>4</number> + <number>3</number> </property> <property stdset="1"> <name>spacing</name> <number>3</number> </property> <widget> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> <cstring>Layout18</cstring> </property> + <property> + <name>layoutMargin</name> + </property> + <property> + <name>layoutSpacing</name> + </property> <grid> <property stdset="1"> <name>margin</name> - <number>0</number> + <number>3</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>3</number> </property> <widget row="0" column="0" > <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1</cstring> </property> <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>7</hsizetype> + <vsizetype>5</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> <name>text</name> - <string>Low power warning -interval</string> + <string>Low power warning interval</string> </property> <property stdset="1"> <name>alignment</name> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property> @@ -1033,13 +1049,13 @@ interval</string> <property stdset="1"> <name>name</name> <cstring>warnintervalBox</cstring> </property> <property stdset="1"> <name>suffix</name> - <string> seconds</string> + <string> sec</string> </property> <property stdset="1"> <name>maxValue</name> <number>60</number> </property> <property stdset="1"> @@ -1082,224 +1098,42 @@ interval</string> <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel2</cstring> </property> <property stdset="1"> - <name>text</name> - <string>very low battery -warning at</string> - </property> - </widget> - <widget row="2" column="0" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel3</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>critical power -warning at</string> - </property> - </widget> - </grid> - </widget> - </vbox> - </widget> - <widget> - <class>QGroupBox</class> - <property stdset="1"> - <name>name</name> - <cstring>LightSensorGroupBox</cstring> - </property> - <property stdset="1"> - <name>title</name> - <string>iPAQ Light Sensor (127 steps)</string> - </property> - <property> - <name>layoutMargin</name> - </property> - <property> - <name>layoutSpacing</name> - </property> - <vbox> - <property stdset="1"> - <name>margin</name> - <number>3</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>3</number> - </property> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout7</cstring> - </property> - <hbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel9</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Steps</string> - </property> - </widget> - <widget> - <class>QSpinBox</class> - <property stdset="1"> - <name>name</name> - <cstring>LightStepSpin</cstring> - </property> - <property stdset="1"> - <name>maxValue</name> - <number>126</number> - </property> - <property stdset="1"> - <name>minValue</name> - <number>1</number> - </property> - <property> - <name>whatsThis</name> - <string>How many different steps should be handled by the light sensor. Values between 1 and 126 are allowed.</string> - </property> - </widget> - </hbox> - </widget> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel10</cstring> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + </sizepolicy> </property> <property stdset="1"> <name>text</name> - <string>Minimum value to turn display on</string> + <string>very low battery warning at</string> </property> </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout9</cstring> - </property> - <hbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget> - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>PixmapLabel2_2</cstring> - </property> - <property stdset="1"> - <name>pixmap</name> - <pixmap>image0</pixmap> - </property> - <property stdset="1"> - <name>scaledContents</name> - <bool>false</bool> - </property> - </widget> - <widget> - <class>QSlider</class> - <property stdset="1"> - <name>name</name> - <cstring>LightMinValueSlider</cstring> - </property> - <property stdset="1"> - <name>maxValue</name> - <number>127</number> - </property> - <property stdset="1"> - <name>tracking</name> - <bool>false</bool> - </property> - <property stdset="1"> - <name>orientation</name> - <enum>Horizontal</enum> - </property> - <property stdset="1"> - <name>tickmarks</name> - <enum>Right</enum> - </property> - </widget> - <widget> + <widget row="2" column="0" > <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>PixmapLabel1_2</cstring> - </property> - <property stdset="1"> - <name>pixmap</name> - <pixmap>image1</pixmap> - </property> - <property stdset="1"> - <name>scaledContents</name> - <bool>false</bool> - </property> - </widget> - </hbox> - </widget> - <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout8</cstring> - </property> - <hbox> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> + <cstring>TextLabel3</cstring> </property> - <widget> - <class>QLabel</class> <property stdset="1"> - <name>name</name> - <cstring>TextLabel11</cstring> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>1</hsizetype> + <vsizetype>5</vsizetype> + </sizepolicy> </property> <property stdset="1"> <name>text</name> - <string>Shift</string> + <string>critical power warning at</string> </property> </widget> - <widget> - <class>QSpinBox</class> - <property stdset="1"> - <name>name</name> - <cstring>LightShiftSpin</cstring> - </property> - <property stdset="1"> - <name>maxValue</name> - <number>126</number> - </property> - </widget> - </hbox> + </grid> </widget> </vbox> </widget> <spacer> <property> <name>name</name> @@ -1337,72 +1171,14 @@ warning at</string> </image> <image> <name>image2</name> <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data> </image> </images> -<connections> - <connection> - <sender>screensaver_dim</sender> - <signal>toggled(bool)</signal> - <receiver>interval_dim</receiver> - <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> <tabstop>brightness</tabstop> </tabstops> </UI> |