other never handling

2 files changed, 15 insertions, 15 deletions

diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index d2618d9..bf94a21 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -73,33 +73,33 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
 
     Config config( "apm" );
     config.setGroup( "Battery" );
 
     int interval;
     // battery spinboxes
     interval = config.readNumEntry( "Interval_Dim", 20 );
     if ( config.readNumEntry("Dim",1) == 0 ) {
-        interval_dim->setSpecialValueText( tr("never") );
+        interval_dim->setValue( 0 );
     } else {
         interval_dim->setValue( interval );
     }
 
     interval = config.readNumEntry( "Interval_LightOff", 30 );
     if ( config.readNumEntry("LightOff",1) == 0 ) {
-        interval_lightoff->setSpecialValueText( tr("never") );
+        interval_lightoff->setValue( 0 );
     } else {
         interval_lightoff->setValue( interval );
     }
 
     interval = config.readNumEntry( "Interval", 60 );
     if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs)
 
-    if ( config.readNumEntry("NoApm", 0) == 0 ) {
-        interval_suspend->setSpecialValueText( tr("never") );
+    if ( config.readNumEntry("NoApm", 0 ) == 1 ) {
+        interval_suspend->setValue( 0 );
     } else {
         interval_suspend->setValue( interval );
     }
 
     // battery check and slider
     LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
     int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( );
     initbright = config.readNumEntry("Brightness",255);
@@ -113,34 +113,34 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
     auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 );
 
 
 
     config.setGroup( "AC" );
     // ac spinboxes
     interval = config.readNumEntry( "Interval_Dim", 20 );
     if ( config.readNumEntry("Dim",1) == 0 ) {
-        interval_dim_ac_3->setSpecialValueText( tr("never") );
+        interval_dim_ac_3->setValue( 0 );
     } else {
     interval_dim_ac_3->setValue( interval );
     }
 
     interval = config.readNumEntry( "Interval_LightOff", 30 );
     if ( config.readNumEntry("LightOff",1) == 0 ) {
-        interval_lightoff_ac_3->setSpecialValueText( tr("never") );
+        interval_lightoff_ac_3->setValue( 0 );
     } else {
         interval_lightoff_ac_3->setValue( interval );
     }
 
     interval = config.readNumEntry( "Interval", 60 );
     if ( interval > 3600 ) {
         interval /= 1000; // compatibility (was millisecs)
     }
-    if ( config.readNumEntry("NoApm", 0) == 0 ) {
-        interval_suspend_ac_3->setSpecialValueText( tr("never") );
+    if ( config.readNumEntry("NoApm", 1) == 1 ) {
+        interval_suspend_ac_3->setValue( 0 );
     } else {
         interval_suspend_ac_3->setValue( interval );
     }
 
     // ac check and slider
     LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
     int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
     initbright_ac = config.readNumEntry("Brightness",255);
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index effa460..f41e5a6 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -6,17 +6,17 @@
         <name>name</name>
         <cstring>LightSettingsBase</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>403</width>
+            <width>399</width>
             <height>532</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
             <hsizetype>7</hsizetype>
             <vsizetype>5</vsizetype>
@@ -145,17 +145,17 @@
                                             <enum>PlusMinus</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>3600</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
-                                            <number>10</number>
+                                            <number>0</number>
                                         </property>
                                         <property stdset="1">
                                             <name>lineStep</name>
                                             <number>10</number>
                                         </property>
                                     </widget>
                                     <widget row="1"  column="0" >
                                         <class>QLabel</class>
@@ -205,17 +205,17 @@
                                             <enum>PlusMinus</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>3600</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
-                                            <number>10</number>
+                                            <number>0</number>
                                         </property>
                                         <property stdset="1">
                                             <name>lineStep</name>
                                             <number>10</number>
                                         </property>
                                     </widget>
                                     <widget row="2"  column="1" >
                                         <class>QSpinBox</class>
@@ -236,17 +236,17 @@
                                             <enum>PlusMinus</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>3600</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
-                                            <number>10</number>
+                                            <number>0</number>
                                         </property>
                                         <property stdset="1">
                                             <name>lineStep</name>
                                             <number>10</number>
                                         </property>
                                     </widget>
                                     <widget row="2"  column="0" >
                                         <class>QLabel</class>
@@ -588,17 +588,17 @@
                                             <enum>PlusMinus</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>3600</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
-                                            <number>10</number>
+                                            <number>0</number>
                                         </property>
                                         <property stdset="1">
                                             <name>lineStep</name>
                                             <number>10</number>
                                         </property>
                                     </widget>
                                     <widget row="0"  column="0" >
                                         <class>QLabel</class>
@@ -637,17 +637,17 @@
                                             <enum>PlusMinus</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>3600</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
-                                            <number>10</number>
+                                            <number>0</number>
                                         </property>
                                         <property stdset="1">
                                             <name>lineStep</name>
                                             <number>10</number>
                                         </property>
                                     </widget>
                                     <widget row="2"  column="0" >
                                         <class>QLabel</class>
@@ -679,17 +679,17 @@
                                             <enum>PlusMinus</enum>
                                         </property>
                                         <property stdset="1">
                                             <name>maxValue</name>
                                             <number>3600</number>
                                         </property>
                                         <property stdset="1">
                                             <name>minValue</name>
-                                            <number>10</number>
+                                            <number>0</number>
                                         </property>
                                         <property stdset="1">
                                             <name>lineStep</name>
                                             <number>10</number>
                                         </property>
                                     </widget>
                                     <widget row="1"  column="0" >
                                         <class>QLabel</class>