Diffstat (limited to 'core/settings/light-and-power/light.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/settings/light-and-power/light.cpp | 38 |
1 files changed, 36 insertions, 2 deletions
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 6115178..d6d09a1 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp | |||
@@ -31,12 +31,13 @@ | |||
31 | #include <qpe/config.h> | 31 | #include <qpe/config.h> |
32 | #include <qpe/power.h> | 32 | #include <qpe/power.h> |
33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 33 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
34 | #include <qpe/qcopenvelope_qws.h> | 34 | #include <qpe/qcopenvelope_qws.h> |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | #include <qlabel.h> | ||
37 | #include <qcheckbox.h> | 38 | #include <qcheckbox.h> |
38 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
39 | #include <qslider.h> | 40 | #include <qslider.h> |
40 | #include <qspinbox.h> | 41 | #include <qspinbox.h> |
41 | #include <qpushbutton.h> | 42 | #include <qpushbutton.h> |
42 | #include <qgroupbox.h> | 43 | #include <qgroupbox.h> |
@@ -51,35 +52,53 @@ using namespace Opie; | |||
51 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | 52 | LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) |
52 | : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) | 53 | : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) |
53 | { | 54 | { |
54 | m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); | 55 | m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); |
55 | m_cres = ODevice::inst ( )-> displayContrastResolution ( ); | 56 | m_cres = ODevice::inst ( )-> displayContrastResolution ( ); |
56 | 57 | ||
58 | // check whether to show the light sensor stuff | ||
59 | |||
57 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { | 60 | if ( !ODevice::inst ( )-> hasLightSensor ( )) { |
58 | auto_brightness-> hide ( ); | 61 | auto_brightness-> hide ( ); |
59 | CalibrateLightSensor-> hide ( ); | 62 | CalibrateLightSensor-> hide ( ); |
60 | auto_brightness_ac-> hide ( ); | 63 | auto_brightness_ac-> hide ( ); |
61 | CalibrateLightSensor_ac-> hide ( ); | 64 | CalibrateLightSensor_ac-> hide ( ); |
62 | } | 65 | } |
66 | |||
67 | // check whether to show the contrast stuff | ||
68 | |||
63 | if (m_cres) { | 69 | if (m_cres) { |
64 | GroupLight->setTitle(tr("Backlight && Contrast")); | 70 | GroupLight->setTitle(tr("Backlight && Contrast")); |
65 | GroupLight_ac->setTitle(GroupLight->title()); | 71 | GroupLight_ac->setTitle(GroupLight->title()); |
66 | } else { | 72 | } else { |
67 | contrast->hide(); | 73 | contrast->hide(); |
68 | contrast_ac->hide(); | 74 | contrast_ac->hide(); |
69 | } | 75 | } |
70 | 76 | ||
77 | // check whether to show the cpu frequency stuff | ||
78 | |||
71 | QStrList freq = ODevice::inst()->allowedCpuFrequencies(); | 79 | QStrList freq = ODevice::inst()->allowedCpuFrequencies(); |
72 | if ( freq.count() ) { | 80 | if ( freq.count() ) { |
73 | frequency->insertStrList( freq ); | 81 | frequency->insertStrList( freq ); |
74 | frequency_ac->insertStrList( freq ); | 82 | frequency_ac->insertStrList( freq ); |
75 | } else { | 83 | } else { |
84 | frequencyLabel->hide(); | ||
76 | frequency->hide(); | 85 | frequency->hide(); |
86 | frequencyLabel_ac->hide(); | ||
77 | frequency_ac->hide(); | 87 | frequency_ac->hide(); |
78 | } | 88 | } |
79 | 89 | ||
90 | // check whether to show the hinge action stuff | ||
91 | |||
92 | if ( !ODevice::inst()->hasHingeSensor() ) { | ||
93 | closeHingeLabel->hide(); | ||
94 | closeHingeAction->hide(); | ||
95 | closeHingeLabel_ac->hide(); | ||
96 | closeHingeAction_ac->hide(); | ||
97 | } | ||
98 | |||
80 | Config config ( "apm" ); | 99 | Config config ( "apm" ); |
81 | config. setGroup ( "Battery" ); | 100 | config. setGroup ( "Battery" ); |
82 | 101 | ||
83 | // battery spinboxes | 102 | // battery spinboxes |
84 | interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); | 103 | interval_dim-> setValue ( config. readNumEntry ( "Dim", 30 )); |
85 | interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); | 104 | interval_lightoff-> setValue ( config. readNumEntry ( "LightOff", 20 )); |
@@ -88,12 +107,15 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
88 | // battery check and slider | 107 | // battery check and slider |
89 | LcdOffOnly->setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); | 108 | LcdOffOnly->setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); |
90 | 109 | ||
91 | // CPU frequency | 110 | // CPU frequency |
92 | frequency->setCurrentItem( config.readNumEntry("Freq", 0) ); | 111 | frequency->setCurrentItem( config.readNumEntry("Freq", 0) ); |
93 | 112 | ||
113 | // hinge action | ||
114 | closeHingeAction->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) ); | ||
115 | |||
94 | int bright = config. readNumEntry ( "Brightness", 127 ); | 116 | int bright = config. readNumEntry ( "Brightness", 127 ); |
95 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); | 117 | int contr = m_oldcontrast = config. readNumEntry ( "Contrast", 127 ); |
96 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); | 118 | brightness-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
97 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); | 119 | brightness-> setLineStep ( QMAX( 1, 256 / m_bres )); |
98 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); | 120 | brightness-> setPageStep ( QMAX( 1, 256 / m_bres )); |
99 | brightness-> setValue ( bright ); | 121 | brightness-> setValue ( bright ); |
@@ -119,12 +141,15 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
119 | // ac check and slider | 141 | // ac check and slider |
120 | LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); | 142 | LcdOffOnly_ac-> setChecked ( config. readBoolEntry ( "LcdOffOnly", false )); |
121 | 143 | ||
122 | // CPU frequency | 144 | // CPU frequency |
123 | frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) ); | 145 | frequency_ac->setCurrentItem( config.readNumEntry("Freq", 0) ); |
124 | 146 | ||
147 | // hinge action | ||
148 | closeHingeAction_ac->setCurrentItem( config.readNumEntry("CloseHingeAction", 0) ); | ||
149 | |||
125 | bright = config. readNumEntry ( "Brightness", 255 ); | 150 | bright = config. readNumEntry ( "Brightness", 255 ); |
126 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); | 151 | brightness_ac-> setTickInterval ( QMAX( 16, 256 / m_bres )); |
127 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); | 152 | brightness_ac-> setLineStep ( QMAX( 1, 256 / m_bres )); |
128 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); | 153 | brightness_ac-> setPageStep ( QMAX( 1, 256 / m_bres )); |
129 | brightness_ac-> setValue ( bright ); | 154 | brightness_ac-> setValue ( bright ); |
130 | 155 | ||
@@ -137,13 +162,13 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
137 | } | 162 | } |
138 | 163 | ||
139 | // light sensor | 164 | // light sensor |
140 | auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false )); | 165 | auto_brightness_ac-> setChecked ( config. readBoolEntry ( "LightSensor", false )); |
141 | m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); | 166 | m_sensordata_ac = config. readListEntry ( "LightSensorData", ';' ); |
142 | 167 | ||
143 | // advanced settings | 168 | // warnings |
144 | config. setGroup ( "Warnings" ); | 169 | config. setGroup ( "Warnings" ); |
145 | warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); | 170 | warnintervalBox-> setValue ( config. readNumEntry ( "checkinterval", 10000 ) / 1000 ); |
146 | lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); | 171 | lowSpinBox-> setValue ( config. readNumEntry ( "powerverylow", 10 ) ); |
147 | criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); | 172 | criticalSpinBox-> setValue ( config. readNumEntry ( "powercritical", 5 ) ); |
148 | 173 | ||
149 | m_resettimer = new QTimer ( this ); | 174 | m_resettimer = new QTimer ( this ); |
@@ -160,12 +185,15 @@ LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) | |||
160 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); | 185 | connect ( brightness_ac, SIGNAL( valueChanged ( int )), this, SLOT( setBacklight ( int ))); |
161 | if (m_cres) { | 186 | if (m_cres) { |
162 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 187 | connect ( contrast, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
163 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); | 188 | connect ( contrast_ac, SIGNAL( valueChanged ( int )), this, SLOT( setContrast ( int ))); |
164 | } | 189 | } |
165 | connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); | 190 | connect( frequency, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); |
191 | connect( frequency_ac, SIGNAL( activated(int) ), this, SLOT( setFrequency(int) ) ); | ||
192 | connect( closeHingeAction, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) ); | ||
193 | connect( closeHingeAction_ac, SIGNAL( activated(int) ), this, SLOT( setCloseHingeAction(int) ) ); | ||
166 | } | 194 | } |
167 | 195 | ||
168 | LightSettings::~LightSettings ( ) | 196 | LightSettings::~LightSettings ( ) |
169 | { | 197 | { |
170 | } | 198 | } |
171 | 199 | ||
@@ -198,13 +226,12 @@ void LightSettings::setBacklight ( int bright ) | |||
198 | } | 226 | } |
199 | } | 227 | } |
200 | 228 | ||
201 | void LightSettings::setContrast ( int contr ) | 229 | void LightSettings::setContrast ( int contr ) |
202 | { | 230 | { |
203 | if (contr == -1) contr = m_oldcontrast; | 231 | if (contr == -1) contr = m_oldcontrast; |
204 | |||
205 | ODevice::inst ( )-> setDisplayContrast(contr); | 232 | ODevice::inst ( )-> setDisplayContrast(contr); |
206 | } | 233 | } |
207 | 234 | ||
208 | void LightSettings::setFrequency ( int index ) | 235 | void LightSettings::setFrequency ( int index ) |
209 | { | 236 | { |
210 | qWarning("LightSettings::setFrequency(%d)", index); | 237 | qWarning("LightSettings::setFrequency(%d)", index); |
@@ -214,12 +241,17 @@ qWarning("LightSettings::setFrequency(%d)", index); | |||
214 | void LightSettings::resetBacklight ( ) | 241 | void LightSettings::resetBacklight ( ) |
215 | { | 242 | { |
216 | setBacklight ( -1 ); | 243 | setBacklight ( -1 ); |
217 | setContrast ( -1 ); | 244 | setContrast ( -1 ); |
218 | } | 245 | } |
219 | 246 | ||
247 | void LightSettings::setCloseHingeAction ( int index ) | ||
248 | { | ||
249 | qWarning("LightSettings::setCloseHingeStatus(%d)", index); | ||
250 | } | ||
251 | |||
220 | void LightSettings::accept ( ) | 252 | void LightSettings::accept ( ) |
221 | { | 253 | { |
222 | Config config ( "apm" ); | 254 | Config config ( "apm" ); |
223 | 255 | ||
224 | // bat | 256 | // bat |
225 | config. setGroup ( "Battery" ); | 257 | config. setGroup ( "Battery" ); |
@@ -228,23 +260,25 @@ void LightSettings::accept ( ) | |||
228 | config. writeEntry ( "LightOff", interval_lightoff-> value ( )); | 260 | config. writeEntry ( "LightOff", interval_lightoff-> value ( )); |
229 | config. writeEntry ( "Suspend", interval_suspend-> value ( )); | 261 | config. writeEntry ( "Suspend", interval_suspend-> value ( )); |
230 | config. writeEntry ( "Brightness", brightness-> value () ); | 262 | config. writeEntry ( "Brightness", brightness-> value () ); |
231 | if (m_cres) | 263 | if (m_cres) |
232 | config. writeEntry ( "Contrast", contrast-> value () ); | 264 | config. writeEntry ( "Contrast", contrast-> value () ); |
233 | config. writeEntry ( "Freq", frequency->currentItem() ); | 265 | config. writeEntry ( "Freq", frequency->currentItem() ); |
266 | config. writeEntry ( "CloseHingeAction", closeHingeAction->currentItem() ); | ||
234 | 267 | ||
235 | // ac | 268 | // ac |
236 | config. setGroup ( "AC" ); | 269 | config. setGroup ( "AC" ); |
237 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); | 270 | config. writeEntry ( "LcdOffOnly", LcdOffOnly_ac-> isChecked ( )); |
238 | config. writeEntry ( "Dim", interval_dim_ac-> value ( )); | 271 | config. writeEntry ( "Dim", interval_dim_ac-> value ( )); |
239 | config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); | 272 | config. writeEntry ( "LightOff", interval_lightoff_ac-> value ( )); |
240 | config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); | 273 | config. writeEntry ( "Suspend", interval_suspend_ac-> value ( )); |
241 | config. writeEntry ( "Brightness", brightness_ac-> value () ); | 274 | config. writeEntry ( "Brightness", brightness_ac-> value () ); |
242 | if (m_cres) | 275 | if (m_cres) |
243 | config. writeEntry ( "Contrast", contrast_ac-> value () ); | 276 | config. writeEntry ( "Contrast", contrast_ac-> value () ); |
244 | config. writeEntry ( "Freq", frequency_ac->currentItem() ); | 277 | config. writeEntry ( "Freq", frequency_ac->currentItem() ); |
278 | config. writeEntry ( "CloseHingeAction", closeHingeAction_ac->currentItem() ); | ||
245 | 279 | ||
246 | // only make light sensor stuff appear if the unit has a sensor | 280 | // only make light sensor stuff appear if the unit has a sensor |
247 | if ( ODevice::inst ( )-> hasLightSensor ( )) { | 281 | if ( ODevice::inst ( )-> hasLightSensor ( )) { |
248 | config. setGroup ( "Battery" ); | 282 | config. setGroup ( "Battery" ); |
249 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); | 283 | config. writeEntry ( "LightSensor", auto_brightness->isChecked() ); |
250 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); | 284 | config. writeEntry ( "LightSensorData", m_sensordata, ';' ); |