LCD only off on suspend patch

2 files changed, 39 insertions, 26 deletions

diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 24e1fab..960a165 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -68,6 +68,7 @@ LightSettings::LightSettings( QWidget* parent,  const char* name, WFlags fl )
 
     screensaver_dim->setChecked( config.readNumEntry("Dim",1) != 0 );
     screensaver_lightoff->setChecked( config.readNumEntry("LightOff",1) != 0 );
+    LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
     int maxbright = qpe_sysBrightnessSteps();
     initbright = config.readNumEntry("Brightness",255);
     brightness->setMaxValue( maxbright );
@@ -113,6 +114,7 @@ void LightSettings::accept()
     config.setGroup( "Screensaver" );
     config.writeEntry( "Dim", (int)screensaver_dim->isChecked() );
     config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() );
+    config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
     config.writeEntry( "Interval_Dim", interval_dim->value() );
     config.writeEntry( "Interval_LightOff", interval_lightoff->value() );
     config.writeEntry( "Interval", interval_suspend->value() );
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 47775f7..f2a4552 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -11,8 +11,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>256</width>
-            <height>316</height>
+            <width>269</width>
+            <height>317</height>
         </rect>
     </property>
     <property stdset="1">
@@ -65,11 +65,11 @@
             <grid>
                 <property stdset="1">
                     <name>margin</name>
-                    <number>6</number>
+                    <number>11</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
-                    <number>3</number>
+                    <number>6</number>
                 </property>
                 <widget row="1"  column="1" >
                     <class>QSpinBox</class>
@@ -125,28 +125,6 @@
                         <number>15</number>
                     </property>
                 </widget>
-                <widget row="1"  column="0" >
-                    <class>QCheckBox</class>
-                    <property stdset="1">
-                        <name>name</name>
-                        <cstring>screensaver_lightoff</cstring>
-                    </property>
-                    <property stdset="1">
-                        <name>sizePolicy</name>
-                        <sizepolicy>
-                            <hsizetype>1</hsizetype>
-                            <vsizetype>0</vsizetype>
-                        </sizepolicy>
-                    </property>
-                    <property stdset="1">
-                        <name>text</name>
-                        <string>Light off after</string>
-                    </property>
-                    <property stdset="1">
-                        <name>checked</name>
-                        <bool>true</bool>
-                    </property>
-                </widget>
                 <widget row="0"  column="0" >
                     <class>QCheckBox</class>
                     <property stdset="1">
@@ -207,6 +185,39 @@
                         <string>Suspend after</string>
                     </property>
                 </widget>
+                <widget row="3"  column="0"  rowspan="1"  colspan="2" >
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>LcdOffOnly</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Only deactivate LCD during Suspend</string>
+                    </property>
+                </widget>
+                <widget row="1"  column="0" >
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>screensaver_lightoff</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>1</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Light off after</string>
+                    </property>
+                    <property stdset="1">
+                        <name>checked</name>
+                        <bool>true</bool>
+                    </property>
+                </widget>
             </grid>
         </widget>
         <widget>