Changeset 246

Timestamp:

07/09/06 05:46:44 (18 years ago)

Author:

Nicholas Riley

Message:

Chooser label; 0 -> No; persist ringtone and alarm message for new alarms.

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• AlarmListView.java (modified) (1 diff)
• AlarmListWindow.java (modified) (3 diffs)

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

@@ -120 +120 @@
         sEditingAlarm = alarm;
         alarm.beginEditing();
-        sMessageField.setText(alarm.getMessage());
         if (asNew) {
             sDiscardAlarmButton.hide();
         } else {
+            sMessageField.setText(alarm.getMessage());
             sDiscardAlarmButton.show();
             editDateOrPeriod(alarm);
+            sAlertPicker.setRingTone(sEditingAlarm.getAlert());
         }
         constrainDate();
-        sAlertPicker.setRingTone(sEditingAlarm.getAlert());
         sEditWindow.show();
     }

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

@@ -1 +1 @@
 package net.sabi.pester;
 
+import danger.app.Application;
 import danger.ui.ScreenWindow;
 import danger.ui.Menu;
@@ -8 +9 @@
     implements Resources, Commands {
     private static AlarmListView sAlarmListView;
+    private static Pester sPester;
 
     public void onDecoded() {
         sAlarmListView = (AlarmListView)getDescendantWithID(ID_ALARM_LIST_VIEW);
+        sPester = (Pester)Application.getCurrentApp();
         updateAlarmCount();
         super.onDecoded();
@@ -17 +20 @@
     public void updateAlarmCount() {
         int size = sAlarmListView.alarmsSet();
-        StringBuffer sb = new StringBuffer().append(size).append(" alarm");
+        StringBuffer sb = new StringBuffer();
+        if (size == 0) sb.append("No");
+        else sb.append(size);
+        sb.append(" alarm");
         if (size != 1) sb.append('s');
-        // sb.append(" set");
-        setSubTitle(sb.toString());
+        sb.append(" set");
+        String alarmCount = sb.toString();
+        setSubTitle(alarmCount);
+        sPester.setChooserFolderLabel(alarmCount);
+        sPester.updatePreviewScreen();
     }