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 | |||
@@ -131,37 +131,38 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) | |||
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() |
@@ -230,29 +231,35 @@ void LightSettings::accept() | |||
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 | |||
@@ -2,25 +2,25 @@ | |||
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> |
@@ -299,24 +299,28 @@ | |||
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> |
@@ -714,36 +718,48 @@ | |||
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> |
@@ -1198,24 +1214,28 @@ warning at</string> | |||
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> |
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 | |||
@@ -33,22 +33,23 @@ class LightSettings : public LightSettingsBase | |||
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 | ||