Changeset 224 for trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m

Timestamp:

05/17/06 04:58:34 (18 years ago)

Author:

rchin

Message:

Object For Target... button now works as it should.

File:

• trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m (modified) (10 diffs)

trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m

@@ -36 +36 @@
 - (id)initWithFSAController:(FSAController *)fsa;
 {
-    self = [super initWithWindowNibName: @"FSAViewAssociationPanel"];
+    self = [super init];
 
     if (self != nil) {
@@ -47 +47 @@
         if (label != nil) [[self window] setTitle: [NSString stringWithFormat: @"%@: %@", [[self window] title], label]];
         bullseyeCursor = [[NSCursor alloc] initWithImage: bullseyeImage hotSpot: NSMakePoint(6, 7)];
-        [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(controlTextDidChange:) name: NSControlTextDidChangeNotification object: variableNameField];
-        [[captureButton cell] setShowsStateBy: NSContentsCellMask | NSChangeGrayCellMask];
-        [captureButton setState: NSOffState];
-        [self update: nil];
     }
     return self;
@@ -65 +61 @@
 }
 
-- (IBAction)update:(id)sender;
-{
-    NSString *variableName = [variableNameField stringValue];
-    BOOL canAssignToVariable = NO;
-    [browseButton setEnabled: selectedElement != nil];
-    [statusField setStringValue: @""];
-    if ([variableName length] != 0) {
-        if (![FSInterpreter validateSyntaxForIdentifier: variableName]) {
-            [statusField setStringValue: @"Invalid name: contains spaces, punctuation or non-ASCII characters"];
-        } else if (selectedElement != nil) {
-            [statusField setStringValue: @"Click ÒAssociateÓ to assign to this variable"];
-            canAssignToVariable = YES;
-        }
-    }
-    [associateButton setEnabled: canAssignToVariable];
-    [variableNameField setEnabled: [captureButton state] == NSOffState];
-}
-
 - (void)stopCapturingVoluntarily:(BOOL)voluntary;
 {
     FSALog(@"stopping capture");
     [[NSNotificationCenter defaultCenter] removeObserver: self name: NSMenuWillSendActionNotification object: nil];
-    [captureButton setState: NSOffState];
-    [self update: nil];
     if (voluntary) {
         FSALog(@"voluntary!");
         [[self window] makeKeyAndOrderFront: self];
         [bullseyeCursor pop];
-        [variableNameField becomeFirstResponder];        
     }
 }
@@ -158 +133 @@
     
     FSALog(@"%4u>capturing one", capture);
-    [captureButton setState: NSOnState];
     [bullseyeCursor push];
-
 captureElement:
     [bullseyeCursor set];
@@ -192 +165 @@
         contentView = [eventWindow contentView];
         view = [[contentView superview] hitTest: [event locationInWindow]];
-        if (view == captureButton) {
-            [NSApp discardEventsMatchingMask: NSAnyEventMask & ~NSKeyUpMask beforeEvent: event];
-            FSALog(@"%4u<stop capture [capture button]", capture);
-            [self stopCapturingVoluntarily: YES];
-            NS_VOIDRETURN;
-        }
         if (view == nil) {
             [self captureOneView];
@@ -214 +181 @@
         [self _addElementToMenu: eventWindow];
     NS_HANDLER
-        [descriptionField setStringValue:
-            [NSString stringWithFormat: @"Çan exception occurred: %@È", localException]];
+        [self alertWithString:[NSString stringWithFormat: @"Çan exception occurred: %@È", localException]];
     NS_ENDHANDLER
     [NSMenu popUpContextMenu: viewHierarchyMenu withEvent: event forView: view];
-    if ([captureButton state] == NSOnState) goto captureElement;
+    [self stopCapturingVoluntarily: YES];
+//    if ([captureButton state] == NSOnState) goto captureElement;
     FSALog(@"%4u<stop capture [fell through to end]", capture);
 }
@@ -224 +191 @@
 - (IBAction)captureView:(id)sender
 {
-    [statusField setStringValue: @"Click inside one of this applicationÕs windows to select."];
     [selectedElement release]; selectedElement = nil;
-    [self update: nil];
     [self captureOneView];
 }
@@ -234 +199 @@
     FSALog(@"element selected: %@", element);
     NS_DURING
-        [descriptionField setStringValue: [element description]];
         [selectedElement release];
         selectedElement = [element retain];
         [[self window] orderFront: self];
     NS_HANDLER
-        [descriptionField setStringValue:
-            [NSString stringWithFormat: @"Çan exception occurred: %@È", localException]];
+        [self alertWithString:[NSString stringWithFormat: @"Çan exception occurred: %@È", localException]];
     NS_ENDHANDLER
     [viewHierarchyMenu release]; viewHierarchyMenu = nil;
@@ -248 +211 @@
 {
     [self setSelectedElement: [sender representedObject]];
-    [self captureOneView];
+    [system browse: selectedElement];
+//    [self captureOneView];
 }
 
@@ -259 +223 @@
 }
 
-- (void)controlTextDidChange:(NSNotification *)notification;
-{
-    [self update: nil];
-}
-
-- (IBAction)defineVariable:(id)sender;
-{
-    NS_DURING
-        NSString *variableName = [variableNameField stringValue];
-        [statusField setStringValue: @"AssociatingÉ"];
-        [interpreter setObject: selectedElement forIdentifier: variableName];
-        [statusField setStringValue: [NSString stringWithFormat: @"Assigned variable Ò%@Ó", variableName]];
-    NS_HANDLER
-        [statusField setStringValue: [NSString stringWithFormat: @"Assocation failed: %@", localException]];
-    NS_ENDHANDLER
-}
-
 - (IBAction)viewInObjectBrowser:(id)sender;
 {
     FSALog(@"system: %@", system);
     [system browse: selectedElement];
-    [statusField setStringValue: @"Opened object browser"];
+}
+
+- (void)alertWithString:(NSString *)alertString
+{
+    [NSAlert alertWithMessageText:alertString
+                    defaultButton:nil
+                  alternateButton:nil
+                      otherButton:nil
+        informativeTextWithFormat:nil];
 }