author | sandman <sandman> | 2002-06-10 23:24:52 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-06-10 23:24:52 (UTC) |
commit | 4ca2d71bbbe91c01e398f6aadd69975fa8894c29 (patch) (unidiff) | |
tree | 7533774848c0fbe63aa89550c30be021019c06ed /noncore/tools | |
parent | 3613c40c01d05fa7bbb60c376a486a350a67d6a6 (diff) | |
download | opie-4ca2d71bbbe91c01e398f6aadd69975fa8894c29.zip opie-4ca2d71bbbe91c01e398f6aadd69975fa8894c29.tar.gz opie-4ca2d71bbbe91c01e398f6aadd69975fa8894c29.tar.bz2 |
Fix some oddities regarding AM/PM and alarms at 00:xx in 24H mode
-rw-r--r-- | noncore/tools/clock/clock.cpp | 3 | ||||
-rw-r--r-- | noncore/tools/clock/setAlarm.cpp | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index 9b9e644..a47793b 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp | |||
@@ -306,4 +306,7 @@ void Clock::slotSetAlarm() | |||
306 | snoozeTime=setAlarmDlg->SnoozeSlider->value(); | 306 | snoozeTime=setAlarmDlg->SnoozeSlider->value(); |
307 | if(ampm) { | 307 | if(ampm) { |
308 | if ( hour == 12 ) | ||
309 | hour = 0; | ||
310 | |||
308 | if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 ) | 311 | if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 ) |
309 | hour+=12; | 312 | hour+=12; |
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp index 6b95e6a..bd964e0 100644 --- a/noncore/tools/clock/setAlarm.cpp +++ b/noncore/tools/clock/setAlarm.cpp | |||
@@ -133,10 +133,13 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl | |||
133 | Pm_RadioButton->setChecked(TRUE); | 133 | Pm_RadioButton->setChecked(TRUE); |
134 | } | 134 | } |
135 | Hour_Slider->setValue( i_alarmHour); | 135 | else if ( i_alarmHour == 0 ) { |
136 | i_alarmHour = 12; | ||
137 | } | ||
138 | Hour_Slider->setValue( i_alarmHour ); | ||
136 | Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); | 139 | Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); |
137 | SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); | 140 | SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); |
138 | } else { | 141 | } else { |
139 | Hour_Slider->setMaxValue( 23); | 142 | Hour_Slider->setMaxValue( 23); |
140 | Hour_Slider->setMinValue( 1); | 143 | Hour_Slider->setMinValue( 0); |
141 | Hour_Slider->setValue( i_alarmHour); | 144 | Hour_Slider->setValue( i_alarmHour); |
142 | Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); | 145 | Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); |