Changeset 260

Timestamp:

07/20/06 02:57:15 (18 years ago)

Author:

Nicholas Riley

Message:

Discard alarm confirmation.

Location:

trunk/hiptop/pester

Files:

• locale/en_US/Pester.rsrc (modified) (2 diffs)
• net/sabi/pester/AlarmListView.java (modified) (2 diffs)

trunk/hiptop/pester/locale/en_US/Pester.rsrc

@@ -49 +49 @@
                 title = "Discard"
                 shortcut = deleteKey
-                event = EVENT_DISCARD_ALARM
+                event = EVENT_CONFIRM_DISCARD_ALARM
 endMenu
 screen ID_ALARM_LIST_SCREEN
@@ -216 +216 @@
         button
                 event = EVENT_DISMISS_ALARM
-                title = "OK"
+                title = okButton
                 position = buttonBottom1
                 shortcut = doneButton
 endAlert
+
+alert ID_DISCARD_ALERT
+        appAlertStyle
+        title = "Discard Alarm?"
+        icon = stopIcon
+        text = "Permanently discard this alarm?"
+        button
+                event = EVENT_DISCARD_ALARM
+                title = discardButton
+                position = buttonBottom2
+        button
+                title = backButton
+                position = buttonBottom1
+                shortcut = doneButton
+endAlert

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

@@ -3 +3 @@
 import danger.app.Application;
 import danger.app.Event;
+import danger.ui.AlertWindow;
 import danger.ui.ActiveListView;
 import danger.util.ActiveList;
@@ -41 +42 @@
             alarmSetDialog().editAlarm(new Alarm(), true);
             return true;
+        case EVENT_CONFIRM_DISCARD_ALARM:
+            AlertWindow alert =
+                Application.getCurrentApp().getAlert(ID_DISCARD_ALERT, this);
+            // XXX localize
+            alert.setMessage("Permanently discard \u201c" +
+                             ((Alarm)getFocusedItem()).getMessage() + 
+                             "\u201d?");
+            alert.show();
+            return true;
         case EVENT_DISCARD_ALARM:
-            // XXX prompt for confirmation
             Alarms.removeAlarm((Alarm)getFocusedItem());
             return true;