author | paule <paule> | 2007-01-31 05:11:08 (UTC) |
---|---|---|
committer | paule <paule> | 2007-01-31 05:11:08 (UTC) |
commit | f4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee (patch) (unidiff) | |
tree | dc0431392342843f47979267dcb3244270b07acf /core | |
parent | 9a3875c32922a322d991e67b13e89242f71a862c (diff) | |
download | opie-f4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee.zip opie-f4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee.tar.gz opie-f4e6ede30d494ad91fdbd0fd72498ef3a44bf7ee.tar.bz2 |
Reinstate startup system year validity check and update year to 2007; show date/time settings application on starting if option is enabled
-rw-r--r-- | core/launcher/main.cpp | 21 |
1 files changed, 16 insertions, 5 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 | |||
@@ -149,13 +149,14 @@ int initApplication( int argc, char ** argv ) | |||
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 | { |
@@ -168,24 +169,34 @@ int initApplication( int argc, char ** argv ) | |||
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" ); |
177 | config.setGroup( "Startup" ); | ||
178 | bool showTimeSettings = config.readBoolEntry( "ShowTimeSettings", FALSE ); | ||
179 | |||
180 | if ( !showTimeSettings && QDate::currentDate().year() < 2007 ) | ||
176 | { | 181 | { |
177 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), | 182 | if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ), |
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>" ) | 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>" ) |
179 | .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) | 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(); |