author | zecke <zecke> | 2004-10-22 15:15:01 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-22 15:15:01 (UTC) |
commit | f2a2eca1870e1fd88c82a6ccb039610949daa72c (patch) (unidiff) | |
tree | 9ca204b4cddfee6272cfc8d5e55b27b60a0743d0 /noncore/settings/netsystemtime/timetabwidget.cpp | |
parent | 0a3ab70a5be70bb04691a2a566ce63719e57f83e (diff) | |
download | opie-f2a2eca1870e1fd88c82a6ccb039610949daa72c.zip opie-f2a2eca1870e1fd88c82a6ccb039610949daa72c.tar.gz opie-f2a2eca1870e1fd88c82a6ccb039610949daa72c.tar.bz2 |
Write the hardware clock after setting the datetime. This way we can
gurantee it is set while opiealarm has not run.
Diffstat (limited to 'noncore/settings/netsystemtime/timetabwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/timetabwidget.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp index 1ea460e..3cc127d 100644 --- a/noncore/settings/netsystemtime/timetabwidget.cpp +++ b/noncore/settings/netsystemtime/timetabwidget.cpp | |||
@@ -69,7 +69,7 @@ TimeTabWidget::TimeTabWidget( QWidget *parent ) | |||
69 | sv->setFrameStyle( QFrame::NoFrame ); | 69 | sv->setFrameStyle( QFrame::NoFrame ); |
70 | QWidget *container = new QWidget( sv->viewport() ); | 70 | QWidget *container = new QWidget( sv->viewport() ); |
71 | sv->addChild( container ); | 71 | sv->addChild( container ); |
72 | 72 | ||
73 | QGridLayout *layout = new QGridLayout( container ); | 73 | QGridLayout *layout = new QGridLayout( container ); |
74 | layout->setMargin( 2 ); | 74 | layout->setMargin( 2 ); |
75 | layout->setSpacing( 4 ); | 75 | layout->setSpacing( 4 ); |
@@ -187,7 +187,7 @@ void TimeTabWidget::setDateTime( const QDateTime &dt ) | |||
187 | sbHour->setValue( t.hour() ); | 187 | sbHour->setValue( t.hour() ); |
188 | } | 188 | } |
189 | sbMin->setValue( t.minute() ); | 189 | sbMin->setValue( t.minute() ); |
190 | 190 | ||
191 | // Set date | 191 | // Set date |
192 | btnDate->setDate( dt.date() ); | 192 | btnDate->setDate( dt.date() ); |
193 | } | 193 | } |
@@ -203,14 +203,20 @@ void TimeTabWidget::setSystemTime( const QDateTime &dt ) | |||
203 | myTv.tv_usec = 0; | 203 | myTv.tv_usec = 0; |
204 | 204 | ||
205 | if ( myTv.tv_sec != -1 ) | 205 | if ( myTv.tv_sec != -1 ) |
206 | ::settimeofday( &myTv, 0 ); | 206 | ::settimeofday( &myTv, 0 ); |
207 | |||
208 | /* | ||
209 | * Commit the datetime to the 'hardware' | ||
210 | * as Global::writeHWClock() is a NOOP with Opie Alarm | ||
211 | */ | ||
212 | system("/sbin/hwclock --systohc --utc"); | ||
207 | } | 213 | } |
208 | } | 214 | } |
209 | 215 | ||
210 | void TimeTabWidget::slotUse12HourTime( int i ) | 216 | void TimeTabWidget::slotUse12HourTime( int i ) |
211 | { | 217 | { |
212 | use12HourTime = (i == 1); | 218 | use12HourTime = (i == 1); |
213 | 219 | ||
214 | cbAmpm->setEnabled( use12HourTime ); | 220 | cbAmpm->setEnabled( use12HourTime ); |
215 | 221 | ||
216 | int show_hour = sbHour->value(); | 222 | int show_hour = sbHour->value(); |