Cappuccino v0.9.6 RC2.

RC2 bootstrap.
Fixed: objcc --includeTypeSignatures typo.
2026-09-09 12:17:13 +00:00 · 2012-08-22 22:35:53 +01:00 · 2012-08-21 23:18:24 +01:00 · 2012-08-21 22:37:08 +01:00 · 2012-08-21 01:24:36 +01:00 · 2012-08-19 17:32:09 +01:00
1560 changed files with 203586 additions and 25919 deletions
@@ -5,3 +5,8 @@ Demos
 ./Aristo
 WebSite
 .push-package
+*.xcodeproj/*.pbxuser
+*.xcodeproj/*.perspectivev3
+xcuserdata/
+!*.xcodeproj/project.pbxproj
+*.xCodeSupport/
@@ -20,10 +20,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "_CPToolTip.j"
@import "CALayer.j"
+@import "CGGeometry.j"
+@import "CPAccordionView.j"
@import "CPAlert.j"
@import "CPAnimation.j"
@import "CPApplication.j"
+@import "CPArrayController.j"
@import "CPBezierPath.j"
@import "CPBox.j"
@import "CPBrowser.j"
@@ -31,18 +35,24 @@
@import "CPButtonBar.j"
@import "CPCheckBox.j"
@import "CPCib.j"
+@import "CPCibBindingConnector.j"
@import "CPCibConnector.j"
@import "CPCibControlConnector.j"
+@import "CPCibHelpConnector.j"
@import "CPCibLoading.j"
@import "CPCibOutletConnector.j"
+@import "CPCibRuntimeAttributesConnector.j"
@import "CPClipView.j"
@import "CPCollectionView.j"
@import "CPCollectionViewItem.j"
@import "CPColor.j"
@import "CPColorPanel.j"
+@import "CPColorSpace.j"
@import "CPColorWell.j"
+@import "CPComboBox.j"
@import "CPCompatibility.j"
@import "CPControl.j"
+@import "CPController.j"
@import "CPCookie.j"
@import "CPCursor.j"
@import "CPDocument.j"
@@ -52,21 +62,26 @@
@import "CPFlashView.j"
@import "CPFont.j"
@import "CPFontManager.j"
-@import "CPGeometry.j"
+@import "CPGradient.j"
@import "CPGraphics.j"
@import "CPImage.j"
@import "CPImageView.j"
@import "CPKeyBinding.j"
+@import "CPLevelIndicator.j"
@import "CPMenu.j"
@import "CPMenuItem.j"
@import "CPOpenPanel.j"
@import "CPOutlineView.j"
@import "CPPanel.j"
@import "CPPasteboard.j"
+@import "CPPopover.j"
@import "CPPopUpButton.j"
+@import "CPPredicateEditor.j"
+@import "CPPredicateEditorRowTemplate.j"
@import "CPProgressIndicator.j"
@import "CPRadio.j"
@import "CPResponder.j"
+@import "CPRuleEditor.j"
@import "CPScroller.j"
@import "CPScrollView.j"
@import "CPSearchField.j"
@@ -74,20 +89,23 @@
@import "CPSegmentedControl.j"
@import "CPShadow.j"
@import "CPSlider.j"
+@import "CPSound.j"
@import "CPSplitView.j"
+@import "CPStepper.j"
@import "CPTableColumn.j"
@import "CPTableView.j"
@import "CPTabView.j"
@import "CPText.j"
@import "CPTextField.j"
+@import "CPTokenField.j"
@import "CPToolbar.j"
@import "CPToolbarItem.j"
-@import "CPTokenField.j"
@import "CPTreeNode.j"
+@import "CPUserDefaultsController.j"
@import "CPView.j"
@import "CPViewAnimation.j"
@import "CPViewController.j"
@import "CPWebView.j"
@import "CPWindow.j"
@import "CPWindowController.j"
-@import "CPArrayController.j"
+@import "CPWorkspace.j"
@@ -69,7 +69,7 @@
  @class CPAccordionView

  <p>CPAccordionView provides a container for CPAccordionViewItem objects and manages layout state
-  for all sublayout items.</p>
+  for all sub-layout items.</p>

  <strong>Example</strong><br />
  <pre>
@@ -6,7 +6,9 @@
 * Copyright 2008, Jake MacMullin.
 *
 * 11/10/2008 Ross Boucher
- *     - Make it conform to style guidelines, general cleanup and ehancements
+ *     - Make it conform to style guidelines, general cleanup and enhancements
+ * 11/10/2010 Antoine Mercadal
+ *     - Enhancements, better compliance with Cocoa API
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -75,22 +77,590 @@ CPCriticalAlertStyle        = 2;
 */
@implementation CPAlert : CPView
 {
-    CPPanel         _alertPanel;
+    BOOL            _showHelp               @accessors(property=showsHelp);
+    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);

-    CPTextField     _messageLabel;
-    CPTextField     _informativeLabel;
-    CPImageView     _alertImageView;
+    CPAlertStyle    _alertStyle             @accessors(property=alertStyle);
+    CPString        _title                  @accessors(property=title);
+    CPView          _accessoryView          @accessors(property=accessoryView);
+    CPImage         _icon                   @accessors(property=icon);

-    CPAlertStyle    _alertStyle;
-    CPString        _windowTitle;
-    int             _windowStyle;
-    CPArray         _buttons;
+    CPArray         _buttons                @accessors(property=buttons,readonly);
+    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);

-    id              _delegate;
-    SEL             _didEndSelector;
+    id              _delegate               @accessors(property=delegate);
    id              _modalDelegate;
+    SEL             _didEndSelector;
+
+    CPWindow        _window                 @accessors(property=window,readonly);
+    int             _defaultWindowStyle;
+
+    CPImageView     _alertImageView;
+    CPTextField     _informativeLabel;
+    CPTextField     _messageLabel;
+    CPButton        _alertHelpButton;
+
+    BOOL            _needsLayout;
 }

+#pragma mark Creating Alerts
+
+/*!
+    Returns a CPAlert object with the provided info
+
+    @param aMessage the main body text of the alert
+    @param defaultButton the title of the default button
+    @param alternateButton if not nil, the title of a second button
+    @param otherButton if not nil, the title of the third button
+    @param informativeText if not nil the informative text of the alert
+    @return fully initialized CPAlert
+*/
+ (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
+{
+    var newAlert = [[self alloc] init];
+
+    [newAlert setMessageText:aMessage];
+    [newAlert addButtonWithTitle:defaultButtonTitle];
+
+    if (alternateButtonTitle)
+        [newAlert addButtonWithTitle:alternateButtonTitle];
+
+    if (otherButtonTitle)
+        [newAlert addButtonWithTitle:otherButtonTitle];
+
+    if (informativeText)
+        [newAlert setInformativeText:informativeText];
+
+    return newAlert;
+}
+
+/*!
+    Return an CPAlert with type error
+
+    @param anErrorMessage the message of the alert
+    @return fully initialized CPAlert
+*/
+ (CPAlert)alertWithError:(CPString)anErrorMessage
+{
+    var newAlert = [[self alloc] init];
+
+    [newAlert setMessageText:anErrorMessage];
+    [newAlert setAlertStyle:CPCriticalAlertStyle];
+
+    return newAlert;
+}
+
+/*!
+    Initializes a \c CPAlert panel with the default alert style \c CPWarningAlertStyle.
+*/
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _buttons            = [];
+        _alertStyle         = CPWarningAlertStyle;
+        _showHelp           = NO;
+        _needsLayout        = YES;
+        _defaultWindowStyle = CPTitledWindowMask;
+
+        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
+        _alertImageView     = [[CPImageView alloc] init];
+        _informativeLabel   = [[CPTextField alloc] init];
+        _suppressionButton  = [CPCheckBox checkBoxWithTitle:@"Do not show this message again"];
+
+        _alertHelpButton    = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
+        [_alertHelpButton setTarget:self];
+        [_alertHelpButton setAction:@selector(_showHelp:)];
+    }
+
+    return self;
+}
+
+#pragma mark Accessors
+
+/*!
+    set the theme to use
+
+    @param the theme to use
+*/
+- (void)setTheme:(CPTheme)aTheme
+{
+    if (aTheme === [self theme])
+        return;
+
+    if (aTheme === [CPTheme defaultHudTheme])
+        _defaultWindowStyle = CPTitledWindowMask | CPHUDBackgroundWindowMask;
+    else
+        _defaultWindowStyle = CPTitledWindowMask;
+
+    _window = nil; // will be regenerated at next layout
+    _needsLayout = YES;
+    [super setTheme:aTheme];
+}
+
+/*! @deprecated
+*/
+- (void)setWindowStyle:(int)aStyle
+{
+    CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
+    [self setTheme:(aStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+}
+
+/*! @deprecated
+*/
+- (int)windowStyle
+{
+    CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
+    return _defaultWindowStyle;
+}
+
+
+/*!
+    set the text of the alert's message
+
+    @param aText CPString containing the text
+*/
+- (void)setMessageText:(CPString)aText
+{
+    [_messageLabel setStringValue:aText];
+    _needsLayout = YES;
+}
+
+/*!
+    return the content of the message text
+    @return CPString containing the message text
+*/
+- (CPString)messageText
+{
+    return [_messageLabel stringValue];
+}
+
+/*!
+    set the text of the alert's informative text
+
+    @param aText CPString containing the informative text
+*/
+- (void)setInformativeText:(CPString)aText
+{
+    [_informativeLabel setStringValue:aText];
+    _needsLayout = YES;
+}
+
+/*!
+    return the content of the message text
+
+    @return CPString containing the message text
+*/
+- (CPString)informativeText
+{
+    return [_informativeLabel stringValue];
+}
+
+/*!
+    Sets the title of the alert window.
+    This API is not present in Cocoa.
+    @param aTitle CPString containing the window title
+*/
+- (void)setTitle:(CPString)aTitle
+{
+    _title = aTitle;
+    [_window setTitle:aTitle];
+}
+
+/*!
+    set the accessory view
+
+    @param aView the accessory view
+*/
+- (void)setAccessoryView:(CPView)aView
+{
+    _accessoryView = aView;
+    _needsLayout = YES;
+}
+
+/*!
+    set if alert shows the suppression button
+
+    @param shouldShowSuppressionButton YES or NO
+*/
+- (void)setShowsSuppressionButton:(BOOL)shouldShowSuppressionButton
+{
+    _showSuppressionButton = shouldShowSuppressionButton;
+    _needsLayout = YES;
+}
+
+#pragma mark Accessing Buttons
+
+/*!
+    Adds a button with a given title to the receiver.
+    Buttons will be added starting from the right hand side of the \c CPAlert panel.
+    The first button will have the index 0, the second button 1 and so on.
+
+    The first button will automatically be given a key equivalent of Return,
+    and any button titled "Cancel" will be given a key equivalent of Escape.
+
+    You really shouldn't need more than 3 buttons.
+
+    @param title the title of the button
+*/
+- (void)addButtonWithTitle:(CPString)aTitle
+{
+    var bounds = [[_window contentView] bounds],
+        count = [_buttons count],
+
+        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+
+    [button setTitle:aTitle];
+    [button setTag:count];
+    [button setTarget:self];
+    [button setAction:@selector(_takeReturnCodeFrom:)];
+
+    [[_window contentView] addSubview:button];
+
+    if (count == 0)
+        [button setKeyEquivalent:CPCarriageReturnCharacter];
+    else if ([aTitle lowercaseString] === @"cancel")
+        [button setKeyEquivalent:CPEscapeFunctionKey];
+
+    [_buttons insertObject:button atIndex:0];
+}
+
+#pragma mark Layout
+
+/*!
+    @ignore
+*/
+- (void)_layoutMessageView
+{
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        sizeWithFontCorrection = 6.0,
+        messageLabelWidth,
+        messageLabelTextSize;
+
+    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
+    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
+
+    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
+    messageLabelTextSize = [[_messageLabel stringValue] sizeWithFont:[_messageLabel font] inWidth:messageLabelWidth];
+
+    [_messageLabel setFrame:CGRectMake(inset.left, inset.top, messageLabelTextSize.width, messageLabelTextSize.height + sizeWithFontCorrection)];
+}
+
+/*!
+    @ignore
+*/
+- (void)_layoutInformativeView
+{
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+        sizeWithFontCorrection = 6.0,
+        informativeLabelWidth,
+        informativeLabelOriginY,
+        informativeLabelTextSize;
+
+    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
+    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
+
+    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
+    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
+    informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];
+
+    [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];
+}
+
+/*!
+    @ignore
+*/
+- (void)_layoutAccessoryView
+{
+    if (!_accessoryView)
+        return;
+
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
+        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
+
+    [_accessoryView setFrameOrigin:CGPointMake(inset.left, accessoryViewOriginY)];
+    [[_window contentView] addSubview:_accessoryView];
+}
+
+/*!
+    @ignore
+*/
+- (void)_layoutSuppressionButton
+{
+    if (!_showSuppressionButton)
+        return;
+
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+        suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
+
+    [_suppressionButton setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
+    [_suppressionButton sizeToFit];
+
+    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
+    [[_window contentView] addSubview:_suppressionButton];
+}
+
+/*!
+    @ignore
+*/
+- (CGSize)_layoutButtonsFromView:(CPView)lastView
+{
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [self currentValueForThemeAttribute:@"size"],
+        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
+        aRepresentativeButton = [_buttons objectAtIndex:0],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+        panelSize = [[_window contentView] frame].size,
+        buttonsOriginY,
+        offsetX;
+
+    [aRepresentativeButton setTheme:[self theme]];
+    [aRepresentativeButton sizeToFit];
+
+    panelSize.height = CGRectGetMaxY([lastView frame]) + defaultElementsMargin + [aRepresentativeButton frameSize].height;
+    if (panelSize.height < minimumSize.height)
+        panelSize.height = minimumSize.height;
+
+    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
+    offsetX = panelSize.width - inset.right;
+
+    for (var i = [_buttons count] - 1; i >= 0 ; i--)
+    {
+        var button = _buttons[i];
+        [button setTheme:[self theme]];
+        [button sizeToFit];
+
+        var buttonFrame = [button frame],
+            width = MAX(80.0, CGRectGetWidth(buttonFrame)),
+            height = CGRectGetHeight(buttonFrame);
+
+        offsetX -= width;
+        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
+        offsetX -= 10;
+    }
+
+    if (_showHelp)
+    {
+        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
+            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
+            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
+
+        [_alertHelpButton setImage:helpImage];
+        [_alertHelpButton setAlternateImage:helpImagePressed];
+        [_alertHelpButton setBordered:NO];
+        [_alertHelpButton setFrame:helpFrame];
+    }
+
+    panelSize.height += [aRepresentativeButton frameSize].height + inset.bottom + buttonOffset;
+    return panelSize;
+}
+
+/*!
+    @ignore
+*/
+- (void)layout
+{
+    if (!_needsLayout)
+        return;
+
+    if (!_window)
+        [self _createWindowWithStyle:nil];
+
+    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
+        theImage = _icon,
+        finalSize;
+
+    if (!theImage)
+        switch (_alertStyle)
+        {
+            case CPWarningAlertStyle:
+                theImage = [self currentValueForThemeAttribute:@"warning-image"];
+                break;
+            case CPInformationalAlertStyle:
+                theImage = [self currentValueForThemeAttribute:@"information-image"];
+                break;
+            case CPCriticalAlertStyle:
+                theImage = [self currentValueForThemeAttribute:@"error-image"];
+                break;
+        }
+
+    [_alertImageView setImage:theImage];
+
+    var imageSize = theImage ? [theImage size] : CGSizeMakeZero();
+    [_alertImageView setFrame:CGRectMake(iconOffset.x, iconOffset.y, imageSize.width, imageSize.height)];
+
+    [self _layoutMessageView];
+    [self _layoutInformativeView];
+    [self _layoutAccessoryView];
+    [self _layoutSuppressionButton];
+
+    var lastView = _informativeLabel;
+    if (_showSuppressionButton)
+        lastView = _suppressionButton;
+    else if (_accessoryView)
+        lastView = _accessoryView
+
+    finalSize = [self _layoutButtonsFromView:lastView];
+    if ([_window styleMask] & CPDocModalWindowMask)
+        finalSize.height -= 26; // adjust the absence of title bar
+
+    [_window setFrameSize:finalSize];
+    [_window center];
+
+    _needsLayout = NO;
+}
+
+#pragma mark Displaying Alerts
+
+/*!
+    Displays the \c CPAlert panel as a modal dialog. The user will not be
+    able to interact with any other controls until s/he has dismissed the alert
+    by clicking on one of the buttons.
+*/
+- (void)runModal
+{
+    if (!([_window styleMask] & _defaultWindowStyle))
+    {
+        _needsLayout = YES;
+        [self _createWindowWithStyle:_defaultWindowStyle];
+    }
+
+    [self layout];
+    [CPApp runModalForWindow:_window];
+}
+
+/*!
+    Runs the receiver modally as an alert sheet attached to a specified window.
+
+    @param window The parent window for the sheet.
+    @param modalDelegate The delegate for the modal-dialog session.
+    @param alertDidEndSelector Message the alert sends to modalDelegate after the sheet is dismissed.
+    @param contextInfo Contextual data passed to modalDelegate in didEndSelector message.
+*/
+- (void)beginSheetModalForWindow:(CPWindow)aWindow modalDelegate:(id)modalDelegate didEndSelector:(SEL)alertDidEndSelector contextInfo:(id)contextInfo
+{
+    if (!([_window styleMask] & CPDocModalWindowMask))
+    {
+        _needsLayout = YES;
+        [self _createWindowWithStyle:CPDocModalWindowMask];
+    }
+
+    [self layout];
+
+    _modalDelegate = modalDelegate;
+    _didEndSelector = alertDidEndSelector;
+
+    [CPApp beginSheet:_window modalForWindow:aWindow modalDelegate:self didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:contextInfo];
+}
+
+/*!
+    Runs the receiver modally as an alert sheet attached to a specified window.
+
+    @param window The parent window for the sheet.
+*/
+- (void)beginSheetModalForWindow:(CPWindow)aWindow
+{
+    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
+}
+
+#pragma mark Private
+
+/*!
+    @ignore
+*/
+- (void)_createWindowWithStyle:(int)forceStyle
+{
+    var frame = CGRectMakeZero();
+    frame.size = [self currentValueForThemeAttribute:@"size"];
+
+    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
+
+    if (_title)
+        [_window setTitle:_title];
+
+    var contentView = [_window contentView],
+        count = [_buttons count];
+
+    if (count)
+        while (count--)
+            [contentView addSubview:_buttons[count]];
+    else
+        [self addButtonWithTitle:@"OK"];
+
+    [contentView addSubview:_messageLabel];
+    [contentView addSubview:_alertImageView];
+    [contentView addSubview:_informativeLabel];
+
+    if (_showHelp)
+        [contentView addSubview:_alertHelpButton];
+}
+
+/*!
+    @ignore
+*/
+- (@action)_showHelp:(id)aSender
+{
+    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
+        [_delegate alertShowHelp:self];
+}
+
+/*
+    @ignore
+*/
+- (@action)_takeReturnCodeFrom:(id)aSender
+{
+    if ([_window isSheet])
+    {
+        [CPApp endSheet:_window returnCode:[aSender tag]];
+        [_window orderOut:nil];
+    }
+    else
+    {
+        [CPApp abortModal];
+        [_window close];
+
+        [self _alertDidEnd:_window returnCode:[aSender tag] contextInfo:nil];
+    }
+}
+
+/*!
+    @ignore
+*/
+- (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
+{
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+            [_delegate alertDidEnd:self returnCode:returnCode];
+
+    if (_didEndSelector)
+        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
+
+    _modalDelegate = nil;
+    _didEndSelector = nil;
+}
+
+#pragma mark Theme Attributes
+
 + (CPString)defaultThemeClass
 {
    return @"alert";
@@ -104,7 +674,17 @@ CPCriticalAlertStyle        = 2;
                                                CGPointMake(15, 12),
                                                [CPNull null],
                                                [CPNull null],
-                                                [CPNull null]
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                0.0,
+                                                0.0,
+                                                3.0,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                [CPNull null],
+                                                0.0
                                                ]
                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
@@ -112,359 +692,18 @@ CPCriticalAlertStyle        = 2;
                                                @"image-offset",
                                                @"information-image",
                                                @"warning-image",
-                                                @"error-image"
+                                                @"error-image",
+                                                @"help-image",
+                                                @"help-image-left-offset",
+                                                @"help-image-pressed",
+                                                @"suppression-button-y-offset",
+                                                @"suppression-button-x-offset",
+                                                @"default-elements-margin",
+                                                @"suppression-button-text-color",
+                                                @"suppression-button-text-font",
+                                                @"suppression-button-text-shadow-color",
+                                                @"suppression-button-text-shadow-offset"
                                                ]];
 }

-/*!
-    Initializes a \c CPAlert panel with the default alert style \c CPWarningAlertStyle.
-*/
- (id)init
-{
-    if (self = [super init])
-    {
-        _buttons = [CPArray array];
-        _alertStyle = CPWarningAlertStyle;
-        _alertPanel = nil;
-        _windowStyle = nil;
-        _didEndSelector = nil;
-
-        _messageLabel = [CPTextField labelWithTitle:@"Alert"];
-        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-        _informativeLabel = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-    }
-
-    return self;
-}
-
-/*!
-    Sets the window appearance. If CPHUDBackgroundWindowMask is set, the default HUD theme
-    will be activated.
-
-    @param styleMask - Either CPHUDBackgroundWindowMask or nil for standard.
-*/
- (void)setWindowStyle:(int)styleMask
-{
-    _windowStyle = styleMask;
-
-    [self setTheme:(_windowStyle & CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-
-    // We'll need to recreate the panel to get the new window style.
-    _alertPanel = nil;
-}
-
- (void)_createPanel
-{
-    var frame = CGRectMakeZero();
-    frame.size = [self currentValueForThemeAttribute:@"size"];
-    _alertPanel = [[CPPanel alloc] initWithContentRect:frame styleMask:_windowStyle ? _windowStyle | CPTitledWindowMask : CPTitledWindowMask];
-
-    var contentView = [_alertPanel contentView],
-        count = [_buttons count];
-
-    if (count)
-    {
-        while (count--)
-            [contentView addSubview:_buttons[count]];
-    }
-    else
-        [self addButtonWithTitle:@"OK"];
-
-    [contentView addSubview:_messageLabel];
-    [contentView addSubview:_alertImageView];
-    [contentView addSubview:_informativeLabel];
-}
-
-/*!
-    Sets the window's title. If this is not defined, a default title based on your warning level will be used.
-    @param aTitle the title to use in place of the default. Set to nil to use default.
-*/
- (void)setTitle:(CPString)aTitle
-{
-    _windowTitle = aTitle;
-}
-
-/*!
-    Gets the window's title.
-*/
- (CPString)title
-{
-    return _windowTitle;
-}
-
-/*!
-    Gets the window's style.
-*/
- (int)windowStyle
-{
-    return _windowStyle;
-}
-
-/*!
-    Sets the receiver’s delegate.
-    @param delegate - Delegate for the alert. nil removes the delegate.
-*/
- (void)setDelegate:(id)delegate
-{
-    _delegate = delegate;
-}
-
-/*!
-    Gets the receiver's delegate.
-*/
- (void)delegate
-{
-    return _delegate;
-}
-
-/*!
-    Sets the alert style of the receiver.
-    @param style - Alert style for the alert.
-*/
- (void)setAlertStyle:(CPAlertStyle)style
-{
-    _alertStyle = style;
-}
-
-/*!
-    Gets the alert style.
-*/
- (CPAlertStyle)alertStyle
-{
-    return _alertStyle;
-}
-
-/*!
-    Sets the receiver’s message text, or title, to a given text.
-    @param messageText - Message text for the alert.
-*/
- (void)setMessageText:(CPString)messageText
-{
-    [_messageLabel setStringValue:messageText];
-}
-
-/*!
-    Returns the receiver's message text body.
-*/
- (CPString)messageText
-{
-    return [_messageLabel stringValue];
-}
-
-/*!
-    Sets the receiver's informative text, shown below the message text.
-    @param informativeText - The informative text.
-*/
- (void)setInformativeText:(CPString)informativeText
-{
-    [_informativeLabel setStringValue:informativeText];
-}
-
-/*!
-    Returns the receiver's informative text.
-*/
- (CPString)informativeText
-{
-    return [_informativeLabel stringValue];
-}
-
-/*!
-    Adds a button with a given title to the receiver.
-    Buttons will be added starting from the right hand side of the \c CPAlert panel.
-    The first button will have the index 0, the second button 1 and so on.
-
-    The first button will automatically be given a key equivalent of Return,
-    and any button titled "Cancel" will be given a key equivalent of Escape.
-
-    You really shouldn't need more than 3 buttons.
-*/
- (void)addButtonWithTitle:(CPString)title
-{
-    var bounds = [[_alertPanel contentView] bounds],
-        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()],
-        _buttonCount = [_buttons count];
-
-    [button setTitle:title];
-    [button setTarget:self];
-    [button setTag:_buttonCount];
-    [button setAction:@selector(_dismissAlert:)];
-
-    [[_alertPanel contentView] addSubview:button];
-
-    if (_buttonCount == 0)
-        [button setKeyEquivalent:CPCarriageReturnCharacter];
-    else if ([title lowercaseString] === "cancel")
-        [button setKeyEquivalent:CPEscapeFunctionKey];
-    else
-        [button setKeyEquivalent:nil];
-
-    [_buttons insertObject:button atIndex:0];
-}
-
- (void)layoutPanel
-{
-    if (!_alertPanel)
-        [self _createPanel];
-
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
-        theTitle,
-        theImage;
-
-    switch (_alertStyle)
-    {
-        case CPWarningAlertStyle:       theImage = [self currentValueForThemeAttribute:@"warning-image"];
-                                        theTitle = @"Warning";
-                                        break;
-        case CPInformationalAlertStyle: theImage = [self currentValueForThemeAttribute:@"information-image"];
-                                        theTitle = @"Information";
-                                        break;
-        case CPCriticalAlertStyle:      theImage = [self currentValueForThemeAttribute:@"error-image"];
-                                        theTitle = @"Error";
-                                        break;
-    }
-
-    [_alertImageView setImage:theImage];
-
-    var imageSize = theImage ? [theImage size] : CGSizeMakeZero();
-    [_alertImageView setFrame:CGRectMake(iconOffset.x, iconOffset.y, imageSize.width, imageSize.height)];
-
-    [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
-    [_alertPanel setFloatingPanel:YES];
-    [_alertPanel center];
-
-    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
-    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-    // FIXME sizeWithFontCorrection shouldn't be needed.
-    var bounds = [[_alertPanel contentView] bounds],
-        offsetX = CGRectGetWidth(bounds) - inset.right,
-        informativeOffset = [self currentValueForThemeAttribute:@"informative-offset"],
-        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
-
-        textWidth = offsetX - inset.left,
-        messageSize = [([_messageLabel stringValue] || " ") sizeWithFont:[_messageLabel font] inWidth:textWidth],
-        informationString = [_informativeLabel stringValue],
-        informativeSize = [(informationString || " ") sizeWithFont:[_informativeLabel font] inWidth:textWidth],
-        sizeWithFontCorrection = 6.0;
-
-    [_messageLabel setFrame:CGRectMake(inset.left, inset.top, textWidth, messageSize.height + sizeWithFontCorrection)];
-    [_informativeLabel setFrame:CGRectMake(inset.left, CGRectGetMaxY([_messageLabel frame]) + informativeOffset, textWidth, informativeSize.height + sizeWithFontCorrection)];
-    // Don't let an empty informative label partially cover the buttons.
-    [_informativeLabel setHidden:!informationString];
-
-    var aRepresentativeButton = _buttons[0],
-        buttonY = MAX(CGRectGetMaxY([_alertImageView frame]), CGRectGetMaxY(informationString ? [_informativeLabel frame] : [_messageLabel frame])) + buttonOffset; // the lower of the bottom of the text and the bottom of the icon.
-
-    [aRepresentativeButton setTheme:[self theme]];
-    [aRepresentativeButton sizeToFit];
-
-    // Make the window just tall enough to fit everything. Bit of a hack really.
-    var minimumSize = [self currentValueForThemeAttribute:@"size"],
-        desiredHeight = MAX(minimumSize.height, buttonY + CGRectGetHeight([aRepresentativeButton bounds]) + inset.bottom),
-        deltaY = desiredHeight - CGRectGetHeight(bounds),
-        frameSize = CGSizeMakeCopy([_alertPanel frame].size);
-
-    frameSize.height += deltaY;
-    [_alertPanel setFrameSize:frameSize];
-
-    var count = [_buttons count];
-
-    while (count--)
-    {
-        var button = _buttons[count];
-        [button setTheme:[self theme]];
-        [button sizeToFit];
-
-        var buttonBounds = [button bounds],
-            width = MAX(80.0, CGRectGetWidth(buttonBounds)),
-            height = CGRectGetHeight(buttonBounds);
-
-        offsetX -= width;
-        [button setFrame:CGRectMake(offsetX, buttonY, width, height)];
-        offsetX -= 10;
-    }
-}
-
-/*!
-    Displays the \c CPAlert panel as a modal dialog. The user will not be
-    able to interact with any other controls until s/he has dismissed the alert
-    by clicking on one of the buttons.
-*/
- (void)runModal
-{
-    [self layoutPanel];
-    [CPApp runModalForWindow:_alertPanel];
-}
-
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-
-    @param window The parent window for the sheet.
-    @param modalDelegate The delegate for the modal-dialog session.
-    @param alertDidEndSelector Message the alert sends to modalDelegate after the sheet is dismissed.
-    @param contextInfo Contextual data passed to modalDelegate in didEndSelector message.
-*/
- (void)beginSheetModalForWindow:(CPWindow)window modalDelegate:(id)modalDelegate didEndSelector:(SEL)alertDidEndSelector contextInfo:(void)contextInfo
-{
-    if (!(_windowStyle & CPDocModalWindowMask))
-        [self setWindowStyle:CPDocModalWindowMask];
-    [self layoutPanel];
-
-    _didEndSelector = alertDidEndSelector;
-    _modalDelegate = modalDelegate;
-
-    [CPApp beginSheet:_alertPanel modalForWindow:window modalDelegate:self didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:contextInfo];
-}
-
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-
-    @param window The parent window for the sheet.
-*/
- (void)beginSheetModalForWindow:(CPWindow)window
-{
-    if (!(_windowStyle & CPDocModalWindowMask))
-        [self setWindowStyle:CPDocModalWindowMask];
-    [self layoutPanel];
-
-    [CPApp beginSheet:_alertPanel modalForWindow:window modalDelegate:self didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:nil];
-}
-
- (void)_alertDidEnd:(CPWindow)aSheet returnCode:(CPInteger)returnCode contextInfo:(id)contextInfo
-{
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-            [_delegate alertDidEnd:self returnCode:returnCode];
-
-    if (_didEndSelector)
-        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
-
-    _didEndSelector = nil;
-    _modalDelegate = nil;
-}
-
-/* @ignore */
- (void)_dismissAlert:(CPButton)button
-{
-    if ([_alertPanel isSheet])
-        [CPApp endSheet:_alertPanel returnCode:[button tag]];
-    else
-    {
-        [CPApp abortModal];
-        [_alertPanel close];
-
-        [self _alertDidEnd:nil returnCode:[button tag] contextInfo:nil];
-    }
-}
-
@end
@@ -21,6 +21,7 @@
 */

@import <Foundation/CPObject.j>
+@import <Foundation/CPTimer.j>

@import "CAMediaTimingFunction.j"

@@ -121,6 +122,7 @@ ACTUAL_FRAME_RATE = 0;
 */
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
+    var timingFunctionName;
    switch (anAnimationCurve)
    {
        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
@@ -306,13 +308,16 @@ ACTUAL_FRAME_RATE = 0;
    if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
        return [_delegate animation:self valueForProgress:t];

+    if (_animationCurve == CPAnimationLinear)
+        return t;
+
    var c1 = [],
        c2 = [];

    [_timingFunction getControlPointAtIndex:1 values:c1];
    [_timingFunction getControlPointAtIndex:2 values:c2];

-    return CubicBezierAtTime(t,c1[0],c1[1],c2[0],c2[1],_duration);
+    return CubicBezierAtTime(t, c1[0], c1[1], c2[0], c2[1], _duration);
 }

@end
@@ -320,28 +325,104 @@ ACTUAL_FRAME_RATE = 0;
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function CubicBezierAtTime(t,p1x,p1y,p2x,p2y,duration)
+var CubicBezierAtTime = function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration)
 {
-    var ax=0,bx=0,cx=0,ay=0,by=0,cy=0;
+    var ax = 0,
+        bx = 0,
+        cx = 0,
+        ay = 0,
+        by = 0,
+        cy = 0;
    // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
-    function sampleCurveX(t) {return ((ax*t+bx)*t+cx)*t;};
-    function sampleCurveY(t) {return ((ay*t+by)*t+cy)*t;};
-    function sampleCurveDerivativeX(t) {return (3.0*ax*t+2.0*bx)*t+cx;};
+    function sampleCurveX(t)
+    {
+        return ((ax * t + bx) * t + cx) * t;
+    }
+
+    function sampleCurveY(t)
+    {
+        return ((ay * t + by) * t + cy) * t;
+    }
+
+    function sampleCurveDerivativeX(t)
+    {
+        return (3.0 * ax * t + 2.0 * bx) * t + cx;
+    }
+
    // The epsilon value to pass given that the animation is going to run over |duration| seconds. The longer the animation, the more precision is needed in the timing function result to avoid ugly discontinuities.
-    function solveEpsilon(duration) {return 1.0/(200.0*duration);};
-    function solve(x,epsilon) {return sampleCurveY(solveCurveX(x,epsilon));};
+    function solveEpsilon(duration)
+    {
+        return 1.0 / (200.0 * duration);
+    }
+
+    function solve(x, epsilon)
+    {
+        return sampleCurveY(solveCurveX(x, epsilon));
+    }
+
    // Given an x value, find a parametric value it came from.
-    function solveCurveX(x,epsilon) {var t0,t1,t2,x2,d2,i;
-        function fabs(n) {if(n>=0) {return n;}else {return 0-n;}};
+    function solveCurveX(x, epsilon)
+    {
+        var t0,
+            t1,
+            t2 = x,
+            x2,
+            d2,
+            i = 0;
+
        // First try a few iterations of Newton's method -- normally very fast.
-        for(t2=x, i=0; i<8; i++) {x2=sampleCurveX(t2)-x; if(fabs(x2)<epsilon) {return t2;} d2=sampleCurveDerivativeX(t2); if(fabs(d2)<1e-6) {break;} t2=t2-x2/d2;}
+        for (; i < 8; i++)
+        {
+            x2 = sampleCurveX(t2) - x;
+
+            if (ABS(x2) < epsilon)
+                return t2;
+
+            d2 = sampleCurveDerivativeX(t2);
+
+            if (ABS(d2) < 1e-6)
+                break;
+
+            t2 = t2 - x2 / d2;
+        }
+
        // Fall back to the bisection method for reliability.
-        t0=0.0; t1=1.0; t2=x; if(t2<t0) {return t0;} if(t2>t1) {return t1;}
-        while(t0<t1) {x2=sampleCurveX(t2); if(fabs(x2-x)<epsilon) {return t2;} if(x>x2) {t0=t2;}else {t1=t2;} t2=(t1-t0)*.5+t0;}
+        t0 = 0.0;
+        t1 = 1.0;
+        t2 = x;
+
+        if (t2 < t0)
+            return t0;
+
+        if (t2 > t1)
+            return t1;
+
+        while (t0 < t1)
+        {
+            x2 = sampleCurveX(t2);
+
+            if (ABS(x2 - x) < epsilon)
+                return t2;
+
+            if (x > x2)
+                t0 = t2;
+
+            else
+                t1 = t2;
+
+            t2 = (t1 - t0) * 0.5 + t0;
+        }
+
        return t2; // Failure.
    };
    // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
-    cx=3.0*p1x; bx=3.0*(p2x-p1x)-cx; ax=1.0-cx-bx; cy=3.0*p1y; by=3.0*(p2y-p1y)-cy; ay=1.0-cy-by;
+    cx = 3.0 * p1x;
+    bx = 3.0 * (p2x - p1x) - cx;
+    ax = 1.0 - cx - bx;
+    cy = 3.0 * p1y;
+    by = 3.0 * (p2y - p1y) - cy;
+    ay = 1.0 - cy - by;
+
    // Convert from input time to parametric value in curve, then from that to output time.
    return solve(t, solveEpsilon(duration));
 };
@@ -33,7 +33,8 @@


 var CPMainCibFile               = @"CPMainCibFile",
-    CPMainCibFileHumanFriendly  = @"Main cib file base name";
+    CPMainCibFileHumanFriendly  = @"Main cib file base name",
+    CPEventModifierFlags = 0;

 CPApp = nil;

@@ -57,7 +58,7 @@ CPRunContinuesResponse  = -1002;
    @ingroup appkit
    @class CPApplication

-    CPApplication is THE way to start up the Cappucino framework for your application to use.
+    CPApplication is THE way to start up the Cappuccino framework for your application to use.
    Every GUI application has exactly one instance of CPApplication (or of a custom subclass of
    CPApplication). Your program's main() function can create that instance by calling the
    \c CPApplicationMain function. A simple example looks like this:
@@ -90,7 +91,6 @@ CPRunContinuesResponse  = -1002;
    CPWindow                _previousKeyWindow;
    CPWindow                _previousMainWindow;

-    CPMenu                  _mainMenu;
    CPDocumentController    _documentController;

    CPModalSession          _currentSession;
@@ -220,28 +220,22 @@ CPRunContinuesResponse  = -1002;
    // At this point we clear the window.status to eliminate Safari's "Cancelled" error message
    // The message shouldn't be displayed, because only an XHR is cancelled, but it is a usability issue.
    // We do it here so that applications can change it in willFinish or didFinishLaunching
+#if PLATFORM(DOM)
    window.status = " ";
+#endif

    // We also want to set the default cursor on the body, so that buttons and things don't have an iBeam
    [[CPCursor arrowCursor] set];

    var bundle = [CPBundle mainBundle],
-        types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
-
-    if ([types count] > 0)
-        _documentController = [CPDocumentController sharedDocumentController];
-
-    var delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
+        delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];

    if (delegateClassName)
    {
        var delegateClass = objj_getClass(delegateClassName);

        if (delegateClass)
-            if ([_documentController class] == delegateClass)
-                [self setDelegate:_documentController];
-            else
-                [self setDelegate:[[delegateClass alloc] init]];
+            [self setDelegate:[[delegateClass alloc] init]];
    }

    var defaultCenter = [CPNotificationCenter defaultCenter];
@@ -250,13 +244,18 @@ CPRunContinuesResponse  = -1002;
        postNotificationName:CPApplicationWillFinishLaunchingNotification
        object:self];

+    var types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
+
+    if ([types count] > 0)
+        _documentController = [CPDocumentController sharedDocumentController];
+
    var needsUntitled = !!_documentController,
        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
        index = 0,
        count = [URLStrings count];

    for (; index < count; ++index)
-        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] || needsUntitled;
+        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] && needsUntitled;

    if (needsUntitled && [_delegate respondsToSelector:@selector(applicationShouldOpenUntitledFile:)])
        needsUntitled = [_delegate applicationShouldOpenUntitledFile:self];
@@ -293,11 +292,21 @@ CPRunContinuesResponse  = -1002;
    }
 }

+/*!
+    Sets the applications icon image. This image is used in the default "About" window.
+    By default this value is pulled from the CPApplicationIcon key in your info.plist file.
+
+    @param anImage - The image to set.
+*/
 - (void)setApplicationIconImage:(CPImage)anImage
 {
    _applicationIconImage = anImage;
 }

+/*!
+    Returns the application icon image. By default this is pulled from the CPApplicationIcon key of info.plist.
+    @return CPImage - Your application icon image.
+*/
 - (CPImage)applicationIconImage
 {
    if (_applicationIconImage)
@@ -310,11 +319,38 @@ CPRunContinuesResponse  = -1002;
    return _applicationIconImage;
 }

+/*!
+    Opens the standard about panel with no options.
+*/
 - (void)orderFrontStandardAboutPanel:(id)sender
 {
    [self orderFrontStandardAboutPanelWithOptions:nil];
 }

+/*!
+    Opens the standard about panel. This method takes a single argument \c options.
+    Options is a dictionary that can contain any of the following keys:
+    <pre>
+    ApplicationName - The name of your application.
+    ApplicationIcon - Application icon image.
+    Version - The full version of your application
+    ApplicationVersion - The shorter version number of your application.
+    Copyright - Human readable copyright information.
+    </pre>
+
+    If you choose not the include any of the above keys, they will default
+    to the following respective keys in your info.plist file.
+
+    <pre>
+    CPBundleName
+    CPApplicationIcon (through a call to -applicationIconImage, see documentation for that method for more details)
+    CPBundleVersion
+    CPBundleShortVersionString
+    CPHumanReadableCopyright
+    </pre>
+
+    @param options - A dictionary with the aboe listed keys. You can pass nil to default to your plist values.
+*/
 - (void)orderFrontStandardAboutPanelWithOptions:(CPDictionary)options
 {
    if (!_aboutPanel)
@@ -338,7 +374,7 @@ CPRunContinuesResponse  = -1002;
            standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];

        // FIXME move this into the CIB eventually
-        [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
+        [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
        [applicationLabel setAlignment:CPCenterTextAlignment];
        [versionLabel setAlignment:CPCenterTextAlignment];
        [copyrightLabel setAlignment:CPCenterTextAlignment];
@@ -530,7 +566,7 @@ CPRunContinuesResponse  = -1002;
 - (BOOL)_handleKeyEquivalent:(CPEvent)anEvent
 {
    return  [[self keyWindow] performKeyEquivalent:anEvent] ||
-            [_mainMenu performKeyEquivalent:anEvent];
+            [[self mainMenu] performKeyEquivalent:anEvent];
 }

 /*!
@@ -540,28 +576,35 @@ CPRunContinuesResponse  = -1002;
 - (void)sendEvent:(CPEvent)anEvent
 {
    _currentEvent = anEvent;
+    CPEventModifierFlags = [anEvent modifierFlags];

+#if PLATFORM(DOM)
    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];

    // temporarily pretend we won't propagate the event. we'll restore the saved value later
    // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
+#endif

    // Check if this is a candidate for key equivalent...
    if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
    {
+#if PLATFORM(DOM)
        var characters = [anEvent characters],
            modifierFlags = [anEvent modifierFlags];

        // Unconditionally propagate on these keys to solve browser copy paste bugs
        if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
+#endif

        return;
    }

+#if PLATFORM(DOM)
    // if we make it this far, then restore the original willPropagate value
    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
+#endif

    if (_eventListeners.length)
    {
@@ -574,6 +617,10 @@ CPRunContinuesResponse  = -1002;
    [[anEvent window] sendEvent:anEvent];
 }

+/*!
+    If the delegate responds to the given selector it will call the method on the delegate,
+    otherwise the method will be passed to CPResponder.
+*/
 - (void)doCommandBySelector:(SEL)aSelector
 {
    if ([_delegate respondsToSelector:aSelector])
@@ -637,7 +684,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPMenu)mainMenu
 {
-    return _mainMenu;
+    return [self menu];
 }

 /*!
@@ -645,21 +692,30 @@ CPRunContinuesResponse  = -1002;
    @param aMenu the menu to set for the application
 */
 - (void)setMainMenu:(CPMenu)aMenu
+{
+    [self setMenu:aMenu];
+}
+
+- (void)setMenu:(CPMenu)aMenu
 {
    if ([aMenu _menuName] === "CPMainMenu")
    {
-        if (_mainMenu === aMenu)
+        if ([self menu] === aMenu)
            return;

-        _mainMenu = aMenu;
+        [super setMenu:aMenu];

        if ([CPPlatform supportsNativeMainMenu])
-            window.cpSetMainMenu(_mainMenu);
+            window.cpSetMainMenu([self menu]);
    }
    else
        [aMenu _setMenuName:@"CPMainMenu"];
 }

+/*!
+    Opens the shared color panel.
+    @param aSender
+*/
 - (void)orderFrontColorPanel:(id)aSender
 {
    [[CPColorPanel sharedColorPanel] orderFront:self];
@@ -828,16 +884,38 @@ CPRunContinuesResponse  = -1002;
    return nil;
 }

+/*!
+    Fires a callback function when an event matching a given mask occurs.
+    @param aCallback - A js function to be fired.
+    @prarm aMask - An event mask for the next event.
+    @param anExpiration - The date for which this callback expires (not implemented).
+    @param inMode (not implemented).
+    @param shouldDequeue (not implemented).
+*/
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
 }

- (CPEvent)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
+/*!
+    Assigns a target and action for the next event matching a given event mask.
+    The callback method called will be passed the CPEvent when it fires.
+
+    @param aTarget - The target object for the callback.
+    @param aSelector - The selector which should be called on the target object.
+    @param aMask - The mask for a given event which should trigger the callback.
+    @param anExpiration - The date for which the callback expires (not implemented).
+    @param aMode (not implemented).
+    @param shouldDequeue (not implemented).
+*/
+- (void)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
 }

+/*!
+    Returns the last event recieved by your application.
+*/
 - (CPEvent)currentEvent
 {
    return _currentEvent;
@@ -855,18 +933,37 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {
-    var styleMask = [aSheet styleMask];
-    if (!(styleMask & CPDocModalWindowMask))
+    if ([aWindow isSheet])
    {
-        [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
+        [CPException raise:CPInternalInconsistencyException reason:@"The target window of beginSheet: cannot be a sheet"];
        return;
    }

-    [aWindow orderFront:self];
-    [aSheet setPlatformWindow:[aWindow platformWindow]];
+    [aSheet._windowView _enableSheet:YES];
+
+    // -dw- if a sheet is already visible, we skip this since it serves no purpose and causes
+    // orderOut: to be called on the sheet, which is not what we want.
+    if (![aWindow isVisible])
+    {
+        [aWindow orderFront:self];
+        [aSheet setPlatformWindow:[aWindow platformWindow]];
+    }
    [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }

+/*!
+    Ends a sheet modal.
+    The following are predefined return codes:
+
+    <pre>
+    CPRunStoppedResponse
+    CPRunAbortedResponse
+    CPRunContinuesResponse
+    </pre>
+
+    @param sheet - The window object (sheet) to dismiss.
+    @param returnCode - The return code to send to the delegate. You can use one of the return codes above or a custom value that you define.
+*/
 - (void)endSheet:(CPWindow)sheet returnCode:(int)returnCode
 {
    var count = [_windows count];
@@ -879,17 +976,37 @@ CPRunContinuesResponse  = -1002;
        if (context != nil && context["sheet"] === sheet)
        {
            context["returnCode"] = returnCode;
-            [aWindow _detachSheetWindow];
+            [aWindow _endSheet];
            return;
        }
    }
 }

+/*!
+    Ends a sheet and sends the return code "0".
+    @param sheet - The CPWindow object (sheet) that should be dismissed.
+*/
 - (void)endSheet:(CPWindow)sheet
 {
+    // FIX ME: this is wrong: by Cocoa this should be: CPRunStoppedResponse.
   [self endSheet:sheet returnCode:0];
 }

+/*!
+    Returns and array of slash seperated arugments to your application.
+    These values are pulled from your window location hash.
+
+    For exampled if your application loaded:
+    <pre>
+    index.html#280north/cappuccino/issues
+    </pre>
+    The follow array would be returned:
+    <pre>
+    ["280north", "cappuccino", "issues"]
+    </pre>
+
+    @return CPArray - The array of arguments.
+*/
 - (CPArray)arguments
 {
    if (_fullArgsString !== window.location.hash)
@@ -898,6 +1015,22 @@ CPRunContinuesResponse  = -1002;
    return _args;
 }

+/*!
+    Sets the arguments of your application.
+    That is, set the slash seperated values of an array as the window location hash.
+
+    For example if you pass an array:
+    <pre>
+    ["280north", "cappuccino", "issues"]
+    </pre>
+
+    The new window location would be
+    <pre>
+    index.html#280north/cappuccino/issues
+    </pre>
+
+    @param args - An array of arguments.
+*/
 - (void)setArguments:(CPArray)args
 {
    if (!args || args.length == 0)
@@ -908,7 +1041,7 @@ CPRunContinuesResponse  = -1002;
        return;
    }

-    if ([args class] != CPArray)
+    if (![args isKindOfClass:CPArray])
        args = [CPArray arrayWithObject:args];

    _args = args;
@@ -939,6 +1072,23 @@ CPRunContinuesResponse  = -1002;
        _args = [];
 }

+/*!
+    Returns a dictionary of the window location named arguments.
+    For example if your location was:
+    <pre>
+    index.html?owner=280north&repo=cappuccino&type=issues
+    </pre>
+
+    a CPDictionary with the keys:
+    <pre>
+    owner, repo, type
+    </pre>
+    and respective values:
+    <pre>
+    280north, cappuccino, issues
+    </pre>
+    Will be returned.
+*/
 - (CPDictionary)namedArguments
 {
    return _namedArgs;
@@ -1029,12 +1179,12 @@ CPRunContinuesResponse  = -1002;
 var _CPModalSessionMake = function(aWindow, aStopCode)
 {
    return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
-}
+};

 var _CPEventListenerMake = function(anEventMask, aCallback)
 {
    return { _mask:anEventMask, _callback:aCallback };
-}
+};

 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
@@ -1044,9 +1194,16 @@ _CPRunModalLoop = function(anEvent)
    var theWindow = [anEvent window],
        modalSession = CPApp._currentSession;

-    if (theWindow == modalSession._window || [theWindow worksWhenModal])
+    // The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal,
+    // yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original
+    // modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working
+    // at all from sheets.
+    if (theWindow == modalSession._window ||
+        [theWindow worksWhenModal] ||
+        [theWindow attachedSheet] == modalSession._window || // -dw- allow modal parent of sheet to be repositioned
+        ([theWindow isKindOfClass:_CPAttachedWindow] && [[theWindow targetView] window] === modalSession._window))
        [theWindow sendEvent:anEvent];
-}
+};

 /*!
    Starts the GUI and Cappuccino frameworks. This function should be
@@ -1203,8 +1360,8 @@ var _CPAppBootstrapperActions = nil;
    [editMenu addItem:undoMenuItem];
    [editMenu addItem:redoMenuItem];

-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]];
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]];
    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];

    [editMenuItem setSubmenu:editMenu];
@@ -1233,3 +1390,16 @@ var _CPAppBootstrapperActions = nil;
 }

@end
+
+
+@implementation CPEvent (CPApplicationModifierFlags)
+
+/*!
+    Returns the currently pressed modifier flags.
+*/
+ (unsigned)modifierFlags
+{
+    return CPEventModifierFlags;
+}
+
+@end
@@ -20,7 +20,6 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 * Copyright 2009 280 North, Inc.
-
 */

@import <Foundation/CPObject.j>
@@ -38,7 +37,7 @@ var DefaultLineWidth = 1.0;
    @class CPBezierPath

    A CPBezierPath allows you to create paths for drawing to the screen using a simpler API than CoreGraphics.
-    Paths can form any shape, including regular polgyons like squares and triangles; circles, arcs; or complex
+    Paths can form any shape, including regular polygons like squares and triangles; circles, arcs; or complex
    line segments.

    A path can be stroked and filled using the relevant method. The currently active fill and stroke color will
@@ -184,7 +183,6 @@ var DefaultLineWidth = 1.0;
    CGContextBeginPath(ctx);
    CGContextAddPath(ctx, _path);
    CGContextSetLineWidth(ctx, [self lineWidth]);
-    CGContextClosePath(ctx);
    CGContextStrokePath(ctx);
 }

@@ -277,10 +275,11 @@ var DefaultLineWidth = 1.0;
 /*!
    Append the contents of a CPBezierPath object.
 */
- (void)appendBezierPath:(NSBezierPath *)other
+- (void)appendBezierPath:(CPBezierPath)other
 {
    CGPathAddPath(_path, nil, other._path);
 }
+
 /*!
    Remove all path elements; clears path.
 */
@@ -25,7 +25,7 @@
 // CPBoxType
 CPBoxPrimary    = 0;
 CPBoxSecondary  = 1;
-CPBoxSeperator  = 2;
+CPBoxSeparator  = 2;
 CPBoxOldStyle   = 3;
 CPBoxCustom     = 4;

@@ -35,6 +35,22 @@ CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;

+// CPTitlePosition
+CPNoTitle     = 0;
+CPAboveTop    = 1;
+CPAtTop       = 2;
+CPBelowTop    = 3;
+CPAboveBottom = 4;
+CPAtBottom    = 5;
+CPBelowBottom = 6;
+
+
+/*!
+    @ingroup appkit
+    @class CPBox
+
+    A CPBox is a simple view which can display a border.
+*/
@implementation CPBox : CPView
 {
    CPBoxType       _boxType;
@@ -48,6 +64,10 @@ CPGrooveBorder  = 3;

    CPSize          _contentMargin;
    CPView          _contentView;
+
+    CPString        _title @accessors(getter=title);
+    int             _titlePosition @accessors(getter=titlePosition);
+    CPTextField     _titleView;
 }

 + (id)boxEnclosingView:(CPView)aView
@@ -55,6 +75,7 @@ CPGrooveBorder  = 3;
    var box = [[self alloc] initWithFrame:CGRectMakeZero()],
        enclosingView = [aView superview];

+    [box setAutoresizingMask:[aView autoresizingMask]];
    [box setFrameFromContentFrame:[aView frame]];

    [enclosingView replaceSubview:aView with:box];
@@ -77,6 +98,9 @@ CPGrooveBorder  = 3;
        _borderWidth = 1.0;
        _contentMargin = CGSizeMake(0.0, 0.0);

+        _titlePosition = CPNoTitle;
+        _titleView = [CPTextField labelWithTitle:@""];
+
        _contentView = [[CPView alloc] initWithFrame:[self bounds]];
        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

@@ -89,16 +113,46 @@ CPGrooveBorder  = 3;

 // Configuring Boxes

+/*!
+    Returns the receiver's border rectangle.
+
+    @return the border rectangle of the box
+*/
 - (CPRect)borderRect
 {
    return [self bounds];
 }

+/*!
+    Returns the receiver's border type. Possible values are:
+
+    <pre>
+    CPNoBorder
+    CPLineBorder
+    CPBezelBorder
+    CPGrooveBorder
+    </pre>
+
+    @return the border type of the box
+*/
 - (CPBorderType)borderType
 {
    return _borderType;
 }

+
+/*!
+    Sets the receiver's border type. Valid values are:
+
+    <pre>
+    CPNoBorder
+    CPLineBorder
+    CPBezelBorder
+    CPGrooveBorder
+    </pre>
+
+    @param borderType the border type to use
+*/
 - (void)setBorderType:(CPBorderType)aBorderType
 {
    if (_borderType === aBorderType)
@@ -108,11 +162,41 @@ CPGrooveBorder  = 3;
    [self setNeedsDisplay:YES];
 }

+/*!
+    Returns the receiver's box type. Possible values are:
+
+    <pre>
+    CPBoxPrimary
+    CPBoxSecondary
+    CPBoxSeparator
+    CPBoxOldStyle
+    CPBoxCustom
+    </pre>
+
+    (In the current implementation, all values act the same except CPBoxSeparator.)
+
+    @return the box type of the box.
+*/
 - (CPBoxType)boxType
 {
    return _boxType;
 }

+/*!
+    Sets the receiver's box type. Valid values are:
+
+    <pre>
+    CPBoxPrimary
+    CPBoxSecondary
+    CPBoxSeparator
+    CPBoxOldStyle
+    CPBoxCustom
+    </pre>
+
+    (In the current implementation, all values act the same except CPBoxSeparator.)
+
+    @param aBoxType the box type of the box.
+*/
 - (void)setBoxType:(CPBoxType)aBoxType
 {
    if (_boxType === aBoxType)
@@ -211,18 +295,100 @@ CPGrooveBorder  = 3;

 - (void)setFrameFromContentFrame:(CPRect)aRect
 {
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
+    var offset = [self _titleHeightOffset];
+
+    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + offset[0] + _borderWidth))];
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+    if (aTitle == _title)
+        return;
+
+    _title = aTitle;
+
+    [self _manageTitlePositioning];
+}
+
+- (void)setTitlePosition:(int)aTitlePotisition
+{
+    if (aTitlePotisition == _titlePosition)
+        return;
+
+    _titlePosition = aTitlePotisition;
+
+    [self _manageTitlePositioning];
+}
+
+- (void)_manageTitlePositioning
+{
+    if (_titlePosition == CPNoTitle)
+    {
+        [_titleView removeFromSuperview];
+        [self setNeedsDisplay:YES];
+        return;
+    }
+
+    [_titleView setStringValue:_title];
+    [_titleView sizeToFit];
+    [self addSubview:_titleView];
+
+    switch (_titlePosition)
+    {
+        case CPAtTop:
+        case CPAboveTop:
+        case CPBelowTop:
+            [_titleView setFrameOrigin:CPPointMake(5.0, 0.0)];
+            [_titleView setAutoresizingMask:CPViewNotSizable];
+            break;
+
+        case CPAboveBottom:
+        case CPAtBottom:
+        case CPBelowBottom:
+            var h = [_titleView frameSize].height;
+            [_titleView setFrameOrigin:CPPointMake(5.0, [self frameSize].height - h)];
+            [_titleView setAutoresizingMask:CPViewMinYMargin];
+            break;
+    }
+
+    [self sizeToFit];
    [self setNeedsDisplay:YES];
 }

 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame];
+    var contentFrame = [_contentView frame],
+        offset = [self _titleHeightOffset];

+    if (!contentFrame)
+        return;
+
+    [_contentView setAutoresizingMask:CPViewNotSizable];
    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
-                                  contentFrame.size.height + _contentMargin.height * 2)];
+                                  contentFrame.size.height + _contentMargin.height * 2 + offset[0])];
+    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
+    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height + offset[1])];
+}
+
+- (float)_titleHeightOffset
+{
+    if (_titlePosition == CPNoTitle)
+        return [0.0, 0.0];
+
+    switch (_titlePosition)
+    {
+        case CPAtTop:
+            return [[_titleView frameSize].height, [_titleView frameSize].height];
+
+        case CPAtBottom:
+            return [[_titleView frameSize].height, 0.0];
+
+        default:
+            return [0.0, 0.0];
+    }
 }

 - (void)drawRect:(CPRect)rect
@@ -230,13 +396,13 @@ CPGrooveBorder  = 3;
    if (_borderType === CPNoBorder)
        return;

-    var bounds = [self bounds];
+    var bounds = CGRectMakeCopy([self bounds]);

    switch (_boxType)
    {
-        case CPBoxSeperator:
-            // NSBox does not include a horitontal flag for the seperator type. We have to determine
-            // the type of seperator to draw by the width and height of the frame.
+        case CPBoxSeparator:
+            // NSBox does not include a horizontal flag for the separator type. We have to determine
+            // the type of separator to draw by the width and height of the frame.
            if (CGRectGetWidth(bounds) === 5.0)
                return [self _drawVerticalSeperatorInRect:bounds];
            else if (CGRectGetHeight(bounds) === 5.0)
@@ -245,6 +411,16 @@ CPGrooveBorder  = 3;
            break;
    }

+    if (_titlePosition == CPAtTop)
+    {
+        bounds.origin.y += [_titleView frameSize].height;
+        bounds.size.height -= [_titleView frameSize].height;
+    }
+    if (_titlePosition == CPAtBottom)
+    {
+        bounds.size.height -= [_titleView frameSize].height;
+    }
+
    switch (_borderType)
    {
        case CPBezelBorder:
@@ -265,8 +441,8 @@ CPGrooveBorder  = 3;
    CGContextSetStrokeColor(context, [self borderColor]);
    CGContextSetLineWidth(context, 1.0);

-    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect) + 0.5);
+    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect) + 0.5);
    CGContextStrokePath(context);
 }

@@ -277,8 +453,8 @@ CPGrooveBorder  = 3;
    CGContextSetStrokeColor(context, [self borderColor]);
    CGContextSetLineWidth(context, 1.0);

-    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetMinX(aRect), CGRectGetHeight(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetMinY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetHeight(aRect));
    CGContextStrokePath(context);
 }

@@ -319,7 +495,10 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
    CPBoxFillColorKey     = @"CPBoxFillColorKey",
    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
+    CPBoxContentMarginKey = @"CPBoxContentMarginKey",
+    CPBoxTitle            = @"CPBoxTitle",
+    CPBoxTitlePosition    = @"CPBoxTitlePosition",
+    CPBoxTitleView        = @"CPBoxTitleView";

@implementation CPBox (CPCoding)

@@ -340,10 +519,16 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",

        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];

+        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
+        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
+        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
+
        _contentView   = [self subviews][0];

        [self setAutoresizesSubviews:YES];
        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        [self _manageTitlePositioning];
    }

    return self;
@@ -362,6 +547,10 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
    [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
    [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];

+    [aCoder encodeObject:_title forKey:CPBoxTitle];
+    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
+    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
+
    [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
 }

@@ -83,42 +83,47 @@
 {
    if (self = [super initWithFrame:aFrame])
    {
-        _rowHeight = 23.0;
-        _defaultColumnWidth = 140.0;
-        _minColumnWidth = 80.0;
-        _imageWidth = 23.0;
-        _leafWidth = 13.0;
-        _columnWidths = [];
-
-        _pathSeparator = "/";
-        _tableViews = [];
-        _tableDelegates = [];
-        _allowsMultipleSelection = YES;
-        _allowsEmptySelection = YES;
-        _tableViewClass = [_CPBrowserTableView class];
-
-        _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-        [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
-        [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelectedDataView];
-        [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
-
-        _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
-
-        [_horizontalScrollView setHasVerticalScroller:NO];
-        [_horizontalScrollView setAutohidesScrollers:YES];
-        [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
-        [_contentView setAutoresizingMask:CPViewHeightSizable];
-
-        [_horizontalScrollView setDocumentView:_contentView];
-
-        [self addSubview:_horizontalScrollView];
+        [self _init];
    }

    return self;
 }

+- (void)_init
+{
+    _rowHeight = 23.0;
+    _defaultColumnWidth = 140.0;
+    _minColumnWidth = 80.0;
+    _imageWidth = 23.0;
+    _leafWidth = 13.0;
+    _columnWidths = [];
+
+    _pathSeparator = "/";
+    _tableViews = [];
+    _tableDelegates = [];
+    _allowsMultipleSelection = YES;
+    _allowsEmptySelection = YES;
+    _tableViewClass = [_CPBrowserTableView class];
+
+    _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+    [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
+    [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelectedDataView];
+    [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
+
+    _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
+
+    [_horizontalScrollView setHasVerticalScroller:NO];
+    [_horizontalScrollView setAutohidesScrollers:YES];
+    [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+    _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
+    [_contentView setAutoresizingMask:CPViewHeightSizable];
+
+    [_horizontalScrollView setDocumentView:_contentView];
+
+    [self addSubview:_horizontalScrollView];
+}
+
 - (void)setPrototypeView:(CPView)aPrototypeView
 {
    _prototypeView = [CPKeyedUnarchiver unarchiveObjectWithData:
@@ -253,7 +258,7 @@
        var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
            view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];

-        [view setImageScaling:CPScaleProportionally];
+        [view setImageScaling:CPImageScaleProportionallyDown];

        [column setDataView:view];
        [column setResizingMask:CPTableColumnNoResizing];
@@ -299,7 +304,7 @@
            tableHeight = CGRectGetHeight([tableView bounds]);

        [[tableView tableColumnWithIdentifier:"Image"] setWidth:_imageWidth];
-        [[tableView tableColumnWithIdentifier:"Content"] setWidth:width - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - scrollerWidth - scrollerWidth];
+        [[tableView tableColumnWithIdentifier:"Content"] setWidth:[self columnContentWidthForColumnWidth:width]];
        [[tableView tableColumnWithIdentifier:"Leaf"] setWidth:_leafWidth];

        [tableView setRowHeight:_rowHeight];
@@ -431,12 +436,14 @@

 - (float)columnContentWidthForColumnWidth:(float)aWidth
 {
-    return aWidth - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - [CPScroller scrollerWidth];
+    var columnSpacing = [_tableViews[0] intercellSpacing].width;
+    return aWidth - (_leafWidth + columnSpacing + (_delegateSupportsImages ? _imageWidth + columnSpacing : 0)) - columnSpacing - [CPScroller scrollerWidth];
 }

 - (float)columnWidthForColumnContentWidth:(float)aWidth
 {
-    return aWidth + (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) + [CPScroller scrollerWidth];
+    var columnSpacing = [_tableViews[0] intercellSpacing].width;
+    return aWidth + (_leafWidth + columnSpacing + (_delegateSupportsImages ? _imageWidth + columnSpacing: 0)) + columnSpacing + [CPScroller scrollerWidth];
 }

 - (void)setImageWidth:(float)aWidth
@@ -650,6 +657,53 @@

@end

+@implementation CPBrowser (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        [self _init];
+
+        _allowsEmptySelection = [aCoder decodeBoolForKey:@"CPBrowserAllowsEmptySelectionKey"];
+        _allowsMultipleSelection = [aCoder decodeBoolForKey:@"CPBrowserAllowsMultipleSelectionKey"];
+        _prototypeView = [aCoder decodeObjectForKey:@"CPBrowserPrototypeViewKey"];
+        _rowHeight = [aCoder decodeFloatForKey:@"CPBrowserRowHeightKey"];
+        _imageWidth = [aCoder decodeFloatForKey:@"CPBrowserImageWidthKey"];
+        _minColumnWidth = [aCoder decodeFloatForKey:@"CPBrowserMinColumnWidthKey"];
+        _columnWidths = [aCoder decodeObjectForKey:@"CPBrowserColumnWidthsKey"];
+
+        [self setDelegate:[aCoder decodeObjectForKey:@"CPBrowserDelegateKey"]];
+        [self setAutohidesScroller:[aCoder decodeBoolForKey:@"CPBrowserAutohidesScrollerKey"]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // Don't encode the subviews, they're transient and will be recreated from data.
+    var actualSubviews = _subviews;
+    _subviews = [];
+    [super encodeWithCoder:aCoder];
+    _subviews = actualSubviews;
+
+    [aCoder encodeBool:[self autohidesScroller] forKey:@"CPBrowserAutohidesScrollerKey"];
+    [aCoder encodeBool:_allowsEmptySelection forKey:@"CPBrowserAllowsEmptySelectionKey"];
+    [aCoder encodeBool:_allowsMultipleSelection forKey:@"CPBrowserAllowsMultipleSelectionKey"];
+    [aCoder encodeObject:_delegate forKey:@"CPBrowserDelegateKey"];
+    [aCoder encodeObject:_prototypeView forKey:@"CPBrowserPrototypeViewKey"];
+    [aCoder encodeFloat:_rowHeight forKey:@"CPBrowserRowHeightKey"];
+    [aCoder encodeFloat:_imageWidth forKey:@"CPBrowserImageWidthKey"];
+    [aCoder encodeFloat:_minColumnWidth forKey:@"CPBrowserMinColumnWidthKey"];
+    [aCoder encodeObject:_columnWidths forKey:@"CPBrowserColumnWidthsKey"];
+}
+
+@end
+
+
 var _CPBrowserResizeControlBackgroundImage = nil;

@implementation _CPBrowserResizeControl : CPView
@@ -847,6 +901,12 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
 }

+- (void)tableViewSelectionDidChange:(CPNotification)aNotification
+{
+    var selectedIndexes = [[aNotification object] selectedRowIndexes];
+    [_browser selectRowIndexes:selectedIndexes inColumn:_index];
+}
+
 - (id)childAtIndex:(unsigned)index
 {
    return [_delegate browser:_browser child:index ofItem:_item];
@@ -928,7 +988,7 @@ var _CPBrowserResizeControlBackgroundImage = nil;
        isHighlighted = [self themeState] & CPThemeStateSelectedDataView;

    [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
-    [imageView setImageScaling:CPScaleNone];
+    [imageView setImageScaling:CPImageScaleNone];
 }

 - (void)encodeWithCoder:(CPCoder)aCoder
@@ -29,20 +29,21 @@

 /* @group CPBezelStyle */

-CPRoundedBezelStyle             = 1;
-CPRegularSquareBezelStyle       = 2;
+                                       // IB style
+CPRoundedBezelStyle             = 1;   // Push
+CPRegularSquareBezelStyle       = 2;   // Bevel
 CPThickSquareBezelStyle         = 3;
 CPThickerSquareBezelStyle       = 4;
-CPDisclosureBezelStyle          = 5;
-CPShadowlessSquareBezelStyle    = 6;
-CPCircularBezelStyle            = 7;
-CPTexturedSquareBezelStyle      = 8;
-CPHelpButtonBezelStyle          = 9;
-CPSmallSquareBezelStyle         = 10;
-CPTexturedRoundedBezelStyle     = 11;
-CPRoundRectBezelStyle           = 12;
-CPRecessedBezelStyle            = 13;
-CPRoundedDisclosureBezelStyle   = 14;
+CPDisclosureBezelStyle          = 5;   // Disclosure triangle
+CPShadowlessSquareBezelStyle    = 6;   // Square
+CPCircularBezelStyle            = 7;   // Round
+CPTexturedSquareBezelStyle      = 8;   // Textured
+CPHelpButtonBezelStyle          = 9;   // Help
+CPSmallSquareBezelStyle         = 10;  // Gradient
+CPTexturedRoundedBezelStyle     = 11;  // Round Textured
+CPRoundRectBezelStyle           = 12;  // Round Rect
+CPRecessedBezelStyle            = 13;  // Recessed
+CPRoundedDisclosureBezelStyle   = 14;  // Disclosure
 CPHUDBezelStyle                 = -1;


@@ -70,7 +71,13 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;

-CPButtonStateMixed  = CPThemeState("mixed");
+CPButtonStateMixed                  = CPThemeState("mixed");
+CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
+
+// add all future correspondance between bezel styles and theme state here.
+var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonStateBezelStyleRounded, nil]
+                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];
+

 CPButtonDefaultHeight = 24.0;
 CPButtonImageOffset   = 3.0;
@@ -100,6 +107,13 @@ CPButtonImageOffset   = 3.0;

    CPString            _keyEquivalent;
    unsigned            _keyEquivalentModifierMask;
+
+    CPTimer             _continuousDelayTimer;
+    CPTimer             _continuousTimer;
+    float               _periodicDelay;
+    float               _periodicInterval;
+
+    BOOL                _isTracking;
 }

 + (id)buttonWithTitle:(CPString)aTitle
@@ -129,6 +143,11 @@ CPButtonImageOffset   = 3.0;
                                       forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]];
 }

+/*!
+    Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
+    @param aFrame The frame rectangle for the created button object.
+    @return An initialized CPView object or nil if the object couldn't be created.
+*/
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
@@ -139,23 +158,35 @@ CPButtonImageOffset   = 3.0;
        [self setValue:CPCenterTextAlignment forThemeAttribute:@"alignment"];
        [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
        [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
-        [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
+        [self setValue:CPImageScaleNone forThemeAttribute:@"image-scaling"];

-        _controlSize = CPRegularControlSize;
-
-        _keyEquivalent = @"";
-        _keyEquivalentModifierMask = 0;
-
-//        [self setBezelStyle:CPRoundRectBezelStyle];
+        [self setBezelStyle:CPRoundRectBezelStyle];
        [self setBordered:YES];
+
+        [self _init];
    }

    return self;
 }

+- (void)_init
+{
+    _controlSize = CPRegularControlSize;
+
+    _keyEquivalent = @"";
+    _keyEquivalentModifierMask = 0;
+
+    // Continuous button defaults.
+    _periodicInterval   = 0.05;
+    _periodicDelay      = 0.5;
+
+    [self setButtonType:CPMomentaryPushInButton];
+}
+
 // Setting the state
 /*!
-    Returns \c YES if the button has a 'mixed' state in addition to on and off.
+    Returns a Boolean value indicating whether the button allows a mixed state.
+    @return \c YES if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
 {
@@ -179,21 +210,21 @@ CPButtonImageOffset   = 3.0;
        [self setState:CPOnState];
 }

+/*!
+    Sets the value of the button using an Objective-J object.
+    @param anObjectValue The value of the button interpreted as an Objective-J object.
+*/
 - (void)setObjectValue:(id)anObjectValue
 {
    if (!anObjectValue || anObjectValue === @"" || ([anObjectValue intValue] === 0))
        anObjectValue = CPOffState;
-
    else if (![anObjectValue isKindOfClass:[CPNumber class]])
        anObjectValue = CPOnState;
-
-    else if (anObjectValue > CPOnState)
+    else if (anObjectValue >= CPOnState)
        anObjectValue = CPOnState
-
    else if (anObjectValue < CPOffState)
        if ([self allowsMixedState])
            anObjectValue = CPMixedState;
-
        else
            anObjectValue = CPOnState;

@@ -201,18 +232,36 @@ CPButtonImageOffset   = 3.0;

    switch ([self objectValue])
    {
-        case CPMixedState:  [self unsetThemeState:CPThemeStateSelected];
-                            [self setThemeState:CPButtonStateMixed];
-                            break;
+        case CPMixedState:
+            [self unsetThemeState:CPThemeStateSelected];
+            [self setThemeState:CPButtonStateMixed];
+            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+                [self setThemeState:CPThemeStateHighlighted];
+            else
+                [self unsetThemeState:CPThemeStateHighlighted];
+            break;

-        case CPOnState:     [self unsetThemeState:CPButtonStateMixed];
-                            [self setThemeState:CPThemeStateSelected];
-                            break;
+        case CPOnState:
+            [self unsetThemeState:CPButtonStateMixed];
+            [self setThemeState:CPThemeStateSelected];
+            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+                [self setThemeState:CPThemeStateHighlighted];
+            else
+                [self unsetThemeState:CPThemeStateHighlighted];
+            break;

-        case CPOffState:    [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed];
+        case CPOffState:
+            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
    }
 }

+/*!
+    Returns the button's next state.
+    @return The button's state. A button can have two or three states.
+    If it has two, this value is either \c CPOffState (the normal or unpressed state)
+    or \c CPOnState (the alternate or pressed state).
+    If it has three, this value can be \c CPOnState (the feature is in effect everywhere), \c CPOffState (the feature is in effect nowhere), or \c CPMixedState (the feature is in effect somewhere).
+*/
 - (CPInteger)nextState
 {
   if ([self allowsMixedState])
@@ -225,8 +274,16 @@ CPButtonImageOffset   = 3.0;
    return 1 - [self state];
 }

+/*!
+    Sets the button's next state to \c aState.
+    @param aState Possible states are any of the CPButton globals:
+    \c CPOffState, \c CPOnState, \c CPMixedState
+*/
 - (void)setNextState
 {
+    if ([self infoForBinding:CPValueBinding])
+        [self setAllowsMixedState:NO];
+
    [self setState:[self nextState]];
 }

@@ -248,6 +305,11 @@ CPButtonImageOffset   = 3.0;
    return [self intValue];
 }

+/*!
+    Sets the title displayed by the button when in its normal state.
+    @param aTitle The string to set as the button's title. This title is always shown on buttons
+    that don’t use their alternate contents when highlighting or displaying their alternate state.
+*/
 - (void)setTitle:(CPString)aTitle
 {
    if (_title === aTitle)
@@ -259,6 +321,11 @@ CPButtonImageOffset   = 3.0;
    [self setNeedsDisplay:YES];
 }

+/*!
+    Returns the title displayed on the button when it’s in its normal state.
+    @return    The title displayed on the receiver when it’s in its normal state
+    or the empty string if the button doesn’t display a title.
+*/
 - (CPString)title
 {
    return _title;
@@ -319,11 +386,19 @@ CPButtonImageOffset   = 3.0;

 - (void)setShowsStateBy:(CPInteger)aMask
 {
+    // CPPushInCellMask cannot be set for showsStateBy.
+    aMask &= ~CPPushInCellMask;
+
    if (_showsStateBy === aMask)
        return;

    _showsStateBy = aMask;

+    if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask) && [self state] != CPOffState)
+        [self setThemeState:CPThemeStateHighlighted];
+    else
+        [self unsetThemeState:CPThemeStateHighlighted];
+
    [self setNeedsDisplay:YES];
    [self setNeedsLayout];
 }
@@ -347,15 +422,20 @@ CPButtonImageOffset   = 3.0;
    }
 }

+- (CPInteger)highlightsBy
+{
+    return _highlightsBy;
+}
+
 - (void)setButtonType:(CPButtonType)aButtonType
 {
    switch (aButtonType)
    {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
                                        [self setShowsStateBy:CPNoCellMask];
                                        break;

-        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
                                        [self setShowsStateBy:CPNoCellMask];
                                        break;

@@ -363,12 +443,12 @@ CPButtonImageOffset   = 3.0;
                                        [self setShowsStateBy:CPNoCellMask];
                                        break;

-        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
                                        break;

-        case CPOnOffButton:             [self setHighlightsBy:CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
                                        break;

        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
@@ -409,66 +489,111 @@ CPButtonImageOffset   = 3.0;
    return _imageDimsWhenDisabled;
 }

+- (void)setPeriodicDelay:(float)aDelay interval:(float)anInterval
+{
+    _periodicDelay      = aDelay;
+    _periodicInterval   = anInterval;
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if ([self isContinuous])
+    {
+        _continuousDelayTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicDelay callback: function()
+        {
+            if (!_continuousTimer)
+                _continuousTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicInterval target:self selector:@selector(onContinousEvent:) userInfo:anEvent repeats:YES];
+        }
+
+        repeats:NO];
+    }
+
+    [super mouseDown:anEvent];
+}
+
+- (void)onContinousEvent:(CPTimer)aTimer
+{
+    if (_target && _action && [_target respondsToSelector:_action])
+        [_target performSelector:_action withObject:self];
+}
+
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
-    [self highlight:YES];
+    _isTracking = YES;

-    return [super startTrackingAt:aPoint];
+    var startedTracking = [super startTrackingAt:aPoint];
+    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            [self highlight:[self state] == CPOffState];
+        else
+            [self highlight:YES];
+    }
+    else
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            [self highlight:[self state] != CPOffState];
+        else
+            [self highlight:NO];
+    }
+    return startedTracking;
 }

 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    [self highlight:NO];
-
-    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
+    _isTracking = NO;

    if (mouseIsUp && CGRectContainsPoint([self bounds], aPoint))
        [self setNextState];
+    else
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            [self highlight:[self state] != CPOffState];
+        else
+            [self highlight:NO];
+    }
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+    [self invalidateTimers];
+}
+
+- (void)invalidateTimers
+{
+    if (_continuousTimer)
+    {
+        [_continuousTimer invalidate];
+        _continuousTimer = nil;
+    }
+
+    if (_continuousDelayTimer)
+    {
+        [_continuousDelayTimer invalidate];
+        _continuousDelayTimer = nil;
+    }
 }

 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    if (_CGInsetIsEmpty(contentInset))
-        return bounds;
-
-    bounds = _CGRectMakeCopy(bounds);
-    bounds.origin.x += contentInset.left;
-    bounds.origin.y += contentInset.top;
-    bounds.size.width -= contentInset.left + contentInset.right;
-    bounds.size.height -= contentInset.top + contentInset.bottom;
-
-    return bounds;
+    return _CGRectInsetByInset(bounds, contentInset);
 }

 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
+    // Is this necessary? The theme itself can just change its inset to a zero inset when !CPThemeStateBordered.
    if (![self isBordered])
-        return _CGRectMakeZero();
+        return bounds;

    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];

-    if (_CGInsetIsEmpty(bezelInset))
-        return bounds;
-
-    bounds = _CGRectMakeCopy(bounds);
-    bounds.origin.x += bezelInset.left;
-    bounds.origin.y += bezelInset.top;
-    bounds.size.width -= bezelInset.left + bezelInset.right;
-    bounds.size.height -= bezelInset.top + bezelInset.bottom;
-
-    return bounds;
+    return _CGRectInsetByInset(bounds, bezelInset);
 }

-/*!
-    Adjust the size of the button to fit the title and surrounding button image.
-*/
- (void)sizeToFit
+- (CGSize)_minimumFrameSize
 {
-    [self layoutSubviews];
-
-    var size,
+    var size = CGSizeMakeZero(),
        contentView = [self ephemeralSubviewNamed:@"content-view"];

    if (contentView)
@@ -492,7 +617,20 @@ CPButtonImageOffset   = 3.0;
    if (maxSize.height >= 0.0)
        size.height = MIN(size.height, maxSize.height);

-    [self setFrameSize:size];
+    return size;
+}
+
+/*!
+    Adjust the size of the button to fit the title and surrounding button image.
+*/
+- (void)sizeToFit
+{
+    [self layoutSubviews];
+
+    [self setFrameSize:[self _minimumFrameSize]];
+
+    if ([self ephemeralSubviewNamed:@"content-view"])
+        [self layoutSubviews];
 }

 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
@@ -534,8 +672,51 @@ CPButtonImageOffset   = 3.0;

    if (contentView)
    {
-        [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
-        [contentView setImage:[self currentValueForThemeAttribute:@"image"]];
+        var title = nil,
+            image = nil;
+
+        if (_isTracking)
+        {
+            if (_highlightsBy & CPContentsCellMask)
+            {
+                if (_showsStateBy & CPContentsCellMask)
+                {
+                    title = ([self state] == CPOffState && _alternateTitle) ? _alternateTitle : _title;
+                    image = ([self state] == CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
+                }
+                else
+                {
+                    title = [self alternateTitle];
+                    image = [self alternateImage];
+                }
+            }
+            else if (_showsStateBy & CPContentsCellMask)
+            {
+                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
+                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
+            }
+            else
+            {
+                title = _title;
+                image = [self image];
+            }
+        }
+        else
+        {
+            if (_showsStateBy & CPContentsCellMask)
+            {
+                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
+                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
+            }
+            else
+            {
+                title = _title;
+                image = [self image];
+            }
+        }
+
+        [contentView setText:title];
+        [contentView setImage:image];
        [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];

        [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
@@ -634,19 +815,75 @@ CPButtonImageOffset   = 3.0;
        return NO;

    [self performClick:nil];
+
    return YES;
 }

+/*!
+    Perform a click on the receiver.
+
+    @param sender - The sender object
+*/
+- (void)performClick:(id)sender
+{
+    // This is slightly different from [super performClick:] in that the highlight behaviour is dependent on
+    // highlightsBy and showsStateBy.
+    if (![self isEnabled])
+        return;
+
+    [self setState:[self nextState]];
+
+    var shouldHighlight = NO;
+
+    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            shouldHighlight = [self state] == CPOffState;
+        else
+            shouldHighlight = YES;
+    }
+
+    [self highlight:shouldHighlight];
+
+    try
+    {
+        [self sendAction:[self action] to:[self target]];
+    }
+    catch (e)
+    {
+        throw e;
+    }
+    finally
+    {
+        if (shouldHighlight)
+            [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+    }
+}
+
@end

@implementation CPButton (NS)

 - (void)setBezelStyle:(unsigned)aBezelStyle
 {
+    if (aBezelStyle === _bezelStyle)
+        return;
+
+    var currentState = [CPButtonBezelStyleStateMap objectForKey:_bezelStyle],
+        newState = [CPButtonBezelStyleStateMap objectForKey:aBezelStyle];
+
+    if (currentState)
+        [self unsetThemeState:currentState];
+
+    if (newState)
+        [self setThemeState:newState];
+
+    _bezelStyle = aBezelStyle;
 }

 - (unsigned)bezelStyle
 {
+    return _bezelStyle;
 }

@end
@@ -661,7 +898,11 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
    CPButtonImageDimsWhenDisabledKey    = @"CPButtonImageDimsWhenDisabledKey",
    CPButtonImagePositionKey            = @"CPButtonImagePositionKey",
    CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
-    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey";
+    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
+    CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
+    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey",
+    CPButtonHighlightsByKey             = @"CPButtonHighlightsByKey",
+    CPButtonShowsStateByKey             = @"CPButtonShowsStateByKey";

@implementation CPButton (CPCoding)

@@ -675,13 +916,24 @@ var CPButtonImageKey                    = @"CPButtonImageKey",

    if (self)
    {
-        _controlSize = CPRegularControlSize;
+        [self _init];

        _title = [aCoder decodeObjectForKey:CPButtonTitleKey];
        _alternateTitle = [aCoder decodeObjectForKey:CPButtonAlternateTitleKey];
+        _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];

-        if ([aCoder containsValueForKey:CPButtonAllowsMixedStateKey])
-            _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
+        if ([aCoder containsValueForKey:CPButtonHighlightsByKey])
+        {
+            // If one exists, assume both do.
+            _highlightsBy = [aCoder decodeIntForKey:CPButtonHighlightsByKey];
+            _showsStateBy = [aCoder decodeIntForKey:CPButtonShowsStateByKey];
+        }
+        else
+        {
+            // Backwards compatibility: if this CPButton was encoded before coding of
+            // highlightsBy and showsStateBy were added, we should just use the
+            // default values from _init rather than overwriting with 0, 0.
+        }

        [self setImageDimsWhenDisabled:[aCoder decodeObjectForKey:CPButtonImageDimsWhenDisabledKey]];

@@ -691,6 +943,12 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
        if ([aCoder containsValueForKey:CPButtonKeyEquivalentKey])
            [self setKeyEquivalent:CFData.decodeBase64ToUtf16String([aCoder decodeObjectForKey:CPButtonKeyEquivalentKey])];

+        if ([aCoder containsValueForKey:CPButtonPeriodicDelayKey])
+            _periodicDelay = [aCoder decodeObjectForKey:CPButtonPeriodicDelayKey];
+
+        if ([aCoder containsValueForKey:CPButtonPeriodicIntervalKey])
+            _periodicInterval = [aCoder decodeObjectForKey:CPButtonPeriodicIntervalKey];
+
        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPButtonKeyEquivalentMaskKey];

        [self setNeedsLayout];
@@ -707,12 +965,16 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
    [super encodeWithCoder:aCoder];
+    [self invalidateTimers];

    [aCoder encodeObject:_title forKey:CPButtonTitleKey];
    [aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];

    [aCoder encodeBool:_allowsMixedState forKey:CPButtonAllowsMixedStateKey];

+    [aCoder encodeInt:_highlightsBy forKey:CPButtonHighlightsByKey];
+    [aCoder encodeInt:_showsStateBy forKey:CPButtonShowsStateByKey];
+
    [aCoder encodeBool:[self imageDimsWhenDisabled] forKey:CPButtonImageDimsWhenDisabledKey];
    [aCoder encodeInt:[self imagePosition] forKey:CPButtonImagePositionKey];

@@ -720,6 +982,9 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
        [aCoder encodeObject:CFData.encodeBase64Utf16String(_keyEquivalent) forKey:CPButtonKeyEquivalentKey];

    [aCoder encodeInt:_keyEquivalentModifierMask forKey:CPButtonKeyEquivalentMaskKey];
+
+    [aCoder encodeObject:_periodicDelay forKey:CPButtonPeriodicDelayKey];
+    [aCoder encodeObject:_periodicInterval forKey:CPButtonPeriodicIntervalKey];
 }

@end
@@ -44,6 +44,14 @@ CPCheckBoxImageOffset = 4.0;
    return @"check-box";
 }

+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding === CPValueBinding)
+        return [_CPCheckBoxValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
@@ -86,4 +94,48 @@ CPCheckBoxImageOffset = 4.0;
    [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
 }

+- (CPImage)image
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (CPImage)alternateImage
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    var startedTracking = [super startTrackingAt:aPoint];
+    [self highlight:YES];
+    return startedTracking;
+}
+
+@end
+
+@implementation _CPCheckBoxValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setAllowsMixedState:(aValue === CPMixedState)];
+    [_source setState:aValue];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setState:aValue];
+}
+
@end
@@ -40,23 +40,23 @@

    @par Delegate Methods

-    @delegate -(void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
+    @delegate - (void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
    Called when the selection in the collection view has changed.
    @param collectionView the collection view who's selection changed

-    @delegate -(void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
+    @delegate - (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
    Called when the user double-clicks on an item in the collection view.
    @param collectionView the collection view that received the double-click
    @param index the index of the item that received the double-click

-    @delegate -(CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
+    @delegate - (CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
    Invoked to obtain data for a set of indices.
    @param collectionView the collection view to obtain data for
    @param indices the indices to return data for
    @param aType the data type
    @return a data object containing the index items

-    @delegate -(CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
+    @delegate - (CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
    Invoked to obtain the data types supported by the specified indices for placement on the pasteboard.
    @param collectionView the collection view the items reside in
    @param indices the indices to obtain drag types
@@ -131,6 +131,49 @@

 /*!
    Sets the item prototype to \c anItem
+
+    The item prototype should implement the CPCoding protocol
+    because the item is copied by archiving and unarchiving the
+    prototypal view.
+
+    Example:
+
+    <pre>
+      @implement MyCustomView : CPCollectionViewItem
+      {
+          CPArray   items   @accessors;
+      }
+
+      - (id)initWithFrame:(CGRect)aFrame
+      {
+        self = [super initWithFrame:aFrame];
+        if (self)
+        {
+          items = [];
+        }
+        return self;
+      }
+
+      - (id)initWithCoder:(CPCoder)aCoder
+      {
+        self = [super initWithCoder:aCoder];
+        items = [aCoder decodeObjectForKey:@"KEY"];
+        return self;
+      }
+
+      - (void)encodeWithCoder:(CPCoder)aCoder
+      {
+        [aCoder encodeObject:items forKey:@"KEY"];
+        [super encodeWithCoder:aCoder];
+      }
+
+      @end
+    </pre>
+
+    This will allow the collection view to create multiple 'clean' copies
+    of the item prototype which will maintain the original values for item
+    and all of the properties archived by the super class.
+
    @param anItem the new item prototype
 */
 - (void)setItemPrototype:(CPCollectionViewItem)anItem
@@ -199,13 +242,15 @@
    Sets the content of the collection view to the content in \c anArray.
    This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.
    It's the responsibility of your custom collection view item to interpret the object.
-    @param anArray the content array
+
+    If the new content array is smaller than the previous one, note that [receiver selectionIndexes] may
+    refer to out of range indices. \c selectionIndexes is not changed as a result of calling the
+    \c setContent: method.
+
+    @param anArray a content array
 */
 - (void)setContent:(CPArray)anArray
 {
-    if (_content == anArray)
-        return;
-
    _content = anArray;

    [self reloadContent];
@@ -241,9 +286,11 @@

    if (!_isSelectable)
    {
-        var index = CPNotFound;
+        var index = CPNotFound,
+            itemCount = [_items count];

-        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+        // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
+        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < itemCount)
            [_items[index] setSelected:NO];
    }
 }
@@ -297,22 +344,27 @@
 */
 - (void)setSelectionIndexes:(CPIndexSet)anIndexSet
 {
-    if ([_selectionIndexes isEqual:anIndexSet] || !_isSelectable)
+    if (!anIndexSet)
+        anIndexSet = [CPIndexSet indexSet];
+    if (!_isSelectable || [_selectionIndexes isEqual:anIndexSet])
        return;

-    var index = CPNotFound;
+    var index = CPNotFound,
+        itemCount = [_items count];

-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound && index < itemCount)
        [_items[index] setSelected:NO];

    _selectionIndexes = anIndexSet;

    var index = CPNotFound;

-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound)
        [_items[index] setSelected:YES];

-    [[CPKeyValueBinding getBinding:@"selectionIndexes" forObject:self] reverseSetValueFor:@"selectionIndexes"];
+    var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
+    [[binderClass getBinding:@"selectionIndexes" forObject:self] reverseSetValueFor:@"selectionIndexes"];

    if ([_delegate respondsToSelector:@selector(collectionViewDidChangeSelection:)])
        [_delegate collectionViewDidChangeSelection:self];
@@ -342,7 +394,7 @@

    _items = [];

-    if (!_itemPrototype || !_content)
+    if (!_itemPrototype)
        return;

    var index = 0;
@@ -357,7 +409,8 @@
    }

    index = CPNotFound;
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
+    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < count)
        [_items[index] setSelected:YES];

    [self tile];
@@ -368,7 +421,7 @@
 {
    var width = CGRectGetWidth([self bounds]);

-    if (![_content count] || width == _tileWidth)
+    if (width == _tileWidth)
        return;

    // We try to fit as many views per row as possible.  Any remaining space is then
@@ -429,7 +482,7 @@
    }

    var superview = [self superview],
-        proposedHeight =  y + itemSize.height + _verticalMargin;
+        proposedHeight = y + itemSize.height + _verticalMargin;

    if ([superview isKindOfClass:[CPClipView class]])
    {
@@ -515,6 +568,8 @@
 */
 - (void)setMinItemSize:(CGSize)aSize
 {
+    if (aSize === nil || aSize === undefined)
+        [CPException raise:CPInvalidArgumentException reason:"Invalid value provided for minimum size"];
    if (CGSizeEqualToSize(_minItemSize, aSize))
        return;

@@ -588,9 +643,7 @@
    _mouseDownEvent = anEvent;

    var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        row = FLOOR(location.y / (_itemSize.height + _verticalMargin)),
-        column = FLOOR(location.x / (_itemSize.width + _horizontalMargin)),
-        index = row * _numberOfColumns + column;
+        index = [self _indexAtPoint:location];

    if (index >= 0 && index < _items.length)
    {
@@ -623,6 +676,13 @@
            indexes = [CPIndexSet indexSetWithIndex:index];

        [self setSelectionIndexes:indexes];
+
+        // TODO Is it allowable for collection view items to become the first responder? In that case they
+        // may have become that at this point by virtue of CPWindow's sendEvent: mouse down handling, and
+        // the following line will rudely snatch it away from them. For most cases though, clicking on an
+        // item should naturally make the collection view the first responder so that keyboard navigation
+        // is enabled.
+        [[self window] makeFirstResponder:self];
    }
    else if (_allowsEmptySelection)
        [self setSelectionIndexes:[CPIndexSet indexSet]];
@@ -726,6 +786,28 @@
    return _delegate;
 }

+/*!
+    @ignore
+*/
+- (CPMenu)menuForEvent:(CPEvent)theEvent
+{
+    if (![[self delegate] respondsToSelector:@selector(collectionView:menuForItemAtIndex:)])
+        return [super menuForEvent:theEvent];
+
+    var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
+        index = [self _indexAtPoint:location];
+
+    return [_delegate collectionView:self menuForItemAtIndex:index];
+}
+
+- (int)_indexAtPoint:(CGPoint)thePoint
+{
+    var row = FLOOR(thePoint.y / (_itemSize.height + _verticalMargin)),
+        column = FLOOR(thePoint.x / (_itemSize.width + _horizontalMargin));
+
+    return row * _numberOfColumns + column;
+}
+
 - (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
 {
    return [_items objectAtIndex:anIndex];
@@ -897,6 +979,22 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK

@implementation CPCollectionView (CPCoding)

+- (void)awakeFromCib
+{
+    [super awakeFromCib];
+
+    var prototypeView = [_itemPrototype view];
+    if (prototypeView && (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero())))
+    {
+        var item = _itemPrototype;
+
+        if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
+            _minItemSize = [prototypeView frameSize];
+        else if (CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
+            _maxItemSize = [prototypeView frameSize];
+    }
+}
+
 - (id)initWithCoder:(CPCoder)aCoder
 {
    self = [super initWithCoder:aCoder];
@@ -910,11 +1008,11 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK

        _itemSize = CGSizeMakeZero();

-        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey] || CGSizeMakeZero();
-        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey] || CGSizeMakeZero();
+        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey];
+        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey];

-        _maxNumberOfRows = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfRowsKey] || 0;
-        _maxNumberOfColumns = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfColumnsKey] || 0;
+        _maxNumberOfRows = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfRowsKey];
+        _maxNumberOfColumns = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfColumnsKey];

        _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];

@@ -27,6 +27,7 @@
@import "CPCompatibility.j"
@import "CPImage.j"

+/// @cond IGNORE

 var _redComponent        = 0,
    _greenComponent      = 1,
@@ -54,6 +55,66 @@ var cachedBlackColor,
    cachedShadowColor,
    cachedClearColor;

+/// @endcond
+
+/*!
+    Orientation to use with \c CPColorPattern for vertical patterns.
+*/
+CPColorPatternIsVertical = YES;
+
+/*!
+    Orientation to use with \c CPColorPattern for horizontal patterns.
+*/
+CPColorPatternIsHorizontal = NO;
+
+/*!
+    To create a simple color with a pattern image:
+
+    <code>CPColorWithImages(name, width, height{, bundle})</code>
+
+    To create a color with a three part pattern image:
+
+    <code>CPColorWithImages(slices{, orientation})</code>
+
+    where slices is an array of three [name, width, height{, bundle}] arrays,
+    and orientation is \c CPColorPatternIsVertical or \ref CPColorPatternIsHorizontal.
+    If orientatation is not passed, it defaults to \ref CPColorPatternIsHorizontal.
+
+    To create a color with a nine part pattern image:
+
+    <code>CPColorWithImages(slices);</code>
+
+    where slices is an array of nine [name, width, height{, bundle}] arrays.
+*/
+function CPColorWithImages()
+{
+    if (arguments.length < 3)
+    {
+        var slices = arguments[0],
+            imageSlices = [];
+
+        for (var i = 0; i < slices.length; ++i)
+        {
+            var slice = slices[i];
+
+            imageSlices.push(slice ? CPImageInBundle(slice[0], CGSizeMake(slice[1], slice[2]), slice[3]) : nil);
+        }
+
+        if (imageSlices.length === 3)
+            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:arguments[1] || CPColorPatternIsHorizontal]];
+        else
+            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
+    }
+    else if (arguments.length === 3 || arguments.length === 4)
+    {
+        return [CPColor colorWithPatternImage:CPImageInBundle(arguments[0], CGSizeMake(arguments[1], arguments[2]), arguments[3])];
+    }
+    else
+    {
+        return nil;
+    }
+}
+
 /*!
    @ingroup appkit

@@ -72,7 +133,7 @@ var cachedBlackColor,
 }

 /*!
-    Creates a color in the RGB color space, with an alpha value.
+    Creates a color in the RGB colorspace, with an alpha value.
    Each component should be between the range of 0.0 to 1.0. For
    the alpha component, a value of 1.0 is opaque, and 0.0 means
    completely transparent.
@@ -86,13 +147,13 @@ var cachedBlackColor,
 */
 + (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
 {
-    return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
+    return [[CPColor alloc] _initWithRGBA:[MAX(0.0, MIN(1.0, red)), MAX(0.0, MIN(1.0, green)), MAX(0.0, MIN(1.0, blue)), MAX(0.0, MIN(1.0, alpha))]];
 }

 /*!
    @deprecated in favor of colorWithRed:green:blue:alpha:

-    Creates a color in the RGB color space, with an alpha value.
+    Creates a color in the RGB colorspace, with an alpha value.
    Each component should be between the range of 0.0 to 1.0. For
    the alpha component, a value of 1.0 is opaque, and 0.0 means
    completely transparent.
@@ -125,7 +186,7 @@ var cachedBlackColor,
 }

 /*!
-    @deprecated in favor of colorWithWhite:apha:
+    @deprecated in favor of colorWithWhite:alpha:

    Creates a new color object with \c white for the RGB components.
    For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
@@ -167,12 +228,12 @@ var cachedBlackColor,

    switch (FLOOR(hue / 60))
    {
-        case 0: return [CPColor colorWithCalibratedRed: b green: t blue: p alpha: alpha];
-        case 1: return [CPColor colorWithCalibratedRed: q green: b blue: p alpha: alpha];
-        case 2: return [CPColor colorWithCalibratedRed: p green: b blue: t alpha: alpha];
-        case 3: return [CPColor colorWithCalibratedRed: p green: q blue: b alpha: alpha];
-        case 4: return [CPColor colorWithCalibratedRed: t green: p blue: b alpha: alpha];
-        case 5: return [CPColor colorWithCalibratedRed: b green: p blue: q alpha: alpha];
+        case 0: return [CPColor colorWithCalibratedRed:b green:t blue:p alpha:alpha];
+        case 1: return [CPColor colorWithCalibratedRed:q green:b blue:p alpha:alpha];
+        case 2: return [CPColor colorWithCalibratedRed:p green:b blue:t alpha:alpha];
+        case 3: return [CPColor colorWithCalibratedRed:p green:q blue:b alpha:alpha];
+        case 4: return [CPColor colorWithCalibratedRed:t green:p blue:b alpha:alpha];
+        case 5: return [CPColor colorWithCalibratedRed:b green:p blue:q alpha:alpha];
    }
 }

@@ -192,6 +253,17 @@ var cachedBlackColor,
    return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null;
 }

+/*!
+    Creates a color in the sRGB colorspace with the given components and alpha values.
+    Values below 0.0 are treated as 0.0 and values above 1.0 are treated as 1.0.
+*/
+ (CPColor)colorWithSRGBRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
+{
+    // TODO If Cappuccino is ported to a colorspace aware platform, this color should be in
+    // sRGBColorSpace.
+    return [self colorWithRed:red green:green blue:blue alpha:alpha];
+}
+
 /*!
    Returns a black color object. (RGBA=[0.0, 0.0, 0.0, 1.0])
 */
@@ -416,10 +488,12 @@ var cachedBlackColor,
        parseInt(parts[0], 10) / 255.0,
        parseInt(parts[1], 10) / 255.0,
        parseInt(parts[2], 10) / 255.0,
-        parts[3] ? parseInt(parts[3], 10) / 255.0 : 1.0
+        parts[3] ? parseFloat(parts[3], 10) : 1.0
    ];

-    _cssString = aString;
+    // We can't reuse aString as _cssString because the browser might not support the `rgba` syntax, and aString might
+    // use it (issue #1413.)
+    [self _initCSSStringFromComponents];

    return self;
 }
@@ -433,18 +507,23 @@ var cachedBlackColor,
    {
        _components = components;

-        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-            parseInt(_components[0] * 255.0) + ", " +
-            parseInt(_components[1] * 255.0) + ", " +
-            parseInt(_components[2] * 255.0) +
-            (hasAlpha ?  (", " + _components[3]) : "") + ")";
+        [self _initCSSStringFromComponents];
    }

    return self;
 }

+- (void)_initCSSStringFromComponents
+{
+    var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+    _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+        parseInt(_components[0] * 255.0) + ", " +
+        parseInt(_components[1] * 255.0) + ", " +
+        parseInt(_components[2] * 255.0) +
+        (hasAlpha ?  (", " + _components[3]) : "") + ")";
+}
+
 /* @ignore */
 - (id)_initWithPatternImage:(CPImage)anImage
 {
@@ -605,7 +684,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 */
 - (CPString)hexString
 {
-    return rgbToHex([self redComponent], [self greenComponent], [self blueComponent])
+    return rgbToHex([self redComponent], [self greenComponent], [self blueComponent]);
 }

 - (BOOL)isEqual:(CPColor)aColor
@@ -616,12 +695,53 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
    if (aColor === self)
        return YES;

-    return [aColor isKindOfClass:CPColor] && [aColor cssString] === [self cssString];
+    if (![aColor isKindOfClass:CPColor])
+        return NO;
+
+    if (_patternImage || [aColor patternImage])
+        return [_patternImage isEqual:[aColor patternImage]];
+
+    // We don't require the components to be equal beyond 8 bits since otherwise
+    // simple rounding errors will make two colours which are exactly the same on
+    // screen compare unequal.
+    return ROUND([self redComponent] * 255.0) == ROUND([aColor redComponent] * 255.0) &&
+           ROUND([self greenComponent] * 255.0) == ROUND([aColor greenComponent] * 255.0) &&
+           ROUND([self blueComponent] * 255.0) == ROUND([aColor blueComponent] * 255.0) &&
+           [self alphaComponent] == [aColor alphaComponent];
 }

 - (CPString)description
 {
-    return [super description]+" "+[self cssString];
+    var description = [super description],
+        patternImage = [self patternImage];
+
+    if (!patternImage)
+        return description + " " + [self cssString];
+
+    description += " {\n";
+
+    if ([patternImage isThreePartImage] || [patternImage isNinePartImage])
+    {
+        var slices = [patternImage imageSlices];
+
+        if ([patternImage isThreePartImage])
+            description += "    orientation: " + ([patternImage isVertical] ? "vertical" : "horizontal") + ",\n";
+
+        description += "    patternImage (" + slices.length + " part): [\n";
+
+        for (var i = 0; i < slices.length; ++i)
+        {
+            var imgDescription = [slices[i] description];
+
+            description += imgDescription.replace(/^/mg, "        ") + ",\n";
+        }
+
+        description = description.substr(0, description.length - 2) + "\n    ]\n}";
+    }
+    else
+        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
+
+    return description;
 }

@end
@@ -666,8 +786,10 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image

@end

+/// @cond IGNORE
 var CPColorComponentsKey    = @"CPColorComponentsKey",
    CPColorPatternImageKey  = @"CPColorPatternImageKey";
+/// @endcond

@implementation CPColor (CPCoding)

@@ -698,13 +820,12 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
@end


+/// @cond IGNORE
 var hexCharacters = "0123456789ABCDEF";

-/*!
-    Used for the CPColor \c +colorWithHexString: implementation
-    @ignore
-    @class CPColor
-    @return an array of rgb components
+/*
+    Used for the CPColor +colorWithHexString: implementation.
+    Returns an array of rgb components.
 */
 var hexToRGB = function(hex)
 {
@@ -742,3 +863,5 @@ var byteToHex = function(n)
    return hexCharacters.charAt((n - n % 16) / 16) +
           hexCharacters.charAt(n % 16);
 };
+
+/// @endcond
@@ -51,7 +51,7 @@ CPWheelColorPickerMode = 1;
 */
 CPSliderColorPickerMode = 2;

-CPColorPickerViewWidth  = 265,
+CPColorPickerViewWidth  = 265;
 CPColorPickerViewHeight = 370;

 /*!
@@ -131,7 +131,7 @@ CPColorPickerViewHeight = 370;
        [self setFloatingPanel:YES];
        [self setBecomesKeyOnlyIfNeeded:YES];

-        [self setMinSize:CGSizeMake(219.0, 342.0)];
+        [self setMinSize:CGSizeMake(219.0, 363.0)];
        [self setMaxSize:CGSizeMake(323.0, 537.0)];
    }

@@ -144,7 +144,7 @@ CPColorPickerViewHeight = 370;
 - (void)setColor:(CPColor)aColor
 {
    _color = aColor;
-    [_previewView setBackgroundColor: _color];
+    [_previewView setBackgroundColor:_color];

    [CPApp sendAction:@selector(changeColor:) to:nil from:self];

@@ -299,7 +299,7 @@ CPColorPickerViewHeight = 370;
        bounds = [contentView bounds];

    _toolbar = [[CPView alloc] initWithFrame:CGRectMake(0, 6, CGRectGetWidth(bounds), TOOLBAR_HEIGHT)];
-    [_toolbar setAutoresizingMask: CPViewWidthSizable];
+    [_toolbar setAutoresizingMask:CPViewWidthSizable];

    var totalToolbarWidth = count * ICON_WIDTH + (count - 1) * ICON_PADDING,
        leftOffset = (CGRectGetWidth(bounds) - totalToolbarWidth) / 2.0,
@@ -339,7 +339,7 @@ CPColorPickerViewHeight = 370;

    [previewBox addSubview:_previewView];

-    var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
+    var _previewLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
    [_previewLabel setStringValue:"Preview:"];
    [_previewLabel setTextColor:[CPColor blackColor]];
    [_previewLabel setAlignment:CPRightTextAlignment];
@@ -357,14 +357,14 @@ CPColorPickerViewHeight = 370;

    [swatchBox addSubview:_swatchView];

-    var _swatchLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
-    [_swatchLabel setStringValue: "Swatches:"];
+    var _swatchLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
+    [_swatchLabel setStringValue:"Swatches:"];
    [_swatchLabel setTextColor:[CPColor blackColor]];
    [_swatchLabel setAlignment:CPRightTextAlignment];


-    var opacityLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
-    [opacityLabel setStringValue: "Opacity:"];
+    var opacityLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
+    [opacityLabel setStringValue:"Opacity:"];
    [opacityLabel setTextColor:[CPColor blackColor]];
    [opacityLabel setAlignment:CPRightTextAlignment];

@@ -372,6 +372,7 @@ CPColorPickerViewHeight = 370;

    [_opacitySlider setMinValue:0.0];
    [_opacitySlider setMaxValue:1.0];
+    [_opacitySlider setAutoresizingMask:CPViewWidthSizable];

    [_opacitySlider setTarget:self];
    [_opacitySlider setAction:@selector(setOpacity:)];
@@ -388,7 +389,7 @@ CPColorPickerViewHeight = 370;
    _action = nil;
    _activePicker = nil;

-    [_previewView setBackgroundColor: _color];
+    [_previewView setBackgroundColor:_color];

    if (buttonForLater)
        [self _setPicker:buttonForLater];
@@ -406,12 +407,13 @@ CPColorPickerViewHeight = 370;


 CPColorDragType = "CPColorDragType";
+
 var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";

 /* @ignore */
@implementation _CPColorPanelSwatches : CPView
 {
-    CPView[]        _swatches;
+    CPArray         _swatches;
    CPColor         _dragColor;
    CPColorPanel    _colorPanel;
    CPCookie        _swatchCookie;
@@ -421,13 +423,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
    self = [super initWithFrame:aFrame];

-    [self setBackgroundColor: [CPColor grayColor]];
+    [self setBackgroundColor:[CPColor grayColor]];

    [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];

    var whiteColor = [CPColor whiteColor];

-    _swatchCookie = [[CPCookie alloc] initWithName: CPColorPanelSwatchesCookie];
+    _swatchCookie = [[CPCookie alloc] initWithName:CPColorPanelSwatchesCookie];
    var colorList = [self startingColorList];

    _swatches = [];
@@ -435,15 +437,15 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    for (var i = 0; i < 50; i++)
    {
        // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-        var view = [[CPView alloc] initWithFrame: CPRectMake(13 * i + 1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame:CPRectMake(13 * i + 1, 1, 12, 12)],
            fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];

        [view setBackgroundColor:whiteColor];
-        [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
+        [fillView setBackgroundColor:(i < colorList.length) ? colorList[i] : whiteColor];

        [view addSubview:fillView];

-        [self addSubview: view];
+        [self addSubview:view];

        _swatches.push(view);
    }
@@ -460,7 +462,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
    var cookieValue = [_swatchCookie value];

-    if (cookieValue == "")
+    if (!cookieValue)
    {
        return [
            [CPColor blackColor],
@@ -479,7 +481,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
        result = [];

    for (var i = 0; i < cookieValue.length; i++)
-        result.push([CPColor colorWithHexString: cookieValue[i]]);
+        result.push([CPColor colorWithHexString:cookieValue[i]]);

    return result;
 }
@@ -494,7 +496,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    var future = new Date();
    future.setYear(2019);

-    [_swatchCookie setValue: JSON.stringify(result) expires:future domain: nil];
+    [_swatchCookie setValue:JSON.stringify(result) expires:future domain:nil];
 }

 - (void)setColorPanel:(CPColorPanel)panel
@@ -527,14 +529,14 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    if (!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
        return NO;

-    [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
+    [_colorPanel setColor:[self colorAtIndex:FLOOR(point.x / 13)] updatePicker:YES];
 }

 - (void)mouseDragged:(CPEvent)anEvent
 {
    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];

-     if(point.x > [self bounds].size.width - 1 || point.x < 1)
+     if (point.x > [self bounds].size.width - 1 || point.x < 1)
        return NO;

    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];
@@ -544,10 +546,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
    _dragColor = [[swatch subviews][0] backgroundColor];

-    var bounds = CPRectCreateCopy([swatch bounds]);
+    var bounds = CGRectMakeCopy([swatch bounds]);

    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame: bounds],
+    var dragView = [[CPView alloc] initWithFrame:bounds],
        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];

    [dragView setBackgroundColor:[CPColor blackColor]];
@@ -555,13 +557,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";

    [dragView addSubview:dragFillView];

-    [self dragView: dragView
-                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset: CPPointMake(0.0, 0.0)
-             event: anEvent
-        pasteboard: nil
-            source: self
-         slideBack: YES];
+    [self dragView:dragView
+                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset:CGPointMake(0.0, 0.0)
+             event:anEvent
+        pasteboard:nil
+            source:self
+         slideBack:YES];
 }

 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
@@ -579,7 +581,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    if (![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
        return NO;

-    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex: FLOOR(location.x / 13)];
+    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex:FLOOR(location.x / 13)];
 }

@end
@@ -634,7 +636,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    var bounds = CPRectMake(0, 0, 15, 15);

    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame: bounds],
+    var dragView = [[CPView alloc] initWithFrame:bounds],
        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];

    [dragView setBackgroundColor:[CPColor blackColor]];
@@ -642,13 +644,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";

    [dragView addSubview:dragFillView];

-    [self dragView: dragView
-                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset: CPPointMake(0.0, 0.0)
-             event: anEvent
-        pasteboard: nil
-            source: self
-         slideBack: YES];
+    [self dragView:dragView
+                at:CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset:CPPointMake(0.0, 0.0)
+             event:anEvent
+        pasteboard:nil
+            source:self
+         slideBack:YES];
 }

 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
@@ -44,10 +44,11 @@
 */
 - (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
 {
-    self = [super init];
-
-    _panel = aPanel;
-    _mask  = aMask;
+    if (self = [super init])
+    {
+        _panel = aPanel;
+        _mask  = aMask;
+    }

    return self;
 }
@@ -76,7 +77,6 @@
 */
 - (void)setMode:(CPColorPanelMode)mode
 {
-    return;
 }

 /*!
@@ -85,7 +85,6 @@
 */
 - (void)setColor:(CPColor)aColor
 {
-    return;
 }

@end
@@ -110,12 +109,12 @@

 - (id)initView
 {
-    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    var aFrame = _CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);

    _pickerView = [[CPView alloc] initWithFrame:aFrame];
    [_pickerView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

-    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:_CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];

    [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
    [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
@@ -128,9 +127,9 @@
    [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];

-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame: CPRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
-    [_hueSaturationView setDelegate: self];
-    [_hueSaturationView setAutoresizingMask: (CPViewWidthSizable | CPViewHeightSizable)];
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:_CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    [_hueSaturationView setDelegate:self];
+    [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];

    [_pickerView addSubview:_hueSaturationView];
    [_pickerView addSubview:_brightnessSlider];
@@ -225,46 +224,49 @@

 - (id)initWithFrame:(CPRect)aFrame
 {
-    self = [super initWithFrame:aFrame];
-
-    var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
-
-    _wheelImage = new Image();
-    _wheelImage.src = path;
-    _wheelImage.style.position = "absolute";
-
-    path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
-
-    _blackWheelImage = new Image();
-    _blackWheelImage.src = path;
-    _blackWheelImage.style.opacity = "0";
-    _blackWheelImage.style.filter = "alpha(opacity=0)"
-    _blackWheelImage.style.position = "absolute";
-
+    if (self = [super initWithFrame:aFrame])
+    {
 #if PLATFORM(DOM)
-    _DOMElement.appendChild(_wheelImage);
-    _DOMElement.appendChild(_blackWheelImage);
+        var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
+
+        _wheelImage = new Image();
+        _wheelImage.src = path;
+        _wheelImage.style.position = "absolute";
+
+        path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
+
+        _blackWheelImage = new Image();
+        _blackWheelImage.src = path;
+        _blackWheelImage.style.opacity = "0";
+        _blackWheelImage.style.filter = "alpha(opacity=0)"
+        _blackWheelImage.style.position = "absolute";
+
+        _DOMElement.appendChild(_wheelImage);
+        _DOMElement.appendChild(_blackWheelImage);
 #endif

-    [self setWheelSize:aFrame.size];
+        [self setWheelSize:aFrame.size];

-    _crosshair = [[CPView alloc] initWithFrame:CPRectMake(_radius - 2, _radius - 2, 4, 4)];
-    [_crosshair setBackgroundColor:[CPColor blackColor]];
+        _crosshair = [[CPView alloc] initWithFrame:CGRectMake(_radius - 2, _radius - 2, 4, 4)];
+        [_crosshair setBackgroundColor:[CPColor blackColor]];

-    var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
-    [view setBackgroundColor:[CPColor whiteColor]];
+        var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
+        [view setBackgroundColor:[CPColor whiteColor]];

-    [_crosshair addSubview:view];
+        [_crosshair addSubview:view];

-    [self addSubview:_crosshair];
+        [self addSubview:_crosshair];
+    }

    return self;
 }

 - (void)setWheelBrightness:(float)brightness
 {
+#if PLATFORM(DOM)
    _blackWheelImage.style.opacity = 1.0 - brightness;
    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness) * 100 + ")"
+#endif
 }

 - (void)setFrameSize:(CPSize)aSize
@@ -277,6 +279,7 @@
 {
    var min = MIN(aSize.width, aSize.height);

+#if PLATFORM(DOM)
    _blackWheelImage.style.width = min;
    _blackWheelImage.style.height = min;
    _blackWheelImage.width = min;
@@ -290,6 +293,7 @@
    _wheelImage.height = min;
    _wheelImage.style.top = (aSize.height - min) / 2.0 + "px";
    _wheelImage.style.left = (aSize.width - min) / 2.0 + "px";
+#endif

    _radius = min / 2.0;

@@ -0,0 +1,62 @@
+/*
+ * CPColorSpace.j
+ * AppKit
+ *
+ * Created by Alexander Ljungberg.
+ * Copyright 2012, SlevenBits Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+var sRGBColorSpace = nil;
+
+/*!
+    Represent color spaces.
+*/
+@implementation CPColorSpace : CPObject
+{
+    CGColorSpace _cgColorSpace;
+}
+
+/*!
+    Return an object representing the standard sRGB color space.
+*/
+ (CPColorSpace)sRGBColorSpace
+{
+    if (!sRGBColorSpace)
+        sRGBColorSpace = [[self alloc] initWithCGColorSpace:CGColorSpaceCreateDeviceRGB()];
+    return sRGBColorSpace;
+}
+
+- (id)initWithCGColorSpace:(CGColorSpace)cgColorSpace
+{
+    if (self = [super init])
+    {
+        _cgColorSpace = cgColorSpace;
+    }
+
+    return self;
+}
+
+/*!
+    Return a Core Graphics color space representing the receiver.
+*/
+- (CGColorSpace)CGColorSpace
+{
+    return _cgColorSpace;
+}
+
+@end
+
@@ -43,7 +43,33 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    BOOL    _bordered;

    CPColor _color;
-    CPView  _wellView;
+}
+
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding == CPValueBinding)
+        return [CPColorWellValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
+ (CPString)defaultThemeClass
+{
+    return @"colorwell";
+}
+
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), [CPNull null], _CGInsetMake(3.0, 3.0, 3.0, 3.0), _CGInsetMakeZero(), [CPNull null]]
+                                       forKeys:[@"bezel-inset", @"bezel-color", @"content-inset", @"content-border-inset", @"content-border-color"]];
+}
+
+- (void)_reverseSetBinding
+{
+    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
+        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
+
+    [theBinding reverseSetValueFor:@"color"];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -53,11 +79,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    if (self)
    {
        _active = NO;
-        _bordered = YES;
        _color = [CPColor whiteColor];
-
-        [self drawBezelWithHighlight:NO];
-        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+        [self setBordered:YES];

        [self _registerForNotifications];
    }
@@ -82,25 +105,23 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
             object:[CPColorPanel sharedColorPanel]];
 }

+/*!
+    Sets whether the color well is bordered.
+*/
+- (void)setBordered:(BOOL)shouldBeBordered
+{
+    if (shouldBeBordered)
+        [self setThemeState:CPThemeStateBordered];
+    else
+        [self unsetThemeState:CPThemeStateBordered];
+}
+
 /*!
    Returns whether the color well is bordered
 */
 - (BOOL)isBordered
 {
-    return _bordered;
-}
-
-/*!
-    Sets the color well's current color.
-*/
- (void)setBordered:(BOOL)bordered
-{
-    if (_bordered == bordered)
-        return;
-
-    _bordered = bordered;
-
-    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+    return [self hasThemeState:CPThemeStateBordered];
 }

 // Managing Color From Color Wells
@@ -123,7 +144,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv

    _color = aColor;

-    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+    [self setNeedsLayout];
 }

 /*!
@@ -186,31 +207,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    return _active;
 }

-// Drawing a Color Well
-
- (void)drawBezelWithHighlight:(BOOL)shouldHighlight
-{
-}
-
-/*!
-    Draws the colored area inside the color well without borders.
-    @param aRect the location at which to draw
-*/
- (void)drawWellInside:(CGRect)aRect
-{
-    if (!_wellView)
-    {
-        _wellView = [[CPView alloc] initWithFrame:aRect];
-        [_wellView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self addSubview:_wellView];
-    }
-    else
-        [_wellView setFrame:aRect];
-
-    [_wellView setBackgroundColor:_color];
-}
-
 - (void)colorPanelDidChangeColor:(CPNotification)aNotification
 {
    [self takeColorFrom:[aNotification object]];
@@ -229,27 +225,11 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    [self deactivate];
 }

- (void)mouseDown:(CPEvent)anEvent
+- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    if (![self isEnabled])
-        return;
+    [self highlight:NO];

-    [self drawBezelWithHighlight:YES];
-}
-
- (void)mouseDragged:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
-}
-
- (void)mouseUp:(CPEvent)anEvent
-{
-    [self drawBezelWithHighlight:NO];
-
-    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]) || ![self isEnabled])
+    if (!mouseIsUp || !CGRectContainsPoint([self bounds], aPoint) || ![self isEnabled])
        return;

    [self activate:YES];
@@ -260,6 +240,115 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    [colorPanel orderFront:self];
 }

+- (CGRect)contentRectForBounds:(CGRect)bounds
+{
+    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
+
+    return _CGRectInsetByInset(bounds, contentInset);
+}
+
+- (CGRect)bezelRectForBounds:(CGRect)bounds
+{
+    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
+
+    return _CGRectInsetByInset(bounds, bezelInset);
+}
+
+- (CGRect)contentBorderRectForBounds:(CGRect)bounds
+{
+    var contentBorderInset = [self currentValueForThemeAttribute:@"content-border-inset"];
+
+    return _CGRectInsetByInset(bounds, contentBorderInset);
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
+{
+    switch (aName)
+    {
+        case "bezel-view":
+            return [self bezelRectForBounds:[self bounds]];
+        case "content-view":
+            return [self contentRectForBounds:[self bounds]];
+        case "content-border-view":
+            return [self contentBorderRectForBounds:[self bounds]];
+    }
+
+    return [super rectForEphemeralSubviewNamed:aName];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+
+    [view setHitTests:NO];
+
+    return view;
+}
+
+- (void)layoutSubviews
+{
+    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:@"content-view"];
+
+    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+    var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
+                                             positioned:CPWindowAbove
+                        relativeToEphemeralSubviewNamed:@"bezel-view"];
+
+
+    [contentView setBackgroundColor:_color];
+
+    var contentBorderView = [self layoutEphemeralSubviewNamed:@"content-border-view"
+                                                   positioned:CPWindowAbove
+                              relativeToEphemeralSubviewNamed:@"content-view"];
+
+    [contentBorderView setBackgroundColor:[self currentValueForThemeAttribute:@"content-border-color"]];
+}
+
+@end
+
+@implementation CPColorWellValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    var placeholderColor = [CPColor blueColor];
+
+    [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:placeholderColor forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setValueFor:(CPString)theBinding
+{
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [destination valueForKeyPath:keyPath],
+        isPlaceholder = CPIsControllerMarker(newValue);
+
+    if (isPlaceholder)
+    {
+        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        {
+           [CPException raise:CPGenericException
+                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
+        }
+
+        newValue = [self _placeholderForMarker:newValue];
+    }
+    else
+    {
+        newValue = [self transformValue:newValue withOptions:options];
+    }
+
+    [_source setColor:newValue];
+}
+
@end

 var CPColorWellColorKey     = "CPColorWellColorKey",
@@ -278,11 +367,8 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
    if (self)
    {
        _active = NO;
-        _bordered = [aCoder decodeBoolForKey:CPColorWellBorderedKey];
        _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
-
-        [self drawBezelWithHighlight:NO];
-        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+        [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];

        [self _registerForNotifications];
    }
@@ -296,19 +382,10 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // We do this in order to avoid encoding the _wellView, which
-    // should just automatically be created programmatically as needed.
-    var actualSubviews = _subviews;
-
-    _subviews = [_subviews copy];
-    [_subviews removeObjectIdenticalTo:_wellView];
-
    [super encodeWithCoder:aCoder];

-    _subviews = actualSubviews;
-
    [aCoder encodeObject:_color forKey:CPColorWellColorKey];
-    [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey];
+    [aCoder encodeObject:[self isBordered] forKey:CPColorWellBorderedKey];
 }

@end
@@ -44,20 +44,20 @@ CPHTMLCanvasFeature                     = 1 << 6;
 CPHTMLContentEditableFeature            = 1 << 7;
 CPHTMLDragAndDropFeature                = 1 << 8;

-CPJavascriptInnerTextFeature            = 1 << 9;
-CPJavascriptTextContentFeature          = 1 << 10;
-CPJavascriptClipboardEventsFeature      = 1 << 11;
-CPJavascriptClipboardAccessFeature      = 1 << 12;
+CPJavaScriptInnerTextFeature            = 1 << 9;
+CPJavaScriptTextContentFeature          = 1 << 10;
+CPJavaScriptClipboardEventsFeature      = 1 << 11;
+CPJavaScriptClipboardAccessFeature      = 1 << 12;
 CPJavaScriptCanvasDrawFeature           = 1 << 13;
 CPJavaScriptCanvasTransformFeature      = 1 << 14;

 CPVMLFeature                            = 1 << 15;

-CPJavascriptRemedialKeySupport          = 1 << 16;
+CPJavaScriptRemedialKeySupport          = 1 << 16;
 CPJavaScriptShadowFeature               = 1 << 20;

 CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
-CPJavaScriptMouseWheelValues_8_15       = 1 << 23
+CPJavaScriptMouseWheelValues_8_15       = 1 << 23;

 CPOpacityRequiresFilterFeature          = 1 << 24;

@@ -65,6 +65,14 @@ CPOpacityRequiresFilterFeature          = 1 << 24;
 CPInputTypeCanBeChangedFeature          = 1 << 25;
 CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;

+CPSOPDisabledFromFileURLs               = 1 << 27;
+
+// element.style.font can be set for an element not in the DOM.
+CPInputSetFontOutsideOfDOM              = 1 << 28;
+
+// Input elements have 1 px of extra padding on the left regardless of padding setting.
+CPInput1PxLeftPadding                   = 1 << 29;
+CPInputOnInputEventFeature              = 1 << 30;

 var USER_AGENT                          = "",
    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
@@ -73,6 +81,7 @@ var USER_AGENT                          = "",
 // default these features to true

 PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
+PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;

 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
    USER_AGENT = window.navigator.userAgent;
@@ -92,12 +101,15 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope

    // Features we can only be sure of with IE (no known independent tests)
    PLATFORM_FEATURES |= CPVMLFeature;
-    PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+    PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;

    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;

    PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
+
+    // Tested in Internet Explore 8 and 9.
+    PLATFORM_FEATURES &= ~CPInputSetFontOutsideOfDOM;
 }

 // WebKit
@@ -112,8 +124,8 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
    if (USER_AGENT.indexOf("Chrome") === -1)
        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;

-    PLATFORM_FEATURES |= CPJavascriptClipboardEventsFeature;
-    PLATFORM_FEATURES |= CPJavascriptClipboardAccessFeature;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardEventsFeature;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardAccessFeature;
    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;

    var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
@@ -124,15 +136,22 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
        minorVersion = parseInt(versionString.substr(versionDivision + 1));

    if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
-        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;

    // FIXME this is a terrible hack to get around this bug:
    // https://bugs.webkit.org/show_bug.cgi?id=21548
    if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;

    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
+
+    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
+    if (majorVersion < 537)
+        PLATFORM_FEATURES |= CPInput1PxLeftPadding;
+
+    if (USER_AGENT.indexOf("Chrome") === CPNotFound)
+        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
 }

 // KHTML
@@ -156,6 +175,9 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.

    if (version < 3.0)
        PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
+
+    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
+    PLATFORM_FEATURES |= CPInput1PxLeftPadding;
 }

 // Feature Specific Checks
@@ -178,9 +200,19 @@ if (typeof document != "undefined")

    // Detect whether we have innerText or textContent (or neither)
    if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES |= CPJavascriptInnerTextFeature;
+        PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
    else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES |= CPJavascriptTextContentFeature;
+        PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
+
+    var DOMInputElement = document.createElement("input");
+    if ("oninput" in DOMInputElement)
+        PLATFORM_FEATURES |= CPInputOnInputEventFeature;
+    else if (typeof DOMInputElement.setAttribute === "function")
+    {
+        DOMInputElement.setAttribute("oninput", "return;");
+        if (typeof DOMInputElement.oninput === "function")
+            PLATFORM_FEATURES |= CPInputOnInputEventFeature;
+    }
 }

 function CPFeatureIsCompatible(aFeature)
@@ -20,36 +20,44 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#import "../Foundation/Ref.h"
+
+@import "../Foundation/CPFormatter.j"
@import "CPFont.j"
@import "CPShadow.j"
@import "CPView.j"
@import "CPKeyValueBinding.j"

+CPLeftTextAlignment      = 0;
+CPRightTextAlignment     = 1;
+CPCenterTextAlignment    = 2;
+CPJustifiedTextAlignment = 3;
+CPNaturalTextAlignment   = 4;

-CPLeftTextAlignment             = 0;
-CPRightTextAlignment            = 1;
-CPCenterTextAlignment           = 2;
-CPJustifiedTextAlignment        = 3;
-CPNaturalTextAlignment          = 4;
+CPRegularControlSize = 0;
+CPSmallControlSize   = 1;
+CPMiniControlSize    = 2;

-CPRegularControlSize            = 0;
-CPSmallControlSize              = 1;
-CPMiniControlSize               = 2;
+CPLineBreakByWordWrapping     = 0;
+CPLineBreakByCharWrapping     = 1;
+CPLineBreakByClipping         = 2;
+CPLineBreakByTruncatingHead   = 3;
+CPLineBreakByTruncatingTail   = 4;
+CPLineBreakByTruncatingMiddle = 5;

-CPLineBreakByWordWrapping       = 0;
-CPLineBreakByCharWrapping       = 1;
-CPLineBreakByClipping           = 2;
-CPLineBreakByTruncatingHead     = 3;
-CPLineBreakByTruncatingTail     = 4;
-CPLineBreakByTruncatingMiddle   = 5;
+CPTopVerticalTextAlignment    = 1;
+CPCenterVerticalTextAlignment = 2;
+CPBottomVerticalTextAlignment = 3;

-CPTopVerticalTextAlignment      = 1,
-CPCenterVerticalTextAlignment   = 2,
-CPBottomVerticalTextAlignment   = 3;
+// Deprecated for use with images, use the CPImageScale constants
+CPScaleProportionally = 0;
+CPScaleToFit          = 1;
+CPScaleNone           = 2;

-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
+CPImageScaleProportionallyDown     = 0;
+CPImageScaleAxesIndependently      = 1;
+CPImageScaleNone                   = 2;
+CPImageScaleProportionallyUpOrDown = 3;

 CPNoImage       = 0;
 CPImageOnly     = 1;
@@ -59,9 +67,9 @@ CPImageBelow    = 4;
 CPImageAbove    = 5;
 CPImageOverlaps = 6;

-CPOnState                       = 1;
-CPOffState                      = 0;
-CPMixedState                    = -1;
+CPOnState    = 1;
+CPOffState   = 0;
+CPMixedState = -1;

 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -72,7 +80,7 @@ CPControlTextDidBeginEditingNotification    = "CPControlTextDidBeginEditingNotif
 CPControlTextDidChangeNotification          = "CPControlTextDidChangeNotification";
 CPControlTextDidEndEditingNotification      = "CPControlTextDidEndEditingNotification";

-var CPControlBlackColor     = [CPColor blackColor];
+var CPControlBlackColor = [CPColor blackColor];

 /*!
    @ingroup appkit
@@ -83,6 +91,7 @@ var CPControlBlackColor     = [CPColor blackColor];
@implementation CPControl : CPView
 {
    id                  _value;
+    CPFormatter         _formatter @accessors(property=formatter);

    // Target-Action Support
    id                  _target;
@@ -95,8 +104,6 @@ var CPControlBlackColor     = [CPColor blackColor];
    BOOL                _trackingWasWithinFrame;
    unsigned            _trackingMouseDownFlags;
    CGPoint             _previousTrackingLocation;
-
-    CPString            _toolTip;
 }

 + (CPDictionary)themeAttributes
@@ -105,7 +112,7 @@ var CPControlBlackColor     = [CPColor blackColor];
                                                CPTopVerticalTextAlignment,
                                                CPLineBreakByClipping,
                                                [CPColor blackColor],
-                                                [CPFont systemFontOfSize:12.0],
+                                                [CPFont systemFontOfSize:CPFontCurrentSystemSize],
                                                [CPNull null],
                                                _CGSizeMakeZero(),
                                                CPImageLeft,
@@ -127,34 +134,48 @@ var CPControlBlackColor     = [CPColor blackColor];

 + (void)initialize
 {
-    if (self === [CPControl class])
-    {
-        [self exposeBinding:@"value"];
-        [self exposeBinding:@"objectValue"];
-        [self exposeBinding:@"stringValue"];
-        [self exposeBinding:@"integerValue"];
-        [self exposeBinding:@"intValue"];
-        [self exposeBinding:@"doubleValue"];
-        [self exposeBinding:@"floatValue"];
+    if (self !== [CPControl class])
+        return;

-        [self exposeBinding:@"enabled"];
-    }
+    [self exposeBinding:@"value"];
+    [self exposeBinding:@"objectValue"];
+    [self exposeBinding:@"stringValue"];
+    [self exposeBinding:@"integerValue"];
+    [self exposeBinding:@"intValue"];
+    [self exposeBinding:@"doubleValue"];
+    [self exposeBinding:@"floatValue"];
+
+    [self exposeBinding:@"enabled"];
+}
+
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding === CPValueBinding)
+        return [_CPValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
+/*!
+    Reverse set the binding iff the CPContinuouslyUpdatesValueBindingOption is set.
+*/
+- (void)_continuouslyReverseSetBinding
+{
+    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
+        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
+
+    if ([theBinding continuouslyUpdatesValue])
+        [theBinding reverseSetValueFor:@"objectValue"];
 }

 - (void)_reverseSetBinding
 {
-    var theBinding = [CPKeyValueBinding getBinding:CPValueBinding forObject:self];
+    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
+        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
+
    [theBinding reverseSetValueFor:@"objectValue"];
 }

- (void)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding === @"value")
-        return @"objectValue";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
@@ -169,7 +190,8 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Sets the receiver's target action
+    Sets the receiver's target action.
+
    @param anAction Sets the action message that gets sent to the target.
 */
 - (void)setAction:(SEL)anAction
@@ -178,7 +200,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Returns the receiver's target action
+    Returns the receiver's target action.
 */
 - (SEL)action
 {
@@ -187,6 +209,7 @@ var CPControlBlackColor     = [CPColor blackColor];

 /*!
    Sets the receiver's target. The target receives action messages from the receiver.
+
    @param aTarget the object that will receive the message specified by action
 */
 - (void)setTarget:(id)aTarget
@@ -204,13 +227,15 @@ var CPControlBlackColor     = [CPColor blackColor];

 /*!
    Causes \c anAction to be sent to \c anObject.
+
    @param anAction the action to send
    @param anObject the object to which the action will be sent
 */
- (void)sendAction:(SEL)anAction to:(id)anObject
+- (BOOL)sendAction:(SEL)anAction to:(id)anObject
 {
    [self _reverseSetBinding];
-    [CPApp sendAction:anAction to:anObject from:self];
+
+    return [CPApp sendAction:anAction to:anObject from:self];
 }

 - (int)sendActionOn:(int)mask
@@ -222,33 +247,6 @@ var CPControlBlackColor     = [CPColor blackColor];
    return previousMask;
 }

-/*!
-    Sets the tooltip for the receiver.
-    @param aToolTip the tooltip
-*/
-/*
-(void)setToolTip:(CPString)aToolTip
-{
-    if (_toolTip == aToolTip)
-        return;
-
-    _toolTip = aToolTip;
-
-#if PLATFORM(DOM)
-    _DOMElement.title = aToolTip;
-#endif
-}
-*/
-/*!
-    Returns the receiver's tooltip
-*/
-/*
-(CPString)toolTip
-{
-    return _toolTip;
-}
-*/
-
 /*!
    Returns whether the control can continuously send its action messages.
 */
@@ -260,7 +258,7 @@ var CPControlBlackColor     = [CPColor blackColor];

 /*!
    Sets whether the cell can continuously send its action messages.
- */
+*/
 - (void)setContinuous:(BOOL)flag
 {
    // Some subclasses should redefine this with CPLeftMouseDraggedMask
@@ -270,6 +268,9 @@ var CPControlBlackColor     = [CPColor blackColor];
        _sendActionOn &= ~CPPeriodicMask;
 }

+/*!
+    Returns YES if the receiver tracks the mouse outside the frame, otherwise NO.
+*/
 - (BOOL)tracksMouseOutsideOfFrame
 {
    return NO;
@@ -286,9 +287,14 @@ var CPControlBlackColor     = [CPColor blackColor];
        [self stopTracking:_previousTrackingLocation at:currentLocation mouseIsUp:YES];

        _trackingMouseDownFlags = 0;
+
+        if (isWithinFrame)
+            [self setThemeState:CPThemeStateHovered];
    }
    else
    {
+        [self unsetThemeState:CPThemeStateHovered];
+
        if (type === CPLeftMouseDown)
        {
            _trackingMouseDownFlags = [anEvent modifierFlags];
@@ -327,6 +333,11 @@ var CPControlBlackColor     = [CPColor blackColor];
    return 0;
 }

+/*!
+    Perform a click on the receiver.
+
+    @param sender - The sender object
+*/
 - (void)performClick:(id)sender
 {
    if (![self isEnabled])
@@ -349,11 +360,18 @@ var CPControlBlackColor     = [CPColor blackColor];
    }
 }

+/*!
+    @ignore
+    Fired when the button timer finished, usually after the user hits enter.
+*/
 - (void)unhighlightButtonTimerDidFinish:(id)sender
 {
    [self highlight:NO];
 }

+/*!
+    Returns the mask of modifier keys held down when the user clicked.
+*/
 - (unsigned)mouseDownFlags
 {
    return _trackingMouseDownFlags;
@@ -373,7 +391,10 @@ var CPControlBlackColor     = [CPColor blackColor];

 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    [self highlight:NO];
+    if (mouseIsUp)
+        [self highlight:NO];
+    else
+        [self highlight:YES];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -384,8 +405,27 @@ var CPControlBlackColor     = [CPColor blackColor];
    [self trackMouse:anEvent];
 }

+- (void)mouseEntered:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+
+    [self setThemeState:CPThemeStateHovered];
+}
+
+- (void)mouseExited:(CPEvent)anEvent
+{
+    var currentLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        isWithinFrame = [self tracksMouseOutsideOfFrame] || CGRectContainsPoint([self bounds], currentLocation);
+
+    // Make sure we're not still in the frame because Cappuccino will sent mouseExited events
+    // for all of the (ephemeral) subviews of a view as well.
+    if (!isWithinFrame)
+        [self unsetThemeState:CPThemeStateHovered];
+}
+
 /*!
-    Returns the receiver's object value
+    Returns the receiver's object value.
 */
 - (id)objectValue
 {
@@ -393,7 +433,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Set's the receiver's object value
+    Sets the receiver's object value.
 */
 - (void)setObjectValue:(id)anObject
 {
@@ -404,7 +444,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Returns the receiver's float value
+    Returns the receiver's float value.
 */
 - (float)floatValue
 {
@@ -413,7 +453,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Sets the receiver's float value
+    Sets the receiver's float value.
 */
 - (void)setFloatValue:(float)aValue
 {
@@ -421,7 +461,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Returns the receiver's double value
+    Returns the receiver's double value.
 */
 - (double)doubleValue
 {
@@ -430,7 +470,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Set's the receiver's double value
+    Sets the receiver's double value.
 */
 - (void)setDoubleValue:(double)anObject
 {
@@ -438,7 +478,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Returns the receiver's int value
+    Returns the receiver's int value.
 */
 - (int)intValue
 {
@@ -447,7 +487,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Set's the receiver's int value
+    Sets the receiver's int value.
 */
 - (void)setIntValue:(int)anObject
 {
@@ -455,7 +495,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Returns the receiver's int value
+    Returns the receiver's int value.
 */
 - (int)integerValue
 {
@@ -464,7 +504,7 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Set's the receiver's int value
+    Sets the receiver's int value.
 */
 - (void)setIntegerValue:(int)anObject
 {
@@ -472,19 +512,50 @@ var CPControlBlackColor     = [CPColor blackColor];
 }

 /*!
-    Returns the receiver's string value
+    Returns the receiver's string value.
 */
 - (CPString)stringValue
 {
+    if (_formatter && _value !== undefined)
+    {
+        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];
+
+        if (formattedValue !== nil && formattedValue !== undefined)
+            return formattedValue;
+    }
+
    return (_value === undefined || _value === nil) ? "" : String(_value);
 }

 /*!
-    Set's the receiver's string value
+    Sets the receiver's string value.
 */
- (void)setStringValue:(CPString)anObject
+- (void)setStringValue:(CPString)aString
 {
-    [self setObjectValue:anObject];
+    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
+    if (aString === nil || aString === undefined)
+    {
+        CPLog.warn("nil or undefined sent to CPControl -setStringValue");
+        return;
+    }
+
+    var value;
+
+    if (_formatter)
+    {
+        value = nil;
+
+        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
+        {
+            // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
+            if (!aString || [_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
+                value = undefined;  // Means the value is invalid
+        }
+    }
+    else
+        value = aString;
+
+    [self setObjectValue:value];
 }

 - (void)takeDoubleValueFrom:(id)sender
@@ -500,21 +571,18 @@ var CPControlBlackColor     = [CPColor blackColor];
        [self setFloatValue:[sender floatValue]];
 }

-
 - (void)takeIntegerValueFrom:(id)sender
 {
    if ([sender respondsToSelector:@selector(integerValue)])
        [self setIntegerValue:[sender integerValue]];
 }

-
 - (void)takeIntValueFrom:(id)sender
 {
    if ([sender respondsToSelector:@selector(intValue)])
        [self setIntValue:[sender intValue]];
 }

-
 - (void)takeObjectValueFrom:(id)sender
 {
    if ([sender respondsToSelector:@selector(objectValue)])
@@ -556,96 +624,200 @@ var CPControlBlackColor     = [CPColor blackColor];
    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }

+/*!
+    Sets the text alignment of the control.
+
+    <pre>
+    CPLeftTextAlignment
+    CPCenterTextAlignment
+    CPRightTextAlignment
+    CPJustifiedTextAlignment
+    CPNaturalTextAlignment
+    </pre>
+*/
 - (void)setAlignment:(CPTextAlignment)alignment
 {
    [self setValue:alignment forThemeAttribute:@"alignment"];
 }

+/*!
+    Returns the text alignment of the control.
+*/
 - (CPTextAlignment)alignment
 {
    return [self valueForThemeAttribute:@"alignment"];
 }

+/*!
+    Set the vertical text alignment of the control.
+
+    <pre>
+    CPTopVerticalTextAlignment
+    CPCenterVerticalTextAlignment
+    CPBottomVerticalTextAlignment
+    </pre>
+*/
 - (void)setVerticalAlignment:(CPTextVerticalAlignment)alignment
 {
    [self setValue:alignment forThemeAttribute:@"vertical-alignment"];
 }

+/*!
+    Returns the vertical text alignment of the receiver.
+*/
 - (CPTextVerticalAlignment)verticalAlignment
 {
    return [self valueForThemeAttribute:@"vertical-alignment"];
 }

+/*!
+    Sets the line break mode of the receiver.
+
+    <pre>
+    CPLineBreakByWordWrapping
+    CPLineBreakByCharWrapping
+    CPLineBreakByClipping
+    CPLineBreakByTruncatingHead
+    CPLineBreakByTruncatingTail
+    CPLineBreakByTruncatingMiddle
+    </pre>
+*/
 - (void)setLineBreakMode:(CPLineBreakMode)mode
 {
    [self setValue:mode forThemeAttribute:@"line-break-mode"];
 }

+/*!
+    Returns the line break mode of the control.
+*/
 - (CPLineBreakMode)lineBreakMode
 {
    return [self valueForThemeAttribute:@"line-break-mode"];
 }

+/*!
+    Sets the text color of the receiver.
+
+    @param aColor - A CPColor object.
+*/
 - (void)setTextColor:(CPColor)aColor
 {
    [self setValue:aColor forThemeAttribute:@"text-color"];
 }

+/*!
+    Returns the text color of the receiver.
+*/
 - (CPColor)textColor
 {
    return [self valueForThemeAttribute:@"text-color"];
 }

+/*!
+    Sets the shadow color of the text for the receiver.
+*/
 - (void)setTextShadowColor:(CPColor)aColor
 {
    [self setValue:aColor forThemeAttribute:@"text-shadow-color"];
 }

+/*!
+    Returns the shadow color of the text for the control.
+*/
 - (CPColor)textShadowColor
 {
    return [self valueForThemeAttribute:@"text-shadow-color"];
 }

- (void)setTextShadowOffset:(float)offset
+/*!
+    Sets the shadow offset for the text.
+
+    @param offset - a CGSize with the x and y offsets.
+*/
+- (void)setTextShadowOffset:(CGSize)offset
 {
    [self setValue:offset forThemeAttribute:@"text-shadow-offset"];
 }

- (float)textShadowOffset
+/*!
+    Returns the text shadow offset of the receiver.
+*/
+- (CGSize)textShadowOffset
 {
    return [self valueForThemeAttribute:@"text-shadow-offset"];
 }

+/*!
+    Sets the font of the control.
+*/
 - (void)setFont:(CPFont)aFont
 {
    [self setValue:aFont forThemeAttribute:@"font"];
 }

+/*!
+    Returns the font of the control.
+*/
 - (CPFont)font
 {
    return [self valueForThemeAttribute:@"font"];
 }

+/*!
+    Sets the image position of the control.
+
+    <pre>
+    CPNoImage
+    CPImageOnly
+    CPImageLeft
+    CPImageRight
+    CPImageBelow
+    CPImageAbove
+    CPImageOverlaps
+    </pre>
+*/
 - (void)setImagePosition:(CPCellImagePosition)position
 {
    [self setValue:position forThemeAttribute:@"image-position"];
 }

+/*!
+    Returns the image position of the receiver.
+*/
 - (CPCellImagePosition)imagePosition
 {
    return [self valueForThemeAttribute:@"image-position"];
 }

+/*!
+    Sets the image scaling of the control.
+
+    <pre>
+    CPImageScaleProportionallyDown
+    CPImageScaleAxesIndependently
+    CPImageScaleNone
+    CPImageScaleProportionallyUpOrDown
+    </pre>
+*/
 - (void)setImageScaling:(CPImageScaling)scaling
 {
    [self setValue:scaling forThemeAttribute:@"image-scaling"];
 }

+/*!
+    Returns the image scaling of the control.
+*/
 - (CPImageScaling)imageScaling
 {
    return [self valueForThemeAttribute:@"image-scaling"];
 }

+/*!
+    Sets the enabled status of the control.
+    Controls that are not enabled can not be used by the user and obtain the CPThemeStateDisabled theme state.
+
+    @param BOOL - YES if the control should be enabled, otherwise NO.
+*/
 - (void)setEnabled:(BOOL)isEnabled
 {
    if (isEnabled)
@@ -654,16 +826,29 @@ var CPControlBlackColor     = [CPColor blackColor];
        [self setThemeState:CPThemeStateDisabled];
 }

+/*!
+    Returns YES if the receiver is enabled, otherwise NO.
+*/
 - (BOOL)isEnabled
 {
    return ![self hasThemeState:CPThemeStateDisabled];
 }

+/*!
+    Highlights the receiver.
+
+    @param BOOL - YES if the receiver should be highlighted, otherwise NO.
+*/
 - (void)highlight:(BOOL)shouldHighlight
 {
    [self setHighlighted:shouldHighlight];
 }

+/*!
+    Highlights the receiver.
+
+    @param BOOL - YES if the receiver should be highlighted, otherwise NO.
+*/
 - (void)setHighlighted:(BOOL)isHighlighted
 {
    if (isHighlighted)
@@ -672,6 +857,9 @@ var CPControlBlackColor     = [CPColor blackColor];
        [self unsetThemeState:CPThemeStateHighlighted];
 }

+/*!
+    Returns YES if the control is highlighted, otherwise NO.
+*/
 - (BOOL)isHighlighted
 {
    return [self hasThemeState:CPThemeStateHighlighted];
@@ -679,22 +867,22 @@ var CPControlBlackColor     = [CPColor blackColor];

@end

-var CPControlValueKey           = "CPControlValueKey",
-    CPControlControlStateKey    = @"CPControlControlStateKey",
-    CPControlIsEnabledKey       = "CPControlIsEnabledKey",
+var CPControlValueKey                   = @"CPControlValueKey",
+    CPControlControlStateKey            = @"CPControlControlStateKey",
+    CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
+    CPControlTargetKey                  = @"CPControlTargetKey",
+    CPControlActionKey                  = @"CPControlActionKey",
+    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
+    CPControlFormatterKey               = @"CPControlFormatterKey",
+    CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",

-    CPControlTargetKey          = "CPControlTargetKey",
-    CPControlActionKey          = "CPControlActionKey",
-    CPControlSendActionOnKey    = "CPControlSendActionOnKey",
-
-    CPControlSendsActionOnEndEditingKey = "CPControlSendsActionOnEndEditingKey";
-
-var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
+    __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";

@implementation CPControl (CPCoding)

 /*
    Initializes the control by unarchiving it from a coder.
+
    @param aCoder the coder from which to unarchive the control
    @return the initialized control
 */
@@ -711,6 +899,8 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";

        [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]];
        [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
+
+        [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
    }

    return self;
@@ -718,6 +908,7 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";

 /*
    Archives the control to the provided coder.
+
    @param aCoder the coder to which the control will be archived.
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
@@ -727,16 +918,21 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
    if (_sendsActionOnEndEditing)
        [aCoder encodeBool:_sendsActionOnEndEditing forKey:CPControlSendsActionOnEndEditingKey];

-    if (_value !== nil)
-        [aCoder encodeObject:_value forKey:CPControlValueKey];
+    var objectValue = [self objectValue];
+
+    if (objectValue !== nil)
+        [aCoder encodeObject:objectValue forKey:CPControlValueKey];

    if (_target !== nil)
        [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];

-    if (_action !== NULL)
+    if (_action !== nil)
        [aCoder encodeObject:_action forKey:CPControlActionKey];

    [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];
+
+    if (_formatter !== nil)
+        [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
 }

@end
@@ -50,7 +50,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
        _declaredKeys = [aDecoder decodeObjectForKey:CPControllerDeclaredKeysKey] || [];
    }

-    return nil;
+    return self;
 }

 - (BOOL)isEditing
@@ -111,8 +111,12 @@
    for (var i = 0; i < ca.length; i++)
    {
        var c = ca[i];
-        while (c.charAt(0) == ' ') c = c.substring(1, c.length);
-        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
+
+        while (c.charAt(0) == ' ')
+            c = c.substring(1, c.length);
+
+        if (c.indexOf(nameEQ) == 0)
+            return c.substring(nameEQ.length, c.length);
    }
 #endif
    return "";
@@ -1,36 +1,41 @@
 /*
-Testing browsers:
-    WebKit r50235 (Safari 4.0.3+)
-    FireFox 3.5
-    Opera 10.0.0
-
-Implemented class methods:
-    Webkit : All
-    IE     : All
-    FireFox Win : All
-    FireFox Mac : All except closedHandCursor disappearingItemCursor // Firefox mac does not support url cursors
-    Opera       : All except resizeLeftRightCursor resizeUpDownCursor operationNotAllowedCursor dragCopyCursor dragLinkCursor contextualMenuCursor openHandCursor closedHandCursor disappearingItemCursor // Opera does not support url cursors so these won't work with images
+Cursor support by browser:
+    OS X 10.6/Chrome 8       : All
+    OS X 10.6/Safari 5       : All
+    OS X 10.6/Firefox 3      : All except disappearingItemCursor (no url() support)
+    OS X 10.6/Firefox 3.5    : All except disappearingItemCursor (no url() support)
+    OS X 10.6/Firefox 3.6    : All except disappearingItemCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
+    OS X 10.6/Firefox 4.0b10 : All
+    OS X/Opera 9             : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor  (no url() support)
+    OS X/Opera 10            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
+    OS X/Opera 11            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
+    Win XP/Chrome 8          : All
+    Win XP/Safari 5          : All
+    Win XP/Firefox 3         : All
+    Win XP/Firefox 3.5       : All
+    Win XP/Firefox 3.6       : All
+    Win XP/Firefox 4.0b10    : All
+    Win XP/Opera 10          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
+    Win XP/Opera 11          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
+    Win XP/IE 7              : All
+    Win XP/IE 8              : All
 */

@import <Foundation/CPObject.j>

 var currentCursor = nil,
    cursorStack = [],
-    cursors = {},
-    cursorURLFormat = nil;
+    cursors = {};

@implementation CPCursor : CPObject
 {
-    CPString _cssString;
+    CPString _cssString @accessors(readonly);
+    CPString _hotSpot @accessors(readonly, getter=hotSpot);
+    CPImage  _image @accessors(readonly, getter=image);
    BOOL     _isSetOnMouseEntered @accessors(readwrite, getter=isSetOnMouseEntered, setter=setOnMouseEntered:);
    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }

-+ (CPCursor)currentCursor
-{
-    return currentCursor;
-}
-
 - (id)initWithCSSString:(CPString)aString
 {
    if (self = [super init])
@@ -39,155 +44,18 @@ var currentCursor = nil,
    return self;
 }

-+ (CPCursor)cursorWithCSSString:(CPString)cssString
+// hotspot is supported in CSS3 (but not IE).
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
 {
-    var cursor = cursors[cssString];
-
-    if (typeof cursor == 'undefined')
-    {
-        cursor = [[CPCursor alloc] initWithCSSString:cssString];
-        cursors[cssString] = cursor;
-    }
-
-    return cursor;
+    _hotSpot = hotSpot;
+    _image = image;
+    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }

-+ (CPCursor)cursorWithImageNamed:(CPString)imageName
+// foregroundColor and backgroundColor are ignored in Cocoa as well.  See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
+- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CPPoint)aHotSpot
 {
-    if (!cursorURLFormat)
-    {
-        cursorURLFormat = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/%@.cur)";
-
-        if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-            cursorURLFormat += ", default";
-    }
-
-    var url = [CPString stringWithFormat:cursorURLFormat, imageName];
-
-    return [[CPCursor alloc] initWithCSSString:url];
-}
-
- (CPString)_cssString
-{
-    return _cssString;
-}
-
-+ (CPCursor)arrowCursor
-{
-    return [CPCursor cursorWithCSSString:@"default"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)crosshairCursor
-{
-    return [CPCursor cursorWithCSSString:@"crosshair"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)IBeamCursor
-{
-    return [CPCursor cursorWithCSSString:@"text"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)pointingHandCursor
-{
-    return [CPCursor cursorWithCSSString:@"pointer"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)resizeDownCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:"s-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeUpCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"n-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeLeftCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"w-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeRightCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"e-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeLeftRightCursor
-{
-    return [CPCursor cursorWithCSSString:@"col-resize"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)resizeUpDownCursor
-{
-    return [CPCursor cursorWithCSSString:@"row-resize"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)operationNotAllowedCursor
-{
-    return [CPCursor cursorWithCSSString:@"not-allowed"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)dragCopyCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"copy"]; // WebKit | FF
-}
-
-+ (CPCursor)dragLinkCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"alias"]; // WebKit | FF
-}
-
-+ (CPCursor)contextualMenuCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"context-menu"]; // WebKit | FF Mac . Not impl FF Win.
-}
-
-+ (CPCursor)openHandCursor
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-webkit-grab"];
-    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-moz-grab"];
-    else if (CPBrowserIsEngine(CPOperaBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"move"];
-
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only. move in FFMac|Opera
-}
-
-+ (CPCursor)closedHandCursor
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-webkit-grabbing"];
-    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-moz-grabbing"];
-
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit || FF
-}
-
-+ (CPCursor)disappearingItemCursor
-{
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // None
+    return [self initWithImage:image hotSpot:hotSpot];
 }

 + (void)hide
@@ -208,44 +76,6 @@ var currentCursor = nil,
        [CPCursor unhide];
 }

- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
-{
-    return [self initWithCSSString:"url(" + [image filename] + "), auto"];
-}
-
-
- (void)mouseEntered:(CPEvent)event
-{
-}
-
- (void)mouseExited:(CPEvent)event
-{
-}
-
- (void)set
-{
-    currentCursor = self;
-
-#if PLATFORM(DOM)
-    [[self class] _setCursorCSS:_cssString];
-#endif
-
-}
-
-+ (void)_setCursorCSS:(CPString)aString
-{
-#if PLATFORM(DOM)
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-    for (var i = 0, count = [platformWindows count]; i < count; i++)
-        platformWindows[i]._DOMBodyElement.style.cursor = aString;
-#endif
-}
-
- (void)push
-{
-    currentCursor = cursorStack.push(self);
-}
-
 - (void)pop
 {
    [CPCursor pop];
@@ -260,6 +90,148 @@ var currentCursor = nil,
    }
 }

+- (void)push
+{
+    currentCursor = cursorStack.push(self);
+}
+
+- (void)set
+{
+    currentCursor = self;
+
+#if PLATFORM(DOM)
+    [[self class] _setCursorCSS:_cssString];
+#endif
+}
+
+- (void)mouseEntered:(CPEvent)event
+{
+}
+
+- (void)mouseExited:(CPEvent)event
+{
+}
+
+ (CPCursor)currentCursor
+{
+    return currentCursor;
+}
+
+ (void)_setCursorCSS:(CPString)aString
+{
+#if PLATFORM(DOM)
+    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
+    for (var i = 0, count = [platformWindows count]; i < count; i++)
+        platformWindows[i]._DOMBodyElement.style.cursor = aString;
+#endif
+}
+
+// Internal method that is used to return the system cursors.  Caches the system cursors for performance.
+ (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
+{
+    var cursor = cursors[cursorName];
+    if (typeof cursor === 'undefined')
+    {
+        var cssString;
+        if (doesHaveImage)
+            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
+        else
+            cssString = aString
+        cursor = [[CPCursor alloc] initWithCSSString:cssString];
+        cursors[cursorName] = cursor;
+    }
+    return cursor;
+}
+
+ (CPCursor)arrowCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:"default" hasImage:NO];
+}
+
+ (CPCursor)crosshairCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"crosshair" hasImage:NO];
+}
+
+ (CPCursor)IBeamCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"text" hasImage:NO];
+}
+
+ (CPCursor)pointingHandCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
+}
+
+ (CPCursor)resizeDownCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeUpCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"n-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeLeftCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"w-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeRightCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"e-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeLeftRightCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeUpDownCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
+}
+
+ (CPCursor)operationNotAllowedCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];
+}
+
+ (CPCursor)dragCopyCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"copy" hasImage:YES];
+}
+
+ (CPCursor)dragLinkCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"alias" hasImage:YES];
+}
+
+ (CPCursor)contextualMenuCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"context-menu" hasImage:YES];
+}
+
+ (CPCursor)openHandCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"move" hasImage:YES];
+}
+
+ (CPCursor)closedHandCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"-moz-grabbing" hasImage:YES];
+}
+
+ (CPCursor)disappearingItemCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"auto" hasImage:YES];
+}
+
+@end
+
+@implementation CPCursor(CPCoding)
+
 - (id)initWithCoder:(CPCoder)coder
 {
    if (self = [super init])
@@ -274,4 +246,3 @@ var currentCursor = nil,
 }

@end
-
@@ -88,7 +88,7 @@ var CPDocumentUntitledCount = 0;
    @class CPDocument

    CPDocument is used to represent a document/file in a Cappuccino application.
-    In a document-based application, generally multiple documents are open simutaneously
+    In a document-based application, generally multiple documents are open simultaneously
    (multiple text documents, slide presentations, spreadsheets, etc.), and multiple
    CPDocuments should be used to represent this.
 */
@@ -208,7 +208,7 @@ var CPDocumentUntitledCount = 0;
    throws an exception.
    @param aType the format of the data
    @param anError not used
-    @throws CPUnsupportedMethodException if this method hasn't been overriden by the subclass
+    @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
    @return the document data
 */
 - (CPData)dataOfType:(CPString)aType error:({CPError})anError
@@ -922,9 +922,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
    return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-}
+};

 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
    return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-}
+};
@@ -24,7 +24,7 @@
@import <Foundation/CPBundle.j>

@import "CPDocument.j"
-@import "CPOpenPanel.j";
+@import "CPOpenPanel.j"


 var CPSharedDocumentController = nil;
@@ -177,7 +177,7 @@ var CPSharedDocumentController = nil;
    @param aType the document type
    @param aDelegate the delegate to notify
    @param aSelector the selector to notify with
-    @param aContextInfo the context infomration passed to the delegate
+    @param aContextInfo the context information passed to the delegate
 */
 - (CPDocument)makeDocumentWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
 {
@@ -390,13 +390,14 @@ var CPSharedDocumentController = nil;

 - (void)noteNewRecentDocument:(CPDocument)aDocument
 {
-    [self noteNewRecentDocumentURL:[[aDocument fileURL] absoluteString]];
+    [self noteNewRecentDocumentURL:[aDocument fileURL]];
 }

- (void)noteNewRecentDocumentURL:(CPString)aURL
+- (void)noteNewRecentDocumentURL:(CPURL)aURL
 {
+    var urlAsString = [aURL isKindOfClass:CPString] ? aURL : [aURL absoluteString];
    if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
-        window.cpNoteNewRecentDocumentPath(aURL);
+        window.cpNoteNewRecentDocumentPath(urlAsString);

   [self _updateRecentDocumentsMenu];
 }
@@ -28,13 +28,13 @@
@import "CPWindow.j"


-CPDragOperationNone     = 0,
-CPDragOperationCopy     = 1 << 1,
-CPDragOperationLink     = 1 << 1,
-CPDragOperationGeneric  = 1 << 2,
-CPDragOperationPrivate  = 1 << 3,
-CPDragOperationMove     = 1 << 4,
-CPDragOperationDelete   = 1 << 5,
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
 CPDragOperationEvery    = -1;

 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
@@ -44,8 +44,8 @@ var CPDragServerPreviousEvent = nil,

 var CPSharedDragServer = nil;

-var CPDragServerSource             = nil;
-var CPDragServerDraggingInfo       = nil;
+var CPDragServerSource             = nil,
+    CPDragServerDraggingInfo       = nil;

 /*
    CPDraggingInfo is a container of information about a specific dragging session.
@@ -220,14 +220,14 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    [_draggingUpdateTimer invalidate];
    _draggingUpdateTimer = nil;

-    var dragOperation = CPDragOperationCopy;
+    var dragOperation = CPDragOperationCopy,
    // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
-    var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
+        draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];

    if (draggingDestination)
        _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];

-    if(draggingDestination !== _draggingDestination)
+    if (draggingDestination !== _draggingDestination)
    {
        if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
            [_draggingDestination draggingExited:CPDragServerDraggingInfo];
@@ -261,7 +261,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
        {
            var contentView = [scrollView contentView],
                bounds = [contentView bounds],
-                insetBounds = CGRectInset(bounds, 10, 10),
+                insetBounds = CGRectInset(bounds, 30, 30),
                eventLocation = [contentView convertPoint:_draggingLocation fromView:nil],
                deltaX = 0,
                deltaY = 0;
@@ -270,10 +270,10 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
            {
                if ([scrollView hasVerticalScroller])
                {
-                    if (eventLocation.y < CGRectGetMinY(insetBounds))
-                        deltaY = CGRectGetMinY(insetBounds) - eventLocation.y;
-                    else if (eventLocation.y > CGRectGetMaxY(insetBounds))
-                        deltaY = CGRectGetMaxY(insetBounds) - eventLocation.y;
+                    if (eventLocation.y < _CGRectGetMinY(insetBounds))
+                        deltaY = _CGRectGetMinY(insetBounds) - eventLocation.y;
+                    else if (eventLocation.y > _CGRectGetMaxY(insetBounds))
+                        deltaY = _CGRectGetMaxY(insetBounds) - eventLocation.y;
                    if (deltaY < -insetBounds.size.height)
                        deltaY = -insetBounds.size.height;
                    if (deltaY > insetBounds.size.height)
@@ -282,17 +282,21 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,

                if ([scrollView hasHorizontalScroller])
                {
-                    if (eventLocation.x < CGRectGetMinX(insetBounds))
-                        deltaX = CGRectGetMinX(insetBounds) - eventLocation.x;
-                    else if (eventLocation.x > CGRectGetMaxX(insetBounds))
-                        deltaX = CGRectGetMaxX(insetBounds) - eventLocation.x;
+                    if (eventLocation.x < _CGRectGetMinX(insetBounds))
+                        deltaX = _CGRectGetMinX(insetBounds) - eventLocation.x;
+                    else if (eventLocation.x > _CGRectGetMaxX(insetBounds))
+                        deltaX = _CGRectGetMaxX(insetBounds) - eventLocation.x;
                    if (deltaX < -insetBounds.size.width)
                        deltaX = -insetBounds.size.width;
                    if (deltaX > insetBounds.size.width)
                        deltaX = insetBounds.size.width;
                }

-                [contentView scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
+                var scrollPoint = _CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY);
+
+                [contentView scrollToPoint:scrollPoint];
+                [[scrollView _headerView] scrollPoint:scrollPoint];
+
            }
        }
    }
@@ -456,8 +460,8 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    }
    else if (type === CPKeyDown)
    {
-        var keyCode = [anEvent keyCode];
-        if (keyCode === CPEscapeKeyCode)
+        var characters = [anEvent characters];
+        if (characters === CPEscapeFunctionKey)
        {
            _dragOperation = CPDragOperationNone;
            [self draggingEndedInPlatformWindow:platformWindow globalLocation:CGPointMakeZero() operation:_dragOperation];
@@ -158,27 +158,29 @@ CPFindFunctionKey                       = "\uF745";
 CPHelpFunctionKey                       = "\uF746";
 CPModeSwitchFunctionKey                 = "\uF747";
 CPEscapeFunctionKey                     = "\u001B";
+CPSpaceFunctionKey                      = "\u0020";


-CPDOMEventDoubleClick                                = "dblclick",
-CPDOMEventMouseDown                                  = "mousedown",
-CPDOMEventMouseUp                                    = "mouseup",
-CPDOMEventMouseMoved                                 = "mousemove",
-CPDOMEventMouseDragged                               = "mousedrag",
-CPDOMEventKeyUp                                      = "keyup",
-CPDOMEventKeyDown                                    = "keydown",
-CPDOMEventKeyPress                                   = "keypress";
-CPDOMEventCopy                                       = "copy";
-CPDOMEventPaste                                      = "paste";
-CPDOMEventScrollWheel                                = "mousewheel";
-CPDOMEventTouchStart                                 = "touchstart";
-CPDOMEventTouchMove                                  = "touchmove";
-CPDOMEventTouchEnd                                   = "touchend";
-CPDOMEventTouchCancel                                = "touchcancel";
+CPDOMEventDoubleClick                   = "dblclick";
+CPDOMEventMouseDown                     = "mousedown";
+CPDOMEventMouseUp                       = "mouseup";
+CPDOMEventMouseMoved                    = "mousemove";
+CPDOMEventMouseDragged                  = "mousedrag";
+CPDOMEventKeyUp                         = "keyup";
+CPDOMEventKeyDown                       = "keydown";
+CPDOMEventKeyPress                      = "keypress";
+CPDOMEventCopy                          = "copy";
+CPDOMEventPaste                         = "paste";
+CPDOMEventScrollWheel                   = "mousewheel";
+CPDOMEventTouchStart                    = "touchstart";
+CPDOMEventTouchMove                     = "touchmove";
+CPDOMEventTouchEnd                      = "touchend";
+CPDOMEventTouchCancel                   = "touchcancel";

 var _CPEventPeriodicEventPeriod         = 0,
    _CPEventPeriodicEventTimer          = nil,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]");
+    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
+    _CPEventStartupMilliseconds         = new Date().getTime();

 /*!
    @ingroup appkit
@@ -202,14 +204,25 @@ var _CPEventPeriodicEventPeriod         = 0,
    BOOL                _isARepeat;
    unsigned            _keyCode;
    DOMEvent            _DOMEvent;
+    int                 _data1;
+    int                 _data2;

    float               _deltaX;
    float               _deltaY;
    float               _deltaZ;
 }

+/*!
+    Returns the current time in fractional seconds since startup.
+*/
+ (CPTimeInterval)currentTimestamp
+{
+    return (new Date().getTime() - _CPEventStartupMilliseconds) / 1000;
+}
+
 /*!
    Creates a new keyboard event.
+
    @param anEventType the event type. Must be one of CPKeyDown, CPKeyUp or CPFlagsChanged
    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -234,7 +247,8 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Creates a new mouse event
+    Creates a new mouse event.
+
    @param anEventType the event type
    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -256,7 +270,8 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Creates a new custom event
+    Creates a new custom event.
+
    @param anEventType the event type. Must be one of CPAppKitDefined, CPSystemDefined, CPApplicationDefined or CPPeriodic
    @param aLocation the location of the cursor in the window specified by \c aWindowNumber
    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -277,16 +292,28 @@ var _CPEventPeriodicEventPeriod         = 0,
        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext subtype:aSubtype data1:aData1 data2:aData2];
 }

+- (id)_initWithType:(CPEventType)anEventType
+{
+    if (self = [super init])
+    {
+        _type = anEventType;
+
+        // Make sure these are 0 rather than nil.
+        _deltaX = 0;
+        _deltaY = 0;
+        _deltaZ = 0;
+    }
+
+    return self;
+}
+
 /* @ignore */
 - (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
-    self = [super init];
-
-    if (self)
+    if (self = [self _initWithType:anEventType])
    {
-        _type = anEventType;
        _location = CPPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
@@ -305,11 +332,8 @@ var _CPEventPeriodicEventPeriod         = 0,
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
-    self = [super init];
-
-    if (self)
+    if (self = [self _initWithType:anEventType])
    {
-        _type = anEventType;
        _location = CPPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
@@ -329,11 +353,8 @@ var _CPEventPeriodicEventPeriod         = 0,
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
 {
-    self = [super init];
-
-    if (self)
+    if (self = [self _initWithType:anEventType])
    {
-        _type = anEventType;
        _location = CPPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
@@ -348,10 +369,10 @@ var _CPEventPeriodicEventPeriod         = 0,

 /*!
    Returns the location of the mouse (for mouse events).
-    If this is not a mouse event, it returns \c nil.
-    If \c window returns \c nil, then
-    the mouse coordinates will be based on the screen coordinates.
+    If the receiver is not a mouse event, it returns \c nil.
+    If \c window returns \c nil, then the mouse coordinates will be based on the screen coordinates.
    Otherwise, the coordinates are relative to the window's coordinates.
+
    @return the location of the mouse, or \c nil for non-mouse events.
 */
 - (CGPoint)locationInWindow
@@ -371,7 +392,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Returns event information as a bit mask
+    Returns event information as a bit mask.
 */
 - (unsigned)modifierFlags
 {
@@ -379,7 +400,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Returns the time the event occurred
+    Returns the time the event occurred in seconds since startup.
 */
 - (CPTimeInterval)timestamp
 {
@@ -395,7 +416,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Returns the event's associated window
+    Returns the event's associated window.
 */
 - (CPWindow)window
 {
@@ -426,7 +447,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Returns the number of clicks that caused this event. (mouse only)
+    Returns the number of clicks that caused this event (mouse only).
 */
 - (int)clickCount
 {
@@ -434,7 +455,8 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Returns the characters associated with this event (keyboard only)
+    Returns the characters associated with this event (keyboard only).
+
    @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (CPString)characters
@@ -444,6 +466,7 @@ var _CPEventPeriodicEventPeriod         = 0,

 /*!
    Returns the character ignoring any modifiers (except shift).
+
    @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (CPString)charactersIgnoringModifiers
@@ -453,6 +476,7 @@ var _CPEventPeriodicEventPeriod         = 0,

 /*!
    Returns \c YES if the keyboard event was caused by the key being held down.
+
    @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (BOOL)isARepeat
@@ -462,6 +486,7 @@ var _CPEventPeriodicEventPeriod         = 0,

 /*!
    Returns the key's key code.
+
    @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (unsigned short)keyCode
@@ -494,7 +519,17 @@ var _CPEventPeriodicEventPeriod         = 0,
    return _DOMEvent;
 }

-// Getting Scroll Wheel Event Infomration
+- (int)data1
+{
+    return _data1;
+}
+
+- (int)data2
+{
+    return _data2;
+}
+
+// Getting Scroll Wheel Event Information
 /*!
    Returns the change in the x-axis for a mouse event.
 */
@@ -527,7 +562,8 @@ var _CPEventPeriodicEventPeriod         = 0,
    if (_CPEventUpperCaseRegex.test(aKeyEquivalent))
        aKeyEquivalentModifierMask |= CPShiftKeyMask;

-    if (CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) && (aKeyEquivalentModifierMask & CPCommandKeyMask))
+    // Windows and Linux don't have command keys, so just switch it to ctrl.
+    if (!CPBrowserIsOperatingSystem(CPMacOperatingSystem) && (aKeyEquivalentModifierMask & CPCommandKeyMask))
    {
        aKeyEquivalentModifierMask |= CPControlKeyMask;
        aKeyEquivalentModifierMask &= ~CPCommandKeyMask;
@@ -556,32 +592,32 @@ var _CPEventPeriodicEventPeriod         = 0,
    if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
        return YES;

-    for(var i=0; i<characterCount; i++)
+    // Cocoa allows almost any key as a key equivalent unless the first responder is a
+    // text field (presumably a subclass of NSText.)
+    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
+
+    // Some keys are accepted as key equivalents even if the first responder is a text
+    // field.
+    for (var i = 0; i < characterCount; i++)
    {
-        switch(_characters.charAt(i))
+        var c = _characters.charAt(i);
+
+        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
+            c === CPEnterCharacter ||
+            c === CPNewlineCharacter ||
+            c === CPCarriageReturnCharacter ||
+            c === CPEscapeFunctionKey)
        {
-            case CPBackspaceCharacter:
-            case CPDeleteCharacter:
-            case CPDeleteFunctionKey:
-            case CPTabCharacter:
-            case CPCarriageReturnCharacter:
-            case CPNewlineCharacter:
-            case CPEscapeFunctionKey:
-            case CPPageUpFunctionKey:
-            case CPPageDownFunctionKey:
-            case CPLeftArrowFunctionKey:
-            case CPUpArrowFunctionKey:
-            case CPRightArrowFunctionKey:
-            case CPDownArrowFunctionKey:
-                return YES;
+            return YES;
        }
    }
-    // FIXME: More cases? Space?
-    return NO;
+
+    return !firstResponderIsText;
 }

 /*!
-    Gene                            rates periodic events every \c aPeriod seconds.
+    Generates periodic events every \c aPeriod seconds.
+
    @param aDelay the number of seconds before the first event
    @param aPeriod the length of time in seconds between successive events
 */
@@ -594,7 +630,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Stops the periodic events from being generated
+    Stops the periodic events from being generated.
 */
 + (void)stopPeriodicEvents
 {
@@ -606,11 +642,34 @@ var _CPEventPeriodicEventPeriod         = 0,
    _CPEventPeriodicEventTimer = nil;
 }

+- (CPString)description
+{
+    switch (_type)
+    {
+        case CPKeyDown:
+        case CPKeyUp:
+        case CPFlagsChanged:
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
+        case CPLeftMouseDown:
+        case CPLeftMouseUp:
+        case CPRightMouseDown:
+        case CPRightMouseUp:
+        case CPMouseMoved:
+        case CPLeftMouseDragged:
+        case CPRightMouseDragged:
+        case CPMouseEntered:
+        case CPMouseExited:
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
+        default:
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CPStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
+    }
+}
+
@end

 function _CPEventFirePeriodEvent()
 {
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
 }

 var CPEventClass = [CPEvent class];
@@ -632,4 +691,3 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie

    return aNativeEvent;
 }
-
@@ -23,7 +23,7 @@
@import <Foundation/CPObject.j>


-/*! 
+/*!
    @ingroup appkit
    @class CPFlashMovie

@@ -52,10 +52,10 @@
 - (id)initWithFile:(CPString)aFilename
 {
    self = [super init];
-    
+
    if (self)
        _filename = aFilename;
-    
+
    return self;
 }

@@ -32,10 +32,10 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
@implementation CPFlashView : CPView
 {
    CPFlashMovie    _flashMovie;
-    
+
    CPDictionary    _params;
    CPDictionary    _paramElements;
-#if PLATFORM(DOM)    
+#if PLATFORM(DOM)
    DOMElement      _DOMParamElement;
    DOMElement      _DOMObjectElement;
    DOMElement      _DOMInnerObjectElement;
@@ -45,7 +45,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
-    
+
    if (self)
    {
 #if PLATFORM(DOM)
@@ -58,24 +58,24 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
            _DOMObjectElement.style.left = @"0px";
            _DOMObjectElement.type = @"application/x-shockwave-flash";
            _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID);
-            
+
            _DOMParamElement = document.createElement(@"param");
            _DOMParamElement.name = @"movie";
-            
+
            _DOMInnerObjectElement = document.createElement(@"object");
            _DOMInnerObjectElement.width = @"100%";
            _DOMInnerObjectElement.height = @"100%";
-            
+
            _DOMObjectElement.appendChild(_DOMParamElement);
            _DOMObjectElement.appendChild(_DOMInnerObjectElement);
-            
+
            _DOMElement.appendChild(_DOMObjectElement);
        }
        else
            [self _rebuildIEObjects];
 #endif
    }
-    
+
    return self;
 }

@@ -83,7 +83,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 {
    if (_flashMovie == aFlashMovie)
        return;
-        
+
    _flashMovie = aFlashMovie;
 #if PLATFORM(DOM)
    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
@@ -104,15 +104,15 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (void)setFlashVars:(CPDictionary)aDictionary
 {
    var varString = @"",
-        enumerator = [aDictionary keyEnumerator];
-    
-    var key;
-    while (key = [enumerator nextObject])
+        enumerator = [aDictionary keyEnumerator],
+        key;
+
+    while ((key = [enumerator nextObject]) !== nil)
        varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
-    
+
    if (!_params)
        _params = [CPDictionary dictionary];
-    
+
    [_params setObject:varString forKey:@"flashvars"];
    [self setParameters:_params];
 }
@@ -129,28 +129,31 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
    {
        var elements = [_paramElements allValues],
            count = [elements count];
-        
+
        for (var i = 0; i < count; i++)
            _DOMObjectElement.removeChild([elements objectAtIndex:i]);
    }
 #endif
-    _params = aDictionary;
+    if (!_params)
+        _params = aDictionary;
+    else
+        [_params addEntriesFromDictionary:aDictionary];
 #if PLATFORM(DOM)
    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
    {
        _paramElements = [CPDictionary dictionary];
-        
+
        var enumerator = [_params keyEnumerator],
            key;
-        
-        while (key = [enumerator nextObject] && _DOMObjectElement)
+
+        while (_DOMObjectElement && (key = [enumerator nextObject]) !== nil)
        {
            var param = document.createElement(@"param");
            param.name = key;
            param.value = [_params objectForKey:key];
-            
+
            _DOMObjectElement.appendChild(param);
-            
+
            [_paramElements setObject:param forKey:key];
        }
    }
@@ -170,17 +173,17 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
    _DOMElement.innerHTML = @"";
    if (![_flashMovie filename])
        return;
-    
+
    var paramString = [CPString stringWithFormat:@"<param name='movie' value='%@' />", [_flashMovie filename]],
        paramEnumerator = [_params keyEnumerator],
        key;
-    
-    while (key = [paramEnumerator nextObject])
+
+    while ((key = [paramEnumerator nextObject]) !== nil)
        paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
-    
+
    _DOMObjectElement = document.createElement(@"object");
    _DOMElement.appendChild(_DOMObjectElement);
-    
+
    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
 }
 #endif
@@ -25,20 +25,88 @@

@import "CPView.j"

-
-var _CPFonts                = {},
-    _CPFontSystemFontFace   = @"Arial, sans-serif",
-    _CPWrapRegExp           = new RegExp("\\s*,\\s*", "g");
-
-
-#define _CPCreateCSSString(aName, aSize, isBold) (isBold ? @"bold " : @"") + ROUND(aSize) + @"px " + ((aName === _CPFontSystemFontFace) ? aName : (@"\"" + aName.replace(_CPWrapRegExp, '", "') + @"\", " + _CPFontSystemFontFace))
-#define _CPCachedFont(aName, aSize, isBold) _CPFonts[_CPCreateCSSString(aName, aSize, isBold)]
+CPFontDefaultSystemFontFace = @"Arial, sans-serif";
+CPFontDefaultSystemFontSize = 12;

 /*!
-    @ingroup appkit
-    @class CPFont
+    To create a font of a size that will dynamically reflect the current
+    system font size, use this for the size argument.
+*/
+CPFontCurrentSystemSize = -1;

-    The CPFont class allows control of the fonts used for displaying text anywhere on the screen. The primary method for getting a particular font is through one of the class methods that take a name and/or size as arguments, and return the appropriate CPFont.
+// For internal use only by this class and subclasses
+_CPFontSystemFacePlaceholder = "_CPFontSystemFacePlaceholder";
+
+var _CPFontCache                     = {},
+    _CPSystemFontCache               = {},
+    _CPFontSystemFontFace            = CPFontDefaultSystemFontFace,
+    _CPFontSystemFontSize            = 12,
+    _CPFontFallbackFaces             = CPFontDefaultSystemFontFace.split(", "),
+    _CPFontStripRegExp               = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
+
+
+#define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
+#define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
+#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFontCache[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
+#define _CPUserFont(aName, aSize, isBold, isItalic)  _CPCachedFont(aName, aSize, isBold, isItalic) || [[CPFont alloc] _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO]
+
+#define _CPSystemFontCacheKey(aSize, isBold)  (String(aSize) + (isBold ? "b" : ""))
+#define _CPCachedSystemFont(aSize, isBold)  _CPSystemFontCache[_CPSystemFontCacheKey(aSize, isBold)]
+#define _CPSystemFont(aSize, isBold)  (_CPCachedSystemFont(aSize, isBold) || [[CPFont alloc] _initWithName:_CPFontSystemFacePlaceholder size:aSize bold:isBold italic:NO system:YES])
+
+/*!
+@ingroup appkit
+@class CPFont
+
+The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
+The primary method for getting a particular font is through one of the class methods that take
+a name and/or size as arguments, and return the appropriate CPFont.
+
+### System fonts
+When you create a font using \c -systemFontOfSize: or \c -boldSystemFontOfSize:, a proxy font is
+created that always refers to the current system font face and size. By default the system
+font face/size is Arial 12px, with a fallback to sans-serif 12px. You may configure this at
+runtime in two ways:
+
+- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
+  Note that if you change the system font face or size during runtime, the next time
+  any view using a system font is redrawn, it will show the new font.
+- By configuring Info.plist for your application or for AppKit. You can set the font face
+  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
+  by adding a CPSystemFontSize integer item to the Info.plist.
+
+Note that in either case, you can specify a comma-delimited list of fonts as the font face.
+Do not quote enclose font faces that contain spaces, that is done automatically when a CSS
+representation of a font is requested.
+
+The browser will use the first available font in the list you supply. CPFont always ensures
+that Arial and sans-serif are in the CSS representation of a font as a fallback, so there is
+no need to add them to the end of your font list.
+
+### nib2cib conversion
+Fonts are converted by nib2cib according to the following algorithm:
+
+- If the font family is Lucida Grande, then a system font will be created.
+- If the font is Lucida Grande 13 (plain), the "default" font will be used at runtime.
+  The default font is taken from the "font" theme attribute if one exists,
+  otherwise from the current system font face and size.
+- Lucida Grande of any size other than 13 will retain its size.
+- Fonts using any family other than Lucida Grande will be used as is, including the size.
+
+### Using custom web fonts
+The configurability of CPFont makes it easy to use a custom web font as the system font.
+For example, if you want to use the google font Asap as the system font, you would do the
+following:
+
+- Add a <link> to the <head> of index-debug.html and index.html:
+@code
+<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
+@endcode
+- Specify Asap as the system font in Info.plist by adding the following item:
+@code
+<key>CPSystemFontFace</key>
+<string>Asap</string>
+@endcode
 */
@implementation CPFont : CPObject
 {
@@ -47,80 +115,200 @@ var _CPFonts                = {},
    float       _ascender;
    float       _descender;
    float       _lineHeight;
-    BOOL        _isBold;
+    BOOL        _isBold         @accessors(readonly, getter=isBold);
+    BOOL        _isItalic       @accessors(readonly, getter=isItalic);
+    BOOL        _isSystem       @accessors(readonly, getter=isSystem);

    CPString    _cssString;
 }

 + (void)initialize
 {
-    var systemFont = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:"CPSystemFontFace"];
+    if (self !== [CPFont class])
+        return;

-    if (systemFont)
-        _CPFontSystemFontFace = systemFont;
+    var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];
+
+    if (!systemFontFace)
+        systemFontFace = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontFace"];
+
+    if (systemFontFace)
+        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);
+
+    var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];
+
+    if (!systemFontSize)
+        systemFontSize = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontSize"];
+
+    if (systemFontSize)
+        _CPFontSystemFontSize = systemFontSize;
+}
+
+/*!
+    Returns the default system font face, which may consist of several comma-separated family names.
+*/
+ (CPString)systemFontFace
+{
+    return _CPFontSystemFontFace;
+}
+
+/*!
+    Sets the default system font face, which may consist of several comma-separated family names.
+*/
+ (CPString)setSystemFontFace:(CPString)aFace
+{
+    var normalizedFaces = _CPFontNormalizedNames(aFace);
+
+    if (normalizedFaces === _CPFontSystemFontFace)
+        return;
+
+    [self _invalidateSystemFontCache]
+    _CPFontSystemFontFace = aFace;
+}
+
+/*!
+    Returns the default system font size.
+*/
+ (float)systemFontSize
+{
+    return _CPFontSystemFontSize;
+}
+
+/*!
+    Sets the default system font size.
+*/
+ (float)setSystemFontSize:(float)size
+{
+    if (size > 0 && size !== _CPFontSystemFontSize)
+    {
+        [self _invalidateSystemFontCache];
+        _CPFontSystemFontSize = size;
+    }
+}
+
+ (void)_invalidateSystemFontCache
+{
+    var systemSize = String(_CPFontSystemFontSize),
+        currentSize = String(CPFontCurrentSystemSize);
+
+    for (key in _CPSystemFontCache)
+    {
+        if (_CPSystemFontCache.hasOwnProperty(key) &&
+            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
+        {
+            delete _CPSystemFontCache[key];
+        }
+    }
 }

 /*!
    Returns a font with the specified name and size.
    @param aName the name of the font
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
    @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPCachedFont(aName, aSize, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO];
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, NO);
+}
+
+/*!
+    Returns a font with the specified name, size and style.
+    @param aName the name of the font
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
+    @param italic whether the font should be italicized
+    @return the requested font
+*/
+ (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
+{
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, italic);
 }

 /*!
    Returns a bold font with the specified name and size.
    @param aName the name of the font
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
    @return the requested bold font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPCachedFont(aName, aSize, YES) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES];
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, NO);
+}
+
+/*!
+    Returns a bold font with the specified name, size and style.
+    @param aName the name of the font
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
+    @param italic whether the font should be italicized
+    @return the requested font
+*/
+ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
+{
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, italic);
+}
+
+/*!
+    Internal font getter like fontWithName:size:italic: with a bold selector.
+*/
+ (CPFont)_fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
+{
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, bold, italic);
 }

 /*!
    Returns the system font scaled to the specified size
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 creates a static font
+           in the current system font size. Negative creates a font
+           that dynamically tracks the current system font size.
    @return the requested system font
 */
 + (CPFont)systemFontOfSize:(CPSize)aSize
 {
-    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO];
+    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
 }

 /*!
    Returns the bold system font scaled to the specified size
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 creates a static font
+           in the current system font size. Negative creates a font
+           that dynamically tracks the current system font size.
    @return the requested bold system font
 */
 + (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
-    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES];
+    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
 }

-/*  FIXME Font Descriptor
-    @ignore
-*/
- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic system:(BOOL)isSystem
 {
    self = [super init];

    if (self)
    {
-        _name = aName;
        _size = aSize;
        _ascender = 0;
        _descender = 0;
        _lineHeight = 0;
        _isBold = isBold;
+        _isItalic = isItalic;
+        _isSystem = isSystem;

-        _cssString = _CPCreateCSSString(_name, _size, _isBold);
-
-        _CPFonts[_cssString] = self;
+        if (isSystem)
+        {
+            _name = aName;
+            _cssString = _CPFontCreateCSSString(_CPFontSystemFontFace, _size, _isBold, _isItalic);
+            _CPSystemFontCache[_CPSystemFontCacheKey(_size, _isBold)] = self;
+        }
+        else
+        {
+            _name = _CPFontNormalizedNames(aName);
+            _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
+            _CPFontCache[_cssString] = self;
+        }
    }

    return self;
@@ -131,22 +319,26 @@ var _CPFonts                = {},
 */
 - (float)ascender
 {
-    if (!_ascender)
-        [self _getMetrics];
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;

-    return _ascender;
+    if (!font._ascender)
+        [font _getMetrics];
+
+    return font._ascender;
 }

 /*!
    Returns the bottom y coordinate (in CSS px), offset from the baseline, of the receiver's longest descender.
-    Thus, if the longest descender extends 2 points below the baseline, descender will return –2.
+    Thus, if the longest descender extends 2 px below the baseline, descender will return –2.
 */
 - (float)descender
 {
-    if (!_descender)
-        [self _getMetrics];
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;

-    return _descender;
+    if (!font._descender)
+        [font _getMetrics];
+
+    return font._descender;
 }

 /*!
@@ -156,10 +348,12 @@ var _CPFonts                = {},
 */
 - (float)defaultLineHeightForFont
 {
-    if (!_lineHeight)
-        [self _getMetrics];
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;

-    return _lineHeight;
+    if (!font._lineHeight)
+        [font _getMetrics];
+
+    return font._lineHeight;
 }

 /*!
@@ -167,7 +361,7 @@ var _CPFonts                = {},
 */
 - (float)size
 {
-    return _size;
+    return _CPRealFontSize(_size);
 }

 /*!
@@ -175,7 +369,9 @@ var _CPFonts                = {},
 */
 - (CPString)cssString
 {
-    return _cssString;
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+
+    return font._cssString;
 }

 /*!
@@ -183,17 +379,30 @@ var _CPFonts                = {},
 */
 - (CPString)familyName
 {
+    if (_isSystem)
+        return _CPFontSystemFontFace;
+
    return _name;
 }

+- (BOOL)isSystemSize
+{
+    return _size <= 0;
+}
+
 - (BOOL)isEqual:(id)anObject
 {
-    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === [self cssString];
+    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
 }

 - (CPString)description
 {
-    return [CPString stringWithFormat:@"%@ %@ %f pt.", [super description], [self familyName], [self size]];
+    return [CPString stringWithFormat:@"%@ %@", [super description], [self cssString]];
+}
+
+- (id)copy
+{
+    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
 }

 - (void)_getMetrics
@@ -207,9 +416,11 @@ var _CPFonts                = {},

@end

-var CPFontNameKey   = @"CPFontNameKey",
-    CPFontSizeKey   = @"CPFontSizeKey",
-    CPFontIsBoldKey = @"CPFontIsBoldKey";
+var CPFontNameKey     = @"CPFontNameKey",
+    CPFontSizeKey     = @"CPFontSizeKey",
+    CPFontIsBoldKey   = @"CPFontIsBoldKey",
+    CPFontIsItalicKey = @"CPFontIsItalicKey",
+    CPFontIsSystemKey = @"CPFontIsSystemKey";

@implementation CPFont (CPCoding)

@@ -220,9 +431,13 @@ var CPFontNameKey   = @"CPFontNameKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
-    return [self _initWithName:[aCoder decodeObjectForKey:CPFontNameKey]
-        size:[aCoder decodeFloatForKey:CPFontSizeKey]
-        bold:[aCoder decodeBoolForKey:CPFontIsBoldKey]];
+    var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
+        size = [aCoder decodeFloatForKey:CPFontSizeKey],
+        isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
+        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey],
+        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];
+
+    return [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
 }

 /*!
@@ -234,6 +449,51 @@ var CPFontNameKey   = @"CPFontNameKey",
    [aCoder encodeObject:_name forKey:CPFontNameKey];
    [aCoder encodeFloat:_size forKey:CPFontSizeKey];
    [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
+    [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
+    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
 }

@end
+
+
+// aName must be normalized
+var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
+{
+    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";
+
+    return properties + _CPFontConcatNameWithFallback(aName);
+};
+
+var _CPFontConcatNameWithFallback = function(aName)
+{
+    var names = _CPFontNormalizedNameArray(aName),
+        fallbackFaces = _CPFontFallbackFaces.slice(0);
+
+    // Remove the fallback names used in the names passed in
+    for (var i = 0; i < names.length; ++i)
+    {
+        for (var j = 0; j < fallbackFaces.length; ++j)
+        {
+            if (names[i].toLowerCase() === fallbackFaces[j].toLowerCase())
+            {
+                fallbackFaces.splice(j, 1);
+                break;
+            }
+        }
+
+        if (names[i].indexOf(" ") > 0)
+            names[i] = '"' + names[i] + '"';
+    }
+
+    return names.concat(fallbackFaces).join(", ");
+};
+
+var _CPFontNormalizedNameArray = function(aName)
+{
+    var names = aName.split(",");
+
+    for (var i = 0; i < names.length; ++i)
+        names[i] = names[i].replace(_CPFontStripRegExp, "");
+
+    return names;
+};
@@ -24,6 +24,19 @@

@import "CPFont.j"

+CPItalicFontMask                    = 1 << 0;
+CPBoldFontMask                      = 1 << 1;
+CPUnboldFontMask                    = 1 << 2;
+CPNonStandardCharacterSetFontMask   = 1 << 3;
+CPNarrowFontMask                    = 1 << 4;
+CPExpandedFontMask                  = 1 << 5;
+CPCondensedFontMask                 = 1 << 6;
+CPSmallCapsFontMask                 = 1 << 7;
+CPPosterFontMask                    = 1 << 8;
+CPCompressedFontMask                = 1 << 9;
+CPFixedPitchFontMask                = 1 << 10;
+CPUnitalicFontMask                  = 1 << 24;
+

 var CPSharedFontManager     = nil,
    CPFontManagerFactory    = Nil;
@@ -33,7 +46,17 @@ var CPSharedFontManager     = nil,
 */
@implementation CPFontManager : CPObject
 {
-    CPArray _availableFonts;
+    CPArray         _availableFonts;
+
+    id              _target @accessors(property=target);
+    SEL             _action @accessors(property=action);
+
+    id              _delegate @accessors(property=delegate);
+
+    CPFont          _selectedFont;
+    BOOL            _multiple @accessors;
+
+    CPDictionary    _activeChange;
 }

 // Getting the Shared Font Manager
@@ -45,7 +68,7 @@ var CPSharedFontManager     = nil,
 {
    if (!CPSharedFontManager)
        CPSharedFontManager = [[CPFontManagerFactory alloc] init];
-    
+
    return CPSharedFontManager;
 }

@@ -59,13 +82,23 @@ var CPSharedFontManager     = nil,
    CPFontManagerFactory = aClass;
 }

+- (id)init
+{
+    if (self = [super init])
+    {
+        _action = @selector(changeFont:);
+    }
+
+    return self;
+}
+
 /*!
    Returns an array of the available fonts
 */
 - (CPArray)availableFonts
 {
    if (!_availableFonts)
-    {   
+    {
        _CPFontDetectSpan = document.createElement("span");
        _CPFontDetectSpan.fontSize = "24px";
        _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -74,13 +107,14 @@ var CPSharedFontManager     = nil,
        div.style.top = "-1000px";
        div.appendChild(_CPFontDetectSpan);
        document.getElementsByTagName("body")[0].appendChild(div);
-    
-	   _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
-    
+
+        _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
+
        _availableFonts = [];
-        for (var i = 0; i < _CPFontDetectAllFonts.length; i++) {
+        for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
+        {
            var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
-		    if (available)
+            if (available)
                _availableFonts.push(_CPFontDetectAllFonts[i]);
        }
    }
@@ -96,79 +130,169 @@ var CPSharedFontManager     = nil,
    return _CPFontDetectFontAvailable(aFontName);
 }

+- (void)setSelectedFont:(CPFont)aFont isMultiple:(BOOL)aFlag
+{
+    _selectedFont = aFont;
+    _isMultiple = aFlag;
+
+    // TODO Notify CPFontPanel when it exists.
+}
+
+- (CPFont)selectedFont
+{
+    return _selectedFont;
+}
+
+- (BOOL)isMultiple
+{
+    return _isMultiple;
+}
+
+- (int)weightOfFont:(CPFont)aFont
+{
+    // TODO Weight 5 is a normal of book weight and 9 and above is bold, but it would be nice to be more
+    // precise than that.
+    return [aFont isBold] ? 9 : 5;
+}
+
+- (CPFontTraitMask)traitsOfFont:(CPFont)aFont
+{
+    return ([aFont isBold] ? CPBoldFontMask : 0) | ([aFont isItalic] ? CPItalicFontMask : 0);
+}
+
+- (CPFont)convertFont:(CPFont)aFont
+{
+    if (!_activeChange)
+        return aFont;
+
+    var addTraits = [_activeChange valueForKey:@"addTraits"];
+
+    if (addTraits)
+        aFont = [self convertFont:aFont toHaveTrait:addTraits];
+
+    return aFont;
+}
+
+- (CPFont)convertFont:(CPFont)aFont toHaveTrait:(CPFontTraitMask)addTraits
+{
+    if (!aFont)
+        return nil;
+
+    var shouldBeBold = ([aFont isBold] || (addTraits & CPBoldFontMask)) && !(addTraits & CPUnboldFontMask),
+        shouldBeItalic = ([aFont isItalic] || (addTraits & CPItalicFontMask)) && !(addTraits & CPUnitalicFontMask),
+        shouldBeSize = [aFont size];
+
+    // XXX On the current platform there will always be a bold/italic version of each font, but still leave
+    // || aFont in here for future platforms.
+    aFont = [CPFont _fontWithName:[aFont familyName] size:shouldBeSize bold:shouldBeBold italic:shouldBeItalic] || aFont;
+
+    return aFont;
+}
+
+- (CPFont)convertFont:(CPFont)aFont toFace:(CPString)aTypeface
+{
+    if (!aFont)
+        return nil;
+
+    var shouldBeBold = [aFont isBold],
+        shouldBeItalic = [aFont isItalic],
+        shouldBeSize = [aFont size];
+
+    aFont = [CPFont _fontWithName:aTypeface size:shouldBeSize bold:shouldBeBold italic:shouldBeItalic] || aFont;
+
+    return aFont;
+}
+
+- (@action)addFontTrait:(id)sender
+{
+    _activeChange = [CPDictionary dictionaryWithObject:[sender tag] forKey:@"addTraits"];
+
+    [self sendAction];
+}
+
+- (BOOL)sendAction
+{
+    return [CPApp sendAction:_action to:_target from:self];
+}
+
@end

 var _CPFontDetectSpan,
    _CPFontDetectReferenceFonts,
    _CPFontDetectAllFonts = [
-        /* "04b_21","A Charming Font","Abadi MT Condensed","Abadi MT Condensed Extra Bold","Abadi MT Condensed Light","Academy Engraved LET","Agency FB","Alba","Alba Matter","Alba Super","Algerian",*/ 
-        "American Typewriter", 
-        /* "Andale Mono","Andale Mono IPA","Andy", */
-        "Apple Chancery","Arial","Arial Black","Arial Narrow","Arial Rounded MT Bold","Arial Unicode MS",
-        /* "Avant Garde","Avantgarde","Baby Kruffy","Base 02","Baskerville","Baskerville Old Face","Bauhaus 93","Beesknees ITC","Bell MT","Berlin Sans FB","Berlin Sans FB Demi","Bernard MT Condensed","Bickley Script",*/
-        "Big Caslon","Bitstream Vera Sans","Bitstream Vera Sans Mono","Bitstream Vera Serif",
-        /* "Blackadder ITC","Blackletter686 BT","Bodoni MT","Bodoni MT Black","Bodoni MT Condensed","Bodoni MT Poster Compressed","Book Antiqua","Bookman","Bookman Old Style","Bradley Hand ITC","Braggadocio","Britannic Bold","Broadway","Broadway BT",*/
+        /* "04b_21", "A Charming Font", "Abadi MT Condensed", "Abadi MT Condensed Extra Bold", "Abadi MT Condensed Light", "Academy Engraved LET", "Agency FB", "Alba", "Alba Matter", "Alba Super", "Algerian",*/
+        "American Typewriter",
+        /* "Andale Mono", "Andale Mono IPA", "Andy", */
+        "Apple Chancery", "Arial", "Arial Black", "Arial Narrow", "Arial Rounded MT Bold", "Arial Unicode MS",
+        /* "Avant Garde", "Avantgarde", "Baby Kruffy", "Base 02", "Baskerville", "Baskerville Old Face", "Bauhaus 93", "Beesknees ITC", "Bell MT", "Berlin Sans FB", "Berlin Sans FB Demi", "Bernard MT Condensed", "Bickley Script",*/
+        "Big Caslon", "Bitstream Vera Sans", "Bitstream Vera Sans Mono", "Bitstream Vera Serif",
+        /* "Blackadder ITC", "Blackletter686 BT", "Bodoni MT", "Bodoni MT Black", "Bodoni MT Condensed", "Bodoni MT Poster Compressed", "Book Antiqua", "Bookman", "Bookman Old Style", "Bradley Hand ITC", "Braggadocio", "Britannic Bold", "Broadway", "Broadway BT",*/
        "Brush Script MT",
-        /* "BudHand","CAMPBELL","Calibri","Californian FB","Calisto MT","Calligraph421 BT",*/
+        /* "BudHand", "CAMPBELL", "Calibri", "Californian FB", "Calisto MT", "Calligraph421 BT",*/
        "Cambria",
-        /* "Candara","Capitals",*/
-        "Caslon","Castellar","Cataneo BT","Centaur","Century Gothic","Century Schoolbook","Century Schoolbook L",
-        /* "Champignon","Charcoal","Charter","Charter BT","Chicago","Chick","Chiller","ClearlyU","Colonna MT",*/
-        "Comic Sans", "Comic Sans MS","Consolas","Constantia","Cooper Black","Copperplate","Copperplate Gothic Bold","Copperplate Gothic Light","Corbel","Courier","Courier New",
-        /* "Croobie","Curlz MT","Desdemona","Didot","DomBold BT","Edwardian Script ITC","Engravers MT","Eras Bold ITC","Eras Demi ITC","Eras Light ITC","Eras Medium ITC","Eurostile","FIRSTHOME","Fat","Felix Titling","Fine Hand","Fixed","Footlight MT Light","Forte","Franklin Gothic Book","Franklin Gothic Demi","Franklin Gothic Demi Cond","Franklin Gothic Heavy","Franklin Gothic Medium","Franklin Gothic Medium Cond","Freestyle Script","French Script MT","Freshbot","Frosty",*/
+        /* "Candara", "Capitals",*/
+        "Caslon", "Castellar", "Cataneo BT", "Centaur", "Century Gothic", "Century Schoolbook", "Century Schoolbook L",
+        /* "Champignon", "Charcoal", "Charter", "Charter BT", "Chicago", "Chick", "Chiller", "ClearlyU", "Colonna MT",*/
+        "Comic Sans", "Comic Sans MS", "Consolas", "Constantia", "Cooper Black", "Copperplate", "Copperplate Gothic Bold", "Copperplate Gothic Light", "Corbel", "Courier", "Courier New",
+        /* "Croobie", "Curlz MT", "Desdemona", "Didot", "DomBold BT", "Edwardian Script ITC", "Engravers MT", "Eras Bold ITC", "Eras Demi ITC", "Eras Light ITC", "Eras Medium ITC", "Eurostile", "FIRSTHOME", "Fat", "Felix Titling", "Fine Hand", "Fixed", "Footlight MT Light", "Forte", "Franklin Gothic Book", "Franklin Gothic Demi", "Franklin Gothic Demi Cond", "Franklin Gothic Heavy", "Franklin Gothic Medium", "Franklin Gothic Medium Cond", "Freestyle Script", "French Script MT", "Freshbot", "Frosty",*/
        "Futura",
-        /* "GENUINE","Gadget","Garamond",*/
-        "Geneva","Georgia","Georgia Ref", "Geeza Pro", "Gigi","Gill Sans","Gill Sans MT","Gill Sans MT Condensed","Gill Sans MT Ext Condensed Bold","Gill Sans Ultra Bold","Gill Sans Ultra Bold Condensed",
-        /* "GlooGun","Gloucester MT Extra Condensed","Goudy Old Style","Goudy Stout","Haettenschweiler","Harlow Solid Italic","Harrington",*/
-        "Helvetica","Helvetica Narrow","Helvetica Neue","Herculanum","High Tower Text","Highlight LET","Hoefler Text","Impact","Imprint MT Shadow",
-        /* "Informal Roman","Jenkins v2.0","John Handy LET","Jokerman","Jokerman LET","Jokewood","Juice ITC","Kabel Ult BT","Kartika","Kino MT","Kristen ITC","Kunstler Script","La Bamba LET", */
-        "Lucida","Lucida Bright","Lucida Calligraphy","Lucida Console","Lucida Fax","Lucida Grande","Lucida Handwriting","Lucida Sans","Lucida Sans Typewriter","Lucida Sans Unicode", 
-        /* "Luxi Mono","Luxi Sans","Luxi Serif","MARKETPRO","MS Reference Sans Serif","MS Reference Serif","Magneto","Maiandra GD", */ 
+        /* "GENUINE", "Gadget", "Garamond",*/
+        "Geneva", "Georgia", "Georgia Ref", "Geeza Pro", "Gigi", "Gill Sans", "Gill Sans MT", "Gill Sans MT Condensed", "Gill Sans MT Ext Condensed Bold", "Gill Sans Ultra Bold", "Gill Sans Ultra Bold Condensed",
+        /* "GlooGun", "Gloucester MT Extra Condensed", "Goudy Old Style", "Goudy Stout", "Haettenschweiler", "Harlow Solid Italic", "Harrington",*/
+        "Helvetica", "Helvetica Narrow", "Helvetica Neue", "Herculanum", "High Tower Text", "Highlight LET", "Hoefler Text", "Impact", "Imprint MT Shadow",
+        /* "Informal Roman", "Jenkins v2.0", "John Handy LET", "Jokerman", "Jokerman LET", "Jokewood", "Juice ITC", "Kabel Ult BT", "Kartika", "Kino MT", "Kristen ITC", "Kunstler Script", "La Bamba LET", */
+        "Lucida", "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "Lucida Grande", "Lucida Handwriting", "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
+        /* "Luxi Mono", "Luxi Sans", "Luxi Serif", "MARKETPRO", "MS Reference Sans Serif", "MS Reference Serif", "Magneto", "Maiandra GD", */
        "Marker Felt",
-        /* "Matisse ITC","Matura MT Script Capitals","Mead Bold","Mekanik LET","Mercurius Script MT Bold", */
-        "Microsoft Sans Serif","Milano LET","Minion Web","MisterEarl BT","Mistral","Monaco","Monotype Corsiva","Monotype.com","New Century Schoolbook","New York","News Gothic MT",
-        /* "Niagara Engraved","Niagara Solid","Nimbus Mono L","Nimbus Roman No9 L","OCR A Extended","OCRB","Odessa LET","Old English Text MT","OldDreadfulNo7 BT","One Stroke Script LET","Onyx","Optima","Orange LET","Palace Script MT","Palatino","Palatino Linotype", */
+        /* "Matisse ITC", "Matura MT Script Capitals", "Mead Bold", "Mekanik LET", "Mercurius Script MT Bold", */
+        "Microsoft Sans Serif", "Milano LET", "Minion Web", "MisterEarl BT", "Mistral", "Monaco", "Monotype Corsiva", "Monotype.com", "New Century Schoolbook", "New York", "News Gothic MT",
+        /* "Niagara Engraved", "Niagara Solid", "Nimbus Mono L", "Nimbus Roman No9 L", "OCR A Extended", "OCRB", "Odessa LET", "Old English Text MT", "OldDreadfulNo7 BT", "One Stroke Script LET", "Onyx", "Optima", "Orange LET", "Palace Script MT", "Palatino", "Palatino Linotype", */
        "Papyrus",
-        /* "ParkAvenue BT","Pepita MT","Perpetua","Perpetua Titling MT","Placard Condensed","Playbill","Poornut","Pristina","Pump Demi Bold LET","Pussycat","Quixley LET","Rage Italic","Rage Italic LET","Ravie","Rockwell","Rockwell Condensed","Rockwell Extra Bold","Ruach LET","Runic MT Condensed","Sand","Script MT Bold","Scruff LET","Segoe UI","Showcard Gothic","Skia","Smudger LET","Snap ITC","Square721 BT","Staccato222 BT","Stencil","Sylfaen", */
-        "Tahoma","Techno","Tempus Sans ITC","Terminal","Textile","Times","Times New Roman","Tiranti Solid LET","Trebuchet MS",
-        /* "Tw Cen MT","Tw Cen MT Condensed","Tw Cen MT Condensed Extra Bold","URW Antiqua T","URW Bookman L","URW Chancery L","URW Gothic L","URW Palladio L","Univers","University Roman LET","Utopia", */
-        "Verdana","Verdana Ref", /* "Victorian LET","Viner Hand ITC","Vivaldi","Vladimir Script","Vrinda","Weltron Urban","Westwood LET","Wide Latin","Zapf Chancery", */
+        /* "ParkAvenue BT", "Pepita MT", "Perpetua", "Perpetua Titling MT", "Placard Condensed", "Playbill", "Poornut", "Pristina", "Pump Demi Bold LET", "Pussycat", "Quixley LET", "Rage Italic", "Rage Italic LET", "Ravie", "Rockwell", "Rockwell Condensed", "Rockwell Extra Bold", "Ruach LET", "Runic MT Condensed", "Sand", "Script MT Bold", "Scruff LET", "Segoe UI", "Showcard Gothic", "Skia", "Smudger LET", "Snap ITC", "Square721 BT", "Staccato222 BT", "Stencil", "Sylfaen", */
+        "Tahoma", "Techno", "Tempus Sans ITC", "Terminal", "Textile", "Times", "Times New Roman", "Tiranti Solid LET", "Trebuchet MS",
+        /* "Tw Cen MT", "Tw Cen MT Condensed", "Tw Cen MT Condensed Extra Bold", "URW Antiqua T", "URW Bookman L", "URW Chancery L", "URW Gothic L", "URW Palladio L", "Univers", "University Roman LET", "Utopia", */
+        "Verdana", "Verdana Ref", /* "Victorian LET", "Viner Hand ITC", "Vivaldi", "Vladimir Script", "Vrinda", "Weltron Urban", "Westwood LET", "Wide Latin", "Zapf Chancery", */
        "Zapfino"];

 // Compare against the reference fonts. Return true if it produces a different size than at least one of them.
-var _CPFontDetectFontAvailable = function(font) {
-	for (var i = 0; i < _CPFontDetectReferenceFonts.length; i++)
-		if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
-			return true;
-	return false;
-}
+var _CPFontDetectFontAvailable = function(font)
+{
+    for (var i = 0; i < _CPFontDetectReferenceFonts.length; i++)
+        if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
+            return true;
+    return false;
+};

 var _CPFontDetectCache = {};

 // Compares two given fonts. Returns true if they produce different sizes (i.e. fontA didn't fallback to fontB)
-var _CPFontDetectCompareFonts = function(fontA, fontB) {
+var _CPFontDetectCompareFonts = function(fontA, fontB)
+{
    var a;
-    if (_CPFontDetectCache[fontA]) {
+    if (_CPFontDetectCache[fontA])
        a = _CPFontDetectCache[fontA];
-    } else {
-    	_CPFontDetectSpan.style.fontFamily = '"' + fontA + '"';
+
+    else
+    {
+        _CPFontDetectSpan.style.fontFamily = '"' + fontA + '"';
        _CPFontDetectCache[fontA] = a = { w: _CPFontDetectSpan.offsetWidth, h: _CPFontDetectSpan.offsetHeight };
    }
-	
-	_CPFontDetectSpan.style.fontFamily= '"' + fontB + '", "' + fontA + '"';
-	var bWidth = _CPFontDetectSpan.offsetWidth;
-	var bHeight = _CPFontDetectSpan.offsetHeight;
-	
-	return (a.w != bWidth || a.h != bHeight);
-}
+
+    _CPFontDetectSpan.style.fontFamily = '"' + fontB + '", "' + fontA + '"';
+    var bWidth = _CPFontDetectSpan.offsetWidth,
+        bHeight = _CPFontDetectSpan.offsetHeight;
+
+    return (a.w != bWidth || a.h != bHeight);
+};

 // Test the candidate fonts pairwise until we find two that are different. Otherwise return the first.
-var _CPFontDetectPickTwoDifferentFonts = function(candidates) {
-	for (var i = 0; i < candidates.length; i++)
-		for (var j = 0; j < i; j++)
-			if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
-				return [candidates[i], candidates[j]];
-	return [candidates[0]];
-}
+var _CPFontDetectPickTwoDifferentFonts = function(candidates)
+{
+    for (var i = 0; i < candidates.length; i++)
+        for (var j = 0; j < i; j++)
+            if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
+                return [candidates[i], candidates[j]];
+    return [candidates[0]];
+};

 [CPFontManager setFontManagerFactory:[CPFontManager class]];
@@ -0,0 +1,123 @@
+/*
+ * CPGradient.j
+ * AppKit
+ *
+ * Created by Alexander Ljungberg.
+ * Copyright 2012, SlevenBits Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;
+CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
+
+/*!
+    A class for drawing linear and radial gradients with a convenient API.
+*/
+@implementation CPGradient : CPObject
+{
+    CGGradient _gradient;
+}
+
+- (id)initWithColors:(CPArray)someColors
+{
+    var count = [someColors count];
+
+    if (count < 2)
+        [CPException raise:CPInvalidArgumentException reason:@"at least 2 colors required"];
+
+    var distance = 1.0 / (count - 1),
+        locations = [CPMutableArray array],
+        location = 0.0;
+
+    for (var i = 0; i < count; i++)
+    {
+        [locations addObject:location];
+        location += distance;
+    }
+
+    return [self initWithColors:someColors atLocations:locations colorSpace:nil];
+}
+
+- (id)initWithColors:(CPArray)someColors atLocations:(CPArray)someLocations colorSpace:(CPColorSpace)aColorSpace
+{
+    if (self = [super init])
+    {
+        var cgColors = [],
+            count = [someColors count],
+            colorSpace = [aColorSpace CGColorSpace] || CGColorSpaceCreateDeviceRGB;
+        for (var i = 0; i < count; i++)
+            cgColors.push(CGColorCreate(colorSpace, [someColors[i] components]));
+        _gradient = CGGradientCreateWithColors(colorSpace, cgColors, someLocations);
+    }
+
+    return self;
+}
+
+- (void)drawInRect:(CGRect)rect angle:(float)angle
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextSaveGState(ctx);
+    CGContextClipToRect(ctx, rect);
+    CGContextAddRect(ctx, rect);
+
+    var startPoint,
+        endPoint;
+
+    // Modulo of negative values doesn't work as expected in JS.
+    angle = ((angle % 360.0) + 360.0) % 360.0;
+
+    if (angle < 90.0)
+        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMinY(rect));
+    else if (angle < 180.0)
+        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMinY(rect));
+    else if (angle < 270.0)
+        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMaxY(rect));
+    else
+        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMaxY(rect));
+
+    // A line segment comes out of the starting point at the given angle, with the first colour
+    // at the starting point and the last at the end. To do what drawInRect: is supposed to do
+    // we want the opposite corner of the starting corner to just reach the final colour stop.
+    // So when the angle isn't a right angle, the segment has to extend beyond the edge of the
+    // rectangle just far enough. This is hard to describe without a picture but if we place
+    // another line through the opposite corner at -90 degrees, it'll help form some triangles
+    // from which we can derive this formula:
+    //
+    // length = cos(angle) * (rectWidth + rectHeight * tan(angle))
+    //
+    // This simplifies down to (in the first quadrant) rectWidth * cos(a) + rectHeight * sin(a).
+
+    var radians = PI * angle / 180.0,
+        length = ABS(_CGRectGetWidth(rect) * COS(radians)) + ABS(_CGRectGetHeight(rect) * SIN(radians));
+
+    endPoint = _CGPointMake(startPoint.x + length * COS(radians),
+                           startPoint.y + length * SIN(radians));
+
+    [self drawFromPoint:startPoint toPoint:endPoint options:CPGradientDrawsBeforeStartingLocation | CPGradientDrawsAfterEndingLocation];
+    CGContextRestoreGState(ctx);
+}
+
+- (void)drawFromPoint:(NSPoint)startingPoint toPoint:(NSPoint)endingPoint options:(NSGradientDrawingOptions)options
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    // TODO kCGGradientDrawsBeforeStartLocation and kCGGradientDrawsAfterEndLocation are not actually supported
+    // by CGContextDrawLinearGradient yet.
+    CGContextDrawLinearGradient(ctx, _gradient, startingPoint, endingPoint, options);
+}
+
+@end
@@ -70,7 +70,10 @@ function CPDrawColorTiledRects(
        if (_CGRectIsEmpty(slice))
            continue;

-        var minX, maxX, minY, maxY;
+        var minX,
+            maxX,
+            minY,
+            maxY;

        if (side == CPMinXEdge || side == CPMaxXEdge)
        {
@@ -105,4 +108,4 @@ function CPDrawColorTiledRects(
    CGContextRestoreGState(context);

    return resultRect;
-}
+}
@@ -25,7 +25,7 @@
@import "CGContext.j"


-var CPGraphicsContextCurrent    = nil;
+var CPGraphicsContextCurrent = nil;

 /*!
    @ingroup appkit
@@ -33,7 +33,7 @@ var CPGraphicsContextCurrent    = nil;
 */
@implementation CPGraphicsContext : CPObject
 {
-    CPContext   _graphicsPort;
+    CGContext   _graphicsPort;
 }

 /*!
@@ -71,10 +71,10 @@ var CPGraphicsContextCurrent    = nil;
 - (id)initWithGraphicsPort:(CPContext)aGraphicsPort
 {
    self = [super init];
-    
+
    if (self)
        _graphicsPort = aGraphicsPort;
-    
+
    return self;
 }

@@ -86,4 +86,17 @@ var CPGraphicsContextCurrent    = nil;
    return _graphicsPort;
 }

+/*!
+    (Not implemented. Always returns Cappuccino's default, `YES`.)
+
+    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
+    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
+
+    Note: Cappuccino is flipped by default.
+*/
+- (BOOL)isFlipped
+{
+    return YES;
+}
+
@end
@@ -21,13 +21,12 @@
 */

@import <Foundation/CPBundle.j>
+@import <Foundation/CPGeometry.j>
@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPObject.j>
@import <Foundation/CPRunLoop.j>
@import <Foundation/CPString.j>

-@import "CPGeometry.j"
-

 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -44,7 +43,8 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";

 var imagesForNames = { },
-    AppKitImageForNames = { };
+    AppKitImageForNames = { },
+    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";

 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
@@ -65,7 +65,7 @@ function CPAppKitImage(aFilename, aSize)
    return CPImageInBundle(aFilename, aSize, [CPBundle bundleForClass:[CPView class]]);
 }

-/*! 
+/*!
    @ingroup appkit
    @class CPImage

@@ -73,7 +73,7 @@ function CPAppKitImage(aFilename, aSize)
    all image types supported by the browser.

    @par Delegate Methods
-    
+
    @delegate -(void)imageDidLoad:(CPImage)image;
    Called when the specified image has finished loading.
    @param image the image that loaded
@@ -157,6 +157,20 @@ function CPAppKitImage(aFilename, aSize)
    return self;
 }

+/*!
+    Initializes the receiver with the specified data. The method loads the data into memory.
+    @param someData the CPData object representing the image
+    @return the initialized image
+*/
+- (id)initWithData:(CPData)someData
+{
+    var base64 = [someData base64],
+        type = [base64 hasPrefix:@"/9j/4AAQSkZJRgABAQEASABIAAD/"] ? @"jpg" : @"png",
+        dataURL = "data:image/" + type + ";base64," + base64;
+
+    return [self initWithContentsOfFile:dataURL];
+}
+
 /*!
    Returns the path of the file associated with this image.
 */
@@ -165,6 +179,37 @@ function CPAppKitImage(aFilename, aSize)
    return _filename;
 }

+/*!
+    Returns the data associated with this image.
+    @discussion Returns nil if the reciever was not initialized with -initWithData: and the browser does not support the canvas feature;
+*/
+- (CPData)data
+{
+#if PLATFORM(DOM)
+    var dataURL;
+
+    if ([_filename hasPrefix:@"data:image"])
+        dataURL = _filename;
+    else if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
+    {
+        var canvas = document.createElement("canvas"),
+            ctx = canvas.getContext("2d");
+
+        canvas.width = _image.width,
+        canvas.height = _image.height;
+
+        ctx.drawImage(_image, 0, 0);
+
+        dataURL = canvas.toDataURL("image/png");
+    }
+    else
+        return nil;
+
+    var base64 = dataURL.replace(/^data:image\/png;base64,/, "");
+    return [CPData dataWithBase64:base64];
+#endif
+}
+
 /*!
    Sets the size of the image.
    @param the size of the image
@@ -280,7 +325,7 @@ function CPAppKitImage(aFilename, aSize)
                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
            }
            [self _derefFromImage];
-        }
+        };

    _image.onerror = function ()
        {
@@ -292,7 +337,7 @@ function CPAppKitImage(aFilename, aSize)
                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
            }
            [self _derefFromImage];
-        }
+        };

    _image.onabort = function ()
        {
@@ -304,7 +349,7 @@ function CPAppKitImage(aFilename, aSize)
                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
            }
            [self _derefFromImage];
-        }
+        };

    _image.src = _filename;

@@ -324,6 +369,24 @@ function CPAppKitImage(aFilename, aSize)
    return NO;
 }

+- (CPString)description
+{
+    var filename = [self filename],
+        size = [self size];
+
+    if (filename.indexOf("data:") === 0)
+    {
+        var index = filename.indexOf(",");
+
+        if (index > 0)
+            filename = [CPString stringWithFormat:@"%s,%s...%s", filename.substr(0, index), filename.substr(index + 1, 10), filename.substr(filename.length - 10)];
+        else
+            filename = "data:<unknown type>";
+    }
+
+    return [CPString stringWithFormat:ImageDescriptionFormat, [super description], filename, size.width, size.height];
+}
+
 /* @ignore */
 - (void)_derefFromImage
 {
@@ -26,11 +26,6 @@
@import "CPImage.j"
@import "CPShadowView.j"

-
-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
-
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -41,17 +36,9 @@ CPImageAlignBottomLeft  = 6;
 CPImageAlignBottomRight = 7;
 CPImageAlignRight       = 8;

-var CPImageViewShadowBackgroundColor = nil,
-    CPImageViewEmptyPlaceholderImage = nil;
-    
-var LEFT_SHADOW_INSET       = 3.0,
-    RIGHT_SHADOW_INSET      = 3.0,
-    TOP_SHADOW_INSET        = 3.0,
-    BOTTOM_SHADOW_INSET     = 5.0,
-    VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
-    HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
+var CPImageViewEmptyPlaceholderImage = nil;

-/*! 
+/*!
    @ingroup appkit
    @class CPImageView

@@ -60,7 +47,7 @@ var LEFT_SHADOW_INSET       = 3.0,
@implementation CPImageView : CPControl
 {
    DOMElement          _DOMImageElement;
-    
+
    BOOL                _hasShadow;
    CPView              _shadowView;

@@ -72,15 +59,26 @@ var LEFT_SHADOW_INSET       = 3.0,

 + (void)initialize
 {
+    if (self !== [CPImageView class])
+        return;
+
    var bundle = [CPBundle bundleForClass:[CPView class]];
-    
+
    CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }

+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding === CPValueBinding || theBinding === CPValueURLBinding || theBinding === CPValuePathBinding || theBinding === CPDataBinding)
+        return [CPImageViewValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
-    
+
    if (self)
    {
 #if PLATFORM(DOM)
@@ -96,11 +94,11 @@ var LEFT_SHADOW_INSET       = 3.0,
        }

        CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-        
+
        _DOMImageElement.style.visibility = "hidden";
 #endif
    }
-    
+
    return self;
 }

@@ -121,29 +119,29 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)setObjectValue:(CPImage)anImage
 {
    var oldImage = [self objectValue];
-    
+
    if (oldImage === anImage)
        return;
-        
+
    [super setObjectValue:anImage];
-    
+
    var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
    if (oldImage)
        [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage];

    var newImage = [self objectValue];
-    
+
 #if PLATFORM(DOM)
    _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
 #endif

    var size = [newImage size];
-    
+
    if (size && size.width === -1 && size.height === -1)
    {
        [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage];
-        
+
 #if PLATFORM(DOM)
        _DOMImageElement.width = 0;
        _DOMImageElement.height = 0;
@@ -162,7 +160,7 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)imageDidLoad:(CPNotification)aNotification
 {
    [self hideOrDisplayContents];
-    
+
    [self setNeedsLayout];
    [self setNeedsDisplay:YES];
 }
@@ -184,25 +182,25 @@ var LEFT_SHADOW_INSET       = 3.0,
 {
    if (_hasShadow == shouldHaveShadow)
        return;
-    
+
    _hasShadow = shouldHaveShadow;

    if (_hasShadow)
    {
        _shadowView = [[CPShadowView alloc] initWithFrame:[self bounds]];
-                        
+
        [self addSubview:_shadowView];
-        
+
        [self setNeedsLayout];
        [self setNeedsDisplay:YES];
    }
    else
    {
        [_shadowView removeFromSuperview];
-        
+
        _shadowView = nil;
    }
-    
+
    [self hideOrDisplayContents];
 }

@@ -215,12 +213,12 @@ var LEFT_SHADOW_INSET       = 3.0,
 {
    if (_imageAlignment == anImageAlignment)
        return;
-        
+
    _imageAlignment = anImageAlignment;
-    
+
    if (![self image])
        return;
-        
+
    [self setNeedsLayout];
    [self setNeedsDisplay:YES];
 }
@@ -238,14 +236,14 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)setImageScaling:(CPImageScaling)anImageScaling
 {
    [super setImageScaling:anImageScaling];
-    
+
 #if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
    {
        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
    }
 #endif
-    
+
    [self setNeedsLayout];
    [self setNeedsDisplay:YES];
 }
@@ -297,68 +295,64 @@ var LEFT_SHADOW_INSET       = 3.0,
        imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
        x = 0.0,
        y = 0.0,
-        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
-        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
+        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
+        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
        boundsWidth = _CGRectGetWidth(bounds),
        boundsHeight = _CGRectGetHeight(bounds),
        width = boundsWidth - insetWidth,
        height = boundsHeight - insetHeight;

-    if (imageScaling === CPScaleToFit)
+    if (imageScaling === CPImageScaleAxesIndependently)
    {
-#if PLATFORM(DOM)
-        _DOMImageElement.width = ROUND(width);
-        _DOMImageElement.height = ROUND(height);
-#endif
+        #if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(width);
+            _DOMImageElement.height = ROUND(height);
+        #endif
    }
    else
    {
        var size = [image size];
-        
+
        if (size.width == -1 && size.height == -1)
            return;

-        if (imageScaling === CPScaleProportionally)
+        switch (imageScaling)
        {
-            // The max size it can be is size.width x size.height, so only
-            // only proportion otherwise.
-            if (width >= size.width && height >= size.height)
-            {
-                width = size.width;
-                height = size.height;
-            }
-            else
-            {
+            case CPImageScaleProportionallyDown:
+                if (width >= size.width && height >= size.height)
+                {
+                    width = size.width;
+                    height = size.height;
+                    break;
+                }
+
+                // intentionally fall through to the next case
+
+            case CPImageScaleProportionallyUpOrDown:
                var imageRatio = size.width / size.height,
                    viewRatio = width / height;
-                    
+
                if (viewRatio > imageRatio)
                    width = height * imageRatio;
                else
                    height = width / imageRatio;
-            }
+                break;

-#if PLATFORM(DOM)
+            case CPImageScaleAxesIndependently:
+            case CPImageScaleNone:
+                width = size.width;
+                height = size.height;
+                break;
+        }
+
+        #if PLATFORM(DOM)
            _DOMImageElement.width = ROUND(width);
            _DOMImageElement.height = ROUND(height);
-#endif
-        }
-        else
-        {
-            width = size.width;
-            height = size.height;
-        }
-    
-        if (imageScaling == CPScaleNone)
-        {
-#if PLATFORM(DOM)
-            _DOMImageElement.width = ROUND(size.width);
-            _DOMImageElement.height = ROUND(size.height);
-#endif
-        }
+        #endif
+
+        var x,
+            y;

-        var x, y;
-            
        switch (_imageAlignment)
        {
            case CPImageAlignLeft:
@@ -366,7 +360,7 @@ var LEFT_SHADOW_INSET       = 3.0,
            case CPImageAlignBottomLeft:
                x = 0.0;
                break;
-                
+
            case CPImageAlignRight:
            case CPImageAlignTopRight:
            case CPImageAlignBottomRight:
@@ -377,7 +371,7 @@ var LEFT_SHADOW_INSET       = 3.0,
                x = (boundsWidth - width) / 2.0;
                break;
        }
-                
+
        switch (_imageAlignment)
        {
            case CPImageAlignTop:
@@ -385,7 +379,7 @@ var LEFT_SHADOW_INSET       = 3.0,
            case CPImageAlignTopRight:
                y = 0.0;
                break;
-                
+
            case CPImageAlignBottom:
            case CPImageAlignBottomLeft:
            case CPImageAlignBottomRight:
@@ -395,7 +389,7 @@ var LEFT_SHADOW_INSET       = 3.0,
            default:
                y = (boundsHeight - height) / 2.0;
                break;
-        }  
+        }

 #if PLATFORM(DOM)
        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
@@ -403,9 +397,9 @@ var LEFT_SHADOW_INSET       = 3.0,
    }

    _imageRect = _CGRectMake(x, y, width, height);
-    
+
    if (_hasShadow)
-        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -450,12 +444,45 @@ var LEFT_SHADOW_INSET       = 3.0,
        [self setImage:images[0]];
        [self sendAction:[self action] to:[self target]];
    }
-    
+
    return YES;
 }

@end

+@implementation CPImageViewValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [self _setPlaceholder:nil forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:nil forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:nil forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:nil forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setImage:nil];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    var image;
+
+    if (aBinding === CPDataBinding)
+        image = [[CPImage alloc] initWithData:aValue];
+    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
+        image = [[CPImage alloc] initWithContentsOfFile:aValue];
+    else if (aBinding === CPValueBinding)
+        image = aValue;
+
+    [_source setImage:image];
+}
+
+@end
+
 var CPImageViewImageKey          = @"CPImageViewImageKey",
    CPImageViewImageScalingKey   = @"CPImageViewImageScalingKey",
    CPImageViewImageAlignmentKey = @"CPImageViewImageAlignmentKey",
@@ -482,10 +509,13 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
        _DOMImageElement.setAttribute("draggable", "true");
        _DOMImageElement.style["-khtml-user-drag"] = "element";
    }
+
+    if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
+        _DOMImageElement.setAttribute("data-cappuccino-view", [self className]);
 #endif

    self = [super initWithCoder:aCoder];
-    
+
    if (self)
    {
 #if PLATFORM(DOM)
@@ -494,14 +524,14 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",

        [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
        [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
-        
-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
+
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
            [self setEditable:YES];

        [self setNeedsLayout];
        [self setNeedsDisplay:YES];
    }
-    
+
    return self;
 }

@@ -512,21 +542,21 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // We do this in order to avoid encoding the _shadowView, which 
+    // We do this in order to avoid encoding the _shadowView, which
    // should just automatically be created programmatically as needed.
    if (_shadowView)
    {
        var actualSubviews = _subviews;
-        
+
        _subviews = [_subviews copy];
        [_subviews removeObjectIdenticalTo:_shadowView];
    }
-        
+
    [super encodeWithCoder:aCoder];
-    
+
    if (_shadowView)
        _subviews = actualSubviews;
-    
+
    [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
    [aCoder encodeInt:_imageAlignment forKey:CPImageViewImageAlignmentKey];

@@ -28,6 +28,7 @@
 CPStandardKeyBindings = {
    @"@.": @"cancelOperation:",

+    @"@a": @"selectAll:",
    @"^a": @"moveToBeginningOfParagraph:",
    @"^$a": @"moveToBeginningOfParagraphAndModifySelection:",
    @"^b": @"moveBackward:",
@@ -152,7 +153,7 @@ var CPKeyBindingCache = {};

 + (void)initialize
 {
-    if ([self class] !== CPKeyBinding)
+    if (self !== [CPKeyBinding class])
        return;

    [self createKeyBindingsFromJSObject:CPStandardKeyBindings];
@@ -35,20 +35,23 @@ var exposedBindingsMap = [CPDictionary new],
 var CPBindingOperationAnd = 0,
    CPBindingOperationOr  = 1;

-@implementation CPKeyValueBinding : CPObject
+@implementation CPBinder : CPObject
 {
    CPDictionary    _info;
    id              _source;
+
+    JSObject        _suppressedNotifications;
+    JSObject        _placeholderForMarker;
 }

 + (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
 {
-    var bindings = [exposedBindingsMap objectForKey:[aClass hash]];
+    var bindings = [exposedBindingsMap objectForKey:[aClass UID]];

    if (!bindings)
    {
        bindings = [];
-        [exposedBindingsMap setObject:bindings forKey:[aClass hash]];
+        [exposedBindingsMap setObject:bindings forKey:[aClass UID]];
    }

    bindings.push(aBinding);
@@ -56,12 +59,12 @@ var CPBindingOperationAnd = 0,

 + (CPArray)exposedBindingsForClass:(Class)aClass
 {
-    return [[exposedBindingsMap objectForKey:[aClass hash]] copy];
+    return [[exposedBindingsMap objectForKey:[aClass UID]] copy];
 }

-+ (CPKeyValueBinding)getBinding:(CPString)aBinding forObject:(id)anObject
+ (CPBinder)getBinding:(CPString)aBinding forObject:(id)anObject
 {
-    return [[bindingsMap objectForKey:[anObject hash]] objectForKey:aBinding];
+    return [[bindingsMap objectForKey:[anObject UID]] objectForKey:aBinding];
 }

 + (CPDictionary)infoForBinding:(CPString)aBinding forObject:(id)anObject
@@ -76,12 +79,12 @@ var CPBindingOperationAnd = 0,

 + (CPDictionary)allBindingsForObject:(id)anObject
 {
-    return [bindingsMap objectForKey:[anObject hash]];
+    return [bindingsMap objectForKey:[anObject UID]];
 }

 + (void)unbind:(CPString)aBinding forObject:(id)anObject
 {
-    var bindings = [bindingsMap objectForKey:[anObject hash]];
+    var bindings = [bindingsMap objectForKey:[anObject UID]];

    if (!bindings)
        return;
@@ -101,7 +104,7 @@ var CPBindingOperationAnd = 0,

 + (void)unbindAllForObject:(id)anObject
 {
-    var bindings = [bindingsMap objectForKey:[anObject hash]];
+    var bindings = [bindingsMap objectForKey:[anObject UID]];
    if (!bindings)
        return;

@@ -111,7 +114,7 @@ var CPBindingOperationAnd = 0,
    while (count--)
        [anObject unbind:[bindings objectForKey:allKeys[count]]];

-    [bindingsMap removeObjectForKey:[anObject hash]];
+    [bindingsMap removeObjectForKey:[anObject UID]];
 }

 - (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
@@ -122,17 +125,21 @@ var CPBindingOperationAnd = 0,
    {
        _source = aSource;
        _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
+        _suppressedNotifications = {};
+        _placeholderForMarker = {};

        if (options)
            [_info setObject:options forKey:CPOptionsKey];

+        [self _updatePlaceholdersWithOptions:options];
+
        [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];

-        var bindings = [bindingsMap objectForKey:[_source hash]];
+        var bindings = [bindingsMap objectForKey:[_source UID]];
        if (!bindings)
        {
            bindings = [CPDictionary new];
-            [bindingsMap setObject:bindings forKey:[_source hash]];
+            [bindingsMap setObject:bindings forKey:[_source UID]];
        }

        [bindings setObject:self forKey:aName];
@@ -142,7 +149,7 @@ var CPBindingOperationAnd = 0,
    return self;
 }

- (void)setValueFor:(CPString)aBinding
+- (void)setValueFor:(CPString)theBinding
 {
    var destination = [_info objectForKey:CPObservedObjectKey],
        keyPath = [_info objectForKey:CPObservedKeyPathKey],
@@ -152,34 +159,30 @@ var CPBindingOperationAnd = 0,

    if (isPlaceholder)
    {
-        switch (newValue)
+        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
        {
-            case CPMultipleValuesMarker:
-                newValue = [options objectForKey:CPMultipleValuesPlaceholderBindingOption] || @"Multiple Values";
-                break;
-
-            case CPNoSelectionMarker:
-                newValue = [options objectForKey:CPNoSelectionPlaceholderBindingOption] || @"No Selection";
-                break;
-
-            case CPNotApplicableMarker:
-                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-                    [CPException raise:CPGenericException reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
-
-                newValue = [options objectForKey:CPNotApplicablePlaceholderBindingOption] || @"Not Applicable";
-                break;
+           [CPException raise:CPGenericException
+                       reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + newValue];
        }
+
+        var value = [self _placeholderForMarker:newValue];
+        [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
    }
    else
    {
-        // Only transform the value if the current value is not a placeholder
-        newValue = [self transformValue:newValue withOptions:options];
+        var value = [self transformValue:newValue withOptions:options];
+        [self setValue:value forBinding:theBinding];
    }
+}

-    [_source setValue:newValue forKey:aBinding];
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setValue:aValue forKey:aBinding];
+}

-    if ([_source respondsToSelector:@selector(_setCurrentValueIsPlaceholder:)])
-        [_source _setCurrentValueIsPlaceholder:isPlaceholder];
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setValue:aValue forKey:aBinding];
 }

 - (void)reverseSetValueFor:(CPString)aBinding
@@ -187,10 +190,18 @@ var CPBindingOperationAnd = 0,
    var destination = [_info objectForKey:CPObservedObjectKey],
        keyPath = [_info objectForKey:CPObservedKeyPathKey],
        options = [_info objectForKey:CPOptionsKey],
-        newValue = [_source valueForKeyPath:aBinding];
+        newValue = [self valueForBinding:aBinding];

    newValue = [self reverseTransformValue:newValue withOptions:options];
+
+    [self suppressSpecificNotificationFromObject:destination keyPath:keyPath];
    [destination setValue:newValue forKeyPath:keyPath];
+    [self unsuppressSpecificNotificationFromObject:destination keyPath:keyPath];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source valueForKeyPath:aBinding];
 }

 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -198,15 +209,15 @@ var CPBindingOperationAnd = 0,
    if (!changes)
        return;

+    var objectSuppressions = _suppressedNotifications[[anObject UID]];
+    if (objectSuppressions && objectSuppressions[aKeyPath])
+        return;
+
    [self setValueFor:context];
 }

 - (id)transformValue:(id)aValue withOptions:(CPDictionary)options
 {
-    var valueTransformerName,
-        valueTransformer,
-        placeholder;
-
    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
        valueTransformer;

@@ -230,14 +241,13 @@ var CPBindingOperationAnd = 0,
    if (valueTransformer)
        aValue = [valueTransformer transformedValue:aValue];

-
-    if (aValue === undefined || aValue === nil)
+    if (aValue === undefined || aValue === nil || aValue === [CPNull null])
        aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;

    return aValue;
 }

- (id)reverseTransformValue:(id)aValue withOptions: (CPDictionary)options
+- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
 {
    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
        valueTransformer;
@@ -253,13 +263,98 @@ var CPBindingOperationAnd = 0,
    return aValue;
 }

+- (BOOL)continuouslyUpdatesValue
+{
+    var options = [_info objectForKey:CPOptionsKey];
+    return [[options objectForKey:CPContinuouslyUpdatesValueBindingOption] boolValue];
+}
+
+- (BOOL)handlesContentAsCompoundValue
+{
+    var options = [_info objectForKey:CPOptionsKey];
+    return [[options objectForKey:CPHandlesContentAsCompoundValueBindingOption] boolValue];
+}
+
+/*!
+    Use this to avoid reacting to the notifications coming out of a reverseTransformedValue:.
+*/
+- (void)suppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
+{
+    if (!anObject)
+        return;
+
+    var uid = [anObject UID],
+        objectSuppressions = _suppressedNotifications[uid];
+    if (!objectSuppressions)
+        _suppressedNotifications[uid] = objectSuppressions = {};
+
+    objectSuppressions[aKeyPath] = YES;
+}
+
+/*!
+    Use this to cancel suppressSpecificNotificationFromObject:keyPath:.
+*/
+- (void)unsuppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
+{
+    if (!anObject)
+        return;
+
+    var uid = [anObject UID],
+        objectSuppressions = _suppressedNotifications[uid];
+    if (!objectSuppressions)
+        return;
+
+    delete objectSuppressions[aKeyPath];
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    var count = [CPBinderPlaceholderMarkers count];
+
+    while (count--)
+    {
+        var marker = CPBinderPlaceholderMarkers[count],
+            optionName = CPBinderPlaceholderOptions[count],
+            isExplicit = [options containsKey:optionName],
+            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
+        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
+    }
+}
+
+- (void)_placeholderForMarker:aMarker
+{
+    var placeholder = _placeholderForMarker[aMarker];
+    if (placeholder)
+        return placeholder['value'];
+    return nil;
+}
+
+- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
+{
+    if (isDefault)
+    {
+        var existingPlaceholder = _placeholderForMarker[aMarker];
+
+        // Don't overwrite an explicitly set placeholder with a default.
+        if (existingPlaceholder && !existingPlaceholder['isDefault'])
+            return;
+    }
+
+    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
+}
+
@end

@implementation CPObject (KeyValueBindingCreation)

 + (void)exposeBinding:(CPString)aBinding
 {
-    [CPKeyValueBinding exposeBinding:aBinding forClass:[self class]];
+    [CPBinder exposeBinding:aBinding forClass:[self class]];
+}
+
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    return [CPBinder class];
 }

 - (CPArray)exposedBindings
@@ -269,7 +364,7 @@ var CPBindingOperationAnd = 0,

    while (theClass)
    {
-        var temp = [CPKeyValueBinding exposedBindingsForClass:theClass];
+        var temp = [CPBinder exposedBindingsForClass:theClass];

        if (temp)
            [exposedBindings addObjectsFromArray:temp];
@@ -288,23 +383,26 @@ var CPBindingOperationAnd = 0,
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
    if (!anObject || !aKeyPath)
-        return CPLog.error("Invalid object or path on "+self+" for "+aBinding);
+        return CPLog.error("Invalid object or path on " + self + " for " + aBinding);

    //if (![[self exposedBindings] containsObject:aBinding])
-    //    CPLog.warn("No binding exposed on "+self+" for "+aBinding);
+    //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
+
+    var binderClass = [[self class] _binderClassForBinding:aBinding];

    [self unbind:aBinding];
-    [[CPKeyValueBinding alloc] initWithBinding:[self _replacementKeyPathForBinding:aBinding] name:aBinding to:anObject keyPath:aKeyPath options:options from:self];
+    [[binderClass alloc] initWithBinding:[self _replacementKeyPathForBinding:aBinding] name:aBinding to:anObject keyPath:aKeyPath options:options from:self];
 }

 - (CPDictionary)infoForBinding:(CPString)aBinding
 {
-    return [CPKeyValueBinding infoForBinding:aBinding forObject:self];
+    return [CPBinder infoForBinding:aBinding forObject:self];
 }

 - (void)unbind:(CPString)aBinding
 {
-    [CPKeyValueBinding unbind:aBinding forObject:self];
+    var binderClass = [[self class] _binderClassForBinding:aBinding];
+    [binderClass unbind:aBinding forObject:self];
 }

 - (id)_replacementKeyPathForBinding:(CPString)binding
@@ -314,13 +412,35 @@ var CPBindingOperationAnd = 0,

@end

-@implementation _CPKeyValueOrBinding : CPKeyValueBinding
+/*!
+    @ignore
+    Provides stub implementations that simply call super for the "objectValue" binding
+    This class should not be necessary but assures backwards compliance with our old way of doing bindings
+    Every class with a value binding should implement a subclass to handle it's specific value binding logic
+*/
+@implementation _CPValueBinder : CPBinder
+{
+}
+
+- (void)setValueFor:(CPString)theBinding
+{
+    [super setValueFor:@"objectValue"];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    [super reverseSetValueFor:@"objectValue"];
+}
+
+@end
+
+@implementation _CPKeyValueOrBinding : CPBinder
 {
 }

 - (void)setValueFor:(CPString)aBinding
 {
-    var bindings = [bindingsMap valueForKey:[_source hash]];
+    var bindings = [bindingsMap valueForKey:[_source UID]];

    if (!bindings)
        return;
@@ -335,13 +455,13 @@ var CPBindingOperationAnd = 0,

@end

-@implementation _CPKeyValueAndBinding : CPKeyValueBinding
+@implementation _CPKeyValueAndBinding : CPBinder
 {
 }

 - (void)setValueFor:(CPString)aBinding
 {
-    var bindings = [bindingsMap objectForKey:[_source hash]];
+    var bindings = [bindingsMap objectForKey:[_source UID]];

    if (!bindings)
        return;
@@ -356,7 +476,7 @@ var CPBindingOperationAnd = 0,

@end

-var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
+var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
 {
    var bindingName = key,
        theBinding,
@@ -378,9 +498,9 @@ var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CP
    }

    return !operation;
-}
+};

-var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
+var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
    var theBinding = [bindings objectForKey:targetKey],
        infoDictionary = theBinding._info,
@@ -415,7 +535,7 @@ var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argu
    }

    [invocation invoke];
-}
+};

 // Keys in options dictionary

@@ -428,45 +548,70 @@ CPOptionsKey            = @"CPOptionsKey";
 CPMultipleValuesMarker  = @"CPMultipleValuesMarker";
 CPNoSelectionMarker     = @"CPNoSelectionMarker";
 CPNotApplicableMarker   = @"CPNotApplicableMarker";
+CPNullMarker            = @"CPNullMarker";

 // Binding name constants
-CPAlignmentBinding      = @"CPAlignmentBinding";
-CPEditableBinding       = @"CPEditableBinding";
-CPEnabledBinding        = @"CPEnabledBinding";
-CPFontBinding           = @"CPFontBinding";
-CPHiddenBinding         = @"CPHiddenBinding";
-CPSelectedIndexBinding  = @"CPSelectedIndexBinding";
-CPTextColorBinding      = @"CPTextColorBinding";
-CPToolTipBinding        = @"CPToolTipBinding";
-CPValueBinding          = @"value";
+CPAlignmentBinding                        = @"alignment";
+CPContentArrayBinding                     = @"contentArray";
+CPContentBinding                          = @"content";
+CPContentObjectBinding                    = @"contentObject";
+CPContentObjectsBinding                   = @"contentObjects";
+CPContentValuesBinding                    = @"contentValues";
+CPEditableBinding                         = @"editable";
+CPEnabledBinding                          = @"enabled";
+CPFontBinding                             = @"font";
+CPFontNameBinding                         = @"fontName";
+CPFontBoldBinding                         = @"fontBold";
+CPHiddenBinding                           = @"hidden";
+CPFilterPredicateBinding                  = @"filterPredicate";
+CPPredicateBinding                        = @"predicate";
+CPSelectedIndexBinding                    = @"selectedIndex";
+CPSelectedLabelBinding                    = @"selectedLabel";
+CPSelectedObjectBinding                   = @"selectedObject";
+CPSelectedObjectsBinding                  = @"selectedObjects";
+CPSelectedTagBinding                      = @"selectedTag";
+CPSelectedValueBinding                    = @"selectedValue";
+CPSelectedValuesBinding                   = @"selectedValues";
+CPSelectionIndexesBinding                 = @"selectionIndexes";
+CPTextColorBinding                        = @"textColor";
+CPTitleBinding                            = @"title";
+CPToolTipBinding                          = @"toolTip";
+CPValueBinding                            = @"value";
+CPValueURLBinding                         = @"valueURL";
+CPValuePathBinding                        = @"valuePath";
+CPDataBinding                             = @"data";

 //Binding options constants
-CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelectionBindingOption";
-CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgumentBindingOption";
-CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditableBindingOption";
-CPConditionallySetsEnabledBindingOption             = @"CPConditionallySetsEnabledBindingOption";
-CPConditionallySetsHiddenBindingOption              = @"CPConditionallySetsHiddenBindingOption";
-CPContinuouslyUpdatesValueBindingOption             = @"CPContinuouslyUpdatesValueBindingOption";
-CPCreatesSortDescriptorBindingOption                = @"CPCreatesSortDescriptorBindingOption";
-CPDeletesObjectsOnRemoveBindingsOption              = @"CPDeletesObjectsOnRemoveBindingsOption";
-CPDisplayNameBindingOption                          = @"CPDisplayNameBindingOption";
-CPDisplayPatternBindingOption                       = @"CPDisplayPatternBindingOption";
-CPHandlesContentAsCompoundValueBindingOption        = @"CPHandlesContentAsCompoundValueBindingOption";
-CPInsertsNullPlaceholderBindingOption               = @"CPInsertsNullPlaceholderBindingOption";
-CPInvokesSeparatelyWithArrayObjectsBindingOption    = @"CPInvokesSeparatelyWithArrayObjectsBindingOption";
-CPMultipleValuesPlaceholderBindingOption            = @"CPMultipleValuesPlaceholderBindingOption";
-CPNoSelectionPlaceholderBindingOption               = @"CPNoSelectionPlaceholderBindingOption";
-CPNotApplicablePlaceholderBindingOption             = @"CPNotApplicablePlaceholderBindingOption";
-CPNullPlaceholderBindingOption                      = @"CPNullPlaceholderBindingOption";
-CPPredicateFormatBindingOption                      = @"CPPredicateFormatBindingOption";
-CPRaisesForNotApplicableKeysBindingOption           = @"CPRaisesForNotApplicableKeysBindingOption";
-CPSelectorNameBindingOption                         = @"CPSelectorNameBindingOption";
-CPSelectsAllWhenSettingContentBindingOption         = @"CPSelectsAllWhenSettingContentBindingOption";
-CPValidatesImmediatelyBindingOption                 = @"CPValidatesImmediatelyBindingOption";
-CPValueTransformerNameBindingOption                 = @"CPValueTransformerNameBindingOption";
-CPValueTransformerBindingOption                     = @"CPValueTransformerBindingOption";
+CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
+CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgument";
+CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditable";
+CPConditionallySetsEnabledBindingOption             = @"CPConditionallySetsEnabled";
+CPConditionallySetsHiddenBindingOption              = @"CPConditionallySetsHidden";
+CPContinuouslyUpdatesValueBindingOption             = @"CPContinuouslyUpdatesValue";
+CPCreatesSortDescriptorBindingOption                = @"CPCreatesSortDescriptor";
+CPDeletesObjectsOnRemoveBindingsOption              = @"CPDeletesObjectsOnRemove";
+CPDisplayNameBindingOption                          = @"CPDisplayName";
+CPDisplayPatternBindingOption                       = @"CPDisplayPattern";
+CPHandlesContentAsCompoundValueBindingOption        = @"CPHandlesContentAsCompoundValue";
+CPInsertsNullPlaceholderBindingOption               = @"CPInsertsNullPlaceholder";
+CPInvokesSeparatelyWithArrayObjectsBindingOption    = @"CPInvokesSeparatelyWithArrayObjects";
+CPMultipleValuesPlaceholderBindingOption            = @"CPMultipleValuesPlaceholder";
+CPNoSelectionPlaceholderBindingOption               = @"CPNoSelectionPlaceholder";
+CPNotApplicablePlaceholderBindingOption             = @"CPNotApplicablePlaceholder";
+CPNullPlaceholderBindingOption                      = @"CPNullPlaceholder";
+CPPredicateFormatBindingOption                      = @"CPPredicateFormat";
+CPRaisesForNotApplicableKeysBindingOption           = @"CPRaisesForNotApplicableKeys";
+CPSelectorNameBindingOption                         = @"CPSelectorName";
+CPSelectsAllWhenSettingContentBindingOption         = @"CPSelectsAllWhenSettingContent";
+CPValidatesImmediatelyBindingOption                 = @"CPValidatesImmediately";
+CPValueTransformerNameBindingOption                 = @"CPValueTransformerName";
+CPValueTransformerBindingOption                     = @"CPValueTransformer";

 CPIsControllerMarker = function(/*id*/anObject)
 {
-    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker;
-}
+    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
+};
+
+var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
+    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
+
@@ -0,0 +1,415 @@
+/*
+ * CPLevelIndicator.j
+ * AppKit
+ *
+ * Created by Alexander Ljungberg.
+ * Copyright 2011, WireLoad Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPControl.j"
+
+CPTickMarkBelow                             = 0;
+CPTickMarkAbove                             = 1;
+CPTickMarkLeft                              = CPTickMarkAbove;
+CPTickMarkRight                             = CPTickMarkBelow;
+
+CPRelevancyLevelIndicatorStyle              = 0;
+CPContinuousCapacityLevelIndicatorStyle     = 1;
+CPDiscreteCapacityLevelIndicatorStyle       = 2;
+CPRatingLevelIndicatorStyle                 = 3;
+
+var _CPLevelIndicatorBezelColor = nil,
+    _CPLevelIndicatorSegmentEmptyColor = nil,
+    _CPLevelIndicatorSegmentNormalColor = nil,
+    _CPLevelIndicatorSegmentWarningColor = nil,
+    _CPLevelIndicatorSegmentCriticalColor = nil,
+
+    _CPLevelIndicatorSpacing = 1;
+
+/*!
+    @ingroup appkit
+    @class CPLevelIndicator
+
+    CPLevelIndicator is a control which indicates a value visually on a scale.
+*/
+@implementation CPLevelIndicator : CPControl
+{
+    CPLevelIndicator    _levelIndicatorStyle    @accessors(property=levelIndicatorStyle);
+    double              _minValue               @accessors(property=minValue);
+    double              _maxValue               @accessors(property=maxValue);
+    double              _warningValue           @accessors(property=warningValue);
+    double              _criticalValue          @accessors(property=criticalValue);
+    CPTickMarkPosition  _tickMarkPosition       @accessors(property=tickMarkPosition);
+    int                 _numberOfTickMarks      @accessors(property=numberOfTickMarks);
+    int                 _numberOfMajorTickMarks @accessors(property=numberOfMajorTickMarks);
+
+    BOOL                _isEditable;
+
+    BOOL                _isTracking;
+}
+
+ (void)initialize
+{
+    if (self !== [CPLevelIndicator class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:CPLevelIndicator];
+
+    _CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-left.png"] size:CGSizeMake(3.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-center.png"] size:CGSizeMake(1.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-right.png"] size:CGSizeMake(3.0, 18.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentEmptyColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentNormalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentWarningColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentCriticalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _levelIndicatorStyle = CPDiscreteCapacityLevelIndicatorStyle;
+        _maxValue = 2;
+        _warningValue = 2;
+        _criticalValue = 2;
+
+        [self _init];
+    }
+
+    return self;
+}
+
+- (void)_init
+{
+}
+
+- (void)layoutSubviews
+{
+    var bezelView = [self layoutEphemeralSubviewNamed:"bezel"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:nil];
+    // TODO Make themable.
+    [bezelView setBackgroundColor:_CPLevelIndicatorBezelColor];
+
+    var segmentCount = _maxValue - _minValue;
+
+    if (segmentCount <= 0)
+        return;
+
+    var filledColor = _CPLevelIndicatorSegmentNormalColor,
+        value = [self doubleValue];
+
+    if (value <= _criticalValue)
+        filledColor = _CPLevelIndicatorSegmentCriticalColor;
+    else if (value <= _warningValue)
+        filledColor = _CPLevelIndicatorSegmentWarningColor;
+
+    for (var i = 0; i < segmentCount; i++)
+    {
+        var segmentView = [self layoutEphemeralSubviewNamed:"segment-bezel-" + i
+                                               positioned:CPWindowAbove
+                          relativeToEphemeralSubviewNamed:bezelView];
+
+        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor];
+    }
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
+{
+    // TODO Put into theme attributes.
+    var bezelHeight = 18,
+        segmentHeight = 17,
+        bounds = _CGRectCreateCopy([self bounds]);
+
+    if (aViewName == "bezel")
+    {
+        bounds.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
+        bounds.size.height = bezelHeight;
+        return bounds;
+    }
+    else if (aViewName.indexOf("segment-bezel") === 0)
+    {
+        var segment = parseInt(aViewName.substring("segment-bezel-".length), 10),
+            segmentCount = _maxValue - _minValue;
+
+        if (segment >= segmentCount)
+            return _CGRectMakeZero();
+
+        var basicSegmentWidth = bounds.size.width / segmentCount,
+            segmentFrame = CGRectCreateCopy([self bounds]);
+
+        segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
+        segmentFrame.origin.x =  FLOOR(segment * basicSegmentWidth);
+        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - _CPLevelIndicatorSpacing;
+        segmentFrame.size.height = segmentHeight;
+
+        return segmentFrame;
+    }
+
+    return _CGRectMakeZero();
+}
+
+/*!
+    Sets whether or not the receiver level indicator can be edited.
+*/
+- (void)setEditable:(BOOL)shouldBeEditable
+{
+    if (_isEditable === shouldBeEditable)
+        return;
+
+    _isEditable = shouldBeEditable;
+}
+
+/*!
+    Returns \c YES if the textfield is currently editable by the user.
+*/
+- (BOOL)isEditable
+{
+    return _isEditable;
+}
+
+- (CPView)hitTest:(CPPoint)aPoint
+{
+    // Don't swallow clicks when displayed in a table.
+    if (![self isEditable])
+        return nil;
+
+    return [super hitTest:aPoint];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if (![self isEditable] || ![self isEnabled])
+        return;
+
+    [self _trackMouse:anEvent];
+}
+
+- (void)_trackMouse:(CPEvent)anEvent
+{
+    var type = [anEvent type];
+
+    if (type == CPLeftMouseDown || type == CPLeftMouseDragged)
+    {
+        var segmentCount = _maxValue - _minValue;
+
+        if (segmentCount <= 0)
+            return;
+
+        var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+            bounds = [self bounds],
+            oldValue = [self doubleValue],
+            newValue = oldValue;
+
+        // Moving the mouse outside of the widget to the left sets it
+        // to its minimum, and moving outside on the right sets it to
+        // its maximum.
+        if (type == CPLeftMouseDragged && location.x < 0)
+        {
+            newValue = _minValue;
+        }
+        else if (type == CPLeftMouseDragged && location.x > bounds.size.width)
+        {
+            newValue = _maxValue;
+        }
+        else
+        {
+            for (var i = 0; i < segmentCount; i++)
+            {
+                var rect = [self rectForEphemeralSubviewNamed:"segment-bezel-" + i];
+
+                // Once we're tracking the mouse, we only care about horizontal mouse movement.
+                if (location.x >= CGRectGetMinX(rect) && location.x < CGRectGetMaxX(rect))
+                {
+                    newValue = (_minValue + i + 1);
+                    break;
+                }
+            }
+        }
+
+        if (newValue != oldValue)
+            [self setDoubleValue:newValue];
+
+        // Track the mouse to support click and slide value editing.
+        _isTracking = YES;
+        [CPApp setTarget:self selector:@selector(_trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+
+        if ([self isContinuous])
+            [self sendAction:[self action] to:[self target]];
+    }
+    else if (_isTracking)
+    {
+        _isTracking = NO;
+        [self sendAction:[self action] to:[self target]];
+    }
+}
+
+/*
+- (CPLevelIndicatorStyle)style;
+- (void)setLevelIndicatorStyle:(CPLevelIndicatorStyle)style;
+*/
+
+- (void)setMinValue:(double)minValue
+{
+    if (_minValue === minValue)
+        return;
+    _minValue = minValue;
+
+    [self setNeedsLayout];
+}
+
+- (void)setMaxValue:(double)maxValue
+{
+    if (_maxValue === maxValue)
+        return;
+    _maxValue = maxValue;
+
+    [self setNeedsLayout];
+}
+
+- (void)setWarningValue:(double)warningValue;
+{
+    if (_warningValue === warningValue)
+        return;
+    _warningValue = warningValue;
+
+    [self setNeedsLayout];
+}
+
+- (void)setCriticalValue:(double)criticalValue;
+{
+    if (_criticalValue === criticalValue)
+        return;
+    _criticalValue = criticalValue;
+
+    [self setNeedsLayout];
+}
+
+/*
+- (CPTickMarkPosition)tickMarkPosition;
+- (void)setTickMarkPosition:(CPTickMarkPosition)position;
+
+- (int)numberOfTickMarks;
+- (void)setNumberOfTickMarks:(int)count;
+
+- (int)numberOfMajorTickMarks;
+- (void)setNumberOfMajorTickMarks:(int)count;
+
+- (double)tickMarkValueAtIndex:(int)index;
+- (CGRect)rectOfTickMarkAtIndex:(int)index;
+*/
+
+@end
+
+var CPLevelIndicatorStyleKey                    = "CPLevelIndicatorStyleKey",
+    CPLevelIndicatorMinValueKey                 = "CPLevelIndicatorMinValueKey",
+    CPLevelIndicatorMaxValueKey                 = "CPLevelIndicatorMaxValueKey",
+    CPLevelIndicatorWarningValueKey             = "CPLevelIndicatorWarningValueKey",
+    CPLevelIndicatorCriticalValueKey            = "CPLevelIndicatorCriticalValueKey",
+    CPLevelIndicatorTickMarkPositionKey         = "CPLevelIndicatorTickMarkPositionKey",
+    CPLevelIndicatorNumberOfTickMarksKey        = "CPLevelIndicatorNumberOfTickMarksKey",
+    CPLevelIndicatorNumberOfMajorTickMarksKey   = "CPLevelIndicatorNumberOfMajorTickMarksKey",
+    CPLevelIndicatorIsEditableKey               = "CPLevelIndicatorIsEditableKey";
+
+@implementation CPLevelIndicator (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _levelIndicatorStyle = [aCoder decodeIntForKey:CPLevelIndicatorStyleKey];
+        _minValue = [aCoder decodeDoubleForKey:CPLevelIndicatorMinValueKey];
+        _maxValue = [aCoder decodeDoubleForKey:CPLevelIndicatorMaxValueKey];
+        _warningValue = [aCoder decodeDoubleForKey:CPLevelIndicatorWarningValueKey];
+        _criticalValue = [aCoder decodeDoubleForKey:CPLevelIndicatorCriticalValueKey];
+        _tickMarkPosition = [aCoder decodeIntForKey:CPLevelIndicatorTickMarkPositionKey];
+        _numberOfTickMarks = [aCoder decodeIntForKey:CPLevelIndicatorNumberOfTickMarksKey];
+        _numberOfMajorTickMarks = [aCoder decodeIntForKey:CPLevelIndicatorNumberOfMajorTickMarksKey];
+
+        _isEditable = [aCoder decodeBoolForKey:CPLevelIndicatorIsEditableKey];
+
+        [self _init];
+
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeInt:_levelIndicatorStyle forKey:CPLevelIndicatorStyleKey];
+    [aCoder encodeDouble:_minValue forKey:CPLevelIndicatorMinValueKey];
+    [aCoder encodeDouble:_maxValue forKey:CPLevelIndicatorMaxValueKey];
+    [aCoder encodeDouble:_warningValue forKey:CPLevelIndicatorWarningValueKey];
+    [aCoder encodeDouble:_criticalValue forKey:CPLevelIndicatorCriticalValueKey];
+    [aCoder encodeInt:_tickMarkPosition forKey:CPLevelIndicatorTickMarkPositionKey];
+    [aCoder encodeInt:_numberOfTickMarks forKey:CPLevelIndicatorNumberOfTickMarksKey];
+    [aCoder encodeInt:_numberOfMajorTickMarks forKey:CPLevelIndicatorNumberOfMajorTickMarksKey];
+    [aCoder encodeBool:_isEditable forKey:CPLevelIndicatorIsEditableKey];
+}
+
+@end
@@ -52,7 +52,7 @@ var _CPMenuBarVisible               = NO,
    @class CPMenu

    Menus provide the user with a list of actions and/or submenus. Submenus themselves are full fledged menus
-    and so a heirarchical structure appears.
+    and so a hierarchical structure appears.
 */
@implementation CPMenu : CPObject
 {
@@ -80,6 +80,9 @@ var _CPMenuBarVisible               = NO,

 + (void)initialize
 {
+    if (self !== [CPMenu class])
+        return;
+
    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
 }

@@ -192,7 +195,7 @@ var _CPMenuBarVisible               = NO,
    }

    if (!highlightColor)
-        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0/255.0 green:130.0/255.0 blue:186.0/255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0 / 255.0 green:130.0 / 255.0 blue:186.0 / 255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];

    if (!highlightTextColor)
        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
@@ -274,22 +277,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)insertItem:(CPMenuItem)aMenuItem atIndex:(unsigned)anIndex
 {
-    var menu = [aMenuItem menu];
-
-    if (menu)
-        if (menu !== self)
-            [CPException raise:CPInternalInconsistencyException reason:@"Attempted to insert item into menu that was already in another menu."];
-        else
-            return;
-
-    [aMenuItem setMenu:self];
-    [_items insertObject:aMenuItem atIndex:anIndex];
-
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidAddItemNotification
-                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
-
+    [self insertObject:aMenuItem inItemsAtIndex:anIndex];
 }

 /*!
@@ -346,16 +334,30 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)removeItemAtIndex:(unsigned)anIndex
 {
-    if (anIndex < 0 || anIndex >= _items.length)
-        return;
+    [self removeObjectFromItemsAtIndex:anIndex];
+}

-    [_items[anIndex] setMenu:nil];
-    [_items removeObjectAtIndex:anIndex];
+/*!
+    Removes all the menu items in the receiver.
+    This method is more efficient than removing menu items individually.

-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidRemoveItemNotification
-                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+    Unlike the other remove methods, this method does not post CPMenuDidChangeItemNotification notifications.
+*/
+- (void)removeAllItems
+{
+    var count = [_items count];
+
+    // Remove the connection to this menu in case
+    // someone else has a reference to the menu item.
+    while (count--)
+        [_items[count] setMenu:nil];
+
+    _highlightedIndex = CPNotFound;
+
+    // Because we are changing _items directly, be sure to notify KVO
+    [self willChangeValueForKey:@"items"];
+    _items = [CPMutableArray array];
+    [self didChangeValueForKey:@"items"];
 }

 /*!
@@ -364,9 +366,11 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)itemChanged:(CPMenuItem)aMenuItem
 {
-    if ([aMenuItem menu] != self)
+    if ([aMenuItem menu] !== self)
        return;

+    [aMenuItem setValue:[aMenuItem valueForKey:@"changeCount"] + 1 forKey:@"changeCount"];
+
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPMenuDidChangeItemNotification
                      object:self
@@ -555,7 +559,6 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)submenuAction:(id)aSender
 {
-
 }

 /*!
@@ -603,11 +606,34 @@ var _CPMenuBarVisible               = NO,
 }

 /*!
-    Not implemented.
+    Enables or disables the receiver’s menu items.
+    If the target does not implement the menu item's action method the item is disabled.
+    If the target responsds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
 */
 - (void)update
 {
+    if (![self autoenablesItems])
+        return;

+    var items = [self itemArray];
+    for (var i = 0; i < [items count]; i++)
+    {
+        var item = [items objectAtIndex:i];
+
+        if ([item hasSubmenu])
+            continue;
+
+        var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
+
+        if (!validator || ![validator respondsToSelector:[item action]])
+            [item setEnabled:NO];
+        else if ([validator respondsToSelector:@selector(validateMenuItem:)])
+            [item setEnabled:[validator validateMenuItem:item]];
+        else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
+            [item setEnabled:[validator validateUserInterfaceItem:item]];
+    }
+
+    [[_menuWindow _menuView] tile];
 }

 // Managing the Title
@@ -689,10 +715,7 @@ var _CPMenuBarVisible               = NO,
    if (aView && !theWindow)
        throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";

-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:aMenu];
+    [self _menuWillOpen];

    // Convert location to global coordinates if not already in them.
    if (aView)
@@ -780,13 +803,10 @@ var _CPMenuBarVisible               = NO,

 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    var delegate = [aMenu delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:aMenu];
+    [aMenu _menuWillOpen];

    if (!aFont)
-        aFont = [CPFont systemFontOfSize:12.0];
+        aFont = [CPFont systemFontOfSize:[CPFont systemFontSize]];

    var theWindow = [aView window],
        menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
@@ -853,7 +873,15 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
+    if (_highlightedIndex < 0)
+        return nil;
+
+    var highlightedItem = _items[_highlightedIndex];
+
+    if ([highlightedItem isSeparatorItem])
+        return nil;
+
+    return highlightedItem;
 }

 // Managing the Delegate
@@ -868,9 +896,25 @@ var _CPMenuBarVisible               = NO,
    return _delegate;
 }

+- (void)_menuWillOpen
+{
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
+}
+
+- (void)_menuDidClose
+{
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:self];
+}
+
 // Handling Tracking
 /*!
-	Cancels tracking.
+    Cancels tracking.
 */
 - (void)cancelTracking
 {
@@ -930,7 +974,7 @@ var _CPMenuBarVisible               = NO,
        characters = [anEvent charactersIgnoringModifiers],
        modifierFlags = [anEvent modifierFlags];

-    for(; index < count; ++index)
+    for (; index < count; ++index)
    {
        var item = _items[index],
            modifierMask = [item keyEquivalentModifierMask];
@@ -967,14 +1011,6 @@ var _CPMenuBarVisible               = NO,
 }

 //
-/*
-    @ignore
-*/
- (BOOL)_itemIsHighlighted:(CPMenuItem)aMenuItem
-{
-    return _items[_highlightedIndex] == aMenuItem;
-}
-
 /*
    @ignore
 */
@@ -990,6 +1026,9 @@ var _CPMenuBarVisible               = NO,

    if (_highlightedIndex !== CPNotFound)
        [[_items[_highlightedIndex] _menuItemView] highlight:YES];
+
+    if (_highlightedIndex !== CPNotFound && _menuWindow)
+        [_menuWindow._menuView scrollRectToVisible:[[_items[_highlightedIndex] _menuItemView] frame]];
 }

 - (void)_setMenuName:(CPString)aName
@@ -1035,6 +1074,61 @@ var _CPMenuBarVisible               = NO,

@end

+@implementation CPMenu (CPKeyValueCoding)
+
+- (CPUInteger)countOfItems
+{
+    return [_items count];
+}
+
+- (CPMenuItem)objectInItemsAtIndex:(CPUInteger)anIndex
+{
+    return [_items objectAtIndex:anIndex];
+}
+
+- (CPArray)itemsAtIndexes:(CPIndexSet)indexes
+{
+    return [_items objectsAtIndexes:indexes];
+}
+
+@end
+
+@implementation CPMenu (CPKeyValueObserving)
+
+- (void)insertObject:(CPMenuItem)aMenuItem inItemsAtIndex:(CPUInteger)anIndex
+{
+    var menu = [aMenuItem menu];
+
+    if (menu)
+        if (menu !== self)
+            [CPException raise:CPInternalInconsistencyException reason:@"Attempted to insert item into menu that was already in another menu."];
+        else
+            return;
+
+    [aMenuItem setMenu:self];
+    [_items insertObject:aMenuItem atIndex:anIndex];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidAddItemNotification
+                      object:self
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+}
+
+- (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
+{
+    if (anIndex < 0 || anIndex >= [_items count])
+        return;
+
+    [[_items objectAtIndex:anIndex] setMenu:nil];
+    [_items removeObjectAtIndex:anIndex];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidRemoveItemNotification
+                      object:self
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+}
+
+@end

 var CPMenuTitleKey              = @"CPMenuTitleKey",
    CPMenuNameKey               = @"CPMenuNameKey",
@@ -1061,6 +1155,8 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",

        _showsStateColumn = ![aCoder containsValueForKey:CPMenuShowsStateColumnKey] || [aCoder decodeBoolForKey:CPMenuShowsStateColumnKey];

+        _autoenablesItems = YES;
+
        [self setMinimumWidth:0];
    }

@@ -15,18 +15,18 @@ var _CPMenuBarWindowBackgroundColor = nil,
    CPMenu      _menu;
    CPView      _highlightView;
    CPArray     _menuItemViews;
-    
+
    CPMenuItem  _trackingMenuItem;
-    
+
    CPImageView _iconImageView;
    CPTextField _titleField;
-    
+
    CPColor     _textColor;
    CPColor     _titleColor;
-    
+
    CPColor     _textShadowColor;
    CPColor     _titleShadowColor;
-    
+
    CPColor     _highlightColor;
    CPColor     _highlightTextColor;
    CPColor     _highlightTextShadowColor;
@@ -34,12 +34,12 @@ var _CPMenuBarWindowBackgroundColor = nil,

 + (void)initialize
 {
-    if (self != [_CPMenuBarWindow class])
+    if (self !== [_CPMenuBarWindow class])
        return;
-        
+
    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:12.0];
+
+    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:[CPFont systemFontSize]];
 }

 + (CPFont)font
@@ -60,27 +60,27 @@ var _CPMenuBarWindowBackgroundColor = nil,
    {
        [self setLevel:CPMainMenuWindowLevel];
        [self setAutoresizingMask:CPWindowWidthSizable];
-     
+
        var contentView = [self contentView];
-        
+
        [contentView setAutoresizesSubviews:NO];
-        
+
        [self setBecomesKeyOnlyIfNeeded:YES];
-        
+
        //
        _iconImageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
-        
+
        [contentView addSubview:_iconImageView];
-        
+
        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];

-        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
+        [_titleField setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 1]];
        [_titleField setAlignment:CPCenterTextAlignment];
        [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
-        
+
        [contentView addSubview:_titleField];
    }
-    
+
    return self;
 }

@@ -99,7 +99,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

    [_titleField setStringValue:aTitle];
    [_titleField sizeToFit];
-    
+
    [self tile];
 }

@@ -122,7 +122,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
    {
        if (!_CPMenuBarWindowBackgroundColor)
            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
-            
+
        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
    }
    else
@@ -133,9 +133,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_textColor == aColor)
        return;
-    
+
    _textColor = aColor;
-    
+
    [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
 }

@@ -143,9 +143,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_titleColor == aColor)
        return;
-    
+
    _titleColor = aColor;
-    
+
    [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
 }

@@ -153,9 +153,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_textShadowColor == aColor)
        return;
-    
+
    _textShadowColor = aColor;
-    
+
    [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
 }

@@ -163,9 +163,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_titleShadowColor == aColor)
        return;
-    
+
    _titleShadowColor = aColor;
-    
+
    [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
 }

@@ -173,7 +173,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_highlightColor == aColor)
        return;
-    
+
    _highlightColor = aColor;
 }

@@ -181,7 +181,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_highlightTextColor == aColor)
        return;
-    
+
    _highlightTextColor = aColor;

 //    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
@@ -191,9 +191,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_highlightTextShadowColor == aColor)
        return;
-    
+
    _highlightTextShadowColor = aColor;
-    
+
 //    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
 }

@@ -201,9 +201,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
    if (_menu == aMenu)
        return;
-    
+
    var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
    if (_menu)
    {
        [defaultCenter
@@ -220,16 +220,16 @@ var _CPMenuBarWindowBackgroundColor = nil,
            removeObserver:self
                      name:CPMenuDidRemoveItemNotification
                    object:_menu];
-                    
+
        var items = [_menu itemArray],
            count = items.length;
-        
+
        while (count--)
            [[items[count] _menuItemView] removeFromSuperview];
    }

    _menu = aMenu;
-    
+
    if (_menu)
    {
        [defaultCenter
@@ -237,41 +237,41 @@ var _CPMenuBarWindowBackgroundColor = nil,
              selector:@selector(menuDidAddItem:)
                  name:CPMenuDidAddItemNotification
                object:_menu];
-    
+
        [defaultCenter
            addObserver:self
              selector:@selector(menuDidChangeItem:)
                  name:CPMenuDidChangeItemNotification
                object:_menu];
-                
+
        [defaultCenter
            addObserver:self
              selector:@selector(menuDidRemoveItem:)
                  name:CPMenuDidRemoveItemNotification
                object:_menu];
    }
-    
+
    _menuItemViews = [];
-    
+
    var contentView = [self contentView],
        items = [_menu itemArray],
        count = items.length;
-    
-    for (index = 0; index < count; ++index)
+
+    for (var index = 0; index < count; ++index)
    {
        var item = items[index],
            menuItemView = [item _menuItemView];
-            
+
        _menuItemViews.push(menuItemView);

        [menuItemView setTextColor:_textColor];
        [menuItemView setHidden:[item isHidden]];
-        
+
        [menuItemView synchronizeWithMenuItem];
-        
+
        [contentView addSubview:menuItemView];
    }
-        
+
    [self tile];
 }

@@ -282,7 +282,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

    [menuItemView setHidden:[menuItem isHidden]];
    [menuItemView synchronizeWithMenuItem];
-    
+
    [self tile];
 }

@@ -298,9 +298,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
    [menuItemView setHidden:[menuItem isHidden]];

    [menuItemView synchronizeWithMenuItem];
-    
+
    [[self contentView] addSubview:menuItemView];
-    
+
    [self tile];
 }

@@ -312,7 +312,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
    [_menuItemViews removeObjectAtIndex:index];

    [menuItemView removeFromSuperview];
-        
+
    [self tile];
 }

@@ -335,7 +335,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

 - (CPFont)font
 {
-    [CPFont systemFontOfSize:12.0];
+    [CPFont systemFontOfSize:[CPFont systemFontSize]];
 }

 - (void)tile
@@ -343,29 +343,29 @@ var _CPMenuBarWindowBackgroundColor = nil,
    var items = [_menu itemArray],
        index = 0,
        count = items.length,
-        
+
        x = MENUBAR_LEFT_MARGIN,
        y = 0.0,
        isLeftAligned = YES;
-    
+
    for (; index < count; ++index)
    {
        var item = items[index];
-        
+
        if ([item isSeparatorItem])
        {
            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
            isLeftAligned = NO;
-            
+
            continue;
        }
-        
+
         if ([item isHidden])
            continue;

        var menuItemView = [item _menuItemView],
            frame = [menuItemView frame];
-        
+
        if (isLeftAligned)
        {
            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
@@ -375,14 +375,14 @@ var _CPMenuBarWindowBackgroundColor = nil,
        else
        {
            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
-     
+
            x = CGRectGetMinX([menuItemView frame]);
        }
    }
-    
+
    var bounds = [[self contentView] bounds],
        titleFrame = [_titleField frame];
-    
+
    if ([_iconImageView isHidden])
        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
    else
@@ -390,7 +390,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
        var iconFrame = [_iconImageView frame],
            iconWidth = CGRectGetWidth(iconFrame),
            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
-        
+
        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
    }
@@ -505,38 +505,38 @@ var _CPMenuBarWindowBackgroundColor = nil,
    for (; index < count; ++index)
    {
        var item = items[index];
-        
+
        if ([item isSeparatorItem])
        {
            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
            isLeftAligned = NO;
-            
+
            continue;
        }
-        
+
         if ([item isHidden])
            continue;

        var menuItemView = [item _menuItemView],
            frame = [menuItemView frame];
-        
+
        if (isLeftAligned)
        {
            [menuItemView setFrameOrigin:CGPointMake(x, (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
-     
+
            x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
        }
        else
        {
            [menuItemView setFrameOrigin:CGPointMake(x - CGRectGetWidth(frame), (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
-     
+
            x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
        }
    }
-    
+
    var bounds = [[self contentView] bounds],
        titleFrame = [_titleField frame];
-    
+
    if ([_iconImageView isHidden])
        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
    else
@@ -544,7 +544,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
        var iconFrame = [_iconImageView frame],
            iconWidth = CGRectGetWidth(iconFrame),
            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
-        
+
        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
    }
@@ -1,17 +1,17 @@
@import <Foundation/CPObject.j>


-_CPMenuManagerScrollingStateUp      = -1,
-_CPMenuManagerScrollingStateDown    = 1,
+_CPMenuManagerScrollingStateUp      = -1;
+_CPMenuManagerScrollingStateDown    = 1;
 _CPMenuManagerScrollingStateNone    = 0;

-var STICKY_TIME_INTERVAL        = 500;
-
-var SharedMenuManager = nil;
+var STICKY_TIME_INTERVAL            = 0.5,
+    SharedMenuManager               = nil;

@implementation _CPMenuManager: CPObject
 {
    CPTimeInterval      _startTime;
+    BOOL                _mouseWasDragged;
    int                 _scrollingState;
    CGPoint             _lastGlobalLocation;

@@ -21,6 +21,11 @@ var SharedMenuManager = nil;
    CPMutableArray      _menuContainerStack;

    Function            _trackingCallback;
+
+    CPString            _keyBuffer;
+
+    CPMenuItem          _previousActiveItem;
+    int                 _showTimerID;
 }

 + (_CPMenuManager)sharedMenuManager
@@ -36,7 +41,7 @@ var SharedMenuManager = nil;
    if (SharedMenuManager)
        return SharedMenuManager;

-    return [super init];    
+    return [super init];
 }

 - (id)trackingMenuContainer
@@ -56,9 +61,12 @@ var SharedMenuManager = nil;
 {
    var menu = [aMenuContainer menu];

+    if ([menu numberOfItems] <= 0)
+        return;
+
    CPApp._activeMenu = menu;

-    _startTime = [anEvent timestamp];//new Date();
+    _startTime = [anEvent timestamp];
    _scrollingState = _CPMenuManagerScrollingStateNone;

    _constraintRect = aRect;
@@ -67,13 +75,13 @@ var SharedMenuManager = nil;

    if (menu === [CPApp mainMenu])
    {
-        var globalLocation = [anEvent globalLocation];
+        var globalLocation = [anEvent globalLocation],

-        // Find which menu window the mouse is currently on top of
-        var menuLocation = [aMenuContainer convertGlobalToBase:globalLocation];
+            // Find which menu window the mouse is currently on top of
+            menuLocation = [aMenuContainer convertGlobalToBase:globalLocation],

-        // Find out the item the mouse is currently on top of
-        var activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
+            // Find out the item the mouse is currently on top of
+            activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;

        _menuBarButtonItemIndex = activeItemIndex;
@@ -83,6 +91,8 @@ var SharedMenuManager = nil;
            return [self trackMenuBarButtonEvent:anEvent];
    }

+    _mouseWasDragged = NO;
+
    [self trackEvent:anEvent];
 }

@@ -95,23 +105,58 @@ var SharedMenuManager = nil;
    if (type === CPAppKitDefined)
        return [self completeTracking];

-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
+
+    if (type === CPKeyDown)
+    {
+        var menu = trackingMenu,
+            submenu = [[menu  highlightedItem] submenu];
+
+        // get the current active menu
+        while (submenu && [submenu._menuWindow isVisible])
+        {
+            menu = submenu;
+            submenu = [[menu  highlightedItem] submenu];
+        }
+
+        if ([menu numberOfItems])
+            [self interpretKeyEvent:anEvent forMenu:menu];
+
+        return;
+    }
+
+    if (_keyBuffer)
+    {
+        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
+            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
+
+        if (type === CPPeriodic)
+            return;
+    }

    // Periodic events don't have a valid location.
    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];

-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
+    if (!globalLocation)
+        return;

    // Find which menu window the mouse is currently on top of
    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
        activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation];
+        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],

-    // Find out the item the mouse is currently on top of
-    var activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
+        // Find out the item the mouse is currently on top of
+        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;

+    // unhighlight when mouse is moved off the menu
+    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
+                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
+        [activeMenu _highlightItemAtIndex:CPNotFound];
+
+    // Remember this for the next periodic event.
+    _lastGlobalLocation = globalLocation;
+
    // If the item isn't enabled its as if we clicked on nothing.
    if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
    {
@@ -121,11 +166,13 @@ var SharedMenuManager = nil;

    var mouseOverMenuView = [activeItem view];

+    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
+        [activeMenuContainer scrollByDelta:[anEvent deltaY]];
+
    if (type === CPPeriodic)
    {
        if (_scrollingState === _CPMenuManagerScrollingStateUp)
            [activeMenuContainer scrollUp];
-
        else if (_scrollingState === _CPMenuManagerScrollingStateDown)
            [activeMenuContainer scrollDown];
    }
@@ -135,29 +182,31 @@ var SharedMenuManager = nil;
    {
        if (!_lastMouseOverMenuView)
            [activeMenu _highlightItemAtIndex:CPNotFound];
-        
+
        if (_lastMouseOverMenuView != mouseOverMenuView)
        {
            [mouseOverMenuView mouseExited:anEvent];
            // FIXME: Possibly multiple of these?
            [_lastMouseOverMenuView mouseEntered:anEvent];
-            
+
            _lastMouseOverMenuView = mouseOverMenuView;
        }

        var menuContainerWindow = activeMenuContainer;

-        if (![menuContainerWindow isKindOfClass:[CPWindow class]])
+        if (![menuContainerWindow isKindOfClass:CPWindow])
            menuContainerWindow = [menuContainerWindow window];

        [menuContainerWindow
-            sendEvent:[CPEvent mouseEventWithType:type location:menuLocation modifierFlags:[anEvent modifierFlags]
-            timestamp:[anEvent timestamp]
-         windowNumber:menuContainerWindow
-              context:nil
-          eventNumber:0
-           clickCount:[anEvent clickCount]
-             pressure:[anEvent pressure]]];
+            sendEvent:[CPEvent mouseEventWithType:type
+                                         location:menuLocation
+                                    modifierFlags:[anEvent modifierFlags]
+                                        timestamp:[anEvent timestamp]
+                                     windowNumber:menuContainerWindow
+                                          context:nil
+                                      eventNumber:0
+                                       clickCount:[anEvent clickCount]
+                                         pressure:[anEvent pressure]]];
    }
    else
    {
@@ -166,11 +215,15 @@ var SharedMenuManager = nil;
            [_lastMouseOverMenuView mouseExited:anEvent];
            _lastMouseOverMenuView = nil;
        }
-        
-        [activeMenu _highlightItemAtIndex:activeItemIndex];
-        
-        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown)
+
+        if (activeItemIndex != CPNotFound)
+            [activeMenu _highlightItemAtIndex:activeItemIndex];
+
+        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
        {
+            if (type === CPLeftMouseDragged)
+                _mouseWasDragged = YES;
+
            var oldScrollingState = _scrollingState;

            _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
@@ -179,34 +232,89 @@ var SharedMenuManager = nil;
            {
                if (_scrollingState === _CPMenuManagerScrollingStateNone)
                    [CPEvent stopPeriodicEvents];
-            
                else if (oldScrollingState === _CPMenuManagerScrollingStateNone)
                    [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
            }
        }
-        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            [trackingMenu cancelTracking];
+        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
+        {
+            /*
+                There are a few possibilites:
+
+                1. The user clicks and releases without dragging within the sticky time.
+                   This is considered a regular mouse click and not a drag. In this case
+                   we allow the user to track the menu by moving the mouse. The next
+                   mouse up will end tracking.
+
+                2. The user clicks and releases without dragging after the sticky time.
+                   This is considered a drag and release and tracking ends.
+
+                3. The user clicks, drags and then releases. Tracking ends.
+            */
+            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
+            {
+                /*
+                    Close the menu if:
+
+                    1. The mouse was dragged.
+                    2. The mouse is released in the menubar.
+                    3. The current item has a submenu with a custom action.
+                */
+                if (_mouseWasDragged ||
+                    [activeMenuContainer isMenuBar] ||
+                    [activeItem action] !== @selector(submenuAction:))
+                {
+                    [trackingMenu cancelTracking];
+                }
+            }
+        }
+    }
+
+    // Prevent previous selected menu items from opening by stopping the timer if a
+    // new item is selected before the timer runs out
+    if (_previousActiveItem !== activeItem)
+    {
+        clearTimeout(_showTimerID);
+        _showTimerID = undefined;
    }

    // If the item has a submenu, show it.
-    if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:))
+    if ([activeItem hasSubmenu]) // && [activeItem action] === @selector(submenuAction:))
    {
-        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex];
+        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
+            newMenuOrigin;

        if ([activeMenuContainer isMenuBar])
-            var newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
+            newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
        else
-            var newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
+            newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));

        newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];

-        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+        // Only start a new timer if the previous was cancelled
+        if (_showTimerID === undefined)
+        {
+            // Close the current menu item because we are going to select a new one after a short delay
+            [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
+
+            if (![activeMenuContainer isMenuBar])
+            {
+                _showTimerID = setTimeout(function()
+                {
+                    [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+                }, 250);
+            }
+            else
+                [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+        }
    }

-    // This handles both the case where we've moved away from the menu, and where 
+    // This handles both the case where we've moved away from the menu, and where
    // we've moved to an item without a submenu.
    else
        [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
+
+    _previousActiveItem = activeItem;
 }

 - (void)trackMenuBarButtonEvent:(CPEvent)anEvent
@@ -216,16 +324,15 @@ var SharedMenuManager = nil;
    if (type === CPAppKitDefined)
        return [self completeTracking];

-    var globalLocation = [anEvent globalLocation];
+    var globalLocation = [anEvent globalLocation],

-    // Find which menu window the mouse is currently on top of
-    var menu = [self trackingMenu],
+        // Find which menu window the mouse is currently on top of
+        menu = [self trackingMenu],
        trackingMenuContainer = [self trackingMenuContainer],
        menuLocation = [trackingMenuContainer convertGlobalToBase:globalLocation];

    if ([trackingMenuContainer itemIndexAtPoint:menuLocation] === _menuBarButtonItemIndex)
        [menu _highlightItemAtIndex:_menuBarButtonItemIndex];
-
    else
        [menu _highlightItemAtIndex:CPNotFound];

@@ -242,23 +349,15 @@ var SharedMenuManager = nil;
    // Stop all periodic events at this point.
    [CPEvent stopPeriodicEvents];

-    // Get the highlighted item from the original menu.
-    var highlightedItem = [trackingMenu highlightedItem];
-
    // Hide all submenus.
    [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-
-    var delegate = [trackingMenu delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:trackingMenu];
+    [trackingMenu _menuDidClose];

    if (_trackingCallback)
        _trackingCallback([self trackingMenuContainer], trackingMenu);

-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidEndTrackingNotification
-                      object:trackingMenu];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidEndTrackingNotification
+                                                        object:trackingMenu];

    CPApp._activeMenu = nil;
 }
@@ -321,6 +420,8 @@ var SharedMenuManager = nil;
    var count = _menuContainerStack.length,
        index = count;

+    [newMenu _menuWillOpen];
+
    // Hide all menus up to the base menu...
    while (index--)
    {
@@ -332,7 +433,7 @@ var SharedMenuManager = nil;
            break;

        // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
+        if (menu === newMenu) //&& [menu supermenu] === baseMenu)
            return [newMenu _highlightItemAtIndex:CPNotFound];

        [menuContainer orderOut:self];
@@ -340,6 +441,8 @@ var SharedMenuManager = nil;

        [_CPMenuWindow poolMenuWindow:menuContainer];
        [_menuContainerStack removeObjectAtIndex:index];
+
+        [menu _menuDidClose];
    }

    if (!newMenu)
@@ -358,10 +461,243 @@ var SharedMenuManager = nil;
    if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
        [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
    else
-        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];        
-    
+        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
+
    [menuWindow setFrameOrigin:aGlobalLocation];
    [menuWindow orderFront:self];
 }

+/// handle keyboard navigation
+- (void)interpretKeyEvent:(CPEvent)anEvent forMenu:(CPMenu)menu
+{
+    var modifierFlags = [anEvent modifierFlags],
+        character = [anEvent charactersIgnoringModifiers],
+        selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
+
+    if (selectorNames)
+    {
+        var iter = [selectorNames objectEnumerator],
+            obj;
+
+        while ((obj = [iter nextObject]) !== nil)
+        {
+            var aSelector = CPSelectorFromString(obj);
+
+            if ([self respondsToSelector:aSelector])
+                [self performSelector:aSelector withObject:menu];
+        }
+    }
+    else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
+    {
+        if (!_keyBuffer)
+        {
+            _startTime = [anEvent timestamp];
+            _keyBuffer = character;
+
+            [CPEvent stopPeriodicEvents];
+            [CPEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
+        }
+        else
+            _keyBuffer += character;
+
+        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:NO];
+        _lastGlobalLocation = Nil;
+    }
+}
+
+- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu clearBuffer:(BOOL)shouldClear
+{
+    var iter = [[menu itemArray] objectEnumerator],
+        obj;
+
+    while ((obj = [iter nextObject]) !== nil)
+    {
+        if ([obj isHidden] || ![obj isEnabled])
+            continue;
+
+        if ([[[obj title] commonPrefixWithString:characters options:CPCaseInsensitiveSearch] length] == [characters length])
+        {
+            [menu _highlightItemAtIndex:iter._index];
+            break;
+        }
+    }
+
+    if (shouldClear)
+    {
+        [CPEvent stopPeriodicEvents];
+        _keyBuffer = Nil;
+    }
+    else
+        _startTime = [CPEvent currentTimestamp];
+}
+
+- (void)scrollToBeginningOfDocument:(CPMenu)menu
+{
+    [menu _highlightItemAtIndex:0];
+}
+
+- (void)scrollToEndOfDocument:(CPMenu)menu
+{
+    [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+}
+
+- (void)scrollPageDown:(CPMenu)menu
+{
+    var menuWindow = menu._menuWindow,
+        menuClipView = menuWindow._menuClipView,
+        bottom = [menuClipView bounds].size.height,
+        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
+        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
+        current = [menu indexOfItem:[menu highlightedItem]];
+
+    if (current == CPNotFound)
+    {
+        [menu _highlightItemAtIndex:0];
+        return;
+    }
+
+    next = current + (last - first);
+
+    if (next < [menu numberOfItems])
+        [menu _highlightItemAtIndex:next];
+    else
+        [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+
+    var item = [menu highlightedItem];
+
+    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+        [self moveDown:menu];
+}
+
+- (void)scrollPageUp:(CPMenu)menu
+{
+    var menuWindow = menu._menuWindow,
+        menuClipView = menuWindow._menuClipView,
+        bottom = [menuClipView bounds].size.height,
+        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
+        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
+        current = [menu indexOfItem:[menu highlightedItem]];
+
+    if (current == CPNotFound)
+    {
+        [menu _highlightItemAtIndex:0];
+        return;
+    }
+
+    next = current - (last - first);
+
+    if (next < 0)
+        [menu _highlightItemAtIndex:0];
+    else
+        [menu _highlightItemAtIndex:next];
+
+    var item = [menu highlightedItem];
+
+    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+        [self moveUp:menu];
+}
+
+- (void)moveLeft:(CPMenu)menu
+{
+    if ([menu supermenu])
+    {
+        if ([menu supermenu] == [CPApp mainMenu])
+        {
+            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
+            [self moveUp:[CPApp mainMenu]];
+
+            var activeItem = [[CPApp mainMenu] highlightedItem],
+                menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
+
+            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
+        }
+        else
+            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
+    }
+}
+
+- (void)moveRight:(CPMenu)menu
+{
+    var activeItem = [menu highlightedItem];
+
+    if ([activeItem hasSubmenu])
+    {
+        if ([[activeItem submenu] numberOfItems])
+        {
+            var activeItemIndex = [menu indexOfItem:activeItem],
+                activeMenuContainer = menu._menuWindow,
+                activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
+                newMenuOrigin;
+
+            if ([activeMenuContainer isMenuBar])
+                newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
+            else
+                newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
+
+            newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
+
+            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+            [self moveDown:[activeItem submenu]];
+        }
+    }
+    else if ([self trackingMenu] == [CPApp mainMenu])
+    {
+        [self showMenu:nil fromMenu:menu atPoint:CGPointMakeZero()];
+        [self moveDown:[CPApp mainMenu]];
+
+        var activeItem = [[CPApp mainMenu] highlightedItem],
+            menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
+
+        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
+    }
+}
+
+- (void)moveDown:(CPMenu)menu
+{
+    var index = menu._highlightedIndex + 1;
+
+    if (index < [menu numberOfItems])
+    {
+        [menu _highlightItemAtIndex:index];
+
+        var item = [menu highlightedItem];
+
+        if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+            [self moveDown:menu];
+    }
+}
+
+- (void)moveUp:(CPMenu)menu
+{
+    var index = menu._highlightedIndex - 1;
+
+    if (index < 0)
+    {
+        if (index != CPNotFound)
+            [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+        return;
+    }
+    [menu _highlightItemAtIndex:index];
+
+    var item = [menu highlightedItem];
+
+    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+        [self moveUp:menu];
+}
+
+- (void)insertNewline:(CPMenu)menu
+{
+    if ([[menu highlightedItem] hasSubmenu])
+        [self moveRight:menu];
+    else
+        [menu cancelTracking]
+}
+
+- (void)cancelOperation:(CPMenu)menu
+{
+    [menu _highlightItemAtIndex:CPNotFound];
+    [CPEvent stopPeriodicEvents];
+    [[self trackingMenu] cancelTracking];
+}
+
@end
@@ -3,9 +3,9 @@

 var _CPMenuWindowPool                       = [],
    _CPMenuWindowPoolCapacity               = 5,
-    
+
    _CPMenuWindowBackgroundColors           = [];
-    
+
 _CPMenuWindowMenuBarBackgroundStyle         = 0;
 _CPMenuWindowPopUpBackgroundStyle           = 1;
 _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
@@ -16,7 +16,7 @@ var STICKY_TIME_INTERVAL        = 500,
    LEFT_MARGIN                 = 1.0,
    RIGHT_MARGIN                = 1.0,
    BOTTOM_MARGIN               = 5.0,
-    
+
    SCROLL_INDICATOR_HEIGHT     = 16.0;

 /*
@@ -26,10 +26,10 @@ var STICKY_TIME_INTERVAL        = 500,
 {
    _CPMenuView         _menuView;
    CPClipView          _menuClipView;
-    
+
    CPImageView         _moreAboveView;
    CPImageView         _moreBelowView;
-    
+
    CGRect              _unconstrainedFrame;
    CGRect              _constraintRect;
 }
@@ -65,11 +65,11 @@ var STICKY_TIME_INTERVAL        = 500,

 + (void)initialize
 {
-    if (self != [_CPMenuWindow class])
+    if (self !== [_CPMenuWindow class])
        return;
-    
+
    var bundle = [CPBundle bundleForClass:self];
-    
+
    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
 }
@@ -89,31 +89,29 @@ var STICKY_TIME_INTERVAL        = 500,
        [self setAcceptsMouseMovedEvents:YES];

        var contentView = [self contentView];
-        
+
        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
-        
+
        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
        [_menuClipView setDocumentView:_menuView];
-        
+
        [contentView addSubview:_menuClipView];
-        
+
        _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-        
+
        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
-        
+
        [contentView addSubview:_moreAboveView];
-        
+
        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-    
+
        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
-        
-        [contentView addSubview:_moreBelowView];

-        [self setShadowStyle:CPWindowShadowStyleMenu];
+        [contentView addSubview:_moreBelowView];
    }
-    
+
    return self;
 }

@@ -135,7 +133,7 @@ var STICKY_TIME_INTERVAL        = 500,
 + (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
 {
    var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
-    
+
    if (!color)
    {
        var bundle = [CPBundle bundleForClass:[self class]];
@@ -146,32 +144,32 @@ var STICKY_TIME_INTERVAL        = 500,
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded0.png"] size:CGSizeMake(4.0, 4.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow1.png"] size:CGSizeMake(1.0, 4.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded2.png"] size:CGSizeMake(4.0, 4.0)],
-                    
+
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-                    
+
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
                ]]];
-        
+
        else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
                [
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
-                    
+
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-                    
+
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
                ]]];
-                
+
        _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
    }

@@ -187,11 +185,11 @@ var STICKY_TIME_INTERVAL        = 500,
 {
    [aMenu _setMenuWindow:self];
    [_menuView setMenu:aMenu];
-    
+
    var menuViewSize = [_menuView frame].size;
-    
+
    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
-    
+
    [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
 }
@@ -208,10 +206,16 @@ var STICKY_TIME_INTERVAL        = 500,
    return [_menuView menu];
 }

+- (_CPMenuView)_menuView
+{
+    return _menuView;
+}
+
 - (void)orderFront:(id)aSender
 {
+    [[self menu] update];
    [self setFrame:_unconstrainedFrame];
-    
+
    [super orderFront:aSender];
 }

@@ -270,16 +274,16 @@ var STICKY_TIME_INTERVAL        = 500,

        topMargin = TOP_MARGIN,
        bottomMargin = BOTTOM_MARGIN,
-        
+
        contentView = [self contentView],
        bounds = [contentView bounds];

    if (moreAbove)
    {
        topMargin += SCROLL_INDICATOR_HEIGHT;
-    
+
        var frame = [_moreAboveView frame];
-        
+
        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
    }

@@ -288,13 +292,18 @@ var STICKY_TIME_INTERVAL        = 500,
    if (moreBelow)
    {
        bottomMargin += SCROLL_INDICATOR_HEIGHT;
-    
+
        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
    }
-    
+
    [_moreBelowView setHidden:!moreBelow];

-    var clipFrame = CGRectMake(LEFT_MARGIN, topMargin, CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN, CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin)
+    var clipFrame = CGRectMakeZero();
+
+    clipFrame.origin.x = LEFT_MARGIN;
+    clipFrame.origin.y = topMargin;
+    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN;
+    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;

    [_menuClipView setFrame:clipFrame];
    [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
@@ -347,24 +356,29 @@ var STICKY_TIME_INTERVAL        = 500,
    return [self canScrollUp] || [self canScrollDown];
 }

- (void)scrollUp
+- (void)scrollByDelta:(float)theDelta
 {
-    if (CGRectGetMinY(_unconstrainedFrame) >= CGRectGetMinY(_constraintRect))
+    if (theDelta === 0.0)
        return;

-    _unconstrainedFrame.origin.y += 10;
+    if (theDelta > 0.0 && ![self canScrollDown])
+        return;

+    if (theDelta < 0.0 && ![self canScrollUp])
+        return;
+
+    _unconstrainedFrame.origin.y -= theDelta;
    [self setFrame:_unconstrainedFrame];
 }

+- (void)scrollUp
+{
+    [self scrollByDelta:-10.0];
+}
+
 - (void)scrollDown
 {
-    if (CGRectGetMaxY(_unconstrainedFrame) <= CGRectGetHeight(_constraintRect))
-        return;
-
-    _unconstrainedFrame.origin.y -= 10;
-
-    [self setFrame:_unconstrainedFrame];
+    [self scrollByDelta:10.0];
 }

@end
@@ -384,16 +398,15 @@ var STICKY_TIME_INTERVAL        = 500,
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
    var frame = [self frame];
-
-    if (![self canScroll])
+    if (!CPRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
        return _CPMenuManagerScrollingStateNone;

    // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT)
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT &&  ![_moreAboveView isHidden])
        return _CPMenuManagerScrollingStateUp;

    // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT)
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT &&  ![_moreBelowView isHidden])
        return _CPMenuManagerScrollingStateDown;

    return _CPMenuManagerScrollingStateNone;
@@ -428,7 +441,7 @@ var STICKY_TIME_INTERVAL        = 500,
 {
    CPArray _menuItemViews;
    CPArray _visibleMenuItemInfos;
-    
+
    CPFont  _font @accessors(property=font);
 }

@@ -462,7 +475,7 @@ var STICKY_TIME_INTERVAL        = 500,
    while (low <= high)
    {
        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle]
+            info = _visibleMenuItemInfos[middle],
            frame = [info.view frame];

        if (y < CGRectGetMinY(frame))
@@ -480,7 +493,7 @@ var STICKY_TIME_INTERVAL        = 500,

 - (void)tile
 {
-    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];   
+    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];

    _menuItemViews = [];
    _visibleMenuItemInfos = [];
@@ -500,15 +513,15 @@ var STICKY_TIME_INTERVAL        = 500,
    for (; index < count; ++index)
    {
        var item = items[index],
-            view = [item _menuItemView];        
-        
+            view = [item _menuItemView];
+
        _menuItemViews.push(view);
-        
+
        if ([item isHidden])
            continue;

        _visibleMenuItemInfos.push({ view:view, index:index });
-        
+
        [view setFont:_font];
        [view setShowsStateColumn:showsStateColumn];
        [view synchronizeWithMenuItem];
@@ -30,6 +30,25 @@
@import "_CPMenuItemView.j"


+var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
+[CPMenuItemStringRepresentationDictionary setObject:"\u238B" forKey:CPEscapeFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21E5" forKey:CPTabCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21E4" forKey:CPBackTabCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2423" forKey:CPSpaceFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u23CE" forKey:CPCarriageReturnCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPBackspaceCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPDeleteFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2326" forKey:CPDeleteCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21F1" forKey:CPHomeFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21F2" forKey:CPEndFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21DE" forKey:CPPageUpFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21DF" forKey:CPPageDownFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2191" forKey:CPUpArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2193" forKey:CPDownArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2190" forKey:CPLeftArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2192" forKey:CPRightArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2327" forKey:CPClearDisplayFunctionKey];
+
 /*!
    @ingroup appkit
    @class CPMenuItem
@@ -77,6 +96,8 @@
    id              _representedObject;
    CPView          _view;

+    int             _changeCount;
+
    _CPMenuItemView _menuItemView;
 }

@@ -98,12 +119,14 @@

    if (self)
    {
+        _changeCount = 0;
        _isSeparator = NO;

        _title = aTitle;
        _action = anAction;

        _isEnabled = YES;
+        _isHidden = NO;

        _tag = 0;
        _state = CPOffState;
@@ -126,13 +149,12 @@
 */
 - (void)setEnabled:(BOOL)isEnabled
 {
-    if ([_menu autoenablesItems])
+    if (_isEnabled === isEnabled)
        return;

-    _isEnabled = isEnabled;
+    _isEnabled = !!isEnabled;

    [_menuItemView setDirty];
-
    [_menu itemChanged:self];
 }

@@ -259,7 +281,7 @@
 */
 - (void)setFont:(CPFont)aFont
 {
-    if (_font == aFont)
+    if ([_font isEqual:aFont])
        return;

    _font = aFont;
@@ -445,7 +467,7 @@ CPOffState
    return _mixedStateImage;
 }

-// Managing Subemenus
+// Managing Submenus
 /*!
    Sets the submenu for this item
    @param aMenu the submenu
@@ -459,13 +481,14 @@ CPOffState

    if (supermenu)
        [CPException raise:CPInvalidArgumentException
-		   reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
+           reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];

    _submenu = aMenu;

    if (_submenu)
    {
        [_submenu setSupermenu:_menu];
+        [_submenu setTitle:[self title]]

        [self setTarget:_menu];
        [self setAction:@selector(submenuAction:)];
@@ -592,22 +615,25 @@ CPControlKeyMask
        return @"";

    var string = _keyEquivalent.toUpperCase(),
-        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask || 
+        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask ||
                    (string === _keyEquivalent && _keyEquivalent.toLowerCase() !== _keyEquivalent.toUpperCase());

+    if ([CPMenuItemStringRepresentationDictionary objectForKey:string])
+        string = [CPMenuItemStringRepresentationDictionary objectForKey:string];
+
    if (CPBrowserIsOperatingSystem(CPMacOperatingSystem))
    {
        if (_keyEquivalentModifierMask & CPCommandKeyMask)
-            string = "⌘" + string;
+            string = "\u2318" + string;

        if (needsShift)
-            string = "⇧" + string;
+            string = "\u21E7" + string;

        if (_keyEquivalentModifierMask & CPAlternateKeyMask)
-            string = "⌥" + string;
+            string = "\u2325" + string;

        if (_keyEquivalentModifierMask & CPControlKeyMask)
-            string = "^" + string;
+            string = "\u2303" + string;
    }
    else
    {
@@ -644,7 +670,7 @@ CPControlKeyMask
 }

 /*!
-    Sets the title of the menu item and the mnemonic character. The mnemonic chracter should be preceded by an '&'.
+    Sets the title of the menu item and the mnemonic character. The mnemonic character should be preceded by an '&'.
    @param aTitle the title string with a denoted mnemonic
 */
 - (void)setTitleWithMnemonicLocation:(CPString)aTitle
@@ -791,12 +817,12 @@ CPControlKeyMask
 - (id)copy
 {
    var item = [[CPMenuItem alloc] init];
-    
+
    // No point in going through accessors and doing lots of unnecessary state checking/updating
    item._isSeparator = _isSeparator;
-    
+
    [item setTitle:_title];
-    [item setFont:_font];        
+    [item setFont:_font];
    [item setTarget:_target];
    [item setAction:_action];
    [item setEnabled:_isEnabled];
@@ -815,7 +841,7 @@ CPControlKeyMask
    [item setIndentationLevel:_indentationLevel];
    [item setToolTip:_toolTip];
    [item setRepresentedObject:_representedObject];
-    
+
    return item;
 }

@@ -847,6 +873,11 @@ CPControlKeyMask
    return ![self submenu] && [self menu] === [CPApp mainMenu];
 }

+- (CPString)description
+{
+    return [super description] + @" target: " + [self target] + @" action: " + CPStringFromSelector([self action]);
+}
+
@end

 var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
@@ -890,6 +921,7 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",

    if (self)
    {
+        _changeCount = 0;
        _isSeparator = [aCoder containsValueForKey:CPMenuItemIsSeparatorKey] && [aCoder decodeBoolForKey:CPMenuItemIsSeparatorKey];

        _title = [aCoder decodeObjectForKey:CPMenuItemTitleKey];
@@ -900,34 +932,33 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
        _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];

        _isEnabled = DEFAULT_VALUE(CPMenuItemIsEnabledKey, YES);
-        _isHidden = DEFAULT_VALUE(CPMenuItemIsHiddenKey, NO);
-        _tag = DEFAULT_VALUE(CPMenuItemTagKey, 0);
-        _state = DEFAULT_VALUE(CPMenuItemStateKey, CPOffState);
+        _isHidden = [aCoder decodeBoolForKey:CPMenuItemIsHiddenKey];
+        _tag = [aCoder decodeIntForKey:CPMenuItemTagKey];
+        _state = [aCoder decodeIntForKey:CPMenuItemStateKey];

-        _image = DEFAULT_VALUE(CPMenuItemImageKey, nil);
-        _alternateImage = DEFAULT_VALUE(CPMenuItemAlternateImageKey, nil);
+        _image = [aCoder decodeObjectForKey:CPMenuItemImageKey];
+        _alternateImage = [aCoder decodeObjectForKey:CPMenuItemAlternateImageKey];
 //    CPImage         _onStateImage;
 //    CPImage         _offStateImage;
 //    CPImage         _mixedStateImage;

        // This order matters because setSubmenu: needs _menu to be around.
-        _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
-        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
+        _menu = [aCoder decodeObjectForKey:CPMenuItemMenuKey];
+        [self setSubmenu:[aCoder decodeObjectForKey:CPMenuItemSubmenuKey]];

        _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
-        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
+        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPMenuItemKeyEquivalentModifierMaskKey];

 //    int             _mnemonicLocation;

 //    BOOL            _isAlternate;

-        // Default is 0.
-        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
+        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey]];

 //    CPString        _toolTip;

-        _representedObject = DEFAULT_VALUE(CPMenuItemRepresentedObjectKey, nil);
-        _view = DEFAULT_VALUE(CPMenuItemViewKey, nil);
+        _representedObject = [aCoder decodeObjectForKey:CPMenuItemRepresentedObjectKey];
+        _view = [aCoder decodeObjectForKey:CPMenuItemViewKey];
    }

    return self;
@@ -9,7 +9,7 @@ var SelectionColor                              = nil,
    SUBMENU_INDICATOR_COLOR                     = nil,
    _CPMenuItemSelectionColor                   = nil,
    _CPMenuItemTextShadowColor                  = nil,
-    
+
    _CPMenuItemDefaultStateImages               = [],
    _CPMenuItemDefaultStateHighlightedImages    = [];

@@ -40,7 +40,7 @@ var SelectionColor                              = nil,

    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-    
+
    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;

@@ -141,17 +141,15 @@ var SelectionColor                              = nil,

    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
    [_imageAndTextView setFrame:imageAndTextViewFrame];
-    
+
    if (hasSubmenuIndicator)
    {
        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0) + 1.0;
        [_submenuIndicatorView setFrame:submenuViewFrame];
    }

-    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
-    
    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
+    [self setFrameSize:CGSizeMake(x + HORIZONTAL_MARGIN, height)];
    [self setAutoresizesSubviews:YES];
 }

@@ -218,19 +216,19 @@ var SelectionColor                              = nil,
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
        bounds = [self bounds];
-    
+
    bounds.size.height -= 1.0;
    bounds.size.width -= 2.0;
    bounds.origin.x += 1.0;

    CGContextBeginPath(context);
-    
+
    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
    CGContextAddLineToPoint(context, CGRectGetMidX(bounds), CGRectGetMaxY(bounds));
-    
+
    CGContextClosePath(context);
-    
+
    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor || [CPColor whiteColor]);
    CGContextSetFillColor(context, _color || [CPColor blackColor]);
    CGContextFillPath(context);
@@ -27,10 +27,10 @@
        bounds = [self bounds];

    CGContextBeginPath(context);
-    
+
    CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-    
+
    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
    CGContextStrokePath(context);
 }
@@ -6,14 +6,14 @@ var LEFT_MARGIN                 = 3.0,
    STATE_COLUMN_WIDTH          = 14.0,
    INDENTATION_WIDTH           = 17.0,
    VERTICAL_MARGIN             = 4.0,
-    
+
    RIGHT_COLUMNS_MARGIN        = 30.0,
    KEY_EQUIVALENT_MARGIN       = 10.0;

 var SUBMENU_INDICATOR_COLOR                     = nil,
    _CPMenuItemSelectionColor                   = nil,
    _CPMenuItemTextShadowColor                  = nil,
-    
+
    _CPMenuItemDefaultStateImages               = [],
    _CPMenuItemDefaultStateHighlightedImages    = [];

@@ -43,9 +43,9 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-    
+
    var bundle = [CPBundle bundleForClass:self];
-    
+
    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;

@@ -74,7 +74,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    {
        _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];

-        [_stateView setImageScaling:CPScaleNone];
+        [_stateView setImageScaling:CPImageScaleNone];

        [self addSubview:_stateView];

@@ -175,7 +175,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
        [_keyEquivalentView sizeToFit];
-        
+
        var keyEquivalentViewFrame = [_keyEquivalentView frame];

        keyEquivalentViewFrame.origin.x = x;
@@ -215,7 +215,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
        [_keyEquivalentView setFrame:keyEquivalentViewFrame];
    }
-    
+
    if (hasSubmenu)
    {
        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
@@ -223,7 +223,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    }

    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
-    
+
    [self setAutoresizesSubviews:NO];
    [self setFrameSize:_minSize];
    [self setAutoresizesSubviews:YES];
@@ -233,7 +233,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
    // FIXME: This should probably be even throw.
    if (![_menuItem isEnabled])
-        return; 
+        return;

    if (shouldHighlight)
    {
@@ -259,7 +259,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
    }
-    
+
    if ([[_menuItem menu] showsStateColumn])
    {
        if (shouldHighlight)
@@ -290,15 +290,15 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
        bounds = [self bounds];
-    
+
    CGContextBeginPath(context);
-    
+
    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-    
+
    CGContextClosePath(context);
-    
+
    CGContextSetFillColor(context, _color);
    CGContextFillPath(context);
 }
@@ -11,10 +11,10 @@ var LEFT_MARGIN                 = 3.0,
    STATE_COLUMN_WIDTH          = 14.0,
    INDENTATION_WIDTH           = 17.0,
    VERTICAL_MARGIN             = 4.0;
-    
+
 var _CPMenuItemSelectionColor                   = nil,
    _CPMenuItemTextShadowColor                  = nil,
-    
+
    _CPMenuItemDefaultStateImages               = [],
    _CPMenuItemDefaultStateHighlightedImages    = [];

@@ -34,21 +34,20 @@ var _CPMenuItemSelectionColor                   = nil,
    BOOL                    _isDirty;
    BOOL                    _showsStateColumn;

-    CPImageView             _stateView;
    _CPImageAndTextView     _imageAndTextView;
    CPView                  _submenuView;
 }

 + (void)initialize
 {
-    if (self != [_CPMenuItemView class])
+    if (self !== [_CPMenuItemView class])
        return;
-    
+
    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-    
+
    var bundle = [CPBundle bundleForClass:self];
-    
+
    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;

@@ -73,12 +72,12 @@ var _CPMenuItemSelectionColor                   = nil,
        _menuItem = aMenuItem;
        _showsStateColumn = YES;
        _isDirty = YES;
-        
+
        [self setAutoresizingMask:CPViewWidthSizable];

        [self synchronizeWithMenuItem];
    }
-    
+
    return self;
 }

@@ -112,7 +111,7 @@ var _CPMenuItemSelectionColor                   = nil,
            _view = menuItemView;
        }
    }
-    
+
    else if ([_menuItem menu] == [CPApp mainMenu])
    {
        if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
@@ -130,7 +129,7 @@ var _CPMenuItemSelectionColor                   = nil,
            [_view removeFromSuperview];
            _view = [_CPMenuItemStandardView view];
        }
-        
+
        [_view setMenuItem:_menuItem];
    }

@@ -161,7 +160,7 @@ var _CPMenuItemSelectionColor                   = nil,
 {
    if (![_menuItem hasSubmenu])
        return NO;
-        
+
    return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
 }

@@ -177,7 +176,7 @@ var _CPMenuItemSelectionColor                   = nil,

 - (void)setFont:(CPFont)aFont
 {
-    if (_font === aFont)
+    if ([_font isEqual:aFont])
        return;

    _font = aFont;
@@ -192,7 +191,7 @@ var _CPMenuItemSelectionColor                   = nil,
 {
    if (_textColor == aColor)
        return;
-    
+
    _textColor = aColor;

    [_imageAndTextView setTextColor:[self textColor]];
@@ -208,7 +207,7 @@ var _CPMenuItemSelectionColor                   = nil,
 {
    if (_textShadowColor == aColor)
        return;
-    
+
    _textShadowColor = aColor;

    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
@@ -233,23 +232,23 @@ var _CPMenuItemSelectionColor                   = nil,
        return;

    _color = aColor;
-    
+
    [self setNeedsDisplay:YES];
 }

 - (void)drawRect:(CGRect)aRect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort];
-    
+
    CGContextBeginPath(context);
-    
+
    CGContextMoveToPoint(context, 1.0, 4.0);
    CGContextAddLineToPoint(context, 9.0, 4.0);
    CGContextAddLineToPoint(context, 5.0, 8.0);
    CGContextAddLineToPoint(context, 1.0, 4.0);
-    
+
    CGContextClosePath(context);
-    
+
    CGContextSetFillColor(context, _color);
    CGContextFillPath(context);
 }
@@ -1,16 +1,47 @@
+/*
+ * CPObjectController.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import <Foundation/CPDictionary.j>
@import <Foundation/CPCountedSet.j>

@import "CPController.j"

+/*!
+    @class

+    CPObjectController is a bindings-compatible controller class.
+    Properties of the content object of an object of this class can be bound to user interface elements to change and access their values.
+
+    The content of an CPObjectController instance is an CPMutableDictionary object by default.
+    This allows a single CPObjectController instance to be used to manage several properties accessed by key value paths.
+    The default content object class can be changed by calling setObjectClass:, which a subclass must override.
+*/
@implementation CPObjectController : CPController
 {
    id              _contentObject;
    id              _selection;

    Class           _objectClass;
+    CPString        _objectClassName;

    BOOL            _isEditable;
    BOOL            _automaticallyPreparesContent;
@@ -20,6 +51,9 @@

 + (id)initialize
 {
+    if (self !== [CPObjectController class])
+        return;
+
    [self exposeBinding:@"editable"];
    [self exposeBinding:@"contentObject"];
 }
@@ -52,11 +86,20 @@
    return [CPSet setWithObjects:"editable", "selection"];
 }

+/*!
+    @ignore
+*/
 - (id)init
 {
    return [self initWithContent:nil];
 }

+/*!
+    Inits and returns a CPObjectController object with the given content.
+
+    @param id aContent - The object the controller will use.
+    @return id the CPObjectConroller instance.
+*/
 - (id)initWithContent:(id)aContent
 {
    if (self = [super init])
@@ -71,11 +114,19 @@
    return self;
 }

+/*!
+    Returns the controller's content object.
+    @return id - The content object of the controller.
+*/
 - (id)content
 {
    return _contentObject;
 }

+/*!
+    Sets the content object for the controller.
+    @param id aContent - The new content object for the controller.
+*/
 - (void)setContent:(id)aContent
 {
    [self willChangeValueForKey:@"contentObject"];
@@ -83,113 +134,197 @@

    _contentObject = aContent;

-    [self didChangeValueForKey:@"contentObject"];
    [self _selectionDidChange];
+    [self didChangeValueForKey:@"contentObject"];
 }

+/*!
+    @ignore
+*/
 - (void)_setContentObject:(id)aContent
 {
    [self setContent:aContent];
 }

+/*!
+    @ignore
+*/
 - (id)_contentObject
 {
    return [self content];
 }

+/*!
+    Sets whether the controller automatically creates and inserts new content objects automatically when loading from a cib file.
+    If you pass YES and the controller uses prepareContent to create the content object.
+    The default is NO.
+
+    @param BOOL shouldAutomaticallyPrepareContent - YES if the content should be prepared, otherwise NO.
+*/
 - (void)setAutomaticallyPreparesContent:(BOOL)shouldAutomaticallyPrepareContent
 {
    _automaticallyPreparesContent = shouldAutomaticallyPrepareContent;
 }

+/*!
+    Returns if the controller prepares the content automatically.
+    @return BOOL - YES if the content is prepared, otherwise NO.
+*/
 - (BOOL)automaticallyPreparesContent
 {
    return _automaticallyPreparesContent;
 }

+/*!
+    Overridden by a subclass that require control over the creation of new objects.
+*/
 - (void)prepareContent
 {
    [self setContent:[self newObject]];
 }

+/*!
+    Sets the object class when creating new objects.
+    @param Class - the class of new objects that will be created.
+*/
 - (void)setObjectClass:(Class)aClass
 {
    _objectClass = aClass;
 }

+/*!
+    Returns the class of what new objects will be when they are created.
+
+    @return Class - The class of new objects.
+*/
 - (Class)objectClass
 {
    return _objectClass;
 }

- (id)newObject
+/*!
+    @ignore
+*/
+- (id)_defaultNewObject
 {
    return [[[self objectClass] alloc] init];
 }

+/*!
+    Creates and returns a new object of the appropriate class.
+    @return id - The object created.
+*/
+- (id)newObject
+{
+    return [self _defaultNewObject];
+}
+
+/*!
+    Sets the controller's content object.
+    @param id anObject - The object to set for the controller.
+*/
 - (void)addObject:(id)anObject
 {
    [self setContent:anObject];

-    [[CPKeyValueBinding getBinding:@"contentObject" forObject:self] reverseSetValueFor:@"contentObject"];
+    var binderClass = [[self class] _binderClassForBinding:@"contentObject"];
+    [[binderClass getBinding:@"contentObject" forObject:self] reverseSetValueFor:@"contentObject"];
 }

+/*!
+    Removes a given object from the controller.
+    @param id anObject - The object to remove from the receiver.
+*/
 - (void)removeObject:(id)anObject
 {
    if ([self content] === anObject)
        [self setContent:nil];

-    [[CPKeyValueBinding getBinding:@"contentObject" forObject:self] reverseSetValueFor:@"contentObject"];
+    var binderClass = [[self class] _binderClassForBinding:@"contentObject"];
+    [[binderClass getBinding:@"contentObject" forObject:self] reverseSetValueFor:@"contentObject"];
 }

+/*!
+    Creates and adds a sets the object as the controller's content.
+    @param id aSender - The sender of the message.
+*/
 - (void)add:(id)aSender
 {
    // FIXME: This should happen on the next run loop?
    [self addObject:[self newObject]];
 }

+/*!
+    @return BOOL - YES if you can added to the controller using add:
+*/
 - (BOOL)canAdd
 {
    return [self isEditable];
 }

+/*!
+    Removes the content object from the controller.
+    @param id aSender - The sender of the message.
+*/
 - (void)remove:(id)aSender
 {
    // FIXME: This should happen on the next run loop?
    [self removeObject:[self content]];
 }

+/*!
+    @return BOOL - Returns YES if you can remove the controller's content using remove:
+*/
 - (BOOL)canRemove
 {
    return [self isEditable] && [[self selectedObjects] count];
 }

+/*!
+    Sets whether the controller allows for the editing of the content.
+    @param BOOL shouldBeEditable - YES if the content should be editable, otherwise NO.
+*/
 - (void)setEditable:(BOOL)shouldBeEditable
 {
    _isEditable = shouldBeEditable;
 }

+/*!
+    @return BOOL - Returns YES if the content of the controller is editable, otherwise NO.
+*/
 - (BOOL)isEditable
 {
    return _isEditable;
 }

+/*!
+    @return CPArray - Returns an array of all objects to be affected by editing.
+*/
 - (CPArray)selectedObjects
 {
-    return [[_CPObservableArray alloc] initWithObjects:[_contentObject] count:1];
+    return [[_CPObservableArray alloc] initWithArray:[_contentObject]];
 }

+/*!
+    Returns a proxy object representing the controller's selection.
+*/
 - (id)selection
 {
    return _selection;
 }

+/*!
+    @ignore
+*/
 - (void)_selectionWillChange
 {
    [_selection controllerWillChange];
    [self willChangeValueForKey:@"selection"];
 }

+/*!
+    @ignore
+*/
 - (void)_selectionDidChange
 {
    if (_selection === undefined || _selection === nil)
@@ -199,6 +334,9 @@
    [self didChangeValueForKey:@"selection"];
 }

+/*!
+    @return id - Returns the keys which are being observed.
+*/
 - (id)observedKeys
 {
    return _observedKeys;
@@ -218,7 +356,8 @@

@end

-var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerObjectClassNameKey",
+var CPObjectControllerContentKey                        = @"CPObjectControllerContentKey",
+    CPObjectControllerObjectClassNameKey                = @"CPObjectControllerObjectClassNameKey",
    CPObjectControllerIsEditableKey                     = @"CPObjectControllerIsEditableKey",
    CPObjectControllerAutomaticallyPreparesContentKey   = @"CPObjectControllerAutomaticallyPreparesContentKey";

@@ -233,11 +372,10 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
        var objectClassName = [aCoder decodeObjectForKey:CPObjectControllerObjectClassNameKey],
            objectClass = CPClassFromString(objectClassName);

-        // FIXME: Error if objectClass === nil
-
-        [self setObjectClass:objectClass];
+        [self setObjectClass:objectClass || [CPMutableDictionary class]];
        [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
-        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey] || NO];
+        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
+        [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];

        _observedKeys = [[CPCountedSet alloc] init];
    }
@@ -247,11 +385,21 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    [aCoder encodeObject:CPStringFromClass(objectClass) forKey:CPObjectControllerObjectClassNameKey];
-    [aCoder encodeObject:[self isEditable] forKey:CPObjectControllerIsEditableKey];
+    [aCoder encodeObject:[self content] forKey:CPObjectControllerContentKey];

-    if (![self automaticallyPreparesContent])
-        [aCoder encodeBOOL:YES forKey:CPObjectControllerAutomaticallyPreparesContentKey];
+    if (_objectClass)
+        [aCoder encodeObject:CPStringFromClass(_objectClass) forKey:CPObjectControllerObjectClassNameKey];
+    else if (_objectClassName)
+        [aCoder encodeObject:_objectClassName forKey:CPObjectControllerObjectClassNameKey];
+
+    [aCoder encodeBool:[self isEditable] forKey:CPObjectControllerIsEditableKey];
+    [aCoder encodeBool:[self automaticallyPreparesContent] forKey:CPObjectControllerAutomaticallyPreparesContentKey];
+}
+
+- (void)awakeFromCib
+{
+    if (![self content] && [self automaticallyPreparesContent])
+        [self prepareContent];
 }

@end
@@ -270,7 +418,7 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

 - (id)initWithKeyPath:(id)aKeyPath observer:(id)anObserver object:(id)anObject
 {
-    if (self=[super init])
+    if (self = [super init])
    {
        _keyPath  = aKeyPath;
        _observer = anObserver;
@@ -319,9 +467,9 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)change context:(id)context
 {
    if (_notifyObject)
-        [_object observeValueForKeyPath:_keyPath ofObject:_object change:change context:context];
+        [_object observeValueForKeyPath:aKeyPath ofObject:_object change:change context:context];

-    [_observer observeValueForKeyPath:_keyPath ofObject:_object change:change context:context];
+    [_observer observeValueForKeyPath:aKeyPath ofObject:_object change:change context:context];
 }

 - (CPString)description
@@ -331,7 +479,8 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

@end

-@implementation _CPObservableArray : CPMutableArray
+// FIXME: This should subclass CPMutableArray not _CPJavaScriptArray
+@implementation _CPObservableArray : _CPJavaScriptArray
 {
    CPArray     _observationProxies;
 }
@@ -352,30 +501,20 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

 - (CPString)description
 {
-    return "<_CPObservableArray: "+[super description]+" >";
+    return "<_CPObservableArray: " + [super description] + " >";
 }

 - (id)initWithArray:(CPArray)anArray
 {
-    if (self = [super initWithArray:anArray])
-    {
-        _observationProxies = [];
-    }
+    self = [super initWithArray:anArray];
+
+    self.isa = [_CPObservableArray class];
+    self._observationProxies = [];

    return self;
 }

- (id)initWithObjects:(CPArray)objects count:(unsigned)count
-{
-    if (self = [super initWithObjects:objects count:count])
-    {
-        _observationProxies = [];
-    }
-
-    return self;
-}
-
-(void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
+- (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
 {
    if (aKeyPath.indexOf("@") === 0)
    {
@@ -387,7 +526,7 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
        [_observationProxies addObject:proxy];

        var dotIndex = aKeyPath.indexOf("."),
-            remaining = aKeyPath.substring(dotIndex+1),
+            remaining = aKeyPath.substring(dotIndex + 1),
            indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];

        [self addObserver:proxy toObjectsAtIndexes:indexes forKeyPath:remaining options:options context:context];
@@ -409,7 +548,7 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
        proxy = [_observationProxies objectAtIndex:index];

        var dotIndex = aKeyPath.indexOf("."),
-            remaining = aKeyPath.substring(dotIndex+1),
+            remaining = aKeyPath.substring(dotIndex + 1),
            indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];

        [self removeObserver:proxy fromObjectsAtIndexes:indexes forKeyPath:remaining];
@@ -423,7 +562,7 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

 - (void)insertObject:(id)anObject atIndex:(unsigned)anIndex
 {
-    for (var i=0, count=[_observationProxies count]; i<count; i++)
+    for (var i = 0, count = [_observationProxies count]; i < count; i++)
    {
        var proxy = [_observationProxies objectAtIndex:i],
            keyPath = [proxy keyPath],
@@ -443,7 +582,9 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

 - (void)removeObjectAtIndex:(unsigned)anIndex
 {
-    for (var i=0, count=[_observationProxies count]; i<count; i++)
+    var currentObject = [self objectAtIndex:anIndex];
+
+    for (var i = 0, count = [_observationProxies count]; i < count; i++)
    {
        var proxy = [_observationProxies objectAtIndex:i],
            keyPath = [proxy keyPath],
@@ -452,7 +593,7 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
        if (operator)
            [self willChangeValueForKey:keyPath];

-        [anObject removeObserver:proxy forKeyPath:keyPath];
+        [currentObject removeObserver:proxy forKeyPath:keyPath];

        if (operator)
            [self didChangeValueForKey:keyPath];
@@ -480,7 +621,7 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
 {
    var currentObject = [self objectAtIndex:anIndex];

-    for (var i=0, count=[_observationProxies count]; i<count; i++)
+    for (var i = 0, count = [_observationProxies count]; i < count; i++)
    {
        var proxy = [_observationProxies objectAtIndex:i],
            keyPath = [proxy keyPath],
@@ -503,11 +644,13 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb

@implementation CPControllerSelectionProxy : CPObject
 {
-    id              _controller;
-    id              _keys;
+    id                  _controller;
+    id                  _keys;

-    CPDictionary    _cachedValues;
-    CPArray         _observationProxies;
+    CPDictionary        _cachedValues;
+    CPArray             _observationProxies;
+
+    Object              _observedObjectsByKeyPath;
 }

 - (id)initWithController:(id)aController
@@ -517,46 +660,80 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
        _cachedValues = [CPDictionary dictionary];
        _observationProxies = [CPArray array];
        _controller = aController;
+        _observedObjectsByKeyPath = {};
    }

    return self;
 }

- (id)valueForKey:(CPString)aKey
+- (id)_controllerMarkerForValues:(CPArray)theValues
 {
-    var value = [_cachedValues objectForKey:aKey];
-
-    if (value !== undefined && value !== nil)
-        return value;
-
-    var allValues = [[_controller selectedObjects] valueForKeyPath:aKey],
-        count = [allValues count];
+    var count = [theValues count],
+        value;

    if (!count)
        value = CPNoSelectionMarker;
    else if (count === 1)
-        value = [allValues objectAtIndex:0];
+        value = [theValues objectAtIndex:0];
    else
    {
        if ([_controller alwaysUsesMultipleValuesMarker])
            value = CPMultipleValuesMarker;
        else
        {
-            value = [allValues objectAtIndex:0];
+            value = [theValues objectAtIndex:0];

-            for (var i=0, count=[allValues count]; i<count && value!=CPMultipleValuesMarker; i++)
+            for (var i = 0, count = [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
            {
-                if (![value isEqual:[allValues objectAtIndex:i]])
+                if (![value isEqual:[theValues objectAtIndex:i]])
                    value = CPMultipleValuesMarker;
            }
        }
    }

-    [_cachedValues setValue:value forKey:aKey];
+    if (value === nil || value.isa && [value isEqual:[CPNull null]])
+        value = CPNullMarker;

    return value;
 }

+- (id)valueForKeyPath:(CPString)theKeyPath
+{
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
+        value = [self _controllerMarkerForValues:values];
+
+    [_cachedValues setObject:value forKey:theKeyPath];
+
+    return value;
+}
+
+- (id)valueForKey:(CPString)theKeyPath
+{
+    return [self valueForKeyPath:theKeyPath];
+}
+
+- (void)setValue:(id)theValue forKeyPath:(CPString)theKeyPath
+{
+    [[_controller selectedObjects] setValue:theValue forKeyPath:theKeyPath];
+    [_cachedValues removeObjectForKey:theKeyPath];
+
+    // Allow handlesContentAsCompoundValue to work, based on observation of Cocoa's
+    // NSArrayController - when handlesContentAsCompoundValue and setValue:forKey:@"selection.X"
+    // is called, the array controller causes the compound value to be rewritten if
+    // handlesContentAsCompoundValue == YES. Note that
+    // A) this doesn't use observation (observe: X is not visible in backtraces)
+    // B) it only happens through the selection proxy and not on arrangedObject.X, content.X
+    // or even selectedObjects.X.
+    // FIXME The main code for this should somehow be in CPArrayController and also work
+    // for table based row edits.
+    [[CPBinder getBinding:@"contentArray" forObject:_controller] _contentArrayDidChange];
+}
+
+- (void)setValue:(id)theValue forKey:(CPString)theKeyPath
+{
+    [self setValue:theKeyPath forKeyPath:theKeyPath];
+}
+
 - (unsigned)count
 {
    return [_cachedValues count];
@@ -567,32 +744,27 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
    return [_cachedValues keyEnumerator];
 }

- (void)setValue:(id)aValue forKey:(CPString)aKey
-{
-    [[_controller selectedObjects] setValue:aValue forKey:aKey];
-}
-
-(void)controllerWillChange
+- (void)controllerWillChange
 {
    _keys = [_cachedValues allKeys];

    if (!_keys)
        return;

-    for (var i=0, count=_keys.length; i<count; i++)
+    for (var i = 0, count = _keys.length; i < count; i++)
        [self willChangeValueForKey:_keys[i]];

    [_cachedValues removeAllObjects];
 }

-(void)controllerDidChange
+- (void)controllerDidChange
 {
    [_cachedValues removeAllObjects];

    if (!_keys)
        return;

-    for (var i=0, count=_keys.length; i<count; i++)
+    for (var i = 0, count = _keys.length; i < count; i++)
        [self didChangeValueForKey:_keys[i]];

   _keys = nil;
@@ -610,7 +782,10 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
    [proxy setNotifyObject:YES];
    [_observationProxies addObject:proxy];

-    [[_controller selectedObjects] addObserver:proxy forKeyPath:aKeyPath options:options context:context];
+    // We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
+    var observedObjects = [_controller selectedObjects];
+    _observedObjectsByKeyPath[aKeyPath] = observedObjects;
+    [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
 }

 - (void)removeObserver:(id)anObject forKeyPath:(CPString)aKeyPath
@@ -618,8 +793,12 @@ var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerOb
    var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObject object:self],
        index = [_observationProxies indexOfObject:proxy];

-    [[_controller selectedObjects] removeObserver:[_observationProxies objectAtIndex:index] forKeyPath:aKeyPath];
+    var observedObjects = _observedObjectsByKeyPath[aKeyPath];
+    [observedObjects removeObserver:[_observationProxies objectAtIndex:index] forKeyPath:aKeyPath];
+
    [_observationProxies removeObjectAtIndex:index];
+
+    _observedObjects = nil;
 }

@end
@@ -1,3 +1,24 @@
+/*
+ * CPOpenPanel.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import "CPPanel.j"

@@ -26,7 +26,7 @@
 CPOKButton      = 1;
 CPCancelButton  = 0;

-/*! 
+/*!
    @ingroup appkit
    @class CPPanel

@@ -51,7 +51,7 @@ CPCancelButton  = 0;
    @global
    @class CPWindow
 */
-CPDocModalWindowMask			= 1 << 6;
+CPDocModalWindowMask    = 1 << 6;

@implementation CPPanel : CPWindow
 {
@@ -50,18 +50,18 @@ CPImagePboardType       = @"CPImagePboardType";
 var CPPasteboards = nil,
    supportsNativePasteboard = NO;

-/*! 
+/*!
    @ingroup appkit
    @class CPPasteboard

-    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations. 
+    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations.
 */
@implementation CPPasteboard : CPObject
 {
    CPArray         _types;
    CPDictionary    _owners;
    CPDictionary    _provided;
-    
+
    unsigned        _changeCount;
    CPString        _stateUID;

@@ -73,11 +73,11 @@ var CPPasteboards = nil,
 */
 + (void)initialize
 {
-    if (self != [CPPasteboard class])
+    if (self !== [CPPasteboard class])
        return;

    [self setVersion:1.0];
-    
+
    CPPasteboards = [CPDictionary dictionary];

    if (typeof window.cpPasteboardWithName !== "undefined")
@@ -103,10 +103,10 @@ var CPPasteboards = nil,

    if (pasteboard)
        return pasteboard;
-    
+
    pasteboard = [[CPPasteboard alloc] _initWithName:aName];
    [CPPasteboards setObject:pasteboard forKey:aName];
-    
+
    return pasteboard;
 }

@@ -114,15 +114,15 @@ var CPPasteboards = nil,
 - (id)_initWithName:(CPString)aName
 {
    self = [super init];
-    
+
    if (self)
    {
        _name = aName;
        _types = [];
-        
+
        _owners = [CPDictionary dictionary];
        _provided = [CPDictionary dictionary];
-        
+
        _changeCount = 0;

        if (supportsNativePasteboard)
@@ -131,7 +131,7 @@ var CPPasteboards = nil,
            [self _synchronizePasteboard];
        }
    }
-    
+
    return self;
 }

@@ -145,17 +145,17 @@ var CPPasteboards = nil,
 {
    var i = 0,
        count = types.length;
-    
+
    for (; i < count; ++i)
    {
        var type = types[i];
-        
-        if(![_owners objectForKey:type])
+
+        if (![_owners objectForKey:type])
        {
            [_types addObject:type];
            [_provided removeObjectForKey:type];
        }
-        
+
        [_owners setObject:anOwner forKey:type];
    }

@@ -191,7 +191,7 @@ var CPPasteboards = nil,
    _provided = [CPDictionary dictionary];

    var count = _types.length;
-    
+
    while (count--)
        [_owners setObject:anOwner forKey:_types[count]];

@@ -283,18 +283,18 @@ var CPPasteboards = nil,
 - (CPData)dataForType:(CPString)aType
 {
    var data = [_provided objectForKey:aType];
-    
+
    if (data)
        return data;
-        
+
    var owner = [_owners objectForKey:aType];
-    
+
    if (owner)
    {
-        [owner pasteboard:self provideDataForType:aType];        
+        [owner pasteboard:self provideDataForType:aType];
        return [_provided objectForKey:aType];
    }
-    
+
    if (aType === CPStringPboardType)
        return [self dataForType:UTF8PboardType];

@@ -339,10 +339,10 @@ var CPPasteboards = nil,
 - (id)propertyListForType:(CPString)aType
 {
    var data = [self dataForType:aType];
-    
+
    if (data)
        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
-        
+
    return nil;
 }

@@ -360,9 +360,9 @@ var CPPasteboards = nil,
 - (CPString)_generateStateUID
 {
    var bits = 32;
-        
+
    _stateUID = @"";
-    
+
    while (bits--)
        _stateUID += FLOOR(RAND() * 16.0).toString(16).toUpperCase();

@@ -20,13 +20,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPGeometry.j>
+
@import "CPButton.j"
-@import "CPGeometry.j"
+@import "CPKeyValueBinding.j"
@import "CPMenu.j"
@import "CPMenuItem.j"

-
-var VISIBLE_MARGIN  = 7.0;
+var VISIBLE_MARGIN = 7.0;

 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

@@ -38,10 +39,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
@implementation CPPopUpButton : CPButton
 {
-    int         _selectedIndex;
+    CPUInteger  _selectedIndex;
    CPRectEdge  _preferredEdge;
-
-    CPMenu      _menu;
 }

 + (CPString)defaultThemeClass
@@ -49,6 +48,21 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    return "popup-button";
 }

+ (CPSet)keyPathsForValuesAffectingSelectedIndex
+{
+    return [CPSet setWithObject:@"objectValue"];
+}
+
+ (CPSet)keyPathsForValuesAffectingSelectedTag
+{
+    return [CPSet setWithObject:@"objectValue"];
+}
+
+ (CPSet)keyPathsForValuesAffectingSelectedItem
+{
+    return [CPSet setWithObject:@"objectValue"];
+}
+
 /*!
    Initializes the pop-up button to the specified size.
    @param aFrame the size for the button
@@ -61,7 +75,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

    if (self)
    {
-        _selectedIndex = CPNotFound;
+        [self selectItemAtIndex:CPNotFound];
+
        _preferredEdge = CPMaxYEdge;

        [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
@@ -71,6 +86,11 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
        [self setMenu:[[CPMenu alloc] initWithTitle:@""]];

        [self setPullsDown:shouldPullDown];
+
+        var options = CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld; // | CPKeyValueObservingOptionInitial;
+        [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
+        [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
+        [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
    }

    return self;
@@ -85,6 +105,9 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

 /*!
    Specifies whether the object is a pull-down or a pop-up menu.
+    If the button pulls down the menu items represent actions, not states.
+    So the text in the button will NOT change when the user selects something different.
+
    @param shouldPullDown \c YES makes the pop-up button
    a pull-down menu. \c NO makes it a pop-up menu.
 */
@@ -98,7 +121,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    if (!changed)
        return;

-    var items = [_menu itemArray];
+    var items = [[self menu] itemArray];

    if ([items count] <= 0)
        return;
@@ -123,21 +146,21 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)addItem:(CPMenuItem)anItem
 {
-    [_menu addItem:anItem];
+    [[self menu] addItem:anItem];
 }

 /*!
    Adds a new menu item with the specified title.
-    @param the new menu item's tite
+    @param the new menu item's title
 */
 - (void)addItemWithTitle:(CPString)aTitle
 {
-    [_menu addItemWithTitle:aTitle action:NULL keyEquivalent:nil];
+    [[self menu] addItemWithTitle:aTitle action:NULL keyEquivalent:nil];
 }

 /*!
    Adds multiple new menu items with the titles specified in the provided array.
-    @param titles an arry of names for the new items
+    @param titles an array of names for the new items
 */
 - (void)addItemsWithTitles:(CPArray)titles
 {
@@ -150,7 +173,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

 /*!
    Inserts a new item with the specified title and index location.
-    @param aTitle the new itme's title
+    @param aTitle the new item's title
    @param anIndex the item's index in the menu
 */
 - (void)insertItemWithTitle:(CPString)aTitle atIndex:(int)anIndex
@@ -162,7 +185,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
        if ([items[count] title] == aTitle)
            [self removeItemAtIndex:count];

-    [_menu insertItemWithTitle:aTitle action:NULL keyEquivalent:nil atIndex:anIndex];
+    [[self menu] insertItemWithTitle:aTitle action:NULL keyEquivalent:nil atIndex:anIndex];
 }

 /*!
@@ -170,10 +193,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)removeAllItems
 {
-    var count = [_menu numberOfItems];
-
-    while (count--)
-        [_menu removeItemAtIndex:0];
+    [[self menu] removeAllItems];
+    [self synchronizeTitleAndSelectedItem];
 }

 /*!
@@ -192,7 +213,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)removeItemAtIndex:(int)anIndex
 {
-    [_menu removeItemAtIndex:anIndex];
+    [[self menu] removeItemAtIndex:anIndex];
    [self synchronizeTitleAndSelectedItem];
 }

@@ -202,10 +223,12 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)selectedItem
 {
-    if (_selectedIndex < 0 || _selectedIndex > [self numberOfItems] - 1)
+    var indexOfSelectedItem = [self indexOfSelectedItem];
+
+    if (indexOfSelectedItem < 0 || indexOfSelectedItem > [self numberOfItems] - 1)
        return nil;

-    return [_menu itemAtIndex:_selectedIndex];
+    return [[self menu] itemAtIndex:indexOfSelectedItem];
 }

 /*!
@@ -224,15 +247,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    return _selectedIndex;
 }

-// For us, CPNumber is toll-free bridged to Number, so just return the selected index.
-/*!
-    Returns the selected item's index. If no item is selected, it returns CPNotFound.
-*/
- (id)objectValue
-{
-    return _selectedIndex;
-}
-
 // Setting the Current Selection
 /*!
    Selects the specified menu item.
@@ -247,22 +261,50 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    Selects the item at the specified index
    @param anIndex the index of the item to select
 */
- (void)selectItemAtIndex:(int)anIndex
+- (void)selectItemAtIndex:(CPUInteger)anIndex
 {
-    if (_selectedIndex == anIndex)
+    [self setObjectValue:anIndex];
+}
+
+- (void)setSelectedIndex:(CPUInteger)anIndex
+{
+    [self setObjectValue:anIndex];
+}
+
+- (CPUInteger)selectedIndex
+{
+    return [self objectValue];
+}
+
+/*!
+    Selects the item at the specified index
+    @param anIndex the index of the item to select
+*/
+- (void)setObjectValue:(int)anIndex
+{
+    var indexOfSelectedItem = [self objectValue];
+
+    anIndex = parseInt(+anIndex, 10);
+
+    if (indexOfSelectedItem === anIndex)
        return;

-    if (_selectedIndex >= 0 && ![self pullsDown])
+    if (indexOfSelectedItem >= 0 && ![self pullsDown])
        [[self selectedItem] setState:CPOffState];

    _selectedIndex = anIndex;

-    if (_selectedIndex >= 0 && ![self pullsDown])
+    if (indexOfSelectedItem >= 0 && ![self pullsDown])
        [[self selectedItem] setState:CPOnState];

    [self synchronizeTitleAndSelectedItem];
 }

+- (id)objectValue
+{
+    return _selectedIndex;
+}
+
 /*!
    Selects the menu item with the specified tag
    @param the tag of the item to select
@@ -281,84 +323,14 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    [self selectItemAtIndex:[self indexOfItemWithTitle:aTitle]];
 }

-/*!
-    Sets the object for the selected item. If no item is selected, then this method has no effect.
-    @param the object set for the selected item
-*/
- (void)setObjectValue:(id)aValue
-{
-    [self selectItemAtIndex:[aValue intValue]];
-}
-
 // Getting Menu Items
-/*!
-    Returns the button's menu of items.
-*/
- (CPMenu)menu
-{
-    return _menu;
-}
-
-/*!
-    Sets the menu for the button
-*/
- (void)setMenu:(CPMenu)aMenu
-{
-    if (_menu === aMenu)
-        return;
-
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (_menu)
-    {
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidAddItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidChangeItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidRemoveItemNotification
-                    object:_menu];
-    }
-
-    _menu = aMenu;
-
-    if (_menu)
-    {
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidAddItem:)
-                  name:CPMenuDidAddItemNotification
-                object:_menu];
-
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidChangeItem:)
-                  name:CPMenuDidChangeItemNotification
-                object:_menu];
-
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidRemoveItem:)
-                  name:CPMenuDidRemoveItemNotification
-                object:_menu];
-    }
-
-    [self synchronizeTitleAndSelectedItem];
-}

 /*!
    Returns a count of the number of items in the button's menu.
 */
 - (int)numberOfItems
 {
-    return [_menu numberOfItems];
+    return [[self menu] numberOfItems];
 }

 /*!
@@ -366,7 +338,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPArray)itemArray
 {
-    return [_menu itemArray];
+    return [[self menu] itemArray];
 }

 /*!
@@ -375,7 +347,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)itemAtIndex:(unsigned)anIndex
 {
-    return [_menu itemAtIndex:anIndex];
+    return [[self menu] itemAtIndex:anIndex];
 }

 /*!
@@ -384,7 +356,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPString)itemTitleAtIndex:(unsigned)anIndex
 {
-    return [[_menu itemAtIndex:anIndex] title];
+    return [[[self menu] itemAtIndex:anIndex] title];
 }

 /*!
@@ -409,7 +381,13 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)itemWithTitle:(CPString)aTitle
 {
-    return [_menu itemAtIndex:[_menu indexOfItemWithTitle:aTitle]];
+    var menu = [self menu],
+        itemIndex = [menu indexOfItemWithTitle:aTitle];
+
+    if (itemIndex === CPNotFound)
+        return nil;
+
+    return [menu itemAtIndex:itemIndex];
 }

 /*!
@@ -417,7 +395,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)lastItem
 {
-    return [[_menu itemArray] lastObject];
+    return [[[self menu] itemArray] lastObject];
 }

 // Getting the Indices of Menu Items
@@ -427,7 +405,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItem:(CPMenuItem)aMenuItem
 {
-    return [_menu indexOfItem:aMenuItem];
+    return [[self menu] indexOfItem:aMenuItem];
 }

 /*!
@@ -436,16 +414,16 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithTag:(int)aTag
 {
-    return [_menu indexOfItemWithTag:aTag];
+    return [[self menu] indexOfItemWithTag:aTag];
 }

 /*!
    Returns the index of the item with the specified title or CPNotFound.
-    @param aTitle the item's titel
+    @param aTitle the item's title
 */
 - (int)indexOfItemWithTitle:(CPString)aTitle
 {
-    return [_menu indexOfItemWithTitle:aTitle];
+    return [[self menu] indexOfItemWithTitle:aTitle];
 }

 /*!
@@ -456,7 +434,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithRepresentedObject:(id)anObject
 {
-    return [_menu indexOfItemWithRepresentedObject:anObject];
+    return [[self menu] indexOfItemWithRepresentedObject:anObject];
 }

 /*!
@@ -468,7 +446,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithTarget:(id)aTarget action:(SEL)anAction
 {
-    return [_menu indexOfItemWithTarget:aTarget action:anAction];
+    return [[self menu] indexOfItemWithTarget:aTarget action:anAction];
 }

 // Setting the Cell Edge to Pop out in Restricted Situations
@@ -483,7 +461,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 }

 /*!
-    Sets the preffered edge of the button to display the
+    Sets the preferred edge of the button to display the
    pop-up when there is a limited amount of screen space.
    By default, the pop-up should draw on top of the button.
 */
@@ -504,7 +482,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

    if ([self pullsDown])
    {
-        var items = [_menu itemArray];
+        var items = [[self menu] itemArray];

        if ([items count] <= 0)
            [self addItemWithTitle:aTitle];
@@ -552,7 +530,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

    if ([self pullsDown])
    {
-        var items = [_menu itemArray];
+        var items = [[self menu] itemArray];

        if ([items count] > 0)
            item = items[0];
@@ -564,73 +542,125 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    [super setTitle:[item title]];
 }

-//
-/*!
-    Called when the menu has a new item added to it.
-    @param aNotification information about the event
-*/
- (void)menuDidAddItem:(CPNotification)aNotification
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)aContext
 {
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
+    var pullsDown = [self pullsDown];

-    if (_selectedIndex < 0)
-        [self selectItemAtIndex:0];
-
-    else if (index == _selectedIndex)
+    if (!pullsDown && aKeyPath === @"selectedItem.changeCount" ||
+        pullsDown && (aKeyPath === @"_firstItem" || aKeyPath === @"_firstItem.changeCount"))
        [self synchronizeTitleAndSelectedItem];

-    else if (index < _selectedIndex)
-        ++_selectedIndex;
-
-    if (index == 0 && [self pullsDown])
+    // FIXME: This is due to a bug in KVO, we should never get it for "menu".
+    if (aKeyPath === @"menu")
    {
-        var items = [_menu itemArray];
+        aKeyPath = @"menu.items";

-        [items[0] setHidden:YES];
-
-        if (items.length > 0)
-            [items[1] setHidden:NO];
+        [changes setObject:CPKeyValueChangeSetting forKey:CPKeyValueChangeKindKey];
+        [changes setObject:[[self menu] itemArray] forKey:CPKeyValueChangeNewKey];
    }

-    var item = [_menu itemArray][index],
-        action = [item action];
-
-    if (!action || (action === @selector(_popUpItemAction:)))
+    if (aKeyPath === @"menu.items")
    {
-        [item setTarget:self];
-        [item setAction:@selector(_popUpItemAction:)];
+        var changeKind = [changes objectForKey:CPKeyValueChangeKindKey],
+            indexOfSelectedItem = [self indexOfSelectedItem];
+
+        if (changeKind === CPKeyValueChangeRemoval)
+        {
+            var index = CPNotFound,
+                indexes = [changes objectForKey:CPKeyValueChangeIndexesKey];
+
+            if ([indexes containsIndex:0] && [self pullsDown])
+                [self _firstItemDidChange];
+
+            if (![self pullsDown] && [indexes containsIndex:indexOfSelectedItem])
+            {
+                // If the selected item is removed the first item becomes selected.
+                indexOfSelectedItem = 0;
+            }
+            else
+            {
+                // See whether the index has changed, despite the actual item not changing.
+                while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
+                        index <= indexOfSelectedItem)
+                    --indexOfSelectedItem;
+            }
+
+            [self selectItemAtIndex:indexOfSelectedItem];
+        }
+
+        else if (changeKind === CPKeyValueChangeReplacement)
+        {
+            var indexes = [changes objectForKey:CPKeyValueChangeIndexesKey];
+
+            if (pullsDown && [indexes containsIndex:0] ||
+                !pullsDown && [indexes containsIndex:indexOfSelectedItem])
+                [self synchronizeTitleAndSelectedItem];
+        }
+
+        else
+        {
+            // No matter what, we want to prepare the new items.
+            var newItems = [changes objectForKey:CPKeyValueChangeNewKey];
+
+            [newItems enumerateObjectsUsingBlock:function(aMenuItem)
+            {
+                var action = [aMenuItem action];
+
+                if (!action)
+                    [aMenuItem setAction:action = @selector(_popUpItemAction:)];
+
+                if (action === @selector(_popUpItemAction:))
+                    [aMenuItem setTarget:self];
+            }];
+
+            if (changeKind === CPKeyValueChangeSetting)
+            {
+                [self _firstItemDidChange];
+
+                [self selectItemAtIndex:CPNotFound];
+                [self selectItemAtIndex:MIN([newItems count] - 1, indexOfSelectedItem)];
+            }
+
+            else //if (changeKind === CPKeyValueChangeInsertion)
+            {
+                var indexes = [changes objectForKey:CPKeyValueChangeIndexesKey];
+
+                if ([self pullsDown] && [indexes containsIndex:0])
+                {
+                    [self _firstItemDidChange];
+
+                    if ([self numberOfItems] > 1)
+                    {
+                        var index = CPNotFound,
+                            originalIndex = 0;
+
+                        while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
+                                index <= originalIndex)
+                            ++originalIndex;
+
+                        [[self itemAtIndex:originalIndex] setHidden:NO];
+                    }
+                }
+
+                if (indexOfSelectedItem < 0)
+                    [self selectItemAtIndex:0];
+
+                else
+                {
+                    var index = CPNotFound;
+
+                    // See whether the index has changed, despite the actual item not changing.
+                    while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
+                            index <= indexOfSelectedItem)
+                        ++indexOfSelectedItem;
+
+                    [self selectItemAtIndex:indexOfSelectedItem];
+                }
+            }
+        }
    }
-}

-/*!
-    Called when a menu item has changed.
-    @param aNotification information about the event
-*/
- (void)menuDidChangeItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
-
-    if ([self pullsDown] && index != 0)
-        return;
-
-    if (![self pullsDown] && index != _selectedIndex)
-        return;
-
-    [self synchronizeTitleAndSelectedItem];
-}
-
-/*!
-    Called when an item was removed from the menu.
-    @param aNotification information about the event
-*/
- (void)menuDidRemoveItem:(CPNotification)aNotification
-{
-    var numberOfItems = [self numberOfItems];
-
-    if (numberOfItems <= _selectedIndex && numberOfItems > 0)
-        [self selectItemAtIndex:numberOfItems - 1];
-    else
-        [self synchronizeTitleAndSelectedItem];
+//    [super observeValueForKeyPath:aKeyPath ofObject:anObject change:changes context:aContext];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -702,7 +732,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

 - (void)rightMouseDown:(CPEvent)anEvent
 {
-    // Disable standard CPView behaviour which incorrectly displays the menu as a 'context menu'.
+    // Disable standard CPView behavior which incorrectly displays the menu as a 'context menu'.
 }

 - (void)_popUpItemAction:(id)aSender
@@ -710,6 +740,22 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    [self sendAction:[self action] to:[self target]];
 }

+- (void)_firstItemDidChange
+{
+    [self willChangeValueForKey:@"_firstItem"];
+    [self didChangeValueForKey:@"_firstItem"];
+
+    [[self _firstItem] setHidden:YES];
+}
+
+- (CPMenuItem)_firstItem
+{
+    if ([self numberOfItems] <= 0)
+        return nil;
+
+    return [[self menu] itemAtIndex:0];
+}
+
 - (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
 {
    var count = objects.length,
@@ -719,19 +765,294 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    [self setEnabled:YES];

    while (count-- > 1)
-    {
        if (value !== [objects[count] valueForKeyPath:aKeyPath])
-        {
            [[self selectedItem] setState:CPOffState];
-        }
-    }
+}
+
+- (void)_reverseSetBinding
+{
+    [_CPPopUpButtonSelectionBinder reverseSetValueForObject:self];
+
+    [super _reverseSetBinding];
 }

@end

-var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",
-    CPPopUpButtonSelectedIndexKey   = @"CPPopUpButtonSelectedIndexKey",
-    CPPopUpButtonPullsDownKey       = @"CPPopUpButtonPullsDownKey";
+@implementation CPPopUpButton (BindingSupport)
+
+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPSelectedIndexBinding ||
+        aBinding == CPSelectedObjectBinding ||
+        aBinding == CPSelectedTagBinding ||
+        aBinding == CPSelectedValueBinding ||
+        aBinding == CPContentBinding ||
+        aBinding == CPContentObjectsBinding ||
+        aBinding == CPContentValuesBinding)
+    {
+        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
+
+        return [CPClassFromString(@"_CPPopUpButton" + capitalizedBinding + "Binder") class];
+    }
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+@end
+
+@implementation _CPPopUpButtonContentBinder : CPBinder
+{
+}
+
+- (CPInteger)_getInsertNullOffset
+{
+    var options = [_info objectForKey:CPOptionsKey];
+
+    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
+}
+
+- (CPString)_getNullPlaceholder
+{
+    var options = [_info objectForKey:CPOptionsKey],
+        placeholder = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
+
+    if (placeholder === [CPNull null])
+        placeholder = @"";
+
+    return placeholder;
+}
+
+- (id)transformValue:(CPArray)contentArray withOptions:(CPDictionary)options
+{
+    // Desactivate the full array transformation forced by super because we don't want this. We want individual transformations (see below).
+    return contentArray;
+}
+
+- (void)setValue:(CPArray)contentArray forBinding:(CPString)aBinding
+{
+    [self _setContent:contentArray];
+    [self _setContentValuesIfNeeded:contentArray];
+}
+
+- (void)valueForBinding:(CPString)aBinding
+{
+    return [self _content];
+}
+
+- (void)_setContent:(CPArray)aValue
+{
+    var count = [aValue count],
+        options = [_info objectForKey:CPOptionsKey],
+        offset = [self _getInsertNullOffset];
+
+    if (count + offset != [_source numberOfItems])
+    {
+        [_source removeAllItems];
+
+        if (offset)
+            [_source addItemWithTitle:[self _getNullPlaceholder]];
+
+        for (var i = 0; i < count; i++)
+        {
+            var item = [[CPMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:nil];
+            [self _setValue:[aValue objectAtIndex:i] forItem:item withOptions:options];
+            [_source addItem:item];
+        }
+    }
+    else
+    {
+        for (var i = 0; i < count; i++)
+        {
+            [self _setValue:[aValue objectAtIndex:i] forItem:[_source itemAtIndex:i + offset] withOptions:options];
+        }
+    }
+}
+
+- (void)_setContentValuesIfNeeded:(CPArray)values
+{
+    var offset = [self _getInsertNullOffset];
+
+    if (![_source infoForBinding:CPContentValuesBinding])
+    {
+        if (offset)
+            [[_source itemAtIndex:0] setTitle:[self _getNullPlaceholder]];
+
+        var count = [values count];
+
+        for (var i = 0; i < count; i++)
+            [[_source itemAtIndex:i + offset] setTitle:[[values objectAtIndex:i] description]];
+    }
+}
+
+- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
+{
+    var value = [self _transformValue:aValue withOptions:options];
+    [aMenuItem setRepresentedObject:value];
+}
+
+- (id)_transformValue:(id)aValue withOptions:(CPDictionary)options
+{
+    return [super transformValue:aValue withOptions:options];
+}
+
+- (CPArray)_content
+{
+    return [_source valueForKeyPath:@"itemArray.representedObject"];
+}
+
+@end
+
+@implementation _CPPopUpButtonContentValuesBinder : _CPPopUpButtonContentBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [super _setContent:aValue];
+}
+
+- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
+{
+    if (aValue === [CPNull null])
+        aValue = nil;
+
+    var value = [self _transformValue:aValue withOptions:options];
+    [aMenuItem setTitle:value];
+}
+
+- (CPArray)_content
+{
+    return [_source valueForKeyPath:@"itemArray.title"];
+}
+
+@end
+
+var binderForObject = {};
+
+@implementation _CPPopUpButtonSelectionBinder : CPBinder
+{
+    CPString _selectionBinding @accessors;
+}
+
+- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
+{
+    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
+
+    if (self)
+    {
+        binderForObject[[aSource UID]] = self;
+        _selectionBinding = aName;
+    }
+
+    return self;
+}
+
+ (void)reverseSetValueForObject:(id)aSource
+{
+    var binder = binderForObject[[aSource UID]];
+    [binder reverseSetValueFor:[binder _selectionBinding]];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [self setValue:aValue forBinding:aBinding];
+}
+
+- (CPInteger)_getInsertNullOffset
+{
+    var options = [[CPBinder infoForBinding:CPContentBinding forObject:_source] objectForKey:CPOptionsKey];
+
+    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedIndexBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectItemAtIndex:aValue + [self _getInsertNullOffset]];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source indexOfSelectedItem] - [self _getInsertNullOffset];
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedObjectBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    var index = [_source indexOfItemWithRepresentedObject:aValue],
+        offset = [self _getInsertNullOffset];
+
+    // If the content binding has the option CPNullPlaceholderBindingOption and the object to select is nil, select the first item (i.e., the placeholder).
+    // Other cases to consider:
+    // 1. no binding:
+    // 1.1 there's no item with a represented object matching the object to select.
+    // 1.2 the object to select is nil/CPNull
+    // 2. there's a binding:
+    // 2.1 there's a CPNullPlaceholderBindingOption:
+    // 2.1.1 there's no item with a represented object matching the object to select?
+    // 2.1.2 the object to select is nil/CPNull
+    // 2.2 there's no CPNullPlaceholderBindingOption:
+    // 2.2.1 there's no item with a represented object matching the object to select?
+    // 2.2.2 the object to select is nil/CPNull
+    // More cases? Behaviour that depends on array controller settings?
+
+    if (offset === 1 && index === CPNotFound)
+        index = 0;
+
+    [_source selectItemAtIndex:index];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedItem] representedObject];
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedTagBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectItemWithTag:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedItem] tag];
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedValueBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectItemWithTitle:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source titleOfSelectedItem];
+}
+
+@end
+
+var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",
+    DEPRECATED_CPPopUpButtonSelectedIndexKey    = @"CPPopUpButtonSelectedIndexKey";

@implementation CPPopUpButton (CPCoding)
 /*!
@@ -747,27 +1068,27 @@ var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",

    if (self)
    {
-        // Nothing is currently selected
-        _selectedIndex = -1;
+        // FIXME: (or not?) _title is nulled in - [CPButton initWithCoder:],
+        // so we need to do this again.
+        [self synchronizeTitleAndSelectedItem];

-        [self setMenu:[aCoder decodeObjectForKey:CPPopUpButtonMenuKey]];
-        [self selectItemAtIndex:[aCoder decodeObjectForKey:CPPopUpButtonSelectedIndexKey]];
+        // FIXME: Remove deprecation leniency for 1.0
+        if ([aCoder containsValueForKey:DEPRECATED_CPPopUpButtonMenuKey])
+        {
+            CPLog.warn(self + " was encoded with an older version of Cappuccino. Please nib2cib the original nib again or open and re-save in Atlas.");
+
+            [self setMenu:[aCoder decodeObjectForKey:DEPRECATED_CPPopUpButtonMenuKey]];
+            [self setObjectValue:[aCoder decodeObjectForKey:DEPRECATED_CPPopUpButtonSelectedIndexKey]];
+        }
+
+        var options = CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld;/* | CPKeyValueObservingOptionInitial */
+
+        [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
+        [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
+        [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
    }

    return self;
 }

-/*!
-    Encodes the data of the pop-up button into a coder
-    @param aCoder the coder to which the data
-    will be written
-*/
- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_menu forKey:CPPopUpButtonMenuKey];
-    [aCoder encodeInt:_selectedIndex forKey:CPPopUpButtonSelectedIndexKey];
-}
-
@end
@@ -0,0 +1,378 @@
+/*
+ * CPPopover.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal.
+ * Copyright 2011 Antoine Mercadal.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import "CPButton.j"
+@import "CPColor.j"
+@import "CPImage.j"
+@import "CPImageView.j"
+@import "CPResponder.j"
+@import "CPView.j"
+@import "_CPAttachedWindow.j"
+
+
+CPPopoverBehaviorApplicationDefined = 0;
+CPPopoverBehaviorTransient          = 1;
+CPPopoverBehaviorSemitransient      = 2;
+
+var CPPopoverDelegate_popover_willShow_     = 1 << 0,
+    CPPopoverDelegate_popover_didShow_      = 1 << 1,
+    CPPopoverDelegate_popover_shouldClose_  = 1 << 2,
+    CPPopoverDelegate_popover_willClose_    = 1 << 3,
+    CPPopoverDelegate_popover_didClose_     = 1 << 4;
+
+
+/*! @ingroup appkit
+    @class CPPopover
+
+    This class represent a widget that displays a attached
+    view relative to another one.
+
+    Delegate can implement:
+
+    @code
+    – popoverShouldClose:(CPPopover)aPopOver
+    – popoverWillShow:(CPPopover)aPopOver
+    – popoverDidShow:(CPPopover)aPopOver
+    – popoverWillClose:(CPPopover)aPopOver
+    – popoverDidClose:(CPPopover)aPopOver
+    @endcode
+*/
+@implementation CPPopover : CPResponder
+{
+    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
+    @outlet id                  _delegate               @accessors(getter=delegate);
+
+    BOOL                        _animates               @accessors(property=animates);
+    int                         _appearance             @accessors(property=appearance);
+    int                         _behavior               @accessors(getter=behavior);
+
+    _CPAttachedWindow           _attachedWindow;
+    int                         _implementedDelegateMethods;
+}
+
+
+#pragma mark -
+#pragma mark Initialization
+
+/*!
+    Initialize the CPPopover witn default values
+
+    @returns an initialized CPPopover
+*/
+- (CPPopover)init
+{
+    if (self = [super init])
+    {
+        _animates      = YES;
+        _appearance    = CPPopoverAppearanceMinimal;
+        _behavior      = CPPopoverBehaviorApplicationDefined;
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Getters / Setters
+
+/*!
+    Returns the current rect of the popover
+
+    @return CGRect representing the frame of the popover
+*/
+- (CGRect)positioningRect
+{
+    if (![_attachedWindow isVisible])
+        return CGRectMakeZero();
+    return [_attachedWindow frame];
+}
+
+/*! Sets the frame of the popover
+    @param aRect the desired frame
+*/
+- (void)setPositioningRect:(CGRect)aRect
+{
+    if (![_attachedWindow isVisible])
+        return;
+    [_attachedWindow setFrame:aRect];
+}
+
+/*!
+    Returns the size of the popover's view
+
+    @return CGSize representing the size of the popover's view
+*/
+- (CGSize)contentSize
+{
+    if (![_attachedWindow isVisible])
+        return CGRectMakeZero();
+    return [[_contentViewController view] frameSize];
+}
+
+/*!
+    Sets the size of of the popover's view
+
+    @param aSize the desired size
+*/
+- (void)setContentSize:(CPSize)aSize
+{
+    [[_contentViewController view] setFrameSize:aSize];
+}
+
+/*!
+    Indicates if CPPopover is visible
+
+    @returns \c YES if visible
+*/
+- (BOOL)isShown
+{
+    return [_attachedWindow isVisible];
+}
+
+/*!
+Set the behavior of the CPPopover. It can be:
+
+- \c CPPopoverBehaviorTransient: the popover will close if another control outside the popover becomes the responder
+- \c CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
+
+@param aBehavior the desired behavior
+*/
+- (void)setBehavior:(int)aBehavior
+{
+    if (_behavior == aBehavior)
+        return;
+
+    _behavior = aBehavior;
+    [_attachedWindow setStyleMask:[self styleMaskForBehavior]];
+}
+
+- (void)setDelegate:(id)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _delegate = aDelegate;
+    _implementedDelegateMethods = 0;
+
+    if ([_delegate respondsToSelector:@selector(popoverWillShow:)])
+        _implementedDelegateMethods |= CPPopoverDelegate_popover_willShow_;
+
+    if ([_delegate respondsToSelector:@selector(popoverDidShow:)])
+        _implementedDelegateMethods |= CPPopoverDelegate_popover_didShow_;
+
+    if ([_delegate respondsToSelector:@selector(popoverShouldClose:)])
+        _implementedDelegateMethods |= CPPopoverDelegate_popover_shouldClose_;
+
+    if ([_delegate respondsToSelector:@selector(popoverWillClose:)])
+        _implementedDelegateMethods |= CPPopoverDelegate_popover_willClose_;
+
+    if ([_delegate respondsToSelector:@selector(popoverDidClose:)])
+        _implementedDelegateMethods |= CPPopoverDelegate_popover_didClose_;
+}
+
+#pragma mark -
+#pragma mark Positioning
+
+/*!
+    Show the popover
+
+    @param positioningRect if set, the popover will be positionned to a random rect relative to the window
+    @param positioningView if set, the popover will be positioned relative to this view
+    @param preferredEdge: \c CPRectEdge representing the preferred positioning.
+*/
+- (void)showRelativeToRect:(CGRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
+{
+    if (!positioningView)
+        [CPException raise:CPInvalidArgumentException reason:"positionView must not be nil"];
+
+    if (!_contentViewController)
+        [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
+
+    // If the popover is currently closing, do nothing. That is what Cocoa does.
+    if ([_attachedWindow isClosing])
+        return;
+
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
+        [_delegate popoverWillShow:self];
+
+    if (!_attachedWindow)
+    {
+        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
+
+        var parentWindow = [positioningView window];
+
+        if (![parentWindow isKindOfClass:_CPAttachedWindow])
+            [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(parentWindowWillClose:) name:CPWindowWillCloseNotification object:parentWindow];
+    }
+
+    [_attachedWindow setAppearance:_appearance];
+    [_attachedWindow setAnimates:_animates];
+    [_attachedWindow setDelegate:self];
+    [_attachedWindow setMovableByWindowBackground:NO];
+    [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
+    [_attachedWindow setContentView:[_contentViewController view]];
+    [_attachedWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];
+
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+        [_delegate popoverDidShow:self];
+}
+
+- (unsigned)styleMaskForBehavior
+{
+    return (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : 0;
+}
+
+/*!
+    Closes the popover
+*/
+- (void)close
+{
+    [self _close];
+}
+
+/*!
+    Closes the popover
+*/
+- (void)_close
+{
+    if ([_attachedWindow isClosing] || ![self isShown])
+        return;
+
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
+        [_delegate popoverWillClose:self];
+
+    [_attachedWindow close];
+
+    // popoverDidClose will be sent from attachedWindowDidClose, since
+    // the attached window will close asynchronously when animating.
+}
+
+
+#pragma mark -
+#pragma mark Action
+
+/*!
+    Close the popover
+
+    @param sender the sender of the action
+*/
+- (IBAction)performClose:(id)sender
+{
+    if ([_attachedWindow isClosing])
+        return;
+
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
+        if (![_delegate popoverShouldClose:self])
+            return;
+
+    [self _close];
+}
+
+
+#pragma mark -
+#pragma mark Delegates
+
+/*! @ignore */
+- (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
+{
+    [self performClose:self];
+
+    // We return NO, because we want the CPPopover to determine
+    // if the attached window can be closed and to give us a chance
+    // to send delegate messages.
+    return NO;
+}
+
+/*! @ignore */
+- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
+{
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
+        [_delegate popoverDidClose:self];
+}
+
+
+#pragma mark -
+#pragma mark Notifications
+
+/*!
+    @ignore
+
+    This method is called only when a non-popover parent window
+    is closing. In that case popovers should order out.
+*/
+- (void)parentWindowWillClose:(CPNotification)aNotification
+{
+    [_attachedWindow orderOut:nil];
+    [self performClose:nil];
+}
+
+@end
+
+@implementation CPPopover (Deprecated)
+
+- (void)setBehaviour:(int)aBehavior
+{
+    _CPReportLenientDeprecation(self, _cmd, @selector(setBehavior:));
+
+    [self setBehavior:aBehavior];
+}
+
+@end
+
+var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
+    CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
+    CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
+    CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",
+    CPPopoverDelegateKey = @"CPPopoverDelegateKey",
+    CPPopoverBehaviorKey = @"CPPopoverBehaviorKey";
+
+@implementation CPPopover (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _appearance = [aCoder decodeIntForKey:CPPopoverAppearanceKey];
+        _animates = [aCoder decodeBoolForKey:CPPopoverAnimatesKey];
+        _contentViewController = [aCoder decodeObjectForKey:CPPopoverContentViewControllerKey];
+        [self setDelegate:[aCoder decodeObjectForKey:CPPopoverDelegateKey]];
+        [self setBehavior:[aCoder decodeIntForKey:CPPopoverBehaviorKey]];
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeInt:_appearance forKey:CPPopoverAppearanceKey];
+    [aCoder encodeBool:_animates forKey:CPPopoverAnimatesKey];
+    [aCoder encodeObject:_contentViewController forKey:CPPopoverContentViewControllerKey];
+    [aCoder encodeObject:_delegate forKey:CPPopoverDelegateKey];
+    [aCoder encodeInt:_behavior forKey:CPPopoverBehaviorKey];
+}
+
+@end
@@ -47,7 +47,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    CPProgressIndicatorStyleIdentifiers     = nil,
    CPProgressIndicatorStyleSizes           = nil;

-/*! 
+/*!
    @ingroup appkit
    @class CPProgressIndicator

@@ -59,20 +59,18 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    double                      _minValue;
    double                      _maxValue;
-    
+
    double                      _doubleValue;
-    
+
    CPControlSize               _controlSize;
-    
+
    BOOL                        _isIndeterminate;
    CPProgressIndicatorStyle    _style;
-    
+
    BOOL                        _isAnimating;
-    
+
    BOOL                        _isDisplayedWhenStoppedSet;
    BOOL                        _isDisplayedWhenStopped;
-    
-    CPView                      _barView;
 }

 /*
@@ -80,25 +78,25 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 */
 + (void)initialize
 {
-    if (self != [CPProgressIndicator class])
+    if (self !== [CPProgressIndicator class])
        return;
-    
+
    var bundle = [CPBundle bundleForClass:self];
-    
+
    CPProgressIndicatorSpinningStyleColors = [];
-    
+
    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif"] size:CGSizeMake(16.0, 16.0)]];
    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleSmall.gif"] size:CGSizeMake(32.0, 32.0)]];
    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize]    = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];

    CPProgressIndicatorBezelBorderViewPool = [];
-    
+
    var start = CPProgressIndicatorBarStyle,
        end = CPProgressIndicatorHUDBarStyle;
-    
+
    for (; start <= end; ++start)
    {
        CPProgressIndicatorBezelBorderViewPool[start] = [];
@@ -106,29 +104,29 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        CPProgressIndicatorBezelBorderViewPool[start][CPSmallControlSize]   = [];
        CPProgressIndicatorBezelBorderViewPool[start][CPRegularControlSize]  = [];
    }
-    
+
    CPProgressIndicatorClassName = [self className];
    CPProgressIndicatorStyleIdentifiers = [];

    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
-    
+
    var regularIdentifier = _CPControlIdentifierForControlSize(CPRegularControlSize),
        smallIdentifier = _CPControlIdentifierForControlSize(CPSmallControlSize),
        miniIdentifier = _CPControlIdentifierForControlSize(CPMiniControlSize);

    CPProgressIndicatorStyleSizes = [];

-    // Bar Sttyle
+    // Bar Style
    var prefixes = [
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
-    ];
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
+            CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
+        ];

-    for (var i = 0, count = prefixes.length; i<count; i++)
+    for (var i = 0, count = prefixes.length; i < count; i++)
    {
        var prefix = prefixes[i];
        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
@@ -140,23 +138,23 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
-    
+
    if (self)
    {
        _minValue = 0.0;
        _maxValue = 100.0;
-        
+
        _doubleValue = 0.0;
-        
+
        _style = CPProgressIndicatorBarStyle;
        _isDisplayedWhenStoppedSet = NO;
-        
+
        _controlSize = CPRegularControlSize;
-        
+
        [self updateBackgroundColor];
        [self drawBar];
    }
-    
+
    return self;
 }

@@ -174,7 +172,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)startAnimation:(id)aSender
 {
    _isAnimating = YES;
-    
+
    [self _hideOrDisplay];
 }

@@ -213,7 +211,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)setDoubleValue:(double)aValue
 {
    _doubleValue = MIN(MAX(aValue, _minValue), _maxValue);
-    
+
    [self drawBar];
 }

@@ -268,7 +266,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    if (_controlSize == aControlSize)
        return;
-    
+
    _controlSize = aControlSize;

    [self updateBackgroundColor];
@@ -290,7 +288,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }

 /*
-    Not yet impemented.
+    Not yet implemented.
 */
 - (CPControlTint)controlTint
 {
@@ -320,7 +318,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    if (_isIndeterminate == isIndeterminate)
        return;
-    
+
    _isIndeterminate = isIndeterminate;

    [self updateBackgroundColor];
@@ -342,9 +340,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    if (_style == aStyle)
        return;
-    
+
    _style = aStyle;
-    
+
    [self updateBackgroundColor];
 }

@@ -357,8 +355,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
    else
        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + 
-            _CPControlIdentifierForControlSize(_controlSize)][0].height)];
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + _CPControlIdentifierForControlSize(_controlSize)][0].height)];
 }

 /*!
@@ -370,11 +367,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    if (_isDisplayedWhenStoppedSet && _isDisplayedWhenStopped == isDisplayedWhenStopped)
        return;
-        
+
    _isDisplayedWhenStoppedSet = YES;
-    
+
    _isDisplayedWhenStopped = isDisplayedWhenStopped;
-    
+
    [self _hideOrDisplay];
 }

@@ -385,10 +382,10 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    if (_isDisplayedWhenStoppedSet)
        return _isDisplayedWhenStopped;
-    
+
    if (_style == CPProgressIndicatorBarStyle || _style == CPProgressIndicatorHUDBarStyle)
        return YES;
-    
+
    return NO;
 }

@@ -401,7 +398,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)setFrameSize:(CGSize)aSize
 {
    [super setFrameSize:aSize];
-    
+
    [self drawBar];
 }

@@ -410,28 +407,39 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
    if (_style == CPProgressIndicatorSpinningStyle)
        return;
-    
-    if (!_barView)
-    {
-        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];        
-        [self addSubview:_barView];
-    }
-    
-    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
+
+    var barView = [self layoutEphemeralSubviewNamed:"bar-view"
+                                         positioned:CPWindowBelow
+                    relativeToEphemeralSubviewNamed:nil];
+
+    [barView setBackgroundColor:_CPControlThreePartImagePattern(
        NO,
        CPProgressIndicatorStyleSizes,
        CPProgressIndicatorClassName,
        @"Bar",
        CPProgressIndicatorStyleIdentifiers[_style],
        _CPControlIdentifierForControlSize(_controlSize))];
+}

-    var width = CGRectGetWidth([self bounds]),
-        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+}

-    if (barWidth > 0.0 && barWidth < 4.0)
-        barWidth = 4.0;
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
+{
+    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
+    {
+        var width = CGRectGetWidth([self bounds]),
+            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));

-    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
+        if (barWidth > 0.0 && barWidth < 4.0)
+            barWidth = 4.0;
+
+        return _CGRectMake(0, 0, barWidth, 16.0);
+    }
+
+    return nil;
 }

 /* @ignore */
@@ -441,10 +449,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    {
        if (_style == CPProgressIndicatorSpinningStyle)
        {
-            [_barView removeFromSuperview];
-            
-            _barView = nil;
-            
+            // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
+            [self layoutEphemeralSubviewNamed:"bar-view"
+                                   positioned:CPWindowBelow
+              relativeToEphemeralSubviewNamed:nil];
+
            [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
        }
        else
@@ -456,7 +465,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
                @"BezelBorder",
                CPProgressIndicatorStyleIdentifiers[_style],
                _CPControlIdentifierForControlSize(_controlSize))];
-                
+
            [self drawBar];
        }
    }
@@ -465,3 +474,48 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }

@end
+
+
+@implementation CPProgressIndicator (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _minValue                   = [aCoder decodeObjectForKey:@"_minValue"];
+        _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
+        _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
+        _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
+        _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
+        _style                      = [aCoder decodeIntForKey:@"_style"];
+        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
+        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
+        _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
+
+        [self updateBackgroundColor];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // Don't encode the background colour. It can be recreated based on the flags and if encoded causes hardcoded
+    // image paths in the cib while just wasting space.
+    var backgroundColor = [self backgroundColor];
+    [self setBackgroundColor:nil];
+    [super encodeWithCoder:aCoder];
+    [self setBackgroundColor:backgroundColor];
+
+    [aCoder encodeObject:_minValue forKey:@"_minValue"];
+    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
+    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
+    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
+    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
+    [aCoder encodeInt:_style forKey:@"_style"];
+    [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
+    [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
+    [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
+}
+
+@end
@@ -150,6 +150,14 @@ CPRadioImageOffset = 4.0;
        [_radioGroup _setSelectedRadio:self];
 }

+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [super sendAction:anAction to:anObject];
+
+    if (_radioGroup)
+        [CPApp sendAction:[_radioGroup action] to:[_radioGroup target] from:_radioGroup];
+}
+
@end

 var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
@@ -173,6 +181,23 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
    [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
 }

+- (CPImage)image
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (CPImage)alternateImage
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    var startedTracking = [super startTrackingAt:aPoint];
+    [self highlight:YES];
+    return startedTracking;
+}
+
@end

@implementation CPRadioGroup : CPObject
@@ -220,8 +245,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";

    [_selectedRadio setState:CPOffState];
    _selectedRadio = aRadio;
-
-    [CPApp sendAction:_action to:_target from:self];
 }

 - (CPRadio)selectedRadio
@@ -231,11 +231,18 @@ CPDeleteForwardKeyCode  = 46;
    [_nextResponder performSelector:_cmd withObject:anEvent];
 }

-/*
-    FIXME This description is bad.
-    Based on \c anEvent, the receiver should simulate the event.
-    @param anEvent the event to simulate
-    @return \c YES if the event receiver simulated the  event
+/*!
+    Overridden by subclasses to handle a key equivalent.
+
+    If the character code or codes in \c anEvent match the receiver’s key equivalent,
+    the receiver should respond to the event and return \c YES. The default implementation
+    does nothing and returns \c NO.
+
+    You should extract the characters for a key equivalent using
+    \ref CPEvent::charactersIgnoringModifiers "[anEvent charactersIgnoringModifiers]".
+
+    @param anEvent An event object that represents the key equivalent pressed
+    @return \c YES if theEvent is a key equivalent that the receiver handled, \c NO if it is not a key equivalent that it should handle.
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
@@ -358,8 +365,8 @@ var CPResponderNextResponderKey = @"CPResponderNextResponderKey",

    if (self)
    {
-        _nextResponder = [aCoder decodeObjectForKey:CPResponderNextResponderKey];
-        _menu = [aCoder decodeObjectForKey:CPResponderMenuKey];
+        [self setNextResponder:[aCoder decodeObjectForKey:CPResponderNextResponderKey]];
+        [self setMenu:[aCoder decodeObjectForKey:CPResponderMenuKey]];
    }

    return self;
@@ -0,0 +1,553 @@
+/*
+ * CPPredicateEditor.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2011, cacaodev.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPRuleEditor.j"
+@import "_CPPredicateEditorTree.j"
+@import "_CPPredicateEditorRowNode.j"
+@import "CPPredicateEditorRowTemplate.j"
+
+@implementation CPPredicateEditor : CPRuleEditor
+{
+    CPArray _allTemplates;
+    CPArray _rootTrees;
+    CPArray _rootHeaderTrees;
+    id      _predicateTarget @accessors(property=target);
+    SEL     _predicateAction @accessors(property=action);
+}
+
+#pragma mark public methods
+/*!
+    @ingroup appkit
+    @class CPPredicateEditor
+
+    @brief CPPredicateEditor is a subclass of CPRuleEditor that is specialized for editing CPPredicate objects.
+
+    CPPredicateEditor provides a CPPredicate property—objectValue (inherited from CPControl)—that you can get and set directly, and that you can bind using bindings (you typically configure a predicate editor in Interface Builder). CPPredicateEditor depends on another class, CPPredicateEditorRowTemplate, that describes the available predicates and how to display them.
+
+    Unlike CPRuleEditor, CPPredicateEditor does not depend on its delegate to populate its rows (and does not call the populating delegate methods). Instead, its rows are populated from its objectValue property (an instance of CPPredicate). CPPredicateEditor relies on instances CPPredicateEditorRowTemplate, which are responsible for mapping back and forth between the displayed view values and various predicates.
+
+    CPPredicateEditor exposes one property, rowTemplates, which is an array of CPPredicateEditorRowTemplate objects.
+*/
+
+/*!
+    @brief Returns the row templates for the receiver.
+    @return The row templates for the receiver.
+    @discussion Until otherwise set, this contains a single compound CPPredicateEditorRowTemplate object.
+    @see setRowTemplates:
+*/
+- (CPArray)rowTemplates
+{
+    return _allTemplates;
+}
+
+/*!
+    @brief Sets the row templates for the receiver.
+    @param rowTemplates An array of CPPredicateEditorRowTemplate objects.
+    @see rowTemplates
+*/
+- (void)setRowTemplates:(id)rowTemplates
+{
+    if (_allTemplates == rowTemplates)
+        return;
+
+    _allTemplates = rowTemplates;
+
+    [self _updateItemsByCompoundTemplates];
+    [self _updateItemsBySimpleTemplates];
+
+    if ([self numberOfRows] > 0)
+    {
+        var predicate = [super predicate];
+        [self _reflectPredicate:predicate];
+    }
+}
+
+/*! @cond */
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding == CPValueBinding)
+        return [CPPredicateEditorValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
+- (id)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return @"predicate";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
+- (void)_initRuleEditorShared
+{
+    [super _initRuleEditorShared];
+
+    _rootTrees = [CPArray array];
+    _rootHeaderTrees = [CPArray array];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    if (self != nil)
+    {
+        var initialTemplate = [[CPPredicateEditorRowTemplate alloc] initWithCompoundTypes:[CPAndPredicateType, CPOrPredicateType]];
+        _allTemplates = [CPArray arrayWithObject:initialTemplate];
+    }
+
+    return self;
+}
+
+- (id)objectValue
+{
+    return [super predicate];
+}
+
+- (void)_updateItemsBySimpleTemplates
+{
+    var templates = [CPMutableArray array],
+        count = [_allTemplates count],
+        t;
+
+    while (count--)
+    {
+        var t = _allTemplates[count];
+        if ([t _rowType] == CPRuleEditorRowTypeSimple)
+            [templates insertObject:t atIndex:0];
+    }
+
+    var trees = [self _constructTreesForTemplates:templates];
+    if ([trees count] > 0)
+        _rootTrees = [self _mergeTree:trees];
+}
+
+- (void)_updateItemsByCompoundTemplates
+{
+    var templates = [CPMutableArray array],
+        count = [_allTemplates count],
+        t;
+
+    while (count--)
+    {
+        var t = _allTemplates[count];
+        if ([t _rowType] == CPRuleEditorRowTypeCompound)
+            [templates insertObject:t atIndex:0];
+    }
+
+    var trees = [self _constructTreesForTemplates:templates];
+    if ([trees count] > 0)
+        _rootHeaderTrees = [self _mergeTree:trees];
+}
+
+- (CPArray)_constructTreesForTemplates:(id)templates
+{
+    var trees = [CPMutableArray array],
+        count = [templates count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var tree = [self _constructTreeForTemplate:templates[i]];
+        [trees addObjectsFromArray:tree];
+    }
+
+    return trees;
+}
+
+- (CPMutableArray)_mergeTree:(CPArray)aTree
+{
+    var mergedTree = [CPMutableArray array];
+    if (aTree == nil)
+        return mergedTree;
+
+    var icount = [aTree count];
+    for (var i = 0; i < icount; i++)
+    {
+        var anode = [aTree objectAtIndex:i],
+            jcount = [mergedTree count],
+            merged = NO;
+
+        for (var j = 0; j < jcount; j++)
+        {
+            var mergednode = [mergedTree objectAtIndex:j];
+
+            if ([[mergednode title] isEqualToString:[anode title]])
+            {
+                var children1 = [mergednode children],
+                    children2 = [anode children],
+                    children12 = [children1 arrayByAddingObjectsFromArray:children2],
+                    mergedChildren = [self _mergeTree:children12];
+
+                [mergednode setChildren:mergedChildren];
+                merged = YES;
+            }
+        }
+
+        if (!merged)
+            [mergedTree addObject:anode];
+    }
+
+    return mergedTree;
+}
+
+- (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
+{
+    var tree = [CPArray array],
+        templateViews = [aTemplate templateViews],
+        count = [templateViews count];
+
+    while (count--)
+    {
+        var children = [CPArray array],
+            itemsCount = 0,
+            menuIndex = -1,
+            itemsArray,
+
+            templateView = [templateViews objectAtIndex:count],
+            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
+
+        if (isPopup)
+        {
+            itemArray = [[templateView itemArray] valueForKey:@"title"];
+            itemsCount = [itemArray count];
+            menuIndex = 0;
+        }
+
+        for (; menuIndex < itemsCount; menuIndex++)
+        {
+            var item = [_CPPredicateEditorTree new];
+            [item setIndexIntoTemplate:count];
+            [item setTemplate:aTemplate];
+            [item setMenuItemIndex:menuIndex];
+            if (isPopup)
+                [item setTitle:[itemArray objectAtIndex:menuIndex]];
+
+            [children addObject:item];
+        }
+
+        [children makeObjectsPerformSelector:@selector(setChildren:) withObject:tree];
+        tree = children;
+    }
+
+    return tree;
+}
+
+#pragma mark Set the Predicate
+
+- (void)setObjectValue:(id)objectValue
+{
+    var ov = [self objectValue];
+    if ((ov == nil) != (objectValue == nil) || ![ov isEqual:objectValue])
+    {
+        [self _setPredicate:objectValue];
+        [self _reflectPredicate:objectValue];
+    }
+}
+
+- (void)_reflectPredicate:(id)predicate
+{
+    var animation = _currentAnimation;
+    _currentAnimation = nil;
+    _sendAction = NO;
+
+    if (predicate != nil)
+    {
+        if ((_nestingMode == CPRuleEditorNestingModeSimple || _nestingMode == CPRuleEditorNestingModeCompound)
+            && [predicate isKindOfClass:[CPComparisonPredicate class]])
+            predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:[CPArray arrayWithObject:predicate]];
+
+        var row = [self _rowObjectFromPredicate:predicate];
+        if (row != nil)
+            [_boundArrayOwner setValue:[CPArray arrayWithObject:row] forKey:_boundArrayKeyPath];
+    }
+
+    [self setAnimation:animation];
+}
+
+- (id)_rowObjectFromPredicate:(CPPredicate)predicate
+{
+    var quality, // TODO: We should use this ref somewhere !
+        type,
+        matchedTemplate = [CPPredicateEditorRowTemplate _bestMatchForPredicate:predicate inTemplates:[self rowTemplates] quality:quality];
+
+    if (matchedTemplate == nil)
+        return nil;
+
+    var copyTemplate = [matchedTemplate copy],
+        subpredicates = [matchedTemplate displayableSubpredicatesOfPredicate:predicate];
+
+    if (subpredicates == nil)
+    {
+        [copyTemplate _setComparisonPredicate:predicate];
+        type = CPRuleEditorRowTypeSimple;
+    }
+    else
+    {
+        [copyTemplate _setCompoundPredicate:predicate];
+        type = CPRuleEditorRowTypeCompound;
+    }
+
+    var row = [self _rowFromTemplate:copyTemplate originalTemplate:matchedTemplate withRowType:type];
+
+    if (subpredicates == nil)
+        return row;
+
+    var count = [subpredicates count],
+        subrows = [CPMutableArray array];
+
+    for (var i = 0; i < count; i++)
+    {
+        var subrow = [self _rowObjectFromPredicate:subpredicates[i]];
+        if (subrow != nil)
+            [subrows addObject:subrow];
+    }
+
+    [row setValue:subrows forKey:[super subrowsKeyPath]];
+
+    return row;
+}
+
+- (id)_rowFromTemplate:(CPPredicateEditorRowTemplate)aTemplate originalTemplate:(CPPredicateEditorRowTemplate)originalTemplate withRowType:(CPRuleEditorRowType)rowType
+{
+    var criteria = [CPArray array],
+        values = [CPArray array],
+        templateViews = [aTemplate templateViews],
+        rootItems,
+        count;
+
+    rootItems = (rowType == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
+
+    while ((count = [rootItems count]) > 0)
+    {
+        var treeChild;
+        for (var i = 0; i < count; i++)
+        {
+            treeChild = [rootItems objectAtIndex:i];
+
+            var currentView = [templateViews objectAtIndex:[treeChild indexIntoTemplate]],
+                title = [treeChild title];
+
+            if (title == nil || [title isEqual:[currentView titleOfSelectedItem]])
+            {
+                var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
+                [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
+
+                [criteria addObject:node];
+                [values addObject:[node displayValue]];
+                break;
+            }
+        }
+
+        rootItems = [treeChild children];
+    }
+
+    var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"];
+
+    return row;
+}
+
+#pragma mark Get the predicate
+
+- (void)_updatePredicate
+{
+    [self _updatePredicateFromRows];
+}
+
+- (void)_updatePredicateFromRows
+{
+    var rootRowsArray = [super _rootRowsArray],
+        subpredicates = [CPMutableArray array],
+        count,
+        count2 = count = [rootRowsArray count],
+        predicate;
+
+    while (count--)
+    {
+        var item = [rootRowsArray objectAtIndex:count],
+            subpredicate = [self _predicateFromRowItem:item];
+
+        if (subpredicate != nil)
+            [subpredicates insertObject:subpredicate atIndex:0];
+    }
+
+    if (_nestingMode != CPRuleEditorNestingModeList && count2 == 1)
+        predicate = [subpredicates lastObject];
+    else
+        predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:subpredicates];
+
+    [self _setPredicate:predicate];
+}
+
+- (id)_predicateFromRowItem:(id)rowItem
+{
+    var subpredicates = [CPArray array],
+        rowType = [rowItem valueForKey:_typeKeyPath];
+
+    if (rowType == CPRuleEditorRowTypeCompound)
+    {
+        var subrows = [rowItem valueForKey:_subrowsArrayKeyPath],
+            count = [subrows count];
+
+        for (var i = 0; i < count; i++)
+        {
+            var subrow = [subrows objectAtIndex:i],
+                predicate = [self _predicateFromRowItem:subrow];
+
+            [subpredicates addObject:predicate];
+        }
+    }
+
+    var criteria = [rowItem valueForKey:_itemsKeyPath],
+        displayValues = [rowItem valueForKey:_valuesKeyPath],
+        count = [criteria count],
+        lastItem = [criteria lastObject],
+        template = [lastItem templateForRow],
+        templateViews = [template templateViews];
+
+    for (var j = 0; j < count; j++)
+    {
+        var view = [templateViews objectAtIndex:j],
+            value = [displayValues objectAtIndex:j];
+        [[criteria objectAtIndex:j] setTemplateViews:templateViews];
+
+        if ([view isKindOfClass:[CPPopUpButton class]])
+            [view selectItemWithTitle:value];
+        else if ([view respondsToSelector:@selector(setObjectValue:)])
+            [view setObjectValue:[value objectValue]];
+    }
+
+    return [template predicateWithSubpredicates:subpredicates];
+}
+
+- (CPCompoundPredicateType)_compoundPredicateTypeForRootRows
+{
+    return CPAndPredicateType;
+}
+
+#pragma mark Control delegate
+
+- (void)_sendRuleAction
+{
+    [super _sendRuleAction];
+}
+
+- (BOOL)_sendsActionOnIncompleteTextChange
+{
+    return NO;
+}
+
+/*
+- (void)_setDefaultTargetAndActionOnView:(CPView)view
+{
+    if ([view isKindOfClass:[CPControl class]])
+    {
+        [view setTarget:self];
+        [view setAction:@selector(_templateControlValueDidChange:)];
+    }
+}
+- (void)_templateControlValueDidChange:(id)sender
+{
+}
+- (void)controlTextDidBeginEditing:(CPNotification)notification
+{
+}
+- (void)controlTextDidEndEditing:(CPNotification)notification
+{
+}
+- (void)controlTextDidChange:(CPNotification)notification
+{
+}
+*/
+
+#pragma mark RuleEditor delegate methods
+
+- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(int)type
+{
+    if (rowItem == nil)
+    {
+        var trees = (type == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
+        return [trees count];
+    }
+    return [[rowItem children] count];
+}
+
+- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(int)type
+{
+    if (rowItem == nil)
+    {
+        var trees = (type == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
+        return [_CPPredicateEditorRowNode rowNodeFromTree:trees[childIndex]];
+    }
+
+    return [[rowItem children] objectAtIndex:childIndex];
+}
+
+- (id)_queryValueForItem:(id)rowItem inRow:(int)rowIndex
+{
+    return [rowItem displayValue];
+}
+
+@end
+
+var CPPredicateTemplatesKey = @"CPPredicateTemplates";
+
+@implementation CPPredicateEditor (CPCoding)
+
+- (id)initWithCoder:(id)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self != nil)
+    {
+        var nibTemplates = [aCoder decodeObjectForKey:CPPredicateTemplatesKey];
+
+        if (nibTemplates != nil)
+            [self setRowTemplates:nibTemplates];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(id)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    [aCoder encodeObject:_allTemplates forKey:CPPredicateTemplatesKey];
+}
+
+@end
+
+@implementation CPPredicateEditorValueBinder : CPBinder
+{
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source _reflectPredicate:nil];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source _reflectPredicate:aValue];
+}
+
+@end
+/*! @endcond */
@@ -0,0 +1,790 @@
+/*
+ * CPPredicateEditorRowTemplate.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2011, cacaodev.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPUndefinedAttributeType     = 0;
+CPInteger16AttributeType     = 100;
+CPInteger32AttributeType     = 200;
+CPInteger64AttributeType     = 300;
+CPDecimalAttributeType       = 400;
+CPDoubleAttributeType        = 500;
+CPFloatAttributeType         = 600;
+CPStringAttributeType        = 700;
+CPBooleanAttributeType       = 800;
+CPDateAttributeType          = 900;
+CPBinaryDataAttributeType    = 1000;
+CPTransformableAttributeType = 1800;
+
+@implementation CPPredicateEditorRowTemplate : CPObject
+{
+    int            _templateType @accessors(readwrite, getter=_templateType, setter=_setTemplateType:);
+    unsigned   _predicateOptions @accessors(readwrite, setter=_setOptions:);
+    unsigned  _predicateModifier @accessors(readwrite, setter=_setModifier:);
+    unsigned  _leftAttributeType @accessors(readwrite, getter=leftAttributeType, setter=_setLeftAttributeType:);
+    unsigned _rightAttributeType @accessors(readwrite, getter=rightAttributeType, setter=_setRightAttributeType:);
+    BOOL         _leftIsWildcard @accessors(property=leftIsWildcard);
+    BOOL        _rightIsWildcard @accessors(property=rightIsWildcard);
+    CPArray               _views @accessors(setter=setTemplateViews:);
+
+}
+
+/*!
+    @ingroup appkit
+    @class CPPredicateEditorRowTemplate
+
+    @brief CPPredicateEditorRowTemplate describes available predicates and how to display them.
+
+    You can create instances of CPPredicateEditorRowTemplate programmatically or in Interface Builder. By default, a non-compound row template has three views: a popup (or static text field) on the left, a popup or static text field for operators, and either a popup or other view on the right.  You can subclass CPPredicateEditorRowTemplate to create a row template with different numbers or types of views.
+
+    CPPredicateEditorRowTemplate is a concrete class, but it has five primitive methods which are called by CPPredicateEditor: -#templateViews, -#matchForPredicate:, -#setPredicate:, -#displayableSubpredicatesOfPredicate:, and -#predicateWithSubpredicates:. CPPredicateEditorRowTemplate implements all of them, but you can override them for custom templates. The primitive methods are used by an instance of CPPredicateEditor as follows.
+
+    First, an instance of CPPredicateEditor is created, and some row templates are set on it—either through a nib file or programmatically. The first thing predicate editor does is ask each of the templates for their views, using templateViews.
+
+    After setting up the predicate editor, you typically send it a  CPPredicateEditor#setObjectValue: message to restore a saved predicate. CPPredicateEditor needs to determine which of its templates should display each predicate in the predicate tree. It does this by sending each of its row templates a matchForPredicate: message and choosing the one that returns the highest value.
+
+    After finding the best match for a predicate, CPPredicateEditor copies that template to get fresh views, inserts them into the proper row, and then sets the predicate on the template using setPredicate:. Within that method, the CPPredicateEditorRowTemplate object must set its views' values to represent that predicate.
+
+    CPPredicateEditorRowTemplate next asks the template for the “displayable sub-predicates” of the predicate by sending a -#displayableSubpredicatesOfPredicate: message. If a template represents a predicate in its entirety, or if the predicate has no subpredicates, it can return nil for this.  Otherwise, it should return a list of predicates to be made into sub-rows of that template's row. The whole process repeats for each sub-predicate.
+
+    At this point, the user sees the predicate that was saved.  If the user then makes some changes to the views of the templates, this causes CPPredicateEditor to recompute its predicate by asking each of the templates to return the predicate represented by the new view values, passing in the subpredicates represented by the sub-rows (an empty array if there are none, or nil if they aren't supported by that predicate type).
+*/
+
+/*!
+    @name Initializing a Template
+*/
+
+/*!
+    @brief Initializes and returns a “pop-up-pop-up-pop-up”-style row template.
+    @param leftExpressions An array of CPExpression objects that represent the left hand side of a predicate.
+    @param rightExpressions An array of CPExpression objects that represent the right hand side of a predicate.
+    @param modifier A modifier for the predicate (see @c CPComparisonPredicateModifier for possible values).
+    @param operators An array of CPNumber objects specifying the operator type (see @c CPPredicateOperatorType for possible values).
+    @param options Options for the predicate (see @c CPComparisonPredicateOptions for possible values).
+    @return A row template of the “pop-up-pop-up-pop-up”-form, with the left and right popups representing the left and right expression arrays -#leftExpressions and -#rightExpressions, and the center popup representing the operators.
+*/
+- (id)initWithLeftExpressions:(CPArray)leftExpressions rightExpressions:(CPArray)rightExpressions modifier:(int)modifier operators:(CPArray)operators options:(int)options
+{
+    self = [super init];
+    if (self != nil)
+    {
+        _templateType = 1;
+        _leftIsWildcard = NO;
+        _rightIsWildcard = NO;
+        _leftAttributeType = 0;
+        _rightAttributeType = 0;
+        _predicateModifier = modifier;
+        _predicateOptions = options;
+
+        var leftView = [self _viewFromExpressions:leftExpressions],
+            rightView = [self _viewFromExpressions:rightExpressions],
+            middleView = [self _viewFromOperatorTypes:operators];
+
+        _views = [[CPArray alloc] initWithObjects:leftView, middleView, rightView];
+    }
+
+    return self;
+}
+
+/*!
+    @brief Initializes and returns a “pop-up-pop-up-view”-style row template.
+    @param leftExpressions An array of CPExpression objects that represent the left hand side of a predicate.
+    @param attributeType An attribute type for the right hand side of a predicate. This value dictates the type of view created, and how the control’s object value is coerced before putting it into a predicate.
+    @param modifier A modifier for the predicate (see @c CPComparisonPredicateModifier for possible values).
+    @param operators An array of CPNumber objects specifying the operator type (see @c CPPredicateOperatorType for possible values).
+    @param options Options for the predicate (see CPComparisonPredicateOptions for possible values).
+    @return A row template initialized using the given arguments.
+*/
+- (id)initWithLeftExpressions:(CPArray )leftExpressions rightExpressionAttributeType:(CPAttributeType)attributeType modifier:(CPComparisonPredicateModifier)modifier operators:(CPArray )operators options:(int)options
+{
+    self = [super init];
+    if (self != nil)
+    {
+        var leftView = [self _viewFromExpressions:leftExpressions],
+            middleView = [self _viewFromOperatorTypes:operators],
+            rightView = [self _viewFromAttributeType:attributeType];
+
+        _templateType = 1;
+        _leftIsWildcard = NO;
+        _rightIsWildcard = YES;
+        _leftAttributeType = 0;
+        _rightAttributeType = attributeType;
+        _predicateModifier = modifier;
+        _predicateOptions = options;
+        _views = [[CPArray alloc] initWithObjects:leftView, middleView, rightView];
+    }
+
+    return self;
+}
+
+/*!
+    @brief Initializes and returns a row template suitable for displaying compound predicates.
+    @param compoundTypes An array of CPNumber objects specifying compound predicate types. See @c CPCompoundPredicateTypes for possible values.
+    @return A row template initialized for displaying compound predicates of the types specified by @a compoundTypes.
+    @discussion CPPredicateEditor contains such a template by default.
+*/
+- (id)initWithCompoundTypes:(CPArray )compoundTypes
+{
+    self = [super init];
+    if (self != nil)
+    {
+        var leftView = [self _viewFromCompoundTypes:compoundTypes],
+            rightView = [[CPPopUpButton alloc] init];
+
+        [rightView addItemWithTitle:@"of the following are true"];
+
+        _templateType = 2;
+        _leftIsWildcard = NO;
+        _rightIsWildcard = NO;
+        _rightAttributeType = 0;
+        _views = [[CPArray alloc] initWithObjects:leftView, rightView];
+    }
+    return self;
+}
+
+/*!
+    @name Primitive Methods
+*/
+
+/*!
+    @brief Returns a positive number if the receiver can represent a given predicate, and 0 if it cannot.
+    @return A positive number if the template can represent predicate, and @c 0 if it cannot.
+    @discussion By default, returns values in the range @c 0 to @c 1.
+    The highest match among all the templates determines which template is responsible for displaying the predicate. You can override this to determine which predicates your custom template handles.
+*/
+- (double)matchForPredicate:(CPPredicate)predicate
+{
+    // How exactly this value (float 0-1) is computed ?
+    if ([self _templateType] == 2 && [predicate isKindOfClass:[CPCompoundPredicate class]])
+    {
+        if ([[self compoundTypes] containsObject:[predicate compoundPredicateType]])
+                return 1;
+    }
+    else if ([self _templateType] == 1 && [predicate isKindOfClass:[CPComparisonPredicate class]])
+    {
+        if (!_leftIsWildcard && ![[self leftExpressions] containsObject:[predicate leftExpression]])
+            return 0;
+
+        if (![[self operators] containsObject:[predicate predicateOperatorType]])
+            return 0;
+
+        if (!_rightIsWildcard && ![[self rightExpressions] containsObject:[predicate rightExpression]])
+            return 0;
+
+        return 1;
+    }
+
+    return 0;
+}
+
+/*!
+    @brief Returns the views for the receiver.
+    @return The views for the receiver.
+    @discussion Instances of CPPopUpButton are treated specially by CPPredicateEditor; their menu items are merged into a single popup button, and matching menu item titles are combined. In this way, a single tree is built from the separate templates.
+*/
+- (CPArray)templateViews
+{
+    return _views;
+}
+
+/*!
+    @brief Sets the value of the views according to the given predicate.
+    @param predicate The predicate value for the receiver.
+    @discussion This method is only called if -#matchForPredicate: returned a positive value for the receiver.
+
+    You can override this to set the values of custom views.
+*/
+- (void)setPredicate:(CPPredicate)predicate
+{
+    if (_templateType == 2)
+        [self _setCompoundPredicate:predicate];
+    else
+        [self _setComparisonPredicate:predicate];
+}
+
+/*!
+    @brief Returns the subpredicates that should be made sub-rows of a given predicate.
+    @param predicate A predicate object.
+    @return The subpredicates that should be made sub-rows of @a predicate. For compound predicates (instances of CPCompoundPredicate), the array of subpredicates; for other types of predicate, returns @c nil. If a template represents a predicate in its entirety, or if the predicate has no subpredicates, returns @c nil.
+    @discussion You can override this method to create custom templates that handle complicated compound predicates.
+*/
+- (CPArray)displayableSubpredicatesOfPredicate:(CPPredicate)predicate
+{
+    if ([predicate isKindOfClass:[CPCompoundPredicate class]])
+    {
+        var subpredicates = [predicate subpredicates];
+        if ([subpredicates count] == 0)
+            return nil;
+
+        return subpredicates;
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the predicate represented by the receiver’s views' values and the given sub-predicates.
+    @param subpredicates An array of predicates.
+    @return The predicate represented by the values of the template's views and the given @a subpredicates. You can override this method to return the predicate represented by your custom views.
+    @discussion This method is only called if -#matchForPredicate: returned a positive value for the receiver.
+
+    You can override this method to return the predicate represented by a custom view.
+*/
+- (CPPredicate)predicateWithSubpredicates:(CPArray)subpredicates
+{
+    if (_templateType == 2)
+    {
+        var type = [[_views[0] selectedItem] representedObject];
+        return [[CPCompoundPredicate alloc] initWithType:type subpredicates:subpredicates];
+    }
+
+    if (_templateType == 1)
+    {
+        var lhs = [self _leftExpression],
+            rhs = [self _rightExpression],
+            operator = [[_views[1] selectedItem] representedObject];
+
+        return [CPComparisonPredicate predicateWithLeftExpression:lhs
+                                                  rightExpression:rhs
+                                                         modifier:[self modifier]
+                                                             type:operator
+                                                          options:[self options]];
+    }
+
+    return nil;
+}
+
+/*!
+    @name Information About a Row Template
+*/
+
+/*!
+    @brief Returns the left hand expressions for the receiver.
+    @return The left hand expressions for the receiver.
+*/
+- (CPArray)leftExpressions
+{
+    if (_templateType == 1 && !_leftIsWildcard)
+    {
+        var view = [_views objectAtIndex:0];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the right hand expressions for the receiver.
+    @return The right hand expressions for the receiver.
+*/
+- (CPArray)rightExpressions
+{
+    if (_templateType == 1 && !_rightIsWildcard)
+    {
+        var view = [_views objectAtIndex:2];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the compound predicate types for the receiver.
+    @return An array of CPNumber objects specifying compound predicate types. See @c CompoundPredicateTypes for possible values.
+*/
+- (CPArray)compoundTypes
+{
+    if (_templateType == 2)
+    {
+        var view = [_views objectAtIndex:0];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the comparison predicate modifier for the receiver.
+    @return The comparison predicate modifier for the receiver.
+*/
+- (CPComparisonPredicateModifier)modifier
+{
+    if (_templateType == 1)
+        return _predicateModifier;
+
+    return nil;
+}
+
+/*!
+    @brief Returns Returns the array of operators for the receiver.
+    @return The array of operators for the receiver.
+*/
+- (CPArray)operators
+{
+    if (_templateType == 1)
+    {
+        var view = [_views objectAtIndex:1];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the comparison predicate options for the receiver.
+    @return The comparison predicate options for the receiver. See @c CPComparisonPredicateOptions for possible values. Returns @c 0 if this does not apply (for example, for a compound template initialized with -#initWithCompoundTypes:).
+*/
+- (int)options
+{
+    if (_templateType == 1)
+        return _predicateOptions;
+
+    return nil;
+}
+
+/*!
+    @brief Returns the attribute type of the receiver’s right expression.
+    @return The attribute type of the receiver’s right expression.
+*/
+- (CPAttributeType)rightExpressionAttributeType
+{
+    return _rightAttributeType;
+}
+
+/*!
+    @brief Returns the attribute type of the receiver’s left expression.
+    @return The attribute type of the receiver’s left expression.
+*/
+- (CPAttributeType)leftExpressionAttributeType
+{
+    return _leftAttributeType;
+}
+
+/*! @cond */
+ (id)_bestMatchForPredicate:(CPPredicate)predicate inTemplates:(CPArray)templates quality:(double)quality
+{
+    var count = [templates count],
+        match_value = 0,
+        templateIndex = CPNotFound,
+        i;
+
+    for (i = 0; i < count; i++)
+    {
+        var template = [templates objectAtIndex:i],
+            amatch = [template matchForPredicate:predicate];
+
+        if (amatch > match_value)
+        {
+            templateIndex = i;
+            match_value = amatch;
+        }
+    }
+
+    if (templateIndex == CPNotFound)
+    {
+        [CPException raise:CPRangeException reason:@"Unable to find template matching predicate: " +  [predicate predicateFormat]];
+        return nil;
+    }
+
+    return [templates objectAtIndex:templateIndex];
+}
+
+- (void)_setCompoundPredicate:(CPCompoundPredicate)predicate
+{
+    var left = [_views objectAtIndex:0],
+        type = [predicate compoundPredicateType],
+        index = [left indexOfItemWithRepresentedObject:type];
+
+    [left selectItemAtIndex:index];
+}
+
+- (void)_setComparisonPredicate:(CPComparisonPredicate)predicate
+{
+    var left = [_views objectAtIndex:0],
+        middle = [_views objectAtIndex:1],
+        right = [_views objectAtIndex:2],
+        leftExpression = [predicate leftExpression],
+        rightExpression = [predicate rightExpression],
+        operator = [predicate predicateOperatorType];
+
+    if (_leftIsWildcard)
+        [left setObjectValue:[leftExpression constantValue]];
+    else
+    {
+        var index = [left indexOfItemWithRepresentedObject:leftExpression];
+        [left selectItemAtIndex:index];
+    }
+
+    var op_index = [middle indexOfItemWithRepresentedObject:operator];
+    [middle selectItemAtIndex:op_index];
+
+    if (_rightIsWildcard)
+        [right setObjectValue:[rightExpression constantValue]];
+    else
+    {
+        var index = [right indexOfItemWithRepresentedObject:rightExpression];
+        [right selectItemAtIndex:index];
+    }
+}
+
+- (CPExpression)_leftExpression
+{
+    return [self _expressionFromView:_views[0] forAttributeType:_leftAttributeType];
+}
+
+- (CPExpression)_rightExpression
+{
+    return [self _expressionFromView:_views[2] forAttributeType:_rightAttributeType];
+}
+
+- (CPExpression)_expressionFromView:(CPView)aView forAttributeType:(CPAttributeType)attributeType
+{
+    if (attributeType == 0)
+        return [[aView selectedItem] representedObject];
+
+    var value;
+    if (attributeType >= CPInteger16AttributeType && attributeType <= CPFloatAttributeType)
+        value = [aView intValue];
+    else if (attributeType == CPBooleanAttributeType)
+        value = [aView state];
+    else
+        value = [aView stringValue];
+
+    return [CPExpression expressionForConstantValue:value];
+}
+
+- (int)_rowType
+{
+    return (_templateType - 1);
+}
+
+- (id)copy
+{
+    return [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:self]];
+}
+
+ (id)_operatorsForAttributeType:(CPAttributeType)attributeType
+{
+    var operators_array = [CPMutableArray array];
+
+    switch (attributeType)
+    {
+        case CPInteger16AttributeType   : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPInteger32AttributeType   : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPInteger64AttributeType   : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPDecimalAttributeType     : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPDoubleAttributeType      : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPFloatAttributeType       : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPStringAttributeType      : [operators_array addObjects:99,4,5,8,9];
+            break;
+        case CPBooleanAttributeType     : [operators_array addObjects:4,5];
+            break;
+        case CPDateAttributeType        : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        default : CPLogConsole("Cannot create operators for an CPAttributeType " + attributeType);
+            break;
+    }
+
+    return operators_array;
+}
+
+- (int)_templateType
+{
+    return _templateType;
+}
+
+- (id)_displayValueForPredicateOperator:(int)operator
+{
+    var value;
+
+    switch (operator)
+    {
+        case CPLessThanPredicateOperatorType            : value = @"is less than";
+            break;
+        case CPLessThanOrEqualToPredicateOperatorType   : value = @"is less than or equal to";
+            break;
+        case CPGreaterThanPredicateOperatorType         : value = @"is greater than";
+            break;
+        case CPGreaterThanOrEqualToPredicateOperatorType : value = @"is greater than or equal to";
+            break;
+        case CPEqualToPredicateOperatorType             : value = @"is";
+            break;
+        case CPNotEqualToPredicateOperatorType          : value = @"is not";
+            break;
+        case CPMatchesPredicateOperatorType             : value = @"matches";
+            break;
+        case CPLikePredicateOperatorType                : value = @"is like";
+            break;
+        case CPBeginsWithPredicateOperatorType          : value = @"begins with";
+            break;
+        case CPEndsWithPredicateOperatorType            : value = @"ends with";
+            break;
+        case CPInPredicateOperatorType                  : value = @"in";
+            break;
+        case CPContainsPredicateOperatorType            : value = @"contains";
+            break;
+        case CPBetweenPredicateOperatorType             : value = @"between";
+            break;
+        default : CPLogConsole(@"unknown predicate operator %d" + operator);
+    }
+
+    return value;
+}
+
+- (id)_displayValueForCompoundPredicateType:(unsigned int)predicateType
+{
+    var value;
+    switch (predicateType)
+    {
+        case CPNotPredicateType: value = @"None";
+            break;
+        case CPAndPredicateType: value = @"All";
+            break;
+        case CPOrPredicateType: value = @"Any";
+            break;
+        default : value = [CPString stringWithFormat:@"unknown compound predicate type %d",predicateType];
+    }
+
+    return value;
+}
+
+- (id)_displayValueForConstantValue:(id)value
+{
+    return [value description]; // number, date, string, ... localize
+}
+
+- (id)_displayValueForKeyPath:(CPString)keyPath
+{
+    return keyPath; // localize
+}
+
+- (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
+{
+    var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)],
+        count = [expressions count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var exp = expressions[i],
+            type = [exp expressionType],
+            title;
+
+        switch (type)
+        {
+            case CPKeyPathExpressionType: title = [self _displayValueForKeyPath:[exp keyPath]];
+                break;
+            case CPConstantValueExpressionType: title = [self _displayValueForConstantValue:[exp constantValue]];
+                break;
+            default: [CPException raise:CPInvalidArgumentException reason:@"Invalid Expression type " + type];
+                break;
+        }
+
+        var item = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+        [item setRepresentedObject:exp];
+        [popup addItem:item];
+    }
+
+    [popup sizeToFit];
+
+    return popup;
+}
+
+- (CPPopUpButton)_viewFromOperatorTypes:(CPArray)operators
+{
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+        count = [operators count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var op = operators[i],
+            title = [self _displayValueForPredicateOperator:op],
+            item = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+
+        [item setRepresentedObject:op];
+        [popup addItem:item];
+    }
+
+    [popup sizeToFit];
+
+    return popup;
+}
+
+- (CPView)_viewFromCompoundTypes:(CPArray)compoundTypes
+{
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+        count = [compoundTypes count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var type = compoundTypes[i],
+            title = [self _displayValueForCompoundPredicateType:type],
+            item = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+
+        [item setRepresentedObject:type];
+        [popup addItem:item];
+    }
+
+    [popup sizeToFit];
+
+    return popup;
+}
+
+- (CPView)_viewFromAttributeType:(CPAttributeType)attributeType
+{
+    var view;
+
+    if (attributeType >= CPInteger16AttributeType && attributeType <= CPFloatAttributeType)
+    {
+        view = [self _textFieldWithFrame:CGRectMake(0, 0, 50, 26)];
+    }
+    else if (attributeType == CPStringAttributeType)
+    {
+        view = [self _textFieldWithFrame:CGRectMake(0, 0, 150, 26)];
+    }
+    else if (attributeType == CPBooleanAttributeType)
+    {
+        view = [[CPCheckBox alloc] initWithFrame:CGRectMake(0, 0, 50, 26)];
+    }
+    else if (attributeType == CPDateAttributeType)
+        view = [[CPDatePicker alloc] initWithFrame:CGRectMake(0, 0, 150, 26)];
+    else
+        return nil;
+
+    [view setTag:attributeType];
+
+    return view;
+}
+
+- (CPTextField)_textFieldWithFrame:(CGRect)frame
+{
+    var textField = [[CPTextField alloc] initWithFrame:frame];
+    [textField setBezeled:YES];
+    [textField setBezelStyle:CPTextFieldSquareBezel];
+    [textField setBordered:YES];
+    [textField setEditable:YES];
+    [textField setFont:[CPFont systemFontOfSize:10]];
+    [textField setSendsActionOnEndEditing:YES];
+
+    return textField;
+}
+
+- (void)_setOptions:(unsigned int)options
+{
+    _predicateOptions = options;
+}
+
+- (void)_setModifier:(unsigned int)modifier
+{
+    _predicateModifier = modifier;
+}
+
+- (CPString)description
+{
+    if (_templateType == 2)
+        return [CPString stringWithFormat:@"<%@ %p %@>",[self className],self,[[self compoundTypes] componentsJoinedByString:@", "]];
+    else if (_templateType == 1 && _rightIsWildcard)
+        return [CPString stringWithFormat:@"<%@ %p [%@] [%@] %d>",[self className],self,[[self leftExpressions] componentsJoinedByString:@", "],[[self operators] componentsJoinedByString:@", "],[self rightExpressionAttributeType]];
+    else
+        return [CPString stringWithFormat:@"<%@ %p [%@] [%@] [%@]>",[self className],self,[[self leftExpressions] componentsJoinedByString:@", "],[[self operators] componentsJoinedByString:@", "],[[self rightExpressions] componentsJoinedByString:@", "]];
+}
+
+/*
+- (void)_setLeftExpressionObject:(id)object
+{
+}
+- (void)_setRightExpressionObject:(id)object
+{
+}
+- (BOOL)_predicateIsNoneAreTrue:(id)predicate
+{
+}
+- (id)_viewFromExpressionObject:(id)object
+{
+}
+*/
+@end
+
+var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
+    CPPredicateTemplateOptionsKey = @"CPPredicateTemplateOptions",
+    CPPredicateTemplateModifierKey = @"CPPredicateTemplateModifier",
+    CPPredicateTemplateLeftAttributeTypeKey = @"CPPredicateTemplateLeftAttributeType",
+    CPPredicateTemplateRightAttributeTypeKey = @"CPPredicateTemplateRightAttributeType",
+    CPPredicateTemplateLeftIsWildcardKey = @"CPPredicateTemplateLeftIsWildcard",
+    CPPredicateTemplateRightIsWildcardKey = @"CPPredicateTemplateRightIsWildcard",
+    CPPredicateTemplateViewsKey = @"CPPredicateTemplateViews";
+
+@implementation CPPredicateEditorRowTemplate (CPCoding)
+
+- (id)initWithCoder:(CPCoder)coder
+{
+    self = [super init];
+    if (self != nil)
+    {
+        _templateType = [coder decodeIntForKey:CPPredicateTemplateTypeKey];
+        _predicateOptions = [coder decodeIntForKey:CPPredicateTemplateOptionsKey];
+        _predicateModifier = [coder decodeIntForKey:CPPredicateTemplateModifierKey];
+        _leftAttributeType = [coder decodeIntForKey:CPPredicateTemplateLeftAttributeTypeKey];
+        _rightAttributeType = [coder decodeIntForKey:CPPredicateTemplateRightAttributeTypeKey];
+        _leftIsWildcard = [coder decodeBoolForKey:CPPredicateTemplateLeftIsWildcardKey];
+        _rightIsWildcard = [coder decodeBoolForKey:CPPredicateTemplateRightIsWildcardKey];
+        _views = [coder decodeObjectForKey:CPPredicateTemplateViewsKey];
+
+        // In Xcode 4, when the menu item title == template's expression keypath, representedObject is empty.
+        // So we need to regenerate expressions from titles.
+        if (_templateType == 1 && _leftIsWildcard == NO)
+        {
+            var itemArray = [_views[0] itemArray],
+                count = [itemArray count];
+
+            for (var i = 0; i < count; i++)
+            {
+                var item = itemArray[i];
+                if ([item representedObject] == nil)
+                {
+                    var exp = [CPExpression expressionForKeyPath:[item title]];
+                    [item setRepresentedObject:exp];
+                }
+            }
+        }
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)coder
+{
+    [coder encodeInt:_templateType forKey:CPPredicateTemplateTypeKey];
+    [coder encodeInt:_predicateOptions forKey:CPPredicateTemplateOptionsKey];
+    [coder encodeInt:_predicateModifier forKey:CPPredicateTemplateModifierKey];
+    [coder encodeInt:_leftAttributeType forKey:CPPredicateTemplateLeftAttributeTypeKey];
+    [coder encodeInt:_rightAttributeType forKey:CPPredicateTemplateRightAttributeTypeKey];
+    [coder encodeBool:_leftIsWildcard forKey:CPPredicateTemplateLeftIsWildcardKey];
+    [coder encodeBool:_rightIsWildcard forKey:CPPredicateTemplateRightIsWildcardKey];
+    [coder encodeObject:_views forKey:CPPredicateTemplateViewsKey];
+}
+
+@end
+/*! @endcond */
@@ -0,0 +1,129 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+@class _CPPredicateEditorTree;
+@implementation _CPPredicateEditorRowNode : CPObject
+{
+    _CPPredicateEditorTree                   tree @accessors;
+    CPMutableArray                  templateViews @accessors;
+    CPMutableArray        copiedTemplateContainer @accessors;
+    CPArray                              children @accessors(copy);
+}
+
+ (id)rowNodeFromTree:(id)aTree
+{
+    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:{}];
+}
+
+ (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable
+{
+    var views,
+        copiedContainer;
+
+    var uuid = [[aTree template] UID],
+        cachedNode = templateTable[uuid],
+        node = [[_CPPredicateEditorRowNode alloc] init];
+
+    [node setTree:aTree];
+
+    if (!cachedNode)
+    {
+        views = [CPMutableArray array];
+        copiedContainer = [CPMutableArray array];
+        templateTable[uuid] = node;
+    }
+    else
+    {
+        views = [cachedNode templateViews];
+        copiedContainer = [cachedNode copiedTemplateContainer];
+    }
+
+    [node setTemplateViews:views];
+    [node setCopiedTemplateContainer:copiedContainer];
+
+    var nodeChildren = [CPMutableArray array],
+        treeChildren = [aTree children],
+        count = [treeChildren count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var treeChild = treeChildren[i],
+            child = [_CPPredicateEditorRowNode _rowNodeFromTree:treeChild withTemplateTable:templateTable];
+
+        [nodeChildren addObject:child];
+    }
+
+    [node setChildren:nodeChildren];
+
+    return node;
+}
+
+- (BOOL)applyTemplate:(id)template withViews:(id)views forOriginalTemplate:(id)originalTemplate
+{
+    var t = [tree template],
+        count = [children count];
+
+    if (t !== template)
+    {
+        [templateViews setArray:views];
+        [copiedTemplateContainer removeAllObjects];
+        [copiedTemplateContainer addObject:template];
+    }
+
+    for (var i = 0; i < count; i++)
+        [children[i] applyTemplate:template withViews:views forOriginalTemplate:originalTemplate];
+}
+
+- (BOOL)isEqual:(id)node
+{
+    if (![node isKindOfClass:[_CPPredicateEditorRowNode class]])
+        return NO;
+
+    return (tree === [node tree]);
+}
+
+- (void)copyTemplateIfNecessary
+{
+    if ([copiedTemplateContainer count] === 0)
+    {
+        var copy = [[tree template] copy];
+        [copiedTemplateContainer addObject:copy];
+        [templateViews addObjectsFromArray:[copy templateViews]];
+    }
+}
+
+- (CPView)templateView
+{
+    [self copyTemplateIfNecessary];
+    return [templateViews objectAtIndex:[tree indexIntoTemplate]];
+}
+
+- (id)templateForRow
+{
+    [self copyTemplateIfNecessary];
+    return [copiedTemplateContainer lastObject];
+}
+
+- (CPString)title
+{
+    return [tree title];
+}
+
+- (id)displayValue
+{
+    var title = [self title];
+
+    if (title !== nil)
+        return title;
+
+    return [self templateView];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<%@ %@ %@ tree:%@ tviews:%@", [self className],[self UID], [self title], [tree UID], [templateViews description]];
+}
+
+@end
@@ -0,0 +1,33 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+@implementation _CPPredicateEditorTree : CPObject
+{
+    CPPredicateEditorRowTemplate         template @accessors;
+    CPString                                title @accessors(copy);
+    CPArray                              children @accessors(copy);
+    CPInteger                   indexIntoTemplate @accessors;
+    CPInteger                       menuItemIndex @accessors;
+}
+
+- (id)copy
+{
+    var tree = [[_CPPredicateEditorTree alloc] init];
+    [tree setTemplate:template];
+    [tree setTitle:title];
+    [tree setMenuItemIndex:menuItemIndex];
+    [tree setIndexIntoTemplate:indexIntoTemplate];
+    [tree setChildren:children];
+
+    return tree;
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<%@: %p (%@) [%d-%d] T:%p at:%d> [\r%@\r]", [self className], self, title, indexIntoTemplate, menuItemIndex, template, [template rightExpressionAttributeType], children];
+}
+
+@end
+
@@ -0,0 +1,79 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPString.j>
+
+var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
+
+@implementation _CPRuleEditorLocalizer : CPObject
+{
+    CPDictionary    _dictionary @accessors(property=dictionary);
+    CPURLConnection connection;
+    CPURLRequest    resquest;
+}
+
+- (void)loadContentOfURL:(CPURL)aURL
+{
+    request = [CPURLRequest requestWithURL:aURL];
+    connection = [CPURLConnection connectionWithRequest:request delegate:self];
+}
+
+- (void)reloadIfNeeded
+{
+    if (connection !== nil) // Connection waiting
+    {
+        connection = nil;
+
+        var data = [CPURLConnection sendSynchronousRequest:request returningResponse:NULL];
+        [self loadContent:[data rawString]];
+    }
+}
+
+- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)rawString
+{
+    if (connection !== nil && rawString !== nil)
+        [self loadContent:rawString];
+
+    connection = nil;
+}
+
+- (void)loadContent:(CPString)aContent
+{
+    var dict = [CPDictionary dictionary],
+        lines = [aContent componentsSeparatedByString:"\n"],
+        count = [lines count];
+
+    for (var i = 0 ; i < count ; i++)
+    {
+        var line = [lines objectAtIndex:i];
+
+        if (line.length > 1)
+        {
+            var match = LocalizerStringsRegex.exec(line);
+
+            if (match && match.length >= 3)
+                [dict setObject:match[2] forKey:match[1]];
+        }
+    }
+
+    _dictionary = [CPDictionary dictionaryWithDictionary:dict];
+}
+
+- (CPString)localizedStringForString:(CPString)aString
+{
+    [self reloadIfNeeded];
+
+    if (_dictionary !== nil && aString !== nil)
+    {
+        var localized = [_dictionary objectForKey:aString];
+
+        if (localized !== nil)
+            return localized;
+    }
+
+    return aString;
+}
@@ -0,0 +1,176 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+var GRADIENT_START_COLOR = "#fcfcfc",
+    GRADIENT_END_COLOR = "#dfdfdf",
+    BORDER_COLOR = "#BDBDBD";
+
+var GRADIENT_NORMAL,
+    GRADIENT_HIGHLIGHTED,
+    GRADIENT_PROPERTY;
+
+if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+{
+    GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_START_COLOR + "), to(" + GRADIENT_END_COLOR + "))",
+    GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_END_COLOR + "), to(" + GRADIENT_START_COLOR + "))";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+{
+    GRADIENT_NORMAL = "-moz-linear-gradient(top, " + GRADIENT_START_COLOR + ", " + GRADIENT_END_COLOR + ")",
+    GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top, " + GRADIENT_END_COLOR + ", " + GRADIENT_START_COLOR + ")";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+{
+    GRADIENT_NORMAL = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_START_COLOR + "', endColorstr='" + GRADIENT_END_COLOR + "')";
+    GRADIENT_HIGHLIGHTED = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_END_COLOR + "', endColorstr='" + GRADIENT_START_COLOR + "')";
+    GRADIENT_PROPERTY = "filter";
+}else
+{
+    GRADIENT_NORMAL = GRADIENT_START_COLOR;
+    GRADIENT_HIGHLIGHTED = GRADIENT_END_COLOR;
+    GRADIENT_PROPERTY = "background";
+}
+
+@implementation _CPRuleEditorPopUpButton : CPPopUpButton
+{
+    CPInteger radius;
+}
+
+- (void)_sharedInit
+{
+    [self setBordered:NO];
+
+    var style = _DOMElement.style;
+    style.border = "1px solid " + BORDER_COLOR;
+    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+        [self _sharedInit];
+
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    [self _sharedInit];
+
+    return self;
+}
+
+- (id)hitTest:(CPPoint)point
+{
+    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+        return nil;
+
+    return self;
+}
+
+- (BOOL)sliceIsEditable
+{
+    var superview = [self superview];
+    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
+}
+
+- (BOOL)trackMouse:(CPEvent)theEvent
+{
+    if (![self sliceIsEditable])
+        return NO;
+
+    return [super trackMouse:theEvent];
+}
+
+- (CGRect)contentRectForBounds:(CGRect)bounds
+{
+    var contentRect = [super contentRectForBounds:bounds];
+    contentRect.origin.x += radius;
+    contentRect.size.width -= 2 * radius;
+
+    return contentRect;
+}
+
+- (void)layoutSubviews
+{
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    var style = _DOMElement.style,
+        radiusCSS = radius + "px";
+
+    style.borderRadius = radiusCSS;
+
+    [super layoutSubviews];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds],
+        arrow_width = FLOOR(CGRectGetHeight(bounds) / 3.5);
+
+    CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);
+
+    var arrowsPath = [CPBezierPath bezierPath];
+    [arrowsPath moveToPoint:CGPointMake(0, 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width / 2, arrow_width + 1)];
+    [arrowsPath closePath];
+
+    CGContextSetFillColor(context, [CPColor colorWithWhite:101 / 255 alpha:1]);
+    [arrowsPath fill];
+
+    CGContextScaleCTM(context, 1 , -1);
+    [arrowsPath fill];
+}
+
+@end
+
+@implementation _CPRuleEditorButton : CPButton
+{
+    CPInteger radius;
+}
+
+- (void)_sharedInit
+{
+    [self setBordered:NO];
+
+    var style = _DOMElement.style;
+    style.border = "1px solid " + BORDER_COLOR;
+    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+        [self _sharedInit];
+
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    [self _sharedInit];
+
+    return self;
+}
+
+- (void)layoutSubviews
+{
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+
+    var style = _DOMElement.style,
+        radiusCSS = radius + "px";
+
+    style.borderRadius = radiusCSS;
+    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+
+    [super layoutSubviews];
+}
+
+@end
@@ -0,0 +1,109 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+@implementation _CPRuleEditorViewSlice : CPView
+{
+    CPRuleEditor _ruleEditor;
+    int          _indentation           @accessors(property=indentation);
+    int          _rowIndex              @accessors(property=rowIndex);
+    CPRect       _animationTargetRect   @accessors(property=_animationTargetRect);
+    BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
+    BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
+    CPColor      _backgroundColor       @accessors(property=backgroundColor);
+}
+
+- (void)removeFromSuperview
+{
+    [super removeFromSuperview];
+}
+
+- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
+{
+    if (self = [super initWithFrame:frame])
+    {
+        _ruleEditor = editor;
+        _selected = NO;
+        _lastSelected = NO;
+    }
+
+    return self;
+}
+
+- (void)_setSelected:(BOOL)select
+{
+    if (select == _selected)
+        return;
+
+    var selector = select ? @"setThemeState:" : @"unsetThemeState:";
+    [[self subviews] makeObjectsPerformSelector:CPSelectorFromString(selector)  withObject:CPThemeStateSelectedDataView];
+    _selected = select;
+}
+
+- (void)drawRect:(CPRect)rect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds],
+        maxX = CGRectGetWidth(bounds) - 2,
+        maxY = CGRectGetHeight(bounds);
+
+// Draw background
+    if ([self _isSelected])
+        _backgroundColor = [_ruleEditor _selectedRowColor];
+    else
+    {
+        var colors = [_ruleEditor _backgroundColors],
+            count = [colors count];
+        _backgroundColor = [colors objectAtIndex:(_rowIndex % count)];
+    }
+
+    CGContextSetFillColor(context, _backgroundColor);
+    CGContextFillRect(context, rect);
+
+// Draw Top Border
+    CGContextBeginPath(context);
+    CGContextMoveToPoint(context, 1, 0);
+    CGContextAddLineToPoint(context, maxX, 0);
+    CGContextClosePath(context);
+    CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
+    CGContextStrokePath(context);
+
+// Draw Bottom Border
+    CGContextBeginPath(context);
+    CGContextMoveToPoint(context, 1, maxY - 0.5);
+    CGContextAddLineToPoint(context, maxX, maxY - 0.5);
+    CGContextClosePath(context);
+    var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
+    CGContextSetStrokeColor(context, bottomColor);
+    CGContextStrokePath(context);
+}
+
+- (void)mouseDown:(CPEvent)theEvent
+{
+    if (editable)
+        [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
+}
+
+- (void)mouseUp:(CPEvent)theEvent
+{
+    if (editable)
+        [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
+}
+
+/*
+- (void)rightMouseDown:(CPEvent)theEvent
+{
+    [_ruleEditor _rightMouseDownOnSlice:self withEvent:theEvent];
+}
+*/
+
+// =========
+// ! DEBUG
+// =========
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<%@ %p index:%d indentation:%d>",[self className],self,[self rowIndex],[self indentation]];
+}
+
+@end
@@ -0,0 +1,525 @@
+/*
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ */
+
+@import "_CPRuleEditorViewSlice.j"
+@import "_CPRuleEditorPopUpButton.j"
+@import "CPRuleEditor.j"
+
+var CONTROL_HEIGHT = 16.,
+    BUTTON_HEIGHT = 16.;
+
+@implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
+{
+    CPMutableArray  _ruleOptionViews;
+    CPMutableArray  _ruleOptionFrames;
+    CPMutableArray  _correspondingRuleItems;
+    CPMutableArray  _ruleOptionInitialViewFrames;
+    CPButton        _addButton;
+    CPButton        _subtractButton;
+    BOOL            editable;
+    CPRuleEditorRowType _rowType @accessors;
+    CPRuleEditorRowType _plusButtonRowType;
+}
+
+- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
+{
+    if (self = [super initWithFrame:frame ruleEditorView:editor])
+        [self _initShared];
+
+    return self;
+}
+
+- (void)_initShared
+{
+    _correspondingRuleItems = [[CPMutableArray alloc] init];
+    _ruleOptionFrames = [[CPMutableArray alloc] init];
+    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
+    _ruleOptionViews = [[CPMutableArray alloc] init];
+     editable = [_ruleEditor isEditable];
+
+    _addButton = [self _createAddRowButton];
+    _subtractButton = [self _createDeleteRowButton];
+    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
+    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
+    [_addButton setHidden:!editable];
+    [_subtractButton setHidden:!editable];
+    [self addSubview:_addButton];
+    [self addSubview:_subtractButton];
+
+    [self setAutoresizingMask:CPViewWidthSizable];
+
+    var center = [CPNotificationCenter defaultCenter];
+    [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
+}
+
+- (CPButton)_createRowButton
+{
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
+    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
+    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
+    [button setAlignment:CPCenterTextAlignment];
+    [button setAutoresizingMask:CPViewMinXMargin];
+    [button setImagePosition:CPImageOnly];
+
+    return button;
+}
+
+- (CPButton)_createAddRowButton
+{
+    var button = [self _createRowButton];
+
+    [button setImage:[_ruleEditor _addImage]];
+    [button setAction:@selector(_addOption:)];
+    [button setTarget:self];
+
+    return button;
+}
+
+- (CPButton)_createDeleteRowButton
+{
+    var button = [self _createRowButton];
+
+    [button setImage:[_ruleEditor _removeImage]];
+    [button setAction:@selector(_deleteOption:)];
+    [button setTarget:self];
+
+    return button;
+}
+
+- (CPMenuItem)_createMenuItemWithTitle:(CPString )title
+{
+    title = [[_ruleEditor standardLocalizer] localizedStringForString:title];
+    var mItem = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+    return mItem;
+}
+
+- (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
+{
+    var title = [[itemsArray objectAtIndex:index] title],
+        font = [_ruleEditor font],
+        width = [title sizeWithFont:font].width + 20,
+        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),
+
+        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
+
+    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
+    [popup setValue:font forThemeAttribute:@"font"];
+
+    var count = [itemsArray count];
+    for (var i = 0; i < count; i++)
+        [popup addItem:[itemsArray objectAtIndex:i]];
+
+    [popup selectItemAtIndex:index];
+
+    return popup;
+}
+
+- (CPMenuItem)_createMenuSeparatorItem
+{
+    return [CPMenuItem separatorItem];
+}
+
+- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString )text
+{
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)],
+        refont = [_ruleEditor font],
+        font = [CPFont fontWithName:[refont familyName] size:[refont size] + 2],
+
+        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text];
+
+    [textField setValue:font forThemeAttribute:@"font"];
+    [textField setStringValue:localizedText];
+    [textField sizeToFit];
+
+    return textField;
+}
+
+- (void)_addOption:(id)sender
+{
+    if (_rowIndex == [_ruleEditor numberOfRows] - 1)
+        [self setNeedsDisplay:YES];
+
+    var type = _plusButtonRowType;
+    if ([_ruleEditor nestingMode] == CPRuleEditorNestingModeCompound && ([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask))
+        type = CPRuleEditorRowTypeCompound;
+
+    [_ruleEditor _addOptionFromSlice:self ofRowType:type];
+}
+
+- (void)_deleteOption:(id)sender
+{
+    [_ruleEditor _deleteSlice:self];
+}
+
+- (void)_ruleOptionPopupChangedAction:(CPMenuItem )sender
+{
+    var layoutdict = [sender representedObject],
+        newItem = [layoutdict objectForKey:@"item"],
+        indexInCriteria = [layoutdict objectForKey:@"indexInCriteria"],
+        oldItem = [_correspondingRuleItems objectAtIndex:indexInCriteria];
+
+    if (![newItem isEqual:oldItem])
+    {
+        [_correspondingRuleItems replaceObjectAtIndex:indexInCriteria withObject:newItem];
+        [_ruleEditor _changedItem:oldItem toItem:newItem inRow:_rowIndex atCriteriaIndex:indexInCriteria];
+    }
+}
+
+- (BOOL)validateMenuItem:(CPMenuItem )menuItem
+{
+    return [_ruleEditor _validateItem:menuItem value:[[menuItem representedObject] valueForKey:@"item"] inRow:_rowIndex];
+}
+
+- (void)_emptyRulePartSubviews
+{
+    var count = [_ruleOptionViews count];
+
+    while (count--)
+        [_ruleOptionViews[count] removeFromSuperview];
+
+    [_ruleOptionViews removeAllObjects];
+    [_ruleOptionFrames removeAllObjects];
+    [_ruleOptionInitialViewFrames removeAllObjects];
+}
+
+- (void)_reconfigureSubviews
+{
+    var ruleItems,
+        criteria,
+        repObject,
+        menuItem,
+        ruleView,
+        criterion,
+        parent,
+        numberOfCriteria,
+        numberOfChildren,
+        firstResponderIndex,
+
+        ruleItems = [CPMutableArray array],
+        responder = [[self window] firstResponder];
+
+    [self _emptyRulePartSubviews];
+
+    criteria = [_ruleEditor criteriaForRow:_rowIndex];
+    numberOfCriteria = [criteria count];
+
+    firstResponderIndex = numberOfCriteria - 1;
+    if (responder)
+        firstResponderIndex = [_ruleOptionViews indexOfObjectIdenticalTo:responder];
+
+    for (var i = 0; i < numberOfCriteria; i++)
+    {
+        ruleView = nil;
+        parent = nil;
+        criterion = [criteria objectAtIndex:i];
+
+        if (i > 0)
+            parent = [criteria objectAtIndex:i - 1];
+
+        var childItems = [],
+            childValues = [];
+
+        [_ruleEditor _getAllAvailableItems:childItems values:childValues asChildrenOfItem:parent inRow:_rowIndex];
+
+        numberOfChildren = [childItems count];
+        if (numberOfChildren > 1)
+        {
+            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren],
+                selectedIndex = [childItems indexOfObject:criterion];
+
+            if (selectedIndex == CPNotFound)
+                break;
+
+            for (var j = 0; j < numberOfChildren; ++j)
+            {
+                var childItem = [childItems objectAtIndex:j],
+                    childValue = [childValues objectAtIndex:j];
+
+                if ([childValue isKindOfClass:[CPMenuItem class]])
+                {
+                    [[childValue menu] removeItem:childValue];
+                    menuItem = childValue;
+                }
+                else
+                {
+                    if ([childValue isEqualToString:@""])
+                        menuItem = [self _createMenuSeparatorItem];
+                    else
+                    {
+                        menuItem = [self _createMenuItemWithTitle:childValue];
+                        [menuItem setTarget:self];
+                        [menuItem setAction:@selector(_ruleOptionPopupChangedAction:)];
+                    }
+                }
+
+                repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"];
+                [menuItem setRepresentedObject:repObject];
+                [menuItems addObject:menuItem];
+            }
+
+            ruleView = [self _createPopUpButtonWithItems:menuItems selectedItemIndex:selectedIndex];
+        }
+        else
+        {
+            var value = [childValues objectAtIndex:0],
+                type = [value valueType];
+
+            if (type === 0)
+                ruleView = [self _createStaticTextFieldWithStringValue:value];
+            else
+            {
+                if (type !== 1)
+                {
+                    [CPException raise:CPInternalInconsistencyException reason:@"Display value must be a string or a menu item"];
+                    continue;
+                }
+
+                ruleView = value;
+                [ruleView setTarget:self];
+                [ruleView setAction:@selector(_sendRuleAction:)];
+                if ([ruleView respondsToSelector:@selector(setDelegate:)])
+                    [ruleView setDelegate:self];
+            }
+        }
+
+        if (ruleView != nil)
+        {
+            [_ruleOptionViews addObject:ruleView];
+            var frame = [ruleView frame];
+            [_ruleOptionInitialViewFrames addObject:frame];
+            [_ruleOptionFrames addObject:frame];
+
+            if (!criterion)
+                criterion = [CPNull null];
+
+            [ruleItems addObject:criterion];
+        }
+    }
+
+    [_correspondingRuleItems setArray:ruleItems];
+
+    if (!editable)
+        [self _updateEnabledStateForSubviews];
+
+    [self _relayoutSubviewsWidthChanged:YES];
+
+    if (firstResponderIndex != CPNotFound)
+    {
+        var aView = [_ruleOptionViews objectAtIndex:firstResponderIndex];
+        [[self window] makeFirstResponder:aView]; // This is not working. bug in CPPopUpButton firstResponder ?
+    }
+
+    //[self setNeedsDisplay:YES];
+}
+
+- (void)_updateEnabledStateForSubviews
+{
+    [_ruleOptionViews makeObjectsPerformSelector:@selector(setEnabled:) withObject:NO];
+}
+
+- (void)layoutSubviews
+{
+    [self _relayoutSubviewsWidthChanged:YES];
+}
+
+- (void)_relayoutSubviewsWidthChanged:(BOOL)widthChanged
+{
+    var optionViewOriginX,
+        leftHorizontalPadding,
+        leftButtonMinX,
+        rowHeight = [_ruleEditor rowHeight],
+        count = [_ruleOptionViews count],
+        sliceFrame = [self frame],
+
+        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
+
+    [_addButton setFrame:buttonFrame];
+    buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
+    [_subtractButton setFrame:buttonFrame];
+
+    if (widthChanged)
+    {
+        optionViewOriginX = [self _leftmostViewFixedHorizontalPadding] + [self _indentationHorizontalPadding] * _indentation;
+        leftHorizontalPadding = [self _rowButtonsLeftHorizontalPadding];
+        leftButtonMinX = CGRectGetMinX(buttonFrame);
+    }
+
+    for (var i = 0; i < count; i++)
+    {
+        var ruleOptionView = _ruleOptionViews[i],
+            optionFrame = _ruleOptionFrames[i];
+
+        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
+        if (widthChanged)
+        {
+            optionFrame.origin.x = optionViewOriginX;
+            if (i == count - 1 && ![self _isRulePopup:ruleOptionView])
+            {
+                var initialFrame = _ruleOptionInitialViewFrames[i];
+                optionFrame.size.width = MIN(CGRectGetWidth(initialFrame), leftButtonMinX - leftHorizontalPadding - optionViewOriginX);
+            }
+        }
+
+        [ruleOptionView setFrame:optionFrame];
+        [self addSubview:ruleOptionView];
+
+        if (widthChanged)
+            optionViewOriginX += CGRectGetWidth(optionFrame) + [self _interviewHorizontalPadding];
+    }
+}
+
+- (void)_updateButtonVisibilities
+{
+    [_addButton setHidden:[_ruleEditor _shouldHideAddButtonForSlice:self]];
+    [_subtractButton setHidden:[_ruleEditor _shouldHideSubtractButtonForSlice:self]];
+}
+
+- (void)_configurePlusButtonByRowType:(CPRuleEditorRowType)type
+{
+    [self _setRowTypeToAddFromPlusButton:type];
+}
+
+- (BOOL)isEditable
+{
+    return editable;
+}
+
+- (void)setEditable:(BOOL)value
+{
+    editable = value;
+//  [self _updateEnabledStateForSubviews];
+    [self _updateButtonVisibilities];
+}
+
+- (float)_alignmentGridWidth
+{
+    return [_ruleEditor _alignmentGridWidth];
+}
+
+- (float)_indentationHorizontalPadding
+{
+    return 30.;
+}
+
+- (float)_interviewHorizontalPadding
+{
+    return 6.;
+}
+
+- (float)_leftmostViewFixedHorizontalPadding
+{
+    return 7.;
+}
+
+- (float)_minimumVerticalPopupPadding
+{
+    return 2.;
+}
+
+- (float)_rowButtonsInterviewHorizontalPadding
+{
+    return 6.;
+}
+
+- (float)_rowButtonsLeftHorizontalPadding
+{
+    return 10.;
+}
+
+- (float)_rowButtonsRightHorizontalPadding
+{
+    return ([[_ruleEditor superview] isKindOfClass:[CPClipView class]]) ? 18. : 10.;
+}
+
+- (void)_setRowTypeToAddFromPlusButton:(int)type
+{
+    _plusButtonRowType = type;
+}
+
+- (void)setNeedsDisplay:(BOOL)flag
+{
+    [super setNeedsDisplay:flag];
+}
+
+- (BOOL)_nestingModeShouldHideAddButton
+{
+    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
+}
+
+- (BOOL)_nestingModeShouldHideSubtractButton
+{
+    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
+}
+
+- (BOOL)containsDisplayValue:(id)value
+{
+    return [[_ruleEditor displayValuesForRow:_rowIndex] containsObject:value];
+    // Ou alors avec _correspondingRuleItems
+}
+
+- (void)viewDidMoveToWindow
+{
+    [self layoutSubviews];
+}
+
+- (void)drawRect:(CPRect)rect
+{
+    [super drawRect:rect];
+}
+
+- (BOOL)_isRulePopup:(CPView)view
+{
+    if ([view isKindOfClass:[_CPRuleEditorPopUpButton class]])
+        return YES;
+    return NO;
+}
+
+- (BOOL)_isRuleStaticTextField:(CPView)view
+{
+    if ([view isKindOfClass:[_CPRuleEditorTextField class]])
+        return YES;
+    return NO;
+}
+
+- (void)_sendRuleAction:(id)sender
+{
+    [_ruleEditor _updatePredicate];
+    [_ruleEditor _sendRuleAction];
+}
+
+- (void)_textDidChange:(CPNotification)aNotif
+{
+    if ([[aNotif object] superview] == self && [_ruleEditor _sendsActionOnIncompleteTextChange])
+        [self _sendRuleAction:nil];
+}
+
+@end
+
+@implementation _CPRuleEditorTextField : CPTextField
+{
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self != nil)
+    {
+        [self setBordered:NO];
+        [self setEditable:NO];
+        [self setDrawsBackground:NO];
+    }
+
+    return self;
+}
+
+- (id)hitTest:(CPPoint)point
+{
+    if (!CPRectContainsPoint([self frame], point))
+        return nil;
+
+    return [self superview];
+}
+
+@end
@@ -1,3 +1,24 @@
+/*
+ * CPSavePanel.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import "CPPanel.j"

@@ -1,11 +1,45 @@
-
+/*
+ * CPScreen.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
@import <Foundation/CPObject.j>

+/*!
+    @ingroup appkit
+    @class CPScreen

+    A CPScreen object describes the attributes of a display device available
+    to Cappuccino.
+*/
@implementation CPScreen : CPObject
 {
 }

+/*!
+    Returns the position and size of the visible area of the receiving screen.
+    This will normally be smaller than the full size of the screen to account
+    for system UI elements. For example, on a Mac the top of the visible frame
+    is placed below the bottom of the menu bar.
+
+    @return the visible screen rectangle
+*/
 - (CGRect)visibleFrame
 {
 #if PLATFORM(DOM)
@@ -15,4 +49,4 @@
 #endif
 }

-@end
+@end
@@ -5,6 +5,9 @@
 * Created by Francisco Tolmasky.
 * Copyright 2008, 280 North, Inc.
 *
+ * Modified to match Lion style by Antoine Mercadal 2011
+ * <antoine.mercadal@archipelproject.org>
+ *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
@@ -20,8 +23,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPControl.j"
+#include "../Foundation/Foundation.h"

+@import "CPControl.j"

 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -54,6 +58,17 @@ NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
 NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";


+CPScrollerStyleLegacy           = 0;
+CPScrollerStyleOverlay          = 1;
+
+CPScrollerKnobStyleDefault      = 0;
+CPScrollerKnobStyleDark         = 1;
+CPScrollerKnobStyleLight        = 2;
+
+CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
+CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
+CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
+
@implementation CPScroller : CPControl
 {
    CPControlSize           _controlSize;
@@ -68,8 +83,19 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    CPScrollerPart          _trackingPart;
    float                   _trackingFloatValue;
    CGPoint                 _trackingStartPoint;
+
+    CPViewAnimation         _animationScroller;
+
+    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
+    int                     _style;
+    CPTimer                 _timerFadeOut;
+    BOOL                    _isMouseOver;
 }

+
+#pragma mark -
+#pragma mark Class methods
+
 + (CPString)defaultThemeClass
 {
    return "scroller";
@@ -78,49 +104,43 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 + (id)themeAttributes
 {
    return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 15.0,
-        @"knob-slot-color": [CPColor lightGrayColor],
+        @"scroller-width": 7.0,
+        @"knob-slot-color": [CPNull null],
        @"decrement-line-color": [CPNull null],
        @"increment-line-color": [CPNull null],
-        @"knob-color": [CPColor grayColor],
+        @"knob-color": [CPNull null],
        @"decrement-line-size":_CGSizeMakeZero(),
        @"increment-line-size":_CGSizeMakeZero(),
        @"track-inset":_CGInsetMakeZero(),
        @"knob-inset": _CGInsetMakeZero(),
-        @"minimum-knob-length":21.0
-    }]
+        @"minimum-knob-length":21.0,
+        @"track-border-overlay": 9.0
+    }];
 }

-
-// Calculating Layout
-
- (id)initWithFrame:(CGRect)aFrame
+ (float)scrollerWidth
 {
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _controlSize = CPRegularControlSize;
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
-        _hitPart = CPScrollerNoPart;
-
-        [self _calculateIsVertical];
-    }
-
-    return self;
+    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
 }

-// Determining CPScroller Size
 /*!
    Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidth
+ (float)scrollerWidthInStyle:(int)aStyle
 {
-    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
+    var scroller = [[self alloc] init];
+
+    if (aStyle == CPScrollerStyleLegacy)
+        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
+    return [scroller currentValueForThemeAttribute:@"scroller-width"];
+}
+
+/*!
+    Returns the CPScroller's overlay value.
+*/
+ (float)scrollerOverlay
+{
+    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
 }

 /*!
@@ -132,6 +152,87 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    return [self scrollerWidth];
 }

+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+
+        _hitPart = CPScrollerNoPart;
+        _allowFadingOut = YES;
+        _isMouseOver = NO;
+        _style = CPScrollerStyleOverlay;
+        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
+                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
+
+        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
+        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
+        [_animationScroller setDelegate:self];
+        [self setAlphaValue:0.0];
+        [self _calculateIsVertical];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Getters / Setters
+
+/*!
+    Returns the scroller's style
+*/
+- (void)style
+{
+    return _style;
+}
+
+/*!
+    Set the scroller's control size
+    @param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
+*/
+- (void)setStyle:(id)aStyle
+{
+    if (_style != nil && _style === aStyle)
+        return;
+
+    _style = aStyle;
+
+    if (_style === CPScrollerStyleLegacy)
+    {
+        [self fadeIn];
+        [self setThemeState:CPThemeStateScrollViewLegacy];
+    }
+    else
+    {
+        _allowFadingOut = YES;
+        [self unsetThemeState:CPThemeStateScrollViewLegacy];
+    }
+
+    [self _adjustScrollerSize];
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+}
+
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
 /*!
    Sets the scroller's size.
    @param aControlSize the scroller's size
@@ -147,27 +248,6 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    [self setNeedsDisplay:YES];
 }

-/*!
-    Returns the scroller's control size
-*/
- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
- (void)setKnobProportion:(float)aProportion
-{
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
 /*!
    Return's the knob's proportion
 */
@@ -176,17 +256,50 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    return _knobProportion;
 }

- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+/*!
+    Set the knob's proportion
+    @param aProportion the desired proportion
+*/
+- (void)setKnobProportion:(float)aProportion
 {
-    var themeState = _themeState;
+    if (!_IS_NUMERIC(aProportion))
+        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];

-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));

-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
 }

-// Calculating Layout
+
+#pragma mark -
+#pragma mark Privates
+
+/*! @ignore */
+- (void)_adjustScrollerSize
+{
+    var frame = [self frame],
+        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
+
+    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
+        frame.size.width = scrollerWidth;
+
+    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
+        frame.size.height = scrollerWidth;
+
+    [self setFrame:frame];
+}
+
+/*! @ignore */
+- (void)_performFadeOut:(CPTimer)aTimer
+{
+    [self fadeOut];
+    _timerFadeOut = nil;
+}
+
+
+#pragma mark -
+#pragma mark Utilities

 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -208,6 +321,9 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    // The ordering of these tests is important.  We check the knob and
    // page rects first since they may overlap with the arrows.

+    if (![self hasThemeState:CPThemeStateSelected])
+        return CPScrollerNoPart;
+
    if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
        return CPScrollerKnob;

@@ -267,16 +383,16 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
            incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
            effectiveDecrementLineHeight = decrementLineSize.height + trackInset.top,
            effectiveIncrementLineHeight = incrementLineSize.height + trackInset.bottom,
-            slotHeight = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
+            slotSize = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
            minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
            knobWidth = width - knobInset.left - knobInset.right,
-            knobHeight = MAX(minimumKnobLength, (slotHeight * _knobProportion)),
-            knobLocation = effectiveDecrementLineHeight + (slotHeight - knobHeight) * [self floatValue];
+            knobHeight = MAX(minimumKnobLength, (slotSize * _knobProportion)),
+            knobLocation = effectiveDecrementLineHeight + (slotSize - knobHeight) * [self floatValue];

        _partRects[CPScrollerDecrementPage] = _CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
        _partRects[CPScrollerKnob]          = _CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
        _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
-        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotSize);
        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);

@@ -296,16 +412,16 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
            incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
            effectiveDecrementLineWidth = decrementLineSize.width + trackInset.left,
            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right,
-            slotWidth = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
+            slotSize = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
            minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
-            knobWidth = MAX(minimumKnobLength, (slotWidth * _knobProportion)),
+            knobWidth = MAX(minimumKnobLength, (slotSize * _knobProportion)),
            knobHeight = height - knobInset.top - knobInset.bottom,
-            knobLocation = effectiveDecrementLineWidth + (slotWidth - knobWidth) * [self floatValue];
+            knobLocation = effectiveDecrementLineWidth + (slotSize - knobWidth) * [self floatValue];

        _partRects[CPScrollerDecrementPage] = _CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
        _partRects[CPScrollerKnob]          = _CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
        _partRects[CPScrollerIncrementPage] = _CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
-        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, height - trackInset.top - trackInset.bottom);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotSize, height - trackInset.top - trackInset.bottom);
        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
        _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);

@@ -316,7 +432,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
        {
            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotHeight);
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotSize);
        }
    }
 }
@@ -330,7 +446,35 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    return _usableParts;
 }

-// Drawing the Parts
+/*!
+    Display the scroller
+*/
+- (void)fadeIn
+{
+    if (_isMouseOver && _knobProportion != 1.0)
+        [self setThemeState:CPThemeStateSelected];
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    [self setAlphaValue:1.0];
+}
+
+/*!
+    Start the fade out anination
+*/
+- (void)fadeOut
+{
+    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
+        return;
+
+    [_animationScroller startAnimation];
+}
+
+
+#pragma mark -
+#pragma mark  Drawing
+
 /*!
    Draws the specified arrow and sets the highlight.
    @param anArrow the arrow to draw
@@ -382,7 +526,8 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    [self checkSpaceForParts];

    var index = 0,
-        count = PARTS_ARRANGEMENT.length;
+        count = PARTS_ARRANGEMENT.length,
+        view;

    for (; index < count; ++index)
    {
@@ -458,7 +603,8 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";

    [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];

-    [self sendAction:[self action] to:[self target]];
+    if (type === CPLeftMouseDragged)
+        [self sendAction:[self action] to:[self target]];
 }

 /*!
@@ -564,6 +710,20 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    [self setNeedsLayout];
 }

+
+#pragma mark -
+#pragma mark Overrides
+
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+{
+    var themeState = _themeState;
+
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
+
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
    if (![self isEnabled])
@@ -582,10 +742,53 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    }
 }

+- (void)mouseEntered:(CPEvent)anEvent
+{
+    [super mouseEntered:anEvent];
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    if (![self isEnabled])
+        return;
+
+    _allowFadingOut = NO;
+    _isMouseOver = YES;
+
+    if ([self alphaValue] > 0 && _knobProportion != 1.0)
+        [self setThemeState:CPThemeStateSelected];
+}
+
+- (void)mouseExited:(CPEvent)anEvent
+{
+    [super mouseExited:anEvent];
+
+    if ([self isHidden] || ![self isEnabled] || !_isMouseOver)
+        return;
+
+    _allowFadingOut = YES;
+    _isMouseOver = NO;
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    _timerFadeOut = [CPTimer scheduledTimerWithTimeInterval:1.2 target:self selector:@selector(_performFadeOut:) userInfo:nil repeats:NO];
+}
+
+
+#pragma mark -
+#pragma mark Delegates
+
+- (void)animationDidEnd:(CPAnimation)animation
+{
+    [self unsetThemeState:CPThemeStateSelected];
+}
+
@end

-var CPScrollerControlSizeKey = "CPScrollerControlSize",
-    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
+var CPScrollerControlSizeKey = @"CPScrollerControlSize",
+    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
+    CPScrollerStyleKey = @"CPScrollerStyleKey";

@implementation CPScroller (CPCoding)

@@ -594,10 +797,12 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",
    if (self = [super initWithCoder:aCoder])
    {
        _controlSize = CPRegularControlSize;
+
        if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
            _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];

        _knobProportion = 1.0;
+
        if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
            _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];

@@ -605,20 +810,20 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",

        _hitPart = CPScrollerNoPart;

+        _allowFadingOut = YES;
+        _isMouseOver = NO;
+
+        var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
+                                                           forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
+
+        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
+        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
+        [_animationScroller setDelegate:self];
+        [self setAlphaValue:0.0];
+
        [self _calculateIsVertical];

-        // Adjust the size of the scroller if the size from cib
-        // isn't equal to the scrollerWidth
-        var frame = [self frame],
-            scrollerWidth = [CPScroller scrollerWidth];
-
-        if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-            frame.size.width = scrollerWidth;
-
-        if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-            frame.size.height = scrollerWidth;
-
-        [self setFrame:frame];
+        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
    }

    return self;
@@ -630,6 +835,7 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",

    [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
    [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
+    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }

@end
@@ -23,12 +23,10 @@
@import "CPButton.j"
@import "CPTextField.j"

-
 CPSearchFieldRecentsTitleMenuItemTag    = 1000;
 CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;
-CPSearchFieldSeparatorMenuItemTag       = 1004;

 var CPSearchFieldSearchImage = nil,
    CPSearchFieldFindImage = nil,
@@ -39,15 +37,16 @@ var SEARCH_BUTTON_DEFAULT_WIDTH = 25.0,
    CANCEL_BUTTON_DEFAULT_WIDTH = 22.0,
    BUTTON_DEFAULT_HEIGHT = 22.0;

+var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
+
 var RECENT_SEARCH_PREFIX = @"   ";

-
-/*! 
+/*!
    @ingroup appkit
    @class CPSearchField
    The CPSearchField class defines the programmatic interface for text fields that are optimized for text-based searches. A CPSearchField object directly inherits from the CPTextField class. The search field implemented by these classes presents a standard user interface for searches, including a search button, a cancel button, and a pop-up icon menu for listing recent search strings and custom search categories.

-    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.    
+    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.
 */
@implementation CPSearchField : CPTextField
 {
@@ -58,7 +57,7 @@ var RECENT_SEARCH_PREFIX = @"   ";

    CPString    _recentsAutosaveName;
    CPArray     _recentSearches;
-    
+
    int         _maximumRecents;
    BOOL        _sendsWholeSearchString;
    BOOL        _sendsSearchStringImmediately;
@@ -73,7 +72,7 @@ var RECENT_SEARCH_PREFIX = @"   ";

 + (void)initialize
 {
-    if (self != [CPSearchField class])
+    if (self !== [CPSearchField class])
        return;

    var bundle = [CPBundle bundleForClass:self];
@@ -96,9 +95,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 #if PLATFORM(DOM)
        _cancelButton._DOMElement.style.cursor = "default";
        _searchButton._DOMElement.style.cursor = "default";
-#endif          
+#endif
    }
-    
+
    return self;
 }

@@ -110,34 +109,45 @@ var RECENT_SEARCH_PREFIX = @"   ";
    [self setBezelStyle:CPTextFieldRoundedBezel];
    [self setBordered:YES];
    [self setEditable:YES];
-    [self setDelegate:self];
    [self setContinuous:YES];
-    
+
    var bounds = [self bounds],
        cancelButton = [[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]],
        searchButton = [[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]];
-        
+
    [self setCancelButton:cancelButton];
    [self resetCancelButton];
-    
+
    [self setSearchButton:searchButton];
    [self resetSearchButton];
-    
+
    _canResignFirstResponder = YES;
 }

+- (void)viewWillMoveToSuperview:(CPView)aView
+{
+    [super viewWillMoveToSuperview:aView];
+
+    // First we remove any observer that may have been in place to avoid memory leakage.
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:self];
+
+    // Register the observe here if we need to.
+    if (aView)
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
+}
+
 // Managing Buttons
 /*!
    Sets the button used to display the search-button image
    @param button The search button.
 */
 - (void)setSearchButton:(CPButton)button
-{ 
+{
    if (button != _searchButton)
    {
        [_searchButton removeFromSuperview];
        _searchButton = button;
-        
+
        [_searchButton setFrame:[self searchButtonRectForBounds:[self bounds]]];
        [_searchButton setAutoresizingMask:CPViewMaxXMargin];
        [self addSubview:_searchButton];
@@ -161,9 +171,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    var button = [self searchButton],
        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
-    
+
    [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
+    [button setImageScaling:CPImageScaleAxesIndependently];
    [button setImage:searchButtonImage];
    [button setAutoresizingMask:CPViewMaxXMargin];
 }
@@ -178,11 +188,11 @@ var RECENT_SEARCH_PREFIX = @"   ";
    {
        [_cancelButton removeFromSuperview];
        _cancelButton = button;
-        
+
        [_cancelButton setFrame:[self cancelButtonRectForBounds:[self bounds]]];
        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
        [_cancelButton setTarget:self];
-        [_cancelButton setAction:@selector(_searchFieldCancel:)];   
+        [_cancelButton setAction:@selector(cancelOperation:)];
        [self _updateCancelButtonVisibility];
        [self addSubview:_cancelButton];
    }
@@ -199,18 +209,18 @@ var RECENT_SEARCH_PREFIX = @"   ";

 /*!
    Resets the cancel button to its default attributes.
-    This method resets the target, action, regular image, and pressed image. By default, when users click the cancel button, the delete: action message is sent up the responder chain. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
+    This method resets the target, action, regular image, and pressed image. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
 */
 - (void)resetCancelButton
 {
    var button = [self cancelButton];
    [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
+    [button setImageScaling:CPImageScaleAxesIndependently];
    [button setImage:CPSearchFieldCancelImage];
    [button setAlternateImage:CPSearchFieldCancelPressedImage];
    [button setAutoresizingMask:CPViewMinXMargin];
    [button setTarget:self];
-    [button setAction:@selector(_searchFieldCancel:)];
+    [button setAction:@selector(cancelOperation:)];
 }

 // Custom Layout
@@ -222,22 +232,22 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchTextRectForBounds:(CGRect)rect
 {
-    var leftOffset = 0, 
+    var leftOffset = 0,
        width = _CGRectGetWidth(rect),
        bounds = [self bounds];
-    
+
    if (_searchButton)
    {
        var searchBounds = [self searchButtonRectForBounds:bounds];
        leftOffset = _CGRectGetMaxX(searchBounds) + 2;
    }
-    
+
    if (_cancelButton)
    {
        var cancelRect = [self cancelButtonRectForBounds:bounds];
        width = _CGRectGetMinX(cancelRect) - leftOffset;
    }
-    
+
    return _CGRectMake(leftOffset, _CGRectGetMinY(rect), width, _CGRectGetHeight(rect));
 }

@@ -257,7 +267,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
    Subclasses can override this method to return a new bounding rectangle for the cancel button. You might use this method to provide a custom layout for the search field control.
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
-{    
+{
    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
 }

@@ -279,7 +289,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)setSearchMenuTemplate:(CPMenu)aMenu
 {
    _searchMenuTemplate = aMenu;
-    
+
    [self resetSearchButton];
    [self _loadRecentSearchList];
    [self _updateSearchMenu];
@@ -291,8 +301,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
    @return \c YES if the action message is sent all at once when the user clicks the search button or presses return; otherwise, NO if the search string is sent after each keystroke. The default value is NO.
 */
 - (BOOL)sendsWholeSearchString
-{ 
-    return _sendsWholeSearchString; 
+{
+    return _sendsWholeSearchString;
 }

 /*!
@@ -309,8 +319,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
    @return \c YES if the text field sends its action immediately upon notification of any changes to the search field; otherwise, NO.
 */
 - (BOOL)sendsSearchStringImmediately
-{ 
-    return _sendsSearchStringImmediately; 
+{
+    return _sendsSearchStringImmediately;
 }

 /*!
@@ -328,7 +338,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
    @return The maximum number of search strings that can appear in the menu. This value is between 0 and 254.
 */
 - (int)maximumRecents
-{ 
+{
    return _maximumRecents;
 }

@@ -342,13 +352,13 @@ var RECENT_SEARCH_PREFIX = @"   ";
        max = 254;
    else if (max < 0)
        max = 10;
-    
+
    _maximumRecents = max;
 }

 /*!
    Returns the list of recent search strings for the control.
-    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty. 
+    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty.
 */
 - (CPArray)recentSearches
 {
@@ -364,8 +374,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    var max = MIN([self maximumRecents], [searches count]),
        searches = [searches subarrayWithRange:CPMakeRange(0, max)];
-    
-    _recentSearches = searches;    
+
+    _recentSearches = searches;
    [self _autosaveRecentSearchList];
 }

@@ -375,7 +385,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CPString)recentsAutosaveName
 {
-    return _recentsAutosaveName; 
+    return _recentsAutosaveName;
 }

 /*!
@@ -386,9 +396,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    if (_recentsAutosaveName != nil)
        [self _deregisterForAutosaveNotification];
-        
+
    _recentsAutosaveName = name;
-    
+
    if (_recentsAutosaveName != nil)
      [self _registerForAutosaveNotification];
 }
@@ -397,13 +407,13 @@ var RECENT_SEARCH_PREFIX = @"   ";

 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
-    var superbounds = [super contentRectForBounds:bounds];    
+    var superbounds = [super contentRectForBounds:bounds];
    return [self searchTextRectForBounds:superbounds];
 }

 + (double)_keyboardDelayForPartialSearchString:(CPString)string
 {
-    return (6 - MIN([string length],4))/10;
+    return (6 - MIN([string length], 4)) / 10;
 }

 - (CPMenu)menu
@@ -421,7 +431,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
    [_cancelButton setHidden:([[self stringValue] length] === 0)];
 }

- (void)controlTextDidChange:(CPNotification)aNotification
+- (void)_searchFieldTextDidChange:(CPNotification)aNotification
 {
    if (![self sendsWholeSearchString])
    {
@@ -431,15 +441,15 @@ var RECENT_SEARCH_PREFIX = @"   ";
        {
            [_partialStringTimer invalidate];
            var timeInterval = [CPSearchField _keyboardDelayForPartialSearchString:[self stringValue]];
-    
-            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval 
-                                                                   target:self 
-                                                                 selector:@selector(_sendPartialString) 
-                                                                 userInfo:nil 
-                                                                  repeats:NO];         
+
+            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval
+                                                                   target:self
+                                                                 selector:@selector(_sendPartialString)
+                                                                 userInfo:nil
+                                                                  repeats:NO];
        }
    }
-    
+
    [self _updateCancelButtonVisibility];
 }

@@ -462,7 +472,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    if (string === nil || string === @"" || [_recentSearches containsObject:string])
        return;
-        
+
    var searches = [CPMutableArray arrayWithArray:_recentSearches];
    [searches addObject:string];
    [self setRecentSearches:searches];
@@ -471,7 +481,7 @@ var RECENT_SEARCH_PREFIX = @"   ";

 - (CPView)hitTest:(CGPoint)aPoint
 {
-    // Make sure a hit anywhere within the search field returns the search field itself    
+    // Make sure a hit anywhere within the search field returns the search field itself
    if (_CGRectContainsPoint([self frame], aPoint))
        return self;
    else
@@ -493,8 +503,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
        if (_searchMenuTemplate == nil)
            [self _sendAction:self];
        else
-           [self _showMenu];  
-    }        
+           [self _showMenu];
+    }
    else if (_CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
        [_cancelButton mouseDown:anEvent];
    else
@@ -504,69 +514,69 @@ var RECENT_SEARCH_PREFIX = @"   ";
 /*!
    Provides the common case items for a recent searches menu. If there are not recent searches,
    displays a single disabled item:
-    
+
        No Recent Searches
-        
+
    If there are 1 more recent searches, it displays:
-    
+
        Recent Searches
           recent search 1
           recent search 2
           etc.
        ---------------------
        Clear Recent Searches
-        
+
    If you wish to add items before or after the template, you can. If you put items
    before, a separator will automatically be placed before the default template item.
    If you add items after the default template, it is your responsibility to add a separator.
-    
+
    To add a custom item:

-    item = [[CPMenuItem alloc] initWithTitle:@"google" 
-                                      action:@selector(google:) 
+    item = [[CPMenuItem alloc] initWithTitle:@"google"
+                                      action:@selector(google:)
                               keyEquivalent:@""];
    [item setTag:700];
    [item setTarget:self];
    [template addItem:item];
-        
-    Be sure that your custom items do not use tags in the range 1000-1004 inclusive.
+
+    Be sure that your custom items do not use tags in the range 1000-1003 inclusive.
    If you wish to maintain state in custom menu items that you add, you will need to maintain
    the item state yourself, then in the action method of the custom items, modify the items
    in the search menu template and send [searchField setSearchMenuTemplate:template] to update the menu.
 */
 - (CPMenu)defaultSearchMenuTemplate
 {
-    var template = [[CPMenu alloc] init], 
+    var template = [[CPMenu alloc] init],
        item;
-        
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent Searches" 
-                                      action:nil 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent Searches"
+                                      action:nil
                               keyEquivalent:@""];
    [item setTag:CPSearchFieldRecentsTitleMenuItemTag];
    [item setEnabled:NO];
    [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item" 
-                                      action:@selector(_searchFieldSearch:) 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item"
+                                      action:@selector(_searchFieldSearch:)
                               keyEquivalent:@""];
    [item setTag:CPSearchFieldRecentsMenuItemTag];
    [item setTarget:self];
    [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Clear Recent Searches" 
-                                      action:@selector(_searchFieldClearRecents:) 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"Clear Recent Searches"
+                                      action:@selector(_searchFieldClearRecents:)
                               keyEquivalent:@""];
    [item setTag:CPSearchFieldClearRecentsMenuItemTag];
    [item setTarget:self];
    [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"No Recent Searches" 
-                                      action:nil 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"No Recent Searches"
+                                      action:nil
                               keyEquivalent:@""];
    [item setTag:CPSearchFieldNoRecentsMenuItemTag];
    [item setEnabled:NO];
    [template addItem:item];
-    
+
    return template;
 }

@@ -574,72 +584,66 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    if (_searchMenuTemplate === nil)
        return;
-        
+
    var menu = [[CPMenu alloc] init],
        countOfRecents = [_recentSearches count],
        numberOfItems = [_searchMenuTemplate numberOfItems];
-    
+
    for (var i = 0; i < numberOfItems; i++)
    {
        var item = [[_searchMenuTemplate itemAtIndex:i] copy];
-            
+
        switch ([item tag])
        {
            case CPSearchFieldRecentsTitleMenuItemTag:
                if (countOfRecents === 0)
                    continue;
-                    
+
                if ([menu numberOfItems] > 0)
                    [self _addSeparatorToMenu:menu];
                break;
-                
+
            case CPSearchFieldRecentsMenuItemTag:
            {
                var itemAction = @selector(_searchFieldSearch:);
-                
+
                for (var recentIndex = 0; recentIndex < countOfRecents; ++recentIndex)
                {
                    // RECENT_SEARCH_PREFIX is a hack until CPMenuItem -setIndentationLevel works
-                    var recentItem = [[CPMenuItem alloc] initWithTitle:RECENT_SEARCH_PREFIX + [_recentSearches objectAtIndex:recentIndex] 
-                                                                 action:itemAction 
+                    var recentItem = [[CPMenuItem alloc] initWithTitle:RECENT_SEARCH_PREFIX + [_recentSearches objectAtIndex:recentIndex]
+                                                                 action:itemAction
                                                          keyEquivalent:[item keyEquivalent]];
                    [item setTarget:self];
                    [menu addItem:recentItem];
                }
-                
+
                continue;
            }
-                
+
            case CPSearchFieldClearRecentsMenuItemTag:
                if (countOfRecents === 0)
                    continue;
-                    
+
                if ([menu numberOfItems] > 0)
                    [self _addSeparatorToMenu:menu];
-                    
+
                [item setAction:@selector(_searchFieldClearRecents:)];
                [item setTarget:self];
                break;
-                
+
            case CPSearchFieldNoRecentsMenuItemTag:
                if (countOfRecents !== 0)
                    continue;
-                    
+
                if ([menu numberOfItems] > 0)
                    [self _addSeparatorToMenu:menu];
                break;
-                
-            case CPSearchFieldSeparatorMenuItemTag:
-                item = [CPMenuItem separatorItem];
-                [item setEnabled:NO];
-                [menu addItem:item];
-                continue;
-        }
-        
+            }
+
        [item setEnabled:([item isEnabled] && [item action] != nil && [item target] != nil)];
        [menu addItem:item];
    }
-    
+
    [menu setDelegate:self];

    _searchMenu = menu;
@@ -660,7 +664,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)menuDidClose:(CPMenu)menu
 {
    _canResignFirstResponder = YES;
-    
+
    [self becomeFirstResponder];
 }

@@ -668,12 +672,12 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled])
        return;
-        
+
    var aFrame = [[self superview] convertRect:[self frame] toView:nil],
        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
-    
+
    var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
-    
+
    [self selectAll:nil];
    [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:self];
 }
@@ -684,24 +688,25 @@ var RECENT_SEARCH_PREFIX = @"   ";
    [_partialStringTimer invalidate];
 }

- (void)_searchFieldCancel:(id)sender
-{   
+- (void)cancelOperation:(id)sender
+{
    [self setObjectValue:@""];
-    [self _sendPartialString];
+    [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
+
    [self _updateCancelButtonVisibility];
 }

 - (void)_searchFieldSearch:(id)sender
 {
    var searchString = [[sender title] substringFromIndex:[RECENT_SEARCH_PREFIX length]];
-    
+
    if ([sender tag] != CPSearchFieldRecentsMenuItemTag)
        [self _addStringToRecentSearches:searchString];
-    
+
    [self setObjectValue:searchString];
    [self _sendPartialString];
    [self selectAll:nil];
-    
+
    [self _updateCancelButtonVisibility];
 }

@@ -715,54 +720,36 @@ var RECENT_SEARCH_PREFIX = @"   ";

 - (void)_registerForAutosaveNotification
 {
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:@"CPAutosavedRecentsChangedNotification" object:nil];
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
 }

 - (void)_deregisterForAutosaveNotification
 {
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:@"CPAutosavedRecentsChangedNotification" object:nil];
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
 }

 - (void)_autosaveRecentSearchList
-{  
-    if (_recentsAutosaveName != nil) 
-        [[CPNotificationCenter defaultCenter] postNotificationName:@"CPAutosavedRecentsChangedNotification" object:_recentsAutosaveName];
+{
+    if (_recentsAutosaveName != nil)
+        [[CPNotificationCenter defaultCenter] postNotificationName:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
 }

 - (void)_updateAutosavedRecents:(id)notification
 {
-    var list = [self recentSearches],
-        name = [notification object],
-        bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
-        cookie_name = [bundle_name lowercaseString] + "." + [notification object],
-
-        cookie = [[CPCookie alloc] initWithName:cookie_name],
-        cookie_value = [list componentsJoinedByString:@","];
-    
-    [cookie setValue:cookie_value 
-             expires:[[CPDate alloc] initWithTimeIntervalSinceNow:3600*24*365] 
-              domain:(window.location.href.hostname)];
+    var name = [notification object];
+    [[CPUserDefaults standardUserDefaults] setObject:_recentSearches forKey:name];
 }

 - (void)_loadRecentSearchList
 {
-    var list,
-        name = [self recentsAutosaveName];
-    
+    var name = [self recentsAutosaveName];
    if (name === nil)
        return;

-    var bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
-        cookie_name = [bundle_name lowercaseString] + "." + name,     
+    var list = [[CPUserDefaults standardUserDefaults] objectForKey:name];

-        cookie = [[CPCookie alloc] initWithName:cookie_name];
-
-    if (cookie != nil)
-    {
-        var cookie_value = [cookie value];
-        list = (cookie_value != @"") ? [cookie_value componentsSeparatedByString:@","] : [CPArray array];
+    if (list !== nil)
        _recentSearches = list;
-    }
 }

@end
@@ -780,7 +767,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
    [_searchButton removeFromSuperview];
    [_cancelButton removeFromSuperview];

-    [super encodeWithCoder:coder];    
+    [super encodeWithCoder:coder];

    if (_searchButton)
        [self addSubview:_searchButton];
@@ -793,7 +780,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",

    if (_recentsAutosaveName)
        [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
-        
+
    if (_searchMenuTemplate)
        [coder encodeObject:_searchMenuTemplate forKey:CPSearchMenuTemplateKey];
 }
@@ -802,16 +789,16 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
 {
    if (self = [super initWithCoder:coder])
    {
-        _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
+        [self setRecentsAutosaveName:[coder decodeObjectForKey:CPRecentsAutosaveNameKey]];
        _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
        _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
        _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
-        
+
        var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
-        
+
        if (template)
            [self setSearchMenuTemplate:template];
-            
+
        [self _init];
    }

@@ -1,3 +1,24 @@
+/*
+ * CPSecureTextField.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */

@import "CPTextField.j"

@@ -55,7 +55,7 @@ CPSegmentSwitchTrackingMomentary = 2;

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPImageScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
                                       forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
 }

@@ -94,7 +94,9 @@ CPSegmentSwitchTrackingMomentary = 2;
    if (_segments.length == aCount)
        return;

-    var height = CGRectGetHeight([self bounds]);
+    var height = CGRectGetHeight([self bounds]),
+        dividersBefore = MAX(0, _segments.length - 1),
+        dividersAfter = MAX(0, aCount - 1);

    if (_segments.length < aCount)
    {
@@ -113,6 +115,14 @@ CPSegmentSwitchTrackingMomentary = 2;
    if (_selectedSegment >= _segments.length)
        _selectedSegment = -1;

+    // Make space for/remove space used by dividers.
+    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
+        delta = thickness * (dividersAfter - dividersBefore),
+        frame = [self frame];
+
+    if (delta)
+        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
+
    [self tileWithChangedSegment:0];
 }

@@ -351,9 +361,9 @@ CPSegmentSwitchTrackingMomentary = 2;
 }

 /*!
-    Enables/diables the specified segment.
+    Enables/disables the specified segment.
    @param isEnabled \c YES enables the segment
-    @param aSegment the segment to enable/disble
+    @param aSegment the segment to enable/disable
    @throws CPRangeException if \c aSegment is out of bounds
 */
 - (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
@@ -607,7 +617,7 @@ CPSegmentSwitchTrackingMomentary = 2;
        segmentWidth = [segment width],
        themeState = _themeStates[aSegment] | (_themeState & CPThemeStateDisabled),
        contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
-        font = [self valueForThemeAttribute:@"font" inState:themeState];
+        font = [self font];

    if (!segmentWidth)
    {
@@ -23,8 +23,8 @@
@import <Foundation/CPObject.j>


-/*! 
-    @deprecated 
+/*!
+    @deprecated
    @class CPShadow

    Instances of this class contain the attributes of a drop shadow used in Cappuccino.
@@ -34,7 +34,7 @@
    CPSize      _offset;
    float       _blurRadius;
    CPColor     _color;
-    
+
    CPString    _cssString;
 }

@@ -54,16 +54,16 @@
 - (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
    self = [super init];
-    
+
    if (self)
    {
        _offset = anOffset;
        _blurRadius = aBlurRadius;
        _color = aColor;
-        
-        _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
+
+        _cssString = [_color cssString] + " " + ROUND(anOffset.width) + @"px " + ROUND(anOffset.height) + @"px " + ROUND(_blurRadius) + @"px";
    }
-    
+
    return self;
 }

@@ -47,7 +47,6 @@ var LIGHT_LEFT_INSET    = 3.0,
 /*!
    @ingroup appkit
 */
-
@implementation CPShadowView : CPView
 {
    CPShadowWeight  _weight;
@@ -55,40 +54,38 @@ var LIGHT_LEFT_INSET    = 3.0,

 + (void)initialize
 {
-    if (self != [CPShadowView class])
+    if (self !== [CPShadowView class])
        return;

    var bundle = [CPBundle bundleForClass:[self class]];

-    CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
+    CPShadowViewLightBackgroundColor = CPColorWithImages([
+        [@"CPShadowView/CPShadowViewLightTopLeft.png", 9.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightTop.png", 1.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightTopRight.png", 9.0, 9.0, bundle],

-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
-            nil,
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
+        [@"CPShadowView/CPShadowViewLightLeft.png", 9.0, 1.0, bundle],
+        nil,
+        [@"CPShadowView/CPShadowViewLightRight.png", 9.0, 1.0, bundle],

-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
-        ]]];
+        [@"CPShadowView/CPShadowViewLightBottomLeft.png", 9.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightBottom.png", 1.0, 9.0, bundle],
+        [@"CPShadowView/CPShadowViewLightBottomRight.png", 9.0, 9.0, bundle]
+    ]);

-    CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
+    CPShadowViewHeavyBackgroundColor = CPColorWithImages([
+        [@"CPShadowView/CPShadowViewHeavyTopLeft.png", 17.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyTop.png", 1.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyTopRight.png", 17.0, 17.0, bundle],

-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
-            nil,
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
+        [@"CPShadowView/CPShadowViewHeavyLeft.png", 17.0, 1.0, bundle],
+        nil,
+        [@"CPShadowView/CPShadowViewHeavyRight.png", 17.0, 1.0, bundle],

-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
-        ]]];
+        [@"CPShadowView/CPShadowViewHeavyBottomLeft.png", 17.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyBottom.png", 1.0, 17.0, bundle],
+        [@"CPShadowView/CPShadowViewHeavyBottomRight.png", 17.0, 17.0, bundle]
+    ]);
 }

 + (id)shadowViewEnclosingView:(CPView)aView
@@ -98,20 +95,24 @@ var LIGHT_LEFT_INSET    = 3.0,

 + (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
 {
-    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
-    [shadowView setWeight:aWeight];
+    var shadowView = [[self alloc] initWithFrame:[aView frame]];

-    var size = [shadowView frame].size,
-        width = size.width - [shadowView leftInset] - [shadowView rightInset],
-        height = size.height - [shadowView topInset] - [shadowView bottomInset],
-        enclosingView = [aView superview];
+    if (shadowView)
+    {
+        [shadowView setWeight:aWeight];

-    [shadowView setHitTests:[aView hitTests]];
-    [shadowView setAutoresizingMask:[aView autoresizingMask]];
-    [aView removeFromSuperview];
-    [shadowView addSubview:aView];
-    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
-    [enclosingView addSubview:shadowView];
+        var size = [shadowView frame].size,
+            width = size.width - [shadowView leftInset] - [shadowView rightInset],
+            height = size.height - [shadowView topInset] - [shadowView bottomInset],
+            enclosingView = [aView superview];
+
+        [shadowView setHitTests:[aView hitTests]];
+        [shadowView setAutoresizingMask:[aView autoresizingMask]];
+        [aView removeFromSuperview];
+        [shadowView addSubview:aView];
+        [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
+        [enclosingView addSubview:shadowView];
+    }

    return shadowView;
 }
@@ -382,9 +382,14 @@ CPCircularSlider    = 1;
    [self setNeedsDisplay:YES];
 }

+- (BOOL)isContinuous
+{
+    return (_sendActionOn & CPLeftMouseDraggedMask) !== 0;
+}
+
 /*!
    @ignore
-    shoudl we have _continuous?
+    should we have _continuous?
 */
 - (void)setContinuous:(BOOL)flag
 {
@@ -425,8 +430,6 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
    {
        _altIncrementValue = [aCoder decodeDoubleForKey:CPSliderAltIncrValueKey];

-        [self setContinuous:YES];
-
        [self _recalculateIsVertical];

        [self setNeedsLayout];
@@ -28,16 +28,16 @@
    @ignore
 */
@implementation CPSliderColorPicker : CPColorPicker
-{    
+{
    CPView      _contentView;
-    
+
    CPSlider    _redSlider;
    CPSlider    _greenSlider;
    CPSlider    _blueSlider;
    CPSlider    _hueSlider;
    CPSlider    _saturationSlider;
    CPSlider    _brightnessSlider;
-    
+
    CPTextField _rgbLabel;
    CPTextField _hsbLabel;
    CPTextField _redLabel;
@@ -58,234 +58,234 @@
    CPTextField _brightnessValue;
 }

- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
+- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
 {
-    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
+    return [super initWithPickerMask:mask colorPanel:owningColorPanel];
 }
-  
-(id)initView
+
+- (id)initView
 {
-    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);    
-    
+    aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+
    _contentView = [[CPView alloc] initWithFrame:aFrame];
-    [_contentView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-    
-    _rgbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 10, 100, 20)];
-    [_rgbLabel setStringValue: "Red, Green, Blue"];
+    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+    _rgbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 10, 100, 20)];
+    [_rgbLabel setStringValue:"Red, Green, Blue"];
    [_rgbLabel setTextColor:[CPColor blackColor]];

-    _redLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 35, 15, 20)];
-    [_redLabel setStringValue: "R"];
+    _redLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 37, 15, 20)];
+    [_redLabel setStringValue:"R"];
    [_redLabel setTextColor:[CPColor blackColor]];
-    
-    _redSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 35, aFrame.size.width - 70, 20)];
-    [_redSlider setMaxValue: 1.0];
-    [_redSlider setMinValue: 0.0];
-    [_redSlider setTarget: self];
-    [_redSlider setAction: @selector(sliderChanged:)];
-    [_redSlider setAutoresizingMask: CPViewWidthSizable];
+
+    _redSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 35, aFrame.size.width - 70, 20)];
+    [_redSlider setMaxValue:1.0];
+    [_redSlider setMinValue:0.0];
+    [_redSlider setTarget:self];
+    [_redSlider setAction:@selector(sliderChanged:)];
+    [_redSlider setAutoresizingMask:CPViewWidthSizable];

    // red value input box
-    _redValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 30, 45, 29)];
-    [_redValue setAutoresizingMask: CPViewMinXMargin];
-    [_redValue setEditable: YES];
-    [_redValue setBezeled: YES];
-    [_redValue setDelegate: self];
-    [_contentView addSubview: _redValue];
+    _redValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 30, 45, 28)];
+    [_redValue setAutoresizingMask:CPViewMinXMargin];
+    [_redValue setEditable:YES];
+    [_redValue setBezeled:YES];
+    [_redValue setDelegate:self];
+    [_contentView addSubview:_redValue];

-    _greenLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 58, 15, 20)];
-    [_greenLabel setStringValue: "G"];
+    _greenLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 63, 15, 20)];
+    [_greenLabel setStringValue:"G"];
    [_greenLabel setTextColor:[CPColor blackColor]];

-    _greenSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 58, aFrame.size.width - 70, 20)];
-    [_greenSlider setMaxValue: 1.0];
-    [_greenSlider setMinValue: 0.0];
-    [_greenSlider setTarget: self];
-    [_greenSlider setAction: @selector(sliderChanged:)];
-    [_greenSlider setAutoresizingMask: CPViewWidthSizable];
+    _greenSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 61, aFrame.size.width - 70, 20)];
+    [_greenSlider setMaxValue:1.0];
+    [_greenSlider setMinValue:0.0];
+    [_greenSlider setTarget:self];
+    [_greenSlider setAction:@selector(sliderChanged:)];
+    [_greenSlider setAutoresizingMask:CPViewWidthSizable];

    // green value input box
-    _greenValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 53, 45, 29)];
-    [_greenValue setAutoresizingMask: CPViewMinXMargin];
-    [_greenValue setEditable: YES];
-    [_greenValue setBezeled: YES];
-    [_greenValue setDelegate: self];
-    [_contentView addSubview: _greenValue];
+    _greenValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 56, 45, 28)];
+    [_greenValue setAutoresizingMask:CPViewMinXMargin];
+    [_greenValue setEditable:YES];
+    [_greenValue setBezeled:YES];
+    [_greenValue setDelegate:self];
+    [_contentView addSubview:_greenValue];

-    _blueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 81, 15, 20)];
-    [_blueLabel setStringValue: "B"];
+    _blueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 90, 15, 20)];
+    [_blueLabel setStringValue:"B"];
    [_blueLabel setTextColor:[CPColor blackColor]];

-    _blueSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 81, aFrame.size.width - 70, 20)];
-    [_blueSlider setMaxValue: 1.0];
-    [_blueSlider setMinValue: 0.0];
-    [_blueSlider setTarget: self];
-    [_blueSlider setAction: @selector(sliderChanged:)];
-    [_blueSlider setAutoresizingMask: CPViewWidthSizable];
+    _blueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 87, aFrame.size.width - 70, 20)];
+    [_blueSlider setMaxValue:1.0];
+    [_blueSlider setMinValue:0.0];
+    [_blueSlider setTarget:self];
+    [_blueSlider setAction:@selector(sliderChanged:)];
+    [_blueSlider setAutoresizingMask:CPViewWidthSizable];

    // blue value input box
-    _blueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 76, 45, 29)];
-    [_blueValue setAutoresizingMask: CPViewMinXMargin];
-    [_blueValue setEditable: YES];
-    [_blueValue setBezeled: YES];
-    [_blueValue setDelegate: self];
-    [_contentView addSubview: _blueValue];
+    _blueValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 82, 45, 28)];
+    [_blueValue setAutoresizingMask:CPViewMinXMargin];
+    [_blueValue setEditable:YES];
+    [_blueValue setBezeled:YES];
+    [_blueValue setDelegate:self];
+    [_contentView addSubview:_blueValue];

-    _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
-    [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
+    _hsbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 120, 190, 20)];
+    [_hsbLabel setStringValue:"Hue, Saturation, Brightness"];
    [_hsbLabel setTextColor:[CPColor blackColor]];

-    _hueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 145, 15, 20)];
-    [_hueLabel setStringValue: "H"];
+    _hueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 145, 15, 20)];
+    [_hueLabel setStringValue:"H"];
    [_hueLabel setTextColor:[CPColor blackColor]];
-    
-    _hueSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 145, aFrame.size.width - 70, 20)];
-    [_hueSlider setMaxValue: 359.0];
-    [_hueSlider setMinValue: 0.0];
-    [_hueSlider setTarget: self];
-    [_hueSlider setAction: @selector(sliderChanged:)];
-    [_hueSlider setAutoresizingMask: CPViewWidthSizable];
+
+    _hueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 143, aFrame.size.width - 70, 20)];
+    [_hueSlider setMaxValue:359.0];
+    [_hueSlider setMinValue:0.0];
+    [_hueSlider setTarget:self];
+    [_hueSlider setAction:@selector(sliderChanged:)];
+    [_hueSlider setAutoresizingMask:CPViewWidthSizable];

    // hue value input box
-    _hueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 140, 45, 29)];
-    [_hueValue setAutoresizingMask: CPViewMinXMargin];
-    [_hueValue setEditable: YES];
-    [_hueValue setBezeled: YES];
-    [_hueValue setDelegate: self];
-    [_contentView addSubview: _hueValue];
+    _hueValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 138, 45, 28)];
+    [_hueValue setAutoresizingMask:CPViewMinXMargin];
+    [_hueValue setEditable:YES];
+    [_hueValue setBezeled:YES];
+    [_hueValue setDelegate:self];
+    [_contentView addSubview:_hueValue];

-    _saturationLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 168, 15, 20)];
-    [_saturationLabel setStringValue: "S"];
+    _saturationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 170, 15, 20)];
+    [_saturationLabel setStringValue:"S"];
    [_saturationLabel setTextColor:[CPColor blackColor]];

-    _saturationSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 168, aFrame.size.width - 70, 20)];
-    [_saturationSlider setMaxValue: 100.0];
-    [_saturationSlider setMinValue: 0.0];
-    [_saturationSlider setTarget: self];
-    [_saturationSlider setAction: @selector(sliderChanged:)];
-    [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
+    _saturationSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 168, aFrame.size.width - 70, 20)];
+    [_saturationSlider setMaxValue:100.0];
+    [_saturationSlider setMinValue:0.0];
+    [_saturationSlider setTarget:self];
+    [_saturationSlider setAction:@selector(sliderChanged:)];
+    [_saturationSlider setAutoresizingMask:CPViewWidthSizable];

    // saturation value input box
-    _saturationValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 163, 45, 29)];
-    [_saturationValue setAutoresizingMask: CPViewMinXMargin];
-    [_saturationValue setEditable: YES];
-    [_saturationValue setBezeled: YES];
-    [_saturationValue setDelegate: self];
-    [_contentView addSubview: _saturationValue];
+    _saturationValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 164, 45, 28)];
+    [_saturationValue setAutoresizingMask:CPViewMinXMargin];
+    [_saturationValue setEditable:YES];
+    [_saturationValue setBezeled:YES];
+    [_saturationValue setDelegate:self];
+    [_contentView addSubview:_saturationValue];

-    _brightnessLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 191, 15, 20)];
-    [_brightnessLabel setStringValue: "B"];
+    _brightnessLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 196, 15, 20)];
+    [_brightnessLabel setStringValue:"B"];
    [_brightnessLabel setTextColor:[CPColor blackColor]];

-    _brightnessSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 191, aFrame.size.width - 70, 20)];
-    [_brightnessSlider setMaxValue: 100.0];
-    [_brightnessSlider setMinValue: 0.0];
-    [_brightnessSlider setTarget: self];
-    [_brightnessSlider setAction: @selector(sliderChanged:)];
-    [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 194, aFrame.size.width - 70, 20)];
+    [_brightnessSlider setMaxValue:100.0];
+    [_brightnessSlider setMinValue:0.0];
+    [_brightnessSlider setTarget:self];
+    [_brightnessSlider setAction:@selector(sliderChanged:)];
+    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable];

    // brightness value input box
-    _brightnessValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 186, 45, 29)];
-    [_brightnessValue setAutoresizingMask: CPViewMinXMargin];
-    [_brightnessValue setEditable: YES];
-    [_brightnessValue setBezeled: YES];
-    [_brightnessValue setDelegate: self];
-    [_contentView addSubview: _brightnessValue];
+    _brightnessValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 190, 45, 28)];
+    [_brightnessValue setAutoresizingMask:CPViewMinXMargin];
+    [_brightnessValue setEditable:YES];
+    [_brightnessValue setBezeled:YES];
+    [_brightnessValue setDelegate:self];
+    [_contentView addSubview:_brightnessValue];

-    _hexLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 230, 30, 20)];
-    [_hexLabel setStringValue: "Hex"];
+    _hexLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 230, 30, 20)];
+    [_hexLabel setStringValue:"Hex"];
    [_hexLabel setTextColor:[CPColor blackColor]];

    //hex input box
-    _hexValue = [[CPTextField alloc] initWithFrame: CGRectMake(32, 225, 80, 29)];
-    [_hexValue setEditable: YES];
-    [_hexValue setBezeled: YES];
-    [_hexValue setDelegate: self];
-    [_contentView addSubview: _hexValue];
+    _hexValue = [[CPTextField alloc] initWithFrame:CGRectMake(32, 225, 80, 28)];
+    [_hexValue setEditable:YES];
+    [_hexValue setBezeled:YES];
+    [_hexValue setDelegate:self];
+    [_contentView addSubview:_hexValue];

-    [_contentView addSubview: _rgbLabel];
-    [_contentView addSubview: _redLabel];
-    [_contentView addSubview: _greenLabel];
-    [_contentView addSubview: _blueLabel];
-    [_contentView addSubview: _redSlider];
-    [_contentView addSubview: _greenSlider];
-    [_contentView addSubview: _blueSlider];
-    
-    [_contentView addSubview: _hsbLabel];
-    [_contentView addSubview: _hueLabel];
-    [_contentView addSubview: _saturationLabel];
-    [_contentView addSubview: _brightnessLabel];
-    [_contentView addSubview: _hueSlider];
-    [_contentView addSubview: _saturationSlider];
-    [_contentView addSubview: _brightnessSlider];
-    
-    [_contentView addSubview: _hexLabel];
+    [_contentView addSubview:_rgbLabel];
+    [_contentView addSubview:_redLabel];
+    [_contentView addSubview:_greenLabel];
+    [_contentView addSubview:_blueLabel];
+    [_contentView addSubview:_redSlider];
+    [_contentView addSubview:_greenSlider];
+    [_contentView addSubview:_blueSlider];
+
+    [_contentView addSubview:_hsbLabel];
+    [_contentView addSubview:_hueLabel];
+    [_contentView addSubview:_saturationLabel];
+    [_contentView addSubview:_brightnessLabel];
+    [_contentView addSubview:_hueSlider];
+    [_contentView addSubview:_saturationSlider];
+    [_contentView addSubview:_brightnessSlider];
+
+    [_contentView addSubview:_hexLabel];
 }

- (CPView)provideNewView:(BOOL)initialRequest 
+- (CPView)provideNewView:(BOOL)initialRequest
 {
-    if (initialRequest) 
+    if (initialRequest)
        [self initView];
-    
+
    return _contentView;
 }

- (int)currentMode 
+- (int)currentMode
 {
    return CPSliderColorPickerMode;
 }

- (BOOL)supportsMode:(int)mode 
+- (BOOL)supportsMode:(int)mode
 {
    return (mode == CPSliderColorPickerMode) ? YES : NO;
 }

-(void)sliderChanged:(id)sender
+- (void)sliderChanged:(id)sender
 {
    var newColor,
        colorPanel = [self colorPanel],
        alpha = [colorPanel opacity];

-    switch(sender)
+    switch (sender)
    {
        case    _hueSlider:
        case    _saturationSlider:
-        case    _brightnessSlider:      newColor = [CPColor colorWithHue: [_hueSlider floatValue]
-                                                              saturation: [_saturationSlider floatValue]
-                                                              brightness: [_brightnessSlider floatValue]
-                                                                   alpha: alpha];
-                                                              
-                                        [self updateRGBSliders: newColor];
+        case    _brightnessSlider:      newColor = [CPColor colorWithHue:[_hueSlider floatValue]
+                                                              saturation:[_saturationSlider floatValue]
+                                                              brightness:[_brightnessSlider floatValue]
+                                                                   alpha:alpha];
+
+                                        [self updateRGBSliders:newColor];
                                        break;
-                                        
+
        case    _redSlider:
        case    _greenSlider:
-        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue]
-                                                                             green: [_greenSlider floatValue]
-                                                                              blue: [_blueSlider floatValue]
-                                                                             alpha: alpha];
-                                                              
-                                        [self updateHSBSliders: newColor];
+        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed:[_redSlider floatValue]
+                                                                             green:[_greenSlider floatValue]
+                                                                              blue:[_blueSlider floatValue]
+                                                                             alpha:alpha];
+
+                                        [self updateHSBSliders:newColor];
                                        break;
    }
-        
+
    [self updateLabels];
-    [self updateHex: newColor];
-    [colorPanel setColor: newColor];
+    [self updateHex:newColor];
+    [colorPanel setColor:newColor];
 }

-(void)setColor:(CPColor)aColor
+- (void)setColor:(CPColor)aColor
 {
-    [self updateRGBSliders: aColor];
-    [self updateHSBSliders: aColor];
-    [self updateHex: aColor];
+    [self updateRGBSliders:aColor];
+    [self updateHSBSliders:aColor];
+    [self updateHex:aColor];
    [self updateLabels];
 }

-(void)updateHSBSliders:(CPColor)aColor
+- (void)updateHSBSliders:(CPColor)aColor
 {
    var hsb = [aColor hsbComponents];
-        
+
    [_hueSlider setFloatValue:hsb[0]];
    [_saturationSlider setFloatValue:hsb[1]];
    [_brightnessSlider setFloatValue:hsb[2]];
@@ -307,13 +307,13 @@

 - (void)updateLabels
 {
-    [_hueValue setStringValue: ROUND([_hueSlider floatValue])];
-    [_saturationValue setStringValue: ROUND([_saturationSlider floatValue])];
-    [_brightnessValue setStringValue: ROUND([_brightnessSlider floatValue])];
-    
-    [_redValue setStringValue: ROUND([_redSlider floatValue] * 255)];
-    [_greenValue setStringValue: ROUND([_greenSlider floatValue] * 255)];
-    [_blueValue setStringValue: ROUND([_blueSlider floatValue] * 255)];
+    [_hueValue setStringValue:ROUND([_hueSlider floatValue])];
+    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue])];
+    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue])];
+
+    [_redValue setStringValue:ROUND([_redSlider floatValue] * 255)];
+    [_greenValue setStringValue:ROUND([_greenSlider floatValue] * 255)];
+    [_blueValue setStringValue:ROUND([_blueSlider floatValue] * 255)];
 }

 - (CPImage)provideNewButtonImage
@@ -330,36 +330,43 @@
 {
    var field = [aNotification object],
        value = [[field stringValue] stringByTrimmingWhitespace];
-    if (field === _hexValue) {
-        var newColor = [CPColor colorWithHexString: value];
-        if (newColor) {
-            [self setColor: newColor];
-            [[self colorPanel] setColor: newColor];
+
+    if (field === _hexValue)
+    {
+        var newColor = [CPColor colorWithHexString:value];
+
+        if (newColor)
+        {
+            [self setColor:newColor];
+            [[self colorPanel] setColor:newColor];
        }
-    } else {
-        switch(field) {
+    }
+    else
+    {
+        switch (field)
+        {
            case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged: _redSlider];
+                                   [self sliderChanged:_redSlider];
                                   break;

            case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged: _greenSlider];
+                                   [self sliderChanged:_greenSlider];
                                   break;

            case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged: _blueSlider];
+                                   [self sliderChanged:_blueSlider];
                                   break;

            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
-                                   [self sliderChanged: _hueSlider];
+                                   [self sliderChanged:_hueSlider];
                                   break;

            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged: _saturationSlider];
+                                   [self sliderChanged:_saturationSlider];
                                   break;

            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged: _brightnessSlider];
+                                   [self sliderChanged:_brightnessSlider];
                                   break;
        }
    }
@@ -0,0 +1,317 @@
+/*
+ * CPSound.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal
+ * Copyright 2010, Antoine Mercadal
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+CPSoundLoadStateEmpty       = 0;
+CPSoundLoadStateLoading     = 1;
+CPSoundLoadStateCanBePlayed = 2;
+CPSoundLoadStateError       = 3;
+
+CPSoundPlayBackStatePlay    = 0;
+CPSoundPlayBackStateStop    = 1;
+CPSoundPlayBackStatePause   = 2;
+
+
+/*!
+    CPSound provides a way to load and play sounds. In the browser it relies on the
+    HTML5 audio tag being available.
+
+    CPSound delegate:
+        - sound:didFinishPlaying: called when sound has finished to played
+
+*/
+@implementation CPSound : CPObject
+{
+    CPString            _name       @accessors(property=name);
+    id                  _delegate   @accessors(property=delegate);
+
+    BOOL                _playRequestBeforeLoad;
+    HTMLAudioElement    _audioTag;
+    int                 _loadStatus;
+    int                 _playBackStatus;
+}
+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _loadStatus = CPSoundLoadStateEmpty;
+        _loops = NO;
+        _audioTag = document.createElement("audio");
+        _audioTag.preload = YES;
+        _playRequestBeforeLoad = NO;
+
+        _audioTag.addEventListener("canplay", function()
+        {
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            [self _soundDidload];
+        }, true);
+
+        _audioTag.addEventListener("ended", function()
+        {
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            [self _soundDidEnd];
+        }, true);
+
+        _audioTag.addEventListener("error", function()
+        {
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            [self _soundError];
+        }, true);
+    }
+
+    return self;
+}
+
+/*!
+    Initialize with the sound contents of the URL represented by aFile.
+
+    @param aFile CPString the path of the sound
+    @param byRef ignored (Cocoa compatibility)
+*/
+- (id)initWithContentsOfFile:(CPString)aFile byReference:(BOOL)byRef
+{
+    if (self = [self init])
+    {
+        _loadStatus = CPSoundLoadStateLoading;
+        _audioTag.src = aFile;
+    }
+
+    return self;
+}
+
+/*!
+    Initialize with the sound contents of the file located at aURL.
+
+    @param aURL CPURL containing the URL of the sound
+    @param byRef ignored (Cocoa compatibility)
+*/
+- (id)initWithContentsOfURL:(CPURL)aURL byReference:(BOOL)byRef
+{
+    return [self initWithContentsOfFile:[aURL absoluteString] byReference:NO];
+}
+
+/*!
+    Initialize with the sound contents of someData.
+
+    @param someData CPData containing the sound
+    @param byRef ignored (Cocoa compatibility)
+*/
+- (id)initWithData:(CPData)someData
+{
+    if (self = [self init])
+    {
+        _loadStatus = CPSoundLoadStateLoading;
+        _audioTag.src = [someData rawString];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Events listener
+
+/*! @ignore
+*/
+- (void)_soundDidload
+{
+    _loadStatus = CPSoundLoadStateCanBePlayed;
+
+    if (_playRequestBeforeLoad)
+    {
+        _playRequestBeforeLoad = NO;
+        [self play];
+    }
+}
+
+/*! @ignore
+*/
+- (void)_soundDidEnd
+{
+    if (![self loops])
+        [self stop];
+}
+
+/*! @ignore
+*/
+- (void)_soundError
+{
+    _loadStatus = CPSoundLoadStateError;
+    CPLog.error("Cannot load sound. Maybe the format of your sound is not compatible with your browser.");
+}
+
+
+#pragma mark -
+#pragma mark Media controls
+
+/*!
+    Play the sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)play
+{
+    if (_loadStatus === CPSoundLoadStateLoading)
+    {
+        _playRequestBeforeLoad = YES;
+        return YES;
+    }
+
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus === CPSoundPlayBackStatePlay))
+        return NO;
+
+    _audioTag.play();
+    _playBackStatus = CPSoundPlayBackStatePlay;
+
+    return YES;
+}
+
+/*!
+    Stop the sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)stop
+{
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus === CPSoundPlayBackStateStop))
+        return NO;
+
+    _audioTag.pause();
+    _audioTag.currentTime = 0.0;
+    _playBackStatus = CPSoundPlayBackStateStop;
+
+    if (_delegate && [_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
+        [_delegate sound:self didFinishPlaying:YES];
+
+    return YES;
+}
+
+/*!
+    Pause the sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)pause
+{
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus === CPSoundPlayBackStatePause))
+        return NO;
+
+    _audioTag.pause();
+    _playBackStatus = CPSoundPlayBackStatePause;
+
+    return YES;
+}
+
+/*!
+    Resume playback of a paused sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)resume
+{
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus !== CPSoundPlayBackStatePause))
+        return NO;
+
+    _audioTag.play();
+    _playBackStatus = CPSoundPlayBackStatePlay;
+
+    return YES;
+}
+
+/*!
+    Return YES if the sound is in loop mode.
+
+    @return BOOL YES if in loop mode, NO otherwise
+*/
+- (BOOL)loops
+{
+    return _audioTag.loop;
+}
+
+/*!
+    Specifies whether the sound should repeat.
+
+    @param BOOL YES for loop mode, NO otherwise
+*/
+- (void)setLoops:(BOOL)shouldLoop
+{
+    _audioTag.loop = shouldLoop;
+}
+
+/*!
+    Returns the volume of the receiver.
+
+    @return double from 0.0 to 1.0
+*/
+- (double)volume
+{
+    return _audioTag.volume;
+}
+
+/*!
+    Set the volume the sound should be played at.
+
+    @param double a volume value between 0.0 and 1.0
+*/
+- (void)setVolume:(double)aVolume
+{
+    if (aVolume > 1.0)
+        aVolume = 1.0;
+    else if (aVolume < 0.0)
+        aVolume = 0.0;
+
+    _audioTag.volume = aVolume;
+}
+
+#pragma mark -
+#pragma mark Accessors
+
+/*!
+    Returns the duration in seconds of the sound.
+
+    @return double the duration
+*/
+- (double)duration
+{
+    return _audioTag.duration;
+}
+
+/*!
+    Returns if the sound is playing or not.
+
+    @return BOOL YES if the sound is playing, NO otherwise
+*/
+- (BOOL)isPlaying
+{
+    return (_playBackStatus === CPSoundPlayBackStatePlay);
+}
+
+@end
@@ -0,0 +1,293 @@
+/*
+ * CPStepper.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal
+ * Copyright 2009, Antoine Mercadal
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPControl.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPTextField.j>
+
+
+
+/*!
+    CPStepper is an implementation of Cocoa NSStepper.
+
+    This control displays a two part button that can be used to increase or decrease a value with a given interval.
+*/
+@implementation CPStepper: CPControl
+{
+    BOOL        _valueWraps     @accessors(property=valueWraps);
+    BOOL        _autorepeat     @accessors(getter=autorepeat);
+    int         _increment      @accessors(property=increment);
+    int         _maxValue       @accessors(property=maxValue);
+    int         _minValue       @accessors(property=minValue);
+
+    CPButton    _buttonDown;
+    CPButton    _buttonUp;
+}
+
+#pragma mark -
+#pragma mark Initialization
+
+/*!
+    Initializes a CPStepper with given values.
+    @param aValue the initial value of the CPStepper
+    @param minValue the minimal acceptable value of the stepper
+    @param maxValue the maximal acceptable value of the stepper
+    @return Initialized CPStepper
+*/
+ (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
+{
+    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
+    [stepper setDoubleValue:aValue];
+    [stepper setMinValue:aMinValue];
+    [stepper setMaxValue:aMaxValue];
+
+    return stepper;
+}
+
+/*!
+    Initializes a CPStepper with default values:
+        - minValue = 0.0
+        - maxValue = 59.0
+        - value = 0.0
+
+    @return Initialized CPStepper
+*/
+ (CPStepper)stepper
+{
+    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
+}
+
+/*!
+    Initializes a CPStepper.
+    @param aFrame the frame of the control
+    @return initialized CPStepper
+*/
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _maxValue       = 59.0;
+        _minValue       = 0.0;
+        _increment      = 1.0;
+        _valueWraps     = YES;
+        _autorepeat     = YES;
+
+        [self setDoubleValue:0.0];
+        [self _init];
+    }
+
+    return self;
+}
+
+/*! @ignore */
+
+- (void)_init
+{
+    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    [_buttonUp setContinuous:_autorepeat];
+    [_buttonUp setTarget:self];
+    [_buttonUp setAction:@selector(_buttonDidClick:)];
+    [_buttonUp setAutoresizingMask:CPViewNotSizable];
+    [self addSubview:_buttonUp];
+
+    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    [_buttonDown setContinuous:_autorepeat];
+    [_buttonDown setTarget:self];
+    [_buttonDown setAction:@selector(_buttonDidClick:)];
+    [_buttonDown setAutoresizingMask:CPViewNotSizable];
+
+    [self setContinuous:_autorepeat];
+    [self addSubview:_buttonDown];
+
+    [self setNeedsLayout];
+}
+
+#pragma mark -
+#pragma mark Superclass overrides
+
+/*!
+    Set if the CPStepper is enabled or not.
+    @param shouldEnabled BOOL that define if stepper is enabled or not.
+*/
+- (void)setEnabled:(BOOL)shouldEnabled
+{
+    [super setEnabled:shouldEnabled];
+
+    [_buttonUp setEnabled:shouldEnabled];
+    [_buttonDown setEnabled:shouldEnabled];
+}
+
+
+- (void)setFrame:(CGRect)aFrame
+{
+    var upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
+        frame = _CGRectMakeCopy(aFrame);
+
+    frame.size.width = MAX(minSize.width, frame.size.width);
+    frame.size.height = MAX(minSize.height, frame.size.height);
+    [super setFrame:frame];
+}
+
+/*! @ignore */
+- (void)layoutSubviews
+{
+    var aFrame = [self frame],
+        upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
+        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
+    [_buttonUp setFrame:upFrame];
+    [_buttonDown setFrame:downFrame];
+
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
+}
+
+/*!
+    Set if CPStepper should autorepeat.
+    @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
+*/
+- (void)setAutorepeat:(BOOL)shouldAutoRepeat
+{
+    if (shouldAutoRepeat !== _autorepeat)
+    {
+        [_buttonUp setContinuous:shouldAutoRepeat];
+        [_buttonDown setContinuous:shouldAutoRepeat];
+    }
+
+    [self setContinuous:shouldAutoRepeat];
+}
+
+/*!
+    Set the current value of the stepper.
+    @param aValue a float containing the value
+*/
+- (void)setDoubleValue:(float)aValue
+{
+    if (aValue > _maxValue)
+        [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
+    else if (aValue < _minValue)
+        [super setDoubleValue:_valueWraps ? _maxValue : _minValue];
+    else
+        [super setDoubleValue:aValue];
+}
+
+#pragma mark -
+#pragma mark Actions
+
+/*! @ignore */
+- (IBAction)_buttonDidClick:(id)aSender
+{
+    if (![self isEnabled])
+        return;
+
+    if (aSender == _buttonUp)
+        [self setDoubleValue:([self doubleValue] + _increment)];
+    else
+        [self setDoubleValue:([self doubleValue] - _increment)];
+
+    if (_target && _action && [_target respondsToSelector:_action])
+        [self sendAction:_action to:_target];
+}
+
+/*!
+    Perform a programatic click on up button.
+    @param aSender sender of the action
+*/
+- (IBAction)performClickUp:(id)aSender
+{
+    [_buttonUp performClick:aSender];
+}
+
+/*!
+    Perform a programatic click on down button.
+    @param aSender sender of the action
+*/
+- (IBAction)performClickDown:(id)aSender
+{
+    [_buttonDown performClick:aSender];
+}
+
+
+#pragma mark -
+#pragma mark Theming
+
+ (CPString)defaultThemeClass
+{
+    return @"stepper";
+}
+
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()]
+                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]];
+}
+
+@end
+
+var CPStepperMinValue   = @"CPStepperMinValue",
+    CPStepperMaxValue   = @"CPStepperMaxValue",
+    CPStepperValueWraps = @"CPStepperValueWraps",
+    CPStepperAutorepeat = @"CPStepperAutorepeat",
+    CPStepperIncrement  = @"CPStepperIncrement";
+
+@implementation CPStepper (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
+        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue];
+        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue];
+        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps];
+        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat];
+
+        [self _init];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
+
+    if (_minValue)
+        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
+    if (_maxValue)
+        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
+    if (_valueWraps)
+        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
+    if (_autorepeat)
+        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
+}
+
+@end
@@ -1,85 +1,100 @@
+/*
+ * CPTabView.j
+ * AppKit
+ *
+ * Created by Derek Hammer.
+ * Copyright 2010, Derek Hammer.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
@import "CPBox.j"
@import "CPSegmentedControl.j"
@import "CPTabViewItem.j"
@import "CPView.j"

-/*
-    Places tabs on top with a bezeled border.
-    @global
-    @group CPTabViewType
-*/
 CPTopTabsBezelBorder     = 0;
-//CPLeftTabsBezelBorder    = 1;
+//CPLeftTabsBezelBorder  = 1;
 CPBottomTabsBezelBorder  = 2;
-//CPRightTabsBezelBorder   = 3;
-/*
-    Displays no tabs and has a bezeled border.
-    @global
-    @group CPTabViewType
-*/
-CPNoTabsBezelBorder      = 4;
-/*
-    Has no tabs and displays a line border.
-    @global
-    @group CPTabViewType
-*/
-CPNoTabsLineBorder       = 5;
-/*
-    Displays no tabs and no border.
-    @global
-    @group CPTabViewType
-*/
-CPNoTabsNoBorder         = 6;
+//CPRightTabsBezelBorder = 3;
+CPNoTabsBezelBorder      = 4; //Displays no tabs and has a bezeled border.
+CPNoTabsLineBorder       = 5; //Has no tabs and displays a line border.
+CPNoTabsNoBorder         = 6; //Displays no tabs and no border.

 var CPTabViewDidSelectTabViewItemSelector           = 1,
    CPTabViewShouldSelectTabViewItemSelector        = 2,
    CPTabViewWillSelectTabViewItemSelector          = 4,
    CPTabViewDidChangeNumberOfTabViewItemsSelector  = 8;

-var HEIGHT_OF_SEGMENTED_CONTROL = 24;
+/*!
+    @ingroup appkit
+    @class CPTabView

+    A CPTabView object presents a tabbed interface where each page is one a
+    complete view hiearchy of its own. The user can navigate between various
+    pages by clicking on the tab headers.
+*/
@implementation CPTabView : CPView
 {
-    CPArray             items;
+    CPArray             _items;

-    CPSegmentedControl  tabs;
-    CPBox               box;
+    CPSegmentedControl  _tabs;
+    CPBox               _box;

-    CPNumber            selectedIndex;
+    CPNumber            _selectedIndex;

-    CPTabViewType       type;
+    CPTabViewType       _type;
+    CPFont              _font;

-    id                  delegate;
-    unsigned            delegateSelectors;
+    id                  _delegate;
+    unsigned            _delegateSelectors;
 }

 - (id)initWithFrame:(CGRect)aFrame
 {
-    self = [super initWithFrame:aFrame];
-    if (self)
+    if (self = [super initWithFrame:aFrame])
    {
-        items = [CPArray array];
-
-        tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, HEIGHT_OF_SEGMENTED_CONTROL)];
-        [tabs setHitTests:NO];
-
-        box = [[CPBox alloc] initWithFrame:CGRectMake(0, HEIGHT_OF_SEGMENTED_CONTROL / 2, CGRectGetWidth(aFrame),
-                                                            CGRectGetHeight(aFrame) - HEIGHT_OF_SEGMENTED_CONTROL)];
-
-        selectedIndex = CPNotFound;
+        _items = [CPArray array];

+        [self _init];
        [self setTabViewType:CPTopTabsBezelBorder];
-        [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
-
-        [self addSubview:box];
-        [self addSubview:tabs];
-
-        [box setAutoresizingMask:CPViewWidthSizable];
-        [tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
    }
+
    return self;
 }

+- (void)_init
+{
+    _selectedIndex = CPNotFound;
+
+    _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+    [_tabs setHitTests:NO];
+
+    var height = [_tabs valueForThemeAttribute:@"default-height"];
+    [_tabs setFrameSize:CGSizeMake(0, height)];
+
+    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
+    [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
+
+    [_box setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    [_tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
+
+    [self addSubview:_box];
+    [self addSubview:_tabs];
+}
+
 // Adding and Removing Tabs
 /*!
    Adds a CPTabViewItem to the tab view.
@@ -87,24 +102,25 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)addTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    [self insertTabViewItem:aTabViewItem atIndex:[items count]];
+    [self insertTabViewItem:aTabViewItem atIndex:[_items count]];
 }

 /*!
-    Inserts a CPTabViewItem into the tab view
-    at the specified index.
+    Inserts a CPTabViewItem into the tab view at the specified index.
    @param aTabViewItem the item to insert
    @param anIndex the index for the item
 */
 - (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(unsigned)anIndex
 {
-    [items insertObject:aTabViewItem atIndex:anIndex];
+    [_items insertObject:aTabViewItem atIndex:anIndex];

    [self _updateItems];
    [self _repositionTabs];

-    if (delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [delegate tabViewDidChangeNumberOfTabViewItems:self];
+    [aTabViewItem _setTabView:self];
+
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
 }

 /*!
@@ -113,39 +129,45 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)removeTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    for (var i = 0; i < [items count]; i++)
+    var count = [_items count];
+    for (var i = 0; i < count; i++)
    {
-        if ([items objectAtIndex:i] === aTabViewItem)
+        if ([_items objectAtIndex:i] === aTabViewItem)
        {
-            [items removeObjectAtIndex:i];
+            [_items removeObjectAtIndex:i];
+            break;
        }
    }

    [self _updateItems];
    [self _repositionTabs];

-    if (delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [delegate tabViewDidChangeNumberOfTabViewItems:self];
+    [aTabViewItem _setTabView:nil];
+
+    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
 }

 // Accessing Tabs
 /*!
    Returns the index of the specified item
    @param aTabViewItem the item to find the index for
+    @return the index of aTabViewItem or CPNotFound
 */
 - (int)indexOfTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    return [items indexOfObjectIdenticalTo:aTabViewItem];
+    return [_items indexOfObjectIdenticalTo:aTabViewItem];
 }

 /*!
    Returns the index of the CPTabViewItem with the specified identifier.
    @param anIdentifier the identifier of the item
+    @return the index of the tab view item identified by anIdentifier, or CPNotFound
 */
 - (int)indexOfTabViewItemWithIdentifier:(CPString)anIdentifier
 {
-    for (var index = [items count]; index >= 0; index--)
-        if ([[items[index] identifier] isEqual:anIdentifier])
+    for (var index = [_items count]; index >= 0; index--)
+        if ([[_items[index] identifier] isEqual:anIdentifier])
            return index;

    return CPNotFound;
@@ -153,26 +175,29 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;

 /*!
    Returns the number of items in the tab view.
+    @return the number of tab view items in the receiver
 */
 - (unsigned)numberOfTabViewItems
 {
-    return [items count];
+    return [_items count];
 }

 /*!
    Returns the CPTabViewItem at the specified index.
+    @return a tab view item, or nil
 */
 - (CPTabViewItem)tabViewItemAtIndex:(unsigned)anIndex
 {
-    return [items objectAtIndex:anIndex];
+    return [_items objectAtIndex:anIndex];
 }

 /*!
    Returns the array of items that backs this tab view.
+    @return a copy of the array of items in the receiver
 */
 - (CPArray)tabViewItems
 {
-    return [items copy]; // Copy?
+    return [_items copy]; // Copy?
 }

 // Selecting a Tab
@@ -182,7 +207,7 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)selectFirstTabViewItem:(id)aSender
 {
-    if ([items count] === 0)
+    if ([_items count] === 0)
        return; // throw?

    [self selectTabViewItemAtIndex:0];
@@ -194,10 +219,10 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)selectLastTabViewItem:(id)aSender
 {
-    if ([items count] === 0)
+    if ([_items count] === 0)
        return; // throw?

-    [self selectTabViewItemAtIndex:[items count] - 1];
+    [self selectTabViewItemAtIndex:[_items count] - 1];
 }

 /*!
@@ -206,12 +231,12 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)selectNextTabViewItem:(id)aSender
 {
-    if (selectedIndex === CPNotFound)
+    if (_selectedIndex === CPNotFound)
        return;

-    var nextIndex = selectedIndex + 1;
+    var nextIndex = _selectedIndex + 1;

-    if (nextIndex === [items count])
+    if (nextIndex === [_items count])
        // does nothing. According to spec at (http://developer.apple.com/mac/library/DOCUMENTATION/Cocoa/Reference/ApplicationKit/Classes/NSTabView_Class/Reference/Reference.html#//apple_ref/occ/instm/NSTabView/selectNextTabViewItem:)
        return;

@@ -224,10 +249,10 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)selectPreviousTabViewItem:(id)aSender
 {
-    if (selectedIndex === CPNotFound)
+    if (_selectedIndex === CPNotFound)
        return;

-    var previousIndex = selectedIndex - 1;
+    var previousIndex = _selectedIndex - 1;

    if (previousIndex < 0)
        return; // does nothing. See above.
@@ -248,34 +273,61 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
    Selects the item at the specified index.
    @param anIndex the index of the item to display.
 */
- (void)selectTabViewItemAtIndex:(unsigned)anIndex
+- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
 {
-    var aTabViewItem = [items objectAtIndex:anIndex];
-
-    if (anIndex === selectedIndex)
+    if (anIndex === _selectedIndex)
        return;

    var aTabViewItem = [self tabViewItemAtIndex:anIndex];

-    if ((delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
-        return;
+    if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
+        return NO;

-    if (delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
-        [delegate tabView:self willSelectTabViewItem:aTabViewItem];
+    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
+        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];

-    [tabs selectSegmentWithTag:anIndex];
+    [_tabs selectSegmentWithTag:anIndex];
    [self _setSelectedIndex:anIndex];

-    if (delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
-        [delegate tabView:self didSelectTabViewItem:aTabViewItem];
+    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
+        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
+
+    return YES;
 }

 /*!
    Returns the current item being displayed.
+    @return the tab view item currenly being displayed by the receiver
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    return [items objectAtIndex:selectedIndex];
+    if (_selectedIndex != CPNotFound)
+        return [_items objectAtIndex:_selectedIndex];
+
+    return nil;
+}
+
+// Modifying the font
+/*!
+    Returns the font for tab label text.
+    @return the font for tab label text
+*/
+- (CPFont)font
+{
+    return _font;
+}
+
+/*!
+    Sets the font for tab label text to font.
+    @param font the font the receiver should use for tab label text
+*/
+- (void)setFont:(CPFont)font
+{
+    if ([_font isEqual:font])
+        return;
+
+    _font = font;
+    [_tabs setFont:_font];
 }

 //
@@ -285,49 +337,60 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)setTabViewType:(CPTabViewType)aTabViewType
 {
-    if (type === aTabViewType)
+    if (_type === aTabViewType)
        return;

-    if ((type === CPTopTabsBezelBorder || type === CPBottomTabsBezelBorder)
-            && (aTabViewType !== CPTopTabsBezelBorder && aTabViewType !== CPBottomTabsBezelBorder))
-        [tabs removeFromSuperview];
+    _type = aTabViewType;

-    if ((type === CPNoTabsBezelBorder || type === CPNoTabsLineBorder || type === CPNoTabsNoBorder)
-            && (aTabViewType !== CPNoTabsBezelBorder && aTabViewType !== CPNoTabsBezelBorder && aTabViewType !== CPNoTabsNoBorder))
-        [self addSubview:tabs];
+    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
+    {
+        [_box setFrame:[self bounds]];
+        [_tabs removeFromSuperview];
+    }
+    else
+    {
+        var aFrame = [self frame],
+            segmentedHeight = CGRectGetHeight([_tabs frame]),
+            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;

-    type = aTabViewType;
+        [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
+                                  CGRectGetHeight(aFrame) - segmentedHeight / 2)];

-    switch (type)
+        [self addSubview:_tabs];
+    }
+
+    switch (_type)
    {
        case CPTopTabsBezelBorder:
        case CPBottomTabsBezelBorder:
        case CPNoTabsBezelBorder:
-            [box setBorderType:CPBezelBorder];
+            [_box setBorderType:CPBezelBorder];
            break;
        case CPNoTabsLineBorder:
-            [box setBorderType:CPLineBorder];
+            [_box setBorderType:CPLineBorder];
            break;
        case CPNoTabsNoBorder:
-            [box setBorderType:CPNoBorder];
+            [_box setBorderType:CPNoBorder];
            break;
    }
 }

 /*!
    Returns the tab view type.
+    @return the tab view type of the receiver
 */
 - (CPTabViewType)tabViewType
 {
-    return type;
+    return _type;
 }

 /*!
    Returns the receiver's delegate.
+    @return the receiver's delegate
 */
 - (id)delegate
 {
-    return delegate;
+    return _delegate;
 }

 /*!
@@ -336,71 +399,78 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 */
 - (void)setDelegate:(id)aDelegate
 {
-    if (delegate == aDelegate)
+    if (_delegate == aDelegate)
        return;

-    delegate = aDelegate;
+    _delegate = aDelegate;

-    delegateSelectors = 0;
+    _delegateSelectors = 0;

-    if ([delegate respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)])
-        delegateSelectors |= CPTabViewShouldSelectTabViewItemSelector;
+    if ([_delegate respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)])
+        _delegateSelectors |= CPTabViewShouldSelectTabViewItemSelector;

-    if ([delegate respondsToSelector:@selector(tabView:willSelectTabViewItem:)])
-        delegateSelectors |= CPTabViewWillSelectTabViewItemSelector;
+    if ([_delegate respondsToSelector:@selector(tabView:willSelectTabViewItem:)])
+        _delegateSelectors |= CPTabViewWillSelectTabViewItemSelector;

-    if ([delegate respondsToSelector:@selector(tabView:didSelectTabViewItem:)])
-        delegateSelectors |= CPTabViewDidSelectTabViewItemSelector;
+    if ([_delegate respondsToSelector:@selector(tabView:didSelectTabViewItem:)])
+        _delegateSelectors |= CPTabViewDidSelectTabViewItemSelector;

-    if ([delegate respondsToSelector:@selector(tabViewDidChangeNumberOfTabViewItems:)])
-        delegateSelectors |= CPTabViewDidChangeNumberOfTabViewItemsSelector;
+    if ([_delegate respondsToSelector:@selector(tabViewDidChangeNumberOfTabViewItems:)])
+        _delegateSelectors |= CPTabViewDidChangeNumberOfTabViewItemsSelector;
 }

 - (void)setBackgroundColor:(CPColor)aColor
 {
-    [box setBackgroundColor:aColor];
+    [_box setBackgroundColor:aColor];
+}
+
+- (CPColor)backgroundColor
+{
+    return [_box backgroundColor];
 }

 - (void)mouseDown:(CPEvent)anEvent
 {
-    var segmentIndex = [tabs testSegment:[tabs convertPoint:[anEvent locationInWindow] fromView:nil]];
+    var segmentIndex = [_tabs testSegment:[_tabs convertPoint:[anEvent locationInWindow] fromView:nil]];

-    if (segmentIndex != CPNotFound)
-    {
-        [self selectTabViewItemAtIndex:segmentIndex];
-        [tabs trackSegment:anEvent];
-    }
+    if (segmentIndex != CPNotFound && [self selectTabViewItemAtIndex:segmentIndex])
+        [_tabs trackSegment:anEvent];
 }

 - (void)_repositionTabs
 {
    var horizontalCenterOfSelf = CGRectGetWidth([self bounds]) / 2,
-        verticalCenterOfTabs = CGRectGetHeight([tabs bounds]) / 2;
+        verticalCenterOfTabs = CGRectGetHeight([_tabs bounds]) / 2;

-    if (type === CPBottomTabsBezelBorder)
-        [tabs setCenter:CGPointMake(horizontalCenterOfSelf, CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
+    if (_type === CPBottomTabsBezelBorder)
+        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
    else
-        [tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
+        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
 }

 - (void)_setSelectedIndex:(CPNumber)index
 {
-    selectedIndex = index;
+    _selectedIndex = index;
+    [self _setContentViewForItem:[_items objectAtIndex:_selectedIndex]];
+}

-    [box setContentView:[[items objectAtIndex:selectedIndex] view]];
+- (void)_setContentViewForItem:(CPTabViewItem)anItem
+{
+    [_box setContentView:[anItem view]];
 }

 - (void)_updateItems
 {
-    [tabs setSegmentCount:[items count]];
+    var count = [_items count];
+    [_tabs setSegmentCount:count];

-    for (var i = 0; i < [items count]; i++)
+    for (var i = 0; i < count; i++)
    {
-        [tabs setLabel:[[items objectAtIndex:i] label] forSegment:i];
-        [tabs setTag:i forSegment:i];
+        [_tabs setLabel:[[_items objectAtIndex:i] label] forSegment:i];
+        [_tabs setTag:i forSegment:i];
    }

-    if (selectedIndex === CPNotFound)
+    if (_selectedIndex === CPNotFound)
    {
        [self selectFirstTabViewItem:self];
    }
@@ -411,6 +481,7 @@ var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 var CPTabViewItemsKey               = "CPTabViewItemsKey",
    CPTabViewSelectedItemKey        = "CPTabViewSelectedItemKey",
    CPTabViewTypeKey                = "CPTabViewTypeKey",
+    CPTabViewFontKey                = "CPTabViewFontKey",
    CPTabViewDelegateKey            = "CPTabViewDelegateKey";

@implementation CPTabView (CPCoding)
@@ -419,18 +490,24 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 {
    if (self = [super initWithCoder:aCoder])
    {
-        type    = [aCoder decodeIntForKey:CPTabViewTypeKey];
-        items   = [];
+        [self _init];

-        var encodedItems = [aCoder decodeObjectForKey:CPTabViewItemsKey];
-        for (var i = 0; encodedItems && i < encodedItems.length; i++)
-            [self insertTabViewItem:encodedItems[i] atIndex:i];
+        _font = [aCoder decodeObjectForKey:CPTabViewFontKey];
+        [_tabs setFont:_font];
+
+        _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
+        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
+
+        [self _updateItems];
+        [self _repositionTabs];
+
+        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];

        var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
        if (selected)
            [self selectTabViewItem:selected];

-        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
+        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
    }

    return self;
@@ -440,12 +517,16 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 {
    [super encodeWithCoder:aCoder];

-    [aCoder encodeObject:items forKey:CPTabViewItemsKey];;
-    [aCoder encodeObject:[self selectedTabViewItem] forKey:CPTabViewSelectedItemKey];
+    [aCoder encodeObject:_items forKey:CPTabViewItemsKey];

-    [aCoder encodeInt:type forKey:CPTabViewTypeKey];
+    var selected = [self selectedTabViewItem];
+    if (selected)
+        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];

-    [aCoder encodeConditionalObject:delegate forKey:CPTabViewDelegateKey];
+    [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
+    [aCoder encodeObject:_font forKey:CPTabViewFontKey];
+
+    [aCoder encodeConditionalObject:_delegate forKey:CPTabViewDelegateKey];
 }

@end
@@ -44,7 +44,7 @@ CPBackgroundTab = 1;
 */
 CPPressedTab    = 2;

-/*! 
+/*!
    @ingroup appkit
    @class CPTabViewItem

@@ -55,10 +55,10 @@ CPPressedTab    = 2;
 {
    id          _identifier;
    CPString    _label;
-    
+
    CPView      _view;
    CPView      _auxiliaryView;
-    
+
    CPTabView   _tabView;
 }

@@ -74,10 +74,10 @@ CPPressedTab    = 2;
 - (id)initWithIdentifier:(id)anIdentifier
 {
    self = [super init];
-    
+
    if (self)
        _identifier = anIdentifier;
-        
+
    return self;
 }

@@ -132,7 +132,13 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
+    if (_view == aView)
+        return;
+
    _view = aView;
+
+    if ([_tabView selectedTabViewItem] == self)
+        [_tabView _setContentViewForItem:self];
 }

 /*!
@@ -145,8 +151,8 @@ CPPressedTab    = 2;

 // Assigning an Auxiliary View
 /*!
-    Sets the tab's auxillary view.
-    @param anAuxillaryView the new auxillary view
+    Sets the tab's auxiliary view.
+    @param anAuxiliaryView the new auxiliary view
 */
 - (void)setAuxiliaryView:(CPView)anAuxiliaryView
 {
@@ -154,7 +160,7 @@ CPPressedTab    = 2;
 }

 /*!
-    Returns the tab's auxillary view
+    Returns the tab's auxiliary view
 */
 - (CPView)auxiliaryView
 {
@@ -191,16 +197,16 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
    self = [super init];
-    
+
    if (self)
    {
        _identifier     = [aCoder decodeObjectForKey:CPTabViewItemIdentifierKey];
        _label          = [aCoder decodeObjectForKey:CPTabViewItemLabelKey];
-        
+
        _view           = [aCoder decodeObjectForKey:CPTabViewItemViewKey];
        _auxiliaryView  = [aCoder decodeObjectForKey:CPTabViewItemAuxViewKey];
    }
-    
+
    return self;
 }

@@ -208,7 +214,7 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 {
    [aCoder encodeObject:_identifier    forKey:CPTabViewItemIdentifierKey];
    [aCoder encodeObject:_label         forKey:CPTabViewItemLabelKey];
-    
+
    [aCoder encodeObject:_view          forKey:CPTabViewItemViewKey];
    [aCoder encodeObject:_auxiliaryView forKey:CPTabViewItemAuxViewKey];
 }
@@ -33,6 +33,17 @@ CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
 CPTableColumnUserResizingMask   = 1 << 1;

+/*!
+    @class CPTableColumn
+
+    A CPTableColumn contains a dataview to display for its column of the CPTableView.
+    A CPTableColumn determines its own size constrains and resizing behavior.
+
+    The default dataview is a CPTextField but you can set it to any view you'd like. See -setDataView: for documentation including theme states.
+
+    To customize the text of the column header you can simply call setStringValue: on the headerview of a table column.
+    For example: [[myTableColumn headerView] setStringValue:"My Title"];
+*/
@implementation CPTableColumn : CPObject
 {
    CPTableView         _tableView;
@@ -54,11 +65,18 @@ CPTableColumnUserResizingMask   = 1 << 1;
    BOOL _disableResizingPosting @accessors(property=disableResizingPosting);
 }

+/*!
+    @ignore
+*/
 - (id)init
 {
    return [self initWithIdentifier:@""];
 }

+/*!
+    Initializes a newly created CPTableColumn with a given identifier.
+
+*/
 - (id)initWithIdentifier:(id)anIdentifier
 {
    self = [super init];
@@ -84,17 +102,50 @@ CPTableColumnUserResizingMask   = 1 << 1;
    return self;
 }

-
+/*!
+    Set the columns's parent tableview
+*/
 - (void)setTableView:(CPTableView)aTableView
 {
    _tableView = aTableView;
 }

+/*!
+    Return the column's parent tableview
+*/
 - (CPTableView)tableView
 {
    return _tableView;
 }

+/*!
+    @ignore
+    this method tries to resize a column called via the tableview via autoresizing
+    it returns the delta from the actual resize and the proposed resize
+
+    for example if the column should have been resized 50px but the maxWidth was hit only
+    after 25px then the return value would be 25px;
+
+    if no edge has been hit zero will be returned
+*/
+- (int)_tryToResizeToWidth:(int)width
+{
+    var min = [self minWidth],
+        max = [self maxWidth],
+        newWidth = ROUND(MIN(MAX(width, min), max));
+
+    [self setWidth:newWidth];
+
+    return newWidth - width;
+}
+
+/*!
+    Set the width of the column
+    Default value is: 100
+
+    If the value is greater than the maxWidth the maxWidth will be reset with the supplied width here
+    If the value is less than the minWidth the minWidth will be reset with the supplied width.
+*/
 - (void)setWidth:(float)aWidth
 {
    aWidth = +aWidth;
@@ -135,11 +186,18 @@ CPTableColumnUserResizingMask   = 1 << 1;
    }
 }

+/*!
+    Returns the column's width
+*/
 - (float)width
 {
    return _width;
 }

+/*!
+    Sets the minimum width of the column.
+    Default value is 10.
+*/
 - (void)setMinWidth:(float)aMinWidth
 {
    aMinWidth = +aMinWidth;
@@ -156,11 +214,18 @@ CPTableColumnUserResizingMask   = 1 << 1;
        [self setWidth:newWidth];
 }

+/*!
+    Returns the minimum width of the column.
+*/
 - (float)minWidth
 {
    return _minWidth;
 }

+/*!
+    Sets the maximum width of the table column.
+    Default value is: 1000000
+*/
 - (void)setMaxWidth:(float)aMaxWidth
 {
    aMaxWidth = +aMaxWidth;
@@ -177,21 +242,42 @@ CPTableColumnUserResizingMask   = 1 << 1;
        [self setWidth:newWidth];
 }

+/*!
+    Returns the maximum width of the column
+*/
 - (float)maxWidth
 {
    return _maxWidth;
 }

+/*!
+<pre>
+    Set the resizing mask of the column.
+    By default the column can be resized automatically with the tableview and manually by the user
+
+    Possible masking values are:
+    CPTableColumnNoResizing
+    CPTableColumnAutoresizingMask
+    CPTableColumnUserResizingMask
+</pre>
+*/
 - (void)setResizingMask:(unsigned)aResizingMask
 {
    _resizingMask = aResizingMask;
 }

+
+/*!
+    Returns the resizing mask of the column
+*/
 - (unsigned)resizingMask
 {
    return _resizingMask;
 }

+/*!
+    Sizes the column to fix the column header text.
+*/
 - (void)sizeToFit
 {
    var width = _CGRectGetWidth([_headerView frame]);
@@ -205,7 +291,16 @@ CPTableColumnUserResizingMask   = 1 << 1;
        [self setWidth:width];
 }

-//Setting Component Cells
+
+/*!
+    Sets the header view for the column.
+    The headerview handles the display of sort indicators, text, etc.
+
+    If you do not want a headerview for you table you should call setHeaderView: on your CPTableView instance.
+    Passing nil here will throw an exception.
+
+    In order to customize the text of the column header see - (CPView)headerView;
+*/
 - (void)setHeaderView:(CPView)aView
 {
    if (!aView)
@@ -219,26 +314,80 @@ CPTableColumnUserResizingMask   = 1 << 1;
    [tableHeaderView setNeedsDisplay:YES];
 }

+/*!
+    Returns the headerview for the column.
+
+    In order to change the text of the headerview for a column you should call setStringValue: on the headerview.
+    For example: [[myTableColumn headerView] setStringValue:"My Column"];
+*/
 - (CPView)headerView
 {
    return _headerView;
 }

 /*!
-    This method set's the "prototype" view which will be used to create all table cells in this column.
+    This method sets the "prototype" view which will be used to create all table cells in this column.

    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each
    individual cell that is shown. As a result, changes made after calling this method won't be reflected.

    Example:
-
+        @code
        [tableColumn setDataView:someView]; // snapshot taken
        [[tableColumn dataView] setSomething:x]; //won't work
+        @endcode

    This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
-
+        @code
        [someView setSomething:x];
        [tableColumn setDataView:someView];
+        @endcode
+
+    @note you should implement CPKeyedArchiving otherwise you might see unexpected results.
+    This is done by adding the following methods to your class:
+    @endnote
+
+    @code
+    - (id)initWithCoder(CPCoder)aCoder;
+    - (void)encodeWithCoder:(CPCoder)aCoder;
+    @endcode
+
+    Example:
+    Say you have two instance variables in your object that need to be set up each time an object is create.
+    We will call these instance variables "image" and "text".
+    Your CPCoding methods will look like the following:
+
+    @code
+    - (id)initWithCoder:(CPCoder)aCoder
+    {
+        self = [super initWithCoder:aCoder];
+
+        if (self)
+        {
+            image = [aCoder decodeObjectForKey:"MyDataViewImage"];
+            text = [aCoder decodeObjectForKey:"MyDataViewText"];
+        }
+
+        return self;
+    }
+
+    - (void)encodeWithCoder:(CPCoder)aCoder
+    {
+        [super encodeWithCoder:aCoder];
+
+        [aCoder encodeObject:image forKey:"MyDataViewImage"];
+        [aCoder encodeObject:text forKey:"MyDataViewText"];
+    }
+    @endcode
+
+    @section Themeing
+
+    When you set a dataview and it is added to the tableview the theme state will be set to \c CPThemeStateTableDataView
+    When the dataview becomes selected the theme state will be set to \c CPThemeStateSelectedDataView.
+
+    If the dataview shows up in a group row of the tableview the theme state will be set to \c CPThemeStateGroupRow.
+
+    You should overide \c setThemeState: and \c unsetThemeState: to handle these theme state changes in your dataview.
 */
 - (void)setDataView:(CPView)aView
 {
@@ -260,7 +409,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
    Returns the CPView object used by the CPTableView to draw values for the receiver.

    By default, this method just calls dataView. Subclassers can override if they need to
-    potentially use different cells for different rows. Subclasses should expect this method
+    potentially use different "cells" or dataViews for different rows. Subclasses should expect this method
    to be invoked with row equal to -1 in cases where no actual row is involved but the table
    view needs to get some generic cell info.
 */
@@ -269,6 +418,9 @@ CPTableColumnUserResizingMask   = 1 << 1;
    return [self dataView];
 }

+/*!
+    @ignore
+*/
 - (id)_newDataViewForRow:(int)aRowIndex
 {
    var dataView = [self dataViewForRow:aRowIndex],
@@ -276,7 +428,7 @@ CPTableColumnUserResizingMask   = 1 << 1;

    var x = [self tableView]._cachedDataViews[dataViewUID];
    if (x && x.length)
-    return x.pop();
+        return x.pop();

    // if we haven't cached an archive of the data view, do it now
    if (!_dataViewData[dataViewUID])
@@ -294,7 +446,7 @@ CPTableColumnUserResizingMask   = 1 << 1;

 //Setting the Identifier

-/*
+/*!
    Sets the receiver identifier to anIdentifier.
 */
 - (void)setIdentifier:(id)anIdentifier
@@ -302,7 +454,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
    _identifier = anIdentifier;
 }

-/*
+/*!
    Returns the object used by the data source to identify the attribute corresponding to the receiver.
 */
 - (id)identifier
@@ -312,7 +464,7 @@ CPTableColumnUserResizingMask   = 1 << 1;

 //Controlling Editability

-/*
+/*!
    Controls whether the user can edit cells in the receiver by double-clicking them.
 */
 - (void)setEditable:(BOOL)shouldBeEditable
@@ -320,31 +472,39 @@ CPTableColumnUserResizingMask   = 1 << 1;
    _isEditable = shouldBeEditable;
 }

-/*
+/*!
    Returns YES if the user can edit cells associated with the receiver by double-clicking the
-    column in the NSTableView, NO otherwise.
+    column in the CPTableView, NO otherwise.
 */
 - (BOOL)isEditable
 {
    return _isEditable;
 }

-//Sorting
+/*!
+    Sets the sort descriptor prototype for the column.
+*/
 - (void)setSortDescriptorPrototype:(CPSortDescriptor)aSortDescriptor
 {
    _sortDescriptorPrototype = aSortDescriptor;
 }

+/*!
+    Returns the sort descriptor prototype for the column.
+*/
 - (CPSortDescriptor)sortDescriptorPrototype
 {
    return _sortDescriptorPrototype;
 }

-//Setting Column Visibility
-
+/*!
+    If YES the tablecolumn will no longer be visible in the tableview.
+    If NO the tablecolumn will be visible in the tableview.
+*/
 - (void)setHidden:(BOOL)shouldBeHidden
 {
    shouldBeHidden = !!shouldBeHidden
+
    if (_isHidden === shouldBeHidden)
        return;

@@ -354,6 +514,9 @@ CPTableColumnUserResizingMask   = 1 << 1;
    [[self tableView] _tableColumnVisibilityDidChange:self];
 }

+/*!
+    Returns the visibility status of the column.
+*/
 - (BOOL)isHidden
 {
    return _isHidden;
@@ -361,7 +524,7 @@ CPTableColumnUserResizingMask   = 1 << 1;

 //Setting Tool Tips

-/*
+/*!
    Sets the tooltip string that is displayed when the cursor pauses over the
    header cell of the receiver.
 */
@@ -370,13 +533,21 @@ CPTableColumnUserResizingMask   = 1 << 1;
    _headerToolTip = aToolTip;
 }

+/*!
+    Returns the tooltip for the column header
+*/
 - (CPString)headerToolTip
 {
    return _headerToolTip;
 }

+/*!
+    @ignore
+*/
 - (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
 {
+    [[self tableView] _didResizeTableColumn:self];
+
    [[CPNotificationCenter defaultCenter]
    postNotificationName:CPTableViewColumnDidResizeNotification
                  object:[self tableView]
@@ -385,19 +556,69 @@ CPTableColumnUserResizingMask   = 1 << 1;

@end

+@implementation CPTableColumnValueBinder : CPBinder
+{
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var tableView = [_source tableView],
+        column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
+        rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [tableView numberOfRows])],
+        columnIndexes = [CPIndexSet indexSetWithIndex:column];
+
+    [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
+}
+
+@end
+
@implementation CPTableColumn (Bindings)

+ (id)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return [CPTableColumnValueBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+/*!
+    Binds the receiver to an object.
+
+    @param CPString aBinding - The binding you wish to make. Typically CPValueBinding.
+    @param id anObject - The object to bind the receiver to.
+    @param CPString aKeyPath - The key path you wish to bind the receiver to.
+    @param CPDictionary options - A dictionary of options for the binding. This parameter is optional, pass nil if you do not wish to use it.
+*/
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];

    if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
-        [[self tableView] _establishBindingsIfUnbound:anObject];
+    {
+        // Bind the table to the array controller this column is bound to.
+        // Note that anObject might not be the array controller. E.g. the keypath could be something like
+        // somePathTo.anArrayController.arrangedObjects.aKey. Cocoa doesn't support this but it is consistent
+        // and it makes sense.
+        var acIndex = aKeyPath.lastIndexOf("arrangedObjects."),
+            arrayController = anObject;
+
+        if (acIndex > 1)
+        {
+            var firstPart = aKeyPath.substring(0, acIndex - 1);
+            arrayController = [anObject valueForKeyPath:firstPart];
+        }
+
+        [[self tableView] _establishBindingsIfUnbound:arrayController];
+    }
 }

- (void)prepareDataView:(CPView)aDataView forRow:(unsigned)aRow
+/*!
+    @ignore
+*/
+- (void)_prepareDataView:(CPView)aDataView forRow:(unsigned)aRow
 {
-    var bindingsDictionary = [CPKeyValueBinding allBindingsForObject:self],
+    var bindingsDictionary = [CPBinder allBindingsForObject:self],
        keys = [bindingsDictionary allKeys];

    for (var i = 0, count = [keys count]; i < count; i++)
@@ -437,20 +658,46 @@ CPTableColumnUserResizingMask   = 1 << 1;
        }

        value = [binding transformValue:value withOptions:[bindingInfo objectForKey:CPOptionsKey]];
-
-        // console.log(bindingName+" : "+keyPath+" : "+aRow+" : "+[[destination valueForKeyPath:keyPath] objectAtIndex:aRow]);
-        [aDataView setValue:value forKey:bindingPath];
+        [aDataView setValue:value forKey:@"objectValue"];
    }
 }

-//- (void)objectValue
-//{
-//    return nil;
-//}
-
- (void)setValue:(CPArray)content
+/*!
+    @ignore
+*/
+- (void)_reverseSetDataView:(CPView)aDataView forRow:(unsigned)aRow
 {
-    [[self tableView] reloadData];
+    var bindingsDictionary = [CPBinder allBindingsForObject:self],
+        keys = [bindingsDictionary allKeys],
+        newValue = [aDataView valueForKey:@"objectValue"];
+
+    for (var i = 0, count = [keys count]; i < count; i++)
+    {
+        var bindingName = keys[i],
+            bindingPath = [aDataView _replacementKeyPathForBinding:bindingName],
+            binding = [bindingsDictionary objectForKey:bindingName],
+            bindingInfo = binding._info,
+            destination = [bindingInfo objectForKey:CPObservedObjectKey],
+            keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
+            options = [bindingInfo objectForKey:CPOptionsKey],
+            dotIndex = keyPath.lastIndexOf(".");
+
+        newValue = [binding reverseTransformValue:newValue withOptions:options];
+
+        if (dotIndex === CPNotFound)
+            [[destination valueForKeyPath:keyPath] replaceObjectAtIndex:aRow withObject:newValue];
+        else
+        {
+            var firstPart = keyPath.substring(0, dotIndex),
+                secondPart = keyPath.substring(dotIndex + 1),
+                firstValue = [destination valueForKeyPath:firstPart];
+
+            if ([firstValue isKindOfClass:CPArray])
+                 [[firstValue objectAtIndex:aRow] setValue:newValue forKeyPath:secondPart];
+            else
+                 [[firstValue valueForKeyPath:secondPart] replaceObjectAtIndex:aRow withObject:newValue];
+        }
+    }
 }

@end
@@ -468,6 +715,9 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",

@implementation CPTableColumn (CPCoding)

+/*!
+    @ignore
+*/
 - (id)initWithCoder:(CPCoder)aCoder
 {
    self = [super init];
@@ -483,7 +733,6 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
        [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
        [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
-        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];

        _resizingMask  = [aCoder decodeIntForKey:CPTableColumnResizingMaskKey];
        _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];
@@ -495,13 +744,16 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
    return self;
 }

+/*!
+    @ignore
+*/
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
    [aCoder encodeObject:_identifier forKey:CPTableColumnIdentifierKey];

-    [aCoder encodeObject:_width forKey:CPTableColumnWidthKey];
-    [aCoder encodeObject:_minWidth forKey:CPTableColumnMinWidthKey];
-    [aCoder encodeObject:_maxWidth forKey:CPTableColumnMaxWidthKey];
+    [aCoder encodeFloat:_width forKey:CPTableColumnWidthKey];
+    [aCoder encodeFloat:_minWidth forKey:CPTableColumnMinWidthKey];
+    [aCoder encodeFloat:_maxWidth forKey:CPTableColumnMaxWidthKey];

    [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
    [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
@@ -516,31 +768,45 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
@end

@implementation CPTableColumn (NSInCompatibility)
-
+/*!
+    @ignore
+*/
 - (void)setHeaderCell:(CPView)aView
 {
    [CPException raise:CPUnsupportedMethodException
-                reason:@"setHeaderCell: is not supported. -setHeaderCell:aView instead."];
+                reason:@"setHeaderCell: is not supported. Use -setHeaderView:aView instead."];
 }

+/*!
+    @ignore
+*/
 - (CPView)headerCell
 {
    [CPException raise:CPUnsupportedMethodException
-                reason:@"headCell is not supported. -headerView instead."];
+                reason:@"headCell is not supported. Use -headerView instead."];
 }

+/*!
+    @ignore
+*/
 - (void)setDataCell:(CPView)aView
 {
    [CPException raise:CPUnsupportedMethodException
-                reason:@"setDataCell: is not supported. Use -setHeaderCell:aView instead."];
+                reason:@"setDataCell: is not supported. Use -setDataView:aView instead."];
 }

+/*!
+    @ignore
+*/
 - (CPView)dataCell
 {
    [CPException raise:CPUnsupportedMethodException
-                reason:@"dataCell is not supported. Use -dataCell instead."];
+                reason:@"dataCell is not supported. Use -dataView instead."];
 }

+/*!
+    @ignore
+*/
 - (id)dataCellForRow:(int)row
 {
    [CPException raise:CPUnsupportedMethodException
@@ -40,7 +40,7 @@
 + (id)themeAttributes
 {
    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
-                                       forKeys:[@"background-color", @"text-alignment", @"text-inset", @"text-color", @"text-font", @"text-shadow-color", @"text-shadow-offset"]];
+                                       forKeys:[@"background-color", @"text-alignment", @"text-inset", @"text-color", @"font", @"text-shadow-color", @"text-shadow-offset"]];
 }

 - (void)initWithFrame:(CGRect)frame
@@ -56,7 +56,7 @@
 {
    _textField = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];

-    [_textField setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    [_textField setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

    [_textField setLineBreakMode:CPLineBreakByTruncatingTail];
    [_textField setAlignment:CPLeftTextAlignment];
@@ -74,7 +74,7 @@

    [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
    [_textField setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
-    [_textField setFont:[self currentValueForThemeAttribute:@"text-font"]];
+    [_textField setFont:[self currentValueForThemeAttribute:@"font"]];
    [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
    [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
    [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
@@ -102,20 +102,20 @@

 - (void)setFont:(CPFont)aFont
 {
-    [_textField setFont:aFont];
+    [self setValue:aFont forThemeAttribute:"font"];
 }

 - (void)_setIndicatorImage:(CPImage)anImage
 {
-	if (anImage)
-	{
-		[_textField setImage:anImage];
-		[_textField setImagePosition:CPImageRight];
-	}
-	else
-	{
-		[_textField setImagePosition:CPNoImage];
-	}
+    if (anImage)
+    {
+        [_textField setImage:anImage];
+        [_textField setImagePosition:CPImageRight];
+    }
+    else
+    {
+        [_textField setImagePosition:CPNoImage];
+    }
 }

@end
@@ -212,7 +212,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal

 - (CGRect)headerRectOfColumn:(int)aColumnIndex
 {
-    var headerRect = [self bounds],
+    var headerRect = CGRectMakeCopy([self bounds]),
        columnRect = [_tableView rectOfColumn:aColumnIndex];

    headerRect.origin.x = _CGRectGetMinX(columnRect);
@@ -592,19 +592,19 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    for (var i = 0; i < count; i++)
    {
        var column = [tableColumns objectAtIndex:i],
-            headerView = [column headerView];
+            headerView = [column headerView],
+            frame = [self headerRectOfColumn:i];

-        var frame = [self headerRectOfColumn:i];
+        // Make space for the gridline on the right.
+        frame.origin.x -= 0.5;
+        frame.size.width -= 1.0;
        frame.size.height -= 0.5;
-        if (i > 0)
-        {
-            frame.origin.x += 0.5;
-            frame.size.width -= 1;
-        }
+        // Note: we're not adding in intercell spacing here. This setting only affects the regular
+        // table cell data views, not the header. Verified in Cocoa on March 29th, 2011.

        [headerView setFrame:frame];

-        if([headerView superview] != self)
+        if ([headerView superview] != self)
            [self addSubview:headerView];
    }

@@ -634,7 +634,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        columnMaxX;

    CGContextBeginPath(context);
-    for(; columnArrayIndex < columnArrayCount; columnArrayIndex++)
+    for (; columnArrayIndex < columnArrayCount; columnArrayIndex++)
    {
        // grab each column rect and add vertical lines
        var columnIndex = columnsArray[columnArrayIndex],
@@ -642,10 +642,9 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal

        columnMaxX = _CGRectGetMaxX(columnToStroke);

-        CGContextMoveToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
+        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
    }
-
    CGContextClosePath(context);
    CGContextStrokePath(context);

@@ -669,7 +668,15 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey",
    {
        [self _init];
        _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey];
-        _drawsColumnLines = [aCoder decodeBoolForKey:CPTableHeaderViewDrawsColumnLines];
+
+        // FIX ME: Take this out before 1.0
+        if ([aCoder containsValueForKey:CPTableHeaderViewDrawsColumnLines])
+            _drawsColumnLines = [aCoder decodeBoolForKey:CPTableHeaderViewDrawsColumnLines];
+        else
+        {
+            _drawsColumnLines = YES;
+            CPLog.warn("The tableview header being decoded is using an old cib. Please run Nib2Cib.");
+        }
    }

    return self;
@@ -1,4 +1,3 @@
-
 /*
 * CPTextField.j
 * AppKit
@@ -21,13 +20,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#import "../Foundation/Ref.h"
+
@import "CPControl.j"
@import "CPStringDrawing.j"
@import "CPCompatibility.j"
@import "_CPImageAndTextView.j"


-CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
+CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */

 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
@@ -45,7 +46,8 @@ var CPTextFieldDOMInputElement = nil,
    CPTextFieldInputIsActive = NO,
    CPTextFieldCachedSelectStartFunction = nil,
    CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurFunction = nil;
+    CPTextFieldBlurFunction = nil,
+    CPTextFieldInputFunction = nil;

 #endif

@@ -83,14 +85,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

    CPColor                 _textFieldBackgroundColor;

-    id                      _placeholderString;
-    id                      _originalPlaceholderString;
-    BOOL                    _currentValueIsPlaceholder;
+    CPString                _placeholderString;
+    CPString                _stringValue;

    id                      _delegate;

-    CPString                _textDidChangeValue;
-
    // NS-style Display Properties
    CPTextFieldBezelStyle   _bezelStyle;
    BOOL                    _isBordered;
@@ -160,6 +159,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    return "textfield";
 }

+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding === CPValueBinding)
+        return [_CPTextFieldValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
 + (id)themeAttributes
 {
    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
@@ -196,13 +203,32 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
            CPTextFieldInputDidBlur = YES;

            return true;
-        }
+        };

        CPTextFieldHandleBlur = function(anEvent)
        {
            CPTextFieldInputOwner = nil;

            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+        };
+
+        if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
+        {
+            CPTextFieldInputFunction = function(anEvent)
+            {
+                if (!CPTextFieldInputOwner)
+                    return;
+
+                var cappEvent = [CPEvent keyEventWithType:CPKeyUp location:_CGPointMakeZero() modifierFlags:0
+                                                timestamp:[CPEvent currentTimestamp] windowNumber:[[CPApp keyWindow] windowNumber] context:nil
+                                               characters:nil charactersIgnoringModifiers:nil isARepeat:NO keyCode:nil];
+
+                [CPTextFieldInputOwner keyUp:cappEvent];
+
+                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            }
+
+            CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
        }

        //FIXME make this not onblur
@@ -468,22 +494,43 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
 #endif

+    // As long as we are the first responder we need to monitor the key status of our window.
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidResignKey:) name:CPWindowDidResignKeyNotification object:[self window]];
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidBecomeKey:) name:CPWindowDidBecomeKeyNotification object:[self window]];
+
+    _isEditing = NO;
+
+    if ([[self window] isKeyWindow])
+        [self _becomeFirstKeyResponder];
+
+    return YES;
+}
+
+/*!
+    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
+
+    Since a first responder but non-key window text field can't receive input it should not even look like an active text field (Cocoa has a "slightly active" text field look it uses when another window is the key window, but Cappuccino doesn't today.)
+*/
+- (void)_becomeFirstKeyResponder
+{
    [self setThemeState:CPThemeStateEditing];

    [self _updatePlaceholderState];

    [self setNeedsLayout];

-    _isEditing = NO;
+    _stringValue = [self stringValue];

 #if PLATFORM(DOM)

-    var string = [self stringValue],
-        element = [self _inputElement];
+    var element = [self _inputElement],
+        font = [self currentValueForThemeAttribute:@"font"],
+        lineHeight = [font defaultLineHeightForFont];

-    element.value = string;
+    element.value = _stringValue;
    element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
-    element.style.font = [[self currentValueForThemeAttribute:@"font"] cssString];
+    if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
+        element.style.font = [font cssString];
    element.style.zIndex = 1000;

    switch ([self alignment])
@@ -495,22 +542,52 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        default:                    element.style.textAlign = "left";
    }

-    var contentRect = [self contentRectForBounds:[self bounds]];
+    var contentRect = [self contentRectForBounds:[self bounds]],
+        verticalAlign = [self currentValueForThemeAttribute:"vertical-alignment"];

-    element.style.top = _CGRectGetMinY(contentRect) + "px";
-    element.style.left = (_CGRectGetMinX(contentRect) - 1) + "px"; // why -1?
+    switch (verticalAlign)
+    {
+        case CPTopVerticalTextAlignment:
+            var topPoint = _CGRectGetMinY(contentRect) + "px";
+            break;
+
+        case CPCenterVerticalTextAlignment:
+            var topPoint = (_CGRectGetMidY(contentRect) - (lineHeight / 2)) + "px";
+            break;
+
+        case CPBottomVerticalTextAlignment:
+            var topPoint = (_CGRectGetMaxY(contentRect) - lineHeight) + "px";
+            break;
+
+        default:
+            var topPoint = _CGRectGetMinY(contentRect) + "px";
+            break;
+    }
+
+    element.style.top = topPoint;
+    var left = _CGRectGetMinX(contentRect);
+    // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
+    if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
+        left -= 1;
+    element.style.left = left + "px";
    element.style.width = _CGRectGetWidth(contentRect) + "px";
-    element.style.height = _CGRectGetHeight(contentRect) + "px";
+    element.style.height = ROUND(lineHeight) + "px";
+    element.style.lineHeight = ROUND(lineHeight) + "px";
+    element.style.verticalAlign = @"top";

    _DOMElement.appendChild(element);

+    // The font change above doesn't work for some browsers if the element isn't already .appendChild'ed.
+    if (!CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
+        element.style.font = [font cssString];
+
    window.setTimeout(function()
    {
        element.focus();

        // Select the text if the textfield became first responder through keyboard interaction
        if (!_willBecomeFirstResponderByClick)
-            [self selectText:self];
+            [self _selectText:self immediately:YES];

        _willBecomeFirstResponderByClick = NO;

@@ -518,8 +595,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        CPTextFieldInputOwner = self;
    }, 0.0);

-    element.value = [self stringValue];
-
    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

    CPTextFieldInputIsActive = YES;
@@ -533,15 +608,58 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
    }
 #endif
-
-    return YES;
 }

 /* @ignore */
 - (BOOL)resignFirstResponder
+{
+    // When we are no longer the first responder we don't worry about the key status of our window anymore.
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
+
+#if PLATFORM(DOM)
+
+    var element = [self _inputElement],
+        newValue = element.value,
+        error = @"";
+
+    if (newValue !== _stringValue)
+    {
+        [self _setStringValue:newValue];
+    }
+
+    // If there is a formatter, always give it a chance to reject the resignation,
+    // even if the value has not changed.
+    if ([self _valueIsValid:newValue] === NO)
+    {
+        element.focus();
+        return NO;
+    }
+
+#endif
+
+    [self _resignFirstKeyResponder];
+
+    _isEditing = NO;
+    [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+
+    if ([self sendsActionOnEndEditing])
+        [self sendAction:[self action] to:[self target]];
+
+    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
+
+    return YES;
+}
+
+- (void)_resignFirstKeyResponder
 {
    [self unsetThemeState:CPThemeStateEditing];

+    // Cache the formatted string
+    _stringValue = [self stringValue];
+
+    _willBecomeFirstResponderByClick = NO;
+
    [self _updatePlaceholderState];

    [self setNeedsLayout];
@@ -550,11 +668,10 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

    var element = [self _inputElement];

-    if ([self stringValue] !== element.value)
-        [self _setStringValue:element.value];
-
    CPTextFieldInputResigning = YES;
-    element.blur();
+
+    if (CPTextFieldInputIsActive)
+        element.blur();

    if (!CPTextFieldInputDidBlur)
        CPTextFieldBlurFunction();
@@ -577,18 +694,38 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    }

 #endif
+}

-    //post CPControlTextDidEndEditingNotification
-    if (_isEditing)
+- (void)_windowDidResignKey:(CPNotification)aNotification
+{
+    if (![[self window] isKeyWindow])
+        [self _resignFirstKeyResponder];
+}
+
+- (void)_windowDidBecomeKey:(CPNotification)aNotification
+{
+    if ([[self window] isKeyWindow] && [[self window] firstResponder] === self)
+        [self _becomeFirstKeyResponder];
+}
+
+- (BOOL)_valueIsValid:(CPString)aValue
+{
+#if PLATFORM(DOM)
+
+    var error = @"";
+
+    if ([self _setStringValue:aValue isNewValue:NO errorDescription:AT_REF(error)] === NO)
    {
-        _isEditing = NO;
-        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+        var acceptInvalidValue = NO;

-        if ([self sendsActionOnEndEditing])
-            [self sendAction:[self action] to:[self target]];
+        if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
+            acceptInvalidValue = [_delegate control:self didFailToFormatString:aValue errorDescription:error];
+
+        if (acceptInvalidValue === NO)
+            return NO;
    }

-    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
+#endif

    return YES;
 }
@@ -653,10 +790,112 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 - (void)keyUp:(CPEvent)anEvent
 {
-    var oldValue = [self stringValue];
-    [self _setStringValue:[self _inputElement].value];
+#if PLATFORM(DOM)

-    if (oldValue !== [self stringValue])
+    var newValue = [self _inputElement].value;
+
+    if (newValue !== _stringValue)
+    {
+        [self _setStringValue:newValue];
+
+        if (!_isEditing)
+        {
+            _isEditing = YES;
+            [self textDidBeginEditing:[CPNotification notificationWithName:CPControlTextDidBeginEditingNotification object:self userInfo:nil]];
+        }
+
+        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
+    }
+
+#endif
+
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+}
+
+- (void)keyDown:(CPEvent)anEvent
+{
+    // CPTextField uses an HTML input element to take the input so we need to
+    // propagate the dom event so the element is updated. This has to be done
+    // before interpretKeyEvents: though so individual commands have a chance
+    // to override this (escape to clear the text in a search field for example).
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+
+    [self interpretKeyEvents:[anEvent]];
+
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
+/*!
+    Invoke the action specified by aSelector on the current responder.
+
+    This is implemented by CPResponder and by default it passes any unrecognized
+    actions on to the next responder but text fields apparently aren't supposed
+    to do that according to this documentation by Apple:
+
+    http://developer.apple.com/mac/library/documentation/cocoa/reference/NSTextInputClient_Protocol/Reference/Reference.html#//apple_ref/occ/intfm/NSTextInputClient/doCommandBySelector:
+*/
+- (void)doCommandBySelector:(SEL)aSelector
+{
+    if ([self respondsToSelector:aSelector])
+        [self performSelector:aSelector];
+}
+
+- (void)insertNewline:(id)sender
+{
+    var newValue = [self _inputElement].value;
+
+    if (newValue !== _stringValue)
+    {
+        [self _setStringValue:newValue];
+    }
+
+    if ([self _valueIsValid:_stringValue])
+    {
+        // If _isEditing == YES then the target action can also be called via
+        // resignFirstResponder, and it is possible that the target action
+        // itself will change this textfield's responder status, so start by
+        // setting the _isEditing flag to NO to prevent the target action being
+        // called twice (once below and once from resignFirstResponder).
+        if (_isEditing)
+        {
+            _isEditing = NO;
+            [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+        }
+
+        // If there is no target action, or the sendAction call returns
+        // success.
+        if (![self action] || [self sendAction:[self action] to:[self target]])
+        {
+            [self selectAll:nil];
+        }
+    }
+
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
+}
+
+- (void)insertNewlineIgnoringFieldEditor:(id)sender
+{
+    [self _insertCharacterIgnoringFieldEditor:CPNewlineCharacter];
+}
+
+- (void)insertTabIgnoringFieldEditor:(id)sender
+{
+    [self _insertCharacterIgnoringFieldEditor:CPTabCharacter];
+}
+
+- (void)_insertCharacterIgnoringFieldEditor:(CPString)aCharacter
+{
+#if PLATFORM(DOM)
+
+    var oldValue = _stringValue,
+        range = [self selectedRange],
+        element = [self _inputElement];
+
+    element.value = [element.value stringByReplacingCharactersInRange:[self selectedRange] withString:aCharacter];
+    [self _setStringValue:element.value];
+
+    // NOTE: _stringValue is now the current input element value
+    if (oldValue !== _stringValue)
    {
        if (!_isEditing)
        {
@@ -667,28 +906,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
    }

-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-}
-
- (void)keyDown:(CPEvent)anEvent
-{
-    if ([anEvent keyCode] === CPReturnKeyCode)
-    {
-        if (_isEditing)
-        {
-            _isEditing = NO;
-            [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-        }
-
-        [self sendAction:[self action] to:[self target]];
-        [self selectText:nil];
-
-        [[[self window] platformWindow] _propagateCurrentDOMEvent:NO];
-    }
-    else
-        [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+#endif
 }

 - (void)textDidBlur:(CPNotification)note
@@ -709,17 +927,18 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    [[CPNotificationCenter defaultCenter] postNotification:note];
 }

- (void)sendAction:(SEL)anAction to:(id)anObject
+- (void)textDidChange:(CPNotification)note
 {
-    // Don't reverse set our empty value
-    if (!_currentValueIsPlaceholder)
-        [self _reverseSetBinding];
+    if ([note object] !== self)
+        return;

-    [CPApp sendAction:anAction to:anObject from:self];
+    [self _continuouslyReverseSetBinding];
+
+    [super textDidChange:note];
 }

 /*!
-    Returns the string the text field.
+    Returns the string in the text field.
 */
 - (id)objectValue
 {
@@ -728,23 +947,84 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 /*
    @ignore
+    Sets the internal string value without updating the value in the input element.
+    This should only be invoked when the underlying text element's value has changed.
 */
- (void)_setStringValue:(id)aValue
+- (BOOL)_setStringValue:(CPString)aValue
 {
-    [self willChangeValueForKey:@"objectValue"];
-    [super setObjectValue:String(aValue)];
-    [self _updatePlaceholderState];
-    [self didChangeValueForKey:@"objectValue"];
+    return [self _setStringValue:aValue isNewValue:YES errorDescription:nil];
+}
+
+/*
+    @ignore
+    Sets the internal string value without updating the value in the input element.
+    If there is a formatter and formatting fails, returns NO. Otherwise returns YES.
+*/
+- (BOOL)_setStringValue:(CPString)aValue isNewValue:(BOOL)isNewValue errorDescription:(CPStringRef)anError
+{
+    _stringValue = aValue;
+
+    var objectValue = aValue,
+        formatter = [self formatter],
+        result = YES;
+
+    if (formatter)
+    {
+        var object = nil;
+
+        if ([formatter getObjectValue:AT_REF(object) forString:aValue errorDescription:anError])
+            objectValue = object;
+        else
+        {
+            objectValue = undefined;  // Mark the value as invalid
+            result = NO;
+        }
+
+        isNewValue |= objectValue !== [super objectValue];
+    }
+
+    if (isNewValue)
+    {
+        [self willChangeValueForKey:@"objectValue"];
+        [super setObjectValue:objectValue];
+        [self _updatePlaceholderState];
+        [self didChangeValueForKey:@"objectValue"];
+    }
+
+    return result;
 }

 - (void)setObjectValue:(id)aValue
 {
    [super setObjectValue:aValue];

+    var formatter = [self formatter];
+
+    if (formatter)
+    {
+        // If there is a formatter, make sure the object value can be formatted successfully
+        var formattedString = [self hasThemeState:CPThemeStateEditing] ? [formatter editingStringForObjectValue:aValue] : [formatter stringForObjectValue:aValue];
+
+        if (formattedString === nil)
+        {
+            var value = nil;
+
+            // Formatting failed, get an "empty" object by formatting an empty string.
+            // If that fails, the value is undefined.
+            if ([formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
+                value = undefined;
+
+            [super setObjectValue:value];
+        }
+    }
+
+    _stringValue = [self stringValue];
+
 #if PLATFORM(DOM)

    if (CPTextFieldInputOwner === self || [[self window] firstResponder] === self)
-        [self _inputElement].value = aValue;
+        [self _inputElement].value = _stringValue;
+
 #endif

    [self _updatePlaceholderState];
@@ -752,9 +1032,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 - (void)_updatePlaceholderState
 {
-    var string = [self stringValue];
-
-    if ((!string || string.length === 0) && ![self hasThemeState:CPThemeStateEditing])
+    if ((!_stringValue || _stringValue.length === 0) && ![self hasThemeState:CPThemeStateEditing])
        [self setThemeState:CPTextFieldStatePlaceholder];
    else
        [self unsetThemeState:CPTextFieldStatePlaceholder];
@@ -787,34 +1065,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    return _placeholderString;
 }

- (void)_setCurrentValueIsPlaceholder:(BOOL)isPlaceholder
-{
-    // The initial _currentValueIsPlaceholder is null so convert it to NO for comparison purposes.
-    if (!!_currentValueIsPlaceholder === isPlaceholder)
-        return;
-
-    if (isPlaceholder)
-    {
-        // Save the original placeholder value so we can restore it later
-        // Only do this if the placeholder is not already overridden because the bindings logic might call this method
-        // several times and we don't want the bindings placeholder to ever become the original placeholder
-        if (!_currentValueIsPlaceholder)
-            _originalPlaceholderString = [self placeholderString];
-
-        // Set the current string value as the current placeholder and clear the string value
-        [self setPlaceholderString:[self stringValue]];
-        [self setStringValue:@""];
-    }
-    else
-    {
-        // Restore the original placeholder, the actual textfield value is already correct
-        // because it was set using setValue:forKey:
-        [self setPlaceholderString:_originalPlaceholderString];
-    }
-
-    _currentValueIsPlaceholder = isPlaceholder;
-}
-
 /*!
    For non-bezeled text fields (typically a label), sizeToFit has two behaviors, depending
    on the line break mode of the receiver.
@@ -835,7 +1085,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    However, since you don't know how tall it needs to be if you change the font, sizeToFit will still be
    useful for making the textfield an appropriate height.
 */
-
 - (void)sizeToFit
 {
    [self setFrameSize:[self _minimumFrameSize]];
@@ -848,7 +1097,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        minSize = [self currentValueForThemeAttribute:@"min-size"],
        maxSize = [self currentValueForThemeAttribute:@"max-size"],
        lineBreakMode = [self lineBreakMode],
-        text = ([self stringValue] || @" "),
+        text = (_stringValue || @" "),
        textSize = _CGSizeMakeCopy(frameSize),
        font = [self currentValueForThemeAttribute:@"font"];

@@ -862,8 +1111,16 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        textSize = [text sizeWithFont:font inWidth:textSize.width];
    }
    else
+    {
        textSize = [text sizeWithFont:font];

+        // Account for possible fractional pixels at right edge
+        textSize.width += 1;
+    }
+
+    // Account for possible fractional pixels at bottom edge
+    textSize.height += 1;
+
    frameSize.height = textSize.height + contentInset.top + contentInset.bottom;

    if ([self isBezeled])
@@ -885,21 +1142,40 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }

 /*!
-    Select all the text in the CPTextField.
+    Make the receiver the first responder and select all the text in the field.
 */
 - (void)selectText:(id)sender
 {
-#if PLATFORM(DOM)
-    var element = [self _inputElement];
+    [self _selectText:sender immediately:NO];
+}

+- (void)_selectText:(id)sender immediately:(BOOL)immediately
+{
+    // Selecting the text in a field makes it the first responder
    if (([self isEditable] || [self isSelectable]))
    {
-        if ([[self window] firstResponder] === self)
-            window.setTimeout(function() { element.select(); }, 0);
-        else if ([self window] !== nil && [[self window] makeFirstResponder:self])
-            window.setTimeout(function() {[self selectText:sender];}, 0);
-    }
+        var wind = [self window];
+
+#if PLATFORM(DOM)
+        var element = [self _inputElement];
+
+        if ([wind firstResponder] === self)
+        {
+            if (immediately)
+                element.select();
+            else
+                window.setTimeout(function() { element.select(); }, 0);
+        }
+        else if (wind !== nil && [wind makeFirstResponder:self])
+            [self _selectText:sender immediately:immediately];
+#else
+        // Even if we can't actually select the text we need to preserve the first
+        // responder side effect.
+        if (wind !== nil && [wind firstResponder] !== self)
+            [wind makeFirstResponder:self];
 #endif
+    }
+
 }

 - (void)copy:(id)sender
@@ -912,8 +1188,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
            return;

        var pasteboard = [CPPasteboard generalPasteboard],
-            stringValue = [self stringValue],
-            stringForPasting = [stringValue substringWithRange:selectedRange];
+            stringForPasting = [_stringValue substringWithRange:selectedRange];

        [pasteboard declareTypes:[CPStringPboardType] owner:nil];
        [pasteboard setString:stringForPasting forType:CPStringPboardType];
@@ -927,6 +1202,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [self copy:sender];
        [self deleteBackward:sender];
    }
+    // If we don't have an oninput listener, we won't detect the change made by the cut and need to fake a key up "soon".
+    else if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
+        [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(keyUp:) userInfo:nil repeats:NO];
 }

 - (void)paste:(id)sender
@@ -941,13 +1219,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [self deleteBackward:sender];

        var selectedRange = [self selectedRange],
-            stringValue = [self stringValue],
            pasteString = [pasteboard stringForType:CPStringPboardType],
-            newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];
+            newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:pasteString];

        [self setStringValue:newValue];
        [self setSelectedRange:CPMakeRange(selectedRange.location + pasteString.length, 0)];
    }
+    // If we don't have an oninput listener, we won't detect the change made by the cut and need to fake a key up "soon".
+    else if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
+        [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(keyUp:) userInfo:nil repeats:NO];
 }

 - (CPRange)selectedRange
@@ -955,6 +1235,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    if ([[self window] firstResponder] !== self)
        return CPMakeRange(0, 0);

+#if PLATFORM(DOM)
+
    // we wrap this in try catch because firefox will throw an exception in certain instances
    try
    {
@@ -981,7 +1263,9 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        // fall through to the return
    }

-    return CGMakeRange(0, 0);
+#endif
+
+    return CPMakeRange(0, 0);
 }

 - (void)setSelectedRange:(CPRange)aRange
@@ -989,6 +1273,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    if (![[self window] firstResponder] === self)
        return;

+#if PLATFORM(DOM)
+
    var inputElement = [self _inputElement];

    try
@@ -1017,6 +1303,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    catch (e)
    {
    }
+
+#endif
 }

 - (void)selectAll:(id)sender
@@ -1026,9 +1314,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 - (void)deleteBackward:(id)sender
 {
-    var selectedRange = [self selectedRange],
-        stringValue = [self stringValue],
-        newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
+    var selectedRange = [self selectedRange];
+
+    if (selectedRange.length < 2)
+         return;
+
+    selectedRange.location += 1;
+    selectedRange.length -= 1;
+
+    var newValue = [_stringValue stringByReplacingCharactersInRange:selectedRange withString:""];

    [self setStringValue:newValue];
    [self setSelectedRange:CPMakeRange(selectedRange.location, 0)];
@@ -1098,30 +1392,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 {
    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    if (!contentInset)
-        return bounds;
-
-    bounds.origin.x += contentInset.left;
-    bounds.origin.y += contentInset.top;
-    bounds.size.width -= contentInset.left + contentInset.right;
-    bounds.size.height -= contentInset.top + contentInset.bottom;
-
-    return bounds;
+    return _CGRectInsetByInset(bounds, contentInset);
 }

 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];

-    if (_CGInsetIsEmpty(bezelInset))
-        return bounds;
-
-    bounds.origin.x += bezelInset.left;
-    bounds.origin.y += bezelInset.top;
-    bounds.size.width -= bezelInset.left + bezelInset.right;
-    bounds.size.height -= bezelInset.top + bezelInset.bottom;
-
-    return bounds;
+    return _CGRectInsetByInset(bounds, bezelInset);
 }

 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
@@ -1148,7 +1426,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    else
    {
        var view = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
-        //[view setImagePosition:CPNoImage];

        [view setHitTests:NO];

@@ -1181,7 +1458,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
            string = [self placeholderString];
        else
        {
-            string = [self stringValue];
+            string = _stringValue;

            if ([self isSecure])
                string = secureStringForString(string);
@@ -1224,7 +1501,7 @@ var secureStringForString = function(aString)
        return "";

    return Array(aString.length + 1).join(CPSecureTextFieldCharacter);
-}
+};


 var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
@@ -1262,18 +1539,6 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
        [self setAlignment:[aCoder decodeIntForKey:CPTextFieldAlignmentKey]];

        [self setPlaceholderString:[aCoder decodeObjectForKey:CPTextFieldPlaceholderStringKey]];
-
-        // Make sure the frame is big enough
-        var minSize = [self _minimumFrameSize];
-        minSize.width = MAX(CGRectGetWidth([self frame]), minSize.width);
-        minSize.height = MAX(CGRectGetHeight([self frame]), minSize.height);
-
-        // Only size multiline bezeled textfields if it's to small to fit the content
-        if ([self isBezeled])
-            if ([self lineBreakMode] === CPLineBreakByCharWrapping || [self lineBreakMode] == CPLineBreakByWordWrapping)
-                minSize.height = MAX(CGRectGetHeight([self frame]), minSize.height);
-
-        [self setFrameSize:minSize];
    }

    return self;
@@ -1302,3 +1567,30 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",

@end

+@implementation _CPTextFieldValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:@"Multiple Values" forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:@"No Selection" forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:@"Not Applicable" forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:@"" forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setPlaceholderString:aValue];
+    [_source setObjectValue:nil];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setObjectValue:aValue];
+}
+
+@end
+
@@ -255,7 +255,7 @@ var CPThemesByName          = { },
        attributeNames = [attributes keyEnumerator],
        objectThemeClass = [anObject themeClass];

-    while (attributeName = [attributeNames nextObject])
+    while ((attributeName = [attributeNames nextObject]) !== nil)
        [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
 }

@@ -405,6 +405,7 @@ function CPThemeStateName(aState)
 CPThemeStateNames[0]        = "normal";
 CPThemeStateNormal          = CPThemeStates["normal"] = 0;
 CPThemeStateDisabled        = CPThemeState("disabled");
+CPThemeStateHovered         = CPThemeState("hovered");
 CPThemeStateHighlighted     = CPThemeState("highlighted");
 CPThemeStateSelected        = CPThemeState("selected");
 CPThemeStateTableDataView   = CPThemeState("tableDataView");
@@ -417,6 +418,9 @@ CPThemeStateEditing         = CPThemeState("editing");
 CPThemeStateVertical        = CPThemeState("vertical");
 CPThemeStateDefault         = CPThemeState("default");
 CPThemeStateCircular        = CPThemeState("circular");
+CPThemeStateAutocompleting  = CPThemeState("autocompleting");
+CPThemeStateMainWindow      = CPThemeState("mainWindow");
+CPThemeStateKeyWindow       = CPThemeState("keyWindow");

@implementation _CPThemeAttribute : CPObject
 {
@@ -578,6 +582,7 @@ CPThemeStateCircular        = CPThemeState("circular");
        _cache = {};

        _name = [aCoder decodeObjectForKey:@"name"];
+        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
        _values = [CPDictionary dictionary];

        if ([aCoder containsValueForKey:@"value"])
@@ -610,6 +615,7 @@ CPThemeStateCircular        = CPThemeState("circular");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
    [aCoder encodeObject:_name forKey:@"name"];
+    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];

    var keys = [_values allKeys],
        count = keys.length;
@@ -665,7 +671,7 @@ var numberOfOnes = function(aNumber)
    cachedNumberOfOnes[slot] = count;

    return count;
-}
+};

 numberOfOnes.displayName = "numberOfOnes";

@@ -50,8 +50,13 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;

-var CPToolbarsByIdentifier              = nil;
-var CPToolbarConfigurationsByIdentifier = nil;
+
+CPToolbarSizeModeDefault                = 0;
+CPToolbarSizeModeRegular                = 1;
+CPToolbarSizeModeSmall                  = 2;
+
+var CPToolbarsByIdentifier              = nil,
+    CPToolbarConfigurationsByIdentifier = nil;

 /*!
    @ingroup appkit
@@ -83,10 +88,12 @@ var CPToolbarConfigurationsByIdentifier = nil;
@implementation CPToolbar : CPObject
 {
    CPString                _identifier;
-    CPToolbarDisplayMode    _displayMode;
+    CPToolbarDisplayMode    _displayMode @accessors(property=displayMode);
    BOOL                    _showsBaselineSeparator;
    BOOL                    _allowsUserCustomization;
    BOOL                    _isVisible;
+    int                     _sizeMode @accessors(property=sizeMode);
+    int                     _desiredHeight;

    id                      _delegate;

@@ -107,7 +114,7 @@ var CPToolbarConfigurationsByIdentifier = nil;
 /* @ignore */
 + (void)initialize
 {
-    if (self != [CPToolbar class])
+    if (self !== [CPToolbar class])
        return;

    CPToolbarsByIdentifier = [CPDictionary dictionary];
@@ -128,6 +135,19 @@ var CPToolbarConfigurationsByIdentifier = nil;
    [toolbarsSharingIdentifier addObject:toolbar];
 }

+/*
+    Temporary theme attributes until we've figured out which CPView these theme attributes should
+    belong to.
+    @ignore
+*/
+ (id)_themeAttributes
+{
+    // "regular-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeRegular.
+    // "small-size-height" is used if no item has a non-zero min size and sizeMode == CPToolbarSizeModeSmall.
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMake(4.0, 4.0, 4.0, TOOLBAR_ITEM_MARGIN), 59.0, 46.0]
+                                       forKeys:[@"content-inset", @"regular-size-height", @"small-size-height"]];
+}
+
 - (id)init
 {
    return [self initWithIdentifier:@""];
@@ -148,6 +168,8 @@ var CPToolbarConfigurationsByIdentifier = nil;

        _identifier = anIdentifier;
        _isVisible = YES;
+        _sizeMode = CPToolbarSizeModeDefault;
+        _desiredHeight = 0;

        [CPToolbar _addToolbar:self forIdentifier:_identifier];
    }
@@ -202,6 +224,16 @@ var CPToolbarConfigurationsByIdentifier = nil;
    [_window _noteToolbarChanged];
 }

+- (void)setSizeMode:(CPToolbarSizeMode)aSize
+{
+    if (aSize === _sizeMode)
+        return;
+    _sizeMode = aSize;
+
+    [[self _toolbarView] setFrame:[self _toolbarViewFrame]];
+    [_window _noteToolbarChanged];
+}
+
 - (CPWindow)_window
 {
    return _window;
@@ -209,7 +241,13 @@ var CPToolbarConfigurationsByIdentifier = nil;

 - (void)_setWindow:(CPWindow)aWindow
 {
+    if (_window)
+        [[CPNotificationCenter defaultCenter] removeObserver:self object:_window];
+
    _window = aWindow;
+
+    if (_window)
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autovalidate) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
 }

 /*!
@@ -226,18 +264,43 @@ var CPToolbarConfigurationsByIdentifier = nil;
    [self _reloadToolbarItems];
 }

+- (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
+{
+    if (_displayMode === aDisplayMode)
+        return;
+    _displayMode = aDisplayMode;
+
+    [self _reloadToolbarItems];
+}
+
 /* @ignore */
 - (void)_loadConfiguration
 {

 }

+- (CGRect)_toolbarViewFrame
+{
+    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [self _valueForThemeAttribute:@"regular-size-height"] : [self _valueForThemeAttribute:@"small-size-height"]);
+    return CPRectMake(0.0, 0.0, 1200.0, height);
+}
+
+/*
+    Temporary theme attributes until we've figured out which CPView these theme attributes should
+    belong to.
+    @ignore
+*/
+- (id)_valueForThemeAttribute:(CPString)attributeName
+{
+    return [[[self class] _themeAttributes] valueForKey:attributeName];
+}
+
 /* @ignore */
 - (CPView)_toolbarView
 {
    if (!_toolbarView)
    {
-        _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
+        _toolbarView = [[_CPToolbarView alloc] initWithFrame:[self _toolbarViewFrame]];

        [_toolbarView setToolbar:self];
        [_toolbarView setAutoresizingMask:CPViewWidthSizable];
@@ -257,13 +320,17 @@ var CPToolbarConfigurationsByIdentifier = nil;
    // _defaultItems may have been loaded from Cib
    _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];

-    if (_delegate)
+    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
    {
-        var itemIdentifiersFromDelegate = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
+        var itemIdentifiersFromDelegate = [_delegate toolbarDefaultItemIdentifiers:self];

+        // If we get items both from the Cib and from the delegate method, put the delegate items before the
+        // Cib ones.
        if (itemIdentifiersFromDelegate)
-            _itemIdentifiers = [_itemIdentifiers arrayByAddingObjectsFromArray:itemIdentifiersFromDelegate];
+            _itemIdentifiers = [itemIdentifiersFromDelegate arrayByAddingObjectsFromArray:_itemIdentifiers];
    }
+    // If we didn't load from a cib and the delegate hasn't been set yet, we'll just work with an empty list
+    // at this point.

    var index = 0,
        count = [_itemIdentifiers count];
@@ -340,6 +407,19 @@ var CPToolbarConfigurationsByIdentifier = nil;
        [toolbarItems[count] validate];
 }

+- (void)_autovalidate
+{
+    var toolbarItems = [self visibleItems],
+        count = [toolbarItems count];
+
+    while (count--)
+    {
+        var item = [toolbarItems objectAtIndex:count];
+        if ([item autovalidates])
+            [item validate];
+    }
+}
+
 /* @ignore */
 - (id)_itemForItemIdentifier:(CPString)identifier willBeInsertedIntoToolbar:(BOOL)toolbar
 {
@@ -427,7 +507,8 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
    CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
    CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
    CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey",
+    CPToolbarSizeModeKey                = @"CPToolbarSizeModeKey";

@implementation CPToolbar (CPCoding)

@@ -446,6 +527,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
        _showsBaselineSeparator = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
        _allowsUserCustomization = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
        _isVisible = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
+        _sizeMode = [aCoder decodeIntForKey:CPToolbarSizeModeKey];

        _identifiedItems = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
        _defaultItems = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
@@ -464,7 +546,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
        // Because we don't know if a delegate will be set later (it is optional
        // as of OS X 10.5), we need to call -_reloadToolbarItems here.
        // In order to load any toolbar items that may have been configured in the
-        // Cib. Unfortunatelly this means that if there is a delegate
+        // Cib. Unfortunately this means that if there is a delegate
        // specified, it will be read later and the resulting call to -setDelegate:
        // will cause -_reloadToolbarItems] to run again :-(
        // FIXME: Can we make this better?
@@ -492,6 +574,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
    [aCoder encodeBool:_showsBaselineSeparator forKey:CPToolbarShowsBaselineSeparatorKey];
    [aCoder encodeBool:_allowsUserCustomization forKey:CPToolbarAllowsUserCustomizationKey];
    [aCoder encodeBool:_isVisible forKey:CPToolbarIsVisibleKey];
+    [aCoder encodeInt:_sizeMode forKey:CPToolbarSizeModeKey]

    [aCoder encodeObject:_identifiedItems forKey:CPToolbarIdentifiedItemsKey];
    [aCoder encodeObject:_defaultItems forKey:CPToolbarDefaultItemsKey];
@@ -508,14 +591,13 @@ var _CPToolbarViewBackgroundColor = nil,
    _CPToolbarViewExtraItemsImage = nil,
    _CPToolbarViewExtraItemsAlternateImage = nil;

-var TOOLBAR_TOP_MARGIN          = 5.0,
-    TOOLBAR_ITEM_MARGIN         = 10.0,
+var TOOLBAR_ITEM_MARGIN         = 10.0,
    TOOLBAR_EXTRA_ITEMS_WIDTH   = 20.0;

 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
    return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
-}
+};

 /* @ignore */
@implementation _CPToolbarView : CPView
@@ -547,9 +629,9 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

    var bundle = [CPBundle bundleForClass:self];

-    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size: CPSizeMake(10.0, 15.0)];
+    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size:CPSizeMake(10.0, 15.0)];

-    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:CGSizeMake(10.0, 15.0)];
+    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:_CGSizeMake(10.0, 15.0)];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -563,7 +645,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        _labelColor = [CPColor blackColor];
        _labelShadowColor = [CPColor colorWithWhite:1.0 alpha:0.75];

-        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
+        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
        [_additionalItemsButton setBordered:NO];

        [_additionalItemsButton setImagePosition:CPImageOnly];
@@ -615,7 +697,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
    // We begin by recalculating the visible items.
    var items = [_toolbar items],
-        itemsWidth = CGRectGetWidth([self bounds]),
+        itemsWidth = _CGRectGetWidth([self bounds]),
        minWidth = _minWidth,
        // FIXME: This should be a CPSet.
        invisibleItemsSortedByPriority = [];
@@ -665,9 +747,27 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
            height = minSize.height;
    }

+    // We'll figure out the proper height for the toolbar depending on its items.
+    // If nothing has a minimum size we'll use the standard toolbar size for the
+    // sizeMode, indicated by a 0 _desiredHeight.
+    var contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
+        newDesiredHeight = height ? height + contentInset.top + contentInset.bottom : 0;
+
+    if (newDesiredHeight != _toolbar._desiredHeight)
+    {
+        // FIXME Probably the toolbar view shouldn't be telling the toolbar which height it should be. Maybe refactor
+        // to just have the toolbar scan the toolbar items whenever the items change.
+        _toolbar._desiredHeight = newDesiredHeight;
+
+        [self setFrame:[_toolbar _toolbarViewFrame]];
+        [_toolbar._window _noteToolbarChanged];
+        // The above will cause tile to be called again.
+        return;
+    }
+
    // Determine all the items that have flexible width.
    // Also determine the height of the toolbar.
-    var count = _visibleItems.length
+    var count = _visibleItems.length,
        flexibleItemIndexes = [CPIndexSet indexSet];

    while (count--)
@@ -684,7 +784,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        // static width (min==max). This handles the case where the user did setView:
        // with a view of a different size than minSize/maxSize
        else
-            [view setFrameSize:CGSizeMake(minSize.width, height)];
+            [view setFrameSize:_CGSizeMake(minSize.width, height)];

        [view setHidden:NO];
    }
@@ -719,21 +819,23 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
                remainingSpace += proposedWidth - constrainedWidth;
            }

-            [view setFrameSize:CGSizeMake(constrainedWidth, height)];
+            [view setFrameSize:_CGSizeMake(constrainedWidth, height)];
        }
    }

    // Now that all the visible items are the correct width, give them their final frames.
    var index = 0,
        count = _visibleItems.length,
-        x = TOOLBAR_ITEM_MARGIN;
+        x = contentInset.left,
+        contentInset = [_toolbar _valueForThemeAttribute:@"content-inset"],
+        y = contentInset.top;

    for (; index < count; ++index)
    {
        var view = [self viewForItem:_visibleItems[index]],
-            viewWidth = CGRectGetWidth([view frame]);
+            viewWidth = _CGRectGetWidth([view frame]);

-        [view setFrame:CGRectMake(x, 0.0, viewWidth, height)];
+        [view setFrame:_CGRectMake(x, y, viewWidth, height)];

        x += viewWidth + TOOLBAR_ITEM_MARGIN;
    }
@@ -767,7 +869,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

    if (needsAdditionalItemsButton)
    {
-        [_additionalItemsButton setFrameOrigin:CGPointMake(itemsWidth + 5.0, (CGRectGetHeight([self bounds]) - CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];
+        [_additionalItemsButton setFrameOrigin:_CGPointMake(itemsWidth + 5.0, (_CGRectGetHeight([self bounds]) - _CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];

        [self addSubview:_additionalItemsButton];

@@ -799,10 +901,11 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

            hasNonSeparatorItem = YES;

-            var menuItem = [[CPMenuItem alloc] initWithTitle:[item label] action:[item action] keyEquivalent:nil];
+            var menuItem = [[CPMenuItem alloc] initWithTitle:[item label] action:@selector(didSelectMenuItem:) keyEquivalent:nil];

+            [menuItem setRepresentedObject:item];
            [menuItem setImage:[item image]];
-            [menuItem setTarget:[item target]];
+            [menuItem setTarget:self];
            [menuItem setEnabled:[item isEnabled]];

            [_additionalItemsButton addItem:menuItem];
@@ -812,6 +915,18 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        [_additionalItemsButton removeFromSuperview];
 }

+/*
+    Used privately.
+    @ignore
+*/
+
+- (void)didSelectMenuItem:(id)aSender
+{
+    var toolbarItem = [aSender representedObject];
+
+    [CPApp sendAction:[toolbarItem action] to:[toolbarItem target] from:toolbarItem];
+}
+
 - (void)reloadToolbarItems
 {
    // Get rid of all our current subviews.
@@ -836,6 +951,10 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
            view = [[_CPToolbarItemView alloc] initWithToolbarItem:item toolbar:self];

        _viewsForToolbarItems[[item UID]] = view;
+
+        if ([item toolTip] && [view respondsToSelector:@selector(setToolTip:)])
+            [view setToolTip:[item toolTip]];
+
        [self addSubview:view];

        _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
@@ -859,10 +978,9 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
        return CPOrderedAscending;

    return CPOrderedDescending;
-}
+};

-var TOP_MARGIN      = 5.0,
-    LABEL_MARGIN    = 2.0;
+var LABEL_MARGIN    = 2.0;

@implementation _CPToolbarItemView : CPControl
 {
@@ -889,12 +1007,12 @@ var TOP_MARGIN      = 5.0,
    {
        _toolbarItem = aToolbarItem;

-        _labelField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        _labelField = [[CPTextField alloc] initWithFrame:_CGRectMakeZero()];

        [_labelField setFont:[CPFont systemFontOfSize:11.0]];
        [_labelField setTextColor:[self FIXME_labelColor]];
        [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
-        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
        [_labelField setAutoresizingMask:CPViewWidthSizable | CPViewMinXMargin];

        [self addSubview:_labelField];
@@ -941,11 +1059,11 @@ var TOP_MARGIN      = 5.0,

        if (identifier === CPToolbarSeparatorItemIdentifier)
        {
-            _view = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 2.0, 32.0)];
+            _view = [[CPView alloc] initWithFrame:_CGRectMake(0.0, 0.0, 2.0, 32.0)];

            // FIXME: Get rid of this old API!!!
            sizes = {};
-            sizes[@"CPToolbarItemSeparator"] = [CGSizeMake(2.0, 26.0), CGSizeMake(2.0, 1.0), CGSizeMake(2.0, 26.0)];
+            sizes[@"CPToolbarItemSeparator"] = [_CGSizeMake(2.0, 26.0), _CGSizeMake(2.0, 1.0), _CGSizeMake(2.0, 26.0)];
            [_view setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];

            [self addSubview:_view];
@@ -979,7 +1097,7 @@ var TOP_MARGIN      = 5.0,
        {
            _imageView = [[CPImageView alloc] initWithFrame:[self bounds]];

-            [_imageView setImageScaling:CPScaleProportionally];
+            [_imageView setImageScaling:CPImageScaleProportionallyDown];

            [self addSubview:_imageView];
        }
@@ -997,8 +1115,13 @@ var TOP_MARGIN      = 5.0,

    _labelSize = [_labelField frame].size;

-    _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
-    _maxSize = CGSizeMake(MAX(_labelSize.width, minSize.width), 100000000.0);
+    var iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
+        labelOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeLabelOnly;
+    [_labelField setHidden:iconOnly];
+    [_view setHidden:labelOnly];
+
+    _minSize = _CGSizeMake(MAX(_labelSize.width, minSize.width), (labelOnly ? 0 : minSize.height) + (iconOnly ? 0 : _labelSize.height + LABEL_MARGIN));
+    _maxSize = _CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);

    [_toolbar tile];
 }
@@ -1015,20 +1138,23 @@ var TOP_MARGIN      = 5.0,
        width = _CGRectGetWidth(bounds);

    if (identifier === CPToolbarSeparatorItemIdentifier)
-        return [_view setFrame:CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
+        return [_view setFrame:_CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];

+    // The view is centred in the available space above the label.
    var view = _view || _imageView,
        itemMaxSize = [_toolbarItem maxSize],
-        height = _CGRectGetHeight(bounds) - _labelSize.height - LABEL_MARGIN - TOP_MARGIN,
+        iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
+        height = _CGRectGetHeight(bounds) - (iconOnly ? 0 : _labelSize.height),
        viewWidth = MIN(itemMaxSize.width, width),
        viewHeight =  MIN(itemMaxSize.height, height);

-    [view setFrame:CGRectMake(  ROUND((width - viewWidth) / 2.0),
-                                TOP_MARGIN + ROUND((height - viewHeight) / 2.0),
-                                viewWidth,
-                                viewHeight)];
+    [view setFrame:_CGRectMake(ROUND((width - viewWidth) / 2.0),
+                               ROUND((height - viewHeight) / 2.0),
+                               viewWidth,
+                               viewHeight)];

-    [_labelField setFrameOrigin:CGPointMake(ROUND((width - _labelSize.width) / 2.0), TOP_MARGIN + height + LABEL_MARGIN)];
+    // Label is always drawn at the bottom of the view. So if the view is really tall but the icon is tiny, the icon is centred above the label while the label remains on the bottom.
+    [_labelField setFrameOrigin:_CGPointMake(ROUND((width - _labelSize.width) / 2.0), _CGRectGetHeight(bounds) - _labelSize.height)];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -1091,7 +1217,7 @@ var TOP_MARGIN      = 5.0,
        if (alternateImage)
            [_imageView setImage:alternateImage];

-        [_labelField setTextShadowOffset:CGSizeMakeZero()];
+        [_labelField setTextShadowOffset:_CGSizeMakeZero()];
    }
    else
    {
@@ -1100,7 +1226,7 @@ var TOP_MARGIN      = 5.0,
        if (image)
            [_imageView setImage:image];

-        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
    }

    [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
@@ -40,7 +40,7 @@ CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
 CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
 CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";

-/*! 
+/*!
    @ingroup appkit
    @class CPToolbarItem

@@ -49,9 +49,9 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
@implementation CPToolbarItem : CPObject
 {
    CPString    _itemIdentifier;
-    
+
    CPToolbar   _toolbar;
-    
+
    CPString    _label;
    CPString    _paletteLabel;
    CPString    _toolTip;
@@ -61,12 +61,12 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
    BOOL        _isEnabled;
    CPImage     _image;
    CPImage     _alternateImage;
-    
+
    CPView      _view;
-    
+
    CGSize      _minSize;
-    CGSize      _maxSize;    
-    
+    CGSize      _maxSize;
+
    int         _visibilityPriority;

    BOOL        _autovalidates;
@@ -86,21 +86,21 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 - (id)initWithItemIdentifier:(CPString)anItemIdentifier
 {
    self = [super init];
-    
+
    if (self)
    {
        _itemIdentifier = anItemIdentifier;
-     
+
        _tag = 0;
        _isEnabled = YES;
-     
+
        _minSize = CGSizeMakeZero();
        _maxSize = CGSizeMakeZero();
-     
+
        _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
        _autovalidates = YES;
    }
-    
+
    return self;
 }

@@ -170,7 +170,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(toolTip)])
        return [_view toolTip];
-    
+
    return _toolTip;
 }

@@ -182,7 +182,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(setToolTip:)])
        [_view setToolTip:aToolTip];
-    
+
    _toolTip = aToolTip;
 }

@@ -193,7 +193,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(tag)])
        return [_view tag];
-    
+
    return _tag;
 }

@@ -205,7 +205,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(setTag:)])
        [_view setTag:aTag];
-    
+
    _tag = aTag;
 }

@@ -216,12 +216,12 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if (_view)
        return [_view respondsToSelector:@selector(target)] ? [_view target] : nil;
-    
+
    return _target;
 }

 /*!
-    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause 
+    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause
    the action to be passed on to the first responder.
    @param aTarget the new target
 */
@@ -229,7 +229,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if (!_view)
        _target = aTarget;
-    
+
    else if ([_view respondsToSelector:@selector(setTarget:)])
        [_view setTarget:aTarget];
 }
@@ -241,7 +241,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if (_view)
        return [_view respondsToSelector:@selector(action)] ? [_view action] : nil;
-    
+
    return _action;
 }

@@ -265,7 +265,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(isEnabled)])
        return [_view isEnabled];
-    
+
    return _isEnabled;
 }

@@ -277,7 +277,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(setEnabled:)])
        [_view setEnabled:shouldBeEnabled];
-    
+
    _isEnabled = shouldBeEnabled;
 }

@@ -288,7 +288,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(image)])
        return [_view image];
-        
+
    return _image;
 }

@@ -302,11 +302,11 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
        [_view setImage:anImage];

    _image = anImage;
-    
+
    if (!_image)
        return;
-    
-    if (_minSize.width === 0 && _minSize.height === 0 && 
+
+    if (_minSize.width === 0 && _minSize.height === 0 &&
        _maxSize.width === 0 && _maxSize.height === 0)
    {
        var imageSize = [_image size];
@@ -327,7 +327,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(setAlternateImage:)])
        [_view setAlternateImage:anImage];
-    
+
    _alternateImage = anImage;
 }

@@ -338,7 +338,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if ([_view respondsToSelector:@selector(alternateIamge)])
        return [_view alternateImage];
-    
+
    return _alternateImage;
 }

@@ -358,7 +358,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
    if (_view == aView)
        return;
-    
+
    _view = aView;

    if (_view)
@@ -366,7 +366,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
        // Tags get forwarded.
        if (_tag !== 0 && [_view respondsToSelector:@selector(setTag:)])
            [_view setTag:_tag];
-        
+
        _target = nil;
        _action = nil;
    }
@@ -386,11 +386,11 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setMinSize:(CGSize)aMinSize
 {
-    if(!aMinSize.height || !aMinSize.width)
+    if (!aMinSize.height || !aMinSize.width)
        return;

    _minSize = CGSizeMakeCopy(aMinSize);
-    
+
    // Try to provide some sanity: Make maxSize >= minSize
    _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
 }
@@ -409,11 +409,11 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setMaxSize:(CGSize)aMaxSize
 {
-    if(!aMaxSize.height || !aMaxSize.width)
+    if (!aMaxSize.height || !aMaxSize.width)
        return;
-        
+
    _maxSize = CGSizeMakeCopy(aMaxSize);
-    
+
    // Try to provide some sanity: Make minSize <= maxSize
    _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
 }
@@ -623,7 +623,7 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
        case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
        case CPToolbarPrintItemIdentifier:              return nil;
    }
-    
+
    return nil;
 }

@@ -1,11 +1,12 @@

@import <Foundation/CPObject.j>
+@import <Foundation/CPIndexPath.j>


@implementation CPTreeNode : CPObject
 {
    id              _representedObject @accessors(readonly, property=representedObject);
-    
+
    CPTreeNode      _parentNode @accessors(readonly, property=parentNode);
    CPMutableArray  _childNodes;
 }
@@ -87,38 +88,16 @@
        [_childNodes[count] sortWithSortDescriptors:sortDescriptors recursively:YES];
 }

- (CPEnumerator)preOrder
+- (CPTreeNode)descendantNodeAtIndexPath:(CPIndexPath)indexPath
 {
-    return [_CPTreeNodeEnumerator enumeratorWithTreeNode:self order:_CPTreeNodeEnumeratorPreOrder];
-}
+    var index = 0,
+        count = [indexPath length],
+        node = self;

- (CPEnumerator)inOrder
-{
-    return [_CPTreeNodeEnumerator enumeratorWithTreeNode:self order:_CPTreeNodeEnumeratorInOrder];
-}
+    for (; index < count; ++index)
+        node = [node objectInChildNodesAtIndex:[indexPath indexAtPosition:index]];

- (CPEnumerator)postOrder
-{
-    return [_CPTreeNodeEnumerator enumeratorWithTreeNode:self order:_CPTreeNodeEnumeratorPostOrder];
-}
-
- (CPEnumerator)levelOrder
-{
-    return [_CPTreeNodeEnumerator enumeratorWithTreeNode:self order:_CPTreeNodeEnumeratorLevelOrder];
-}
-
- (int)countByEnumeratingWithState:(id)aState objects:(id)objects count:(id)aCount
-{
-    if (aState.state !== 0)
-        return 0;
-
-    // FIXME: Change this to inorder when implemented?
-    var count = [[self preOrder] countByEnumeratingWithState:aState objects:objects count:aCount];
-
-    // Dangerous?
-    aState.state = YES;
-
-    return count;
+    return node;
 }

@end
@@ -151,166 +130,3 @@ var CPTreeNodeRepresentedObjectKey  = @"CPTreeNodeRepresentedObjectKey",
 }

@end
-
-var _CPTreeNodeEnumeratorPreOrder   = 0,
-    _CPTreeNodeEnumeratorInOrder    = 1,
-    _CPTreeNodeEnumeratorPostOrder  = 2,
-    _CPTreeNodeEnumeratorLevelOrder = 3;
-
-@implementation _CPTreeNodeEnumerator : CPEnumerator
-{
-    int         _order;
-    Object      _state;
-    CPTreeNode  _treeNode;
-}
-
-+ (_CPTreeNodeEnumerator)enumeratorWithTreeNode:(CPTreeNode)aTreeNode order:(int)anOrder
-{
-    return [[self alloc] initWithTreeNode:aTreeNode order:anOrder];
-}
-
- (id)initWithTreeNode:(CPTreeNode)aTreeNode order:(int)anOrder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _order = anOrder
-        _state = [self _newState];
-        _treeNode = aTreeNode;
-    }
-
-    return self;
-}
-
- (id)_newState
-{
-    return { stack:[_treeNode], visited:[CPSet set] };
-}
-
- (id)_preOrderFromState:(Object)state allObjects:(BOOL)shouldReturnAllObjects
-{
-    var stack = state.stack;
-
-    if (stack.length <= 0)
-        return nil;
-
-    if (shouldReturnAllObjects)
-        var allObjects = [];
-
-    while (stack.length)
-    {
-        var currentNode = stack.pop(),
-            childNodes = currentNode._childNodes,
-            count = childNodes.length;
-
-        while (count--)
-            stack.push(childNodes[count]);
-
-        if (shouldReturnAllObjects)
-            allObjects.push(currentNode);
-        else
-            return currentNode;
-    }
-
-    return allObjects;
-}
-
- (id)_inOrderFromState:(Object)state allObjects:(BOOL)shouldReturnAllObjects
-{
-    // Implement.
-}
-
- (id)_postOrderFromState:(Object)state allObjects:(BOOL)shouldReturnAllObjects
-{
-    var stack = state.stack;
-
-    if (stack.length <= 0)
-        return nil;
-
-    var visited = state.visited;
-
-    if (shouldReturnAllObjects)
-        var allObjects = [];
-
-    while (stack.length)
-    {
-        var currentNode = [stack lastObject],
-            childNodes = currentNode._childNodes,
-            originalCount = stack.length,
-            count = childNodes.length;
-
-        while (count--)
-        {
-            var treeNode = childNodes[count];
-
-            if ([visited containsObject:treeNode])
-                continue;
-            else
-                stack.push(treeNode);
-        }
-
-        if (originalCount === stack.length)
-        {
-            [visited addObject:currentNode];
-
-            if (shouldReturnAllObjects)
-                allObjects.push(stack.pop());
-            else
-                return stack.pop();
-        }
-    }
-
-    return allObjects;
-}
-
- (id)_levelOrderFromState:(Object)state allObjects:(BOOL)shouldReturnAllObjects
-{
-    // Implement.
-}
-
- (id)nextObject
-{
-    if (_order === _CPTreeNodeEnumeratorPreOrder)
-        return [self _preOrderFromState:[self _newState] allObjects:NO];
-
-    else if (_order === _CPTreeNodeEnumeratorInOrder)
-        return [self _inOrderFromState:[self _newState] allObjects:NO];
-
-    else if (_order === _CPTreeNodeEnumeratorPostOrder)
-        return [self _postOrderFromState:[self _newState] allObjects:NO];
-
-    //else if (_order === _CPTreeNodeEnumeratorLevelOrder)
-        return [self _levelOrderFromState:[self _newState] allObjects:NO];
-
-}
-
- (CPArray)allObjects
-{
-    if (_order === _CPTreeNodeEnumeratorPreOrder)
-        return [self _preOrderFromState:[self _newState] allObjects:YES];
-
-    else if (_order === _CPTreeNodeEnumeratorInOrder)
-        return [self _inOrderFromState:[self _newState] allObjects:YES];
-
-    else if (_order === _CPTreeNodeEnumeratorPostOrder)
-        return [self _postOrderFromState:[self _newState] allObjects:YES];
-
-    //else if (_order === _CPTreeNodeEnumeratorLevelOrder)
-        return [self _levelOrderFromState:[self _newState] allObjects:NO];
-}
-
- (int)countByEnumeratingWithState:(id)aState objects:(id)objects count:(id)aCount
-{
-    if (aState.state !== 0)
-        return 0;
-
-    var count = [[self allObjects] countByEnumeratingWithState:aState objects:objects count:aCount];
-
-    // Dangerous?
-    aState.state = YES;
-
-    return count;
-}
-
-@end
@@ -0,0 +1,267 @@
+/*
+ * CPUserDefaultsController.j
+ * AppKit
+ *
+ * Portions based on NSUserDefaultsController.m (2009-06-04) in Cocotron (http://www.cocotron.org/)
+ * Copyright (c) 2006-2007 Christopher J. W. Lloyd
+ *
+ * Created by Alexander Ljungberg.
+ * Copyright 2011, WireLoad Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+@import <Foundation/CPString.j>
+@import <AppKit/CPController.j>
+
+var SharedUserDefaultsController = nil;
+
+@implementation CPUserDefaultsController : CPController
+{
+    CPUserDefaults  _defaults           @accessors(readonly, property=defaults);
+    CPDictionary    _initialValues      @accessors(property=initialValues);
+    BOOL            _appliesImmediately @accessors(property=appliesImmediately);
+}
+
+ (id)sharedUserDefaultsController
+{
+    if (!SharedUserDefaultsController)
+        SharedUserDefaultsController = [[CPUserDefaultsController alloc] initWithDefaults:nil initialValues:nil];
+
+    return SharedUserDefaultsController;
+}
+
+- (id)initWithDefaults:(CPUserDefaults)someDefaults initialValues:(CPDictionary)initialValues
+{
+    if (self = [super init])
+    {
+        if (!someDefaults)
+            someDefaults = [CPUserDefaults standardUserDefaults];
+
+        _defaults = someDefaults;
+        _initialValues = [initialValues copy];
+        _appliesImmediately = YES;
+        _valueProxy = [[_CPUserDefaultsControllerProxy alloc] initWithController:self];
+    }
+
+    return self;
+}
+
+- (id)values
+{
+    return _valueProxy;
+}
+
+- (BOOL)hasUnappliedChanges
+{
+    return [_valueProxy hasUnappliedChanges];
+}
+
+- (void)save:(id)sender
+{
+    [_valueProxy save];
+}
+
+- (void)revert:(id)sender
+{
+    [_valueProxy revert];
+}
+
+- (void)revertToInitialValues:(id)sender
+{
+    [_valueProxy revertToInitialValues];
+}
+
+@end
+
+
+var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
+
+@implementation CPUserDefaultsController (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if ([aCoder decodeBoolForKey:CPUserDefaultsControllerSharedKey])
+        return [CPUserDefaultsController sharedUserDefaultsController];
+
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        [CPException raise:CPUnsupportedMethodException reason:@"decoding of non-shared CPUserDefaultsController not implemented"];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    if (self === SharedUserDefaultsController)
+    {
+        [aCoder encodeBool:YES forKey:CPUserDefaultsControllerSharedKey];
+        return;
+    }
+
+    [CPException raise:CPUnsupportedMethodException reason:@"encoding of non-shared CPUserDefaultsController not implemented"];
+}
+
+@end
+
+
+@implementation _CPUserDefaultsControllerProxy : CPObject
+{
+    CPUserDefaultsController    _controller;
+    // TODO Could be optimised with a JS dict.
+    CPMutableDictionary         _cachedValues;
+}
+
+- (id)initWithController:(CPUserDefaultsController)aController
+{
+    if (self = [super init])
+    {
+        _controller = aController;
+        _cachedValues = [CPMutableDictionary dictionary];
+
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(userDefaultsDidChange:) name:CPUserDefaultsDidChangeNotification object:[_controller defaults]];
+    }
+
+    return self;
+}
+
+- (void)dealloc
+{
+    // FIXME No dealloc in Cappuccino.
+    [[CPNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
+}
+
+- (id)valueForKey:(CPString)aKey
+{
+    var value = [_cachedValues objectForKey:aKey];
+    if (value === nil)
+    {
+        value = [[_controller defaults] objectForKey:aKey];
+        if (value === nil)
+            value = [[_controller initialValues] objectForKey:aKey];
+
+        if (value !== nil)
+            [_cachedValues setObject:value forKey:aKey];
+    }
+    return value;
+}
+
+- (void)setValue:(id)aValue forKey:(CPString)aKey
+{
+    [self willChangeValueForKey:aKey];
+    [_cachedValues setObject:aValue forKey:aKey];
+    if ([_controller appliesImmediately])
+        [[_controller defaults] setObject:aValue forKey:aKey];
+    [self didChangeValueForKey:aKey];
+}
+
+
+- (void)revert
+{
+    var keys = [_cachedValues allKeys],
+        keysCount = [keys count];
+
+    while (keysCount--)
+    {
+        var key = keys[keysCount];
+        [self willChangeValueForKey:key];
+        [_cachedValues removeObjectForKey:key];
+        [self didChangeValueForKey:key];
+    }
+}
+
+- (void)save
+{
+    var keys = [_cachedValues allKeys],
+        keysCount = [keys count];
+
+    while (keysCount--)
+    {
+        var key = keys[keysCount];
+        [[_controller defaults] setObject:[_cachedValues objectForKey:key] forKey:key];
+    }
+}
+
+- (void)revertToInitialValues
+{
+    var initial = [_controller initialValues],
+        keys = [_cachedValues allKeys],
+        keysCount = [keys count];
+
+    while (keysCount--)
+    {
+        var key = keys[keysCount];
+        [self willChangeValueForKey:key];
+
+        var initialValue = [initial objectForKey:key];
+        if (initialValue !== nil)
+            [_cachedValues setObject:initialValue forKey:key];
+        else
+            [_cachedValues removeObjectForKey:key];
+
+        [self didChangeValueForKey:key];
+
+    }
+}
+
+- (void)userDefaultsDidChange:(CPNotification)aNotification
+{
+    var defaults = [_controller defaults],
+        keys = [_cachedValues allKeys],
+        keysCount = [keys count];
+
+    while (keysCount--)
+    {
+        var key = keys[keysCount],
+            value = [_cachedValues objectForKey:key],
+            newValue = [defaults objectForKey:key];
+
+        if (![value isEqual:newValue])
+        {
+            [self willChangeValueForKey:key];
+            [_cachedValues setObject:newValue forKey:key];
+            [self didChangeValueForKey:key];
+        }
+    }
+}
+
+- (BOOL)hasUnappliedChanges
+{
+    var defaults = [_controller defaults],
+        keys = [_cachedValues allKeys],
+        keysCount = [keys count];
+
+    while (keysCount--)
+    {
+        var key = keys[keysCount],
+            value = [_cachedValues objectForKey:key],
+            newValue = [defaults objectForKey:key];
+
+        if (![value isEqual:newValue])
+            return YES;
+    }
+
+    return NO;
+}
+
+@end
+
@@ -21,14 +21,14 @@
 */

@import <Foundation/CPArray.j>
+@import <Foundation/CPGeometry.j>
@import <Foundation/CPObjJRuntime.j>
@import <Foundation/CPSet.j>

@import "CGAffineTransform.j"
-@import "CGGeometry.j"
+

@import "CPColor.j"
-@import "CPGeometry.j"
@import "CPGraphicsContext.j"
@import "CPResponder.j"
@import "CPTheme.j"
@@ -98,6 +98,10 @@ var CPViewFlags                     = { },
    CPViewHasCustomDrawRect         = 1 << 0,
    CPViewHasCustomLayoutSubviews   = 1 << 1;

+var CPCurrentToolTip,
+    CPCurrentToolTipTimer,
+    CPToolTipDelay = 1.0;
+
 /*!
    @ingroup appkit
    @class CPView
@@ -141,6 +145,7 @@ var CPViewFlags                     = { },
    BOOL                _postsFrameChangedNotifications;
    BOOL                _postsBoundsChangedNotifications;
    BOOL                _inhibitFrameAndBoundsChangedNotifications;
+    BOOL                _inLiveResize;

 #if PLATFORM(DOM)
    DOMElement          _DOMElement;
@@ -186,6 +191,12 @@ var CPViewFlags                     = { },
    CPView              _previousKeyView;

    unsigned            _viewClassFlags;
+
+    // ToolTips
+    CPString            _toolTip    @accessors(getter=toolTip);
+    Function            _toolTipFunctionIn;
+    Function            _toolTipFunctionOut;
+    BOOL                _toolTipInstalled;
 }

 /*
@@ -211,7 +222,7 @@ var CPViewFlags                     = { },
    CachedNotificationCenter = [CPNotificationCenter defaultCenter];
 }

- (void)setupViewFlags
+- (void)_setupViewFlags
 {
    var theClass = [self class],
        classUID = [theClass UID];
@@ -232,6 +243,13 @@ var CPViewFlags                     = { },
    _viewClassFlags = CPViewFlags[classUID];
 }

+- (void)_setupToolTipHandlers
+{
+    _toolTipInstalled = NO;
+    _toolTipFunctionIn = function(e) { [self _fireToolTip]; }
+    _toolTipFunctionOut = function(e) { [self _invalidateToolTip]; };
+}
+
 + (CPSet)keyPathsForValuesAffectingFrame
 {
    return [CPSet setWithObjects:@"frameOrigin", @"frameSize"];
@@ -288,6 +306,9 @@ var CPViewFlags                     = { },
        CPDOMDisplayServerSetStyleLeftTop(_DOMElement, NULL, _CGRectGetMinX(aFrame), _CGRectGetMinY(aFrame));
        CPDOMDisplayServerSetStyleSize(_DOMElement, width, height);

+        if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
+            _DOMElement.setAttribute("data-cappuccino-view", [self className]);
+
        _DOMImageParts = [];
        _DOMImageSizes = [];
 #endif
@@ -295,7 +316,8 @@ var CPViewFlags                     = { },
        _theme = [CPTheme defaultTheme];
        _themeState = CPThemeStateNormal;

-        [self setupViewFlags];
+        [self _setupToolTipHandlers];
+        [self _setupViewFlags];

        [self _loadThemeAttributes];
    }
@@ -303,6 +325,127 @@ var CPViewFlags                     = { },
    return self;
 }

+
+/*!
+    Sets the tooltip for the receiver.
+
+    @param aToolTip the tooltip
+*/
+- (void)setToolTip:(CPString)aToolTip
+{
+    if (_toolTip == aToolTip)
+        return;
+
+    _toolTip = aToolTip;
+
+    if (_toolTip)
+        [self _installToolTipEventHandlers];
+    else
+        [self _uninstallToolTipEventHandlers];
+}
+
+/*! @ignore
+
+    Install the handlers for the tooltip
+*/
+- (void)_installToolTipEventHandlers
+{
+    if (_toolTipInstalled)
+        return;
+
+#if PLATFORM(DOM)
+    if (_DOMElement.addEventListener)
+    {
+        _DOMElement.addEventListener("mouseover", _toolTipFunctionIn, NO);
+        _DOMElement.addEventListener("keypress", _toolTipFunctionOut, NO);
+        _DOMElement.addEventListener("mouseout", _toolTipFunctionOut, NO);
+    }
+    else if (_DOMElement.attachEvent)
+    {
+        _DOMElement.attachEvent("onmouseover", _toolTipFunctionIn);
+        _DOMElement.attachEvent("onkeypress", _toolTipFunctionOut);
+        _DOMElement.attachEvent("onmouseout", _toolTipFunctionOut);
+    }
+#endif
+
+    _toolTipInstalled = YES;
+}
+
+/*! @ignore
+
+    Uninstall the handlers for the tooltip
+*/
+- (void)_uninstallToolTipEventHandlers
+{
+    if (!_toolTipInstalled)
+        return;
+
+#if PLATFORM(DOM)
+    if (_DOMElement.removeEventListener)
+    {
+        _DOMElement.removeEventListener("mouseover", _toolTipFunctionIn, NO);
+        _DOMElement.removeEventListener("keypress", _toolTipFunctionOut, NO);
+        _DOMElement.removeEventListener("mouseout", _toolTipFunctionOut, NO);
+    }
+    else if (_DOMElement.detachEvent)
+    {
+        _DOMElement.detachEvent("onmouseover", _toolTipFunctionIn);
+        _DOMElement.detachEvent("onkeypress", _toolTipFunctionOut);
+        _DOMElement.detachEvent("onmouseout", _toolTipFunctionOut);
+    }
+#endif
+
+    _toolTipInstalled = NO;
+}
+
+/*! @ignore
+    Starts the tooltip timer.
+*/
+- (void)_fireToolTip
+{
+    if (CPCurrentToolTipTimer)
+    {
+        [CPCurrentToolTipTimer invalidate];
+
+        if (CPCurrentToolTip)
+            [CPCurrentToolTip close];
+
+        CPCurrentToolTip = nil;
+    }
+
+    if (_toolTip)
+        CPCurrentToolTipTimer = [CPTimer scheduledTimerWithTimeInterval:CPToolTipDelay target:self selector:@selector(_showToolTip:) userInfo:nil repeats:NO];
+}
+
+/*! @ignore
+    Stop the tooltip timer if any
+*/
+- (void)_invalidateToolTip
+{
+    if (CPCurrentToolTipTimer)
+    {
+        [CPCurrentToolTipTimer invalidate];
+        CPCurrentToolTipTimer = nil;
+    }
+
+    if (CPCurrentToolTip)
+    {
+        [CPCurrentToolTip close];
+        CPCurrentToolTip = nil;
+    }
+}
+
+/*! @ignore
+    Actually shows the tooltip if any
+*/
+- (void)_showToolTip:(CPTimer)aTimer
+{
+    if (CPCurrentToolTip)
+        [CPCurrentToolTip close];
+
+    CPCurrentToolTip = [_CPToolTip toolTipWithString:_toolTip];
+}
+
 /*!
    Returns the container view of the receiver
    @return the receiver's containing view
@@ -362,6 +505,9 @@ var CPViewFlags                     = { },
 /* @ignore */
 - (void)_insertSubview:(CPView)aSubview atIndex:(int)anIndex
 {
+    if (aSubview === self)
+        [CPException raise:CPInvalidArgumentException reason:"can't add a view as a subview of itself"];
+
    // We will have to adjust the z-index of all views starting at this index.
    var count = _subviews.length;

@@ -524,7 +670,7 @@ var CPViewFlags                     = { },
    var addedSubview = nil,
        addedSubviewEnumerator = [addedSubviews objectEnumerator];

-    while (addedSubview = [addedSubviewEnumerator nextObject])
+    while ((addedSubview = [addedSubviewEnumerator nextObject]) !== nil)
        [self addSubview:addedSubview];

    // If the order is fine, no need to reorder.
@@ -632,7 +778,7 @@ var CPViewFlags                     = { },
 }

 /*!
-    Called when the receiver is about to be remove one of its subviews.
+    Called when the receiver is about to remove one of its subviews.
    @param aView the view that will be removed
 */
 - (void)willRemoveSubview:(CPView)aView
@@ -703,9 +849,9 @@ var CPViewFlags                     = { },

 /*!
    Sets the frame size of the receiver to the dimensions and origin of the provided rectangle in the coordinate system
-    of the superview. The method also posts an CPViewFrameDidChangeNotification to the notification
+    of the superview. The method also posts a CPViewFrameDidChangeNotification to the notification
    center if the receiver is configured to do so. If the frame is the same as the current frame, the method simply
-    returns (and no notificaion is posted).
+    returns (and no notification is posted).
    @param aFrame the rectangle specifying the new origin and size  of the receiver
 */
 - (void)setFrame:(CGRect)aFrame
@@ -756,7 +902,7 @@ var CPViewFlags                     = { },
 }

 /*!
-    Returns the center of the receiver's frame to the provided point. The point is defined in the superview's coordinate system.
+    Returns the center of the receiver's frame in the superview's coordinate system.
    @return CGPoint the center point of the receiver's frame
 */
 - (CGPoint)center
@@ -845,11 +991,17 @@ var CPViewFlags                     = { },

            if (_backgroundType === BackgroundVerticalThreePartImage)
            {
+                // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, _DOMImageSizes[0].height);
                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], size.width, _DOMImageSizes[2].height);
            }
            else if (_backgroundType === BackgroundHorizontalThreePartImage)
            {
+                // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], _DOMImageSizes[0].width, size.height);
                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], _DOMImageSizes[2].width, size.height);
            }
            else if (_backgroundType === BackgroundNinePartImage)
            {
@@ -1284,6 +1436,14 @@ var CPViewFlags                     = { },
    return view !== nil;
 }

+/*!
+    Returns YES if the view is not hidden, has no hidden ancestor and doesn't belong to a hidden window.
+*/
+- (BOOL)_isVisible
+{
+    return ![self isHiddenOrHasHiddenAncestor] && [[self window] isVisible];
+}
+
 /*!
    Called when the return value of isHiddenOrHasHiddenAncestor becomes YES,
    e.g. when this view becomes hidden due to a setHidden:YES message to
@@ -1528,7 +1688,10 @@ var CPViewFlags                     = { },
        }
        else if (_backgroundType == BackgroundVerticalThreePartImage)
        {
+            // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], frameSize.width, _DOMImageSizes[0].height);
            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width, frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], frameSize.width, _DOMImageSizes[2].height);

            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, 0.0, _DOMImageSizes[0].height);
@@ -1536,7 +1699,10 @@ var CPViewFlags                     = { },
        }
        else if (_backgroundType == BackgroundHorizontalThreePartImage)
        {
+            // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], _DOMImageSizes[0].width, frameSize.height);
            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, frameSize.height);
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[2], _DOMImageSizes[2].width, frameSize.height);

            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
@@ -1566,6 +1732,16 @@ var CPViewFlags                     = { },
    return CGPointApplyAffineTransform(aPoint, _CPViewGetTransform(aView, self));
 }

+/*!
+    Converts the point from the base coordinate system to the receiver’s coordinate system.
+    @param aPoint A point specifying a location in the base coordinate system
+    @return The point converted to the receiver’s base coordinate system
+*/
+- (CGPoint)convertPointFromBase:(CGPoint)aPoint
+{
+    return CGPointApplyAffineTransform(aPoint, _CPViewGetTransform(nil, self));
+}
+
 /*!
    Converts \c aPoint from the receiver's coordinate space to the coordinate space of \c aView.
    @param aPoint the point to convert
@@ -1577,6 +1753,16 @@ var CPViewFlags                     = { },
    return CGPointApplyAffineTransform(aPoint, _CPViewGetTransform(self, aView));
 }

+/*!
+    Converts the point from the receiver’s coordinate system to the base coordinate system.
+    @param aPoint A point specifying a location in the coordinate system of the receiver
+    @return The point converted to the base coordinate system
+*/
+- (CGPoint)convertPointToBase:(CGPoint)aPoint
+{
+    return CGPointApplyAffineTransform(aPoint, _CPViewGetTransform(self, nil));
+}
+
 /*!
    Convert's \c aSize from \c aView's coordinate space to the receiver's coordinate space.
    @param aSize the size to convert
@@ -1610,6 +1796,16 @@ var CPViewFlags                     = { },
    return CGRectApplyAffineTransform(aRect, _CPViewGetTransform(aView, self));
 }

+/*!
+    Converts the rectangle from the base coordinate system to the receiver’s coordinate system.
+    @param aRect A rectangle specifying a location in the base coordinate system
+    @return The rectangle converted to the receiver’s base coordinate system
+*/
+- (CGRect)convertRectFromBase:(CGRect)aRect
+{
+    return CGRectApplyAffineTransform(aRect, _CPViewGetTransform(nil, self));
+}
+
 /*!
    Converts \c aRect from the receiver's coordinate space to \c aView's coordinate space.
    @param aRect the rectangle to convert
@@ -1621,6 +1817,16 @@ var CPViewFlags                     = { },
    return CGRectApplyAffineTransform(aRect, _CPViewGetTransform(self, aView));
 }

+/*!
+    Converts the rectangle from the receiver’s coordinate system to the base coordinate system.
+    @param aRect  A rectangle specifying a location in the coordinate system of the receiver
+    @return The rectangle converted to the base coordinate system
+*/
+- (CGRect)convertRectToBase:(CGRect)aRect
+{
+    return CGRectApplyAffineTransform(aRect, _CPViewGetTransform(self, nil));
+}
+
 /*!
    Sets whether the receiver posts a CPViewFrameDidChangeNotification notification
    to the default notification center when its frame is changed. The default is \c NO.
@@ -1695,7 +1901,7 @@ setBoundsOrigin:
    @param aLocation the lower-left corner coordinate of \c anImage
    @param mouseOffset the distance from the \c -mouseDown: location and the current location
    @param anEvent the \c -mouseDown: that triggered the drag
-    @param aPastebaord the pasteboard that holds the drag data
+    @param aPasteboard the pasteboard that holds the drag data
    @param aSourceObject the drag operation controller
    @param slideBack Whether the image should 'slide back' if the drag is rejected
 */
@@ -1710,7 +1916,7 @@ setBoundsOrigin:
    @param aLocation the top-left corner coordinate of \c aView
    @param mouseOffset the distance from the \c -mouseDown: location and the current location
    @param anEvent the \c -mouseDown: that triggered the drag
-    @param aPastebaord the pasteboard that holds the drag data
+    @param aPasteboard the pasteboard that holds the drag data
    @param aSourceObject the drag operation controller
    @param slideBack Whether the view should 'slide back' if the drag is rejected
 */
@@ -2060,7 +2266,7 @@ setBoundsOrigin:

 /*!
    Scrolls the clip view to a specified point
-    @param the clip view to scoll
+    @param the clip view to scroll
    @param the point to scroll to
 */
 - (void)scrollClipView:(CPClipView)aClipView toPoint:(CGPoint)aPoint
@@ -2077,10 +2283,61 @@ setBoundsOrigin:
 {
 }

+/*!
+    Return yes if the receiver is in a live-resize operation.
+*/
+- (BOOL)inLiveResize
+{
+    return _inLiveResize;
+}
+
+/*!
+    Not implemented.
+
+    A view will be sent this message before a window begins a resize operation. The
+    receiver might choose to simplify its drawing operations during a live resize
+    for speed.
+
+    Subclasses should call super.
+*/
+- (void)viewWillStartLiveResize
+{
+    _inLiveResize = YES;
+}
+
+/*!
+    Not implemented.
+
+    A view will be sent this message after a window finishes a resize operation. The
+    receiver which simplified its drawing operations in viewWillStartLiveResize might
+    stop doing so now. Note the view might no longer be in a window, so use
+    [self setNeedsDisplay:YES] if a final non-simplified redraw is required.
+
+    Subclasses should call super.
+*/
+- (void)viewDidEndLiveResize
+{
+    _inLiveResize = NO;
+}
+
@end

@implementation CPView (KeyView)

+/*!
+    Overridden by subclasses to handle a key equivalent.
+
+    If the receiver’s key equivalent is the same as the characters of the key-down event theEvent,
+    as returned by \ref CPEvent::charactersIgnoringModifiers "[anEvent charactersIgnoringModifiers]",
+    the receiver should take the appropriate action and return \c YES. Otherwise, it should return
+    the result of invoking super’s implementation. The default implementation of this method simply
+    passes the message down the view hierarchy (from superviews to subviews)
+    and returns \c NO if none of the receiver’s subviews responds \c YES.
+
+    @param anEvent An event object that represents the key equivalent pressed
+    @return \c YES if theEvent is a key equivalent that the receiver handled,
+            \c NO if it is not a key equivalent that it should handle.
+*/
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
    var count = [_subviews count];
@@ -2105,11 +2362,18 @@ setBoundsOrigin:

 - (CPView)nextValidKeyView
 {
-    var result = [self nextKeyView];
+    var result = [self nextKeyView],
+        firstResult = result;

    while (result && ![result canBecomeKeyView])
+    {
        result = [result nextKeyView];

+        // Cycled.
+        if (result === firstResult)
+            return nil;
+    }
+
    return result;
 }

@@ -2120,23 +2384,38 @@ setBoundsOrigin:

 - (CPView)previousValidKeyView
 {
-    var result = [self previousKeyView];
+    var result = [self previousKeyView],
+        firstResult = result;

    while (result && ![result canBecomeKeyView])
+    {
        result = [result previousKeyView];

+        // Cycled.
+        if (result === firstResult)
+            return nil;
+    }
+
    return result;
 }

 - (void)_setPreviousKeyView:(CPView)previous
 {
-    _previousKeyView = previous;
+    if ([previous isEqual:self])
+        _previousKeyView = nil;
+    else
+        _previousKeyView = previous;
 }

 - (void)setNextKeyView:(CPView)next
 {
-    _nextKeyView = next;
-    [_nextKeyView _setPreviousKeyView:self];
+    if ([next isEqual:self])
+        _nextKeyView = nil;
+    else
+    {
+        _nextKeyView = next;
+        [_nextKeyView _setPreviousKeyView:self];
+    }
 }

@end
@@ -2213,6 +2492,10 @@ setBoundsOrigin:

 - (BOOL)hasThemeState:(CPThemeState)aState
 {
+    // Because CPThemeStateNormal is defined as 0 we need to check for it explicitly here
+    if (aState === CPThemeStateNormal && _themeState === CPThemeStateNormal)
+        return YES;
+
    return !!(_themeState & ((typeof aState === "string") ? CPThemeState(aState) : aState));
 }

@@ -2447,6 +2730,55 @@ setBoundsOrigin:
    return [_themeAttributes[aName] valueForState:_themeState];
 }

+- (BOOL)hasThemeAttribute:(CPString)aName
+{
+    return (_themeAttributes && _themeAttributes[aName] !== undefined);
+}
+
+/*!
+    Registers theme values encoded in an array at runtime. The format of the data in the array
+    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
+    CPColorWithImages() in place of PatternColor(). For more information see the comments
+    at the top of ThemeDescriptors.j.
+
+    @param themeValues array of theme values
+*/
+- (void)registerThemeValues:(CPArray)themeValues
+{
+    for (var i = 0; i < themeValues.length; ++i)
+    {
+        var attributeValueState = themeValues[i],
+            attribute = attributeValueState[0],
+            value = attributeValueState[1],
+            state = attributeValueState[2];
+
+        if (state)
+            [self setValue:value forThemeAttribute:attribute inState:state];
+        else
+            [self setValue:value forThemeAttribute:attribute];
+    }
+}
+
+/*!
+    Registers theme values encoded in an array at runtime. The format of the data in the array
+    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
+    CPColorWithImages() in place of PatternColor(). The values in \c inheritedValues are
+    registered first, then those in \c themeValues override/augment the inherited values.
+    For more information see the comments at the top of ThemeDescriptors.j.
+
+    @param themeValues array of base theme values
+    @param inheritedValues array of overridden/additional theme values
+*/
+- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues
+{
+    // Register inherited values first, then override those with the subtheme values.
+    if (inheritedValues)
+        [self registerThemeValues:inheritedValues];
+
+    if (themeValues)
+        [self registerThemeValues:themeValues];
+}
+
 - (CPView)createEphemeralSubviewNamed:(CPString)aViewName
 {
    return nil;
@@ -2469,7 +2801,7 @@ setBoundsOrigin:

    var frame = [self rectForEphemeralSubviewNamed:aViewName];

-    if (frame && !_CGRectIsEmpty(frame))
+    if (frame)
    {
        if (!_ephemeralSubviewsForNames[aViewName])
        {
@@ -2511,6 +2843,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
    CPViewBoundsKey                 = @"CPViewBoundsKey",
    CPViewFrameKey                  = @"CPViewFrameKey",
    CPViewHitTestsKey               = @"CPViewHitTestsKey",
+    CPViewToolTipKey                = @"CPViewToolTipKey",
    CPViewIsHiddenKey               = @"CPViewIsHiddenKey",
    CPViewOpacityKey                = @"CPViewOpacityKey",
    CPViewSubviewsKey               = @"CPViewSubviewsKey",
@@ -2558,10 +2891,19 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
        _registeredDraggedTypes = [CPSet set];
        _registeredDraggedTypesArray = [];

-        _autoresizingMask = [aCoder decodeIntForKey:CPViewAutoresizingMaskKey] || CPViewNotSizable;
+        // Other views (CPBox) might set an autoresizes mask on their subviews before it is actually decoded.
+        // We make sure we don't override the value by checking if it was already set.
+        if (_autoresizingMask === nil)
+            _autoresizingMask = [aCoder decodeIntForKey:CPViewAutoresizingMaskKey] || CPViewNotSizable;
+
        _autoresizesSubviews = ![aCoder containsValueForKey:CPViewAutoresizesSubviewsKey] || [aCoder decodeBoolForKey:CPViewAutoresizesSubviewsKey];

-        _hitTests = ![aCoder containsValueForKey:CPViewHitTestsKey] || [aCoder decodeObjectForKey:CPViewHitTestsKey];
+        _hitTests = ![aCoder containsValueForKey:CPViewHitTestsKey] || [aCoder decodeBoolForKey:CPViewHitTestsKey];
+
+        [self _setupToolTipHandlers];
+        _toolTip = [aCoder decodeObjectForKey:CPViewToolTipKey];
+        if (_toolTip)
+            [self _installToolTipEventHandlers];

        // DOM SETUP
 #if PLATFORM(DOM)
@@ -2581,10 +2923,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
        }
 #endif

-        if ([aCoder containsValueForKey:CPViewIsHiddenKey])
-            [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];
-        else
-            _isHidden = NO;
+        [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];

        if ([aCoder containsValueForKey:CPViewOpacityKey])
            [self setAlphaValue:[aCoder decodeIntForKey:CPViewOpacityKey]];
@@ -2592,8 +2931,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
            _opacity = 1.0;

        [self setBackgroundColor:[aCoder decodeObjectForKey:CPViewBackgroundColorKey]];
-
-        [self setupViewFlags];
+        [self _setupViewFlags];

        _theme = [CPTheme defaultTheme];
        _themeClass = [aCoder decodeObjectForKey:CPViewThemeClassKey];
@@ -2674,14 +3012,17 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
    if (_isHidden)
        [aCoder encodeBool:_isHidden forKey:CPViewIsHiddenKey];

+    if (_toolTip)
+        [aCoder encodeObject:_toolTip forKey:CPViewToolTipKey];
+
    var nextKeyView = [self nextKeyView];

-    if (nextKeyView !== nil)
+    if (nextKeyView !== nil && ![nextKeyView isEqual:self])
        [aCoder encodeConditionalObject:nextKeyView forKey:CPViewNextKeyViewKey];

    var previousKeyView = [self previousKeyView];

-    if (previousKeyView !== nil)
+    if (previousKeyView !== nil && ![previousKeyView isEqual:self])
        [aCoder encodeConditionalObject:previousKeyView forKey:CPViewPreviousKeyViewKey];

    [aCoder encodeObject:[self themeClass] forKey:CPViewThemeClassKey];
@@ -2699,7 +3040,7 @@ var _CPViewFullScreenModeStateMake = function(aView)
    var superview = aView._superview;

    return { autoresizingMask:aView._autoresizingMask, frame:CGRectMakeCopy(aView._frame), index:(superview ? [superview._subviews indexOfObjectIdenticalTo:aView] : 0), superview:superview };
-}
+};

 var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
 {
@@ -2796,4 +3137,6 @@ var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
    }*/

    return transform;
-}
+};
+
+
@@ -23,19 +23,49 @@
@import "CPAnimation.j"


-CPViewAnimationTargetKey = @"CPViewAnimationTarget";
-CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrame";
-CPViewAnimationEndFrameKey = @"CPViewAnimationEndFrame";
-CPViewAnimationEffectKey = @"CPViewAnimationEffect";
+CPViewAnimationTargetKey = @"CPViewAnimationTargetKey";
+CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrameKey";
+CPViewAnimationEndFrameKey = @"CPViewAnimationEndFrameKey";
+CPViewAnimationEffectKey = @"CPViewAnimationEffectKey";

-CPViewAnimationFadeInEffect = @"CPViewAnimationFadeIn";
-CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
+CPViewAnimationFadeInEffect = @"CPViewAnimationFadeInEffect";
+CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect";
+
+/*!
+    @class CPViewAnimation
+
+    CPViewAnimation is a subclass of CPAnimation that makes it easy to do
+    basic animations on views.
+*/

@implementation CPViewAnimation : CPAnimation
 {
    CPArray _viewAnimations;
 }

+/*!
+    Designated initializer.
+
+    This method takes an array of CPDictionaries. Each dictionary should
+    contain values for the following keys:
+
+    <pre>
+    CPViewAnimationTargetKey - (Required) The view to animate.
+    CPViewAnimationStartFrameKey - (Optional) The start frame of the target.
+    CPViewAnimationEndFrameKey - (Optional) The end frame of the target.
+    CPViewAnimationEffectKey - (Optional) a fade effect to use for the animation.
+    </pre>
+
+    For example:
+    <pre>
+    var animation = [CPDictionary dictionaryWithObjects:[myViewToAnimate, aStartFrame, anEndFrame, CPViewAnimationFadeInEffect]
+                                                forKeys:[CPViewAnimationTargetKey, CPViewAnimationStartFrameKey, CPViewAnimationEndFrameKey, CPViewAnimationEffectKey]];
+    </pre>
+
+    If you pass nil instead of an array of dictionaries you should later call setViewAnimations:.
+
+    @param viewAnimations - An array of CPDictionaries for each animation.
+*/
 - (id)initWithViewAnimations:(CPArray)viewAnimations
 {
    if (self = [super initWithDuration:0.5 animationCurve:CPAnimationLinear])
@@ -61,7 +91,7 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
        if (effect === CPViewAnimationFadeInEffect)
        {
            [view setAlphaValue:0.0];
-            [view setHidden:NO];
+            [self _targetView:view setHidden:NO];
        }
        else if (effect === CPViewAnimationFadeOutEffect)
            [view setAlphaValue:1.0];
@@ -81,7 +111,8 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
            view = [self _targetView:dictionary],
            startFrame = [self _startFrame:dictionary],
            endFrame = [self _endFrame:dictionary],
-            differenceFrame = _CGRectMakeZero();
+            differenceFrame = _CGRectMakeZero(),
+            value = [super currentValue];

        differenceFrame.origin.x = endFrame.origin.x - startFrame.origin.x;
        differenceFrame.origin.y = endFrame.origin.y - startFrame.origin.y;
@@ -89,22 +120,22 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
        differenceFrame.size.height = endFrame.size.height - startFrame.size.height;

        var intermediateFrame = _CGRectMakeZero();
-        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * progress;
-        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * progress;
-        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * progress;
-        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * progress;
+        intermediateFrame.origin.x = startFrame.origin.x + differenceFrame.origin.x * value;
+        intermediateFrame.origin.y = startFrame.origin.y + differenceFrame.origin.y * value;
+        intermediateFrame.size.width = startFrame.size.width + differenceFrame.size.width * value;
+        intermediateFrame.size.height = startFrame.size.height + differenceFrame.size.height * value;

        [view setFrame:intermediateFrame];

        // Update the view's alpha value
        var effect = [self _effect:dictionary];
        if (effect === CPViewAnimationFadeInEffect)
-            [view setAlphaValue:1.0 * progress];
+            [view setAlphaValue:1.0 * value];
        else if (effect === CPViewAnimationFadeOutEffect)
-            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * progress];
+            [view setAlphaValue:1.0 + ( 0.0 - 1.0 ) * value];

        if (progress === 1.0)
-            [view setHidden:_CGRectIsNull(endFrame) || [view alphaValue] === 0.0];
+            [self _targetView:view setHidden:_CGRectIsNull(endFrame) || [view alphaValue] === 0.0];
    }
 }

@@ -125,12 +156,25 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
        else if (effect === CPViewAnimationFadeOutEffect)
            [view setAlphaValue:0.0];

-        [view setHidden:_CGRectIsNull(endFrame) || [view alphaValue] === 0.0];
+        [self _targetView:view setHidden:_CGRectIsNull(endFrame) || [view alphaValue] === 0.0];
    }

    [super stopAnimation];
 }

+- (void)_targetView:(id)theView setHidden:(BOOL)isHidden
+{
+    if ([theView isKindOfClass:[CPWindow class]])
+    {
+        if (isHidden)
+            [theView orderOut:self];
+        else
+            [theView orderFront:self];
+    }
+    else
+        [theView setHidden:isHidden];
+}
+
 - (id)_targetView:(CPDictionary)dictionary
 {
    var targetView = [dictionary valueForKey:CPViewAnimationTargetKey];
@@ -168,6 +212,11 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOut";
    return _viewAnimations;
 }

+/*!
+    Takes an array of CPDictionaries as documented in initWithViewAnimations:.
+
+    @param viewAnimations - An array of dictionaries describing the animation.
+*/
 - (void)setViewAnimations:(CPArray)viewAnimations
 {
    if (viewAnimations != _viewAnimations)
@@ -29,31 +29,45 @@

 var CPViewControllerCachedCibs;

-/*! @class CPViewController
-    The CPViewController class provides the fundamental view-management controller for Cappuccino applications.
-    The basic view controller class supports the presentation of an associated view in addition to basic support
-    for managing modal views and, in the future, animations. Subclasses such as CPNavigationController and
-    CPTabBarController provide additional behavior for managing complex hierarchies of view controllers and views.
+/*!
+    @ingroup appkit
+    @class CPViewController

-    You use each instance of CPViewController to manage a single view (and hierarchy). For a simple view controller,
-    this entails managing the view hierarchy responsible for presenting your application content.
-    A typical view hierarchy consists of a root viewŃa reference to which is available in the view property of this classŃ
-    and one or more subviews presenting the actual content. In the case of navigation and tab bar controllers, the view
-    controller manages not only the high-level view hierarchy (which provides the navigation controls) but also one
-    or more additional view controllers that handle the presentation of the application content.
+    The CPViewController class provides the fundamental view-management
+    controller for Cappuccino applications. The basic view controller class
+    supports the presentation of an associated view in addition to basic
+    support for managing modal views and, in the future, animations.
+    Subclasses such as CPNavigationController and CPTabBarController provide
+    additional behavior for managing complex hierarchies of view controllers
+    and views.

-    Unlike UIViewController in Cocoa Touch, a CPViewController does not represent an entire screen of content. You
-    will add your root view to an existing view or window's content view. You can manage many view controllers
-    on screen at once. CPViewController is also the preferred way of working with Cibs.
+    You use each instance of CPViewController to manage a single view (and
+    hierarchy). For a simple view controller, this entails managing the view
+    hierarchy responsible for presenting your application content. A typical
+    view hierarchy consists of a root view, a reference to which is available
+    in the view property of this class, and one or more subviews presenting
+    the actual content. In the case of navigation and tab bar controllers, the
+    view controller manages not only the high-level view hierarchy (which
+    provides the navigation controls) but also one or more additional view
+    controllers that handle the presentation of the application content.

-    Subclasses can override -loadView to create their custom view hierarchy, or specify a cib name to be loaded automatically.
-    It has methods that are called when a view appears or disappears.
-    This class is also a good place for delegate & datasource methods, and other controller stuff.
+    Unlike UIViewController in Cocoa Touch, a CPViewController does not
+    represent an entire screen of content. You will add your root view to an
+    existing view or window's content view. You can manage many view
+    controllers on screen at once. CPViewController is also the preferred way
+    of working with Cibs.
+
+    Subclasses can override -loadView to create their custom view hierarchy,
+    or specify a cib name to be loaded automatically. It has methods that are
+    called when a view appears or disappears. This class is also a good place
+    for delegate & datasource methods, and other controller stuff.
 */
@implementation CPViewController : CPResponder
 {
    CPView          _view @accessors(property=view);
    BOOL            _isLoading;
+    BOOL            _isLazy;
+    BOOL            _isViewLoaded @accessors(getter=isViewLoaded);

    id              _representedObject @accessors(property=representedObject);
    CPString        _title @accessors(property=title);
@@ -65,8 +79,10 @@ var CPViewControllerCachedCibs;

 + (void)initialize
 {
-    if (self === CPViewController)
-        CPViewControllerCachedCibs = [CPDictionary dictionary];
+    if (self !== [CPViewController class])
+        return;
+
+    CPViewControllerCachedCibs = [CPDictionary dictionary];
 }

 /*!
@@ -88,9 +104,14 @@ var CPViewControllerCachedCibs;
 }

 /*!
-    The designated initializer. If you subclass CPViewController, you must call the super implementation of this method, even if you aren't using a Cib.
-    In the specified Cib, the File's Owner proxy should have its class set to your view controller subclass, with the view outlet connected to the main view.
-    If you pass in a nil Cib name, then you must either call -setView: before -view is invoked, or override -loadView to set up your views.
+    The designated initializer. If you subclass CPViewController, you must
+    call the super implementation of this method, even if you aren't using a
+    Cib.
+
+    In the specified Cib, the File's Owner proxy should have its class set to
+    your view controller subclass, with the view outlet connected to the main
+    view. If you pass in a nil Cib name, then you must either call -setView:
+    before -view is invoked, or override -loadView to set up your views.

    @param cibNameOrNil The path to the cib to load for the root view or nil to programmatically create views.
    @param cibBundleOrNil The bundle that the cib is located in or nil for the main bundle.
@@ -107,20 +128,25 @@ var CPViewControllerCachedCibs;
        _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];

        _isLoading = NO;
+        _isLazy = NO;
    }

    return self;
 }

 /*!
-    Programmatically creates the view that the controller manages.
-    You should never call this method directly. The view controller calls this method when the view property is requested but is nil.
+    Programmatically creates the view that the controller manages. You should
+    never call this method directly. The view controller calls this method
+    when the view property is requested but is nil.

-    If you create your views manually, you must override this method and use it to create your view and assign it to the view property.
-    The default implementation for programmatic views is to create a plain view. You can invoke super to utilize this view.
+    If you create your views manually, you must override this method and use
+    it to create your view and assign it to the view property. The default
+    implementation for programmatic views is to create a plain, zero width & height
+    view. You can invoke super to utilize this view.

-    If you use Interface Builder to create your views, you initialize the view using the
-    initWithCibName:bundle: method then you must not override this method. The consequences risk shattering the space-time continuum.
+    If you use Interface Builder to create your views, and you initialize the
+    controller using the initWithCibName:bundle: methods, then you MUST NOT override
+    this method. The consequences risk shattering the space-time continuum.

    Note: The cib loading system is currently synchronous.
 */
@@ -129,23 +155,30 @@ var CPViewControllerCachedCibs;
    if (_view)
        return;

-    // check if a cib is already cached for the current _cibName
-    var cib = [CPViewControllerCachedCibs objectForKey:_cibName];
-
-    if (!cib)
+    if (_cibName)
    {
-        // if the cib isn't cached yet : fetch it and cache it
-        cib = [[CPCib alloc] initWithContentsOfURL:[_cibBundle pathForResource:_cibName + @".cib"]];
-        [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
-    }
+        // check if a cib is already cached for the current _cibName
+        var cib = [CPViewControllerCachedCibs objectForKey:_cibName];

-    [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+        if (!cib)
+        {
+            // if the cib isn't cached yet : fetch it and cache it
+            cib = [[CPCib alloc] initWithCibNamed:_cibName bundle:_cibBundle];
+            [CPViewControllerCachedCibs setObject:cib forKey:_cibName];
+        }
+
+        [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
+    }
+    else
+        _view = [CPView new];
 }

 /*!
    Returns the view that the controller manages.
-    If this property is nil, the controller sends loadView to itself to create the view that it manages.
-    Subclasses should override the loadView method to create any custom views. The default value is nil.
+
+    If this property is nil, the controller sends loadView to itself to create
+    the view that it manages. Subclasses should override the loadView method
+    to create any custom views. The default value is nil.
 */
 - (CPView)view
 {
@@ -163,7 +196,7 @@ var CPViewControllerCachedCibs;
        if (_view === nil && [cibOwner isKindOfClass:[CPDocument class]])
            [self setView:[cibOwner valueForKey:@"view"]];

-        if (!_view) 
+        if (!_view)
        {
            var reason = [CPString stringWithFormat:@"View for %@ could not be loaded from Cib or no view specified. Override loadView to load the view manually.", self];

@@ -174,39 +207,64 @@ var CPViewControllerCachedCibs;
            [cibOwner viewControllerDidLoadCib:self];

        _isLoading = NO;
-        [self viewDidLoad];
+        [self _viewDidLoad];
+    }
+    else if (_isLazy)
+    {
+        _isLazy = NO;
+        [self _viewDidLoad];
    }

    return _view;
 }

+- (void)_viewDidLoad
+{
+    [self willChangeValueForKey:"isViewLoaded"];
+    [self viewDidLoad];
+    isViewLoaded = YES;
+    [self didChangeValueForKey:"isViewLoaded"];
+}

 /*!
-    This method is called after the view controller has loaded its associated views into memory. 
-    This method is called regardless of whether the views were stored in a nib file or created programmatically in the loadView method. 
-    This method is most commonly used to perform additional initialization steps on views that are loaded from cib files.
+    This method is called after the view controller has loaded its associated views into memory.
+
+    This method is called regardless of whether the views were stored in a nib
+    file or created programmatically in the loadView method, but NOT when setView
+    is invoked. This method is most commonly used to perform additional initialization
+    steps on views that are loaded from cib files.
 */
 - (void)viewDidLoad
 {
-    
+
 }


 /*!
    Manually sets the view that the controller manages.
-    Setting to nil will cause -loadView to be called on all subsequent calls of -view.
+
+    Setting to nil will cause -loadView to be called on all subsequent calls
+    of -view.

    @param aView The view this controller should represent.
 */
 - (void)setView:(CPView)aView
 {
-    var viewWasLoaded = !_view;
+    var willChangeIsViewLoaded = (_isViewLoaded == NO && aView != nil) || (_isViewLoaded == YES && aView == nil);
+
+    if (willChangeIsViewLoaded)
+        [self willChangeValueForKey:"isViewLoaded"];

    _view = aView;
+    _isViewLoaded = aView !== nil;

-    // Make sure the viewDidLoad method is called if the view is set directly
-    if (!_isLoading && viewWasLoaded)
-        [self viewDidLoad];
+    if (willChangeIsViewLoaded)
+        [self didChangeValueForKey:"isViewLoaded"];
+}
+
+- (BOOL)automaticallyNotifiesObserversOfIsViewLoaded
+{
+    return NO;
 }

@end
@@ -238,6 +296,7 @@ var CPViewControllerViewKey     = @"CPViewControllerViewKey",
        _cibBundle = bundlePath ? [CPBundle bundleWithPath:bundlePath] : [CPBundle mainBundle];

        _cibExternalNameTable = [CPDictionary dictionaryWithObject:self forKey:CPCibOwner];
+        _isLazy = YES;
    }

    return self;
@@ -36,45 +36,94 @@ CPWebViewProgressEstimateChangedNotification    = "CPWebViewProgressEstimateChan
 CPWebViewProgressStartedNotification            = "CPWebViewProgressStartedNotification";
 CPWebViewProgressFinishedNotification           = "CPWebViewProgressFinishedNotification";

+/*!
+    Automatically choose between AppKit (Cappuccino style) scrollbars and
+    native scrollbars. In this mode AppKit scrollbars are always used except
+    when the web view is loaded with a URL which does not appear to pass the
+    same origin policy.
+*/
+CPWebViewScrollAuto                             = 0;
+/*!
+    Always use AppKit scrollbars. If a URL is loaded whcih does not appear to
+    pass the same origin policy, native scrollbars will be used but a warnning
+    will be logged.
+*/
 CPWebViewScrollAppKit                           = 1;
+/*!
+    Always use native (platform dependent) scrollbars.
+*/
 CPWebViewScrollNative                           = 2;
+/*!
+    Never display scrollbars.
+*/
+CPWebViewScrollNone                             = 3;

-// FIXME: somehow make CPWebView work with CPScrollView instead of native scrollbars (is this even possible?)
+/*!
+    How frequently the size of the document will be checked at page load time
+    when AppKit scrollbars are used.
+*/
+CPWebViewAppKitScrollPollInterval               = 1.0;
+
+/*!
+    How many times the size of the size of the document will be checked at
+    page load time when AppKit scrollbars are used.
+
+    AppKit scrollbars must check the size of the document to display the
+    correct size of scrollbars. To improve performance the checks are only
+    performed a limited number of times per reload.
+*/
+CPWebViewAppKitScrollMaxPollCount                  = 3;

 /*!
    @ingroup appkit
-*/

+    @class CPWebView
+
+    CPWebView allows you to display arbitrary HTML or embed a
+    webpage inside your application.
+
+    It's important to note that the same origin policy applies to this view.
+    That is, if the web page being displayed is not located in the same origin
+    (protocol, domain, and port) as the application, you will have limited
+    control over the view and no access to its contents. Furthermore,
+    Cappuccino style scrollbars can't be used to scroll it.
+*/
@implementation CPWebView : CPView
 {
-    CPScrollView    _scrollView;
-    CPView          _frameView;
+    CPScrollView        _scrollView;
+    CPView              _frameView;

-    IFrame      _iframe;
-    CPString    _mainFrameURL;
-    CPArray     _backwardStack;
-    CPArray     _forwardStack;
+    IFrame              _iframe;
+    CPString            _mainFrameURL;
+    CPArray             _backwardStack;
+    CPArray             _forwardStack;

-    BOOL        _ignoreLoadStart;
-    BOOL        _ignoreLoadEnd;
+    BOOL                _ignoreLoadStart;
+    BOOL                _ignoreLoadEnd;
+    BOOL                _isLoading;

-    id          _downloadDelegate;
-    id          _frameLoadDelegate;
-    id          _policyDelegate;
-    id          _resourceLoadDelegate;
-    id          _UIDelegate;
+    id                  _downloadDelegate;
+    id                  _frameLoadDelegate;
+    id                  _policyDelegate;
+    id                  _resourceLoadDelegate;
+    id                  _UIDelegate;

-    CPWebScriptObject _wso;
+    CPWebScriptObject   _wso;

-    CPString    _url;
-    CPString    _html;
+    CPString            _url;
+    CPString            _html;

-    Function    _loadCallback;
+    Function            _loadCallback;

-    int         _scrollMode;
-    CGSize      _scrollSize;
+    int                 _scrollMode;
+    int                 _effectiveScrollMode;
+    BOOL                _contentIsAccessible;
+    CPTimer             _contentSizeCheckTimer;
+    int                 _contentSizePollCount;

-    int         _loadHTMLStringTimer;
+    int                 _loadHTMLStringTimer;
+
+    BOOL                _drawsBackground;
 }

 - (id)initWithFrame:(CPRect)frameRect frameName:(CPString)frameName groupName:(CPString)groupName
@@ -83,17 +132,24 @@ CPWebViewScrollNative                           = 2;
    {
        _iframe.name = frameName;
    }
-    return self
+
+    return self;
 }

 - (id)initWithFrame:(CPRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
-        _mainFrameURL   = nil;
-        _backwardStack  = [];
-        _forwardStack   = [];
-        _scrollMode     = CPWebViewScrollNative;
+        _mainFrameURL           = nil;
+        _backwardStack          = [];
+        _forwardStack           = [];
+        _scrollMode             = CPWebViewScrollAuto;
+        _contentIsAccessible    = YES;
+        _isLoading              = NO;
+
+        _drawsBackground        = YES;
+
+        [self setBackgroundColor:[CPColor whiteColor]];

        [self _initDOMWithFrame:aFrame];
    }
@@ -107,75 +163,82 @@ CPWebViewScrollNative                           = 2;
    _ignoreLoadEnd  = YES;

    _iframe = document.createElement("iframe");
-    _iframe.name = "iframe_" + Math.floor(Math.random()*10000);
+    _iframe.name = "iframe_" + FLOOR(RAND() * 10000);
    _iframe.style.width = "100%";
    _iframe.style.height = "100%";
    _iframe.style.borderWidth = "0px";
    _iframe.frameBorder = "0";

-    [self setDrawsBackground:YES];
+    [self _applyBackgroundColor];

-    _loadCallback = function() {
-	    // HACK: this block handles the case where we don't know about loads initiated by the user clicking a link
-	    if (!_ignoreLoadStart)
-	    {
-	        // post the start load notification
-	        [self _startedLoading];
+    _loadCallback = function()
+    {
+        // HACK: this block handles the case where we don't know about loads initiated by the user clicking a link
+        if (!_ignoreLoadStart)
+        {
+            // post the start load notification
+            [self _startedLoading];

-	        if (_mainFrameURL)
-	            [_backwardStack addObject:_mainFrameURL];
+            if (_mainFrameURL)
+                [_backwardStack addObject:_mainFrameURL];

-	        // FIXME: this doesn't actually get the right URL for different domains. Not possible due to browser security restrictions.
-            _mainFrameURL = _iframe.src;
+            // FIXME: this doesn't actually get the right URL for different domains. Not possible due to browser security restrictions.
            _mainFrameURL = _iframe.src;

            // clear the forward
-	        [_forwardStack removeAllObjects];
-	    }
-	    else
+            [_forwardStack removeAllObjects];
+        }
+        else
            _ignoreLoadStart = NO;

-	    if (!_ignoreLoadEnd)
-	    {
+        if (!_ignoreLoadEnd)
+        {
            [self _finishedLoading];
-	    }
-	    else
-	        _ignoreLoadEnd = NO;
+        }
+        else
+            _ignoreLoadEnd = NO;

        [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-	}
-
-	if (_iframe.addEventListener)
-	    _iframe.addEventListener("load", _loadCallback, false);
-	else if (_iframe.attachEvent)
-		_iframe.attachEvent("onload", _loadCallback);
+    };

+    if (_iframe.addEventListener)
+        _iframe.addEventListener("load", _loadCallback, false);
+    else if (_iframe.attachEvent)
+        _iframe.attachEvent("onload", _loadCallback);

    _frameView = [[CPView alloc] initWithFrame:[self bounds]];
-    [_frameView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    [_frameView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

    _scrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
    [_scrollView setAutohidesScrollers:YES];
-    [_scrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    [_scrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
    [_scrollView setDocumentView:_frameView];

    _frameView._DOMElement.appendChild(_iframe);

-    [self _setScrollMode:_scrollMode];
+    [self _updateEffectiveScrollMode];

    [self addSubview:_scrollView];
 }

-
 - (void)setFrameSize:(CPSize)aSize
 {
    [super setFrameSize:aSize];
    [self _resizeWebFrame];
 }

+- (void)viewDidUnhide
+{
+    // Sizing cannot properly happen while we're hidden because the iframe is inaccessible.
+    // So now that it is accessible again, make sure to catch up.
+    [_frameView setFrameSize:[_scrollView contentSize]];
+    [self _resizeWebFrame];
+    [self _scheduleContentSizeCheck];
+}
+
 - (void)_attachScrollEventIfNecessary
 {
-    if (_scrollMode !== CPWebViewScrollAppKit)
+    if (_effectiveScrollMode !== CPWebViewScrollAppKit)
        return;

    var win = null;
@@ -200,71 +263,130 @@ CPWebViewScrollNative                           = 2;

 - (void)_resizeWebFrame
 {
-    if (_scrollMode === CPWebViewScrollAppKit)
+    // When a webview is not in the DOM we can't inspect its contents for sizing information.
+    // If we try, we might end up setting the fallback frame size which will then become
+    // somewhat sticky.
+    if (![self _isVisible])
    {
-        if (_scrollSize)
+        return;
+    }
+
+    if (_effectiveScrollMode === CPWebViewScrollAppKit)
+    {
+        var visibleRect = [_frameView visibleRect];
+        [_frameView setFrameSize:CGSizeMake(CGRectGetMaxX(visibleRect), CGRectGetMaxY(visibleRect))];
+
+        // try to get the document size so we can correctly set the frame
+        var win = null;
+        try { win = [self DOMWindow]; } catch (e) {}
+
+        if (win && win.document && win.document.body)
        {
-            [_frameView setFrameSize:_scrollSize];
+            var width = win.document.body.scrollWidth,
+                height = win.document.body.scrollHeight;
+
+            _iframe.setAttribute("width", width);
+            _iframe.setAttribute("height", height);
+
+            [_frameView setFrameSize:CGSizeMake(width, height)];
        }
        else
        {
-            var visibleRect = [_frameView visibleRect];
-            [_frameView setFrameSize:CGSizeMake(CGRectGetMaxX(visibleRect), CGRectGetMaxY(visibleRect))];
-
-            // try to get the document size so we can correctly set the frame
-            var win = null;
-            try { win = [self DOMWindow]; } catch (e) {}
-
-            if (win && win.document && win.document.body)
-            {
-                var width = win.document.body.scrollWidth,
-                    height = win.document.body.scrollHeight;
-
-                _iframe.setAttribute("width", width);
-                _iframe.setAttribute("height", height);
-
-                [_frameView setFrameSize:CGSizeMake(width, height)];
-            }
-            else
+            // If we do have access to the content, it might be that the 'body' element simply hasn't loaded yet.
+            // The size will be updated by the content size timer in this case.
+            if (!win || !win.document)
            {
                CPLog.warn("using default size 800*1600");
-
                [_frameView setFrameSize:CGSizeMake(800, 1600)];
            }
-
-            [_frameView scrollRectToVisible:visibleRect];
        }
+
+        [_frameView scrollRectToVisible:visibleRect];
    }
 }

+/*!
+    Sets the scroll mode of the receiver.
+
+    Valid values are:
+        CPWebViewScrollAuto
+        CPWebViewScrollAppKit
+        CPWebViewScrollNative
+        CPWebViewScrollNone
+
+    CPWebViewScrollAuto
+*/
 - (void)setScrollMode:(int)aScrollMode
 {
    if (_scrollMode == aScrollMode)
        return;

-    [self _setScrollMode:aScrollMode];
+    _scrollMode = aScrollMode;
+
+    [self _updateEffectiveScrollMode];
 }

- (void)_setScrollMode:(int)aScrollMode
+/*!
+    Returns the effective scroll mode of the receiver.
+
+    Valied values are:
+        CPWebViewScrollAuto
+        CPWebViewScrollAppKit
+        CPWebViewScrollNative
+        CPWebViewScrollNone
+*/
+- (int)effectiveScrollMode
 {
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        _scrollMode = CPWebViewScrollNative;
-    else
-        _scrollMode = aScrollMode;
+    return _effectiveScrollMode;
+}
+
+- (void)_updateEffectiveScrollMode
+{
+    var _newScrollMode = CPWebViewScrollAppKit;
+
+    if (_scrollMode == CPWebViewScrollNative
+        || (_scrollMode == CPWebViewScrollAuto && !_contentIsAccessible)
+        || CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+    {
+        _newScrollMode = CPWebViewScrollNative;
+    }
+    else if (_scrollMode == CPWebViewScrollAppKit && !_contentIsAccessible)
+    {
+        // Same behaviour as the previous case except that a warning is logged when AppKit
+        // scrollers can't be used.
+        CPLog.warn(self + " unable to use CPWebViewScrollAppKit scroll mode due to same origin policy.");
+        _newScrollMode = CPWebViewScrollNative;
+    }
+
+    if (_newScrollMode !== _effectiveScrollMode)
+        [self _setEffectiveScrollMode:_newScrollMode];
+}
+
+- (void)_setEffectiveScrollMode:(int)aScrollMode
+{
+    _effectiveScrollMode = aScrollMode;

    _ignoreLoadStart = YES;
    _ignoreLoadEnd  = YES;

    var parent = _iframe.parentNode;
+    // FIXME "scrolling" can't be changed without readding the iframe. Unfortunately this causes a reload.
    parent.removeChild(_iframe);

-    if (_scrollMode === CPWebViewScrollAppKit)
+    if (_effectiveScrollMode === CPWebViewScrollAppKit)
    {
        [_scrollView setHasHorizontalScroller:YES];
        [_scrollView setHasVerticalScroller:YES];

        _iframe.setAttribute("scrolling", "no");
    }
+    else if (_effectiveScrollMode === CPWebViewScrollNone)
+    {
+        [_scrollView setHasHorizontalScroller:NO];
+        [_scrollView setHasVerticalScroller:NO];
+
+        _iframe.setAttribute("scrolling", "no");
+    }
    else
    {
        [_scrollView setHasHorizontalScroller:NO];
@@ -276,27 +398,45 @@ CPWebViewScrollNative                           = 2;
    }

    parent.appendChild(_iframe);
+    [self _applyBackgroundColor];
+
+    [self _resizeWebFrame];
 }

+- (void)_maybePollWebFrameSize
+{
+    if (CPWebViewAppKitScrollMaxPollCount == 0 || _contentSizePollCount++ < CPWebViewAppKitScrollMaxPollCount)
+        [self _resizeWebFrame];
+    else
+        [_contentSizeCheckTimer invalidate];
+}
+
+/*!
+    Loads a string of HTML into the receiver.
+
+    @param CPString - The string to load.
+*/
 - (void)loadHTMLString:(CPString)aString
 {
    [self loadHTMLString:aString baseURL:nil];
 }

+/*!
+    Loads a string of HTML into the receiver.
+
+    @param CPString - The string to load.
+    @param CPURL - The base url of the string. (not implemented)
+*/
 - (void)loadHTMLString:(CPString)aString baseURL:(CPURL)URL
 {
    // FIXME: do something with baseURL?
-
-    [self _setScrollMode:CPWebViewScrollAppKit];
-
    [_frameView setFrameSize:[_scrollView contentSize]];

    [self _startedLoading];

    _ignoreLoadStart = YES;
-    _ignoreLoadEnd = NO;

-    _url = null;
+    _url = nil;
    _html = aString;

    [self _load];
@@ -304,15 +444,12 @@ CPWebViewScrollNative                           = 2;

 - (void)_loadMainFrameURL
 {
-    [self _setScrollMode:CPWebViewScrollNative];
-
    [self _startedLoading];

    _ignoreLoadStart = YES;
-    _ignoreLoadEnd = NO;

    _url = _mainFrameURL;
-    _html = null;
+    _html = nil;

    [self _load];
 }
@@ -321,13 +458,26 @@ CPWebViewScrollNative                           = 2;
 {
    if (_url)
    {
+        // Try to figure out if this URL will pass the same origin policy and hence allow us to potentially
+        // use appkit scrollbars.
+        var cpurl = [CPURL URLWithString:_url];
+        _contentIsAccessible = [cpurl _passesSameOriginPolicy];
+        [self _updateEffectiveScrollMode];
+
+        _ignoreLoadEnd = NO;
+
        _iframe.src = _url;
    }
-    else if (_html)
+    else if (_html !== nil)
    {
        // clear the iframe
        _iframe.src = "";

+        _contentIsAccessible = YES;
+        [self _updateEffectiveScrollMode];
+
+        _ignoreLoadEnd = NO;
+
        if (_loadHTMLStringTimer !== nil)
        {
            window.clearTimeout(_loadHTMLStringTimer);
@@ -339,8 +489,11 @@ CPWebViewScrollNative                           = 2;
        {
            var win = [self DOMWindow];

+            /*
+            If _html is the empty string, subtitute in an empty HTML structure. Just leaving the contents entirely empty prompts the browser to subtitute in a white page which would interfere with any custom background colours in use by this web view.
+            */
            if (win)
-                win.document.write(_html);
+                win.document.write(_html || "<html><body></body></html>");

            window.setTimeout(_loadCallback, 1);
        }, 0);
@@ -349,6 +502,8 @@ CPWebViewScrollNative                           = 2;

 - (void)_startedLoading
 {
+    _isLoading = YES;
+
    [[CPNotificationCenter defaultCenter] postNotificationName:CPWebViewProgressStartedNotification object:self];

    if ([_frameLoadDelegate respondsToSelector:@selector(webView:didStartProvisionalLoadForFrame:)])
@@ -357,20 +512,69 @@ CPWebViewScrollNative                           = 2;

 - (void)_finishedLoading
 {
+    _isLoading = NO;
+
    [self _resizeWebFrame];
    [self _attachScrollEventIfNecessary];

+    [self _scheduleContentSizeCheck];
+
    [[CPNotificationCenter defaultCenter] postNotificationName:CPWebViewProgressFinishedNotification object:self];

    if ([_frameLoadDelegate respondsToSelector:@selector(webView:didFinishLoadForFrame:)])
        [_frameLoadDelegate webView:self didFinishLoadForFrame:nil]; // FIXME: give this a frame somehow?
 }

+- (void)_scheduleContentSizeCheck
+{
+    [_contentSizeCheckTimer invalidate];
+    if (_effectiveScrollMode == CPWebViewScrollAppKit)
+    {
+        /*
+        FIXME Need better method.
+        We don't know when the content of the iframe changes size (e.g. a
+        picture finishes loading, dynamic content is loaded). Often when a
+        page has initially 'loaded', it does not yet have its final size. In
+        lieu of any resize events we will simply check back in a few times
+        some time after loading.
+
+        We run these checks only a limited number of times as to not deplete
+        battery life and slow down the software needlessly. This does mean
+        there are situations where the content changes size and the AppKit
+        scrollbars will be out of sync. Users who have dynamic content
+        in their web view will, for now, have to implement domain specific
+        fixes.
+        */
+
+        _contentSizePollCount = 0;
+        _contentSizeCheckTimer = [CPTimer scheduledTimerWithTimeInterval:CPWebViewAppKitScrollPollInterval target:self selector:@selector(_maybePollWebFrameSize) userInfo:nil repeats:YES];
+    }
+}
+
+/*!
+    Returns whether the web view is loading. Note: due to browser limitations
+    this value is not particularly reliable.
+*/
+- (BOOL)isLoading
+{
+    return _isLoading;
+}
+
+/*!
+    Returns the URL of the main frame.
+
+    @return CPString - The URL of the main frame.
+*/
 - (CPString)mainFrameURL
 {
    return _mainFrameURL;
 }

+/*!
+    Sets the URL of the main frame.
+
+    @param CPString - the url to set.
+*/
 - (void)setMainFrameURL:(CPString)URLString
 {
    if (_mainFrameURL)
@@ -381,6 +585,11 @@ CPWebViewScrollNative                           = 2;
    [self _loadMainFrameURL];
 }

+/*!
+    Tells the webview to navigate to the previous page.
+
+    @return BOOL - YES if the receiver was able to go back, otherwise NO.
+*/
 - (BOOL)goBack
 {
    if (_backwardStack.length > 0)
@@ -397,6 +606,11 @@ CPWebViewScrollNative                           = 2;
    return NO;
 }

+/*!
+    Tells the receiver to go forward in page history.
+
+    @return - YES if the receiver was able to go forward, otherwise NO.
+*/
 - (BOOL)goForward
 {
    if (_forwardStack.length > 0)
@@ -413,11 +627,23 @@ CPWebViewScrollNative                           = 2;
    return NO;
 }

+/*!
+    Checks to see if the webview has a history stack you can navigate back
+    through.
+
+    @return BOOL - YES if the receiver can navigate backward through history, otherwise NO.
+*/
 - (BOOL)canGoBack
 {
    return (_backwardStack.length > 0);
 }

+/*!
+    Checks to see if the webview has a history stack you can navigate forward
+    through.
+
+    @return BOOL - YES if the receiver can navigate forward through history, otherwise NO.
+*/
 - (BOOL)canGoForward
 {
    return (_forwardStack.length > 0);
@@ -429,16 +655,30 @@ CPWebViewScrollNative                           = 2;
    return { back: _backwardStack, forward: _forwardStack };
 }

+/*!
+    Closes the webview by unloading the webpage. The webview will no longer
+    respond to load requests or delegate methods once this is called.
+*/
 - (void)close
 {
    _iframe.parentNode.removeChild(_iframe);
 }

+/*!
+    Returns the window object of the webview.
+
+    @return DOMWindow - The window object.
+*/
 - (DOMWindow)DOMWindow
 {
    return (_iframe.contentDocument && _iframe.contentDocument.defaultView) || _iframe.contentWindow;
 }

+/*!
+    Returns the root Object of the webview as a CPWebScriptObject.
+
+    @return CPWebScriptObject - the Object of the webview.
+*/
 - (CPWebScriptObject)windowScriptObject
 {
    var win = [self DOMWindow];
@@ -452,17 +692,37 @@ CPWebViewScrollNative                           = 2;
    return _wso;
 }

+/*!
+    Evaluates a javascript string in the webview and returns the result of
+    that evaluation as a string.
+
+    @param script - A string of javascript.
+    @return CPString - The result of the evaluation.
+*/
 - (CPString)stringByEvaluatingJavaScriptFromString:(CPString)script
 {
    var result = [self objectByEvaluatingJavaScriptFromString:script];
    return result ? String(result) : nil;
 }

+/*!
+    Evaluates a string of javascript in the webview and returns the result.
+
+    @param script - A string of javascript.
+    @return JSObject - A JSObject resulting from the evaluation.
+*/
 - (JSObject)objectByEvaluatingJavaScriptFromString:(CPString)script
 {
    return [[self windowScriptObject] evaluateWebScript:script];
 }

+/*!
+    Gets the computed style for an element.
+
+    @param DOMElement - An Element.
+    @param pseudoElement - A pseudoElement.
+    @return DOMCSSStyleDeclaration - The computed style for an element.
+*/
 - (DOMCSSStyleDeclaration)computedStyleForElement:(DOMElement)element pseudoElement:(CPString)pseudoElement
 {
    var win = [[self windowScriptObject] window];
@@ -475,47 +735,114 @@ CPWebViewScrollNative                           = 2;
 }


-
+/*!
+    @return BOOL - YES if the webview draws its own background, otherwise NO.
+*/
 - (BOOL)drawsBackground
 {
-    return _iframe.style.backgroundColor != "";
+    return _drawsBackground;
 }

- (void)setDrawsBackground:(BOOL)drawsBackround
+/*!
+    Sets whether the webview draws its own background when the displayed contents do not.
+
+    If you are trying to create a transparent iframe:
+
+    A) call this method with NO
+    A) call setBackground:[CPColor transparent]
+    B) ensure the content does not draw a background, e.g. it has <body style="background-color: transparent;">
+
+    @param BOOL - YES if the webview should draw its background, otherwise NO.
+*/
+- (void)setDrawsBackground:(BOOL)drawsBackground
 {
-    _iframe.style.backgroundColor = drawsBackround ? "white" : "";
+    if (drawsBackground == _drawsBackground)
+        return;
+    _drawsBackground = drawsBackground;
+
+    [self _applyBackgroundColor];
 }

+- (void)setBackgroundColor:(CPColor)aColor
+{
+    [super setBackgroundColor:aColor];
+    [self _applyBackgroundColor];
+}

+- (void)_applyBackgroundColor
+{
+    if (_iframe)
+    {
+        var bgColor = [self backgroundColor] || [CPColor whiteColor];
+        _iframe.allowtransparency = !_drawsBackground;
+        _iframe.style.backgroundColor = _drawsBackground ? [bgColor cssString] : "transparent";
+    }
+}

 // IBActions

- (IBAction)takeStringURLFrom:(id)sender
+/*!
+    Used with the target/action mechanism to automatically set the webviews
+    mainFrameURL to the senders stringValue.
+
+    @param sender - the sender of the action. Should respond to -stringValue.
+*/
+- (@action)takeStringURLFrom:(id)sender
 {
    [self setMainFrameURL:[sender stringValue]];
 }

- (IBAction)goBack:(id)sender
+/*!
+    Same as -goBack but takes a sender as a param.
+
+    @param sender - the sender of the action.
+*/
+- (@action)goBack:(id)sender
 {
    [self goBack];
 }

- (IBAction)goForward:(id)sender
+/*!
+    Same as -goForward but takes a sender as a param.
+
+    @param sender - the sender of the action.
+*/
+- (@action)goForward:(id)sender
 {
    [self goForward];
 }

- (IBAction)stopLoading:(id)sender
+/*!
+    Stops loading the webview. (not yet implemented)
+
+    @param sender - the sender of the action.
+*/
+- (@action)stopLoading:(id)sender
 {
    // FIXME: what to do?
 }

- (IBAction)reload:(id)sender
+/*!
+    Reloads the webview.
+
+    @param sender - the sender of the action.
+*/
+- (@action)reload:(id)sender
 {
-    [self _loadMainFrameURL];
+    // If we're displaying pure HTML, redisplay it.
+    if (!_url && (_html !== nil))
+        [self loadHTMLString:_html];
+    else
+        [self _loadMainFrameURL];
 }

- (IBAction)print:(id)sender
+/*!
+    Tells the webview to print. If the webview is unable to print due to
+    browser restrictions the user is alerted to print from the file menu.
+
+    @param sender - the sender of the receiver.
+*/
+- (@action)print:(id)sender
 {
    try
    {
@@ -575,12 +902,19 @@ CPWebViewScrollNative                           = 2;

@end

+/*!
+    @class CPWebScriptObject

+    A CPWebScriptObject is an Objective-J wrapper around a scripting object.
+*/
@implementation CPWebScriptObject : CPObject
 {
    Window _window;
 }

+/*!
+    Initializes the scripting object with the scripting Window object.
+*/
 - (id)initWithWindow:(Window)aWindow
 {
    if (self = [super init])
@@ -590,6 +924,12 @@ CPWebViewScrollNative                           = 2;
    return self;
 }

+/*!
+    Call a method with arguments on the receiver.
+
+    @param methodName - The method that should be called.
+    @param args - An array of arguments to pass to the method call.
+*/
 - (id)callWebScriptMethod:(CPString)methodName withArguments:(CPArray)args
 {
    // Would using "with" be better here?
@@ -603,15 +943,25 @@ CPWebViewScrollNative                           = 2;
    return undefined;
 }

+/*!
+    Evaluates a string of javascript and returns the result.
+
+    @param script - The script to run.
+    @return - The result of the evaluation, which may be 'undefined'.
+*/
 - (id)evaluateWebScript:(CPString)script
 {
    try {
        return _window.eval(script);
    } catch (e) {
+        // FIX ME: if we fail inside here, shouldn't we return an exception?
    }
    return undefined;
 }

+/*!
+    Returns the receivers Window object.
+*/
 - (Window)window
 {
    return _window;
@@ -624,6 +974,7 @@ CPWebViewScrollNative                           = 2;

 /*!
    Initializes the web view from the data in a coder.
+
    @param aCoder the coder from which to read the data
    @return the initialized web view
 */
@@ -637,13 +988,16 @@ CPWebViewScrollNative                           = 2;
        _mainFrameURL   = nil;
        _backwardStack  = [];
        _forwardStack   = [];
-        _scrollMode     = CPWebViewScrollNative;
+        _scrollMode     = CPWebViewScrollAuto;

 #if PLATFORM(DOM)
        [self _initDOMWithFrame:[self frame]];
 #endif

-        [self setBackgroundColor:[CPColor whiteColor]];
+        if (![self backgroundColor])
+            [self setBackgroundColor:[CPColor whiteColor]];
+
+        [self _updateEffectiveScrollMode];
    }

    return self;
@@ -651,6 +1005,7 @@ CPWebViewScrollNative                           = 2;

 /*!
    Writes out the web view's instance information to a coder.
+
    @param aCoder the coder to which to write the data
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
@@ -662,3 +1017,22 @@ CPWebViewScrollNative                           = 2;
 }

@end
+
+@implementation CPURL(SOP)
+
+/*!
+    Private API.
+
+    Returns YES if the receiver URL would pass the same origin policy if loaded by the current runtime environment.
+
+    Since Cappuccino runs in the browser, it is often restricted from accessing URLs from outside of its own origin (protocol, domain, port). This method tries to determine if the URL represented by the receiver is of the same origin, or if other circumstances will allow the content at the URL to be interacted with.
+*/
+- (BOOL)_passesSameOriginPolicy
+{
+    var documentURL = [CPURL URLWithString:window.location.href];
+    if ([documentURL isFileURL] && CPFeatureIsCompatible(CPSOPDisabledFromFileURLs))
+        return YES;
+    return ([documentURL scheme] == [self scheme] && [documentURL host] == [self host] && [documentURL port] == [self port]);
+}
+
+@end
@@ -0,0 +1,387 @@
+/*
+ * _CPAttachedWindowView.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal
+ * Copyright 2011 <primalmotion@archipelproject.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "_CPWindowView.j"
+
+#define ALIGN_STROKE(point)  (FLOOR(point) === (point) ? (point) + halfStrokeWidth : (point))
+#define ALIGN_COORD(point)   (FLOOR(point))
+
+var _CPAttachedWindowViewDefaultCursorSize = CGSizeMake(16, 10),
+    _CPAttachedWindowViewRadius = 5.0,
+    _CPAttachedWindowViewStrokeWidth = 1.0,
+    _CPAttachedWindowViewShadowSize = CGSizeMake(0, 6),
+    _CPAttachedWindowViewShadowBlur = 15.0;
+
+/*!
+    @ignore
+
+    A custom CPWindowView that manages a border and cursor
+*/
+@implementation _CPAttachedWindowView : _CPWindowView
+{
+    float       _arrowOffsetX   @accessors(property=arrowOffsetX);
+    float       _arrowOffsetY   @accessors(property=arrowOffsetY);
+    int         _appearance     @accessors(property=appearance);
+    unsigned    _preferredEdge  @accessors(property=preferredEdge);
+
+    CGSize      _cursorSize;
+}
+
+/*!
+    Compute the contentView frame from a given window frame
+
+    @param aFrameRect the window frame
+*/
+- (CGRect)contentRectForFrameRect:(CGRect)aFrameRect
+{
+    var contentRect = CGRectMakeCopy(aFrameRect);
+
+    // @todo change border art and remove this pixel perfect adaptation
+    // return CGRectInset(contentRect, 20, 20);
+
+    contentRect.origin.x += 18;
+    contentRect.origin.y += 17;
+    contentRect.size.width -= 35;
+    contentRect.size.height -= 37;
+
+    return contentRect;
+}
+
+/*!
+    Compute the window frame from a given contentView frame
+
+    @param aContentRect the contentView frame
+*/
+ (CGRect)frameRectForContentRect:(CGRect)aContentRect
+{
+    var frameRect = CGRectMakeCopy(aContentRect);
+
+    // @todo change border art and remove this pixel perfect adaptation
+    //return CGRectOffset(frameRect, 20, 20);
+
+    frameRect.origin.x -= 18;
+    frameRect.origin.y -= 17;
+    frameRect.size.width += 35;
+    frameRect.size.height += 37;
+    return frameRect;
+}
+
+/*!
+    Initialize the _CPWindowView
+*/
+- (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask
+{
+    if (self = [super initWithFrame:aFrame styleMask:aStyleMask])
+    {
+        _arrowOffsetX = 0.0;
+        _arrowOffsetY = 0.0;
+        _appearance = CPPopoverAppearanceMinimal;
+        _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
+    }
+
+    return self;
+}
+
+/*!
+    Hide the cursor
+*/
+- (void)hideCursor
+{
+    _cursorSize = CGSizeMakeZero();
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Show the cursor
+*/
+- (void)showCursor
+{
+    _cursorSize = CGSizeMakeCopy(_CPAttachedWindowViewDefaultCursorSize);
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Draw the view
+*/
+- (void)drawRect:(CGRect)aRect
+{
+    [super drawRect:aRect];
+
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        radius = _CPAttachedWindowViewRadius,
+        arrowWidth = _cursorSize.width,
+        arrowHeight = _cursorSize.height,
+        strokeWidth = _CPAttachedWindowViewStrokeWidth,
+        halfStrokeWidth = strokeWidth / 2.0,
+        strokeColor,
+        shadowColor = [[CPColor blackColor] colorWithAlphaComponent:.2],
+        shadowSize = _CPAttachedWindowViewShadowSize,
+        shadowBlur = _CPAttachedWindowViewShadowBlur,
+        gradient,
+        frame = [self bounds];
+
+    if (_appearance == CPPopoverAppearanceMinimal)
+    {
+        gradient = CGGradientCreateWithColorComponents(
+                        CGColorSpaceCreateDeviceRGB(),
+                        [
+                            (254.0 / 255), (254.0 / 255), (254.0 / 255), 0.93,
+                            (231.0 / 255), (231.0 / 255), (231.0 / 255), 0.93
+                        ],
+                        [0, 1],
+                        2
+                    );
+        strokeColor = [CPColor colorWithHexString:@"B8B8B8"];
+    }
+    else
+    {
+        gradient = CGGradientCreateWithColorComponents(
+                        CGColorSpaceCreateDeviceRGB(),
+                        [
+                            (38.0 / 255), (38.0 / 255), (38.0 / 255), 0.93,
+                            (18.0 / 255), (18.0 / 255), (18.0 / 255), 0.93
+                        ],
+                        [0, 1],
+                        2);
+        strokeColor = [CPColor colorWithHexString:@"222222"];
+    }
+
+    // fix rect to take care of stroke and shadow
+    frame.origin.x += halfStrokeWidth + shadowBlur;
+    frame.origin.y += halfStrokeWidth + (shadowBlur + shadowSize.height / 2);
+    frame.size.width -= strokeWidth + (shadowBlur * 2);
+    frame.size.height -= strokeWidth + (shadowBlur * 2 + shadowSize.height);
+
+    CGContextSetStrokeColor(context, strokeColor);
+    CGContextSetLineWidth(context, strokeWidth);
+    CGContextBeginPath(context);
+    CGContextSetShadowWithColor(context, shadowSize, shadowBlur, shadowColor);
+    CGContextDrawLinearGradient(context, gradient, CGPointMake(CGRectGetMidX(frame), 0.0), CGPointMake(CGRectGetMidX(frame), frame.size.height), 0);
+
+    var xMin = _CGRectGetMinX(frame),
+        xMax = _CGRectGetMaxX(frame),
+        yMin = _CGRectGetMinY(frame),
+        yMax = _CGRectGetMaxY(frame),
+        arrowMinX = ALIGN_COORD(xMin + radius + strokeWidth),
+        arrowMaxX = ALIGN_COORD(xMax - radius - strokeWidth),
+        arrowMinY = ALIGN_COORD(yMin + radius + strokeWidth),
+        arrowMaxY = ALIGN_COORD(yMax - radius + strokeWidth),
+        arrowAnchor = CGPointMakeZero(),
+        arrowStart = CGPointMakeZero(),
+        pt = CGPointMakeZero();
+
+    // draw!
+    switch (_preferredEdge)
+    {
+        case CPMinXEdge:
+        case CPMaxXEdge:
+            // origin nw
+            pt.x = ALIGN_COORD(xMin + radius);
+            pt.y = yMin;
+            CGContextMoveToPoint(context, pt.x, pt.y);
+
+            // ne
+            pt.x = ALIGN_COORD(xMax - radius);
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, xMax, yMin, xMax, ALIGN_COORD(yMin + radius));
+
+            if (_preferredEdge === CPMinXEdge)
+            {
+                // arrow CPMinXEdge
+                arrowAnchor.x = ALIGN_STROKE(xMax);
+                arrowAnchor.y = ALIGN_COORD((frame.size.height / 2) + yMin + _arrowOffsetY);
+
+                // to top edge
+                pt.y = ALIGN_COORD(arrowAnchor.y - (arrowWidth / 2));
+
+                // adjust starting point to not go beyond the corner
+                if (pt.y <= arrowMinY)
+                    pt.y = arrowMinY;
+                else if ((pt.y + arrowWidth) > arrowMaxY)
+                    pt.y = arrowMaxY - arrowWidth;
+
+                pt.x = arrowAnchor.x;
+                arrowStart = CGPointMakeCopy(pt);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // top edge -> point
+                pt.x = ALIGN_STROKE(arrowAnchor.x + arrowHeight);
+                pt.y = arrowAnchor.y;
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // point -> bottom edge
+                pt.x = arrowAnchor.x;
+                pt.y = ALIGN_COORD(arrowStart.y + arrowWidth);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+            }
+
+            // se
+            pt.x = xMax;
+            pt.y = ALIGN_COORD(yMax - radius);
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMax, ALIGN_COORD(xMax - radius), yMax);
+
+            // sw
+            pt.x = ALIGN_COORD(xMin + radius);
+            pt.y = yMax;
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, xMin, pt.y, xMin, ALIGN_COORD(yMax - radius));
+
+            if (_preferredEdge === CPMaxXEdge)
+            {
+                // arrow CPMaxXEdge
+                arrowAnchor.x = ALIGN_STROKE(xMin);
+                arrowAnchor.y = ALIGN_COORD((frame.size.height / 2) + yMin + _arrowOffsetY);
+
+                // to bottom edge
+                pt.y = ALIGN_COORD(arrowAnchor.y + (arrowWidth / 2));
+
+                // adjust starting point to not go beyond the corner
+                if ((pt.y - arrowWidth) < arrowMinY)
+                    pt.y = arrowMinY + arrowWidth;
+                else if (pt.y > arrowMaxY)
+                    pt.y = arrowMaxY;
+
+                pt.x = arrowAnchor.x;
+                arrowStart = CGPointMakeCopy(pt);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // bottom edge -> point
+                pt.x = ALIGN_STROKE(arrowAnchor.x - arrowHeight);
+                pt.y = arrowAnchor.y;
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // point -> top edge
+                pt.x = arrowAnchor.x;
+                pt.y = ALIGN_COORD(arrowStart.y - arrowWidth);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+            }
+
+            // nw
+            pt.x = xMin;
+            pt.y = ALIGN_COORD(yMin + radius);
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMin, ALIGN_COORD(xMin + radius), yMin);
+            break;
+
+        case CPMaxYEdge:
+        case CPMinYEdge:
+            // origin sw
+            pt.x = xMin;
+            pt.y = ALIGN_COORD(yMax - radius);
+            CGContextMoveToPoint(context, pt.x, pt.y);
+
+            // nw
+            pt.y = ALIGN_COORD(yMin + radius);
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMin, ALIGN_COORD(xMin + radius), yMin);
+
+            if (_preferredEdge === CPMaxYEdge)
+            {
+                // arrow CPMaxYEdge
+                arrowAnchor.x = ALIGN_COORD((frame.size.width / 2) + xMin + _arrowOffsetX);
+                arrowAnchor.y = ALIGN_STROKE(yMin + _arrowOffsetY);
+
+                // to left edge
+                pt.x = ALIGN_COORD(arrowAnchor.x - (arrowWidth / 2));
+
+                // adjust starting point to not go beyond the corner
+                if (pt.x < arrowMinX)
+                    pt.x = arrowMinX;
+                else if ((pt.x + arrowWidth) > arrowMaxX)
+                    pt.x = arrowMaxX - arrowWidth;
+
+                pt.y = arrowAnchor.y;
+                arrowStart = CGPointMakeCopy(pt);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // left edge -> point
+                pt.x = arrowAnchor.x;
+                pt.y = ALIGN_STROKE(arrowAnchor.y - arrowHeight);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // point -> right edge
+                pt.x = ALIGN_COORD(arrowStart.x + arrowWidth);
+                pt.y = arrowAnchor.y;
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+            }
+
+            // ne
+            pt.x = ALIGN_COORD(xMax - radius);
+            pt.y = yMin;
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, xMax, pt.y, xMax, ALIGN_COORD(yMin + radius));
+
+            // se
+            pt.x = xMax;
+            pt.y = ALIGN_COORD(yMax - radius);
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, pt.x, yMax, ALIGN_COORD(xMax - radius), yMax);
+
+            if (_preferredEdge === CPMinYEdge)
+            {
+                // arrow CPMinYEdge
+                arrowAnchor.x = ALIGN_COORD((frame.size.width / 2) + xMin + _arrowOffsetX);
+                arrowAnchor.y = ALIGN_STROKE(yMax + _arrowOffsetY);
+
+                // to right edge
+                pt.x = ALIGN_COORD(arrowAnchor.x + (arrowWidth / 2));
+
+                // adjust starting point to not go beyond the corner
+                if ((pt.x - arrowWidth) < arrowMinX)
+                    pt.x = arrowMinX + arrowWidth;
+                else if (pt.x > arrowMaxX)
+                    pt.x = arrowMaxX;
+
+                pt.y = arrowAnchor.y;
+                arrowStart = CGPointMakeCopy(pt);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // right edge -> point
+                pt.x = arrowAnchor.x;
+                pt.y = ALIGN_STROKE(arrowAnchor.y + arrowHeight);
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+
+                // point -> left edge
+                pt.x = ALIGN_COORD(arrowStart.x - arrowWidth);
+                pt.y = arrowAnchor.y;
+                CGContextAddLineToPoint(context, pt.x, pt.y);
+            }
+
+            // sw
+            pt.x = ALIGN_COORD(xMin + radius);
+            pt.y = yMax;
+            CGContextAddLineToPoint(context, pt.x, pt.y);
+            CGContextAddCurveToPoint(context, pt.x, pt.y, xMin, pt.y, xMin, ALIGN_COORD(yMax - radius));
+            break;
+
+        default:
+            // no computed edge means standard rounded rect
+            CGContextAddPath(context, CGPathWithRoundedRectangleInRect(frame, radius, radius, YES, YES, YES, YES));
+    }
+
+    CGContextClosePath(context);
+    CGContextStrokePath(context);
+    CGContextFillPath(context);
+}
+
+@end
--- a/Show More
+++ b/Show More