Merge remote-tracking branch 'upstream/main'

AppKit/CPButtonBar.j

@@ -36,6 +36,7 @@
     BOOL    _hasResizeControl;
     BOOL    _resizeControlIsLeftAligned;
     CPArray _buttons;
+    CPArray _rightButtons;
 }
 
 + (id)plusButton
@@ -104,6 +105,7 @@
     if (self)
     {
         _buttons = [];
+        _rightButtons = [];
         [self setNeedsLayout];
     }
 
@@ -157,6 +159,30 @@
     return [CPArray arrayWithArray:_buttons];
 }
 
+- (void)setRightButtons:(CPArray)buttons
+{
+    for (var i = [_rightButtons count] - 1; i >= 0; i--)
+    {
+        [_rightButtons[i] removeFromSuperview];
+        [_rightButtons[i] removeObserver:self forKeyPath:@"hidden"];
+    }
+
+    _rightButtons = [CPArray arrayWithArray:buttons];
+
+    for (var i = [_rightButtons count] - 1; i >= 0; i--)
+    {
+        [_rightButtons[i] addObserver:self forKeyPath:@"hidden" options:CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld context:nil];
+        [_rightButtons[i] setBordered:YES];
+    }
+
+    [self setNeedsLayout];
+}
+
+- (CPArray)rightButtons
+{
+    return [CPArray arrayWithArray:_rightButtons];
+}
+
 - (void)setHasResizeControl:(BOOL)shouldHaveResizeControl
 {
     if (_hasResizeControl === shouldHaveResizeControl)
@@ -243,46 +269,73 @@
         }
     }
 
-    var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
-        bounds = [self bounds],
+    var rightButtonsNotHidden = [CPArray arrayWithArray:_rightButtons],
+        rightCount = [rightButtonsNotHidden count];
+
+    while (rightCount--)
+    {
+        var button = rightButtonsNotHidden[rightCount];
+
+        if ([button isHidden])
+        {
+            [button removeFromSuperview];
+            [rightButtonsNotHidden removeObject:button];
+        }
+    }
+
+    var bounds = [self bounds],
         height = CGRectGetHeight(bounds) - 1,
         frameWidth = CGRectGetWidth(bounds),
         resizeRect = _hasResizeControl ? [self rectForEphemeralSubviewNamed:"resize-control-view"] : CGRectMakeZero(),
         resizeWidth = CGRectGetWidth(resizeRect),
         availableWidth = frameWidth - resizeWidth - 1;
 
-    for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
+    var currentLeftOffset = _resizeControlIsLeftAligned ? resizeWidth - 1 : -1,
+        currentRightOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX(bounds) + 1 : CGRectGetMaxX(bounds) - resizeWidth + 1;
+
+    var setupButton = function(button, isRightAligned)
     {
-        var button = buttonsNotHidden[i],
-            width = CGRectGetWidth([button frame]);
+        var width = CGRectGetWidth([button frame]);
 
         if (availableWidth > width)
             availableWidth -= width;
         else
-            break;
+            return NO;
 
-        if (_resizeControlIsLeftAligned)
+        if (isRightAligned)
         {
-            [button setFrame:CGRectMake(currentButtonOffset - width, 1, width, height)];
-            currentButtonOffset -= width - 1;
+            [button setFrame:CGRectMake(currentRightOffset - width, 1, width, height)];
+            currentRightOffset -= width - 1;
         }
         else
-        {
-            [button setFrame:CGRectMake(currentButtonOffset, 1, width, height)];
-            currentButtonOffset += width - 1;
+        {[button setFrame:CGRectMake(currentLeftOffset, 1, width, height)];
+            currentLeftOffset += width - 1;
         }
 
         [button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered]];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted,  CPThemeStateBordered, ]];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted, CPThemeStateBordered]];
         [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered]];
         [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];
 
