summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp16
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui14
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
@@ -78,14 +78,14 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 }
@@ -93,8 +93,8 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 }
@@ -118,14 +118,14 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 }
@@ -134,8 +134,8 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 }
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
@@ -11,7 +11,7 @@
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>
@@ -150,7 +150,7 @@
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>
@@ -210,7 +210,7 @@
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>
@@ -241,7 +241,7 @@
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>
@@ -593,7 +593,7 @@
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>
@@ -642,7 +642,7 @@
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>
@@ -684,7 +684,7 @@
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>