Changeset 53 for trunk/Cocoa/Pester

Timestamp:

01/02/03 05:30:03 (21 years ago)

Author:

Nicholas Riley

Message:

Updated for Pester 1.1a5 (very limited release).

Pester 1.1a4 was never released.

Location:

trunk/Cocoa/Pester/Source

Files:

• . (modified) (1 prop)
• .DS_Store (modified) ( previous)
• BDAlias.h (modified) (1 diff)
• BDAlias.m (modified) (1 diff)
• English.lproj/.DS_Store (modified) ( previous)
• English.lproj/InfoPlist.strings (modified) ( previous)
• English.lproj/MainMenu.nib/classes.nib (modified) (6 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (3 diffs)
• English.lproj/MainMenu.nib/objects.nib (modified) ( previous)
• English.lproj/Movie alert.nib/classes.nib (modified) (1 diff)
• English.lproj/Movie alert.nib/info.nib (modified) (2 diffs)
• English.lproj/Movie alert.nib/objects.nib (modified) ( previous)
• English.lproj/Notifier.nib/classes.nib (modified) (1 diff)
• English.lproj/Notifier.nib/info.nib (modified) (2 diffs)
• English.lproj/Notifier.nib/objects.nib (modified) ( previous)
• NDAppleScript (deleted)
• NJRFSObjectSelector.m (modified) (4 diffs)
• NJRHistoryTrackingComboBox.m (modified) (1 diff)
• NJRIntegerFilter.h (modified) (1 diff)
• NJRIntegerFilter.m (modified) (2 diffs)
• NJRIntervalField.h (added)
• NJRIntervalField.m (added)
• NJRQTMediaPopUpButton.h (modified) (1 diff)
• NJRQTMediaPopUpButton.m (modified) (7 diffs)
• NJRTableDelegate.m (modified) (1 diff)
• NJRTableView.h (modified) (2 diffs)
• NJRTableView.m (modified) (1 diff)
• NJRUnfocusableMovieView.h (added)
• NJRUnfocusableMovieView.m (added)
• NJRVoicePopUpButton.h (modified) (1 diff)
• NJRVoicePopUpButton.m (modified) (2 diffs)
• NSAttributedString-NJRExtensions.h (added)
• NSAttributedString-NJRExtensions.m (added)
• NSCalendarDate-NJRExtensions.h (added)
• NSCalendarDate-NJRExtensions.m (added)
• NSDictionary-NJRExtensions.h (added)
• NSDictionary-NJRExtensions.m (added)
• NSDisclosureButtonCell.h (added)
• NSString-NJRExtensions.h (added)
• NSString-NJRExtensions.m (added)
• PSAlarm.h (modified) (3 diffs)
• PSAlarm.m (modified) (14 diffs)
• PSAlarmAlertController.h (modified) (1 diff)
• PSAlarmAlertController.m (modified) (2 diffs)
• PSAlarmNotifierController.h (modified) (2 diffs)
• PSAlarmNotifierController.m (modified) (3 diffs)
• PSAlarmSetController.h (modified) (5 diffs)
• PSAlarmSetController.m (modified) (18 diffs)
• PSAlarms.h (modified) (3 diffs)
• PSAlarms.m (modified) (7 diffs)
• PSAlarmsController.m (modified) (2 diffs)
• PSAlert.h (modified) (1 diff)
• PSAlert.m (modified) (2 diffs)
• PSAlerts.h (added)
• PSAlerts.m (added)
• PSApplication.m (modified) (5 diffs)
• PSBeepAlert.h (modified) (2 diffs)
• PSBeepAlert.m (modified) (5 diffs)
• PSDockBounceAlert.m (modified) (1 diff)
• PSError.h (added)
• PSError.m (added)
• PSMovieAlert.h (modified) (2 diffs)
• PSMovieAlert.m (modified) (4 diffs)
• PSMovieAlertController.h (modified) (2 diffs)
• PSMovieAlertController.m (modified) (4 diffs)
• PSNotifierAlert.m (modified) (1 diff)
• PSPowerManager.h (added)
• PSPowerManager.m (added)
• PSPropertyListSerialization.h (added)
• PSScriptAlert.h (modified) (1 diff)
• PSScriptAlert.m (modified) (2 diffs)
• PSSpeechAlert.h (modified) (2 diffs)
• PSSpeechAlert.m (modified) (4 diffs)
• Pester.pbproj/nicholas.pbxuser (modified) (32 diffs)
• Pester.pbproj/project.pbxproj (modified) (86 diffs)
• Pester_Prefix.h (added)
• Read Me.rtfd/TXT.rtf (modified) ( previous)
• VERSION (modified) (1 diff)

trunk/Cocoa/Pester/Source

@@ -1 +1 @@
 build
+.gdb_history

@@ -1 +1 @@
 build
+.gdb_history

trunk/Cocoa/Pester/Source/BDAlias.h

@@ -63 +63 @@
 - (BOOL)isEqual:(id)object;
 
+- (NSString *)displayNameWithKindString:(NSString **)outKindString;
+
 - (NSString *)fullPath;
 - (NSString *)fullPathRelativeToPath:(NSString *)relPath;

trunk/Cocoa/Pester/Source/BDAlias.m

@@ -245 +245 @@
 }
 
+- (NSString *)displayNameWithKindString:(NSString **)outKindString;
+{
+    AliasHandle alias = [self alias];
+    FSRef ref;
+    Boolean wasChanged;
+    CFStringRef name;
+
+    if (alias == NULL) return nil;
+    if (FSResolveAlias(NULL, alias, &ref, &wasChanged) != noErr) return nil;
+
+    if (LSCopyDisplayNameForRef(&ref, &name) != noErr) return nil;
+    [(NSString *)name autorelease];
+
+    if (outKindString != NULL) {
+        if (LSCopyKindStringForRef(&ref, (CFStringRef *)outKindString) != noErr) return nil;
+        [*outKindString autorelease];
+    }
+
+    return (NSString *)name;
+}
+
 - (NSString *)fullPath
 {

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib

@@ -17 +17 @@
         {CLASS = NJRIntegerFilter; LANGUAGE = ObjC; SUPERCLASS = NSNumberFormatter; }, 
         {
+            CLASS = NJRIntervalField; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {intervalUnits = NSPopUpButton; }; 
+            SUPERCLASS = NSTextField; 
+        }, 
+        {
             ACTIONS = {stopSoundPreview = id; }; 
             CLASS = NJRQTMediaPopUpButton; 
@@ -23 +29 @@
             SUPERCLASS = NSPopUpButton; 
         }, 
+        {CLASS = NJRUnfocusableMovieView; LANGUAGE = ObjC; SUPERCLASS = NSMovieView; }, 
         {
             ACTIONS = {stopVoicePreview = id; }; 
@@ -29 +36 @@
             SUPERCLASS = NSPopUpButton; 
         }, 
+        {CLASS = NSDisclosureButtonCell; LANGUAGE = ObjC; SUPERCLASS = NSButtonCell; }, 
         {CLASS = NSObject; LANGUAGE = ObjC; }, 
         {
@@ -35 +43 @@
                 doScriptChanged = id; 
                 doSpeakChanged = id; 
+                editAlertChanged = id; 
                 inAtChanged = id; 
                 playSoundChanged = id; 
@@ -45 +54 @@
             LANGUAGE = ObjC; 
             OUTLETS = {
+                alertTabs = NSTabView; 
+                alertView = NSTextField; 
                 bounceDockIcon = NSButton; 
+                cancelButton = NSButton; 
                 displayMessage = NSButtonCell; 
                 doScript = NSButtonCell; 
                 doSpeak = NSButtonCell; 
+                editAlert = NSButtonCell; 
                 inAtMatrix = NSMatrix; 
                 messageField = NSTextField; 
@@ -67 +80 @@
                 timeSummary = NSTextField; 
                 voice = NJRVoicePopUpButton; 
+                wakeUp = NSButtonCell; 
             }; 
             SUPERCLASS = NSWindowController; 

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>73 38 356 240 0 0 1600 1178 </string>
+        <string>63 2 356 240 0 0 1280 832 </string>
         <key>IBEditorPositions</key>
         <dict>
                 <key>29</key>
-                <string>94 343 273 44 0 0 1600 1178 </string>
+                <string>130 241 273 44 0 0 1280 832 </string>
         </dict>
         <key>IBFramework Version</key>
-        <string>286.0</string>
+        <string>291.0</string>
         <key>IBOpenObjects</key>
         <array>
@@ -18 +18 @@
         </array>
         <key>IBSystem Version</key>
-        <string>6D52</string>
+        <string>6G30</string>
         <key>IBUserGuides</key>
         <dict>
@@ -25 +25 @@
                         <key>guideLocations</key>
                         <array>
-                                <string>Horizontal:92.000000</string>
-                                <string>Horizontal:148.000000</string>
-                                <string>Horizontal:116.000000</string>
-                                <string>Horizontal:64.000000</string>
+                                <string>Horizontal:122.000000</string>
+                                <string>Horizontal:178.000000</string>
+                                <string>Horizontal:192.000000</string>
+                                <string>Vertical:36.000000</string>
+                                <string>Vertical:16.000000</string>
+                                <string>Vertical:85.000000</string>
+                                <string>Vertical:422.000000</string>
+                                <string>Horizontal:151.000000</string>
                         </array>
                         <key>guidesLocked</key>

trunk/Cocoa/Pester/Source/English.lproj/Movie alert.nib/classes.nib

@@ -9 +9 @@
             SUPERCLASS = NSWindowController; 
         }, 
-        {CLASS = java.lang.Object; LANGUAGE = Java; }
+        {CLASS = "java.lang.Object"; LANGUAGE = Java; }
     ); 
     IBVersion = 1; 

trunk/Cocoa/Pester/Source/English.lproj/Movie alert.nib/info.nib

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
         <key>IBFramework Version</key>
-        <string>263.2</string>
+        <string>291.0</string>
         <key>IBOpenObjects</key>
         <array>
@@ -10 +10 @@
         </array>
         <key>IBSystem Version</key>
-        <string>5S66</string>
+        <string>6G30</string>
 </dict>
 </plist>

trunk/Cocoa/Pester/Source/English.lproj/Notifier.nib/classes.nib

@@ -2 +2 @@
     IBClasses = (
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = NJRIntegerFilter; LANGUAGE = ObjC; SUPERCLASS = NSNumberFormatter; }, 
         {
-            ACTIONS = {close = id; }; 
+            CLASS = NJRIntervalField; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {intervalUnits = NSPopUpButton; }; 
+            SUPERCLASS = NSTextField; 
+        }, 
+        {
+            ACTIONS = {close = id; snooze = id; stopRepeating = id; }; 
             CLASS = PSAlarmNotifierController; 
             LANGUAGE = ObjC; 
-            OUTLETS = {dateField = NSTextField; messageField = NSTextField; }; 
+            OUTLETS = {
+                dateField = NSTextField; 
+                intervalField = NSTextField; 
+                messageField = NSTextField; 
+                nextDateField = NSTextField; 
+                okButton = NSButton; 
+                snoozeButton = NSButton; 
+                snoozeIntervalField = NJRIntervalField; 
+            }; 
             SUPERCLASS = NSWindowController; 
         }

trunk/Cocoa/Pester/Source/English.lproj/Notifier.nib/info.nib

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
         <key>IBDocumentLocation</key>
-        <string>424 83 356 240 0 0 1280 832 </string>
+        <string>122 13 356 240 0 0 1280 832 </string>
         <key>IBFramework Version</key>
-        <string>263.2</string>
+        <string>291.0</string>
         <key>IBOpenObjects</key>
         <array>
@@ -12 +12 @@
         </array>
         <key>IBSystem Version</key>
-        <string>5S66</string>
+        <string>6G30</string>
+        <key>IBUserGuides</key>
+        <dict>
+                <key>5</key>
+                <dict>
+                        <key>guideLocations</key>
+                        <array>
+                                <string>Horizontal:87.000000</string>
+                                <string>Horizontal:108.000000</string>
+                                <string>Horizontal:66.000000</string>
+                                <string>Vertical:92.000000</string>
+                                <string>Horizontal:133.000000</string>
+                        </array>
+                        <key>guidesLocked</key>
+                        <false/>
+                </dict>
+        </dict>
 </dict>
 </plist>

trunk/Cocoa/Pester/Source/NJRFSObjectSelector.m

@@ -1 +1 @@
 #import "NJRFSObjectSelector.h"
 #import "NSImage-NJRExtensions.h"
+#import "NSString-NJRExtensions.h"
 #include <Carbon/Carbon.h>
 
+static NSImage *PopupTriangleImage = nil;
+static NSSize PopupTriangleSize;
+
 @implementation NJRFSObjectSelector
 
 - (void)_initSelector;
 {
+    if (PopupTriangleImage == nil) {
+        PopupTriangleImage = [[NSImage imageNamed: @"Popup triangle"] retain];
+        PopupTriangleSize = [PopupTriangleImage size];
+    }
     canChooseFiles = YES; canChooseDirectories = NO;
     [self setAlias: nil];
@@ -47 +55 @@
         [NSBezierPath strokeRect: NSInsetRect(boundsRect, 2, 2)];
     } else if (selectedAlias != nil && [self isEnabled]) {
-        static NSImage *popupTriangle = nil;
-        static NSSize imageSize;
-        if (popupTriangle == nil) {
-            popupTriangle = [[NSImage imageNamed: @"Popup triangle"] retain];
-            imageSize = [popupTriangle size];
-        }
         // equivalent to popup triangle location for large bezel in Carbon
-        [popupTriangle compositeToPoint: NSMakePoint(NSMaxX(boundsRect) - imageSize.width - 5, NSMaxY(boundsRect) - 5) operation: NSCompositeSourceOver];
+        [PopupTriangleImage compositeToPoint: NSMakePoint(NSMaxX(boundsRect) - PopupTriangleSize.width - 5, NSMaxY(boundsRect) - 5) operation: NSCompositeSourceOver];
     }
 }
@@ -130 +132 @@
         NSString *path = [alias fullPath];
         NSString *revealPath = nil;
-        NSString *targetName = [path lastPathComponent];
         NSMenu *menu = [[NSMenu alloc] initWithTitle: @""];
         NSFileManager *fmgr = [NSFileManager defaultManager];
