summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp22
-rw-r--r--core/settings/light-and-power/lightsettingsbase.ui117
2 files changed, 122 insertions, 17 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index 97120f2..77c6b40 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -54,17 +54,15 @@
54#include <opie/odevice.h> 54#include <opie/odevice.h>
55 55
56using namespace Opie; 56using namespace Opie;
57 57
58LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl ) 58LightSettings::LightSettings( QWidget* parent, const char* name, WFlags )
59 : LightSettingsBase( parent, name, TRUE, fl ) 59 : LightSettingsBase( parent, name, TRUE, WStyle_ContextHelp )
60{ 60{
61 61
62 if ( ODevice::inst()->hasLightSensor() ) { 62 if ( ODevice::inst()->hasLightSensor() ) {
63 // Not supported yet - hide until implemented 63 // Not supported yet - hide until implemented
64 auto_brightness->setEnabled( false );
65 CalibrateLightSensor->setEnabled( false ); 64 CalibrateLightSensor->setEnabled( false );
66 auto_brightness_ac_3->setEnabled( false );
67 CalibrateLightSensorAC->setEnabled( false ); 65 CalibrateLightSensorAC->setEnabled( false );
68 } else { 66 } else {
69 // if ipaq no need to show the sensor box 67 // if ipaq no need to show the sensor box
70 auto_brightness->hide(); 68 auto_brightness->hide();
@@ -74,11 +72,9 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
74 } 72 }
75 73
76 Config config( "qpe" ); 74 Config config( "qpe" );
77 config.setGroup( "Screensaver" ); 75 config.setGroup( "Screensaver" );
78
79 int interval; 76 int interval;
80
81 // battery spinboxes 77 // battery spinboxes
82 interval = config.readNumEntry( "Interval_Dim", 20 ); 78 interval = config.readNumEntry( "Interval_Dim", 20 );
83 if ( config.readNumEntry("Dim",1) == 0 ) { 79 if ( config.readNumEntry("Dim",1) == 0 ) {
84 interval_dim->setSpecialValueText( tr("never") ); 80 interval_dim->setSpecialValueText( tr("never") );
@@ -123,12 +119,8 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
123 } 119 }
124 120
125 121
126 // battery check and slider 122 // battery check and slider
127
128
129
130
131 LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 ); 123 LcdOffOnly->setChecked( config.readNumEntry("LcdOffOnly",0) != 0 );
132 int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( ); 124 int maxbright = ODevice::inst ( )-> displayBrightnessResolution ( );
133 initbright = config.readNumEntry("Brightness",255); 125 initbright = config.readNumEntry("Brightness",255);
134 brightness->setMaxValue( maxbright ); 126 brightness->setMaxValue( maxbright );
@@ -149,10 +141,10 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
149 141
150 142
151 // ipaq sensor 143 // ipaq sensor
152 config.setGroup( "Ipaqlightsensor" ); 144 config.setGroup( "Ipaqlightsensor" );
153 auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); 145 auto_brightness->setChecked( config.readNumEntry("LightSensor",0) != 0 );
154 auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); 146 auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",0) != 0 );
155 //LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); 147 //LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) );
156 //LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); 148 //LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) );
157 //connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; 149 //connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ;
158 //LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); 150 //LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) );
@@ -167,10 +159,9 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
167 connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) ); 159 connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
168 connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) ); 160 connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) );
169} 161}
170 162
171LightSettings::~LightSettings() 163LightSettings::~LightSettings() {
172{
173} 164}
174 165
175void LightSettings::slotSliderTicks( int steps ) { 166void LightSettings::slotSliderTicks( int steps ) {
176// LightMinValueSlider->setTickInterval( steps ); 167// LightMinValueSlider->setTickInterval( steps );
@@ -185,9 +176,8 @@ static void set_fl(int bright)
185 176
186void LightSettings::reject() 177void LightSettings::reject()
187{ 178{
188 set_fl(initbright); 179 set_fl(initbright);
189
190 QDialog::reject(); 180 QDialog::reject();
191} 181}
192 182
193void LightSettings::accept() 183void LightSettings::accept()
@@ -283,6 +273,6 @@ void LightSettings::applyBrightnessAC()
283 273
284void LightSettings::done(int r) 274void LightSettings::done(int r)
285{ 275{
286 QDialog::done(r); 276 QDialog::done(r);
287 close ( ); 277 close ();
288} 278}
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui
index fee5c2c..effa460 100644
--- a/core/settings/light-and-power/lightsettingsbase.ui
+++ b/core/settings/light-and-power/lightsettingsbase.ui
@@ -332,8 +332,12 @@
332 <property stdset="1"> 332 <property stdset="1">
333 <name>tickInterval</name> 333 <name>tickInterval</name>
334 <number>32</number> 334 <number>32</number>
335 </property> 335 </property>
336 <property>
337 <name>whatsThis</name>
338 <string>set a fix value for backlight</string>
339 </property>
336 </widget> 340 </widget>
337 <widget> 341 <widget>
338 <class>QLayoutWidget</class> 342 <class>QLayoutWidget</class>
339 <property stdset="1"> 343 <property stdset="1">
@@ -463,8 +467,12 @@
463 <property stdset="1"> 467 <property stdset="1">
464 <name>text</name> 468 <name>text</name>
465 <string>Calibrate</string> 469 <string>Calibrate</string>
466 </property> 470 </property>
471 <property>
472 <name>whatsThis</name>
473 <string>Advanced settings for light sensor handling</string>
474 </property>
467 </widget> 475 </widget>
468 </hbox> 476 </hbox>
469 </widget> 477 </widget>
470 </vbox> 478 </vbox>
@@ -771,8 +779,12 @@
771 <property stdset="1"> 779 <property stdset="1">
772 <name>tickmarks</name> 780 <name>tickmarks</name>
773 <enum>Right</enum> 781 <enum>Right</enum>
774 </property> 782 </property>
783 <property>
784 <name>whatsThis</name>
785 <string>set a fix value for backlight</string>
786 </property>
775 </widget> 787 </widget>
776 <widget> 788 <widget>
777 <class>QLayoutWidget</class> 789 <class>QLayoutWidget</class>
778 <property stdset="1"> 790 <property stdset="1">
@@ -902,8 +914,12 @@
902 <property stdset="1"> 914 <property stdset="1">
903 <name>text</name> 915 <name>text</name>
904 <string>Calibrate</string> 916 <string>Calibrate</string>
905 </property> 917 </property>
918 <property>
919 <name>whatsThis</name>
920 <string>Advanced settings for light sensor handling</string>
921 </property>
906 </widget> 922 </widget>
907 </hbox> 923 </hbox>
908 </widget> 924 </widget>
909 </vbox> 925 </vbox>
@@ -1173,12 +1189,111 @@
1173 <name>image2</name> 1189 <name>image2</name>
1174 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data> 1190 <data format="XPM.GZ" length="424">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022130543251d2e253d856405bffcbc54105b19c856360003103711c4354b344b314b04719340dcb434b31488ac1e1a2020a6acac8c2ea60cc54862606ea232b218541b5810452c3111432c510f550c22886a1e482c115d0c2c88e6168818babaa4a42462c48082cae8e68102011a06b5d65c0041d3518e</data>
1175 </image> 1191 </image>
1176</images> 1192</images>
1193<connections>
1194 <connection>
1195 <sender>auto_brightness</sender>
1196 <signal>toggled(bool)</signal>
1197 <receiver>brightness</receiver>
1198 <slot>setDisabled(bool)</slot>
1199 </connection>
1200 <connection>
1201 <sender>auto_brightness_ac_3</sender>
1202 <signal>toggled(bool)</signal>
1203 <receiver>brightness_ac_3</receiver>
1204 <slot>setDisabled(bool)</slot>
1205 </connection>
1206 <connection>
1207 <sender>auto_brightness_ac_3</sender>
1208 <signal>toggled(bool)</signal>
1209 <receiver>TextLabel1_3_2</receiver>
1210 <slot>setDisabled(bool)</slot>
1211 </connection>
1212 <connection>
1213 <sender>auto_brightness</sender>
1214 <signal>toggled(bool)</signal>
1215 <receiver>TextLabel1_3</receiver>
1216 <slot>setDisabled(bool)</slot>
1217 </connection>
1218 <connection>
1219 <sender>auto_brightness</sender>
1220 <signal>toggled(bool)</signal>
1221 <receiver>interval_dim</receiver>
1222 <slot>setDisabled(bool)</slot>
1223 </connection>
1224 <connection>
1225 <sender>auto_brightness_ac_3</sender>
1226 <signal>toggled(bool)</signal>
1227 <receiver>interval_dim_ac_3</receiver>
1228 <slot>setDisabled(bool)</slot>
1229 </connection>
1230 <connection>
1231 <sender>auto_brightness</sender>
1232 <signal>toggled(bool)</signal>
1233 <receiver>PixmapLabel2</receiver>
1234 <slot>setDisabled(bool)</slot>
1235 </connection>
1236 <connection>
1237 <sender>auto_brightness</sender>
1238 <signal>toggled(bool)</signal>
1239 <receiver>TextLabel4</receiver>
1240 <slot>setDisabled(bool)</slot>
1241 </connection>
1242 <connection>
1243 <sender>auto_brightness</sender>
1244 <signal>toggled(bool)</signal>
1245 <receiver>TextLabel5</receiver>
1246 <slot>setDisabled(bool)</slot>
1247 </connection>
1248 <connection>
1249 <sender>auto_brightness</sender>
1250 <signal>toggled(bool)</signal>
1251 <receiver>PixmapLabel1</receiver>
1252 <slot>setDisabled(bool)</slot>
1253 </connection>
1254 <connection>
1255 <sender>auto_brightness_ac_3</sender>
1256 <signal>toggled(bool)</signal>
1257 <receiver>PixmapLabel2_2_3</receiver>
1258 <slot>setDisabled(bool)</slot>
1259 </connection>
1260 <connection>
1261 <sender>auto_brightness_ac_3</sender>
1262 <signal>toggled(bool)</signal>
1263 <receiver>TextLabel6</receiver>
1264 <slot>setDisabled(bool)</slot>
1265 </connection>
1266 <connection>
1267 <sender>auto_brightness_ac_3</sender>
1268 <signal>toggled(bool)</signal>
1269 <receiver>TextLabel7</receiver>
1270 <slot>setDisabled(bool)</slot>
1271 </connection>
1272 <connection>
1273 <sender>auto_brightness_ac_3</sender>
1274 <signal>toggled(bool)</signal>
1275 <receiver>PixmapLabel1_2_3</receiver>
1276 <slot>setDisabled(bool)</slot>
1277 </connection>
1278</connections>
1177<tabstops> 1279<tabstops>
1178 <tabstop>auto_brightness</tabstop>
1179 <tabstop>interval_dim</tabstop> 1280 <tabstop>interval_dim</tabstop>
1180 <tabstop>interval_lightoff</tabstop> 1281 <tabstop>interval_lightoff</tabstop>
1181 <tabstop>interval_suspend</tabstop> 1282 <tabstop>interval_suspend</tabstop>
1283 <tabstop>LcdOffOnly</tabstop>
1182 <tabstop>brightness</tabstop> 1284 <tabstop>brightness</tabstop>
1285 <tabstop>auto_brightness</tabstop>
1286 <tabstop>CalibrateLightSensor</tabstop>
1287 <tabstop>TabWidget3</tabstop>
1288 <tabstop>interval_lightoff_ac_3</tabstop>
1289 <tabstop>interval_suspend_ac_3</tabstop>
1290 <tabstop>interval_dim_ac_3</tabstop>
1291 <tabstop>LcdOffOnly_2_3</tabstop>
1292 <tabstop>brightness_ac_3</tabstop>
1293 <tabstop>auto_brightness_ac_3</tabstop>
1294 <tabstop>CalibrateLightSensorAC</tabstop>
1295 <tabstop>lowSpinBox</tabstop>
1296 <tabstop>warnintervalBox</tabstop>
1297 <tabstop>criticalSpinBox</tabstop>
1183</tabstops> 1298</tabstops>
1184</UI> 1299</UI>