Add about panel

Reviewed by me.

AppKit/CPApplication.j

@@ -96,6 +96,10 @@ CPRunContinuesResponse  = -1002;
     CPDictionary            _namedArgs;
     CPArray                 _args;
     CPString                _fullArgsString;
+
+    CPImage                 _applicationIconImage;
+
+    CPPanel                 _aboutPanel;
 }
 
 /*!
@@ -302,11 +306,88 @@ CPRunContinuesResponse  = -1002;
 
 - (void)terminate:(id)aSender
 {
-    [[CPDocumentController sharedDocumentController] closeAllDocumentsWithDelegate:self
-                                                              didCloseAllSelector:@selector(_documentController:didCloseAll:context:)
-                                                                      contextInfo:nil];
+    if (![CPPlatform isBrowser])
+    {
+        [[CPDocumentController sharedDocumentController] closeAllDocumentsWithDelegate:self
+                                                                  didCloseAllSelector:@selector(_documentController:didCloseAll:context:)
+                                                                          contextInfo:nil];
+    }
+    else
+    {
+        [[[CPApp mainWindow] platformWindow] _propagateCurrentDOMEvent:YES];
+    }
 }
 
+- (void)setApplicationIconImage:(CPImage)anImage
+{
+    _applicationIconImage = anImage;
+}
+
+- (CPImage)applicationIconImage
+{
+    if (_applicationIconImage)
+        return _applicationIconImage;
+
+    var imagePath = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPApplicationIcon"];
+    if (imagePath)
+        _applicationIconImage = [[CPImage alloc] initWithContentsOfFile:imagePath];
+
+    return _applicationIconImage;
+}
+
+- (void)orderFrontStandardAboutPanel:(id)sender
+{
+    [self orderFrontStandardAboutPanelWithOptions:nil];
+}
+
+- (void)orderFrontStandardAboutPanelWithOptions:(CPDictionary)options
+{
+    if (!_aboutPanel)
+    {
+        var mainInfo = [[CPBundle mainBundle] infoDictionary],
+            applicationTitle = [options objectForKey:"ApplicationName"] || [mainInfo objectForKey:@"CPBundleName"],
+            applicationIcon = [options objectForKey:@"ApplicationIcon"] || [self applicationIconImage],
+            version = [options objectForKey:@"Version"] || [mainInfo objectForKey:@"CPBundleVersion"],
+            applicationVersion = [options objectForKey:@"ApplicationVersion"] || [mainInfo objectForKey:@"CPBundleShortVersionString"],
+            copyright = [options objectForKey:@"Copyright"] || [mainInfo objectForKey:@"CPHumanReadableCopyright"];
+
+        var aboutPanelController = [[CPWindowController alloc] initWithWindowCibName:@"AboutPanel"],
+            aboutPanel = [aboutPanelController window],
+            contentView = [aboutPanel contentView],
+            imageView = [contentView viewWithTag:1],
+            applicationLabel = [contentView viewWithTag:2],
+            versionLabel = [contentView viewWithTag:3],
+            copyrightLabel = [contentView viewWithTag:4],
+            standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
+    
+        // FIXME move this into the CIB eventually
+        [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
+        [applicationLabel setAlignment:CPCenterTextAlignment];
+        [versionLabel setAlignment:CPCenterTextAlignment];
+        [copyrightLabel setAlignment:CPCenterTextAlignment];
+
+        [imageView setImage:applicationIcon || [[CPImage alloc] initWithContentsOfFile:standardPath 
+                                                                                  size:CGSizeMake(256, 256)]];
+
+        [applicationLabel setStringValue:applicationTitle || ""];
+
+        if (version && applicationVersion)
+            [versionLabel setStringValue:sprintf(@"Version %@ (%@)", applicationVersion, version)];
+        else if (applicationVersion || version)
+            [versionLabel setStringValue:sprintf(@"Version %@", applicationVersion || version)];
+        else
+            [versionLabel setStringValue:@""];
+
+        [copyrightLabel setStringValue:copyright || ""];
+        [aboutPanel center];
+
+        _aboutPanel = aboutPanel;
+    }
+
+    [_aboutPanel orderFront:self];
+}
+
+
 - (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
 {
     // callback method for terminate:
@@ -559,16 +640,6 @@ CPRunContinuesResponse  = -1002;
     [[CPColorPanel sharedColorPanel] orderFront:self];
 }
 
-- (void)orderFrontStandardAboutPanel:(id)aSender
-{
-    [self orderFrontStandardAboutPanelWithOptions:nil];
-}
-
-- (void)orderFrontStandardAboutPanelWithOptions:(CPDictionary)aDictionary
-{
-    // FIXME: Implement.
-}
-
 // Posting Actions
 /*!
     Tries to perform the action with an argument. Performs

AppKit/CPToolbar.j

@@ -957,7 +957,14 @@ var TOP_MARGIN      = 5.0,
 - (void)mouseDown:(CPEvent)anEvent
 {
     if ([_toolbarItem view])
-        return;
+        return [[self nextResponder] mouseDown:anEvent];
+
+    var identifier = [_toolbarItem itemIdentifier];
+
+    if (identifier === CPToolbarSpaceItemIdentifier ||
+        identifier === CPToolbarFlexibleSpaceItemIdentifier ||
+        identifier === CPToolbarSeparatorItemIdentifier)
+        return [[self nextResponder] mouseDown:anEvent];
 
     [super mouseDown:anEvent];
 }

AppKit/CPView.j

@@ -596,7 +596,7 @@ var CPViewFlags                     = { },
 
 - (void)viewWithTag:(CPInteger)aTag
 {
-    if ([self tag] === aTag)
+    if ([self tag] == aTag)
         return self;
 
     var index = 0,

Objective-J/CommonJS/lib/objective-j/compiler.js

@@ -83,11 +83,11 @@ function compileWithResolvedFlags(aFilePath, objjcFlags, gccFlags)
     for (var index = 0; index < fragments.length; index++)
     {
         var fragment = fragments[index];
-        
+
         if (IS_FILE(fragment))
             preprocessed += (IS_LOCAL(fragment) ? MARKER_IMPORT_LOCAL : MARKER_IMPORT_STD) + ';' + GET_PATH(fragment).length + ';' + GET_PATH(fragment);
         else
-        {            
+        {
             var code = GET_CODE(fragment);
 
             if (shouldCheckSyntax)
@@ -99,23 +99,25 @@ function compileWithResolvedFlags(aFilePath, objjcFlags, gccFlags)
                 catch (e)
                 {
                     var lines = code.split("\n"),
-                        PAD = 3;
-                        
-                    print("Syntax error in "+GET_FILE(fragment).path+
-                            " on preprocessed line number "+e.lineNumber+"\n"+
-                            "\t"+lines.slice(Math.max(0, e.lineNumber - 1 - PAD), e.lineNumber+PAD).join("\n\t"));
-                        
-                    OS.exit(1);
+                        PAD = 3,
+                        lineNumber = e.lineNumber || e.line,
+                        errorInfo = "Syntax error in "+GET_FILE(fragment).path+
+                                    " on preprocessed line number "+lineNumber+"\n\n"+
+                                    "\t"+lines.slice(Math.max(0, lineNumber - 1 - PAD), lineNumber+PAD).join("\n\t");
+
+                    print(errorInfo);
+
+                    throw errorInfo;
                 }
             }
-            
+
             if (shouldCompress)
             {
                 code = compress("function(){" + code + '}', FILE.basename(aFilePath));
-            
+
                 code = code.substr("function(){".length, code.length - "function(){};\n\n".length);
             }
-            
+
             preprocessed += MARKER_CODE + ';' + code.length + ';' + code;
         }
     }

Objective-J/CommonJS/objj-executable

@@ -1,27 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env narwhal
 
-# get the absolute path of the executable
-SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
+var FILE = require("file");
 
-# resolve symlinks
-while [ -h "$SELF_PATH" ]; do
-	DIR=$(dirname -- "$SELF_PATH")
-	SYM=$(readlink -- "$SELF_PATH")
-	SELF_PATH=$(cd -- "$DIR" && cd -- $(dirname -- "$SYM") && pwd)/$(basename -- "$SYM")
-done
+var cappuccinoPackage = FILE.path(module.path).dirname().dirname();
+var mainPath = cappuccinoPackage.join("lib", FILE.basename(module.path), "main.j");
+var frameworksPath = cappuccinoPackage.join("Frameworks");
 
-SELF_DIR=`dirname $SELF_PATH`
-export SELF_HOME=`dirname $SELF_DIR`
-SELF_LIB="$SELF_HOME/lib"
+// TODO: is specifying the Frameworks necessary?
+system.args.splice(1, 0, "-I"+frameworksPath, String(mainPath));
 
-FRAMEWORKS="$SELF_HOME/Frameworks"
-MAIN="$SELF_LIB/$(basename $SELF_PATH)/main.j"
+// HACK: remove use of SELF_HOME from capp gen
+system.env["SELF_HOME"] = cappuccinoPackage;
 
-
-# convert paths for Cygwin
-if [[ `uname` == CYGWIN* ]]; then
-    FRAMEWORKS=`cygpath -w "$FRAMEWORKS"`
-    MAIN=`cygpath -w "$MAIN"`
-fi
-
-objj -I$FRAMEWORKS $MAIN "$@"
+require("objective-j").run(system.args);

Objective-J/Runtime/runtime.js

@@ -161,12 +161,12 @@ function class_copyIvarList(/*Class*/ aClass)
 
 #define METHOD_DISPLAY_NAME(aClass, aMethod) (ISMETA(aClass) ? '+' : '-') + " [" + class_getName(aClass) + ' ' + method_getName(aMethod) + ']'
 
