author | harlekin <harlekin> | 2002-10-20 16:14:46 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-20 16:14:46 (UTC) |
commit | d3936c24518e9fea48a060eaef02e64a89646657 (patch) (unidiff) | |
tree | 0dc08dc1c757e0d7a2b32d53ed2a56d8b0442fa3 | |
parent | 56ac4499a8e13a58d006b35ea023153df9995f7a (diff) | |
download | opie-d3936c24518e9fea48a060eaef02e64a89646657.zip opie-d3936c24518e9fea48a060eaef02e64a89646657.tar.gz opie-d3936c24518e9fea48a060eaef02e64a89646657.tar.bz2 |
fixed emmited slider values
-rw-r--r-- | core/settings/light-and-power/light.cpp | 17 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 22 | ||||
-rw-r--r-- | core/settings/light-and-power/settings.h | 1 |
3 files changed, 34 insertions, 6 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 8721a95..1a94209 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -79,180 +79,187 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) | |||
79 | 79 | ||
80 | int interval; | 80 | int interval; |
81 | 81 | ||
82 | // battery spinboxes | 82 | // battery spinboxes |
83 | interval = config.readNumEntry( "Interval_Dim", 20 ); | 83 | interval = config.readNumEntry( "Interval_Dim", 20 ); |
84 | interval_dim->setValue( interval ); | 84 | interval_dim->setValue( interval ); |
85 | interval = config.readNumEntry( "Interval_LightOff", 30 ); | 85 | interval = config.readNumEntry( "Interval_LightOff", 30 ); |
86 | interval_lightoff->setValue( interval ); | 86 | interval_lightoff->setValue( interval ); |
87 | interval = config.readNumEntry( "Interval", 60 ); | 87 | interval = config.readNumEntry( "Interval", 60 ); |
88 | if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs) | 88 | if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs) |
89 | interval_suspend->setValue( interval ); | 89 | interval_suspend->setValue( interval ); |
90 | 90 | ||
91 | // ac spinboxes | 91 | // ac spinboxes |
92 | interval = config.readNumEntry( "Interval_DimAC", 20 ); | 92 | interval = config.readNumEntry( "Interval_DimAC", 20 ); |
93 | interval_dim_ac_3->setValue( interval ); | 93 | interval_dim_ac_3->setValue( interval ); |
94 | interval = config.readNumEntry( "Interval_LightOffAC", 30 ); | 94 | interval = config.readNumEntry( "Interval_LightOffAC", 30 ); |
95 | interval_lightoff_ac_3->setValue( interval ); | 95 | interval_lightoff_ac_3->setValue( interval ); |
96 | interval = config.readNumEntry( "IntervalAC", 60 ); | 96 | interval = config.readNumEntry( "IntervalAC", 60 ); |
97 | if ( interval > 3600 ) { | 97 | if ( interval > 3600 ) { |
98 | interval /= 1000; // compatibility (was millisecs) | 98 | interval /= 1000; // compatibility (was millisecs) |
99 | } | 99 | } |
100 | interval_suspend_ac_3->setValue( interval ); | 100 | interval_suspend_ac_3->setValue( interval ); |
101 | 101 | ||
102 | 102 | ||
103 | // battery check and slider | 103 | // battery check and slider |
104 | screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 ); | 104 | screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 ); |
105 | screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 ); | 105 | screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 ); |
106 | LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 ); | 106 | LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 ); |
107 | int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( ); | 107 | int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( ); |
108 | initbright = config.readNumEntry("Brightness",255); | 108 | initbright = config.readNumEntry("Brightness",255); |
109 | brightness->setMaxValue( maxbright ); | 109 | brightness->setMaxValue( maxbright ); |
110 | brightness->setTickInterval( QMAX(1,maxbright/16) ); | 110 | brightness->setTickInterval( QMAX(1,maxbright/16) ); |
111 | brightness->setLineStep( QMAX(1,maxbright/16) ); | 111 | brightness->setLineStep( QMAX(1,maxbright/16) ); |
112 | brightness->setPageStep( QMAX(1,maxbright/16) ); | 112 | brightness->setPageStep( QMAX(1,maxbright/16) ); |
113 | brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); | 113 | brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); |
114 | 114 | ||
115 | // ac check and slider | 115 | // ac check and slider |
116 | screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 ); | 116 | screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 ); |
117 | screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 ); | 117 | screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 ); |
118 | LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 ); | 118 | LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 ); |
119 | int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); | 119 | int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); |
120 | initbright_ac = config.readNumEntry("BrightnessAC",255); | 120 | initbright_ac = config.readNumEntry("BrightnessAC",255); |
121 | brightness_ac_3->setMaxValue( maxbright_ac ); | 121 | brightness_ac_3->setMaxValue( maxbright_ac ); |
122 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); | 122 | brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); |
123 | brightness_ac_3->setLineStep( 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) ); | 124 | brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); |
125 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); | 125 | brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); |
126 | 126 | ||
127 | // advanced settings | 127 | // advanced settings |
128 | config.setGroup( "APM" ); | 128 | config.setGroup( "APM" ); |
129 | warnintervalBox->setValue( config.readNumEntry("check_interval", 10000)/1000 ); | 129 | warnintervalBox->setValue( config.readNumEntry("check_interval", 10000)/1000 ); |
130 | lowSpinBox->setValue( config.readNumEntry("power_verylow", 10 ) ); | 130 | lowSpinBox->setValue( config.readNumEntry("power_verylow", 10 ) ); |
131 | criticalSpinBox->setValue( config.readNumEntry("power_critical", 5 ) ); | 131 | criticalSpinBox->setValue( config.readNumEntry("power_critical", 5 ) ); |
132 | 132 | ||
133 | // ipaq sensor | 133 | // ipaq sensor |
134 | config.setGroup( "Ipaq_light_sensor" ); | 134 | config.setGroup( "Ipaq_light_sensor" ); |
135 | auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); | 135 | auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); |
136 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); | 136 | auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); |
137 | LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); | 137 | LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); |
138 | LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); | 138 | LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); |
139 | connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; | 139 | connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; |
140 | LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); | 140 | LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); |
141 | 141 | ||
142 | 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())); | 143 | connect(brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) ); |
144 | } | 144 | } |
145 | 145 | ||
146 | LightSettings::~LightSettings() | 146 | LightSettings::~LightSettings() |
147 | { | 147 | { |
148 | } | 148 | } |
149 | 149 | ||
150 | void LightSettings::slotSliderTicks( int steps ) { | 150 | void LightSettings::slotSliderTicks( int steps ) { |
151 | LightMinValueSlider->setTickInterval( steps ); | 151 | LightMinValueSlider->setTickInterval( steps ); |
152 | } | 152 | } |
153 | 153 | ||
154 | static void set_fl(int bright) | 154 | static void set_fl(int bright) |
155 | { | 155 | { |
156 | qDebug( QString("BRIGHT !! : %1").arg( bright ) ); | ||
156 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 157 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
157 | e << bright; | 158 | e << bright; |
158 | } | 159 | } |
159 | 160 | ||
160 | void LightSettings::reject() | 161 | void LightSettings::reject() |
161 | { | 162 | { |
162 | set_fl(initbright); | 163 | set_fl(initbright); |
163 | 164 | ||
164 | QDialog::reject(); | 165 | QDialog::reject(); |
165 | } | 166 | } |
166 | 167 | ||
167 | void LightSettings::accept() | 168 | void LightSettings::accept() |
168 | { | 169 | { |
169 | if ( qApp->focusWidget() ) | 170 | if ( qApp->focusWidget() ) |
170 | qApp->focusWidget()->clearFocus(); | 171 | qApp->focusWidget()->clearFocus(); |
171 | 172 | ||
172 | applyBrightness(); | 173 | applyBrightness(); |
173 | 174 | ||
174 | // bat | 175 | // bat |
175 | int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0); | 176 | int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0); |
176 | int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0); | 177 | int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0); |
177 | int i_suspend = interval_suspend->value(); | 178 | int i_suspend = interval_suspend->value(); |
178 | QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" ); | 179 | QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" ); |
179 | e << i_dim << i_lightoff << i_suspend; | 180 | e << i_dim << i_lightoff << i_suspend; |
180 | 181 | ||
181 | // ac | 182 | // ac |
182 | int i_dim_ac = (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0); | 183 | 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_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0); |
184 | int i_suspend_ac = interval_suspend_ac_3->value(); | 185 | int i_suspend_ac = interval_suspend_ac_3->value(); |
185 | QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" ); | 186 | QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" ); |
186 | e << i_dim_ac << i_lightoff_ac << i_suspend_ac; | 187 | e << i_dim_ac << i_lightoff_ac << i_suspend_ac; |
187 | 188 | ||
188 | Config config( "qpe" ); | 189 | Config config( "qpe" ); |
189 | config.setGroup( "Screensaver" ); | 190 | config.setGroup( "Screensaver" ); |
190 | 191 | ||
191 | // bat | 192 | // bat |
192 | config.writeEntry( "Dim", (int)screensaver_dim->isChecked() ); | 193 | config.writeEntry( "Dim", (int)screensaver_dim->isChecked() ); |
193 | config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() ); | 194 | config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() ); |
194 | config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() ); | 195 | config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() ); |
195 | config.writeEntry( "Interval_Dim", interval_dim->value() ); | 196 | config.writeEntry( "Interval_Dim", interval_dim->value() ); |
196 | config.writeEntry( "Interval_LightOff", interval_lightoff->value() ); | 197 | config.writeEntry( "Interval_LightOff", interval_lightoff->value() ); |
197 | config.writeEntry( "Interval", interval_suspend->value() ); | 198 | config.writeEntry( "Interval", interval_suspend->value() ); |
198 | config.writeEntry( "Brightness", | 199 | config.writeEntry( "Brightness", |
199 | (brightness->maxValue()-brightness->value())*255/brightness->maxValue() ); | 200 | (brightness->maxValue()-brightness->value())*255/brightness->maxValue() ); |
200 | 201 | ||
201 | // ac | 202 | // ac |
202 | config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() ); | 203 | config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() ); |
203 | config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); | 204 | config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); |
204 | config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); | 205 | config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); |
205 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); | 206 | config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); |
206 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); | 207 | config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); |
207 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); | 208 | config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); |
208 | config.writeEntry( "BrightnessAC", | 209 | config.writeEntry( "BrightnessAC", |
209 | (brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() ); | 210 | (brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() ); |
210 | 211 | ||
211 | // advanced | 212 | // advanced |
212 | config.setGroup( "APM" ); | 213 | config.setGroup( "APM" ); |
213 | config.writeEntry( "check_interval", warnintervalBox->value()*1000 ); | 214 | config.writeEntry( "check_interval", warnintervalBox->value()*1000 ); |
214 | config.writeEntry( "power_verylow", lowSpinBox->value() ); | 215 | config.writeEntry( "power_verylow", lowSpinBox->value() ); |
215 | config.writeEntry( "power_critical", criticalSpinBox->value() ); | 216 | config.writeEntry( "power_critical", criticalSpinBox->value() ); |
216 | QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); | 217 | QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); |
217 | 218 | ||
218 | 219 | ||
219 | // only make ipaq light sensor entries in config file if on an ipaq | 220 | // only make ipaq light sensor entries in config file if on an ipaq |
220 | if ( ODevice::inst()->model() == Model_iPAQ_H31xx || | 221 | if ( ODevice::inst()->model() == Model_iPAQ_H31xx || |
221 | ODevice::inst()->model() == Model_iPAQ_H36xx || | 222 | ODevice::inst()->model() == Model_iPAQ_H36xx || |
222 | ODevice::inst()->model() == Model_iPAQ_H37xx || | 223 | ODevice::inst()->model() == Model_iPAQ_H37xx || |
223 | ODevice::inst()->model() == Model_iPAQ_H38xx ) { | 224 | ODevice::inst()->model() == Model_iPAQ_H38xx ) { |
224 | 225 | ||
225 | // ipaq sensor | 226 | // ipaq sensor |
226 | config.setGroup( "Ipaq_light_sensor" ); | 227 | config.setGroup( "Ipaq_light_sensor" ); |
227 | 228 | ||
228 | config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); | 229 | config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); |
229 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); | 230 | config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); |
230 | config.writeEntry( "Steps", LightStepSpin->value() ); | 231 | config.writeEntry( "Steps", LightStepSpin->value() ); |
231 | config.writeEntry( "MinValue", LightMinValueSlider->value() ); | 232 | config.writeEntry( "MinValue", LightMinValueSlider->value() ); |
232 | config.writeEntry( "Shift", LightShiftSpin->value() ); | 233 | config.writeEntry( "Shift", LightShiftSpin->value() ); |
233 | } | 234 | } |
234 | 235 | ||
235 | config.write(); | 236 | config.write(); |
236 | 237 | ||
237 | QDialog::accept(); | 238 | QDialog::accept(); |
238 | } | 239 | } |
239 | 240 | ||
240 | void LightSettings::applyBrightness() | 241 | void LightSettings::applyBrightness() |
241 | { | 242 | { |
243 | if ( !PowerStatus::Online ) { | ||
244 | int bright = ( brightness->value() ) * 255 / brightness->maxValue(); | ||
245 | set_fl(bright); | ||
246 | } | ||
247 | } | ||
248 | |||
249 | void LightSettings::applyBrightnessAC() | ||
250 | { | ||
251 | qDebug( QString("SLIDER : %1").arg( brightness_ac_3->value() ) ); | ||
242 | // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting | 252 | // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting |
243 | if ( PowerStatus::Online ) { | 253 | if ( PowerStatus::Online ) { |
244 | int bright = (brightness_ac_3->maxValue() - brightness_ac_3->value())*255 / brightness_ac_3->maxValue(); | 254 | int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue(); |
245 | set_fl(bright); | ||
246 | } else { | ||
247 | int bright = (brightness->maxValue()-brightness->value())*255 / brightness->maxValue(); | ||
248 | set_fl(bright); | 255 | set_fl(bright); |
249 | } | 256 | } |
250 | } | 257 | } |
251 | 258 | ||
252 | 259 | ||
253 | 260 | ||
254 | void LightSettings::done(int r) | 261 | void LightSettings::done(int r) |
255 | { | 262 | { |
256 | QDialog::done(r); | 263 | QDialog::done(r); |
257 | close ( ); | 264 | close ( ); |
258 | } | 265 | } |
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index fd85017..5e62626 100644 --- a/core/settings/light-and-power/lightsettingsbase.ui +++ b/core/settings/light-and-power/lightsettingsbase.ui | |||
@@ -1,78 +1,78 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>LightSettingsBase</class> | 2 | <class>LightSettingsBase</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QDialog</class> | 4 | <class>QDialog</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>LightSettingsBase</cstring> | 7 | <cstring>LightSettingsBase</cstring> |
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>419</width> | 14 | <width>415</width> |
15 | <height>532</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"> | 22 | <property stdset="1"> |
23 | <name>sizeGripEnabled</name> | 23 | <name>sizeGripEnabled</name> |
24 | <bool>false</bool> | 24 | <bool>false</bool> |
25 | </property> | 25 | </property> |
26 | <property> | 26 | <property> |
27 | <name>layoutMargin</name> | 27 | <name>layoutMargin</name> |
28 | </property> | 28 | </property> |
29 | <property> | 29 | <property> |
30 | <name>layoutSpacing</name> | 30 | <name>layoutSpacing</name> |
31 | </property> | 31 | </property> |
32 | <vbox> | 32 | <vbox> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>margin</name> | 34 | <name>margin</name> |
35 | <number>3</number> | 35 | <number>3</number> |
36 | </property> | 36 | </property> |
37 | <property stdset="1"> | 37 | <property stdset="1"> |
38 | <name>spacing</name> | 38 | <name>spacing</name> |
39 | <number>3</number> | 39 | <number>3</number> |
40 | </property> | 40 | </property> |
41 | <widget> | 41 | <widget> |
42 | <class>QTabWidget</class> | 42 | <class>QTabWidget</class> |
43 | <property stdset="1"> | 43 | <property stdset="1"> |
44 | <name>name</name> | 44 | <name>name</name> |
45 | <cstring>TabWidget3</cstring> | 45 | <cstring>TabWidget3</cstring> |
46 | </property> | 46 | </property> |
47 | <property> | 47 | <property> |
48 | <name>layoutMargin</name> | 48 | <name>layoutMargin</name> |
49 | </property> | 49 | </property> |
50 | <property> | 50 | <property> |
51 | <name>layoutSpacing</name> | 51 | <name>layoutSpacing</name> |
52 | </property> | 52 | </property> |
53 | <widget> | 53 | <widget> |
54 | <class>QWidget</class> | 54 | <class>QWidget</class> |
55 | <property stdset="1"> | 55 | <property stdset="1"> |
56 | <name>name</name> | 56 | <name>name</name> |
57 | <cstring>tab</cstring> | 57 | <cstring>tab</cstring> |
58 | </property> | 58 | </property> |
59 | <attribute> | 59 | <attribute> |
60 | <name>title</name> | 60 | <name>title</name> |
61 | <string>on Battery</string> | 61 | <string>on Battery</string> |
62 | </attribute> | 62 | </attribute> |
63 | <vbox> | 63 | <vbox> |
64 | <property stdset="1"> | 64 | <property stdset="1"> |
65 | <name>margin</name> | 65 | <name>margin</name> |
66 | <number>3</number> | 66 | <number>3</number> |
67 | </property> | 67 | </property> |
68 | <property stdset="1"> | 68 | <property stdset="1"> |
69 | <name>spacing</name> | 69 | <name>spacing</name> |
70 | <number>3</number> | 70 | <number>3</number> |
71 | </property> | 71 | </property> |
72 | <widget> | 72 | <widget> |
73 | <class>QGroupBox</class> | 73 | <class>QGroupBox</class> |
74 | <property stdset="1"> | 74 | <property stdset="1"> |
75 | <name>name</name> | 75 | <name>name</name> |
76 | <cstring>GroupBox3</cstring> | 76 | <cstring>GroupBox3</cstring> |
77 | </property> | 77 | </property> |
78 | <property stdset="1"> | 78 | <property stdset="1"> |
@@ -247,128 +247,132 @@ | |||
247 | <property stdset="1"> | 247 | <property stdset="1"> |
248 | <name>text</name> | 248 | <name>text</name> |
249 | <string>Suspend after</string> | 249 | <string>Suspend after</string> |
250 | </property> | 250 | </property> |
251 | </widget> | 251 | </widget> |
252 | </grid> | 252 | </grid> |
253 | </widget> | 253 | </widget> |
254 | <widget> | 254 | <widget> |
255 | <class>QCheckBox</class> | 255 | <class>QCheckBox</class> |
256 | <property stdset="1"> | 256 | <property stdset="1"> |
257 | <name>name</name> | 257 | <name>name</name> |
258 | <cstring>LcdOffOnly</cstring> | 258 | <cstring>LcdOffOnly</cstring> |
259 | </property> | 259 | </property> |
260 | <property stdset="1"> | 260 | <property stdset="1"> |
261 | <name>text</name> | 261 | <name>text</name> |
262 | <string>Deactivate LCD only (does not suspend)</string> | 262 | <string>Deactivate LCD only (does not suspend)</string> |
263 | </property> | 263 | </property> |
264 | </widget> | 264 | </widget> |
265 | </vbox> | 265 | </vbox> |
266 | </widget> | 266 | </widget> |
267 | <widget> | 267 | <widget> |
268 | <class>QGroupBox</class> | 268 | <class>QGroupBox</class> |
269 | <property stdset="1"> | 269 | <property stdset="1"> |
270 | <name>name</name> | 270 | <name>name</name> |
271 | <cstring>GroupBox9</cstring> | 271 | <cstring>GroupBox9</cstring> |
272 | </property> | 272 | </property> |
273 | <property stdset="1"> | 273 | <property stdset="1"> |
274 | <name>title</name> | 274 | <name>title</name> |
275 | <string>Backlight</string> | 275 | <string>Backlight</string> |
276 | </property> | 276 | </property> |
277 | <property> | 277 | <property> |
278 | <name>layoutMargin</name> | 278 | <name>layoutMargin</name> |
279 | </property> | 279 | </property> |
280 | <property> | 280 | <property> |
281 | <name>layoutSpacing</name> | 281 | <name>layoutSpacing</name> |
282 | </property> | 282 | </property> |
283 | <vbox> | 283 | <vbox> |
284 | <property stdset="1"> | 284 | <property stdset="1"> |
285 | <name>margin</name> | 285 | <name>margin</name> |
286 | <number>3</number> | 286 | <number>3</number> |
287 | </property> | 287 | </property> |
288 | <property stdset="1"> | 288 | <property stdset="1"> |
289 | <name>spacing</name> | 289 | <name>spacing</name> |
290 | <number>3</number> | 290 | <number>3</number> |
291 | </property> | 291 | </property> |
292 | <widget> | 292 | <widget> |
293 | <class>QSlider</class> | 293 | <class>QSlider</class> |
294 | <property stdset="1"> | 294 | <property stdset="1"> |
295 | <name>name</name> | 295 | <name>name</name> |
296 | <cstring>brightness</cstring> | 296 | <cstring>brightness</cstring> |
297 | </property> | 297 | </property> |
298 | <property stdset="1"> | 298 | <property stdset="1"> |
299 | <name>maxValue</name> | 299 | <name>maxValue</name> |
300 | <number>255</number> | 300 | <number>255</number> |
301 | </property> | 301 | </property> |
302 | <property stdset="1"> | 302 | <property stdset="1"> |
303 | <name>lineStep</name> | 303 | <name>lineStep</name> |
304 | <number>16</number> | 304 | <number>16</number> |
305 | </property> | 305 | </property> |
306 | <property stdset="1"> | 306 | <property stdset="1"> |
307 | <name>pageStep</name> | 307 | <name>pageStep</name> |
308 | <number>16</number> | 308 | <number>16</number> |
309 | </property> | 309 | </property> |
310 | <property stdset="1"> | 310 | <property stdset="1"> |
311 | <name>tracking</name> | ||
312 | <bool>true</bool> | ||
313 | </property> | ||
314 | <property stdset="1"> | ||
311 | <name>orientation</name> | 315 | <name>orientation</name> |
312 | <enum>Horizontal</enum> | 316 | <enum>Horizontal</enum> |
313 | </property> | 317 | </property> |
314 | <property stdset="1"> | 318 | <property stdset="1"> |
315 | <name>tickmarks</name> | 319 | <name>tickmarks</name> |
316 | <enum>Right</enum> | 320 | <enum>Right</enum> |
317 | </property> | 321 | </property> |
318 | <property stdset="1"> | 322 | <property stdset="1"> |
319 | <name>tickInterval</name> | 323 | <name>tickInterval</name> |
320 | <number>32</number> | 324 | <number>32</number> |
321 | </property> | 325 | </property> |
322 | </widget> | 326 | </widget> |
323 | <widget> | 327 | <widget> |
324 | <class>QLayoutWidget</class> | 328 | <class>QLayoutWidget</class> |
325 | <property stdset="1"> | 329 | <property stdset="1"> |
326 | <name>name</name> | 330 | <name>name</name> |
327 | <cstring>Layout10</cstring> | 331 | <cstring>Layout10</cstring> |
328 | </property> | 332 | </property> |
329 | <hbox> | 333 | <hbox> |
330 | <property stdset="1"> | 334 | <property stdset="1"> |
331 | <name>margin</name> | 335 | <name>margin</name> |
332 | <number>0</number> | 336 | <number>0</number> |
333 | </property> | 337 | </property> |
334 | <property stdset="1"> | 338 | <property stdset="1"> |
335 | <name>spacing</name> | 339 | <name>spacing</name> |
336 | <number>6</number> | 340 | <number>6</number> |
337 | </property> | 341 | </property> |
338 | <widget> | 342 | <widget> |
339 | <class>QLabel</class> | 343 | <class>QLabel</class> |
340 | <property stdset="1"> | 344 | <property stdset="1"> |
341 | <name>name</name> | 345 | <name>name</name> |
342 | <cstring>PixmapLabel2</cstring> | 346 | <cstring>PixmapLabel2</cstring> |
343 | </property> | 347 | </property> |
344 | <property stdset="1"> | 348 | <property stdset="1"> |
345 | <name>pixmap</name> | 349 | <name>pixmap</name> |
346 | <pixmap>image0</pixmap> | 350 | <pixmap>image0</pixmap> |
347 | </property> | 351 | </property> |
348 | <property stdset="1"> | 352 | <property stdset="1"> |
349 | <name>scaledContents</name> | 353 | <name>scaledContents</name> |
350 | <bool>false</bool> | 354 | <bool>false</bool> |
351 | </property> | 355 | </property> |
352 | </widget> | 356 | </widget> |
353 | <widget> | 357 | <widget> |
354 | <class>QLabel</class> | 358 | <class>QLabel</class> |
355 | <property stdset="1"> | 359 | <property stdset="1"> |
356 | <name>name</name> | 360 | <name>name</name> |
357 | <cstring>TextLabel4</cstring> | 361 | <cstring>TextLabel4</cstring> |
358 | </property> | 362 | </property> |
359 | <property stdset="1"> | 363 | <property stdset="1"> |
360 | <name>text</name> | 364 | <name>text</name> |
361 | <string>Off</string> | 365 | <string>Off</string> |
362 | </property> | 366 | </property> |
363 | </widget> | 367 | </widget> |
364 | <spacer> | 368 | <spacer> |
365 | <property> | 369 | <property> |
366 | <name>name</name> | 370 | <name>name</name> |
367 | <cstring>Spacer2</cstring> | 371 | <cstring>Spacer2</cstring> |
368 | </property> | 372 | </property> |
369 | <property stdset="1"> | 373 | <property stdset="1"> |
370 | <name>orientation</name> | 374 | <name>orientation</name> |
371 | <enum>Horizontal</enum> | 375 | <enum>Horizontal</enum> |
372 | </property> | 376 | </property> |
373 | <property stdset="1"> | 377 | <property stdset="1"> |
374 | <name>sizeType</name> | 378 | <name>sizeType</name> |
@@ -662,140 +666,152 @@ | |||
662 | </property> | 666 | </property> |
663 | <property stdset="1"> | 667 | <property stdset="1"> |
664 | <name>sizePolicy</name> | 668 | <name>sizePolicy</name> |
665 | <sizepolicy> | 669 | <sizepolicy> |
666 | <hsizetype>1</hsizetype> | 670 | <hsizetype>1</hsizetype> |
667 | <vsizetype>0</vsizetype> | 671 | <vsizetype>0</vsizetype> |
668 | </sizepolicy> | 672 | </sizepolicy> |
669 | </property> | 673 | </property> |
670 | <property stdset="1"> | 674 | <property stdset="1"> |
671 | <name>text</name> | 675 | <name>text</name> |
672 | <string>Dim light after</string> | 676 | <string>Dim light after</string> |
673 | </property> | 677 | </property> |
674 | <property stdset="1"> | 678 | <property stdset="1"> |
675 | <name>checked</name> | 679 | <name>checked</name> |
676 | <bool>true</bool> | 680 | <bool>true</bool> |
677 | </property> | 681 | </property> |
678 | </widget> | 682 | </widget> |
679 | </grid> | 683 | </grid> |
680 | </widget> | 684 | </widget> |
681 | <widget> | 685 | <widget> |
682 | <class>QCheckBox</class> | 686 | <class>QCheckBox</class> |
683 | <property stdset="1"> | 687 | <property stdset="1"> |
684 | <name>name</name> | 688 | <name>name</name> |
685 | <cstring>LcdOffOnly_2_3</cstring> | 689 | <cstring>LcdOffOnly_2_3</cstring> |
686 | </property> | 690 | </property> |
687 | <property stdset="1"> | 691 | <property stdset="1"> |
688 | <name>text</name> | 692 | <name>text</name> |
689 | <string>Deactivate LCD only (does not suspend)</string> | 693 | <string>Deactivate LCD only (does not suspend)</string> |
690 | </property> | 694 | </property> |
691 | </widget> | 695 | </widget> |
692 | </vbox> | 696 | </vbox> |
693 | </widget> | 697 | </widget> |
694 | <widget> | 698 | <widget> |
695 | <class>QGroupBox</class> | 699 | <class>QGroupBox</class> |
696 | <property stdset="1"> | 700 | <property stdset="1"> |
697 | <name>name</name> | 701 | <name>name</name> |
698 | <cstring>GroupBox8</cstring> | 702 | <cstring>GroupBox8</cstring> |
699 | </property> | 703 | </property> |
700 | <property stdset="1"> | 704 | <property stdset="1"> |
701 | <name>title</name> | 705 | <name>title</name> |
702 | <string>Backlight</string> | 706 | <string>Backlight</string> |
703 | </property> | 707 | </property> |
704 | <property> | 708 | <property> |
705 | <name>layoutMargin</name> | 709 | <name>layoutMargin</name> |
706 | </property> | 710 | </property> |
707 | <property> | 711 | <property> |
708 | <name>layoutSpacing</name> | 712 | <name>layoutSpacing</name> |
709 | </property> | 713 | </property> |
710 | <vbox> | 714 | <vbox> |
711 | <property stdset="1"> | 715 | <property stdset="1"> |
712 | <name>margin</name> | 716 | <name>margin</name> |
713 | <number>3</number> | 717 | <number>3</number> |
714 | </property> | 718 | </property> |
715 | <property stdset="1"> | 719 | <property stdset="1"> |
716 | <name>spacing</name> | 720 | <name>spacing</name> |
717 | <number>3</number> | 721 | <number>3</number> |
718 | </property> | 722 | </property> |
719 | <widget> | 723 | <widget> |
720 | <class>QSlider</class> | 724 | <class>QSlider</class> |
721 | <property stdset="1"> | 725 | <property stdset="1"> |
722 | <name>name</name> | 726 | <name>name</name> |
723 | <cstring>brightness_ac_3</cstring> | 727 | <cstring>brightness_ac_3</cstring> |
724 | </property> | 728 | </property> |
725 | <property stdset="1"> | 729 | <property stdset="1"> |
730 | <name>minValue</name> | ||
731 | <number>0</number> | ||
732 | </property> | ||
733 | <property stdset="1"> | ||
726 | <name>maxValue</name> | 734 | <name>maxValue</name> |
727 | <number>255</number> | 735 | <number>255</number> |
728 | </property> | 736 | </property> |
729 | <property stdset="1"> | 737 | <property stdset="1"> |
730 | <name>lineStep</name> | 738 | <name>lineStep</name> |
731 | <number>16</number> | 739 | <number>16</number> |
732 | </property> | 740 | </property> |
733 | <property stdset="1"> | 741 | <property stdset="1"> |
734 | <name>pageStep</name> | 742 | <name>pageStep</name> |
735 | <number>16</number> | 743 | <number>16</number> |
736 | </property> | 744 | </property> |
737 | <property stdset="1"> | 745 | <property stdset="1"> |
746 | <name>value</name> | ||
747 | <number>255</number> | ||
748 | </property> | ||
749 | <property stdset="1"> | ||
750 | <name>tracking</name> | ||
751 | <bool>true</bool> | ||
752 | </property> | ||
753 | <property stdset="1"> | ||
738 | <name>orientation</name> | 754 | <name>orientation</name> |
739 | <enum>Horizontal</enum> | 755 | <enum>Horizontal</enum> |
740 | </property> | 756 | </property> |
741 | <property stdset="1"> | 757 | <property stdset="1"> |
742 | <name>tickmarks</name> | 758 | <name>tickmarks</name> |
743 | <enum>Right</enum> | 759 | <enum>Right</enum> |
744 | </property> | 760 | </property> |
745 | <property stdset="1"> | 761 | <property stdset="1"> |
746 | <name>tickInterval</name> | 762 | <name>tickInterval</name> |
747 | <number>32</number> | 763 | <number>32</number> |
748 | </property> | 764 | </property> |
749 | </widget> | 765 | </widget> |
750 | <widget> | 766 | <widget> |
751 | <class>QLayoutWidget</class> | 767 | <class>QLayoutWidget</class> |
752 | <property stdset="1"> | 768 | <property stdset="1"> |
753 | <name>name</name> | 769 | <name>name</name> |
754 | <cstring>Layout20</cstring> | 770 | <cstring>Layout20</cstring> |
755 | </property> | 771 | </property> |
756 | <hbox> | 772 | <hbox> |
757 | <property stdset="1"> | 773 | <property stdset="1"> |
758 | <name>margin</name> | 774 | <name>margin</name> |
759 | <number>0</number> | 775 | <number>0</number> |
760 | </property> | 776 | </property> |
761 | <property stdset="1"> | 777 | <property stdset="1"> |
762 | <name>spacing</name> | 778 | <name>spacing</name> |
763 | <number>6</number> | 779 | <number>6</number> |
764 | </property> | 780 | </property> |
765 | <widget> | 781 | <widget> |
766 | <class>QLabel</class> | 782 | <class>QLabel</class> |
767 | <property stdset="1"> | 783 | <property stdset="1"> |
768 | <name>name</name> | 784 | <name>name</name> |
769 | <cstring>PixmapLabel2_2_3</cstring> | 785 | <cstring>PixmapLabel2_2_3</cstring> |
770 | </property> | 786 | </property> |
771 | <property stdset="1"> | 787 | <property stdset="1"> |
772 | <name>pixmap</name> | 788 | <name>pixmap</name> |
773 | <pixmap>image2</pixmap> | 789 | <pixmap>image2</pixmap> |
774 | </property> | 790 | </property> |
775 | <property stdset="1"> | 791 | <property stdset="1"> |
776 | <name>scaledContents</name> | 792 | <name>scaledContents</name> |
777 | <bool>false</bool> | 793 | <bool>false</bool> |
778 | </property> | 794 | </property> |
779 | </widget> | 795 | </widget> |
780 | <widget> | 796 | <widget> |
781 | <class>QLabel</class> | 797 | <class>QLabel</class> |
782 | <property stdset="1"> | 798 | <property stdset="1"> |
783 | <name>name</name> | 799 | <name>name</name> |
784 | <cstring>TextLabel6</cstring> | 800 | <cstring>TextLabel6</cstring> |
785 | </property> | 801 | </property> |
786 | <property stdset="1"> | 802 | <property stdset="1"> |
787 | <name>text</name> | 803 | <name>text</name> |
788 | <string>Off</string> | 804 | <string>Off</string> |
789 | </property> | 805 | </property> |
790 | </widget> | 806 | </widget> |
791 | <spacer> | 807 | <spacer> |
792 | <property> | 808 | <property> |
793 | <name>name</name> | 809 | <name>name</name> |
794 | <cstring>Spacer3</cstring> | 810 | <cstring>Spacer3</cstring> |
795 | </property> | 811 | </property> |
796 | <property stdset="1"> | 812 | <property stdset="1"> |
797 | <name>orientation</name> | 813 | <name>orientation</name> |
798 | <enum>Horizontal</enum> | 814 | <enum>Horizontal</enum> |
799 | </property> | 815 | </property> |
800 | <property stdset="1"> | 816 | <property stdset="1"> |
801 | <name>sizeType</name> | 817 | <name>sizeType</name> |
@@ -1146,128 +1162,132 @@ warning at</string> | |||
1146 | </property> | 1162 | </property> |
1147 | <property stdset="1"> | 1163 | <property stdset="1"> |
1148 | <name>minValue</name> | 1164 | <name>minValue</name> |
1149 | <number>1</number> | 1165 | <number>1</number> |
1150 | </property> | 1166 | </property> |
1151 | <property> | 1167 | <property> |
1152 | <name>whatsThis</name> | 1168 | <name>whatsThis</name> |
1153 | <string>How many different steps should be handled by the light sensor. Values between 1 and 126 are allowed.</string> | 1169 | <string>How many different steps should be handled by the light sensor. Values between 1 and 126 are allowed.</string> |
1154 | </property> | 1170 | </property> |
1155 | </widget> | 1171 | </widget> |
1156 | </hbox> | 1172 | </hbox> |
1157 | </widget> | 1173 | </widget> |
1158 | <widget> | 1174 | <widget> |
1159 | <class>QLabel</class> | 1175 | <class>QLabel</class> |
1160 | <property stdset="1"> | 1176 | <property stdset="1"> |
1161 | <name>name</name> | 1177 | <name>name</name> |
1162 | <cstring>TextLabel10</cstring> | 1178 | <cstring>TextLabel10</cstring> |
1163 | </property> | 1179 | </property> |
1164 | <property stdset="1"> | 1180 | <property stdset="1"> |
1165 | <name>text</name> | 1181 | <name>text</name> |
1166 | <string>Minimum value to turn display on</string> | 1182 | <string>Minimum value to turn display on</string> |
1167 | </property> | 1183 | </property> |
1168 | </widget> | 1184 | </widget> |
1169 | <widget> | 1185 | <widget> |
1170 | <class>QLayoutWidget</class> | 1186 | <class>QLayoutWidget</class> |
1171 | <property stdset="1"> | 1187 | <property stdset="1"> |
1172 | <name>name</name> | 1188 | <name>name</name> |
1173 | <cstring>Layout9</cstring> | 1189 | <cstring>Layout9</cstring> |
1174 | </property> | 1190 | </property> |
1175 | <hbox> | 1191 | <hbox> |
1176 | <property stdset="1"> | 1192 | <property stdset="1"> |
1177 | <name>margin</name> | 1193 | <name>margin</name> |
1178 | <number>0</number> | 1194 | <number>0</number> |
1179 | </property> | 1195 | </property> |
1180 | <property stdset="1"> | 1196 | <property stdset="1"> |
1181 | <name>spacing</name> | 1197 | <name>spacing</name> |
1182 | <number>6</number> | 1198 | <number>6</number> |
1183 | </property> | 1199 | </property> |
1184 | <widget> | 1200 | <widget> |
1185 | <class>QLabel</class> | 1201 | <class>QLabel</class> |
1186 | <property stdset="1"> | 1202 | <property stdset="1"> |
1187 | <name>name</name> | 1203 | <name>name</name> |
1188 | <cstring>PixmapLabel2_2</cstring> | 1204 | <cstring>PixmapLabel2_2</cstring> |
1189 | </property> | 1205 | </property> |
1190 | <property stdset="1"> | 1206 | <property stdset="1"> |
1191 | <name>pixmap</name> | 1207 | <name>pixmap</name> |
1192 | <pixmap>image0</pixmap> | 1208 | <pixmap>image0</pixmap> |
1193 | </property> | 1209 | </property> |
1194 | <property stdset="1"> | 1210 | <property stdset="1"> |
1195 | <name>scaledContents</name> | 1211 | <name>scaledContents</name> |
1196 | <bool>false</bool> | 1212 | <bool>false</bool> |
1197 | </property> | 1213 | </property> |
1198 | </widget> | 1214 | </widget> |
1199 | <widget> | 1215 | <widget> |
1200 | <class>QSlider</class> | 1216 | <class>QSlider</class> |
1201 | <property stdset="1"> | 1217 | <property stdset="1"> |
1202 | <name>name</name> | 1218 | <name>name</name> |
1203 | <cstring>LightMinValueSlider</cstring> | 1219 | <cstring>LightMinValueSlider</cstring> |
1204 | </property> | 1220 | </property> |
1205 | <property stdset="1"> | 1221 | <property stdset="1"> |
1206 | <name>maxValue</name> | 1222 | <name>maxValue</name> |
1207 | <number>127</number> | 1223 | <number>127</number> |
1208 | </property> | 1224 | </property> |
1209 | <property stdset="1"> | 1225 | <property stdset="1"> |
1226 | <name>tracking</name> | ||
1227 | <bool>false</bool> | ||
1228 | </property> | ||
1229 | <property stdset="1"> | ||
1210 | <name>orientation</name> | 1230 | <name>orientation</name> |
1211 | <enum>Horizontal</enum> | 1231 | <enum>Horizontal</enum> |
1212 | </property> | 1232 | </property> |
1213 | <property stdset="1"> | 1233 | <property stdset="1"> |
1214 | <name>tickmarks</name> | 1234 | <name>tickmarks</name> |
1215 | <enum>Right</enum> | 1235 | <enum>Right</enum> |
1216 | </property> | 1236 | </property> |
1217 | </widget> | 1237 | </widget> |
1218 | <widget> | 1238 | <widget> |
1219 | <class>QLabel</class> | 1239 | <class>QLabel</class> |
1220 | <property stdset="1"> | 1240 | <property stdset="1"> |
1221 | <name>name</name> | 1241 | <name>name</name> |
1222 | <cstring>PixmapLabel1_2</cstring> | 1242 | <cstring>PixmapLabel1_2</cstring> |
1223 | </property> | 1243 | </property> |
1224 | <property stdset="1"> | 1244 | <property stdset="1"> |
1225 | <name>pixmap</name> | 1245 | <name>pixmap</name> |
1226 | <pixmap>image1</pixmap> | 1246 | <pixmap>image1</pixmap> |
1227 | </property> | 1247 | </property> |
1228 | <property stdset="1"> | 1248 | <property stdset="1"> |
1229 | <name>scaledContents</name> | 1249 | <name>scaledContents</name> |
1230 | <bool>false</bool> | 1250 | <bool>false</bool> |
1231 | </property> | 1251 | </property> |
1232 | </widget> | 1252 | </widget> |
1233 | </hbox> | 1253 | </hbox> |
1234 | </widget> | 1254 | </widget> |
1235 | <widget> | 1255 | <widget> |
1236 | <class>QLayoutWidget</class> | 1256 | <class>QLayoutWidget</class> |
1237 | <property stdset="1"> | 1257 | <property stdset="1"> |
1238 | <name>name</name> | 1258 | <name>name</name> |
1239 | <cstring>Layout8</cstring> | 1259 | <cstring>Layout8</cstring> |
1240 | </property> | 1260 | </property> |
1241 | <hbox> | 1261 | <hbox> |
1242 | <property stdset="1"> | 1262 | <property stdset="1"> |
1243 | <name>margin</name> | 1263 | <name>margin</name> |
1244 | <number>0</number> | 1264 | <number>0</number> |
1245 | </property> | 1265 | </property> |
1246 | <property stdset="1"> | 1266 | <property stdset="1"> |
1247 | <name>spacing</name> | 1267 | <name>spacing</name> |
1248 | <number>6</number> | 1268 | <number>6</number> |
1249 | </property> | 1269 | </property> |
1250 | <widget> | 1270 | <widget> |
1251 | <class>QLabel</class> | 1271 | <class>QLabel</class> |
1252 | <property stdset="1"> | 1272 | <property stdset="1"> |
1253 | <name>name</name> | 1273 | <name>name</name> |
1254 | <cstring>TextLabel11</cstring> | 1274 | <cstring>TextLabel11</cstring> |
1255 | </property> | 1275 | </property> |
1256 | <property stdset="1"> | 1276 | <property stdset="1"> |
1257 | <name>text</name> | 1277 | <name>text</name> |
1258 | <string>Shift</string> | 1278 | <string>Shift</string> |
1259 | </property> | 1279 | </property> |
1260 | </widget> | 1280 | </widget> |
1261 | <widget> | 1281 | <widget> |
1262 | <class>QSpinBox</class> | 1282 | <class>QSpinBox</class> |
1263 | <property stdset="1"> | 1283 | <property stdset="1"> |
1264 | <name>name</name> | 1284 | <name>name</name> |
1265 | <cstring>LightShiftSpin</cstring> | 1285 | <cstring>LightShiftSpin</cstring> |
1266 | </property> | 1286 | </property> |
1267 | <property stdset="1"> | 1287 | <property stdset="1"> |
1268 | <name>maxValue</name> | 1288 | <name>maxValue</name> |
1269 | <number>126</number> | 1289 | <number>126</number> |
1270 | </property> | 1290 | </property> |
1271 | </widget> | 1291 | </widget> |
1272 | </hbox> | 1292 | </hbox> |
1273 | </widget> | 1293 | </widget> |
diff --git a/core/settings/light-and-power/settings.h b/core/settings/light-and-power/settings.h index 77f90d6..adfd735 100644 --- a/core/settings/light-and-power/settings.h +++ b/core/settings/light-and-power/settings.h | |||
@@ -1,54 +1,55 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #ifndef SETTINGS_H | 20 | #ifndef SETTINGS_H |
21 | #define SETTINGS_H | 21 | #define SETTINGS_H |
22 | 22 | ||
23 | 23 | ||
24 | #include <qstrlist.h> | 24 | #include <qstrlist.h> |
25 | #include <qasciidict.h> | 25 | #include <qasciidict.h> |
26 | #include "lightsettingsbase.h" | 26 | #include "lightsettingsbase.h" |
27 | 27 | ||
28 | 28 | ||
29 | class LightSettings : public LightSettingsBase | 29 | class LightSettings : public LightSettingsBase |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | 32 | ||
33 | public: | 33 | public: |
34 | LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 34 | LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
35 | ~LightSettings(); | 35 | ~LightSettings(); |
36 | 36 | ||
37 | protected: | 37 | protected: |
38 | void accept(); | 38 | void accept(); |
39 | void reject(); | 39 | void reject(); |
40 | 40 | ||
41 | void done ( int r ); | 41 | void done ( int r ); |
42 | 42 | ||
43 | private slots: | 43 | private slots: |
44 | void applyBrightness(); | 44 | void applyBrightness(); |
45 | void applyBrightnessAC(); | ||
45 | void slotSliderTicks( int steps ); | 46 | void slotSliderTicks( int steps ); |
46 | 47 | ||
47 | private: | 48 | private: |
48 | int initbright; | 49 | int initbright; |
49 | int initbright_ac; | 50 | int initbright_ac; |
50 | }; | 51 | }; |
51 | 52 | ||
52 | 53 | ||
53 | #endif // SETTINGS_H | 54 | #endif // SETTINGS_H |
54 | 55 | ||