Changeset 238

Timestamp:

07/08/06 18:37:31 (18 years ago)

Author:

Nicholas Riley

Message:

First pass at control set for edit dialog.

Location:

trunk/hiptop/pester

Files:

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

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

@@ -64 +64 @@
                 
 endScreen
+
+menu ID_PERIOD_UNITS_MENU
+        menuItem
+                title = "second(s)"
+                id = 1
+        menuItem
+                title = "minute(s)"
+                id = 60
+        menuItem
+                title = "hour(s)"
+                id = 3600
+endMenu
+
 dialog ID_ALARM_SET_DIALOG
-
         title = "Set Alarm"
         showCancel
@@ -88 +100 @@
                 initialFocus
 
+        radioButton
+                title = "In"
+                id = ID_IN_BUTTON
+                positionBelow = ID_MESSAGE_FIELD : 5
+                alignRight = ID_MESSAGE_LABEL
+
+        numberEditor
+                # width = 50
+                id = ID_PERIOD_FIELD
+                dontWrap
+                minValue = 1
+                maxValue = 99
+                alignBaseline = ID_IN_BUTTON
+                positionToRight = ID_IN_BUTTON : 3
+
+        popupMenu
+                menu = ID_PERIOD_UNITS_MENU
+                positionToRight = ID_PERIOD_FIELD : 3
+
+        radioButton
+                title = "At"
+                id = ID_AT_BUTTON
+                positionBelow = ID_PERIOD_FIELD : 5
+                alignRight = ID_MESSAGE_LABEL
+
+        dateEditor
+                id = ID_TIME_EDITOR
+                longTimeFormat
+                positionToRight = ID_AT_BUTTON : 3
+                alignBaseline = ID_AT_BUTTON
+
+        dateEditor
+                id = ID_DATE_EDITOR
+                positionToRight = ID_TIME_EDITOR : 1
+                alignBaseline = ID_AT_BUTTON
+        
+        datePicker
+                id = ID_DATE_PICKER
+                positionToRight = ID_DATE_EDITOR : 1
+                alignTop = ID_DATE_EDITOR
+
+        button
+                id = ID_DISCARD_ALARM_BUTTON
+                position = buttonTop2
+                title = "Discard"
+                event = EVENT_DISCARD_ALARM
+
         button
                 position = buttonBottom1

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

@@ -4 +4 @@
 import danger.app.Event;
 import danger.ui.ActiveListView;
+import danger.ui.Button;
 import danger.ui.DialogWindow;
 import danger.ui.Rect;
@@ -21 +22 @@
     private static DialogWindow sEditWindow;
     private TypeAheadTextField sMessageField;
+    private Button sDiscardAlarmButton;
 
     private static Alarm sFocusedAlarm, sEditingAlarm;
@@ -36 +38 @@
         sMessageField = (TypeAheadTextField)sEditWindow.getDescendantWithID(ID_MESSAGE_FIELD);
         sEditWindow.disableBottomRightButtonOnEmptyField(sMessageField);
+        sDiscardAlarmButton = (Button)sEditWindow.getDescendantWithID(ID_DISCARD_ALARM_BUTTON);
 
         super.onDecoded();
@@ -50 +53 @@
     }
 
-    void editAlarm(Alarm alarm) {
+    void editAlarm(Alarm alarm, boolean asNew) {
         sEditingAlarm = alarm;
         alarm.beginEditing();
         sMessageField.setText(sEditingAlarm.getMessage());
+        if (asNew) {
+            sDiscardAlarmButton.hide();
+        } else {
+            sDiscardAlarmButton.show();
+        }
+        boolean usesPeriod = sEditingAlarm.getUsesPeriod();
+        
         sEditWindow.show();
     }
@@ -60 +70 @@
         switch (e.type) {
         case EVENT_NEW_ALARM:
-            editAlarm(new Alarm());
+            editAlarm(new Alarm(), true);
             return true;
         case EVENT_SET_ALARM:
@@ -83 +93 @@
     protected void itemActivated(Object item) {
         // XXX deschedule alarm
-        editAlarm(sFocusedAlarm);
+        editAlarm(sFocusedAlarm, false);
     }
     protected void itemFocused(Object item) {