summaryrefslogtreecommitdiff
path: root/core/launcher
Unidiff
Diffstat (limited to 'core/launcher') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/serverapp.cpp14
-rw-r--r--core/launcher/serverapp.h4
2 files changed, 17 insertions, 1 deletions
diff --git a/core/launcher/serverapp.cpp b/core/launcher/serverapp.cpp
index 11381e6..f7c2341 100644
--- a/core/launcher/serverapp.cpp
+++ b/core/launcher/serverapp.cpp
@@ -259,12 +259,13 @@ QPE_MEMALERTER_IMPL
259 259
260 260
261//--------------------------------------------------------------------------- 261//---------------------------------------------------------------------------
262 262
263bool ServerApplication::doRestart = FALSE; 263bool ServerApplication::doRestart = FALSE;
264bool ServerApplication::allowRestart = TRUE; 264bool ServerApplication::allowRestart = TRUE;
265bool ServerApplication::ms_is_starting = TRUE;
265 266
266void ServerApplication::switchLCD( bool on ) { 267void ServerApplication::switchLCD( bool on ) {
267 if ( !qApp ) 268 if ( !qApp )
268 return; 269 return;
269 270
270 ServerApplication *dapp = ServerApplication::me() ; 271 ServerApplication *dapp = ServerApplication::me() ;
@@ -281,13 +282,13 @@ void ServerApplication::switchLCD( bool on ) {
281 282
282} 283}
283 284
284ServerApplication::ServerApplication( int& argc, char **argv, Type t ) 285ServerApplication::ServerApplication( int& argc, char **argv, Type t )
285 : QPEApplication( argc, argv, t ) 286 : QPEApplication( argc, argv, t )
286{ 287{
287 288 ms_is_starting = true;
288 289
289 // We know we'll have lots of cached pixmaps due to App/DocLnks 290 // We know we'll have lots of cached pixmaps due to App/DocLnks
290 QPixmapCache::setCacheLimit(512); 291 QPixmapCache::setCacheLimit(512);
291 292
292 m_ps = new PowerStatus; 293 m_ps = new PowerStatus;
293 m_ps_last = new PowerStatus; 294 m_ps_last = new PowerStatus;
@@ -843,8 +844,19 @@ void ServerApplication::soundAlarm() {
843 844
844ServerApplication *ServerApplication::me ( ) 845ServerApplication *ServerApplication::me ( )
845{ 846{
846 return static_cast<ServerApplication*>( qApp ); 847 return static_cast<ServerApplication*>( qApp );
847} 848}
848 849
850bool ServerApplication::isStarting()
851{
852 return ms_is_starting;
853}
854
855int ServerApplication::exec()
856{
857 ms_is_starting = true;
858 qDebug("Serverapp - exec");
859 return QPEApplication::exec();
860}
849 861
850#include "serverapp.moc" 862#include "serverapp.moc"
diff --git a/core/launcher/serverapp.h b/core/launcher/serverapp.h
index fe3f24a..4d9f808 100644
--- a/core/launcher/serverapp.h
+++ b/core/launcher/serverapp.h
@@ -91,17 +91,20 @@ public:
91 ~ServerApplication(); 91 ~ServerApplication();
92 92
93 static bool doRestart; 93 static bool doRestart;
94 static bool allowRestart; 94 static bool allowRestart;
95 static bool screenLocked(); 95 static bool screenLocked();
96 static void login(bool at_poweron); 96 static void login(bool at_poweron);
97
98 static bool isStarting();
97 99
98 static void switchLCD ( bool on ); // only for togglePower in Desktop 100 static void switchLCD ( bool on ); // only for togglePower in Desktop
99 static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar 101 static void soundAlarm(); // only because QCop soundAlarm() is defined in QPE/TaskBar
100 102
101 void restart(); 103 void restart();
104 int exec();
102 105
103signals: 106signals:
104 void menu(); 107 void menu();
105 void home(); 108 void home();
106 void launch(); 109 void launch();
107 void power(); 110 void power();
@@ -152,12 +155,13 @@ private:
152 int m_powerCritical; 155 int m_powerCritical;
153 int m_currentPowerLevel; 156 int m_currentPowerLevel;
154 157
155 bool m_keyclick_sound : 1; 158 bool m_keyclick_sound : 1;
156 bool m_screentap_sound : 1; 159 bool m_screentap_sound : 1;
157 bool m_alarm_sound : 1; 160 bool m_alarm_sound : 1;
161 static bool ms_is_starting;
158 162
159 163
160 friend class KeyFilter; 164 friend class KeyFilter;
161}; 165};
162 166
163 167