author | harlekin <harlekin> | 2002-10-20 16:14:46 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-10-20 16:14:46 (UTC) |
commit | d3936c24518e9fea48a060eaef02e64a89646657 (patch) (side-by-side diff) | |
tree | 0dc08dc1c757e0d7a2b32d53ed2a56d8b0442fa3 /core | |
parent | 56ac4499a8e13a58d006b35ea023153df9995f7a (diff) | |
download | opie-d3936c24518e9fea48a060eaef02e64a89646657.zip opie-d3936c24518e9fea48a060eaef02e64a89646657.tar.gz opie-d3936c24518e9fea48a060eaef02e64a89646657.tar.bz2 |
fixed emmited slider values
-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 @@ -131,37 +131,38 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) criticalSpinBox->setValue( config.readNumEntry("power_critical", 5 ) ); // ipaq sensor config.setGroup( "Ipaq_light_sensor" ); auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); 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() { set_fl(initbright); QDialog::reject(); } void LightSettings::accept() @@ -230,29 +231,35 @@ void LightSettings::accept() config.writeEntry( "Steps", LightStepSpin->value() ); config.writeEntry( "MinValue", LightMinValueSlider->value() ); config.writeEntry( "Shift", LightShiftSpin->value() ); } config.write(); 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); } } void LightSettings::done(int r) { QDialog::done(r); close ( ); } 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 @@ -2,25 +2,25 @@ <class>LightSettingsBase</class> <widget> <class>QDialog</class> <property stdset="1"> <name>name</name> <cstring>LightSettingsBase</cstring> </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> </property> <property stdset="1"> <name>sizeGripEnabled</name> <bool>false</bool> </property> <property> @@ -299,24 +299,28 @@ <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>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> </property> <property stdset="1"> <name>tickInterval</name> <number>32</number> </property> </widget> @@ -714,36 +718,48 @@ </property> <property stdset="1"> <name>spacing</name> <number>3</number> </property> <widget> <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> </property> <property stdset="1"> <name>tickInterval</name> <number>32</number> </property> </widget> @@ -1198,24 +1214,28 @@ warning at</string> </widget> <widget> <class>QSlider</class> <property stdset="1"> <name>name</name> <cstring>LightMinValueSlider</cstring> </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> </property> </widget> <widget> <class>QLabel</class> <property stdset="1"> <name>name</name> 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 @@ -33,22 +33,23 @@ class LightSettings : public LightSettingsBase public: LightSettings( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~LightSettings(); protected: void accept(); void reject(); void done ( int r ); private slots: void applyBrightness(); + void applyBrightnessAC(); void slotSliderTicks( int steps ); private: int initbright; int initbright_ac; }; #endif // SETTINGS_H |