@@ -136 +137 @@
         if (path != nil) { // can resolve alias
             [self setImage: [[NSWorkspace sharedWorkspace] iconForFile: path]];
-            [self setTitle: targetName];
+            {   // set image first so titleRectForBounds: returns the correct value
+                NSMutableString *title = [[fmgr displayNameAtPath: path] mutableCopy];
+                NSDictionary *fontAttributes = [[self attributedTitle] fontAttributesInRange: NSMakeRange(0, 0)];
+                [title truncateToWidth: [[self cell] titleRectForBounds: [self bounds]].size.width - PopupTriangleSize.width by: NSLineBreakByTruncatingMiddle withAttributes: fontAttributes];
+                [self setTitle: title];
+                [title release];
+            }
             do {
                 item = [menu addItemWithTitle: [fmgr displayNameAtPath: path]

trunk/Cocoa/Pester/Source/NJRHistoryTrackingComboBox.m

@@ -60 +60 @@
     NSString *newValue = [self stringValue];
     int oldIndex = [self indexOfItemWithObjectValue: newValue];
+    if ([newValue length] == 0) return YES; // donÕt save empty entries
     [self removeItemWithObjectValue: newValue];
     [self insertItemWithObjectValue: newValue atIndex: 0];

trunk/Cocoa/Pester/Source/NJRIntegerFilter.h

@@ -7 +7 @@
 //
 
-#import <AppKit/AppKit.h>
+#import <Foundation/Foundation.h>
 
 

trunk/Cocoa/Pester/Source/NJRIntegerFilter.m

@@ -7 +7 @@
 //
 
-// based on MyIntegerFilter
-// Copyright © 2001 Bill Cheeseman. All rights reserved.
+// based on MyIntegerFilter, later VRIntegerNumberFilter
+// Copyright © 2001-2002 Bill Cheeseman. All rights reserved.
 
 #import "NJRIntegerFilter.h"
@@ -14 +14 @@
 @implementation NJRIntegerFilter
 
-// Input filter
+// Input validation
 
-- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error {
-
-    // Override method to enable NSControl delegate method control:didFailToValidatePartialString:errorDescription: to
-    // reject invalid keypresses. Filters out keyboard input characters other than "1" .. "9".
+- (BOOL)isPartialStringValid:(NSString **)partialStringPtr proposedSelectedRange:(NSRangePointer)proposedSelRangePtr originalString:(NSString *)origString originalSelectedRange:(NSRange)origSelRange errorDescription:(NSString **)error;
+{
+    // Override method to enable NSControl delegate method control:didFailToValidatePartialString:errorDescription: to reject invalid keypresses. Filters out keyboard input characters other than 0..9.
     if ([[*partialStringPtr substringWithRange:NSMakeRange(origSelRange.location, (*proposedSelRangePtr).location - origSelRange.location)] rangeOfCharacterFromSet:[[NSCharacterSet decimalDigitCharacterSet] invertedSet] options:NSLiteralSearch].location != NSNotFound) {
-        *error = NSLocalizedString(@"Input is not an integer", @"Presented when user value not a numeric digit");
-        return NO; // Reject *partialStringPtr as typed, invoke delegate method
+        *error = NSLocalizedString(@"Input is not an integer.", @"Presented when user value not a numeric digit");
+        return NO; // Reject *partialStringPtr as typed, invoke delegate method for error handling
     }
-
-    if ([*partialStringPtr length] == 0) {
-        // Work around NSFormatter issue in Mac OS X 10.0.
-        [[[NSApp keyWindow] fieldEditor:NO forObject:nil] setSelectedRange:*proposedSelRangePtr];
-    }
-
+    *error = nil;
     return YES; // Accept *partialStringPtr as typed
 }

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.h

@@ -22 +22 @@
 
 - (BDAlias *)selectedAlias;
+- (void)setAlias:(BDAlias *)alias;
+
 - (BOOL)canRepeat;
+
 - (IBAction)stopSoundPreview:(id)sender;
 

trunk/Cocoa/Pester/Source/NJRQTMediaPopUpButton.m

@@ -11 +11 @@
 #import "NSMovie-NJRExtensions.h"
 #import "NSImage-NJRExtensions.h"
+
+// XXX workaround for SoundFileManager log message in 10.2.3 and earlier
+#include <stdio.h>
+#include <unistd.h>
+#include <fcntl.h>
+// XXX end workaround
 
 static const int NJRQTMediaPopUpButtonMaxRecentItems = 10;
@@ -103 +109 @@
 #pragma mark initialize-release
 
-- (void)awakeFromNib;
+- (void)_setUp;
 {
     NSMenu *menu;
@@ -145 +151 @@
 }
 
+- (id)initWithFrame:(NSRect)frame;
+{
+    if ( (self = [super initWithFrame: frame]) != nil) {
+        [self _setUp];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)coder;
+{
+    if ( (self = [super initWithCoder: coder]) != nil) {
+        [self _setUp];
+    }
+    return self;
+}
+
 - (void)dealloc;
 {
@@ -171 +193 @@
 }
 
+- (void)setAlias:(BDAlias *)alias;
+{
+    [self _setAlias: alias];
+    if ([self _validateWithPreview: NO]) {
+        [self selectItem: [self _itemForAlias: selectedAlias]];
+    }
+}
+
 - (void)_setPath:(NSString *)path;
 {
@@ -186 +216 @@
     // [self _validateRecentMedia];
     path = [alias fullPath];
-    sf = [[SoundFileManager sharedSoundFileManager] soundFileFromPath: path];
+    {   // XXX suppress log message from Apple's code:
+        // 2002-12-14 14:09:58.740 Pester[26529] Could not find sound type for directory /Users/nicholas/Desktop
+        int errfd = dup(STDERR_FILENO), nullfd = open("/dev/null", O_WRONLY, 0);
+        // need to have something open in STDERR_FILENO because if it isn't,
+        // NSLog will log to /dev/console
+        dup2(nullfd, STDERR_FILENO);
+        close(nullfd);
+        sf = [[SoundFileManager sharedSoundFileManager] soundFileFromPath: path];
+        dup2(errfd, STDERR_FILENO);
+        close(errfd);
+    }
     // NSLog(@"_itemForAlias: %@", path);
 
@@ -250 +290 @@
             [preview setMovie: nil];
             if (movie == nil) {
-                NSBeginAlertSheet(@"Format not recognized", @"OK", nil, nil, [self window], nil, nil, nil, nil, @"The item you selected isnÕt a sound or movie recognized by QuickTime.  Please select a different item.");
+                NSBeginAlertSheet(@"Format not recognized", nil, nil, nil, [self window], nil, nil, nil, nil, @"The item you selected isnÕt a sound or movie recognized by QuickTime.  Please select a different item.");
                 [self _invalidateSelection];
                 return NO;
             }
             if (![movie hasAudio] && ![movie hasVideo]) {
-                NSBeginAlertSheet(@"No video or audio", @"OK", nil, nil, [self window], nil, nil, nil, nil, @"Ò%@Ó contains neither audio nor video content playable by QuickTime.  Please select a different item.", [[NSFileManager defaultManager] displayNameAtPath: [selectedAlias fullPath]]);
+                NSBeginAlertSheet(@"No video or audio", nil, nil, nil, [self window], nil, nil, nil, nil, @"Ò%@Ó contains neither audio nor video content playable by QuickTime.  Please select a different item.", [[NSFileManager defaultManager] displayNameAtPath: [selectedAlias fullPath]]);
                 [self _invalidateSelection];
                 [movie release];
@@ -262 +302 @@
         }
         [movie release];
-        [preview start: self];
+        if (doPreview) [preview start: self];
     }
     [[NSNotificationCenter defaultCenter] postNotificationName: NJRQTMediaPopUpButtonMovieChangedNotification object: self];

trunk/Cocoa/Pester/Source/NJRTableDelegate.m

@@ -179 +179 @@
             NSRect columnRect = [superview convertRect: [tableView rectOfColumn: [tableView columnWithIdentifier: sortingKey]] fromView: tableView];
             // XXX support horizontal scroll bar/clipping (not for Pester, but eventually)
-            NSRect tableScrollFrame = [[tableView enclosingScrollView] frame];
+            // NSRect tableScrollFrame = [[tableView enclosingScrollView] frame];
             NSRect selectFrame = [typeSelectControl frame];
             [superview setNeedsDisplayInRect: selectFrame]; // fix artifacts caused by moving view

trunk/Cocoa/Pester/Source/NJRTableView.h

@@ -11 +11 @@
 
 @interface NJRTableView : NSTableView {
+    NSMutableDictionary *toolTipRegionList;
     NSMutableString *typed;
     IBOutlet id typeSelectDisplay;
@@ -29 +30 @@
 
 - (void)removeSelectedRowsFromTableView:(NSTableView *)tableView;
+- (NSString *)tableView:(NSTableView *)aTableView toolTipForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
 
 @end

trunk/Cocoa/Pester/Source/NJRTableView.m

@@ -17 +17 @@
 
 @implementation NJRTableView
+
+- (id)initWithCoder:(NSCoder *)aDecoder;
+{
+    if ( (self = [super initWithCoder: aDecoder]) != nil) {
+        toolTipRegionList = [[NSMutableDictionary alloc] initWithCapacity: 20];
+    }
+    return self;
+}
+
+- (void)dealloc;
+{
+    [toolTipRegionList release];
+    [super dealloc];
+}
+
+#pragma mark tool tips
+
+- (void)reloadData;
+{
+    [toolTipRegionList removeAllObjects];
+    [self removeAllToolTips];
+    [super reloadData];
+}
+
+- (void)noteNumberOfRowsChanged;
+{
+    [toolTipRegionList removeAllObjects];
+    [self removeAllToolTips];
+    [super noteNumberOfRowsChanged];
+}
+
+- (NSString *)_keyForColumn:(int)columnIndex row:(int)rowIndex;
+{
+    return [NSString stringWithFormat:@"%d,%d", rowIndex, columnIndex];
+}
+
+- (NSString *)view:(NSView *)view stringForToolTip:(NSToolTipTag)tag point:(NSPoint)point userData:(void *)data;
+{
+    // ask our data source for the tool tip
+    if ([[self dataSource] respondsToSelector: @selector(tableView:toolTipForTableColumn:row:)]) {
+        if ([self rowAtPoint: point] >= 0) return [[self dataSource] tableView: self toolTipForTableColumn: [[self tableColumns] objectAtIndex: [self columnAtPoint: point]] row: [self rowAtPoint: point]];
+    }
+    return nil;
+}
+
+- (NSRect)frameOfCellAtColumn:(int)columnIndex row:(int)rowIndex;
+{
+    // this cell is apparently displayed, so we need to add a region for it
+    NSNumber *toolTipTag;
+    NSRect result = [super frameOfCellAtColumn: columnIndex row: rowIndex];
+    // check if cell is already in the list
+    NSString *cellKey = [self _keyForColumn: columnIndex row: rowIndex];
+    // remove old region
+    if (toolTipTag = [toolTipRegionList objectForKey: cellKey])
+        [self removeToolTip: [toolTipTag intValue]];
+    // add new region
+    [toolTipRegionList setObject: [NSNumber numberWithInt: [self addToolTipRect: result owner: self userData: cellKey]] forKey: cellKey];
+    return [super frameOfCellAtColumn: columnIndex row: rowIndex];
+}
+
+#pragma mark type selection
 
 - (id)typeSelectDisplay;

trunk/Cocoa/Pester/Source/NJRVoicePopUpButton.h

@@ -15 +15 @@
 }
 
+- (void)setVoice:(NSString *)voice;
+
+- (id)delegate;
 - (void)setDelegate:(id)delegate;
-- (id)delegate;
 
 - (IBAction)stopVoicePreview:(id)sender;

trunk/Cocoa/Pester/Source/NJRVoicePopUpButton.m

@@ -68 +68 @@
 }
 
+- (void)setVoice:(NSString *)voice;
+{
+    int voiceIdx = [self indexOfItemWithTitle: voice];
+    if (voiceIdx == -1) {
+        [self _invalidateVoiceSelection];
+    } else {
+        [self selectItemAtIndex: voiceIdx];
+    }
+}
+
 - (void)_previewVoice;
 {
@@ -80 +90 @@
 
     if ( (err = GetIndVoice(voiceIndex, &voice)) != noErr) {
-        NSBeginAlertSheet(@"Voice not available", @"OK", nil, nil, [self window], nil, nil, nil, nil, @"The voice Ò%@Ó you selected could not be used.  An error of type %ld occurred while attempting to retrieve voice information.", voiceName, err);
+        NSBeginAlertSheet(@"Voice not available", nil, nil, nil, [self window], nil, nil, nil, nil, @"The voice Ò%@Ó you selected could not be used.  An error of type %ld occurred while attempting to retrieve voice information.", voiceName, err);
         [self _invalidateVoiceSelection];
         return;

trunk/Cocoa/Pester/Source/PSAlarm.h

@@ -8 +8 @@
 
 #import <Foundation/Foundation.h>
+#import "PSPropertyListSerialization.h"
 
 typedef enum {
-    PSAlarmInvalid, PSAlarmInterval, PSAlarmDate, PSAlarmSet
+    PSAlarmInvalid, // incorrectly specified
+    PSAlarmInterval, // interval specified (possibly repeating)
+    PSAlarmDate, // date specified
+    PSAlarmSet, // pending, timer set
+    PSAlarmSnooze, // expired alarm with snooze interval set (possibly repeating)
+    PSAlarmExpired // expired alarm (possibly repeating)
 } PSAlarmType;
 
 extern NSString * const PSAlarmTimerSetNotification;
 extern NSString * const PSAlarmTimerExpiredNotification;
+extern NSString * const PSAlarmDiedNotification;
 
-// XXX figure out how to support reading old alarms
+@class PSAlert, PSAlerts;
 
-@class PSAlert;
-
-@interface PSAlarm : NSObject <NSCoding> {
-    PSAlarmType alarmType;
+@interface PSAlarm : NSObject <NSCoding, PSPropertyListSerialization> {
+    PSAlarmType alarmType; // changes during lifetime of alarm; more like a state
     NSCalendarDate *alarmDate;
     NSTimeInterval alarmInterval;
+    NSTimeInterval snoozeInterval;
+    NSTimeInterval timeRemaining;
     NSString *alarmMessage;
     NSString *invalidMessage;
     NSTimer *timer;
-    NSMutableArray *alerts;
+    PSAlerts *alerts;
+    BOOL repeating;
 }
 
@@ -34 +42 @@
 - (void)setForDate:(NSDate *)date atTime:(NSDate *)time;
 - (void)setMessage:(NSString *)aMessage;
-- (void)addAlert:(PSAlert *)alert;
-- (void)removeAlerts;
+- (void)setAlerts:(PSAlerts *)theAlerts;
+- (void)setRepeating:(BOOL)isRepeating;
+- (void)setSnoozeInterval:(NSTimeInterval)anInterval;
 
 - (NSCalendarDate *)date;
 - (NSCalendarDate *)time;
 - (NSTimeInterval)interval;
+- (NSTimeInterval)timeRemaining;
 - (NSString *)message;
-- (NSArray *)alerts;
+- (PSAlerts *)alerts;
+- (BOOL)isRepeating;
+- (NSTimeInterval)snoozeInterval; // most recent interval (nonzero return does not indicate alarm is snoozing or set to snooze)
 
 - (NSString *)dateString;
 - (NSString *)shortDateString;
 - (NSString *)timeString;
+- (NSString *)dateTimeString; // current or next alarm time
+- (NSString *)nextDateTimeString; // next alarm time
+- (NSString *)intervalString;
 - (NSString *)timeRemainingString;
 
@@ -51 +66 @@
 - (NSString *)invalidMessage;
 
+- (NSAttributedString *)prettyDescription;
+
 - (NSComparisonResult)compareDate:(PSAlarm *)otherAlarm;
 - (NSComparisonResult)compareMessage:(PSAlarm *)otherAlarm;
 
-- (BOOL)setTimer;
+- (BOOL)setTimer; // or die, if expired and no snooze/repeat
 - (void)cancelTimer;
 
+// 1.1 only, going away when we move to keyed archiving
+- (NSDictionary *)propertyListRepresentation;
+- (id)initWithPropertyList:(NSDictionary *)dict;
+
 @end

trunk/Cocoa/Pester/Source/PSAlarm.m

@@ -9 +9 @@
 #import "PSAlarm.h"
 #import "PSAlert.h"
+#import "PSAlerts.h"
 #import "NJRDateFormatter.h"
+#import "NSCalendarDate-NJRExtensions.h"
+#import "NSDictionary-NJRExtensions.h"
+#import "NSString-NJRExtensions.h"
 
 NSString * const PSAlarmTimerSetNotification = @"PSAlarmTimerSetNotification";
 NSString * const PSAlarmTimerExpiredNotification = @"PSAlarmTimerExpiredNotification";
+NSString * const PSAlarmDiedNotification = @"PSAlarmDiedNotification";
+
+// property list keys
+static NSString * const PLAlarmType = @"type"; // NSString
+static NSString * const PLAlarmDate = @"date"; // NSNumber
+static NSString * const PLAlarmInterval = @"interval"; // NSNumber
+static NSString * const PLAlarmSnoozeInterval = @"snooze interval"; // NSNumber
+static NSString * const PLAlarmMessage = @"message"; // NSString
+static NSString * const PLAlarmAlerts = @"alerts"; // NSDictionary
+static NSString * const PLAlarmRepeating = @"repeating"; // NSNumber
 
 static NSString *dateFormat, *shortDateFormat, *timeFormat;
@@ -72 +86 @@
     invalidMessage = nil;
     alarmType = type;
+    if (type != PSAlarmInterval) [self setRepeating: NO];
 }
 
 - (void)_setDateFromInterval;
 {
-    [alarmDate release]; alarmDate = nil;
-    alarmDate = [NSCalendarDate dateWithTimeIntervalSinceNow: alarmInterval];
-    [alarmDate retain];
+    [self _setAlarmDate: [NSCalendarDate dateWithTimeIntervalSinceNow: alarmInterval]];
     [self _beValidWithType: PSAlarmInterval];
 }
@@ -84 +97 @@
 - (void)_setIntervalFromDate;
 {
-    alarmInterval = [alarmDate timeIntervalSinceNow] + 1;
+    alarmInterval = [alarmDate timeIntervalSinceNow];
     if (alarmInterval <= 0) {
         [self _beInvalid: @"Please specify an alarm time in the future."];
@@ -90 +103 @@
     }
     [self _beValidWithType: PSAlarmDate];
+}
+
+- (PSAlarmType)_alarmTypeForString:(NSString *)string;
+{
+    if ([string isEqualToString: @"PSAlarmDate"]) return PSAlarmDate;
+    if ([string isEqualToString: @"PSAlarmInterval"]) return PSAlarmInterval;
+    if ([string isEqualToString: @"PSAlarmSet"]) return PSAlarmSet;
+    if ([string isEqualToString: @"PSAlarmInvalid"]) return PSAlarmInvalid;
+    if ([string isEqualToString: @"PSAlarmSnooze"]) return PSAlarmSnooze;
+    if ([string isEqualToString: @"PSAlarmExpired"]) return PSAlarmExpired;
+    NSLog(@"unknown alarm type string: %@", string);
+    return nil;
 }
 
@@ -99 +124 @@
         case PSAlarmSet: return @"PSAlarmSet";
         case PSAlarmInvalid: return @"PSAlarmInvalid";
+        case PSAlarmSnooze: return @"PSAlarmSnooze";
+        case PSAlarmExpired: return @"PSAlarmExpired";
         default: return [NSString stringWithFormat: @"<unknown: %u>", alarmType];
     }
 }
 
+- (NSString *)_stringForInterval:(unsigned long long)interval;
+{
+    const unsigned long long minute = 60, hour = minute * 60, day = hour * 24, year = day * 365.26;
+    // +[NSString stringWithFormat:] in 10.1 does not support long longs: work around it by converting to unsigned ints or longs for display
+    if (interval == 0) return nil;
+    if (interval < minute) return [NSString stringWithFormat: @"%us", (unsigned)interval];
+    if (interval < day) return [NSString stringWithFormat: @"%uh %um", (unsigned)(interval / hour), (unsigned)((interval % hour) / minute)];
+    if (interval < 2 * day) return @"One day";
+    if (interval < year) return [NSString stringWithFormat: @"%u days", (unsigned)(interval / day)];
+    if (interval < 2 * year) return @"One year";
+    return [NSString stringWithFormat: @"%lu years", (unsigned long)(interval / year)];
+}
+
 - (void)_timerExpired:(NSTimer *)aTimer;
 {
+    NSLog(@"expired: %@; now %@", [[aTimer fireDate] description], [[NSDate date] description]);
+    alarmType = PSAlarmExpired;
     [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerExpiredNotification object: self];
     [timer release]; timer = nil;
@@ -128 +170 @@
 - (void)setForDate:(NSDate *)date atTime:(NSDate *)time;
 {
-    NSCalendarDate *calTime, *calDate;
+    NSCalendarDate *dateTime;
     if (time == nil && date == nil) {
         [self _beInvalid: @"Please specify an alarm date and time."]; return;
@@ -139 +181 @@
     }
     // XXX if calTime's date is different from the default date, complain
-    calTime = [NSCalendarDate dateWithTimeIntervalSinceReferenceDate: [time timeIntervalSinceReferenceDate]];
-    calDate = [NSCalendarDate dateWithTimeIntervalSinceReferenceDate: [date timeIntervalSinceReferenceDate]];
-    if (calTime == nil || calDate == nil) {
+    dateTime = [NSCalendarDate dateWithDate: date atTime: time];
+    if (dateTime == nil) {
         [self _beInvalid: @"Please specify a reasonable date and time."];
     }
-    [self setForDateAtTime:
-        [[[NSCalendarDate alloc] initWithYear: [calDate yearOfCommonEra]
-                                        month: [calDate monthOfYear]
-                                          day: [calDate dayOfMonth]
-                                         hour: [calTime hourOfDay]
-                                       minute: [calTime minuteOfHour]
-                                       second: [calTime secondOfMinute]
-                                     timeZone: nil] autorelease]];
+    [self setForDateAtTime: dateTime];
+}
+
+- (void)setRepeating:(BOOL)isRepeating;
+{
+    repeating = isRepeating;
+}
+
+- (void)setSnoozeInterval:(NSTimeInterval)anInterval;
+{
+    snoozeInterval = anInterval;
+    NSAssert(alarmType == PSAlarmExpired, @"CanÕt snooze an alarm that hasnÕt expired");
+    alarmType = PSAlarmSnooze;
 }
 
@@ -175 +221 @@
 {
     if (alarmType == PSAlarmDate) [self _setIntervalFromDate];
-    return (alarmType != PSAlarmInvalid);
+    if (alarmType == PSAlarmInvalid ||
+        (alarmType == PSAlarmExpired && ![self isRepeating])) return NO;
+    return YES;
 }
 
@@ -204 +252 @@
 - (NSTimeInterval)interval;
 {
-    if (alarmType == PSAlarmSet || alarmType == PSAlarmDate) [self _setIntervalFromDate];
+    if (alarmType == PSAlarmDate) [self _setIntervalFromDate];
     return alarmInterval;
 }
 
-- (void)addAlert:(PSAlert *)alert;
-{
-    if (alerts == nil) alerts = [[NSMutableArray alloc] initWithCapacity: 4];
-    [alerts addObject: alert];
-}
-
-- (void)removeAlerts;
-{
-    [alerts removeAllObjects];
-}
-
-- (NSArray *)alerts;
-{
-    return [[alerts copy] autorelease];
+- (NSTimeInterval)snoozeInterval;
+{
+    return snoozeInterval;
+}
+
+- (NSTimeInterval)timeRemaining;
+{
+    NSAssert1(alarmType == PSAlarmSet, @"CanÕt get time remaining on alarm with no timer set: %@", self);
+    return -[[NSDate date] timeIntervalSinceDate: alarmDate];
+}
+
+- (void)setAlerts:(PSAlerts *)theAlerts;
+{
+    [alerts release]; alerts = nil;
+    alerts = [theAlerts retain];
+}
+
+- (PSAlerts *)alerts;
+{
+    if (alerts == nil) alerts = [[PSAlerts alloc] init];
+    return alerts;
+}
+
+- (BOOL)isRepeating;
+{
+    return repeating;
 }
 
@@ -239 +299 @@
 }
 
+- (NSString *)dateTimeString;
+{
+    return [NSString stringWithFormat: @"%@ at %@", [self dateString], [self timeString]];
+}
+
+- (NSString *)nextDateTimeString;
+{
+    if (![self isRepeating]) {
+        return nil;
+    } else {
+        NSCalendarDate *date = [[NSCalendarDate alloc] initWithTimeIntervalSinceNow: [self interval]];
+        NSString *nextDateTimeString = [NSString stringWithFormat: @"%@ at %@",
+            [date descriptionWithCalendarFormat: dateFormat locale: locale],
+            [date descriptionWithCalendarFormat: timeFormat locale: locale]];
+        [date release];
+        return nextDateTimeString;
+    }
+}
+
+- (NSString *)intervalString;
+{
+    const unsigned long long mval = 99, minute = 60, hour = minute * 60;
+    unsigned long long interval = [self interval];
+    if (interval == 0) return nil;
+    if (interval == 1) return @"One second";
+    if (interval == minute) return @"One minute";
+    if (interval % minute == 0) return [NSString stringWithFormat: @"%u minutes", (unsigned)(interval / minute)];
+    if (interval <= mval) return [NSString stringWithFormat: @"%u seconds", (unsigned)interval];
+    if (interval == hour) return @"One hour";
+    if (interval % hour == 0) return [NSString stringWithFormat: @"%u hours", (unsigned)(interval / hour)];
+    if (interval <= mval * minute) return [NSString stringWithFormat: @"%u minutes", (unsigned)(interval / minute)];
+    if (interval <= mval * hour) return [NSString stringWithFormat: @"%u hours", (unsigned)(interval / hour)];
+    return [self _stringForInterval: interval];
+}
+
 - (NSString *)timeRemainingString;
 {
-    static const unsigned long long minute = 60, hour = minute * 60, day = hour * 24, year = day * 365.26;
-    unsigned long long interval = [self interval];
-    // +[NSString stringWithFormat:] in 10.1 does not support long longs: work around it by converting to unsigned ints or longs for display
-    if (interval == 0) return @"ÇexpiredÈ";
-    if (interval < minute) return [NSString stringWithFormat: @"%us", (unsigned)interval];
-    if (interval < day) return [NSString stringWithFormat: @"%uh %um", (unsigned)(interval / hour), (unsigned)((interval % hour) / minute)];
-    if (interval < year) return [NSString stringWithFormat: @"%u days", (unsigned)(interval / day)];
-    if (interval < 2 * year) return @"One year";
-    return [NSString stringWithFormat: @"%lu years", (unsigned long)(interval / year)];
+    NSString *timeRemainingString = [self _stringForInterval: llround([self timeRemaining])];
+    
+    if (timeRemainingString == nil) return @"ÇexpiredÈ";
+    return timeRemainingString;
+}
+
+- (NSAttributedString *)prettyDescription;
+{
+    NSMutableAttributedString *string = [[NSMutableAttributedString alloc] init];
+    NSAttributedString *alertList = [alerts prettyList];
+
+    [string appendAttributedString:
+        [[NSString stringWithFormat: @"At alarm time for Ò%@Ó:\n", [self message]] small]];
+    if (alertList != nil) {
+        [string appendAttributedString: alertList];
+    } else {
+        [string appendAttributedString: [@"Do nothing." small]];
+    }
+    if ([self isRepeating]) {
+        [string appendAttributedString:
+            [[NSString stringWithFormat: @"\nAlarm repeats every %@.", [[self intervalString] lowercaseString]] small]];
+    }
+    return [string autorelease];
 }
 
@@ -256 +365 @@
 - (BOOL)setTimer;
 {
-    switch (alarmType) {
-        case PSAlarmDate: if (![self isValid]) return NO;
-        case PSAlarmInterval:
-            timer = [NSTimer scheduledTimerWithTimeInterval: alarmInterval target: self selector: @selector(_timerExpired:) userInfo: nil repeats: NO];
-            if (timer != nil) {
-                [timer retain];
-                alarmType = PSAlarmSet;
-                [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerSetNotification object: self];
-                return YES;
-            }
-        default:
+    if (alarmType == PSAlarmExpired) {
+        if ([self isRepeating]) {
+            [self _setDateFromInterval];
+        } else {
+            [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmDiedNotification object: self];
             return NO;
-    }
+        }
+    } else if (alarmType == PSAlarmDate) {
+        if (![self isValid]) return NO;
+    } else if (alarmType == PSAlarmSnooze) {
+        [self _setAlarmDate: [NSCalendarDate dateWithTimeIntervalSinceNow: snoozeInterval]];
+    } else if (alarmType != PSAlarmInterval) {
+        return NO;
+    }
+    timer = [NSTimer scheduledTimerWithTimeInterval: (alarmType == PSAlarmSnooze ? snoozeInterval : alarmInterval) target: self selector: @selector(_timerExpired:) userInfo: nil repeats: NO];
+    if (timer == nil) return NO;
+    [timer retain];
+    alarmType = PSAlarmSet;
+    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmTimerSetNotification object: self];
+    // NSLog(@"set: %@; now %@; remaining %@", [[timer fireDate] description], [[NSDate date] description], [self timeRemainingString]);
+    return YES;
 }
 
@@ -274 +391 @@
 {
     [timer invalidate]; [timer release]; timer = nil;
+    [self setRepeating: NO];
 }
 
@@ -300 +418 @@
 }
 
-#pragma mark archiving
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity: 5];
+    if (![self isValid]) return nil;
+    [dict setObject: [self _alarmTypeString] forKey: PLAlarmType];
+    switch (alarmType) {
+        case PSAlarmDate:
+        case PSAlarmSet:
+            [dict setObject: [NSNumber numberWithDouble: [alarmDate timeIntervalSinceReferenceDate]] forKey: PLAlarmDate];
+            break;
+        case PSAlarmSnooze:
+        case PSAlarmInterval:
+        case PSAlarmExpired:
+            [dict setObject: [NSNumber numberWithDouble: alarmInterval] forKey: PLAlarmInterval];
+            [dict setObject: [NSNumber numberWithBool: repeating] forKey: PLAlarmRepeating];
+            break;
+        default:
+            NSAssert1(NO, @"CanÕt save alarm type %@", [self _alarmTypeString]);
+            break;
+    }
+    if (snoozeInterval != 0)
+        [dict setObject: [NSNumber numberWithDouble: snoozeInterval] forKey: PLAlarmSnoozeInterval];
+    [dict setObject: alarmMessage forKey: PLAlarmMessage];
+    if (alerts != nil) {
+        [dict setObject: [alerts propertyListRepresentation] forKey: PLAlarmAlerts];
+    }
+    return dict;
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    if ( (self = [self init]) != nil) {
+        PSAlerts *alarmAlerts;
+        alarmType = [self _alarmTypeForString: [dict objectForRequiredKey: PLAlarmType]];
+        switch (alarmType) {
+            case PSAlarmDate:
+            case PSAlarmSet:
+               { NSCalendarDate *date = [[NSCalendarDate alloc] initWithTimeIntervalSinceReferenceDate: [[dict objectForRequiredKey: PLAlarmDate] doubleValue]];
+                [self _setAlarmDate: date];
+                [date release];
+               }
+                break;
+            case PSAlarmSnooze: // snooze interval set but not confirmed; ignore
+                alarmType = PSAlarmExpired;
+            case PSAlarmInterval:
+            case PSAlarmExpired:
+                alarmInterval = [[dict objectForRequiredKey: PLAlarmInterval] doubleValue];
+                repeating = [[dict objectForRequiredKey: PLAlarmRepeating] boolValue];
+                break;
+            default:
+                NSAssert1(NO, @"CanÕt load alarm type %@", [self _alarmTypeString]);
+                break;
+        }
+        snoozeInterval = [[dict objectForKey: PLAlarmSnoozeInterval] doubleValue];
+        [self setMessage: [dict objectForRequiredKey: PLAlarmMessage]];
+        alarmAlerts = [[PSAlerts alloc] initWithPropertyList: [dict objectForRequiredKey: PLAlarmAlerts]];
+        [self setAlerts: alarmAlerts];
+        [alarmAlerts release];
+        if (alarmType == PSAlarmSet) {
+            alarmType = PSAlarmDate;
+            [self setTimer];
+        }
+        if (alarmType == PSAlarmExpired) {
+            [self setTimer];
+            if (alarmType == PSAlarmExpired) { // failed to restart
+                [self release];
+                self = nil;
+            }
+        }
+    }
+    return self;
+}
+
+#pragma mark archiving (Pester 1.0)
 
 - (void)encodeWithCoder:(NSCoder *)coder;
@@ -324 +517 @@
 - (id)initWithCoder:(NSCoder *)coder;
 {
-    if ( (self = [super init]) != nil) {
+    if ( (self = [self init]) != nil) {
+        PSAlerts *legacyAlerts = [[PSAlerts alloc] initWithPesterVersion1Alerts];
+        [self setAlerts: legacyAlerts];
+        [legacyAlerts release];
         [coder decodeValueOfObjCType: @encode(PSAlarmType) at: &alarmType];
         switch (alarmType) {

trunk/Cocoa/Pester/Source/PSAlarmAlertController.h

@@ -13 +13 @@
 
 @interface PSAlarmAlertController : NSObject {
-
+    NSMutableSet *pendingAlerts;
+    ProcessSerialNumber frontmostApp;
+    BOOL appWasHidden;
 }
 

trunk/Cocoa/Pester/Source/PSAlarmAlertController.m

@@ -8 +8 @@
 
 #import "PSAlarmAlertController.h"
+#import "PSAlert.h"
+#import "PSAlerts.h"
 
 NSString * const PSAlarmAlertStopNotification = @"PSAlarmAlertStopNotification";
@@ -23 +25 @@
 }
 
+- (void)_resumeAlarm:(PSAlarm *)alarm;
+{
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    [alarm setTimer]; // if snooze not set and not repeating, alarm will die
+    if (frontmostApp.highLongOfPSN != 0 || frontmostApp.lowLongOfPSN != 0) {
+        SetFrontProcess(&frontmostApp);
+        if (appWasHidden)
+            [NSApp hide: self];
+    }
+}
+
+- (void)_alertCompleted:(NSNotification *)notification;
+{
+    PSAlert *alert = [[notification userInfo] objectForKey: @"alert"];
+    unsigned count = [pendingAlerts count];
+    [pendingAlerts removeObject: alert];
+    NSLog(@"removed: %@; still pending: %@", alert, [pendingAlerts description]);
+    NSLog(@"alarm: %@ retainCount %d", [notification object], [[notification object] retainCount]);
+    NSAssert2([pendingAlerts count] == count - 1, @"alert not in set: %@\n%@", alert, notification);
+    if ([pendingAlerts count] == 0) {
+        [self _resumeAlarm: [notification object]];
+        [self release];
+    }
+}
+
 - (id)initWithAlarm:(PSAlarm *)alarm;
 {
     if ( (self = [super init]) != nil) {
-        [[alarm alerts] makeObjectsPerformSelector: @selector(triggerForAlarm:)
-                                        withObject: alarm];
-        [NSApp activateIgnoringOtherApps: YES];
+        PSAlerts *alerts = [alarm alerts];
+        NSArray *allAlerts = [alerts allAlerts];
+        if ([allAlerts count] == 0) {
+            [self _resumeAlarm: alarm];
+        } else {
+            pendingAlerts = [[NSMutableSet alloc] init];
+            [pendingAlerts addObjectsFromArray: allAlerts];
+            [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alertCompleted:)
+                                                         name: PSAlarmAlertCompletedNotification object: alarm];
+            [self retain]; // release in _alertCompleted:
+        }
+        [alerts triggerForAlarm: alarm];
+        if ([alerts requirePesterFrontmost] && ![NSApp isActive]) { // restore frontmost process afterward
+            NSDictionary *activeProcessInfo = [[NSWorkspace sharedWorkspace] activeApplication];
+            frontmostApp.highLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberHigh"] longValue];
+            frontmostApp.lowLongOfPSN = [[activeProcessInfo objectForKey: @"NSApplicationProcessSerialNumberLow"] longValue];
+            appWasHidden = [NSApp isHidden];
+            [NSApp activateIgnoringOtherApps: YES];
+        }
     }
     return self;
 }
 
+- (void)dealloc;
+{
+    NSLog(@"%@ dealloc", self);
+    [pendingAlerts release];
+    [super dealloc];
+}
+
 @end

trunk/Cocoa/Pester/Source/PSAlarmNotifierController.h

@@ -9 +9 @@
 #import <AppKit/AppKit.h>
 
+@class NJRIntervalField;
 @class PSAlarm;
 
@@ -14 +15 @@
     IBOutlet NSTextField *messageField;
     IBOutlet NSTextField *dateField;
+    IBOutlet NSTextField *intervalField;
+    IBOutlet NSTextField *nextDateField;
+    IBOutlet NJRIntervalField *snoozeIntervalField;
+    IBOutlet NSButton *okButton;
+    IBOutlet NSButton *snoozeButton;
+    NSTimer *updateTimer;
+    PSAlarm *alarm;
+    BOOL canSnooze;
 }
 
-- (id)initWithAlarm:(PSAlarm *)alarm;
+- (id)initWithAlarm:(PSAlarm *)anAlarm;
 
-- (IBAction)close:(NSButton *)sender;
+- (IBAction)close:(id)sender;
+- (IBAction)snooze:(NSButton *)sender;
+- (IBAction)stopRepeating:(NSButton *)sender;
 
 @end

trunk/Cocoa/Pester/Source/PSAlarmNotifierController.m

@@ -10 +10 @@
 #import "PSAlarmAlertController.h"
 #import "PSAlarm.h"
+#import "PSNotifierAlert.h"
+#import "NJRIntervalField.h"
+
+static NSString * const PSAlarmSnoozeInterval = @"Pester alarm snooze interval"; // NSUserDefaults key
+
+@interface PSAlarmNotifierController (Private)
+
+- (void)update:(id)sender;
+- (void)updateNextDateDisplay:(id)sender;
+
+@end
 
 @implementation PSAlarmNotifierController
@@ -15 +26 @@
 // XXX should use NSNonactivatingPanelMask on 10.2
 
-- (id)initWithAlarm:(PSAlarm *)alarm;
+- (id)initWithAlarm:(PSAlarm *)anAlarm;
 {
     if ([self initWithWindowNibName: @"Notifier"]) {
-        [[self window] center];
+        NSWindow *window = [self window];
+        NSRect frameRect = [window frame];
+        alarm = [anAlarm retain];
         [messageField setStringValue: [alarm message]];
-        [dateField setStringValue:
-            [NSString stringWithFormat: @"%@ at %@", [alarm dateString], [alarm timeString]]];
-        [[self window] makeKeyAndOrderFront: nil];
-        [[self window] orderFrontRegardless];
+        [dateField setStringValue: [alarm dateTimeString]];
+        if (![snoozeIntervalField setInterval: [alarm snoozeInterval]] &&
+            ![snoozeIntervalField setInterval: [[[NSUserDefaults standardUserDefaults] objectForKey: PSAlarmSnoozeInterval] doubleValue]])
+            [snoozeIntervalField setInterval: 15 * 60]; // 15 minutes
+        if ([alarm isRepeating]) {
+            [intervalField setStringValue:
+                [NSString stringWithFormat: @"every %@", [[alarm intervalString] lowercaseString]]];
+            [self updateNextDateDisplay: nil];
+            updateTimer = [NSTimer scheduledTimerWithTimeInterval: 1 target: self selector: @selector(updateNextDateDisplay:) userInfo: nil repeats: YES];
+            frameRect.size = [window maxSize];
+        } else {
+            frameRect.size = [window minSize];
+        }
+        [window setFrame: frameRect display: NO];
+        [window center];
+        [window makeKeyAndOrderFront: nil];
+        [window orderFrontRegardless];
     }
     return self;
+}
+
+- (void)dealloc;
+{
+    [alarm release];
+    [updateTimer invalidate]; updateTimer = nil;
+    [super dealloc];
+}
+
+- (void)updateNextDateDisplay:(id)sender;
+{
+    if (!canSnooze) {
+        NSString *nextDateTimeString = [alarm nextDateTimeString];
+        if (nextDateTimeString == nil) { // no longer repeating
+            [updateTimer invalidate]; updateTimer = nil;
+        } else {
+            [nextDateField setStringValue: nextDateTimeString];
+        }
+    }
+}
+
+- (void)update:(id)sender;
+{
+    canSnooze = [snoozeIntervalField interval] != 0;
+    if (canSnooze) [nextDateField setStringValue: @"after snooze"];
+    [snoozeButton setEnabled: canSnooze];
+    [canSnooze ? snoozeButton : okButton setKeyEquivalent: @"\r"];
+    [canSnooze ? okButton : snoozeButton setKeyEquivalent: @""];
 }
 
@@ -32 +86 @@
     [PSAlarmAlertController stopAlerts: sender];
     [self close];
+    [[PSNotifierAlert alert] completedForAlarm: alarm];
+}
+
+- (IBAction)snooze:(NSButton *)sender;
+{
+    NSTimeInterval snoozeInterval = [snoozeIntervalField interval];
+    [alarm setSnoozeInterval: snoozeInterval];
+    [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithDouble: snoozeInterval] forKey: PSAlarmSnoozeInterval];
+    [self close: sender];
+}
+
+- (IBAction)stopRepeating:(NSButton *)sender;
+{
+    NSWindow *window = [self window];
+    NSRect frameRect = [window frame];
+    NSSize newSize = [window minSize];
+    
+    [alarm setRepeating: NO];
+    [sender setEnabled: NO];
+    frameRect.origin.y += frameRect.size.height - newSize.height;
+    frameRect.size = newSize;
+    [window setFrame: frameRect display: YES animate: YES];
 }
 
 @end
+
+@implementation PSAlarmNotifierController (NSControlSubclassDelegate)
+
+- (BOOL)control:(NSControl *)control didFailToFormatString:(NSString *)string errorDescription:(NSString *)error;
+{
+    if (control == snoozeIntervalField)
+        [snoozeIntervalField handleDidFailToFormatString: string errorDescription: error label: @"snooze interval"];
+    return NO;
+}
+
+- (void)control:(NSControl *)control didFailToValidatePartialString:(NSString *)string errorDescription:(NSString *)error;
+{
+    // NSLog(@"UPDATING FROM validation");
+    [self update: control]; // switch to snooze if someone types something weird...
+}
+
+- (BOOL)control:(NSControl *)control textView:(NSTextView *)textView doCommandBySelector:(SEL)commandSelector;
+{
+    // NSLog(@"UPDATING from textView: %@", NSStringFromSelector(commandSelector));
+    if (commandSelector == @selector(cancel:)) {
+        // if someone just wants the stupid thing to go away and presses escape, donÕt hinder them
+        [self close: control];
+        return YES;
+    }
+    // if someone invokes the default button or switches fields, donÕt override it
+    if (commandSelector == @selector(insertNewline:) ||
+        commandSelector == @selector(insertTab:) ||
+        commandSelector == @selector(insertBacktab:)) return NO;
+    [self update: control]; // ...or if they type a navigation key...
+    return NO; // we donÕt handle it
+}
+
+@end
+
+@implementation PSAlarmNotifierController (NSControlSubclassNotifications)
+
+- (void)controlTextDidChange:(NSNotification *)notification;
+{
+    // NSLog(@"UPDATING FROM controlTextDidChange: %@", [notification object]);
+    [self update: [notification object]]; // ...or if they modify the snooze interval
+}
+
+@end
+
+@implementation PSAlarmNotifierController (NSWindowNotifications)
+
+- (void)windowWillClose:(NSNotification *)notification;
+{
+    // canÕt rely on dealloc to invalidate the timer, because it retains this object
+    [updateTimer invalidate]; updateTimer = nil;
+    [self release]; // in non-document-based apps, this is needed; see docs
+}
+
+@end

trunk/Cocoa/Pester/Source/PSAlarmSetController.h

@@ -11 +11 @@
 
 @class NJRFSObjectSelector;
+@class NJRIntervalField;
 @class NJRQTMediaPopUpButton;
 @class NJRVoicePopUpButton;
@@ -17 +18 @@
     IBOutlet NSTextField *messageField;
     IBOutlet NSMatrix *inAtMatrix;
-    IBOutlet NSTextField *timeInterval;
+    IBOutlet NJRIntervalField *timeInterval;
     IBOutlet NSPopUpButton *timeIntervalUnits;
     IBOutlet NSButton *timeIntervalRepeats;
@@ -23 +24 @@
     IBOutlet NSTextField *timeDate;
     IBOutlet NSPopUpButton *timeDateCompletions; // XXX should go away when bug preventing both formatters and popup menus from existing is fixed
+    IBOutlet NSButtonCell *editAlert;
+    IBOutlet NSTextField *alertView;
+    IBOutlet NSTabView *alertTabs;
     IBOutlet NSButtonCell *displayMessage;
     IBOutlet NSButton *bounceDockIcon;
@@ -35 +39 @@
     IBOutlet NJRVoicePopUpButton *voice;
     IBOutlet NSButton *scriptSelectButton;
+    IBOutlet NSButtonCell *wakeUp;
     IBOutlet NSTextField *timeSummary;
+    IBOutlet NSButton *cancelButton;
     IBOutlet NSButton *setButton;
     NSString *status;
@@ -46 +52 @@
 - (IBAction)dateCompleted:(NSPopUpButton *)sender;
 - (IBAction)inAtChanged:(id)sender;
+- (IBAction)editAlertChanged:(id)sender;
 - (IBAction)playSoundChanged:(id)sender;
 - (IBAction)doScriptChanged:(id)sender;

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -9 +9 @@
 #import "PSAlarmSetController.h"
 #import "PSAlarmAlertController.h"
+#import "PSPowerManager.h"
 #import "NJRDateFormatter.h"
 #import "NJRFSObjectSelector.h"
+#import "NJRIntervalField.h"
 #import "NJRQTMediaPopUpButton.h"
 #import "NJRVoicePopUpButton.h"
+#import "NSString-NJRExtensions.h"
+#import "NSAttributedString-NJRExtensions.h"
+#import "NSCalendarDate-NJRExtensions.h"
 #import <Carbon/Carbon.h>
 
+#import "PSAlerts.h"
 #import "PSDockBounceAlert.h"
 #import "PSScriptAlert.h"
@@ -38 +44 @@
 ¥ If you feed NSCalendarDate dateWithNaturalLanguageString: an " AM"/" PM" locale, it doesn't accept that date format.
 ¥ descriptions for %X and %x are reversed (time zone is in %X, not %x)
+¥ NSComboBox data source issues, canÕt have it appear as ÒtodayÓ because the formatter doesnÕt like that.  Should be able to enter text into the data source and have the formatter process it without altering it.
 ¥ too hard to implement date-only or time-only formatters
 ¥ should be able to specify that natural language favors date or time (10 = 10th of month, not 10am)
@@ -44 +51 @@
 */
 
+static NSString * const PSAlertsSelected = @"Pester alerts selected"; // NSUserDefaults key
+static NSString * const PSAlertsEditing = @"Pester alerts editing"; // NSUserDefaults key
+
 @interface PSAlarmSetController (Private)
 
+- (void)_readAlerts:(PSAlerts *)alerts;
+- (BOOL)_setAlerts;
 - (void)_stopUpdateTimer;
 
@@ -54 +66 @@
 - (void)awakeFromNib;
 {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     alarm = [[PSAlarm alloc] init];
     [[self window] center];
@@ -60 +73 @@
     [timeDate setFormatter: [[NJRDateFormatter alloc] initWithDateFormat: [NJRDateFormatter localizedDateFormatIncludingWeekday: NO] allowNaturalLanguage: YES]];
     {
-        NSArray *dayNames = [[NSUserDefaults standardUserDefaults] arrayForKey:
+        NSArray *dayNames = [defaults arrayForKey:
             NSWeekDayNameArray];
         NSArray *completions = [timeDateCompletions itemTitles];
@@ -83 +96 @@
         }
     }
+    [editAlert setIntValue: [defaults boolForKey: PSAlertsEditing]];
+    {
+        NSDictionary *plAlerts = [defaults dictionaryForKey: PSAlertsSelected];
+        PSAlerts *alerts;
+        if (plAlerts == nil) {
+            alerts = [[PSAlerts alloc] initWithPesterVersion1Alerts];
+        } else {
+            NS_DURING
+                alerts = [[PSAlerts alloc] initWithPropertyList: plAlerts];
+            NS_HANDLER
+                NSRunAlertPanel(@"Unable to restore alerts", @"Pester could not restore recent alert information for one or more alerts in the Set Alarm window.  The default set of alerts will be used instead.\n\n%@", nil, nil, nil, [localException reason]);
+                alerts = [[PSAlerts alloc] initWithPesterVersion1Alerts];
+            NS_ENDHANDLER
+        }
+        [self _readAlerts: alerts];
+    }
     [timeDate setObjectValue: [NSDate date]];
-    [self inAtChanged: nil];
+    [self inAtChanged: nil]; // by convention, if sender is nil, we're initializing
     [self playSoundChanged: nil];
     [self doScriptChanged: nil];
     [self doSpeakChanged: nil];
+    [self editAlertChanged: nil];
     [script setFileTypes: [NSArray arrayWithObjects: @"applescript", @"script", NSFileTypeForHFSTypeCode(kOSAFileType), NSFileTypeForHFSTypeCode('TEXT'), nil]];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(silence:) name: PSAlarmAlertStopNotification object: nil];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(playSoundChanged:) name: NJRQTMediaPopUpButtonMovieChangedNotification object: sound];
