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
@@ -69,17 +69,16 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     } else {
         // if ipaq no need to show the sensor box
         IpaqGroupBox->hide();
         IpaqGroupBoxAC->hide();
         LightSensorGroupBox->hide();
     }
 
     Config config( "qpe" );
-
     config.setGroup( "Screensaver" );
 
     int interval;
 
     // battery spinboxes
     interval = config.readNumEntry( "Interval_Dim", 20 );
     interval_dim->setValue( interval );
     interval = config.readNumEntry( "Interval_LightOff", 30 );
@@ -134,31 +133,31 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     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( applyBrightnessAC() ) );
+    connect( brightness, 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 ) );
+    qDebug ( QString( "Brightness" ).arg( bright ) );
     QCopEnvelope e("QPE/System", "setBacklight(int)" );
     e << bright;
 }
 
 void LightSettings::reject()
 {
     set_fl(initbright);
 
@@ -235,27 +234,26 @@ void LightSettings::accept()
 
     config.write();
 
     QDialog::accept();
 }
 
 void LightSettings::applyBrightness()
 {
-    if ( !PowerStatus::Online ) {
+    if (  PowerStatusManager::readStatus().acStatus() != 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 ) {
+    if ( PowerStatusManager::readStatus().acStatus() ==  PowerStatus::Online ) {
         int bright = ( brightness_ac_3->value() ) * 255  / brightness_ac_3->maxValue();
         set_fl(bright);
     }
 }
 
 
 
 void LightSettings::done(int r)
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
@@ -753,20 +753,16 @@
                                 <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>
                             <widget>
                                 <class>QLayoutWidget</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>Layout20</cstring>
                                 </property>
                                 <hbox>