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
@@ -69,82 +69,82 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
69 CalibrateLightSensor->hide(); 69 CalibrateLightSensor->hide();
70 auto_brightness_ac_3->hide(); 70 auto_brightness_ac_3->hide();
71 CalibrateLightSensorAC->hide(); 71 CalibrateLightSensorAC->hide();
72 } 72 }
73 73
74 Config config( "apm" ); 74 Config config( "apm" );
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 );
104 int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( ); 104 int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( );
105 initbright = config.readNumEntry("Brightness",255); 105 initbright = config.readNumEntry("Brightness",255);
106 brightness->setMaxValue( maxbright ); 106 brightness->setMaxValue( maxbright );
107 brightness->setTickInterval( QMAX(1,maxbright/16) ); 107 brightness->setTickInterval( QMAX(1,maxbright/16) );
108 brightness->setLineStep( QMAX(1,maxbright/16) ); 108 brightness->setLineStep( QMAX(1,maxbright/16) );
109 brightness->setPageStep( QMAX(1,maxbright/16) ); 109 brightness->setPageStep( QMAX(1,maxbright/16) );
110 brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); 110 brightness->setValue( (maxbright*255 - initbright*maxbright)/255 );
111 111
112 // light sensor 112 // light sensor
113 auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 ); 113 auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 );
114 114
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 );
145 int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); 145 int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
146 initbright_ac = config.readNumEntry("Brightness",255); 146 initbright_ac = config.readNumEntry("Brightness",255);
147 brightness_ac_3->setMaxValue( maxbright_ac ); 147 brightness_ac_3->setMaxValue( maxbright_ac );
148 brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); 148 brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) );
149 brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); 149 brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) );
150 brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); 150 brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) );
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
@@ -2,25 +2,25 @@
2<class>LightSettingsBase</class> 2<class>LightSettingsBase</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>LightSettingsBase</cstring> 7 <cstring>LightSettingsBase</cstring>
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>
21 <hsizetype>7</hsizetype> 21 <hsizetype>7</hsizetype>
22 <vsizetype>5</vsizetype> 22 <vsizetype>5</vsizetype>
23 </sizepolicy> 23 </sizepolicy>
24 </property> 24 </property>
25 <property stdset="1"> 25 <property stdset="1">
26 <name>caption</name> 26 <name>caption</name>
@@ -141,25 +141,25 @@
141 <string>never</string> 141 <string>never</string>
142 </property> 142 </property>
143 <property stdset="1"> 143 <property stdset="1">
144 <name>buttonSymbols</name> 144 <name>buttonSymbols</name>
145 <enum>PlusMinus</enum> 145 <enum>PlusMinus</enum>
146 </property> 146 </property>
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>
160 <widget row="1" column="0" > 160 <widget row="1" column="0" >
161 <class>QLabel</class> 161 <class>QLabel</class>
162 <property stdset="1"> 162 <property stdset="1">
163 <name>name</name> 163 <name>name</name>
164 <cstring>TextLabel2_2</cstring> 164 <cstring>TextLabel2_2</cstring>
165 </property> 165 </property>
@@ -201,25 +201,25 @@
201 <string>never</string> 201 <string>never</string>
202 </property> 202 </property>
203 <property stdset="1"> 203 <property stdset="1">
204 <name>buttonSymbols</name> 204 <name>buttonSymbols</name>
205 <enum>PlusMinus</enum> 205 <enum>PlusMinus</enum>
206 </property> 206 </property>
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>
220 <widget row="2" column="1" > 220 <widget row="2" column="1" >
221 <class>QSpinBox</class> 221 <class>QSpinBox</class>
222 <property stdset="1"> 222 <property stdset="1">
223 <name>name</name> 223 <name>name</name>
224 <cstring>interval_suspend</cstring> 224 <cstring>interval_suspend</cstring>
225 </property> 225 </property>
@@ -232,25 +232,25 @@
232 <string>never</string> 232 <string>never</string>
233 </property> 233 </property>
234 <property stdset="1"> 234 <property stdset="1">
235 <name>buttonSymbols</name> 235 <name>buttonSymbols</name>
236 <enum>PlusMinus</enum> 236 <enum>PlusMinus</enum>
237 </property> 237 </property>
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>
251 <widget row="2" column="0" > 251 <widget row="2" column="0" >
252 <class>QLabel</class> 252 <class>QLabel</class>
253 <property stdset="1"> 253 <property stdset="1">
254 <name>name</name> 254 <name>name</name>
255 <cstring>TextLabel1_2</cstring> 255 <cstring>TextLabel1_2</cstring>
256 </property> 256 </property>
@@ -584,25 +584,25 @@
584 <string>never</string> 584 <string>never</string>
585 </property> 585 </property>
586 <property stdset="1"> 586 <property stdset="1">
587 <name>buttonSymbols</name> 587 <name>buttonSymbols</name>
588 <enum>PlusMinus</enum> 588 <enum>PlusMinus</enum>
589 </property> 589 </property>
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>
603 <widget row="0" column="0" > 603 <widget row="0" column="0" >
604 <class>QLabel</class> 604 <class>QLabel</class>
605 <property stdset="1"> 605 <property stdset="1">
606 <name>name</name> 606 <name>name</name>
607 <cstring>TextLabel1_3_2</cstring> 607 <cstring>TextLabel1_3_2</cstring>
608 </property> 608 </property>
@@ -633,25 +633,25 @@
633 <string>never</string> 633 <string>never</string>
634 </property> 634 </property>
635 <property stdset="1"> 635 <property stdset="1">
636 <name>buttonSymbols</name> 636 <name>buttonSymbols</name>
637 <enum>PlusMinus</enum> 637 <enum>PlusMinus</enum>
638 </property> 638 </property>
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>
652 <widget row="2" column="0" > 652 <widget row="2" column="0" >
653 <class>QLabel</class> 653 <class>QLabel</class>
654 <property stdset="1"> 654 <property stdset="1">
655 <name>name</name> 655 <name>name</name>
656 <cstring>TextLabel1_2_2_3</cstring> 656 <cstring>TextLabel1_2_2_3</cstring>
657 </property> 657 </property>
@@ -675,25 +675,25 @@
675 <string>never</string> 675 <string>never</string>
676 </property> 676 </property>
677 <property stdset="1"> 677 <property stdset="1">
678 <name>buttonSymbols</name> 678 <name>buttonSymbols</name>
679 <enum>PlusMinus</enum> 679 <enum>PlusMinus</enum>
680 </property> 680 </property>
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>
694 <widget row="1" column="0" > 694 <widget row="1" column="0" >
695 <class>QLabel</class> 695 <class>QLabel</class>
696 <property stdset="1"> 696 <property stdset="1">
697 <name>name</name> 697 <name>name</name>
698 <cstring>TextLabel2_2_2</cstring> 698 <cstring>TextLabel2_2_2</cstring>
699 </property> 699 </property>