-    [voice setDelegate: self];
-    // XXX still broken under 10.2, check 10.1 behavior and see if subclassing NSComboBox will help
-    // if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_1) {
-        // XXX workaround for 10.1.x bug which sets the first responder to the wrong field, but it works if I set the initial first responder to nil... go figure.
-        [[self window] setInitialFirstResponder: nil];
-    // }
+    [voice setDelegate: self]; // XXX why don't we do this in IB?  It should use the accessor...
+    [wakeUp setEnabled: [PSPowerManager autoWakeSupported]];
+    // XXX workaround for 10.1.x and 10.2.x bug which sets the first responder to the wrong field alternately, but it works if I set the initial first responder to nil... go figure.
+    [[self window] setInitialFirstResponder: nil];
     [[self window] makeKeyAndOrderFront: nil];
 }
@@ -110 +138 @@
 }
 
+// XXX with -[NSControl currentEditor] don't need to compare?  Also check -[NSControl validateEditing]
 - (id)objectValueForTextField:(NSTextField *)field whileEditing:(id)sender;
 {
@@ -124 +153 @@
 }
 
+#pragma mark date/interval setting
+
 - (void)setAlarmDateAndInterval:(id)sender;
 {
     if (isInterval) {
-        [alarm setInterval:
-            [[self objectValueForTextField: timeInterval whileEditing: sender] intValue] *
-                [timeIntervalUnits selectedTag]];
+        [alarm setInterval: [timeInterval interval]];
     } else {
         [alarm setForDate: [self objectValueForTextField: timeDate whileEditing: sender]
@@ -141 +170 @@
 }
 
-// XXX use OACalendar?
+// XXX use OACalendar in popup like Palm Desktop?
 
 - (IBAction)updateDateDisplay:(id)sender;
@@ -193 +222 @@
     [timeDateCompletions setEnabled: !isInterval];
     if (sender != nil)
-        [[self window] makeFirstResponder: isInterval ? timeInterval : timeOfDay];
+        [[self window] makeFirstResponder: isInterval ? (NSTextField *)timeInterval : timeOfDay];
     // NSLog(@"UPDATING FROM inAtChanged");
     [self update: nil];
 }
+
+- (IBAction)dateCompleted:(NSPopUpButton *)sender;
+{
+    [timeDate setStringValue: [sender titleOfSelectedItem]];
+    [self update: sender];
+}
+
+#pragma mark alert editing
+
+- (IBAction)editAlertChanged:(id)sender;
+{
+    BOOL editAlertSelected = [editAlert intValue];
+    NSView *editAlertControl = [editAlert controlView];
+    NSWindow *window = [self window];
+    NSRect frame = [window frame];
+    if (editAlertSelected) {
+        NSSize editWinSize = [window maxSize];
+        [editAlertControl setNextKeyView: [displayMessage controlView]];
+        frame.origin.y += frame.size.height - editWinSize.height;
+        frame.size = editWinSize;
+        [window setFrame: frame display: (sender != nil) animate: (sender != nil)];
+        [self updateDateDisplay: sender];
+        [alertTabs selectTabViewItemWithIdentifier: @"edit"];
+    } else {
+        NSSize viewWinSize = [window minSize];
+        NSRect textFrame = [alertView frame];
+        float textHeight;
+        if (![self _setAlerts]) {
+            [alertView setStringValue: [NSString stringWithFormat: @"CouldnÕt process alert information.\n%@", status]];
+        } else {
+            NSAttributedString *string = [[alarm alerts] prettyList];
+            if (string == nil) {
+                [alertView setStringValue: @"Do nothing. Click the button labeled ÒEditÓ to add an alert."];
+            } else {
+                [alertView setAttributedStringValue: string];
+                [self updateDateDisplay: sender];
+            }
+        }
+        if (sender != nil) { // nil == we're initializing, don't mess with focus
+            NSResponder *oldResponder = [window firstResponder];
+            // make sure focus doesn't get stuck in the edit tab: it is confusing and leaves behind artifacts
+            if (oldResponder == editAlertControl || [oldResponder isKindOfClass: [NSView class]] && [(NSView *)oldResponder isDescendantOf: alertTabs])
+                [window makeFirstResponder: messageField]; // would use editAlertControl, but can't get it to display anomaly-free.
+            [self silence: sender];
+        }
+        // allow height to expand, though not arbitrarily (should still fit on an 800x600 screen)
+        textHeight = [[alertView cell] cellSizeForBounds: NSMakeRect(0, 0, textFrame.size.width, 400)].height;
+        textFrame.origin.y += textFrame.size.height - textHeight;
+        textFrame.size.height = textHeight;
+        [alertView setFrame: textFrame];
+        viewWinSize.height += textHeight;
+        [alertTabs selectTabViewItemWithIdentifier: @"view"];
+        frame.origin.y += frame.size.height - viewWinSize.height;
+        frame.size = viewWinSize;
+        [window setFrame: frame display: (sender != nil) animate: (sender != nil)];
+        [editAlertControl setNextKeyView: cancelButton];
+    }
+    if (sender != nil) {
+        [[NSUserDefaults standardUserDefaults] setBool: editAlertSelected forKey: PSAlertsEditing];
+    }
+}
+
 
 - (IBAction)playSoundChanged:(id)sender;
@@ -206 +297 @@
     [soundRepetitionStepper setEnabled: canRepeat];
     [soundRepetitionsLabel setTextColor: canRepeat ? [NSColor controlTextColor] : [NSColor disabledControlTextColor]];
-    if (playSoundSelected && sender != nil)
+    if (playSoundSelected && sender == playSound) {
         [[self window] makeFirstResponder: sound];
+    }
 }
 
