Changeset 113 for trunk/Cocoa/Pester/Source/PSAlarmsController.m

Timestamp:

03/10/03 05:48:21 (21 years ago)

Author:

Nicholas Riley

Message:

PSTimer.m: Fix bug 15, leaking PSTimer from NSInvocation argument retention.

Read Me.rtfd: Updated release notes.

PSAlarm.[hm]: Removed obsolete comment. Changed 1m-59m times to
display without `0h'. Moved code from deserialization to -resetTimer
to be used for alarm deletion undo - fix bug 14.

PSAlarmsController.m: Fix bug 14 - implement _restoreAlarms:,
_removeAlarms and _undoManager. Need to add localized string.

PSAlarmAlertController.m: Fix bug 17, move alert triggering from
constructor to -performAlertsForAlarm: to avoid nested notifications
delivering in wrong order.

PSAlarms.[hm]: Fix bug 14 - implement -restoreAlarms, invokes [PSAlarm
resetTimer]. Clarified a comment. Uncommented some debug logging.

package-Pester.sh: Implemented partition map-less disk image, saves a
few K on distribution. Removed obsolete comments. Added agvtool
bump.

File:

• trunk/Cocoa/Pester/Source/PSAlarmsController.m (modified) (2 diffs)

trunk/Cocoa/Pester/Source/PSAlarmsController.m

@@ -14 +14 @@
 #import "NJRTableView.h"
 #import "NJRTableDelegate.h"
+
+@interface PSAlarmsController (PrivateUndoSupport)
+
+- (void)_restoreAlarms:(NSSet *)selectedAlarms;
+- (void)_removeAlarms:(NSSet *)selectedAlarms;
+
+@end
 
 @implementation PSAlarmsController
@@ -53 +60 @@
 }
 
+- (NSUndoManager *)undoManager;
+{
+    return [[self window] undoManager];
+}
+
+- (void)_restoreAlarms:(NSSet *)selectedAlarms;
+{
+    [alarms restoreAlarms: selectedAlarms];
+    [[alarmList delegate] selectItems: selectedAlarms];
+    [[self undoManager] setActionName: NSLocalizedString(@"Alarm Removal", "Undo action")];
+    [[[self undoManager] prepareWithInvocationTarget: self] _removeAlarms: selectedAlarms];
+}
+
+- (void)_removeAlarms:(NSSet *)selectedAlarms;
+{
+    [alarms removeAlarms: selectedAlarms];
+    [[self undoManager] setActionName: NSLocalizedString(@"Alarm Removal", "Undo action")];
+    [[[self undoManager] prepareWithInvocationTarget: self] _restoreAlarms: selectedAlarms];
+}
+
 - (IBAction)remove:(id)sender;
 {
-    [alarms removeAlarms: [[alarmList delegate] selectedItems]];
+    [self _removeAlarms: [[alarmList delegate] selectedItems]];
 }