-        // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
+        // FIXME shouldn't need this[button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
         [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
         [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
 
         [self addSubview:button];
+        
+        return YES;
+    };
+
+    for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
+    {
+        if (!setupButton(buttonsNotHidden[i], _resizeControlIsLeftAligned))
+            break;
+    }
+
+    for (var i = 0, count = [rightButtonsNotHidden count]; i < count; i++)
+    {
+        if (!setupButton(rightButtonsNotHidden[i], YES))
+            break;
     }
 
     if (_hasResizeControl)
@@ -314,7 +367,8 @@
 
 var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
     CPButtonBarResizeControlIsLeftAlignedKey = @"CPButtonBarResizeControlIsLeftAlignedKey",
-    CPButtonBarButtonsKey = @"CPButtonBarButtonsKey";
+    CPButtonBarButtonsKey = @"CPButtonBarButtonsKey",
+    CPButtonBarRightButtonsKey = @"CPButtonBarRightButtonsKey";
 
 @implementation CPButtonBar (CPCoding)
 
@@ -325,6 +379,7 @@ var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
     [aCoder encodeBool:_hasResizeControl forKey:CPButtonBarHasResizeControlKey];
     [aCoder encodeBool:_resizeControlIsLeftAligned forKey:CPButtonBarResizeControlIsLeftAlignedKey];
     [aCoder encodeObject:_buttons forKey:CPButtonBarButtonsKey];
+    [aCoder encodeObject:_rightButtons forKey:CPButtonBarRightButtonsKey];
 }
 
 - (id)initWithCoder:(CPCoder)aCoder
@@ -332,6 +387,7 @@ var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
     if (self = [super initWithCoder:aCoder])
     {
         _buttons = [aCoder decodeObjectForKey:CPButtonBarButtonsKey] || [];
+        _rightButtons = [aCoder decodeObjectForKey:CPButtonBarRightButtonsKey] || [];
         _hasResizeControl = [aCoder decodeBoolForKey:CPButtonBarHasResizeControlKey];
         _resizeControlIsLeftAligned = [aCoder decodeBoolForKey:CPButtonBarResizeControlIsLeftAlignedKey];
     }

Tests/Manual/CPButtonBarTest/AppController.j

