Changeset 19 for trunk/Cocoa/F-Script Anywhere/Source/FSAController.m

Timestamp:

10/20/02 05:39:33 (22 years ago)

Author:

Nicholas Riley

Message:

F-Script Anywhere 1.1.6d1

File:

• trunk/Cocoa/F-Script Anywhere/Source/FSAController.m (modified) (7 diffs)

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

@@ -28 +28 @@
 #import "FSAViewAssociationController.h"
 #import "FSAnywhere.h"
+#import "FSAWindowManager.h"
 #import <FScript/FSInterpreter.h>
 
@@ -107 +108 @@
             item = [fsaMenu addItemWithTitle: NSLocalizedStringFromTableInBundle(@"About F-Script AnywhereÉ", @"FSA", bundle, @"Title of Info Panel menu item") action:@selector(showInfo:) keyEquivalent: @""];
             [item setTarget: self];
+            [[FSAWindowManager sharedManager] setWindowMenu: fsaMenu];
         }
     }
@@ -118 +120 @@
     sel = [menuItem action];
     if (sel == @selector(showInfo:) || sel == @selector(createInterpreterWindow:)) return YES;
-    FSALog(@"-[FSAController validateMenuItem:] unknown menu item for validation: %@", menuItem);
+    FSALog(@"+[FSAController validateMenuItem:] unknown menu item for validation: %@", menuItem);
     return NO;
 }
@@ -129 +131 @@
 + (void)showInfo:(id)sender;
 {
-    int result = NSRunInformationalAlertPanel(@"About F-Script Anywhere", @"F-Script Anywhere lets you embed a F-Script interpreter in a Cocoa application while it is running.\n\nF-Script Anywhere is currently installed in this application.  To remove it, quit this application.\n\nFor more information about F-Script, please visit its Web site %@.", @"OK", @"Visit Web Site", nil, FSA_FScriptURL);
+    int result = NSRunInformationalAlertPanel([NSString stringWithFormat: @"About F-Script Anywhere (version %s)", FSA_VERSION], @"F-Script Anywhere lets you embed a F-Script interpreter in a Cocoa application while it is running.\n\nF-Script Anywhere is currently installed in this application.  To remove it, quit this application.\n\nFor more information about F-Script, please visit its Web site %@.", @"OK", @"Visit Web Site", nil, FSA_FScriptURL);
     if (result == NSAlertAlternateReturn) {
         [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString: FSA_FScriptURL]];
@@ -144 +146 @@
 
     if (self != nil) {
-        NSString *appName = nil;
         NSWindow *window = [self window];
-
-        NSAssert(window != nil, @"Can't get interpreter window!");
+        NSString *label;
+        static unsigned numInterpWindows = 0;
+
+        NSAssert(window != nil, @"CanÕt get interpreter window!");
+        if (interpreterNum == 0) interpreterNum = ++numInterpWindows;
+        if ( (label = [self interpreterLabel]) != nil) {
+            [window setTitle: [NSString stringWithFormat: @"%@: %@", [window title], label]];
+        }
+
+        [window setLevel: NSNormalWindowLevel]; // XXX if set floating, it is globally floating!
+        [self showWindow: self];
+        [window makeKeyAndOrderFront: self];
+#warning this should go away when F-Script properly accepts firstResponder on the InterpreterView
+        [window makeFirstResponder: (NSView *)[[[self interpreterView] cliView] shellView]];
+        [[FSAWindowManager sharedManager] registerWindow: window];
+        system = [[[self interpreterView] interpreter] objectForIdentifier: @"sys" found: NULL];
+        [system retain];
+        NSAssert1([system isKindOfClass: [System class]], @"Initial value bound to identifier 'sys' is not a System object, but %@", system);
+    }
+    
+    return self;
+}
+
+- (void)dealloc;
+{
+    [system release];
+    [super dealloc];
+}
+
+- (NSString *)interpreterLabel;
+{
+    static NSString *appName = nil;
+    static BOOL retrievedAppName = NO;
+    
+    if (appName == nil) {
+        if (retrievedAppName) return nil;
         NS_DURING
             appName = [[[NSBundle mainBundle] infoDictionary] objectForKey: @"CFBundleName"];
@@ -153 +188 @@
             FSALog(@"Exception occurred while trying to obtain application name: %@", localException);
         NS_ENDHANDLER
-        if (appName != nil) {
-            [window setTitle: [NSString stringWithFormat: @"%@: %@", [window title], appName]];
-        }
-
-        [window setLevel: NSNormalWindowLevel]; // XXX if set floating, it is globally floating!
-        [self showWindow: self];
-        [window makeKeyAndOrderFront: self];
-#warning this should go away when F-Script properly accepts firstResponder on the InterpreterView
-        [window makeFirstResponder: (NSView *)[[[self interpreterView] cliView] shellView]];
-        system = [[[self interpreterView] interpreter] objectForIdentifier: @"sys" found: NULL];
-        [system retain];
-        NSAssert1([system isKindOfClass: [System class]], @"Initial value bound to identifier 'sys' is not a System object, but %@", system);
-    }
-    
-    return self;
-}
-
-- (void)dealloc;
-{
-    [system release];
-    [super dealloc];
+        retrievedAppName = YES;
+    }
+    if (interpreterNum == 1) return appName;
+    return [NSString stringWithFormat: @"%@ [%u]", appName, interpreterNum];
 }
 
@@ -194 +212 @@
 {
     NS_DURING
+        FSAWindowManager *wm = [FSAWindowManager sharedManager];
         if (viewAssociationController == nil) {
             viewAssociationController = [[FSAViewAssociationController alloc] initWithFSAController: self];
         }
         [viewAssociationController showWindow: self];
+        if (![wm windowIsRegistered: [viewAssociationController window]]) {
+            [wm registerSubordinateWindow: [viewAssociationController window]
+                                forWindow: [self window]];
+        }
     NS_HANDLER
         FSALog(@"%@", localException);