-function class_addMethod(/*Class*/ aClass, /*SEL*/ aName, /*IMP*/ anImplementation, /*String*/aType)
+function class_addMethod(/*Class*/ aClass, /*SEL*/ aName, /*IMP*/ anImplementation, /*Array<String>*/ types)
 {
     if (aClass.method_hash[aName])
         return NO;
     
-    var method = new objj_method(aName, anImplementation, aType);
+    var method = new objj_method(aName, anImplementation, types);
     
     aClass.method_list.push(method); 
     aClass.method_dtable[aName] = method;
@@ -177,7 +177,7 @@ function class_addMethod(/*Class*/ aClass, /*SEL*/ aName, /*IMP*/ anImplementati
     // FIXME: Should this be done here?
     // If this is a root class...
     if (!ISMETA(aClass) && GETMETA(aClass).isa === GETMETA(aClass))
-        class_addMethod(GETMETA(aClass), method);
+        class_addMethod(GETMETA(aClass), aName, anImplementation, types);
 
     return YES;
 }

Tools/nib2cib/NSScrollView.j

@@ -35,12 +35,9 @@
         _horizontalScroller = [aCoder decodeObjectForKey:"NSHScroller"];
         _contentView        = [aCoder decodeObjectForKey:"NSContentView"];
 
-        _hasVerticalScroller    = !Boolean(flags & (1 << 4));
-        _hasHorizontalScroller  = !Boolean(flags & (1 << 5));
-        _autohidesScrollers     = Boolean(flags & (1 << 9));
-
-        [self setHasHorizontalScroller:!_hasHorizontalScroller];
-        [self setHasVerticalScroller:!_hasVerticalScroller];
+        _hasVerticalScroller    = !!(flags & (1 << 4));
+        _hasHorizontalScroller  = !!(flags & (1 << 5));
+        _autohidesScrollers     = !!(flags & (1 << 9));
 
         //[aCoder decodeBytesForKey:"NSScrollAmts"];
         _verticalLineScroll = 10.0;

bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 function prompt () {
     while true; do
@@ -25,23 +25,39 @@ function path_instructions () {
     echo "    export PATH=$INSTALL_DIRECTORY/bin:\$PATH"
 }
 
-TEMPZIP="/tmp/narwhal.zip"
+if [ "--clone" = "$1" ]; then
+    GITCLONE=1
+fi
+
 INSTALL_DIRECTORY="/usr/local/narwhal"
+TEMPZIP="/tmp/narwhal.zip"
 
 ORIGINAL_PATH="$PATH"
 
 if ! which "narwhal"; then
     echo "================================================================================"
-    echo "Narwhal JavaScript platform is required. Install it into \"$INSTALL_DIRECTORY\"?"
+    echo "Narwhal JavaScript platform is required. Install it automatically?"
     if prompt; then
-        echo "Downloading Narwhal..."
-        curl -L -o "$TEMPZIP" "http://github.com/280north/narwhal/zipball/master"
-        echo "Installing Narwhal..."
-        unzip "$TEMPZIP" -d "$INSTALL_DIRECTORY"
-        rm "$TEMPZIP"
-        
-        mv $INSTALL_DIRECTORY/280north-narwhal-*/* $INSTALL_DIRECTORY/.
-        rm -rf $INSTALL_DIRECTORY/280north-narwhal-*
+        echo "================================================================================"
+        echo "To use the default location, \"$INSTALL_DIRECTORY\", just hit enter/return, or enter another path:"
+        read INSTALL_DIRECTORY_INPUT
+        if [ "$INSTALL_DIRECTORY_INPUT" ]; then
+            INSTALL_DIRECTORY="$INSTALL_DIRECTORY_INPUT"
+        fi
+
+        if [ "$GITCLONE" ]; then
+            echo "Cloning Narwhal..."
+            git clone git://github.com/280north/narwhal.git "$INSTALL_DIRECTORY"
+        else
+            echo "Downloading Narwhal..."
+            curl -L -o "$TEMPZIP" "http://github.com/280north/narwhal/zipball/master"
+            echo "Installing Narwhal..."
+            unzip "$TEMPZIP" -d "$INSTALL_DIRECTORY"
+            rm "$TEMPZIP"
+
+            mv $INSTALL_DIRECTORY/280north-narwhal-*/* $INSTALL_DIRECTORY/.
+            rm -rf $INSTALL_DIRECTORY/280north-narwhal-*
+        fi
         
         if ! which "narwhal"; then
             export PATH="$INSTALL_DIRECTORY/bin:$PATH"
@@ -58,14 +74,24 @@ if ! which "narwhal"; then
 fi
 
 echo "Installing necessary dependencies..."
-tusk install browserjs jake
+
+if [ "$GITCLONE" ]; then
+    tusk update
+    tusk clone browserjs jake
+else
+    tusk install browserjs jake
+fi
 
 if [ `uname` = "Darwin" ]; then
     echo "================================================================================"
     echo "Would you like to install the JavaScriptCore engine for Narwhal?"
     echo "This is optional but will make building and running Objective-J much faster."
     if prompt; then
-        tusk install narwhal-jsc
+        if [ "$GITCLONE" ]; then
+            tusk clone narwhal-jsc
+        else
+            tusk install narwhal-jsc
+        fi
         pushd "$INSTALL_DIRECTORY/packages/narwhal-jsc"
         make webkit
         popd

common.jake

@@ -203,8 +203,9 @@ global.subjake = function(/*Array<String>*/ directories, /*String*/ aTaskName)
     {
         if (FILE.isDirectory(aDirectory) && FILE.isFile(FILE.join(aDirectory, "Jakefile")))
         {
-            OS.system("cd " + aDirectory + " && " + serializedENV() + " " + ARGV[0] + " " + aTaskName);
-        //rake abort if ($? != 0)
+            var returnCode = OS.system("cd " + aDirectory + " && " + serializedENV() + " " + ARGV[0] + " " + aTaskName);
+            if (returnCode)
+                OS.exit(returnCode);
         }
         else
             print("warning: subjake missing: " + aDirectory + " (this is not necessarily an error, " + aDirectory + " may be optional)");