@@ -234 +326 @@
     [script setEnabled: doScriptSelected];
     [scriptSelectButton setEnabled: doScriptSelected];
-    if (doScriptSelected && sender != nil)
+    if (doScriptSelected && sender != nil) {
         [[self window] makeFirstResponder: scriptSelectButton];
+        if ([script alias] == nil) [scriptSelectButton performClick: sender];
+    }
 }
 
 - (IBAction)doSpeakChanged:(id)sender;
 {
-    BOOL doSpeakSelected = [doSpeak intValue];
+    BOOL doSpeakSelected = [doSpeak state] == NSOnState;
     [voice setEnabled: doSpeakSelected];
     if (doSpeakSelected && sender != nil)
@@ -246 +340 @@
 }
 
-- (IBAction)dateCompleted:(NSPopUpButton *)sender;
-{
-    [timeDate setStringValue: [sender titleOfSelectedItem]];
-    [self update: sender];
-}
+- (void)_readAlerts:(PSAlerts *)alerts;
+{
+    NSEnumerator *e = [alerts alertEnumerator];
+    PSAlert *alert;
+    
+    [alarm setAlerts: alerts];
+
+    // turn off all alerts
+    [bounceDockIcon setState: NSOffState];
+    [doScript setIntValue: NO];
+    [displayMessage setIntValue: NO];
+    [playSound setIntValue: NO];
+    [doSpeak setIntValue: NO];
+
+    while ( (alert = [e nextObject]) != nil) {
+        if ([alert isKindOfClass: [PSDockBounceAlert class]]) {
+            [bounceDockIcon setState: NSOnState];
+        } else if ([alert isKindOfClass: [PSScriptAlert class]]) {
+            [doScript setIntValue: YES];
+            [script setAlias: [(PSScriptAlert *)alert scriptFileAlias]];
+        } else if ([alert isKindOfClass: [PSNotifierAlert class]]) {
+            [displayMessage setIntValue: YES];
+        } else if ([alert isKindOfClass: [PSBeepAlert class]]) {
+            unsigned int repetitions = [(PSBeepAlert *)alert repetitions];
+            [playSound setIntValue: YES];
+            [sound setAlias: nil];
+            [soundRepetitions setIntValue: repetitions];
+            [soundRepetitionStepper setIntValue: repetitions];
+        } else if ([alert isKindOfClass: [PSMovieAlert class]]) {
+            unsigned int repetitions = [(PSMovieAlert *)alert repetitions];
+            [playSound setIntValue: YES];
+            [sound setAlias: [(PSMovieAlert *)alert movieFileAlias]];
+            [soundRepetitions setIntValue: repetitions];
+            [soundRepetitionStepper setIntValue: repetitions];
+        } else if ([alert isKindOfClass: [PSSpeechAlert class]]) {
+            [doSpeak setIntValue: YES];
+            [voice setVoice: [(PSSpeechAlert *)alert voice]];
+        }
+    }
+}
+
+- (BOOL)_setAlerts;
+{
+    PSAlerts *alerts = [alarm alerts];
+    
+    [alerts removeAlerts];
+    NS_DURING
+        // dock bounce alert
+        if ([bounceDockIcon state] == NSOnState)
+            [alerts addAlert: [PSDockBounceAlert alert]];
+        // script alert
+        if ([doScript intValue]) {
+            BDAlias *scriptFileAlias = [script alias];
+            if (scriptFileAlias == nil) {
+                [self setStatus: @"Unable to set script alert (no script specified?)"];
+                return NO;
+            }
+            [alerts addAlert: [PSScriptAlert alertWithScriptFileAlias: scriptFileAlias]];
+        }
+        // notifier alert
+        if ([displayMessage intValue])
+            [alerts addAlert: [PSNotifierAlert alert]];
+        // sound alerts
+        if ([playSound intValue]) {
+            BDAlias *soundAlias = [sound selectedAlias];
+            unsigned short numReps = [soundRepetitions intValue];
+            if (soundAlias == nil) // beep alert
+                [alerts addAlert: [PSBeepAlert alertWithRepetitions: numReps]];
+            else // movie alert
+                [alerts addAlert: [PSMovieAlert alertWithMovieFileAlias: soundAlias repetitions: numReps]];
+        }
+        // speech alert
+        if ([doSpeak intValue])
+            [alerts addAlert: [PSSpeechAlert alertWithVoice: [voice titleOfSelectedItem]]];
+        [[NSUserDefaults standardUserDefaults] setObject: [alerts propertyListRepresentation] forKey: PSAlertsSelected];
+    NS_HANDLER
+        [self setStatus: [localException reason]];
+        NS_VALUERETURN(NO, BOOL);
+    NS_ENDHANDLER
+    return YES;
+}
+
+#pragma mark actions
 
 // to ensure proper updating of interval, this should be the only method by which the window is shown (e.g. from the Alarm menu)
@@ -256 +428 @@
 {
     if (![[self window] isVisible]) {
+        NSDate *today = [NSCalendarDate dateForDay: [NSDate date]];
+        if ([(NSDate *)[timeDate objectValue] compare: today] == NSOrderedAscending) {
+            [timeDate setObjectValue: today];
+        }
         [self update: self];
-        // XXX otherwise, first responder appears to alternate every time the window is shown?!  And if you set the initial first responder, you can't tab in the window. :(
+        // XXX bug workaround - otherwise, first responder appears to alternate every time the window is shown.  And if you set the initial first responder, you can't tab in the window. :(
         [[self window] makeFirstResponder: [[self window] initialFirstResponder]];
     }
@@ -266 +442 @@
 {
     // set alerts before setting alarm...
-    [alarm removeAlerts];
-    // dock bounce alert
-    if ([bounceDockIcon state] == NSOnState)
-        [alarm addAlert: [PSDockBounceAlert alert]];
-    // script alert
-    if ([doScript intValue]) {
-        BDAlias *scriptFileAlias = [script alias];
-        if (scriptFileAlias == nil) {
-            [self setStatus: @"Unable to set script alert (no script specified?)"];
-            return;
-        }
-        [alarm addAlert: [PSScriptAlert alertWithScriptFileAlias: scriptFileAlias]];
-    }
-    // notifier alert
-    if ([displayMessage intValue])
-        [alarm addAlert: [PSNotifierAlert alert]];
-    // sound alerts
-    if ([playSound intValue]) {
-        BDAlias *soundAlias = [sound selectedAlias];
-        unsigned short numReps = [soundRepetitions intValue];
-        if (soundAlias == nil) // beep alert
-            [alarm addAlert: [PSBeepAlert alertWithRepetitions: numReps]];
-        else // movie alert
-            [alarm addAlert: [PSMovieAlert alertWithMovieFileAlias: soundAlias repetitions: numReps]];
-    }
-    // speech alert
-    if ([doSpeak intValue])
-        [alarm addAlert: [PSSpeechAlert alertWithVoice: [voice titleOfSelectedItem]]];
+    if (![self _setAlerts]) return;
 
     // set alarm
     [self setAlarmDateAndInterval: sender];
+    [alarm setRepeating: [timeIntervalRepeats state] == NSOnState];
     [alarm setMessage: [messageField stringValue]];
     if (![alarm setTimer]) {
@@ -319 +469 @@
 @implementation PSAlarmSetController (NSControlSubclassDelegate)
 
+- (BOOL)control:(NSControl *)control didFailToFormatString:(NSString *)string errorDescription:(NSString *)error;
+{
+    if (control == timeInterval)
+        [timeInterval handleDidFailToFormatString: string errorDescription: error label: @"alarm interval"];
+    return NO;
+}
+
 - (void)control:(NSControl *)control didFailToValidatePartialString:(NSString *)string errorDescription:(NSString *)error;
 {
-    unichar c;
-    int tag;
-    unsigned length = [string length];
-    if (control != timeInterval || length == 0) return;
-    c = [string characterAtIndex: length - 1];
-    switch (c) {
-        case 's': case 'S': tag = 1; break;
-        case 'm': case 'M': tag = 60; break;
-        case 'h': case 'H': tag = 60 * 60; break;
-        default: return;
-    }
-    [timeIntervalUnits selectItemAtIndex:
-        [timeIntervalUnits indexOfItemWithTag: tag]];
     // NSLog(@"UPDATING FROM validation");
-    [self update: timeInterval]; // make sure we still examine the field editor, otherwise if the existing numeric string is invalid, it'll be cleared
+    if (control == timeInterval) [self update: timeInterval]; // make sure we still examine the field editor, otherwise if the existing numeric string is invalid, it'll be cleared
 }
 
@@ -347 +491 @@
     [self silence: nil];
     [self _stopUpdateTimer];
+    [self _setAlerts];
 }
 
@@ -367 +512 @@
 - (NSString *)voicePopUpButton:(NJRVoicePopUpButton *)sender previewStringForVoice:(NSString *)voice;
 {
-    return [messageField stringValue];
+    NSString *message = [messageField stringValue];
+    if (message == nil || [message length] == 0)
+        message = [alarm message];
+    return message;
 }
 

trunk/Cocoa/Pester/Source/PSAlarms.h

@@ -8 +8 @@
 
 #import <Cocoa/Cocoa.h>
+#import "PSPropertyListSerialization.h"
 
 extern NSString * const PSAlarmsDidChangeNotification;
@@ -14 +15 @@
 @class PSAlarm;
 
-@interface PSAlarms : NSObject {
+@interface PSAlarms : NSObject <PSPropertyListSerialization> {
     NSMutableArray *alarms;
+    NSMutableSet *expiredAlarms;
     PSAlarm *nextAlarm;
 }
@@ -22 +24 @@
 + (PSAlarms *)allAlarms;
 
+- (unsigned)countOfVersion1Alarms;
+- (void)importVersion1Alarms;
+- (void)discardVersion1Alarms;
+
 - (NSArray *)alarms;
+
 - (PSAlarm *)nextAlarm;
 - (int)alarmCount;

trunk/Cocoa/Pester/Source/PSAlarms.m

@@ -9 +9 @@
 #import "PSAlarms.h"
 #import "PSAlarm.h"
+#import "NSDictionary-NJRExtensions.h"
+
+NSString * const PSAlarmImportException = @"PSAlarmImportException";
 
 NSString * const PSAlarmsDidChangeNotification = @"PSAlarmsDidChangeNotification";
 NSString * const PSAlarmsNextAlarmDidChangeNotification = @"PSAlarmsNextAlarmDidChangeNotification";
 
-static NSString * const PSPendingAlarms = @"Pester pending alarms"; // NSUserDefaults key
+// NSUserDefaults key
+static NSString * const PSPendingAlarms = @"Pester pending alarms"; // 1.0 Ð 1.1a3
+static NSString * const PSAllAlarms = @"Pester alarms"; // 1.1a4 Ð 
+
+// property list keys
+static NSString * const PLAlarmsPending = @"pending";
+static NSString * const PLAlarmsExpired = @"expired";
 
 static PSAlarms *PSAlarmsAllAlarms = nil;
@@ -28 +37 @@
 {
     if (PSAlarmsAllAlarms == nil) {
-        PSAlarmsAllAlarms = [[self alloc] init];
+        NSDictionary *plAlarms = [[NSUserDefaults standardUserDefaults] objectForKey: PSAllAlarms];
+        if (plAlarms == nil) {
+            PSAlarmsAllAlarms = [[self alloc] init];
+        } else {
+            PSAlarmsAllAlarms = [[self alloc] initWithPropertyList: plAlarms];
+        }
         [PSAlarmsAllAlarms _updateNextAlarm]; // only generate notifications after singleton established
     }
@@ -37 +51 @@
     NSAssert(PSAlarmsAllAlarms != nil, @"Attempt to use +[PSAlarms allAlarms] before setup complete");
     return PSAlarmsAllAlarms;
+}
+
+#pragma mark private
+
+- (void)_changed;
+{
+    NSMutableArray *alarmsData = [[NSMutableArray alloc] init];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [self _updateNextAlarm];
+    // NSLog(@"PSAlarms _changed:\n%@", alarms);
+    [defaults setObject: [self propertyListRepresentation] forKey: PSAllAlarms];
+    [defaults synchronize];
+    [alarmsData release];
+    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmsDidChangeNotification object: self];
+}
+
+- (void)_alarmTimerExpired:(NSNotification *)notification;
+{
+    PSAlarm *alarm = [notification object];
+    NSLog(@"timer expired: %@ retainCount %d", alarm, [alarm retainCount]);
+    [expiredAlarms addObject: alarm];
+    NSLog(@"expired alarms: %@", [expiredAlarms description]);
+    [alarms removeObject: alarm];
+    [self _changed];
+}
+
+- (void)_alarmTimerSet:(NSNotification *)notification;
+{
+    PSAlarm *alarm = [notification object];
+    NSLog(@"timer set: %@ retainCount %d", alarm, [alarm retainCount]);
+    [alarms addObject: alarm];
+    [expiredAlarms removeObject: alarm];
+    [self _changed];
+}
+
+- (void)_alarmDied:(NSNotification *)notification;
+{
+    PSAlarm *alarm = [notification object];
+    NSLog(@"alarm died: %@ retainCount %d", alarm, [alarm retainCount]);
+    [alarms removeObject: alarm];
+    [expiredAlarms removeObject: alarm];
+    [self _changed];
 }
 
@@ -59 +115 @@
 }
 
+- (void)_setUpNotifications;
+{
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alarmTimerSet:) name: PSAlarmTimerSetNotification object: nil];
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alarmTimerExpired:) name: PSAlarmTimerExpiredNotification object: nil];
+    [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alarmDied:) name: PSAlarmDiedNotification object: nil];
+}
+
+#pragma mark initialize-release
+
 - (id)init;
 {
     if ( (self = [super init]) != nil) {
         alarms = [[NSMutableArray alloc] init];
-        NS_DURING
-            NSArray *alarmsData = [[NSUserDefaults standardUserDefaults] arrayForKey: PSPendingAlarms];
-            NSEnumerator *e = [alarmsData objectEnumerator];
-            NSData *alarmData;
-            PSAlarm *alarm;
-            while ( (alarmData = [e nextObject]) != nil) {
-                alarm = [NSUnarchiver unarchiveObjectWithData: alarmData];
-                if (alarm != nil)
-                    [alarms addObject: alarm];
-            }
-        NS_HANDLER
-            // XXX need better error handling here, don't stomp on data
-            NSLog(@"An error occurred while attempting to restore the alarm list: %@", localException);
-        NS_ENDHANDLER
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alarmTimerSet:) name: PSAlarmTimerSetNotification object: nil];
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_alarmTimerExpired:) name: PSAlarmTimerExpiredNotification object: nil];
+        expiredAlarms = [[NSMutableSet alloc] init];
+        [self _setUpNotifications];
     }
     return self;
@@ -86 +137 @@
 {
     [alarms release];
+    [expiredAlarms release];
     [[NSNotificationCenter defaultCenter] removeObserver: self];
     [super dealloc];
 }
 
-- (void)_changed;
-{
-    NSMutableArray *alarmsData = [[NSMutableArray alloc] init];
-    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-    NSEnumerator *e;
-    PSAlarm *alarm;
-    [self _updateNextAlarm];
-    // NSLog(@"PSAlarms _changed:\n%@", alarms);
-    // archive
-    e = [alarms objectEnumerator];
-    while ( (alarm = [e nextObject]) != nil) {
-        [alarmsData addObject: [NSArchiver archivedDataWithRootObject: alarm]];
-    }
-    [defaults setObject: alarmsData forKey: PSPendingAlarms];
-    [defaults synchronize];
-    [alarmsData release];
-    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmsDidChangeNotification object: self];
-}
-
-- (void)_alarmTimerExpired:(NSNotification *)notification;
-{
-    [alarms removeObject: [notification object]];
-    [self _changed];
-}
-
-- (void)_alarmTimerSet:(NSNotification *)notification;
-{
-    [alarms addObject: [notification object]];
-    [self _changed];
+#pragma mark accessing
+
+- (NSArray *)alarms;
+{
+    return alarms;
 }
 
@@ -124 +152 @@
 {
     return nextAlarm;
-}
-
-- (NSArray *)alarms;
-{
-    return alarms;
 }
 
@@ -185 +208 @@
 }
 
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableArray *plPendingAlarms = [[NSMutableArray alloc] initWithCapacity: [alarms count]];
+    NSMutableArray *plExpiredAlarms = [[NSMutableArray alloc] initWithCapacity: [expiredAlarms count]];
+    NSDictionary *plAllAlarms, *plAlarm;
+    NSEnumerator *e;
+    PSAlarm *alarm;
+
+    e = [alarms objectEnumerator];
+    while ( (alarm = [e nextObject]) != nil) {
+        plAlarm = [alarm propertyListRepresentation];
+        if (plAlarm != nil)
+            [plPendingAlarms addObject: plAlarm];
+    }
+
+    e = [expiredAlarms objectEnumerator];
+    while ( (alarm = [e nextObject]) != nil) {
+        plAlarm = [alarm propertyListRepresentation];
+        if (plAlarm != nil)
+            [plExpiredAlarms addObject: plAlarm];
+    }
+    
+    plAllAlarms = [NSDictionary dictionaryWithObjectsAndKeys:
+        plPendingAlarms, PLAlarmsPending, plExpiredAlarms, PLAlarmsExpired, nil];
+    [plPendingAlarms release];
+    [plExpiredAlarms release];
+    
+    return plAllAlarms;
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    if ( (self = [super init]) != nil) {
+        NSArray *plPendingAlarms = [dict objectForRequiredKey: PLAlarmsPending];
+        NSArray *plExpiredAlarms = [dict objectForRequiredKey: PLAlarmsExpired];
+        NSEnumerator *e;
+        NSDictionary *plAlarm;
+        PSAlarm *alarm;
+
+        alarms = [[NSMutableArray alloc] initWithCapacity: [plPendingAlarms count]];
+        e = [plPendingAlarms objectEnumerator];
+        while ( (plAlarm = [e nextObject]) != nil) {
+            [alarms addObject: [[PSAlarm alloc] initWithPropertyList: plAlarm]];
+        }
+
+        e = [plExpiredAlarms objectEnumerator];
+        while ( (plAlarm = [e nextObject]) != nil) {
+            // expired alarms may be just that, or they may have outstanding repeats - if the latter, PSAlarm will reschedule the alarm.
+            if ( (alarm = [[PSAlarm alloc] initWithPropertyList: plAlarm]) != nil)
+                [alarms addObject: alarm];
+        }
+        expiredAlarms = [[NSMutableSet alloc] init];
+        
+        [self _setUpNotifications];
+    }
+    return self;
+}
+
+#pragma mark archiving (Pester 1.0)
+
+- (unsigned)countOfVersion1Alarms;
+{
+    return [[[NSUserDefaults standardUserDefaults] objectForKey: PSPendingAlarms] count];
+}
+
+- (void)discardVersion1Alarms;
+{
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    [defaults removeObjectForKey: PSPendingAlarms];
+    [defaults synchronize];
+}
+
+- (void)importVersion1Alarms;
+{
+    NSArray *alarmsData = [[NSUserDefaults standardUserDefaults] arrayForKey: PSPendingAlarms];
+    NSEnumerator *e = [alarmsData objectEnumerator];
+    NSData *alarmData;
+    PSAlarm *alarm;
+    while ( (alarmData = [e nextObject]) != nil) {
+        NS_DURING
+            alarm = [NSUnarchiver unarchiveObjectWithData: alarmData];
+        NS_HANDLER
+            alarm = nil;
+            // XXX
+        NS_ENDHANDLER
+        if (alarm != nil)
+            [alarms addObject: alarm];
+    }
+}
+
 @end