@@ -0,0 +1,104 @@
+/*
+ * AppController.j
+ * CPButtonBar Right Buttons Manual Test
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPKeyedArchiver.j>
+@import <Foundation/CPKeyedUnarchiver.j>
+@import <AppKit/AppKit.j>
+
+@implementation AppController : CPObject
+{
+    CPButtonBar buttonBar;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask],
+        contentView = [theWindow contentView];
+
+    var bounds = [contentView bounds];
+
+    // 1. Create the ButtonBar
+    buttonBar = [[CPButtonBar alloc] initWithFrame:CGRectMake(0, CGRectGetHeight(bounds) - 28, CGRectGetWidth(bounds), 28)];
+    [buttonBar setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
+    
+    // Add resize control to ensure bounds calculations are correct
+    [buttonBar setHasResizeControl:YES];
+
+    // 2. Setup standard Left Buttons
+    var plusButton = [CPButtonBar plusButton],
+        minusButton = [CPButtonBar minusButton];
+    
+    [buttonBar setButtons:[plusButton, minusButton]];
+
+    // 3. Setup the new Right Buttons (PR #745)
+    var actionButton = [CPButtonBar actionPopupButton],
+        customRightBtn = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 70, 24)];
+        
+    [customRightBtn setTitle:@"Settings"];
+    [buttonBar setRightButtons:[customRightBtn, actionButton]];
+
+    [contentView addSubview:buttonBar];
+
+    // --- Testing Controls ---
+
+    // Button to test resizing alignment layout
+    var toggleAlignmentBtn = [CPButton buttonWithTitle:@"Toggle Resize Control Alignment"];
+    [toggleAlignmentBtn setFrameOrigin:CGPointMake(20, 20)];
+    [toggleAlignmentBtn sizeToFit];
+    [toggleAlignmentBtn setTarget:self];
+    [toggleAlignmentBtn setAction:@selector(toggleResizeAlignment:)];
+    [contentView addSubview:toggleAlignmentBtn];
+
+    // Button to test the KVO "hidden" observer on rightButtons
+    var toggleVisibilityBtn = [CPButton buttonWithTitle:@"Toggle Right Button Visibility"];
+    [toggleVisibilityBtn setFrameOrigin:CGPointMake(20, 60)];
+    [toggleVisibilityBtn sizeToFit];
+    [toggleVisibilityBtn setTarget:self];
+    [toggleVisibilityBtn setAction:@selector(toggleRightVisibility:)];
+    [contentView addSubview:toggleVisibilityBtn];
+
+    // Button to test CPCoding archiving/unarchiving of rightButtons
+    var testArchivingBtn = [CPButton buttonWithTitle:@"Test Archiving (CPCoding)"];
+    [testArchivingBtn setFrameOrigin:CGPointMake(20, 100)];
+    [testArchivingBtn sizeToFit];
+    [testArchivingBtn setTarget:self];
+    [testArchivingBtn setAction:@selector(testArchiving:)];
+    [contentView addSubview:testArchivingBtn];
+
+    [theWindow orderFront:self];
+}
+
+- (void)toggleResizeAlignment:(id)sender
+{
+    // Flipping the resize control to the left shouldn't break the right-aligned buttons
+    [buttonBar setResizeControlIsLeftAligned:![buttonBar resizeControlIsLeftAligned]];
+}
+
+- (void)toggleRightVisibility:(id)sender
+{
+    var rightBtns = [buttonBar rightButtons];
+    if ([rightBtns count] > 0)
+    {
+        var btn = rightBtns[0];
+        [btn setHidden:![btn isHidden]];
+    }
+}
+
+- (void)testArchiving:(id)sender
+{
+    // Test the new CPButtonBarRightButtonsKey in CPCoding
+    var data = [CPKeyedArchiver archivedDataWithRootObject:buttonBar];
+    var unarchivedBar = [CPKeyedUnarchiver unarchiveObjectWithData:data];
+
+    var bounds = [[buttonBar superview] bounds];
+    
+    // Place the cloned bar directly above the original one
+    [unarchivedBar setFrame:CGRectMake(0, CGRectGetHeight(bounds) - 56, CGRectGetWidth(bounds), 28)];
+    
+    [[buttonBar superview] addSubview:unarchivedBar];
+}
+
+@end

Tests/Manual/CPButtonBarTest/Info.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CPApplicationDelegateClass</key>
+	<string>AppController</string>
+	<key>CPBundleName</key>
+	<string>CPButtonBarTest</string>
+	<key>CPPrincipalClass</key>
+	<string>CPApplication</string>
+</dict>
+</plist>

Tests/Manual/CPButtonBarTest/Jakefile

@@ -0,0 +1,81 @@
+/*
+ * Jakefile
+ * CPBrowserTest
+ *
+ * Created by Ross Boucher on March 23, 2010.
+ * Copyright 2010, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("CPBrowserTest", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPBrowserTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPBrowserTest");
+    task.setIdentifier("com.yourcompany.CPBrowserTest");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPBrowserTest");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/*"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPBrowserTest"));
+    print("----------------------------");
+}
+
+task ("default", ["CPBrowserTest"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "CPBrowserTest", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "CPBrowserTest", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "CPBrowserTest"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "CPBrowserTest"), FILE.join("Build", "Deployment", "CPBrowserTest")]);
+    printResults("Deployment")
+});

Tests/Manual/CPButtonBarTest/index-debug.html

@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index-debug.html
+ __project.name__
+
+ Created by __user.name__ on __project.date__.
+ Copyright __project.year__, __organization.name__ All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>__project.name__</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
+            // The below will tell the compiler to generate debug symbols, type signatures and not inline objj_msgSend functions.
+            // This will affect only Objective-J code that is compiled when loading the application. It will not affect precompiled
+            // code like the Cappuccino frameworks.
+            //
+            // Debug symbols will give each Objective-J method a Javascript function name. Without a name it will be very hard to find
+            // the methods in the debugger.
+            // Type Signatures will give type information to the Objective-J runtime for instance variables and methods.
+            // Inline objj_msgSend will give a speed increase but decorators will not work. Check below on debug options for
+            // more information on decorators.
+            //
+            // Uncomment or comment on the line below to change the flags
+            OBJJ_COMPILER_FLAGS = ["IncludeDebugSymbols", "IncludeTypeSignatures", "SourceMap", "InlineMsgSend"];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+            // Decorators will only work when the code is compiled without the compiler option 'InlineMsgSend'. Check above.
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this application.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>

Tests/Manual/CPButtonBarTest/index.html

@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index.html
+ __project.name__
+
+ Created by __user.name__ on __project.date__.
+ Copyright __project.year__, __organization.name__ All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>__project.name__</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            // The below will tell the compiler to not generate debug symbols but will generate type signatures and inline objj_msgSend functions.
+            // This will affect only Objective-J code that is compiled when loading the application. It will not affect precompiled
+            // code like the Cappuccino frameworks.
+            // Uncomment or comment on the line below to change the flags
+            OBJJ_COMPILER_FLAGS = [/*"IncludeDebugSymbols"*/, "IncludeTypeSignatures"/*, "SourceMap"*/, "InlineMsgSend"];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this application.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>

Tests/Manual/CPButtonBarTest/main.j

@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPButtonBarTest
+ *
+ * Created by Ross Boucher on March 23, 2010.
+ * Copyright 2010, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}