summaryrefslogtreecommitdiff
authortille <tille>2002-06-26 09:40:05 (UTC)
committer tille <tille>2002-06-26 09:40:05 (UTC)
commit28d91fba01e6eb728de997757a33f4328ee19e2f (patch) (unidiff)
treef027967e0d120620c46084101547ca7adabbb16e
parentf49bd645d1537e826e12a3beaafbf291b3ad4d07 (diff)
downloadopie-28d91fba01e6eb728de997757a33f4328ee19e2f.zip
opie-28d91fba01e6eb728de997757a33f4328ee19e2f.tar.gz
opie-28d91fba01e6eb728de997757a33f4328ee19e2f.tar.bz2
combos update sys
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp2
-rw-r--r--noncore/settings/netsystemtime/opie-netsystemtime.control3
-rw-r--r--noncore/settings/netsystemtime/settime.cpp25
-rw-r--r--noncore/settings/netsystemtime/settime.h2
4 files changed, 29 insertions, 3 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 4a7959e..b2f192a 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -13,65 +13,65 @@
13#include <qpe/timeconversion.h> 13#include <qpe/timeconversion.h>
14#include <qpe/tzselect.h> 14#include <qpe/tzselect.h>
15#include <qpe/timestring.h> 15#include <qpe/timestring.h>
16#include <qpe/qpedialog.h> 16#include <qpe/qpedialog.h>
17#include <sys/time.h> 17#include <sys/time.h>
18#include <time.h> 18#include <time.h>
19#include <stdlib.h> 19#include <stdlib.h>
20 20
21 21
22Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) 22Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
23 : SetDateTime( parent, name, fl ) 23 : SetDateTime( parent, name, fl )
24{ 24{
25 Config cfg("ntp",Config::User); 25 Config cfg("ntp",Config::User);
26 cfg.setGroup("settings"); 26 cfg.setGroup("settings");
27 // _maxOffset = cfg.readNumEntry("maxOffset",5); 27 // _maxOffset = cfg.readNumEntry("maxOffset",5);
28// _minLookupDiff = cfg.readNumEntry("minLookupDiff",10); 28// _minLookupDiff = cfg.readNumEntry("minLookupDiff",10);
29 SpinBoxMinDelay->setValue( cfg.readNumEntry("minLookupDiff",10) ); 29 SpinBoxMinDelay->setValue( cfg.readNumEntry("minLookupDiff",10) );
30 SpinBoxMinDelay->setMinValue( 7 ); 30 SpinBoxMinDelay->setMinValue( 7 );
31 LineEditNtpSrv->setText( cfg.readEntry("ntpServer", tr("time.fu-berlin.de")) ); 31 LineEditNtpSrv->setText( cfg.readEntry("ntpServer", tr("time.fu-berlin.de")) );
32 ntpProcess = new OProcess( ); 32 ntpProcess = new OProcess( );
33 33
34 QSocket *ntpSock = new QSocket( this ); 34 QSocket *ntpSock = new QSocket( this );
35 ntpSock->connectToHost( LineEditNtpSrv->text() ,123); 35 ntpSock->connectToHost( LineEditNtpSrv->text() ,123);
36 connect( ntpSock, SIGNAL( error(int) ), 36 connect( ntpSock, SIGNAL( error(int) ),
37 SLOT(slotCheckNtp(int)) ); 37 SLOT(slotCheckNtp(int)) );
38 38
39 connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), 39 connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
40 this, SLOT(getNtpOutput(OProcess*,char*,int))); 40 this, SLOT(getNtpOutput(OProcess*,char*,int)));
41 connect ( ntpProcess, SIGNAL(processExited(OProcess*)), 41 connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
42 this, SLOT(ntpFinished(OProcess*))); 42 this, SLOT(ntpFinished(OProcess*)));
43 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp())); 43 connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
44 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime())); 44 connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
45 45 slotCheckNtp(-1);
46// slotRunNtp(); 46// slotRunNtp();
47 readLookups(); 47 readLookups();
48} 48}
49 49
50Ntp::~Ntp() 50Ntp::~Ntp()
51{ 51{
52 Config cfg("ntp",Config::User); 52 Config cfg("ntp",Config::User);
53 cfg.setGroup("settings"); 53 cfg.setGroup("settings");
54 cfg.writeEntry("ntpServer", LineEditNtpSrv->text()); 54 cfg.writeEntry("ntpServer", LineEditNtpSrv->text());
55 cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() ); 55 cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() );
56} 56}
57 57
58 58
59void Ntp::slotRunNtp() 59void Ntp::slotRunNtp()
60{ 60{
61 TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); 61 TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
62 ntpProcess->clearArguments(); 62 ntpProcess->clearArguments();
63 *ntpProcess << "ntpdate" << LineEditNtpSrv->text(); 63 *ntpProcess << "ntpdate" << LineEditNtpSrv->text();
64 bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); 64 bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
65 if ( !ret ) { 65 if ( !ret ) {
66 qDebug("Error while executing ntp"); 66 qDebug("Error while executing ntp");
67 } 67 }
68} 68}
69 69
70void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) 70void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
71{ 71{
72 QString lineStr, lineStrOld; 72 QString lineStr, lineStrOld;
73 lineStr = buffer; 73 lineStr = buffer;
74 lineStr=lineStr.left(buflen); 74 lineStr=lineStr.left(buflen);
75 if (lineStr!=lineStrOld) 75 if (lineStr!=lineStrOld)
76 { 76 {
77 MultiLineEditntpOutPut->append(lineStr); 77 MultiLineEditntpOutPut->append(lineStr);
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control
index a5809b0..406d7b0 100644
--- a/noncore/settings/netsystemtime/opie-netsystemtime.control
+++ b/noncore/settings/netsystemtime/opie-netsystemtime.control
@@ -1,10 +1,11 @@
1Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop 1Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop
2Priority: optional 2Priority: optional
3Section: opie/settings 3Section: opie/settings
4Depends: ntpdate 4Depends: ntpdate
5Conflicts: opie-systemtime
5Maintainer: Patrick S. Vogt <tille@handhelds.org> 6Maintainer: Patrick S. Vogt <tille@handhelds.org>
6Architecture: arm 7Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 8Version: $QPE_VERSION-$SUB_VERSION
8Depends: opie-base ($QPE_VERSION), ntpdate 9Depends: opie-base ($QPE_VERSION), ntpdate
9Description: ntp ( Network Time Protocol) gui 10Description: ntp ( Network Time Protocol) gui
10This utility syncs system time with a atomic timerserver via internet \ No newline at end of file 11This utility syncs system time with a atomic timerserver via internet
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 2cef6e8..b456012 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -163,159 +163,181 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
163 if (df == date_formats[3]) 163 if (df == date_formats[3])
164 currentdf = 3; 164 currentdf = 3;
165 dateFormatCombo->insertItem( tr( date_formats[3].toNumberString() ) ); 165 dateFormatCombo->insertItem( tr( date_formats[3].toNumberString() ) );
166 166
167 dateFormatCombo->setCurrentItem( currentdf ); 167 dateFormatCombo->setCurrentItem( currentdf );
168 dateButton->setDateFormat( df ); 168 dateButton->setDateFormat( df );
169 169
170 connect( dateFormatCombo, SIGNAL( activated(int)), 170 connect( dateFormatCombo, SIGNAL( activated(int)),
171 SLOT(formatChanged(int))); 171 SLOT(formatChanged(int)));
172 172
173 QHBoxLayout *hb4 = new QHBoxLayout( vb ); 173 QHBoxLayout *hb4 = new QHBoxLayout( vb );
174 l = new QLabel( tr("Applet format" ), FrameSystemTime ); 174 l = new QLabel( tr("Applet format" ), FrameSystemTime );
175 hb4->addWidget( l, 1 ); 175 hb4->addWidget( l, 1 );
176 176
177 clockAppletCombo = new QComboBox( FrameSystemTime ); 177 clockAppletCombo = new QComboBox( FrameSystemTime );
178 clockAppletCombo->insertItem( tr("hh:mm"), 0 ); 178 clockAppletCombo->insertItem( tr("hh:mm"), 0 );
179 clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 ); 179 clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 );
180 clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 ); 180 clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 );
181 181
182 hb4->addWidget( clockAppletCombo, 2 ); 182 hb4->addWidget( clockAppletCombo, 2 );
183 int clockApplet = config.readNumEntry("ClockApplet",0); 183 int clockApplet = config.readNumEntry("ClockApplet",0);
184 clockAppletCombo->setCurrentItem( clockApplet ); 184 clockAppletCombo->setCurrentItem( clockApplet );
185 185
186 vb->addStretch( 0 ); 186 vb->addStretch( 0 );
187 187
188 QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()), 188 QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()),
189 this, SLOT(commitTime())); 189 this, SLOT(commitTime()));
190 190
191 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), 191 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
192 timeButton, SLOT( slotTzChange( const QString& ) ) ); 192 timeButton, SLOT( slotTzChange( const QString& ) ) );
193 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ), 193 QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
194 SLOT( tzChange( const QString& ) ) ); 194 SLOT( tzChange( const QString& ) ) );
195
196 QObject::connect( weekStartCombo, SIGNAL( activated ( int )),
197 SLOT(updateSystem(int ) ));
198 QObject::connect( ampmCombo, SIGNAL( activated ( int )),
199 SLOT(updateSystem(int ) ));
200 QObject::connect( dateFormatCombo, SIGNAL( activated ( int )),
201 SLOT(updateSystem(int ) ));
202 QObject::connect( clockAppletCombo, SIGNAL( activated ( int )),
203 SLOT(updateSystem(int ) ));
195} 204}
196 205
197SetDateTime::~SetDateTime() 206SetDateTime::~SetDateTime()
198{ 207{
208 writeSettings();
209
210}
199 211
212void SetDateTime::writeSettings()
213{
200 Config config("qpe"); 214 Config config("qpe");
201 config.setGroup( "Time" ); 215 config.setGroup( "Time" );
202 config.writeEntry( "AMPM", ampmCombo->currentItem() ); 216 config.writeEntry( "AMPM", ampmCombo->currentItem() );
203 config.writeEntry( "MONDAY", weekStartCombo->currentItem() ); 217 config.writeEntry( "MONDAY", weekStartCombo->currentItem() );
204 config.setGroup( "Date" ); 218 config.setGroup( "Date" );
205 DateFormat df = date_formats[dateFormatCombo->currentItem()]; 219 DateFormat df = date_formats[dateFormatCombo->currentItem()];
206 config.writeEntry( "Separator", QString(df.separator())); 220 config.writeEntry( "Separator", QString(df.separator()));
207 config.writeEntry( "ShortOrder", df.shortOrder()); 221 config.writeEntry( "ShortOrder", df.shortOrder());
208 config.writeEntry( "LongOrder", df.longOrder()); 222 config.writeEntry( "LongOrder", df.longOrder());
209 config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() ); 223 config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() );
210 224
211 Config lconfig("locale"); 225 Config lconfig("locale");
212 lconfig.setGroup( "Location" ); 226 lconfig.setGroup( "Location" );
213 lconfig.writeEntry( "Timezone", tz->currentZone() ); 227 lconfig.writeEntry( "Timezone", tz->currentZone() );
214 228
215} 229}
216 230
217void SetDateTime::commitTime() 231void SetDateTime::commitTime()
218{ 232{
219 tz->setFocus(); 233 tz->setFocus();
220 // really turn off the screensaver before doing anything 234 // really turn off the screensaver before doing anything
221 { 235 {
222 // Needs to be encased in { } so that it deconstructs and sends 236 // Needs to be encased in { } so that it deconstructs and sends
223 QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); 237 QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
224 disableScreenSaver << 0 << 0 << 0; 238 disableScreenSaver << 0 << 0 << 0;
225 } 239 }
226 // Need to process the QCOP event generated above before proceeding 240 // Need to process the QCOP event generated above before proceeding
227 qApp->processEvents(); 241 qApp->processEvents();
228 242
229 // before we progress further, set our TZ! 243 // before we progress further, set our TZ!
230 setenv( "TZ", tz->currentZone(), 1 ); 244 setenv( "TZ", tz->currentZone(), 1 );
231 // now set the time... 245 // now set the time...
232 QDateTime dt( dateButton->date(), timeButton->time() ); 246 QDateTime dt( dateButton->date(), timeButton->time() );
233 247
234 if ( dt.isValid() ) setTime(dt); 248 if ( dt.isValid() ) setTime(dt);
235} 249}
236 250
237void SetDateTime::setTime(QDateTime dt) 251void SetDateTime::setTime(QDateTime dt)
238{ 252{
239 Config cfg("ntp",Config::User); 253 Config cfg("ntp",Config::User);
240 cfg.setGroup("correction"); 254 cfg.setGroup("correction");
241 int t = TimeConversion::toUTC(dt); 255 int t = TimeConversion::toUTC(dt);
242 struct timeval myTv; 256 struct timeval myTv;
243 myTv.tv_sec = t; 257 myTv.tv_sec = t;
244 cfg.writeEntry("time", t ); 258 cfg.writeEntry("time", t );
245 myTv.tv_usec = 0; 259 myTv.tv_usec = 0;
246 260
247 if ( myTv.tv_sec != -1 ) 261 if ( myTv.tv_sec != -1 )
248 ::settimeofday( &myTv, 0 ); 262 ::settimeofday( &myTv, 0 );
249 Global::writeHWClock(); 263 Global::writeHWClock();
264}
265
266void SetDateTime::updateSystem(int i)
267{
268 qDebug("SetDateTime::updateSystem(int %i)",i);
269 writeSettings();
250 // since time has changed quickly load in the datebookdb 270 // since time has changed quickly load in the datebookdb
251 // to allow the alarm server to get a better grip on itself 271 // to allow the alarm server to get a better grip on itself
252 // (example re-trigger alarms for when we travel back in time) 272 // (example re-trigger alarms for when we travel back in time)
253 DateBookDB db; 273 // DateBookDB db;
254 274
255 // set the timezone for everyone else... 275 // set the timezone for everyone else...
256 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); 276 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
257 setTimeZone << tz->currentZone(); 277 setTimeZone << tz->currentZone();
258 278
259 // AM/PM setting and notify time changed 279 // AM/PM setting and notify time changed
260 QCopEnvelope setClock( "QPE/System", "clockChange(bool)" ); 280 QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
261 setClock << ampmCombo->currentItem(); 281 setClock << ampmCombo->currentItem();
262 282
263 // Notify everyone what day we prefer to start the week on. 283 // Notify everyone what day we prefer to start the week on.
264 QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" ); 284 QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
265 setWeek << weekStartCombo->currentItem(); 285 setWeek << weekStartCombo->currentItem();
266 286
267 // Notify everyone what date format to use 287 // Notify everyone what date format to use
268 QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" ); 288 QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
269 setDateFormat << date_formats[dateFormatCombo->currentItem()]; 289 setDateFormat << date_formats[dateFormatCombo->currentItem()];
270 290
271 // Restore screensaver 291 // Restore screensaver
272 QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); 292 QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
273 enableScreenSaver << -1 << -1 << -1; 293 enableScreenSaver << -1 << -1 << -1;
274 294
275} 295}
276 296
277void SetDateTime::tzChange( const QString &tz ) 297void SetDateTime::tzChange( const QString &tz )
278{ 298{
299 qDebug("SetDateTime::tzChange");
279 // set the TZ get the time and leave gracefully... 300 // set the TZ get the time and leave gracefully...
280 QString strSave; 301 QString strSave;
281 strSave = getenv( "TZ" ); 302 strSave = getenv( "TZ" );
282 setenv( "TZ", tz, 1 ); 303 setenv( "TZ", tz, 1 );
283 304
284 QDate d = QDate::currentDate(); 305 QDate d = QDate::currentDate();
285 // reset the time. 306 // reset the time.
286 if ( !strSave.isNull() ) { 307 if ( !strSave.isNull() ) {
287 setenv( "TZ", strSave, 1 ); 308 setenv( "TZ", strSave, 1 );
288 } 309 }
289 dateButton->setDate( d ); 310 dateButton->setDate( d );
311 updateSystem();
290} 312}
291 313
292void SetDateTime::formatChanged(int i) 314void SetDateTime::formatChanged(int i)
293{ 315{
294 dateButton->setDateFormat(date_formats[i]); 316 dateButton->setDateFormat(date_formats[i]);
295} 317}
296 318
297static const int ValueAM = 0; 319static const int ValueAM = 0;
298static const int ValuePM = 1; 320static const int ValuePM = 1;
299 321
300 322
301 323
302SetTime::SetTime( QWidget *parent, const char *name ) 324SetTime::SetTime( QWidget *parent, const char *name )
303 : QWidget( parent, name ) 325 : QWidget( parent, name )
304{ 326{
305 use12hourTime = FALSE; 327 use12hourTime = FALSE;
306 328
307 QTime currTime = QTime::currentTime(); 329 QTime currTime = QTime::currentTime();
308 hour = currTime.hour(); 330 hour = currTime.hour();
309 minute = currTime.minute(); 331 minute = currTime.minute();
310 332
311 QHBoxLayout *hb2 = new QHBoxLayout( this ); 333 QHBoxLayout *hb2 = new QHBoxLayout( this );
312 hb2->setSpacing( 3 ); 334 hb2->setSpacing( 3 );
313 335
314 QLabel *l = new QLabel( tr("Hour"), this ); 336 QLabel *l = new QLabel( tr("Hour"), this );
315 // l->setAlignment( AlignRight | AlignVCenter ); 337 // l->setAlignment( AlignRight | AlignVCenter );
316 hb2->addWidget( l ); 338 hb2->addWidget( l );
317 339
318 sbHour = new QSpinBox( this ); 340 sbHour = new QSpinBox( this );
319 sbHour->setMinimumWidth( 30 ); 341 sbHour->setMinimumWidth( 30 );
320 if(use12hourTime) { 342 if(use12hourTime) {
321 sbHour->setMinValue(1); 343 sbHour->setMinValue(1);
@@ -401,62 +423,63 @@ void SetTime::show12hourTime( int on )
401 if (show_hour >= 12) { 423 if (show_hour >= 12) {
402 show_hour -= 12; 424 show_hour -= 12;
403 ampm->setCurrentItem( ValuePM ); 425 ampm->setCurrentItem( ValuePM );
404 } else { 426 } else {
405 ampm->setCurrentItem( ValueAM ); 427 ampm->setCurrentItem( ValueAM );
406 } 428 }
407 if (show_hour == 0) 429 if (show_hour == 0)
408 show_hour = 12; 430 show_hour = 12;
409 431
410 } else { 432 } else {
411 sbHour->setMinValue( 0 ); 433 sbHour->setMinValue( 0 );
412 sbHour->setMaxValue( 23 ); 434 sbHour->setMaxValue( 23 );
413 } 435 }
414 436
415 437
416 sbHour->setValue( show_hour ); 438 sbHour->setValue( show_hour );
417} 439}
418 440
419void SetTime::checkedPM( int c ) 441void SetTime::checkedPM( int c )
420{ 442{
421 int show_hour = sbHour->value(); 443 int show_hour = sbHour->value();
422 if (show_hour == 12) 444 if (show_hour == 12)
423 show_hour = 0; 445 show_hour = 0;
424 446
425 if ( c == ValuePM ) 447 if ( c == ValuePM )
426 show_hour += 12; 448 show_hour += 12;
427 449
428 hour = show_hour; 450 hour = show_hour;
429} 451}
430 452
431void SetTime::slotTzChange( const QString &tz ) 453void SetTime::slotTzChange( const QString &tz )
432{ 454{
455 qDebug("SetTime::slotTzChange");
433 // set the TZ get the time and leave gracefully... 456 // set the TZ get the time and leave gracefully...
434 QString strSave; 457 QString strSave;
435 strSave = getenv( "TZ" ); 458 strSave = getenv( "TZ" );
436 setenv( "TZ", tz, 1 ); 459 setenv( "TZ", tz, 1 );
437 460
438 QTime t = QTime::currentTime(); 461 QTime t = QTime::currentTime();
439 // reset the time. 462 // reset the time.
440 if ( !strSave.isNull() ) { 463 if ( !strSave.isNull() ) {
441 setenv( "TZ", strSave, 1 ); 464 setenv( "TZ", strSave, 1 );
442 } 465 }
443 466
444 // just set the spinboxes and let it propage through 467 // just set the spinboxes and let it propage through
445 if(use12hourTime) { 468 if(use12hourTime) {
446 int show_hour = t.hour(); 469 int show_hour = t.hour();
447 if (t.hour() >= 12) { 470 if (t.hour() >= 12) {
448 show_hour -= 12; 471 show_hour -= 12;
449 ampm->setCurrentItem( ValuePM ); 472 ampm->setCurrentItem( ValuePM );
450 } else { 473 } else {
451 ampm->setCurrentItem( ValueAM ); 474 ampm->setCurrentItem( ValueAM );
452 } 475 }
453 if (show_hour == 0) 476 if (show_hour == 0)
454 show_hour = 12; 477 show_hour = 12;
455 sbHour->setValue( show_hour ); 478 sbHour->setValue( show_hour );
456 } else { 479 } else {
457 sbHour->setValue( t.hour() ); 480 sbHour->setValue( t.hour() );
458 } 481 }
459 sbMin->setValue( t.minute() ); 482 sbMin->setValue( t.minute() );
460} 483}
461 484
462 485
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 60423e7..778cb9c 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -45,52 +45,54 @@ public:
45public slots: 45public slots:
46 void slotTzChange( const QString& tz ); 46 void slotTzChange( const QString& tz );
47 void show12hourTime( int ); 47 void show12hourTime( int );
48 48
49protected slots: 49protected slots:
50 void hourChanged( int value ); 50 void hourChanged( int value );
51 void minuteChanged( int value ); 51 void minuteChanged( int value );
52 52
53 void checkedPM( int ); 53 void checkedPM( int );
54 54
55protected: 55protected:
56 int hour; 56 int hour;
57 int minute; 57 int minute;
58 bool use12hourTime; 58 bool use12hourTime;
59 QComboBox *ampm; 59 QComboBox *ampm;
60 QSpinBox *sbHour; 60 QSpinBox *sbHour;
61 QSpinBox *sbMin; 61 QSpinBox *sbMin;
62}; 62};
63 63
64class DateButton; 64class DateButton;
65 65
66class SetDateTime : public NtpBase 66class SetDateTime : public NtpBase
67{ 67{
68 Q_OBJECT 68 Q_OBJECT
69public: 69public:
70 SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 ); 70 SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 );
71 ~SetDateTime(); 71 ~SetDateTime();
72 72
73protected slots: 73protected slots:
74 void commitTime(); 74 void commitTime();
75 void tzChange( const QString &tz ); 75 void tzChange( const QString &tz );
76 void formatChanged(int); 76 void formatChanged(int);
77 void updateSystem(int i=0);
77 78
78protected: 79protected:
79 void setTime(QDateTime dt); 80 void setTime(QDateTime dt);
81 void writeSettings();
80 82
81 SetTime *timeButton; 83 SetTime *timeButton;
82 DateButton *dateButton; 84 DateButton *dateButton;
83 TimeZoneSelector *tz; 85 TimeZoneSelector *tz;
84 QComboBox *weekStartCombo; 86 QComboBox *weekStartCombo;
85 QComboBox *ampmCombo; 87 QComboBox *ampmCombo;
86 QComboBox *dateFormatCombo; 88 QComboBox *dateFormatCombo;
87 QComboBox *clockAppletCombo; 89 QComboBox *clockAppletCombo;
88 QPushButton *ButtonSetTime; 90 QPushButton *ButtonSetTime;
89 QLabel *TextLabelMainPredTime; 91 QLabel *TextLabelMainPredTime;
90 92
91 DateFormat date_formats[4]; 93 DateFormat date_formats[4];
92}; 94};
93 95
94 96
95#endif 97#endif
96 98