Changeset 288 for trunk/hiptop

Timestamp:

07/25/06 16:56:58 (18 years ago)

Author:

Nicholas Riley

Message:

Nicer rescheduling support; cancel reschedule should only be supported for repeating alarms (for non-repeating ones, you can only discard).

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• AlarmSetDialog.java (modified) (2 diffs)
• Pester.java (modified) (1 diff)

trunk/hiptop/pester/net/sabi/pester/AlarmSetDialog.java

@@ -131 +131 @@
         if (asNew) {
             mDiscardAlarmButton.hide();
-            // XXX default to now?
         } else {
             editAlarm(alarm);
@@ -154 +153 @@
             Application.registerForEvent(this, Event.EVENT_TIME_FORMAT_CHANGED);
         }
+    }
+
+    public void rescheduleAlarm(Alarm alarm) {
+        setWindowStyle(SYSTEM_DIALOG_STYLE);
+        if (alarm.getRepeating()) {
+            alarm.schedule(); // if we cancel, it'll continue repeating
+        } else {
+            getCancelButton().disable();
+        }
+        editAlarm(alarm, false);
     }
 

trunk/hiptop/pester/net/sabi/pester/Pester.java

@@ -36 +36 @@
             return true;
         case EVENT_SET_ALARM:
-            AlarmSetDialog alarmSetDialog = AlarmSetDialog.getDialog();
-            alarmSetDialog.setWindowStyle(AlarmSetDialog.SYSTEM_DIALOG_STYLE);
-            alarmSetDialog.editAlarm((Alarm)sAlarmStack.pop(),false);
+            AlarmSetDialog.getDialog().rescheduleAlarm((Alarm)sAlarmStack.pop());
             return true;
         case EVENT_SNOOZE_ALARM:
-            String snoozeMinutesString =
-                TextInputAlertWindow.
-                getTextFieldValue((IPCMessage)e.argument,
-                                  ID_SNOOZE_MINUTES);
-            int snoozeMinutes = Integer.parseInt(snoozeMinutesString);
+            int snoozeMinutes =
+                Integer.parseInt(TextInputAlertWindow.
+                                 getTextFieldValue((IPCMessage)e.argument,
+                                                   ID_SNOOZE_MINUTES));
             ((Alarm)sAlarmStack.pop()).snoozeForMinutes(snoozeMinutes);
             return true;