summaryrefslogtreecommitdiff
path: root/core/settings/light-and-power
authorharlekin <harlekin>2002-10-22 13:28:41 (UTC)
committer harlekin <harlekin>2002-10-22 13:28:41 (UTC)
commit514c76157fcf558300973fd4ffb4b131911ef257 (patch) (side-by-side diff)
tree12d83b765344effb3eac799e3c4e128a2575f310 /core/settings/light-and-power
parent78152b3adbe3ae4626c8f53e3edd0babcaf6fb72 (diff)
downloadopie-514c76157fcf558300973fd4ffb4b131911ef257.zip
opie-514c76157fcf558300973fd4ffb4b131911ef257.tar.gz
opie-514c76157fcf558300973fd4ffb4b131911ef257.tar.bz2
fix for slider misbehaviour ( setting light preview )
Diffstat (limited to 'core/settings/light-and-power') (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
@@ -74,7 +74,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
}
Config config( "qpe" );
-
config.setGroup( "Screensaver" );
int interval;
@@ -139,8 +138,8 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ;
LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) );
- 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() ) );
}
LightSettings::~LightSettings()
@@ -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>