trunk/Cocoa/Pester/Source/PSAlarmsController.m

@@ -9 +9 @@
 #import "PSAlarmsController.h"
 #import "PSAlarm.h"
+#import "PSAlerts.h"
 #import "NSTableView-NJRExtensions.h"
 #import "NJRTableView.h"
@@ -82 +83 @@
 }
 
+- (NSString *)tableView:(NSTableView *)aTableView toolTipForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
+{
+    PSAlarm *alarm = [reorderedAlarms objectAtIndex: rowIndex];
+
+    return [[alarm prettyDescription] string];
+}
+
 @end
 

trunk/Cocoa/Pester/Source/PSAlert.h

@@ -9 +9 @@
 #import <Foundation/Foundation.h>
 #import "PSAlarm.h"
+#import "PSPropertyListSerialization.h"
+#import "NSString-NJRExtensions.h"
 
-@interface PSAlert : NSObject {
+extern NSString * const PSAlertCreationException;
 
+extern NSString * const PSAlarmAlertCompletedNotification; // userInfo key: "alert" -> PSAlert
+
+@interface PSAlert : NSObject <PSPropertyListSerialization> {
+    
 }
-
-// XXX need archiving support
 
 // subclasses should implement these methods
 + (PSAlert *)alert;
 - (void)triggerForAlarm:(PSAlarm *)alarm;
+- (BOOL)requiresPesterFrontmost;
+
+- (NSAttributedString *)actionDescription;
+
+// after alert completes, invoke method of superclass
+- (void)completedForAlarm:(PSAlarm *)alarm;
 
 @end

trunk/Cocoa/Pester/Source/PSAlert.m

@@ -8 +8 @@
 
 #import "PSAlert.h"
+#import "NSDictionary-NJRExtensions.h"
 
+NSString * const PSAlertCreationException = @"PSAlertCreationException";
+
+NSString * const PSAlarmAlertCompletedNotification = @"PSAlarmAlertCompletedNotification";
+
+// property list keys
+static NSString * const PLAlertClass = @"class"; // NSString
 
 @implementation PSAlert
@@ -23 +30 @@
 }
 
+- (BOOL)requiresPesterFrontmost;
+{
+    return NO;
+}
+
+- (void)completedForAlarm:(PSAlarm *)alarm;
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName: PSAlarmAlertCompletedNotification object: alarm userInfo: [NSDictionary dictionaryWithObject: self forKey: @"alert"]];
+}
+
+- (NSAttributedString *)actionDescription;
+{
+    NSAssert(NO, @"Class is abstract");
+    return nil;
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    return [NSDictionary dictionaryWithObject: NSStringFromClass([self class]) forKey: PLAlertClass];
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    if ( (self = [self init]) != nil) {
+        IMP myImp = [self methodForSelector: _cmd];
+        NSString *clsString = [dict objectForRequiredKey: PLAlertClass];
+        Class cls = NSClassFromString(clsString);
+        NSAssert1(cls != nil, @"Alert class %@ is not available", clsString);
+        [super release];
+        self = [cls alloc];
+        if (self != nil) {
+            IMP subImp = [self methodForSelector: @selector(initWithPropertyList:)];
+            NSAssert1(subImp != myImp, @"No implementation of initWithPropertyList: for alert class %@", clsString);
+            self = [self initWithPropertyList: dict];
+        }
+    }
+    return self;
+}
+
 @end

trunk/Cocoa/Pester/Source/PSApplication.m

@@ -21 +21 @@
     [[NSNotificationCenter defaultCenter] addObserver: [PSAlarmAlertController class] selector: @selector(controllerWithTimerExpiredNotification:) name: PSAlarmTimerExpiredNotification object: nil];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(nextAlarmDidChange:) name: PSAlarmsNextAlarmDidChangeNotification object: nil];
+    // XXX exception handling
     [PSAlarms setUp];
     [self setDelegate: self];
