summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp107
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui682
2 files changed, 291 insertions, 498 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
@@ -46,2 +46,3 @@
#include <qspinbox.h>
+#include <qpushbutton.h>
#include <qlistbox.h>
@@ -60,15 +61,14 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags 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();
}
@@ -82,5 +82,15 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
interval = config.readNumEntry( "Interval_Dim", 20 );
- interval_dim->setValue( interval );
+ if ( config.readNumEntry("Dim",1) == 0 ) {
+ interval_dim->setSpecialValueText( tr("never") );
+ } else {
+ interval_dim->setValue( interval );
+ }
+
interval = config.readNumEntry( "Interval_LightOff", 30 );
- interval_lightoff->setValue( interval );
+ if ( config.readNumEntry("LightOff",1) == 0 ) {
+ interval_lightoff->setSpecialValueText( tr("never") );
+ } else {
+ interval_lightoff->setValue( interval );
+ }
+
interval = config.readNumEntry( "Interval", 60 );
@@ -91,5 +101,15 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
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 );
- interval_lightoff_ac_3->setValue( interval );
+ 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 );
@@ -98,3 +118,7 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
}
- interval_suspend_ac_3->setValue( interval );
+ if ( config.readNumEntry("NoApmAC", 0) == 0 ) {
+ interval_suspend_ac_3->setSpecialValueText( tr("never") );
+ } else {
+ interval_suspend_ac_3->setValue( interval );
+ }
@@ -102,4 +126,6 @@ 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 );
@@ -114,6 +140,3 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
// 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 ( );
@@ -131,6 +154,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
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 ) );
@@ -143,4 +166,2 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
-
-
connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
@@ -154,3 +175,3 @@ LightSettings::~LightSettings()
void LightSettings::slotSliderTicks( int steps ) {
- LightMinValueSlider->setTickInterval( steps );
+// LightMinValueSlider->setTickInterval( steps );
}
@@ -173,4 +194,5 @@ void LightSettings::accept()
{
- if ( qApp->focusWidget() )
+ if ( qApp->focusWidget() ) {
qApp->focusWidget()->clearFocus();
+ }
@@ -179,4 +201,4 @@ void LightSettings::accept()
// 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();
@@ -186,4 +208,4 @@ void LightSettings::accept()
// 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();
@@ -196,4 +218,4 @@ void LightSettings::accept()
// 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() );
@@ -206,6 +228,6 @@ void LightSettings::accept()
// 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() );
@@ -218,15 +240,10 @@ void LightSettings::accept()
// 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() );
}
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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>411</width>
+ <width>403</width>
<height>532</height>
@@ -18,2 +18,9 @@
<property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>5</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
<name>caption</name>
@@ -104,3 +111,9 @@
<name>name</name>
- <cstring>Layout8</cstring>
+ <cstring>Layout11</cstring>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
</property>
@@ -109,3 +122,3 @@
<name>margin</name>
- <number>0</number>
+ <number>3</number>
</property>
@@ -113,5 +126,5 @@
<name>spacing</name>
- <number>6</number>
+ <number>3</number>
</property>
- <widget row="0" column="1" >
+ <widget row="1" column="1" >
<class>QSpinBox</class>
@@ -119,3 +132,3 @@
<name>name</name>
- <cstring>interval_dim</cstring>
+ <cstring>interval_lightoff</cstring>
</property>
@@ -123,3 +136,7 @@
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
+ </property>
+ <property stdset="1">
+ <name>specialValueText</name>
+ <string>never</string>
</property>
@@ -139,3 +156,3 @@
<name>lineStep</name>
- <number>15</number>
+ <number>10</number>
</property>
@@ -143,6 +160,17 @@
<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>
@@ -151,4 +179,4 @@
<sizepolicy>
- <hsizetype>1</hsizetype>
- <vsizetype>0</vsizetype>
+ <hsizetype>7</hsizetype>
+ <vsizetype>1</vsizetype>
</sizepolicy>
@@ -157,10 +185,6 @@
<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>
@@ -168,3 +192,3 @@
<name>name</name>
- <cstring>interval_suspend</cstring>
+ <cstring>interval_dim</cstring>
</property>
@@ -172,3 +196,7 @@
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
+ </property>
+ <property stdset="1">
+ <name>specialValueText</name>
+ <string>never</string>
</property>
@@ -188,6 +216,6 @@
<name>lineStep</name>
- <number>15</number>
+ <number>10</number>
</property>
</widget>
- <widget row="1" column="1" >
+ <widget row="2" column="1" >
<class>QSpinBox</class>
@@ -195,3 +223,3 @@
<name>name</name>
- <cstring>interval_lightoff</cstring>
+ <cstring>interval_suspend</cstring>
</property>
@@ -199,3 +227,7 @@
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
+ </property>
+ <property stdset="1">
+ <name>specialValueText</name>
+ <string>never</string>
</property>
@@ -215,25 +247,3 @@
<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>
@@ -303,3 +313,3 @@
<name>lineStep</name>
- <number>16</number>
+ <number>1</number>
</property>
@@ -416,43 +426,44 @@
</widget>
- </vbox>
- </widget>
- <widget>
- <class>QGroupBox</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>
- </property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>3</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>3</number>
- </property>
<widget>
- <class>QCheckBox</class>
+ <class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>auto_brightness</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <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>
+ <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>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>auto_brightness</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <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>
@@ -535,3 +546,9 @@
<name>name</name>
- <cstring>Layout9_3</cstring>
+ <cstring>Layout14</cstring>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
</property>
@@ -540,3 +557,3 @@
<name>margin</name>
- <number>0</number>
+ <number>3</number>
</property>
@@ -544,16 +561,5 @@
<name>spacing</name>
- <number>6</number>
+ <number>3</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>
- </property>
- </widget>
- <widget row="0" column="1" >
+ <widget row="1" column="1" >
<class>QSpinBox</class>
@@ -561,3 +567,3 @@
<name>name</name>
- <cstring>interval_dim_ac_3</cstring>
+ <cstring>interval_lightoff_ac_3</cstring>
</property>
@@ -565,3 +571,7 @@
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
+ </property>
+ <property stdset="1">
+ <name>specialValueText</name>
+ <string>never</string>
</property>
@@ -581,3 +591,21 @@
<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>
@@ -592,3 +620,7 @@
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
+ </property>
+ <property stdset="1">
+ <name>specialValueText</name>
+ <string>never</string>
</property>
@@ -608,6 +640,17 @@
<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>
@@ -615,3 +658,3 @@
<name>name</name>
- <cstring>interval_lightoff_ac_3</cstring>
+ <cstring>interval_dim_ac_3</cstring>
</property>
@@ -619,3 +662,7 @@
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
+ </property>
+ <property stdset="1">
+ <name>specialValueText</name>
+ <string>never</string>
</property>
@@ -635,3 +682,3 @@
<name>lineStep</name>
- <number>15</number>
+ <number>10</number>
</property>
@@ -639,13 +686,6 @@
<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>
@@ -655,28 +695,2 @@
</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>
@@ -695,13 +709,2 @@
</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>
@@ -862,43 +865,44 @@
</widget>
- </vbox>
- </widget>
- <widget>
- <class>QGroupBox</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>
- </property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>3</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>3</number>
- </property>
<widget>
- <class>QCheckBox</class>
+ <class>QLayoutWidget</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>
- </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>
+ <cstring>Layout10</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>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>
+ </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>
@@ -967,3 +971,3 @@
<name>margin</name>
- <number>4</number>
+ <number>3</number>
</property>
@@ -979,2 +983,8 @@
</property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
<grid>
@@ -982,3 +992,3 @@
<name>margin</name>
- <number>0</number>
+ <number>3</number>
</property>
@@ -986,3 +996,3 @@
<name>spacing</name>
- <number>6</number>
+ <number>3</number>
</property>
@@ -995,5 +1005,11 @@
<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>
@@ -1038,3 +1054,3 @@ interval</string>
<name>suffix</name>
- <string> seconds</string>
+ <string> sec</string>
</property>
@@ -1087,68 +1103,7 @@ interval</string>
<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>
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>5</vsizetype>
+ </sizepolicy>
</property>
@@ -1156,91 +1111,6 @@ warning at</string>
<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>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Minimum value to turn display on</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>
+ <string>very low battery warning at</string>
</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>
@@ -1248,35 +1118,10 @@ warning at</string>
<name>name</name>
- <cstring>PixmapLabel1_2</cstring>
- </property>
- <property stdset="1">
- <name>pixmap</name>
- <pixmap>image1</pixmap>
+ <cstring>TextLabel3</cstring>
</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>
- </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>
@@ -1284,17 +1129,6 @@ warning at</string>
<name>text</name>
- <string>Shift</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>
+ <string>critical power warning at</string>
</property>
</widget>
- </hbox>
+ </grid>
</widget>
@@ -1342,63 +1176,5 @@ warning at</string>
</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>