-rw-r--r-- | core/launcher/main.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp index 8ed8710..4063517 100644 --- a/core/launcher/main.cpp +++ b/core/launcher/main.cpp | |||
@@ -147,17 +147,18 @@ int initApplication( int argc, char ** argv ) | |||
147 | initEnvironment(); | 147 | initEnvironment(); |
148 | 148 | ||
149 | #ifdef QWS | 149 | #ifdef QWS |
150 | QWSServer::setDesktopBackground( QImage() ); | 150 | QWSServer::setDesktopBackground( QImage() ); |
151 | #endif | 151 | #endif |
152 | ServerApplication a( argc, argv, QApplication::GuiServer ); | 152 | ServerApplication a( argc, argv, QApplication::GuiServer ); |
153 | initKeyboard(); | 153 | initKeyboard(); |
154 | 154 | ||
155 | if ( firstUse() ) | 155 | bool firstUseShown = firstUse(); |
156 | if ( firstUseShown ) | ||
156 | { | 157 | { |
157 | a.restart(); | 158 | a.restart(); |
158 | return 0; | 159 | return 0; |
159 | } | 160 | } |
160 | 161 | ||
161 | { | 162 | { |
162 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); | 163 | QCopEnvelope e("QPE/System", "setBacklight(int)" ); |
163 | e << -3; // Forced on | 164 | e << -3; // Forced on |
@@ -166,28 +167,38 @@ int initApplication( int argc, char ** argv ) | |||
166 | AlarmServer::initialize(); | 167 | AlarmServer::initialize(); |
167 | Server *s = new Server(); | 168 | Server *s = new Server(); |
168 | new SysFileMonitor(s); | 169 | new SysFileMonitor(s); |
169 | #ifdef QWS | 170 | #ifdef QWS |
170 | Network::createServer(s); | 171 | Network::createServer(s); |
171 | #endif | 172 | #endif |
172 | s->show(); | 173 | s->show(); |
173 | 174 | ||
174 | #if 0 | 175 | if ( !firstUseShown ) { |
175 | if ( QDate::currentDate().year() < 2005 ) | 176 | Config config( "qpe" ); |
176 | { | 177 | config.setGroup( "Startup" ); |
177 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), | 178 | bool showTimeSettings = config.readBoolEntry( "ShowTimeSettings", FALSE ); |
178 | ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ) | 179 | |
179 | .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 180 | if ( !showTimeSettings && QDate::currentDate().year() < 2007 ) |
181 | { | ||
182 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), | ||
183 | ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" ) | ||
184 | .arg( TimeString::dateString( QDate::currentDate())), | ||
185 | QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | ||
186 | { | ||
187 | showTimeSettings = TRUE; | ||
188 | } | ||
189 | } | ||
190 | |||
191 | if ( showTimeSettings ) | ||
180 | { | 192 | { |
181 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); | 193 | QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" ); |
182 | e << QString ( ); | 194 | e << QString ( ); |
183 | } | 195 | } |
184 | } | 196 | } |
185 | #endif | ||
186 | 197 | ||
187 | create_pidfile(); | 198 | create_pidfile(); |
188 | odebug << "--> mainloop in" << oendl; | 199 | odebug << "--> mainloop in" << oendl; |
189 | int rv = a.exec(); | 200 | int rv = a.exec(); |
190 | odebug << "<-- mainloop out" << oendl; | 201 | odebug << "<-- mainloop out" << oendl; |
191 | remove_pidfile(); | 202 | remove_pidfile(); |
192 | odebug << "removing server object..." << oendl; | 203 | odebug << "removing server object..." << oendl; |
193 | delete s; | 204 | delete s; |