summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -79,5 +79,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -86,5 +86,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -94,6 +94,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -119,5 +119,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -126,5 +126,5 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
@@ -135,6 +135,6 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
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 );
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
@@ -12,5 +12,5 @@
<x>0</x>
<y>0</y>
- <width>403</width>
+ <width>399</width>
<height>532</height>
</rect>
@@ -151,5 +151,5 @@
<property stdset="1">
<name>minValue</name>
- <number>10</number>
+ <number>0</number>
</property>
<property stdset="1">
@@ -211,5 +211,5 @@
<property stdset="1">
<name>minValue</name>
- <number>10</number>
+ <number>0</number>
</property>
<property stdset="1">
@@ -242,5 +242,5 @@
<property stdset="1">
<name>minValue</name>
- <number>10</number>
+ <number>0</number>
</property>
<property stdset="1">
@@ -594,5 +594,5 @@
<property stdset="1">
<name>minValue</name>
- <number>10</number>
+ <number>0</number>
</property>
<property stdset="1">
@@ -643,5 +643,5 @@
<property stdset="1">
<name>minValue</name>
- <number>10</number>
+ <number>0</number>
</property>
<property stdset="1">
@@ -685,5 +685,5 @@
<property stdset="1">
<name>minValue</name>
- <number>10</number>
+ <number>0</number>
</property>
<property stdset="1">