summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp8
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui4
2 files changed, 3 insertions, 9 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
@@ -74,7 +74,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
}
Config config( "qpe" );
-
config.setGroup( "Screensaver" );
int interval;
@@ -153,7 +152,7 @@ void LightSettings::slotSliderTicks( int steps ) {
static void set_fl(int bright)
{
- qDebug( QString("BRIGHT !! : %1").arg( bright ) );
+ qDebug ( QString( "Brightness" ).arg( bright ) );
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << bright;
}
@@ -240,7 +239,7 @@ void LightSettings::accept()
void LightSettings::applyBrightness()
{
- if ( !PowerStatus::Online ) {
+ if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {
int bright = ( brightness->value() ) * 255 / brightness->maxValue();
set_fl(bright);
}
@@ -248,9 +247,8 @@ void LightSettings::applyBrightness()
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();
set_fl(bright);
}
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
@@ -758,10 +758,6 @@
<name>tickmarks</name>
<enum>Right</enum>
</property>
- <property stdset="1">
- <name>tickInterval</name>
- <number>32</number>
- </property>
</widget>
<widget>
<class>QLayoutWidget</class>