author | sandman <sandman> | 2002-12-29 18:41:55 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-29 18:41:55 (UTC) |
commit | 7c3dceb16d9007e2c36b2b83e2a499cda3411138 (patch) (unidiff) | |
tree | 78a0945be9233099ca7e5e4e01d8b78364f009cb /core | |
parent | f8673391881545af514054babe47fdc162770a72 (diff) | |
download | opie-7c3dceb16d9007e2c36b2b83e2a499cda3411138.zip opie-7c3dceb16d9007e2c36b2b83e2a499cda3411138.tar.gz opie-7c3dceb16d9007e2c36b2b83e2a499cda3411138.tar.bz2 |
Power warning changes:
- interval can now be in the range (0 [Never] ... 300 [5min] )
- some code cleanup in the launcher
-rw-r--r-- | core/launcher/desktop.cpp | 22 | ||||
-rw-r--r-- | core/launcher/desktop.h | 2 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 20 |
3 files changed, 29 insertions, 15 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index fa9736f..03a23dc 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -166,38 +166,31 @@ void DesktopApplication::switchLCD ( bool on ) | |||
166 | } | 166 | } |
167 | else { | 167 | else { |
168 | dapp-> m_screensaver-> setDisplayState ( false ); | 168 | dapp-> m_screensaver-> setDisplayState ( false ); |
169 | } | 169 | } |
170 | } | 170 | } |
171 | } | 171 | } |
172 | } | 172 | } |
173 | 173 | ||
174 | 174 | ||
175 | DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) | 175 | DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) |
176 | : QPEApplication( argc, argv, appType ) | 176 | : QPEApplication( argc, argv, appType ) |
177 | { | 177 | { |
178 | |||
179 | Config cfg( "apm" ); | ||
180 | cfg.setGroup( "Warnings" ); | ||
181 | //cfg.readNumEntry( "checkinterval", 10000 ) | ||
182 | m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 ); | ||
183 | m_powerCritical = cfg.readNumEntry( "powercritical", 5 ); | ||
184 | |||
185 | m_ps = new PowerStatus; | 178 | m_ps = new PowerStatus; |
186 | m_ps_last = new PowerStatus; | 179 | m_ps_last = new PowerStatus; |
187 | pa = new DesktopPowerAlerter( 0 ); | 180 | pa = new DesktopPowerAlerter( 0 ); |
188 | 181 | ||
189 | m_timer = new QTimer( this ); | 182 | m_apm_timer = new QTimer ( this ); |
190 | connect( m_timer, SIGNAL( timeout() ), this, SLOT( apmTimeout() ) ); | 183 | connect ( m_apm_timer, SIGNAL( timeout ( )), this, SLOT( apmTimeout ( ))); |
191 | m_timer->start( 5000 ); | 184 | reloadPowerWarnSettings ( ); |
192 | 185 | ||
193 | m_last_button = 0; | 186 | m_last_button = 0; |
194 | m_button_timer = new QTimer ( ); | 187 | m_button_timer = new QTimer ( ); |
195 | connect ( m_button_timer, SIGNAL( timeout ( )), this, SLOT( sendHeldAction ( ))); | 188 | connect ( m_button_timer, SIGNAL( timeout ( )), this, SLOT( sendHeldAction ( ))); |
196 | 189 | ||
197 | channel = new QCopChannel( "QPE/System", this ); | 190 | channel = new QCopChannel( "QPE/System", this ); |
198 | connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ), | 191 | connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ), |
199 | this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) ); | 192 | this, SLOT( systemMessage( const QCString&, const QByteArray& ) ) ); |
200 | 193 | ||
201 | channel = new QCopChannel( "QPE/Launcher", this ); | 194 | channel = new QCopChannel( "QPE/Launcher", this ); |
202 | connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ), | 195 | connect( channel, SIGNAL( received( const QCString&, const QByteArray& ) ), |
203 | this, SLOT( launcherMessage( const QCString&, const QByteArray& ) ) ); | 196 | this, SLOT( launcherMessage( const QCString&, const QByteArray& ) ) ); |
@@ -292,25 +285,30 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & | |||
292 | QCopEnvelope e ( "QPE/Obex", "send(QString,QString,QString)" ); | 285 | QCopEnvelope e ( "QPE/Obex", "send(QString,QString,QString)" ); |
293 | QString mimetype = "text/x-vCard"; | 286 | QString mimetype = "text/x-vCard"; |
294 | e << tr( "business card" ) << card << mimetype; | 287 | e << tr( "business card" ) << card << mimetype; |
295 | } | 288 | } |
296 | } | 289 | } |
297 | } | 290 | } |
298 | 291 | ||
299 | void DesktopApplication::reloadPowerWarnSettings() | 292 | void DesktopApplication::reloadPowerWarnSettings() |
300 | { | 293 | { |
301 | Config cfg( "apm" ); | 294 | Config cfg( "apm" ); |
302 | cfg.setGroup( "Warnings" ); | 295 | cfg.setGroup( "Warnings" ); |
303 | 296 | ||
304 | // m_timer->changeInterval( cfg.readNumEntry( "checkinterval", 10000 ) ); | 297 | int iv = cfg. readNumEntry ( "checkinterval", 10000 ); |
298 | |||
299 | m_apm_timer-> stop ( ); | ||
300 | if ( iv ) | ||
301 | m_apm_timer-> start ( iv ); | ||
302 | |||
305 | m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 ); | 303 | m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 ); |
306 | m_powerCritical = cfg.readNumEntry( "powervcritical", 5 ); | 304 | m_powerCritical = cfg.readNumEntry( "powervcritical", 5 ); |
307 | } | 305 | } |
308 | 306 | ||
309 | 307 | ||
310 | enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown; | 308 | enum MemState { Unknown, VeryLow, Low, Normal } memstate = Unknown; |
311 | 309 | ||
312 | 310 | ||
313 | void DesktopApplication::launcherMessage( const QCString & msg, const QByteArray & data ) | 311 | void DesktopApplication::launcherMessage( const QCString & msg, const QByteArray & data ) |
314 | { | 312 | { |
315 | QDataStream stream ( data, IO_ReadOnly ); | 313 | QDataStream stream ( data, IO_ReadOnly ); |
316 | 314 | ||
@@ -333,25 +331,25 @@ void DesktopApplication::launcherMessage( const QCString & msg, const QByteArray | |||
333 | } | 331 | } |
334 | 332 | ||
335 | void DesktopApplication::sendHeldAction ( ) | 333 | void DesktopApplication::sendHeldAction ( ) |
336 | { | 334 | { |
337 | if ( m_last_button ) { | 335 | if ( m_last_button ) { |
338 | m_last_button-> heldAction ( ). send ( ); | 336 | m_last_button-> heldAction ( ). send ( ); |
339 | m_last_button = 0; | 337 | m_last_button = 0; |
340 | } | 338 | } |
341 | } | 339 | } |
342 | 340 | ||
343 | 341 | ||
344 | 342 | ||
345 | void DesktopApplication::checkButtonAction ( const ODeviceButton *db, int keycode, bool press, bool autoRepeat ) | 343 | void DesktopApplication::checkButtonAction ( const ODeviceButton *db, int /*keycode*/, bool press, bool autoRepeat ) |
346 | { | 344 | { |
347 | if ( db ) { | 345 | if ( db ) { |
348 | if ( !press && !autoRepeat && m_button_timer-> isActive ( )) { | 346 | if ( !press && !autoRepeat && m_button_timer-> isActive ( )) { |
349 | m_button_timer-> stop ( ); | 347 | m_button_timer-> stop ( ); |
350 | if ( !db-> pressedAction ( ). channel ( ). isEmpty ( )) { | 348 | if ( !db-> pressedAction ( ). channel ( ). isEmpty ( )) { |
351 | db-> pressedAction ( ). send ( ); | 349 | db-> pressedAction ( ). send ( ); |
352 | } | 350 | } |
353 | } | 351 | } |
354 | else if ( press && !autoRepeat ) { | 352 | else if ( press && !autoRepeat ) { |
355 | m_button_timer-> stop ( ); | 353 | m_button_timer-> stop ( ); |
356 | 354 | ||
357 | if ( !db-> heldAction ( ). channel ( ). isEmpty ( )) { | 355 | if ( !db-> heldAction ( ). channel ( ). isEmpty ( )) { |
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index 6cb7ab2..db0173e 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h | |||
@@ -86,25 +86,25 @@ protected: | |||
86 | void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat ); | 86 | void checkButtonAction ( const Opie::ODeviceButton *db, int keycode, bool press, bool autoRepeat ); |
87 | 87 | ||
88 | private: | 88 | private: |
89 | static DesktopApplication *me ( ); | 89 | static DesktopApplication *me ( ); |
90 | 90 | ||
91 | private: | 91 | private: |
92 | void reloadPowerWarnSettings(); | 92 | void reloadPowerWarnSettings(); |
93 | DesktopPowerAlerter *pa; | 93 | DesktopPowerAlerter *pa; |
94 | PowerStatus *m_ps, *m_ps_last; | 94 | PowerStatus *m_ps, *m_ps_last; |
95 | QTimer *cardSendTimer; | 95 | QTimer *cardSendTimer; |
96 | QCopChannel *channel; | 96 | QCopChannel *channel; |
97 | OpieScreenSaver *m_screensaver; | 97 | OpieScreenSaver *m_screensaver; |
98 | QTimer * m_timer; | 98 | QTimer * m_apm_timer; |
99 | int m_powerVeryLow; | 99 | int m_powerVeryLow; |
100 | int m_powerCritical; | 100 | int m_powerCritical; |
101 | int m_currentPowerLevel; | 101 | int m_currentPowerLevel; |
102 | 102 | ||
103 | const Opie::ODeviceButton *m_last_button; | 103 | const Opie::ODeviceButton *m_last_button; |
104 | QTimer *m_button_timer; | 104 | QTimer *m_button_timer; |
105 | 105 | ||
106 | bool m_keyclick_sound : 1; | 106 | bool m_keyclick_sound : 1; |
107 | bool m_screentap_sound : 1; | 107 | bool m_screentap_sound : 1; |
108 | bool m_alarm_sound : 1; | 108 | bool m_alarm_sound : 1; |
109 | }; | 109 | }; |
110 | 110 | ||
diff --git a/core/settings/light-and-power/lightsettingsbase.ui b/core/settings/light-and-power/lightsettingsbase.ui index 309b95d..b583b5c 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>371</width> | 14 | <width>367</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> |
@@ -1053,33 +1053,49 @@ | |||
1053 | </widget> | 1053 | </widget> |
1054 | <widget row="0" column="1" > | 1054 | <widget row="0" column="1" > |
1055 | <class>QSpinBox</class> | 1055 | <class>QSpinBox</class> |
1056 | <property stdset="1"> | 1056 | <property stdset="1"> |
1057 | <name>name</name> | 1057 | <name>name</name> |
1058 | <cstring>warnintervalBox</cstring> | 1058 | <cstring>warnintervalBox</cstring> |
1059 | </property> | 1059 | </property> |
1060 | <property stdset="1"> | 1060 | <property stdset="1"> |
1061 | <name>suffix</name> | 1061 | <name>suffix</name> |
1062 | <string> sec</string> | 1062 | <string> sec</string> |
1063 | </property> | 1063 | </property> |
1064 | <property stdset="1"> | 1064 | <property stdset="1"> |
1065 | <name>specialValueText</name> | ||
1066 | <string>never</string> | ||
1067 | </property> | ||
1068 | <property stdset="1"> | ||
1069 | <name>wrapping</name> | ||
1070 | <bool>true</bool> | ||
1071 | </property> | ||
1072 | <property stdset="1"> | ||
1065 | <name>buttonSymbols</name> | 1073 | <name>buttonSymbols</name> |
1066 | <enum>PlusMinus</enum> | 1074 | <enum>PlusMinus</enum> |
1067 | </property> | 1075 | </property> |
1068 | <property stdset="1"> | 1076 | <property stdset="1"> |
1069 | <name>maxValue</name> | 1077 | <name>maxValue</name> |
1070 | <number>60</number> | 1078 | <number>300</number> |
1071 | </property> | 1079 | </property> |
1072 | <property stdset="1"> | 1080 | <property stdset="1"> |
1073 | <name>minValue</name> | 1081 | <name>minValue</name> |
1082 | <number>0</number> | ||
1083 | </property> | ||
1084 | <property stdset="1"> | ||
1085 | <name>lineStep</name> | ||
1086 | <number>5</number> | ||
1087 | </property> | ||
1088 | <property stdset="1"> | ||
1089 | <name>value</name> | ||
1074 | <number>5</number> | 1090 | <number>5</number> |
1075 | </property> | 1091 | </property> |
1076 | <property> | 1092 | <property> |
1077 | <name>whatsThis</name> | 1093 | <name>whatsThis</name> |
1078 | <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string> | 1094 | <string>how often should be checked for low power. This determines the rate popups occure in low power situations</string> |
1079 | </property> | 1095 | </property> |
1080 | </widget> | 1096 | </widget> |
1081 | <widget row="2" column="1" > | 1097 | <widget row="2" column="1" > |
1082 | <class>QSpinBox</class> | 1098 | <class>QSpinBox</class> |
1083 | <property stdset="1"> | 1099 | <property stdset="1"> |
1084 | <name>name</name> | 1100 | <name>name</name> |
1085 | <cstring>criticalSpinBox</cstring> | 1101 | <cstring>criticalSpinBox</cstring> |