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
@@ -75,29 +75,29 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
    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 ) {
+    if ( config.readNumEntry("NoApm", 0 ) == 1 ) {
-        interval_suspend->setSpecialValueText( tr("never") );
+        interval_suspend->setValue( 0 );
    } else {
        interval_suspend->setValue( interval );
    }
    // battery check and slider
    LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
@@ -115,30 +115,30 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags )
    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 ) {
+    if ( config.readNumEntry("NoApm", 1) == 1 ) {
-        interval_suspend_ac_3->setSpecialValueText( tr("never") );
+        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 );
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
@@ -8,13 +8,13 @@
    </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>
@@ -147,13 +147,13 @@
                                        <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>
@@ -207,13 +207,13 @@
                                        <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>
@@ -238,13 +238,13 @@
                                        <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>
@@ -590,13 +590,13 @@
                                        <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>
@@ -639,13 +639,13 @@
                                        <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>
@@ -681,13 +681,13 @@
                                        <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>

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
@@ -75,29 +75,29 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
75	config.setGroup( "Battery" );	75	config.setGroup( "Battery" );
76		76
77	int interval;	77	int interval;
78	// battery spinboxes	78	// battery spinboxes
79	interval = config.readNumEntry( "Interval_Dim", 20 );	79	interval = config.readNumEntry( "Interval_Dim", 20 );
80	if ( config.readNumEntry("Dim",1) == 0 ) {	80	if ( config.readNumEntry("Dim",1) == 0 ) {
81	interval_dim->setSpecialValueText( tr("never") );	81	interval_dim->setValue( 0 );
82	} else {	82	} else {
83	interval_dim->setValue( interval );	83	interval_dim->setValue( interval );
84	}	84	}
85		85
86	interval = config.readNumEntry( "Interval_LightOff", 30 );	86	interval = config.readNumEntry( "Interval_LightOff", 30 );
87	if ( config.readNumEntry("LightOff",1) == 0 ) {	87	if ( config.readNumEntry("LightOff",1) == 0 ) {
88	interval_lightoff->setSpecialValueText( tr("never") );	88	interval_lightoff->setValue( 0 );
89	} else {	89	} else {
90	interval_lightoff->setValue( interval );	90	interval_lightoff->setValue( interval );
91	}	91	}
92		92
93	interval = config.readNumEntry( "Interval", 60 );	93	interval = config.readNumEntry( "Interval", 60 );
94	if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs)	94	if ( interval > 3600 ) interval /= 1000; // compatibility (was millisecs)
95		95
96	if ( config.readNumEntry("NoApm", 0) == 0 ) {	96	if ( config.readNumEntry("NoApm", 0 ) == 1 ) {
97	interval_suspend->setSpecialValueText( tr("never") );	97	interval_suspend->setValue( 0 );
98	} else {	98	} else {
99	interval_suspend->setValue( interval );	99	interval_suspend->setValue( interval );
100	}	100	}
101		101
102	// battery check and slider	102	// battery check and slider
103	LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );	103	LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
@@ -115,30 +115,30 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
115		115
116		116
117	config.setGroup( "AC" );	117	config.setGroup( "AC" );
118	// ac spinboxes	118	// ac spinboxes
119	interval = config.readNumEntry( "Interval_Dim", 20 );	119	interval = config.readNumEntry( "Interval_Dim", 20 );
120	if ( config.readNumEntry("Dim",1) == 0 ) {	120	if ( config.readNumEntry("Dim",1) == 0 ) {
121	interval_dim_ac_3->setSpecialValueText( tr("never") );	121	interval_dim_ac_3->setValue( 0 );
122	} else {	122	} else {
123	interval_dim_ac_3->setValue( interval );	123	interval_dim_ac_3->setValue( interval );
124	}	124	}
125		125
126	interval = config.readNumEntry( "Interval_LightOff", 30 );	126	interval = config.readNumEntry( "Interval_LightOff", 30 );
127	if ( config.readNumEntry("LightOff",1) == 0 ) {	127	if ( config.readNumEntry("LightOff",1) == 0 ) {
128	interval_lightoff_ac_3->setSpecialValueText( tr("never") );	128	interval_lightoff_ac_3->setValue( 0 );
129	} else {	129	} else {
130	interval_lightoff_ac_3->setValue( interval );	130	interval_lightoff_ac_3->setValue( interval );
131	}	131	}
132		132
133	interval = config.readNumEntry( "Interval", 60 );	133	interval = config.readNumEntry( "Interval", 60 );
134	if ( interval > 3600 ) {	134	if ( interval > 3600 ) {
135	interval /= 1000; // compatibility (was millisecs)	135	interval /= 1000; // compatibility (was millisecs)
136	}	136	}
137	if ( config.readNumEntry("NoApm", 0) == 0 ) {	137	if ( config.readNumEntry("NoApm", 1) == 1 ) {
138	interval_suspend_ac_3->setSpecialValueText( tr("never") );	138	interval_suspend_ac_3->setValue( 0 );
139	} else {	139	} else {
140	interval_suspend_ac_3->setValue( interval );	140	interval_suspend_ac_3->setValue( interval );
141	}	141	}
142		142
143	// ac check and slider	143	// ac check and slider
144	LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );	144	LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );


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
@@ -8,13 +8,13 @@
8	</property>	8	</property>
9	<property stdset="1">	9	<property stdset="1">
10	<name>geometry</name>	10	<name>geometry</name>
11	<rect>	11	<rect>
12	<x>0</x>	12	<x>0</x>
13	<y>0</y>	13	<y>0</y>
14	<width>403</width>	14	<width>399</width>
15	<height>532</height>	15	<height>532</height>
16	</rect>	16	</rect>
17	</property>	17	</property>
18	<property stdset="1">	18	<property stdset="1">
19	<name>sizePolicy</name>	19	<name>sizePolicy</name>
20	<sizepolicy>	20	<sizepolicy>
@@ -147,13 +147,13 @@
147	<property stdset="1">	147	<property stdset="1">
148	<name>maxValue</name>	148	<name>maxValue</name>
149	<number>3600</number>	149	<number>3600</number>
150	</property>	150	</property>
151	<property stdset="1">	151	<property stdset="1">
152	<name>minValue</name>	152	<name>minValue</name>
153	<number>10</number>	153	<number>0</number>
154	</property>	154	</property>
155	<property stdset="1">	155	<property stdset="1">
156	<name>lineStep</name>	156	<name>lineStep</name>
157	<number>10</number>	157	<number>10</number>
158	</property>	158	</property>
159	</widget>	159	</widget>
@@ -207,13 +207,13 @@
207	<property stdset="1">	207	<property stdset="1">
208	<name>maxValue</name>	208	<name>maxValue</name>
209	<number>3600</number>	209	<number>3600</number>
210	</property>	210	</property>
211	<property stdset="1">	211	<property stdset="1">
212	<name>minValue</name>	212	<name>minValue</name>
213	<number>10</number>	213	<number>0</number>
214	</property>	214	</property>
215	<property stdset="1">	215	<property stdset="1">
216	<name>lineStep</name>	216	<name>lineStep</name>
217	<number>10</number>	217	<number>10</number>
218	</property>	218	</property>
219	</widget>	219	</widget>
@@ -238,13 +238,13 @@
238	<property stdset="1">	238	<property stdset="1">
239	<name>maxValue</name>	239	<name>maxValue</name>
240	<number>3600</number>	240	<number>3600</number>
241	</property>	241	</property>
242	<property stdset="1">	242	<property stdset="1">
243	<name>minValue</name>	243	<name>minValue</name>
244	<number>10</number>	244	<number>0</number>
245	</property>	245	</property>
246	<property stdset="1">	246	<property stdset="1">
247	<name>lineStep</name>	247	<name>lineStep</name>
248	<number>10</number>	248	<number>10</number>
249	</property>	249	</property>
250	</widget>	250	</widget>
@@ -590,13 +590,13 @@
590	<property stdset="1">	590	<property stdset="1">
591	<name>maxValue</name>	591	<name>maxValue</name>
592	<number>3600</number>	592	<number>3600</number>
593	</property>	593	</property>
594	<property stdset="1">	594	<property stdset="1">
595	<name>minValue</name>	595	<name>minValue</name>
596	<number>10</number>	596	<number>0</number>
597	</property>	597	</property>
598	<property stdset="1">	598	<property stdset="1">
599	<name>lineStep</name>	599	<name>lineStep</name>
600	<number>10</number>	600	<number>10</number>
601	</property>	601	</property>
602	</widget>	602	</widget>
@@ -639,13 +639,13 @@
639	<property stdset="1">	639	<property stdset="1">
640	<name>maxValue</name>	640	<name>maxValue</name>
641	<number>3600</number>	641	<number>3600</number>
642	</property>	642	</property>
643	<property stdset="1">	643	<property stdset="1">
644	<name>minValue</name>	644	<name>minValue</name>
645	<number>10</number>	645	<number>0</number>
646	</property>	646	</property>
647	<property stdset="1">	647	<property stdset="1">
648	<name>lineStep</name>	648	<name>lineStep</name>
649	<number>10</number>	649	<number>10</number>
650	</property>	650	</property>
651	</widget>	651	</widget>
@@ -681,13 +681,13 @@
681	<property stdset="1">	681	<property stdset="1">
682	<name>maxValue</name>	682	<name>maxValue</name>
683	<number>3600</number>	683	<number>3600</number>
684	</property>	684	</property>
685	<property stdset="1">	685	<property stdset="1">
686	<name>minValue</name>	686	<name>minValue</name>
687	<number>10</number>	687	<number>0</number>
688	</property>	688	</property>
689	<property stdset="1">	689	<property stdset="1">
690	<name>lineStep</name>	690	<name>lineStep</name>
691	<number>10</number>	691	<number>10</number>
692	</property>	692	</property>
693	</widget>	693	</widget>