summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -137,25 +137,26 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) );
LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) );
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(applyBrightness()));
+ connect(brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) );
}
LightSettings::~LightSettings()
{
}
void LightSettings::slotSliderTicks( int steps ) {
LightMinValueSlider->setTickInterval( steps );
}
static void set_fl(int bright)
{
+ qDebug( QString("BRIGHT !! : %1").arg( bright ) );
QCopEnvelope e("QPE/System", "setBacklight(int)" );
e << bright;
}
void LightSettings::reject()
{
@@ -236,18 +237,24 @@ void LightSettings::accept()
QDialog::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
@@ -8,13 +8,13 @@
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>419</width>
+ <width>415</width>
<height>532</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Light and Power Settings</string>
@@ -305,12 +305,16 @@
</property>
<property stdset="1">
<name>pageStep</name>
<number>16</number>
</property>
<property stdset="1">
+ <name>tracking</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Right</enum>
@@ -720,24 +724,36 @@
<class>QSlider</class>
<property stdset="1">
<name>name</name>
<cstring>brightness_ac_3</cstring>
</property>
<property stdset="1">
+ <name>minValue</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
<name>maxValue</name>
<number>255</number>
</property>
<property stdset="1">
<name>lineStep</name>
<number>16</number>
</property>
<property stdset="1">
<name>pageStep</name>
<number>16</number>
</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>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Right</enum>
@@ -1204,12 +1220,16 @@ warning at</string>
</property>
<property stdset="1">
<name>maxValue</name>
<number>127</number>
</property>
<property stdset="1">
+ <name>tracking</name>
+ <bool>false</bool>
+ </property>
+ <property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>tickmarks</name>
<enum>Right</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
@@ -39,12 +39,13 @@ protected:
void reject();
void done ( int r );
private slots:
void applyBrightness();
+ void applyBrightnessAC();
void slotSliderTicks( int steps );
private:
int initbright;
int initbright_ac;
};