summaryrefslogtreecommitdiff
authorerik <erik>2007-04-23 20:38:22 (UTC)
committer erik <erik>2007-04-23 20:38:22 (UTC)
commitd38e40fe9ee475230425fa83e924c49e5946b87c (patch) (unidiff)
treef10fceda92538e1bc9cee66f82062773974ec092
parent1edbb754d3c8cfccf1630e2ad1e531e907555cbd (diff)
downloadopie-d38e40fe9ee475230425fa83e924c49e5946b87c.zip
opie-d38e40fe9ee475230425fa83e924c49e5946b87c.tar.gz
opie-d38e40fe9ee475230425fa83e924c49e5946b87c.tar.bz2
Fix for bug 1848 where the outcome of setting the time to 12:00AM did not
work. This commit is based on a patch submitted by harlekin. Thank you!
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
@@ -168,25 +168,25 @@ void TimeTabWidget::saveSettings( bool commit )
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 }
@@ -230,25 +230,25 @@ void 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