Changeset 280 for trunk

Timestamp:

07/24/06 07:19:50 (18 years ago)

Author:

Nicholas Riley

Message:

If you're editing an alarm, focus on the time/interval edit field
rather than the message. Relayout set alarm display when time/date
format changes (yay positionDynamically!). Attempt to fix tooltip for

1-minute alarm refreshing/flashing without changing (needs more

testing). Build against 3.0 libraries by default.

Location:

trunk/hiptop/pester

Files:

• build.xml (modified) (1 diff)
• locale/en_US/Pester.rsrc (modified) (4 diffs)
• net/sabi/pester/Alarm.java (modified) (1 diff)
• net/sabi/pester/AlarmSetDialog.java (modified) (4 diffs)

trunk/hiptop/pester/build.xml

@@ -12 +12 @@
     <property name="APP_VERSION_BUILD" value="1"/>
 
+    <property name="TARGET_LIB_VERSION" value="3.0" />
+
     <import file="${DANGER_HOME}/tools/build_common.xml"/>
 </project>

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

@@ -163 +163 @@
                         alignBaseline = ID_AT_BUTTON
                         positionToRight = ID_AT_BUTTON : 1
-        
+
                 dateEditor
                         id = ID_DATE_EDITOR
@@ -170 +170 @@
                         alignBaseline = ID_TIME_EDITOR
                         className = "net.sabi.pester.AlarmDateEditor"
+                        positionDynamically # can move if time format changes
                 
                 datePicker
@@ -176 +177 @@
                         positionToRight = ID_DATE_EDITOR : 1
                         alignTop = ID_DATE_EDITOR
+                        positionDynamically # can move if time format changes
         endGroupBox
 
@@ -220 +222 @@
         button
                 event = EVENT_SET_ALARM
-                title = "Edit..."
+                title = "Reschedule..."
                 position = buttonBottom2
         button

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

@@ -278 +278 @@
         if (i <= 24 * 60 * 60) {
             i %= 60;
-            return (i == 0 ? 60 : i);
+            return (i == 0 ? 60 : i + 1);
         }
         i %= 3600;
-        return (i == 0 ? 3600 : i);
+        return (i == 0 ? 3600 : i + 1);
     }
 

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

@@ -23 +23 @@
 import danger.ui.StaticTextBox;
 import danger.ui.TypeAheadTextField;
+import danger.ui.View;
 import danger.util.DEBUG;
 
@@ -136 +137 @@
         Application.registerForEvent(this, Event.EVENT_TIME_CHANGED);
         show();
+        if (!asNew) setFocusedDescendant(isIn() ? (View)mPeriodField :
+                                         (View)mTimeEditor);
         if (!mHaveShownWindow) {
             Rect alarmRect = mSetAlarmButton.getFrame();
@@ -145 +148 @@
             mHaveShownWindow = true;
             setAutoSize(false); // don't resize to contain it next time
+            // XXX still a minor potential race here, but it's so unlikely
+            // as to not be worth fixing
+            Application.registerForEvent(this, Event.EVENT_TIME_FORMAT_CHANGED);
         }
     }
@@ -244 +250 @@
             stopEditing();
             return true;
+        case Event.EVENT_TIME_FORMAT_CHANGED: // time format changed
+            mTimeEditor.setFormat(DateTimeEditor.FORMAT_TIME_LONG);
+            return true;
         case Event.EVENT_TIME_CHANGED: // time on device changed
         case Event.EVENT_ALARM: // computed time invalid