summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -302,12 +302,15 @@ void Clock::slotSetAlarm()
config.setGroup("Time");
QString tmp;
hour = setAlarmDlg->Hour_Slider->value();
minute = setAlarmDlg->Minute_Slider->value();
snoozeTime=setAlarmDlg->SnoozeSlider->value();
if(ampm) {
+ if ( hour == 12 )
+ hour = 0;
+
if(setAlarmDlg->Pm_RadioButton->isChecked() && hour < 12 )
hour+=12;
}
config.writeEntry("clockAlarmHour", tmp.setNum( hour ),10);
config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10);
config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10);
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
@@ -129,18 +129,21 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
Hour_Slider->setMinValue( 1);
if( i_alarmHour > 12) {
i_alarmHour = i_alarmHour - 12;
Pm_RadioButton->setChecked(TRUE);
}
- 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) );
SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) );
} else {
Hour_Slider->setMaxValue( 23);
- Hour_Slider->setMinValue( 1);
+ Hour_Slider->setMinValue( 0);
Hour_Slider->setValue( i_alarmHour);
Minute_Slider->setValue( alarmMinute.toInt(&ok,10) );
SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) );
Am_RadioButton->hide();
Pm_RadioButton->hide();
}