summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-20 16:14:46 (UTC)
committer harlekin <harlekin>2002-10-20 16:14:46 (UTC)
commitd3936c24518e9fea48a060eaef02e64a89646657 (patch) (unidiff)
tree0dc08dc1c757e0d7a2b32d53ed2a56d8b0442fa3
parent56ac4499a8e13a58d006b35ea023153df9995f7a (diff)
downloadopie-d3936c24518e9fea48a060eaef02e64a89646657.zip
opie-d3936c24518e9fea48a060eaef02e64a89646657.tar.gz
opie-d3936c24518e9fea48a060eaef02e64a89646657.tar.bz2
fixed emmited slider values
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp17
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui22
-rw-r--r--core/settings/light-and-power/settings.h1
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
@@ -140,7 +140,7 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
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
146LightSettings::~LightSettings() 146LightSettings::~LightSettings()
@@ -153,6 +153,7 @@ void LightSettings::slotSliderTicks( int steps ) {
153 153
154static void set_fl(int bright) 154static 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}
@@ -239,12 +240,18 @@ void LightSettings::accept()
239 240
240void LightSettings::applyBrightness() 241void LightSettings::applyBrightness()
241{ 242{
243 if ( !PowerStatus::Online ) {
244 int bright = ( brightness->value() ) * 255 / brightness->maxValue();
245 set_fl(bright);
246 }
247}
248
249void 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}
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
@@ -11,7 +11,7 @@
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>
@@ -308,6 +308,10 @@
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>
@@ -723,6 +727,10 @@
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>
@@ -735,6 +743,14 @@
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>
@@ -1207,6 +1223,10 @@ warning at</string>
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>
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
@@ -42,6 +42,7 @@ protected:
42 42
43private slots: 43private slots:
44 void applyBrightness(); 44 void applyBrightness();
45 void applyBrightnessAC();
45 void slotSliderTicks( int steps ); 46 void slotSliderTicks( int steps );
46 47
47private: 48private: