summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/settings/light-and-power/light.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index da36826..0193a7b 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -107,164 +107,164 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags fl )
107 initbright = config.readNumEntry("Brightness",255); 107 initbright = config.readNumEntry("Brightness",255);
108 brightness->setMaxValue( maxbright ); 108 brightness->setMaxValue( maxbright );
109 brightness->setTickInterval( QMAX(1,maxbright/16) ); 109 brightness->setTickInterval( QMAX(1,maxbright/16) );
110 brightness->setLineStep( QMAX(1,maxbright/16) ); 110 brightness->setLineStep( QMAX(1,maxbright/16) );
111 brightness->setPageStep( QMAX(1,maxbright/16) ); 111 brightness->setPageStep( QMAX(1,maxbright/16) );
112 brightness->setValue( (maxbright*255 - initbright*maxbright)/255 ); 112 brightness->setValue( (maxbright*255 - initbright*maxbright)/255 );
113 113
114 // ac check and slider 114 // ac check and slider
115 screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 ); 115 screensaver_dim_ac_3->setChecked( config.readNumEntry("DimAC",1) != 0 );
116 screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 ); 116 screensaver_lightoff_ac_3->setChecked( config.readNumEntry("LightOffAC",1) != 0 );
117 LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 ); 117 LcdOffOnly_2_3->setChecked( config.readNumEntry("LcdOffOnlyAC",0) != 0 );
118 int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( ); 118 int maxbright_ac = ODevice::inst ( )-> displayBrightnessResolution ( );
119 initbright_ac = config.readNumEntry("BrightnessAC",255); 119 initbright_ac = config.readNumEntry("BrightnessAC",255);
120 brightness_ac_3->setMaxValue( maxbright_ac ); 120 brightness_ac_3->setMaxValue( maxbright_ac );
121 brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) ); 121 brightness_ac_3->setTickInterval( QMAX(1,maxbright_ac/16) );
122 brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) ); 122 brightness_ac_3->setLineStep( QMAX(1,maxbright_ac/16) );
123 brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) ); 123 brightness_ac_3->setPageStep( QMAX(1,maxbright_ac/16) );
124 brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 ); 124 brightness_ac_3->setValue( (maxbright_ac*255 - initbright_ac*maxbright_ac)/255 );
125 125
126 126
127 // ipaq sensor 127 // ipaq sensor
128 config.setGroup( "Ipaq_light_sensor" ); 128 config.setGroup( "Ipaq_light_sensor" );
129 auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 ); 129 auto_brightness->setChecked( config.readNumEntry("LightSensor",1) != 0 );
130 auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 ); 130 auto_brightness_ac_3->setChecked( config.readNumEntry("LightSensorAC",1) != 0 );
131 LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) ); 131 LightStepSpin->setValue( config.readNumEntry("Steps", 10 ) );
132 LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) ); 132 LightMinValueSlider->setValue( config.readNumEntry("MinValue", 70 ) );
133 connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ; 133 connect( LightStepSpin, SIGNAL( valueChanged( int ) ), this, SLOT( slotSliderTicks( int ) ) ) ;
134 LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) ); 134 LightShiftSpin->setValue( config.readNumEntry("Shift", 0 ) );
135 135
136 // advanced settings 136 // advanced settings
137 Config conf("apm"); 137 Config conf("apm");
138 conf.setGroup( "warnings" ); 138 conf.setGroup( "warnings" );
139 warnintervalBox->setValue( conf.readNumEntry("checkinterval", 10000)/1000 ); 139 warnintervalBox->setValue( conf.readNumEntry("checkinterval", 10000)/1000 );
140 lowSpinBox->setValue( conf.readNumEntry("powerverylow", 10 ) ); 140 lowSpinBox->setValue( conf.readNumEntry("powerverylow", 10 ) );
141 criticalSpinBox->setValue( conf.readNumEntry("powercritical", 5 ) ); 141 criticalSpinBox->setValue( conf.readNumEntry("powercritical", 5 ) );
142 142
143 143
144 144
145 connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) ); 145 connect( brightness, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightness() ) );
146 connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) ); 146 connect( brightness_ac_3, SIGNAL( valueChanged(int) ), this, SLOT( applyBrightnessAC() ) );
147} 147}
148 148
149LightSettings::~LightSettings() 149LightSettings::~LightSettings()
150{ 150{
151} 151}
152 152
153void LightSettings::slotSliderTicks( int steps ) { 153void LightSettings::slotSliderTicks( int steps ) {
154 LightMinValueSlider->setTickInterval( steps ); 154 LightMinValueSlider->setTickInterval( steps );
155} 155}
156 156
157static void set_fl(int bright) 157static void set_fl(int bright)
158{ 158{
159 qDebug ( QString( "Brightness" ).arg( bright ) ); 159 qDebug ( QString( "Brightness" ).arg( bright ) );
160 QCopEnvelope e("QPE/System", "setBacklight(int)" ); 160 QCopEnvelope e("QPE/System", "setBacklight(int)" );
161 e << bright; 161 e << bright;
162} 162}
163 163
164void LightSettings::reject() 164void LightSettings::reject()
165{ 165{
166 set_fl(initbright); 166 set_fl(initbright);
167 167
168 QDialog::reject(); 168 QDialog::reject();
169} 169}
170 170
171void LightSettings::accept() 171void LightSettings::accept()
172{ 172{
173 if ( qApp->focusWidget() ) 173 if ( qApp->focusWidget() )
174 qApp->focusWidget()->clearFocus(); 174 qApp->focusWidget()->clearFocus();
175 175
176 applyBrightness(); 176 applyBrightness();
177 177
178 // bat 178 // bat
179 int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0); 179 int i_dim = (screensaver_dim->isChecked() ? interval_dim->value() : 0);
180 int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0); 180 int i_lightoff = (screensaver_lightoff->isChecked() ? interval_lightoff->value() : 0);
181 int i_suspend = interval_suspend->value(); 181 int i_suspend = interval_suspend->value();
182 QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" ); 182 QCopEnvelope e("QPE/System", "setScreenSaverIntervals(int,int,int)" );
183 e << i_dim << i_lightoff << i_suspend; 183 e << i_dim << i_lightoff << i_suspend;
184 184
185 // ac 185 // ac
186 int i_dim_ac = (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0); 186 int i_dim_ac = (screensaver_dim_ac_3->isChecked() ? interval_dim_ac_3->value() : 0);
187 int i_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0); 187 int i_lightoff_ac = (screensaver_lightoff_ac_3->isChecked() ? interval_lightoff_ac_3->value() : 0);
188 int i_suspend_ac = interval_suspend_ac_3->value(); 188 int i_suspend_ac = interval_suspend_ac_3->value();
189 QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" ); 189 QCopEnvelope e_ac("QPE/System", "setScreenSaverIntervalsAC(int,int,int)" );
190 e << i_dim_ac << i_lightoff_ac << i_suspend_ac; 190 e << i_dim_ac << i_lightoff_ac << i_suspend_ac;
191 191
192 Config config( "qpe" ); 192 Config config( "qpe" );
193 config.setGroup( "Screensaver" ); 193 config.setGroup( "Screensaver" );
194 194
195 // bat 195 // bat
196 config.writeEntry( "Dim", (int)screensaver_dim->isChecked() ); 196 config.writeEntry( "Dim", (int)screensaver_dim->isChecked() );
197 config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() ); 197 config.writeEntry( "LightOff", (int)screensaver_lightoff->isChecked() );
198 config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() ); 198 config.writeEntry( "LcdOffOnly", (int)LcdOffOnly->isChecked() );
199 config.writeEntry( "Interval_Dim", interval_dim->value() ); 199 config.writeEntry( "Interval_Dim", interval_dim->value() );
200 config.writeEntry( "Interval_LightOff", interval_lightoff->value() ); 200 config.writeEntry( "Interval_LightOff", interval_lightoff->value() );
201 config.writeEntry( "Interval", interval_suspend->value() ); 201 config.writeEntry( "Interval", interval_suspend->value() );
202 config.writeEntry( "Brightness", 202 config.writeEntry( "Brightness",
203 (brightness->maxValue()-brightness->value())*255/brightness->maxValue() ); 203 ( brightness->value() ) * 255 / brightness->maxValue() );
204 204
205 // ac 205 // ac
206 config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() ); 206 config.writeEntry( "DimAC", (int)screensaver_dim_ac_3->isChecked() );
207 config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() ); 207 config.writeEntry( "LightOffAC", (int)screensaver_lightoff_ac_3->isChecked() );
208 config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() ); 208 config.writeEntry( "LcdOffOnlyAC", (int)LcdOffOnly_2_3->isChecked() );
209 config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() ); 209 config.writeEntry( "Interval_DimAC", interval_dim_ac_3->value() );
210 config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() ); 210 config.writeEntry( "Interval_LightOffAC", interval_lightoff_ac_3->value() );
211 config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() ); 211 config.writeEntry( "IntervalAC", interval_suspend_ac_3->value() );
212 config.writeEntry( "BrightnessAC", 212 config.writeEntry( "BrightnessAC",
213 (brightness_ac_3->maxValue() - brightness_ac_3->value())*255/brightness_ac_3->maxValue() ); 213 ( brightness_ac_3->value()) * 255 / brightness_ac_3->maxValue() );
214 214
215 215
216 // only make ipaq light sensor entries in config file if on an ipaq 216 // only make ipaq light sensor entries in config file if on an ipaq
217 if ( ODevice::inst()->model() == Model_iPAQ_H31xx || 217 if ( ODevice::inst()->model() == Model_iPAQ_H31xx ||
218 ODevice::inst()->model() == Model_iPAQ_H36xx || 218 ODevice::inst()->model() == Model_iPAQ_H36xx ||
219 ODevice::inst()->model() == Model_iPAQ_H37xx || 219 ODevice::inst()->model() == Model_iPAQ_H37xx ||
220 ODevice::inst()->model() == Model_iPAQ_H38xx ) { 220 ODevice::inst()->model() == Model_iPAQ_H38xx ) {
221 221
222 // ipaq sensor 222 // ipaq sensor
223 config.setGroup( "Ipaq_light_sensor" ); 223 config.setGroup( "Ipaq_light_sensor" );
224 224
225 config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() ); 225 config.writeEntry( "LightSensor", (int)auto_brightness->isChecked() );
226 config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() ); 226 config.writeEntry( "LightSensorAC", (int)auto_brightness_ac_3->isChecked() );
227 config.writeEntry( "Steps", LightStepSpin->value() ); 227 config.writeEntry( "Steps", LightStepSpin->value() );
228 config.writeEntry( "MinValue", LightMinValueSlider->value() ); 228 config.writeEntry( "MinValue", LightMinValueSlider->value() );
229 config.writeEntry( "Shift", LightShiftSpin->value() ); 229 config.writeEntry( "Shift", LightShiftSpin->value() );
230 } 230 }
231 231
232 config.write(); 232 config.write();
233 233
234 // advanced 234 // advanced
235 Config conf("apm"); 235 Config conf("apm");
236 conf.setGroup( "Warnings" ); 236 conf.setGroup( "Warnings" );
237 conf.writeEntry( "check_interval", warnintervalBox->value()*1000 ); 237 conf.writeEntry( "check_interval", warnintervalBox->value()*1000 );
238 conf.writeEntry( "power_verylow", lowSpinBox->value() ); 238 conf.writeEntry( "power_verylow", lowSpinBox->value() );
239 conf.writeEntry( "power_critical", criticalSpinBox->value() ); 239 conf.writeEntry( "power_critical", criticalSpinBox->value() );
240 QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()"); 240 QCopEnvelope e_warn("QPE/System", "reloadPowerWarnSettings()");
241 conf.write(); 241 conf.write();
242 242
243 243
244 QDialog::accept(); 244 QDialog::accept();
245} 245}
246 246
247void LightSettings::applyBrightness() 247void LightSettings::applyBrightness()
248{ 248{
249 if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) { 249 if ( PowerStatusManager::readStatus().acStatus() != PowerStatus::Online ) {
250 int bright = ( brightness->value() ) * 255 / brightness->maxValue(); 250 int bright = ( brightness->value() ) * 255 / brightness->maxValue();
251 set_fl(bright); 251 set_fl(bright);
252 } 252 }
253} 253}
254 254
255void LightSettings::applyBrightnessAC() 255void LightSettings::applyBrightnessAC()
256{ 256{
257 // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting 257 // if ac is attached, set directly that sliders setting, else the "on battery" sliders setting
258 if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) { 258 if ( PowerStatusManager::readStatus().acStatus() == PowerStatus::Online ) {
259 int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue(); 259 int bright = ( brightness_ac_3->value() ) * 255 / brightness_ac_3->maxValue();
260 set_fl(bright); 260 set_fl(bright);
261 } 261 }
262} 262}
263 263
264 264
265 265
266void LightSettings::done(int r) 266void LightSettings::done(int r)
267{ 267{
268 QDialog::done(r); 268 QDialog::done(r);
269 close ( ); 269 close ( );
270} 270}