summaryrefslogtreecommitdiff
authorsandman <sandman>2002-06-10 23:24:52 (UTC)
committer sandman <sandman>2002-06-10 23:24:52 (UTC)
commit4ca2d71bbbe91c01e398f6aadd69975fa8894c29 (patch) (side-by-side diff)
tree7533774848c0fbe63aa89550c30be021019c06ed
parent3613c40c01d05fa7bbb60c376a486a350a67d6a6 (diff)
downloadopie-4ca2d71bbbe91c01e398f6aadd69975fa8894c29.zip
opie-4ca2d71bbbe91c01e398f6aadd69975fa8894c29.tar.gz
opie-4ca2d71bbbe91c01e398f6aadd69975fa8894c29.tar.bz2
Fix some oddities regarding AM/PM and alarms at 00:xx in 24H mode
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/tools/clock/clock.cpp3
-rw-r--r--noncore/tools/clock/setAlarm.cpp7
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
@@ -307,2 +307,5 @@ void Clock::slotSetAlarm()
if(ampm) {
+ if ( hour == 12 )
+ hour = 0;
+
if(setAlarmDlg->Pm_RadioButton->isChecked() && 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
@@ -134,3 +134,6 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
}
- Hour_Slider->setValue( i_alarmHour);
+ else if ( i_alarmHour == 0 ) {
+ i_alarmHour = 12;
+ }
+ Hour_Slider->setValue( i_alarmHour );
Minute_Slider->setValue( alarmMinute.toInt(&ok,10) );
@@ -139,3 +142,3 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
Hour_Slider->setMaxValue( 23);
- Hour_Slider->setMinValue( 1);
+ Hour_Slider->setMinValue( 0);
Hour_Slider->setValue( i_alarmHour);