-rw-r--r-- | core/launcher/desktop.cpp | 34 | ||||
-rw-r--r-- | core/launcher/desktop.h | 2 | ||||
-rw-r--r-- | core/settings/light-and-power/lightsettingsbase.ui | 20 |
3 files changed, 35 insertions, 21 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 | |||
@@ -177,9 +177,2 @@ DesktopApplication::DesktopApplication( int& argc, char **argv, Type 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; |
@@ -188,5 +181,5 @@ DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType ) | |||
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 | ||
@@ -228,3 +221,3 @@ void DesktopApplication::apmTimeout() | |||
228 | { | 221 | { |
229 | qpedesktop->checkMemory(); // in case no events are being generated | 222 | qpedesktop-> checkMemory ( ); // in case no events are being generated |
230 | 223 | ||
@@ -298,10 +291,15 @@ void DesktopApplication::systemMessage( const QCString & msg, const QByteArray & | |||
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 ); |
305 | m_powerVeryLow = cfg.readNumEntry( "powerverylow", 10 ); | 298 | |
306 | m_powerCritical = cfg.readNumEntry( "powervcritical", 5 ); | 299 | m_apm_timer-> stop ( ); |
300 | if ( iv ) | ||
301 | m_apm_timer-> start ( iv ); | ||
302 | |||
303 | m_powerVeryLow = cfg. readNumEntry ( "powerverylow", 10 ); | ||
304 | m_powerCritical = cfg. readNumEntry ( "powervcritical", 5 ); | ||
307 | } | 305 | } |
@@ -344,3 +342,3 @@ void DesktopApplication::sendHeldAction ( ) | |||
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 | { |
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 | |||
@@ -97,3 +97,3 @@ private: | |||
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; |
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 | |||
@@ -13,3 +13,3 @@ | |||
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>371</width> | 14 | <width>367</width> |
15 | <height>532</height> | 15 | <height>532</height> |
@@ -1064,2 +1064,10 @@ | |||
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> |
@@ -1069,3 +1077,3 @@ | |||
1069 | <name>maxValue</name> | 1077 | <name>maxValue</name> |
1070 | <number>60</number> | 1078 | <number>300</number> |
1071 | </property> | 1079 | </property> |
@@ -1073,2 +1081,10 @@ | |||
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> |