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 | |
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 | 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 | |||
@@ -154,3 +154,4 @@ int initApplication( int argc, char ** argv ) | |||
154 | 154 | ||
155 | if ( firstUse() ) | 155 | bool firstUseShown = firstUse(); |
156 | if ( firstUseShown ) | ||
156 | { | 157 | { |
@@ -173,8 +174,19 @@ int initApplication( int argc, char ** argv ) | |||
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 | { |
@@ -184,3 +196,2 @@ int initApplication( int argc, char ** argv ) | |||
184 | } | 196 | } |
185 | #endif | ||
186 | 197 | ||