Changeset 244 for trunk

Timestamp:

07/09/06 03:57:15 (18 years ago)

Author:

Nicholas Riley

Message:

Audio support.

Location:

trunk/hiptop/pester

Files:

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

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

@@ -88 +88 @@
 #       className = "net.sabi.pester.AlarmSetDialog"
         widthPct = 100
+        centerUnderTitleBar
 
         staticText
@@ -172 +173 @@
                         alignTop = ID_DATE_EDITOR
         endGroupBox
-        
+
+        staticText
+                text = "Alert"
+                id = ID_ALERT_LABEL
+                justifyRight
+                font = boldSysFont
+                positionBelow = ID_AT_GROUP : 5
+                alignRight = ID_MESSAGE_LABEL
+
+        ringTonePicker
+                id = ID_ALERT_PICKER
+                # alignBaseline = ID_ALERT_LABEL
+                positionBelow = ID_AT_GROUP : 3
+                positionToRight = ID_ALERT_LABEL : 3
+                fillToRight = 0
+
         button
                 id = ID_DISCARD_ALARM_BUTTON

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

@@ -6 +6 @@
 import java.io.DataOutputStream;
 import danger.app.Application;
+import danger.audio.RingToneObject;
 import danger.internal.Date;
 import danger.util.LocaleUtils;
@@ -22 +23 @@
     private int mPeriod; // XXX rename to 'interval'
     private Date mDate;
+    private RingToneObject mAlert;
 
     // transient
@@ -47 +49 @@
         return mDate;
     }
+    public RingToneObject getAlert() {
+        return mAlert;
+    }
 
     public void setMessage(String message) {
@@ -58 +63 @@
         mType = TYPE_DATE;
         mDate = date;
+    }
+    public void setAlert(RingToneObject alert) {
+        mAlert = alert.isValid() ? alert : null;
     }
 

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

@@ -3 +3 @@
 import danger.app.Application;
 import danger.app.Event;
+import danger.audio.ToneClass;
+import danger.audio.ToneRights;
+
 import danger.internal.Date;
 import danger.ui.ActiveListView;
@@ -16 +19 @@
 import danger.ui.RadioButton;
 import danger.ui.Rect;
+import danger.ui.RingTonePicker;
 import danger.ui.TypeAheadTextField;
 import danger.util.ActiveList;
@@ -39 +43 @@
     private DateTimeEditor sTimeEditor, sDateEditor;
     private DatePicker sDatePicker;
+    private RingTonePicker sAlertPicker;
     private Button sDiscardAlarmButton, sSetAlarmButton;
 
@@ -64 +69 @@
         sDateEditor = (DateTimeEditor)sEditWindow.getDescendantWithID(ID_DATE_EDITOR);
         sDatePicker = (DatePicker)sEditWindow.getDescendantWithID(ID_DATE_PICKER);
+        sAlertPicker = (RingTonePicker)sEditWindow.getDescendantWithID(ID_ALERT_PICKER);
         sSetAlarmButton = (Button)sEditWindow.getDescendantWithID(ID_SET_ALARM_BUTTON);
         sDiscardAlarmButton = (Button)sEditWindow.getDescendantWithID(ID_DISCARD_ALARM_BUTTON);
         sInButton.setValue(1);
         sDateEditor.limitToDangerEpoch();
+        sAlertPicker.setGroupFilter(ToneClass.FOREGROUND | ToneClass.BACKGROUND |
+                                    ToneClass.CUSTOM);
+        sAlertPicker.setRights(ToneRights.FULL);
+        sAlertPicker.setCanRecord(true);
 
         super.onDecoded();
@@ -118 +128 @@
         }
         constrainDate();
+        sAlertPicker.setRingTone(sEditingAlarm.getAlert());
         sEditWindow.show();
     }
@@ -154 +165 @@
                 sEditingAlarm.setDate(editingDate());
             }
+            sEditingAlarm.setAlert(sAlertPicker.getRingTone());
             // schedule before adding so the tooltip is correct
             sEditingAlarm.schedule();

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

@@ -25 +25 @@
             alert.setTitle(alert.getTitle() + ": " + alarm.getDateTimeString());
             alert.setMessage(alarm.getMessage());
-            // alert.setMessageFormatDate(alarm.getDate());
+            alert.setShowTone(alarm.getAlert());
             alert.show(AlertWindow.SYSTEM_ALERT_TYPE_ALARM);
             sAlarmStack.push(alarm);