Changeset 243 for trunk/hiptop/pester/net/sabi/pester/AlarmListView.java

Timestamp:

07/09/06 03:16:34 (18 years ago)

Author:

Nicholas Riley

Message:

Bug fixing and cleanups.

File:

• trunk/hiptop/pester/net/sabi/pester/AlarmListView.java (modified) (4 diffs)

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

@@ -124 +124 @@
         Date date = sDateEditor.getDate();
         date.setTime(sTimeEditor.getDate().getTime());
+        date.setSeconds(0);
         return date;
     }
@@ -153 +154 @@
                 sEditingAlarm.setDate(editingDate());
             }
+            // schedule before adding so the tooltip is correct
+            sEditingAlarm.schedule();
             if (sEditingAlarm != sFocusedAlarm) { // new alarm
                 sAlarmList.addItem(sEditingAlarm);
                 setFocusedItem(sEditingAlarm);
                 sFocusedAlarm = sEditingAlarm;
-            } else {
-                sEditingAlarm.update();
-            }
+            }
+            return true;
         case EVENT_CANCEL_ALARM:
-            if (sEditingAlarm == sFocusedAlarm)
-                sEditingAlarm.schedule();
+            if (sEditingAlarm == sFocusedAlarm) // existing alarm
+                sEditingAlarm.resume();
             sEditingAlarm = null;
             return true;
@@ -200 +202 @@
 
     protected void itemActivated(Object item) {
-        // XXX deschedule alarm
         editAlarm(sFocusedAlarm, false);
     }
@@ -223 +224 @@
         if (item == null) // this is dumb, why do we get asked for a tooltip?
             return null;
-        // XXX only set a tooltip if the message is truncated
-        return ((Alarm)item).getMessage();
+        // XXX need "in XXX minutes" too
+        return ((Alarm)item).getDateTimeString();
     }
 }