summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-20 14:37:00 (UTC)
committer harlekin <harlekin>2002-10-20 14:37:00 (UTC)
commit9f442f5af601d1e15bb4d0509ed012e61609260d (patch) (unidiff)
tree068baed1f795a81f56341904b08c345f265561ec
parentb915686dd38e99df72db332e1ea0b12a0895bdb3 (diff)
downloadopie-9f442f5af601d1e15bb4d0509ed012e61609260d.zip
opie-9f442f5af601d1e15bb4d0509ed012e61609260d.tar.gz
opie-9f442f5af601d1e15bb4d0509ed012e61609260d.tar.bz2
reworked light and power, ac setting tab added and prepared for ipaq light sensor
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 @@
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20
21// redone by Maximilian Reiss <harlekin@handhelds.org>
22
20#include "settings.h" 23#include "settings.h"
21 24
22#include <qpe/global.h> 25#include <qpe/global.h>
@@ -24,6 +27,7 @@
24#include <qpe/config.h> 27#include <qpe/config.h>
25#include <qpe/applnk.h> 28#include <qpe/applnk.h>
26#include <qpe/qpeapplication.h> 29#include <qpe/qpeapplication.h>
30#include <qpe/power.h>
27#if defined(Q_WS_QWS) && !defined(QT_NO_COP) 31#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
28#include <qpe/qcopenvelope_qws.h> 32#include <qpe/qcopenvelope_qws.h>
29#endif 33#endif
@@ -38,6 +42,7 @@
38#include <qdatastream.h> 42#include <qdatastream.h>
39#include <qmessagebox.h> 43#include <qmessagebox.h>
40#include <qcombobox.h> 44#include <qcombobox.h>
45#include <qgroupbox.h>
41#include <qspinbox.h> 46#include <qspinbox.h>
42#include <qlistbox.h> 47#include <qlistbox.h>
43#include <qdir.h> 48#include <qdir.h>
@@ -52,14 +57,29 @@ using namespace Opie;
52LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) 57LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
53 : LightSettingsBase( parent, name, TRUE, fl ) 58 : LightSettingsBase( parent, name, TRUE, fl )
54{ 59{
55 // Not supported 60
56 auto_brightness->hide(); 61 if ( ODevice::inst()->model() == Model_iPAQ_H31xx ||
62 ODevice::inst()->model() == Model_iPAQ_H36xx ||
63 ODevice::inst()->model() == Model_iPAQ_H37xx ||
64 ODevice::inst()->model() == Model_iPAQ_H38xx ) {
65 // Not supported yet - hide until implemented
66 IpaqGroupBox->setEnabled( false );
67 IpaqGroupBoxAC->setEnabled( false );
68 LightSensorGroupBox->setEnabled( false );
69 } else {
70 // if ipaq no need to show the sensor box
71 IpaqGroupBox->hide();
72 IpaqGroupBoxAC->hide();
73 LightSensorGroupBox->hide();
74 }
57 75
58 Config config( "qpe" ); 76 Config config( "qpe" );
59 77
60 config.setGroup( "Screensaver" ); 78 config.setGroup( "Screensaver" );
61 79
62 int interval; 80 int interval;
81
82 // battery spinboxes
63 interval = config.readNumEntry( "Interval_Dim", 20 ); 83 interval = config.readNumEntry( "Interval_Dim", 20 );
64 interval_dim->setValue( interval ); 84 interval_dim->setValue( interval );
65 interval = config.readNumEntry( "Interval_LightOff", 30 ); 85 interval = config.readNumEntry( "Interval_LightOff", 30 );
@@ -68,6 +88,19 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
68 if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs) 88 if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs)
69 interval_suspend->setValue( interval ); 89 interval_suspend->setValue( interval );
70 90
91 // ac spinboxes
92 interval = config.readNumEntry( "Interval_DimAC", 20 );
93 interval_dim_ac_3->setValue( interval );
94 interval = config.readNumEntry( "Interval_LightOffAC", 30 );
95 interval_lightoff_ac_3->setValue( interval );
96 interval = config.readNumEntry( "IntervalAC", 60 );
97 if ( interval > 3600 ) {
98 interval /= 1000; // compatibility (was millisecs)
99 }
100 interval_suspend_ac_3->setValue( interval );
101
102
103 // battery check and slider
71 screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 ); 104 screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 );
72 screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 ); 105 screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 );
73 LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 ); 106 LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
@@ -79,13 +112,45 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
79 brightness->setPageStep( QMAX(1,maxbright/16) ); 112 brightness->setPageStep( QMAX(1,maxbright/16) );
80 brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); 113 brightness->setValue( (maxbright*255 - initbright*maxbright)/255 );
81 114
115 // ac check and slider
116 screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 );
117 screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 );
118 LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 );
119 int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
120 initbright_ac = config.readNumEntry("BrightnessAC",255);
121 brightness_ac_3->setMaxValue( maxbright_ac );
122 brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) );
123 brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) );
124 brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) );
125 brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 );
126
127 // advanced settings
128 config.setGroup( "APM" );
129 warnintervalBox->setValue( config.readNumEntry("check_interval", 10000)/1000 );
130 lowSpinBox->setValue( config.readNumEntry("power_verylow", 10 ) );
131 criticalSpinBox->setValue( config.readNumEntry("power_critical", 5 ) );
132
133 // ipaq sensor
134 config.setGroup( "Ipaq_light_sensor" );
135 auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 );
136 auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 );
137 LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) );
138 LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) );
139 connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ;
140 LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) );
141
82 connect(brightness, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness())); 142 connect(brightness, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness()));
143 connect(brightness_ac_3, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness()));
83} 144}
84 145
85LightSettings::~LightSettings() 146LightSettings::~LightSettings()
86{ 147{
87} 148}
88 149
150void LightSettings::slotSliderTicks( int steps ) {
151 LightMinValueSlider->setTickInterval( steps );
152}
153
89static void set_fl(int bright) 154static void set_fl(int bright)
90{ 155{
91 QCopEnvelope e("QPE/System", "setBacklight(int)" ); 156 QCopEnvelope e("QPE/System", "setBacklight(int)" );
@@ -106,14 +171,24 @@ void LightSettings::accept()
106 171
107 applyBrightness(); 172 applyBrightness();
108 173
174 // bat
109 int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0); 175 int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0);
110 int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0); 176 int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0);
111 int i_suspend = interval_suspend->value(); 177 int i_suspend = interval_suspend->value();
112 QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" ); 178 QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" );
113 e << i_dim << i_lightoff << i_suspend; 179 e << i_dim << i_lightoff << i_suspend;
114 180
181 // ac
182 int i_dim_ac = (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0);
183 int i_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0);
184 int i_suspend_ac = interval_suspend_ac_3->value();
185 QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" );
186 e << i_dim_ac << i_lightoff_ac << i_suspend_ac;
187
115 Config config( "qpe" ); 188 Config config( "qpe" );
116 config.setGroup( "Screensaver" ); 189 config.setGroup( "Screensaver" );
190
191 // bat
117 config.writeEntry( "Dim", (int)screensaver_dim->isChecked() ); 192 config.writeEntry( "Dim", (int)screensaver_dim->isChecked() );
118 config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() ); 193 config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() );
119 config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() ); 194 config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
@@ -122,6 +197,41 @@ void LightSettings::accept()
122 config.writeEntry( "Interval", interval_suspend->value() ); 197 config.writeEntry( "Interval", interval_suspend->value() );
123 config.writeEntry( "Brightness", 198 config.writeEntry( "Brightness",
124 (brightness->maxValue()-brightness->value())*255/brightness->maxValue() ); 199 (brightness->maxValue()-brightness->value())*255/brightness->maxValue() );
200
201 // ac
202 config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() );
203 config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() );
204 config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() );
205 config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() );
206 config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() );
207 config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() );
208 config.writeEntry( "BrightnessAC",
209 (brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() );
210
211 // advanced
212 config.setGroup( "APM" );
213 config.writeEntry( "check_interval", warnintervalBox->value()*1000 );
214 config.writeEntry( "power_verylow", lowSpinBox->value() );
215 config.writeEntry( "power_critical", criticalSpinBox->value() );
216 QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()");
217
218
219 // only make ipaq light sensor entries in config file if on an ipaq
220 if ( ODevice::inst()->model() == Model_iPAQ_H31xx ||
221 ODevice::inst()->model() == Model_iPAQ_H36xx ||
222 ODevice::inst()->model() == Model_iPAQ_H37xx ||
223 ODevice::inst()->model() == Model_iPAQ_H38xx ) {
224
225 // ipaq sensor
226 config.setGroup( "Ipaq_light_sensor" );
227
228 config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() );
229 config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() );
230 config.writeEntry( "Steps", LightStepSpin->value() );
231 config.writeEntry( "MinValue", LightMinValueSlider->value() );
232 config.writeEntry( "Shift", LightShiftSpin->value() );
233 }
234
125 config.write(); 235 config.write();
126 236
127 QDialog::accept(); 237 QDialog::accept();
@@ -129,12 +239,18 @@ void LightSettings::accept()
129 239
130void LightSettings::applyBrightness() 240void LightSettings::applyBrightness()
131{ 241{
132 int bright = (brightness->maxValue()-brightness->value())*255 242 // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting
133 / brightness->maxValue(); 243 if ( PowerStatus::Online ) {
244 int bright = (brightness_ac_3->maxValue() - brightness_ac_3->value())*255 / brightness_ac_3->maxValue();
134 set_fl(bright); 245 set_fl(bright);
246 } else {
247 int bright = (brightness->maxValue()-brightness->value())*255 / brightness->maxValue();
248 set_fl(bright);
249 }
135} 250}
136 251
137 252
253
138void LightSettings::done(int r) 254void LightSettings::done(int r)
139{ 255{
140 QDialog::done(r); 256 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 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>269</width> 14 <width>419</width>
15 <height>317</height> 15 <height>532</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Light and Power Settings</string> 20 <string>Light and Power Settings</string>
21 </property> 21 </property>
22 <property stdset="1">
23 <name>sizeGripEnabled</name>
24 <bool>false</bool>
25 </property>
22 <property> 26 <property>
23 <name>layoutMargin</name> 27 <name>layoutMargin</name>
24 </property> 28 </property>
29 <property>
30 <name>layoutSpacing</name>
31 </property>
25 <vbox> 32 <vbox>
26 <property stdset="1"> 33 <property stdset="1">
27 <name>margin</name> 34 <name>margin</name>
28 <number>7</number> 35 <number>3</number>
29 </property> 36 </property>
30 <property stdset="1"> 37 <property stdset="1">
31 <name>spacing</name> 38 <name>spacing</name>
32 <number>6</number> 39 <number>3</number>
33 </property> 40 </property>
34 <widget> 41 <widget>
35 <class>QCheckBox</class> 42 <class>QTabWidget</class>
36 <property stdset="1"> 43 <property stdset="1">
37 <name>name</name> 44 <name>name</name>
38 <cstring>auto_brightness</cstring> 45 <cstring>TabWidget3</cstring>
39 </property> 46 </property>
40 <property stdset="1"> 47 <property>
41 <name>text</name> 48 <name>layoutMargin</name>
42 <string>Adjust to environment</string>
43 </property> 49 </property>
44 <property> 50 <property>
45 <name>whatsThis</name> 51 <name>layoutSpacing</name>
46 <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> 52 </property>
53 <widget>
54 <class>QWidget</class>
55 <property stdset="1">
56 <name>name</name>
57 <cstring>tab</cstring>
58 </property>
59 <attribute>
60 <name>title</name>
61 <string>on Battery</string>
62 </attribute>
63 <vbox>
64 <property stdset="1">
65 <name>margin</name>
66 <number>3</number>
67 </property>
68 <property stdset="1">
69 <name>spacing</name>
70 <number>3</number>
47 </property> 71 </property>
48 </widget>
49 <widget> 72 <widget>
50 <class>QGroupBox</class> 73 <class>QGroupBox</class>
51 <property stdset="1"> 74 <property stdset="1">
@@ -53,8 +76,12 @@
53 <cstring>GroupBox3</cstring> 76 <cstring>GroupBox3</cstring>
54 </property> 77 </property>
55 <property stdset="1"> 78 <property stdset="1">
79 <name>enabled</name>
80 <bool>true</bool>
81 </property>
82 <property stdset="1">
56 <name>title</name> 83 <name>title</name>
57 <string>Power saving</string> 84 <string>General Settings</string>
58 </property> 85 </property>
59 <property> 86 <property>
60 <name>layoutMargin</name> 87 <name>layoutMargin</name>
@@ -62,20 +89,35 @@
62 <property> 89 <property>
63 <name>layoutSpacing</name> 90 <name>layoutSpacing</name>
64 </property> 91 </property>
92 <vbox>
93 <property stdset="1">
94 <name>margin</name>
95 <number>3</number>
96 </property>
97 <property stdset="1">
98 <name>spacing</name>
99 <number>3</number>
100 </property>
101 <widget>
102 <class>QLayoutWidget</class>
103 <property stdset="1">
104 <name>name</name>
105 <cstring>Layout8</cstring>
106 </property>
65 <grid> 107 <grid>
66 <property stdset="1"> 108 <property stdset="1">
67 <name>margin</name> 109 <name>margin</name>
68 <number>11</number> 110 <number>0</number>
69 </property> 111 </property>
70 <property stdset="1"> 112 <property stdset="1">
71 <name>spacing</name> 113 <name>spacing</name>
72 <number>6</number> 114 <number>6</number>
73 </property> 115 </property>
74 <widget row="1" column="1" > 116 <widget row="0" column="1" >
75 <class>QSpinBox</class> 117 <class>QSpinBox</class>
76 <property stdset="1"> 118 <property stdset="1">
77 <name>name</name> 119 <name>name</name>
78 <cstring>interval_lightoff</cstring> 120 <cstring>interval_dim</cstring>
79 </property> 121 </property>
80 <property stdset="1"> 122 <property stdset="1">
81 <name>suffix</name> 123 <name>suffix</name>
@@ -98,6 +140,28 @@
98 <number>15</number> 140 <number>15</number>
99 </property> 141 </property>
100 </widget> 142 </widget>
143 <widget row="1" column="0" >
144 <class>QCheckBox</class>
145 <property stdset="1">
146 <name>name</name>
147 <cstring>screensaver_lightoff</cstring>
148 </property>
149 <property stdset="1">
150 <name>sizePolicy</name>
151 <sizepolicy>
152 <hsizetype>1</hsizetype>
153 <vsizetype>0</vsizetype>
154 </sizepolicy>
155 </property>
156 <property stdset="1">
157 <name>text</name>
158 <string>Light off after</string>
159 </property>
160 <property stdset="1">
161 <name>checked</name>
162 <bool>true</bool>
163 </property>
164 </widget>
101 <widget row="2" column="1" > 165 <widget row="2" column="1" >
102 <class>QSpinBox</class> 166 <class>QSpinBox</class>
103 <property stdset="1"> 167 <property stdset="1">
@@ -125,6 +189,33 @@
125 <number>15</number> 189 <number>15</number>
126 </property> 190 </property>
127 </widget> 191 </widget>
192 <widget row="1" column="1" >
193 <class>QSpinBox</class>
194 <property stdset="1">
195 <name>name</name>
196 <cstring>interval_lightoff</cstring>
197 </property>
198 <property stdset="1">
199 <name>suffix</name>
200 <string> seconds</string>
201 </property>
202 <property stdset="1">
203 <name>buttonSymbols</name>
204 <enum>PlusMinus</enum>
205 </property>
206 <property stdset="1">
207 <name>maxValue</name>
208 <number>3600</number>
209 </property>
210 <property stdset="1">
211 <name>minValue</name>
212 <number>10</number>
213 </property>
214 <property stdset="1">
215 <name>lineStep</name>
216 <number>15</number>
217 </property>
218 </widget>
128 <widget row="0" column="0" > 219 <widget row="0" column="0" >
129 <class>QCheckBox</class> 220 <class>QCheckBox</class>
130 <property stdset="1"> 221 <property stdset="1">
@@ -147,11 +238,324 @@
147 <bool>true</bool> 238 <bool>true</bool>
148 </property> 239 </property>
149 </widget> 240 </widget>
241 <widget row="2" column="0" >
242 <class>QLabel</class>
243 <property stdset="1">
244 <name>name</name>
245 <cstring>TextLabel1_2</cstring>
246 </property>
247 <property stdset="1">
248 <name>text</name>
249 <string>Suspend after</string>
250 </property>
251 </widget>
252 </grid>
253 </widget>
254 <widget>
255 <class>QCheckBox</class>
256 <property stdset="1">
257 <name>name</name>
258 <cstring>LcdOffOnly</cstring>
259 </property>
260 <property stdset="1">
261 <name>text</name>
262 <string>Deactivate LCD only (does not suspend)</string>
263 </property>
264 </widget>
265 </vbox>
266 </widget>
267 <widget>
268 <class>QGroupBox</class>
269 <property stdset="1">
270 <name>name</name>
271 <cstring>GroupBox9</cstring>
272 </property>
273 <property stdset="1">
274 <name>title</name>
275 <string>Backlight</string>
276 </property>
277 <property>
278 <name>layoutMargin</name>
279 </property>
280 <property>
281 <name>layoutSpacing</name>
282 </property>
283 <vbox>
284 <property stdset="1">
285 <name>margin</name>
286 <number>3</number>
287 </property>
288 <property stdset="1">
289 <name>spacing</name>
290 <number>3</number>
291 </property>
292 <widget>
293 <class>QSlider</class>
294 <property stdset="1">
295 <name>name</name>
296 <cstring>brightness</cstring>
297 </property>
298 <property stdset="1">
299 <name>maxValue</name>
300 <number>255</number>
301 </property>
302 <property stdset="1">
303 <name>lineStep</name>
304 <number>16</number>
305 </property>
306 <property stdset="1">
307 <name>pageStep</name>
308 <number>16</number>
309 </property>
310 <property stdset="1">
311 <name>orientation</name>
312 <enum>Horizontal</enum>
313 </property>
314 <property stdset="1">
315 <name>tickmarks</name>
316 <enum>Right</enum>
317 </property>
318 <property stdset="1">
319 <name>tickInterval</name>
320 <number>32</number>
321 </property>
322 </widget>
323 <widget>
324 <class>QLayoutWidget</class>
325 <property stdset="1">
326 <name>name</name>
327 <cstring>Layout10</cstring>
328 </property>
329 <hbox>
330 <property stdset="1">
331 <name>margin</name>
332 <number>0</number>
333 </property>
334 <property stdset="1">
335 <name>spacing</name>
336 <number>6</number>
337 </property>
338 <widget>
339 <class>QLabel</class>
340 <property stdset="1">
341 <name>name</name>
342 <cstring>PixmapLabel2</cstring>
343 </property>
344 <property stdset="1">
345 <name>pixmap</name>
346 <pixmap>image0</pixmap>
347 </property>
348 <property stdset="1">
349 <name>scaledContents</name>
350 <bool>false</bool>
351 </property>
352 </widget>
353 <widget>
354 <class>QLabel</class>
355 <property stdset="1">
356 <name>name</name>
357 <cstring>TextLabel4</cstring>
358 </property>
359 <property stdset="1">
360 <name>text</name>
361 <string>Off</string>
362 </property>
363 </widget>
364 <spacer>
365 <property>
366 <name>name</name>
367 <cstring>Spacer2</cstring>
368 </property>
369 <property stdset="1">
370 <name>orientation</name>
371 <enum>Horizontal</enum>
372 </property>
373 <property stdset="1">
374 <name>sizeType</name>
375 <enum>Expanding</enum>
376 </property>
377 <property>
378 <name>sizeHint</name>
379 <size>
380 <width>20</width>
381 <height>20</height>
382 </size>
383 </property>
384 </spacer>
385 <widget>
386 <class>QLabel</class>
387 <property stdset="1">
388 <name>name</name>
389 <cstring>TextLabel5</cstring>
390 </property>
391 <property stdset="1">
392 <name>text</name>
393 <string>Full</string>
394 </property>
395 </widget>
396 <widget>
397 <class>QLabel</class>
398 <property stdset="1">
399 <name>name</name>
400 <cstring>PixmapLabel1</cstring>
401 </property>
402 <property stdset="1">
403 <name>pixmap</name>
404 <pixmap>image1</pixmap>
405 </property>
406 <property stdset="1">
407 <name>scaledContents</name>
408 <bool>false</bool>
409 </property>
410 </widget>
411 </hbox>
412 </widget>
413 </vbox>
414 </widget>
415 <widget>
416 <class>QGroupBox</class>
417 <property stdset="1">
418 <name>name</name>
419 <cstring>IpaqGroupBox</cstring>
420 </property>
421 <property stdset="1">
422 <name>title</name>
423 <string>iPAQ</string>
424 </property>
425 <property>
426 <name>layoutMargin</name>
427 </property>
428 <property>
429 <name>layoutSpacing</name>
430 </property>
431 <vbox>
432 <property stdset="1">
433 <name>margin</name>
434 <number>3</number>
435 </property>
436 <property stdset="1">
437 <name>spacing</name>
438 <number>3</number>
439 </property>
440 <widget>
441 <class>QCheckBox</class>
442 <property stdset="1">
443 <name>name</name>
444 <cstring>auto_brightness</cstring>
445 </property>
446 <property stdset="1">
447 <name>text</name>
448 <string>Use light sensor</string>
449 </property>
450 <property>
451 <name>whatsThis</name>
452 <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>
453 </property>
454 </widget>
455 </vbox>
456 </widget>
457 <spacer>
458 <property>
459 <name>name</name>
460 <cstring>Spacer4</cstring>
461 </property>
462 <property stdset="1">
463 <name>orientation</name>
464 <enum>Vertical</enum>
465 </property>
466 <property stdset="1">
467 <name>sizeType</name>
468 <enum>Expanding</enum>
469 </property>
470 <property>
471 <name>sizeHint</name>
472 <size>
473 <width>20</width>
474 <height>20</height>
475 </size>
476 </property>
477 </spacer>
478 </vbox>
479 </widget>
480 <widget>
481 <class>QWidget</class>
482 <property stdset="1">
483 <name>name</name>
484 <cstring>tab</cstring>
485 </property>
486 <attribute>
487 <name>title</name>
488 <string>on AC</string>
489 </attribute>
490 <vbox>
491 <property stdset="1">
492 <name>margin</name>
493 <number>3</number>
494 </property>
495 <property stdset="1">
496 <name>spacing</name>
497 <number>3</number>
498 </property>
499 <widget>
500 <class>QGroupBox</class>
501 <property stdset="1">
502 <name>name</name>
503 <cstring>GroupBox4</cstring>
504 </property>
505 <property stdset="1">
506 <name>enabled</name>
507 <bool>true</bool>
508 </property>
509 <property stdset="1">
510 <name>title</name>
511 <string>General Settings</string>
512 </property>
513 <property>
514 <name>layoutMargin</name>
515 </property>
516 <property>
517 <name>layoutSpacing</name>
518 </property>
519 <vbox>
520 <property stdset="1">
521 <name>margin</name>
522 <number>3</number>
523 </property>
524 <property stdset="1">
525 <name>spacing</name>
526 <number>3</number>
527 </property>
528 <widget>
529 <class>QLayoutWidget</class>
530 <property stdset="1">
531 <name>name</name>
532 <cstring>Layout9_3</cstring>
533 </property>
534 <grid>
535 <property stdset="1">
536 <name>margin</name>
537 <number>0</number>
538 </property>
539 <property stdset="1">
540 <name>spacing</name>
541 <number>6</number>
542 </property>
543 <widget row="2" column="0" >
544 <class>QLabel</class>
545 <property stdset="1">
546 <name>name</name>
547 <cstring>TextLabel1_2_2_3</cstring>
548 </property>
549 <property stdset="1">
550 <name>text</name>
551 <string>Suspend after</string>
552 </property>
553 </widget>
150 <widget row="0" column="1" > 554 <widget row="0" column="1" >
151 <class>QSpinBox</class> 555 <class>QSpinBox</class>
152 <property stdset="1"> 556 <property stdset="1">
153 <name>name</name> 557 <name>name</name>
154 <cstring>interval_dim</cstring> 558 <cstring>interval_dim_ac_3</cstring>
155 </property> 559 </property>
156 <property stdset="1"> 560 <property stdset="1">
157 <name>suffix</name> 561 <name>suffix</name>
@@ -174,33 +578,65 @@
174 <number>15</number> 578 <number>15</number>
175 </property> 579 </property>
176 </widget> 580 </widget>
177 <widget row="2" column="0" > 581 <widget row="2" column="1" >
178 <class>QLabel</class> 582 <class>QSpinBox</class>
179 <property stdset="1"> 583 <property stdset="1">
180 <name>name</name> 584 <name>name</name>
181 <cstring>TextLabel1_2</cstring> 585 <cstring>interval_suspend_ac_3</cstring>
182 </property> 586 </property>
183 <property stdset="1"> 587 <property stdset="1">
184 <name>text</name> 588 <name>suffix</name>
185 <string>Suspend after</string> 589 <string> seconds</string>
590 </property>
591 <property stdset="1">
592 <name>buttonSymbols</name>
593 <enum>PlusMinus</enum>
594 </property>
595 <property stdset="1">
596 <name>maxValue</name>
597 <number>3600</number>
598 </property>
599 <property stdset="1">
600 <name>minValue</name>
601 <number>10</number>
602 </property>
603 <property stdset="1">
604 <name>lineStep</name>
605 <number>15</number>
186 </property> 606 </property>
187 </widget> 607 </widget>
188 <widget row="3" column="0" rowspan="1" colspan="2" > 608 <widget row="1" column="1" >
189 <class>QCheckBox</class> 609 <class>QSpinBox</class>
190 <property stdset="1"> 610 <property stdset="1">
191 <name>name</name> 611 <name>name</name>
192 <cstring>LcdOffOnly</cstring> 612 <cstring>interval_lightoff_ac_3</cstring>
193 </property> 613 </property>
194 <property stdset="1"> 614 <property stdset="1">
195 <name>text</name> 615 <name>suffix</name>
196 <string>Deactivate LCD only (does not suspend)</string> 616 <string> seconds</string>
617 </property>
618 <property stdset="1">
619 <name>buttonSymbols</name>
620 <enum>PlusMinus</enum>
621 </property>
622 <property stdset="1">
623 <name>maxValue</name>
624 <number>3600</number>
625 </property>
626 <property stdset="1">
627 <name>minValue</name>
628 <number>10</number>
629 </property>
630 <property stdset="1">
631 <name>lineStep</name>
632 <number>15</number>
197 </property> 633 </property>
198 </widget> 634 </widget>
199 <widget row="1" column="0" > 635 <widget row="1" column="0" >
200 <class>QCheckBox</class> 636 <class>QCheckBox</class>
201 <property stdset="1"> 637 <property stdset="1">
202 <name>name</name> 638 <name>name</name>
203 <cstring>screensaver_lightoff</cstring> 639 <cstring>screensaver_lightoff_ac_3</cstring>
204 </property> 640 </property>
205 <property stdset="1"> 641 <property stdset="1">
206 <name>sizePolicy</name> 642 <name>sizePolicy</name>
@@ -218,31 +654,73 @@
218 <bool>true</bool> 654 <bool>true</bool>
219 </property> 655 </property>
220 </widget> 656 </widget>
657 <widget row="0" column="0" >
658 <class>QCheckBox</class>
659 <property stdset="1">
660 <name>name</name>
661 <cstring>screensaver_dim_ac_3</cstring>
662 </property>
663 <property stdset="1">
664 <name>sizePolicy</name>
665 <sizepolicy>
666 <hsizetype>1</hsizetype>
667 <vsizetype>0</vsizetype>
668 </sizepolicy>
669 </property>
670 <property stdset="1">
671 <name>text</name>
672 <string>Dim light after</string>
673 </property>
674 <property stdset="1">
675 <name>checked</name>
676 <bool>true</bool>
677 </property>
678 </widget>
221 </grid> 679 </grid>
222 </widget> 680 </widget>
223 <widget> 681 <widget>
224 <class>QLayoutWidget</class> 682 <class>QCheckBox</class>
225 <property stdset="1"> 683 <property stdset="1">
226 <name>name</name> 684 <name>name</name>
227 <cstring>Layout18</cstring> 685 <cstring>LcdOffOnly_2_3</cstring>
686 </property>
687 <property stdset="1">
688 <name>text</name>
689 <string>Deactivate LCD only (does not suspend)</string>
690 </property>
691 </widget>
692 </vbox>
693 </widget>
694 <widget>
695 <class>QGroupBox</class>
696 <property stdset="1">
697 <name>name</name>
698 <cstring>GroupBox8</cstring>
699 </property>
700 <property stdset="1">
701 <name>title</name>
702 <string>Backlight</string>
228 </property> 703 </property>
229 <property> 704 <property>
230 <name>layoutMargin</name> 705 <name>layoutMargin</name>
231 </property> 706 </property>
232 <hbox> 707 <property>
708 <name>layoutSpacing</name>
709 </property>
710 <vbox>
233 <property stdset="1"> 711 <property stdset="1">
234 <name>margin</name> 712 <name>margin</name>
235 <number>0</number> 713 <number>3</number>
236 </property> 714 </property>
237 <property stdset="1"> 715 <property stdset="1">
238 <name>spacing</name> 716 <name>spacing</name>
239 <number>6</number> 717 <number>3</number>
240 </property> 718 </property>
241 <widget> 719 <widget>
242 <class>QSlider</class> 720 <class>QSlider</class>
243 <property stdset="1"> 721 <property stdset="1">
244 <name>name</name> 722 <name>name</name>
245 <cstring>brightness</cstring> 723 <cstring>brightness_ac_3</cstring>
246 </property> 724 </property>
247 <property stdset="1"> 725 <property stdset="1">
248 <name>maxValue</name> 726 <name>maxValue</name>
@@ -258,7 +736,7 @@
258 </property> 736 </property>
259 <property stdset="1"> 737 <property stdset="1">
260 <name>orientation</name> 738 <name>orientation</name>
261 <enum>Vertical</enum> 739 <enum>Horizontal</enum>
262 </property> 740 </property>
263 <property stdset="1"> 741 <property stdset="1">
264 <name>tickmarks</name> 742 <name>tickmarks</name>
@@ -273,69 +751,144 @@
273 <class>QLayoutWidget</class> 751 <class>QLayoutWidget</class>
274 <property stdset="1"> 752 <property stdset="1">
275 <name>name</name> 753 <name>name</name>
276 <cstring>Layout16</cstring> 754 <cstring>Layout20</cstring>
277 </property>
278 <property>
279 <name>layoutSpacing</name>
280 </property> 755 </property>
281 <vbox> 756 <hbox>
282 <property stdset="1"> 757 <property stdset="1">
283 <name>margin</name> 758 <name>margin</name>
284 <number>0</number> 759 <number>0</number>
285 </property> 760 </property>
286 <property stdset="1"> 761 <property stdset="1">
287 <name>spacing</name> 762 <name>spacing</name>
288 <number>0</number> 763 <number>6</number>
289 </property> 764 </property>
290 <widget> 765 <widget>
291 <class>QLayoutWidget</class> 766 <class>QLabel</class>
292 <property stdset="1"> 767 <property stdset="1">
293 <name>name</name> 768 <name>name</name>
294 <cstring>Layout10</cstring> 769 <cstring>PixmapLabel2_2_3</cstring>
295 </property> 770 </property>
296 <hbox>
297 <property stdset="1"> 771 <property stdset="1">
298 <name>margin</name> 772 <name>pixmap</name>
299 <number>0</number> 773 <pixmap>image2</pixmap>
300 </property> 774 </property>
301 <property stdset="1"> 775 <property stdset="1">
302 <name>spacing</name> 776 <name>scaledContents</name>
303 <number>6</number> 777 <bool>false</bool>
304 </property> 778 </property>
779 </widget>
305 <widget> 780 <widget>
306 <class>QLabel</class> 781 <class>QLabel</class>
307 <property stdset="1"> 782 <property stdset="1">
308 <name>name</name> 783 <name>name</name>
309 <cstring>PixmapLabel1</cstring> 784 <cstring>TextLabel6</cstring>
785 </property>
786 <property stdset="1">
787 <name>text</name>
788 <string>Off</string>
789 </property>
790 </widget>
791 <spacer>
792 <property>
793 <name>name</name>
794 <cstring>Spacer3</cstring>
795 </property>
796 <property stdset="1">
797 <name>orientation</name>
798 <enum>Horizontal</enum>
799 </property>
800 <property stdset="1">
801 <name>sizeType</name>
802 <enum>Expanding</enum>
803 </property>
804 <property>
805 <name>sizeHint</name>
806 <size>
807 <width>20</width>
808 <height>20</height>
809 </size>
810 </property>
811 </spacer>
812 <widget>
813 <class>QLabel</class>
814 <property stdset="1">
815 <name>name</name>
816 <cstring>TextLabel7</cstring>
817 </property>
818 <property stdset="1">
819 <name>text</name>
820 <string>Full</string>
821 </property>
822 </widget>
823 <widget>
824 <class>QLabel</class>
825 <property stdset="1">
826 <name>name</name>
827 <cstring>PixmapLabel1_2_3</cstring>
310 </property> 828 </property>
311 <property stdset="1"> 829 <property stdset="1">
312 <name>pixmap</name> 830 <name>pixmap</name>
313 <pixmap>image0</pixmap> 831 <pixmap>image1</pixmap>
314 </property> 832 </property>
315 <property stdset="1"> 833 <property stdset="1">
316 <name>scaledContents</name> 834 <name>scaledContents</name>
317 <bool>false</bool> 835 <bool>false</bool>
318 </property> 836 </property>
319 </widget> 837 </widget>
838 </hbox>
839 </widget>
840 </vbox>
841 </widget>
320 <widget> 842 <widget>
321 <class>QLabel</class> 843 <class>QGroupBox</class>
322 <property stdset="1"> 844 <property stdset="1">
323 <name>name</name> 845 <name>name</name>
324 <cstring>TextLabel1</cstring> 846 <cstring>IpaqGroupBoxAC</cstring>
847 </property>
848 <property stdset="1">
849 <name>title</name>
850 <string>iPAQ</string>
851 </property>
852 <property>
853 <name>layoutMargin</name>
854 </property>
855 <property>
856 <name>layoutSpacing</name>
857 </property>
858 <vbox>
859 <property stdset="1">
860 <name>margin</name>
861 <number>3</number>
862 </property>
863 <property stdset="1">
864 <name>spacing</name>
865 <number>3</number>
866 </property>
867 <widget>
868 <class>QCheckBox</class>
869 <property stdset="1">
870 <name>name</name>
871 <cstring>auto_brightness_ac_3</cstring>
325 </property> 872 </property>
326 <property stdset="1"> 873 <property stdset="1">
327 <name>text</name> 874 <name>text</name>
328 <string>Bright</string> 875 <string>Use light sensor</string>
329 </property> 876 </property>
877 <property>
878 <name>whatsThis</name>
879 <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>
880 </property>
881 </widget>
882 </vbox>
330 </widget> 883 </widget>
331 <spacer> 884 <spacer>
332 <property> 885 <property>
333 <name>name</name> 886 <name>name</name>
334 <cstring>Spacer3</cstring> 887 <cstring>Spacer5</cstring>
335 </property> 888 </property>
336 <property stdset="1"> 889 <property stdset="1">
337 <name>orientation</name> 890 <name>orientation</name>
338 <enum>Horizontal</enum> 891 <enum>Vertical</enum>
339 </property> 892 </property>
340 <property stdset="1"> 893 <property stdset="1">
341 <name>sizeType</name> 894 <name>sizeType</name>
@@ -349,24 +902,268 @@
349 </size> 902 </size>
350 </property> 903 </property>
351 </spacer> 904 </spacer>
352 </hbox> 905 </vbox>
353 </widget> 906 </widget>
354 <widget> 907 <widget>
908 <class>QWidget</class>
909 <property stdset="1">
910 <name>name</name>
911 <cstring>tab</cstring>
912 </property>
913 <attribute>
914 <name>title</name>
915 <string>Advanced Settings</string>
916 </attribute>
917 <vbox>
918 <property stdset="1">
919 <name>margin</name>
920 <number>3</number>
921 </property>
922 <property stdset="1">
923 <name>spacing</name>
924 <number>3</number>
925 </property>
926 <widget>
927 <class>QGroupBox</class>
928 <property stdset="1">
929 <name>name</name>
930 <cstring>GroupBox5</cstring>
931 </property>
932 <property stdset="1">
933 <name>title</name>
934 <string>Warnings</string>
935 </property>
936 <property>
937 <name>layoutMargin</name>
938 </property>
939 <property>
940 <name>layoutSpacing</name>
941 </property>
942 <vbox>
943 <property stdset="1">
944 <name>margin</name>
945 <number>4</number>
946 </property>
947 <property stdset="1">
948 <name>spacing</name>
949 <number>3</number>
950 </property>
951 <widget>
952 <class>QLayoutWidget</class>
953 <property stdset="1">
954 <name>name</name>
955 <cstring>Layout18</cstring>
956 </property>
957 <grid>
958 <property stdset="1">
959 <name>margin</name>
960 <number>0</number>
961 </property>
962 <property stdset="1">
963 <name>spacing</name>
964 <number>6</number>
965 </property>
966 <widget row="0" column="0" >
967 <class>QLabel</class>
968 <property stdset="1">
969 <name>name</name>
970 <cstring>TextLabel1</cstring>
971 </property>
972 <property stdset="1">
973 <name>text</name>
974 <string>Low power warning
975interval</string>
976 </property>
977 <property stdset="1">
978 <name>alignment</name>
979 <set>WordBreak|AlignVCenter|AlignLeft</set>
980 </property>
981 <property>
982 <name>wordwrap</name>
983 </property>
984 </widget>
985 <widget row="1" column="1" >
986 <class>QSpinBox</class>
987 <property stdset="1">
988 <name>name</name>
989 <cstring>lowSpinBox</cstring>
990 </property>
991 <property stdset="1">
992 <name>suffix</name>
993 <string> %</string>
994 </property>
995 <property stdset="1">
996 <name>maxValue</name>
997 <number>80</number>
998 </property>
999 <property stdset="1">
1000 <name>minValue</name>
1001 <number>2</number>
1002 </property>
1003 <property>
1004 <name>whatsThis</name>
1005 <string>At what battery level should the low power warning pop up</string>
1006 </property>
1007 </widget>
1008 <widget row="0" column="1" >
1009 <class>QSpinBox</class>
1010 <property stdset="1">
1011 <name>name</name>
1012 <cstring>warnintervalBox</cstring>
1013 </property>
1014 <property stdset="1">
1015 <name>suffix</name>
1016 <string> seconds</string>
1017 </property>
1018 <property stdset="1">
1019 <name>maxValue</name>
1020 <number>60</number>
1021 </property>
1022 <property stdset="1">
1023 <name>minValue</name>
1024 <number>5</number>
1025 </property>
1026 <property>
1027 <name>whatsThis</name>
1028 <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string>
1029 </property>
1030 </widget>
1031 <widget row="2" column="1" >
1032 <class>QSpinBox</class>
1033 <property stdset="1">
1034 <name>name</name>
1035 <cstring>criticalSpinBox</cstring>
1036 </property>
1037 <property stdset="1">
1038 <name>prefix</name>
1039 <string></string>
1040 </property>
1041 <property stdset="1">
1042 <name>suffix</name>
1043 <string> %</string>
1044 </property>
1045 <property stdset="1">
1046 <name>maxValue</name>
1047 <number>80</number>
1048 </property>
1049 <property stdset="1">
1050 <name>minValue</name>
1051 <number>2</number>
1052 </property>
1053 <property>
1054 <name>whatsThis</name>
1055 <string>At what battery level should the critical power warning pop up</string>
1056 </property>
1057 </widget>
1058 <widget row="1" column="0" >
1059 <class>QLabel</class>
1060 <property stdset="1">
1061 <name>name</name>
1062 <cstring>TextLabel2</cstring>
1063 </property>
1064 <property stdset="1">
1065 <name>text</name>
1066 <string>very low battery
1067warning at</string>
1068 </property>
1069 </widget>
1070 <widget row="2" column="0" >
355 <class>QLabel</class> 1071 <class>QLabel</class>
356 <property stdset="1"> 1072 <property stdset="1">
357 <name>name</name> 1073 <name>name</name>
358 <cstring>TextLabel3</cstring> 1074 <cstring>TextLabel3</cstring>
359 </property> 1075 </property>
360 <property stdset="1"> 1076 <property stdset="1">
361 <name>sizePolicy</name> 1077 <name>text</name>
362 <sizepolicy> 1078 <string>critical power
363 <hsizetype>5</hsizetype> 1079warning at</string>
364 <vsizetype>7</vsizetype> 1080 </property>
365 </sizepolicy> 1081 </widget>
1082 </grid>
1083 </widget>
1084 </vbox>
1085 </widget>
1086 <widget>
1087 <class>QGroupBox</class>
1088 <property stdset="1">
1089 <name>name</name>
1090 <cstring>LightSensorGroupBox</cstring>
1091 </property>
1092 <property stdset="1">
1093 <name>title</name>
1094 <string>iPAQ Light Sensor (127 steps)</string>
1095 </property>
1096 <property>
1097 <name>layoutMargin</name>
1098 </property>
1099 <property>
1100 <name>layoutSpacing</name>
1101 </property>
1102 <vbox>
1103 <property stdset="1">
1104 <name>margin</name>
1105 <number>3</number>
1106 </property>
1107 <property stdset="1">
1108 <name>spacing</name>
1109 <number>3</number>
1110 </property>
1111 <widget>
1112 <class>QLayoutWidget</class>
1113 <property stdset="1">
1114 <name>name</name>
1115 <cstring>Layout7</cstring>
1116 </property>
1117 <hbox>
1118 <property stdset="1">
1119 <name>margin</name>
1120 <number>0</number>
1121 </property>
1122 <property stdset="1">
1123 <name>spacing</name>
1124 <number>6</number>
1125 </property>
1126 <widget>
1127 <class>QLabel</class>
1128 <property stdset="1">
1129 <name>name</name>
1130 <cstring>TextLabel9</cstring>
1131 </property>
1132 <property stdset="1">
1133 <name>text</name>
1134 <string>Steps</string>
1135 </property>
1136 </widget>
1137 <widget>
1138 <class>QSpinBox</class>
1139 <property stdset="1">
1140 <name>name</name>
1141 <cstring>LightStepSpin</cstring>
1142 </property>
1143 <property stdset="1">
1144 <name>maxValue</name>
1145 <number>126</number>
1146 </property>
1147 <property stdset="1">
1148 <name>minValue</name>
1149 <number>1</number>
1150 </property>
1151 <property>
1152 <name>whatsThis</name>
1153 <string>How many different steps should be handled by the light sensor. Values between 1 and 126 are allowed.</string>
1154 </property>
1155 </widget>
1156 </hbox>
1157 </widget>
1158 <widget>
1159 <class>QLabel</class>
1160 <property stdset="1">
1161 <name>name</name>
1162 <cstring>TextLabel10</cstring>
366 </property> 1163 </property>
367 <property stdset="1"> 1164 <property stdset="1">
368 <name>text</name> 1165 <name>text</name>
369 <string>&lt;blockquote&gt;The brighter the screen light, the more battery power is used.&lt;/blockquote&gt;</string> 1166 <string>Minimum value to turn display on</string>
370 </property> 1167 </property>
371 </widget> 1168 </widget>
372 <widget> 1169 <widget>
@@ -388,7 +1185,41 @@
388 <class>QLabel</class> 1185 <class>QLabel</class>
389 <property stdset="1"> 1186 <property stdset="1">
390 <name>name</name> 1187 <name>name</name>
391 <cstring>PixmapLabel2</cstring> 1188 <cstring>PixmapLabel2_2</cstring>
1189 </property>
1190 <property stdset="1">
1191 <name>pixmap</name>
1192 <pixmap>image0</pixmap>
1193 </property>
1194 <property stdset="1">
1195 <name>scaledContents</name>
1196 <bool>false</bool>
1197 </property>
1198 </widget>
1199 <widget>
1200 <class>QSlider</class>
1201 <property stdset="1">
1202 <name>name</name>
1203 <cstring>LightMinValueSlider</cstring>
1204 </property>
1205 <property stdset="1">
1206 <name>maxValue</name>
1207 <number>127</number>
1208 </property>
1209 <property stdset="1">
1210 <name>orientation</name>
1211 <enum>Horizontal</enum>
1212 </property>
1213 <property stdset="1">
1214 <name>tickmarks</name>
1215 <enum>Right</enum>
1216 </property>
1217 </widget>
1218 <widget>
1219 <class>QLabel</class>
1220 <property stdset="1">
1221 <name>name</name>
1222 <cstring>PixmapLabel1_2</cstring>
392 </property> 1223 </property>
393 <property stdset="1"> 1224 <property stdset="1">
394 <name>pixmap</name> 1225 <name>pixmap</name>
@@ -399,32 +1230,57 @@
399 <bool>false</bool> 1230 <bool>false</bool>
400 </property> 1231 </property>
401 </widget> 1232 </widget>
1233 </hbox>
1234 </widget>
1235 <widget>
1236 <class>QLayoutWidget</class>
1237 <property stdset="1">
1238 <name>name</name>
1239 <cstring>Layout8</cstring>
1240 </property>
1241 <hbox>
1242 <property stdset="1">
1243 <name>margin</name>
1244 <number>0</number>
1245 </property>
1246 <property stdset="1">
1247 <name>spacing</name>
1248 <number>6</number>
1249 </property>
402 <widget> 1250 <widget>
403 <class>QLabel</class> 1251 <class>QLabel</class>
404 <property stdset="1"> 1252 <property stdset="1">
405 <name>name</name> 1253 <name>name</name>
406 <cstring>TextLabel2</cstring> 1254 <cstring>TextLabel11</cstring>
407 </property> 1255 </property>
408 <property stdset="1"> 1256 <property stdset="1">
409 <name>text</name> 1257 <name>text</name>
410 <string>Off</string> 1258 <string>Shift</string>
411 </property> 1259 </property>
1260 </widget>
1261 <widget>
1262 <class>QSpinBox</class>
412 <property stdset="1"> 1263 <property stdset="1">
413 <name>alignment</name> 1264 <name>name</name>
414 <set>AlignVCenter|AlignLeft</set> 1265 <cstring>LightShiftSpin</cstring>
415 </property> 1266 </property>
416 <property> 1267 <property stdset="1">
417 <name>vAlign</name> 1268 <name>maxValue</name>
1269 <number>126</number>
418 </property> 1270 </property>
419 </widget> 1271 </widget>
1272 </hbox>
1273 </widget>
1274 </vbox>
1275 </widget>
420 <spacer> 1276 <spacer>
421 <property> 1277 <property>
422 <name>name</name> 1278 <name>name</name>
423 <cstring>Spacer2</cstring> 1279 <cstring>Spacer1</cstring>
424 </property> 1280 </property>
425 <property stdset="1"> 1281 <property stdset="1">
426 <name>orientation</name> 1282 <name>orientation</name>
427 <enum>Horizontal</enum> 1283 <enum>Vertical</enum>
428 </property> 1284 </property>
429 <property stdset="1"> 1285 <property stdset="1">
430 <name>sizeType</name> 1286 <name>sizeType</name>
@@ -438,21 +1294,22 @@
438 </size> 1294 </size>
439 </property> 1295 </property>
440 </spacer> 1296 </spacer>
441 </hbox>
442 </widget>
443 </vbox> 1297 </vbox>
444 </widget> 1298 </widget>
445 </hbox>
446 </widget> 1299 </widget>
447 </vbox> 1300 </vbox>
448</widget> 1301</widget>
449<images> 1302<images>
450 <image> 1303 <image>
451 <name>image0</name> 1304 <name>image0</name>
452 <data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data> 1305 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b324b364b06719340dcb434b36488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c004336518f</data>
453 </image> 1306 </image>
454 <image> 1307 <image>
455 <name>image1</name> 1308 <name>image1</name>
1309 <data format="XPM.GZ" length="439">789c6d8ec10ac2300c86ef7b8ad0ff36a4730777111f41f1288887b4b3e8610a3a0f22bebb6dd3d54d0ca5cdffe54f9aaaa4dd764d6555dc7beecf96ec896f54b68fae7bee0fab57a1ea86fc5950ad6685d2646973bd1c43ce3ec73c46903648e79a5624443a27d20cd2b9382704747e124382f11a7c5e30b364b957b331866331b3800c38f70282121c7c628367c098c1e0eb03121ccd4b46fcb0f80b26bb4833987f76b6d6f274de5fe6a1a031d30969f55e161fe4715f7b</data>
1310 </image>
1311 <image>
1312 <name>image2</name>
456 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data> 1313 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data>
457 </image> 1314 </image>
458</images> 1315</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 @@
1Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower 1Files: bin/light-and-power apps/Settings/Light.desktop pics/lightandpower
2Priority: optional 2Priority: optional
3Section: opie/settings 3Section: opie/settings
4Maintainer: Warwick Allison <warwick@trolltech.com> 4Maintainer: Maximilian Reiss <harlekin@handhelds.org>
5Architecture: arm 5Architecture: arm
6Version: $QPE_VERSION-$SUB_VERSION 6Version: $QPE_VERSION-$SUB_VERSION
7Depends: opie-base ($QPE_VERSION) 7Depends: 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:
42 42
43private slots: 43private slots:
44 void applyBrightness(); 44 void applyBrightness();
45 void slotSliderTicks( int steps );
45 46
46private: 47private:
47 int initbright; 48 int initbright;
49 int initbright_ac;
48}; 50};
49 51
50 52