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 | |||
@@ -296,24 +296,27 @@ void Clock::slotSetAlarm() | |||
296 | slotToggleAlarm(); | 296 | slotToggleAlarm(); |
297 | Set_Alarm *setAlarmDlg; | 297 | Set_Alarm *setAlarmDlg; |
298 | setAlarmDlg = new Set_Alarm(this,"SetAlarm", TRUE); | 298 | setAlarmDlg = new Set_Alarm(this,"SetAlarm", TRUE); |
299 | int result = setAlarmDlg->exec(); | 299 | int result = setAlarmDlg->exec(); |
300 | if(result == 1) { | 300 | if(result == 1) { |
301 | Config config( "qpe" ); | 301 | Config config( "qpe" ); |
302 | config.setGroup("Time"); | 302 | config.setGroup("Time"); |
303 | QString tmp; | 303 | QString tmp; |
304 | hour = setAlarmDlg->Hour_Slider->value(); | 304 | hour = setAlarmDlg->Hour_Slider->value(); |
305 | minute = setAlarmDlg->Minute_Slider->value(); | 305 | minute = setAlarmDlg->Minute_Slider->value(); |
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; |
310 | } | 313 | } |
311 | config.writeEntry("clockAlarmHour", tmp.setNum( hour ),10); | 314 | config.writeEntry("clockAlarmHour", tmp.setNum( hour ),10); |
312 | config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10); | 315 | config.writeEntry("clockAlarmMinute",tmp.setNum( minute ),10); |
313 | config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10); | 316 | config.writeEntry("clockAlarmSnooze",tmp.setNum( snoozeTime ),10); |
314 | config.write(); | 317 | config.write(); |
315 | } | 318 | } |
316 | } | 319 | } |
317 | 320 | ||
318 | void Clock::slotSnooze() | 321 | void Clock::slotSnooze() |
319 | { | 322 | { |
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 | |||
123 | QString alarmHour=config.readEntry("clockAlarmHour","8"); | 123 | QString alarmHour=config.readEntry("clockAlarmHour","8"); |
124 | int i_alarmHour = alarmHour.toInt(&ok,10); | 124 | int i_alarmHour = alarmHour.toInt(&ok,10); |
125 | QString alarmMinute=config.readEntry("clockAlarmMinute","0"); | 125 | QString alarmMinute=config.readEntry("clockAlarmMinute","0"); |
126 | QString snoozeTime=config.readEntry("clockAlarmSnooze","0"); | 126 | QString snoozeTime=config.readEntry("clockAlarmSnooze","0"); |
127 | if(ampm) { | 127 | if(ampm) { |
128 | Hour_Slider->setMaxValue( 12); | 128 | Hour_Slider->setMaxValue( 12); |
129 | Hour_Slider->setMinValue( 1); | 129 | Hour_Slider->setMinValue( 1); |
130 | 130 | ||
131 | if( i_alarmHour > 12) { | 131 | if( i_alarmHour > 12) { |
132 | i_alarmHour = i_alarmHour - 12; | 132 | i_alarmHour = i_alarmHour - 12; |
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) ); |
143 | SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); | 146 | SnoozeSlider->setValue( snoozeTime.toInt(&ok,10) ); |
144 | Am_RadioButton->hide(); | 147 | Am_RadioButton->hide(); |
145 | Pm_RadioButton->hide(); | 148 | Pm_RadioButton->hide(); |
146 | } | 149 | } |
147 | // signals and slots connections | 150 | // signals and slots connections |
148 | } | 151 | } |
149 | 152 | ||
150 | Set_Alarm::~Set_Alarm() | 153 | Set_Alarm::~Set_Alarm() |
151 | { | 154 | { |
152 | 155 | ||