| -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 @@ -141,5 +141,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) connect(brightness, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness())); - connect(brightness_ac_3, SIGNAL(valueChanged(int)), this, SLOT(applyBrightness())); + connect(brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) ); } @@ -154,4 +154,5 @@ void LightSettings::slotSliderTicks( int steps ) { static void set_fl(int bright) { + qDebug( QString("BRIGHT !! : %1").arg( bright ) ); QCopEnvelope e("QPE/System", "setBacklight(int)" ); e << bright; @@ -240,10 +241,16 @@ void LightSettings::accept() void LightSettings::applyBrightness() { + if ( !PowerStatus::Online ) { + int bright = ( brightness->value() ) * 255 / brightness->maxValue(); + set_fl(bright); + } +} + +void LightSettings::applyBrightnessAC() +{ + qDebug( QString("SLIDER : %1").arg( brightness_ac_3->value() ) ); // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting if ( PowerStatus::Online ) { - int bright = (brightness_ac_3->maxValue() - brightness_ac_3->value())*255 / brightness_ac_3->maxValue(); - set_fl(bright); - } else { - int bright = (brightness->maxValue()-brightness->value())*255 / brightness->maxValue(); + int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue(); set_fl(bright); } 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 @@ -12,5 +12,5 @@ <x>0</x> <y>0</y> - <width>419</width> + <width>415</width> <height>532</height> </rect> @@ -309,4 +309,8 @@ </property> <property stdset="1"> + <name>tracking</name> + <bool>true</bool> + </property> + <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> @@ -724,4 +728,8 @@ </property> <property stdset="1"> + <name>minValue</name> + <number>0</number> + </property> + <property stdset="1"> <name>maxValue</name> <number>255</number> @@ -736,4 +744,12 @@ </property> <property stdset="1"> + <name>value</name> + <number>255</number> + </property> + <property stdset="1"> + <name>tracking</name> + <bool>true</bool> + </property> + <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> @@ -1208,4 +1224,8 @@ warning at</string> </property> <property stdset="1"> + <name>tracking</name> + <bool>false</bool> + </property> + <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> 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 @@ -43,4 +43,5 @@ protected: private slots: void applyBrightness(); + void applyBrightnessAC(); void slotSliderTicks( int steps ); |