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
@@ -296,24 +296,27 @@ void Clock::slotSetAlarm()
slotToggleAlarm();
Set_Alarm *setAlarmDlg;
setAlarmDlg = new Set_Alarm(this,"SetAlarm", TRUE);
int result = setAlarmDlg->exec();
if(result == 1) {
Config config( "qpe" );
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);
config.write();
}
}
void Clock::slotSnooze()
{
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
@@ -123,30 +123,33 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl
QString alarmHour=config.readEntry("clockAlarmHour","8");
int i_alarmHour = alarmHour.toInt(&ok,10);
QString alarmMinute=config.readEntry("clockAlarmMinute","0");
QString snoozeTime=config.readEntry("clockAlarmSnooze","0");
if(ampm) {
Hour_Slider->setMaxValue( 12);
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();
}
// signals and slots connections
}
Set_Alarm::~Set_Alarm()
{