summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp12
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui4
2 files changed, 5 insertions, 11 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 1a94209..d93b0af 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -76,3 +76,2 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
Config config( "qpe" );
-
config.setGroup( "Screensaver" );
@@ -141,4 +140,4 @@ 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( applyBrightnessAC() ) );
+ connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
+ connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) );
}
@@ -155,3 +154,3 @@ static void set_fl(int bright)
{
- qDebug( QString("BRIGHT !! : %1").arg( bright ) );
+ qDebug ( QString( "Brightness" ).arg( bright ) );
QCopEnvelope e("QPE/System", "setBacklight(int)" );
@@ -242,3 +241,3 @@ void LightSettings::applyBrightness()
{
- if ( !PowerStatus::Online ) {
+ if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {
int bright = ( brightness->value() ) * 255 / brightness->maxValue();
@@ -250,5 +249,4 @@ 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 ) {
+ if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) {
int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue();
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 5e62626..be096ac 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -760,6 +760,2 @@
</property>
- <property stdset="1">
- <name>tickInterval</name>
- <number>32</number>
- </property>
</widget>