summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp124
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui1007
-rw-r--r--core/settings/light-and-power/opie-light-and-power.control2
-rw-r--r--core/settings/light-and-power/settings.h2
4 files changed, 1055 insertions, 80 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
@@ -17,6 +17,9 @@
** not clear to you.
**
**********************************************************************/
+
+// redone by Maximilian Reiss <harlekin@handhelds.org>
+
#include "settings.h"
#include <qpe/global.h>
@@ -24,6 +27,7 @@
#include <qpe/config.h>
#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>
#endif
@@ -38,6 +42,7 @@
#include <qdatastream.h>
#include <qmessagebox.h>
#include <qcombobox.h>
+#include <qgroupbox.h>
#include <qspinbox.h>
#include <qlistbox.h>
#include <qdir.h>
@@ -52,14 +57,29 @@ using namespace Opie;
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" );
config.setGroup( "Screensaver" );
int interval;
+
+ // battery spinboxes
interval = config.readNumEntry( "Interval_Dim", 20 );
interval_dim->setValue( interval );
interval = config.readNumEntry( "Interval_LightOff", 30 );
@@ -68,6 +88,19 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs)
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 );
LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
@@ -79,13 +112,45 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
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 );
+ 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()));
}
LightSettings::~LightSettings()
{
}
+void LightSettings::slotSliderTicks( int steps ) {
+ LightMinValueSlider->setTickInterval( steps );
+}
+
static void set_fl(int bright)
{
QCopEnvelope e("QPE/System", "setBacklight(int)" );
@@ -106,14 +171,24 @@ void LightSettings::accept()
applyBrightness();
+ // bat
int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0);
int i_lightoff = (screensaver_lightoff->isChecked() ? 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_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( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
@@ -122,6 +197,41 @@ void LightSettings::accept()
config.writeEntry( "Interval", interval_suspend->value() );
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();
QDialog::accept();
@@ -129,12 +239,18 @@ void LightSettings::accept()
void LightSettings::applyBrightness()
{
- int bright = (brightness->maxValue()-brightness->value())*255
- / brightness->maxValue();
+ // 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)
{
QDialog::done(r);
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 5e7ff45..fd85017 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -11,41 +11,64 @@
<rect>
<x>0</x>
<y>0</y>
- <width>269</width>
- <height>317</height>
+ <width>419</width>
+ <height>532</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Light and Power Settings</string>
</property>
+ <property stdset="1">
+ <name>sizeGripEnabled</name>
+ <bool>false</bool>
+ </property>
<property>
<name>layoutMargin</name>
</property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
<vbox>
<property stdset="1">
<name>margin</name>
- <number>7</number>
+ <number>3</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>6</number>
+ <number>3</number>
</property>
<widget>
- <class>QCheckBox</class>
+ <class>QTabWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>auto_brightness</cstring>
+ <cstring>TabWidget3</cstring>
</property>
- <property stdset="1">
- <name>text</name>
- <string>Adjust to environment</string>
+ <property>
+ <name>layoutMargin</name>
</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>
+ <name>layoutSpacing</name>
+ </property>
+ <widget>
+ <class>QWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>tab</cstring>
+ </property>
+ <attribute>
+ <name>title</name>
+ <string>on Battery</string>
+ </attribute>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>3</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>3</number>
</property>
- </widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
@@ -53,8 +76,12 @@
<cstring>GroupBox3</cstring>
</property>
<property stdset="1">
+ <name>enabled</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
<name>title</name>
- <string>Power saving</string>
+ <string>General Settings</string>
</property>
<property>
<name>layoutMargin</name>
@@ -62,20 +89,35 @@
<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>Layout8</cstring>
+ </property>
<grid>
<property stdset="1">
<name>margin</name>
- <number>11</number>
+ <number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
- <widget row="1" column="1" >
+ <widget row="0" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
- <cstring>interval_lightoff</cstring>
+ <cstring>interval_dim</cstring>
</property>
<property stdset="1">
<name>suffix</name>
@@ -98,6 +140,28 @@
<number>15</number>
</property>
</widget>
+ <widget row="1" column="0" >
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>screensaver_lightoff</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>1</hsizetype>
+ <vsizetype>0</vsizetype>
+ </sizepolicy>
+ </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="2" column="1" >
<class>QSpinBox</class>
<property stdset="1">
@@ -125,6 +189,33 @@
<number>15</number>
</property>
</widget>
+ <widget row="1" column="1" >
+ <class>QSpinBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>interval_lightoff</cstring>
+ </property>
+ <property stdset="1">
+ <name>suffix</name>
+ <string> seconds</string>
+ </property>
+ <property stdset="1">
+ <name>buttonSymbols</name>
+ <enum>PlusMinus</enum>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>3600</number>
+ </property>
+ <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">
@@ -147,11 +238,324 @@
<bool>true</bool>
</property>
</widget>
+ <widget row="2" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Suspend after</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget>
+ <class>QCheckBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>LcdOffOnly</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Deactivate LCD only (does not suspend)</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox9</cstring>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Backlight</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>QSlider</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>brightness</cstring>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>255</number>
+ </property>
+ <property stdset="1">
+ <name>lineStep</name>
+ <number>16</number>
+ </property>
+ <property stdset="1">
+ <name>pageStep</name>
+ <number>16</number>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>tickmarks</name>
+ <enum>Right</enum>
+ </property>
+ <property stdset="1">
+ <name>tickInterval</name>
+ <number>32</number>
+ </property>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <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>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PixmapLabel2</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>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel4</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Off</string>
+ </property>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer2</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel5</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Full</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PixmapLabel1</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>
+ </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>
+ <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>
+ </vbox>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer4</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
+ <widget>
+ <class>QWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>tab</cstring>
+ </property>
+ <attribute>
+ <name>title</name>
+ <string>on AC</string>
+ </attribute>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>3</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>3</number>
+ </property>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox4</cstring>
+ </property>
+ <property stdset="1">
+ <name>enabled</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>General Settings</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>Layout9_3</cstring>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</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>
+ </property>
+ </widget>
<widget row="0" column="1" >
<class>QSpinBox</class>
<property stdset="1">
<name>name</name>
- <cstring>interval_dim</cstring>
+ <cstring>interval_dim_ac_3</cstring>
</property>
<property stdset="1">
<name>suffix</name>
@@ -174,33 +578,65 @@
<number>15</number>
</property>
</widget>
- <widget row="2" column="0" >
- <class>QLabel</class>
+ <widget row="2" column="1" >
+ <class>QSpinBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1_2</cstring>
+ <cstring>interval_suspend_ac_3</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Suspend after</string>
+ <name>suffix</name>
+ <string> seconds</string>
+ </property>
+ <property stdset="1">
+ <name>buttonSymbols</name>
+ <enum>PlusMinus</enum>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>3600</number>
+ </property>
+ <property stdset="1">
+ <name>minValue</name>
+ <number>10</number>
+ </property>
+ <property stdset="1">
+ <name>lineStep</name>
+ <number>15</number>
</property>
</widget>
- <widget row="3" column="0" rowspan="1" colspan="2" >
- <class>QCheckBox</class>
+ <widget row="1" column="1" >
+ <class>QSpinBox</class>
<property stdset="1">
<name>name</name>
- <cstring>LcdOffOnly</cstring>
+ <cstring>interval_lightoff_ac_3</cstring>
</property>
<property stdset="1">
- <name>text</name>
- <string>Deactivate LCD only (does not suspend)</string>
+ <name>suffix</name>
+ <string> seconds</string>
+ </property>
+ <property stdset="1">
+ <name>buttonSymbols</name>
+ <enum>PlusMinus</enum>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>3600</number>
+ </property>
+ <property stdset="1">
+ <name>minValue</name>
+ <number>10</number>
+ </property>
+ <property stdset="1">
+ <name>lineStep</name>
+ <number>15</number>
</property>
</widget>
<widget row="1" column="0" >
<class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>screensaver_lightoff</cstring>
+ <cstring>screensaver_lightoff_ac_3</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
@@ -218,31 +654,73 @@
<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>QLayoutWidget</class>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout18</cstring>
+ <cstring>LcdOffOnly_2_3</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Deactivate LCD only (does not suspend)</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox8</cstring>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Backlight</string>
</property>
<property>
<name>layoutMargin</name>
</property>
- <hbox>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <vbox>
<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>
<class>QSlider</class>
<property stdset="1">
<name>name</name>
- <cstring>brightness</cstring>
+ <cstring>brightness_ac_3</cstring>
</property>
<property stdset="1">
<name>maxValue</name>
@@ -258,7 +736,7 @@
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
@@ -273,69 +751,144 @@
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout16</cstring>
- </property>
- <property>
- <name>layoutSpacing</name>
+ <cstring>Layout20</cstring>
</property>
- <vbox>
+ <hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
- <number>0</number>
+ <number>6</number>
</property>
<widget>
- <class>QLayoutWidget</class>
+ <class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout10</cstring>
+ <cstring>PixmapLabel2_2_3</cstring>
</property>
- <hbox>
<property stdset="1">
- <name>margin</name>
- <number>0</number>
+ <name>pixmap</name>
+ <pixmap>image2</pixmap>
</property>
<property stdset="1">
- <name>spacing</name>
- <number>6</number>
+ <name>scaledContents</name>
+ <bool>false</bool>
</property>
+ </widget>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>PixmapLabel1</cstring>
+ <cstring>TextLabel6</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Off</string>
+ </property>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer3</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel7</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Full</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PixmapLabel1_2_3</cstring>
</property>
<property stdset="1">
<name>pixmap</name>
- <pixmap>image0</pixmap>
+ <pixmap>image1</pixmap>
</property>
<property stdset="1">
<name>scaledContents</name>
<bool>false</bool>
</property>
</widget>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
<widget>
- <class>QLabel</class>
+ <class>QGroupBox</class>
<property stdset="1">
<name>name</name>
- <cstring>TextLabel1</cstring>
+ <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>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>auto_brightness_ac_3</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Bright</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>
+ </vbox>
</widget>
<spacer>
<property>
<name>name</name>
- <cstring>Spacer3</cstring>
+ <cstring>Spacer5</cstring>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
<property stdset="1">
<name>sizeType</name>
@@ -349,24 +902,268 @@
</size>
</property>
</spacer>
- </hbox>
+ </vbox>
</widget>
<widget>
+ <class>QWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>tab</cstring>
+ </property>
+ <attribute>
+ <name>title</name>
+ <string>Advanced Settings</string>
+ </attribute>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>3</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>3</number>
+ </property>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox5</cstring>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Warnings</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>4</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>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Low power warning
+interval</string>
+ </property>
+ <property stdset="1">
+ <name>alignment</name>
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
+ <property>
+ <name>wordwrap</name>
+ </property>
+ </widget>
+ <widget row="1" column="1" >
+ <class>QSpinBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>lowSpinBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>suffix</name>
+ <string> %</string>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>80</number>
+ </property>
+ <property stdset="1">
+ <name>minValue</name>
+ <number>2</number>
+ </property>
+ <property>
+ <name>whatsThis</name>
+ <string>At what battery level should the low power warning pop up</string>
+ </property>
+ </widget>
+ <widget row="0" column="1" >
+ <class>QSpinBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>warnintervalBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>suffix</name>
+ <string> seconds</string>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>60</number>
+ </property>
+ <property stdset="1">
+ <name>minValue</name>
+ <number>5</number>
+ </property>
+ <property>
+ <name>whatsThis</name>
+ <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string>
+ </property>
+ </widget>
+ <widget row="2" column="1" >
+ <class>QSpinBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>criticalSpinBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>prefix</name>
+ <string></string>
+ </property>
+ <property stdset="1">
+ <name>suffix</name>
+ <string> %</string>
+ </property>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>80</number>
+ </property>
+ <property stdset="1">
+ <name>minValue</name>
+ <number>2</number>
+ </property>
+ <property>
+ <name>whatsThis</name>
+ <string>At what battery level should the critical power warning pop up</string>
+ </property>
+ </widget>
+ <widget row="1" column="0" >
+ <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>sizePolicy</name>
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>7</vsizetype>
- </sizepolicy>
+ <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>
</property>
<property stdset="1">
<name>text</name>
- <string>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</string>
+ <string>Minimum value to turn display on</string>
</property>
</widget>
<widget>
@@ -388,7 +1185,41 @@
<class>QLabel</class>
<property stdset="1">
<name>name</name>
- <cstring>PixmapLabel2</cstring>
+ <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>orientation</name>
+ <enum>Horizontal</enum>
+ </property>
+ <property stdset="1">
+ <name>tickmarks</name>
+ <enum>Right</enum>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PixmapLabel1_2</cstring>
</property>
<property stdset="1">
<name>pixmap</name>
@@ -399,32 +1230,57 @@
<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>TextLabel2</cstring>
+ <cstring>TextLabel11</cstring>
</property>
<property stdset="1">
<name>text</name>
- <string>Off</string>
+ <string>Shift</string>
</property>
+ </widget>
+ <widget>
+ <class>QSpinBox</class>
<property stdset="1">
- <name>alignment</name>
- <set>AlignVCenter|AlignLeft</set>
+ <name>name</name>
+ <cstring>LightShiftSpin</cstring>
</property>
- <property>
- <name>vAlign</name>
+ <property stdset="1">
+ <name>maxValue</name>
+ <number>126</number>
</property>
</widget>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
<spacer>
<property>
<name>name</name>
- <cstring>Spacer2</cstring>
+ <cstring>Spacer1</cstring>
</property>
<property stdset="1">
<name>orientation</name>
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
<property stdset="1">
<name>sizeType</name>
@@ -438,21 +1294,22 @@
</size>
</property>
</spacer>
- </hbox>
- </widget>
</vbox>
</widget>
- </hbox>
</widget>
</vbox>
</widget>
<images>
<image>
<name>image0</name>
- <data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data>
+ <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b324b364b06719340dcb434b36488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c004336518f</data>
</image>
<image>
<name>image1</name>
+ <data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data>
+ </image>
+ <image>
+ <name>image2</name>
<data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data>
</image>
</images>
diff --git a/core/settings/light-and-power/opie-light-and-power.control b/core/settings/light-and-power/opie-light-and-power.control
index c5e3a83..0bc128d 100644
--- a/core/settings/light-and-power/opie-light-and-power.control
+++ b/core/settings/light-and-power/opie-light-and-power.control
@@ -1,7 +1,7 @@
Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
Priority: optional
Section: opie/settings
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: Maximilian Reiss <harlekin@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
Depends: opie-base ($QPE_VERSION)
diff --git a/core/settings/light-and-power/settings.h b/core/settings/light-and-power/settings.h
index 27c09a7..77f90d6 100644
--- a/core/settings/light-and-power/settings.h
+++ b/core/settings/light-and-power/settings.h
@@ -42,9 +42,11 @@ protected:
private slots:
void applyBrightness();
+ void slotSliderTicks( int steps );
private:
int initbright;
+ int initbright_ac;
};