Changeset 248 for trunk/hiptop

Timestamp:

07/09/06 21:28:43 (18 years ago)

Author:

Nicholas Riley

Message:

Better way of retrieving selected unit (thanks, Jean-Sebastien Payette)

Location:

trunk/hiptop/pester

Files:

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

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

@@ -68 +68 @@
 menu ID_PERIOD_UNITS_MENU
         menuItem
-                id = ID_PERIOD_SECONDS
                 title = "second(s)"
                 event = EVENT_PERIOD_UNIT
                 eventData = 1
         menuItem
-                id = ID_PERIOD_MINUTES
                 title = "minute(s)"
                 event = EVENT_PERIOD_UNIT
                 eventData = 60
         menuItem
-                id = ID_PERIOD_HOURS
                 title = "hour(s)"
                 event = EVENT_PERIOD_UNIT

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

@@ -13 +13 @@
 import danger.ui.DatePicker;
 import danger.ui.DialogWindow;
-import danger.ui.Menu;
 import danger.ui.MenuItem;
 import danger.ui.NumberEditor;
@@ -37 +36 @@
     private RadioButton sInButton, sAtButton;
     private NumberEditor sPeriodField;
-    private Menu sPeriodUnitsMenu;
     private PopupMenu sPeriodUnitsPopup;
     // XXX don't allow <5 second repeating alarms
@@ -63 +61 @@
         sAtButton = (RadioButton)sEditWindow.getDescendantWithID(ID_AT_BUTTON);
         sPeriodField = (NumberEditor)sEditWindow.getDescendantWithID(ID_PERIOD_FIELD);
-        sPeriodUnitsMenu = (Menu)sEditWindow.getDescendantWithID(ID_PERIOD_UNITS_MENU);
         sPeriodUnitsPopup = (PopupMenu)sEditWindow.getDescendantWithID(ID_PERIOD_UNITS_POPUP);
         sRepeatCheckBox = (CheckBox)sEditWindow.getDescendantWithID(ID_PERIOD_REPEAT_CHECKBOX);
@@ -97 +94 @@
             int period = alarm.getPeriod();
             for (int i = sPeriodUnitsPopup.itemCount() - 1 ; i >= 0 ; --i) {
-                MenuItem item = sPeriodUnitsPopup.getItem(i);
-                int unitsPerSec = item.getEvent().data;
+                int unitsPerSec = sPeriodUnitsPopup.getItem(i).getEvent().data;
                 if (period % unitsPerSec == 0) {
-                    sPeriodUnitsPopup.setValueWithItemID(sPeriodUnitsMenu.getIDOfItem(item));
+                    sPeriodUnitsPopup.setValue(i);
                     sPeriodField.setValue(period / unitsPerSec);
                     break;
@@ -139 +135 @@
     }
 
+    // XXX make this into a more general validation method;
+    // XXX check before dismissing dialog that alarm is valid
+    // XXX and display alarm date
     protected void constrainDate() {
         // XXX schedule every minute (second?) if in AT mode
@@ -157 +156 @@
             sEditingAlarm.setMessage(sMessageField.toString());
             if (sInButton.getValue() == 1) {
-                int itemID = sPeriodUnitsPopup.getValueAsItemID();
-                MenuItem itemWithID = sPeriodUnitsMenu.getItemWithID(itemID);
-                Event event = itemWithID.getEvent();
+                int itemIndex = sPeriodUnitsPopup.getValue();
+                MenuItem itemAtIndex = sPeriodUnitsPopup.getItem(itemIndex);
+                Event event = itemAtIndex.getEvent();
                 sEditingAlarm.setPeriod(sPeriodField.getValue() * event.data,
                                         sRepeatCheckBox.getValue() == 1);