@@ -71 +72 @@
 {
     PSAlarm *alarm = [timer userInfo];
-    NSTimeInterval alarmInterval;
+    NSTimeInterval timeRemaining;
     NSString *tileString;
     if (timer == nil) alarm = [[PSAlarms allAlarms] nextAlarm];
     if (alarm == nil) return;
     tileString = [alarm timeRemainingString];
+    timeRemaining = [alarm timeRemaining]; // want to err on the side of timeRemaining being smaller, otherwise ÇexpiredÈ can appear
     {
         NSMutableDictionary *atts = [NSMutableDictionary dictionary];
@@ -117 +119 @@
         [tile release];
     }
-    alarmInterval = [alarm interval];
-    // NSLog(@"_updateDockTile > time remaining %@ (%.0lf), last time interval %.0lf", tileString, alarmInterval, dockUpdateInterval);
-    if (alarmInterval > 61) {
-        NSTimeInterval nextUpdate = ((unsigned long long)alarmInterval) % 60;
+    // NSLog(@"_updateDockTile > time remaining %@ (%.6lf), last time interval %.6lf", tileString, timeRemaining, dockUpdateInterval);
+    if (timeRemaining > 61) {
+        NSTimeInterval nextUpdate = ((unsigned long long)timeRemaining) % 60;
         if (nextUpdate <= 1) nextUpdate = 60;
         [self _resetUpdateTimer];
@@ -126 +127 @@
         // NSLog(@"_updateDockTile > set timer for %.0lf seconds", nextUpdate);
     } else if (timer == nil || dockUpdateInterval > 1) {
-        [self _resetUpdateTimer];
+        [self _resetUpdateTimer]; 
         [self _setUpdateTimerForInterval: 1 alarm: alarm repeats: YES];
         // NSLog(@"_updateDockTile > set timer for 1 second");
-    } else if (alarmInterval < 2) {
+    } else if (timeRemaining <= 1) {
         [self _resetUpdateTimer];
     }
@@ -182 +183 @@
 @implementation PSApplication (NSApplicationNotifications)
 
+- (void)applicationDidFinishLaunching:(NSNotification *)notification;
+{
+    // XXX import panel will not be frontmost window if you switch to another app while Pester is launching; Mac OS X bug?
+    PSAlarms *allAlarms = [PSAlarms allAlarms];
+    unsigned version1AlarmCount = [allAlarms countOfVersion1Alarms];
+    if (version1AlarmCount > 0) {
+        int answer = NSRunAlertPanel(@"Import alarms from older Pester version?", @"Pester found %u alarm%@ created with an older version. These alarms must be converted for use with this version of Pester, and will be unavailable in previous versions after conversion. New alarms created with this version of Pester will not appear in Pester version 1.1a3 or earlier.",
+                                     @"Import", @"Discard", @"DonÕt Import",
+                                     version1AlarmCount, version1AlarmCount == 1 ? @"" : @"s");
+        switch (answer) {
+            case NSAlertDefaultReturn:
+                NS_DURING
+                    [allAlarms importVersion1Alarms];
+                NS_HANDLER
+                    NSRunAlertPanel(@"Error occurred importing alarms", @"Pester was unable to convert some alarms created with an older version. Those alarms which could be read have been converted. The previous-format alarms have been retained; try using an older version of Pester to read them.\n\n%@", nil, nil, nil, [localException reason]);
+                    NS_VOIDRETURN;
+                NS_ENDHANDLER
+            case NSAlertAlternateReturn:
+                NSLog(@"discard");
+                // [allAlarms discardVersion1Alarms];
+                break;
+            case NSAlertOtherReturn:
+                NSLog(@"donÕt import");
+                break;
+        }
+    }
+}
+
 - (void)applicationWillTerminate:(NSNotification *)notification;
 {

trunk/Cocoa/Pester/Source/PSBeepAlert.h

@@ -9 +9 @@
 #import "PSAlert.h"
 
-
 @interface PSBeepAlert : PSAlert {
+    PSAlarm *alarm;
     unsigned short repetitions;
-    unsigned short repetitionsRemaining;    
+    unsigned short repetitionsRemaining;
 }
 
@@ -18 +18 @@
 - (id)initWithRepetitions:(unsigned short)numReps;
 
+- (unsigned short)repetitions;
+
 @end

trunk/Cocoa/Pester/Source/PSBeepAlert.m

@@ -10 +10 @@
 #import "PSBeepAlert.h"
 #import "PSAlarmAlertController.h"
+#import "NSDictionary-NJRExtensions.h"
+
+// property list keys
+static NSString * const PLAlertRepetitions = @"times"; // NSNumber
 
 @implementation PSBeepAlert
@@ -32 +36 @@
 }
 
+- (unsigned short)repetitions;
+{
+    return repetitions;
+}
+
 - (void)beep;
 {
@@ -37 +46 @@
     repetitionsRemaining--;
     if (repetitionsRemaining == 0) {
+        [self completedForAlarm: alarm];
         [self release];
         return;
@@ -48 +58 @@
 }
 
-- (void)triggerForAlarm:(PSAlarm *)alarm;
+- (void)triggerForAlarm:(PSAlarm *)anAlarm;
 {
+    alarm = anAlarm;
     repetitionsRemaining = repetitions;
     [self retain];
@@ -56 +67 @@
 }
 
+- (NSAttributedString *)actionDescription;
+{
+    return [[@"Play the system alert sound" stringByAppendingString:
+                                            repetitions == 1 ? @"" : [NSString stringWithFormat: @" %hu times", repetitions]] small];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableDictionary *plAlert = [[super propertyListRepresentation] mutableCopy];
+    [plAlert setObject: [NSNumber numberWithUnsignedShort: repetitions] forKey: PLAlertRepetitions];
+    return [plAlert autorelease];
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    return [self initWithRepetitions: [[dict objectForRequiredKey: PLAlertRepetitions] unsignedShortValue]];
+}
+
 @end

trunk/Cocoa/Pester/Source/PSDockBounceAlert.m

@@ -30 +30 @@
     [NSApp requestUserAttention: NSInformationalRequest];
     [[self class] performSelector: @selector(stopBouncing) withObject: nil afterDelay: 1 inModes: [NSArray arrayWithObject: NSDefaultRunLoopMode]];
+    [self completedForAlarm: alarm];
 }
 
+- (NSAttributedString *)actionDescription;
+{
+    return [@"Bounce dock icon" small];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    [self release];
+    return [[PSDockBounceAlert alert] retain];
+}
+        
 @end

trunk/Cocoa/Pester/Source/PSMovieAlert.h

@@ -9 +9 @@
 #import <AppKit/AppKit.h>
 #import "PSAlert.h"
-#import "BDAlias.h"
 
+@class BDAlias;
 
 @interface PSMovieAlert : PSAlert {
@@ -22 +22 @@
 + (PSMovieAlert *)alertWithMovieFileAlias:(BDAlias *)anAlias repetitions:(unsigned short)numReps;
 
-- (id)initWithAlias:(BDAlias *)anAlias repetitions:(unsigned int) numReps;
+- (id)initWithMovieFileAlias:(BDAlias *)anAlias repetitions:(unsigned int) numReps;
 
 - (BOOL)hasVideo;
 - (NSMovie *)movie;
+- (BDAlias *)movieFileAlias;
 - (unsigned short)repetitions;
 

trunk/Cocoa/Pester/Source/PSMovieAlert.m

@@ -10 +10 @@
 #import "PSMovieAlert.h"
 #import "PSMovieAlertController.h"
+#import "NSDictionary-NJRExtensions.h"
 #import "NSMovie-NJRExtensions.h"
+#import "BDAlias.h"
+
+// property list keys
+static NSString * const PLAlertRepetitions = @"times"; // NSString
+static NSString * const PLAlertAlias = @"alias"; // NSData
 
 @implementation PSMovieAlert
@@ -16 +22 @@
 + (PSMovieAlert *)alertWithMovieFileAlias:(BDAlias *)anAlias repetitions:(unsigned short)numReps;
 {
-    return [[[self alloc] initWithAlias: anAlias repetitions: numReps] autorelease];
+    return [[[self alloc] initWithMovieFileAlias: anAlias repetitions: numReps] autorelease];
 }
 
-- (id)initWithAlias:(BDAlias *)anAlias repetitions:(unsigned int) numReps;
+- (id)initWithMovieFileAlias:(BDAlias *)anAlias repetitions:(unsigned int) numReps;
 {
     if ( (self = [super init]) != nil) {
+        NSString *path = [anAlias fullPath];
+        if (path == nil) {
+            [self release];
+            [NSException raise: PSAlertCreationException format: @"CanÕt locate media to play as alert."];
+        }
         alias = [anAlias retain];
         repetitions = numReps;
-        movie = [[NSMovie alloc] initWithURL: [NSURL fileURLWithPath: [anAlias fullPath]] byReference: YES];
+        movie = [[NSMovie alloc] initWithURL: [NSURL fileURLWithPath: path] byReference: YES];
         if (movie == nil) {
             [self release];
@@ -46 +57 @@
 }
 
+- (BOOL)requiresPesterFrontmost;
+{
+    return hasVideo;
+}
+
 - (NSMovie *)movie;
 {
     return movie;
+}
+
+- (BDAlias *)movieFileAlias;
+{
+    return alias;
 }
 
@@ -73 +94 @@
 }
 
+- (NSAttributedString *)actionDescription;
+{
+    BOOL isStatic = [movie isStatic];
+    NSMutableAttributedString *string = [[(isStatic ? @"Show " : @"Play ") small] mutableCopy];
+    NSString *kindString = nil, *name = [alias displayNameWithKindString: &kindString];
+    if (name == nil) name = @"ÇcanÕt locate media fileÈ";
+    else [string appendAttributedString: [[NSString stringWithFormat: @"%@ ", kindString] small]];
+    [string appendAttributedString: [name underlined]];
+    if (repetitions > 1 && !isStatic) {
+        [string appendAttributedString: [[NSString stringWithFormat: @" %hu times", repetitions] small]];
+    }
+    return [string autorelease];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableDictionary *plAlert = [[super propertyListRepresentation] mutableCopy];
+    [plAlert setObject: [NSNumber numberWithUnsignedShort: repetitions] forKey: PLAlertRepetitions];
+    [plAlert setObject: [alias aliasData] forKey: PLAlertAlias];
+    return [plAlert autorelease];
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    return [self initWithMovieFileAlias: [BDAlias aliasWithData: [dict objectForRequiredKey: PLAlertAlias]]
+                            repetitions: [[dict objectForRequiredKey: PLAlertRepetitions] unsignedShortValue]];
+}
+
 @end

trunk/Cocoa/Pester/Source/PSMovieAlertController.h

@@ -13 +13 @@
 
 @interface PSMovieAlertController : NSWindowController {
+    PSAlarm *alarm;
+    PSMovieAlert *alert;
     IBOutlet NSMovieView *movieView;
     void *theMovie; /* Movie */
@@ -19 +21 @@
 }
 
-+ (PSMovieAlertController *)controllerWithAlarm:(PSAlarm *)alarm movieAlert:(PSMovieAlert *)alert;
++ (PSMovieAlertController *)controllerWithAlarm:(PSAlarm *)anAlarm movieAlert:(PSMovieAlert *)anAlert;
 
-- (id)initWithAlarm:(PSAlarm *)alarm movieAlert:(PSMovieAlert *)alert;
+- (id)initWithAlarm:(PSAlarm *)anAlarm movieAlert:(PSMovieAlert *)anAlert;
 
 @end

trunk/Cocoa/Pester/Source/PSMovieAlertController.m

@@ -17 +17 @@
 @implementation PSMovieAlertController
 
-+ (PSMovieAlertController *)controllerWithAlarm:(PSAlarm *)alarm movieAlert:(PSMovieAlert *)alert;
++ (PSMovieAlertController *)controllerWithAlarm:(PSAlarm *)anAlarm movieAlert:(PSMovieAlert *)anAlert;
 {
-    return [[self alloc] initWithAlarm: alarm movieAlert: alert];
+    return [[self alloc] initWithAlarm: anAlarm movieAlert: anAlert];
 }
 
@@ -39 +39 @@
 }
 
-- (id)initWithAlarm:(PSAlarm *)alarm movieAlert:(PSMovieAlert *)alert;
+- (id)initWithAlarm:(PSAlarm *)anAlarm movieAlert:(PSMovieAlert *)anAlert;
 {
     if ([self initWithWindowNibName: @"Movie alert"]) {
-        NSMovie *movie = [alert movie];
+        NSMovie *movie = [anAlert movie];
         NSWindow *window = [self window]; // connect outlets
+        alarm = anAlarm;
+        alert = anAlert;
         [movieView setMovie: movie];
         theMovie = [movie QTMovie];
@@ -67 +69 @@
             [window setFrame: frame display: NO];
             [window setTitle: [alarm message]];
+            {   // XXX workaround for (IMO) ugly appearance of Cocoa utility windows
+                NSView *miniButton = [window standardWindowButton: NSWindowMiniaturizeButton],
+                *zoomButton = [window standardWindowButton: NSWindowZoomButton];
+                // NOTE: this will not work if the window is resizable: when the frame is reset, the standard buttons reappear
+                [miniButton setFrameOrigin: NSMakePoint(-100, -100)];
+                [zoomButton setFrameOrigin: NSMakePoint(-100, -100)];
+                [[miniButton superview] setNeedsDisplay: YES];
+                [[zoomButton superview] setNeedsDisplay: YES];
+            }
             [[self window] orderFrontRegardless];
         }
@@ -91 +102 @@
     repetitions = 0;
     [movieView stop: self];
-    [self release];
+    [alert completedForAlarm: alarm];
+    [self autorelease];
     // note: there may still be a retained copy of this object until the runloop timer has let go of us at the end of the current movie playback cycle; donÕt worry about it.
 }

trunk/Cocoa/Pester/Source/PSNotifierAlert.m

@@ -26 +26 @@
 }
 
+- (BOOL)requiresPesterFrontmost;
+{
+    return YES;
+}
+
+- (NSAttributedString *)actionDescription;
+{
+    return [@"Display message and time" small];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    [self release];
+    return [[PSNotifierAlert alert] retain];
+}
+
 @end

trunk/Cocoa/Pester/Source/PSScriptAlert.h

@@ -18 +18 @@
 - (id)initWithScriptFileAlias:(BDAlias *)anAlias;
 
+- (BDAlias *)scriptFileAlias;
+
 @end

trunk/Cocoa/Pester/Source/PSScriptAlert.m

@@ -9 +9 @@
 #import "PSScriptAlert.h"
 #import "BDAlias.h"
-#import "NDAppleScriptObject.h"
+// XXX remove #import "NDAppleScriptObject.h"
+#import "NSDictionary-NJRExtensions.h"
+
+// property list keys
+static NSString * const PLAlertAlias = @"alias"; // NSData
 
 @implementation PSScriptAlert
@@ -26 +30 @@
 }
 
+- (BDAlias *)scriptFileAlias;
+{
+    return alias;
+}
+
 - (void)triggerForAlarm:(PSAlarm *)alarm;
 {
-    NDAppleScriptObject *as = [NDAppleScriptObject appleScriptObjectWithContentsOfFile: [alias fullPath]];
+    NSString *scriptPath = [alias fullPath];
 
-    if (as != nil) {
-        [as execute];
+    if (scriptPath == nil) {
+        NSRunAlertPanel(@"CanÕt find script", @"Pester couldnÕt find the script for the alarm Ò%@Ó.",
+                        nil, nil, nil, [alarm message]);
+    } else {
+        NSDictionary *errorInfo;
+        NSAppleScript *script = [[NSAppleScript alloc] initWithContentsOfURL: [NSURL fileURLWithPath: scriptPath] error: &errorInfo];
+        if (script == nil) {
+            NSString *errorMessage = [errorInfo objectForKey: NSAppleScriptErrorMessage];
+            NSNumber *errorNumber = [errorInfo objectForKey: NSAppleScriptErrorNumber];
+            NSString *appName = [errorInfo objectForKey: NSAppleScriptErrorAppName];
+            if (errorMessage == nil) errorMessage = [errorInfo objectForKey: NSAppleScriptErrorBriefMessage];
+            NSRunAlertPanel(@"Script loading error",
+                            @"Pester encountered an error while attempting to load Ò%@Ó%@ %@",
+                            nil, nil, nil,
+                            [[NSFileManager defaultManager] displayNameAtPath: scriptPath],
+                            errorMessage == nil ? @"" : [NSString stringWithFormat: @":\n\n%@%@", appName == nil ? @"" : @"Ò%@Ó reported an error: ", errorMessage],
+                            errorNumber == nil ? @"" : [NSString stringWithFormat: @"(%@)", errorNumber]);
+        } else {
+            NSAppleEventDescriptor *scriptResult = [script executeAndReturnError: &errorInfo];
+            if (scriptResult == nil) {
+                NSString *errorMessage = [errorInfo objectForKey: NSAppleScriptErrorMessage];
+                NSNumber *errorNumber = [errorInfo objectForKey: NSAppleScriptErrorNumber];
+                NSString *appName = [errorInfo objectForKey: NSAppleScriptErrorAppName];
+                if (errorMessage == nil) errorMessage = [errorInfo objectForKey: NSAppleScriptErrorBriefMessage];
+                NSRunAlertPanel(@"Script execution error",
+                                @"Pester encountered an error while attempting to execute the script Ò%@Ó%@ %@",
+                                nil, nil, nil,
+                                [[NSFileManager defaultManager] displayNameAtPath: scriptPath],
+                                errorMessage == nil ? @"" : [NSString stringWithFormat: @":\n\n%@%@", appName == nil ? @"" : @"Ò%@Ó reported an error: ", errorMessage],
+                                errorNumber == nil ? @"" : [NSString stringWithFormat: @"(%@)", errorNumber]);
+            }
+        }
     }
+    [self completedForAlarm: alarm];
 }
+
+- (NSAttributedString *)actionDescription;
+{
+    NSMutableAttributedString *string = [[@"Do script " small] mutableCopy];
+    NSString *scriptName = [alias displayNameWithKindString: NULL];
+    if (scriptName == nil) scriptName = @"ÇcanÕt locate scriptÈ";
+    [string appendAttributedString: [scriptName underlined]];
+    return [string autorelease];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableDictionary *plAlert = [[super propertyListRepresentation] mutableCopy];
+    [plAlert setObject: [alias aliasData] forKey: PLAlertAlias];
+    return [plAlert autorelease];
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    return [self initWithScriptFileAlias: [BDAlias aliasWithData: [dict objectForRequiredKey: PLAlertAlias]]];
+}
+
 @end

trunk/Cocoa/Pester/Source/PSSpeechAlert.h

@@ -8 +8 @@
 
 #import "PSAlert.h"
-#import "SUSpeaker.h"
+
+@class SUSpeaker;
 
 @interface PSSpeechAlert : PSAlert {
     SUSpeaker *speaker;
     NSString *voice;
+    PSAlarm *alarm;
 }
 
@@ -19 +21 @@
 - (id)initWithVoice:(NSString *)aVoice;
 
+- (NSString *)voice;
+
 @end

trunk/Cocoa/Pester/Source/PSSpeechAlert.m

@@ -4 +4 @@
 //
 //  Created by Nicholas Riley on Sat Oct 26 2002.
-//  Copyright (c) 2002 __MyCompanyName__. All rights reserved.
+//  Copyright (c) 2002 Nicholas Riley. All rights reserved.
 //
 
 #import "PSSpeechAlert.h"
 #import "PSAlarmAlertController.h"
+#import "NSDictionary-NJRExtensions.h"
+#import "SUSpeaker.h"
+
+// property list keys
+static NSString * const PLAlertVoice = @"voice"; // NSString
 
 @implementation PSSpeechAlert
@@ -20 +25 @@
 {
     if ( (self = [super init]) != nil) {
-        voice = aVoice;
+        voice = [aVoice retain];
     }
     return self;
@@ -33 +38 @@
 }
 
+- (NSString *)voice;
+{
+    return voice;
+}
+
 - (void)_stopSpeaking:(NSNotification *)notification;
 {
-    [speaker stopSpeaking];
-    // don't release here, we'll still get the didFinishSpeaking: message as a delegate
+    [speaker stopSpeaking]; // triggers didFinishSpeaking:
 }
 
-- (void)triggerForAlarm:(PSAlarm *)alarm;
+- (void)triggerForAlarm:(PSAlarm *)anAlarm;
 {
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(_stopSpeaking:) name: PSAlarmAlertStopNotification object: nil];
     
     if ( (speaker = [[SUSpeaker alloc] init]) == nil) return;
+    alarm = anAlarm;
     [speaker setDelegate: self];
     [speaker setVoice: [[SUSpeaker voiceNames] indexOfObject: voice] + 1];
     [speaker speakText: [alarm message]];
-    
-    [self retain];
+}
+
+- (NSAttributedString *)actionDescription;
+{
+    NSMutableAttributedString *string = [[@"Speak message with voice " small] mutableCopy];
+    [string appendAttributedString: [voice underlined]];
+    return [string autorelease];
+}
+
+#pragma mark property list serialization (Pester 1.1)
+
+- (NSDictionary *)propertyListRepresentation;
+{
+    NSMutableDictionary *plAlert = [[super propertyListRepresentation] mutableCopy];
+    [plAlert setObject: voice forKey: PLAlertVoice];
+    return [plAlert autorelease];
+}
+
+- (id)initWithPropertyList:(NSDictionary *)dict;
+{
+    if ( (self = [self init]) != nil) {
+        voice = [dict objectForRequiredKey: PLAlertVoice];
+    }
+    return self;
 }
 
@@ -55 +87 @@
 @implementation PSSpeechAlert (SUSpeakerDelegate)
 
-- (void)didFinishSpeaking:(SUSpeaker*)speaker;
+- (void)didFinishSpeaking:(SUSpeaker *)aSpeaker;
 {
-    [self release];
+    [self completedForAlarm: alarm];
+    [speaker release]; speaker = nil;
 }
 

trunk/Cocoa/Pester/Source/Pester.pbproj/nicholas.pbxuser

@@ -2 +2 @@
 {
         29B97313FDCFA39411CA2CEA = {
-                activeBuildStyle = 4A9504CDFFE6A4B311CA0CBA;
+                activeBuildStyle = 4A9504CCFFE6A4B311CA0CBA;
                 activeExecutable = F59B967103538BE201154278;
                 activeTarget = 29B97326FDCFA39411CA2CEA;
@@ -12 +12 @@
                         F500E5370359719B01AEEDB1,
                         F5B15F74037E42EB01AEEDB1,
+                        E1A9DEE703BF3C110089E8B2,
+                        E17AED7003C0F4D600B89ACF,
+                        E1156BFA03C148E2006717DC,
+                        E1156C2C03C394D6006717DC,
+                        E117A4AB03C3E2FD00E10BA2,
                 );
                 executables = (
@@ -17 +22 @@
                 );
                 perUserDictionary = {
-                        PBXPerProjectTemplateStateSaveDate = 59271904;
-                        "PBXTemplateGeometry-F5314676015831810DCA290F" = {
-                                ContentSize = "{618, 257}";
+                        PBXPerProjectTemplateStateSaveDate = 63172038;
+                        "PBXTemplateGeometry-F5CA7ECB015C094F0DCA290F" = {
+                                ContentSize = "{668, 621}";
                                 LeftSlideOut = {
                                         Collapsed = NO;
-                                        Frame = "{{0, 23}, {618, 234}}";
+                                        Frame = "{{0, 0}, {668, 621}}";
                                         Split0 = {
-                                                ActiveTab = 2;
-                                                Collapsed = YES;
-                                                Frame = "{{0, 0}, {618, 234}}";
+                                                Collapsed = NO;
+                                                Frame = "{{0, 0}, {668, 621}}";
                                                 Split0 = {
-                                                        Frame = "{{1e+06, 1e+06}, {618, 0}}";
+                                                        Frame = "{{0, 0}, {668, 621}}";
                                                 };
                                                 SplitCount = 1;
                                                 Tab0 = {
+                                                        Frame = "{{0, 0}, {484, 208}}";
+                                                };
+                                                Tab1 = {
                                                         Debugger = {
                                                                 Collapsed = NO;
-                                                                Frame = "{{0, 0}, {952, 321}}";
+                                                                Frame = "{{0, 0}, {664, 208}}";
                                                                 Split0 = {
-                                                                        Frame = "{{0, 24}, {952, 297}}";
+                                                                        Frame = "{{0, 24}, {664, 184}}";
                                                                         Split0 = {
-                                                                                Frame = "{{0, 0}, {468, 297}}";
+                                                                                Frame = "{{0, 0}, {325, 184}}";
                                                                         };
                                                                         Split1 = {
                                                                                 DebugVariablesTableConfiguration = (
                                                                                         Name,
-                                                                                        126.803,
+                                                                                        123,
                                                                                         Value,
-                                                                                        150.074,
+                                                                                        85,
                                                                                         Summary,
-                                                                                        172.123,
+                                                                                        96.123,
                                                                                 );
-                                                                                Frame = "{{477, 0}, {475, 297}}";
+                                                                                Frame = "{{334, 0}, {330, 184}}";
                                                                         };
                                                                         SplitCount = 2;
@@ -63 +70 @@
                                                                 TabsVisible = YES;
                                                         };
-                                                        Frame = "{{0, 0}, {952, 321}}";
+                                                        Frame = "{{0, 0}, {664, 208}}";
                                                         LauncherConfigVersion = 7;
                                                 };
-                                                Tab1 = {
-                                                        Frame = "{{0, 0}, {781, 452}}";
+                                                Tab2 = {
+                                                        Frame = "{{0, 0}, {664, 50}}";
                                                         LauncherConfigVersion = 3;
                                                         Runner = {
-                                                                Frame = "{{0, 0}, {781, 452}}";
+                                                                Frame = "{{0, 0}, {664, 50}}";
                                                         };
                                                 };
-                                                Tab2 = {
-                                                        BuildMessageFrame = "{{0, 0}, {620, 123}}";
-                                                        BuildTranscriptFrame = "{{0, 132}, {620, 98}}";
-                                                        Frame = "{{0, 0}, {618, 228}}";
-                                                };
                                                 Tab3 = {
+                                                        BuildMessageFrame = "{{0, 0}, {614, 262}}";
+                                                        BuildTranscriptFrame = "{{0, 271}, {614, 2}}";
+                                                        BuildTranscriptFrameExpanded = YES;
                                                         Frame = "{{0, 0}, {612, 295}}";
                                                 };
-                                                TabCount = 4;
-                                                TabsVisible = NO;
-                                        };
-                                        SplitCount = 1;
-                                        Tab0 = {
-                                                Frame = "{{0, 0}, {300, 533}}";
-                                                GroupTreeTableConfiguration = (
-                                                        TargetStatusColumn,
-                                                        18,
-                                                        MainColumn,
-                                                        267,
-                                                );
-                                        };
-                                        Tab1 = {
-                                                ClassesFrame = "{{0, 0}, {280, 398}}";
-                                                ClassesTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXClassColumnIdentifier,
-                                                        237,
-                                                );
-                                                Frame = "{{0, 0}, {278, 659}}";
-                                                MembersFrame = "{{0, 407}, {280, 252}}";
-                                                MembersTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXMethodColumnIdentifier,
-                                                        236,
-                                                );
-                                        };
-                                        Tab2 = {
-                                                Frame = "{{0, 0}, {200, 100}}";
-                                        };
-                                        Tab3 = {
-                                                Frame = "{{0, 0}, {200, 100}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {200, 45}}";
-                                                        TargetTreeTableConfiguration = (
-                                                                ActiveTarget,
-                                                                16,
-                                                                TargetName,
-                                                                168,
-                                                        );
+                                                Tab4 = {
+                                                        Frame = "{{0, 0}, {612, 295}}";
                                                 };
-                                                Split1 = {
-                                                        BuildStyleTreeTableConfiguration = (
-                                                                IsActive,
-                                                                16,
-                                                                Name,
-                                                                169,
-                                                        );
-                                                        Frame = "{{0, 54}, {200, 46}}";
-                                                };
-                                                SplitCount = 2;
-                                        };
-                                        Tab4 = {
-                                                ExecutableTreeTableConfiguration = (
-                                                        ActiveExecutable,
-                                                        16,
-                                                        ExecutableName,
-                                                        217,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        Tab5 = {
-                                                BreakpointsTreeTableConfiguration = (
-                                                        breakpointColumn,
-                                                        197,
-                                                        enabledColumn,
-                                                        31,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        TabCount = 6;
-                                        TabsVisible = NO;
-                                };
-                                StatusViewVisible = YES;
-                                Template = F5314676015831810DCA290F;
-                                ToolbarVisible = YES;
-                                WindowLocation = "{460, 270}";
-                        };
-                        "PBXTemplateGeometry-F5CA7EC9015C08ED0DCA290F" = {
-                                ContentSize = "{665, 594}";
-                                LeftSlideOut = {
-                                        Collapsed = NO;
-                                        Frame = "{{0, 0}, {665, 594}}";
-                                        Split0 = {
-                                                ActiveTab = 3;
-                                                Collapsed = NO;
-                                                Frame = "{{0, 0}, {665, 594}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 304}, {665, 290}}";
-                                                };
-                                                SplitCount = 1;
-                                                Tab0 = {
-                                                        Debugger = {
-                                                                Collapsed = NO;
-                                                                Frame = "{{0, 0}, {484, 208}}";
-                                                                Split0 = {
-                                                                        Frame = "{{0, 24}, {484, 184}}";
-                                                                        Split0 = {
-                                                                                Frame = "{{0, 0}, {236, 184}}";
-                                                                        };
-                                                                        Split1 = {
-                                                                                DebugVariablesTableConfiguration = (
-                                                                                        Name,
-                                                                                        48.80299,
-                                                                                        Value,
-                                                                                        71.07401,
-                                                                                        Summary,
-                                                                                        93.123,
-                                                                                );
-                                                                                Frame = "{{245, 0}, {239, 184}}";
-                                                                        };
-                                                                        SplitCount = 2;
-                                                                };
-                                                                SplitCount = 1;
-                                                                Tab0 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                Tab1 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                TabCount = 2;
-                                                                TabsVisible = YES;
-                                                        };
-                                                        Frame = "{{0, 0}, {484, 208}}";
-                                                        LauncherConfigVersion = 7;
-                                                };
-                                                Tab1 = {
-                                                        Frame = "{{0, 0}, {664, 208}}";
-                                                        LauncherConfigVersion = 3;
-                                                        Runner = {
-                                                                Frame = "{{0, 0}, {664, 208}}";
-                                                        };
-                                                };
-                                                Tab2 = {
-                                                        BuildMessageFrame = "{{0, 0}, {666, 43}}";
-                                                        BuildTranscriptFrame = "{{0, 52}, {666, 0}}";
-                                                        Frame = "{{0, 0}, {664, 50}}";
-                                                };
-                                                Tab3 = {
-                                                        Frame = "{{0, 0}, {665, 298}}";
-                                                };
-                                                TabCount = 4;
+                                                TabCount = 5;
                                                 TabsVisible = NO;
                                         };
@@ -260 +124 @@
                                         Tab3 = {
                                                 Frame = "{{0, 0}, {200, 557}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {200, 270}}";
-                                                        TargetTreeTableConfiguration = (
-                                                                ActiveTarget,
-                                                                16,
-                                                                TargetName,
-                                                                168,
-                                                        );
-                                                };
-                                                Split1 = {
-                                                        BuildStyleTreeTableConfiguration = (
-                                                                IsActive,
-                                                                16,
-                                                                Name,
-                                                                169,
-                                                        );
-                                                        Frame = "{{0, 279}, {200, 278}}";
-                                                };
-                                                SplitCount = 2;
+                                                TargetTableConfiguration = (
+                                                        ActiveObject,
+                                                        16,
+                                                        ObjectNames,
+                                                        202.296,
+                                                );
                                         };
                                         Tab4 = {
-                                                ExecutableTreeTableConfiguration = (
-                                                        ActiveExecutable,
-                                                        16,
-                                                        ExecutableName,
-                                                        217,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        Tab5 = {
                                                 BreakpointsTreeTableConfiguration = (
                                                         breakpointColumn,
@@ -298 +140 @@
                                                 Frame = "{{0, 0}, {250, 100}}";
                                         };
-                                        TabCount = 6;
+                                        TabCount = 5;
                                         TabsVisible = NO;
                                 };
-                                StatusViewVisible = NO;
-                                Template = F5CA7EC9015C08ED0DCA290F;
-                                ToolbarVisible = NO;
-                                WindowLocation = "{69, 216}";
-                        };
-                        "PBXTemplateGeometry-F5CA7ECB015C094F0DCA290F" = {
-                                ContentSize = "{668, 621}";
-                                LeftSlideOut = {
-                                        Collapsed = NO;
-                                        Frame = "{{0, 0}, {668, 621}}";
-                                        Split0 = {
-                                                Collapsed = NO;
-                                                Frame = "{{0, 0}, {668, 621}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {668, 621}}";
-                                                };
-                                                SplitCount = 1;
-                                                Tab0 = {
-                                                        Debugger = {
-                                                                Collapsed = NO;
-                                                                Frame = "{{0, 0}, {484, 208}}";
-                                                                Split0 = {
-                                                                        Frame = "{{0, 24}, {484, 184}}";
-                                                                        Split0 = {
-                                                                                Frame = "{{0, 0}, {236, 184}}";
-                                                                        };
-                                                                        Split1 = {
-                                                                                DebugVariablesTableConfiguration = (
-                                                                                        Name,
-                                                                                        123,
-                                                                                        Value,
-                                                                                        85,
-                                                                                        Summary,
-                                                                                        62.123,
-                                                                                );
-                                                                                Frame = "{{245, 0}, {239, 184}}";
-                                                                        };
-                                                                        SplitCount = 2;
-                                                                };
-                                                                SplitCount = 1;
-                                                                Tab0 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                Tab1 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                TabCount = 2;
-                                                                TabsVisible = YES;
-                                                        };
-                                                        Frame = "{{0, 0}, {484, 208}}";
-                                                        LauncherConfigVersion = 7;
-                                                };
-                                                Tab1 = {
-                                                        Frame = "{{0, 0}, {664, 208}}";
-                                                        LauncherConfigVersion = 3;
-                                                        Runner = {
-                                                                Frame = "{{0, 0}, {664, 208}}";
-                                                        };
-                                                };
-                                                Tab2 = {
-                                                        BuildMessageFrame = "{{0, 0}, {666, 43}}";
-                                                        BuildTranscriptFrame = "{{0, 52}, {666, 0}}";
-                                                        Frame = "{{0, 0}, {664, 50}}";
-                                                };
-                                                Tab3 = {
-                                                        Frame = "{{0, 0}, {612, 295}}";
-                                                };
-                                                TabCount = 4;
-                                                TabsVisible = NO;
-                                        };
-                                        SplitCount = 1;
-                                        Tab0 = {
-                                                Frame = "{{0, 0}, {313, 531}}";
-                                                GroupTreeTableConfiguration = (
-                                                        TargetStatusColumn,
-                                                        18,
-                                                        MainColumn,
-                                                        280,
-                                                );
-                                        };
-                                        Tab1 = {
-                                                ClassesFrame = "{{0, 0}, {280, 398}}";
-                                                ClassesTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXClassColumnIdentifier,
-                                                        237,
-                                                );
-                                                Frame = "{{0, 0}, {278, 659}}";
-                                                MembersFrame = "{{0, 407}, {280, 252}}";
-                                                MembersTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXMethodColumnIdentifier,
-                                                        236,
-                                                );
-                                        };
-                                        Tab2 = {
-                                                Frame = "{{0, 0}, {200, 100}}";
-                                        };
-                                        Tab3 = {
-                                                Frame = "{{0, 0}, {200, 557}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {200, 270}}";
-                                                        TargetTreeTableConfiguration = (
-                                                                ActiveTarget,
-                                                                16,
-                                                                TargetName,
-                                                                168,
-                                                        );
-                                                };
-                                                Split1 = {
-                                                        BuildStyleTreeTableConfiguration = (
-                                                                IsActive,
-                                                                16,
-                                                                Name,
-                                                                169,
-                                                        );
-                                                        Frame = "{{0, 279}, {200, 278}}";
-                                                };
-                                                SplitCount = 2;
-                                        };
-                                        Tab4 = {
-                                                ExecutableTreeTableConfiguration = (
-                                                        ActiveExecutable,
-                                                        16,
-                                                        ExecutableName,
-                                                        217,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        Tab5 = {
-                                                BreakpointsTreeTableConfiguration = (
-                                                        breakpointColumn,
-                                                        197,
-                                                        enabledColumn,
-                                                        31,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        TabCount = 6;
-                                        TabsVisible = NO;
-                                };
+                                NavBarShownByDefault = YES;
                                 StatusViewVisible = NO;
                                 Template = F5CA7ECB015C094F0DCA290F;
                                 ToolbarVisible = NO;
-                                WindowLocation = "{361, 189}";
-                        };
-                        "PBXTemplateGeometry-F5CA7ECC015C09990DCA290F" = {
-                                ContentSize = "{773, 558}";
-                                LeftSlideOut = {
-                                        Collapsed = NO;
-                                        Frame = "{{0, 23}, {773, 535}}";
-                                        Split0 = {
-                                                ActiveTab = 0;
-                                                Collapsed = NO;
-                                                Frame = "{{24, 0}, {749, 535}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 337}, {749, 198}}";
-                                                };
-                                                SplitCount = 1;
-                                                Tab0 = {
-                                                        Debugger = {
-                                                                ActiveTab = 1;
-                                                                Collapsed = NO;
-                                                                Frame = "{{0, 0}, {749, 331}}";
-                                                                Split0 = {
-                                                                        Frame = "{{0, 127}, {749, 204}}";
-                                                                        Split0 = {
-                                                                                Frame = "{{0, 0}, {366, 204}}";
-                                                                        };
-                                                                        Split1 = {
-                                                                                DebugVariablesTableConfiguration = (
-                                                                                        Name,
-                                                                                        120.803,
-                                                                                        Value,
-                                                                                        116.074,
-                                                                                        Summary,
-                                                                                        111.123,
-                                                                                );
-                                                                                Frame = "{{375, 0}, {374, 204}}";
-                                                                        };
-                                                                        SplitCount = 2;
-                                                                };
-                                                                SplitCount = 1;
-                                                                Tab0 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                Tab1 = {
-                                                                        Frame = "{{0, 0}, {749, 103}}";
-                                                                };
-                                                                TabCount = 2;
-                                                                TabsVisible = YES;
-                                                        };
-                                                        Frame = "{{0, 0}, {749, 331}}";
-                                                        LauncherConfigVersion = 7;
-                                                };
-                                                Tab1 = {
-                                                        Frame = "{{0, 0}, {664, 208}}";
-                                                        LauncherConfigVersion = 3;
-                                                        Runner = {
-                                                                Frame = "{{0, 0}, {664, 208}}";
-                                                        };
-                                                };
-                                                Tab2 = {
-                                                        BuildMessageFrame = "{{0, 0}, {666, 43}}";
-                                                        BuildTranscriptFrame = "{{0, 52}, {666, 0}}";
-                                                        Frame = "{{0, 0}, {664, 50}}";
-                                                };
-                                                Tab3 = {
-                                                        Frame = "{{0, 0}, {612, 295}}";
-                                                };
-                                                TabCount = 4;
-                                                TabsVisible = NO;
-                                        };
-                                        SplitCount = 1;
-                                        Tab0 = {
-                                                Frame = "{{0, 0}, {313, 531}}";
-                                                GroupTreeTableConfiguration = (
-                                                        TargetStatusColumn,
-                                                        18,
-                                                        MainColumn,
-                                                        280,
-                                                );
-                                        };
-                                        Tab1 = {
-                                                ClassesFrame = "{{0, 0}, {280, 398}}";
-                                                ClassesTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXClassColumnIdentifier,
-                                                        237,
-                                                );
-                                                Frame = "{{0, 0}, {278, 659}}";
-                                                MembersFrame = "{{0, 407}, {280, 252}}";
-                                                MembersTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXMethodColumnIdentifier,
-                                                        236,
-                                                );
-                                        };
-                                        Tab2 = {
-                                                Frame = "{{0, 0}, {200, 100}}";
-                                        };
-                                        Tab3 = {
-                                                Frame = "{{0, 0}, {200, 557}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {200, 270}}";
-                                                        TargetTreeTableConfiguration = (
-                                                                ActiveTarget,
-                                                                16,
-                                                                TargetName,
-                                                                168,
-                                                        );
-                                                };
-                                                Split1 = {
-                                                        BuildStyleTreeTableConfiguration = (
-                                                                IsActive,
-                                                                16,
-                                                                Name,
-                                                                169,
-                                                        );
-                                                        Frame = "{{0, 279}, {200, 278}}";
-                                                };
-                                                SplitCount = 2;
-                                        };
-                                        Tab4 = {
-                                                ExecutableTreeTableConfiguration = (
-                                                        ActiveExecutable,
-                                                        16,
-                                                        ExecutableName,
-                                                        217,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        Tab5 = {
-                                                BreakpointsTreeTableConfiguration = (
-                                                        breakpointColumn,
-                                                        197,
-                                                        enabledColumn,
-                                                        31,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        TabCount = 6;
-                                        TabsVisible = YES;
-                                };
-                                StatusViewVisible = YES;
-                                Template = F5CA7ECC015C09990DCA290F;
-                                ToolbarVisible = YES;
-                                WindowLocation = "{13, 212}";
-                        };
-                        "PBXTemplateGeometry-F5E465990156DFB90DCA290F" = {
-                                ContentSize = "{352, 553}";
-                                LeftSlideOut = {
-                                        ActiveTab = 0;
-                                        Collapsed = YES;
-                                        Frame = "{{0, 23}, {352, 530}}";
-                                        Split0 = {
-                                                Collapsed = NO;
-                                                Frame = "{{1e+06, 1e+06}, {0, 530}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {0, 530}}";
-                                                };
-                                                SplitCount = 1;
-                                                Tab0 = {
-                                                        Debugger = {
-                                                                Collapsed = NO;
-                                                                Frame = "{{0, 0}, {484, 208}}";
-                                                                Split0 = {
-                                                                        Frame = "{{0, 24}, {484, 184}}";
-                                                                        Split0 = {
-                                                                                Frame = "{{0, 0}, {236, 184}}";
-                                                                        };
-                                                                        Split1 = {
-                                                                                DebugVariablesTableConfiguration = (
-                                                                                        Name,
-                                                                                        123,
-                                                                                        Value,
-                                                                                        85,
-                                                                                        Summary,
-                                                                                        62.123,
-                                                                                );
-                                                                                Frame = "{{245, 0}, {239, 184}}";
-                                                                        };
-                                                                        SplitCount = 2;
-                                                                };
-                                                                SplitCount = 1;
-                                                                Tab0 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                Tab1 = {
-                                                                        Frame = "{{0, 0}, {100, 50}}";
-                                                                };
-                                                                TabCount = 2;
-                                                                TabsVisible = YES;
-                                                        };
-                                                        Frame = "{{0, 0}, {484, 208}}";
-                                                        LauncherConfigVersion = 7;
-                                                };
-                                                Tab1 = {
-                                                        Frame = "{{0, 0}, {664, 208}}";
-                                                        LauncherConfigVersion = 3;
-                                                        Runner = {
-                                                                Frame = "{{0, 0}, {664, 208}}";
-                                                        };
-                                                };
-                                                Tab2 = {
-                                                        BuildMessageFrame = "{{0, 0}, {666, 43}}";
-                                                        BuildTranscriptFrame = "{{0, 52}, {666, 0}}";
-                                                        Frame = "{{0, 0}, {664, 50}}";
-                                                };
-                                                Tab3 = {
-                                                        Frame = "{{0, 0}, {612, 295}}";
-                                                };
-                                                TabCount = 4;
-                                                TabsVisible = NO;
-                                        };
-                                        SplitCount = 1;
-                                        Tab0 = {
-                                                Frame = "{{0, 0}, {328, 530}}";
-                                                GroupTreeTableConfiguration = (
-                                                        TargetStatusColumn,
-                                                        18,
-                                                        MainColumn,
-                                                        295,
-                                                );
-                                        };
-                                        Tab1 = {
-                                                ClassesFrame = "{{0, 0}, {343, 348}}";
-                                                ClassesTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXClassColumnIdentifier,
-                                                        300,
-                                                );
-                                                Frame = "{{0, 0}, {341, 578}}";
-                                                MembersFrame = "{{0, 357}, {343, 221}}";
-                                                MembersTreeTableConfiguration = (
-                                                        PBXBookColumnIdentifier,
-                                                        20,
-                                                        PBXMethodColumnIdentifier,
-                                                        299,
-                                                );
-                                        };
-                                        Tab2 = {
-                                                Frame = "{{0, 0}, {319, 576}}";
-                                        };
-                                        Tab3 = {
-                                                Frame = "{{0, 0}, {341, 578}}";
-                                                Split0 = {
-                                                        Frame = "{{0, 0}, {341, 281}}";
-                                                        TargetTreeTableConfiguration = (
-                                                                ActiveTarget,
-                                                                16,
-                                                                TargetName,
-                                                                309,
-                                                        );
-                                                };
-                                                Split1 = {
-                                                        BuildStyleTreeTableConfiguration = (
-                                                                IsActive,
-                                                                16,
-                                                                Name,
-                                                                310,
-                                                        );
-                                                        Frame = "{{0, 290}, {341, 288}}";
-                                                };
-                                                SplitCount = 2;
-                                        };
-                                        Tab4 = {
-                                                ExecutableTreeTableConfiguration = (
-                                                        ActiveExecutable,
-                                                        16,
-                                                        ExecutableName,
-                                                        286,
-                                                );
-                                                Frame = "{{0, 0}, {319, 576}}";
-                                        };
-                                        Tab5 = {
-                                                BreakpointsTreeTableConfiguration = (
-                                                        breakpointColumn,
-                                                        197,
-                                                        enabledColumn,
-                                                        31,
-                                                );
-                                                Frame = "{{0, 0}, {250, 100}}";
-                                        };
-                                        TabCount = 6;
-                                        TabsVisible = YES;
-                                };
-                                StatusViewVisible = YES;
-                                Template = F5E465990156DFB90DCA290F;
-                                ToolbarVisible = YES;
-                                WindowLocation = "{2, 217}";
+                                WindowLocation = "{420, 75}";
                         };
                         PBXWorkspaceContents = (
@@ -743 +154 @@
                                                 Split0 = {
                                                         Split0 = {
+                                                                NavContent0 = {
+                                                                        bookmark = E1096EC203C3F504009B92C1;
+                                                                        history = (
+                                                                                E1D2937503BD418200F9204E,
+                                                                                E1D2937B03BD418200F9204E,
+                                                                                E1D2937C03BD418200F9204E,
+                                                                                E1D2937E03BD418200F9204E,
+                                                                                E1D2938303BD418200F9204E,
+                                                                                E1D2938403BD418200F9204E,
+                                                                                E1D2938503BD418200F9204E,
+                                                                                E1D2938603BD418200F9204E,
+                                                                                E1D2938903BD418200F9204E,
+                                                                                E195A26303BE251F00186F9B,
+                                                                                E195A26403BE251F00186F9B,
+                                                                                E195A26503BE251F00186F9B,
+                                                                                E195A26603BE251F00186F9B,
+                                                                                E195A26703BE251F00186F9B,
+                                                                                E195A26803BE251F00186F9B,
+                                                                                E195A26C03BE251F00186F9B,
+                                                                                E195A26D03BE251F00186F9B,
+                                                                                E195A26E03BE251F00186F9B,
+                                                                                E195A26F03BE251F00186F9B,
+                                                                                E195A27603BE251F00186F9B,
+                                                                                E195A27A03BE251F00186F9B,
+                                                                                E195A27B03BE251F00186F9B,
+                                                                                E195A27D03BE251F00186F9B,
+                                                                                E195A27E03BE251F00186F9B,
+                                                                                E195A28003BE251F00186F9B,
+                                                                                E195A28F03BE251F00186F9B,
+                                                                                E19DCB6C03BE4A0A00B934BF,
+                                                                                E19DCB7803BE4A0A00B934BF,
+                                                                                E19DCB8203BE4A0A00B934BF,
+                                                                                E19DCB8303BE4A0A00B934BF,
+                                                                                E19DCC8703BE900300B934BF,
+                                                                                E19DCC8803BE900300B934BF,
+                                                                                E19DCC8903BE900300B934BF,
+                                                                                E19DCC8A03BE900300B934BF,
+                                                                                E19DCC8B03BE900300B934BF,
+                                                                                E19DCC8C03BE900300B934BF,
+                                                                                E19DCC8E03BE900300B934BF,
+                                                                                E19DCC8F03BE900300B934BF,
+                                                                                E19DCC9203BE900300B934BF,
+                                                                                E19DCC9603BE900300B934BF,
+                                                                                E19DCC9703BE900300B934BF,
+                                                                                E19DCC9C03BE900300B934BF,
+                                                                                E19DCC9E03BE900300B934BF,
+                                                                                E1A9DEEB03BF480F0089E8B2,
+                                                                                E1A9DEEE03BF480F0089E8B2,
+                                                                                E1A9DEF003BF480F0089E8B2,
+                                                                                E1A9DEF103BF480F0089E8B2,
+                                                                                E1A9DEF203BF480F0089E8B2,
+                                                                                E11CD2CA03BF9B3300C49BEF,
+                                                                                E11CD2D003BF9B3300C49BEF,
+                                                                                E11CD2D103BF9B3300C49BEF,
+                                                                                E11CD2D203BF9B3300C49BEF,
+                                                                                E11CD2D303BF9B3300C49BEF,
+                                                                                E11CD2D403BF9B3300C49BEF,
+                                                                                E11CD2D503BF9B3300C49BEF,
+                                                                                E11CD2D603BF9B3300C49BEF,
+                                                                                E11CD2D703BF9B3300C49BEF,
+                                                                                E11CD2D803BF9B3300C49BEF,
+                                                                                E11CD2E003BF9B3300C49BEF,
+                                                                                E17AED7203C0F5D300B89ACF,
+                                                                                E17AED7303C0F5D300B89ACF,
+                                                                                E17AED7403C0F5D300B89ACF,
+                                                                                E17AED7503C0F5D300B89ACF,
+                                                                                E17AED7603C0F5D300B89ACF,
+                                                                                E17AED7703C0F5D300B89ACF,
+                                                                                E17AED7803C0F5D300B89ACF,
+                                                                                E17AED7903C0F5D300B89ACF,
+                                                                                E17AED7A03C0F5D300B89ACF,
+                                                                                E17AED7B03C0F5D300B89ACF,
+                                                                                E17AED7C03C0F5D300B89ACF,
+                                                                                E17AED7D03C0F5D300B89ACF,
+                                                                                E17AED7E03C0F5D300B89ACF,
+                                                                                E17AED7F03C0F5D300B89ACF,
+                                                                                E17AED8003C0F5D300B89ACF,
+                                                                                E17AED8103C0F5D300B89ACF,
+                                                                                E17AED8203C0F5D300B89ACF,
+                                                                                E17AED8303C0F5D300B89ACF,
+                                                                                E17AED8403C0F5D300B89ACF,
+                                                                                E17AED8503C0F5D300B89ACF,
+                                                                                E17AED8603C0F5D300B89ACF,
+                                                                                E17AED8703C0F5D300B89ACF,
+                                                                                E17AED8803C0F5D300B89ACF,
+                                                                                E17AED8903C0F5D300B89ACF,
+                                                                                E117A4AC03C3E9C600E10BA2,
+                                                                                E117A4AD03C3E9C600E10BA2,
+                                                                                E117A4AE03C3E9C600E10BA2,
+                                                                                E117A4AF03C3E9C600E10BA2,
+                                                                                E117A4B003C3E9C600E10BA2,
+                                                                                E1096EB603C3EDB0009B92C1,
+                                                                                E1096EB903C3EDB0009B92C1,
+                                                                        );
+                                                                        prevStack = (
+                                                                                E1D2939103BD418200F9204E,
+                                                                                E1D2939203BD418200F9204E,
+                                                                                E1D2939303BD418200F9204E,
+                                                                                E1D2939403BD418200F9204E,
+                                                                                E1D2939503BD418200F9204E,
+                                                                                E1D2939603BD418200F9204E,
+                                                                                E1D2939703BD418200F9204E,
+                                                                                E1D2939803BD418200F9204E,
+                                                                                E1D2939903BD418200F9204E,
+                                                                                E1D2939A03BD418200F9204E,
+                                                                                E1D2939B03BD418200F9204E,
+                                                                                E1D2939C03BD418200F9204E,
+                                                                                E1D2939D03BD418200F9204E,
+                                                                                E1D2939E03BD418200F9204E,
+                                                                                E1D2939F03BD418200F9204E,
+                                                                                E1D293A003BD418200F9204E,
+                                                                                E1D293A103BD418200F9204E,
+                                                                                E1D293A203BD418200F9204E,
+                                                                                E1D293A303BD418200F9204E,
+                                                                                E1D293A403BD418200F9204E,
+                                                                                E1D293A503BD418200F9204E,
+                                                                                E1D293A603BD418200F9204E,
+                                                                                E1D293A703BD418200F9204E,
+                                                                                E1D293A803BD418200F9204E,
+                                                                                E1D293A903BD418200F9204E,
+                                                                                E1D293AA03BD418200F9204E,
+                                                                                E1D293AB03BD418200F9204E,
+                                                                                E1D293AC03BD418200F9204E,
+                                                                                E1D293AD03BD418200F9204E,
+                                                                                E1D293AE03BD418200F9204E,
+                                                                                E1D293AF03BD418200F9204E,
+                                                                                E1D293B003BD418200F9204E,
+                                                                                E1D293B203BD418200F9204E,
+                                                                                E1D293B403BD418200F9204E,
+                                                                                E1D293B503BD418200F9204E,
+                                                                                E1D293B703BD418200F9204E,
+                                                                                E1D293B903BD418200F9204E,
+                                                                                E1D293BA03BD418200F9204E,
+                                                                                E1D293BB03BD418200F9204E,
+                                                                                E1D293BC03BD418200F9204E,
+                                                                                E1D293BD03BD418200F9204E,
+                                                                                E1D293BE03BD418200F9204E,
+                                                                                E1D293BF03BD418200F9204E,
+                                                                                E1D293C003BD418200F9204E,
+                                                                                E1D293C103BD418200F9204E,
+                                                                                E1D293C203BD418200F9204E,
+                                                                                E1D293C403BD418200F9204E,
+                                                                                E1D293C503BD418200F9204E,
+                                                                                E1D293C603BD418200F9204E,
+                                                                                E1D293C703BD418200F9204E,
+                                                                                E1D293C803BD418200F9204E,
+                                                                                E1D293C903BD418200F9204E,
+                                                                                E1D293CA03BD418200F9204E,
+                                                                                E1D293CB03BD418200F9204E,
+                                                                                E1D293CC03BD418200F9204E,
+                                                                                E1D293CD03BD418200F9204E,
+                                                                                E1D293CE03BD418200F9204E,
+                                                                                E1D293CF03BD418200F9204E,
+                                                                                E1D293D003BD418200F9204E,
+                                                                                E1D293D103BD418200F9204E,
+                                                                                E1D293D203BD418200F9204E,
+                                                                                E1D293D303BD418200F9204E,
+                                                                                E1D293D403BD418200F9204E,
+                                                                                E1D293D503BD418200F9204E,
+                                                                                E1D293D603BD418200F9204E,
+                                                                                E1D293D703BD418200F9204E,
+                                                                                E1D293D803BD418200F9204E,
+                                                                                E1D293D903BD418200F9204E,
+                                                                                E1D293DA03BD418200F9204E,
+                                                                                E1D293DB03BD418200F9204E,
+                                                                                E1D293DC03BD418200F9204E,
+                                                                                E1D293DD03BD418200F9204E,
+                                                                                E1D293DE03BD418200F9204E,
+                                                                                E1D293DF03BD418200F9204E,
+                                                                                E1D293E003BD418200F9204E,
+                                                                                E1D293E103BD418200F9204E,
+                                                                                E1D293E203BD418200F9204E,
+                                                                                E1D293E303BD418200F9204E,
+                                                                                E1D293E403BD418200F9204E,
+                                                                                E1D293E503BD418200F9204E,
+                                                                                E1D293E603BD418200F9204E,
+                                                                                E1D293E703BD418200F9204E,
+                                                                                E1D293E803BD418200F9204E,
+                                                                                E1D293E903BD418200F9204E,
+                                                                                E1D293EA03BD418200F9204E,
+                                                                                E1D293EB03BD418200F9204E,
+                                                                                E1D293EC03BD418200F9204E,
+                                                                                E1D293EE03BD418200F9204E,
+                                                                                E1D293F003BD418200F9204E,
+                                                                                E1D293F103BD418200F9204E,
+                                                                                E1D293F203BD418200F9204E,
+                                                                                E1D293F303BD418200F9204E,
+                                                                                E1D293F403BD418200F9204E,
+                                                                                E1D293F503BD418200F9204E,
+                                                                                E1D293F703BD418200F9204E,
+                                                                                E1D293F803BD418200F9204E,
+                                                                                E1D293F903BD418200F9204E,
+                                                                                E1D293FB03BD418200F9204E,
+                                                                                E1D293FC03BD418200F9204E,
+                                                                                E1D293FD03BD418200F9204E,
+                                                                                E1D293FE03BD418200F9204E,
+                                                                                E1D293FF03BD418200F9204E,
+                                                                                E1D2940003BD418200F9204E,
+                                                                                E1D2940103BD418200F9204E,
+                                                                                E1D2940203BD418200F9204E,
+                                                                                E1D2940303BD418200F9204E,
+                                                                                E1D2940403BD418200F9204E,
+                                                                                E1D2940503BD418200F9204E,
+                                                                                E1D2940603BD418200F9204E,
+                                                                                E1D2940703BD418200F9204E,
+                                                                                E1D2940803BD418200F9204E,
+                                                                                E1D2940903BD418200F9204E,
+                                                                                E1D2940A03BD418200F9204E,
+                                                                                E1D2940B03BD418200F9204E,
+                                                                                E1D2940C03BD418200F9204E,
+                                                                                E1D2940D03BD418200F9204E,
+                                                                                E1D2940E03BD418200F9204E,
+                                                                                E1D2940F03BD418200F9204E,
+                                                                                E1D2941003BD418200F9204E,
+                                                                                E1D2941103BD418200F9204E,
+                                                                                E1D2941203BD418200F9204E,
+                                                                                E1D2941303BD418200F9204E,
+                                                                                E1D2941403BD418200F9204E,
+                                                                                E1D2941503BD418200F9204E,
+                                                                                E1D2941603BD418200F9204E,
+                                                                                E1D2941703BD418200F9204E,
+                                                                                E1D2941803BD418200F9204E,
+                                                                                E1D2941903BD418200F9204E,
+                                                                                E1D2941A03BD418200F9204E,
+                                                                                E1D2941B03BD418200F9204E,
+                                                                                E1D2941C03BD418200F9204E,
+                                                                                E1D2941D03BD418200F9204E,
+                                                                                E1D2941E03BD418200F9204E,
+                                                                                E1D2941F03BD418200F9204E,
+                                                                                E1D2942003BD418200F9204E,
+                                                                                E1D2942103BD418200F9204E,
+                                                                                E1D2942203BD418200F9204E,
+                                                                                E1D2942303BD418200F9204E,
+                                                                                E1D2942403BD418200F9204E,
+                                                                                E1D2942503BD418200F9204E,
+                                                                                E1D2942603BD418200F9204E,
+                                                                                E1D2942703BD418200F9204E,
+                                                                                E1D2942803BD418200F9204E,
+                                                                                E1D2942903BD418200F9204E,
+                                                                                E1D2942A03BD418200F9204E,
+                                                                                E1D2942B03BD418200F9204E,
+                                                                                E1D2942C03BD418200F9204E,
+                                                                                E1D2942D03BD418200F9204E,
+                                                                                E1D2942E03BD418200F9204E,
+                                                                                E1D2942F03BD418200F9204E,
+                                                                                E1D2943003BD418200F9204E,
+                                                                                E1D2943103BD418200F9204E,
+                                                                                E1D2943203BD418200F9204E,
+                                                                                E1D2943303BD418200F9204E,
+                                                                                E1D2943403BD418200F9204E,
+                                                                                E1D2943503BD418200F9204E,
+                                                                                E1D2943603BD418200F9204E,
+                                                                                E1D2943703BD418200F9204E,
+                                                                                E1D2943803BD418200F9204E,
+                                                                                E1D2943903BD418200F9204E,
+                                                                                E195A29103BE251F00186F9B,
+                                                                                E195A29203BE251F00186F9B,
+                                                                                E195A29503BE251F00186F9B,
+                                                                                E195A29603BE251F00186F9B,
+                                                                                E195A29703BE251F00186F9B,
+                                                                                E195A29803BE251F00186F9B,
+                                                                                E195A29903BE251F00186F9B,
+                                                                                E195A29A03BE251F00186F9B,
+                                                                                E195A29D03BE251F00186F9B,
+                                                                                E195A29E03BE251F00186F9B,
+                                                                                E195A29F03BE251F00186F9B,
+                                                                                E195A2A003BE251F00186F9B,
+                                                                                E195A2A103BE251F00186F9B,
+                                                                                E195A2A203BE251F00186F9B,
+                                                                                E195A2A303BE251F00186F9B,
+                                                                                E195A2A503BE251F00186F9B,
+                                                                                E195A2A603BE251F00186F9B,
+                                                                                E195A2A703BE251F00186F9B,
+                                                                                E195A2A803BE251F00186F9B,
+                                                                                E195A2A903BE251F00186F9B,
+                                                                                E195A2AA03BE251F00186F9B,
+                                                                                E195A2AC03BE251F00186F9B,
+                                                                                E195A2AD03BE251F00186F9B,
+                                                                                E195A2AE03BE251F00186F9B,
+                                                                                E195A2AF03BE251F00186F9B,
+                                                                                E195A2B003BE251F00186F9B,
+                                                                                E195A2B103BE251F00186F9B,
+                                                                                E195A2B203BE251F00186F9B,
+                                                                                E195A2B303BE251F00186F9B,
+                                                                                E195A2B403BE251F00186F9B,
+                                                                                E195A2B503BE251F00186F9B,
+                                                                                E195A2B603BE251F00186F9B,
+                                                                                E195A2B703BE251F00186F9B,
+                                                                                E195A2B803BE251F00186F9B,
+                                                                                E195A2B903BE251F00186F9B,
+                                                                                E195A2BA03BE251F00186F9B,
+                                                                                E195A2BB03BE251F00186F9B,
+                                                                                E195A2BC03BE251F00186F9B,
+                                                                                E195A2BD03BE251F00186F9B,
+                                                                                E195A2BE03BE251F00186F9B,
+                                                                                E195A2C103BE251F00186F9B,
+                                                                                E195A2C203BE251F00186F9B,
+                                                                                E195A2C303BE251F00186F9B,
+                                                                                E195A2C403BE251F00186F9B,
+                                                                                E195A2C503BE251F00186F9B,
+                                                                                E195A2C603BE251F00186F9B,
+                                                                                E195A2C703BE251F00186F9B,
+                                                                                E195A2C803BE251F00186F9B,
+                                                                                E195A2C903BE251F00186F9B,
+                                                                                E195A2CA03BE251F00186F9B,
+                                                                                E195A2CB03BE251F00186F9B,
+                                                                                E195A2CD03BE251F00186F9B,
+                                                                                E195A2CF03BE251F00186F9B,
+                                                                                E195A2D103BE251F00186F9B,
+                                                                                E195A2D303BE251F00186F9B,
+                                                                                E195A2D503BE251F00186F9B,
+                                                                                E195A2D703BE251F00186F9B,
+                                                                                E195A2D903BE251F00186F9B,
+                                                                                E195A2DB03BE251F00186F9B,
+                                                                                E195A2DD03BE251F00186F9B,
+                                                                                E195A2DF03BE251F00186F9B,
+                                                                                E195A2E003BE251F00186F9B,
+                                                                                E195A2E103BE251F00186F9B,
+                                                                                E195A2E203BE251F00186F9B,
+                                                                                E195A2E303BE251F00186F9B,
+                                                                                E195A2E403BE251F00186F9B,
+                                                                                E195A2E503BE251F00186F9B,
+                                                                                E195A2E603BE251F00186F9B,
+                                                                                E195A2E803BE251F00186F9B,
+                                                                                E195A2E903BE251F00186F9B,
+                                                                                E195A2EA03BE251F00186F9B,
+                                                                                E195A2EB03BE251F00186F9B,
+                                                                                E195A2EC03BE251F00186F9B,
+                                                                                E195A2ED03BE251F00186F9B,
+                                                                                E195A2EE03BE251F00186F9B,
+                                                                                E195A2F003BE251F00186F9B,
+                                                                                E195A2F103BE251F00186F9B,
+                                                                                E195A2F303BE251F00186F9B,
+                                                                                E195A2F403BE251F00186F9B,
+                                                                                E195A2F503BE251F00186F9B,
+                                                                                E195A2F603BE251F00186F9B,
+                                                                                E195A2F703BE251F00186F9B,
+                                                                                E195A2F803BE251F00186F9B,
+                                                                                E195A2F903BE251F00186F9B,
+                                                                                E195A2FA03BE251F00186F9B,
+                                                                                E195A2FC03BE251F00186F9B,
+                                                                                E195A2FE03BE251F00186F9B,
+                                                                                E19DCB8503BE4A0A00B934BF,
+                                                                                E19DCB8603BE4A0A00B934BF,
+                                                                                E19DCB8703BE4A0A00B934BF,
+                                                                                E19DCB8903BE4A0A00B934BF,
+                                                                                E19DCB8A03BE4A0A00B934BF,
+                                                                                E19DCB8B03BE4A0A00B934BF,
+                                                                                E19DCB8C03BE4A0A00B934BF,
+                                                                                E19DCB8E03BE4A0A00B934BF,
+                                                                                E19DCB9003BE4A0A00B934BF,
+                                                                                E19DCB9103BE4A0A00B934BF,
+                                                                                E19DCB9303BE4A0A00B934BF,
+                                                                                E19DCB9403BE4A0A00B934BF,
+                                                                                E19DCB9503BE4A0A00B934BF,
+                                                                                E19DCB9603BE4A0A00B934BF,
+                                                                                E19DCB9703BE4A0A00B934BF,
+                                                                                E19DCB9803BE4A0A00B934BF,
+                                                                                E19DCB9903BE4A0A00B934BF,
+                                                                                E19DCB9A03BE4A0A00B934BF,
+                                                                                E19DCB9B03BE4A0A00B934BF,
+                                                                                E19DCB9C03BE4A0A00B934BF,
+                                                                                E19DCB9D03BE4A0A00B934BF,
+                                                                                E19DCB9E03BE4A0A00B934BF,
+                                                                                E19DCB9F03BE4A0A00B934BF,
+                                                                                E19DCBA003BE4A0A00B934BF,
+                                                                                E19DCBA103BE4A0A00B934BF,
+                                                                                E19DCBA203BE4A0A00B934BF,
+                                                                                E19DCBA303BE4A0A00B934BF,
+                                                                                E19DCBA403BE4A0A00B934BF,
+                                                                                E19DCBA503BE4A0A00B934BF,
+                                                                                E19DCBA603BE4A0A00B934BF,
+                                                                                E19DCBA703BE4A0A00B934BF,
+                                                                                E19DCBA803BE4A0A00B934BF,
+                                                                                E19DCBA903BE4A0A00B934BF,
+                                                                                E19DCBAA03BE4A0A00B934BF,
+                                                                                E19DCBAB03BE4A0A00B934BF,
+                                                                                E19DCBAC03BE4A0A00B934BF,
+                                                                                E19DCBAD03BE4A0A00B934BF,
+                                                                                E19DCBAE03BE4A0A00B934BF,
+                                                                                E19DCBAF03BE4A0A00B934BF,
+                                                                                E19DCBB003BE4A0A00B934BF,
+                                                                                E19DCBB103BE4A0A00B934BF,
+                                                                                E19DCBB203BE4A0A00B934BF,
+                                                                                E19DCBB603BE4A0A00B934BF,
+                                                                                E19DCBB703BE4A0A00B934BF,
+                                                                                E19DCBB803BE4A0A00B934BF,
+                                                                                E19DCBB903BE4A0A00B934BF,
+                                                                                E19DCBBA03BE4A0A00B934BF,
+                                                                                E19DCBBB03BE4A0A00B934BF,
+                                                                                E19DCBBC03BE4A0A00B934BF,
+                                                                                E19DCBBD03BE4A0A00B934BF,
+                                                                                E19DCCA203BE900300B934BF,
+                                                                                E19DCCA303BE900300B934BF,
+                                                                                E19DCCA403BE900300B934BF,
+                                                                                E19DCCA503BE900300B934BF,
+                                                                                E19DCCA603BE900300B934BF,
+                                                                                E19DCCA703BE900300B934BF,
+                                                                                E19DCCA803BE900300B934BF,
+                                                                                E19DCCA903BE900300B934BF,
+                                                                                E19DCCAB03BE900300B934BF,
+                                                                                E19DCCAC03BE900300B934BF,
+                                                                                E19DCCAE03BE900300B934BF,
+                                                                                E19DCCAF03BE900300B934BF,
+                                                                                E19DCCB003BE900300B934BF,
+                                                                                E19DCCB103BE900300B934BF,
+                                                                                E19DCCB203BE900300B934BF,
+                                                                                E19DCCB303BE900300B934BF,
+                                                                                E19DCCB403BE900300B934BF,
+                                                                                E19DCCB503BE900300B934BF,
+                                                                                E19DCCB603BE900300B934BF,
+                                                                                E19DCCB703BE900300B934BF,
+                                                                                E19DCCB903BE900300B934BF,
+                                                                                E19DCCBA03BE900300B934BF,
+                                                                                E19DCCBB03BE900300B934BF,
+                                                                                E19DCCBC03BE900300B934BF,
+                                                                                E19DCCBD03BE900300B934BF,
+                                                                                E19DCCBE03BE900300B934BF,
+                                                                                E19DCCBF03BE900300B934BF,
+                                                                                E19DCCC003BE900300B934BF,
+                                                                                E19DCCC103BE900300B934BF,
+                                                                                E19DCCC203BE900300B934BF,
+                                                                                E19DCCC303BE900300B934BF,
+                                                                                E19DCCC403BE900300B934BF,
+                                                                                E19DCCC503BE900300B934BF,
+                                                                                E19DCCC603BE900300B934BF,
+                                                                                E19DCCC703BE900300B934BF,
+                                                                                E19DCCC803BE900300B934BF,
+                                                                                E19DCCC903BE900300B934BF,
+                                                                                E19DCCCA03BE900300B934BF,
+                                                                                E19DCCCB03BE900300B934BF,
+                                                                                E19DCCCD03BE900300B934BF,
+                                                                                E19DCCCE03BE900300B934BF,
+                                                                                E19DCCCF03BE900300B934BF,
+                                                                                E19DCCD103BE900300B934BF,
+                                                                                E19DCCD203BE900300B934BF,
+                                                                                E19DCCD403BE900300B934BF,
+                                                                                E19DCCD503BE900300B934BF,
+                                                                                E19DCCD603BE900300B934BF,
+                                                                                E19DCCD703BE900300B934BF,
+                                                                                E19DCCD803BE900300B934BF,
+                                                                                E19DCCD903BE900300B934BF,
+                                                                                E19DCCDA03BE900300B934BF,
+                                                                                E19DCCDB03BE900300B934BF,
+                                                                                E1A9DEF703BF480F0089E8B2,
+                                                                                E1A9DEF903BF480F0089E8B2,
+                                                                                E1A9DEFB03BF480F0089E8B2,
+                                                                                E1A9DEFC03BF480F0089E8B2,
+                                                                                E1A9DEFD03BF480F0089E8B2,
+                                                                                E1A9DEFE03BF480F0089E8B2,
+                                                                                E1A9DF0003BF480F0089E8B2,
+                                                                                E1A9DF0203BF480F0089E8B2,
+                                                                                E1A9DF0303BF480F0089E8B2,
+                                                                                E1A9DF0403BF480F0089E8B2,
+                                                                                E1A9DF0503BF480F0089E8B2,
+                                                                                E1A9DF0603BF480F0089E8B2,
+                                                                                E1A9DF0703BF480F0089E8B2,
+                                                                                E1A9DF0803BF480F0089E8B2,
+                                                                                E1A9DF0A03BF480F0089E8B2,
+                                                                                E11CD2E303BF9B3300C49BEF,
+                                                                                E11CD2E503BF9B3300C49BEF,
+                                                                                E11CD2E603BF9B3300C49BEF,
+                                                                                E11CD2E703BF9B3300C49BEF,
+                                                                                E11CD2E803BF9B3300C49BEF,
+                                                                                E11CD2E903BF9B3300C49BEF,
+                                                                                E11CD2EA03BF9B3300C49BEF,
+                                                                                E11CD2EB03BF9B3300C49BEF,
+                                                                                E11CD2EC03BF9B3300C49BEF,
+                                                                                E11CD2ED03BF9B3300C49BEF,
+                                                                                E11CD2EE03BF9B3300C49BEF,
+                                                                                E11CD2EF03BF9B3300C49BEF,
+                                                                                E11CD2F603BF9B3300C49BEF,
+                                                                                E11CD2F803BF9B3300C49BEF,
+                                                                                E11CD2FB03BF9B3300C49BEF,
+                                                                                E17AED8B03C0F5D300B89ACF,
+                                                                                E17AED8C03C0F5D300B89ACF,
+                                                                                E17AED8D03C0F5D300B89ACF,
+                                                                                E17AED8E03C0F5D300B89ACF,
+                                                                                E17AED8F03C0F5D300B89ACF,
+                                                                                E17AED9003C0F5D300B89ACF,
+                                                                                E17AED9103C0F5D300B89ACF,
+                                                                                E17AED9203C0F5D300B89ACF,
+                                                                                E17AED9303C0F5D300B89ACF,
+                                                                                E17AED9403C0F5D300B89ACF,
+                                                                                E17AED9503C0F5D300B89ACF,
+                                                                                E17AED9603C0F5D300B89ACF,
+                                                                                E17AED9703C0F5D300B89ACF,
+                                                                                E17AED9803C0F5D300B89ACF,
+                                                                                E17AED9903C0F5D300B89ACF,
+                                                                                E17AED9A03C0F5D300B89ACF,
+                                                                                E17AED9B03C0F5D300B89ACF,
+                                                                                E17AED9C03C0F5D300B89ACF,
+                                                                                E17AED9D03C0F5D300B89ACF,
+                                                                                E17AED9E03C0F5D300B89ACF,
+                                                                                E17AED9F03C0F5D300B89ACF,
+                                                                                E17AEDA003C0F5D300B89ACF,
+                                                                                E17AEDA103C0F5D300B89ACF,
+                                                                                E17AEDA203C0F5D300B89ACF,
+                                                                                E17AEDA303C0F5D300B89ACF,
+                                                                                E17AEDA403C0F5D300B89ACF,
+                                                                                E17AEDA503C0F5D300B89ACF,
+                                                                                E17AEDA603C0F5D300B89ACF,
+                                                                                E17AEDA703C0F5D300B89ACF,
+                                                                                E17AEDA803C0F5D300B89ACF,
+                                                                                E17AEDA903C0F5D300B89ACF,
+                                                                                E17AEDAA03C0F5D300B89ACF,
+                                                                                E17AEDAB03C0F5D300B89ACF,
+                                                                                E17AEDAC03C0F5D300B89ACF,
+                                                                                E17AEDAD03C0F5D300B89ACF,
+                                                                                E17AEDAE03C0F5D300B89ACF,
+                                                                                E17AEDAF03C0F5D300B89ACF,
+                                                                                E17AEDB003C0F5D300B89ACF,
+                                                                                E17AEDB103C0F5D300B89ACF,
+                                                                                E17AEDB203C0F5D300B89ACF,
+                                                                                E17AEDB303C0F5D300B89ACF,
+                                                                                E17AEDB403C0F5D300B89ACF,
+                                                                                E17AEDB503C0F5D300B89ACF,
+                                                                                E17AEDB603C0F5D300B89ACF,
+                                                                                E17AEDB703C0F5D300B89ACF,
+                                                                                E17AEDB803C0F5D300B89ACF,
+                                                                                E17AEDB903C0F5D300B89ACF,
+                                                                                E17AEDBA03C0F5D300B89ACF,
+                                                                                E17AEDBB03C0F5D300B89ACF,
+                                                                                E17AEDBC03C0F5D300B89ACF,
+                                                                                E17AEDBD03C0F5D300B89ACF,
+                                                                                E17AEDBE03C0F5D300B89ACF,
+                                                                                E17AEDBF03C0F5D300B89ACF,
+                                                                                E17AEDC003C0F5D300B89ACF,
+                                                                                E17AEDC103C0F5D300B89ACF,
+                                                                                E17AEDC203C0F5D300B89ACF,
+                                                                                E17AEDC303C0F5D300B89ACF,
+                                                                                E17AEDC403C0F5D300B89ACF,
+                                                                                E17AEDC503C0F5D300B89ACF,
+                                                                                E17AEDC603C0F5D300B89ACF,
+                                                                                E17AEDC703C0F5D300B89ACF,
+                                                                                E17AEDC803C0F5D300B89ACF,
+                                                                                E17AEDC903C0F5D300B89ACF,
+                                                                                E117A4B203C3E9C600E10BA2,
+                                                                                E117A4B303C3E9C600E10BA2,
+                                                                                E117A4B403C3E9C600E10BA2,
+                                                                                E1096EB803C3EDB0009B92C1,
+                                                                        );
+                                                                };
                                                                 NavCount = 1;
                                                                 NavGeometry0 = {
-                                                                        Frame = "{{0, 0}, {150, 530}}";
+                                                                        Frame = "{{0, 0}, {689, 635}}";
                                                                         NavBarVisible = YES;
                                                                 };
+                                                                NavSplitVertical = NO;
                                                         };
                                                         SplitCount = 1;
-                                                        Tab0 = {
+                                                        Tab1 = {
                                                                 Debugger = {
                                                                         Split0 = {
@@ -760 +715 @@
                                                                 LauncherConfigVersion = 7;
                                                         };
-                                                        Tab1 = {
+                                                        Tab2 = {
                                                                 LauncherConfigVersion = 3;
                                                                 Runner = {
                                                                 };
                                                         };
-                                                        TabCount = 4;
+                                                        TabCount = 5;
+                                                };
+                                                SplitCount = 1;
+                                                Tab1 = {
+                                                        OptionsSetName = "Flat, project classes";
+                                                };
+                                                TabCount = 5;
+                                        };
+                                },
+                                {
+                                        LeftSlideOut = {
+                                                Split0 = {
+                                                        Split0 = {
+                                                                NavCount = 1;
+                                                                NavGeometry0 = {
+                                                                        Frame = "{{0, 0}, {945, 150}}";
+                                                                        NavBarVisible = YES;
+                                                                };
+                                                                NavSplitVertical = NO;
+                                                        };
+                                                        SplitCount = 1;
+                                                        Tab1 = {
+                                                                Debugger = {
+                                                                        Split0 = {
+                                                                                SplitCount = 2;
+                                                                        };
+                                                                        SplitCount = 1;
+                                                                        TabCount = 2;
+                                                                };
+                                                                LauncherConfigVersion = 7;
+                                                        };
+                                                        Tab2 = {
+                                                                LauncherConfigVersion = 3;
+                                                                Runner = {
+                                                                };
+                                                        };
+                                                        TabCount = 5;
                                                 };
                                                 SplitCount = 1;
@@ -780 +771 @@
                                                                 NavCount = 1;
                                                                 NavGeometry0 = {
-                                                                        Frame = "{{0, 0}, {973, 150}}";
+                                                                        Frame = "{{0, 0}, {769, 153}}";
                                                                         NavBarVisible = YES;
                                                                 };
+                                                                NavSplitVertical = NO;
                                                         };
                                                         SplitCount = 1;
-                                                        Tab0 = {
+                                                        Tab1 = {
                                                                 Debugger = {
                                                                         Split0 = {
@@ -795 +787 @@
                                                                 LauncherConfigVersion = 7;
                                                         };
-                                                        Tab1 = {
+                                                        Tab2 = {
                                                                 LauncherConfigVersion = 3;
                                                                 Runner = {
                                                                 };
                                                         };
-                                                        TabCount = 4;
+                                                        TabCount = 5;
                                                 };
                                                 SplitCount = 1;
@@ -814 +806 @@
                                                         Split0 = {
                                                                 NavContent0 = {
-                                                                        bookmark = F562F80B037E5D2101AEEDB1;
+                                                                        bookmark = E1096EC303C3F504009B92C1;
                                                                         history = (
-                                                                                F5B163A5037E543A01AEEDB1,
+                                                                                E17AEDCC03C0F5D300B89ACF,
+                                                                                E117A4B803C3E9C600E10BA2,
+                                                                                E1096EBB03C3EDB0009B92C1,
+                                                                        );
+                                                                        prevStack = (
+                                                                                E17AEDCE03C0F5D300B89ACF,
+                                                                                E17AEDCF03C0F5D300B89ACF,
+                                                                                E117A4BA03C3E9C600E10BA2,
                                                                         );
                                                                 };
                                                                 NavCount = 1;
                                                                 NavGeometry0 = {
-                                                                        Frame = "{{0, 0}, {668, 621}}";
+                                                                        Frame = "{{0, 0}, {749, 201}}";
                                                                         NavBarVisible = YES;
                                                                 };
+                                                                NavSplitVertical = NO;
                                                         };
                                                         SplitCount = 1;
-                                                        Tab0 = {
+                                                        Tab1 = {
                                                                 Debugger = {
                                                                         Split0 = {
@@ -836 +836 @@
                                                                 LauncherConfigVersion = 7;
                                                         };
-                                                        Tab1 = {
+                                                        Tab2 = {
                                                                 LauncherConfigVersion = 3;
                                                                 Runner = {
                                                                 };
                                                         };
-                                                        TabCount = 4;
+                                                        TabCount = 5;
                                                 };
                                                 SplitCount = 1;
@@ -854 +854 @@
                                                 Split0 = {
                                                         Split0 = {
+                                                                NavContent0 = {
+                                                                        bookmark = E1096EC403C3F504009B92C1;
+                                                                        history = (
+                                                                                E1096EBC03C3EDB0009B92C1,
+                                                                        );
+                                                                };
                                                                 NavCount = 1;
                                                                 NavGeometry0 = {
-                                                                        Frame = "{{0, 0}, {618, 150}}";
+                                                                        Frame = "{{0, 0}, {668, 621}}";
                                                                         NavBarVisible = YES;
                                                                 };
+                                                                NavSplitVertical = NO;
                                                         };
                                                         SplitCount = 1;
-        

@@ -1 +1 @@
 build
+.gdb_history