summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/timetabwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/timetabwidget.cpp b/noncore/settings/netsystemtime/timetabwidget.cpp
index 895514b..e6fcf7f 100644
--- a/noncore/settings/netsystemtime/timetabwidget.cpp
+++ b/noncore/settings/netsystemtime/timetabwidget.cpp
@@ -156,49 +156,49 @@ void TimeTabWidget::saveSettings( bool commit )
156 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" ); 156 QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
157 setTimeZone << tz; 157 setTimeZone << tz;
158 158
159 // If controls have a valid date & time, update systemtime 159 // If controls have a valid date & time, update systemtime
160 int hour = sbHour->value(); 160 int hour = sbHour->value();
161 if ( use12HourTime && cbAmpm->currentItem() == ValuePM ) 161 if ( use12HourTime && cbAmpm->currentItem() == ValuePM )
162 hour += 12; 162 hour += 12;
163 QDateTime dt( btnDate->date(), QTime ( hour, sbMin->value(), QTime::currentTime().second() ) ); 163 QDateTime dt( btnDate->date(), QTime ( hour, sbMin->value(), QTime::currentTime().second() ) );
164 setSystemTime( dt ); 164 setSystemTime( dt );
165 } 165 }
166 else 166 else
167 { 167 {
168 // Reset systemtime to hardware clock (i.e. undo any changes made by this app) 168 // Reset systemtime to hardware clock (i.e. undo any changes made by this app)
169 system("/sbin/hwclock --hctosys --utc"); 169 system("/sbin/hwclock --hctosys --utc");
170 } 170 }
171} 171}
172 172
173void TimeTabWidget::setDateTime( const QDateTime &dt ) 173void TimeTabWidget::setDateTime( const QDateTime &dt )
174{ 174{
175 // Set time 175 // Set time
176 QTime t = dt.time(); 176 QTime t = dt.time();
177 if( use12HourTime ) 177 if( use12HourTime )
178 { 178 {
179 int show_hour = t.hour(); 179 int show_hour = t.hour();
180 if ( t.hour() >= 12 ) 180 if ( t.hour() > 12 )
181 { 181 {
182 show_hour -= 12; 182 show_hour -= 12;
183 cbAmpm->setCurrentItem( ValuePM ); 183 cbAmpm->setCurrentItem( ValuePM );
184 } 184 }
185 else 185 else
186 { 186 {
187 cbAmpm->setCurrentItem( ValueAM ); 187 cbAmpm->setCurrentItem( ValueAM );
188 } 188 }
189 if ( show_hour == 0 ) 189 if ( show_hour == 0 )
190 show_hour = 12; 190 show_hour = 12;
191 sbHour->setValue( show_hour ); 191 sbHour->setValue( show_hour );
192 } 192 }
193 else 193 else
194 { 194 {
195 sbHour->setValue( t.hour() ); 195 sbHour->setValue( t.hour() );
196 } 196 }
197 sbMin->setValue( t.minute() ); 197 sbMin->setValue( t.minute() );
198 198
199 // Set date 199 // Set date
200 btnDate->setDate( dt.date() ); 200 btnDate->setDate( dt.date() );
201} 201}
202 202
203void TimeTabWidget::setNTPBtnEnabled( bool enabled ) 203void TimeTabWidget::setNTPBtnEnabled( bool enabled )
204{ 204{
@@ -218,49 +218,49 @@ void TimeTabWidget::setSystemTime( const QDateTime &dt )
218 if ( myTv.tv_sec != -1 ) 218 if ( myTv.tv_sec != -1 )
219 ::settimeofday( &myTv, 0 ); 219 ::settimeofday( &myTv, 0 );
220 220
221 /* 221 /*
222 * Commit the datetime to the 'hardware' 222 * Commit the datetime to the 'hardware'
223 * as Global::writeHWClock() is a NOOP with Opie Alarm 223 * as Global::writeHWClock() is a NOOP with Opie Alarm
224 */ 224 */
225 system("/sbin/hwclock --systohc --utc"); 225 system("/sbin/hwclock --systohc --utc");
226 } 226 }
227} 227}
228 228
229void TimeTabWidget::slotUse12HourTime( int i ) 229void TimeTabWidget::slotUse12HourTime( int i )
230{ 230{
231 use12HourTime = (i == 1); 231 use12HourTime = (i == 1);
232 232
233 cbAmpm->setEnabled( use12HourTime ); 233 cbAmpm->setEnabled( use12HourTime );
234 234
235 int show_hour = sbHour->value(); 235 int show_hour = sbHour->value();
236 236
237 if ( use12HourTime ) 237 if ( use12HourTime )
238 { 238 {
239 sbHour->setMinValue( 1 ); 239 sbHour->setMinValue( 1 );
240 sbHour->setMaxValue( 12 ); 240 sbHour->setMaxValue( 12 );
241 241
242 if ( show_hour >= 12 ) 242 if ( show_hour > 12 )
243 { 243 {
244 show_hour -= 12; 244 show_hour -= 12;
245 cbAmpm->setCurrentItem( ValuePM ); 245 cbAmpm->setCurrentItem( ValuePM );
246 } 246 }
247 else 247 else
248 { 248 {
249 cbAmpm->setCurrentItem( ValueAM ); 249 cbAmpm->setCurrentItem( ValueAM );
250 } 250 }
251 if ( show_hour == 0 ) 251 if ( show_hour == 0 )
252 show_hour = 12; 252 show_hour = 12;
253 } 253 }
254 else 254 else
255 { 255 {
256 sbHour->setMinValue( 0 ); 256 sbHour->setMinValue( 0 );
257 sbHour->setMaxValue( 23 ); 257 sbHour->setMaxValue( 23 );
258 258
259 if ( cbAmpm->currentItem() == ValuePM ) 259 if ( cbAmpm->currentItem() == ValuePM )
260 { 260 {
261 show_hour += 12; 261 show_hour += 12;
262 if ( show_hour == 24 ) 262 if ( show_hour == 24 )
263 show_hour = 0; 263 show_hour = 0;
264 } 264 }
265 } 265 }
266 266