1 files changed, 62 insertions, 45 deletions

diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 04d2249..97120f2 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -46,2 +46,3 @@
 #include <qspinbox.h>
+#include <qpushbutton.h>
 #include <qlistbox.h>
@@ -60,15 +61,14 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
 
-    if ( ODevice::inst()->model() ==  Model_iPAQ_H31xx ||
-         ODevice::inst()->model() ==  Model_iPAQ_H36xx ||
-         ODevice::inst()->model() ==  Model_iPAQ_H37xx ||
-         ODevice::inst()->model() ==  Model_iPAQ_H38xx ) {
+    if ( ODevice::inst()->hasLightSensor() ) {
         // Not supported yet - hide until implemented
-        IpaqGroupBox->setEnabled( false );
-        IpaqGroupBoxAC->setEnabled( false );
-        LightSensorGroupBox->setEnabled( false );
+        auto_brightness->setEnabled( false );
+        CalibrateLightSensor->setEnabled( false );
+        auto_brightness_ac_3->setEnabled( false );
+        CalibrateLightSensorAC->setEnabled( false );
     } else {
         // if ipaq no need to show the sensor box
-        IpaqGroupBox->hide();
-        IpaqGroupBoxAC->hide();
-        LightSensorGroupBox->hide();
+        auto_brightness->hide();
+        CalibrateLightSensor->hide();
+        auto_brightness_ac_3->hide();
+        CalibrateLightSensorAC->hide();
     }
@@ -82,5 +82,15 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     interval = config.readNumEntry( "Interval_Dim", 20 );
-    interval_dim->setValue( interval );
+    if ( config.readNumEntry("Dim",1) == 0 ) {
+        interval_dim->setSpecialValueText( tr("never") );
+    } else {
+        interval_dim->setValue( interval );
+    }
+
     interval = config.readNumEntry( "Interval_LightOff", 30 );
-    interval_lightoff->setValue( interval );
+    if ( config.readNumEntry("LightOff",1) == 0 ) {
+        interval_lightoff->setSpecialValueText( tr("never") );
+    } else {
+        interval_lightoff->setValue( interval );
+    }
+
     interval = config.readNumEntry( "Interval", 60 );
@@ -91,5 +101,15 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     interval = config.readNumEntry( "Interval_DimAC", 20 );
+    if ( config.readNumEntry("DimAC",1) == 0 ) {
+        interval_dim_ac_3->setSpecialValueText( tr("never") );
+    } else {
     interval_dim_ac_3->setValue( interval );
+    }
+
     interval = config.readNumEntry( "Interval_LightOffAC", 30 );
-    interval_lightoff_ac_3->setValue( interval );
+    if ( config.readNumEntry("LightOffAC",1) == 0 ) {
+        interval_lightoff_ac_3->setSpecialValueText( tr("never") );
+    } else {
+        interval_lightoff_ac_3->setValue( interval );
+    }
+
     interval = config.readNumEntry( "IntervalAC", 60 );
@@ -98,3 +118,7 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     }
-    interval_suspend_ac_3->setValue( interval );
+    if ( config.readNumEntry("NoApmAC", 0) == 0 ) {
+        interval_suspend_ac_3->setSpecialValueText( tr("never") );
+    } else {
+        interval_suspend_ac_3->setValue( interval );
+    }
 
@@ -102,4 +126,6 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     // battery check and slider
-    screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 );
-    screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 );
+
+
+
+
     LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
@@ -114,6 +140,3 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     // ac check and slider
-    screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 );
-    screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 );
     LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 );
-    noApmAC->setChecked( config.readNumEntry("NoApmAC",0) != 0 );
     int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
@@ -131,6 +154,6 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
     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 ) );
+    //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 ) );
 
@@ -143,4 +166,2 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
 
-
-
     connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
@@ -154,3 +175,3 @@ LightSettings::~LightSettings()
 void LightSettings::slotSliderTicks( int steps ) {
-    LightMinValueSlider->setTickInterval( steps );
+//    LightMinValueSlider->setTickInterval( steps );
 }
@@ -173,4 +194,5 @@ void LightSettings::accept()
 {
-    if ( qApp->focusWidget() )
+    if ( qApp->focusWidget() ) {
         qApp->focusWidget()->clearFocus();
+    }
 
@@ -179,4 +201,4 @@ void LightSettings::accept()
     // bat
-    int i_dim =      (screensaver_dim->isChecked() ? interval_dim->value() : 0);
-    int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0);
+    int i_dim =      ( !( interval_dim->specialValueText() == tr("never") ) ? interval_dim->value() : 0);
+    int i_lightoff = ( !( interval_lightoff->specialValueText() == tr("never") )  ? interval_lightoff->value() : 0);
     int i_suspend =  interval_suspend->value();
@@ -186,4 +208,4 @@ void LightSettings::accept()
     // ac
-    int i_dim_ac =      (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0);
-    int i_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0);
+    int i_dim_ac =      ( !( interval_dim_ac_3->specialValueText() == tr("never") ) ? interval_dim_ac_3->value() : 0);
+    int i_lightoff_ac = ( !( interval_lightoff_ac_3->specialValueText() == tr("never") ) ? interval_lightoff_ac_3->value() : 0);
     int i_suspend_ac =  interval_suspend_ac_3->value();
@@ -196,4 +218,4 @@ void LightSettings::accept()
     // bat
-    config.writeEntry( "Dim", (int)screensaver_dim->isChecked() );
-    config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() );
+    config.writeEntry( "Dim", interval_dim->specialValueText() == tr("never") );
+    config.writeEntry( "LightOff", interval_lightoff->specialValueText() == tr("never") );
     config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
@@ -206,6 +228,6 @@ void LightSettings::accept()
     // ac
-    config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() );
-    config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() );
+    config.writeEntry( "DimAC", interval_dim_ac_3->specialValueText() == tr("never") );
+    config.writeEntry( "LightOffAC", interval_lightoff_ac_3->specialValueText() == tr("never") );
     config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() );
-    config.writeEntry( "NoAPmAC", (int)noApmAC->isChecked() );
+    config.writeEntry( "NoAPmAC", interval_suspend_ac_3->specialValueText() == tr("never") );
     config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() );
@@ -218,15 +240,10 @@ void LightSettings::accept()
     // only make ipaq light sensor entries in config file if on an ipaq
-    if ( ODevice::inst()->model() ==  Model_iPAQ_H31xx ||
-         ODevice::inst()->model() ==  Model_iPAQ_H36xx ||
-         ODevice::inst()->model() ==  Model_iPAQ_H37xx ||
-         ODevice::inst()->model() ==  Model_iPAQ_H38xx ) {
-
+    if ( ODevice::inst()->hasLightSensor() ) {
         // ipaq sensor
         config.setGroup( "Ipaqlightsensor" );
-
         config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() );
         config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() );
-        config.writeEntry( "Steps", LightStepSpin->value() );
-        config.writeEntry( "MinValue", LightMinValueSlider->value() );
-        config.writeEntry( "Shift", LightShiftSpin->value() );
+        //config.writeEntry( "Steps", LightStepSpin->value() );
+        //onfig.writeEntry( "MinValue", LightMinValueSlider->value() );
+        //config.writeEntry( "Shift", LightShiftSpin->value() );
     }