summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp64
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui86
2 files changed, 36 insertions, 114 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index a58b1c1..8b98672 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -80,19 +80,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
80 LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); 80 LcdOffOnly-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
81 81
82 int bright = config. readNumEntry ( "Brightness", 127 ); 82 int bright = config. readNumEntry ( "Brightness", 127 );
83 int contr = config. readNumEntry ( "Contrast", 127 ); 83 int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 );
84 brightness-> setMaxValue ( m_bres - 1 ); 84 brightness-> setTickInterval ( QMAX( 16, 256 / m_bres ));
85 brightness-> setTickInterval ( QMAX( 1, m_bres / 16 )); 85 brightness-> setLineStep ( QMAX( 1, 256 / m_bres ));
86 brightness-> setLineStep ( QMAX( 1, m_bres / 16 )); 86 brightness-> setPageStep ( QMAX( 1, 256 / m_bres ));
87 brightness-> setPageStep ( QMAX( 1, m_bres / 16 )); 87 brightness-> setValue ( bright );
88 brightness-> setValue (( bright * ( m_bres - 1 ) + 127 ) / 255 );
89 88
90 if (m_cres) { 89 if (m_cres) {
91 contrast-> setMaxValue ( m_cres - 1 ); 90 contrast-> setTickInterval ( QMAX( 16, 256 / m_cres ));
92 contrast-> setTickInterval ( QMAX( 1, m_cres / 16 )); 91 contrast-> setLineStep ( QMAX( 1, 256 / m_cres ));
93 contrast-> setLineStep ( QMAX( 1, m_cres / 16 )); 92 contrast-> setPageStep ( QMAX( 1, 256 / m_cres ));
94 contrast-> setPageStep ( QMAX( 1, m_cres / 16 )); 93 contrast-> setValue ( contr );
95 contrast-> setValue (( contr * ( m_cres - 1 ) + 127 ) / 255 );
96 } 94 }
97 95
98 // light sensor 96 // light sensor
@@ -110,19 +108,17 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
110 LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); 108 LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false ));
111 109
112 bright = config. readNumEntry ( "Brightness", 255 ); 110 bright = config. readNumEntry ( "Brightness", 255 );
113 brightness_ac-> setMaxValue ( m_bres - 1 ); 111 brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres ));
114 brightness_ac-> setTickInterval ( QMAX( 1, m_bres / 16 )); 112 brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres ));
115 brightness_ac-> setLineStep ( QMAX( 1, m_bres / 16 )); 113 brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres ));
116 brightness_ac-> setPageStep ( QMAX( 1, m_bres / 16 )); 114 brightness_ac-> setValue ( bright );
117 brightness_ac-> setValue (( bright * ( m_bres - 1 ) + 127 ) / 255 );
118 115
119 if (m_cres) { 116 if (m_cres) {
120 contr = config. readNumEntry ( "Contrast", 127); 117 contr = config. readNumEntry ( "Contrast", 127);
121 contrast_ac-> setMaxValue ( m_cres - 1 ); 118 contrast_ac-> setTickInterval ( QMAX( 16, 256 / m_cres ));
122 contrast_ac-> setTickInterval ( QMAX( 1, m_cres / 16 )); 119 contrast_ac-> setLineStep ( QMAX( 1, 256 / m_cres ));
123 contrast_ac-> setLineStep ( QMAX( 1, m_cres / 16 )); 120 contrast_ac-> setPageStep ( QMAX( 1, 256 / m_cres ));
124 contrast_ac-> setPageStep ( QMAX( 1, m_cres / 16 )); 121 contrast_ac-> setValue ( contr );
125 contrast_ac-> setValue (( contr * ( m_cres - 1 ) + 127 ) / 255 );
126 } 122 }
127 123
128 // light sensor 124 // light sensor
@@ -147,7 +143,7 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
147 143
148 connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); 144 connect ( brightness, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
149 connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); 145 connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int )));
150 if (m_havecontrast) { 146 if (m_cres) {
151 connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); 147 connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
152 connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); 148 connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int )));
153 } 149 }
@@ -177,30 +173,20 @@ void LightSettings::calibrateSensorAC ( )
177 173
178void LightSettings::setBacklight ( int bright ) 174void LightSettings::setBacklight ( int bright )
179{ 175{
180 if ( bright >= 0 )
181 bright = bright * 255 / ( m_bres - 1 );
182
183 QCopEnvelope e ( "QPE/System", "setBacklight(int)" ); 176 QCopEnvelope e ( "QPE/System", "setBacklight(int)" );
184 e << bright; 177 e << bright;
185 178
186 if ( bright != -1 ) { 179 if ( bright != -1 ) {
187 m_resettimer-> stop ( ); 180 m_resettimer-> stop ( );
188 m_resettimer-> start ( 2000, true ); 181 m_resettimer-> start ( 4000, true );
189 } 182 }
190} 183}
191 184
192void LightSettings::setContrast ( int contr ) 185void LightSettings::setContrast ( int contr )
193{ 186{
194 if ( contr >= 0 ) 187 if (contr == -1) contr = m_oldcontrast;
195 contr = contr * 255 / ( m_cres - 1 );
196
197 QCopEnvelope e ( "QPE/System", "setContrast(int)" );
198 e << contr;
199 188
200 if ( contr != -1 ) { 189 ODevice::inst ( )-> setDisplayContrast(contr);
201 m_resettimer-> stop ( );
202 m_resettimer-> start ( 2000, true );
203 }
204} 190}
205 191
206void LightSettings::resetBacklight ( ) 192void LightSettings::resetBacklight ( )
@@ -219,9 +205,9 @@ void LightSettings::accept ( )
219 config. writeEntry ( "Dim", interval_dim-> value ( )); 205 config. writeEntry ( "Dim", interval_dim-> value ( ));
220 config. writeEntry ( "LightOff", interval_lightoff-> value ( )); 206 config. writeEntry ( "LightOff", interval_lightoff-> value ( ));
221 config. writeEntry ( "Suspend", interval_suspend-> value ( )); 207 config. writeEntry ( "Suspend", interval_suspend-> value ( ));
222 config. writeEntry ( "Brightness", brightness-> value ( ) * 255 / ( m_bres - 1 ) ); 208 config. writeEntry ( "Brightness", brightness-> value () );
223 if (m_cres) 209 if (m_cres)
224 config. writeEntry ( "Contrast", contrast-> value ( ) * 255 / ( m_cres - 1 ) ); 210 config. writeEntry ( "Contrast", contrast-> value () );
225 211
226 // ac 212 // ac
227 config. setGroup ( "AC" ); 213 config. setGroup ( "AC" );
@@ -229,9 +215,9 @@ void LightSettings::accept ( )
229 config. writeEntry ( "Dim", interval_dim_ac-> value ( )); 215 config. writeEntry ( "Dim", interval_dim_ac-> value ( ));
230 config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); 216 config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( ));
231 config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); 217 config. writeEntry ( "Suspend", interval_suspend_ac-> value ( ));
232 config. writeEntry ( "Brightness", brightness_ac-> value ( ) * 255 / ( m_bres - 1 )); 218 config. writeEntry ( "Brightness", brightness_ac-> value () );
233 if (m_cres) 219 if (m_cres)
234 config. writeEntry ( "Contrast", contrast_ac-> value ( ) * 255 / ( m_cres - 1 )); 220 config. writeEntry ( "Contrast", contrast_ac-> value () );
235 221
236 // only make light sensor stuff appear if the unit has a sensor 222 // only make light sensor stuff appear if the unit has a sensor
237 if ( ODevice::inst ( )-> hasLightSensor ( )) { 223 if ( ODevice::inst ( )-> hasLightSensor ( )) {
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index 8fdd604..884c21c 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>355</width> 14 <width>347</width>
15 <height>532</height> 15 <height>532</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
@@ -80,7 +80,7 @@
80 <class>QGroupBox</class> 80 <class>QGroupBox</class>
81 <property stdset="1"> 81 <property stdset="1">
82 <name>name</name> 82 <name>name</name>
83 <cstring>GroupBox3</cstring> 83 <cstring>Group1</cstring>
84 </property> 84 </property>
85 <property stdset="1"> 85 <property stdset="1">
86 <name>enabled</name> 86 <name>enabled</name>
@@ -140,7 +140,7 @@
140 <class>QLabel</class> 140 <class>QLabel</class>
141 <property stdset="1"> 141 <property stdset="1">
142 <name>name</name> 142 <name>name</name>
143 <cstring>TextLabel2_2</cstring> 143 <cstring>TL2</cstring>
144 </property> 144 </property>
145 <property stdset="1"> 145 <property stdset="1">
146 <name>sizePolicy</name> 146 <name>sizePolicy</name>
@@ -158,7 +158,7 @@
158 <class>QLabel</class> 158 <class>QLabel</class>
159 <property stdset="1"> 159 <property stdset="1">
160 <name>name</name> 160 <name>name</name>
161 <cstring>TextLabel1_3</cstring> 161 <cstring>TL1</cstring>
162 </property> 162 </property>
163 <property stdset="1"> 163 <property stdset="1">
164 <name>sizePolicy</name> 164 <name>sizePolicy</name>
@@ -238,7 +238,7 @@
238 <class>QLabel</class> 238 <class>QLabel</class>
239 <property stdset="1"> 239 <property stdset="1">
240 <name>name</name> 240 <name>name</name>
241 <cstring>TextLabel1_2</cstring> 241 <cstring>TL3</cstring>
242 </property> 242 </property>
243 <property stdset="1"> 243 <property stdset="1">
244 <name>sizePolicy</name> 244 <name>sizePolicy</name>
@@ -308,18 +308,6 @@
308 <number>255</number> 308 <number>255</number>
309 </property> 309 </property>
310 <property stdset="1"> 310 <property stdset="1">
311 <name>lineStep</name>
312 <number>1</number>
313 </property>
314 <property stdset="1">
315 <name>pageStep</name>
316 <number>16</number>
317 </property>
318 <property stdset="1">
319 <name>tracking</name>
320 <bool>true</bool>
321 </property>
322 <property stdset="1">
323 <name>orientation</name> 311 <name>orientation</name>
324 <enum>Horizontal</enum> 312 <enum>Horizontal</enum>
325 </property> 313 </property>
@@ -327,10 +315,6 @@
327 <name>tickmarks</name> 315 <name>tickmarks</name>
328 <enum>Right</enum> 316 <enum>Right</enum>
329 </property> 317 </property>
330 <property stdset="1">
331 <name>tickInterval</name>
332 <number>32</number>
333 </property>
334 <property> 318 <property>
335 <name>whatsThis</name> 319 <name>whatsThis</name>
336 <string>set a fix value for backlight</string> 320 <string>set a fix value for backlight</string>
@@ -347,18 +331,6 @@
347 <number>255</number> 331 <number>255</number>
348 </property> 332 </property>
349 <property stdset="1"> 333 <property stdset="1">
350 <name>lineStep</name>
351 <number>1</number>
352 </property>
353 <property stdset="1">
354 <name>pageStep</name>
355 <number>16</number>
356 </property>
357 <property stdset="1">
358 <name>tracking</name>
359 <bool>true</bool>
360 </property>
361 <property stdset="1">
362 <name>orientation</name> 334 <name>orientation</name>
363 <enum>Horizontal</enum> 335 <enum>Horizontal</enum>
364 </property> 336 </property>
@@ -366,10 +338,6 @@
366 <name>tickmarks</name> 338 <name>tickmarks</name>
367 <enum>Right</enum> 339 <enum>Right</enum>
368 </property> 340 </property>
369 <property stdset="1">
370 <name>tickInterval</name>
371 <number>32</number>
372 </property>
373 <property> 341 <property>
374 <name>whatsThis</name> 342 <name>whatsThis</name>
375 <string>set a fix value for contrast</string> 343 <string>set a fix value for contrast</string>
@@ -412,7 +380,7 @@
412 <class>QLabel</class> 380 <class>QLabel</class>
413 <property stdset="1"> 381 <property stdset="1">
414 <name>name</name> 382 <name>name</name>
415 <cstring>TextLabel4</cstring> 383 <cstring>TL4</cstring>
416 </property> 384 </property>
417 <property stdset="1"> 385 <property stdset="1">
418 <name>text</name> 386 <name>text</name>
@@ -444,7 +412,7 @@
444 <class>QLabel</class> 412 <class>QLabel</class>
445 <property stdset="1"> 413 <property stdset="1">
446 <name>name</name> 414 <name>name</name>
447 <cstring>TextLabel5</cstring> 415 <cstring>TL5</cstring>
448 </property> 416 </property>
449 <property stdset="1"> 417 <property stdset="1">
450 <name>text</name> 418 <name>text</name>
@@ -566,7 +534,7 @@
566 <class>QGroupBox</class> 534 <class>QGroupBox</class>
567 <property stdset="1"> 535 <property stdset="1">
568 <name>name</name> 536 <name>name</name>
569 <cstring>GroupBox4</cstring> 537 <cstring>Group3</cstring>
570 </property> 538 </property>
571 <property stdset="1"> 539 <property stdset="1">
572 <name>enabled</name> 540 <name>enabled</name>
@@ -762,7 +730,7 @@
762 <class>QGroupBox</class> 730 <class>QGroupBox</class>
763 <property stdset="1"> 731 <property stdset="1">
764 <name>name</name> 732 <name>name</name>
765 <cstring>GroupBox8</cstring> 733 <cstring>Group4</cstring>
766 </property> 734 </property>
767 <property stdset="1"> 735 <property stdset="1">
768 <name>title</name> 736 <name>title</name>
@@ -790,30 +758,14 @@
790 <cstring>brightness_ac</cstring> 758 <cstring>brightness_ac</cstring>
791 </property> 759 </property>
792 <property stdset="1"> 760 <property stdset="1">
793 <name>minValue</name>
794 <number>0</number>
795 </property>
796 <property stdset="1">
797 <name>maxValue</name> 761 <name>maxValue</name>
798 <number>255</number> 762 <number>255</number>
799 </property> 763 </property>
800 <property stdset="1"> 764 <property stdset="1">
801 <name>lineStep</name>
802 <number>16</number>
803 </property>
804 <property stdset="1">
805 <name>pageStep</name>
806 <number>16</number>
807 </property>
808 <property stdset="1">
809 <name>value</name> 765 <name>value</name>
810 <number>255</number> 766 <number>255</number>
811 </property> 767 </property>
812 <property stdset="1"> 768 <property stdset="1">
813 <name>tracking</name>
814 <bool>true</bool>
815 </property>
816 <property stdset="1">
817 <name>orientation</name> 769 <name>orientation</name>
818 <enum>Horizontal</enum> 770 <enum>Horizontal</enum>
819 </property> 771 </property>
@@ -833,30 +785,14 @@
833 <cstring>contrast_ac</cstring> 785 <cstring>contrast_ac</cstring>
834 </property> 786 </property>
835 <property stdset="1"> 787 <property stdset="1">
836 <name>minValue</name>
837 <number>0</number>
838 </property>
839 <property stdset="1">
840 <name>maxValue</name> 788 <name>maxValue</name>
841 <number>255</number> 789 <number>255</number>
842 </property> 790 </property>
843 <property stdset="1"> 791 <property stdset="1">
844 <name>lineStep</name>
845 <number>16</number>
846 </property>
847 <property stdset="1">
848 <name>pageStep</name>
849 <number>16</number>
850 </property>
851 <property stdset="1">
852 <name>value</name> 792 <name>value</name>
853 <number>255</number> 793 <number>255</number>
854 </property> 794 </property>
855 <property stdset="1"> 795 <property stdset="1">
856 <name>tracking</name>
857 <bool>true</bool>
858 </property>
859 <property stdset="1">
860 <name>orientation</name> 796 <name>orientation</name>
861 <enum>Horizontal</enum> 797 <enum>Horizontal</enum>
862 </property> 798 </property>
@@ -866,7 +802,7 @@
866 </property> 802 </property>
867 <property> 803 <property>
868 <name>whatsThis</name> 804 <name>whatsThis</name>
869 <string>set a fix value for backlight</string> 805 <string>set a fix value for contrast</string>
870 </property> 806 </property>
871 </widget> 807 </widget>
872 <widget> 808 <widget>
@@ -1060,7 +996,7 @@
1060 <class>QGroupBox</class> 996 <class>QGroupBox</class>
1061 <property stdset="1"> 997 <property stdset="1">
1062 <name>name</name> 998 <name>name</name>
1063 <cstring>GroupBox5</cstring> 999 <cstring>Group5</cstring>
1064 </property> 1000 </property>
1065 <property stdset="1"> 1001 <property stdset="1">
1066 <name>title</name> 1002 <name>title</name>