This will be Cappuccino 0.9.7-1.

Update some more version numbers.
This will be Cappuccino 0.9.7.
2026-09-09 12:17:13 +00:00 · 2014-05-09 19:36:10 +01:00 · 2013-11-28 19:51:15 +00:00 · 2013-11-28 19:48:29 +00:00 · 2013-11-28 18:39:01 +00:00 · 2013-11-28 17:18:16 +00:00
2707 changed files with 148972 additions and 30102 deletions
@@ -10,3 +10,8 @@ WebSite
 xcuserdata/
 !*.xcodeproj/project.pbxproj
 *.xCodeSupport/
+*.XcodeSupport/
+*XcodeSupport/
+Tests/Manual/**/*.xcodeproj
+*.sublime-project
+*.sublime-workspace
@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+    - 0.8
+install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
+script: jake test
+env: PATH="$TRAVIS_BUILD_DIR/narwhal/bin:$PATH" CAPP_BUILD="$TRAVIS_BUILD_DIR/Build" NARWHAL_ENGINE=rhino
@@ -55,6 +55,7 @@
@import "CPController.j"
@import "CPCookie.j"
@import "CPCursor.j"
+@import "CPDatePicker.j"
@import "CPDocument.j"
@import "CPDocumentController.j"
@import "CPEvent.j"
@@ -106,7 +106,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
        _itemViews = [];
        _expandedItemIndexes = [CPIndexSet indexSet];

-        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 100.0, 24.0)]];
+        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)]];
    }

    return self;
@@ -227,7 +227,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 {
    var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];

-    [indexSet removeIndexes:_expandedIndexes];
+    [indexSet removeIndexes:_expandedItemIndexes];

    return indexSet;
 }
@@ -258,18 +258,18 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection

 - (void)setFrameSize:(CGSize)aSize
 {
-    var width = _CGRectGetWidth([self frame]);
+    var width = CGRectGetWidth([self frame]);

    [super setFrameSize:aSize];

-    if (width !== _CGRectGetWidth([self frame]))
+    if (width !== CGRectGetWidth([self frame]))
        [self _invalidateItemsStartingAtIndex:0];
 }

 - (void)layoutSubviews
 {
    if (_items.length <= 0)
-        return [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), 0.0)];
+        return [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), 0.0)];

    if (_dirtyItemIndex === CPNotFound)
        return;
@@ -278,7 +278,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection

    var index = _dirtyItemIndex,
        count = _itemViews.length,
-        width = _CGRectGetWidth([self bounds]),
+        width = CGRectGetWidth([self bounds]),
        y = index > 0 ? CGRectGetMaxY([_itemViews[index - 1] frame]) : 0.0;

    // Do this now (instead of after looping), so that if we are made dirty again in the middle we don't blow this value away.
@@ -293,7 +293,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
        y = CGRectGetMaxY([itemView frame]);
    }

-    [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), y)];
+    [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), y)];
 }

@end
@@ -310,7 +310,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection

 - (id)initWithAccordionView:(CPAccordionView)anAccordionView
 {
-    self = [super initWithFrame:_CGRectMakeZero()];
+    self = [super initWithFrame:CGRectMakeZero()];

    if (self)
    {
@@ -376,21 +376,21 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection

 - (void)setFrameY:(float)aY width:(float)aWidth
 {
-    var headerHeight = _CGRectGetHeight([_headerView frame]);
+    var headerHeight = CGRectGetHeight([_headerView frame]);

    // Size to fit or something?
-    [_headerView setFrameSize:_CGSizeMake(aWidth, headerHeight)];
-    [_contentView setFrameOrigin:_CGPointMake(0.0, headerHeight)];
+    [_headerView setFrameSize:CGSizeMake(aWidth, headerHeight)];
+    [_contentView setFrameOrigin:CGPointMake(0.0, headerHeight)];

    if ([self isCollapsed])
-        [self setFrame:_CGRectMake(0.0, aY, aWidth, headerHeight)];
+        [self setFrame:CGRectMake(0.0, aY, aWidth, headerHeight)];

    else
    {
-        var contentHeight = _CGRectGetHeight([_contentView frame]);
+        var contentHeight = CGRectGetHeight([_contentView frame]);

-        [_contentView setFrameSize:_CGSizeMake(aWidth, contentHeight)];
-        [self setFrame:_CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
+        [_contentView setFrameSize:CGSizeMake(aWidth, contentHeight)];
+        [self setFrame:CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
    }
 }

@@ -28,15 +28,19 @@
@import <Foundation/CPObject.j>
@import <Foundation/CPString.j>

-@import "CPApplication.j"
@import "CPButton.j"
@import "CPColor.j"
@import "CPFont.j"
@import "CPImage.j"
@import "CPImageView.j"
@import "CPPanel.j"
+@import "CPText.j"
@import "CPTextField.j"

+@class CPCheckBox
+
+@global CPApp
+
 /*
    @global
    @group CPAlertStyle
@@ -53,6 +57,8 @@ CPInformationalAlertStyle   = 1;
 */
 CPCriticalAlertStyle        = 2;

+var bottomHeight = 71;
+
 /*!
    @ingroup appkit

@@ -75,32 +81,34 @@ CPCriticalAlertStyle        = 2;
           representing the first button added to the alert which appears on the
           right, 1 representing the next button to the left and so on)
 */
-@implementation CPAlert : CPView
+@implementation CPAlert : CPObject
 {
-    BOOL            _showHelp               @accessors(property=showsHelp);
-    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);
+    BOOL                _showHelp               @accessors(property=showsHelp);
+    BOOL                _showSuppressionButton  @accessors(property=showsSuppressionButton);

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

-    CPArray         _buttons                @accessors(property=buttons,readonly);
-    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);
+    CPArray             _buttons                @accessors(property=buttons, readonly);
+    CPCheckBox          _suppressionButton      @accessors(property=suppressionButton, readonly);

-    id              _delegate               @accessors(property=delegate);
-    id              _modalDelegate;
-    SEL             _didEndSelector;
+    id                  _delegate               @accessors(property=delegate);
+    id                  _modalDelegate;
+    SEL                 _didEndSelector         @accessors(property=didEndSelector);
+    Function            _didEndBlock;

-    CPWindow        _window                 @accessors(property=window,readonly);
-    int             _defaultWindowStyle;
+    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
+    CPWindow            _window                 @accessors(property=window, readonly);
+    int                 _defaultWindowStyle;

-    CPImageView     _alertImageView;
-    CPTextField     _informativeLabel;
-    CPTextField     _messageLabel;
-    CPButton        _alertHelpButton;
+    CPImageView         _alertImageView;
+    CPTextField         _informativeLabel;
+    CPTextField         _messageLabel;
+    CPButton            _alertHelpButton;

-    BOOL            _needsLayout;
+    BOOL                _needsLayout;
 }

 #pragma mark Creating Alerts
@@ -163,7 +171,8 @@ CPCriticalAlertStyle        = 2;
        _alertStyle         = CPWarningAlertStyle;
        _showHelp           = NO;
        _needsLayout        = YES;
-        _defaultWindowStyle = CPTitledWindowMask;
+        _defaultWindowStyle = _CPModalWindowMask;
+        _themeView          = [_CPAlertThemeView new];

        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
        _alertImageView     = [[CPImageView alloc] init];
@@ -180,6 +189,11 @@ CPCriticalAlertStyle        = 2;

 #pragma mark Accessors

+- (CPTheme)theme
+{
+    return [_themeView theme];
+}
+
 /*!
    set the theme to use

@@ -197,19 +211,29 @@ CPCriticalAlertStyle        = 2;

    _window = nil; // will be regenerated at next layout
    _needsLayout = YES;
-    [super setTheme:aTheme];
+    [_themeView setTheme:aTheme];
 }

-/*! @deprecated
-*/
- (void)setWindowStyle:(int)aStyle
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
+{
+    [_themeView setValue:aValue forThemeAttribute:aName];
+}
+
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(CPThemeState)aState
+{
+    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
+}
+
+
+/*! @deprecated */
+- (void)setWindowStyle:(int)style
 {
    CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
-    [self setTheme:(aStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
+    [self setTheme:(style === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
 }

-/*! @deprecated
-*/
+/*! @deprecated */
 - (int)windowStyle
 {
    CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
@@ -218,18 +242,19 @@ CPCriticalAlertStyle        = 2;


 /*!
-    set the text of the alert's message
+    Set the text of the alert's message.

    @param aText CPString containing the text
 */
- (void)setMessageText:(CPString)aText
+- (void)setMessageText:(CPString)text
 {
-    [_messageLabel setStringValue:aText];
+    [_messageLabel setStringValue:text];
    _needsLayout = YES;
 }

 /*!
-    return the content of the message text
+    Return the content of the message text.
+
    @return CPString containing the message text
 */
 - (CPString)messageText
@@ -238,13 +263,13 @@ CPCriticalAlertStyle        = 2;
 }

 /*!
-    set the text of the alert's informative text
+    Set the text of the alert's informative text.

    @param aText CPString containing the informative text
 */
- (void)setInformativeText:(CPString)aText
+- (void)setInformativeText:(CPString)text
 {
-    [_informativeLabel setStringValue:aText];
+    [_informativeLabel setStringValue:text];
    _needsLayout = YES;
 }

@@ -261,6 +286,7 @@ CPCriticalAlertStyle        = 2;
 /*!
    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
@@ -270,7 +296,7 @@ CPCriticalAlertStyle        = 2;
 }

 /*!
-    set the accessory view
+    Set the accessory view.

    @param aView the accessory view
 */
@@ -281,7 +307,7 @@ CPCriticalAlertStyle        = 2;
 }

 /*!
-    set if alert shows the suppression button
+    Set if the alert shows the suppression button.

    @param shouldShowSuppressionButton YES or NO
 */
@@ -334,16 +360,16 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutMessageView
 {
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+    var inset = [_themeView 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 setTextColor:[_themeView currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[_themeView currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[_themeView currentValueForThemeAttribute:@"message-text-alignment"]];
    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];

    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -357,18 +383,18 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_layoutInformativeView
 {
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [_themeView 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 setTextColor:[_themeView currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[_themeView currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[_themeView currentValueForThemeAttribute:@"informative-text-alignment"]];
    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];

    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -386,8 +412,8 @@ CPCriticalAlertStyle        = 2;
    if (!_accessoryView)
        return;

-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;

@@ -403,16 +429,16 @@ CPCriticalAlertStyle        = 2;
    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"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [_themeView 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 setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
    [_suppressionButton sizeToFit];

    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
@@ -424,14 +450,17 @@ CPCriticalAlertStyle        = 2;
 */
 - (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"],
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
+        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
        aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
        panelSize = [[_window contentView] frame].size,
        buttonsOriginY,
+        buttonMarginY,
+        buttonMarginX,
+        theme = [self theme],
        offsetX;

    [aRepresentativeButton setTheme:[self theme]];
@@ -444,6 +473,19 @@ CPCriticalAlertStyle        = 2;
    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
    offsetX = panelSize.width - inset.right;

+    switch ([_window styleMask])
+    {
+        case _CPModalWindowMask:
+            buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
+            buttonMarginX = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-x"];
+            break;
+
+        default:
+            buttonMarginY = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-y"];
+            buttonMarginX = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-x"];
+            break;
+    }
+
    for (var i = [_buttons count] - 1; i >= 0 ; i--)
    {
        var button = _buttons[i];
@@ -455,14 +497,14 @@ CPCriticalAlertStyle        = 2;
            height = CGRectGetHeight(buttonFrame);

        offsetX -= width;
-        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
+        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
        offsetX -= 10;
    }

    if (_showHelp)
    {
-        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
+        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);

@@ -487,7 +529,7 @@ CPCriticalAlertStyle        = 2;
    if (!_window)
        [self _createWindowWithStyle:nil];

-    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
+    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
        theImage = _icon,
        finalSize;

@@ -495,13 +537,13 @@ CPCriticalAlertStyle        = 2;
        switch (_alertStyle)
        {
            case CPWarningAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"warning-image"];
+                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
                break;
            case CPInformationalAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"information-image"];
+                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
                break;
            case CPCriticalAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"error-image"];
+                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
                break;
        }

@@ -519,7 +561,7 @@ CPCriticalAlertStyle        = 2;
    if (_showSuppressionButton)
        lastView = _suppressionButton;
    else if (_accessoryView)
-        lastView = _accessoryView
+        lastView = _accessoryView;

    finalSize = [self _layoutButtonsFromView:lastView];
    if ([_window styleMask] & CPDocModalWindowMask)
@@ -528,6 +570,12 @@ CPCriticalAlertStyle        = 2;
    [_window setFrameSize:finalSize];
    [_window center];

+    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
+    {
+        [_window setMovable:YES];
+        [_window setMovableByWindowBackground:YES];
+    }
+
    _needsLayout = NO;
 }

@@ -550,6 +598,17 @@ CPCriticalAlertStyle        = 2;
    [CPApp runModalForWindow:_window];
 }

+/*!
+    The same as \c runModal, but executes the code in \c block when the
+    alert is dismissed.
+*/
+- (void)runModalWithDidEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
+{
+    _didEndBlock = block;
+
+    [self runModal];
+}
+
 /*!
    Runs the receiver modally as an alert sheet attached to a specified window.

@@ -584,6 +643,20 @@ CPCriticalAlertStyle        = 2;
    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
 }

+/*!
+    Runs the receiver modally as an alert sheet attached to a specified window.
+    Executes the code in \c block when the alert is dismissed.
+
+    @param window The parent window for the sheet.
+    @param block  Code block to execute on dismissal
+*/
+- (void)beginSheetModalForWindow:(CPWindow)aWindow didEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
+{
+    _didEndBlock = block;
+
+    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
+}
+
 #pragma mark Private

 /*!
@@ -592,9 +665,11 @@ CPCriticalAlertStyle        = 2;
 - (void)_createWindowWithStyle:(int)forceStyle
 {
    var frame = CGRectMakeZero();
-    frame.size = [self currentValueForThemeAttribute:@"size"];
+    frame.size = [_themeView currentValueForThemeAttribute:@"size"];

-    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
+    _window = [[CPPanel alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
+    [_window setLevel:CPStatusWindowLevel];
+    [_window setPlatformWindow:[[CPApp keyWindow] platformWindow]];

    if (_title)
        [_window setTitle:_title];
@@ -632,8 +707,8 @@ CPCriticalAlertStyle        = 2;
 {
    if ([_window isSheet])
    {
-        [CPApp endSheet:_window returnCode:[aSender tag]];
        [_window orderOut:nil];
+        [CPApp endSheet:_window returnCode:[aSender tag]];
    }
    else
    {
@@ -649,61 +724,75 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+    if (_didEndBlock)
+    {
+        if (typeof(_didEndBlock) === "function")
+            _didEndBlock(self, returnCode);
+        else
+            CPLog.warn("%s: didEnd block is not a function", [self description]);
+
+        // didEnd blocks are transient
+        _didEndBlock = nil;
+    }
+    else if (_modalDelegate)
+    {
+        if (_didEndSelector)
+            objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
+    }
+    else if (_delegate)
+    {
+        if (_didEndSelector)
+            objj_msgSend(_delegate, _didEndSelector, self, returnCode);
+        else 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
+@end
+
+@implementation _CPAlertThemeView : CPView

 + (CPString)defaultThemeClass
 {
    return @"alert";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
-                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
-                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
-                                                CGPointMake(15, 12),
-                                                [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",
-                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
-                                                @"image-offset",
-                                                @"information-image",
-                                                @"warning-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"
-                                                ]];
+    return @{
+            @"size": CGSizeMake(400.0, 110.0),
+            @"content-inset": CGInsetMake(15, 15, 15, 50),
+            @"informative-offset": 6,
+            @"button-offset": 10,
+            @"message-text-alignment": CPJustifiedTextAlignment,
+            @"message-text-color": [CPColor blackColor],
+            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
+            @"message-text-shadow-color": [CPNull null],
+            @"message-text-shadow-offset": CGSizeMakeZero(),
+            @"informative-text-alignment": CPJustifiedTextAlignment,
+            @"informative-text-color": [CPColor blackColor],
+            @"informative-text-font": [CPFont systemFontOfSize:12.0],
+            @"informative-text-shadow-color": [CPNull null],
+            @"informative-text-shadow-offset": CGSizeMakeZero(),
+            @"image-offset": CGPointMake(15, 12),
+            @"information-image": [CPNull null],
+            @"warning-image": [CPNull null],
+            @"error-image": [CPNull null],
+            @"help-image": [CPNull null],
+            @"help-image-left-offset": 15,
+            @"help-image-pressed": [CPNull null],
+            @"suppression-button-y-offset": 0.0,
+            @"suppression-button-x-offset": 0.0,
+            @"default-elements-margin": 3.0,
+            @"suppression-button-text-color": [CPColor blackColor],
+            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
+            @"suppression-button-text-shadow-color": [CPNull null],
+            @"suppression-button-text-shadow-offset": 0.0,
+            @"modal-window-button-margin-y": 0.0,
+            @"modal-window-button-margin-x": 0.0,
+            @"standard-window-button-margin-y": 0.0,
+            @"standard-window-button-margin-x": 0.0,
+        };
 }

@end
@@ -123,23 +123,29 @@ ACTUAL_FRAME_RATE = 0;
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
    var timingFunctionName;
+
    switch (anAnimationCurve)
    {
-        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
-                                    break;
+        case CPAnimationEaseInOut:
+            timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
+            break;

-        case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
-                                    break;
+        case CPAnimationEaseIn:
+            timingFunctionName = kCAMediaTimingFunctionEaseIn;
+            break;

-        case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
-                                    break;
+        case CPAnimationEaseOut:
+            timingFunctionName = kCAMediaTimingFunctionEaseOut;
+            break;

-        case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
-                                    break;
+        case CPAnimationLinear:
+            timingFunctionName = kCAMediaTimingFunctionLinear;
+            break;

-        default:                    [CPException raise:CPInvalidArgumentException
-                                                reason:"Invalid value provided for animation curve"];
-                                    break;
+        default:
+            [CPException raise:CPInvalidArgumentException
+                        reason:@"Invalid value provided for animation curve"];
+            break;
    }

    _animationCurve = anAnimationCurve;
@@ -230,7 +236,9 @@ ACTUAL_FRAME_RATE = 0;
    ACTUAL_FRAME_RATE = 0;
    _lastTime = new Date();

-    _timer = [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
+    var timerInterval = _frameRate <= 0.0 ? 0.0001 : 1.0/_frameRate;
+
+    _timer = [CPTimer scheduledTimerWithTimeInterval:timerInterval target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
 }

 /*
@@ -325,7 +333,7 @@ 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(t, p1x, p1y, p2x, p2y, duration)
 {
    var ax = 0,
        bx = 0,
@@ -22,38 +22,25 @@

@import <Foundation/CPBundle.j>

+@import "CPApplication_Constants.j"
@import "CPCompatibility.j"
+@import "CPColorPanel.j"
+@import "CPCursor.j"
+@import "CPDocumentController.j"
@import "CPEvent.j"
@import "CPMenu.j"
@import "CPResponder.j"
-@import "CPDocumentController.j"
@import "CPThemeBlend.j"
@import "CPCibLoading.j"
+@import "CPPanel.j"
@import "CPPlatform.j"
-
+@import "CPWindowController.j"
+@import "_CPPopoverWindow.j"

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

-CPApp = nil;
-
-CPApplicationWillFinishLaunchingNotification    = @"CPApplicationWillFinishLaunchingNotification";
-CPApplicationDidFinishLaunchingNotification     = @"CPApplicationDidFinishLaunchingNotification";
-CPApplicationWillTerminateNotification          = @"CPApplicationWillTerminateNotification";
-CPApplicationWillBecomeActiveNotification       = @"CPApplicationWillBecomeActiveNotification";
-CPApplicationDidBecomeActiveNotification        = @"CPApplicationDidBecomeActiveNotification";
-CPApplicationWillResignActiveNotification       = @"CPApplicationWillResignActiveNotification";
-CPApplicationDidResignActiveNotification        = @"CPApplicationDidResignActiveNotification";
-
-CPTerminateNow      = YES;
-CPTerminateCancel   = NO;
-CPTerminateLater    = -1; // not currently supported
-
-CPRunStoppedResponse    = -1000;
-CPRunAbortedResponse    = -1001;
-CPRunContinuesResponse  = -1002;
-
 /*!
    @ingroup appkit
    @class CPApplication
@@ -82,8 +69,10 @@ CPRunContinuesResponse  = -1002;
@implementation CPApplication : CPResponder
 {
    CPArray                 _eventListeners;
+    int                     _eventListenerInsertionIndex;

    CPEvent                 _currentEvent;
+    CPWindow                _lastMouseMoveWindow;

    CPArray                 _windows;
    CPWindow                _keyWindow;
@@ -138,10 +127,9 @@ CPRunContinuesResponse  = -1002;
    if (self)
    {
        _eventListeners = [];
+        _eventListenerInsertionIndex = 0;

-        _windows = [];
-
-        [_windows addObject:nil];
+        _windows = [[CPNull null]];
    }

    return self;
@@ -169,7 +157,8 @@ CPRunContinuesResponse  = -1002;
            CPApplicationDidBecomeActiveNotification, @selector(applicationDidBecomeActive:),
            CPApplicationWillResignActiveNotification, @selector(applicationWillResignActive:),
            CPApplicationDidResignActiveNotification, @selector(applicationDidResignActive:),
-            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:)
+            CPApplicationWillTerminateNotification, @selector(applicationWillTerminate:),
+            CPApplicationDidChangeScreenParametersNotification, @selector(applicationDidChangeScreenParameters:)
        ],
        count = [delegateNotifications count];

@@ -250,8 +239,13 @@ CPRunContinuesResponse  = -1002;
        _documentController = [CPDocumentController sharedDocumentController];

    var needsUntitled = !!_documentController,
-        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
-        index = 0,
+        URLStrings = nil;
+
+#if PLATFORM(DOM)
+    URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings();
+#endif
+
+    var index = 0,
        count = [URLStrings count];

    for (; index < count; ++index)
@@ -362,22 +356,32 @@ CPRunContinuesResponse  = -1002;
            applicationVersion = [options objectForKey:@"ApplicationVersion"] || [mainInfo objectForKey:@"CPBundleShortVersionString"],
            copyright = [options objectForKey:@"Copyright"] || [mainInfo objectForKey:@"CPHumanReadableCopyright"];

-        var aboutPanelPath = [[CPBundle bundleForClass:[CPWindowController class]] pathForResource:@"AboutPanel.cib"],
-            aboutPanelController = [CPWindowController alloc],
-            aboutPanelController = [aboutPanelController initWithWindowCibPath:aboutPanelPath owner:aboutPanelController],
-            aboutPanel = [aboutPanelController window],
-            contentView = [aboutPanel contentView],
-            imageView = [contentView viewWithTag:1],
-            applicationLabel = [contentView viewWithTag:2],
-            versionLabel = [contentView viewWithTag:3],
-            copyrightLabel = [contentView viewWithTag:4],
-            standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
+        var windowWidth = 275,
+            windowHeight = 223,
+            imgWidth = 100,
+            imgHeight = 100,
+            interField = 8,
+            aboutPanel = [[CPWindow alloc] initWithContentRect:CGRectMake(0, 0, windowWidth, windowHeight) styleMask:CPClosableWindowMask],
+            imageView = [[CPImageView alloc] initWithFrame:CGRectMake((windowWidth / 2) - (imgWidth / 2), interField, imgWidth, imgHeight)],
+            applicationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(17, imgHeight + 16, windowWidth - 34, 24)],
+            versionLabel = [[CPTextField alloc] initWithFrame:CGRectMake(17, imgHeight + 48, windowWidth - 34, 16)],
+            copyrightLabel = [[CPTextField alloc] initWithFrame:CGRectMake(17, imgHeight + 72, windowWidth - 34, 32)],
+            contentView = [aboutPanel contentView];

-        // FIXME move this into the CIB eventually
        [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
        [applicationLabel setAlignment:CPCenterTextAlignment];
+        [versionLabel setFont:[CPFont systemFontOfSize:[CPFont systemFontSize] - 1]];
        [versionLabel setAlignment:CPCenterTextAlignment];
+        [copyrightLabel setFont:[CPFont systemFontOfSize:[CPFont systemFontSize] - 1]];
        [copyrightLabel setAlignment:CPCenterTextAlignment];
+        [copyrightLabel setLineBreakMode:CPLineBreakByWordWrapping];
+
+        [contentView addSubview:imageView];
+        [contentView addSubview:applicationLabel];
+        [contentView addSubview:versionLabel];
+        [contentView addSubview:copyrightLabel];
+
+        var standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];

        [imageView setImage:applicationIcon || [[CPImage alloc] initWithContentsOfFile:standardPath
                                                                                  size:CGSizeMake(256, 256)]];
@@ -391,7 +395,7 @@ CPRunContinuesResponse  = -1002;
        else
            [versionLabel setStringValue:@""];

-        [copyrightLabel setStringValue:copyright || ""];
+        [copyrightLabel setStringValue:copyright || @""];
        [aboutPanel center];

        _aboutPanel = aboutPanel;
@@ -401,7 +405,7 @@ CPRunContinuesResponse  = -1002;
 }


- (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
+- (void)_documentController:(CPDocumentController)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
 {
    // callback method for terminate:
    if (didCloseAll)
@@ -500,6 +504,8 @@ CPRunContinuesResponse  = -1002;
        if (_eventListeners[count]._callback === _CPRunModalLoop)
        {
            _eventListeners.splice(count, 1);
+            if (count <= _eventListenerInsertionIndex)
+                _eventListenerInsertionIndex--;

            return;
        }
@@ -547,7 +553,7 @@ CPRunContinuesResponse  = -1002;

 //    [theWindow._bridge _obscureWindowsBelowModalWindow];

-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];
 }

 /*!
@@ -565,8 +571,8 @@ CPRunContinuesResponse  = -1002;
 /* @ignore */
 - (BOOL)_handleKeyEquivalent:(CPEvent)anEvent
 {
-    return  [[self keyWindow] performKeyEquivalent:anEvent] ||
-            [[self mainMenu] performKeyEquivalent:anEvent];
+    return [[self keyWindow] performKeyEquivalent:anEvent] ||
+           [[self mainMenu] performKeyEquivalent:anEvent];
 }

 /*!
@@ -578,43 +584,51 @@ CPRunContinuesResponse  = -1002;
    _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
+    var theWindow = [anEvent window];

    // 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
-
+        // The key equivalent was handled.
        return;
+
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
    }

-#if PLATFORM(DOM)
-    // if we make it this far, then restore the original willPropagate value
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
-#endif
-
-    if (_eventListeners.length)
+    /*
+        Event listeners are processed from back to front so that newer event listeners normally take
+        precedence. If during the execution of a callback a new event listener is added, it should
+        be inserted after the current callback but before any higher priority callbacks. This makes
+        repeating event listeners (those that reinsert themselves) stable relative to each other.
+    */
+    for (var i = _eventListeners.length - 1; i >= 0; i--)
    {
-        if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
-            _eventListeners.pop()._callback(anEvent);
+        var listener = _eventListeners[i];

-        return;
+        if (listener._mask & (1 << [anEvent type]))
+        {
+            _eventListeners.splice(i, 1);
+            // In case the callback wants to add more listeners.
+            _eventListenerInsertionIndex = i;
+            listener._callback(anEvent);
+
+            if (listener._dequeue)
+            {
+                // Don't process the event normally and don't send it to any other listener.
+                _eventListenerInsertionIndex = _eventListeners.length;
+                return;
+            }
+        }
    }

-    [[anEvent window] sendEvent:anEvent];
+    _eventListenerInsertionIndex = _eventListeners.length;
+
+    if (theWindow)
+        [theWindow sendEvent:anEvent];
 }

 /*!
@@ -650,6 +664,10 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
+    // Never allow _windows[0] to be returned - it's an internal CPNull placeholder.
+    if (!aWindowNumber)
+        return nil;
+
    return _windows[aWindowNumber];
 }

@@ -658,7 +676,8 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)windows
 {
-    return _windows;
+    // Return all windows, but not the CPNull placeholder in _windows[0].
+    return [_windows subarrayWithRange:CPMakeRange(1, [_windows count] - 1)];
 }

 /*!
@@ -886,31 +905,44 @@ CPRunContinuesResponse  = -1002;

 /*!
    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).
+
+    If multiple callbacks are set which match the same event, later callbacks
+    take priority over earlier callbacks, unless a new callback is set while
+    an existing callback is being processed in which case it's given the same
+    priority as the currently processing callback.
+
+    @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).
+    @param shouldDequeue YES to remove the event from the queue after calling the callback,
+    NO to deliver it normally.
 */
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
+    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, aCallback, 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).
+    If multiple callbacks are set which match the same event, later callbacks
+    take priority over earlier callbacks, unless a new callback is set while
+    an existing callback is being processed in which case it's given the same
+    priority as the currently processing callback.
+
+    @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).
+    @param shouldDequeue YES to remove the event from the queue after calling the callback,
+    NO to deliver it normally.
 */
 - (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); }));
+    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
 }

 /*!
@@ -928,10 +960,10 @@ CPRunContinuesResponse  = -1002;
    @param aSheet the window to display as a sheet
    @param aWindow the window that will hold the sheet as a child
    @param aModalDelegate
-    @param aDidEndSelector
-    @param aContextInfo
+    @param didEndSelector
+    @param contextInfo
 */
- (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
+- (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)didEndSelector contextInfo:(id)contextInfo
 {
    if ([aWindow isSheet])
    {
@@ -939,16 +971,8 @@ CPRunContinuesResponse  = -1002;
        return;
    }

-    [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];
+    [aSheet._windowView _enableSheet:YES inWindow:aWindow];
+    [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:didEndSelector contextInfo:contextInfo];
 }

 /*!
@@ -973,7 +997,7 @@ CPRunContinuesResponse  = -1002;
        var aWindow = [_windows objectAtIndex:count],
            context = aWindow._sheetContext;

-        if (context != nil && context["sheet"] === sheet)
+        if (context && context["sheet"] === sheet)
        {
            context["returnCode"] = returnCode;
            [aWindow _endSheet];
@@ -1009,7 +1033,8 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)arguments
 {
-    if (_fullArgsString !== window.location.hash)
+    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
+    if (window && window.location && _fullArgsString !== window.location.hash)
        [self _reloadArguments];

    return _args;
@@ -1036,8 +1061,9 @@ CPRunContinuesResponse  = -1002;
    if (!args || args.length == 0)
    {
        _args = [];
-        window.location.hash = @"#";
-
+        // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
+        if (window && window.location)
+            window.location.hash = @"#";
        return;
    }

@@ -1052,12 +1078,15 @@ CPRunContinuesResponse  = -1002;

    var hash = [toEncode componentsJoinedByString:@"/"];

-    window.location.hash = @"#" + hash;
+    // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
+    if (window && window.location)
+        window.location.hash = @"#" + hash;
 }

 - (void)_reloadArguments
 {
-    _fullArgsString = window.location.hash;
+    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
+    _fullArgsString = (window && window.location) ? window.location.hash : "";

    if (_fullArgsString.length)
    {
@@ -1171,7 +1200,7 @@ CPRunContinuesResponse  = -1002;

 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
 }

@end
@@ -1181,28 +1210,29 @@ var _CPModalSessionMake = function(aWindow, aStopCode)
    return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
 };

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

 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
 {
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];

    var theWindow = [anEvent window],
        modalSession = CPApp._currentSession;

-    // 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.
+    /*
+        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 isKindOfClass:_CPPopoverWindow] && [[theWindow targetView] window] === modalSession._window))
+    {
        [theWindow sendEvent:anEvent];
+    }
 };

 /*!
@@ -1218,7 +1248,17 @@ function CPApplicationMain(args, namedArgs)
 #if PLATFORM(DOM)
    // hook to allow recorder, etc to manipulate things before starting AppKit
    if (window.parent !== window && typeof window.parent._childAppIsStarting === "function")
-        window.parent._childAppIsStarting(window);
+    {
+        try
+        {
+            window.parent._childAppIsStarting(window);
+        }
+        catch(err)
+        {
+            // This could happen if we're in an iframe without access to the parent frame.
+            CPLog.warn("Failed to call parent frame's _childAppIsStarting().");
+        }
+    }
 #endif

    var mainBundle = [CPBundle mainBundle],
@@ -1275,7 +1315,7 @@ var _CPAppBootstrapperActions = nil;
    var defaultThemeName = [CPApplication defaultThemeName],
        themeURL = nil;

-    if (defaultThemeName === @"Aristo")
+    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
        themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
    else
        themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
@@ -1302,8 +1342,8 @@ var _CPAppBootstrapperActions = nil;
    if (mainCibFile)
    {
        [mainBundle loadCibFile:mainCibFile
-            externalNameTable:[CPDictionary dictionaryWithObject:CPApp forKey:CPCibOwner]
-                 loadDelegate:self];
+              externalNameTable:@{ CPCibOwner: CPApp }
+                   loadDelegate:self];

        return YES;
    }
@@ -1320,26 +1360,25 @@ var _CPAppBootstrapperActions = nil;
    // FIXME: We should implement autoenabling.
    [mainMenu setAutoenablesItems:NO];

-    var bundle = [CPBundle bundleForClass:[CPApplication class]],
-        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];

-    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
-    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
+    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];

    [mainMenu addItem:newMenuItem];

    var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];

-    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
-    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
+    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];

    [mainMenu addItem:openMenuItem];

    var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
        saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];

-    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
-    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
+    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];

    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
    [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
@@ -1381,7 +1420,7 @@ var _CPAppBootstrapperActions = nil;

 + (void)cibDidFailToLoad:(CPCib)aCib
 {
-    throw new Error("Could not load main cib file (Did you forget to nib2cib it?).");
+    throw new Error("Could not load main cib file. Did you forget to nib2cib it?");
 }

 + (void)reset
@@ -0,0 +1,40 @@
+/*
+ * CPApplication_Constants.j
+ * AppKit
+ *
+ * Created by Aparajita Fishman.
+ * Copyright 2013 The Cappuccino Project
+ *
+ * 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
+ */
+
+CPApp = nil;
+
+CPApplicationWillFinishLaunchingNotification        = @"CPApplicationWillFinishLaunchingNotification";
+CPApplicationDidFinishLaunchingNotification         = @"CPApplicationDidFinishLaunchingNotification";
+CPApplicationWillTerminateNotification              = @"CPApplicationWillTerminateNotification";
+CPApplicationWillBecomeActiveNotification           = @"CPApplicationWillBecomeActiveNotification";
+CPApplicationDidBecomeActiveNotification            = @"CPApplicationDidBecomeActiveNotification";
+CPApplicationWillResignActiveNotification           = @"CPApplicationWillResignActiveNotification";
+CPApplicationDidResignActiveNotification            = @"CPApplicationDidResignActiveNotification";
+CPApplicationDidChangeScreenParametersNotification  = @"CPApplicationDidChangeScreenParametersNotification";
+
+CPTerminateNow      = YES;
+CPTerminateCancel   = NO;
+CPTerminateLater    = -1; // not currently supported
+
+CPRunStoppedResponse    = -1000;
+CPRunAbortedResponse    = -1001;
+CPRunContinuesResponse  = -1002;
@@ -65,51 +65,51 @@

 + (CPSet)keyPathsForValuesAffectingContentArray
 {
-    return [CPSet setWithObjects:"content"];
+    return [CPSet setWithObjects:@"content"];
 }

 + (CPSet)keyPathsForValuesAffectingArrangedObjects
 {
    // Also depends on "filterPredicate" but we'll handle that manually.
-    return [CPSet setWithObjects:"content", "sortDescriptors"];
+    return [CPSet setWithObjects:@"content", @"sortDescriptors"];
 }

 + (CPSet)keyPathsForValuesAffectingSelection
 {
-    return [CPSet setWithObjects:"selectionIndexes"];
+    return [CPSet setWithObjects:@"selectionIndexes"];
 }

 + (CPSet)keyPathsForValuesAffectingSelectionIndex
 {
-    return [CPSet setWithObjects:"selectionIndexes"];
+    return [CPSet setWithObjects:@"selectionIndexes"];
 }

 + (CPSet)keyPathsForValuesAffectingSelectionIndexes
 {
    // When the arranged objects change, selection preservation may cause the indexes
    // to change.
-    return [CPSet setWithObjects:"arrangedObjects"];
+    return [CPSet setWithObjects:@"arrangedObjects"];
 }

 + (CPSet)keyPathsForValuesAffectingSelectedObjects
 {
    // Don't need to depend on arrangedObjects here because selectionIndexes already does.
-    return [CPSet setWithObjects:"selectionIndexes"];
+    return [CPSet setWithObjects:@"selectionIndexes"];
 }

 + (CPSet)keyPathsForValuesAffectingCanRemove
 {
-    return [CPSet setWithObjects:"selectionIndexes"];
+    return [CPSet setWithObjects:@"selectionIndexes"];
 }

 + (CPSet)keyPathsForValuesAffectingCanSelectNext
 {
-    return [CPSet setWithObjects:"selectionIndexes"];
+    return [CPSet setWithObjects:@"selectionIndexes"];
 }

 + (CPSet)keyPathsForValuesAffectingCanSelectPrevious
 {
-    return [CPSet setWithObjects:"selectionIndexes"];
+    return [CPSet setWithObjects:@"selectionIndexes"];
 }


@@ -744,6 +744,7 @@
        return;

    var willClearPredicate = NO;
+
    if (_clearsFilterPredicateOnInsertion && _filterPredicate)
    {
        [self willChangeValueForKey:@"filterPredicate"];
@@ -792,10 +793,18 @@
    // not appear in arrangedObjects and we do not have to update at all.
    */

-    // This will also send notificaitons for arrangedObjects.
+    // TODO: Remove these lines when granular notifications are implemented
+    var proxy = [_CPKVOProxy proxyForObject:self];
+    [proxy setAdding:YES];
+
+    // This will also send notifications for arrangedObjects.
    [self didChangeValueForKey:@"content"];
+
    if (willClearPredicate)
        [self didChangeValueForKey:@"filterPredicate"];
+
+    // TODO: Remove this line when granular notifications are implemented
+    [proxy setAdding:NO];
 }

 /*!
@@ -811,6 +820,7 @@
        return;

    var willClearPredicate = NO;
+
    if (_clearsFilterPredicateOnInsertion && _filterPredicate)
    {
        [self willChangeValueForKey:@"filterPredicate"];
@@ -848,9 +858,15 @@
    if ([self avoidsEmptySelection] && [[self selectionIndexes] count] <= 0 && [_contentObject count] > 0)
        [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];

+    var proxy = [_CPKVOProxy proxyForObject:self];
+    [proxy setAdding:YES];
+
    [self didChangeValueForKey:@"content"];
+
    if (willClearPredicate)
        [self didChangeValueForKey:@"filterPredicate"];
+
+    [proxy setAdding:NO];
 }

 /*!
@@ -897,7 +913,9 @@
    if (![self canAdd])
        return;

-    [self insert:sender];
+    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
+
+    [self addObject:newObject];
 }

 /*!
@@ -909,9 +927,13 @@
    if (![self canInsert])
        return;

-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
+    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject],
+        lastSelectedIndex = [_selectionIndexes lastIndex];

-    [self addObject:newObject];
+    if (lastSelectedIndex !== CPNotFound)
+        [self insertObject:newObject atArrangedObjectIndex:lastSelectedIndex];
+    else
+        [self addObject:newObject];
 }

 /*!
@@ -964,7 +986,7 @@
                // be the 'wrong' one - as in not the one the user selected - but the wrong
                // one is still just another pointer to the same object, so the user will not
                // be able to see any difference.
-                contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
+                var contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
                [_contentObject removeObjectAtIndex:contentIndex];
            }
            [arrangedObjects removeObjectAtIndex:anIndex];
@@ -1073,12 +1095,12 @@

@implementation CPArrayController (CPBinder)

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding == @"contentArray")
+    if (aBinding == @"contentArray")
        return [_CPArrayControllerContentBinder class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

@end
@@ -1093,7 +1115,8 @@
        isCompound = [self handlesContentAsCompoundValue],
        dotIndex = keyPath.lastIndexOf("."),
        firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
-        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy];
+        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy],
+        newValue;

    if (!isCompound && !isSelectionProxy)
    {
@@ -1113,6 +1136,7 @@
    }

    var isPlaceholder = CPIsControllerMarker(newValue);
+
    if (isPlaceholder)
    {
        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
@@ -48,6 +48,8 @@ var DefaultLineWidth = 1.0;
 {
    CGPath  _path;
    float   _lineWidth;
+    CPArray _lineDashes;
+    float   _lineDashesPhase;
 }

 /*!
@@ -61,11 +63,11 @@ var DefaultLineWidth = 1.0;
 /*!
    Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
+ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)aRect
 {
    var path = [self bezierPath];

-    [path appendBezierPathWithOvalInRect:rect];
+    [path appendBezierPathWithOvalInRect:aRect];

    return path;
 }
@@ -73,11 +75,20 @@ var DefaultLineWidth = 1.0;
 /*!
    Create a new CPBezierPath object initialized with a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithRect:(CGRect)rect
+ (CPBezierPath)bezierPathWithRect:(CGRect)aRect
 {
    var path = [self bezierPath];

-    [path appendBezierPathWithRect:rect];
+    [path appendBezierPathWithRect:aRect];
+
+    return path;
+}
+
+ (CPBezierPath)bezierPathWithRoundedRect:(CGRect)aRect xRadius:(float)xRadius yRadius:(float)yRadius
+{
+    var path = [self bezierPath];
+
+    [path appendBezierPathWithRoundedRect:aRect xRadius:xRadius yRadius:yRadius];

    return path;
 }
@@ -136,6 +147,8 @@ var DefaultLineWidth = 1.0;
    {
        _path = CGPathCreateMutable();
        _lineWidth = [[self class] defaultLineWidth];
+        _lineDashesPhase = 0;
+        _lineDashes = [];
    }

    return self;
@@ -165,6 +178,19 @@ var DefaultLineWidth = 1.0;
    CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }

+- (CGRect)bounds
+{
+    // TODO: this should return this. The controlPointBounds is not a tight fit.
+    // return CGPathGetBoundingBox(_path);
+
+    return [self controlPointBounds];
+}
+
+- (CGRect)controlPointBounds
+{
+    return CGPathGetBoundingBox(_path);
+}
+
 /*!
    Create a line segment between the first and last points in the subpath, closing it.
 */
@@ -183,6 +209,7 @@ var DefaultLineWidth = 1.0;
    CGContextBeginPath(ctx);
    CGContextAddPath(ctx, _path);
    CGContextSetLineWidth(ctx, [self lineWidth]);
+    CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
    CGContextStrokePath(ctx);
 }

@@ -196,10 +223,50 @@ var DefaultLineWidth = 1.0;
    CGContextBeginPath(ctx);
    CGContextAddPath(ctx, _path);
    CGContextSetLineWidth(ctx, [self lineWidth]);
+    CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
    CGContextClosePath(ctx);
    CGContextFillPath(ctx);
 }

+/*!
+    Cocoa compatibility.
+*/
+- (void)getLineDash:(CPArrayRef)patternRef count:(NSInteger)count phase:(CGFloatRef)phaseRef
+{
+    return [self getLineDash:patternRef phase:phaseRef];
+}
+
+/*!
+    Retrieve the line dash pattern and phase and write them into the provided references.
+*/
+- (void)getLineDash:(CPArrayRef)patternRef phase:(CGFloatRef)phaseRef
+{
+    if (patternRef)
+        @deref(patternRef) = [_lineDashes copy];
+    if (phaseRef)
+        @deref(phaseRef) = _lineDashesPhase;
+}
+
+/*!
+    Cocoa compatibility.
+*/
+- (void)setLineDash:(CPArray)aPattern count:(NSInteger)count phase:(CGFloat)aPhase
+{
+    [self setLineDash:aPattern phase:aPhase];
+}
+
+/*!
+    Set stroke line dash pattern.
+
+    @param aPattern an array of stroke-skip lengths such as [2, 2, 4, 4]
+    @param aPhase amount of shift for the starting position of the first stroke
+*/
+- (void)setLineDash:(CPArray)aPattern phase:(CGFloat)aPhase
+{
+    _lineDashes = aPattern;
+    _lineDashesPhase = aPhase;
+}
+
 /*!
    Get the line width.
 */
@@ -272,6 +339,11 @@ var DefaultLineWidth = 1.0;
    CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
 }

+- (void)appendBezierPathWithArcFromPoint:(CGPoint)fromPoint toPoint:(CGPoint)toPoint radius:(float)radius
+{
+    CGPathAddArcToPoint(_path, null, fromPoint.x, fromPoint.y, toPoint.x, toPoint.y, radius);
+}
+
 /*!
    Append the contents of a CPBezierPath object.
 */
@@ -288,4 +360,21 @@ var DefaultLineWidth = 1.0;
    _path = CGPathCreateMutable();
 }

+- (void)addClip
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextAddPath(ctx, _path);
+    CGContextClip(ctx);
+}
+
+- (void)setClip
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextBeginPath(ctx);
+    CGContextAddPath(ctx, _path);
+    CGContextClip(ctx);
+}
+
@end
@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPTextField.j"
@import "CPView.j"

 // CPBoxType
@@ -55,14 +56,6 @@ CPBelowBottom = 6;
 {
    CPBoxType       _boxType;
    CPBorderType    _borderType;
-
-    CPColor         _borderColor;
-    CPColor         _fillColor;
-
-    float           _cornerRadius;
-    float           _borderWidth;
-
-    CPSize          _contentMargin;
    CPView          _contentView;

    CPString        _title @accessors(getter=title);
@@ -70,6 +63,33 @@ CPBelowBottom = 6;
    CPTextField     _titleView;
 }

+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if ([aBinding hasPrefix:CPDisplayPatternTitleBinding])
+        return [CPTitleWithPatternBinding class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+ (CPString)defaultThemeClass
+{
+    return @"box";
+}
+
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"background-color": [CPNull null],
+            @"border-color": [CPNull null],
+            @"border-width": 1.0,
+            @"corner-radius": 3.0,
+            @"inner-shadow-offset": CGSizeMakeZero(),
+            @"inner-shadow-size": 6.0,
+            @"inner-shadow-color": [CPNull null],
+            @"content-margin": CGSizeMakeZero(),
+        };
+}
+
 + (id)boxEnclosingView:(CPView)aView
 {
    var box = [[self alloc] initWithFrame:CGRectMakeZero()],
@@ -85,18 +105,13 @@ CPBelowBottom = 6;
    return box;
 }

- (id)initWithFrame:(CPRect)frameRect
+- (id)initWithFrame:(CGRect)frameRect
 {
    self = [super initWithFrame:frameRect];

    if (self)
    {
        _borderType = CPBezelBorder;
-        _fillColor = [CPColor clearColor];
-        _borderColor = [CPColor blackColor];
-
-        _borderWidth = 1.0;
-        _contentMargin = CGSizeMake(0.0, 0.0);

        _titlePosition = CPNoTitle;
        _titleView = [CPTextField labelWithTitle:@""];
@@ -118,7 +133,7 @@ CPBelowBottom = 6;

    @return the border rectangle of the box
 */
- (CPRect)borderRect
+- (CGRect)borderRect
 {
    return [self bounds];
 }
@@ -208,58 +223,54 @@ CPBelowBottom = 6;

 - (CPColor)borderColor
 {
-    return _borderColor;
+    return [self valueForThemeAttribute:@"border-color"];
 }

 - (void)setBorderColor:(CPColor)color
 {
-    if ([color isEqual:_borderColor])
+    if ([color isEqual:[self borderColor]])
        return;

-    _borderColor = color;
-    [self setNeedsDisplay:YES];
+    [self setValue:color forThemeAttribute:@"border-color"];
 }

 - (float)borderWidth
 {
-    return _borderWidth;
+    return [self valueForThemeAttribute:@"border-width"];
 }

 - (void)setBorderWidth:(float)width
 {
-    if (width === _borderWidth)
+    if (width === [self borderWidth])
        return;

-    _borderWidth = width;
-    [self setNeedsDisplay:YES];
+    [self setValue:width forThemeAttribute:@"border-width"];
 }

 - (float)cornerRadius
 {
-    return _cornerRadius;
+    return [self valueForThemeAttribute:@"corner-radius"];
 }

 - (void)setCornerRadius:(float)radius
 {
-    if (radius === _cornerRadius)
+    if (radius === [self cornerRadius])
        return;

-    _cornerRadius = radius;
-    [self setNeedsDisplay:YES];
+    [self setValue:radius forThemeAttribute:@"corner-radius"];
 }

 - (CPColor)fillColor
 {
-    return _fillColor;
+    return [self valueForThemeAttribute:@"background-color"];
 }

 - (void)setFillColor:(CPColor)color
 {
-    if ([color isEqual:_fillColor])
+    if ([color isEqual:[self fillColor]])
        return;

-    _fillColor = color;
-    [self setNeedsDisplay:YES];
+    [self setValue:color forThemeAttribute:@"background-color"];
 }

 - (CPView)contentView
@@ -272,34 +283,43 @@ CPBelowBottom = 6;
    if (aView === _contentView)
        return;

-    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
+    var borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+
+    [aView setFrame:CGRectInset([self bounds], contentMargin.width + borderWidth, contentMargin.height + borderWidth)];
    [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-    [self replaceSubview:_contentView with:aView];
+
+    //  A nil contentView is allowed (tested in Cocoa 2013-02-22).
+    if (!aView)
+        [_contentView removeFromSuperview];
+    else if (_contentView)
+        [self replaceSubview:_contentView with:aView];
+    else
+        [self addSubview:aView];

    _contentView = aView;
 }

- (CPSize)contentViewMargins
+- (CGSize)contentViewMargins
 {
-    return _contentMargin;
+    return [self valueForThemeAttribute:@"content-margin"];
 }

- (void)setContentViewMargins:(CPSize)size
+- (void)setContentViewMargins:(CGSize)size
 {
     if (size.width < 0 || size.height < 0)
         [CPException raise:CPGenericException reason:@"Margins must be positive"];

-    _contentMargin = CGSizeMakeCopy(size);
-    [self setNeedsDisplay:YES];
+    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
 }

- (void)setFrameFromContentFrame:(CPRect)aRect
+- (void)setFrameFromContentFrame:(CGRect)aRect
 {
-    var offset = [self _titleHeightOffset];
+    var offset = [self _titleHeightOffset],
+        borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];

-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + offset[0] + _borderWidth))];
-
-    [self setNeedsDisplay:YES];
+    [self setFrame:CGRectInset(aRect, -(contentMargin.width + borderWidth), -(contentMargin.height + offset[0] + borderWidth))];
 }

 - (void)setTitle:(CPString)aTitle
@@ -322,6 +342,26 @@ CPBelowBottom = 6;
    [self _manageTitlePositioning];
 }

+- (CPFont)titleFont
+{
+    return [_titleView font];
+}
+
+- (void)setTitleFont:(CPFont)aFont
+{
+    [_titleView setFont:aFont];
+}
+
+/*!
+    Return the text field used to display the receiver's title.
+
+    This is the Cappuccino equivalent to the `titleCell` method.
+*/
+- (CPTextField)titleView
+{
+    return _titleView;
+}
+
 - (void)_manageTitlePositioning
 {
    if (_titlePosition == CPNoTitle)
@@ -340,7 +380,7 @@ CPBelowBottom = 6;
        case CPAtTop:
        case CPAboveTop:
        case CPBelowTop:
-            [_titleView setFrameOrigin:CPPointMake(5.0, 0.0)];
+            [_titleView setFrameOrigin:CGPointMake(5.0, 0.0)];
            [_titleView setAutoresizingMask:CPViewNotSizable];
            break;

@@ -348,7 +388,7 @@ CPBelowBottom = 6;
        case CPAtBottom:
        case CPBelowBottom:
            var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CPPointMake(5.0, [self frameSize].height - h)];
+            [_titleView setFrameOrigin:CGPointMake(5.0, [self frameSize].height - h)];
            [_titleView setAutoresizingMask:CPViewMinYMargin];
            break;
    }
@@ -360,17 +400,13 @@ CPBelowBottom = 6;
 - (void)sizeToFit
 {
    var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset];
+        offset = [self _titleHeightOffset],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];

    if (!contentFrame)
        return;

-    [_contentView setAutoresizingMask:CPViewNotSizable];
-    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
-                                  contentFrame.size.height + _contentMargin.height * 2 + offset[0])];
-    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height + offset[1])];
+    [_contentView setFrameOrigin:CGPointMake(contentMargin.width, contentMargin.height + offset[1])];
 }

 - (float)_titleHeightOffset
@@ -391,12 +427,17 @@ CPBelowBottom = 6;
    }
 }

- (void)drawRect:(CPRect)rect
+- (void)setValue:(id)aValue forKey:(CPString)aKey
 {
-    if (_borderType === CPNoBorder)
-        return;
+    if (aKey === CPDisplayPatternTitleBinding)
+        [self setTitle:aValue || @""];
+    else
+        [super setValue:aValue forKey:aKey];
+}

-    var bounds = CGRectMakeCopy([self bounds]);
+- (void)drawRect:(CGRect)rect
+{
+    var bounds = [self bounds];

    switch (_boxType)
    {
@@ -404,9 +445,9 @@ CPBelowBottom = 6;
            // 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];
+                return [self _drawVerticalSeparatorInRect:bounds];
            else if (CGRectGetHeight(bounds) === 5.0)
-                return [self _drawHorizontalSeperatorInRect:bounds];
+                return [self _drawHorizontalSeparatorInRect:bounds];

            break;
    }
@@ -421,81 +462,137 @@ CPBelowBottom = 6;
        bounds.size.height -= [_titleView frameSize].height;
    }

+    // Primary or secondary type boxes always draw the same way, unless they are CPNoBorder.
+    if ((_boxType === CPBoxPrimary || _boxType === CPBoxSecondary) && _borderType !== CPNoBorder)
+    {
+        [self _drawPrimaryBorderInRect:bounds];
+        return;
+    }
+
    switch (_borderType)
    {
        case CPBezelBorder:
            [self _drawBezelBorderInRect:bounds];
            break;

-        default:
+        case CPGrooveBorder:
        case CPLineBorder:
            [self _drawLineBorderInRect:bounds];
            break;
+
+        case CPNoBorder:
+            [self _drawNoBorderInRect:bounds];
+            break;
    }
 }

- (void)_drawHorizontalSeperatorInRect:(CGRect)aRect
+- (void)_drawHorizontalSeparatorInRect:(CGRect)aRect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort];

    CGContextSetStrokeColor(context, [self borderColor]);
    CGContextSetLineWidth(context, 1.0);

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

- (void)_drawVerticalSeperatorInRect:(CGRect)aRect
+- (void)_drawVerticalSeparatorInRect:(CGRect)aRect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort];

    CGContextSetStrokeColor(context, [self borderColor]);
    CGContextSetLineWidth(context, 1.0);

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

+- (void)_drawLineBorderInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        cornerRadius = [self cornerRadius],
+        borderWidth = [self borderWidth];
+
+    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
+
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextSetStrokeColor(context, [self borderColor]);
+
+    CGContextSetLineWidth(context, borderWidth);
+    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+}
+
 - (void)_drawBezelBorderInRect:(CGRect)aRect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        sides = [CPMinYEdge, CPMaxXEdge, CPMaxYEdge, CPMinXEdge],
-        sideGray = 190.0 / 255.0,
-        grays = [142.0 / 255.0, sideGray, sideGray, sideGray],
-        borderWidth = _borderWidth;
+        cornerRadius = [self cornerRadius],
+        borderWidth = [self borderWidth],
+        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
+        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
+        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];

-    while (borderWidth--)
-        aRect = CPDrawTiledRects(aRect, aRect, sides, grays);
+    var baseRect = aRect;
+    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);

+    CGContextSaveGState(context);
+
+    CGContextSetStrokeColor(context, [self borderColor]);
+    CGContextSetLineWidth(context, borderWidth);
    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRect(context, aRect);
+    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+
+    CGContextRestoreGState(context);
 }

- (void)_drawLineBorderInRect:(CGRect)aRect
+- (void)_drawPrimaryBorderInRect:(CGRect)aRect
+{
+    // Draw the "primary" style CPBox.
+
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        cornerRadius = [self cornerRadius],
+        borderWidth = [self borderWidth],
+        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
+        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
+        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"],
+        baseRect = aRect;
+
+    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
+
+    CGContextSaveGState(context);
+
+    CGContextSetStrokeColor(context, [self borderColor]);
+    CGContextSetLineWidth(context, borderWidth);
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+
+    CGContextBeginPath(context);
+    // Note we can't use the 0.5 inset rectangle when setting up clipping. The clipping has to be
+    // on integer coordinates for this to look right in Chrome.
+    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(baseRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
+    CGContextClip(context);
+    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+
+    CGContextRestoreGState(context);
+}
+
+- (void)_drawNoBorderInRect:(CGRect)aRect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort];

-    aRect = CGRectInset(aRect, _borderWidth / 2.0, _borderWidth / 2.0);
-
    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetLineWidth(context, _borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
+    CGContextFillRect(context, aRect);
 }

@end

 var CPBoxTypeKey          = @"CPBoxTypeKey",
    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
-    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
-    CPBoxFillColorKey     = @"CPBoxFillColorKey",
-    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
-    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey",
    CPBoxTitle            = @"CPBoxTitle",
    CPBoxTitlePosition    = @"CPBoxTitlePosition",
    CPBoxTitleView        = @"CPBoxTitleView";
@@ -511,14 +608,6 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
        _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
        _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];

-        _borderColor   = [aCoder decodeObjectForKey:CPBoxBorderColorKey];
-        _fillColor     = [aCoder decodeObjectForKey:CPBoxFillColorKey];
-
-        _cornerRadius  = [aCoder decodeFloatForKey:CPBoxCornerRadiusKey];
-        _borderWidth   = [aCoder decodeFloatForKey:CPBoxBorderWidthKey];
-
-        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
-
        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
@@ -540,18 +629,9 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",

    [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
    [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
-
-    [aCoder encodeObject:_borderColor forKey:CPBoxBorderColorKey];
-    [aCoder encodeObject:_fillColor forKey:CPBoxFillColorKey];
-
-    [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];
 }

@end
@@ -24,15 +24,16 @@

@import "CPControl.j"
@import "CPImage.j"
+@import "CPScrollView.j"
@import "CPTableView.j"
@import "CPTextField.j"
-@import "CPScrollView.j"
+
+@global CPApp

 /*!
    @ingroup appkit
    @class CPBrowser
 */
-
@implementation CPBrowser : CPControl
 {
    id              _delegate;
@@ -65,18 +66,18 @@
    CPArray         _columnWidths;
 }

-+ (CPImage)branchImage
+ (CPString)defaultThemeClass
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
-                                                    pathForResource:"browser-leaf.png"]
-                                              size:CGSizeMake(9,9)];
+    return "browser";
 }

-+ (CPImage)highlightedBranchImage
+ (CPDictionary)themeAttributes
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
-                                                    pathForResource:"browser-leaf-highlighted.png"]
-                                              size:CGSizeMake(9,9)];
+    return @{
+        @"image-control-resize": [CPNull null],
+        @"image-control-leaf": [CPNull null],
+        @"image-control-leaf-pressed": [CPNull null]
+    };
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -170,7 +171,7 @@
    [self addColumn];
 }

- (void)setLastColumn:(int)columnIndex
+- (void)setLastColumn:(CPInteger)columnIndex
 {
    if (columnIndex >= _tableViews.length)
        return;
@@ -178,6 +179,11 @@
    var oldValue = _tableViews.length - 1,
        indexPlusOne = columnIndex + 1; // unloads all later columns.

+    if (columnIndex > 0)
+        [_tableViews[columnIndex - 1] setNeedsDisplay:YES];
+
+    [_tableViews[columnIndex] setNeedsDisplay:YES];
+
    [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"]
      makeObjectsPerformSelector:@selector(removeFromSuperview)];

@@ -276,8 +282,8 @@
    var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
        view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];

-    [view setBranchImage:[[self class] branchImage]];
-    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
+    [view setBranchImage:[self valueForThemeAttribute:@"image-control-leaf"]];
+    [view setHighlightedBranchImage:[self valueForThemeAttribute:@"image-control-leaf-pressed"]];

    [column setDataView:view];
    [column setResizingMask:CPTableColumnNoResizing];
@@ -285,7 +291,7 @@
    [aTableView addTableColumn:column];
 }

- (void)reloadColumn:(int)column
+- (void)reloadColumn:(CPInteger)column
 {
    [[self tableViewInColumn:column] reloadData];
 }
@@ -353,7 +359,7 @@

 // ITEMS

- (id)itemAtRow:(int)row inColumn:(int)column
+- (id)itemAtRow:(CPInteger)row inColumn:(CPInteger)column
 {
    return [_tableDelegates[column] childAtIndex:row];
 }
@@ -363,7 +369,7 @@
    return [_delegate respondsToSelector:@selector(browser:isLeafItem:)] && [_delegate browser:self isLeafItem:item];
 }

- (id)parentForItemsInColumn:(int)column
+- (id)parentForItemsInColumn:(CPInteger)column
 {
    return [_tableDelegates[column] _item];
 }
@@ -425,11 +431,26 @@

 - (void)keyDown:(CPEvent)anEvent
 {
-    var column = [self selectedColumn];
-    if (column === -1)
+    var key = [anEvent charactersIgnoringModifiers],
+        column = [self selectedColumn];
+
+    if (column === CPNotFound)
        return;

-    [_tableViews[column] keyDown:anEvent];
+    if (key === CPLeftArrowFunctionKey || key === CPRightArrowFunctionKey)
+    {
+        if (key === CPLeftArrowFunctionKey)
+        {
+            var previousColumn = column - 1,
+                selectedRow = [self selectedRowInColumn:previousColumn];
+
+            [self selectRow:selectedRow inColumn:previousColumn];
+        }
+        else
+            [self selectRow:0 inColumn:column + 1];
+    }
+    else
+        [_tableViews[column] keyDown:anEvent];
 }

 // SIZING
@@ -631,7 +652,7 @@
    [_tableViews makeObjectsPerformSelector:@selector(registerForDraggedTypes:) withObject:types];
 }

- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent
+- (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent
 {
    if ([_delegate respondsToSelector:@selector(browser:canDragRowsWithIndexes:inColumn:withEvent:)])
        return [_delegate browser:self canDragRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent];
@@ -639,7 +660,7 @@
    return YES;
 }

- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+- (CPImage)draggingImageForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
    if ([_delegate respondsToSelector:@selector(browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:)])
        return [_delegate browser:self draggingImageForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
@@ -647,7 +668,7 @@
    return nil;
 }

- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(int)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+- (CPView)draggingViewForRowsWithIndexes:(CPIndexSet)rowIndexes inColumn:(CPInteger)columnIndex withEvent:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
    if ([_delegate respondsToSelector:@selector(browser:draggingViewForRowsWithIndexes:inColumn:withEvent:offset:)])
        return [_delegate browser:self draggingViewForRowsWithIndexes:rowIndexes inColumn:columnIndex withEvent:dragEvent offset:dragImageOffset];
@@ -704,8 +725,6 @@
@end


-var _CPBrowserResizeControlBackgroundImage = nil;
-
@implementation _CPBrowserResizeControl : CPView
 {
    CGPoint     _mouseDownX;
@@ -714,22 +733,14 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    unsigned    _width;
 }

-+ (CPImage)backgroundImage
-{
-    if (!_CPBrowserResizeControlBackgroundImage)
-    {
-        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
-        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
-                                                                                    size:CGSizeMake(15, 14)];
-    }
-
-    return _CPBrowserResizeControlBackgroundImage;
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
-        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
+    {
+        var browser = [[CPBrowser alloc] init];
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[browser valueForThemeAttribute:@"image-control-resize"]]];
+    }
+

    return self;
 }
@@ -760,7 +771,7 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    CPBrowser                _browser @accessors;
 }

- (void)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
@@ -814,18 +825,26 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    return _browser;
 }

+/*!
+    @ignore
+*/
+- (BOOL)_isFocused
+{
+    return ([super _isFocused] || [_browser tableViewInColumn:[_browser selectedColumn]] === self);
+}
+
 - (BOOL)canDragRowsWithIndexes:(CPIndexSet)rowIndexes atPoint:(CGPoint)mouseDownPoint
 {
    return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
 }

- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
    return [_browser draggingImageForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragImageOffset] ||
           [super dragImageForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragImageOffset];
 }

- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragViewOffset
 {
    var count = theTableColumns.length;
    while (count--)
@@ -838,30 +857,6 @@ var _CPBrowserResizeControlBackgroundImage = nil;
           [super dragViewForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragViewOffset];
 }

- (void)moveUp:(id)sender
-{
-    [super moveUp:sender];
-    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
-}
-
- (void)moveDown:(id)sender
-{
-    [super moveDown:sender];
-    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
-}
-
- (void)moveLeft:(id)sender
-{
-    var previousColumn = [_browser selectedColumn] - 1,
-        selectedRow = [_browser selectedRowInColumn:previousColumn];
-
-    [_browser selectRow:selectedRow inColumn:previousColumn];
-}
-
- (void)moveRight:(id)sender
-{
-    [_browser selectRow:0 inColumn:[_browser selectedColumn] + 1];
-}

@end

@@ -907,12 +902,12 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    [_browser selectRowIndexes:selectedIndexes inColumn:_index];
 }

- (id)childAtIndex:(unsigned)index
+- (id)childAtIndex:(CPUInteger)index
 {
    return [_delegate browser:_browser child:index ofItem:_item];
 }

- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(int)row dropOperation:(CPTableViewDropOperation)operation
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id)info row:(CPInteger)row dropOperation:(CPTableViewDropOperation)operation
 {
    if ([_delegate respondsToSelector:@selector(browser:acceptDrop:atRow:column:dropOperation:)])
        return [_delegate browser:_browser acceptDrop:info atRow:row column:_index dropOperation:operation];
@@ -920,7 +915,7 @@ var _CPBrowserResizeControlBackgroundImage = nil;
        return NO;
 }

- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(int)row proposedDropOperation:(CPTableViewDropOperation)operation
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(CPInteger)row proposedDropOperation:(CPTableViewDropOperation)operation
 {
    if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
        return [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
@@ -1000,7 +995,7 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    [aCoder encodeObject:_highlightedBranchImage forKey:"_CPBrowserLeafViewHighlightedBranchImageKey"];
 }

- (void)initWithCoder:(CPCoder)aCoder
+- (id)initWithCoder:(CPCoder)aCoder
 {
    if (self = [super initWithCoder:aCoder])
    {
@@ -25,7 +25,8 @@

@import "CPControl.j"
@import "CPStringDrawing.j"
-
+@import "CPText.j"
+@import "CPWindow_Constants.j"

 /* @group CPBezelStyle */

@@ -59,11 +60,11 @@ CPMomentaryPushInButton = 7;
 CPMomentaryPushButton   = 0;
 CPMomentaryLight        = 7;

-CPNoButtonMask              = 0;
-CPContentsButtonMask        = 1;
-CPPushInButtonMask          = 2;
-CPGrayButtonMask            = 4;
-CPBackgroundButtonMask      = 8;
+CPNoButtonMask          = 0;
+CPContentsButtonMask    = 1;
+CPPushInButtonMask      = 2;
+CPGrayButtonMask        = 4;
+CPBackgroundButtonMask  = 8;

 CPNoCellMask                = CPNoButtonMask;
 CPContentsCellMask          = CPContentsButtonMask;
@@ -71,16 +72,19 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;

-CPButtonStateMixed                  = CPThemeState("mixed");
-CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
+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]];
+var CPButtonBezelStyleStateMap = @{
+        CPRoundedBezelStyle: CPButtonStateBezelStyleRounded,
+        CPRoundRectBezelStyle: [CPNull null],
+    };

-
-CPButtonDefaultHeight = 24.0;
+/// @cond IGNORE
+CPButtonDefaultHeight = 25.0;
 CPButtonImageOffset   = 3.0;
+/// @endcond

 /*!
    @ingroup appkit
@@ -116,6 +120,14 @@ CPButtonImageOffset   = 3.0;
    BOOL                _isTracking;
 }

+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding === CPTargetBinding || [aBinding hasPrefix:CPArgumentBinding])
+        return [CPActionBinding class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
 + (id)buttonWithTitle:(CPString)aTitle
 {
    return [self buttonWithTitle:aTitle theme:[CPTheme defaultTheme]];
@@ -137,10 +149,15 @@ CPButtonImageOffset   = 3.0;
    return @"button";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
-                                       forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]];
+    return @{
+            @"image": [CPNull null],
+            @"image-offset": 0.0,
+            @"bezel-inset": CGInsetMakeZero(),
+            @"content-inset": CGInsetMakeZero(),
+            @"bezel-color": [CPNull null],
+        };
 }

 /*!
@@ -221,7 +238,7 @@ CPButtonImageOffset   = 3.0;
    else if (![anObjectValue isKindOfClass:[CPNumber class]])
        anObjectValue = CPOnState;
    else if (anObjectValue >= CPOnState)
-        anObjectValue = CPOnState
+        anObjectValue = CPOnState;
    else if (anObjectValue < CPOffState)
        if ([self allowsMixedState])
            anObjectValue = CPMixedState;
@@ -275,7 +292,7 @@ CPButtonImageOffset   = 3.0;
 }

 /*!
-    Sets the button's next state to \c aState.
+    Sets the button's state to the next available state.
    @param aState Possible states are any of the CPButton globals:
    \c CPOffState, \c CPOnState, \c CPMixedState
 */
@@ -431,38 +448,47 @@ CPButtonImageOffset   = 3.0;
 {
    switch (aButtonType)
    {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPNoCellMask];
-                                        break;
+        case CPMomentaryLightButton:
+            [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+            [self setShowsStateBy:CPNoCellMask];
+            break;

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

-        case CPMomentaryChangeButton:   [self setHighlightsBy:CPContentsCellMask];
-                                        [self setShowsStateBy:CPNoCellMask];
-                                        break;
+        case CPMomentaryChangeButton:
+            [self setHighlightsBy:CPContentsCellMask];
+            [self setShowsStateBy:CPNoCellMask];
+            break;

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

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

-        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
-                                        [self setShowsStateBy:CPContentsCellMask];
-                                        break;
+        case CPToggleButton:
+            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
+            [self setShowsStateBy:CPContentsCellMask];
+            break;

-        case CPSwitchButton:            [CPException raise:CPInvalidArgumentException
-                                                    reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
+        case CPSwitchButton:
+            [CPException raise:CPInvalidArgumentException
+                        reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];

-        case CPRadioButton:             [CPException raise:CPInvalidArgumentException
-                                                    reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
+        case CPRadioButton:
+            [CPException raise:CPInvalidArgumentException
+                        reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];

-        default:                        [CPException raise:CPInvalidArgumentException
-                                                    reason:"Unknown button type."];
+        default:
+            [CPException raise:CPInvalidArgumentException
+                        reason:"Unknown button type."];
    }

    [self setImageDimsWhenDisabled:YES];
@@ -522,6 +548,7 @@ CPButtonImageOffset   = 3.0;
    _isTracking = YES;

    var startedTracking = [super startTrackingAt:aPoint];
+
    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
    {
        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
@@ -536,6 +563,7 @@ CPButtonImageOffset   = 3.0;
        else
            [self highlight:NO];
    }
+
    return startedTracking;
 }

@@ -577,7 +605,7 @@ CPButtonImageOffset   = 3.0;
 {
    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    return _CGRectInsetByInset(bounds, contentInset);
+    return CGRectInsetByInset(bounds, contentInset);
 }

 - (CGRect)bezelRectForBounds:(CGRect)bounds
@@ -588,7 +616,7 @@ CPButtonImageOffset   = 3.0;

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

-    return _CGRectInsetByInset(bounds, bezelInset);
+    return CGRectInsetByInset(bounds, bezelInset);
 }

 - (CGSize)_minimumFrameSize
@@ -648,14 +676,14 @@ CPButtonImageOffset   = 3.0;
 {
    if (aName === "bezel-view")
    {
-        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+        var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];

        [view setHitTests:NO];

        return view;
    }
    else
-        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+        return [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];
 }

 - (void)layoutSubviews
@@ -988,6 +1016,3 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 }

@end
-
-@import "CPCheckBox.j"
-@import "CPRadio.j"
@@ -1,5 +1,31 @@
+/*
+ * CPButtonBar.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 "CPView.j"
+@import "CPWindow_Constants.j"
+
+@class CPSplitView
+
+@global CPPopUpButtonStatePullsDown


@implementation CPButtonBar : CPView
@@ -12,7 +38,7 @@
 + (id)plusButton
 {
    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];

    [button setBordered:NO];
    [button setImage:image];
@@ -24,7 +50,7 @@
 + (id)minusButton
 {
    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];

    [button setBordered:NO];
    [button setImage:image];
@@ -36,7 +62,7 @@
 + (id)actionPopupButton
 {
    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];

    [button addItemWithTitle:nil];
    [[button lastItem] setImage:image];
@@ -53,10 +79,19 @@
    return @"button-bar";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
+    return @{
+            @"resize-control-inset": CGInsetMake(0.0, 0.0, 0.0, 0.0),
+            @"resize-control-size": CGSizeMakeZero(),
+            @"resize-control-color": [CPNull null],
+            @"bezel-color": [CPNull null],
+            @"button-bezel-color": [CPNull null],
+            @"button-text-color": [CPNull null],
+            @"button-image-plus": [CPNull null],
+            @"button-image-minus": [CPNull null],
+            @"button-image-action": [CPNull null],
+        };
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -44,12 +44,12 @@ CPCheckBoxImageOffset = 4.0;
    return @"check-box";
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding === CPValueBinding)
+    if (aBinding === CPValueBinding)
        return [_CPCheckBoxValueBinder class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -22,6 +22,7 @@

@import "CPView.j"

+@class CPScrollView

 /*!
    @ingroup appkit
@@ -44,10 +45,10 @@
    if (_documentView == aView)
        return;

-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
    if (_documentView)
    {
+        var defaultCenter = [CPNotificationCenter defaultCenter];
+
        [defaultCenter
            removeObserver:self
                      name:CPViewFrameDidChangeNotification
@@ -66,24 +67,30 @@
    if (_documentView)
    {
        [self addSubview:_documentView];
-
-        [_documentView setPostsFrameChangedNotifications:YES];
-        [_documentView setPostsBoundsChangedNotifications:YES];
-
-        [defaultCenter
-            addObserver:self
-               selector:@selector(viewFrameChanged:)
-                   name:CPViewFrameDidChangeNotification
-                 object:_documentView];
-
-        [defaultCenter
-            addObserver:self
-               selector:@selector(viewBoundsChanged:)
-                   name:CPViewBoundsDidChangeNotification
-                 object:_documentView];
+        [self _observeDocumentView];
    }
 }

+- (void)_observeDocumentView
+{
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    [_documentView setPostsFrameChangedNotifications:YES];
+    [_documentView setPostsBoundsChangedNotifications:YES];
+
+    [defaultCenter
+        addObserver:self
+           selector:@selector(viewFrameChanged:)
+               name:CPViewFrameDidChangeNotification
+             object:_documentView];
+
+    [defaultCenter
+        addObserver:self
+           selector:@selector(viewBoundsChanged:)
+               name:CPViewBoundsDidChangeNotification
+             object:_documentView];
+}
+
 /*!
    Returns the document view.
 */
@@ -101,19 +108,19 @@
 - (CGPoint)constrainScrollPoint:(CGPoint)aPoint
 {
    if (!_documentView)
-        return _CGPointMakeZero();
+        return CGPointMakeZero();

    var documentFrame = [_documentView frame];

-    aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(_bounds), 0.0)));
-    aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(_CGRectGetHeight(documentFrame) - _CGRectGetHeight(_bounds), 0.0)));
+    aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(CGRectGetWidth(documentFrame) - CGRectGetWidth(_bounds), 0.0)));
+    aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(CGRectGetHeight(documentFrame) - CGRectGetHeight(_bounds), 0.0)));

    return aPoint;
 }

 - (void)setBoundsOrigin:(CGPoint)aPoint
 {
-    if (_CGPointEqualToPoint(_bounds.origin, aPoint))
+    if (CGPointEqualToPoint(_bounds.origin, aPoint))
        return;

    [super setBoundsOrigin:aPoint];
@@ -233,7 +240,12 @@ var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
 - (id)initWithCoder:(CPCoder)aCoder
 {
    if (self = [super initWithCoder:aCoder])
-        [self setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
+    {
+        // Don't call setDocumentView: here. It calls addSubview:, but it's A) not necessary since the
+        // view hierarchy is fully encoded and B) dangerous if the subview is not fully decoded.
+        _documentView = [aCoder decodeObjectForKey:CPClipViewDocumentViewKey];
+        [self _observeDocumentView];
+    }

    return self;
 }
@@ -22,13 +22,38 @@

@import "CPViewController.j"

-
 /*!
    Represents an object inside a CPCollectionView.
 */
@implementation CPCollectionViewItem : CPViewController
 {
    BOOL    _isSelected;
+    CPData  _cachedArchive;
+}
+
+- (id)copy
+{
+    var cibName = [self cibName],
+        copy;
+
+    if (cibName)
+    {
+        copy = [[[self class] alloc] initWithCibName:cibName bundle:[self cibBundle]];
+    }
+    else
+    {
+        if (!_cachedArchive)
+            _cachedArchive = [CPKeyedArchiver archivedDataWithRootObject:self];
+
+        copy = [CPKeyedUnarchiver unarchiveObjectWithData:_cachedArchive];
+
+        // copy connections
+    }
+
+    [copy setRepresentedObject:[self representedObject]];
+    [copy setSelected:_isSelected];
+
+    return copy;
 }

 // Setting the Represented Object
@@ -21,12 +21,24 @@
 */

@import <Foundation/CPObject.j>
+@import "CPGraphicsContext.j"

@import "CGColor.j"

@import "CPCompatibility.j"
@import "CPImage.j"

+
+/*!
+    Orientation to use with \c CPColorPattern for vertical patterns.
+*/
+CPColorPatternIsVertical = YES;
+
+/*!
+    Orientation to use with \c CPColorPattern for horizontal patterns.
+*/
+CPColorPatternIsHorizontal = NO;
+
 /// @cond IGNORE

 var _redComponent        = 0,
@@ -57,64 +69,6 @@ var cachedBlackColor,

 /// @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

@@ -202,11 +156,15 @@ function CPColorWithImages()
 }

 /*!
-    Creates a new color in HSB space.
+    Creates a new color based on the given HSB components.

-    @param hue the hue value
-    @param saturation the saturation value
-    @param brightness the brightness value
+    Note: earlier versions of this method took a hue component as degrees between 0-360,
+    and saturation and brightness components as percent between 0-100. This method has
+    now been corrected to take all components in the 0-1 range as in Cocoa.
+
+    @param hue the hue component (0.0-1.0)
+    @param saturation the saturation component (0.0-1.0)
+    @param brightness the brightness component (0.0-1.0)

    @return the initialized color
 */
@@ -215,25 +173,61 @@ function CPColorWithImages()
    return [self colorWithHue:hue saturation:saturation brightness:brightness alpha:1.0];
 }

+/*!
+    Calibrated colors are not supported in Cappuccino.
+
+    This method has the same result as [CPColor colorWithHue:saturation:brightness:alpha:].
+*/
+ (CPColor)colorWithCalibratedHue:(float)hue saturation:(float)saturation brightness:(float)brightness alpha:(float)alpha
+{
+    return [self colorWithHue:hue saturation:saturation brightness:brightness alpha:alpha];
+}
+
+/*!
+    Creates a new color based on the given HSB components.
+
+    Note: earlier versions of this method took a hue component as degrees between 0-360,
+    and saturation and brightness components as percent between 0-100. This method has
+    now been corrected to take all components in the 0-1 range as in Cocoa.
+
+    @param hue the hue component (0.0-1.0)
+    @param saturation the saturation component (0.0-1.0)
+    @param brightness the brightness component (0.0-1.0)
+    @param alpha the opacity component (0.0-1.0)
+
+    @return the initialized color
+*/
 + (CPColor)colorWithHue:(float)hue saturation:(float)saturation brightness:(float)brightness alpha:(float)alpha
 {
+    // Clamp values.
+    hue = MAX(MIN(hue, 1.0), 0.0);
+    saturation = MAX(MIN(saturation, 1.0), 0.0);
+    brightness = MAX(MIN(brightness, 1.0), 0.0);
+
    if (saturation === 0.0)
-        return [CPColor colorWithCalibratedWhite:brightness / 100.0 alpha:alpha];
+        return [CPColor colorWithCalibratedWhite:brightness alpha:alpha];

-    var f = hue % 60,
-        p = (brightness * (100 - saturation)) / 10000,
-        q = (brightness * (6000 - saturation * f)) / 600000,
-        t = (brightness * (6000 - saturation * (60 -f))) / 600000,
-        b =  brightness / 100.0;
+    var f = (hue * 360) % 60,
+        p = (brightness * (1 - saturation)),
+        q = (brightness * (60 - saturation * f)) / 60,
+        t = (brightness * (60 - saturation * (60 - f))) / 60,
+        b = brightness;

-    switch (FLOOR(hue / 60))
+    switch (FLOOR(hue * 6))
    {
-        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:
+        case 6:
+            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];
    }
 }

@@ -611,8 +605,19 @@ function CPColorWithImages()
    return [[[self class] alloc] _initWithRGBA:components];
 }

+/*!
+    Returns the receiver. This method is a placeholder that does nothing but may be implemented in the future.
+*/
+- (CPColor)colorUsingColorSpaceName:(id)aColorSpaceName
+{
+    return self;
+}
+
 /*!
    Returns an array with the HSB values for this color.
+
+    The values are expressed as fractions between 0.0-1.0.
+
    The index values are ordered as:
 <pre>
 <b>Index</b>   <b>Component</b>
@@ -659,12 +664,36 @@ function CPColorWithImages()
    }

    return [
-        ROUND(hue * 360.0),
-        ROUND(saturation * 100.0),
-        ROUND(brightness * 100.0)
+        hue,
+        saturation,
+        brightness
    ];
 }

+/*!
+    Returns the hue component, the H in HSB, of the receiver.
+*/
+- (float)hueComponent
+{
+    return [self hsbComponents][0];
+}
+
+/*!
+    Returns the saturation component, the S in HSB, of the receiver.
+*/
+- (float)saturationComponent
+{
+    return [self hsbComponents][1];
+}
+
+/*!
+    Returns the brightness component, the B in HSB, of the receiver.
+*/
+- (float)brightnessComponent
+{
+    return [self hsbComponents][2];
+}
+
 /*!
    Returns the CSS representation of this color. The color will
    be in one of the following forms:
@@ -731,7 +760,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image

        for (var i = 0; i < slices.length; ++i)
        {
-            var imgDescription = [slices[i] description];
+            var imgDescription = [slices[i] description] || "nil";

            description += imgDescription.replace(/^/mg, "        ") + ",\n";
        }
@@ -739,7 +768,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
        description = description.substr(0, description.length - 2) + "\n    ]\n}";
    }
    else
-        description += [patternImage description].replace(/^/mg, "    ") + "\n}";
+        description += ([patternImage description] || "nil").replace(/^/mg, "    ") + "\n}";

    return description;
 }
@@ -864,4 +893,551 @@ var byteToHex = function(n)
           hexCharacters.charAt(n % 16);
 };

+/*!
+    To create a simple color with a pattern image:
+        CPColorWithImages(name, width, height{, bundle})
+
+    To create a color with a three-part/nine-part image using a pattern string:
+        CPColorWithImages(pattern, attributes{, bundle})
+
+    <pattern> must have one or more placeholders. There are there possible
+    placeholders available that together can be used to build a filename:
+
+    style     A top-level style, for example normal (empty) and "default".
+    state     The state of a view, for example "highlighted" and "disabled".
+    position  The position of an image within a 3-part or 9-part image.
+              This must be provided.
+
+    Each placeholder is filled with the values you pass in a the attributes object.
+    Neither style nor state are necessary, if you omit them the next level of the
+    hierarchy is the top level.
+
+    Attributes
+    ----------
+    styles: [...]
+    An array of style names. For example, if you want to generate the filenames
+    "button-bezel" and "default-button-bezel", you would use ["", "default"]
+    for the styles.
+
+    states: [...]
+    An array of state names.
+
+    positions: <spec>
+    Specifies the naming convention for the slices of the image. For 3-part images,
+    <spec> may be one of:
+
+        "@"     Equivalent to ["left", "center", "right"] for horizontal
+                images, ["top", "center", "bottom"] for vertical images
+        "#"     Equivalent to ["0", "1", "2"]
+        [...]   An array of any three literal strings
+
+    For 9-part images, <spec> may be one of:
+
+        "@" | "abbrev"  Equivalent to ["top-left", "top", "top-right",
+                                       "left", "center", "right",
+                                       "bottom-left", "bottom", "bottom-right"]
+        "full"          Equivalent to ["top-left", "top-center", "top-right",
+                                       "center-left", "center-center", "center-right",
+                                       "bottom-left", "bottom-center", "bottom-right"]
+        "#"              Equivalent to ["0", "1", "2", "3", "4", "5", "6", "7", "8"]
+        [...]           An array of any nine literal strings
+
+    width: <number>
+    The width of the left image for horizontal 3-part images, the top image for
+    vertical 3-part images, or the top left corner for 9-part images.
+
+    height: <number>
+    The height of the left image for horizontal 3-part images, the top image for
+    vertical 3-part images, or the top left corner for 9-part images.
+
+    centerWidth: <number>
+    For a horizontal 3-part image that has a center slice width that is not 1.0,
+    set this for the width of the center slice. If omitted, it defaults
+    to 1.0. Not used for 9-part images.
+
+    rightWidth: <number>
+    For a horizontal 3-part image that has different left/right slice widths,
+    or a 9-part image that has different left/right corner slice widths,
+    set this for the width of the right slice. If omitted, the "width"
+    value is used for left and right widths.
+
+    centerHeight: <number>
+    For a vertical 3-part image that has a center slice height that is not 1.0,
+    set this for the height of the center slice. If omitted, it defaults
+    to 1.0. Not used for 9-part images.
+
+    bottomHeight: <number>
+    For a vertical image that has different top/bottom slice heights,
+    or a 9-part image that has different top/bottom corner slice heights,
+    set this for the height of the bottom slice. If omitted, the "height"
+    value is used for top and bottom heights.
+
+    centerIsNil: <BOOL>
+    For 9-part images, if the center image is nil, set this to YES.
+    If omitted or set to NO, a center image must be provided.
+
+    separator: <string>
+    The separator to use between components of the pattern.
+    If it is omitted, it defaults to "-".
+
+    orientation: PatternIsHorizontal | PatternIsVertical
+    The orientation of the image. This must be specified for 3-part images,
+    it should NOT be specified for 9-part images.
+
+    Using a pattern, all of this:
+
+    bezelColor = PatternColor(
+        [
+            ["button-bezel-left.png", 4.0, 24.0],
+            ["button-bezel-center.png", 1.0, 24.0],
+            ["button-bezel-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    highlightedBezelColor = PatternColor(
+        [
+            ["button-bezel-highlighted-left.png", 4.0, 24.0],
+            ["button-bezel-highlighted-center.png", 1.0, 24.0],
+            ["button-bezel-highlighted-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    disabledBezelColor = PatternColor(
+        [
+            ["button-bezel-disabled-left.png", 4.0, 24.0],
+            ["button-bezel-disabled-center.png", 1.0, 24.0],
+            ["button-bezel-disabled-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    defaultBezelColor = PatternColor(
+        [
+            ["default-button-bezel-left.png", 4.0, 24.0],
+            ["default-button-bezel-center.png", 1.0, 24.0],
+            ["default-button-bezel-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    defaultHighlightedBezelColor = PatternColor(
+        [
+            ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
+            ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
+            ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal),
+
+    defaultDisabledBezelColor = PatternColor(
+        [
+            ["default-button-bezel-disabled-left.png", 4.0, 24.0],
+            ["default-button-bezel-disabled-center.png", 1.0, 24.0],
+            ["default-button-bezel-disabled-right.png", 4.0, 24.0]
+        ],
+        PatternIsHorizontal)
+
+    can be replaced with this:
+
+    bezelColors = PatternColor(
+        "{style}button-bezel{state}{position}.png",
+        {
+            styles: ["", "default"],
+            states: ["", "highlighted", "disabled"],
+            positions: "@",
+            width: 4.0,
+            height: 24.0,
+            orientation: PatternIsHorizontal
+        })
+
+    Which would effectively create the following object:
+
+    {
+        "@":
+        {
+            "@": <ThreePartImage>:
+            [
+                ["button-bezel-left.png", 4.0, 24.0],
+                ["button-bezel-center.png", 1.0, 24.0],
+                ["button-bezel-right.png", 4.0, 24.0]
+            ],
+            "highlighted": <ThreePartImage>:
+            [
+                ["button-bezel-highlighted-left.png", 4.0, 24.0],
+                ["button-bezel-highlighted-center.png", 1.0, 24.0],
+                ["button-bezel-highlighted-right.png", 4.0, 24.0]
+            ],
+            "disabled": <ThreePartImage>:
+            [
+                ["button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["button-bezel-disabled-right.png", 4.0, 24.0]
+            ]
+        },
+
+        "default":
+        {
+            "@": <ThreePartImage>:
+            [
+                ["default-button-bezel-left.png", 4.0, 24.0],
+                ["default-button-bezel-center.png", 1.0, 24.0],
+                ["default-button-bezel-right.png", 4.0, 24.0]
+            ],
+            "highlighted": <ThreePartImage>:
+            [
+                ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
+                ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
+                ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
+            ],
+            "disabled": <ThreePartImage>:
+            [
+                ["default-button-bezel-disabled-left.png", 4.0, 24.0],
+                ["button-bezel-disabled-center.png", 1.0, 24.0],
+                ["default-button-bezel-disabled-right.png", 4.0, 24.0]
+            ]
+        }
+    }
+
+    To reference empty names in the pattern color, use the key "@".
+    So, for example, to reference the "default" style, "disabled" state,
+    you would use the following expression:
+
+    bezelColors["@"]["disabled"]
+
+    To create a color with a three-part pattern image explicitly:
+        CPColorWithImages(slices, orientation)
+
+    where slices is an array of three [name, width, height{, bundle}] arrays,
+    and orientation is CPColorPatternIsVertical or CPColorPatternIsHorizontal.
+
+    To create a color with a nine-part pattern image explicitly:
+        CPColorWithImages(slices);
+
+    where slices is an array of nine [name, width, height{, bundle}] arrays.
+*/
+function CPColorWithImages()
+{
+    var slices = nil,
+        numParts = 0,
+        isVertical = false,
+        imageFactory = CPImageInBundle,
+        args = Array.prototype.slice.apply(arguments);
+
+    if (typeof(args[args.length - 1]) === "function")
+        imageFactory = args.pop();
+
+    switch (args.length)
+    {
+        case 1:
+            return imageFromSlices(args[0], isVertical, imageFactory);
+
+        case 2:
+            // New-style 3-part and 9-part images
+            if (typeof(args[0]) === "string")
+                return patternColorsFromPattern.call(this, args[0], args[1], imageFactory);
+
+            return imageFromSlices(args[0], args[1], imageFactory);
+
+        case 3:
+        case 4:
+            return [CPColor colorWithPatternImage:imageFactory(args[0], args[1], args[2], args[3])];
+
+        default:
+            throw("ERROR: Invalid argument count: " + args.length);
+    }
+}
+
+var imageFromSlices = function(slices, isVertical, imageFactory)
+{
+    var imageSlices = [];
+
+    for (var i = 0; i < slices.length; ++i)
+    {
+        var slice = slices[i];
+
+        imageSlices.push(slice ? imageFactory(slice[0], slice[1], slice[2], slice[3]) : nil);
+    }
+
+    switch (slices.length)
+    {
+        case 3:
+            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:isVertical]];
+
+        case 9:
+            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
+
+        default:
+            throw("ERROR: Invalid number of image slices: " + slices.length);
+    }
+};
+
+var patternColorsFromPattern = function(pattern, attributes, imageFactory)
+{
+    if (pattern.match(/^.*\{[^}]+\}/))
+    {
+        var width = attributes["width"],
+            height = attributes["height"],
+            separator = attributes["separator"] || "-",
+            orientation = attributes["orientation"],
+            rightWidth,
+            bottomHeight,
+            centerWidthHeight,
+            centerIsNil,
+            numParts;
+
+        // positions are mandatory
+        if (pattern.indexOf("{position}") < 0)
+            throw("ERROR: Pattern strings must have a {position} placeholder (\"" + pattern + "\")");
+
+        if (orientation === undefined)
+        {
+            numParts = 9;
+
+            if (attributes["centerIsNil"] !== undefined)
+                centerIsNil = attributes["centerIsNil"];
+        }
+        else
+        {
+            numParts = 3;
+            isVertical = orientation === PatternIsVertical;
+
+            if (isVertical)
+            {
+                if (attributes["centerHeight"])
+                    centerWidthHeight = attributes["centerHeight"];
+            }
+            else
+            {
+                if (attributes["centerWidth"])
+                    centerWidthHeight = attributes["centerWidth"];
+            }
+        }
+
+        if (attributes["rightWidth"])
+            rightWidth = attributes["rightWidth"];
+
+        if (attributes["bottomHeight"])
+            bottomHeight = attributes["bottomHeight"];
+
+        var positions = attributes["positions"] || "@",
+            states = nil,
+            styles = nil;
+
+        if (numParts === 3)
+        {
+            if (positions === "@")
+            {
+                if (isVertical)
+                    positions = ["top", "center", "bottom"];
+                else
+                    positions = ["left", "center", "right"];
+            }
+            else if (positions === "#")
+                positions = ["0", "1", "2"];
+            else
+                throw("ERROR: Invalid positions: " + positions)
+        }
+        else // numParts === 9
+        {
+            if (positions === "@" || positions === "abbrev")
+                positions = ["top-left", "top", "top-right", "left", "center", "right", "bottom-left", "bottom", "bottom-right"];
+            else if (positions === "full")
+                positions = ["top-left", "top-center", "top-right", "center-left", "center-center", "center-right", "bottom-left", "bottom-center", "bottom-right"];
+            else if (positions === "#")
+                positions = ["0", "1", "2", "3", "4", "5", "6", "7", "8"];
+            else
+                throw("ERROR: Invalid positions: " + positions)
+        }
+
+        // states
+        if (pattern.indexOf("{state}") >= 0)
+        {
+            states = attributes["states"];
+
+            if (!states)
+                throw("ERROR: {state} placeholder in the pattern (\"" + pattern + "\") but no states item in the attributes");
+        }
+
+        // styles
+        if (pattern.indexOf("{style}") >= 0)
+        {
+            styles = attributes["styles"];
+
+            if (!styles)
+                throw("ERROR: {style} placeholder in the pattern (\"" + pattern + "\") but no styles item in the attributes");
+        }
+
+        // Now assemble the hierarchy
+        var placeholder = "{position}",
+            pos = pattern.indexOf(placeholder),
+            i;
+
+        for (i = 0; i < positions.length; ++i)
+            positions[i] = pattern.replace(placeholder, pos === 0 ? positions[i] + separator : separator + positions[i]);
+
+        var slices = positions,
+            object = slices,
+            key,
+            sep;
+
+        if (states)
+        {
+            placeholder = "{state}";
+            pos = pattern.indexOf(placeholder);
+            object = {};
+
+            for (i = 0; i < states.length; ++i)
+            {
+                var state = states[i];
+                key = state || "@";
+                sep = state ? separator : "";
+
+                object[key] = slices.slice(0);
+                replacePlaceholderInArray(object[key], placeholder, pos === 0 ? state + sep : sep + state);
+            }
+        }
+
+        if (styles)
+        {
+            placeholder = "{style}";
+            pos = pattern.indexOf(placeholder);
+
+            var styleObject = {};
+
+            for (i = 0; i < styles.length; ++i)
+            {
+                var style = styles[i];
+                key = style || "@";
+                sep = style ? separator : "";
+
+                if (states)
+                {
+                    styleObject[key] = cloneObject(object);
+                    replacePlaceholderInObject(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
+                }
+                else
+                {
+                    styleObject[key] = slices.slice(0);
+                    replacePlaceholderInArray(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
+                }
+            }
+
+            object = styleObject;
+        }
+
+        if (styles || states)
+        {
+            if (numParts === 3)
+                makeThreePartSlicesFromObject(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+            else
+                makeNinePartSlicesFromObject(object, width, height, rightWidth, bottomHeight, centerIsNil);
+
+            makeImagesFromObject(object, isVertical, imageFactory);
+            return object;
+        }
+        else
+        {
+            if (numParts === 3)
+                makeThreePartSlicesFromArray(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+            else
+                makeNinePartSlicesFromArray(object, width, height, rightWidth, bottomHeight, centerIsNil);
+
+            return imageFromSlices(object, isVertical, imageFactory);
+        }
+    }
+    else
+        throw("ERROR: No placeholders in slice pattern (\"" + pattern + "\")");
+};
+
+var replacePlaceholderInArray = function(array, find, replacement)
+{
+    for (var i = 0; i < array.length; ++i)
+        array[i] = array[i].replace(find, replacement);
+};
+
+var replacePlaceholderInObject = function(object, find, replacement)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                replacePlaceholderInArray(object[key], find, replacement);
+            else
+                replacePlaceholderInObject(object[key], find, replacement);
+};
+
+var cloneObject = function(object)
+{
+    var clone = {};
+
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                clone[key] = object[key].slice(0);
+            else if (typeof(object[key]) === "object")
+                clone[key] = cloneObject(object[key]);
+            else
+                clone[key] = object[key];
+
+    return clone;
+};
+
+var makeThreePartSlicesFromObject = function(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                makeThreePartSlicesFromArray(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+            else // object
+                makeThreePartSlicesFromObject(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
+};
+
+var makeThreePartSlicesFromArray = function(array, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
+{
+    array[0] = [array[0], width, height];
+
+    if (isVertical)
+    {
+        array[1] = [array[1], width, centerWidthHeight ? centerWidthHeight : 1.0];
+        array[2] = [array[2], width, bottomHeight ? bottomHeight : height];
+    }
+    else
+    {
+        array[1] = [array[1], centerWidthHeight ? centerWidthHeight : 1.0, height];
+        array[2] = [array[2], rightWidth ? rightWidth : width, height];
+    }
+};
+
+var makeNinePartSlicesFromObject = function(object, width, height, rightWidth, bottomHeight, centerIsNil)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                makeNinePartSlicesFromArray(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
+            else // object
+                makeNinePartSlicesFromObject(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
+};
+
+var makeNinePartSlicesFromArray = function(array, width, height, rightWidth, bottomHeight, centerIsNil)
+{
+    rightWidth = rightWidth ? rightWidth : width;
+    bottomHeight = bottomHeight ? bottomHeight : height;
+
+    array[0] = [array[0], width, height];                // top-left
+    array[1] = [array[1], 1.0, height];                  // top
+    array[2] = [array[2], rightWidth, height];           // top-right
+    array[3] = [array[3], width, 1.0];                   // left
+    array[4] = centerIsNil ? nil : [array[4], 1.0, 1.0]; // center
+    array[5] = [array[5], rightWidth, 1.0];              // right
+    array[6] = [array[6], width, bottomHeight];          // bottom-left
+    array[7] = [array[7], 1.0, bottomHeight];            // bottom
+    array[8] = [array[8], rightWidth, bottomHeight];     // bottom-right
+};
+
+var makeImagesFromObject = function(object, isVertical, imageFactory)
+{
+    for (var key in object)
+        if (object.hasOwnProperty(key))
+            if (object[key].constructor === Array)
+                object[key] = imageFromSlices(object[key], isVertical, imageFactory);
+            else // object
+                makeImagesFromObject(object[key], isVertical, imageFactory);
+};
+
 /// @endcond
@@ -20,12 +20,32 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPApplication.j"
@import "CPButton.j"
@import "CPCookie.j"
@import "CPPanel.j"
+@import "CPPasteboard.j"
@import "CPView.j"

+@class CPSlider
+
+@global CPApp
+
+/*
+    A color wheel
+    @global
+    @group CPColorPanelMode
+*/
+CPWheelColorPickerMode = 1;
+
+/*
+    Slider based picker
+    @global
+    @group CPColorPanelMode
+*/
+CPSliderColorPickerMode = 2;
+
+CPColorPickerViewWidth  = 265;
+CPColorPickerViewHeight = 370;

 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";

@@ -38,22 +58,6 @@ var PREVIEW_HEIGHT = 20.0,
 var SharedColorPanel = nil,
    ColorPickerClasses = [];

-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
-
 /*!
    @ingroup appkit
    @class CPColorPanel
@@ -123,7 +127,7 @@ CPColorPickerViewHeight = 370;

    if (self)
    {
-        [[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+        //[[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];

        [self setTitle:@"Color Panel"];
        [self setLevel:CPFloatingWindowLevel];
@@ -248,8 +252,8 @@ CPColorPickerViewHeight = 370;
        var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
            bounds = [[self contentView] bounds];

-        [view setFrameSize:CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin:CPPointMake(5, height)];
+        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin:CGPointMake(5, height)];
    }

    [_currentView removeFromSuperview];
@@ -419,7 +423,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    CPCookie        _swatchCookie;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];

@@ -437,7 +441,7 @@ 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:CGRectMake(13 * i + 1, 1, 12, 12)],
            fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];

        [view setBackgroundColor:whiteColor];
@@ -572,7 +576,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
 }

- (void)performDragOperation:(id <CPDraggingInfo>)aSender
+- (void)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
 {
    var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
        pasteboard = [aSender draggingPasteboard],
@@ -592,7 +596,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    CPColorPanel    _colorPanel;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];

@@ -611,7 +615,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    return _colorPanel;
 }

- (void)performDragOperation:(id <CPDraggingInfo>)aSender
+- (void)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
 {
    var pasteboard = [aSender draggingPasteboard];

@@ -633,7 +637,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";

    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];

-    var bounds = CPRectMake(0, 0, 15, 15);
+    var bounds = CGRectMake(0, 0, 15, 15);

    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
    var dragView = [[CPView alloc] initWithFrame:bounds],
@@ -645,8 +649,8 @@ 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)
+                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
@@ -24,6 +24,12 @@

@import "CPView.j"

+@class CPSlider
+
+@global CPColorPickerViewWidth
+@global CPColorPickerViewHeight
+@global CPWheelColorPickerMode
+

 /*!
    @ingroup appkit
@@ -109,12 +115,12 @@

 - (id)initView
 {
-    var aFrame = _CGRectMake(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"];
@@ -127,7 +133,7 @@
    [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];

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

@@ -152,12 +158,12 @@
        brightness = [_brightnessSlider floatValue];

    [_hueSaturationView setWheelBrightness:brightness / 100.0];
-    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hue saturation:saturation brightness:100]];
+    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hue / 360.0 saturation:saturation / 100.0 brightness:1]];

    var colorPanel = [self colorPanel],
        opacity = [colorPanel opacity];

-    _cachedColor = [CPColor colorWithHue:hue saturation:saturation brightness:brightness alpha:opacity];
+    _cachedColor = [CPColor colorWithHue:hue / 360.0 saturation:saturation / 100.0 brightness:brightness / 100.0 alpha:opacity];

    [[self colorPanel] setColor:_cachedColor];
 }
@@ -188,10 +194,10 @@
    var hsb = [newColor hsbComponents];

    [_hueSaturationView setPositionToColor:newColor];
-    [_brightnessSlider setFloatValue:hsb[2]];
-    [_hueSaturationView setWheelBrightness:hsb[2] / 100.0];
+    [_brightnessSlider setFloatValue:hsb[2] * 100.0];
+    [_hueSaturationView setWheelBrightness:hsb[2]];

-    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:100]];
+    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:1]];
 }

 - (CPImage)provideNewButtonImage
@@ -222,7 +228,7 @@
    float       _radius;
 }

- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
@@ -269,13 +275,13 @@
 #endif
 }

- (void)setFrameSize:(CPSize)aSize
+- (void)setFrameSize:(CGSize)aSize
 {
    [super setFrameSize:aSize];
    [self setWheelSize:aSize];
 }

- (void)setWheelSize:(CPSize)aSize
+- (void)setWheelSize:(CGSize)aSize
 {
    var min = MIN(aSize.width, aSize.height);

@@ -353,15 +359,15 @@
    _angle     = [self radiansToDegrees:angle];
    _distance  = (distance / _radius) * 100.0;

-    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
 }

 - (void)setPositionToColor:(CPColor)aColor
 {
    var hsb    = [aColor hsbComponents],
        bounds = [self bounds],
-        angle    = [self degreesToRadians:hsb[0]],
-        distance = (hsb[1] / 100.0) * _radius;
+        angle    = [self degreesToRadians:hsb[0] * 360.0],
+        distance = hsb[1] * _radius;

    [self setAngle:angle distance:distance];
 }
@@ -20,6 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPObject.j>
+
 var sRGBColorSpace = nil;

 /*!
@@ -45,12 +45,12 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    CPColor _color;
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding == CPValueBinding)
+    if (aBinding == CPValueBinding)
        return [CPColorWellValueBinder class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

 + (CPString)defaultThemeClass
@@ -58,10 +58,15 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    return @"colorwell";
 }

-+ (id)themeAttributes
+ (CPDictionary)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"]];
+    return @{
+            @"bezel-inset": CGInsetMakeZero(),
+            @"bezel-color": [CPNull null],
+            @"content-inset": CGInsetMake(3.0, 3.0, 3.0, 3.0),
+            @"content-border-inset": CGInsetMakeZero(),
+            @"content-border-color": [CPNull null],
+        };
 }

 - (void)_reverseSetBinding
@@ -244,21 +249,21 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    return _CGRectInsetByInset(bounds, contentInset);
+    return CGRectInsetByInset(bounds, contentInset);
 }

 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];

-    return _CGRectInsetByInset(bounds, bezelInset);
+    return CGRectInsetByInset(bounds, bezelInset);
 }

 - (CGRect)contentBorderRectForBounds:(CGRect)bounds
 {
    var contentBorderInset = [self currentValueForThemeAttribute:@"content-border-inset"];

-    return _CGRectInsetByInset(bounds, contentBorderInset);
+    return CGRectInsetByInset(bounds, contentBorderInset);
 }

 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
@@ -278,7 +283,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv

 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];

    [view setHitTests:NO];

@@ -315,7 +320,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv

 - (void)_updatePlaceholdersWithOptions:(CPDictionary)options
 {
-    var placeholderColor = [CPColor blueColor];
+    var placeholderColor = [CPColor blackColor];

    [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
    [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
@@ -323,30 +328,19 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
    [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
 }

- (void)setValueFor:(CPString)theBinding
+- (id)valueForBinding:(CPString)aBinding
 {
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
+    return [_source color];
+}

-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
+- (void)setValue:(id)aValue forBinding:(CPString)theBinding
+{
+    [_source setColor:aValue];
+}

-        newValue = [self _placeholderForMarker:newValue];
-    }
-    else
-    {
-        newValue = [self transformValue:newValue withOptions:options];
-    }
-
-    [_source setColor:newValue];
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setColor:aValue];
 }

@end
@@ -20,6 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPText.j"
@import "CPTextField.j"
@import "_CPPopUpList.j"

@@ -57,17 +58,20 @@ var CPComboBoxTextSubview = @"text",
    return "combobox";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjectsAndKeys:_CGSizeMake(21.0, 29.0), @"popup-button-size", _CGInsetMake(3.0, 3.0, 3.0, 3.0), @"border-inset"];
+    return @{
+                @"popup-button-size": CGSizeMake(21.0, 29.0),
+                @"border-inset": CGInsetMake(3.0, 3.0, 3.0, 3.0),
+            };
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding === CPContentBinding || theBinding === CPContentValuesBinding)
+    if (aBinding === CPContentBinding || aBinding === CPContentValuesBinding)
        return [_CPComboBoxContentBinder class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -83,7 +87,7 @@ var CPComboBoxTextSubview = @"text",
 - (void)_initComboBox
 {
    _items = [CPArray array];
-    _listClass = [_CPPopUpList class];
+//    _listClass = [_CPPopUpList class];
    _usesDataSource = NO;
    _completes = NO;
    _canComplete = NO;
@@ -167,7 +171,7 @@ var CPComboBoxTextSubview = @"text",

 #pragma mark Setting a Delegate

- (id < CPComboBoxDelegate >)delegate
+- (id /*< CPComboBoxDelegate >*/)delegate
 {
    return [super delegate];
 }
@@ -178,7 +182,7 @@ var CPComboBoxTextSubview = @"text",
    protocol, in actual fact it doesn't. Also note that the same
    delegate may conform to the NSTextFieldDelegate protocol.
 */
- (void)setDelegate:(id < CPComboBoxDelegate >)aDelegate
+- (void)setDelegate:(id /*< CPComboBoxDelegate >*/)aDelegate
 {
    var delegate = [self delegate];

@@ -227,7 +231,7 @@ var CPComboBoxTextSubview = @"text",

 #pragma mark Setting a Data Source

- (id < CPComboBoxDataSource >)dataSource
+- (id /*< CPComboBoxDataSource >*/)dataSource
 {
    if (!_usesDataSource)
        [self _dataSourceWarningForMethod:_cmd condition:NO];
@@ -235,7 +239,7 @@ var CPComboBoxTextSubview = @"text",
    return _dataSource;
 }

- (void)setDataSource:(id < CPComboBoxDataSource >)aSource
+- (void)setDataSource:(id /*< CPComboBoxDataSource >*/)aSource
 {
    if (!_usesDataSource)
        [self _dataSourceWarningForMethod:_cmd condition:NO];
@@ -850,7 +854,7 @@ var CPComboBoxTextSubview = @"text",
 {
    if (aName === "popup-button-view")
    {
-        var view = [[_CPComboBoxPopUpButton alloc] initWithFrame:_CGRectMakeZero() comboBox:self];
+        var view = [[_CPComboBoxPopUpButton alloc] initWithFrame:CGRectMakeZero() comboBox:self];

        return view;
    }
@@ -1110,7 +1114,7 @@ var CPComboBoxCompletionTest = function(object, index, context)
 */
@implementation _CPComboBoxContentBinder : CPBinder

- (void)setValueFor:(CPString)theBinding
+- (void)setValueFor:(CPString)aBinding
 {
    var destination = [_info objectForKey:CPObservedObjectKey],
        keyPath = [_info objectForKey:CPObservedKeyPathKey],
@@ -1152,13 +1156,15 @@ var CPComboBoxCompletionTest = function(object, index, context)
    else
        newValue = [self transformValue:newValue withOptions:options];

-    switch (theBinding)
+    switch (aBinding)
    {
-        case CPContentBinding:          [_source setContent:newValue];
-                                        break;
+        case CPContentBinding:
+            [_source setContent:newValue];
+            break;

-        case CPContentValuesBinding:    [_source setContentValues:newValue];
-                                        break;
+        case CPContentValuesBinding:
+            [_source setContentValues:newValue];
+            break;
    }
 }

@@ -20,7 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPEvent.j"
+@import "CPEvent_Constants.j"
@import "CPPlatform.j"


@@ -38,50 +38,68 @@ CPWindowsOperatingSystem                = 1;
 CPOtherOperatingSystem                  = 2;

 // Features
-CPCSSRGBAFeature                        = 1 << 5;
+CPCSSRGBAFeature                        = 5;

-CPHTMLCanvasFeature                     = 1 << 6;
-CPHTMLContentEditableFeature            = 1 << 7;
-CPHTMLDragAndDropFeature                = 1 << 8;
+CPHTMLCanvasFeature                     = 6;
+CPHTMLContentEditableFeature            = 7;
+CPHTMLDragAndDropFeature                = 8;

-CPJavaScriptInnerTextFeature            = 1 << 9;
-CPJavaScriptTextContentFeature          = 1 << 10;
-CPJavaScriptClipboardEventsFeature      = 1 << 11;
-CPJavaScriptClipboardAccessFeature      = 1 << 12;
-CPJavaScriptCanvasDrawFeature           = 1 << 13;
-CPJavaScriptCanvasTransformFeature      = 1 << 14;
+CPJavaScriptInnerTextFeature            = 9;
+CPJavaScriptTextContentFeature          = 10;
+// In onpaste, oncopy and oncut events, the event has an event.clipboardData from which the current pasteboard contents can be read with event.clipboardData.getData.
+CPJavaScriptClipboardEventsFeature      = 11;
+// window.clipboardData exists and can be read and written to at any time using window.clipboardData.getData/setData.
+CPJavaScriptClipboardAccessFeature      = 12;
+CPJavaScriptCanvasDrawFeature           = 13;
+CPJavaScriptCanvasTransformFeature      = 14;

-CPVMLFeature                            = 1 << 15;
+CPVMLFeature                            = 15;

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

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

-CPOpacityRequiresFilterFeature          = 1 << 24;
+CPOpacityRequiresFilterFeature          = 24;

-//Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 1 << 25;
-CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
+// Internet explorer does not allow dynamically changing the type of an input element
+CPInputTypeCanBeChangedFeature          = 25;
+CPHTML5DragAndDropSourceYOffBy1         = 26;

-CPSOPDisabledFromFileURLs               = 1 << 27;
+CPSOPDisabledFromFileURLs               = 27;

 // element.style.font can be set for an element not in the DOM.
-CPInputSetFontOutsideOfDOM              = 1 << 28;
+CPInputSetFontOutsideOfDOM              = 28;

 // Input elements have 1 px of extra padding on the left regardless of padding setting.
-CPInput1PxLeftPadding                   = 1 << 29;
-CPInputOnInputEventFeature              = 1 << 30;
+CPInput1PxLeftPadding                   = 29;
+CPInputOnInputEventFeature              = 30;
+
+CPFileAPIFeature                        = 31;
+
+
+
+/*
+    When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
+*/
+CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
+
+// The paste event is only sent if an input or textarea has focus.
+CPJavaScriptPasteRequiresEditableTarget   = 1 << 1;
+// Redirecting the focus of the browser on keydown to an input for Cmd-V or Ctrl-V makes the paste fail.
+CPJavaScriptPasteCantRefocus            = 1 << 2;
+

 var USER_AGENT                          = "",
    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = 0;
+    PLATFORM_FEATURES                   = [],
+    PLATFORM_BUGS                       = 0,
+    PLATFORM_STYLE_JS_PROPERTIES        = {};

 // default these features to true
-
-PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
-PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;
+PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
+PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;

 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
    USER_AGENT = window.navigator.userAgent;
@@ -91,7 +109,7 @@ if (typeof window !== "undefined" && window.opera)
 {
    PLATFORM_ENGINE = CPOperaBrowserEngine;

-    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
+    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
 }

 // Internet Explorer
@@ -100,16 +118,19 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
    PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;

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

-    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
+    PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = YES;

-    PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
+    PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = NO;

    // Tested in Internet Explore 8 and 9.
-    PLATFORM_FEATURES &= ~CPInputSetFontOutsideOfDOM;
+    PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = NO;
+
+    // IE allows free clipboard access.
+    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
 }

 // WebKit
@@ -118,15 +139,12 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
    PLATFORM_ENGINE = CPWebKitBrowserEngine;

    // Features we can only be sure of with WebKit (no known independent tests)
-    PLATFORM_FEATURES |= CPCSSRGBAFeature;
-    PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
+    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
+    PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;

-    if (USER_AGENT.indexOf("Chrome") === -1)
-        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
-
-    PLATFORM_FEATURES |= CPJavaScriptClipboardEventsFeature;
-    PLATFORM_FEATURES |= CPJavaScriptClipboardAccessFeature;
-    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
+    PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
+    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = NO;
+    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;

    var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
        versionEnd = USER_AGENT.indexOf(" ", versionStart),
@@ -136,22 +154,33 @@ 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] = YES;

    // 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] = YES;

    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
+        PLATFORM_FEATURES[CPHTML5DragAndDropSourceYOffBy1] = YES;

    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
    if (majorVersion < 537)
-        PLATFORM_FEATURES |= CPInput1PxLeftPadding;
+        PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;

    if (USER_AGENT.indexOf("Chrome") === CPNotFound)
-        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
+    {
+        PLATFORM_FEATURES[CPSOPDisabledFromFileURLs] = YES;
+        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
+        // https://bugs.webkit.org/show_bug.cgi?id=75891
+        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
+        // https://bugs.webkit.org/show_bug.cgi?id=39689
+        PLATFORM_BUGS |= CPJavaScriptPasteCantRefocus;
+    }
+
+    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
+    if (majorVersion > 533)
+        PLATFORM_BUGS |= CPCanvasParentDrawErrorsOnMovementBug;
 }

 // KHTML
@@ -165,59 +194,90 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
    PLATFORM_ENGINE = CPGeckoBrowserEngine;

-    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
+    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;

    var index = USER_AGENT.indexOf("Firefox"),
        version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));

    if (version >= 3.0)
-        PLATFORM_FEATURES |= CPCSSRGBAFeature;
+        PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;

    if (version < 3.0)
-        PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
+        PLATFORM_FEATURES[CPJavaScriptMouseWheelValues_8_15] = YES;

    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
-    PLATFORM_FEATURES |= CPInput1PxLeftPadding;
+    PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+
+    // This was supposed to be added in Firefox 22, but when testing with the latest beta as of 2013-06-14
+    // it does not seem to work. It seems to exhibit the CPJavaScriptPasteRequiresEditableTarget problem,
+    // and in addition doesn't seem to work with our native copy code either.
+    /*if (version >= 22.0)
+    {
+        PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
+        // TODO File a bug at https://bugzilla.mozilla.org/. In other browsers, one can return "false" from the
+        // beforepaste event to indicate a paste should be enabled even that the DOMEvent.target is not editable.
+        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
+    }*/
 }

-// Feature Specific Checks
+// Feature-specific checks
 if (typeof document != "undefined")
 {
    var canvasElement = document.createElement("canvas");
-    // Detect Canvas Support
+
+    // Detect canvas support
    if (canvasElement && canvasElement.getContext)
    {
-        PLATFORM_FEATURES |= CPHTMLCanvasFeature;
+        PLATFORM_FEATURES[CPHTMLCanvasFeature] = YES;

-        // Detect Canvas setTransform/transform support
+        // Any browser that supports canvas supports CSS opacity
+        PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = NO;
+
+        // Detect canvas setTransform/transform support
        var context = document.createElement("canvas").getContext("2d");

        if (context && context.setTransform && context.transform)
-            PLATFORM_FEATURES |= CPJavaScriptCanvasTransformFeature;
+            PLATFORM_FEATURES[CPJavaScriptCanvasTransformFeature] = YES;
    }

    var DOMElement = document.createElement("div");

    // Detect whether we have innerText or textContent (or neither)
    if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
+        PLATFORM_FEATURES[CPJavaScriptInnerTextFeature] = YES;
    else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
+        PLATFORM_FEATURES[CPJavaScriptTextContentFeature] = YES;

    var DOMInputElement = document.createElement("input");
+
    if ("oninput" in DOMInputElement)
-        PLATFORM_FEATURES |= CPInputOnInputEventFeature;
+        PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
    else if (typeof DOMInputElement.setAttribute === "function")
    {
        DOMInputElement.setAttribute("oninput", "return;");
+
        if (typeof DOMInputElement.oninput === "function")
-            PLATFORM_FEATURES |= CPInputOnInputEventFeature;
+            PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
    }
+
+    // Detect FileAPI support
+    if (typeof DOMInputElement.setAttribute === "function")
+    {
+        DOMInputElement.setAttribute("type", "file");
+        PLATFORM_FEATURES[CPFileAPIFeature] = !!DOMInputElement["files"];
+    }
+    else
+        PLATFORM_FEATURES[CPFileAPIFeature] = NO;
 }

 function CPFeatureIsCompatible(aFeature)
 {
-    return PLATFORM_FEATURES & aFeature;
+    return !!PLATFORM_FEATURES[aFeature];
+}
+
+function CPPlatformHasBug(aBug)
+{
+    return PLATFORM_BUGS & aBug;
 }

 function CPBrowserIsEngine(anEngine)
@@ -257,3 +317,120 @@ else
    CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
    CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
+
+/*!
+    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
+    CPBrowserStyleProperty('transition') -> WebkitTransition
+
+    While technically not a style property, style related event handler names are also supported.
+    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
+
+    CSS is only available in platform(dom), so don't rely too heavily on it.
+*/
+function CPBrowserStyleProperty(aProperty)
+{
+    var lowerProperty = aProperty.toLowerCase();
+
+    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
+    {
+        var r = nil;
+
+#if PLATFORM(DOM)
+        var testElement = document.createElement('div');
+
+        switch (lowerProperty)
+        {
+            case 'transitionend':
+                var candidates = {
+                        'WebkitTransition' : 'webkitTransitionEnd',
+                        'MozTransition'    : 'transitionend',
+                        'OTransition'      : 'oTransitionEnd',
+                        'msTransition'     : 'MSTransitionEnd',
+                        'transition'       : 'transitionend'
+                    };
+
+                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
+                break;
+
+            case 'transformorigin':
+
+                var candidates = {
+                        'WebkitTransform' : 'WebkitTransformOrigin',
+                        'MozTransform'    : 'MozTransformOrigin',
+                        'OTransform'      : 'OTransformOrigin',
+                        'msTransform'     : 'MSTransformOrigin',
+                        'transform'       : 'transformOrigin'
+                    };
+
+                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transform']] || nil;
+                break;
+
+            default:
+                var prefixes = ["Webkit", "Moz", "O", "ms"],
+                    strippedProperty = aProperty.split('-').join(' '),
+                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
+
+                for (var i = 0; i < prefixes.length; i++)
+                {
+                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
+                    if (prefixes[i] + aProperty in testElement.style)
+                    {
+                        r = prefixes[i] + aProperty;
+                        break;
+                    }
+                    else if (prefixes[i] + capProperty in testElement.style)
+                    {
+                        r = prefixes[i] + capProperty;
+                        break;
+                    }
+                }
+
+                if (!r && lowerProperty in testElement.style)
+                    r = lowerProperty;
+
+                break;
+        }
+#endif
+
+        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
+    }
+
+    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
+}
+
+function CPBrowserCSSProperty(aProperty)
+{
+    var browserProperty = CPBrowserStyleProperty(aProperty);
+
+    if (!browserProperty)
+        return nil;
+
+    var prefixes = {
+            'Webkit': '-webkit-',
+            'Moz': '-moz-',
+            'O': '-o-',
+            'ms': '-ms-'
+        };
+
+    for (var prefix in prefixes)
+    {
+        if (browserProperty.substring(0, prefix.length) == prefix)
+        {
+            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
+                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
+
+            // If there were any capitalized words in the browserProperty, insert a "-" between each one
+            if (parts && parts.length > 0)
+                browserPropertyWithoutPrefix = parts.join("-");
+
+            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
+        }
+    }
+
+    var parts = browserProperty.match(/[A-Z][a-z]+/g);
+
+    if (parts && parts.length > 0)
+        browserProperty = parts.join("-");
+
+    return browserProperty.toLowerCase();
+}
@@ -20,14 +20,16 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#import "../Foundation/Ref.h"
+@import <Foundation/CPFormatter.j>
+@import <Foundation/CPTimer.j>

-@import "../Foundation/CPFormatter.j"
@import "CPFont.j"
@import "CPShadow.j"
@import "CPView.j"
@import "CPKeyValueBinding.j"

+@global CPApp
+
 CPLeftTextAlignment      = 0;
 CPRightTextAlignment     = 1;
 CPCenterTextAlignment    = 2;
@@ -108,28 +110,19 @@ var CPControlBlackColor = [CPColor blackColor];

 + (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPLeftTextAlignment,
-                                                CPTopVerticalTextAlignment,
-                                                CPLineBreakByClipping,
-                                                [CPColor blackColor],
-                                                [CPFont systemFontOfSize:CPFontCurrentSystemSize],
-                                                [CPNull null],
-                                                _CGSizeMakeZero(),
-                                                CPImageLeft,
-                                                CPScaleToFit,
-                                                _CGSizeMakeZero(),
-                                                _CGSizeMake(-1.0, -1.0)]
-                                       forKeys:[@"alignment",
-                                                @"vertical-alignment",
-                                                @"line-break-mode",
-                                                @"text-color",
-                                                @"font",
-                                                @"text-shadow-color",
-                                                @"text-shadow-offset",
-                                                @"image-position",
-                                                @"image-scaling",
-                                                @"min-size",
-                                                @"max-size"]];
+    return @{
+            @"alignment": CPLeftTextAlignment,
+            @"vertical-alignment": CPTopVerticalTextAlignment,
+            @"line-break-mode": CPLineBreakByClipping,
+            @"text-color": [CPColor blackColor],
+            @"font": [CPFont systemFontOfSize:CPFontCurrentSystemSize],
+            @"text-shadow-color": [CPNull null],
+            @"text-shadow-offset": CGSizeMakeZero(),
+            @"image-position": CPImageLeft,
+            @"image-scaling": CPScaleToFit,
+            @"min-size": CGSizeMakeZero(),
+            @"max-size": CGSizeMake(-1.0, -1.0),
+        };
 }

 + (void)initialize
@@ -148,12 +141,14 @@ var CPControlBlackColor = [CPColor blackColor];
    [self exposeBinding:@"enabled"];
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding === CPValueBinding)
+    if (aBinding === CPValueBinding)
        return [_CPValueBinder class];
+    else if ([aBinding hasPrefix:CPEnabledBinding])
+        return [CPMultipleValueAndBinding class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

 /*!
@@ -235,6 +230,9 @@ var CPControlBlackColor = [CPColor blackColor];
 {
    [self _reverseSetBinding];

+    var binding = [CPBinder getBinding:CPTargetBinding forObject:self];
+    [binding invokeAction];
+
    return [CPApp sendAction:anAction to:anObject from:self];
 }

@@ -324,11 +322,11 @@ var CPControlBlackColor = [CPColor blackColor];
    _previousTrackingLocation = currentLocation;
 }

- (void)setState:(int)state
+- (void)setState:(CPInteger)state
 {
 }

- (int)nextState
+- (CPInteger)nextState
 {
    return 0;
 }
@@ -397,6 +395,14 @@ var CPControlBlackColor = [CPColor blackColor];
        [self highlight:YES];
 }

+/*!
+    Enabled controls accept first mouse by default.
+*/
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return [self isEnabled];
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
    if (![self isEnabled])
@@ -524,7 +530,7 @@ var CPControlBlackColor = [CPColor blackColor];
            return formattedValue;
    }

-    return (_value === undefined || _value === nil) ? "" : String(_value);
+    return (_value === undefined || _value === nil) ? @"" : String(_value);
 }

 /*!
@@ -545,10 +551,10 @@ var CPControlBlackColor = [CPColor blackColor];
    {
        value = nil;

-        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
+        if ([_formatter getObjectValue:@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)
+            if (!aString || [_formatter getObjectValue:@ref(value) forString:@"" errorDescription:nil] === NO)
                value = undefined;  // Means the value is invalid
        }
    }
@@ -601,7 +607,7 @@ var CPControlBlackColor = [CPColor blackColor];
    if ([note object] != self)
        return;

-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:@{"CPFieldEditor": [note object]}];
 }

 - (void)textDidChange:(CPNotification)note
@@ -610,7 +616,7 @@ var CPControlBlackColor = [CPColor blackColor];
    if ([note object] != self)
        return;

-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:@{"CPFieldEditor": [note object]}];
 }

 - (void)textDidEndEditing:(CPNotification)note
@@ -621,7 +627,49 @@ var CPControlBlackColor = [CPColor blackColor];

    [self _reverseSetBinding];

-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[note userInfo]];
+}
+
+/*!
+    @ignore
+    Return the currentTextMovement needed by the delegate textDidEndEditing
+    This is going to check the currentEvent of the CPApp
+*/
+- (unsigned)_currentTextMovement
+{
+    var currentEvent = [CPApp currentEvent],
+        keyCode = [currentEvent keyCode],
+        modifierFlags = [currentEvent modifierFlags];
+
+    switch (keyCode)
+    {
+        case CPEscapeKeyCode:
+            return CPCancelTextMovement;
+
+        case CPLeftArrowKeyCode:
+            return CPLeftTextMovement;
+
+        case CPRightArrowKeyCode:
+            return CPRightTextMovement;
+
+        case CPUpArrowKeyCode:
+            return CPUpTextMovement;
+
+        case CPDownArrowKeyCode:
+            return CPDownTextMovement;
+
+        case CPReturnKeyCode:
+            return CPReturnTextMovement;
+
+        case CPTabKeyCode:
+            if (modifierFlags & CPShiftKeyMask)
+                return CPBacktabTextMovement;
+
+            return CPTabTextMovement;
+
+        default:
+            return CPOtherTextMovement;
+    }
 }

 /*!
@@ -807,7 +855,7 @@ var CPControlBlackColor = [CPColor blackColor];
 /*!
    Returns the image scaling of the control.
 */
- (CPImageScaling)imageScaling
+- (CPUInteger)imageScaling
 {
    return [self valueForThemeAttribute:@"image-scaling"];
 }
@@ -64,7 +64,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
        count = _editors.length;

    for (; index < count; ++index)
-        if (![[_editors objectAtIndex:i] commitEditing])
+        if (![[_editors objectAtIndex:index] commitEditing])
            return NO;

    return YES;
@@ -94,7 +94,7 @@
        domain = "";

 #if PLATFORM(DOM)
-    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
+    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
 #else
    _cookieValue = value;
    _expires = expires;
@@ -23,9 +23,12 @@ Cursor support by browser:

@import <Foundation/CPObject.j>

+@global CPApp
+
 var currentCursor = nil,
    cursorStack = [],
-    cursors = {};
+    cursors = {},
+    ieCursorMap = {};

@implementation CPCursor : CPObject
 {
@@ -36,6 +39,20 @@ var currentCursor = nil,
    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }

+ (void)initialize
+{
+    if (self !== CPCursor)
+        return;
+
+    // IE < 9 does not support some CSS cursors, we map them to supported ones
+    ieCursorMap = {
+        "ew-resize":   "e-resize",
+        "ns-resize":   "n-resize",
+        "nesw-resize": "ne-resize",
+        "nwse-resize": "nw-resize"
+    };
+}
+
 - (id)initWithCSSString:(CPString)aString
 {
    if (self = [super init])
@@ -44,23 +61,30 @@ var currentCursor = nil,
    return self;
 }

-// hotspot is supported in CSS3 (but not IE).
- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
+/*!
+    Init a cursor with the given image and hotspot.
+    hotspot is supported in CSS3 (but not IE).
+*/
+- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
 {
    _hotSpot = hotSpot;
    _image = image;
    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }

-// 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
+/*!
+    Init a cursor with the given image and hotspot. This is provided
+    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
+    (as they are in Cocoa). 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:(CGPoint)aHotSpot
 {
-    return [self initWithImage:image hotSpot:hotSpot];
+    return [self initWithImage:image hotSpot:aHotSpot];
 }

 + (void)hide
 {
-    [self _setCursorCSS:"none"]; // Not supported in IE
+    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
 }

 + (void)unhide
@@ -92,7 +116,8 @@ var currentCursor = nil,

 - (void)push
 {
-    currentCursor = cursorStack.push(self);
+    cursorStack.push(self);
+    currentCursor = self;
 }

 - (void)set
@@ -121,6 +146,7 @@ var currentCursor = nil,
 {
 #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
@@ -130,22 +156,40 @@ var currentCursor = nil,
 + (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
 {
    var cursor = cursors[cursorName];
-    if (typeof cursor === 'undefined')
+
+    if (typeof cursor === "undefined")
    {
        var cssString;
+
        if (doesHaveImage)
-            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
+        {
+            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath],
+                extension = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) ? @"cur" : @"png";
+
+            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.%@), %@", themeResourcePath, cursorName, extension, aString];
+        }
+
        else
-            cssString = aString
+        {
+            // IE <= 8 does not support some cursors, map them to supported cursors
+            var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
+
+            if (ieLessThan9)
+                cssString = ieCursorMap[aString] || 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];
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
 }

 + (CPCursor)crosshairCursor
@@ -163,6 +207,36 @@ var currentCursor = nil,
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
 }

+ (CPCursor)resizeNorthwestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeNorthwestSoutheastCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeNortheastCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeNortheastSouthwestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeSouthwestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize" hasImage:NO];
+}
+
+ (CPCursor)resizeSoutheastCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize" hasImage:NO];
+}
+
 + (CPCursor)resizeDownCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
@@ -188,11 +262,21 @@ var currentCursor = nil,
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
 }

+ (CPCursor)resizeEastWestCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize" hasImage:NO];
+}
+
 + (CPCursor)resizeUpDownCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
 }

+ (CPCursor)resizeNorthSouthCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize" hasImage:NO];
+}
+
 + (CPCursor)operationNotAllowedCursor
 {
    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];
@@ -0,0 +1,691 @@
+/* CPDatePicker.j
+* AppKit
+*
+* Created by Alexandre Wilhelm
+* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
+*
+* 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"
+@import "CPFont.j"
+@import "CPTextField.j"
+@import "_CPDatePickerTextField.j"
+@import "_CPDatePickerCalendar.j"
+
+@import <Foundation/CPArray.j>
+@import <Foundation/CPObject.j>
+@import <Foundation/CPDate.j>
+@import <Foundation/CPDateFormatter.j>
+@import <Foundation/CPLocale.j>
+@import <Foundation/CPTimeZone.j>
+
+@class CPStepper
+@class CPApp
+
+@global CPLocaleLanguageCode
+@global CPDateFormatterShortStyle
+
+var CPDatePicker_validateProposedDateValue_timeInterval = 1 << 1;
+
+CPSingleDateMode = 0;
+CPRangeDateMode = 1;
+
+CPTextFieldAndStepperDatePickerStyle    = 0;
+CPClockAndCalendarDatePickerStyle       = 1;
+CPTextFieldDatePickerStyle              = 2;
+
+CPHourMinuteDatePickerElementFlag       = 0x000c;
+CPHourMinuteSecondDatePickerElementFlag = 0x000e;
+CPTimeZoneDatePickerElementFlag         = 0x0010;
+CPYearMonthDatePickerElementFlag        = 0x00c0;
+CPYearMonthDayDatePickerElementFlag     = 0x00e0;
+CPEraDatePickerElementFlag              = 0x0100;
+
+/*!
+    @ingroup appkit
+    This control displays a datepicker in a Cappuccino application
+*/
+@implementation CPDatePicker : CPControl
+{
+    BOOL            _isBordered         @accessors(getter=isBordered, setter=setBordered:);
+    BOOL            _isBezeled          @accessors(getter=isBezeled, setter=setBezeled:);
+    BOOL            _drawsBackground    @accessors(property=drawsBackground);
+    CPDate          _dateValue          @accessors(property=dateValue);
+    CPDate          _minDate            @accessors(property=minDate);
+    CPDate          _maxDate            @accessors(property=maxDate);
+    CPFont          _textFont           @accessors(property=textFont);
+    CPLocale        _locale             @accessors(property=locale);
+    //CPCalendar  _calendar           @accessors(property=calendar);
+    CPTimeZone      _timeZone           @accessors(property=timeZone);
+    id              _delegate           @accessors(property=delegate);
+    CPInteger       _datePickerElements @accessors(property=datePickerElements);
+    CPInteger       _datePickerMode     @accessors(property=datePickerMode);
+    CPInteger       _datePickerStyle    @accessors(property=datePickerStyle);
+    CPInteger       _timeInterval       @accessors(property=timeInterval);
+
+    _CPDatePickerTextField  _datePickerTextfield;
+    _CPDatePickerCalendar   _datePickerCalendar;
+    unsigned                _implementedCDatePickerDelegateMethods;
+}
+
+
+#pragma mark -
+#pragma mark Theme methods
+
+ (CPString)defaultThemeClass
+{
+    return @"datePicker";
+}
+
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"bezel-color": [CPColor clearColor],
+            @"border-width" : 1.0,
+            @"border-color": [CPColor clearColor],
+            @"content-inset": CGInsetMakeZero(),
+            @"bezel-inset": CGInsetMakeZero(),
+            @"datepicker-textfield-bezel-color": [CPColor clearColor],
+            @"min-size-datepicker-textfield": CGSizeMakeZero(),
+            @"content-inset-datepicker-textfield": CGInsetMakeZero(),
+            @"content-inset-datepicker-textfield-separator": CGInsetMakeZero(),
+            @"separator-content-inset": CGInsetMakeZero(),
+            @"date-hour-margin": 5.0,
+            @"stepper-margin": 5.0,
+            @"bezel-color-calendar": [CPColor clearColor],
+            @"title-text-color": [CPColor blackColor],
+            @"title-text-shadow-color": [CPColor clearColor],
+            @"title-text-shadow-offset": CGSizeMakeZero(),
+            @"title-font": [CPNull null],
+            @"weekday-text-color": [CPColor blackColor],
+            @"weekday-text-shadow-color": [CPColor clearColor],
+            @"weekday-text-shadow-offset": CGSizeMakeZero(),
+            @"weekday-font": [CPNull null],
+            @"arrow-image-left": [CPNull null],
+            @"arrow-image-right": [CPNull null],
+            @"arrow-image-left-highlighted": [CPNull null],
+            @"arrow-image-right-highlighted": [CPNull null],
+            @"arrow-inset": CGInsetMakeZero(),
+            @"circle-image": [CPNull null],
+            @"circle-image-highlighted": [CPNull null],
+            @"tile-text-color": [CPColor blackColor],
+            @"tile-text-shadow-color": [CPColor clearColor],
+            @"tile-text-shadow-offset": CGSizeMakeZero(),
+            @"tile-font": [CPNull null],
+            @"size-tile": CGSizeMakeZero(),
+            @"size-calendar": CGSizeMakeZero(),
+            @"size-header": CGSizeMakeZero(),
+            @"min-size-calendar": CGSizeMakeZero(),
+            @"max-size-calendar": CGSizeMakeZero(),
+            @"bezel-color-clock": [CPColor clearColor],
+            @"clock-text-color": [CPColor blackColor],
+            @"clock-text-shadow-color": [CPColor clearColor],
+            @"clock-text-shadow-offset": CGSizeMakeZero(),
+            @"clock-font": [CPNull null],
+            @"second-hand-image": [CPNull null],
+            @"hour-hand-image": [CPNull null],
+            @"middle-hand-image": [CPNull null],
+            @"minute-hand-image": [CPNull null],
+            @"size-clock": CGSizeMakeZero(),
+            @"second-hand-size": CGSizeMakeZero(),
+            @"hour-hand-size": CGSizeMakeZero(),
+            @"middle-hand-size": CGSizeMakeZero(),
+            @"minute-hand-size": CGSizeMakeZero(),
+    };
+}
+
+
+#pragma mark -
+#pragma mark Binding methods
+
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
+        return [_CPDatePickerValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
+- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return @"dateValue";
+
+    if (aBinding == CPMinValueBinding)
+        return @"minDate";
+
+    if (aBinding == CPMaxValueBinding)
+        return @"maxDate";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _drawsBackground = YES;
+        _datePickerStyle = CPTextFieldAndStepperDatePickerStyle;
+        _datePickerMode = CPSingleDateMode;
+        _datePickerElements = CPYearMonthDayDatePickerElementFlag | CPHourMinuteSecondDatePickerElementFlag;
+        _timeInterval = 0;
+        _implementedCDatePickerDelegateMethods = 0;
+
+        [self setObjectValue:[CPDate date]];
+        _minDate = [CPDate distantPast];
+        _maxDate = [CPDate distantFuture];
+
+        [self setBezeled:YES];
+        [self setBordered:YES];
+
+        [self _init];
+    }
+
+    return self
+}
+
+- (void)_init
+{
+    if (!_locale)
+        _locale = [CPLocale currentLocale];
+
+    if (!_timeZone)
+        _timeZone = [CPTimeZone systemTimeZone];
+
+    _datePickerTextfield = [[_CPDatePickerTextField alloc] initWithFrame:[self bounds] withDatePicker:self];
+
+    [_datePickerTextfield setDateValue:_dateValue];
+    [self addSubview:_datePickerTextfield];
+
+    _datePickerCalendar = [[_CPDatePickerCalendar alloc] initWithFrame:[self bounds] withDatePicker:self];
+    [_datePickerCalendar setDateValue:_dateValue];
+    [_datePickerCalendar setHidden:YES];
+    [self addSubview:_datePickerCalendar];
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+
+#pragma mark -
+#pragma mark Delegate methods
+
+/*! Set the delegate of the datePicker
+    @param aDelegate delegate of the datePicker
+*/
+- (void)setDelegate:(id)aDelegate
+{
+    _delegate = aDelegate;
+    _implementedCDatePickerDelegateMethods = 0;
+
+    // Look if the delegate implements or not the delegate methods
+    if ([_delegate respondsToSelector:@selector(datePicker:validateProposedDateValue:timeInterval:)])
+        _implementedCDatePickerDelegateMethods |= CPDatePicker_validateProposedDateValue_timeInterval;
+}
+
+
+#pragma mark -
+#pragma mark Layout method
+
+/*! Layout the subviews
+*/
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+    {
+        [_datePickerTextfield setHidden:NO];
+        [_datePickerCalendar setHidden:YES];
+        [_datePickerTextfield setNeedsLayout];
+    }
+    else
+    {
+        [_datePickerCalendar setHidden:NO];
+        [_datePickerTextfield setHidden:YES];
+        [_datePickerCalendar setNeedsLayout];
+    }
+}
+
+#pragma mark -
+#pragma mark Setter
+
+/*! Return the objectValue of the datePicker. The objectValue should take the timeZoneEffect
+*/
+- (id)objectValue
+{
+    // TODO : add timeZone effect. How to do it because js ???
+    return _dateValue
+}
+
+/*! Set the objectValue ofhe datePier. It has to be a CPDate
+    @param aDateValue the dateValue
+*/
+- (void)setObjectValue:(CPDate)aValue
+{
+    [self setDateValue:aValue];
+}
+
+/* Set the dateValue of the datePicker
+    @param aDateValue the dateValue
+*/
+- (void)setDateValue:(CPDate)aDateValue
+{
+    if (aDateValue == nil)
+        return;
+
+    [self _setDateValue:aDateValue timeInterval:_timeInterval];
+}
+
+/*! Set the dateValue and the timeInterval. This method checks the min and max date of the datePicker also. It will call the delegate if possible.
+    @param aDateValue the dateValue
+    @param aTimeInterval the timeInterval
+*/
+- (void)_setDateValue:(CPDate)aDateValue timeInterval:(CPTimeInterval)aTimeInterval
+{
+    if (_minDate)
+        aDateValue = new Date (MAX(aDateValue, _minDate));
+
+    if (_maxDate)
+        aDateValue = new Date (MIN(aDateValue, _maxDate));
+
+    aTimeInterval = MAX(MIN(aTimeInterval, [_maxDate timeIntervalSinceDate:aDateValue]), [_minDate timeIntervalSinceDate:aDateValue]);
+
+    if ([aDateValue isEqualToDate:_dateValue] && aTimeInterval == _timeInterval)
+        return;
+
+    if (_implementedCDatePickerDelegateMethods & CPDatePicker_validateProposedDateValue_timeInterval)
+    {
+        // constrain timeInterval also
+        var aStartDateRef = function(x){if (typeof x == 'undefined') return aDateValue; aDateValue = x;}
+        var aTimeIntervalRef = function(x){if (typeof x == 'undefined') return aTimeInterval; aTimeInterval = x;}
+
+        [_delegate datePicker:self validateProposedDateValue:aStartDateRef timeInterval:aTimeIntervalRef];
+    }
+
+    [self willChangeValueForKey:@"objectValue"];
+    [self willChangeValueForKey:@"dateValue"];
+    _dateValue = aDateValue;
+    [super setObjectValue:_dateValue];
+    [self didChangeValueForKey:@"objectValue"];
+    [self didChangeValueForKey:@"dateValue"];
+
+    [self willChangeValueForKey:@"timeInterval"];
+    _timeInterval = (_datePickerMode == CPSingleDateMode)? 0 : aTimeInterval;
+    [self didChangeValueForKey:@"timeInterval"];
+
+    [self sendAction:[self action] to:[self target]];
+
+    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+        [_datePickerTextfield setDateValue:_dateValue];
+    else
+        [_datePickerCalendar setDateValue:_dateValue];
+}
+
+/*! Set the minDate of the datePicker
+    @param aMinDate the minDate
+*/
+- (void)setMinDate:(CPDate)aMinDate
+{
+    [self willChangeValueForKey:@"minDate"];
+    _minDate = aMinDate;
+    [self didChangeValueForKey:@"minDate"];
+
+    [self _setDateValue:_dateValue timeInterval:_timeInterval];
+}
+
+/*! Set the maxDate of the datePicker
+    @param aMaxDate the maxDate
+*/
+- (void)setMaxDate:(CPDate)aMaxDate
+{
+    [self willChangeValueForKey:@"maxDate"];
+    _maxDate = aMaxDate;
+    [self didChangeValueForKey:@"maxDate"];
+
+    [self _setDateValue:_dateValue timeInterval:_timeInterval];
+}
+
+/*! Set the syle of the datePicker
+    @param aDatePickerStyle the datePicker style
+*/
+- (void)setDatePickerStyle:(CPInteger)aDatePickerStyle
+{
+    _datePickerStyle = aDatePickerStyle;
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+/*! Set the elements of the datePicker
+    @param aDatePickerElements the datePicker elements
+*/
+- (void)setDatePickerElements:(CPInteger)aDatePickerElements
+{
+    _datePickerElements = aDatePickerElements;
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+/*! Set the mode of the datePicker
+    @param aDatePickerMode the datePicker mode
+*/
+- (void)setDatePickerMode:(CPInteger)aDatePickerMode
+{
+    _datePickerMode = aDatePickerMode;
+
+    if (_datePickerMode == CPSingleDateMode)
+        [self _setDateValue:[self dateValue] timeInterval:0];
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+/*! Set the timeInterval of the datePicker
+    @param aTimeInterval the timeInterval of the datePicker
+*/
+- (void)setTimeInterval:(CPInteger)aTimeInterval
+{
+    if (_datePickerMode == CPSingleDateMode)
+        return;
+
+    [self _setDateValue:[self dateValue] timeInterval:aTimeInterval];
+}
+
+/*! Set the locale of the datePicker. This update laso the locale of the formatter.
+    @param aLocale the locale
+*/
+- (void)setLocale:(CPLocale)aLocale
+{
+    _locale = aLocale;
+
+    if (_formatter)
+    {
+        [self willChangeValueForKey:@"locale"];
+        [_formatter setLocale:_locale];
+        [self didChangeValueForKey:@"locale"];
+    }
+
+    // This will update the textFields (usefull when changing with a date with pm and am)
+    [_datePickerTextfield setDateValue:_dateValue];
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
+/*!
+    Sets whether the datepicker will have a bezeled border.
+    @param shouldBeBezeled \c YES means the datepicker will draw a bezeled border
+*/
+- (void)setBezeled:(BOOL)shouldBeBezeled
+{
+    _isBezeled = shouldBeBezeled;
+
+    if (shouldBeBezeled)
+        [self setThemeState:CPThemeStateBezeled];
+    else
+        [self unsetThemeState:CPThemeStateBezeled];
+}
+
+/*!
+    Sets whether the datepicker will have a border drawn. (actually it does nothing)
+    @param shouldBeBordered \c YES makes the datepicker draw a border
+*/
+- (void)setBordered:(BOOL)shouldBeBordered
+{
+    _isBordered = shouldBeBordered;
+
+    if (shouldBeBordered)
+        [self setThemeState:CPThemeStateBordered];
+    else
+        [self unsetThemeState:CPThemeStateBordered];
+}
+
+/*!
+    Sets the font of the control.
+    @param aFont
+*/
+- (void)setTextFont:(CPFont)aFont
+{
+    [self setFont:aFont];
+}
+
+/*! 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 a boolean. YES if the control should be enabled, otherwise NO.
+*/
+- (void)setEnabled:(BOOL)aBoolean
+{
+    [super setEnabled:aBoolean];
+
+    [_datePickerTextfield setEnabled:aBoolean];
+    [_datePickerCalendar setEnabled:aBoolean];
+}
+
+/*! Set the background color of the datePicker
+    @param aColor
+*/
+- (void)setBackgroundColor:(CPColor)aColor
+{
+    _backgroundColor = aColor;
+    [self setNeedsLayout];
+}
+
+/*! Set the boolean drawsBackgroundColor
+    @param aBoolean
+*/
+- (void)setDrawsBackground:(BOOL)aBoolean
+{
+    [self willChangeValueForKey:@"drawsBackground"];
+    _drawsBackground = aBoolean;
+    [self didChangeValueForKey:@"drawsBackground"];
+
+    [self setNeedsLayout];
+}
+
+/*! Set the timeZone
+    @param aTimeZone
+*/
+- (void)setTimeZone:(CPTimeZone)aTimeZone
+{
+    [self willChangeValueForKey:@"timeZone"];
+    _timeZone = aTimeZone;
+    [self didChangeValueForKey:@"timeZone"];
+
+    [self setNeedsLayout];
+}
+
+
+#pragma mark -
+#pragma mark First responder methods
+
+/*! Return YES if style is set to CPTextFieldAndStepperDatePickerStyle or CPTextFieldDatePickerStyle
+*/
+- (BOOL)becomeFirstResponder
+{
+    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+        [_datePickerTextfield _selecteTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]];
+    else
+        return NO;
+
+    return YES;
+}
+
+/*! Return YES
+*/
+- (BOOL)acceptsFirstResponder
+{
+    return YES;
+}
+
+/*! Return YES
+*/
+- (BOOL)resignFirstResponder
+{
+    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+        [_datePickerTextfield resignFirstResponder];
+
+    return YES;
+}
+
+
+#pragma mark -
+#pragma mark getter
+
+/*!
+    Returns \c YES if the textfield is bezeled.
+*/
+- (BOOL)isBezeled
+{
+    return [self hasThemeState:CPThemeStateBezeled];
+}
+
+/*!
+    Returns \c YES if the textfield has a border.
+*/
+- (BOOL)isBordered
+{
+    return [self hasThemeState:CPThemeStateBordered];
+}
+
+/*!
+    Returns the font of the control.
+*/
+- (CPFont)textFont
+{
+    return [self font];
+}
+
+/*! Check if we are in the american format or not. Depending on the locale
+*/
+- (BOOL)_isAmericanFormat
+{
+    return [[_locale objectForKey:CPLocaleCountryCode] isEqualToString:@"US"];
+}
+
+/*! Check if we are in the english format or not. Depending on the locale
+*/
+- (BOOL)_isEnglishFormat
+{
+    return [[_locale objectForKey:CPLocaleLanguageCode] isEqualToString:@"en"];
+}
+
+
+#pragma mark -
+#pragma mark Key event
+
+/*! Key down event
+    @param anEvent
+*/
+- (void)keyDown:(CPEvent)anEvent
+{
+    if (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle || _datePickerStyle == CPTextFieldDatePickerStyle)
+        [_datePickerTextfield keyDown:anEvent];
+}
+
+@end
+
+var CPDatePickerModeKey         = @"CPDatePickerModeKey",
+    CPIntervalKey               = @"CPIntervalKey",
+    CPMinDateKey                = @"CPMinDateKey",
+    CPMaxDateKey                = @"CPMaxDateKey",
+    CPBackgroundColorKey        = @"CPBackgroundColorKey",
+    CPDrawsBackgroundKey        = @"CPDrawsBackgroundKey",
+    CPTextFontKey               = @"CPTextFontKey",
+    CPDatePickerElementsKey     = @"CPDatePickerElementsKey",
+    CPDatePickerStyleKey        = @"CPDatePickerStyleKey",
+    CPLocaleKey                 = @"CPLocaleKey",
+    CPBorderedKey               = @"CPBorderedKey",
+    CPDateValueKey              = @"CPDateValueKey";
+
+@implementation CPDatePicker (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _textFont = [aCoder decodeObjectForKey:CPTextFontKey];
+        _minDate = [aCoder decodeObjectForKey:CPMinDateKey] || [CPDate distantPast];
+        _maxDate = [aCoder decodeObjectForKey:CPMaxDateKey] || [CPDate distantFuture];
+        _timeInterval = [aCoder decodeDoubleForKey:CPIntervalKey];
+        _datePickerMode = [aCoder decodeIntForKey:CPDatePickerModeKey];
+        _datePickerElements = [aCoder decodeIntForKey:CPDatePickerElementsKey];
+        _datePickerStyle = [aCoder decodeIntForKey:CPDatePickerStyleKey];
+        _locale = [aCoder decodeObjectForKey:CPLocaleKey];
+        _dateValue = [aCoder decodeObjectForKey:CPDateValueKey];
+        _backgroundColor = [aCoder decodeObjectForKey:CPBackgroundColorKey];
+        _drawsBackground = [aCoder decodeBoolForKey:CPDrawsBackgroundKey];
+        _isBordered = [aCoder decodeBoolForKey:CPBorderedKey];
+        [self _init];
+    }
+
+    return self
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    [aCoder encodeDouble:_timeInterval forKey:CPIntervalKey];
+    [aCoder encodeInt:_datePickerMode forKey:CPDatePickerModeKey];
+    [aCoder encodeInt:_datePickerStyle forKey:CPDatePickerStyleKey];
+    [aCoder encodeInt:_datePickerElements forKey:CPDatePickerElementsKey];
+    [aCoder encodeObject:_minDate forKey:CPMinDateKey];
+    [aCoder encodeObject:_maxDate forKey:CPMaxDateKey]
+    [aCoder encodeObject:_dateValue forKey:CPDateValueKey];;
+    [aCoder encodeObject:_textFont forKey:CPTextFontKey];
+    [aCoder encodeObject:_locale forKey:CPLocaleKey];
+    [aCoder encodeObject:_backgroundColor forKey:CPBackgroundColorKey];
+    [aCoder encodeObject:_drawsBackground forKey:CPDrawsBackgroundKey];
+    [aCoder encodeObject:_isBordered forKey:CPBorderedKey];
+}
+
+@end
+
+@implementation _CPDatePickerValueBinder : CPBinder
+{
+}
+
+@end
+
+@implementation CPDate (CPDatePickerAdditions)
+
+- (int)_daysInMonth
+{
+    return 32 - new Date(self.getFullYear(), self.getMonth(), 32).getDate();
+}
+
+- (void)_resetToMidnight
+{
+    self.setHours(0);
+    self.setMinutes(0);
+    self.setSeconds(0);
+    self.setMilliseconds(0);
+}
+
+- (void)_resetToLastSeconds
+{
+    self.setHours(23);
+    self.setMinutes(59);
+    self.setSeconds(59);
+    self.setMilliseconds(99);
+}
+
+@end
@@ -0,0 +1,314 @@
+/*
+* _CPDatePickerClock.j
+* AppKit
+*
+* Created by Alexandre Wilhelm
+* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
+*
+* 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 "CPView.j"
+@import "CPTextField.j"
+@import "CPImageView.j"
+@import "CALayer.j"
+
+
+@class _CPCibCustomResource
+@class CPDatePicker
+
+@global CPHourMinuteSecondDatePickerElementFlag
+@global CPTextFieldAndStepperDatePickerStyle
+@global CPTextFieldDatePickerStyle
+
+var RADIANS = Math.PI / 180;
+
+
+@implementation _CPDatePickerClock : CPView
+{
+    BOOL            _isEnabled;
+    CALayer         _rootLayer;
+    CALayer         _hourHandLayer;
+    CALayer         _minuteHandLayer;
+    CALayer         _secondHandLayer;
+    CALayer         _middleHandLayer;
+    CPDatePicker    _datePicker;
+    CPTextField     _PMAMTextField;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+- (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _datePicker = aDatePicker;
+
+        _PMAMTextField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-font" inState:CPThemeStateNormal] forThemeAttribute:@"font" inState:CPThemeStateNormal];
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-color" inState:CPThemeStateNormal];
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateNormal];
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-offset" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateNormal];
+
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-font" inState:CPThemeStateDisabled] forThemeAttribute:@"font" inState:CPThemeStateDisabled];
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
+        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
+
+        [self addSubview:_PMAMTextField];
+
+        var middleHandSize = [_datePicker valueForThemeAttribute:@"middle-hand-size"],
+            minuteHandSize = [_datePicker valueForThemeAttribute:@"minute-hand-size"],
+            hourHandSize = [_datePicker valueForThemeAttribute:@"hour-hand-size"],
+            secondHandSize = [_datePicker valueForThemeAttribute:@"second-hand-size"];
+
+        // We use layer to make the rotation possible
+        _hourHandLayer = [[HandLayer alloc] initWithSize:hourHandSize];
+        [_hourHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
+        [_hourHandLayer setAnchorPoint:CGPointMakeZero()];
+        [_hourHandLayer setPosition:CGPointMake(0.0, 0.0)];
+
+        _minuteHandLayer = [[HandLayer alloc] initWithSize:minuteHandSize];
+        [_minuteHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
+        [_minuteHandLayer setAnchorPoint:CGPointMakeZero()];
+        [_minuteHandLayer setPosition:CGPointMake(0.0, 0.0)];
+
+        _secondHandLayer = [[HandLayer alloc] initWithSize:secondHandSize];
+        [_secondHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
+        [_secondHandLayer setAnchorPoint:CGPointMakeZero()];
+        [_secondHandLayer setPosition:CGPointMake(0.0, 0.0)];
+
+        _middleHandLayer = [[HandLayer alloc] initWithSize:middleHandSize];
+        [_middleHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
+        [_middleHandLayer setAnchorPoint:CGPointMakeZero()];
+        [_middleHandLayer setPosition:CGPointMake(0.0, 0.0)];
+
+        _rootLayer = [CALayer layer];
+        [self setWantsLayer:YES];
+        [self setLayer:_rootLayer];
+
+        [_hourHandLayer setNeedsDisplay];
+        [_middleHandLayer setNeedsDisplay];
+        [_secondHandLayer setNeedsDisplay];
+        [_minuteHandLayer setNeedsDisplay];
+
+        [_rootLayer addSublayer:_hourHandLayer];
+        [_rootLayer addSublayer:_minuteHandLayer];
+        [_rootLayer addSublayer:_secondHandLayer];
+        [_rootLayer addSublayer:_middleHandLayer];
+
+        [_rootLayer setNeedsDisplay];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Layout methods
+
+- (void)layoutSubviews
+{
+    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle || [_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
+        return;
+
+    [super layoutSubviews];
+
+    var bounds = [self bounds],
+        dateValue = [[_datePicker dateValue] copy];
+
+    [dateValue _dateWithTimeZone:[_datePicker timeZone]];
+
+    [self setBackgroundColor:[_datePicker currentValueForThemeAttribute:@"bezel-color-clock"]];
+    [_middleHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"middle-hand-image"]];
+    [_hourHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"hour-hand-image"]];
+    [_minuteHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"minute-hand-image"]];
+    [_secondHandLayer setImage:[_datePicker currentValueForThemeAttribute:@"second-hand-image"]];
+
+    if ([_datePicker _isEnglishFormat])
+    {
+        if (dateValue.getHours() > 11)
+            [_PMAMTextField setStringValue:@"PM"]
+        else
+            [_PMAMTextField setStringValue:@"AM"];
+
+        [_PMAMTextField sizeToFit];
+        [_PMAMTextField setFrameOrigin:CGPointMake(bounds.size.width / 2 - [_PMAMTextField frameSize].width / 2, bounds.size.height / 2 + 15)];
+        [_PMAMTextField setHidden:NO];
+    }
+    else
+    {
+        [_PMAMTextField setHidden:YES];
+    }
+
+    [_hourHandLayer setRotationRadians:[self _hourPositionRadianForDate:dateValue]];
+    [_minuteHandLayer setRotationRadians:[self _minutePositionRadianForDate:dateValue]];
+    [_secondHandLayer setRotationRadians:[self _secondPositionRadianForDate:dateValue]];
+
+    [_PMAMTextField setEnabled:_isEnabled];
+    [_hourHandLayer setEnabled:_isEnabled];
+    [_middleHandLayer setEnabled:_isEnabled];
+    [_secondHandLayer setEnabled:_isEnabled];
+    [_minuteHandLayer setEnabled:_isEnabled];
+
+    // Check if we have to display the hand second
+    if (([_datePicker datePickerElements] & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)
+        [_secondHandLayer setHidden:NO];
+    else
+        [_secondHandLayer setHidden:YES];
+
+    [_rootLayer setNeedsDisplay];
+}
+
+
+#pragma mark -
+#pragma mark Accessors
+
+- (float)_hourPositionRadianForDate:(CPDate)aDate
+{
+    var hours = aDate.getHours() + aDate.getMinutes() / 60;
+
+    return (360 * hours / 12) * RADIANS;
+}
+
+- (float)_secondPositionRadianForDate:(CPDate)aDate
+{
+    return (360 * aDate.getSeconds() / 60) * RADIANS;
+}
+
+- (float)_minutePositionRadianForDate:(CPDate)aDate
+{
+    var minutes = aDate.getMinutes() + aDate.getSeconds() / 60;
+
+    return (360 * minutes / 60) * RADIANS;
+}
+
+- (void)setEnabled:(BOOL)shouldEnable
+{
+    shouldEnable = !!shouldEnable;
+
+    if (shouldEnable === _isEnabled)
+        return;
+
+    _isEnabled = shouldEnable;
+    [self setNeedsLayout];
+
+    // FIXME: This is a workaround for an apparent bug in CALayer.
+    // Without pumping the event loop, the sublayers of _rootLayer
+    // (the hands) are not redrawn until an event occurs.
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
+@end
+
+
+@implementation HandLayer : CALayer
+{
+    BOOL    _isEnabled      @accessors(setter=setEnabled:, getter=isEnabled);
+
+    CPImage _image;
+    CALayer _imageLayer;
+    float   _rotationRadians;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+- (id)initWithSize:(CGSize)aSize
+{
+    if (self = [super init])
+    {
+        _isEnabled = YES;
+        _imageLayer = [CALayer layer];
+        _rotationRadians = 0;
+
+        [_imageLayer setDelegate:self];
+        [_imageLayer setBounds:CGRectMake(0.0, 0.0, aSize.width, aSize.height)];
+
+        [self addSublayer:_imageLayer];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Setter Getter methods
+
+/*!
+    Set the bounds of the layer. The imageLayer will be at the center of this bounds.
+*/
+- (void)setBounds:(CGRect)aRect
+{
+    [super setBounds:aRect];
+
+    [_imageLayer setPosition:CGPointMake(CGRectGetMidX(aRect), CGRectGetMidY(aRect))];
+}
+
+- (void)setImage:(CPImage)anImage
+{
+    if (_image === anImage)
+        return;
+
+    if ([anImage isKindOfClass:[_CPCibCustomResource class]])
+        _image = [anImage imageFromCoder:nil];
+    else
+        _image = anImage;
+
+    [_imageLayer setNeedsDisplay];
+}
+
+- (void)setRotationRadians:(float)radians
+{
+    if (_rotationRadians === radians)
+        return;
+
+    _rotationRadians = radians;
+
+    [_imageLayer setAffineTransform:CGAffineTransformScale(
+        CGAffineTransformMakeRotation(_rotationRadians),
+        1.0, 1.0)];
+}
+
+- (void)setEnabled:(BOOL)shouldEnable
+{
+    shouldEnable = !!shouldEnable;
+
+    if (_isEnabled === shouldEnable)
+        return;
+
+    _isEnabled = shouldEnable;
+    [self setNeedsDisplay];
+    [_imageLayer setNeedsDisplay];
+}
+
+- (void)imageDidLoad:(CPImage)anImage
+{
+    [_imageLayer setNeedsDisplay];
+}
+
+- (void)drawLayer:(CALayer)aLayer inContext:(CGContext)aContext
+{
+    if ([_image loadStatus] != CPImageLoadStatusCompleted)
+        [_image setDelegate:self];
+    else
+        CGContextDrawImage(aContext, [aLayer bounds], _image);
+}
+
+@end
@@ -0,0 +1,168 @@
+/*
+ * CPDictionaryController.j
+ * AppKit
+ *
+ * Adapted from Cocotron, by Johannes Fortmann
+ *
+ * Created by Blair Duncan
+ * Copyright 2013, SGL Studio, BBDO Toronto All rights reserved.
+ *
+ * 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 "CPArrayController.j"
+
+@implementation CPDictionaryController : CPArrayController
+{
+    CPDictionary    _contentDictionary;
+
+    CPArray         _includedKeys @accessors(property=includedKeys);
+    CPArray         _excludedKeys @accessors(property=excludedKeys);
+
+    CPString        _initialKey @accessors(property=initialKey);
+    id              _initialValue @accessors(property=initialValue);
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _initialKey = @"key";
+        _initialValue = @"value";
+    }
+
+    return self;
+}
+
+- (id)newObject
+{
+    var keys = [_contentDictionary allKeys],
+        newKey = _initialKey,
+        count = 0;
+
+    if ([keys containsObject:newKey])
+        while ([keys containsObject:newKey])
+            newKey = [CPString stringWithFormat:@"%@%i", _initialKey, ++count];
+
+    return [self _newObjectWithKey:newKey value:_initialValue];
+}
+
+- (id)_newObjectWithKey:(CPString)aKey value:(id)aValue
+{
+    var aNewObject = [_CPDictionaryControllerKeyValuePair new];
+
+    aNewObject._dictionary = _contentDictionary;
+    aNewObject._controller = self;
+    aNewObject._key = aKey;
+
+    if (aValue !== nil)
+        [aNewObject setValue:aValue];
+
+    return aNewObject;
+}
+
+- (CPDictionary)contentDictionary
+{
+    return _contentDictionary;
+}
+
+- (void)setContentDictionary:(CPDictionary)aDictionary
+{
+    if (aDictionary == _contentDictionary)
+        return;
+
+    if ([aDictionary isKindOfClass:[CPDictionary class]])
+        _contentDictionary = aDictionary;
+    else
+        _contentDictionary = nil;
+
+    var array = [CPArray array],
+        allKeys = [_contentDictionary allKeys];
+
+    [allKeys addObjectsFromArray:_includedKeys];
+
+    var iter = [[CPSet setWithArray:allKeys] objectEnumerator],
+        obj;
+
+    while ((obj = [iter nextObject]) !== nil)
+        if (![_excludedKeys containsObject:obj])
+            [array addObject:[self _newObjectWithKey:obj value:nil]];
+
+    [super setContent:array];
+}
+
+
+@end
+
+
+var CPIncludedKeys  = @"CPIncludedKeys",
+    CPExcludedKeys  = @"CPExcludedKeys";
+
+@implementation CPDictionaryController (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _includedKeys = [aCoder decodeObjectForKey:CPIncludedKeys];
+        _excludedKeys = [aCoder decodeObjectForKey:CPExcludedKeys];
+        _initialKey = @"key";
+        _initialValue = @"value";
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeObject:_includedKeys forKey:CPIncludedKeys];
+    [aCoder encodeObject:_excludedKeys forKey:CPExcludedKeys];
+}
+
+@end
+
+
+
+
+@implementation _CPDictionaryControllerKeyValuePair : CPObject
+{
+    CPString                _key @accessors(property=key);
+    CPDictionary            _dictionary @accessors(property=dictionary);
+    CPDictionaryController  _controller @accessors(property=controller);
+}
+
+- (id)value
+{
+   return [_dictionary objectForKey:_key];
+}
+
+- (void)setValue:(id)aValue
+{
+   [_dictionary setObject:aValue forKey:_key];
+}
+
+- (BOOL)isExplicitlyIncluded
+{
+    return [[_controller _includedKeys] containsObject:_key];
+}
+
+
+@end
@@ -23,12 +23,16 @@
@import <Foundation/CPString.j>
@import <Foundation/CPArray.j>

-@import "CPApplication.j"
+@import "CPAlert.j"
@import "CPResponder.j"
@import "CPSavePanel.j"
@import "CPViewController.j"
@import "CPWindowController.j"

+@class CPDocumentController
+
+@global CPApp
+

 /*
    @global
@@ -125,7 +129,7 @@ var CPDocumentUntitledCount = 0;
    if (self)
    {
        _windowControllers = [];
-        _viewControllersForWindowControllers = [CPDictionary dictionary];
+        _viewControllersForWindowControllers = @{};

        _hasUndoManager = YES;
        _changeCount = 0;
@@ -142,7 +146,7 @@ var CPDocumentUntitledCount = 0;
    @param anError not used
    @return the initialized document
 */
- (id)initWithType:(CPString)aType error:({CPError})anError
+- (id)initWithType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
    self = [self init];

@@ -211,7 +215,7 @@ var CPDocumentUntitledCount = 0;
    @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
    @return the document data
 */
- (CPData)dataOfType:(CPString)aType error:({CPError})anError
+- (CPData)dataOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
    [CPException raise:CPUnsupportedMethodException
                reason:"dataOfType:error: must be overridden by the document subclass."];
@@ -240,11 +244,6 @@ var CPDocumentUntitledCount = 0;
 {
 }

- (CPWindowController)firstEligibleExistingWindowController
-{
-    return nil;
-}
-
 // Creating and managing window controllers
 /*!
    Creates the window controller for this document.
@@ -257,6 +256,7 @@ var CPDocumentUntitledCount = 0;
 - (void)makeViewAndWindowControllers
 {
    var viewCibName = [self viewCibName],
+        windowCibName = [self windowCibName],
        viewController = nil,
        windowController = nil;

@@ -264,31 +264,21 @@ var CPDocumentUntitledCount = 0;
    if ([viewCibName length])
        viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];

-    // If we have a view controller, check if we have a free window for it.
-    if (viewController)
-        windowController = [self firstEligibleExistingWindowController];
+    // From a cib if we have one.
+    if ([windowCibName length])
+        windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];

-    // If not, create one.
-    if (!windowController)
+    // If not you get a standard window capable of displaying multiple documents and view
+    else if (viewController)
    {
-        var windowCibName = [self windowCibName];
+        var view = [viewController view],
+            viewFrame = [view frame];

-        // From a cib if we have one.
-        if ([windowCibName length])
-            windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
+        viewFrame.origin = CGPointMake(50, 50);

-        // If not you get a standard window capable of displaying multiple documents and view
-        else if (viewController)
-        {
-            var view = [viewController view],
-                viewFrame = [view frame];
+        var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];

-            viewFrame.origin = CGPointMake(50, 50);
-
-            var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
-
-            windowController = [[CPWindowController alloc] initWithWindow:theWindow];
-        }
+        windowController = [[CPWindowController alloc] initWithWindow:theWindow];
    }

    if (windowController && viewController)
@@ -25,6 +25,10 @@

@import "CPDocument.j"
@import "CPOpenPanel.j"
+@import "CPMenuItem.j"
+@import "CPWindowController.j"
+
+@global CPApp


 var CPSharedDocumentController = nil;
@@ -124,7 +128,7 @@ var CPSharedDocumentController = nil;
    @param anError not used
    @return the created document
 */
- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:({CPError})anError
+- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
    return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
 }
@@ -144,7 +148,7 @@ var CPSharedDocumentController = nil;
    {
        var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];

-        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:[CPDictionary dictionaryWithObject:shouldDisplay forKey:@"shouldDisplay"]];
+        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:@{ @"shouldDisplay": shouldDisplay }];

        [self addDocument:result];

@@ -249,6 +253,14 @@ var CPSharedDocumentController = nil;
    return _documents;
 }

+/*!
+    Returns the CPDocument object associated with the main window.
+*/
+- (CPDocument)currentDocument
+{
+    return [[[CPApp mainWindow] windowController] document];
+}
+
 /*!
    Adds \c aDocument under the control of the receiver.
    @param aDocument the document to add
@@ -267,6 +279,33 @@ var CPSharedDocumentController = nil;
    [_documents removeObjectIdenticalTo:aDocument];
 }

+/*!
+    Returns the document object whose window controller
+    owns a specified window.
+*/
+- (CPDocument)documentForWindow:(CPWindow)aWindow
+{
+   return [[aWindow windowController] document];
+}
+
+/*!
+    Returns a Boolean value that indicates whether the receiver
+    has any documents with unsaved changes.
+*/
+- (BOOL)hasEditedDocuments
+{
+    var iter = [_documents objectEnumerator],
+        obj;
+
+    while ((obj = [iter nextObject]) !== nil)
+    {
+        if ([obj isDocumentEdited])
+            return YES;
+    }
+
+    return NO;
+}
+
 - (CPString)defaultType
 {
    return [_documentTypes[0] objectForKey:@"CPBundleTypeName"];
@@ -339,10 +378,10 @@ var CPSharedDocumentController = nil;
 - (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
 {
    var context = {
-        delegate: aDelegate,
-        selector: didCloseSelector,
-        context: info
-    };
+            delegate: aDelegate,
+            selector: didCloseSelector,
+            context: info
+        };

    [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
 }
@@ -20,22 +20,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPApplication.j"
+@import "CPDragServer_Constants.j"
@import "CPEvent.j"
@import "CPImageView.j"
@import "CPPasteboard.j"
@import "CPView.j"
-@import "CPWindow.j"
+@import "CPWindow_Constants.j"

+@class CPWindow  // This file is imported by CPWindow.j
+@class _CPDOMDataTransferPasteboard

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

 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])

@@ -72,7 +67,7 @@ var CPDragServerSource             = nil,
 - (unsigned)draggingSourceOperationMask
 */

- (CPPoint)draggingLocation
+- (CGPoint)draggingLocation
 {
    return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -168,7 +163,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,

    if (self)
    {
-        _draggedWindow = [[CPWindow alloc] initWithContentRect:_CGRectMakeZero() styleMask:CPBorderlessWindowMask];
+        _draggedWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessWindowMask];

        [_draggedWindow setLevel:CPDraggingWindowLevel];
    }
@@ -206,7 +201,12 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 - (void)draggingSourceUpdatedWithGlobalLocation:(CGPoint)aGlobalLocation
 {
    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow setFrameOrigin:_CGPointMake(aGlobalLocation.x - _draggingOffset.width, aGlobalLocation.y - _draggingOffset.height)];
+    {
+        var frame = [_draggedWindow frame];
+        frame.origin.x = aGlobalLocation.x - _draggingOffset.width;
+        frame.origin.y = aGlobalLocation.y - _draggingOffset.height;
+        [_draggedWindow _setFrame:frame display:YES animate:NO constrainWidth:NO constrainHeight:NO];
+    }

    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_movedTo_)
        [_draggingSource draggedImage:[_draggedView image] movedTo:aGlobalLocation];
@@ -253,7 +253,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
            _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
                                                                    target:self
                                                                  selector:@selector(_sendPeriodicDraggingUpdate:)
-                                                                  userInfo:[CPDictionary dictionaryWithJSObject:{platformWindow:aPlatformWindow, location:aLocation}]
+                                                                  userInfo:@{ "platformWindow":aPlatformWindow, "location":aLocation }
                                                                   repeats:NO];

        var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
@@ -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,17 @@ 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;
                }

-                var scrollPoint = _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];
@@ -370,22 +370,26 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
        if (mouseDownWindow)
            mouseDownEventLocation = [mouseDownWindow convertBaseToGlobal:mouseDownEventLocation];

-        _draggingOffset = _CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
+        _draggingOffset = CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
    }
    else
-        _draggingOffset = _CGSizeMakeZero();
+        _draggingOffset = CGSizeMakeZero();

    if ([CPPlatform isBrowser])
        [_draggedWindow setPlatformWindow:[aWindow platformWindow]];

-    [aView setFrameOrigin:_CGPointMakeZero()];
+    [aView setFrameOrigin:CGPointMakeZero()];

-    var mouseLocation = [CPEvent mouseLocation];
+    var mouseLocation = [CPEvent mouseLocation],
+        viewSize = [aView frameSize],
+        startDragLocationX = mouseLocation.x - _draggingOffset.width,
+        startDragLocationY = mouseLocation.y - _draggingOffset.height,
+        draggedWindowFrame = CGRectMake(startDragLocationX, startDragLocationY, viewSize.width, viewSize.height);

    // Place it where the mouse pointer is.
-    _startDragLocation = _CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height);
-    [_draggedWindow setFrameOrigin:_startDragLocation];
-    [_draggedWindow setFrameSize:[aView frame].size];
+    _startDragLocation = CGPointMake(startDragLocationX, startDragLocationY);
+
+    [_draggedWindow _setFrame:draggedWindowFrame display:YES animate:NO constrainWidth:NO constrainHeight:NO];

    [[_draggedWindow contentView] addSubview:aView];

@@ -434,7 +438,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    var imageSize = [anImage size];

    if (!_imageView)
-        _imageView = [[CPImageView alloc] initWithFrame:_CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
+        _imageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];

    [_imageView setImage:anImage];

@@ -461,6 +465,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    else if (type === CPKeyDown)
    {
        var characters = [anEvent characters];
+
        if (characters === CPEscapeFunctionKey)
        {
            _dragOperation = CPDragOperationNone;
@@ -477,39 +482,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    // If we're not a mouse up, then we're going to want to grab the next event.
    [CPApp setTarget:self selector:@selector(trackDragging:)
        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
-        untilDate:nil inMode:0 dequeue:NO];
-}
-
-@end
-
-@implementation CPWindow (CPDraggingAdditions)
-
-/* @ignore */
- (id)_dragHitTest:(CGPoint)aPoint pasteboard:(CPPasteboard)aPasteboard
-{
-    // If none of our views or ourselves has registered for drag events...
-    if (!_inclusiveRegisteredDraggedTypes)
-        return nil;
-
-// We don't need to do this because the only place this gets called
-// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
-// be safe?
-//    if (![self containsPoint:aPoint])
-//        return nil;
-
-    var adjustedPoint = [self convertPlatformWindowToBase:aPoint],
-        hitView = [_windowView hitTest:adjustedPoint];
-
-    while (hitView && ![aPasteboard availableTypeFromArray:[hitView registeredDraggedTypes]])
-        hitView = [hitView superview];
-
-    if (hitView)
-        return hitView;
-
-    if ([aPasteboard availableTypeFromArray:[self registeredDraggedTypes]])
-        return self;
-
-    return nil;
+        untilDate:nil inMode:0 dequeue:YES];
 }

@end
@@ -1,9 +1,9 @@
 /*
- * CPRange.h
- * Foundation
+ * CPDragServer_Constants.j
+ * AppKit
 *
- * Created by Alexander Ljungberg.
- * Copyright 2012, SlevenBits Ltd.
+ * 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
@@ -20,8 +20,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define _CPMaxRange(aRange) ((aRange).location + (aRange).length)
-#define _CPMakeRange(aLocation, aLength) { location:(aLocation), length:aLength }
-#define _CPMakeRangeCopy(aRange) { location:(aRange).location, length:(aRange).length }
-#define _CPEmptyRange(aRange) ((aRange).length === 0)
-#define _CPLocationInRange(aLocation, aRange) (((aLocation) >= (aRange).location) && ((aLocation) < _CPMaxRange(aRange)))
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
+CPDragOperationEvery    = -1;
@@ -20,162 +20,19 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPEvent_Constants.j"
+
@import <Foundation/CPObject.j>
+@import <Foundation/CPObjJRuntime.j>
+@import <Foundation/CPString.j>
+
+@import "CPCompatibility.j"
+@import "CGGeometry.j"
@import "CPText.j"

+@class CPTextField

-CPLeftMouseDown                         = 1;
-CPLeftMouseUp                           = 2;
-CPRightMouseDown                        = 3;
-CPRightMouseUp                          = 4;
-CPMouseMoved                            = 5;
-CPLeftMouseDragged                      = 6;
-CPRightMouseDragged                     = 7;
-CPMouseEntered                          = 8;
-CPMouseExited                           = 9;
-CPKeyDown                               = 10;
-CPKeyUp                                 = 11;
-CPFlagsChanged                          = 12;
-CPAppKitDefined                         = 13;
-CPSystemDefined                         = 14;
-CPApplicationDefined                    = 15;
-CPPeriodic                              = 16;
-CPCursorUpdate                          = 17;
-CPScrollWheel                           = 22;
-CPOtherMouseDown                        = 25;
-CPOtherMouseUp                          = 26;
-CPOtherMouseDragged                     = 27;
-
-// iPhone Event Types
-CPTouchStart                            = 28;
-CPTouchMove                             = 29;
-CPTouchEnd                              = 30;
-CPTouchCancel                           = 31;
-
-CPAlphaShiftKeyMask                     = 1 << 16;
-CPShiftKeyMask                          = 1 << 17;
-CPControlKeyMask                        = 1 << 18;
-CPAlternateKeyMask                      = 1 << 19;
-CPCommandKeyMask                        = 1 << 20;
-CPNumericPadKeyMask                     = 1 << 21;
-CPHelpKeyMask                           = 1 << 22;
-CPFunctionKeyMask                       = 1 << 23;
-CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
-
-CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
-CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
-CPRightMouseDownMask                    = 1 << CPRightMouseDown;
-CPRightMouseUpMask                      = 1 << CPRightMouseUp;
-CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
-CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
-CPMouseMovedMask                        = 1 << CPMouseMoved;
-CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
-CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
-CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
-CPMouseEnteredMask                      = 1 << CPMouseEntered;
-CPMouseExitedMask                       = 1 << CPMouseExited;
-CPCursorUpdateMask                      = 1 << CPCursorUpdate;
-CPKeyDownMask                           = 1 << CPKeyDown;
-CPKeyUpMask                             = 1 << CPKeyUp;
-CPFlagsChangedMask                      = 1 << CPFlagsChanged;
-CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
-CPSystemDefinedMask                     = 1 << CPSystemDefined;
-CPApplicationDefinedMask                = 1 << CPApplicationDefined;
-CPPeriodicMask                          = 1 << CPPeriodic;
-CPScrollWheelMask                       = 1 << CPScrollWheel;
-CPAnyEventMask                          = 0xffffffff;
-
-CPUpArrowFunctionKey                    = "\uF700";
-CPDownArrowFunctionKey                  = "\uF701";
-CPLeftArrowFunctionKey                  = "\uF702";
-CPRightArrowFunctionKey                 = "\uF703";
-CPF1FunctionKey                         = "\uF704";
-CPF2FunctionKey                         = "\uF705";
-CPF3FunctionKey                         = "\uF706";
-CPF4FunctionKey                         = "\uF707";
-CPF5FunctionKey                         = "\uF708";
-CPF6FunctionKey                         = "\uF709";
-CPF7FunctionKey                         = "\uF70A";
-CPF8FunctionKey                         = "\uF70B";
-CPF9FunctionKey                         = "\uF70C";
-CPF10FunctionKey                        = "\uF70D";
-CPF11FunctionKey                        = "\uF70E";
-CPF12FunctionKey                        = "\uF70F";
-CPF13FunctionKey                        = "\uF710";
-CPF14FunctionKey                        = "\uF711";
-CPF15FunctionKey                        = "\uF712";
-CPF16FunctionKey                        = "\uF713";
-CPF17FunctionKey                        = "\uF714";
-CPF18FunctionKey                        = "\uF715";
-CPF19FunctionKey                        = "\uF716";
-CPF20FunctionKey                        = "\uF717";
-CPF21FunctionKey                        = "\uF718";
-CPF22FunctionKey                        = "\uF719";
-CPF23FunctionKey                        = "\uF71A";
-CPF24FunctionKey                        = "\uF71B";
-CPF25FunctionKey                        = "\uF71C";
-CPF26FunctionKey                        = "\uF71D";
-CPF27FunctionKey                        = "\uF71E";
-CPF28FunctionKey                        = "\uF71F";
-CPF29FunctionKey                        = "\uF720";
-CPF30FunctionKey                        = "\uF721";
-CPF31FunctionKey                        = "\uF722";
-CPF32FunctionKey                        = "\uF723";
-CPF33FunctionKey                        = "\uF724";
-CPF34FunctionKey                        = "\uF725";
-CPF35FunctionKey                        = "\uF726";
-CPInsertFunctionKey                     = "\uF727";
-CPDeleteFunctionKey                     = "\uF728";
-CPHomeFunctionKey                       = "\uF729";
-CPBeginFunctionKey                      = "\uF72A";
-CPEndFunctionKey                        = "\uF72B";
-CPPageUpFunctionKey                     = "\uF72C";
-CPPageDownFunctionKey                   = "\uF72D";
-CPPrintScreenFunctionKey                = "\uF72E";
-CPScrollLockFunctionKey                 = "\uF72F";
-CPPauseFunctionKey                      = "\uF730";
-CPSysReqFunctionKey                     = "\uF731";
-CPBreakFunctionKey                      = "\uF732";
-CPResetFunctionKey                      = "\uF733";
-CPStopFunctionKey                       = "\uF734";
-CPMenuFunctionKey                       = "\uF735";
-CPUserFunctionKey                       = "\uF736";
-CPSystemFunctionKey                     = "\uF737";
-CPPrintFunctionKey                      = "\uF738";
-CPClearLineFunctionKey                  = "\uF739";
-CPClearDisplayFunctionKey               = "\uF73A";
-CPInsertLineFunctionKey                 = "\uF73B";
-CPDeleteLineFunctionKey                 = "\uF73C";
-CPInsertCharFunctionKey                 = "\uF73D";
-CPDeleteCharFunctionKey                 = "\uF73E";
-CPPrevFunctionKey                       = "\uF73F";
-CPNextFunctionKey                       = "\uF740";
-CPSelectFunctionKey                     = "\uF741";
-CPExecuteFunctionKey                    = "\uF742";
-CPUndoFunctionKey                       = "\uF743";
-CPRedoFunctionKey                       = "\uF744";
-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";
+@global CPApp

 var _CPEventPeriodicEventPeriod         = 0,
    _CPEventPeriodicEventTimer          = nil,
@@ -190,7 +47,7 @@ var _CPEventPeriodicEventPeriod         = 0,
@implementation CPEvent : CPObject
 {
    CPEventType         _type;
-    CPPoint             _location;
+    CGPoint             _location;
    unsigned            _modifierFlags;
    CPTimeInterval      _timestamp;
    CPGraphicsContext   _context;
@@ -206,10 +63,16 @@ var _CPEventPeriodicEventPeriod         = 0,
    DOMEvent            _DOMEvent;
    int                 _data1;
    int                 _data2;
+    short               _subtype;

    float               _deltaX;
    float               _deltaY;
    float               _deltaZ;
+
+#if PLATFORM(DOM)
+    BOOL                _suppressCappuccinoCut;
+    BOOL                _suppressCappuccinoPaste;
+#endif
 }

 /*!
@@ -308,13 +171,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /* @ignore */
- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -328,13 +191,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /* @ignore */
- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -355,7 +218,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -377,7 +240,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 */
 - (CGPoint)locationInWindow
 {
-    return _CGPointMakeCopy(_location);
+    return CGPointMakeCopy(_location);
 }

 - (CGPoint)globalLocation
@@ -615,6 +478,24 @@ var _CPEventPeriodicEventPeriod         = 0,
    return !firstResponderIsText;
 }

+/*!
+    Return YES if this event is a part of processing a browser controlled cut or paste event
+    where the browser will go ahead and do the work of cutting or pasting within the input
+    element after processing of this event. The implication is that it should not be done by
+    the CPTextField (or whatever else is controlling the input) since this would result in
+    nothing being cut (because the field already cut the text out), or a double paste
+    (because the field pasted as well as the browser).
+*/
+- (BOOL)_platformIsEffectingCutOrPaste
+{
+#if PLATFORM(DOM)
+    return _suppressCappuccinoCut || _suppressCappuccinoPaste;
+#else
+    return NO;
+#endif
+}
+
+
 /*!
    Generates periodic events every \c aPeriod seconds.

@@ -649,7 +530,7 @@ var _CPEventPeriodicEventPeriod         = 0,
        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];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
        case CPLeftMouseDown:
        case CPLeftMouseUp:
        case CPRightMouseDown:
@@ -659,9 +540,9 @@ var _CPEventPeriodicEventPeriod         = 0,
        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];
+            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, CGStringFromPoint(_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];
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
    }
 }

@@ -669,7 +550,7 @@ var _CPEventPeriodicEventPeriod         = 0,

 function _CPEventFirePeriodEvent()
 {
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] 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];
@@ -0,0 +1,174 @@
+/*
+ * CPEvent_Constants.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
+ */
+
+CPLeftMouseDown                         = 1;
+CPLeftMouseUp                           = 2;
+CPRightMouseDown                        = 3;
+CPRightMouseUp                          = 4;
+CPMouseMoved                            = 5;
+CPLeftMouseDragged                      = 6;
+CPRightMouseDragged                     = 7;
+CPMouseEntered                          = 8;
+CPMouseExited                           = 9;
+CPKeyDown                               = 10;
+CPKeyUp                                 = 11;
+CPFlagsChanged                          = 12;
+CPAppKitDefined                         = 13;
+CPSystemDefined                         = 14;
+CPApplicationDefined                    = 15;
+CPPeriodic                              = 16;
+CPCursorUpdate                          = 17;
+CPScrollWheel                           = 22;
+CPOtherMouseDown                        = 25;
+CPOtherMouseUp                          = 26;
+CPOtherMouseDragged                     = 27;
+
+// iPhone Event Types
+CPTouchStart                            = 28;
+CPTouchMove                             = 29;
+CPTouchEnd                              = 30;
+CPTouchCancel                           = 31;
+
+CPAlphaShiftKeyMask                     = 1 << 16;
+CPShiftKeyMask                          = 1 << 17;
+CPControlKeyMask                        = 1 << 18;
+CPAlternateKeyMask                      = 1 << 19;
+CPCommandKeyMask                        = 1 << 20;
+CPNumericPadKeyMask                     = 1 << 21;
+CPHelpKeyMask                           = 1 << 22;
+CPFunctionKeyMask                       = 1 << 23;
+CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
+
+CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
+CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
+CPRightMouseDownMask                    = 1 << CPRightMouseDown;
+CPRightMouseUpMask                      = 1 << CPRightMouseUp;
+CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
+CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
+CPMouseMovedMask                        = 1 << CPMouseMoved;
+CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
+CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
+CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
+CPMouseEnteredMask                      = 1 << CPMouseEntered;
+CPMouseExitedMask                       = 1 << CPMouseExited;
+CPCursorUpdateMask                      = 1 << CPCursorUpdate;
+CPKeyDownMask                           = 1 << CPKeyDown;
+CPKeyUpMask                             = 1 << CPKeyUp;
+CPFlagsChangedMask                      = 1 << CPFlagsChanged;
+CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
+CPSystemDefinedMask                     = 1 << CPSystemDefined;
+CPApplicationDefinedMask                = 1 << CPApplicationDefined;
+CPPeriodicMask                          = 1 << CPPeriodic;
+CPScrollWheelMask                       = 1 << CPScrollWheel;
+CPAnyEventMask                          = 0xffffffff;
+
+CPUpArrowFunctionKey                    = "\uF700";
+CPDownArrowFunctionKey                  = "\uF701";
+CPLeftArrowFunctionKey                  = "\uF702";
+CPRightArrowFunctionKey                 = "\uF703";
+CPF1FunctionKey                         = "\uF704";
+CPF2FunctionKey                         = "\uF705";
+CPF3FunctionKey                         = "\uF706";
+CPF4FunctionKey                         = "\uF707";
+CPF5FunctionKey                         = "\uF708";
+CPF6FunctionKey                         = "\uF709";
+CPF7FunctionKey                         = "\uF70A";
+CPF8FunctionKey                         = "\uF70B";
+CPF9FunctionKey                         = "\uF70C";
+CPF10FunctionKey                        = "\uF70D";
+CPF11FunctionKey                        = "\uF70E";
+CPF12FunctionKey                        = "\uF70F";
+CPF13FunctionKey                        = "\uF710";
+CPF14FunctionKey                        = "\uF711";
+CPF15FunctionKey                        = "\uF712";
+CPF16FunctionKey                        = "\uF713";
+CPF17FunctionKey                        = "\uF714";
+CPF18FunctionKey                        = "\uF715";
+CPF19FunctionKey                        = "\uF716";
+CPF20FunctionKey                        = "\uF717";
+CPF21FunctionKey                        = "\uF718";
+CPF22FunctionKey                        = "\uF719";
+CPF23FunctionKey                        = "\uF71A";
+CPF24FunctionKey                        = "\uF71B";
+CPF25FunctionKey                        = "\uF71C";
+CPF26FunctionKey                        = "\uF71D";
+CPF27FunctionKey                        = "\uF71E";
+CPF28FunctionKey                        = "\uF71F";
+CPF29FunctionKey                        = "\uF720";
+CPF30FunctionKey                        = "\uF721";
+CPF31FunctionKey                        = "\uF722";
+CPF32FunctionKey                        = "\uF723";
+CPF33FunctionKey                        = "\uF724";
+CPF34FunctionKey                        = "\uF725";
+CPF35FunctionKey                        = "\uF726";
+CPInsertFunctionKey                     = "\uF727";
+CPDeleteFunctionKey                     = "\uF728";
+CPHomeFunctionKey                       = "\uF729";
+CPBeginFunctionKey                      = "\uF72A";
+CPEndFunctionKey                        = "\uF72B";
+CPPageUpFunctionKey                     = "\uF72C";
+CPPageDownFunctionKey                   = "\uF72D";
+CPPrintScreenFunctionKey                = "\uF72E";
+CPScrollLockFunctionKey                 = "\uF72F";
+CPPauseFunctionKey                      = "\uF730";
+CPSysReqFunctionKey                     = "\uF731";
+CPBreakFunctionKey                      = "\uF732";
+CPResetFunctionKey                      = "\uF733";
+CPStopFunctionKey                       = "\uF734";
+CPMenuFunctionKey                       = "\uF735";
+CPUserFunctionKey                       = "\uF736";
+CPSystemFunctionKey                     = "\uF737";
+CPPrintFunctionKey                      = "\uF738";
+CPClearLineFunctionKey                  = "\uF739";
+CPClearDisplayFunctionKey               = "\uF73A";
+CPInsertLineFunctionKey                 = "\uF73B";
+CPDeleteLineFunctionKey                 = "\uF73C";
+CPInsertCharFunctionKey                 = "\uF73D";
+CPDeleteCharFunctionKey                 = "\uF73E";
+CPPrevFunctionKey                       = "\uF73F";
+CPNextFunctionKey                       = "\uF740";
+CPSelectFunctionKey                     = "\uF741";
+CPExecuteFunctionKey                    = "\uF742";
+CPUndoFunctionKey                       = "\uF743";
+CPRedoFunctionKey                       = "\uF744";
+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";
@@ -38,7 +38,6 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 #if PLATFORM(DOM)
    DOMElement      _DOMParamElement;
    DOMElement      _DOMObjectElement;
-    DOMElement      _DOMInnerObjectElement;
 #endif
 }

@@ -52,22 +51,16 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
        if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
        {
            _DOMObjectElement = document.createElement(@"object");
+            _DOMObjectElement.id = [self elementID];
            _DOMObjectElement.width = @"100%";
            _DOMObjectElement.height = @"100%";
            _DOMObjectElement.style.top = @"0px";
            _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);
        }
@@ -89,7 +82,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
    {
        _DOMParamElement.value = [aFlashMovie filename];
-        _DOMInnerObjectElement.data = [aFlashMovie filename];
+        _DOMObjectElement.data = [aFlashMovie filename];
    }
    else
        [self _rebuildIEObjects];
@@ -107,11 +100,14 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
        enumerator = [aDictionary keyEnumerator],
        key;

-    while ((key = [enumerator nextObject]) !== nil)
+    if (key = [enumerator nextObject])
+        varString = [varString stringByAppendingFormat:@"%@=%@", key, [aDictionary objectForKey:key]];
+
+    while (key = [enumerator nextObject])
        varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];

    if (!_params)
-        _params = [CPDictionary dictionary];
+        _params = @{};

    [_params setObject:varString forKey:@"flashvars"];
    [self setParameters:_params];
@@ -141,7 +137,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 #if PLATFORM(DOM)
    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
    {
-        _paramElements = [CPDictionary dictionary];
+        _paramElements = @{};

        var enumerator = [_params keyEnumerator],
            key;
@@ -184,10 +180,20 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
    _DOMObjectElement = document.createElement(@"object");
    _DOMElement.appendChild(_DOMObjectElement);

-    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
+    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object id=%@ classid=%@ width=%@ height=%@>%@</object>", [self elementID], IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
 }
 #endif

+- (CPString)elementID
+{
+    return @"CPFV_" + [self UID];
+}
+
+- (void)mouseMoved:(CPEvent)sommit
+{
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+}
+
 - (void)mouseDragged:(CPEvent)anEvent
 {
    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
@@ -37,12 +37,12 @@ CPFontCurrentSystemSize = -1;
 // 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");
+var _CPFontCache          = {},
+    _CPSystemFontCache    = {},
+    _CPFontSystemFontFace = CPFontDefaultSystemFontFace,
+    _CPFontSystemFontSize = 12,
+    _CPFontFallbackFaces  = CPFontDefaultSystemFontFace.split(", "),
+    _CPFontStripRegExp    = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");


 #define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
@@ -174,6 +174,23 @@ following:
    return _CPFontSystemFontSize;
 }

+ (float)systemFontSizeForControlSize:(CPControlSize)aSize
+{
+    // TODO These sizes should be themable or made less arbitrary in some other way.
+    switch (aSize)
+    {
+        case CPSmallControlSize:
+            return _CPFontSystemFontSize - 1;
+
+        case CPMiniControlSize:
+            return _CPFontSystemFontSize - 2;
+
+        case CPRegularControlSize:
+        default:
+            return _CPFontSystemFontSize;
+    }
+}
+
 /*!
    Sets the default system font size.
 */
@@ -191,7 +208,7 @@ following:
    var systemSize = String(_CPFontSystemFontSize),
        currentSize = String(CPFontCurrentSystemSize);

-    for (key in _CPSystemFontCache)
+    for (var key in _CPSystemFontCache)
    {
        if (_CPSystemFontCache.hasOwnProperty(key) &&
            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
@@ -266,7 +283,7 @@ following:
           that dynamically tracks the current system font size.
    @return the requested system font
 */
-+ (CPFont)systemFontOfSize:(CPSize)aSize
+ (CPFont)systemFontOfSize:(CGSize)aSize
 {
    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
 }
@@ -278,7 +295,7 @@ following:
           that dynamically tracks the current system font size.
    @return the requested bold system font
 */
-+ (CPFont)boldSystemFontOfSize:(CPSize)aSize
+ (CPFont)boldSystemFontOfSize:(CGSize)aSize
 {
    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
 }
@@ -24,6 +24,8 @@

@import "CPFont.j"

+@global CPApp
+
 CPItalicFontMask                    = 1 << 0;
 CPBoldFontMask                      = 1 << 1;
 CPUnboldFontMask                    = 1 << 2;
@@ -54,7 +56,7 @@ var CPSharedFontManager     = nil,
    id              _delegate @accessors(property=delegate);

    CPFont          _selectedFont;
-    BOOL            _multiple @accessors;
+    BOOL            _multiple @accessors(getter=isMultiple, setter=setMultiple:);

    CPDictionary    _activeChange;
 }
@@ -99,6 +101,9 @@ var CPSharedFontManager     = nil,
 {
    if (!_availableFonts)
    {
+        _availableFonts = [];
+
+#if PLATFORM(DOM)
        _CPFontDetectSpan = document.createElement("span");
        _CPFontDetectSpan.fontSize = "24px";
        _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -110,13 +115,16 @@ var CPSharedFontManager     = nil,

        _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);

-        _availableFonts = [];
        for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
        {
            var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
            if (available)
                _availableFonts.push(_CPFontDetectAllFonts[i]);
        }
+#else
+        // If there's no font detection, just assume all fonts are available.
+        _availableFonts = _CPFontDetectAllFonts;
+#endif
    }
    return _availableFonts;
 }
@@ -133,7 +141,7 @@ var CPSharedFontManager     = nil,
 - (void)setSelectedFont:(CPFont)aFont isMultiple:(BOOL)aFlag
 {
    _selectedFont = aFont;
-    _isMultiple = aFlag;
+    _multiple = aFlag;

    // TODO Notify CPFontPanel when it exists.
 }
@@ -143,11 +151,6 @@ var CPSharedFontManager     = nil,
    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
@@ -205,7 +208,8 @@ var CPSharedFontManager     = nil,

 - (@action)addFontTrait:(id)sender
 {
-    _activeChange = [CPDictionary dictionaryWithObject:[sender tag] forKey:@"addTraits"];
+    var tag = [sender tag];
+    _activeChange = tag === nil ? @{} : @{ @"addTraits": tag };

    [self sendAction];
 }
@@ -20,6 +20,16 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPObject.j>
+@import <Foundation/CPException.j>
+@import <Foundation/CPMutableArray.j>
+
+@import "CGColor.j"
+@import "CGColorSpace.j"
+@import "CGGradient.j"
+@import "CPBezierPath.j"
+@import "CPGraphicsContext.j"
+
 CPGradientDrawsBeforeStartingLocation   = kCGGradientDrawsBeforeStartLocation;
 CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;

@@ -31,6 +41,11 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
    CGGradient _gradient;
 }

+- (id)initWithStartingColor:(CPColor)startingColor endingColor:(CPColor)endingColor
+{
+    return [self initWithColors:[startingColor, endingColor]];
+}
+
 - (id)initWithColors:(CPArray)someColors
 {
    var count = [someColors count];
@@ -74,20 +89,32 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
    CGContextClipToRect(ctx, rect);
    CGContextAddRect(ctx, rect);

-    var startPoint,
+    [self _drawInRect:rect atAngle:angle];
+
+    CGContextRestoreGState(ctx);
+}
+
+/*!
+    @ignore like draw in rect but apply no clipping.
+*/
+- (void)_drawInRect:(CGRect)rect atAngle:(float)angle
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort],
+
+        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));
+        startPoint = CGPointMake(CGRectGetMinX(rect), CGRectGetMinY(rect));
    else if (angle < 180.0)
-        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMinY(rect));
+        startPoint = CGPointMake(CGRectGetMaxX(rect), CGRectGetMinY(rect));
    else if (angle < 270.0)
-        startPoint = _CGPointMake(_CGRectGetMaxX(rect), _CGRectGetMaxY(rect));
+        startPoint = CGPointMake(CGRectGetMaxX(rect), CGRectGetMaxY(rect));
    else
-        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMaxY(rect));
+        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
@@ -102,13 +129,31 @@ CPGradientDrawsAfterEndingLocation      = kCGGradientDrawsAfterEndLocation;
    // 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));
+        length = ABS(CGRectGetWidth(rect) * COS(radians)) + ABS(CGRectGetHeight(rect) * SIN(radians));

-    endPoint = _CGPointMake(startPoint.x + length * COS(radians),
+    endPoint = CGPointMake(startPoint.x + length * COS(radians),
                           startPoint.y + length * SIN(radians));

    [self drawFromPoint:startPoint toPoint:endPoint options:CPGradientDrawsBeforeStartingLocation | CPGradientDrawsAfterEndingLocation];
-    CGContextRestoreGState(ctx);
+}
+
+- (void)drawInBezierPath:(CPBezierPath)aPath angle:(float)anAngle
+{
+    [CPGraphicsContext saveGraphicsState];
+
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    // Nail down the path which CGContextDrawLinearGradient will cause to be filled.
+    // Note we don't do this by clipping to the path and then calling drawInRect:atAngle:
+    // as this would cut off any antialias of the drawing, plus any active context shadow.
+    CGContextBeginPath(ctx);
+    CGContextAddPath(ctx, aPath._path);
+    CGContextSetLineWidth(ctx, [aPath lineWidth]);
+    CGContextClosePath(ctx);
+
+    [self _drawInRect:[aPath bounds] atAngle:anAngle];
+
+    [CPGraphicsContext restoreGraphicsState];
 }

 - (void)drawFromPoint:(NSPoint)startingPoint toPoint:(NSPoint)endingPoint options:(NSGradientDrawingOptions)options
@@ -23,6 +23,16 @@
@import "CPColor.j"
@import "CPGraphicsContext.j"

+CPCalibratedWhiteColorSpace = @"CalibratedWhiteColorSpace";
+CPCalibratedBlackColorSpace = @"CalibratedBlackColorSpace";
+CPCalibratedRGBColorSpace   = @"CalibratedRGBColorSpace";
+CPDeviceWhiteColorSpace     = @"DeviceWhiteColorSpace";
+CPDeviceBlackColorSpace     = @"DeviceBlackColorSpace";
+CPDeviceRGBColorSpace       = @"DeviceRGBColorSpace";
+CPDeviceCMYKColorSpace      = @"DeviceCMYKColorSpace";
+CPNamedColorSpace           = @"NamedColorSpace";
+CPPatternColorSpace         = @"PatternColorSpace";
+CPCustomColorSpace          = @"CustomColorSpace";

 function CPDrawTiledRects(
   /* CGRect */ boundsRect,
@@ -50,9 +60,9 @@ function CPDrawColorTiledRects(
    if (sides.length != colors.length)
        [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and colors (length: " + colors.length + ") must have the same length."];

-    var resultRect = _CGRectMakeCopy(boundsRect),
-        slice = _CGRectMakeZero(),
-        remainder = _CGRectMakeZero(),
+    var resultRect = CGRectMakeCopy(boundsRect),
+        slice = CGRectMakeZero(),
+        remainder = CGRectMakeZero(),
        context = [[CPGraphicsContext currentContext] graphicsPort];

    CGContextSaveGState(context);
@@ -67,7 +77,7 @@ function CPDrawColorTiledRects(
        slice = CGRectIntersection(slice, clipRect);

        // Cocoa docs say that only slices that are within the clipRect are actually drawn
-        if (_CGRectIsEmpty(slice))
+        if (CGRectIsEmpty(slice))
            continue;

        var minX,
@@ -78,23 +88,23 @@ function CPDrawColorTiledRects(
        if (side == CPMinXEdge || side == CPMaxXEdge)
        {
            // Make sure we have at least 1 pixel to draw a line
-            if (_CGRectGetWidth(slice) < 1.0)
+            if (CGRectGetWidth(slice) < 1.0)
                continue;

-            minX = _CGRectGetMinX(slice) + 0.5;
+            minX = CGRectGetMinX(slice) + 0.5;
            maxX = minX;
-            minY = _CGRectGetMinY(slice);
-            maxY = _CGRectGetMaxY(slice);
+            minY = CGRectGetMinY(slice);
+            maxY = CGRectGetMaxY(slice);
        }
        else // CPMinYEdge || CPMaxYEdge
        {
            // Make sure we have at least 1 pixel to draw a line
-            if (_CGRectGetHeight(slice) < 1.0)
+            if (CGRectGetHeight(slice) < 1.0)
                continue;

-            minX = _CGRectGetMinX(slice);
-            maxX = _CGRectGetMaxX(slice);
-            minY = _CGRectGetMinY(slice) + 0.5;
+            minX = CGRectGetMinX(slice);
+            maxX = CGRectGetMaxX(slice);
+            minY = CGRectGetMinY(slice) + 0.5;
            maxY = minY;
        }

@@ -25,7 +25,8 @@
@import "CGContext.j"


-var CPGraphicsContextCurrent = nil;
+var CPGraphicsContextCurrent = nil,
+    CPGraphicsContextThreadStack = nil;

 /*!
    @ingroup appkit
@@ -52,6 +53,29 @@ var CPGraphicsContextCurrent = nil;
    CPGraphicsContextCurrent = aGraphicsContext;
 }

+ (void)saveGraphicsState
+{
+    if (!CPGraphicsContextCurrent)
+        return;
+
+    if (!CPGraphicsContextThreadStack)
+        CPGraphicsContextThreadStack = [CPMutableArray array];
+
+    [CPGraphicsContextThreadStack addObject:CPGraphicsContextCurrent];
+    [CPGraphicsContextCurrent saveGraphicsState];
+}
+
+ (void)restoreGraphicsState
+{
+    var lastContext = [CPGraphicsContextThreadStack lastObject];
+
+    if (lastContext)
+    {
+        [lastContext restoreGraphicsState];
+        [CPGraphicsContextThreadStack removeLastObject];
+    }
+}
+
 /*!
    Creates a graphics context with a provided port.
    @param aContext the context to initialize with
@@ -99,4 +123,14 @@ var CPGraphicsContextCurrent = nil;
    return YES;
 }

+- (void)saveGraphicsState
+{
+    CGContextSaveGState(_graphicsPort);
+}
+
+- (void)restoreGraphicsState
+{
+    CGContextRestoreGState(_graphicsPort);
+}
+
@end
@@ -21,12 +21,14 @@
 */

@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 <Foundation/CPData.j>

+@import "CGGeometry.j"
+@import "CPCompatibility.j"

 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -49,15 +51,44 @@ var imagesForNames = { },
 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);

-function CPImageInBundle(aFilename, aSize, aBundle)
+/*!
+    Returns a resource image with a relative path and size
+    in a bundle.
+
+    @param filename A filename or relative path to a resource image.
+    @param width    Width of the image. May be omitted.
+    @param height   Height of the image. May be omitted if width is omitted.
+    @param size     Instead of passing width/height, a CGSize may be passed.
+    @param bundle   Bundle in which the image resource can be found.
+                    If omitted, defaults to the main bundle.
+    @return CPImage
+*/
+function CPImageInBundle()
 {
-    if (!aBundle)
-        aBundle = [CPBundle mainBundle];
+    var filename = arguments[0],
+        size = nil,
+        bundle = nil;

-    if (aSize)
-        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
+    if (typeof(arguments[1]) === "number")
+    {
+        if (arguments[1] !== nil && arguments[1] !== undefined)
+            size = CGSizeMake(arguments[1], arguments[2]);

-    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
+        bundle = arguments[3];
+    }
+    else if (typeof(arguments[1]) === "object")
+    {
+        size = arguments[1];
+        bundle = arguments[2];
+    }
+
+    if (!bundle)
+        bundle = [CPBundle mainBundle];
+
+    if (size)
+        return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename] size:size];
+
+    return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename]];
 }

 function CPAppKitImage(aFilename, aSize)
@@ -105,19 +136,24 @@ function CPAppKitImage(aFilename, aSize)

 /*!
    Initializes the image, by associating it with a filename. The image
-    denoted in \c aFilename is not actually loaded. It will
-    be loaded once needed.
+    denoted in \c aFilename is not actually loaded. It will be loaded
+    once needed.
+
    @param aFilename the file containing the image
    @param aSize the image's size
    @return the initialized image
 */
 - (id)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
 {
+    // Quietly return nil like in Cocoa, rather than crashing later.
+    if (aFilename === undefined || aFilename === nil)
+        return nil;
+
    self = [super init];

    if (self)
    {
-        _size = CPSizeCreateCopy(aSize);
+        _size = CGSizeMakeCopy(aSize);
        _filename = aFilename;
        _loadStatus = CPImageLoadStatusInitialized;
    }
@@ -271,6 +307,14 @@ function CPAppKitImage(aFilename, aSize)
    return _name;
 }

+/*!
+    Returns the underlying Image element for a single image.
+*/
+- (Image)image
+{
+    return _image;
+}
+
 /*!
    Sets the receiver's delegate.
    @param the delegate
@@ -359,6 +403,11 @@ function CPAppKitImage(aFilename, aSize)
 #endif
 }

+- (BOOL)isSingleImage
+{
+    return YES;
+}
+
 - (BOOL)isThreePartImage
 {
    return NO;
@@ -490,6 +539,11 @@ function CPAppKitImage(aFilename, aSize)
    return _isVertical;
 }

+- (BOOL)isSingleImage
+{
+    return NO;
+}
+
 - (BOOL)isThreePartImage
 {
    return YES;
@@ -554,6 +608,11 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
    return _imageSlices;
 }

+- (BOOL)isSingleImage
+{
+    return NO;
+}
+
 - (BOOL)isThreePartImage
 {
    return NO;
@@ -26,6 +26,9 @@
@import "CPImage.j"
@import "CPShadowView.j"

+@global CPImagesPboardType
+@global appkit_tag_dom_elements
+
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
 CPImageAlignTopLeft     = 2;
@@ -67,12 +70,14 @@ var CPImageViewEmptyPlaceholderImage = nil;
    CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding === CPValueBinding || theBinding === CPValueURLBinding || theBinding === CPValuePathBinding || theBinding === CPDataBinding)
+    if (aBinding === CPValueBinding || aBinding === CPValueURLBinding || aBinding === CPValuePathBinding || aBinding === CPDataBinding)
        return [CPImageViewValueBinder class];
+    else if ([aBinding hasPrefix:CPEditableBinding])
+        return [CPMultipleValueAndBinding class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -82,26 +87,37 @@ var CPImageViewEmptyPlaceholderImage = nil;
    if (self)
    {
 #if PLATFORM(DOM)
-        _DOMImageElement = document.createElement("img");
-        _DOMImageElement.style.position = "absolute";
-        _DOMImageElement.style.left = "0px";
-        _DOMImageElement.style.top = "0px";
-
-        if ([CPPlatform supportsDragAndDrop])
-        {
-            _DOMImageElement.setAttribute("draggable", "true");
-            _DOMImageElement.style["-khtml-user-drag"] = "element";
-        }
-
-        CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-
-        _DOMImageElement.style.visibility = "hidden";
+        [self _createDOMImageElement];
 #endif
    }

    return self;
 }

+- (void)_createDOMImageElement
+{
+#if PLATFORM(DOM)
+    if (_DOMImageElement)
+        return;
+
+    _DOMImageElement = document.createElement("img");
+    _DOMImageElement.style.position = "absolute";
+    _DOMImageElement.style.left = "0px";
+    _DOMImageElement.style.top = "0px";
+
+    if ([CPPlatform supportsDragAndDrop])
+    {
+        _DOMImageElement.setAttribute("draggable", "true");
+        _DOMImageElement.style["-khtml-user-drag"] = "element";
+    }
+
+    _DOMImageElement.style.visibility = "hidden";
+    AppKitTagDOMElement(self, _DOMImageElement);
+
+    CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
+#endif
+}
+
 /*!
    Returns the view's image.
 */
@@ -133,6 +149,9 @@ var CPImageViewEmptyPlaceholderImage = nil;
    var newImage = [self objectValue];

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

@@ -248,7 +267,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
    [self setNeedsDisplay:YES];
 }

- (unsigned)imageScaling
+- (CPUInteger)imageScaling
 {
    return [self currentValueForThemeAttribute:@"image-scaling"];
 }
@@ -297,8 +316,8 @@ var CPImageViewEmptyPlaceholderImage = nil;
        y = 0.0,
        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
-        boundsWidth = _CGRectGetWidth(bounds),
-        boundsHeight = _CGRectGetHeight(bounds),
+        boundsWidth = CGRectGetWidth(bounds),
+        boundsHeight = CGRectGetHeight(bounds),
        width = boundsWidth - insetWidth,
        height = boundsHeight - insetHeight;

@@ -396,10 +415,10 @@ var CPImageViewEmptyPlaceholderImage = nil;
 #endif
    }

-    _imageRect = _CGRectMake(x, y, width, height);
+    _imageRect = CGRectMake(x, y, width, height);

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

 - (void)mouseDown:(CPEvent)anEvent
@@ -471,16 +490,30 @@ var CPImageViewEmptyPlaceholderImage = nil;
 {
    var image;

-    if (aBinding === CPDataBinding)
+    if (aValue == nil)
+        image = nil;
+    else if (aBinding === CPDataBinding)
        image = [[CPImage alloc] initWithData:aValue];
    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        image = [[CPImage alloc] initWithContentsOfFile:aValue];
+        image = [CPImage cachedImageWithContentsOfFile:aValue];
    else if (aBinding === CPValueBinding)
        image = aValue;

    [_source setImage:image];
 }

+- (id)valueForBinding:(CPString)aBinding
+{
+    var image = [_source image];
+
+    if (aBinding === CPDataBinding)
+        return [image data];
+    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
+        return [image filename];
+    else if (aBinding === CPValueBinding)
+        return image;
+}
+
@end

 var CPImageViewImageKey          = @"CPImageViewImageKey",
@@ -498,28 +531,12 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
-#if PLATFORM(DOM)
-    _DOMImageElement = document.createElement("img");
-    _DOMImageElement.style.position = "absolute";
-    _DOMImageElement.style.left = "0px";
-    _DOMImageElement.style.top = "0px";
-    _DOMImageElement.style.visibility = "hidden";
-    if ([CPPlatform supportsDragAndDrop])
-    {
-        _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)
-        _DOMElement.appendChild(_DOMImageElement);
+        [self _createDOMImageElement];
 #endif

        [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
@@ -545,17 +562,12 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
    // 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];
-    }
+        [_shadowView removeFromSuperview];

    [super encodeWithCoder:aCoder];

    if (_shadowView)
-        _subviews = actualSubviews;
+        [self addSubview:_shadowView];

    [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
    [aCoder encodeInt:_imageAlignment forKey:CPImageViewImageAlignmentKey];
@@ -565,3 +577,21 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 }

@end
+
+@implementation CPImage (CachedImage)
+
+ (CPImage)cachedImageWithContentsOfFile:(CPString)aFile
+{
+    var cached_name = [CPString stringWithFormat:@"%@_%d", [self class], [aFile hash]],
+        image = [CPImage imageNamed:cached_name];
+
+    if (!image)
+    {
+        image = [[CPImage alloc] initWithContentsOfFile:aFile];
+        [image setName:cached_name];
+    }
+
+    return image;
+}
+
+@end
@@ -21,9 +21,10 @@
 */

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

-@import "CPEvent.j"
-
+@import "CPEvent_Constants.j"
+@import "CPText.j"

 CPStandardKeyBindings = {
    @"@.": @"cancelOperation:",
@@ -26,11 +26,14 @@
@import <Foundation/CPObject.j>
@import <Foundation/CPArray.j>
@import <Foundation/CPDictionary.j>
+@import <Foundation/CPInvocation.j>
@import <Foundation/CPValueTransformer.j>
+@import <Foundation/CPKeyValueObserving.j>

+@class CPButton

-var exposedBindingsMap = [CPDictionary new],
-    bindingsMap = [CPDictionary new];
+var exposedBindingsMap = @{},
+    bindingsMap = @{};

 var CPBindingOperationAnd = 0,
    CPBindingOperationOr  = 1;
@@ -38,7 +41,7 @@ var CPBindingOperationAnd = 0,
@implementation CPBinder : CPObject
 {
    CPDictionary    _info;
-    id              _source;
+    id              _source @accessors(getter=source);

    JSObject        _suppressedNotifications;
    JSObject        _placeholderForMarker;
@@ -94,9 +97,9 @@ var CPBindingOperationAnd = 0,
    if (!theBinding)
        return;

-    var infoDictionary = theBinding._info,
-        observedObject = [infoDictionary objectForKey:CPObservedObjectKey],
-        keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey];
+    var info = theBinding._info,
+        observedObject = [info objectForKey:CPObservedObjectKey],
+        keyPath = [info objectForKey:CPObservedKeyPathKey];

    [observedObject removeObserver:theBinding forKeyPath:keyPath];
    [bindings removeObjectForKey:aBinding];
@@ -105,6 +108,7 @@ var CPBindingOperationAnd = 0,
 + (void)unbindAllForObject:(id)anObject
 {
    var bindings = [bindingsMap objectForKey:[anObject UID]];
+
    if (!bindings)
        return;

@@ -119,26 +123,32 @@ var CPBindingOperationAnd = 0,

 - (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
 {
-    self = [super init];
+    // We use [self init] here because subclasses override init. We can't override this method
+    // because their initialization has to occur before this method in this class is executed.
+    self = [self init];

    if (self)
    {
        _source = aSource;
-        _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
+        _info = @{
+                CPObservedObjectKey: aDestination,
+                CPObservedKeyPathKey: aKeyPath,
+            };
        _suppressedNotifications = {};
        _placeholderForMarker = {};

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

-        [self _updatePlaceholdersWithOptions:options];
+        [self _updatePlaceholdersWithOptions:options forBinding:aName];

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

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

@@ -149,21 +159,25 @@ var CPBindingOperationAnd = 0,
    return self;
 }

+- (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
+{
+    if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+    {
+       [CPException raise:CPGenericException
+                   reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + aValue];
+    }
+}
+
 - (void)setValueFor:(CPString)theBinding
 {
    var destination = [_info objectForKey:CPObservedObjectKey],
        keyPath = [_info objectForKey:CPObservedKeyPathKey],
        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
+        newValue = [destination valueForKeyPath:keyPath];

-    if (isPlaceholder)
+    if (CPIsControllerMarker(newValue))
    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + newValue];
-        }
+        [self raiseIfNotApplicable:newValue forKeyPath:keyPath options:options];

        var value = [self _placeholderForMarker:newValue];
        [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
@@ -210,6 +224,7 @@ var CPBindingOperationAnd = 0,
        return;

    var objectSuppressions = _suppressedNotifications[[anObject UID]];
+
    if (objectSuppressions && objectSuppressions[aKeyPath])
        return;

@@ -228,6 +243,7 @@ var CPBindingOperationAnd = 0,
        if (!valueTransformer)
        {
            var valueTransformerClass = CPClassFromString(valueTransformerName);
+
            if (valueTransformerClass)
            {
                valueTransformer = [[valueTransformerClass alloc] init];
@@ -241,7 +257,11 @@ var CPBindingOperationAnd = 0,
    if (valueTransformer)
        aValue = [valueTransformer transformedValue:aValue];

-    if (aValue === undefined || aValue === nil || aValue === [CPNull null])
+    // If the value is nil AND the source doesn't respond to setPlaceholderString: then
+    // we set the value to the placeholder. Otherwise, we do not want to short cut the process
+    // of setting the placeholder that is based on the fact that the value is nil.
+    if ((aValue === undefined || aValue === nil || aValue === [CPNull null])
+        && ![_source respondsToSelector:@selector(setPlaceholderString:)])
        aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;

    return aValue;
@@ -285,6 +305,7 @@ var CPBindingOperationAnd = 0,

    var uid = [anObject UID],
        objectSuppressions = _suppressedNotifications[uid];
+
    if (!objectSuppressions)
        _suppressedNotifications[uid] = objectSuppressions = {};

@@ -301,6 +322,7 @@ var CPBindingOperationAnd = 0,

    var uid = [anObject UID],
        objectSuppressions = _suppressedNotifications[uid];
+
    if (!objectSuppressions)
        return;

@@ -317,15 +339,23 @@ var CPBindingOperationAnd = 0,
            optionName = CPBinderPlaceholderOptions[count],
            isExplicit = [options containsKey:optionName],
            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
+
        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
    }
 }

- (void)_placeholderForMarker:aMarker
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
 {
-    var placeholder = _placeholderForMarker[aMarker];
+    [self _updatePlaceholdersWithOptions:options];
+}
+
+- (JSObject)_placeholderForMarker:(id)aMarker
+{
+    var placeholder = _placeholderForMarker[[aMarker UID]];
+
    if (placeholder)
-        return placeholder['value'];
+        return placeholder.value;
+
    return nil;
 }

@@ -333,14 +363,14 @@ var CPBindingOperationAnd = 0,
 {
    if (isDefault)
    {
-        var existingPlaceholder = _placeholderForMarker[aMarker];
+        var existingPlaceholder = _placeholderForMarker[[aMarker UID]];

        // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder['isDefault'])
+        if (existingPlaceholder && !existingPlaceholder.isDefault)
            return;
    }

-    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
+    _placeholderForMarker[[aMarker UID]] = { 'isDefault': isDefault, 'value': aPlaceholder };
 }

@end
@@ -352,7 +382,7 @@ var CPBindingOperationAnd = 0,
    [CPBinder exposeBinding:aBinding forClass:[self class]];
 }

-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
    return [CPBinder class];
 }
@@ -405,7 +435,7 @@ var CPBindingOperationAnd = 0,
    [binderClass unbind:aBinding forObject:self];
 }

- (id)_replacementKeyPathForBinding:(CPString)binding
+- (CPString)_replacementKeyPathForBinding:(CPString)binding
 {
    return binding;
 }
@@ -414,13 +444,13 @@ var CPBindingOperationAnd = 0,

 /*!
    @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
+    Provides stub implementations that simply calls super for the "objectValue" binding.
+    This class should not be necessary but assures backwards compliance with our old way of doing bindings.
+
+    IMPORTANT!
+    Every class with a value binding should implement a subclass to handle its specific value binding logic.
 */
@implementation _CPValueBinder : CPBinder
-{
-}

 - (void)setValueFor:(CPString)theBinding
 {
@@ -434,8 +464,9 @@ var CPBindingOperationAnd = 0,

@end

-@implementation _CPKeyValueOrBinding : CPBinder
+@implementation _CPMultipleValueBooleanBinding : CPBinder
 {
+    CPBindingOperationKind _operation;
 }

 - (void)setValueFor:(CPString)aBinding
@@ -445,7 +476,14 @@ var CPBindingOperationAnd = 0,
    if (!bindings)
        return;

-    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationOr) forKey:aBinding];
+    var baseBinding = aBinding.replace(/\d$/, "");
+
+    [_source setValue:[self resolveMultipleValuesForBinding:baseBinding bindings:bindings booleanOperation:_operation] forKey:baseBinding];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    // read-only
 }

 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -453,61 +491,146 @@ var CPBindingOperationAnd = 0,
    [self setValueFor:context];
 }

-@end
-
-@implementation _CPKeyValueAndBinding : CPBinder
+- (BOOL)resolveMultipleValuesForBinding:(CPString)aBinding bindings:(CPDictionary)bindings booleanOperation:(CPBindingOperationKind)operation
 {
-}
-
- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap objectForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationAnd) forKey:aBinding];
-}
-
- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObejct change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-@end
-
-var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
-{
-    var bindingName = key,
+    var bindingName = aBinding,
        theBinding,
-        count = 1;
+        count = 2;

    while (theBinding = [bindings objectForKey:bindingName])
    {
-        var infoDictionary = theBinding._info,
-            object  = [infoDictionary objectForKey:CPObservedObjectKey],
-            keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey],
-            options = [infoDictionary objectForKey:CPOptionsKey];
+        var info    = theBinding._info,
+            object  = [info objectForKey:CPObservedObjectKey],
+            keyPath = [info objectForKey:CPObservedKeyPathKey],
+            options = [info objectForKey:CPOptionsKey],
+            value   = [object valueForKeyPath:keyPath];

-        var value = [theBinding transformValue:[object valueForKeyPath:keyPath] withOptions:options];
+        if (CPIsControllerMarker(value))
+        {
+            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
+            value = [theBinding _placeholderForMarker:value];
+        }
+        else
+            value = [theBinding transformValue:value withOptions:options];

-        if (value == operation)
-            return operation;
+        if (operation === CPBindingOperationOr)
+        {
+            // Any true condition means true for OR
+            if (value)
+                return YES;
+        }

-        bindingName = [CPString stringWithFormat:@"%@%i", key, ++count];
+        // Any false condition means false for AND
+        else if (!value)
+            return NO;
+
+        bindingName = aBinding + (count++);
    }

-    return !operation;
-};
+    // If we get here, all OR conditions were false or all AND conditions were true
+    return operation === CPBindingOperationOr ? NO : YES;
+}

-var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
+@end
+
+@implementation CPMultipleValueAndBinding : _CPMultipleValueBooleanBinding
+
+- (id)init
 {
-    var theBinding = [bindings objectForKey:targetKey],
-        infoDictionary = theBinding._info,
+    if (self = [super init])
+        _operation = CPBindingOperationAnd;

-        object   = [infoDictionary objectForKey:CPObservedObjectKey],
-        keyPath  = [infoDictionary objectForKey:CPObservedKeyPathKey],
-        options  = [infoDictionary objectForKey:CPOptionsKey],
+    return self;
+}
+
+@end
+
+@implementation CPMultipleValueOrBinding : _CPMultipleValueBooleanBinding
+
+- (id)init
+{
+    if (self = [super init])
+        _operation = CPBindingOperationOr;
+
+    return self;
+}
+
+@end
+
+@implementation _CPMultipleValueActionBinding : CPBinder
+{
+    CPString _argumentBinding;
+    CPString _targetBinding;
+}
+
+- (void)setValueFor:(CPString)theBinding
+{
+    // Called when the binding is first created
+    [self checkForNullBinding:theBinding initializing:YES];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    // no-op
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
+{
+    // context is the binding name
+    [self checkForNullBinding:context initializing:NO];
+}
+
+/*!
+    @ignore
+
+    When the value of a multiple-value argument binding changes,
+    if the binding is marked not to allow null arguments, we have to check
+    if the binding's value is nil and disable the button if it is.
+    Otherwise the button is enabled.
+*/
+- (void)checkForNullBinding:(CPString)theBinding initializing:(BOOL)isInitializing
+{
+    // Only done for buttons
+    if (![_source isKindOfClass:CPButton])
+        return;
+
+    // We start with the button enabled for the first argument during init,
+    // and subsequent checks can disable it.
+    if (isInitializing && theBinding === CPArgumentBinding)
+        [_source setEnabled:YES];
+
+    var bindings = [bindingsMap valueForKey:[_source UID]],
+        binding  = [bindings objectForKey:theBinding],
+        info     = binding._info,
+        options  = [info objectForKey:CPOptionsKey];
+
+    if (![options valueForKey:CPAllowsNullArgumentBindingOption])
+    {
+        var object  = [info objectForKey:CPObservedObjectKey],
+            keyPath = [info objectForKey:CPObservedKeyPathKey],
+            value   = [object valueForKeyPath:keyPath];
+
+        if (value === nil || value === undefined)
+        {
+            [_source setEnabled:NO];
+            return;
+        }
+    }
+
+    // If a binding value changed and did not fail the null test, enable the button
+    if (!isInitializing)
+        [_source setEnabled:YES];
+}
+
+- (void)invokeAction
+{
+    var bindings = [bindingsMap valueForKey:[_source UID]],
+        theBinding = [bindings objectForKey:CPTargetBinding],
+
+        info     = theBinding._info,
+        object   = [info objectForKey:CPObservedObjectKey],
+        keyPath  = [info objectForKey:CPObservedKeyPathKey],
+        options  = [info objectForKey:CPOptionsKey],

        target   = [object valueForKeyPath:keyPath],
        selector = [options objectForKey:CPSelectorNameBindingOption];
@@ -515,27 +638,194 @@ var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CP
    if (!target || !selector)
        return;

-    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]];
-    [invocation setSelector:selector];
-
-    var bindingName = argumentKey,
+    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]],
+        bindingName = CPArgumentBinding,
        count = 1;

    while (theBinding = [bindings objectForKey:bindingName])
    {
-        infoDictionary = theBinding._info;
+        info   = theBinding._info;
+        object = [info objectForKey:CPObservedObjectKey];
+        keyPath  = [info objectForKey:CPObservedKeyPathKey];

-        keyPath = [infoDictionary objectForKey:CPObserverKeyPathKey];
-        object  = [[infoDictionary objectForKey:CPObservedObjectKey] valueForKeyPath:keyPath];
+        [invocation setArgument:[object valueForKeyPath:keyPath] atIndex:++count];

-        if (object)
-            [invocation setArgument:object atIndex:++count];
-
-        bindingName = [CPString stringWithFormat:@"%@%i", argumentKey, count];
+        bindingName = CPArgumentBinding + count;
    }

-    [invocation invoke];
-};
+    [invocation setSelector:selector];
+    [invocation invokeWithTarget:target];
+}
+
+@end
+
+@implementation CPActionBinding : _CPMultipleValueActionBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _argumentBinding = CPArgumentBinding;
+        _targetBinding = CPTargetBinding;
+    }
+
+    return self;
+}
+
+@end
+
+@implementation CPDoubleClickActionBinding : _CPMultipleValueActionBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _argumentBinding = CPArgumentBinding;
+        _targetBinding = CPTargetBinding;
+    }
+
+    return self;
+}
+
+@end
+
+/*!
+    Abstract superclass for CPValueWithPatternBinding and CPTitleWithPatternBinding.
+*/
+@implementation _CPPatternBinding : CPBinder
+{
+    CPString _bindingKey;
+    CPString _patternPlaceholder;
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var bindings = [bindingsMap valueForKey:[_source UID]];
+
+    if (!bindings)
+        return;
+
+    // Strip off any trailing number from the binding name
+    var baseBinding = aBinding.replace(/\d$/, ""),
+        result = [self resolveMultipleValuesForBindings:bindings];
+
+    if (result.isPlaceholder)
+        [self setPlaceholderValue:result.value withMarker:result.marker forBinding:baseBinding];
+    else
+        [self setValue:result.value forBinding:baseBinding];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    // read-only
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
+{
+    [self setValueFor:context];
+}
+
+- (JSObject)resolveMultipleValuesForBindings:(CPDictionary)bindings
+{
+    var theBinding,
+        result = { value:@"", isPlaceholder:NO, marker:nil };
+
+    for (var count = 1; theBinding = [bindings objectForKey:_bindingKey + count]; ++count)
+    {
+        var info    = theBinding._info,
+            object  = [info objectForKey:CPObservedObjectKey],
+            keyPath = [info objectForKey:CPObservedKeyPathKey],
+            options = [info objectForKey:CPOptionsKey],
+            value   = [object valueForKeyPath:keyPath];
+
+        if (count === 1)
+            result.value = [options objectForKey:CPDisplayPatternBindingOption];
+
+        if (CPIsControllerMarker(value))
+        {
+            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
+
+            result.isPlaceholder = YES;
+            result.marker = value;
+
+            value = [theBinding _placeholderForMarker:value];
+        }
+        else
+            value = [theBinding transformValue:value withOptions:options];
+
+        if (value === nil || value === undefined)
+            value = @"";
+
+        result.value = result.value.replace("%{" + _patternPlaceholder + count + "}@", [value description]);
+    }
+
+    return result;
+}
+
+@end
+
+
+/*!
+    Users of this class must override setValue:forKey: and if the
+    key is CPDisplayPatternValueBinding, set the appropriate value
+    for the control class. For example, CPTextField uses setObjectValue.
+*/
+@implementation CPValueWithPatternBinding : _CPPatternBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _bindingKey = CPDisplayPatternValueBinding;
+        _patternPlaceholder = @"value";
+    }
+
+    return self;
+}
+
+@end
+
+
+/*!
+    Users of this class must override setValue:forKey: and if the
+    key is CPDisplayPatternTitleBinding, set the appropriate value
+    for the control class. For example, CPBox uses setTitle.
+*/
+@implementation CPTitleWithPatternBinding : _CPPatternBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _bindingKey = CPDisplayPatternTitleBinding;
+        _patternPlaceholder = @"title";
+    }
+
+    return self;
+}
+
+@end
+
+@implementation _CPStateMarker : CPObject
+{
+    CPString _name;
+}
+
+- (id)initWithName:(CPString)aName
+{
+    if (self = [super init])
+        _name = aName
+
+    return self;
+}
+
+- (CPString)description
+{
+    return "<" + _name + ">";
+}
+
+@end
+

 // Keys in options dictionary

@@ -545,18 +835,23 @@ CPObservedKeyPathKey    = @"CPObservedKeyPathKey";
 CPOptionsKey            = @"CPOptionsKey";

 // special markers
-CPMultipleValuesMarker  = @"CPMultipleValuesMarker";
-CPNoSelectionMarker     = @"CPNoSelectionMarker";
-CPNotApplicableMarker   = @"CPNotApplicableMarker";
-CPNullMarker            = @"CPNullMarker";
+CPNoSelectionMarker     = [[_CPStateMarker alloc] initWithName:@"NO SELECTION MARKER"];
+CPMultipleValuesMarker  = [[_CPStateMarker alloc] initWithName:@"MULTIPLE VALUES MARKER"];
+CPNotApplicableMarker   = [[_CPStateMarker alloc] initWithName:@"NOT APPLICABLE MARKER"];
+CPNullMarker            = [[_CPStateMarker alloc] initWithName:@"NULL MARKER"];

 // Binding name constants
 CPAlignmentBinding                        = @"alignment";
+CPArgumentBinding                         = @"argument";
 CPContentArrayBinding                     = @"contentArray";
 CPContentBinding                          = @"content";
 CPContentObjectBinding                    = @"contentObject";
 CPContentObjectsBinding                   = @"contentObjects";
 CPContentValuesBinding                    = @"contentValues";
+CPDisplayPatternTitleBinding              = @"displayPatternTitle";
+CPDisplayPatternValueBinding              = @"displayPatternValue";
+CPDoubleClickArgumentBinding              = @"doubleClickArgument";
+CPDoubleClickTargetBinding                = @"doubleClickTarget";
 CPEditableBinding                         = @"editable";
 CPEnabledBinding                          = @"enabled";
 CPFontBinding                             = @"font";
@@ -564,6 +859,8 @@ CPFontNameBinding                         = @"fontName";
 CPFontBoldBinding                         = @"fontBold";
 CPHiddenBinding                           = @"hidden";
 CPFilterPredicateBinding                  = @"filterPredicate";
+CPMaxValueBinding                         = @"maxValue";
+CPMinValueBinding                         = @"minValue";
 CPPredicateBinding                        = @"predicate";
 CPSelectedIndexBinding                    = @"selectedIndex";
 CPSelectedLabelBinding                    = @"selectedLabel";
@@ -573,6 +870,7 @@ CPSelectedTagBinding                      = @"selectedTag";
 CPSelectedValueBinding                    = @"selectedValue";
 CPSelectedValuesBinding                   = @"selectedValues";
 CPSelectionIndexesBinding                 = @"selectionIndexes";
+CPTargetBinding                           = @"target";
 CPTextColorBinding                        = @"textColor";
 CPTitleBinding                            = @"title";
 CPToolTipBinding                          = @"toolTip";
@@ -581,7 +879,7 @@ CPValueURLBinding                         = @"valueURL";
 CPValuePathBinding                        = @"valuePath";
 CPDataBinding                             = @"data";

-//Binding options constants
+// Binding options constants
 CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
 CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgument";
 CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditable";
@@ -21,6 +21,9 @@
 */

@import "CPControl.j"
+@import "CPWindow_Constants.j"
+
+@global CPApp

 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
@@ -32,14 +35,6 @@ CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;
 CPRatingLevelIndicatorStyle                 = 3;

-var _CPLevelIndicatorBezelColor = nil,
-    _CPLevelIndicatorSegmentEmptyColor = nil,
-    _CPLevelIndicatorSegmentNormalColor = nil,
-    _CPLevelIndicatorSegmentWarningColor = nil,
-    _CPLevelIndicatorSegmentCriticalColor = nil,
-
-    _CPLevelIndicatorSpacing = 1;
-
 /*!
    @ingroup appkit
    @class CPLevelIndicator
@@ -62,57 +57,21 @@ var _CPLevelIndicatorBezelColor = nil,
    BOOL                _isTracking;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [CPLevelIndicator class])
-        return;
+    return "level-indicator";
+}

-    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
-    ]];
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"bezel-color": [CPNull null],
+            @"color-empty": [CPNull null],
+            @"color-normal": [CPNull null],
+            @"color-warning": [CPNull null],
+            @"color-critical": [CPNull null],
+            @"spacing": 1.0,
+        };
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -125,37 +84,31 @@ var _CPLevelIndicatorBezelColor = nil,
        _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];
+    [bezelView setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];

    var segmentCount = _maxValue - _minValue;

    if (segmentCount <= 0)
        return;

-    var filledColor = _CPLevelIndicatorSegmentNormalColor,
+    var filledColor = [self valueForThemeAttribute:@"color-normal"],
        value = [self doubleValue];

    if (value <= _criticalValue)
-        filledColor = _CPLevelIndicatorSegmentCriticalColor;
+        filledColor = [self valueForThemeAttribute:@"color-critical"];
    else if (value <= _warningValue)
-        filledColor = _CPLevelIndicatorSegmentWarningColor;
+        filledColor = [self valueForThemeAttribute:@"color-warning"];

    for (var i = 0; i < segmentCount; i++)
    {
@@ -163,13 +116,13 @@ var _CPLevelIndicatorBezelColor = nil,
                                               positioned:CPWindowAbove
                          relativeToEphemeralSubviewNamed:bezelView];

-        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor];
+        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]];
    }
 }

 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
 }

 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
@@ -177,11 +130,11 @@ var _CPLevelIndicatorBezelColor = nil,
    // TODO Put into theme attributes.
    var bezelHeight = 18,
        segmentHeight = 17,
-        bounds = _CGRectCreateCopy([self bounds]);
+        bounds = CGRectCreateCopy([self bounds]);

    if (aViewName == "bezel")
    {
-        bounds.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
+        bounds.origin.y = (CGRectGetHeight(bounds) - bezelHeight) / 2.0;
        bounds.size.height = bezelHeight;
        return bounds;
    }
@@ -191,20 +144,21 @@ var _CPLevelIndicatorBezelColor = nil,
            segmentCount = _maxValue - _minValue;

        if (segment >= segmentCount)
-            return _CGRectMakeZero();
+            return CGRectMakeZero();

        var basicSegmentWidth = bounds.size.width / segmentCount,
-            segmentFrame = CGRectCreateCopy([self bounds]);
+            segmentFrame = CGRectCreateCopy([self bounds]),
+            spacing = [self valueForThemeAttribute:@"spacing"];

-        segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
+        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.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - spacing;
        segmentFrame.size.height = segmentHeight;

        return segmentFrame;
    }

-    return _CGRectMakeZero();
+    return CGRectMakeZero();
 }

 /*!
@@ -226,7 +180,7 @@ var _CPLevelIndicatorBezelColor = nil,
    return _isEditable;
 }

- (CPView)hitTest:(CPPoint)aPoint
+- (CPView)hitTest:(CGPoint)aPoint
 {
    // Don't swallow clicks when displayed in a table.
    if (![self isEditable])
@@ -388,8 +342,6 @@ var CPLevelIndicatorStyleKey                    = "CPLevelIndicatorStyleKey",

        _isEditable = [aCoder decodeBoolForKey:CPLevelIndicatorIsEditableKey];

-        [self _init];
-
        [self setNeedsLayout];
        [self setNeedsDisplay:YES];
    }
@@ -25,12 +25,10 @@
@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPString.j>

-@import "_CPMenuManager.j"
-@import "CPApplication.j"
-@import "CPClipView.j"
+@import "CPKeyValueBinding.j"
@import "CPMenuItem.j"
-@import "CPPanel.j"

+@global CPApp

 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -38,12 +36,8 @@ CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";

 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";

-var MENUBAR_HEIGHT = 28.0;
-
 var _CPMenuBarVisible               = NO,
    _CPMenuBarTitle                 = @"",
-    _CPMenuBarIconImage             = nil,
-    _CPMenuBarIconImageAlphaValue   = 1.0,
    _CPMenuBarAttributes            = nil,
    _CPMenuBarSharedWindow          = nil;

@@ -74,6 +68,8 @@ var _CPMenuBarVisible               = NO,

    int             _highlightedIndex;
    _CPMenuWindow   _menuWindow;
+
+    CPEvent         _lastCloseEvent;
 }

 // Managing the Menu Bar
@@ -83,7 +79,7 @@ var _CPMenuBarVisible               = NO,
    if (self !== [CPMenu class])
        return;

-    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
+    [[self class] setMenuBarAttributes:@{}];
 }

 + (BOOL)menuBarVisible
@@ -109,8 +105,8 @@ var _CPMenuBarVisible               = NO,
        [_CPMenuBarSharedWindow setMenu:[CPApp mainMenu]];

        [_CPMenuBarSharedWindow setTitle:_CPMenuBarTitle];
-        [_CPMenuBarSharedWindow setIconImage:_CPMenuBarIconImage];
-        [_CPMenuBarSharedWindow setIconImageAlphaValue:_CPMenuBarIconImageAlphaValue];
+        [_CPMenuBarSharedWindow setIconImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image" forClass:_CPMenuView]];
+        [_CPMenuBarSharedWindow setIconImageAlphaValue:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image-alpha-value" forClass:_CPMenuView]];

        [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
        [_CPMenuBarSharedWindow setTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTextColor"]];
@@ -154,6 +150,13 @@ var _CPMenuBarVisible               = NO,
    return _CPMenuBarImage;
 }

+ (void)_setOrRemoveMenuBarAttribute:(id)aValue forKey:(id)aKey
+{
+    if (aValue === nil)
+        [_CPMenuBarAttributes removeObjectForKey:aKey];
+    else
+        [_CPMenuBarAttributes setObject:aValue forKey:aKey];
+}

 + (void)setMenuBarAttributes:(CPDictionary)attributes
 {
@@ -178,8 +181,8 @@ var _CPMenuBarVisible               = NO,

    else if (!textColor && !titleColor)
    {
-        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTextColor"];
-        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTitleColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
    }

    if (!textShadowColor && titleShadowColor)
@@ -190,18 +193,18 @@ var _CPMenuBarVisible               = NO,

    else if (!textShadowColor && !titleShadowColor)
    {
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleShadowColor"];
    }

    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"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];

    if (!highlightTextColor)
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextColor"];

    if (!highlightTextShadowColor)
-        [_CPMenuBarAttributes setObject:[CPColor blackColor] forKey:@"CPMenuBarHighlightTextShadowColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextShadowColor"];

    if (_CPMenuBarSharedWindow)
    {
@@ -230,14 +233,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
    if (self === [CPApp mainMenu])
-        return MENUBAR_HEIGHT;
+        return [CPMenu menuBarHeight];

    return 0.0;
 }

 + (float)menuBarHeight
 {
-    return MENUBAR_HEIGHT;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
 }

 // Creating a CPMenu Object
@@ -275,7 +278,7 @@ var _CPMenuBarVisible               = NO,
    @param aMenuItem the item to insert
    @param anIndex the index in the menu to insert the item.
 */
- (void)insertItem:(CPMenuItem)aMenuItem atIndex:(unsigned)anIndex
+- (void)insertItem:(CPMenuItem)aMenuItem atIndex:(CPUInteger)anIndex
 {
    [self insertObject:aMenuItem inItemsAtIndex:anIndex];
 }
@@ -288,7 +291,7 @@ var _CPMenuBarVisible               = NO,
    @param anIndex the index location in the menu for the new item
    @return the new menu item
 */
- (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(unsigned)anIndex
+- (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(CPUInteger)anIndex
 {
    var item = [[CPMenuItem alloc] initWithTitle:aTitle action:anAction keyEquivalent:aKeyEquivalent];

@@ -332,7 +335,7 @@ var _CPMenuBarVisible               = NO,
    Removes the item at the specified index from the menu
    @param anIndex the index of the item to remove
 */
- (void)removeItemAtIndex:(unsigned)anIndex
+- (void)removeItemAtIndex:(CPUInteger)anIndex
 {
    [self removeObjectFromItemsAtIndex:anIndex];
 }
@@ -352,7 +355,7 @@ var _CPMenuBarVisible               = NO,
    while (count--)
        [_items[count] setMenu:nil];

-    _highlightedIndex = CPNotFound;
+    [self _highlightItemAtIndex:CPNotFound];

    // Because we are changing _items directly, be sure to notify KVO
    [self willChangeValueForKey:@"items"];
@@ -366,7 +369,12 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)itemChanged:(CPMenuItem)aMenuItem
 {
-    if ([aMenuItem menu] !== self)
+    /*
+        During cib unarchiving, menu items will have a reference to their menu,
+        but of course the items are still being unarchived and the menu's _items
+        have not yet been instantiated. In that case we will not do anything here.
+    */
+    if ([aMenuItem menu] !== self || !_items)
        return;

    [aMenuItem setValue:[aMenuItem valueForKey:@"changeCount"] + 1 forKey:@"changeCount"];
@@ -374,7 +382,7 @@ var _CPMenuBarVisible               = NO,
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPMenuDidChangeItemNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:[_items indexOfObjectIdenticalTo:aMenuItem] forKey:@"CPMenuItemIndex"]];
+                    userInfo:@{ @"CPMenuItemIndex": [_items indexOfObjectIdenticalTo:aMenuItem] }];
 }

 // Finding Menu Items
@@ -607,15 +615,17 @@ var _CPMenuBarVisible               = NO,

 /*!
    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.
+    If the item has no target, an action binding is checked. If the target does not implement
+    the menu item's action method or the binding's selector, the item is disabled.
+    If the target responds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
 */
 - (void)update
 {
-    if (![self autoenablesItems])
+    if (!_autoenablesItems)
        return;

    var items = [self itemArray];
+
    for (var i = 0; i < [items count]; i++)
    {
        var item = [items objectAtIndex:i];
@@ -623,14 +633,50 @@ var _CPMenuBarVisible               = NO,
        if ([item hasSubmenu])
            continue;

-        var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
+        // If there are enabled bindings for the item, they override anything else
+        var binder = [CPBinder getBinding:CPEnabledBinding forObject:item];

-        if (!validator || ![validator respondsToSelector:[item action]])
-            [item setEnabled:NO];
+        if (binder)
+        {
+            [binder setValueFor:CPEnabledBinding];
+            return;
+        }
+
+        var validator = [CPApp targetForAction:[item action] to:[item target] from:item],
+            shouldBeEnabled = YES;
+
+        if (!validator)
+        {
+            // If targetForAction: returns nil, it could be that there is no action.
+            // If there is an action and nil is returned, no valid target could be found.
+            if ([item action] || [item target])
+                shouldBeEnabled = NO;
+            else
+            {
+                // Check to see if there is a target binding with an invalid selector
+                var info = [CPBinder infoForBinding:CPTargetBinding forObject:item];
+
+                if (info)
+                {
+                    var object = [info objectForKey:CPObservedObjectKey],
+                        keyPath = [info objectForKey:CPObservedKeyPathKey],
+                        options = [info objectForKey:CPOptionsKey],
+                        target = [object valueForKeyPath:keyPath],
+                        selector = [options valueForKey:CPSelectorNameBindingOption];
+
+                    if (target && selector && ![target respondsToSelector:CPSelectorFromString(selector)])
+                        shouldBeEnabled = NO;
+                }
+            }
+        }
+        else if (![validator respondsToSelector:[item action]])
+            shouldBeEnabled = NO;
        else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            [item setEnabled:[validator validateMenuItem:item]];
+            shouldBeEnabled = [validator validateMenuItem:item];
        else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            [item setEnabled:[validator validateUserInterfaceItem:item]];
+            shouldBeEnabled = [validator validateUserInterfaceItem:item];
+
+        [item setEnabled:shouldBeEnabled];
    }

    [[_menuWindow _menuView] tile];
@@ -675,7 +721,13 @@ var _CPMenuBarVisible               = NO,
    // highlightedItem is always enabled. Do there exist edge cases: disabling on closing a menu,
    // etc.? Requires further investigation and tests.
    if (highlightedItem && [highlightedItem isEnabled])
+    {
+        // Perform any action binding
+        var binding = [CPBinder getBinding:CPTargetBinding forObject:highlightedItem];
+        [binding invokeAction];
+
        [CPApp sendAction:[highlightedItem action] to:[highlightedItem target] from:highlightedItem];
+    }
 }

 //
@@ -803,6 +855,9 @@ var _CPMenuBarVisible               = NO,

 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
+    // This is needed when we are making several rights click
+    [[_CPMenuManager sharedMenuManager] cancelActiveMenu];
+
    [aMenu _menuWillOpen];

    if (!aFont)
@@ -906,6 +961,10 @@ var _CPMenuBarVisible               = NO,

 - (void)_menuDidClose
 {
+    // Remember which event caused this menu to close, if any. CPPopUpButton uses this to detect
+    // when a click on the button itself caused the menu to close.
+    _lastCloseEvent = [CPApp currentEvent];
+
    var delegate = [self delegate];

    if ([delegate respondsToSelector:@selector(menuDidClose:)])
@@ -925,7 +984,7 @@ var _CPMenuBarVisible               = NO,
 {
    [CPApp sendEvent:[CPEvent
        otherEventWithType:CPAppKitDefined
-                  location:_CGPointMakeZero()
+                  location:CGPointMakeZero()
             modifierFlags:0
                 timestamp:0
              windowNumber:0
@@ -976,8 +1035,7 @@ var _CPMenuBarVisible               = NO,

    for (; index < count; ++index)
    {
-        var item = _items[index],
-            modifierMask = [item keyEquivalentModifierMask];
+        var item = _items[index];

        if ([anEvent _triggersKeyEquivalent:[item keyEquivalent] withModifierMask:[item keyEquivalentModifierMask]])
        {
@@ -1003,7 +1061,7 @@ var _CPMenuBarVisible               = NO,
    Sends the action of the menu item at the specified index.
    @param anIndex the index of the item
 */
- (void)performActionForItemAtIndex:(unsigned)anIndex
+- (void)performActionForItemAtIndex:(CPUInteger)anIndex
 {
    var item = _items[anIndex];

@@ -1106,12 +1164,13 @@ var _CPMenuBarVisible               = NO,
            return;

    [aMenuItem setMenu:self];
+    [self _highlightItemAtIndex:CPNotFound];
    [_items insertObject:aMenuItem atIndex:anIndex];

    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPMenuDidAddItemNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
 }

 - (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
@@ -1120,12 +1179,13 @@ var _CPMenuBarVisible               = NO,
        return;

    [[_items objectAtIndex:anIndex] setMenu:nil];
+    [self _highlightItemAtIndex:CPNotFound];
    [_items removeObjectAtIndex:anIndex];

    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPMenuDidRemoveItemNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
 }

@end
@@ -1133,7 +1193,8 @@ var _CPMenuBarVisible               = NO,
 var CPMenuTitleKey              = @"CPMenuTitleKey",
    CPMenuNameKey               = @"CPMenuNameKey",
    CPMenuItemsKey              = @"CPMenuItemsKey",
-    CPMenuShowsStateColumnKey   = @"CPMenuShowsStateColumnKey";
+    CPMenuShowsStateColumnKey   = @"CPMenuShowsStateColumnKey",
+    CPMenuAutoEnablesItemsKey   = @"CPMenuAutoEnablesItemsKey";

@implementation CPMenu (CPCoding)

@@ -1155,7 +1216,7 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",

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

-        _autoenablesItems = YES;
+        _autoenablesItems = ![aCoder containsValueForKey:CPMenuAutoEnablesItemsKey] || [aCoder decodeBoolForKey:CPMenuAutoEnablesItemsKey];

        [self setMinimumWidth:0];
    }
@@ -1178,6 +1239,9 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",

    if (!_showsStateColumn)
        [aCoder encodeBool:_showsStateColumn forKey:CPMenuShowsStateColumnKey];
+
+    if (!_autoenablesItems)
+        [aCoder encodeBool:_autoenablesItems forKey:CPMenuAutoEnablesItemsKey];
 }

@end
@@ -1,14 +1,33 @@
+/*
+ * _CPMenuBarWindow.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"
-@import "_CPMenuWindow.j"
+@import "_CPMenuManager.j"

+@class _CPMenuView

-var MENUBAR_HEIGHT          = 28.0,
-    MENUBAR_MARGIN          = 10.0,
-    MENUBAR_LEFT_MARGIN     = 10.0,
-    MENUBAR_RIGHT_MARGIN    = 10.0;
-
-var _CPMenuBarWindowBackgroundColor = nil,
-    _CPMenuBarWindowFont            = nil;
+@global CPMenuDidAddItemNotification
+@global CPMenuDidChangeItemNotification
+@global CPMenuDidRemoveItemNotification

@implementation _CPMenuBarWindow : CPPanel
 {
@@ -32,19 +51,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
    CPColor     _highlightTextShadowColor;
 }

-+ (void)initialize
-{
-    if (self !== [_CPMenuBarWindow class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:[CPFont systemFontSize]];
-}
-
 + (CPFont)font
 {
-    return _CPMenuBarWindowFont;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
 }

 - (id)init
@@ -52,12 +61,14 @@ var _CPMenuBarWindowBackgroundColor = nil,
    // This only shows up in browser land, so don't bother calculating metrics in desktop.
    var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];

-    contentRect.size.height = MENUBAR_HEIGHT;
+    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];

    self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];

    if (self)
    {
+        _constrainsToUsableScreen = NO;
+
        [self setLevel:CPMainMenuWindowLevel];
        [self setAutoresizingMask:CPWindowWidthSizable];

@@ -119,12 +130,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 - (void)setColor:(CPColor)aColor
 {
    if (!aColor)
-    {
-        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];
-    }
+        [[self contentView] setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
    else
        [[self contentView] setBackgroundColor:aColor];
 }
@@ -137,6 +143,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
    _textColor = aColor;

    [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
+    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuTextColor:) withObject:_textColor];
 }

 - (void)setTitleColor:(CPColor)aColor
@@ -157,6 +164,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
    _textShadowColor = aColor;

    [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
+    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuTextShadowColor:) withObject:_textShadowColor];
 }

 - (void)setTitleShadowColor:(CPColor)aColor
@@ -175,6 +183,8 @@ var _CPMenuBarWindowBackgroundColor = nil,
        return;

    _highlightColor = aColor;
+
+    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightColor:) withObject:_highlightColor];
 }

 - (void)setHighlightTextColor:(CPColor)aColor
@@ -184,7 +194,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

    _highlightTextColor = aColor;

-//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
+    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightTextColor:) withObject:_highlightTextColor];
 }

 - (void)setHighlightTextShadowColor:(CPColor)aColor
@@ -194,7 +204,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

    _highlightTextShadowColor = aColor;

-//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
+    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightTextShadowColor:) withObject:_highlightTextShadowColor];
 }

 - (void)setMenu:(CPMenu)aMenu
@@ -316,6 +326,11 @@ var _CPMenuBarWindowBackgroundColor = nil,
    [self tile];
 }

+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return YES;
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
    var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
@@ -344,7 +359,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
        index = 0,
        count = items.length,

-        x = MENUBAR_LEFT_MARGIN,
+        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView],
        y = 0.0,
        isLeftAligned = YES;

@@ -354,7 +369,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

        if ([item isSeparatorItem])
        {
-            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
            isLeftAligned = NO;

            continue;
@@ -368,13 +383,13 @@ var _CPMenuBarWindowBackgroundColor = nil,

        if (isLeftAligned)
        {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];

            x += CGRectGetWidth([menuItemView frame]);
        }
        else
        {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];

            x = CGRectGetMinX([menuItemView frame]);
        }
@@ -402,7 +417,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

    [super setFrame:aRect display:shouldDisplay animate:shouldAnimate];

-    if (!_CGSizeEqualToSize(size, aRect.size))
+    if (!CGSizeEqualToSize(size, aRect.size))
        [self tile];
 }

@@ -452,102 +467,3 @@ var _CPMenuBarWindowBackgroundColor = nil,
 }

@end
-
-@implementation _CPMenuBarView : _CPMenuView
-{
-}
-
- (CGRect)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
-}
-
- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var bounds = [self bounds];
-
-    if (!CGRectContainsPoint(bounds, aPoint))
-        return CPNotFound;
-
-    var x = aPoint.x,
-        low = 0,
-        high = _visibleMenuItemInfos.length - 1;
-
-    while (low <= high)
-    {
-        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle],
-            frame = [info.view frame];
-
-        if (x < CGRectGetMinX(frame))
-            high = middle - 1;
-
-        else if (x > CGRectGetMaxX(frame))
-            low = middle + 1;
-
-        else
-            return info.index;
-   }
-
-   return CPNotFound;
-}
-
- (void)tile
-{
-    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 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
-    {
-        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)];
-    }
-}
-
-@end
@@ -1,16 +1,51 @@
-@import <Foundation/CPObject.j>
+/*
+ * _CPMenuManager.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>
+@import <Foundation/CPNotificationCenter.j>
+
+@import "CPEvent.j"
+@import "CPKeyBinding.j"
+
+@class CPWindow
+@class _CPMenuWindow
+
+
+@global CPApp
+@global CPMenuDidEndTrackingNotification
+@global _CPMenuWindowMenuBarBackgroundStyle
+@global _CPMenuWindowPopUpBackgroundStyle

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

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

@implementation _CPMenuManager: CPObject
 {
    CPTimeInterval      _startTime;
+    CPEvent             _openEvent;
    BOOL                _mouseWasDragged;
    int                 _scrollingState;
    CGPoint             _lastGlobalLocation;
@@ -26,6 +61,8 @@ var STICKY_TIME_INTERVAL            = 0.5,

    CPMenuItem          _previousActiveItem;
    int                 _showTimerID;
+
+    int                 _menuBarButtonItemIndex;
 }

 + (_CPMenuManager)sharedMenuManager
@@ -67,6 +104,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
    CPApp._activeMenu = menu;

    _startTime = [anEvent timestamp];
+    _openEvent = anEvent;
    _scrollingState = _CPMenuManagerScrollingStateNone;

    _constraintRect = aRect;
@@ -85,7 +123,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;

        _menuBarButtonItemIndex = activeItemIndex;
-        _menuBarButtonMenuContainer = aMenuContainer;
+//        _menuBarButtonMenuContainer = aMenuContainer;

        if ([activeItem _isMenuBarButton])
            return [self trackMenuBarButtonEvent:anEvent];
@@ -96,6 +134,11 @@ var STICKY_TIME_INTERVAL            = 0.5,
    [self trackEvent:anEvent];
 }

+- (void)_trackAgain
+{
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseDownMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
+}
+
 - (void)trackEvent:(CPEvent)anEvent
 {
    var type = [anEvent type],
@@ -105,8 +148,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
    if (type === CPAppKitDefined)
        return [self completeTracking];

-    [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,
@@ -122,23 +163,18 @@ var STICKY_TIME_INTERVAL            = 0.5,
        if ([menu numberOfItems])
            [self interpretKeyEvent:anEvent forMenu:menu];

+        [self _trackAgain];
        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];

    if (!globalLocation)
+    {
+        [self _trackAgain];
        return;
+    }

    // Find which menu window the mouse is currently on top of
    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
@@ -149,6 +185,35 @@ var STICKY_TIME_INTERVAL            = 0.5,
        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;

+    /*
+    Click outside the menu structure?
+
+    The event which caused the menu to open is not considered even if it's
+    technically a click outside of an open menu, since this would mean the same
+    click which opened the menu could also close it. This is actually common.
+    E.g. you click on a button and it opens a menu below itself.
+    */
+    if (type === CPLeftMouseDown && _openEvent !== anEvent && (!activeMenuContainer || !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation)))
+    {
+        [self completeTracking];
+
+        /*
+        You can close and interact with a control in a single click. E.g. you can have a menu open,
+        click on a button outside of it and have the menu immediately close and the button activate,
+        without having to click once to close the menu and once to activate the button.
+
+        Since we normally dequeue the event after tracking it, we'll have to put it back on the stack
+        in this special case. Note that it's important the event is executed /right now/, since certain
+        controls such as HTML upload buttons need a native click event at the top of the stack trace
+        to activate - it's not something we can fake later.
+        */
+        [CPApp sendEvent:anEvent];
+
+        return;
+    }
+
+    [self _trackAgain];
+
    // unhighlight when mouse is moved off the menu
    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
@@ -185,9 +250,9 @@ var STICKY_TIME_INTERVAL            = 0.5,

        if (_lastMouseOverMenuView != mouseOverMenuView)
        {
-            [mouseOverMenuView mouseExited:anEvent];
+            [_lastMouseOverMenuView mouseExited:anEvent];
            // FIXME: Possibly multiple of these?
-            [_lastMouseOverMenuView mouseEntered:anEvent];
+            [mouseOverMenuView mouseEntered:anEvent];

            _lastMouseOverMenuView = mouseOverMenuView;
        }
@@ -216,7 +281,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
            _lastMouseOverMenuView = nil;
        }

-        if (activeItemIndex != CPNotFound)
+        if (activeItemIndex !== CPNotFound)
            [activeMenu _highlightItemAtIndex:activeItemIndex];

        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
@@ -342,6 +407,15 @@ var STICKY_TIME_INTERVAL            = 0.5,
        [menu cancelTracking];
 }

+- (void)cancelActiveMenu
+{
+    if (CPApp._activeMenu)
+    {
+        [self completeTracking];
+        _menuContainerStack = [];
+    }
+}
+
 - (void)completeTracking
 {
    var trackingMenu = [self trackingMenu];
@@ -392,8 +466,8 @@ var STICKY_TIME_INTERVAL            = 0.5,
    {
        var menuContainer = _menuContainerStack[index],
            menuContainerFrame = [menuContainer globalFrame],
-            menuContainerMinX = _CGRectGetMinX(menuContainerFrame),
-            menuContainerMaxX = _CGRectGetMaxX(menuContainerFrame);
+            menuContainerMinX = CGRectGetMinX(menuContainerFrame),
+            menuContainerMaxX = CGRectGetMaxX(menuContainerFrame);

        // If within the x bounds of this menu container, return it.
        if (x < menuContainerMaxX && x >= menuContainerMinX)
@@ -489,6 +563,9 @@ var STICKY_TIME_INTERVAL            = 0.5,
    }
    else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
    {
+        if (([anEvent timestamp] - _startTime) > STICKY_TIME_INTERVAL)
+            _keyBuffer = nil;
+
        if (!_keyBuffer)
        {
            _startTime = [anEvent timestamp];
@@ -500,12 +577,12 @@ var STICKY_TIME_INTERVAL            = 0.5,
        else
            _keyBuffer += character;

-        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:NO];
-        _lastGlobalLocation = Nil;
+        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu];
+        _lastGlobalLocation = nil;
    }
 }

- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu clearBuffer:(BOOL)shouldClear
+- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu
 {
    var iter = [[menu itemArray] objectEnumerator],
        obj;
@@ -522,13 +599,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
        }
    }

-    if (shouldClear)
-    {
-        [CPEvent stopPeriodicEvents];
-        _keyBuffer = Nil;
-    }
-    else
-        _startTime = [CPEvent currentTimestamp];
+    _startTime = [CPEvent currentTimestamp];
 }

 - (void)scrollToBeginningOfDocument:(CPMenu)menu
@@ -556,7 +627,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
        return;
    }

-    next = current + (last - first);
+    var next = current + (last - first);

    if (next < [menu numberOfItems])
        [menu _highlightItemAtIndex:next];
@@ -584,7 +655,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
        return;
    }

-    next = current - (last - first);
+    var next = current - (last - first);

    if (next < 0)
        [menu _highlightItemAtIndex:0];
@@ -665,6 +736,8 @@ var STICKY_TIME_INTERVAL            = 0.5,
        if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
            [self moveDown:menu];
    }
+    else if (menu == [CPApp mainMenu])
+         [menu _highlightItemAtIndex:0];
 }

 - (void)moveUp:(CPMenu)menu
@@ -673,10 +746,12 @@ var STICKY_TIME_INTERVAL            = 0.5,

    if (index < 0)
    {
-        if (index != CPNotFound)
+        if (index != CPNotFound || menu == [CPApp mainMenu])
            [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+
        return;
    }
+
    [menu _highlightItemAtIndex:index];

    var item = [menu highlightedItem];
@@ -1,5 +1,29 @@
-@import "CPWindow.j"
+/*
+ * _CPMenuWindow.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 "CPClipView.j"
+@import "CPImageView.j"
+@import "CPWindow.j"
+@import "_CPMenuManager.j"

 var _CPMenuWindowPool                       = [],
    _CPMenuWindowPoolCapacity               = 5,
@@ -10,15 +34,6 @@ _CPMenuWindowMenuBarBackgroundStyle         = 0;
 _CPMenuWindowPopUpBackgroundStyle           = 1;
 _CPMenuWindowAttachedMenuBackgroundStyle    = 2;

-var STICKY_TIME_INTERVAL        = 500,
-
-    TOP_MARGIN                  = 5.0,
-    LEFT_MARGIN                 = 1.0,
-    RIGHT_MARGIN                = 1.0,
-    BOTTOM_MARGIN               = 5.0,
-
-    SCROLL_INDICATOR_HEIGHT     = 16.0;
-
 /*
    @ignore
 */
@@ -57,32 +72,24 @@ var STICKY_TIME_INTERVAL        = 500,

 + (void)poolMenuWindow:(_CPMenuWindow)aMenuWindow
 {
-    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity)
+    // FIXME :the poolMenuWindow is called too many times somewhere....
+    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity || [_CPMenuWindowPool containsObject:aMenuWindow])
        return;

    _CPMenuWindowPool.push(aMenuWindow);
 }

-+ (void)initialize
-{
-    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)];
-}
-
 - (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
 {
-    _constraintRect = _CGRectMakeZero();
-    _unconstrainedFrame = _CGRectMakeZero();
+    _constraintRect = CGRectMakeZero();
+    _unconstrainedFrame = CGRectMakeZero();

    self = [super initWithContentRect:aRect styleMask:CPBorderlessWindowMask];

    if (self)
    {
+        _constrainsToUsableScreen = NO;
+
        [self setLevel:CPPopUpMenuWindowLevel];
        [self setHasShadow:YES];
        [self setShadowStyle:CPMenuWindowShadowStyle];
@@ -92,22 +99,22 @@ var STICKY_TIME_INTERVAL        = 500,

        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];

-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
+        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake([_menuView valueForThemeAttribute:@"menu-window-margin-inset"].left, [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top, 0.0, 0.0)];
        [_menuClipView setDocumentView:_menuView];

        [contentView addSubview:_menuClipView];

        _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];

-        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
-        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
+        [_moreAboveView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-above-image"]];
+        [_moreAboveView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-above-image"] size]];

        [contentView addSubview:_moreAboveView];

        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];

-        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
-        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
+        [_moreBelowView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-below-image"]];
+        [_moreBelowView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-below-image"] size]];

        [contentView addSubview:_moreBelowView];
    }
@@ -117,7 +124,7 @@ var STICKY_TIME_INTERVAL        = 500,

 + (float)_standardLeftMargin
 {
-    return LEFT_MARGIN;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
 }

 - (void)setFont:(CPFont)aFont
@@ -139,36 +146,10 @@ var STICKY_TIME_INTERVAL        = 500,
        var bundle = [CPBundle bundleForClass:[self class]];

        if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-                [
-                    [[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)]
-                ]]];
+            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];

        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)]
-                ]]];
+            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];

        _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
    }
@@ -186,12 +167,13 @@ var STICKY_TIME_INTERVAL        = 500,
    [aMenu _setMenuWindow:self];
    [_menuView setMenu:aMenu];

-    var menuViewSize = [_menuView frame].size;
+    var menuViewSize = [_menuView frame].size,
+        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];

-    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
+    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];

    [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
+    [_menuClipView setFrame:CGRectMake(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
 }

 - (void)setMinWidth:(float)aWidth
@@ -228,28 +210,30 @@ var STICKY_TIME_INTERVAL        = 500,

 - (CGRect)unconstrainedFrame
 {
-    return _CGRectMakeCopy(_unconstrainedFrame);
+    return CGRectMakeCopy(_unconstrainedFrame);
 }

 // We need this because if not this will call setFrame: with -frame instead of -unconstrainedFrame, turning
 // the constrained frame into the unconstrained frame.
 - (void)setFrameOrigin:(CGPoint)aPoint
 {
-    [super setFrame:_CGRectMake(aPoint.x, aPoint.y, _CGRectGetWidth(_unconstrainedFrame), _CGRectGetHeight(_unconstrainedFrame))];
+    [super setFrame:CGRectMake(aPoint.x, aPoint.y, CGRectGetWidth(_unconstrainedFrame), CGRectGetHeight(_unconstrainedFrame))];
 }

 - (void)setFrameSize:(CGSize)aSize
 {
-    [super setFrame:_CGRectMake(_CGRectGetMinX(_unconstrainedFrame), _CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
+    [super setFrame:CGRectMake(CGRectGetMinX(_unconstrainedFrame), CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
 }

 - (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
 {
    // FIXME: There are integral window issues with platform windows.
    // FIXME: This gets called far too often.
-    _unconstrainedFrame = _CGRectMakeCopy(aFrame);
+    _unconstrainedFrame = CGRectMakeCopy(aFrame);

-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
+        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
+        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];

    // We don't want to simply intersect the visible frame and the unconstrained frame.
    // We should be allowing as much of the width to fit as possible (pushing back and forward).
@@ -268,41 +252,41 @@ var STICKY_TIME_INTERVAL        = 500,
    [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];

    // This needs to happen before changing the frame.
-    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + LEFT_MARGIN, CGRectGetMinY(aFrame) + TOP_MARGIN),
-        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + TOP_MARGIN,
-        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - BOTTOM_MARGIN,
+    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + marginInset.left, CGRectGetMinY(aFrame) + marginInset.top),
+        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + marginInset.top,
+        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - marginInset.bottom,

-        topMargin = TOP_MARGIN,
-        bottomMargin = BOTTOM_MARGIN,
+        topMargin = marginInset.top,
+        bottomMargin = marginInset.bottom,

        contentView = [self contentView],
        bounds = [contentView bounds];

    if (moreAbove)
    {
-        topMargin += SCROLL_INDICATOR_HEIGHT;
+        topMargin += scrollIndicatorHeight;

        var frame = [_moreAboveView frame];

-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
    }

    [_moreAboveView setHidden:!moreAbove];

    if (moreBelow)
    {
-        bottomMargin += SCROLL_INDICATOR_HEIGHT;
+        bottomMargin += scrollIndicatorHeight;

-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
+        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
    }

    [_moreBelowView setHidden:!moreBelow];

    var clipFrame = CGRectMakeZero();

-    clipFrame.origin.x = LEFT_MARGIN;
+    clipFrame.origin.x = marginInset.left;
    clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN;
+    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;

    [_menuClipView setFrame:clipFrame];
@@ -398,15 +382,15 @@ var STICKY_TIME_INTERVAL        = 500,
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
    var frame = [self frame];
-    if (!CPRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
+    if (!CGRectContainsPoint(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 &&  ![_moreAboveView isHidden])
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-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 &&  ![_moreBelowView isHidden])
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
        return _CPMenuManagerScrollingStateDown;

    return _CPMenuManagerScrollingStateNone;
@@ -414,7 +398,7 @@ var STICKY_TIME_INTERVAL        = 500,

 - (float)deltaYForItemAtIndex:(int)anIndex
 {
-    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
 }

 - (CGPoint)rectForItemAtIndex:(int)anIndex
@@ -445,6 +429,44 @@ var STICKY_TIME_INTERVAL        = 500,
    CPFont  _font @accessors(property=font);
 }

+
+ (CPString)defaultThemeClass
+{
+    return "menu-view";
+}
+
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"menu-window-more-above-image": [CPNull null],
+            @"menu-window-more-below-image": [CPNull null],
+            @"menu-window-pop-up-background-style-color": [CPNull null],
+            @"menu-window-menu-bar-background-style-color": [CPNull null],
+            @"menu-window-margin-inset": CGInsetMake(5.0, 1.0, 1.0, 5.0),
+            @"menu-window-scroll-indicator-height": 16.0,
+            @"menu-bar-window-background-color": [CPNull null],
+            @"menu-bar-window-background-selected-color": [CPNull null],
+            @"menu-bar-window-font": [CPNull null],
+            @"menu-bar-window-height": 30.0,
+            @"menu-bar-window-margin": 10.0,
+            @"menu-bar-window-left-margin": 10.0,
+            @"menu-bar-window-right-margin": 10.0,
+            @"menu-bar-text-color": [CPNull null],
+            @"menu-bar-title-color": [CPNull null],
+            @"menu-bar-text-shadow-color": [CPNull null],
+            @"menu-bar-title-shadow-color": [CPNull null],
+            @"menu-bar-highlight-color": [CPNull null],
+            @"menu-bar-highlight-text-color": [CPNull null],
+            @"menu-bar-highlight-text-shadow-color": [CPNull null],
+            @"menu-bar-height": 28.0,
+            @"menu-bar-icon-image": [CPNull null],
+            @"menu-bar-icon-image-alpha-value": 1.0,
+            @"menu-general-icon-new": [CPNull null],
+            @"menu-general-icon-save": [CPNull null],
+            @"menu-general-icon-open": [CPNull null],
+        };
+}
+
 - (unsigned)numberOfUnhiddenItems
 {
    return _visibleMenuItemInfos.length;
@@ -25,29 +25,33 @@
@import <Foundation/CPString.j>

@import "CPImage.j"
-@import "CPMenu.j"
+@import "CPText.j"
@import "CPView.j"
@import "_CPMenuItemView.j"

+@class CPMenu

-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];
+@global CPApp
+
+var CPMenuItemStringRepresentationDictionary = @{
+        CPEscapeFunctionKey:        "\u238B",
+        CPTabCharacter:             "\u21E5",
+        CPBackTabCharacter:         "\u21E4",
+        CPSpaceFunctionKey:         "\u2423",
+        CPCarriageReturnCharacter:  "\u23CE",
+        CPBackspaceCharacter:       "\u232B",
+        CPDeleteFunctionKey:        "\u232B",
+        CPDeleteCharacter:          "\u2326",
+        CPHomeFunctionKey:          "\u21F1",
+        CPEndFunctionKey:           "\u21F2",
+        CPPageUpFunctionKey:        "\u21DE",
+        CPPageDownFunctionKey:      "\u21DF",
+        CPUpArrowFunctionKey:       "\u2191",
+        CPDownArrowFunctionKey:     "\u2193",
+        CPLeftArrowFunctionKey:     "\u2190",
+        CPRightArrowFunctionKey:    "\u2192",
+        CPClearDisplayFunctionKey:  "\u2327",
+    };

 /*!
    @ingroup appkit
@@ -101,6 +105,16 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
    _CPMenuItemView _menuItemView;
 }

+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if ([aBinding hasPrefix:CPEnabledBinding])
+        return [CPMultipleValueAndBinding class];
+    else if (aBinding === CPTargetBinding || [aBinding hasPrefix:CPArgumentBinding])
+        return [CPActionBinding class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
 - (id)init
 {
    return [self initWithTitle:@"" action:nil keyEquivalent:nil];
@@ -152,6 +166,9 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
    if (_isEnabled === isEnabled)
        return;

+    if (!isEnabled && [self isHighlighted])
+        [_menu _highlightItemAtIndex:CPNotFound];
+
    _isEnabled = !!isEnabled;

    [_menuItemView setDirty];
@@ -1,54 +1,61 @@
-@import "CPView.j"
+/*
+ * _CPMenuItemMenuBarView.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 "CPControl.j"
+@import "_CPImageAndTextView.j"

-var HORIZONTAL_MARGIN           = 8.0,
-    SUBMENU_INDICATOR_MARGIN    = 3.0,
-    VERTICAL_MARGIN             = 4.0;
-
-var SelectionColor                              = nil,
-    SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@class _CPMenuBarWindow
+@class _CPMenuView

@implementation _CPMenuItemMenuBarView : CPView
 {
+    CPColor                 _highlightColor @accessors(property=highlightColor);
+    CPColor                 _textColor @accessors(property=textColor);
+    CPColor                 _textShadowColor @accessors(property=textShadowColor);
+    CPColor                 _highlightTextColor @accessors(property=highlightTextColor);
+    CPColor                 _highlightTextShadowColor @accessors(property=highlightTextShadowColor);
+
    CPMenuItem              _menuItem @accessors(property=menuItem);

    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;

    BOOL                    _isDirty;
+    BOOL                    _shouldHighlight;

    _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuIndicatorView;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemMenuBarView class])
-        return;
+    return "menu-item-bar-view";
+}

-    var bundle = [CPBundle bundleForClass:self];
-
-    SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
-
-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _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;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"horizontal-margin": 9.0,
+            @"submenu-indicator-margin": 3.0,
+            @"vertical-margin": 4.0,
+        };
 }

 + (id)view
@@ -62,7 +69,7 @@ var SelectionColor                              = nil,

    if (self)
    {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];

        [_imageAndTextView setImagePosition:CPImageLeft];
        [_imageAndTextView setImageOffset:3.0];
@@ -71,86 +78,98 @@ var SelectionColor                              = nil,

        [self addSubview:_imageAndTextView];

-        _submenuIndicatorView = [[_CPMenuItemMenuBarSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 9.0, 6.0)];
-
-        [_submenuIndicatorView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
-
-        [self addSubview:_submenuIndicatorView];
-
        [self setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
    }

    return self;
 }

+- (void)setTextColor:(CPColor)aColor
+{
+    _textColor = aColor;
+    [self setNeedsLayout];
+}
+
+- (void)setTextShadowColor:(CPColor)aColor
+{
+    _textShadowColor = aColor;
+    [self setNeedsLayout];
+}
+
+- (void)setHighlightTextColor:(CPColor)aColor
+{
+    _highlightTextColor = aColor;
+    [self setNeedsLayout];
+}
+
+- (void)setHighlightTextShadowColor:(CPColor)aColor
+{
+    _highlightTextShadowColor = aColor;
+    [self setNeedsLayout];
+}
+
 - (CPColor)textColor
 {
    if (![_menuItem isEnabled])
        return [CPColor lightGrayColor];

-    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
+    return _textColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView];
 }

 - (CPColor)textShadowColor
 {
    if (![_menuItem isEnabled])
-        return [CPColor colorWithWhite:0.8 alpha:0.8];
+        return [CPColor clearColor];

-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
+    return _textShadowColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView];
+}
+
+- (CPColor)highlightTextColor
+{
+    if (![_menuItem isEnabled])
+        return [CPColor lightGrayColor];
+
+    return _highlightTextColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView];
+}
+
+- (CPColor)highlightTextShadowColor
+{
+    if (![_menuItem isEnabled])
+        return [CPColor clearColor];
+
+    return _highlightTextShadowColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView];
+}
+
+- (CPColor)highlightColor
+{
+    return _highlightColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView];
 }

 - (void)update
 {
-    var x = HORIZONTAL_MARGIN,
+    var x = [self valueForThemeAttribute:@"horizontal-margin"],
        height = 0.0;

+    [_imageAndTextView setText:[_menuItem title]];
    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_imageAndTextView setImage:[_menuItem image]];
-    [_imageAndTextView setText:[_menuItem title]];
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+    [_imageAndTextView setImage:[_menuItem image]];
    [_imageAndTextView sizeToFit];

    var imageAndTextViewFrame = [_imageAndTextView frame];

    imageAndTextViewFrame.origin.x = x;
    x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
-
-    var hasSubmenuIndicator = [_menuItem hasSubmenu] && [_menuItem action];
-
-    if (hasSubmenuIndicator)
-    {
-        [_submenuIndicatorView setHidden:NO];
-        [_submenuIndicatorView setColor:[self textColor]];
-        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
-
-        var submenuViewFrame = [_submenuIndicatorView frame];
-
-        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
-
-        x = CGRectGetMaxX(submenuViewFrame);
-        height = MAX(height, CGRectGetHeight(submenuViewFrame));
-    }
-    else
-        [_submenuIndicatorView setHidden:YES];
-
-    height += 2.0 * VERTICAL_MARGIN;
+    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame)) + 2.0 * [self valueForThemeAttribute:@"vertical-margin"];

    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];
-    }
-
    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + HORIZONTAL_MARGIN, height)];
+    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
    [self setAutoresizesSubviews:YES];
+    [self setNeedsLayout];
 }

 - (void)highlight:(BOOL)shouldHighlight
@@ -159,17 +178,20 @@ var SelectionColor                              = nil,
    if (![_menuItem isEnabled])
        shouldHighlight = NO;

-    if (shouldHighlight)
+    _shouldHighlight = shouldHighlight;
+    [self setNeedsLayout];
+}
+
+- (void)layoutSubviews
+{
+    if (_shouldHighlight)
    {
        if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:SelectionColor];
+            [self setBackgroundColor:[self highlightColor]];

        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-
-        [_submenuIndicatorView setColor:[CPColor whiteColor]];
-        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
+        [_imageAndTextView setTextColor:[self highlightTextColor]];
+        [_imageAndTextView setTextShadowColor:[self highlightTextShadowColor]];
    }
    else
    {
@@ -178,60 +200,7 @@ var SelectionColor                              = nil,
        [_imageAndTextView setImage:[_menuItem image]];
        [_imageAndTextView setTextColor:[self textColor]];
        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-
-        [_submenuIndicatorView setColor:[self textColor]];
-        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
    }
 }

@end
-
-@implementation _CPMenuItemMenuBarSubmenuIndicatorView : CPView
-{
-    CPColor _color;
-    CPColor _shadowColor;
-}
-
- (void)setColor:(CPColor)aColor
-{
-    if (_color === aColor)
-        return;
-
-    _color = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
- (void)setShadowColor:(CPColor)aColor
-{
-    if (_shadowColor === aColor)
-        return;
-
-    _shadowColor = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
- (void)drawRect:(CGRect)aRect
-{
-    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);
-}
-
-@end
@@ -1,6 +1,29 @@
+/*
+ * _CPMenuItemSeparatorView.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 "CPView.j"

+@class _CPMenuItemStandardView
+

@implementation _CPMenuItemSeparatorView : CPView
 {
@@ -31,8 +54,8 @@
    CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);

-    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
+    CGContextSetStrokeColor(context, [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-color" forClass:_CPMenuItemStandardView]);
    CGContextStrokePath(context);
 }

-@end
+@end
@@ -1,32 +1,38 @@
+/*
+ * _CPMenuItemStandardView.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 "CPControl.j"
-
-
-var LEFT_MARGIN                 = 3.0,
-    RIGHT_MARGIN                = 14.0 + 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    = [];
+@import "CPImageView.j"
+@import "_CPImageAndTextView.j"

@implementation _CPMenuItemStandardView : CPView
 {
    CPMenuItem              _menuItem @accessors(property=menuItem);

    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;

    CGSize                  _minSize @accessors(readonly, property=minSize);
    BOOL                    _isDirty;
+    BOOL                    _highlighted;

    CPImageView             _stateView;
    _CPImageAndTextView     _imageAndTextView;
@@ -34,26 +40,32 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    CPView                  _submenuIndicatorView;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemStandardView class])
-        return;
+    return "menu-item-standard-view";
+}

-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _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;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"submenu-indicator-color": [CPNull null],
+            @"menu-item-selection-color": [CPNull null],
+            @"menu-item-text-shadow-color": [CPNull null],
+            @"menu-item-text-color": [CPNull null],
+            @"menu-item-default-off-state-image": [CPNull null],
+            @"menu-item-default-off-state-highlighted-image": [CPNull null],
+            @"menu-item-default-on-state-image": [CPNull null],
+            @"menu-item-default-on-state-highlighted-image": [CPNull null],
+            @"menu-item-default-mixed-state-image": [CPNull null],
+            @"menu-item-default-mixed-state-highlighted-image": [CPNull null],
+            @"menu-item-separator-color": [CPNull null],
+            @"left-margin": 3.0,
+            @"right-margin": 17.0,
+            @"state-column-width": 14.0,
+            @"indentation-width": 17.0,
+            @"vertical-margin": 4.0,
+            @"right-columns-margin": 30.0,
+        };
 }

 + (id)view
@@ -63,7 +75,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

 + (float)_standardLeftMargin
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -95,7 +107,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

        _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];

-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
        [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];

        [self addSubview:_submenuIndicatorView];
@@ -111,7 +123,10 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    if (![_menuItem isEnabled])
        return [CPColor lightGrayColor];

-    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
+    if (_highlighted)
+        return [CPColor whiteColor];
+
+    return [self valueForThemeAttribute:@"menu-item-text-color"];
 }

 - (CPColor)textShadowColor
@@ -119,7 +134,10 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    if (![_menuItem isEnabled])
        return nil;

-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
+    if (_highlighted)
+        return nil;
+
+    return [self valueForThemeAttribute:@"menu-item-text-shadow-color"];
 }

 - (void)setFont:(CPFont)aFont
@@ -129,16 +147,34 @@ var SUBMENU_INDICATOR_COLOR                     = nil,

 - (void)update
 {
-    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
+    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
        height = 0.0,
        hasStateColumn = [[_menuItem menu] showsStateColumn];

    if (hasStateColumn)
    {
        [_stateView setHidden:NO];
-        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];

-        x += STATE_COLUMN_WIDTH;
+        switch ([_menuItem state])
+        {
+            case CPOnState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
+                break;
+
+            case CPOffState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
+                break;
+
+            case CPMixedState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
+                break;
+
+            default:
+                break;
+        }
+
+        x += [self valueForThemeAttribute:@"state-column-width"];
    }
    else
        [_stateView setHidden:YES];
@@ -162,7 +198,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        hasSubmenu = [_menuItem hasSubmenu];

    if (hasKeyEquivalent || hasSubmenu)
-        x += RIGHT_COLUMNS_MARGIN;
+        x += [self valueForThemeAttribute:@"right-columns-margin"];

    if (hasKeyEquivalent)
    {
@@ -173,7 +209,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_keyEquivalentView setTextColor:[self textColor]];
        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, [self valueForThemeAttribute:@"vertical-margin"])];
        [_keyEquivalentView sizeToFit];

        var keyEquivalentViewFrame = [_keyEquivalentView frame];
@@ -183,7 +219,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));

        if (hasSubmenu)
-            x += RIGHT_COLUMNS_MARGIN;
+            x += [self valueForThemeAttribute:@"right-columns-margin"];
    }
    else
        [_keyEquivalentView setHidden:YES];
@@ -202,13 +238,13 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    else
        [_submenuIndicatorView setHidden:YES];

-    height += 2.0 * VERTICAL_MARGIN;
+    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];

    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
    [_imageAndTextView setFrame:imageAndTextViewFrame];

    if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
+        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];

    if (hasKeyEquivalent)
    {
@@ -222,7 +258,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_submenuIndicatorView setFrame:submenuViewFrame];
    }

-    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
+    _minSize = CGSizeMake(x + [self valueForThemeAttribute:@"right-margin"], height);

    [self setAutoresizesSubviews:NO];
    [self setFrameSize:_minSize];
@@ -235,40 +271,76 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    if (![_menuItem isEnabled])
        return;

+    _highlighted = shouldHighlight;
+
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_keyEquivalentView setTextColor:[self textColor]];
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+
    if (shouldHighlight)
    {
-        [self setBackgroundColor:_CPMenuItemSelectionColor];
-
+        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];
        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
-        [_submenuIndicatorView setColor:[CPColor whiteColor]];
-
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_submenuIndicatorView setColor:[self textColor]];
    }
    else
    {
        [self setBackgroundColor:nil];
-
        [_imageAndTextView setImage:[_menuItem image]];
-        [_imageAndTextView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
-
-        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
    }

    if ([[_menuItem menu] showsStateColumn])
    {
        if (shouldHighlight)
-            [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
+        {
+            switch ([_menuItem state])
+            {
+                case CPOnState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image"]];
+                    break;
+
+                case CPOffState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-highlighted-image"]];
+                    break;
+
+                case CPMixedState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-highlighted-image"]];
+                    break;
+
+                default:
+                    break;
+            }
+        }
        else
-            [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        {
+            switch ([_menuItem state])
+            {
+                case CPOnState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
+                    break;
+
+                case CPOffState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
+                    break;
+
+                case CPMixedState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
+                    break;
+
+                default:
+                    break;
+            }
+        }
    }
 }

+- (BOOL)isHighlighted
+{
+    return _highlighted;
+}
+
@end

@implementation _CPMenuItemSubmenuIndicatorView : CPView
@@ -1,22 +1,32 @@
+/*
+ * _CPMenuItemView.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 <AppKit/CPControl.j>
+@import "CPControl.j"

@import "_CPMenuItemSeparatorView.j"
@import "_CPMenuItemStandardView.j"
@import "_CPMenuItemMenuBarView.j"

-
-var LEFT_MARGIN                 = 3.0,
-    RIGHT_MARGIN                = 16.0,
-    STATE_COLUMN_WIDTH          = 14.0,
-    INDENTATION_WIDTH           = 17.0,
-    VERTICAL_MARGIN             = 4.0;
-
-var _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@global CPApp

 /*
    @ignore
@@ -24,7 +34,7 @@ var _CPMenuItemSelectionColor                   = nil,
@implementation _CPMenuItemView : CPView
 {
    CPMenuItem              _menuItem;
-    CPView                  _view;
+    CPView                  _view       @accessors(property=view, readonly);

    CPFont                  _font;
    CPColor                 _textColor;
@@ -38,31 +48,22 @@ var _CPMenuItemSelectionColor                   = nil,
    CPView                  _submenuView;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    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;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+    return "menu-item-view";
 }

-+ (float)leftMargin
+ (CPDictionary)themeAttributes
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return @{};
 }

+// Not used in the Appkit
+// + (float)leftMargin
+// {
+//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+// }
+
 - (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
 {
    self = [super initWithFrame:aFrame];
@@ -111,7 +112,6 @@ var _CPMenuItemSelectionColor                   = nil,
            _view = menuItemView;
        }
    }
-
    else if ([_menuItem menu] == [CPApp mainMenu])
    {
        if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
@@ -219,6 +219,36 @@ var _CPMenuItemSelectionColor                   = nil,
    return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
 }

+- (void)setParentMenuHighlightColor:(CPColor)aColor
+{
+    if ([_view respondsToSelector:@selector(setHighlightColor:)])
+        [_view setHighlightColor:aColor];
+}
+
+- (void)setParentMenuHighlightTextColor:(CPColor)aColor
+{
+    if ([_view respondsToSelector:@selector(setHighlightTextColor:)])
+        [_view setHighlightTextColor:aColor];
+}
+
+- (void)setParentMenuHighlightTextShadowColor:(CPColor)aColor
+{
+    if ([_view respondsToSelector:@selector(setHighlightTextShadowColor:)])
+        [_view setHighlightTextShadowColor:aColor];
+}
+
+- (void)setParentMenuTextColor:(CPColor)aColor
+{
+    if ([_view respondsToSelector:@selector(setTextColor:)])
+        [_view setTextColor:aColor];
+}
+
+- (void)setParentMenuTextShadowColor:(CPColor)aColor
+{
+    if ([_view respondsToSelector:@selector(setTextShadowColor:)])
+        [_view setTextShadowColor:aColor];
+}
+
@end

@implementation _CPMenuItemArrowView : CPView
@@ -245,8 +275,6 @@ var _CPMenuItemSelectionColor                   = nil,
    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);
@@ -22,8 +22,10 @@

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

@import "CPController.j"
+@import "CPKeyValueBinding.j"

 /*!
    @class
@@ -49,7 +51,7 @@
    CPCountedSet    _observedKeys;
 }

-+ (id)initialize
+ (void)initialize
 {
    if (self !== [CPObjectController class])
        return;
@@ -104,11 +106,13 @@
 {
    if (self = [super init])
    {
-        [self setContent:aContent];
        [self setEditable:YES];
        [self setObjectClass:[CPMutableDictionary class]];

        _observedKeys = [[CPCountedSet alloc] init];
+        _selection = [[CPControllerSelectionProxy alloc] initWithController:self];
+
+        [self setContent:aContent];
    }

    return self;
@@ -516,8 +520,12 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

 - (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
 {
-    if (aKeyPath.indexOf("@") === 0)
+    if (aKeyPath.charAt(0) === "@")
    {
+        // Simple collection operators are scalar and can't be proxied
+        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
+            return;
+
        var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self];

        proxy._options = options;
@@ -540,8 +548,12 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

 - (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
 {
-    if (aKeyPath.indexOf("@") === 0)
+    if (aKeyPath.charAt(0) === "@")
    {
+        // Simple collection operators are scalar and can't be proxied
+        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
+            return;
+
        var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self],
            index = [_observationProxies indexOfObject:proxy];

@@ -560,13 +572,13 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    }
 }

- (void)insertObject:(id)anObject atIndex:(unsigned)anIndex
+- (void)insertObject:(id)anObject atIndex:(CPUInteger)anIndex
 {
    for (var i = 0, count = [_observationProxies count]; i < count; i++)
    {
        var proxy = [_observationProxies objectAtIndex:i],
            keyPath = [proxy keyPath],
-            operator = keyPath.indexOf(".") === 0;
+            operator = keyPath.charAt(0) === ".";

        if (operator)
            [self willChangeValueForKey:keyPath];
@@ -580,7 +592,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    [super insertObject:anObject atIndex:anIndex];
 }

- (void)removeObjectAtIndex:(unsigned)anIndex
+- (void)removeObjectAtIndex:(CPUInteger)anIndex
 {
    var currentObject = [self objectAtIndex:anIndex];

@@ -588,7 +600,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    {
        var proxy = [_observationProxies objectAtIndex:i],
            keyPath = [proxy keyPath],
-            operator = keyPath.indexOf(".") === 0;
+            operator = keyPath.charAt(0) === ".";

        if (operator)
            [self willChangeValueForKey:keyPath];
@@ -602,7 +614,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    [super removeObjectAtIndex:anIndex];
 }

- (_CPObservableArray)objectsAtIndexes:(CPIndexSet)theIndexes
+- (CPArray)objectsAtIndexes:(CPIndexSet)theIndexes
 {
    return [_CPObservableArray arrayWithArray:[super objectsAtIndexes:theIndexes]];
 }
@@ -617,7 +629,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
   [self removeObjectAtIndex:[self count]];
 }

- (void)replaceObjectAtIndex:(unsigned)anIndex withObject:(id)anObject
+- (void)replaceObjectAtIndex:(CPUInteger)anIndex withObject:(id)anObject
 {
    var currentObject = [self objectAtIndex:anIndex];

@@ -625,7 +637,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    {
        var proxy = [_observationProxies objectAtIndex:i],
            keyPath = [proxy keyPath],
-            operator = keyPath.indexOf(".") === 0;
+            operator = keyPath.charAt(0) === ".";

        if (operator)
            [self willChangeValueForKey:keyPath];
@@ -657,7 +669,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 {
    if (self = [super init])
    {
-        _cachedValues = [CPDictionary dictionary];
+        _cachedValues = @{};
        _observationProxies = [CPArray array];
        _controller = aController;
        _observedObjectsByKeyPath = {};
@@ -699,12 +711,18 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

 - (id)valueForKeyPath:(CPString)theKeyPath
 {
-    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
-        value = [self _controllerMarkerForValues:values];
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];

-    [_cachedValues setObject:value forKey:theKeyPath];
+    // Simple collection operators like @count return a scalar value, not an array or set
+    if ([values isKindOfClass:CPArray] || [values isKindOfClass:CPSet])
+    {
+        var value = [self _controllerMarkerForValues:values];
+        [_cachedValues setObject:value forKey:theKeyPath];

-    return value;
+        return value;
+    }
+    else
+        return values;
 }

 - (id)valueForKey:(CPString)theKeyPath
@@ -798,7 +816,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

    [_observationProxies removeObjectAtIndex:index];

-    _observedObjects = nil;
+    _observedObjectsByKeyPath[aKeyPath] = nil;
 }

@end
@@ -47,9 +47,9 @@
        var options = { directoryURL: [self directoryURL],
                        canChooseFiles: [self canChooseFiles],
                        canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] };
+                        allowsMultipleSelection: [self allowsMultipleSelection] },

-        var result = window.cpOpenPanel(options);
+            result = window.cpOpenPanel(options);

        _URLs = result.URLs;

@@ -20,9 +20,11 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CPButton.j"
@import "CPTableColumn.j"
@import "CPTableView.j"

+@global CPApp

 CPOutlineViewColumnDidMoveNotification          = @"CPOutlineViewColumnDidMoveNotification";
 CPOutlineViewColumnDidResizeNotification        = @"CPOutlineViewColumnDidResizeNotification";
@@ -33,22 +35,24 @@ CPOutlineViewItemWillExpandNotification         = @"CPOutlineViewItemWillExpandN
 CPOutlineViewSelectionDidChangeNotification     = @"CPOutlineViewSelectionDidChangeNotification";
 CPOutlineViewSelectionIsChangingNotification    = @"CPOutlineViewSelectionIsChangingNotification";

-var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 1,
-    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 2,
+var CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_                          = 1 << 1,
+    CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 2,
+    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 3,

-    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 3,
-    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 4,
-    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 5,
-    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 6,
+    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 4,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 5,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 6,
+    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 7,

-    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 7,
-    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 8,
+    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 8,
+    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 9,

-    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 9,
+    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 10,

-    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 10;
+    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 11;

 var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                                  = 1 << 1,
+    CPOutlineViewDelegate_outlineView_viewForTableColumn_item_                                      = 1 << 26,
    CPOutlineViewDelegate_outlineView_didClickTableColumn_                                          = 1 << 2,
    CPOutlineViewDelegate_outlineView_didDragTableColumn_                                           = 1 << 3,
    CPOutlineViewDelegate_outlineView_heightOfRowByItem_                                            = 1 << 4,
@@ -228,12 +232,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    if (![aDataSource respondsToSelector:@selector(outlineView:numberOfChildrenOfItem:)])
        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:numberOfChildrenOfItem:'"];

-    if (![aDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
-        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:objectValueForTableColumn:byItem:'"];
-
    _outlineViewDataSource = aDataSource;
    _implementedOutlineViewDataSourceMethods = 0;

+    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
+        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
+
    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:setObjectValue:forTableColumn:byItem:)])
        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_;

@@ -348,6 +352,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (void)expandItem:(id)anItem expandChildren:(BOOL)shouldExpandChildren
 {
+    if ([self _delegateRespondsToShouldExpandItem])
+        if ([_outlineViewDelegate outlineView:self shouldExpandItem:anItem] == NO)
+            return;
+
    var itemInfo = null;

    if (!anItem)
@@ -376,9 +384,8 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        var previousRowCount = [self numberOfRows];

        itemInfo.isExpanded = YES;
-        // XXX Shouldn't the items reload before the notification is sent?
-        [self _noteItemDidExpand:anItem];
        [self reloadItem:anItem reloadChildren:YES];
+        [self _noteItemDidExpand:anItem];

        // Shift selection indexes below so that the same items remain selected.
        var rowCountDelta = [self numberOfRows] - previousRowCount;
@@ -424,6 +431,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    if (!anItem)
        return;

+    if ([self _delegateRespondsToShouldCollapseItem])
+        if ([_outlineViewDelegate outlineView:self shouldCollapseItem:anItem] == NO)
+            return;
+
    var itemInfo = _itemInfosForItems[[anItem UID]];

    if (!itemInfo)
@@ -469,9 +480,8 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    }
    itemInfo.isExpanded = NO;

-    // XXX Shouldn't the items reload before the notification is sent?
-    [self _noteItemDidCollapse:anItem];
    [self reloadItem:anItem reloadChildren:YES];
+    [self _noteItemDidCollapse:anItem];

    // Send selection notifications only after the items have loaded so that
    // the new selection is consistent with the actual rows for any observers.
@@ -708,27 +718,36 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 {
    var theItem = [self itemAtRow:aRow];
    if (![self isExpandable:theItem] || ![self _shouldShowOutlineDisclosureControlForItem:theItem])
-        return _CGRectMakeZero();
+        return CGRectMakeZero();

    var dataViewFrame = [self _frameOfOutlineDataViewAtRow:aRow],
-        disclosureWidth = _CGRectGetWidth([_disclosureControlPrototype frame]),
-        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - disclosureWidth, _CGRectGetMinY(dataViewFrame), disclosureWidth, _CGRectGetHeight(dataViewFrame));
+        disclosureWidth = CGRectGetWidth([_disclosureControlPrototype frame]),
+        frame = CGRectMake(CGRectGetMinX(dataViewFrame) - disclosureWidth, CGRectGetMinY(dataViewFrame), disclosureWidth, CGRectGetHeight(dataViewFrame));

    return frame;
 }

 /*!
    @ignore
-    Select or deselect rows, this is overridden because we need to change the color or the outline control.
+    Select or deselect rows, this is overridden because we need to change the color of the outline control.
 */
- (void)_performSelection:(BOOL)select forRow:(CPInteger)rowIndex context:(id)context
+- (void)_setSelectedRowIndexes:(CPIndexSet)rows
 {
-    [super _performSelection:select forRow:rowIndex context:context];
+    if (_disclosureControlsForRows.length)
+    {
+        var indexes = [_selectedRowIndexes copy];
+        [indexes removeIndexesInRange:CPMakeRange(_disclosureControlsForRows.length, _itemsForRows.length - _disclosureControlsForRows.length)];
+        [[_disclosureControlsForRows objectsAtIndexes:indexes] makeObjectsPerformSelector:@selector(unsetThemeState:) withObject:CPThemeStateSelected];
+    }

-    var control = _disclosureControlsForRows[rowIndex],
-        selector = select ? @"setThemeState:" : @"unsetThemeState:";
+    [super _setSelectedRowIndexes:rows];

-    [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
+    if (_disclosureControlsForRows.length)
+    {
+        var indexes = [_selectedRowIndexes copy];
+        [indexes removeIndexesInRange:CPMakeRange(_disclosureControlsForRows.length, _itemsForRows.length - _disclosureControlsForRows.length)];
+        [[_disclosureControlsForRows objectsAtIndexes:indexes] makeObjectsPerformSelector:@selector(setThemeState:) withObject:CPThemeStateSelected];
+    }
 }

 /*!
@@ -870,6 +889,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,

    var delegateMethods = [
            CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                       , @selector(outlineView:dataViewForTableColumn:item:),
+            CPOutlineViewDelegate_outlineView_viewForTableColumn_item_                           , @selector(outlineView:viewForTableColumn:item:),
            CPOutlineViewDelegate_outlineView_didClickTableColumn_                               , @selector(outlineView:didClickTableColumn:),
            CPOutlineViewDelegate_outlineView_didDragTableColumn_                                , @selector(outlineView:didDragTableColumn:),
            CPOutlineViewDelegate_outlineView_heightOfRowByItem_                                 , @selector(outlineView:heightOfRowByItem:),
@@ -962,6 +982,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
            name:CPOutlineViewItemDidCollapseNotification
            object:self];

+    [self _updateIsViewBased];
+
+    if ([self _delegateRespondsToDataViewForTableColumn])
+        CPLog.warn("outlineView:dataViewForTableColumn:item: is deprecated. You should use -outlineView:viewForTableColumn:item: where you can request the view with -makeViewWithIdentifier:owner:");
 }

 - (BOOL)_sendDelegateDeleteKeyPressed
@@ -1054,11 +1078,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    @ignore
    We need to offset the dataview and add the disclosure triangle.
 */
- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
+- (CPView)_dragViewForColumn:(CPInteger)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
 {
    var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
        tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + 23.0),
+        defaultRowHeight = [self valueForThemeAttribute:@"default-row-height"],
+        bounds = CGRectMake(0.0, 0.0, [tableColumn width], CGRectGetHeight([self exposedRect]) + defaultRowHeight),
        columnRect = [self rectOfColumn:theColumnIndex],
        headerView = [tableColumn headerView],
        row = [_exposedRows firstIndex];
@@ -1072,7 +1097,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        dataViewFrame.origin.x = 0.0;

        // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + 23.0;
+        dataViewFrame.origin.y = (CGRectGetMinY(dataViewFrame) - CGRectGetMinY([self exposedRect])) + defaultRowHeight;
        [dataView setFrame:dataViewFrame];

        [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
@@ -1096,7 +1121,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,

    // Add the column header view
    var headerFrame = [headerView frame];
-    headerFrame.origin = _CGPointMakeZero();
+    headerFrame.origin = CGPointMakeZero();

    var columnHeaderView = [[_CPTableColumnHeaderView alloc] initWithFrame:headerFrame];
    [columnHeaderView setStringValue:[headerView stringValue]];
@@ -1186,7 +1211,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
    @ignore
 */
- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
+- (id)_parentItemForUpperRow:(CPInteger)theUpperRowIndex andLowerRow:(CPInteger)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
 {
    if (_shouldRetargetItem)
        return _retargetedItem;
@@ -1216,7 +1241,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
+- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(CPInteger)theUpperRowIndex andLowerRow:(CPInteger)theLowerRowIndex offset:(CGPoint)theOffset
 {
    // Call super and the update x to reflect the current indentation level
    var rect = [super _rectForDropHighlightViewBetweenUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex offset:theOffset],
@@ -1302,7 +1327,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,

        var disclosureControlFrame = [self frameOfOutlineDisclosureControlAtRow:row];

-        if (_CGRectIsEmpty(disclosureControlFrame))
+        if (CGRectIsEmpty(disclosureControlFrame))
            continue;

        var control = [self _dequeueDisclosureControl];
@@ -1359,7 +1384,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 - (void)_toggleFromDisclosureControl:(CPControl)aControl
 {
    var controlFrame = [aControl frame],
-        item = [self itemAtRow:[self rowAtPoint:_CGPointMake(_CGRectGetMinX(controlFrame), _CGRectGetMidY(controlFrame))]];
+        item = [self itemAtRow:[self rowAtPoint:CGPointMake(CGRectGetMinX(controlFrame), CGRectGetMidY(controlFrame))]];

    if ([self isItemExpanded:item])
        [self collapseItem:item];
@@ -1440,7 +1465,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPOutlineViewItemWillExpandNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
+                    userInfo:@{ "CPObject": item }];
 }

 /*!
@@ -1451,7 +1476,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPOutlineViewItemDidExpandNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
+                    userInfo:@{ "CPObject": item }];
 }

 /*!
@@ -1462,7 +1487,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPOutlineViewItemWillCollapseNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
+                    userInfo:@{ "CPObject": item }];
 }

 /*!
@@ -1473,7 +1498,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    [[CPNotificationCenter defaultCenter]
        postNotificationName:CPOutlineViewItemDidCollapseNotification
                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
+                    userInfo:@{ "CPObject": item }];
 }

 - (void)keyDown:(CPEvent)anEvent
@@ -1532,6 +1557,59 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    [super keyDown:anEvent];
 }

+- (CPView)_sendDelegateViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
+{
+    return [_outlineViewDelegate outlineView:self viewForTableColumn:aTableColumn item:[self itemAtRow:aRow]];
+}
+
+- (CPView)_sendDelegateDataViewForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
+{
+    return [_outlineViewDelegate outlineView:self dataViewForTableColumn:aTableColumn item:[self itemAtRow:aRow]];
+}
+
+- (BOOL)_dataSourceRespondsToObjectValueForTableColumn
+{
+    return _implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
+}
+
+- (BOOL)_delegateRespondsToViewForTableColumn
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_viewForTableColumn_item_;
+}
+
+- (BOOL)_delegateRespondsToDataViewForTableColumn
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
+}
+
+- (BOOL)_delegateRespondsToShouldExpandItem
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldExpandItem_;
+}
+
+- (BOOL)_delegateRespondsToShouldCollapseItem
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldCollapseItem_;
+}
+
+/*!
+    @ignore
+    Return YES if the delegate implements outlineView:selectionIndexesForProposedSelection
+*/
+- (BOOL)_delegateRespondsToSelectionIndexesForProposedSelection
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_selectionIndexesForProposedSelection_;
+}
+
+/*!
+    @ignore
+    Return YES if the delegate implements outlineView:shouldSelectItem:
+*/
+- (BOOL)_delegateRespondsToShouldSelectRow
+{
+    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_;
+}
+
@end

 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
@@ -1729,7 +1807,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return [_outlineView._outlineViewDataSource outlineView:_outlineView writeItems:items toPasteboard:thePasteboard];
 }

- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
+- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(CPInteger)theRow offset:(CGPoint)theOffset
 {
    if (_outlineView._shouldRetargetChildIndex)
        return _outlineView._retargedChildIndex;
@@ -1753,7 +1831,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return childIndex;
 }

- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
+- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(CPInteger)theRow offset:(CGPoint)theOffset
 {
    if (theDropOperation === CPTableViewDropAbove)
        return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]
@@ -1761,8 +1839,8 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return [_outlineView itemAtRow:theRow];
 }

- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id < CPDraggingInfo >)theInfo
-    proposedRow:(int)theRow proposedDropOperation:(CPTableViewDropOperation)theOperation
+- (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id /*< CPDraggingInfo >*/)theInfo
+    proposedRow:(CPInteger)theRow proposedDropOperation:(CPTableViewDropOperation)theOperation
 {
    if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_))
        return CPDragOperationNone;
@@ -1781,7 +1859,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return [_outlineView._outlineViewDataSource outlineView:_outlineView validateDrop:theInfo proposedItem:parentItem proposedChildIndex:childIndex];
 }

- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id <CPDraggingInfo>)theInfo row:(int)theRow dropOperation:(CPTableViewDropOperation)theOperation
+- (BOOL)tableView:(CPTableView)aTableView acceptDrop:(id /*<CPDraggingInfo>*/)theInfo row:(CPInteger)theRow dropOperation:(CPTableViewDropOperation)theOperation
 {
    if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_))
        return NO;
@@ -1825,22 +1903,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return self;
 }

- (CPView)tableView:(CPTableView)theTableView dataViewForTableColumn:(CPTableColumn)theTableColumn row:(int)theRow
-{
-    var dataView = nil;
-
-    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
-        dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
-                                       dataViewForTableColumn:theTableColumn
-                                                         item:[_outlineView itemAtRow:theRow]];
-
-    if (!dataView)
-        dataView = [theTableColumn dataViewForRow:theRow];
-
-    return dataView;
-}
-
- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
+- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(CPInteger)theRow
 {
    return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
 }
@@ -1850,7 +1913,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return SELECTION_SHOULD_CHANGE(_outlineView);
 }

- (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
+- (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(CPInteger)aRow
 {
    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldEditTableColumn_item_))
        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldEditTableColumn:aColumn item:[_outlineView itemAtRow:aRow]];
@@ -1858,7 +1921,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return NO;
 }

- (float)tableView:(CPTableView)theTableView heightOfRow:(int)theRow
+- (float)tableView:(CPTableView)theTableView heightOfRow:(CPInteger)theRow
 {
    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_heightOfRowByItem_))
        return [_outlineView._outlineViewDelegate outlineView:_outlineView heightOfRowByItem:[_outlineView itemAtRow:theRow]];
@@ -1866,7 +1929,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return [theTableView rowHeight];
 }

- (void)tableView:(CPTableView)aTableView willDisplayView:(id)aView forTableColumn:(CPTableColumn)aTableColumn row:(int)aRowIndex
+- (void)tableView:(CPTableView)aTableView willDisplayView:(id)aView forTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRowIndex
 {
    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_willDisplayView_forTableColumn_item_))
    {
@@ -1875,7 +1938,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    }
 }

- (BOOL)tableView:(CPTableView)aTableView isGroupRow:(int)aRow
+- (BOOL)tableView:(CPTableView)aTableView isGroupRow:(CPInteger)aRow
 {
    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_isGroupItem_))
        return [_outlineView._outlineViewDelegate outlineView:_outlineView isGroupItem:[_outlineView itemAtRow:aRow]];
@@ -1883,7 +1946,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return NO;
 }

- (CPMenu)tableView:(CPTableView)aTableView menuForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
+- (CPMenu)tableView:(CPTableView)aTableView menuForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow
 {
    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_menuForTableColumn_item_))
    {
@@ -1896,6 +1959,22 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return [_outlineView menu] || [[_outlineView class] defaultMenu];
 }

+- (CPIndexSet)tableView:(CPTableView)aTableView selectionIndexesForProposedSelection:(CPIndexSet)anIndexSet
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_selectionIndexesForProposedSelection_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView selectionIndexesForProposedSelection:anIndexSet];
+
+    return anIndexSet;
+}
+
+- (BOOL)tableView:(CPTableView)aTableView shouldSelectTableColumn:(CPTableColumn)aTableColumn
+{
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectTableColumn:aTableColumn];
+
+    return YES;
+}
+
@end

@implementation CPDisclosureButton : CPButton
@@ -1913,7 +1992,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    return self;
 }

- (void)setState:(CPState)aState
+- (void)setState:(CPInteger)aState
 {
    [super setState:aState];

@@ -1928,14 +2007,14 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 {
    var bounds = [self bounds],
        context = [[CPGraphicsContext currentContext] graphicsPort],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+        width = CGRectGetWidth(bounds),
+        height = CGRectGetHeight(bounds);

    CGContextBeginPath(context);

    if (_angle)
    {
-        var centre = _CGPointMake(FLOOR(width / 2.0), FLOOR(height / 2.0));
+        var centre = CGPointMake(FLOOR(width / 2.0), FLOOR(height / 2.0));
        CGContextTranslateCTM(context, centre.x, centre.y);
        CGContextRotateCTM(context, _angle);
        CGContextTranslateCTM(context, -centre.x, -centre.y);
@@ -1947,9 +2026,8 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    CGContextMoveToPoint(context, 0.0, 0.0);
    CGContextAddLineToPoint(context, 9.0, 0.0);
    CGContextAddLineToPoint(context, 4.5, 8.0);
-    CGContextAddLineToPoint(context, 0.0, 0.0);
-
    CGContextClosePath(context);
+
    CGContextSetFillColor(context,
        colorForDisclosureTriangle([self hasThemeState:CPThemeStateSelected],
            [self hasThemeState:CPThemeStateHighlighted]));
@@ -1957,8 +2035,8 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt

    CGContextBeginPath(context);
    CGContextMoveToPoint(context, 0.0, 0.0);
-
    CGContextAddLineToPoint(context, 4.5, 8.0);
+
    if (_angle === 0.0)
        CGContextAddLineToPoint(context, 9.0, 0.0);

@@ -2000,6 +2078,8 @@ var CPOutlineViewIndentationPerLevelKey = @"CPOutlineViewIndentationPerLevelKey"

        [super setDataSource:[[_CPOutlineViewTableViewDataSource alloc] initWithOutlineView:self]];
        [super setDelegate:[[_CPOutlineViewTableViewDelegate alloc] initWithOutlineView:self]];
+
+        [self _updateIsViewBased];
    }

    return self;
@@ -114,4 +114,9 @@ CPDocModalWindowMask    = 1 << 6;
    return NO;
 }

+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+
@end
@@ -22,6 +22,7 @@

@import <Foundation/CPObject.j>
@import <Foundation/CPArray.j>
+@import <Foundation/CPData.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPPropertyListSerialization.j>

@@ -78,7 +79,7 @@ var CPPasteboards = nil,

    [self setVersion:1.0];

-    CPPasteboards = [CPDictionary dictionary];
+    CPPasteboards = @{};

    if (typeof window.cpPasteboardWithName !== "undefined")
        supportsNativePasteboard = YES;
@@ -117,11 +118,11 @@ var CPPasteboards = nil,

    if (self)
    {
-        _name = aName;
+//        _name = aName;
        _types = [];

-        _owners = [CPDictionary dictionary];
-        _provided = [CPDictionary dictionary];
+        _owners = @{};
+        _provided = @{};

        _changeCount = 0;

@@ -187,13 +188,15 @@ var CPPasteboards = nil,
 {
    [_types setArray:types];

-    _owners = [CPDictionary dictionary];
-    _provided = [CPDictionary dictionary];
+    _owners = @{};
+    _provided = @{};

-    var count = _types.length;
-
-    while (count--)
-        [_owners setObject:anOwner forKey:_types[count]];
+    if (anOwner)
+    {
+        var count = _types.length;
+        while (count--)
+            [_owners setObject:anOwner forKey:_types[count]];
+    }

    if (_nativePasteboard && shouldUpdate)
    {
@@ -204,6 +207,7 @@ var CPPasteboards = nil,
        _nativePasteboard.declareTypes_(nativeTypes);
        _changeCount = _nativePasteboard.changeCount();
    }
+
    return ++_changeCount;
 }

@@ -242,19 +246,23 @@ var CPPasteboards = nil,
 */
 - (void)setString:(CPString)aString forType:(CPString)aType
 {
+    // Putting a non-string on the string pasteboard can lead to strange crashes.
+    if (aString && aString.isa && ![aString isKindOfClass:CPString])
+        [CPException raise:CPInvalidArgumentException reason:"CPPasteboard setString:forType: must be called with a string."];
+
    [self setPropertyList:aString forType:aType];
 }

 // Determining Types
 /*!
-    Checks the pasteboard's types for a match with the types listen in the specified array. The array should
+    Checks the pasteboard's types for a match with the types listed in the specified array. The array should
    be ordered by the requestor's most preferred data type first.
    @param anArray an array of requested types ordered by preference
    @return the highest match with the pasteboard's supported types or \c nil if no match was found
 */
 - (CPString)availableTypeFromArray:(CPArray)anArray
 {
-    return [[self types] firstObjectCommonWithArray:anArray];
+    return [anArray firstObjectCommonWithArray:[self types]];
 }

 /*!
@@ -20,8 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <Foundation/CPGeometry.j>
-
+@import "CGGeometry.j"
@import "CPButton.j"
@import "CPKeyValueBinding.j"
@import "CPMenu.j"
@@ -280,7 +279,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    Selects the item at the specified index
    @param anIndex the index of the item to select
 */
- (void)setObjectValue:(int)anIndex
+- (void)setObjectValue:(id)anIndex
 {
    var indexOfSelectedItem = [self objectValue];

@@ -345,7 +344,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    Returns the item at the specified index or \c nil if the item does not exist.
    @param anIndex the index of the item to obtain
 */
- (CPMenuItem)itemAtIndex:(unsigned)anIndex
+- (CPMenuItem)itemAtIndex:(CPUInteger)anIndex
 {
    return [[self menu] itemAtIndex:anIndex];
 }
@@ -354,7 +353,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    Returns the title of the item at the specified index or \c nil if no item exists.
    @param anIndex the index of the item
 */
- (CPString)itemTitleAtIndex:(unsigned)anIndex
+- (CPString)itemTitleAtIndex:(CPUInteger)anIndex
 {
    return [[[self menu] itemAtIndex:anIndex] title];
 }
@@ -668,10 +667,15 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    if (![self isEnabled] || ![self numberOfItems])
        return;

+    var menu = [self menu];
+
+    // Don't reopen the menu based on the same click which caused it to close, e.g. a click on this button.
+    if (menu._lastCloseEvent === anEvent)
+        return;
+
    [self highlight:YES];

-    var menu = [self menu],
-        bounds = [self bounds],
+    var bounds = [self bounds],
        minimumWidth = CGRectGetWidth(bounds);

    // FIXME: setFont: should set the font on the menu.
@@ -680,7 +684,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    if ([self pullsDown])
    {
        var positionedItem = nil,
-            location = CGPointMake(0.0, CGRectGetMaxY(bounds));
+            location = CGPointMake(0.0, CGRectGetMaxY(bounds) - 1);
    }
    else
    {
@@ -834,7 +838,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    [self _setContentValuesIfNeeded:contentArray];
 }

- (void)valueForBinding:(CPString)aBinding
+- (id)valueForBinding:(CPString)aBinding
 {
    return [self _content];
 }
@@ -906,7 +910,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
 }

- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+- (void)setValue:(CPArray)aValue forBinding:(CPString)aBinding
 {
    [super _setContent:aValue];
 }
@@ -28,7 +28,7 @@
@import "CPImageView.j"
@import "CPResponder.j"
@import "CPView.j"
-@import "_CPAttachedWindow.j"
+@import "_CPPopoverWindow.j"


 CPPopoverBehaviorApplicationDefined = 0;
@@ -45,7 +45,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*! @ingroup appkit
    @class CPPopover

-    This class represent a widget that displays a attached
+    This class represent a widget that displays a popover
    view relative to another one.

    Delegate can implement:
@@ -63,11 +63,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
    @outlet id                  _delegate               @accessors(getter=delegate);

-    BOOL                        _animates               @accessors(property=animates);
+    BOOL                        _animates               @accessors(getter=animates);
    int                         _appearance             @accessors(property=appearance);
    int                         _behavior               @accessors(getter=behavior);

-    _CPAttachedWindow           _attachedWindow;
+    _CPPopoverWindow            _popoverWindow;
    int                         _implementedDelegateMethods;
 }

@@ -103,9 +103,10 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGRect)positioningRect
 {
-    if (![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return CGRectMakeZero();
-    return [_attachedWindow frame];
+
+    return [_popoverWindow frame];
 }

 /*! Sets the frame of the popover
@@ -113,9 +114,10 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (void)setPositioningRect:(CGRect)aRect
 {
-    if (![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return;
-    [_attachedWindow setFrame:aRect];
+
+    [_popoverWindow setFrame:aRect];
 }

 /*!
@@ -125,8 +127,9 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (CGSize)contentSize
 {
-    if (![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return CGRectMakeZero();
+
    return [[_contentViewController view] frameSize];
 }

@@ -135,7 +138,7 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,

    @param aSize the desired size
 */
- (void)setContentSize:(CPSize)aSize
+- (void)setContentSize:(CGSize)aSize
 {
    [[_contentViewController view] setFrameSize:aSize];
 }
@@ -147,7 +150,21 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 */
 - (BOOL)isShown
 {
-    return [_attachedWindow isVisible];
+    return [_popoverWindow isVisible];
+}
+
+/*!
+    Set if the popover should animate for open/close actions.
+
+    @param shouldAnimate if YES, the popover will be animated.
+*/
+- (void)setAnimates:(BOOL)shouldAnimate
+{
+    if (_animates == shouldAnimate)
+        return;
+
+    _animates = shouldAnimate;
+    [_popoverWindow setAnimates:_animates];
 }

 /*!
@@ -164,7 +181,7 @@ Set the behavior of the CPPopover. It can be:
        return;

    _behavior = aBehavior;
-    [_attachedWindow setStyleMask:[self styleMaskForBehavior]];
+    [_popoverWindow setStyleMask:[self styleMaskForBehavior]];
 }

 - (void)setDelegate:(id)aDelegate
@@ -210,31 +227,27 @@ Set the behavior of the CPPopover. It can be:
        [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])
+    if ([_popoverWindow isClosing])
        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
        [_delegate popoverWillShow:self];

-    if (!_attachedWindow)
+    if (!_popoverWindow)
    {
-        _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];
+        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
    }

-    [_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];
+    [_popoverWindow setPlatformWindow:[[positioningView window] platformWindow]];
+    [_popoverWindow setAppearance:_appearance];
+    [_popoverWindow setAnimates:_animates];
+    [_popoverWindow setDelegate:self];
+    [_popoverWindow setMovableByWindowBackground:NO];
+    [_popoverWindow setFrame:[_popoverWindow frameRectForContentRect:[[_contentViewController view] frame]]];
+    [_popoverWindow setContentView:[_contentViewController view]];
+    [_popoverWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge];

-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
        [_delegate popoverDidShow:self];
 }

@@ -256,16 +269,16 @@ Set the behavior of the CPPopover. It can be:
 */
 - (void)_close
 {
-    if ([_attachedWindow isClosing] || ![self isShown])
+    if ([_popoverWindow isClosing] || ![self isShown])
        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
        [_delegate popoverWillClose:self];

-    [_attachedWindow close];
+    [_popoverWindow close];

-    // popoverDidClose will be sent from attachedWindowDidClose, since
-    // the attached window will close asynchronously when animating.
+    // popoverDidClose will be sent from popoverWindowDidClose, since
+    // the popover window will close asynchronously when animating.
 }


@@ -279,7 +292,7 @@ Set the behavior of the CPPopover. It can be:
 */
 - (IBAction)performClose:(id)sender
 {
-    if ([_attachedWindow isClosing])
+    if ([_popoverWindow isClosing])
        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
@@ -294,37 +307,28 @@ Set the behavior of the CPPopover. It can be:
 #pragma mark Delegates

 /*! @ignore */
- (BOOL)attachedWindowShouldClose:(_CPAttachedWindow)anAttachedWindow
+- (BOOL)popoverWindowShouldClose:(_CPPopoverWindow)aPopoverWindow
 {
    [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
+    // if the popover window can be closed and to give us a chance
    // to send delegate messages.
    return NO;
 }

 /*! @ignore */
- (void)attachedWindowDidClose:(_CPAttachedWindow)anAttachedWindow
+- (void)popoverWindowDidClose:(_CPPopoverWindow)aPopoverWindow
 {
    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
+/*! @ignore */
+- (void)popoverWindowDidShow:(_CPPopoverWindow)aPopoverWindow
 {
-    [_attachedWindow orderOut:nil];
-    [self performClose:nil];
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+        [_delegate popoverDidShow:self];
 }

@end
@@ -340,7 +344,7 @@ Set the behavior of the CPPopover. It can be:

@end

-var CPPopoverNeedsNewAttachedWindowKey = @"CPPopoverNeedsNewAttachedWindowKey",
+var CPPopoverNeedsNewPopoverWindowKey = @"CPPopoverNeedsNewPopoverWindowKey",
    CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
    CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
    CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",
@@ -23,29 +23,26 @@
@import "CGGeometry.j"
@import "CPImageView.j"
@import "CPView.j"
+@import "CPWindow_Constants.j"


 /*
    @global
    @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorBarStyle         = 0;
+CPProgressIndicatorBarStyle = 0;
 /*
    @global
    @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorSpinningStyle    = 1;
+CPProgressIndicatorSpinningStyle = 1;
 /*
    @global
    @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorHUDBarStyle      = 2;
+CPProgressIndicatorHUDBarStyle = 2;

-var CPProgressIndicatorSpinningStyleColors  = nil,
-
-    CPProgressIndicatorClassName            = nil,
-    CPProgressIndicatorStyleIdentifiers     = nil,
-    CPProgressIndicatorStyleSizes           = nil;
+var CPProgressIndicatorSpinningStyleColors = [];

 /*!
    @ingroup appkit
@@ -64,7 +61,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

    CPControlSize               _controlSize;

-    BOOL                        _isIndeterminate;
+    BOOL                        _indeterminate;
    CPProgressIndicatorStyle    _style;

    BOOL                        _isAnimating;
@@ -73,66 +70,30 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    BOOL                        _isDisplayedWhenStopped;
 }

-/*
-    @ignore
-*/
-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [CPProgressIndicator class])
-        return;
+    return @"progress-indicator";
+}

-    var bundle = [CPBundle bundleForClass:self];
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"indeterminate-bar-color": [CPNull null],
+            @"bar-color": [CPNull null],
+            @"default-height": 20,
+            @"bezel-color": [CPNull null],
+            @"spinning-mini-gif": [CPNull null],
+            @"spinning-small-gif": [CPNull null],
+            @"spinning-regular-gif": [CPNull null],
+        };
+}

-    CPProgressIndicatorSpinningStyleColors = [];
+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding === CPValueBinding || aBinding === @"isIndeterminate")
+        return [_CPProgressIndicatorBinder class];

-    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleMini.gif"] size:CGSizeMake(16.0, 16.0)]];
-    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [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] = [];
-        CPProgressIndicatorBezelBorderViewPool[start][CPMiniControlSize]    = [];
-        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 Style
-    var prefixes = [
-            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++)
-    {
-        var prefix = prefixes[i];
-        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-        CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-        CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-    }
+    return [super _binderClassForBinding:aBinding];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -151,8 +112,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

        _controlSize = CPRegularControlSize;

-        [self updateBackgroundColor];
-        [self drawBar];
+        [self setNeedsLayout];
    }

    return self;
@@ -314,12 +274,12 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    Specifies whether this progress indicator should be indeterminate or display progress based on it's max and min.
    @param isDeterminate \c YES makes the indicator indeterminate
 */
- (void)setIndeterminate:(BOOL)isIndeterminate
+- (void)setIndeterminate:(BOOL)indeterminate
 {
-    if (_isIndeterminate == isIndeterminate)
+    if (_indeterminate == indeterminate)
        return;

-    _isIndeterminate = isIndeterminate;
+    _indeterminate = indeterminate;

    [self updateBackgroundColor];
 }
@@ -329,7 +289,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 */
 - (BOOL)isIndeterminate
 {
-    return _isIndeterminate;
+    return _indeterminate;
 }

 /*!
@@ -343,6 +303,8 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

    _style = aStyle;

+    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
    [self updateBackgroundColor];
 }

@@ -354,8 +316,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    if (_style == CPProgressIndicatorSpinningStyle)
        [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
    else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + _CPControlIdentifierForControlSize(_controlSize)][0].height)];
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
 }

 /*!
@@ -405,25 +366,12 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 /* @ignore */
 - (void)drawBar
 {
-    if (_style == CPProgressIndicatorSpinningStyle)
-        return;
-
-    var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                         positioned:CPWindowBelow
-                    relativeToEphemeralSubviewNamed:nil];
-
-    [barView setBackgroundColor:_CPControlThreePartImagePattern(
-        NO,
-        CPProgressIndicatorStyleSizes,
-        CPProgressIndicatorClassName,
-        @"Bar",
-        CPProgressIndicatorStyleIdentifiers[_style],
-        _CPControlIdentifierForControlSize(_controlSize))];
+    [self setNeedsLayout];
 }

 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
 }

 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
@@ -436,7 +384,10 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        if (barWidth > 0.0 && barWidth < 4.0)
            barWidth = 4.0;

-        return _CGRectMake(0, 0, barWidth, 16.0);
+        if (_indeterminate)
+            barWidth = width;
+
+        return CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
    }

    return nil;
@@ -444,6 +395,18 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

 /* @ignore */
 - (void)updateBackgroundColor
+{
+    if ([CPProgressIndicatorSpinningStyleColors count] === 0)
+    {
+        CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
+        CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
+        CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
+    }
+
+    [self setNeedsLayout];
+}
+
+- (void)layoutSubviews
 {
    if (YES)//_isBezeled)
    {
@@ -458,15 +421,16 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        }
        else
        {
-            [self setBackgroundColor:_CPControlThreePartImagePattern(
-                NO,
-                CPProgressIndicatorStyleSizes,
-                CPProgressIndicatorClassName,
-                @"BezelBorder",
-                CPProgressIndicatorStyleIdentifiers[_style],
-                _CPControlIdentifierForControlSize(_controlSize))];
+           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];

-            [self drawBar];
+           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
+                                                 positioned:CPWindowBelow
+                            relativeToEphemeralSubviewNamed:nil];
+
+           if (_indeterminate)
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
+           else
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
        }
    }
    else
@@ -486,7 +450,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
        _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
        _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
-        _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
+        _indeterminate              = [aCoder decodeObjectForKey:@"_indeterminate"];
        _style                      = [aCoder decodeIntForKey:@"_style"];
        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
@@ -500,8 +464,8 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

 - (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.
+    // 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];
@@ -511,7 +475,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
-    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
+    [aCoder encodeObject:_indeterminate forKey:@"_indeterminate"];
    [aCoder encodeInt:_style forKey:@"_style"];
    [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
    [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
@@ -519,3 +483,52 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }

@end
+
+
+@implementation _CPProgressIndicatorBinder : CPBinder
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
+{
+    var value = aBinding === CPValueBinding ? 0.0 : YES;
+
+    [self _setPlaceholder:value forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:value forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:value forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:value forMarker:CPNullMarker isDefault:YES];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    if (aBinding === CPValueBinding)
+        return [_source doubleValue];
+    else if (aBinding === @"isIndeterminate")
+        [_source isIndeterminate];
+    else
+        return [super valueForBinding:aBinding];
+}
+
+- (BOOL)_setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    if (aBinding === CPValueBinding)
+        [_source setDoubleValue:aValue];
+    else if (aBinding === @"isIndeterminate")
+        [_source setIndeterminate:aValue];
+    else
+        return NO;
+
+    return YES;
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    if (![self _setValue:aValue forBinding:aBinding])
+        [super setValue:aValue forBinding:aBinding];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    if (![self _setValue:aValue forBinding:aBinding])
+        [super setPlaceholderValue:aValue withMarker:aMarker forBinding:aBinding];
+}
+
+@end
@@ -25,6 +25,8 @@

@import "CPButton.j"

+@global CPApp
+

 /*!
    @ingroup appkit
@@ -150,7 +152,7 @@ CPRadioImageOffset = 4.0;
        [_radioGroup _setSelectedRadio:self];
 }

- (void)sendAction:(SEL)anAction to:(id)anObject
+- (BOOL)sendAction:(SEL)anAction to:(id)anObject
 {
    [super sendAction:anAction to:anObject];

@@ -202,29 +204,122 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";

@implementation CPRadioGroup : CPObject
 {
-    CPSet   _radios;
+    CPArray _radios;
    CPRadio _selectedRadio;

+    BOOL    _enabled @accessors(getter=enabled);
+    BOOL    _hidden @accessors(getter=hidden);
+
    id      _target @accessors(property=target);
    SEL     _action @accessors(property=action);
 }

+ (void)initialize
+{
+    if (self !== [CPRadioGroup class])
+        return;
+
+    [self exposeBinding:CPSelectedValueBinding];
+    [self exposeBinding:CPSelectedTagBinding];
+    [self exposeBinding:CPSelectedIndexBinding];
+
+    [self exposeBinding:CPEnabledBinding];
+    [self exposeBinding:CPHiddenBinding];
+}
+
 - (id)init
 {
    self = [super init];

    if (self)
    {
-        _radios = [CPSet set];
+        _radios = [];
        _selectedRadio = nil;
+        _enabled = YES;
+        _hidden = NO;
    }

    return self;
 }

+/*!
+    Selects the radio button at the given index within the group.
+    If index is -1, all of the radio buttons are turned off.
+*/
+- (void)selectRadioAtIndex:(int)index
+{
+    if (index === -1)
+        [self _setSelectedRadio:nil];
+    else
+    {
+        var radio = [_radios objectAtIndex:index];
+
+        [self _setSelectedRadio:radio];
+        [radio setState:CPOnState];
+    }
+}
+
+/*!
+    Selects the first radio button within the group with the given tag.
+    If a radio button with the given tag is found, selects it
+    and returns YES. Otherwise returns NO.
+*/
+- (BOOL)selectRadioWithTag:(int)tag
+{
+    var index = [_radios indexOfObjectPassingTest:function(radio)
+                    {
+                        return [radio tag] === tag;
+                    }];
+
+    if (index !== CPNotFound)
+    {
+        [self selectRadioAtIndex:index];
+        return YES;
+    }
+    else
+        return NO;
+}
+
+/*!
+    Returns the CPRadio that is currently selected within the group,
+    or nil if none are selected.
+*/
+- (CPRadio)selectedRadio
+{
+    return _selectedRadio;
+}
+
+/*!
+    Returns the index of the selected radio within the array of radio buttons.
+    Buttons are numbered going left to right and top to bottom. Returns -1
+    if no radio within the group is selected.
+*/
+- (int)selectedRadioIndex
+{
+    return [_radios indexOfObject:_selectedRadio];
+}
+
+- (CPArray)radios
+{
+    return _radios;
+}
+
+- (void)setEnabled:(BOOL)enabled
+{
+    [_radios makeObjectsPerformSelector:@selector(setEnabled:) withObject:enabled];
+}
+
+- (void)setHidden:(BOOL)hidden
+{
+    [_radios makeObjectsPerformSelector:@selector(setHidden:) withObject:hidden];
+}
+
+#pragma mark Private
+
 - (void)_addRadio:(CPRadio)aRadio
 {
-    [_radios addObject:aRadio];
+    if ([_radios indexOfObject:aRadio] === CPNotFound)
+        [_radios addObject:aRadio];

    if ([aRadio state] === CPOnState)
        [self _setSelectedRadio:aRadio];
@@ -238,23 +333,30 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
    [_radios removeObject:aRadio];
 }

+/*!
+    Selects the first radio button within the group with the given tag.
+    If a radio button with the given tag is found, selects it
+    and returns YES. Otherwise returns NO.
+*/
+- (void)_selectRadioWithTitle:(CPString)aTitle
+{
+    var index = [_radios indexOfObjectPassingTest:function(radio)
+                    {
+                        return [radio title] === aTitle;
+                    }];
+
+    [self selectRadioAtIndex:index];
+}
+
 - (void)_setSelectedRadio:(CPRadio)aRadio
 {
    if (_selectedRadio === aRadio)
        return;

    [_selectedRadio setState:CPOffState];
+
    _selectedRadio = aRadio;
-}
-
- (CPRadio)selectedRadio
-{
-    return _selectedRadio;
-}
-
- (CPArray)radios
-{
-    return [_radios allObjects];
+    [_CPRadioGroupSelectionBinder reverseSetValueForObject:self];
 }

@end
@@ -284,3 +386,100 @@ var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
 }

@end
+
+@implementation CPRadioGroup (BindingSupport)
+
+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding === CPSelectedValueBinding   ||
+        aBinding === CPSelectedTagBinding     ||
+        aBinding === CPSelectedIndexBinding)
+    {
+        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
+
+        return [CPClassFromString(@"_CPRadioGroup" + capitalizedBinding + "Binder") class];
+    }
+    else if ([aBinding hasPrefix:CPEnabledBinding])
+        return [CPMultipleValueAndBinding class];
+    else if ([aBinding hasPrefix:CPHiddenBinding])
+        return [CPMultipleValueOrBinding class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+@end
+
+var binderForObject = {};
+
+@implementation _CPRadioGroupSelectionBinder : 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];
+}
+
+@end
+
+@implementation _CPRadioGroupSelectedIndexBinder : _CPRadioGroupSelectionBinder
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectRadioAtIndex:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source selectedRadioIndex];
+}
+
+@end
+
+@implementation _CPRadioGroupSelectedTagBinder : _CPRadioGroupSelectionBinder
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectRadioWithTag:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedRadio] tag];
+}
+
+@end
+
+@implementation _CPRadioGroupSelectedValueBinder : _CPRadioGroupSelectionBinder
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source _selectRadioWithTitle:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedRadio] title];
+}
+
+@end
@@ -21,7 +21,11 @@
 */

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

+@import "CPEvent.j"
+
+@class CPKeyBinding

 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;
@@ -352,7 +356,7 @@ CPDeleteForwardKeyCode  = 46;
 var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
    CPResponderMenuKey = @"CPResponderMenuKey";

-@implementation CPResponder (CPCoding)
+@implementation CPResponder (CPCoding) <CPCoding>

 /*!
    Initializes the responder with data from a coder.
@@ -82,15 +82,15 @@
 }

 /*! @cond */
-+ (Class)_binderClassForBinding:(CPString)theBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
-    if (theBinding == CPValueBinding)
+    if (aBinding == CPValueBinding)
        return [CPPredicateEditorValueBinder class];

-    return [super _binderClassForBinding:theBinding];
+    return [super _binderClassForBinding:aBinding];
 }

- (id)_replacementKeyPathForBinding:(CPString)aBinding
+- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
 {
    if (aBinding == CPValueBinding)
        return @"predicate";
@@ -220,7 +220,7 @@
        var children = [CPArray array],
            itemsCount = 0,
            menuIndex = -1,
-            itemsArray,
+            itemArray,

            templateView = [templateViews objectAtIndex:count],
            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
@@ -360,7 +360,11 @@
        rootItems = [treeChild children];
    }

-    var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"];
+    var row = @{
+            @"criteria": criteria,
+            @"displayValues": values,
+            @"rowType": rowType,
+        };

    return row;
 }
@@ -480,7 +484,7 @@

 #pragma mark RuleEditor delegate methods

- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(int)type
+- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(CPRuleEditorRowType)type
 {
    if (rowItem == nil)
    {
@@ -490,7 +494,7 @@
    return [[rowItem children] count];
 }

- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(int)type
+- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(CPRuleEditorRowType)type
 {
    if (rowItem == nil)
    {
@@ -501,7 +505,7 @@
    return [[rowItem children] objectAtIndex:childIndex];
 }

- (id)_queryValueForItem:(id)rowItem inRow:(int)rowIndex
+- (id)_queryValueForItem:(id)rowItem inRow:(CPInteger)rowIndex
 {
    return [rowItem displayValue];
 }
@@ -512,7 +516,7 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";

@implementation CPPredicateEditor (CPCoding)

- (id)initWithCoder:(id)aCoder
+- (id)initWithCoder:(CPCoder)aCoder
 {
    self = [super initWithCoder:aCoder];

@@ -527,7 +531,7 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
    return self;
 }

- (void)encodeWithCoder:(id)aCoder
+- (void)encodeWithCoder:(CPCoder)aCoder
 {
    [super encodeWithCoder:aCoder];
    [aCoder encodeObject:_allTemplates forKey:CPPredicateTemplatesKey];
@@ -20,6 +20,17 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPPredicate.j>
+
+@import "CPCheckBox.j"
+@import "CPPopUpButton.j"
+@import "CPMenuItem.j"
+@import "CPTextField.j"
+
+// NOTE: CPDatePicker is not implemented yet
+@class CPDatePicker
+
+
 CPUndefinedAttributeType     = 0;
 CPInteger16AttributeType     = 100;
 CPInteger32AttributeType     = 200;
@@ -583,7 +594,7 @@ CPTransformableAttributeType = 1800;

 - (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
 {
-    var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)],
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
        count = [expressions count];

    for (var i = 0; i < count; i++)
@@ -691,12 +702,12 @@ CPTransformableAttributeType = 1800;
    return textField;
 }

- (void)_setOptions:(unsigned int)options
+- (void)_setOptions:(unsigned)options
 {
    _predicateOptions = options;
 }

- (void)_setModifier:(unsigned int)modifier
+- (void)_setModifier:(unsigned)modifier
 {
    _predicateModifier = modifier;
 }
@@ -20,35 +20,26 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <AppKit/CPTextField.j>
-@import <AppKit/CPViewAnimation.j>
-@import <AppKit/CPView.j>
@import <Foundation/CPPredicate.j>
@import <Foundation/CPArray.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPIndexSet.j>

+@import "CPPasteboard.j"
+@import "CPRuleEditor_Constants.j"
+@import "CPTextField.j"
+@import "CPViewAnimation.j"
+@import "CPView.j"
+
@import "_CPRuleEditorViewSliceRow.j"
@import "_CPRuleEditorLocalizer.j"

-CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
-CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
-CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
-CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
-CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
-CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
-CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
+@class CPCompoundPredicate
+@class CPComparisonPredicate

-CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
-CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
-
-CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
-CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
-CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
-CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
-
-CPRuleEditorRowTypeSimple       = 0;
-CPRuleEditorRowTypeCompound     = 1;
+@global CPDirectPredicateModifier
+@global CPCaseInsensitivePredicateOption
+@global CPOrPredicateType

 var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
    itemsContext                = "items",
@@ -131,10 +122,18 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
    return @"rule-editor";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"alternating-row-colors", @"selected-color", @"slice-top-border-color", @"slice-bottom-border-color", @"slice-last-bottom-border-color", @"font", @"add-image", @"remove-image"]];
+    return @{
+            @"alternating-row-colors": [CPNull null],
+            @"selected-color": [CPNull null],
+            @"slice-top-border-color": [CPNull null],
+            @"slice-bottom-border-color": [CPNull null],
+            @"slice-last-bottom-border-color": [CPNull null],
+            @"font": [CPNull null],
+            @"add-image": [CPNull null],
+            @"remove-image": [CPNull null],
+        };
 }

 - (id)initWithFrame:(CGRect)frame
@@ -462,7 +461,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
    @param row The index of a row in the receiver.
    @return The currently chosen items for row @a row.
 */
- (id)criteriaForRow:(int)row
+- (id)criteriaForRow:(CPInteger)row
 {
    var rowcache = [self _rowCacheForIndex:row];
    if (rowcache)
@@ -481,7 +480,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
    @return The chosen values (strings, views, or menu items) for row row.
    @discussion The values returned are the same as those returned from the delegate method -#ruleEditor:displayValueForCriterion:inRow:
 */
- (CPMutableArray)displayValuesForRow:(int)row
+- (CPMutableArray)displayValuesForRow:(CPInteger)row
 {
    var rowcache = [self _rowCacheForIndex:row];
    if (rowcache)
@@ -504,7 +503,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
    @param rowIndex The index of a row in the receiver.
    @return The index of the parent of the row at @a rowIndex. If the row at @a rowIndex is a root row, returns @c -1.
 */
- (int)parentRowForRow:(int)rowIndex
+- (int)parentRowForRow:(CPInteger)rowIndex
 {
    if (rowIndex < 0 || rowIndex >= [self numberOfRows])
        [CPException raise:CPRangeException reason:_cmd + @" row " + rowIndex + " is out of range"];
@@ -545,7 +544,7 @@ TODO: implement
    @return The type of the row at @a rowIndex.
    @warning Raises a @c CPRangeException if rowIndex is less than @c 0 or greater than or equal to the number of rows.
 */
- (CPRuleEditorRowType)rowTypeForRow:(int)rowIndex
+- (CPRuleEditorRowType)rowTypeForRow:(CPInteger)rowIndex
 {
    if (rowIndex < 0 || rowIndex > [self numberOfRows])
        [CPException raise:CPRangeException reason:_cmd + @"row " + rowIndex + " is out of range"];
@@ -566,7 +565,7 @@ TODO: implement
    @return The immediate subrows of the row at @a rowIndex.
    @discussion Rows are numbered starting at @c 0.
 */
- (CPIndexSet)subrowIndexesForRow:(int)rowIndex
+- (CPIndexSet)subrowIndexesForRow:(CPInteger)rowIndex
 {
    var object;

@@ -692,7 +691,7 @@ TODO: implement
    @note Currently, @a shouldAnimate has no effect, rows are always animated when calling this method.
    @see addRow:
 */
- (void)insertRowAtIndex:(int)rowIndex withType:(unsigned int)rowType asSubrowOfRow:(int)parentRow animate:(BOOL)shouldAnimate
+- (void)insertRowAtIndex:(int)rowIndex withType:(unsigned int)rowType asSubrowOfRow:(CPInteger)parentRow animate:(BOOL)shouldAnimate
 {
 /*
    TODO: raise exceptions if parentRow is greater than or equal to rowIndex, or if rowIndex would fall amongst the children of some other parent, or if the nesting mode forbids this configuration.
@@ -800,7 +799,7 @@ TODO: implement
 */
 - (CPPredicate)predicateForRow:(CPInteger)aRow
 {
-    var predicateParts = [CPDictionary dictionary],
+    var predicateParts = @{},
        items = [self criteriaForRow:aRow],
        count = [items count],
        predicate,
@@ -1314,7 +1313,7 @@ TODO: implement
    return [_boundArrayOwner mutableArrayValueForKey:_boundArrayKeyPath];
 }

- (BOOL)_nextUnusedItems:(CPArray)items andValues:(CPArray)values forRow:(int)rowIndex forRowType:(unsigned int)type
+- (BOOL)_nextUnusedItems:(CPArray)items andValues:(CPArray)values forRow:(CPInteger)rowIndex forRowType:(unsigned int)type
 {
    var parentItem = [items lastObject], // if empty items array, this is NULL aka the root item;
        childrenCount = [self _queryNumberOfChildrenOfItem:parentItem withRowType:type],
@@ -1376,7 +1375,7 @@ TODO: implement
    return YES;
 }

- (CPMutableArray)_getItemsAndValuesToAddForRow:(int)rowIndex ofType:(CPRuleEditorRowType)type
+- (CPMutableArray)_getItemsAndValuesToAddForRow:(CPInteger)rowIndex ofType:(CPRuleEditorRowType)type
 {
    //var cachedItemsAndValues = _itemsAndValuesToAddForRowType[type];
    //if (cachedItemsAndValues)
@@ -1396,7 +1395,10 @@ TODO: implement
    {
        var item = [items objectAtIndex:i],
            value = [values objectAtIndex:i],
-            itemAndValue = [CPDictionary dictionaryWithObjects:[item, value] forKeys:["item", "value"]];
+            itemAndValue = @{
+                    "item": item,
+                    "value": value,
+                };

        [itemsAndValues addObject:itemAndValue];
    }
@@ -1416,7 +1418,7 @@ TODO: implement
    [self insertRowAtIndex:insertIndex withType:type asSubrowOfRow:parentRowIndex animate:YES];
 }

- (id)_insertNewRowAtIndex:(int)insertIndex ofType:(CPRuleEditorRowType)rowtype withParentRow:(int)parentRowIndex
+- (id)_insertNewRowAtIndex:(int)insertIndex ofType:(CPRuleEditorRowType)rowtype withParentRow:(CPInteger)parentRowIndex
 {
    var row = [[[self rowClass] alloc] init],
        itemsandvalues = [self _getItemsAndValuesToAddForRow:insertIndex ofType:rowtype],
@@ -1512,26 +1514,13 @@ TODO: implement
            oldRows = [CPArray arrayWithArray:newRows];
            [oldRows removeObjectsInArray:changeNewValue];
        }
-        else if (changeKind === CPKeyValueChangeRemoval)
-        {
-            newRows = [self _subrowObjectsOfObject:object];
-            oldRows = [CPArray arrayWithArray:newRows];
-            var delIndexes = [change objectForKey:CPKeyValueChangeIndexesKey];
-            [oldRows insertObjects:delObjects atIndexes:changeOldValue];    // Pas sur que ce soit bon
-        }

        [self _changedRowArray:newRows withOldRowArray:oldRows forParent:object];
        [self _reconfigureSubviewsAnimate:[self _wantsRowAnimations]];
    }
-    else if (context === itemsContext)
-    {
-    }
-    else if (context === valuesContext)
-    {
-    }
 }

- (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(int)aRow atCriteriaIndex:(int)fromItemIndex
+- (void)_changedItem:(id)fromItem toItem:(id)toItem inRow:(CPInteger)aRow atCriteriaIndex:(int)fromItemIndex
 {
    var criteria = [self criteriaForRow:aRow],
        displayValues = [self displayValuesForRow:aRow],
@@ -1695,7 +1684,7 @@ TODO: implement
    [super bind:aBinding toObject:observableController withKeyPath:aKeyPath options:options];
 }

- (void)unbind:(id)object
+- (void)unbind:(CPString)object
 {
    _rowClass = [_CPRuleEditorRowObject class];
    [super unbind:object];
@@ -1703,8 +1692,8 @@ TODO: implement

 - (void)_setBoundDataSource:(id)datasource withKeyPath:(CPString)keyPath options:(CPDictionary)options
 {
-    if ([observableController respondsToSelector:@selector(objectClass)])
-        _rowClass = [observableController objectClass];
+    if ([datasource respondsToSelector:@selector(objectClass)])
+        _rowClass = [datasource objectClass];

    _boundArrayKeyPath = keyPath;
    _boundArrayOwner = datasource;
@@ -1793,7 +1782,7 @@ TODO: implement

        if (animate)
        {
-            var animation = [CPDictionary dictionary];
+            var animation = @{};
            [animation setObject:aslice forKey:CPViewAnimationTargetKey];
            [animation setObject:startRect forKey:CPViewAnimationStartFrameKey];
            [animation setObject:targetRect forKey:CPViewAnimationEndFrameKey];
@@ -1888,17 +1877,17 @@ TODO: implement

 - (CPString)_toolTipForAddCompoundRowButton
 {
-    return @"Add Compound row";
+    return [_standardLocalizer localizedStringForString:@"Add compound row"];
 }

 - (CPString)_toolTipForAddSimpleRowButton
 {
-    return @"Add row";
+    return [_standardLocalizer localizedStringForString:@"Add row"];
 }

 - (CPString)_toolTipForDeleteRowButton
 {
-    return @"Delete row";
+    return [_standardLocalizer localizedStringForString:@"Delete row"];
 }

 - (void)_updateSliceIndentations
@@ -2016,7 +2005,7 @@ TODO: implement
    return [_ruleDelegate ruleEditor:self child:childIndex forCriterion:item withRowType:type];
 }

- (id)_queryValueForItem:(id)item inRow:(int)row
+- (id)_queryValueForItem:(id)item inRow:(CPInteger)row
 {
    return [_ruleDelegate ruleEditor:self displayValueForCriterion:item inRow:row];
 }
@@ -2037,12 +2026,12 @@ TODO: implement
    _alignmentGridWidth = width;
 }

- (BOOL)_validateItem:(id)item value:(id)value inRow:(int)row
+- (BOOL)_validateItem:(id)item value:(id)value inRow:(CPInteger)row
 {
    return [self _queryCanSelectItem:item displayValue:value inRow:row];
 }

- (BOOL)_queryCanSelectItem:(id)item displayValue:(id)value inRow:(int)row
+- (BOOL)_queryCanSelectItem:(id)item displayValue:(id)value inRow:(CPInteger)row
 {
    return YES;
 }
@@ -2058,7 +2047,7 @@ TODO: implement
    [super setNeedsDisplay:flag];
 }

- (void)setFrameSize:(CPSize)size
+- (void)setFrameSize:(CGSize)size
 {
    [self setNeedsDisplay:YES];

@@ -2126,7 +2115,7 @@ TODO: implement
    [dragview setBackgroundColor:[firstSlice backgroundColor]];
    [dragview setAlphaValue:0.7];

-    dragPoint = CPMakePoint(0, firstIndex * _sliceHeight);
+    dragPoint = CGPointMake(0, firstIndex * _sliceHeight);

    [self dragView:dragview
                at:dragPoint
@@ -2139,7 +2128,7 @@ TODO: implement
    return YES;
 }

- (CPDragOperation)draggingEntered:(id < CPDraggingInfo >)sender
+- (CPDragOperation)draggingEntered:(id /*< CPDraggingInfo >*/)sender
 {
    if ([sender draggingSource] === self)
    {
@@ -2169,7 +2158,7 @@ TODO: implement
    _subviewIndexOfDropLine = CPNotFound;
 }

- (CPDragOperation)draggingUpdated:(id <CPDraggingInfo>)sender
+- (CPDragOperation)draggingUpdated:(id /*<CPDraggingInfo>*/)sender
 {
    var point = [self convertPoint:[sender draggingLocation] fromView:nil],
        y = point.y + _sliceHeight / 2,
@@ -2188,7 +2177,7 @@ TODO: implement
        if (_subviewIndexOfDropLine !== CPNotFound && _subviewIndexOfDropLine < numberOfRows)
        {
            var previousBelowSlice = [_slices objectAtIndex:_subviewIndexOfDropLine];
-            [previousBelowSlice setFrameOrigin:CPMakePoint(0, [previousBelowSlice rowIndex] * _sliceHeight)];
+            [previousBelowSlice setFrameOrigin:CGPointMake(0, [previousBelowSlice rowIndex] * _sliceHeight)];
        }

        if (indexOfDropLine <= _lastRow && indexOfDropLine < numberOfRows)
@@ -2206,12 +2195,12 @@ TODO: implement
    return CPDragOperationMove;
 }

- (BOOL)prepareForDragOperation:(id < CPDraggingInfo >)sender
+- (BOOL)prepareForDragOperation:(id /*< CPDraggingInfo >*/)sender
 {
    return (_subviewIndexOfDropLine !== CPNotFound);
 }

- (BOOL)performDragOperation:(id < CPDraggingInfo >)info
+- (BOOL)performDragOperation:(id /*< CPDraggingInfo >*/)info
 {
    var aboveInsertIndexCount = 0,
        object,
@@ -2254,7 +2243,7 @@ TODO: implement
    return [CPIndexSet indexSetWithIndex:CPDragOperationMove];
 }

- (void)draggedView:(CPView)dragView endedAt:(CPPoint)aPoint operation:(CPDragOperation)operation
+- (void)draggedView:(CPView)dragView endedAt:(CGPoint)aPoint operation:(CPDragOperation)operation
 {
    _draggingRows = nil;

@@ -2273,7 +2262,7 @@ TODO: implement
 {
 }

- (void)_setWindow:(id)window
+- (void)_setWindow:(CPWindow)window
 {
    [super _setWindow:window];
 }
@@ -2290,7 +2279,7 @@ TODO: implement

 - (void)_postRowCountChangedNotificationOfType:(CPString)notificationName indexes:indexes
 {
-    var userInfo = [CPDictionary dictionaryWithObject:indexes forKey:"indexes"];
+    var userInfo = indexes === nil ? @{} : @{ "indexes": indexes };
    [[CPNotificationCenter defaultCenter] postNotificationName:notificationName object:self userInfo:userInfo];
 }

@@ -2336,7 +2325,7 @@ TODO: implement
    return YES;
 }

- (void)_getAllAvailableItems:(id)items values:(id)values asChildrenOfItem:(id)parentItem inRow:(int)aRow
+- (void)_getAllAvailableItems:(id)items values:(id)values asChildrenOfItem:(id)parentItem inRow:(CPInteger)aRow
 {
    var type,
        indexofCriterion,
@@ -2437,7 +2426,7 @@ var CPRuleEditorAlignmentGridWidthKey       = @"CPRuleEditorAlignmentGridWidth",
    return self;
 }

- (void)encodeWithCoder:(id)coder
+- (void)encodeWithCoder:(CPCoder)coder
 {
    [super encodeWithCoder:coder];

@@ -2492,7 +2481,7 @@ var CriteriaKey         = @"criteria",
    return "<" + [self className] + ">\nsubrows = " + [subrows description] + "\ncriteria = " + [criteria description] + "\ndisplayValues = " + [displayValues description];
 }

- (id)initWithCoder:(id)coder
+- (id)initWithCoder:(CPCoder)coder
 {
    self = [super init];
    if (self !== nil)
@@ -2506,7 +2495,7 @@ var CriteriaKey         = @"criteria",
    return self;
 }

- (void)encodeWithCoder:(id)coder
+- (void)encodeWithCoder:(CPCoder)coder
 {
    [coder encodeObject:subrows forKey:SubrowsKey];
    [coder encodeObject:criteria forKey:CriteriaKey];
@@ -2545,7 +2534,7 @@ var CPBoundArrayKey = @"CPBoundArray";
    return self;
 }

- (id)initWithCoder:(id)coder
+- (id)initWithCoder:(CPCoder)coder
 {
    if (self = [super init])
        boundArray = [coder decodeObjectForKey:CPBoundArrayKey];
@@ -2553,7 +2542,7 @@ var CPBoundArrayKey = @"CPBoundArray";
    return self;
 }

- (void)encodeWithCoder:(id)coder
+- (void)encodeWithCoder:(CPCoder)coder
 {
    [coder encodeObject:boundArray forKey:CPBoundArrayKey];
 }
@@ -2578,7 +2567,7 @@ var dropSeparatorColor = [CPColor colorWithHexString:@"4886ca"];
 {
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort];
    CGContextSetFillColor(context, dropSeparatorColor);
@@ -0,0 +1,40 @@
+/*
+ * CPRuleEditor_Constants.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
+ */
+
+CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
+CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
+CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
+CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
+CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
+CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
+CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
+
+CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
+CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
+
+CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
+CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
+CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
+CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
+
+CPRuleEditorRowTypeSimple       = 0;
+CPRuleEditorRowTypeCompound     = 1;
@@ -1,9 +1,25 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * 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
 */

-@class _CPPredicateEditorTree;
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
@implementation _CPPredicateEditorRowNode : CPObject
 {
    _CPPredicateEditorTree                   tree @accessors;
@@ -1,8 +1,25 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * 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 <Foundation/CPString.j>
+
@implementation _CPPredicateEditorTree : CPObject
 {
    CPPredicateEditorRowTemplate         template @accessors;
@@ -1,11 +1,27 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * 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 <Foundation/CPDictionary.j>
@import <Foundation/CPString.j>
+@import <Foundation/CPURLConnection.j>
+@import <Foundation/CPURLRequest.j>

 var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");

@@ -13,7 +29,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 {
    CPDictionary    _dictionary @accessors(property=dictionary);
    CPURLConnection connection;
-    CPURLRequest    resquest;
+    CPURLRequest    request;
 }

 - (void)loadContentOfURL:(CPURL)aURL
@@ -43,7 +59,7 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)

 - (void)loadContent:(CPString)aContent
 {
-    var dict = [CPDictionary dictionary],
+    var dict = @{},
        lines = [aContent componentsSeparatedByString:"\n"],
        count = [lines count];

@@ -77,3 +93,5 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)

    return aString;
 }
+
+@end
@@ -1,8 +1,27 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * 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 "CPBezierPath.j"
+@import "CPPopUpButton.j"
+
+@class _CPRuleEditorViewSlice
+
 var GRADIENT_START_COLOR = "#fcfcfc",
    GRADIENT_END_COLOR = "#dfdfdf",
    BORDER_COLOR = "#BDBDBD";
@@ -44,9 +63,11 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 {
    [self setBordered:NO];

+#if PLATFORM(DOM)
    var style = _DOMElement.style;
    style.border = "1px solid " + BORDER_COLOR;
    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+#endif
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -65,9 +86,9 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
    return self;
 }

- (id)hitTest:(CPPoint)point
+- (CPView)hitTest:(CGPoint)point
 {
-    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
        return nil;

    return self;
@@ -79,12 +100,12 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
 }

- (BOOL)trackMouse:(CPEvent)theEvent
+- (void)trackMouse:(CPEvent)theEvent
 {
    if (![self sliceIsEditable])
-        return NO;
+        return;

-    return [super trackMouse:theEvent];
+    [super trackMouse:theEvent];
 }

 - (CGRect)contentRectForBounds:(CGRect)bounds
@@ -98,11 +119,13 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))

 - (void)layoutSubviews
 {
+#if PLATFORM(DOM)
    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
    var style = _DOMElement.style,
        radiusCSS = radius + "px";

    style.borderRadius = radiusCSS;
+#endif

    [super layoutSubviews];
 }
@@ -139,9 +162,11 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 {
    [self setBordered:NO];

+#if PLATFORM(DOM)
    var style = _DOMElement.style;
    style.border = "1px solid " + BORDER_COLOR;
    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
+#endif
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -162,6 +187,7 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))

 - (void)layoutSubviews
 {
+#if PLATFORM(DOM)
    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);

    var style = _DOMElement.style,
@@ -169,6 +195,7 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))

    style.borderRadius = radiusCSS;
    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+#endif

    [super layoutSubviews];
 }
@@ -1,17 +1,34 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * 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 "CPView.j"
+
@implementation _CPRuleEditorViewSlice : CPView
 {
    CPRuleEditor _ruleEditor;
    int          _indentation           @accessors(property=indentation);
    int          _rowIndex              @accessors(property=rowIndex);
-    CPRect       _animationTargetRect   @accessors(property=_animationTargetRect);
+    CGRect       _animationTargetRect   @accessors(property=_animationTargetRect);
    BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
    BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
    CPColor      _backgroundColor       @accessors(property=backgroundColor);
+    BOOL         _editable              @accessors(getter=isEditable, setter=setEditable:);
 }

 - (void)removeFromSuperview
@@ -36,19 +53,19 @@
    if (select == _selected)
        return;

-    var selector = select ? @"setThemeState:" : @"unsetThemeState:";
-    [[self subviews] makeObjectsPerformSelector:CPSelectorFromString(selector)  withObject:CPThemeStateSelectedDataView];
+    var selector = select ? @selector(setThemeState:) : @selector(unsetThemeState:);
+    [[self subviews] makeObjectsPerformSelector:selector  withObject:CPThemeStateSelectedDataView];
    _selected = select;
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
        bounds = [self bounds],
-        maxX = CGRectGetWidth(bounds) - 2,
+        maxX = CGRectGetWidth(bounds),
        maxY = CGRectGetHeight(bounds);

-// Draw background
+    // Draw background
    if ([self _isSelected])
        _backgroundColor = [_ruleEditor _selectedRowColor];
    else
@@ -61,33 +78,33 @@
    CGContextSetFillColor(context, _backgroundColor);
    CGContextFillRect(context, rect);

-// Draw Top Border
+    // Draw Top Border
    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 1, 0);
+    CGContextMoveToPoint(context, 0, 0);
    CGContextAddLineToPoint(context, maxX, 0);
-    CGContextClosePath(context);
    CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
    CGContextStrokePath(context);

-// Draw Bottom Border
+    // Draw Bottom Border
    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 1, maxY - 0.5);
-    CGContextAddLineToPoint(context, maxX, maxY - 0.5);
-    CGContextClosePath(context);
+    CGContextMoveToPoint(context, 0, maxY);
+    CGContextAddLineToPoint(context, maxX, maxY);
+
    var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
+
    CGContextSetStrokeColor(context, bottomColor);
    CGContextStrokePath(context);
 }

 - (void)mouseDown:(CPEvent)theEvent
 {
-    if (editable)
+    if (_editable)
        [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
 }

 - (void)mouseUp:(CPEvent)theEvent
 {
-    if (editable)
+    if (_editable)
        [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
 }

@@ -106,4 +123,4 @@
    return [CPString stringWithFormat:@"<%@ %p index:%d indentation:%d>",[self className],self,[self rowIndex],[self indentation]];
 }

-@end
+@end
@@ -1,11 +1,27 @@
 /*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * 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_Constants.j"
@import "_CPRuleEditorViewSlice.j"
@import "_CPRuleEditorPopUpButton.j"
-@import "CPRuleEditor.j"
+
+@global CPApp

 var CONTROL_HEIGHT = 16.,
    BUTTON_HEIGHT = 16.;
@@ -18,7 +34,7 @@ var CONTROL_HEIGHT = 16.,
    CPMutableArray  _ruleOptionInitialViewFrames;
    CPButton        _addButton;
    CPButton        _subtractButton;
-    BOOL            editable;
+
    CPRuleEditorRowType _rowType @accessors;
    CPRuleEditorRowType _plusButtonRowType;
 }
@@ -37,14 +53,14 @@ var CONTROL_HEIGHT = 16.,
    _ruleOptionFrames = [[CPMutableArray alloc] init];
    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
    _ruleOptionViews = [[CPMutableArray alloc] init];
-     editable = [_ruleEditor isEditable];
+     _editable = [_ruleEditor isEditable];

    _addButton = [self _createAddRowButton];
    _subtractButton = [self _createDeleteRowButton];
    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [_addButton setHidden:!editable];
-    [_subtractButton setHidden:!editable];
+    [_addButton setHidden:!_editable];
+    [_subtractButton setHidden:!_editable];
    [self addSubview:_addButton];
    [self addSubview:_subtractButton];

@@ -121,17 +137,18 @@ var CONTROL_HEIGHT = 16.,
    return [CPMenuItem separatorItem];
 }

- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString )text
+- (_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],
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CGRectMakeZero()],
+        ruleEditorFont = [_ruleEditor font],
+        font = [CPFont fontWithName:[ruleEditorFont familyName] size:[ruleEditorFont size] + 2],
+        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text],
+        size = [localizedText sizeWithFont:font];

-        localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text];
+    [textField setFrameSize:CGSizeMake(size.width + 4, CONTROL_HEIGHT + 2)];

    [textField setValue:font forThemeAttribute:@"font"];
    [textField setStringValue:localizedText];
-    [textField sizeToFit];

    return textField;
 }
@@ -254,7 +271,11 @@ var CONTROL_HEIGHT = 16.,
                    }
                }

-                repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"];
+                repObject = @{
+                        @"item": childItem,
+                        @"value": childValue,
+                        @"indexInCriteria": i
+                    };
                [menuItem setRepresentedObject:repObject];
                [menuItems addObject:menuItem];
            }
@@ -300,7 +321,7 @@ var CONTROL_HEIGHT = 16.,

    [_correspondingRuleItems setArray:ruleItems];

-    if (!editable)
+    if (!_editable)
        [self _updateEnabledStateForSubviews];

    [self _relayoutSubviewsWidthChanged:YES];
@@ -352,6 +373,7 @@ var CONTROL_HEIGHT = 16.,
            optionFrame = _ruleOptionFrames[i];

        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
+
        if (widthChanged)
        {
            optionFrame.origin.x = optionViewOriginX;
@@ -381,14 +403,9 @@ var CONTROL_HEIGHT = 16.,
    [self _setRowTypeToAddFromPlusButton:type];
 }

- (BOOL)isEditable
-{
-    return editable;
-}
-
 - (void)setEditable:(BOOL)value
 {
-    editable = value;
+    [super setEditable:value]
 //  [self _updateEnabledStateForSubviews];
    [self _updateButtonVisibilities];
 }
@@ -464,7 +481,7 @@ var CONTROL_HEIGHT = 16.,
    [self layoutSubviews];
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    [super drawRect:rect];
 }
@@ -476,13 +493,6 @@ var CONTROL_HEIGHT = 16.,
    return NO;
 }

- (BOOL)_isRuleStaticTextField:(CPView)view
-{
-    if ([view isKindOfClass:[_CPRuleEditorTextField class]])
-        return YES;
-    return NO;
-}
-
 - (void)_sendRuleAction:(id)sender
 {
    [_ruleEditor _updatePredicate];
@@ -504,19 +514,17 @@ var CONTROL_HEIGHT = 16.,
 - (id)initWithFrame:(CGRect)frame
 {
    self = [super initWithFrame:frame];
-    if (self != nil)
+    if (self)
    {
-        [self setBordered:NO];
-        [self setEditable:NO];
        [self setDrawsBackground:NO];
    }

    return self;
 }

- (id)hitTest:(CPPoint)point
+- (CPView)hitTest:(CGPoint)point
 {
-    if (!CPRectContainsPoint([self frame], point))
+    if (!CGRectContainsPoint([self frame], point))
        return nil;

    return [self superview];
@@ -43,9 +43,9 @@
 - (CGRect)visibleFrame
 {
 #if PLATFORM(DOM)
-    return _CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
+    return CGRectMake(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
 #else
-    return _CGRectMakeZero();
+    return CGRectMakeZero();
 #endif
 }

@@ -34,34 +34,44 @@


 /*! @ignore */
-var _isSystemUsingOverlayScrollers = function()
+var _isBrowserUsingOverlayScrollers = function()
 {
 #if PLATFORM(DOM)
-    var inner = document.createElement('p'),
-        outer = document.createElement('div');
+    /*
+        Even if the system supports overlay (Lion) scrollers,
+        the browser (e.g. FireFox *cough*) may not.

-    inner.style.width = "100%";
-    inner.style.height = "200px";
+        To determine if the browser is using overlay scrollbars,
+        we put a <p> element inside a shorter <div> and set its
+        overflow to scroll. If the browser is using visible scrollers,
+        the outer div's clientWidth will less than the offsetWidth, because
+        clientWidth does not include scrollbars, whereas offsetWidth does.
+        So if clientWidth === offsetWidth, the scrollers must be overlay.
+        Even IE gets this right.
+    */
+    var outer = document.createElement('div'),
+        inner = document.createElement('p');

+    // position it absolute so it doesn't affect existing DOM elements
    outer.style.position = "absolute";
    outer.style.top = "0px";
    outer.style.left = "0px";
    outer.style.visibility = "hidden";
    outer.style.width = "200px";
    outer.style.height = "150px";
-    outer.style.overflow = "hidden";
-    outer.appendChild (inner);
+    outer.style.overflow = "scroll";

-    document.body.appendChild (outer);
-    var w1 = inner.offsetWidth;
-    outer.style.overflow = 'scroll';
-    var w2 = inner.offsetWidth;
-    if (w1 == w2)
-        w2 = outer.clientWidth;
+    inner.style.width = "100%";
+    inner.style.height = "200px";
+    outer.appendChild(inner);

-    document.body.removeChild (outer);
+    document.body.appendChild(outer);

-    return (w1 - w2 == 0);
+    var usingOverlayScrollers = outer.clientWidth === outer.offsetWidth;
+
+    document.body.removeChild(outer);
+
+    return usingOverlayScrollers;
 #else
    return NO;
 #endif
@@ -130,8 +140,8 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,

    var globalValue = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPScrollersGlobalStyle"];

-    if (globalValue == nil || globalValue == -1)
-        CPScrollerStyleGlobal = _isSystemUsingOverlayScrollers() ? CPScrollerStyleOverlay : CPScrollerStyleLegacy
+    if (globalValue === nil || globalValue === -1)
+        CPScrollerStyleGlobal = _isBrowserUsingOverlayScrollers() ? CPScrollerStyleOverlay : CPScrollerStyleLegacy
    else
        CPScrollerStyleGlobal = globalValue;
 }
@@ -143,15 +153,15 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,

 + (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithJSObject:{
-        @"bottom-corner-color": [CPColor whiteColor],
-        @"border-color": [CPColor blackColor]
-    }];
+    return @{
+            @"bottom-corner-color": [CPColor whiteColor],
+            @"border-color": [CPColor blackColor]
+        };
 }

 + (CGSize)contentSizeForFrameSize:(CGSize)frameSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType
 {
-    var bounds = [self _insetBounds:_CGRectMake(0.0, 0.0, frameSize.width, frameSize.height) borderType:borderType],
+    var bounds = [self _insetBounds:CGRectMake(0.0, 0.0, frameSize.width, frameSize.height) borderType:borderType],
        scrollerWidth = [CPScroller scrollerWidth];

    if (hFlag)
@@ -165,17 +175,17 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,

 + (CGSize)frameSizeForContentSize:(CGSize)contentSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType
 {
-    var bounds = [self _insetBounds:_CGRectMake(0.0, 0.0, contentSize.width, contentSize.height) borderType:borderType],
+    var bounds = [self _insetBounds:CGRectMake(0.0, 0.0, contentSize.width, contentSize.height) borderType:borderType],
        widthInset = contentSize.width - bounds.size.width,
        heightInset = contentSize.height - bounds.size.height,
-        frameSize = _CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset),
+        frameSize = CGSizeMake(contentSize.width + widthInset, contentSize.height + heightInset),
        scrollerWidth = [CPScroller scrollerWidth];

    if (hFlag)
-        frameSize.height -= scrollerWidth;
+        frameSize.height += scrollerWidth;

    if (vFlag)
-        frameSize.width -= scrollerWidth;
+        frameSize.width += scrollerWidth;

    return frameSize;
 }
@@ -186,10 +196,10 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,
    {
        case CPLineBorder:
        case CPBezelBorder:
-            return _CGRectInset(bounds, 1.0, 1.0);
+            return CGRectInset(bounds, 1.0, 1.0);

        case CPGrooveBorder:
-            bounds = _CGRectInset(bounds, 2.0, 2.0);
+            bounds = CGRectInset(bounds, 2.0, 2.0);
            ++bounds.origin.y;
            --bounds.size.height;
            return bounds;
@@ -213,7 +223,7 @@ var CPScrollerStyleGlobal                       = CPScrollerStyleOverlay,

    @param aStyle the scroller style to set all scroller views to use (CPScrollerStyleLegacy or CPScrollerStyleOverlay)
 */
-+ (int)setGlobalScrollerStyle:(int)aStyle
+ (void)setGlobalScrollerStyle:(int)aStyle
 {
    CPScrollerStyleGlobal = aStyle;
    [[CPNotificationCenter defaultCenter] postNotificationName:CPScrollerStyleGlobalChangeNotification object:nil];
@@ -517,8 +527,8 @@ Notifies the delegate when the scroll view has finished scrolling.
    {
        var bounds = [self _insetBounds];

-        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(_CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1), [CPScroller scrollerWidthInStyle:_scrollerStyle])]];
-        [[self horizontalScroller] setFrameSize:CGSizeMake(_CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle])];
+        [self setHorizontalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, MAX(CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1), [CPScroller scrollerWidthInStyle:_scrollerStyle])]];
+        [[self horizontalScroller] setFrameSize:CGSizeMake(CGRectGetWidth(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle])];
    }

    [self reflectScrolledClipView:_contentView];
@@ -582,8 +592,8 @@ Notifies the delegate when the scroll view has finished scrolling.
    {
        var bounds = [self _insetBounds];

-        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:_CGRectMake(0.0, 0.0, [CPScroller scrollerWidthInStyle:_scrollerStyle], MAX(_CGRectGetHeight(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1))]];
-        [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidthInStyle:_scrollerStyle], _CGRectGetHeight(bounds))];
+        [self setVerticalScroller:[[CPScroller alloc] initWithFrame:CGRectMake(0.0, 0.0, [CPScroller scrollerWidthInStyle:_scrollerStyle], MAX(CGRectGetHeight(bounds), [CPScroller scrollerWidthInStyle:_scrollerStyle] + 1))]];
+        [[self verticalScroller] setFrameSize:CGSizeMake([CPScroller scrollerWidthInStyle:_scrollerStyle], CGRectGetHeight(bounds))];
    }

    [self reflectScrolledClipView:_contentView];
@@ -859,13 +869,13 @@ Notifies the delegate when the scroll view has finished scrolling.
 - (CGRect)_cornerViewFrame
 {
    if (!_cornerView)
-        return _CGRectMakeZero();
+        return CGRectMakeZero();

    var bounds = [self _insetBounds],
        frame = [_cornerView frame];

-    frame.origin.x = _CGRectGetMaxX(bounds) - _CGRectGetWidth(frame);
-    frame.origin.y = _CGRectGetMinY(bounds);
+    frame.origin.x = CGRectGetMaxX(bounds) - CGRectGetWidth(frame);
+    frame.origin.y = CGRectGetMinY(bounds);

    return frame;
 }
@@ -876,14 +886,14 @@ Notifies the delegate when the scroll view has finished scrolling.
    var headerView = [self _headerView];

    if (!headerView)
-        return _CGRectMakeZero();
+        return CGRectMakeZero();

    var frame = [self _insetBounds];

-    frame.size.height = _CGRectGetHeight([headerView frame]);
+    frame.size.height = CGRectGetHeight([headerView frame]);

    if (SHOULD_SHOW_CORNER_VIEW())
-        frame.size.width -= _CGRectGetWidth([self _cornerViewFrame]);
+        frame.size.width -= CGRectGetWidth([self _cornerViewFrame]);

    return frame;
 }
@@ -924,18 +934,18 @@ Notifies the delegate when the scroll view has finished scrolling.
            break;

        case CPScrollerDecrementPage:
-            contentBounds.origin.y -= _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+            contentBounds.origin.y -= CGRectGetHeight(contentBounds) - _verticalPageScroll;
            break;

        case CPScrollerIncrementPage:
-            contentBounds.origin.y += _CGRectGetHeight(contentBounds) - _verticalPageScroll;
+            contentBounds.origin.y += CGRectGetHeight(contentBounds) - _verticalPageScroll;
            break;

        // We want integral bounds!
        case CPScrollerKnobSlot:
        case CPScrollerKnob:
        default:
-            contentBounds.origin.y = ROUND(value * (_CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds)));
+            contentBounds.origin.y = ROUND(value * (CGRectGetHeight(documentFrame) - CGRectGetHeight(contentBounds)));
    }

    [self _sendDelegateMessages];
@@ -961,18 +971,18 @@ Notifies the delegate when the scroll view has finished scrolling.
            break;

        case CPScrollerDecrementPage:
-            contentBounds.origin.x -= _CGRectGetWidth(contentBounds) - _horizontalPageScroll;
+            contentBounds.origin.x -= CGRectGetWidth(contentBounds) - _horizontalPageScroll;
            break;

        case CPScrollerIncrementPage:
-            contentBounds.origin.x += _CGRectGetWidth(contentBounds) - _horizontalPageScroll;
+            contentBounds.origin.x += CGRectGetWidth(contentBounds) - _horizontalPageScroll;
            break;

        // We want integral bounds!
        case CPScrollerKnobSlot:
        case CPScrollerKnob:
        default:
-            contentBounds.origin.x = ROUND(value * (_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentBounds)));
+            contentBounds.origin.x = ROUND(value * (CGRectGetWidth(documentFrame) - CGRectGetWidth(contentBounds)));
    }

    [self _sendDelegateMessages];
@@ -1096,7 +1106,7 @@ Notifies the delegate when the scroll view has finished scrolling.
        }

        [_contentView setFrame:[self _insetBounds]];
-        [_headerClipView setFrame:_CGRectMakeZero()];
+        [_headerClipView setFrame:CGRectMakeZero()];

        --_recursionCount;

@@ -1106,14 +1116,14 @@ Notifies the delegate when the scroll view has finished scrolling.
    var documentFrame = [documentView frame], // the size of the whole document
        contentFrame = [self _insetBounds], // assume it takes up the entire size of the scrollview (no scrollers)
        headerClipViewFrame = [self _headerClipViewFrame],
-        headerClipViewHeight = _CGRectGetHeight(headerClipViewFrame);
+        headerClipViewHeight = CGRectGetHeight(headerClipViewFrame);

    contentFrame.origin.y += headerClipViewHeight;
    contentFrame.size.height -= headerClipViewHeight;

-    var difference = _CGSizeMake(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(contentFrame), _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentFrame)),
-        verticalScrollerWidth = _CGRectGetWidth([_verticalScroller frame]),
-        horizontalScrollerHeight = _CGRectGetHeight([_horizontalScroller frame]),
+    var difference = CGSizeMake(CGRectGetWidth(documentFrame) - CGRectGetWidth(contentFrame), CGRectGetHeight(documentFrame) - CGRectGetHeight(contentFrame)),
+        verticalScrollerWidth = [CPScroller scrollerWidthInStyle:[_verticalScroller style]],
+        horizontalScrollerHeight = [CPScroller scrollerWidthInStyle:[_horizontalScroller style]],
        hasVerticalScroll = difference.height > 0.0,
        hasHorizontalScroll = difference.width > 0.0,
        shouldShowVerticalScroller = _hasVerticalScroller && (!_autohidesScrollers || hasVerticalScroll),
@@ -1162,18 +1172,18 @@ Notifies the delegate when the scroll view has finished scrolling.
    if (shouldShowVerticalScroller)
    {
        var verticalScrollerY =
-            MAX(_CGRectGetMinY(contentFrame), MAX(_CGRectGetMaxY([self _cornerViewFrame]), _CGRectGetMaxY(headerClipViewFrame)));
+            MAX(CGRectGetMinY(contentFrame), MAX(CGRectGetMaxY([self _cornerViewFrame]), CGRectGetMaxY(headerClipViewFrame)));

-        var verticalScrollerHeight = _CGRectGetMaxY(contentFrame) - verticalScrollerY;
+        var verticalScrollerHeight = CGRectGetMaxY(contentFrame) - verticalScrollerY;

        // Make a gap at the bottom of the vertical scroller so that the horizontal and vertical can't overlap.
        if (_scrollerStyle === CPScrollerStyleOverlay && hasHorizontalScroll)
            verticalScrollerHeight -= horizontalScrollerHeight;

-        var documentHeight = _CGRectGetHeight(documentFrame);
+        var documentHeight = CGRectGetHeight(documentFrame);
        [_verticalScroller setFloatValue:(difference.height <= 0.0) ? 0.0 : scrollPoint.y / difference.height];
-        [_verticalScroller setKnobProportion:documentHeight > 0 ? _CGRectGetHeight(contentFrame) / documentHeight : 1.0];
-        [_verticalScroller setFrame:_CGRectMake(_CGRectGetMaxX(contentFrame) - overlay, verticalScrollerY, verticalScrollerWidth, verticalScrollerHeight)];
+        [_verticalScroller setKnobProportion:documentHeight > 0 ? CGRectGetHeight(contentFrame) / documentHeight : 1.0];
+        [_verticalScroller setFrame:CGRectMake(CGRectGetMaxX(contentFrame) - overlay, verticalScrollerY, verticalScrollerWidth, verticalScrollerHeight)];
    }
    else if (wasShowingVerticalScroller)
    {
@@ -1183,16 +1193,16 @@ Notifies the delegate when the scroll view has finished scrolling.

    if (shouldShowHorizontalScroller)
    {
-        var horizontalScrollerWidth = _CGRectGetWidth(contentFrame);
+        var horizontalScrollerWidth = CGRectGetWidth(contentFrame);
        // Make a gap at the bottom of the vertical scroller so that the horizontal and vertical can't overlap.
        if (_scrollerStyle === CPScrollerStyleOverlay && hasVerticalScroll)
            horizontalScrollerWidth -= verticalScrollerWidth;

-        var documentWidth = _CGRectGetWidth(documentFrame);
+        var documentWidth = CGRectGetWidth(documentFrame);

        [_horizontalScroller setFloatValue:(difference.width <= 0.0) ? 0.0 : scrollPoint.x / difference.width];
-        [_horizontalScroller setKnobProportion:documentWidth > 0 ? _CGRectGetWidth(contentFrame) / documentWidth : 1.0];
-        [_horizontalScroller setFrame:_CGRectMake(_CGRectGetMinX(contentFrame), _CGRectGetMaxY(contentFrame) - overlay, horizontalScrollerWidth, horizontalScrollerHeight)];
+        [_horizontalScroller setKnobProportion:documentWidth > 0 ? CGRectGetWidth(contentFrame) / documentWidth : 1.0];
+        [_horizontalScroller setFrame:CGRectMake(CGRectGetMinX(contentFrame), CGRectGetMaxY(contentFrame) - overlay, horizontalScrollerWidth, horizontalScrollerHeight)];
    }
    else if (wasShowingHorizontalScroller)
    {
@@ -1256,7 +1266,7 @@ Notifies the delegate when the scroll view has finished scrolling.
 #pragma mark -
 #pragma mark Overrides

- (void)drawRect:(CPRect)aRect
+- (void)drawRect:(CGRect)aRect
 {
    [super drawRect:aRect];

@@ -1272,7 +1282,7 @@ Notifies the delegate when the scroll view has finished scrolling.
    {
        case CPLineBorder:
            CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"border-color"]);
-            CGContextStrokeRect(context, _CGRectInset(strokeRect, 0.5, 0.5));
+            CGContextStrokeRect(context, CGRectInset(strokeRect, 0.5, 0.5));
            break;

        case CPBezelBorder:
@@ -1290,10 +1300,10 @@ Notifies the delegate when the scroll view has finished scrolling.

 - (void)_drawGrayBezelInContext:(CGContext)context bounds:(CGRect)aRect
 {
-    var minX = _CGRectGetMinX(aRect),
-        maxX = _CGRectGetMaxX(aRect),
-        minY = _CGRectGetMinY(aRect),
-        maxY = _CGRectGetMaxY(aRect),
+    var minX = CGRectGetMinX(aRect),
+        maxX = CGRectGetMaxX(aRect),
+        minY = CGRectGetMinY(aRect),
+        maxY = CGRectGetMaxY(aRect),
        y = minY + 0.5;

    // Slightly darker line on top.
@@ -1324,10 +1334,10 @@ Notifies the delegate when the scroll view has finished scrolling.

 - (void)_drawGrooveInContext:(CGContext)context bounds:(CGRect)aRect
 {
-    var minX = _CGRectGetMinX(aRect),
-        maxX = _CGRectGetMaxX(aRect),
-        minY = _CGRectGetMinY(aRect),
-        maxY = _CGRectGetMaxY(aRect);
+    var minX = CGRectGetMinX(aRect),
+        maxX = CGRectGetMaxX(aRect),
+        minY = CGRectGetMinY(aRect),
+        maxY = CGRectGetMaxY(aRect);

    CGContextBeginPath(context);
    CGContextSetStrokeColor(context, [CPColor colorWithWhite:159.0 / 255.0 alpha:1.0]);
@@ -1357,11 +1367,11 @@ Notifies the delegate when the scroll view has finished scrolling.
    CGContextBeginPath(context);
    CGContextSetStrokeColor(context, [CPColor whiteColor]);

-    var rect = _CGRectOffset(aRect, 1.0, 1.0);
+    var rect = CGRectOffset(aRect, 1.0, 1.0);

    rect.size.width -= 1.0;
    rect.size.height -= 1.0;
-    CGContextStrokeRect(context, _CGRectInset(rect, 0.5, 0.5));
+    CGContextStrokeRect(context, CGRectInset(rect, 0.5, 0.5));

    CGContextBeginPath(context);
    CGContextSetStrokeColor(context, [CPColor colorWithWhite:192.0 / 255.0 alpha:1.0]);
@@ -1395,29 +1405,29 @@ Notifies the delegate when the scroll view has finished scrolling.
 - (void)scrollPageUp:(id)sender
 {
    var contentBounds = [_contentView bounds];
-    [self moveByOffset:CGSizeMake(0.0, -(_CGRectGetHeight(contentBounds) - _verticalPageScroll))];
+    [self moveByOffset:CGSizeMake(0.0, -(CGRectGetHeight(contentBounds) - _verticalPageScroll))];
 }

 - (void)scrollPageDown:(id)sender
 {
    var contentBounds = [_contentView bounds];
-    [self moveByOffset:CGSizeMake(0.0, _CGRectGetHeight(contentBounds) - _verticalPageScroll)];
+    [self moveByOffset:CGSizeMake(0.0, CGRectGetHeight(contentBounds) - _verticalPageScroll)];
 }

 - (void)scrollToBeginningOfDocument:(id)sender
 {
-    [_contentView scrollToPoint:_CGPointMakeZero()];
-    [_headerClipView scrollToPoint:_CGPointMakeZero()];
+    [_contentView scrollToPoint:CGPointMakeZero()];
+    [_headerClipView scrollToPoint:CGPointMakeZero()];
 }

 - (void)scrollToEndOfDocument:(id)sender
 {
    var contentBounds = [_contentView bounds],
        documentFrame = [[self documentView] frame],
-        scrollPoint = _CGPointMake(0.0, _CGRectGetHeight(documentFrame) - _CGRectGetHeight(contentBounds));
+        scrollPoint = CGPointMake(0.0, CGRectGetHeight(documentFrame) - CGRectGetHeight(contentBounds));

    [_contentView scrollToPoint:scrollPoint];
-    [_headerClipView scrollToPoint:_CGPointMakeZero()];
+    [_headerClipView scrollToPoint:CGPointMakeZero()];
 }

 - (void)moveLeft:(id)sender
@@ -25,7 +25,12 @@

 #include "../Foundation/Foundation.h"

+@import "CPAnimation.j"
@import "CPControl.j"
+@import "CPWindow_Constants.j"
+@import "CPViewAnimation.j"
+
+@global CPApp

 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -52,6 +57,8 @@ var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScroll
    NAMES_FOR_PARTS     = {},
    PARTS_FOR_NAMES     = {};

+var _CACHED_THEME_SCROLLER = nil; // This is used by the class methods to pull the theme attributes.
+
 NAMES_FOR_PARTS[CPScrollerDecrementLine]    = @"decrement-line";
 NAMES_FOR_PARTS[CPScrollerIncrementLine]    = @"increment-line";
 NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
@@ -101,21 +108,21 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
    return "scroller";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 7.0,
-        @"knob-slot-color": [CPNull null],
-        @"decrement-line-color": [CPNull null],
-        @"increment-line-color": [CPNull null],
-        @"knob-color": [CPNull null],
-        @"decrement-line-size":_CGSizeMakeZero(),
-        @"increment-line-size":_CGSizeMakeZero(),
-        @"track-inset":_CGInsetMakeZero(),
-        @"knob-inset": _CGInsetMakeZero(),
-        @"minimum-knob-length":21.0,
-        @"track-border-overlay": 9.0
-    }];
+    return @{
+            @"scroller-width": 7.0,
+            @"knob-slot-color": [CPNull null],
+            @"decrement-line-color": [CPNull null],
+            @"increment-line-color": [CPNull null],
+            @"knob-color": [CPNull null],
+            @"decrement-line-size": CGSizeMakeZero(),
+            @"increment-line-size": CGSizeMakeZero(),
+            @"track-inset": CGInsetMakeZero(),
+            @"knob-inset": CGInsetMakeZero(),
+            @"minimum-knob-length": 21.0,
+            @"track-border-overlay": 9.0
+        };
 }

 + (float)scrollerWidth
@@ -128,11 +135,13 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 */
 + (float)scrollerWidthInStyle:(int)aStyle
 {
-    var scroller = [[self alloc] init];
+    if (!_CACHED_THEME_SCROLLER)
+        _CACHED_THEME_SCROLLER = [[self alloc] init];

    if (aStyle == CPScrollerStyleLegacy)
-        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-    return [scroller currentValueForThemeAttribute:@"scroller-width"];
+        return [_CACHED_THEME_SCROLLER valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
+
+    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"scroller-width"];
 }

 /*!
@@ -140,7 +149,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 */
 + (float)scrollerOverlay
 {
-    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
+    if (!_CACHED_THEME_SCROLLER)
+        _CACHED_THEME_SCROLLER = [[self alloc] init];
+
+    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"track-border-overlay"];
 }

 /*!
@@ -170,14 +182,20 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
        _allowFadingOut = YES;
        _isMouseOver = NO;
        _style = CPScrollerStyleOverlay;
-        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
+
+        var paramAnimFadeOut = @{
+                CPViewAnimationTargetKey: self,
+                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
+            };

        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
        [_animationScroller setDelegate:self];
        [self setAlphaValue:0.0];
-        [self _calculateIsVertical];
+
+        // We have to choose an orientation. If for some bizarre reason width === height,
+        // punt and choose vertical.
+        [self _setIsVertical:CGRectGetHeight(aFrame) >= CGRectGetWidth(aFrame)];
    }

    return self;
@@ -217,7 +235,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
        [self unsetThemeState:CPThemeStateScrollViewLegacy];
    }

-    [self _adjustScrollerSize];
+    //[self _adjustScrollerSize];
 }

 - (void)setObjectValue:(id)aValue
@@ -304,7 +322,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
    if (aPart == CPScrollerNoPart)
-        return _CGRectMakeZero();
+        return CGRectMakeZero();

    return _partRects[aPart];
 }
@@ -374,8 +392,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

    var knobInset = [self currentValueForThemeAttribute:@"knob-inset"],
        trackInset = [self currentValueForThemeAttribute:@"track-inset"],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+        width = CGRectGetWidth(bounds),
+        height = CGRectGetHeight(bounds);

    if ([self isVertical])
    {
@@ -389,21 +407,21 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
            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, slotSize);
-        _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
+        _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, slotSize);
+        _partRects[CPScrollerDecrementLine] = CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
+        _partRects[CPScrollerIncrementLine] = CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);

        if (height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
-            _partRects[CPScrollerKnob] = _CGRectMakeZero();
+            _partRects[CPScrollerKnob] = CGRectMakeZero();

        if (height < decrementLineSize.height + incrementLineSize.height - 2)
        {
-            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
+            _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
+            _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
+            _partRects[CPScrollerKnobSlot]      = CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
        }
    }
    else
@@ -418,21 +436,21 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
            knobHeight = height - knobInset.top - knobInset.bottom,
            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, 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);
+        _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, 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);

        if (width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
-            _partRects[CPScrollerKnob] = _CGRectMakeZero();
+            _partRects[CPScrollerKnob] = CGRectMakeZero();

        if (width < decrementLineSize.width + incrementLineSize.width - 2)
        {
-            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotSize);
+            _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
+            _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
+            _partRects[CPScrollerKnobSlot]      = CGRectMake(0.0, 0.0,  width, slotSize);
        }
    }
 }
@@ -500,7 +518,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

 - (CPView)createViewForPart:(CPScrollerPart)aPart
 {
-    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];

    [view setHitTests:NO];

@@ -514,7 +532,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];

    [view setHitTests:NO];

@@ -523,6 +541,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

 - (void)layoutSubviews
 {
+    [self _adjustScrollerSize];
    [self checkSpaceForParts];

    var index = 0,
@@ -588,7 +607,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
    {
        var knobRect = [self rectForPart:CPScrollerKnob],
            knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
-            remainder = ![self isVertical] ? (_CGRectGetWidth(knobSlotRect) - _CGRectGetWidth(knobRect)) : (_CGRectGetHeight(knobSlotRect) - _CGRectGetHeight(knobRect));
+            remainder = ![self isVertical] ? (CGRectGetWidth(knobSlotRect) - CGRectGetWidth(knobRect)) : (CGRectGetHeight(knobSlotRect) - CGRectGetHeight(knobRect));

        if (remainder <= 0)
            [self setFloatValue:0.0];
@@ -633,20 +652,20 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

        if ([anEvent modifierFlags] & CPAlternateKeyMask)
        {
-            if (_trackingPart == CPScrollerDecrementLine)
+            if (_trackingPart === CPScrollerDecrementLine)
                _hitPart = CPScrollerDecrementPage;

-            else if (_trackingPart == CPScrollerIncrementLine)
+            else if (_trackingPart === CPScrollerIncrementLine)
                _hitPart = CPScrollerIncrementPage;

-            else if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
+            else if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
            {
                var knobRect = [self rectForPart:CPScrollerKnob],
-                    knobWidth = ![self isVertical] ? _CGRectGetWidth(knobRect) : _CGRectGetHeight(knobRect),
+                    knobWidth = ![self isVertical] ? CGRectGetWidth(knobRect) : CGRectGetHeight(knobRect),
                    knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
-                    remainder = (![self isVertical] ? _CGRectGetWidth(knobSlotRect) : _CGRectGetHeight(knobSlotRect)) - knobWidth;
+                    remainder = (![self isVertical] ? CGRectGetWidth(knobSlotRect) : CGRectGetHeight(knobSlotRect)) - knobWidth;

-                [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - _CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - _CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];
+                [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];

                _hitPart = CPScrollerKnob;

@@ -667,11 +686,11 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
    {
        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];

-        if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
+        if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
        {
            var hitPart = [self testPart:[anEvent locationInWindow]];

-            if (hitPart == CPScrollerDecrementPage || hitPart == CPScrollerIncrementPage)
+            if (hitPart === CPScrollerDecrementPage || hitPart === CPScrollerIncrementPage)
            {
                _trackingPart = hitPart;
                _hitPart = hitPart;
@@ -687,18 +706,13 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

 }

- (void)_calculateIsVertical
+- (void)_setIsVertical:(BOOL)isVertical
 {
-    // Recalculate isVertical.
-    var bounds = [self bounds],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+    _isVertical = isVertical;

-    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
-
-    if (_isVertical === 1)
+    if (_isVertical)
        [self setThemeState:CPThemeStateVertical];
-    else if (_isVertical === 0)
+    else
        [self unsetThemeState:CPThemeStateVertical];
 }

@@ -733,12 +747,14 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

    switch (_hitPart)
    {
-        case CPScrollerKnob:            return [self trackKnob:anEvent];
+        case CPScrollerKnob:
+            return [self trackKnob:anEvent];

        case CPScrollerDecrementLine:
        case CPScrollerIncrementLine:
        case CPScrollerDecrementPage:
-        case CPScrollerIncrementPage:   return [self trackScrollButtons:anEvent];
+        case CPScrollerIncrementPage:
+            return [self trackScrollButtons:anEvent];
    }
 }

@@ -786,9 +802,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");

@end

-var CPScrollerControlSizeKey = @"CPScrollerControlSize",
+var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
+    CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey = @"CPScrollerStyleKey";
+    CPScrollerStyleKey          = @"CPScrollerStyleKey";

@implementation CPScroller (CPCoding)

@@ -797,7 +814,6 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
    if (self = [super initWithCoder:aCoder])
    {
        _controlSize = CPRegularControlSize;
-
        if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
            _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];

@@ -813,17 +829,19 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
        _allowFadingOut = YES;
        _isMouseOver = NO;

-        var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                           forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
+        var paramAnimFadeOut = @{
+                CPViewAnimationTargetKey: self,
+                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
+            };

        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
        [_animationScroller setDelegate:self];
        [self setAlphaValue:0.0];

-        [self _calculateIsVertical];
-
        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+
+        [self _setIsVertical:[aCoder decodeBoolForKey:CPScrollerIsVerticalKey]];
    }

    return self;
@@ -834,6 +852,7 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
    [super encodeWithCoder:aCoder];

    [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
+    [aCoder encodeInt:_isVertical forKey:CPScrollerIsVerticalKey];
    [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }
@@ -21,22 +21,19 @@
 */

@import "CPButton.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
@import "CPTextField.j"

+@class CPUserDefaults
+
+@global CPApp
+
 CPSearchFieldRecentsTitleMenuItemTag    = 1000;
 CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;

-var CPSearchFieldSearchImage = nil,
-    CPSearchFieldFindImage = nil,
-    CPSearchFieldCancelImage = nil,
-    CPSearchFieldCancelPressedImage = nil;
-
-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 = @"   ";
@@ -70,16 +67,14 @@ var RECENT_SEARCH_PREFIX = @"   ";
    return @"searchfield"
 }

-+ (void)initialize
+ (CPDictionary)themeAttributes
 {
-    if (self !== [CPSearchField class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    return @{
+            @"image-search": [CPNull null],
+            @"image-find": [CPNull null],
+            @"image-cancel": [CPNull null],
+            @"image-cancel-pressed": [CPNull null]
+        };
 }

 - (id)initWithFrame:(CGRect)frame
@@ -170,7 +165,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)resetSearchButton
 {
    var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
+        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];

    [button setBordered:NO];
    [button setImageScaling:CPImageScaleAxesIndependently];
@@ -193,6 +188,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
        [_cancelButton setTarget:self];
        [_cancelButton setAction:@selector(cancelOperation:)];
+        [_cancelButton setButtonType:CPMomentaryChangeButton];
        [self _updateCancelButtonVisibility];
        [self addSubview:_cancelButton];
    }
@@ -216,8 +212,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
    var button = [self cancelButton];
    [button setBordered:NO];
    [button setImageScaling:CPImageScaleAxesIndependently];
-    [button setImage:CPSearchFieldCancelImage];
-    [button setAlternateImage:CPSearchFieldCancelPressedImage];
+    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
+    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
    [button setAutoresizingMask:CPViewMinXMargin];
    [button setTarget:self];
    [button setAction:@selector(cancelOperation:)];
@@ -233,22 +229,22 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (CGRect)searchTextRectForBounds:(CGRect)rect
 {
    var leftOffset = 0,
-        width = _CGRectGetWidth(rect),
+        width = CGRectGetWidth(rect),
        bounds = [self bounds];

    if (_searchButton)
    {
        var searchBounds = [self searchButtonRectForBounds:bounds];
-        leftOffset = _CGRectGetMaxX(searchBounds) + 2;
+        leftOffset = CGRectGetMaxX(searchBounds) + 2;
    }

    if (_cancelButton)
    {
        var cancelRect = [self cancelButtonRectForBounds:bounds];
-        width = _CGRectGetMinX(cancelRect) - leftOffset;
+        width = CGRectGetMinX(cancelRect) - leftOffset;
    }

-    return _CGRectMake(leftOffset, _CGRectGetMinY(rect), width, _CGRectGetHeight(rect));
+    return CGRectMake(leftOffset, CGRectGetMinY(rect), width, CGRectGetHeight(rect));
 }

 /*!
@@ -258,7 +254,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
+    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
+
+    return CGRectMake(5, (CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
 }

 /*!
@@ -268,7 +266,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (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);
+    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
+
+    return CGRectMake(CGRectGetWidth(rect) - size.width - 5, (CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
 }

 // Managing Menu Templates
@@ -458,7 +458,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
    [self sendAction:[self action] to:[self target]];
 }

- (void)sendAction:(SEL)anAction to:(id)anObject
+- (BOOL)sendAction:(SEL)anAction to:(id)anObject
 {
    [super sendAction:anAction to:anObject];

@@ -482,7 +482,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (CPView)hitTest:(CGPoint)aPoint
 {
    // Make sure a hit anywhere within the search field returns the search field itself
-    if (_CGRectContainsPoint([self frame], aPoint))
+    if (CGRectContainsPoint([self frame], aPoint))
        return self;
    else
        return nil;
@@ -498,14 +498,19 @@ var RECENT_SEARCH_PREFIX = @"   ";
    var location = [anEvent locationInWindow],
        point = [self convertPoint:location fromView:nil];

-    if (_CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
+    if (CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
    {
        if (_searchMenuTemplate == nil)
-            [self _sendAction:self];
+        {
+            if ([_searchButton target] && [_searchButton action])
+                [_searchButton mouseDown:anEvent];
+            else
+                [self _sendAction:self];
+        }
        else
           [self _showMenu];
    }
-    else if (_CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
+    else if (CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
        [_cancelButton mouseDown:anEvent];
    else
        [super mouseDown:anEvent];
@@ -674,7 +679,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
        return;

    var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+        location = CGPointMake(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];

@@ -23,7 +23,10 @@
@import <Foundation/CPArray.j>

@import "CPControl.j"
+@import "CPWindow_Constants.j"
+@import "_CPImageAndTextView.j"

+@global CPApp

 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
@@ -53,10 +56,35 @@ CPSegmentSwitchTrackingMomentary = 2;
    return "segmented-control";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    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"]];
+    return @{
+            @"alignment": CPCenterTextAlignment,
+            @"vertical-alignment": CPCenterVerticalTextAlignment,
+            @"image-position": CPImageLeft,
+            @"image-scaling": CPImageScaleNone,
+            @"bezel-inset": CGInsetMakeZero(),
+            @"content-inset": CGInsetMakeZero(),
+            @"left-segment-bezel-color": [CPNull null],
+            @"right-segment-bezel-color": [CPNull null],
+            @"center-segment-bezel-color": [CPNull null],
+            @"divider-bezel-color": [CPNull null],
+            @"divider-thickness": 1.0,
+            @"default-height": 24.0,
+        };
+}
+
+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if ([self _isSelectionBinding:aBinding])
+        return [_CPSegmentedControlBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+ (BOOL)_isSelectionBinding:(CPString)aBinding
+{
+    return (aBinding === CPSelectedIndexBinding || aBinding === CPSelectedLabelBinding || aBinding === CPSelectedTagBinding);
 }

 - (id)initWithFrame:(CGRect)aRect
@@ -76,6 +104,19 @@ CPSegmentSwitchTrackingMomentary = 2;
    return self;
 }

+- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
+{
+    if ([[self class] _isSelectionBinding:aBinding] && _trackingMode !== CPSegmentSwitchTrackingSelectOne)
+        CPLog.warn("Binding " + aBinding + " needs CPSegmentSwitchTrackingSelectOne tracking mode");
+    else
+        [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
+}
+
+- (void)_reverseSetBinding
+{
+    [_CPSegmentedControlBinder reverseSetValueForObject:self];
+}
+
 /*!
    Returns the tag of the selected segment.
 */
@@ -115,13 +156,15 @@ 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];
+        frame = [self frame],
+        widthOfAllSegments = 0,
+        dividerExtraSpace = ([_segments count] - 1) * thickness;

-    if (delta)
-        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
+    for (var i = 0; i < [_segments count]; i++)
+        widthOfAllSegments += [_segments[i] width];
+
+    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];

    [self tileWithChangedSegment:0];
 }
@@ -172,6 +215,21 @@ CPSegmentSwitchTrackingMomentary = 2;
    return NO;
 }

+- (BOOL)_selectSegmentWithLabel:(CPString)aLabel
+{
+    var index = 0;
+
+    for (; index < _segments.length; ++index)
+        if (_segments[index].label == aLabel)
+        {
+            [self setSelectedSegment:index];
+
+            return YES;
+        }
+
+    return NO;
+}
+
 // Specifying Tracking Mode

 - (BOOL)isTracking
@@ -366,11 +424,14 @@ CPSegmentSwitchTrackingMomentary = 2;
    @param aSegment the segment to enable/disable
    @throws CPRangeException if \c aSegment is out of bounds
 */
- (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
+- (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setEnabled:isEnabled];
+    if ([_segments[aSegment] enabled] === shouldBeEnabled)
+        return;

-    if (isEnabled)
+    [_segments[aSegment] setEnabled:shouldBeEnabled];
+
+    if (shouldBeEnabled)
        _themeStates[aSegment] &= ~CPThemeStateDisabled;
    else
        _themeStates[aSegment] |= CPThemeStateDisabled;
@@ -460,7 +521,7 @@ CPSegmentSwitchTrackingMomentary = 2;
    }
    else if (aName === "right-segment-bezel")
    {
-        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
+        return CGRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                            bezelInset.top,
                            contentInset.right,
                            height);
@@ -503,9 +564,9 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
    if ([aName hasPrefix:@"segment-content"])
-        return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+        return [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];

-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
 }

 - (void)layoutSubviews
@@ -796,6 +857,7 @@ CPSegmentSwitchTrackingMomentary = 2;
            return;

        var highlighted = [self testSegment:location] === _trackingSegment;
+
        if (highlighted != _trackingHighlighted)
        {
            _trackingHighlighted = highlighted;
@@ -882,6 +944,74 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",

@end

+var CPSegmentedControlBindersMap = {},
+    CPSegmentedControlNoSelectionPlaceholder = "CPSegmentedControlNoSelectionPlaceholder";
+
+@implementation _CPSegmentedControlBinder : CPBinder
+{
+    CPString _selectionBinding @accessors(readonly, getter=selectionBinding);
+}
+
+ (void)reverseSetValueForObject:(id)aSource
+{
+    var binder = CPSegmentedControlBindersMap[[aSource UID]];
+    [binder reverseSetValueFor:[binder selectionBinding]];
+}
+
+- (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)
+    {
+        CPSegmentedControlBindersMap[[aSource UID]] = self;
+        _selectionBinding = aName;
+    }
+
+    return self;
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    if (aValue == CPSegmentedControlNoSelectionPlaceholder)
+        [_source setSelected:NO forSegment:[_source selectedSegment]];
+    else
+        [self setValue:aValue forBinding:aBinding];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    if (aBinding == CPSelectedIndexBinding)
+        [_source setSelectedSegment:aValue];
+    else if (aBinding == CPSelectedTagBinding)
+        [_source selectSegmentWithTag:aValue];
+    else if (aBinding == CPSelectedLabelBinding)
+        [_source _selectSegmentWithLabel:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    var selectedIndex = [_source selectedSegment];
+
+    if (aBinding == CPSelectedIndexBinding)
+        return selectedIndex;
+    else if (aBinding == CPSelectedTagBinding)
+        return [_source tagForSegment:selectedIndex];
+    else if (aBinding == CPSelectedLabelBinding)
+        return [_source labelForSegment:selectedIndex];
+}
+
+@end

@implementation _CPSegmentItem : CPObject
 {
@@ -31,11 +31,9 @@
 */
@implementation CPShadow : CPObject
 {
-    CPSize      _offset;
-    float       _blurRadius;
-    CPColor     _color;
-
-    CPString    _cssString;
+    CGSize      _offset @accessors(property=shadowOffset);
+    float       _blurRadius @accessors(property=shadowBlurRadius);
+    CPColor     _color @accessors(property=shadowColor);
 }

 /*!
@@ -51,7 +49,7 @@
 }

 /* @ignore */
- (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+- (id)_initWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
    self = [super init];

@@ -60,35 +58,16 @@
        _offset = anOffset;
        _blurRadius = aBlurRadius;
        _color = aColor;
-
-        _cssString = [_color cssString] + " " + ROUND(anOffset.width) + @"px " + ROUND(anOffset.height) + @"px " + ROUND(_blurRadius) + @"px";
    }

    return self;
 }

-/*!
-    Returns the shadow's offset.
-*/
- (CGSize)shadowOffset
+- (void)set
 {
-    return _offset;
-}
+   var context = [[CPGraphicsContext currentContext] graphicsPort];

-/*!
-    Returns the shadow's blur radius
-*/
- (float)shadowBlurRadius
-{
-    return _blurRadius;
-}
-
-/*!
-    Returns the shadow's color.
-*/
- (CPColor)shadowColor
-{
-    return _color;
+   CGContextSetShadowWithColor(context, _offset, _blurRadius, _color);
 }

 /*!
@@ -96,7 +75,7 @@
 */
 - (CPString)cssString
 {
-    return _cssString;
+    return [_color cssString] + " " + ROUND(_offset.width) + @"px " + ROUND(_offset.height) + @"px " + ROUND(_blurRadius) + @"px";
 }

-@end
+@end
@@ -24,25 +24,15 @@

@import "CGGeometry.j"
@import "CPImage.j"
-@import "CPImageView.j"
@import "CPView.j"


 CPLightShadow   = 0;
 CPHeavyShadow   = 1;

-var CPShadowViewLightBackgroundColor    = nil,
-    CPShadowViewHeavyBackgroundColor    = nil;
+CPThemeStateShadowViewLight = CPThemeState("shadowview-style-light");
+CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");

-var LIGHT_LEFT_INSET    = 3.0,
-    LIGHT_RIGHT_INSET   = 3.0,
-    LIGHT_TOP_INSET     = 3.0,
-    LIGHT_BOTTOM_INSET  = 5.0,
-
-    HEAVY_LEFT_INSET    = 7.0,
-    HEAVY_RIGHT_INSET   = 7.0,
-    HEAVY_TOP_INSET     = 5.0,
-    HEAVY_BOTTOM_INSET  = 5.0;

 /*!
    @ingroup appkit
@@ -52,40 +42,25 @@ var LIGHT_LEFT_INSET    = 3.0,
    CPShadowWeight  _weight;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [CPShadowView class])
-        return;
+    return "shadow-view";
+}

-    var bundle = [CPBundle bundleForClass:[self class]];
+ (CPDictionary)themeAttributes
+{
+    return @{
+            @"bezel-color": [CPNull null],
+            @"content-inset": CGInsetMakeZero()
+        };
+}

-    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],
+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
+{
+    var shadowView = [CPShadowView new],
+        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];

-        [@"CPShadowView/CPShadowViewLightLeft.png", 9.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewLightRight.png", 9.0, 1.0, bundle],
-
-        [@"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 = 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],
-
-        [@"CPShadowView/CPShadowViewHeavyLeft.png", 17.0, 1.0, bundle],
-        nil,
-        [@"CPShadowView/CPShadowViewHeavyRight.png", 17.0, 1.0, bundle],
-
-        [@"CPShadowView/CPShadowViewHeavyBottomLeft.png", 17.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottom.png", 1.0, 17.0, bundle],
-        [@"CPShadowView/CPShadowViewHeavyBottomRight.png", 17.0, 17.0, bundle]
-    ]);
+    return CGRectMake(CGRectGetMinX(aFrame) - inset.left, CGRectGetMinY(aFrame) - inset.top, CGRectGetWidth(aFrame) + inset.left + inset.right, CGRectGetHeight(aFrame) + inset.top + inset.bottom);
 }

 + (id)shadowViewEnclosingView:(CPView)aView
@@ -102,15 +77,16 @@ var LIGHT_LEFT_INSET    = 3.0,
        [shadowView setWeight:aWeight];

        var size = [shadowView frame].size,
-            width = size.width - [shadowView leftInset] - [shadowView rightInset],
-            height = size.height - [shadowView topInset] - [shadowView bottomInset],
+            inset = [shadowView currentValueForThemeAttribute:@"content-inset"],
+            width = size.width - inset.left - inset.right,
+            height = size.height - inset.top - inset.bottom,
            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)]
+        [aView setFrame:CGRectMake(inset.left, inset.top, width, height)];
        [enclosingView addSubview:shadowView];
    }

@@ -123,9 +99,7 @@ var LIGHT_LEFT_INSET    = 3.0,

    if (self)
    {
-        _weight = CPLightShadow;
-
-        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
+        [self setWeight:CPLightShadow];

        [self setHitTests:NO];
    }
@@ -141,54 +115,45 @@ var LIGHT_LEFT_INSET    = 3.0,
    _weight = aWeight;

    if (_weight == CPLightShadow)
-        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
-
+        [self setThemeState:CPThemeStateShadowViewLight];
    else
-        [self setBackgroundColor:CPShadowViewHeavyBackgroundColor];
+        [self setThemeState:CPThemeStateShadowViewHeavy];
+
+    [self setNeedsLayout];
 }

 - (float)leftInset
 {
-    return _weight == CPLightShadow ? LIGHT_LEFT_INSET : HEAVY_LEFT_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].left;
 }

 - (float)rightInset
 {
-    return _weight == CPLightShadow ? LIGHT_RIGHT_INSET : HEAVY_RIGHT_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].right;
 }

 - (float)topInset
 {
-    return _weight == CPLightShadow ? LIGHT_TOP_INSET : HEAVY_TOP_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].top;
 }

 - (float)bottomInset
 {
-    return _weight == CPLightShadow ? LIGHT_BOTTOM_INSET : HEAVY_BOTTOM_INSET;
+    return [self currentValueForThemeAttribute:@"content-inset"].bottom;
 }

 - (float)horizontalInset
 {
-    if (_weight == CPLightShadow)
-        return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
+    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
+    return currentContentInset.left + currentContentInset.right;
 }

 - (float)verticalInset
 {
-    if (_weight == CPLightShadow)
-        return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
+    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];

-    return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
-}
-
-+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
-{
-    if (aWeight == CPLightShadow)
-        return CGRectMake(_CGRectGetMinX(aFrame) - LIGHT_LEFT_INSET, _CGRectGetMinY(aFrame) - LIGHT_TOP_INSET, _CGRectGetWidth(aFrame) + LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET, _CGRectGetHeight(aFrame) + LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET);
-    else
-        return CGRectMake(_CGRectGetMinX(aFrame) - HEAVY_LEFT_INSET, _CGRectGetMinY(aFrame) - HEAVY_TOP_INSET, _CGRectGetWidth(aFrame) + HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET, _CGRectGetHeight(aFrame) + HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET);
+    return currentContentInset.top + currentContentInset.bottom;
 }

 - (CGRect)frameForContentFrame:(CGRect)aFrame
@@ -201,4 +166,11 @@ var LIGHT_LEFT_INSET    = 3.0,
    [self setFrame:[self frameForContentFrame:aFrame]];
 }

+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+}
+
@end
@@ -21,6 +21,7 @@
 */

@import "CPControl.j"
+@import "CPWindow_Constants.j"


 /*! SLIDER STATES */
@@ -39,6 +40,8 @@ CPCircularSlider    = 1;
    double          _altIncrementValue;

    BOOL            _isVertical;
+
+    CGSize          _dragOffset;
 }

 + (CPString)defaultThemeClass
@@ -46,10 +49,14 @@ CPCircularSlider    = 1;
    return "slider";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
-                                       forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
+    return @{
+            @"knob-color": [CPNull null],
+            @"knob-size": CGSizeMakeZero(),
+            @"track-width": 0.0,
+            @"track-color": [CPNull null],
+        };
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -155,16 +162,16 @@ CPCircularSlider    = 1;
        var trackWidth = [self currentValueForThemeAttribute:@"track-width"];

        if (trackWidth <= 0)
-            return _CGRectMakeZero();
+            return CGRectMakeZero();

        if ([self isVertical])
        {
-            bounds.origin.x = (_CGRectGetWidth(bounds) - trackWidth) / 2.0;
+            bounds.origin.x = (CGRectGetWidth(bounds) - trackWidth) / 2.0;
            bounds.size.width = trackWidth;
        }
        else
        {
-            bounds.origin.y = (_CGRectGetHeight(bounds) - trackWidth) / 2.0;
+            bounds.origin.y = (CGRectGetHeight(bounds) - trackWidth) / 2.0;
            bounds.size.height = trackWidth;
        }
    }
@@ -177,13 +184,13 @@ CPCircularSlider    = 1;
    var knobSize = [self currentValueForThemeAttribute:@"knob-size"];

    if (knobSize.width <= 0 || knobSize.height <= 0)
-        return _CGRectMakeZero();
+        return CGRectMakeZero();

-    var knobRect = _CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
+    var knobRect = CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
        trackRect = [self trackRectForBounds:bounds];

    // No track, do our best to approximate a place for this thing.
-    if (!trackRect || _CGRectIsEmpty(trackRect))
+    if (!trackRect || CGRectIsEmpty(trackRect))
        trackRect = bounds;

    if ([self hasThemeState:CPThemeStateCircular])
@@ -196,13 +203,13 @@ CPCircularSlider    = 1;
    }
    else if ([self isVertical])
    {
-        knobRect.origin.x = _CGRectGetMidX(trackRect) - knobSize.width / 2.0;
-        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
+        knobRect.origin.x = CGRectGetMidX(trackRect) - knobSize.width / 2.0;
+        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (CGRectGetHeight(trackRect) - knobSize.height);
    }
    else
    {
-        knobRect.origin.x = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetWidth(trackRect) - knobSize.width);
-        knobRect.origin.y = _CGRectGetMidY(trackRect) - knobSize.height / 2.0;
+        knobRect.origin.x = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (CGRectGetWidth(trackRect) - knobSize.width);
+        knobRect.origin.y = CGRectGetMidY(trackRect) - knobSize.height / 2.0;
    }

    return knobRect;
@@ -253,8 +260,8 @@ CPCircularSlider    = 1;
 {
    // Recalculate isVertical.
    var bounds = [self bounds],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+        width = CGRectGetWidth(bounds),
+        height = CGRectGetHeight(bounds);

    _isVertical = width < height ? 1 : (width > height ? 0 : -1);

@@ -299,55 +306,55 @@ CPCircularSlider    = 1;

    if ([self hasThemeState:CPThemeStateCircular])
    {
-        var knobWidth = _CGRectGetWidth(knobRect);
+        var knobWidth = CGRectGetWidth(knobRect);

        trackRect.origin.x += knobWidth / 2;
        trackRect.size.width -= knobWidth;

        var minValue = [self minValue],
-            dx = aPoint.x - _CGRectGetMidX(trackRect),
-            dy = aPoint.y - _CGRectGetMidY(trackRect);
+            dx = aPoint.x - CGRectGetMidX(trackRect),
+            dy = aPoint.y - CGRectGetMidY(trackRect);

        return MAX(0.0, MIN(1.0, 1.0 - (3 * PI_2 - ATAN2(dy, dx)) % PI2 / PI2)) * ([self maxValue] - minValue) + minValue;
    }
    else if ([self isVertical])
    {
-        var knobHeight = _CGRectGetHeight(knobRect);
+        var knobHeight = CGRectGetHeight(knobRect);

        trackRect.origin.y += knobHeight / 2;
        trackRect.size.height -= knobHeight;

        var minValue = [self minValue];

-        return MAX(0.0, MIN(1.0, (_CGRectGetMaxY(trackRect) - aPoint.y) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (CGRectGetMaxY(trackRect) - aPoint.y) / CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
    }
    else
    {
-        var knobWidth = _CGRectGetWidth(knobRect);
+        var knobWidth = CGRectGetWidth(knobRect);

        trackRect.origin.x += knobWidth / 2;
        trackRect.size.width -= knobWidth;

        var minValue = [self minValue];

-        return MAX(0.0, MIN(1.0, (aPoint.x - _CGRectGetMinX(trackRect)) / _CGRectGetWidth(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (aPoint.x - CGRectGetMinX(trackRect)) / CGRectGetWidth(trackRect))) * ([self maxValue] - minValue) + minValue;
    }
 }

 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
    var bounds = [self bounds],
-        knobRect = [self knobRectForBounds:_CGRectMakeCopy(bounds)];
+        knobRect = [self knobRectForBounds:CGRectMakeCopy(bounds)];

-    if (_CGRectContainsPoint(knobRect, aPoint))
-        _dragOffset = _CGSizeMake(_CGRectGetMidX(knobRect) - aPoint.x, _CGRectGetMidY(knobRect) - aPoint.y);
+    if (CGRectContainsPoint(knobRect, aPoint))
+        _dragOffset = CGSizeMake(CGRectGetMidX(knobRect) - aPoint.x, CGRectGetMidY(knobRect) - aPoint.y);
    else
    {
        var trackRect = [self trackRectForBounds:bounds];

-        if (trackRect && _CGRectContainsPoint(trackRect, aPoint))
+        if (trackRect && CGRectContainsPoint(trackRect, aPoint))
        {
-            _dragOffset = _CGSizeMakeZero();
+            _dragOffset = CGSizeMakeZero();

            [self setObjectValue:[self _valueAtPoint:aPoint]];
        }
@@ -366,7 +373,7 @@ CPCircularSlider    = 1;

 - (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
 {
-    [self setObjectValue:[self _valueAtPoint:_CGPointMake(aPoint.x + _dragOffset.width, aPoint.y + _dragOffset.height)]];
+    [self setObjectValue:[self _valueAtPoint:CGPointMake(aPoint.x + _dragOffset.width, aPoint.y + _dragOffset.height)]];

    return YES;
 }
@@ -20,8 +20,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPView.j"
@import "CPColorPicker.j"
+@import "CPSlider.j"
+@import "CPTextField.j"
+@import "CPView.j"
+
+@global CPColorPickerViewWidth
+@global CPColorPickerViewHeight
+@global CPSliderColorPickerMode


 /*
@@ -49,7 +55,6 @@
    CPTextField _hexLabel;
    CPTextField _hexValue;

-    CPTextField _hexValue;
    CPTextField _redValue;
    CPTextField _greenValue;
    CPTextField _blueValue;
@@ -65,7 +70,7 @@

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

    _contentView = [[CPView alloc] initWithFrame:aFrame];
    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -140,7 +145,7 @@
    [_hueLabel setTextColor:[CPColor blackColor]];

    _hueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 143, aFrame.size.width - 70, 20)];
-    [_hueSlider setMaxValue:359.0];
+    [_hueSlider setMaxValue:0.999];
    [_hueSlider setMinValue:0.0];
    [_hueSlider setTarget:self];
    [_hueSlider setAction:@selector(sliderChanged:)];
@@ -159,7 +164,7 @@
    [_saturationLabel setTextColor:[CPColor blackColor]];

    _saturationSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 168, aFrame.size.width - 70, 20)];
-    [_saturationSlider setMaxValue:100.0];
+    [_saturationSlider setMaxValue:1.0];
    [_saturationSlider setMinValue:0.0];
    [_saturationSlider setTarget:self];
    [_saturationSlider setAction:@selector(sliderChanged:)];
@@ -178,7 +183,7 @@
    [_brightnessLabel setTextColor:[CPColor blackColor]];

    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 194, aFrame.size.width - 70, 20)];
-    [_brightnessSlider setMaxValue:100.0];
+    [_brightnessSlider setMaxValue:1.0];
    [_brightnessSlider setMinValue:0.0];
    [_brightnessSlider setTarget:self];
    [_brightnessSlider setAction:@selector(sliderChanged:)];
@@ -276,6 +281,9 @@

 - (void)setColor:(CPColor)aColor
 {
+    if (!aColor)
+        [CPException raise:CPInvalidArgumentException reason:"aColor can't be nil"];
+
    [self updateRGBSliders:aColor];
    [self updateHSBSliders:aColor];
    [self updateHex:aColor];
@@ -307,9 +315,9 @@

 - (void)updateLabels
 {
-    [_hueValue setStringValue:ROUND([_hueSlider floatValue])];
-    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue])];
-    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue])];
+    [_hueValue setStringValue:ROUND([_hueSlider floatValue] * 360.0)];
+    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue] * 100.0)];
+    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue] * 100.0)];

    [_redValue setStringValue:ROUND([_redSlider floatValue] * 255)];
    [_greenValue setStringValue:ROUND([_greenSlider floatValue] * 255)];
@@ -357,15 +365,15 @@
                                   [self sliderChanged:_blueSlider];
                                   break;

-            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
+            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360) / 360.0, 0)];
                                   [self sliderChanged:_hueSlider];
                                   break;

-            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
+            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100) / 100.0, 0)];
                                   [self sliderChanged:_saturationSlider];
                                   break;

-            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
+            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100) / 100.0, 0)];
                                   [self sliderChanged:_brightnessSlider];
                                   break;
        }
@@ -21,6 +21,7 @@
 */

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

 CPSoundLoadStateEmpty       = 0;
 CPSoundLoadStateLoading     = 1;
@@ -59,7 +60,7 @@ CPSoundPlayBackStatePause   = 2;
    if (self = [super init])
    {
        _loadStatus = CPSoundLoadStateEmpty;
-        _loops = NO;
+//        _loops = NO;
        _audioTag = document.createElement("audio");
        _audioTag.preload = YES;
        _playRequestBeforeLoad = NO;
@@ -25,6 +25,10 @@
@import "CPButtonBar.j"
@import "CPImage.j"
@import "CPView.j"
+@import "CPCursor.j"
+
+@class CPUserDefaults
+@global CPApp

 #define SPLIT_VIEW_MAYBE_POST_WILL_RESIZE() \
    if ((_suppressResizeNotificationsMask & DidPostWillResizeNotification) === 0) \
@@ -51,10 +55,7 @@
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";

-var CPSplitViewHorizontalImage = nil,
-    CPSplitViewVerticalImage = nil,
-
-    ShouldSuppressResizeNotifications   = 1,
+var ShouldSuppressResizeNotifications   = 1,
    DidPostWillResizeNotification       = 1 << 1,
    DidSuppressResizeNotification       = 1 << 2;

@@ -102,24 +103,15 @@ var CPSplitViewHorizontalImage = nil,
    return @"splitview";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[1.0, 10.0, [CPColor grayColor]]
-                                       forKeys:[@"divider-thickness", @"pane-divider-thickness", @"pane-divider-color"]];
-}
-
-/*
-    @ignore
-*/
-+ (void)initialize
-{
-    if (self !== [CPSplitView class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    CPSplitViewHorizontalImage = CPImageInBundle("CPSplitView/CPSplitViewHorizontal.png", CGSizeMake(5.0, 10.0), bundle);
-    CPSplitViewVerticalImage = CPImageInBundle("CPSplitView/CPSplitViewVertical.png", CGSizeMake(10.0, 5.0), bundle);
+    return @{
+            @"divider-thickness": 1.0,
+            @"pane-divider-thickness": 10.0,
+            @"pane-divider-color": [CPColor grayColor],
+            @"horizontal-divider-color": [CPNull null],
+            @"vertical-divider-color": [CPNull null],
+        };
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -202,7 +194,7 @@ var CPSplitViewHorizontalImage = nil,

    _originComponent = [self isVertical] ? "x" : "y";
    _sizeComponent = [self isVertical] ? "width" : "height";
-    _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
+    _dividerImagePath = [self isVertical] ? [[self valueForThemeAttribute:@"vertical-divider-color"] filename] : [[self valueForThemeAttribute:@"horizontal-divider-color"] filename];

    return changed;
 }
@@ -342,8 +334,8 @@ var CPSplitViewHorizontalImage = nil,
    }

    [self _setupDOMDivider];
-    CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
-    CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
+    CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, CGRectGetMinX(aRect), CGRectGetMinY(aRect));
+    CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], CGRectGetWidth(aRect), CGRectGetHeight(aRect));
 #endif
 }

@@ -793,7 +785,7 @@ var CPSplitViewHorizontalImage = nil,
    [self setNeedsDisplay:YES];
 }

- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
+- (void)resizeSubviewsWithOldSize:(CGSize)oldSize
 {
    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
    {
@@ -1003,7 +995,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
    @param unsigned int - The divider index the button bar will be assigned to.
 */
 // FIXME Should be renamed to setButtonBar:ofDividerAtIndex:.
- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
+- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(CPUInteger)dividerIndex
 {
    if (!aButtonBar)
    {
@@ -1037,7 +1029,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
    var userInfo = nil;

    if (_currentDivider !== CPNotFound)
-        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
+        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };

    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
                                                        object:self
@@ -1049,7 +1041,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
    var userInfo = nil;

    if (_currentDivider !== CPNotFound)
-        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
+        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };

    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification
                                                        object:self
@@ -1102,7 +1094,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
    for (var i = 0; i < count; i++)
    {
        var frame = [_subviews[i] frame];
-        [positions addObject:CPStringFromRect(frame)];
+        [positions addObject:CGStringFromRect(frame)];
        [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
    }

@@ -1118,7 +1110,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
 */
 - (void)_restoreFromAutosaveIfNeeded
 {
-    if (_shouldRestoreFromAutosaveUnlessFrameSize && !_CGSizeEqualToSize([self frameSize], _shouldRestoreFromAutosaveUnlessFrameSize))
+    if (_shouldRestoreFromAutosaveUnlessFrameSize && !CGSizeEqualToSize([self frameSize], _shouldRestoreFromAutosaveUnlessFrameSize))
    {
        [self _restoreFromAutosave];
    }
@@ -1149,7 +1141,7 @@ The sum of the views and the sum of the dividers should be equal to the size of

        for (var i = 0, count = [frames count] - 1; i < count; i++)
        {
-            var frame = CPRectFromString(frames[i]);
+            var frame = CGRectFromString(frames[i]);
            position += frame.size[_sizeComponent];

            [self setPosition:position ofDividerAtIndex:i];
@@ -1165,7 +1157,14 @@ The sum of the views and the sum of the dividers should be equal to the size of
        _preCollapsePositions = [CPMutableDictionary new];

        for (var i = 0, count = [preCollapseArray count]; i < count; i++)
-            [_preCollapsePositions setObject:preCollapseArray[i] forKey:i + ""];
+        {
+            var item = preCollapseArray[i];
+
+            if (item === nil)
+                [_preCollapsePositions removeObjectForKey:String(i)];
+            else
+                [_preCollapsePositions setObject:item forKey:String(i)];
+        }
    }
 }

@@ -20,9 +20,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <AppKit/CPControl.j>
-@import <AppKit/CPButton.j>
-@import <AppKit/CPTextField.j>
+@import "CPControl.j"
+@import "CPButton.j"
+@import "CPTextField.j"



@@ -55,11 +55,15 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMake(0, 0, 19, 25)];
+    var stepper = [[CPStepper alloc] initWithFrame:CGRectMakeZero()];
+
    [stepper setDoubleValue:aValue];
    [stepper setMinValue:aMinValue];
    [stepper setMaxValue:aMaxValue];

+    // _sizeToFit will put the good size for the stepper depending of the current theme
+    [stepper _sizeToFit];
+
    return stepper;
 }

@@ -76,6 +80,22 @@
    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }

+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding || aBinding == CPMinValueBinding || aBinding == CPMaxValueBinding)
+        return [_CPStepperValueBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return @"doubleValue";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
 /*!
    Initializes a CPStepper.
    @param aFrame the frame of the control
@@ -102,14 +122,14 @@

 - (void)_init
 {
-    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    _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 = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
    [_buttonDown setContinuous:_autorepeat];
    [_buttonDown setTarget:self];
    [_buttonDown setAction:@selector(_buttonDidClick:)];
@@ -141,8 +161,8 @@
 {
    var upSize = [self valueForThemeAttribute:@"up-button-size"],
        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
-        frame = _CGRectMakeCopy(aFrame);
+        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);
@@ -155,8 +175,9 @@
    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);
+        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];

@@ -168,6 +189,11 @@
    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }

+- (void)_sizeToFit
+{
+    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
+}
+
 /*!
    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
@@ -187,7 +213,7 @@
    Set the current value of the stepper.
    @param aValue a float containing the value
 */
- (void)setDoubleValue:(float)aValue
+- (void)setDoubleValue:(double)aValue
 {
    if (aValue > _maxValue)
        [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
@@ -211,8 +237,7 @@
    else
        [self setDoubleValue:([self doubleValue] - _increment)];

-    if (_target && _action && [_target respondsToSelector:_action])
-        [self sendAction:_action to:_target];
+    [self sendAction:[self action] to:[self target]];
 }

 /*!
@@ -242,10 +267,32 @@
    return @"stepper";
 }

-+ (id)themeAttributes
+ (CPDictionary)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"]];
+    return @{
+            @"bezel-color-up-button": [CPNull null],
+            @"bezel-color-down-button": [CPNull null],
+            @"up-button-size": CGSizeMakeZero(),
+            @"down-button-size": CGSizeMakeZero(),
+        };
+}
+
+@end
+
+@implementation _CPStepperValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
+{
+    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
+
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:placeholder forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:placeholder forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:placeholder forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:placeholder forMarker:CPNullMarker isDefault:YES];
 }

@end
@@ -22,6 +22,7 @@

@import <Foundation/CPString.j>

+@import "CGGeometry.j"
@import "CPPlatformString.j"


@@ -88,9 +88,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    _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];
 }
@@ -110,7 +107,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    @param aTabViewItem the item to insert
    @param anIndex the index for the item
 */
- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(unsigned)anIndex
+- (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPUInteger)anIndex
 {
    [_items insertObject:aTabViewItem atIndex:anIndex];

@@ -186,7 +183,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    Returns the CPTabViewItem at the specified index.
    @return a tab view item, or nil
 */
- (CPTabViewItem)tabViewItemAtIndex:(unsigned)anIndex
+- (CPTabViewItem)tabViewItemAtIndex:(CPUInteger)anIndex
 {
    return [_items objectAtIndex:anIndex];
 }
@@ -273,7 +270,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    Selects the item at the specified index.
    @param anIndex the index of the item to display.
 */
- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
+- (BOOL)selectTabViewItemAtIndex:(CPUInteger)anIndex
 {
    if (anIndex === _selectedIndex)
        return;
@@ -343,21 +340,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    _type = aTabViewType;

    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;
-
-        [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
-                                  CGRectGetHeight(aFrame) - segmentedHeight / 2)];
-
        [self addSubview:_tabs];
-    }

    switch (_type)
    {
@@ -373,6 +358,29 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
            [_box setBorderType:CPNoBorder];
            break;
    }
+
+    [self setNeedsLayout];
+}
+
+- (void)layoutSubviews
+{
+    // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
+    // This means we can't rely on autoresize masks.
+    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
+    {
+        [_box setFrame:[self bounds]];
+    }
+    else
+    {
+        var aFrame = [self frame],
+            segmentedHeight = CGRectGetHeight([_tabs frame]),
+            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
+
+        [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
+                                   CGRectGetHeight(aFrame) - segmentedHeight / 2)];
+
+        [self _repositionTabs];
+    }
 }

 /*!
@@ -451,10 +459,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 - (void)_setSelectedIndex:(CPNumber)index
 {
    _selectedIndex = index;
-    [self _setContentViewForItem:[_items objectAtIndex:_selectedIndex]];
+    [self _setContentViewFromItem:[_items objectAtIndex:_selectedIndex]];
 }

- (void)_setContentViewForItem:(CPTabViewItem)anItem
+- (void)_setContentViewFromItem:(CPTabViewItem)anItem
 {
    [_box setContentView:[anItem view]];
 }
@@ -471,9 +479,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    }

    if (_selectedIndex === CPNotFound)
-    {
        [self selectFirstTabViewItem:self];
-    }
 }

@end
@@ -498,24 +504,43 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
        _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 setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
+        self.selectOnAwake = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        _type = [aCoder decodeIntForKey:CPTabViewTypeKey];
    }

    return self;
 }

+- (void)awakeFromCib
+{
+    // This cannot be run in initWithCoder because it might call selectTabViewItem:, which is
+    // not safe to call before the views of the tab views items are fully decoded.
+    [self _updateItems];
+
+    if (self.selectOnAwake)
+    {
+        [self selectTabViewItem:self.selectOnAwake];
+        delete self.selectOnAwake;
+    }
+
+    var type = _type;
+    _type = nil;
+    [self setTabViewType:type];
+
+    [self setNeedsLayout];
+}
+
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
+    // Don't bother to encode the CPBox. We will recreate it on decode and its content view is already
+    // stored by the tab view item. Not encoding _box makes the resulting archive smaller and reduces
+    // the surface for decoding bugs (of which we've had many in tab view).
+    var subviews = [self subviews];
+    [_box removeFromSuperview];
    [super encodeWithCoder:aCoder];
+    [self setSubviews:subviews];

    [aCoder encodeObject:_items forKey:CPTabViewItemsKey];

@@ -60,6 +60,7 @@ CPPressedTab    = 2;
    CPView      _auxiliaryView;

    CPTabView   _tabView;
+    unsigned    _tabState;      // Looks like it is not yet implemented
 }

 - (id)init
@@ -138,7 +139,7 @@ CPPressedTab    = 2;
    _view = aView;

    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewForItem:self];
+        [_tabView _setContentViewFromItem:self];
 }

 /*!
@@ -26,8 +26,11 @@
@import <Foundation/CPSortDescriptor.j>
@import <Foundation/CPString.j>

-@import "CPTableHeaderView.j"
+@import "CPTextField.j"

+@global CPTableViewColumnDidResizeNotification
+
+@class _CPTableColumnHeaderView

 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
@@ -49,7 +52,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
    CPTableView         _tableView;
    CPView              _headerView;
    CPView              _dataView;
-    Object              _dataViewData;
+    CPData              _dataViewData;

    float               _width;
    float               _minWidth;
@@ -83,7 +86,7 @@ CPTableColumnUserResizingMask   = 1 << 1;

    if (self)
    {
-        _dataViewData = { };
+        _dataViewData = nil;

        _width = 100.0;
        _minWidth = 10.0;
@@ -280,7 +283,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (void)sizeToFit
 {
-    var width = _CGRectGetWidth([_headerView frame]);
+    var width = CGRectGetWidth([_headerView frame]);

    if (width < [self minWidth])
        [self setMinWidth:width];
@@ -392,12 +395,12 @@ CPTableColumnUserResizingMask   = 1 << 1;
 - (void)setDataView:(CPView)aView
 {
    if (_dataView)
-        _dataViewData[[_dataView UID]] = nil;
+        _dataViewData = nil;

    [aView setThemeState:CPThemeStateTableDataView];

    _dataView = aView;
-    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
+    _dataViewData = [CPKeyedArchiver archivedDataWithRootObject:aView];
 }

 - (CPView)dataView
@@ -413,7 +416,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
    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.
 */
- (id)dataViewForRow:(int)aRowIndex
+- (id)dataViewForRow:(CPInteger)aRowIndex
 {
    return [self dataView];
 }
@@ -421,24 +424,12 @@ CPTableColumnUserResizingMask   = 1 << 1;
 /*!
    @ignore
 */
- (id)_newDataViewForRow:(int)aRowIndex
+- (id)_newDataView
 {
-    var dataView = [self dataViewForRow:aRowIndex],
-        dataViewUID = [dataView UID];
+    if (!_dataViewData)
+        return nil;

-    var x = [self tableView]._cachedDataViews[dataViewUID];
-    if (x && x.length)
-        return x.pop();
-
-    // if we haven't cached an archive of the data view, do it now
-    if (!_dataViewData[dataViewUID])
-        _dataViewData[dataViewUID] = [CPKeyedArchiver archivedDataWithRootObject:dataView];
-
-    // unarchive the data view cache
-    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData[dataViewUID]];
-    newDataView.identifier = dataViewUID;
-
-    // make sure only we have control over the size and placement
+    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData];
    [newDataView setAutoresizingMask:CPViewNotSizable];

    return newDataView;
@@ -494,7 +485,13 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (CPSortDescriptor)sortDescriptorPrototype
 {
-    return _sortDescriptorPrototype;
+    if (_sortDescriptorPrototype)
+        return _sortDescriptorPrototype;
+
+    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
+        binding = [binderClass getBinding:CPValueBinding forObject:self];
+
+    return [binding _defaultSortDescriptorPrototype];
 }

 /*!
@@ -551,7 +548,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
    [[CPNotificationCenter defaultCenter]
    postNotificationName:CPTableViewColumnDidResizeNotification
                  object:[self tableView]
-                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+                userInfo:@{ @"CPTableColumn": self, @"CPOldWidth": oldWidth }];
 }

@end
@@ -570,11 +567,35 @@ CPTableColumnUserResizingMask   = 1 << 1;
    [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
 }

+- (CPSortDescriptor)_defaultSortDescriptorPrototype
+{
+    if (![self createsSortDescriptor])
+        return nil;
+
+    var keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        dotIndex = keyPath.indexOf(".");
+
+    if (dotIndex === CPNotFound)
+        return nil;
+
+    var firstPart = keyPath.substring(0, dotIndex),
+        key = keyPath.substring(dotIndex + 1);
+
+    return [CPSortDescriptor sortDescriptorWithKey:key ascending:YES];
+}
+
+- (BOOL)createsSortDescriptor
+{
+    var options = [_info objectForKey:CPOptionsKey],
+        optionValue = [options objectForKey:CPCreatesSortDescriptorBindingOption];
+    return optionValue === nil ? YES : [optionValue boolValue];
+}
+
@end

@implementation CPTableColumn (Bindings)

-+ (id)_binderClassForBinding:(CPString)aBinding
+ (Class)_binderClassForBinding:(CPString)aBinding
 {
    if (aBinding == CPValueBinding)
        return [CPTableColumnValueBinder class];
@@ -724,7 +745,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",

    if (self)
    {
-        _dataViewData = { };
+        _dataViewData = nil;

        _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
        _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
@@ -807,7 +828,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 /*!
    @ignore
 */
- (id)dataCellForRow:(int)row
+- (id)dataCellForRow:(CPInteger)row
 {
    [CPException raise:CPUnsupportedMethodException
                reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];
@@ -22,9 +22,15 @@

@import <Foundation/CPIndexSet.j>

+@import "CPCursor.j"
+@import "CPPasteboard.j"
@import "CPTableColumn.j"
-@import "CPTableView.j"
@import "CPView.j"
+@import "_CPImageAndTextView.j"
+
+@class CPTableView
+
+@global CPApp


@implementation _CPTableColumnHeaderView : CPView
@@ -37,15 +43,24 @@
    return @"columnHeader";
 }

-+ (id)themeAttributes
+ (CPDictionary)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", @"font", @"text-shadow-color", @"text-shadow-offset"]];
+    return @{
+            @"background-color": [CPNull null],
+            @"text-alignment": CPLeftTextAlignment,
+            @"line-break-mode": CPLineBreakByTruncatingTail,
+            @"text-inset": CGInsetMakeZero(),
+            @"text-color": [CPNull null],
+            @"font": [CPNull null],
+            @"text-shadow-color": [CPNull null],
+            @"text-shadow-offset": CGSizeMakeZero()
+        };
 }

- (void)initWithFrame:(CGRect)frame
+- (id)initWithFrame:(CGRect)frame
 {
    self = [super initWithFrame:frame];
+
    if (self)
        [self _init];

@@ -54,7 +69,7 @@

 - (void)_init
 {
-    _textField = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+    _textField = [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];

    [_textField setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];

@@ -72,12 +87,13 @@
    var inset = [self currentValueForThemeAttribute:@"text-inset"],
        bounds = [self bounds];

-    [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
+    [_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:@"font"]];
    [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
    [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
    [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
+    [_textField setLineBreakMode:[self currentValueForThemeAttribute:@"line-break-mode"]];
 }

 - (void)setStringValue:(CPString)string
@@ -102,7 +118,52 @@

 - (void)setFont:(CPFont)aFont
 {
-    [self setValue:aFont forThemeAttribute:"font"];
+    [self setValue:aFont forThemeAttribute:@"font"];
+}
+
+- (CPFont)font
+{
+    return [self currentValueForThemeAttribute:@"font"]
+}
+
+- (void)setAlignment:(CPTextAlignment)alignment
+{
+    [self setValue:alignment forThemeAttribute:@"text-alignment"];
+}
+
+- (CPTextAlignment)alignment
+{
+    return [self currentValueForThemeAttribute:@"text-alignment"]
+}
+
+- (void)setLineBreakMode:(CPLineBreakMode)mode
+{
+    [self setValue:mode forThemeAttribute:@"line-break-mode"];
+}
+
+- (CPLineBreakMode)lineBreakMode
+{
+    return [self currentValueForThemeAttribute:@"line-break-mode"]
+}
+
+- (void)setTextColor:(CPColor)aColor
+{
+    [self setValue:aColor forThemeAttribute:@"text-color"];
+}
+
+- (CPColor)textColor
+{
+    return [self currentValueForThemeAttribute:@"text-color"]
+}
+
+- (void)setTextShadowColor:(CPColor)aColor
+{
+    [self setValue:aColor forThemeAttribute:@"text-shadow-color"];
+}
+
+- (CPColor)textShadowColor
+{
+    return [self currentValueForThemeAttribute:@"text-shadow-color"]
 }

 - (void)_setIndicatorImage:(CPImage)anImage
@@ -122,6 +183,10 @@

 var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
    _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
+    _CPTableColumnHeaderViewTextColorKey = @"_CPTableColumnHeaderViewTextColorKey",
+    _CPTableColumnHeaderViewTextShadowColorKey = @"_CPTableColumnHeaderViewTextShadowColorKey",
+    _CPTableColumnHeaderViewAlignmentKey = @"_CPTableColumnHeaderViewAlignmentKey",
+    _CPTableColumnHeaderViewLineBreakModeKey = @"_CPTableColumnHeaderViewLineBreakModeKey",
    _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";

@implementation _CPTableColumnHeaderView (CPCoding)
@@ -134,6 +199,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
        [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
        [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
+        [self setTextColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextColorKey]];
+        [self setTextShadowColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextShadowColorKey]];
+        [self setAlignment:[aCoder decodeIntForKey:_CPTableColumnHeaderViewAlignmentKey]];
+        [self setLineBreakMode:[aCoder decodeIntForKey:_CPTableColumnHeaderViewLineBreakModeKey]];
    }

    return self;
@@ -145,7 +214,11 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal

    [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
    [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
-    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
+    [aCoder encodeObject:[self font] forKey:_CPTableColumnHeaderViewFontKey];
+    [aCoder encodeObject:[self textColor] forKey:_CPTableColumnHeaderViewTextColorKey];
+    [aCoder encodeObject:[self textShadowColor] forKey:_CPTableColumnHeaderViewTextShadowColorKey];
+    [aCoder encodeInt:[self alignment] forKey:_CPTableColumnHeaderViewAlignmentKey];
+    [aCoder encodeInt:[self lineBreakMode] forKey:_CPTableColumnHeaderViewLineBreakModeKey];
 }

@end
@@ -156,6 +229,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    CGPoint                 _previousTrackingLocation;
    int                     _activeColumn;
    int                     _pressedColumn;
+    int                     _lastDragDestinationColumnIndex;

    BOOL                    _isResizing;
    BOOL                    _isDragging;
@@ -172,16 +246,19 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    return @"tableHeaderRow";
 }

-+ (id)themeAttributes
+ (CPDictionary)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPColor grayColor]]
-                                       forKeys:[@"background-color", @"divider-color"]];
+    return @{
+            @"background-color": [CPNull null],
+            @"divider-color": [CPColor grayColor],
+            @"divider-thickness": 1.0
+        };
 }

 - (void)_init
 {
-    _mouseDownLocation = _CGPointMakeZero();
-    _previousTrackingLocation = _CGPointMakeZero();
+    _mouseDownLocation = CGPointMakeZero();
+    _previousTrackingLocation = CGPointMakeZero();
    _activeColumn = -1;
    _pressedColumn = -1;

@@ -210,13 +287,13 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    return [_tableView columnAtPoint:CGPointMake(aPoint.x, aPoint.y)];
 }

- (CGRect)headerRectOfColumn:(int)aColumnIndex
+- (CGRect)headerRectOfColumn:(CPInteger)aColumnIndex
 {
    var headerRect = CGRectMakeCopy([self bounds]),
        columnRect = [_tableView rectOfColumn:aColumnIndex];

-    headerRect.origin.x = _CGRectGetMinX(columnRect);
-    headerRect.size.width = _CGRectGetWidth(columnRect);
+    headerRect.origin.x = CGRectGetMinX(columnRect);
+    headerRect.size.width = CGRectGetWidth(columnRect);

    return headerRect;
 }
@@ -231,14 +308,14 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    return _drawsColumnLines;
 }

- (CGRect)_cursorRectForColumn:(int)column
+- (CGRect)_cursorRectForColumn:(CPInteger)column
 {
    if (column == -1 || !([_tableView._tableColumns[column] resizingMask] & CPTableColumnUserResizingMask))
-        return _CGRectMakeZero();
+        return CGRectMakeZero();

    var rect = [self headerRectOfColumn:column];

-    rect.origin.x = _CGRectGetMaxX(rect) - 5;
+    rect.origin.x = CGRectGetMaxX(rect) - 5;
    rect.size.width = 20;

    return rect;
@@ -256,6 +333,9 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    {
        var headerView = [_tableView._tableColumns[column] headerView];
        [headerView setThemeState:CPThemeStateHighlighted];
+
+        if (_tableView._editingCellIndex || _tableView._editingColumn == column)
+            [[self window] makeFirstResponder:_tableView];
    }

    _pressedColumn = column;
@@ -275,7 +355,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    currentLocation.x -= 5.0;

    var columnIndex = [self columnAtPoint:currentLocation],
-        shouldResize = [self shouldResizeTableColumn:columnIndex at:_CGPointMake(currentLocation.x + 5.0, currentLocation.y)];
+        shouldResize = [self shouldResizeTableColumn:columnIndex at:CGPointMake(currentLocation.x + 5.0, currentLocation.y)];

    if (type === CPLeftMouseUp)
    {
@@ -303,7 +383,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        _mouseDownLocation = currentLocation;
        _activeColumn = columnIndex;

-        [_tableView _sendDelegateDidMouseDownInHeader:columnIndex];
+        [_tableView _sendDelegateMouseDownInHeaderOfTableColumn:columnIndex];

        if (shouldResize)
            [self startResizingTableColumn:columnIndex at:currentLocation];
@@ -319,7 +399,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
            [self continueResizingTableColumn:_activeColumn at:currentLocation];
        else
        {
-            if (_activeColumn === columnIndex && _CGRectContainsPoint([self headerRectOfColumn:columnIndex], currentLocation))
+            if (_activeColumn === columnIndex && CGRectContainsPoint([self headerRectOfColumn:columnIndex], currentLocation))
            {
                if (_isTrackingColumn && _pressedColumn !== -1)
                {
@@ -337,24 +417,25 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    [CPApp setTarget:self selector:@selector(trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }

- (void)startTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)startTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
+    _lastDragDestinationColumnIndex = -1;
    [self _setPressedColumn:aColumnIndex];
 }

- (BOOL)continueTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)continueTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    if ([self _shouldDragTableColumn:aColumnIndex at:aPoint])
    {
        var columnRect = [self headerRectOfColumn:aColumnIndex],
-            offset = _CGPointMakeZero(),
+            offset = CGPointMakeZero(),
            view = [_tableView _dragViewForColumn:aColumnIndex event:[CPApp currentEvent] offset:offset],
-            viewLocation = _CGPointMakeZero();
+            viewLocation = CGPointMakeZero();

-        viewLocation.x = ( _CGRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x );
-        viewLocation.y = _CGRectGetMinY(columnRect) + offset.y;
+        viewLocation.x = ( CGRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x );
+        viewLocation.y = CGRectGetMinY(columnRect) + offset.y;

-        [self dragView:view at:viewLocation offset:_CGSizeMakeZero() event:[CPApp currentEvent]
+        [self dragView:view at:viewLocation offset:CGSizeMakeZero() event:[CPApp currentEvent]
            pasteboard:[CPPasteboard pasteboardWithName:CPDragPboard] source:self slideBack:YES];

        return NO;
@@ -363,21 +444,21 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    return YES;
 }

- (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)_shouldStopTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    return _isTrackingColumn && _activeColumn === aColumnIndex &&
-        _CGRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
+        CGRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
 }

- (void)stopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)stopTrackingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    [self _setPressedColumn:CPNotFound];
    [self _updateResizeCursor:[CPApp currentEvent]];
 }

- (BOOL)_shouldDragTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)_shouldDragTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
-    return [_tableView allowsColumnReordering] && ABS(aPoint.x - _mouseDownLocation.x) >= 10.0;
+    return ABS(aPoint.x - _mouseDownLocation.x) >= 10.0 && [_tableView _sendDelegateShouldReorderColumn:aColumnIndex toColumn:-1];
 }

 - (CGRect)_headerRectOfLastVisibleColumn
@@ -410,10 +491,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    frame.origin = [self convertPoint:frame.origin fromView:nil];

    // This effectively clamps the value between the minimum and maximum
-    frame.origin.x = MAX(0.0, MIN(_CGRectGetMinX(frame), _CGRectGetMaxX(lastColumnRect) - _CGRectGetWidth(activeColumnRect)));
+    frame.origin.x = MAX(0.0, MIN(CGRectGetMinX(frame), CGRectGetMaxX(lastColumnRect) - CGRectGetWidth(activeColumnRect)));

    // Make sure the column cannot move vertically
-    frame.origin.y = _CGRectGetMinY(lastColumnRect);
+    frame.origin.y = CGRectGetMinY(lastColumnRect);

    // Convert the calculated origin back to the window coordinate system
    frame.origin = [self convertPoint:frame.origin toView:nil];
@@ -423,11 +504,14 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    [dragWindow setFrame:frame];
 }

- (void)_moveColumn:(int)aFromIndex toColumn:(int)aToIndex
+- (void)_moveColumn:(CPInteger)aFromIndex toColumn:(CPInteger)aToIndex
 {
-    [_tableView moveColumn:aFromIndex toColumn:aToIndex];
-    _activeColumn = aToIndex;
-    _pressedColumn = _activeColumn;
+    if ([_tableView _sendDelegateShouldReorderColumn:aFromIndex toColumn:aToIndex])
+    {
+        [_tableView moveColumn:aFromIndex toColumn:aToIndex];
+        _activeColumn = aToIndex;
+        _pressedColumn = _activeColumn;
+    }
 }

 - (void)draggedView:(CPView)aView beganAt:(CGPoint)aPoint
@@ -452,9 +536,9 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    var hoverPoint = CGPointCreateCopy(aPoint);

    if (aPoint.x < _previousTrackingLocation.x)
-        hoverPoint = _CGPointMake(_CGRectGetMinX(dragWindowFrame), _CGRectGetMinY(dragWindowFrame));
+        hoverPoint = CGPointMake(CGRectGetMinX(dragWindowFrame), CGRectGetMinY(dragWindowFrame));
    else if (aPoint.x > _previousTrackingLocation.x)
-        hoverPoint = _CGPointMake(_CGRectGetMaxX(dragWindowFrame), _CGRectGetMinY(dragWindowFrame));
+        hoverPoint = CGPointMake(CGRectGetMaxX(dragWindowFrame), CGRectGetMinY(dragWindowFrame));

    // Convert the hover point from the global coordinate system to windows' coordinate system
    hoverPoint = [[self window] convertGlobalToBase:hoverPoint];
@@ -463,14 +547,21 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal

    var hoveredColumn = [self columnAtPoint:hoverPoint];

-    if (hoveredColumn !== -1)
+    if (hoveredColumn !== _lastDragDestinationColumnIndex && hoveredColumn !== -1)
    {
        var columnRect = [self headerRectOfColumn:hoveredColumn],
-            columnCenterPoint = [self convertPoint:CGPointMake(_CGRectGetMidX(columnRect), _CGRectGetMidY(columnRect)) fromView:self];
+            columnCenterPoint = [self convertPoint:CGPointMake(CGRectGetMidX(columnRect), CGRectGetMidY(columnRect)) fromView:self];
+
        if (hoveredColumn < _activeColumn && hoverPoint.x < columnCenterPoint.x)
+        {
            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
+            _lastDragDestinationColumnIndex = hoveredColumn;
+        }
        else if (hoveredColumn > _activeColumn && hoverPoint.x > columnCenterPoint.x)
+        {
            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
+            _lastDragDestinationColumnIndex = hoveredColumn;
+        }
    }

    _previousTrackingLocation = aPoint;
@@ -486,9 +577,11 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    [self stopTrackingTableColumn:_activeColumn at:aLocation];

    [self setNeedsDisplay:YES];
+
+    [_tableView _enqueueDraggingViews];
 }

- (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (BOOL)shouldResizeTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    if (_isResizing)
        return YES;
@@ -496,10 +589,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    if (_isTrackingColumn)
        return NO;

-    return [_tableView allowsColumnResizing] && _CGRectContainsPoint([self _cursorRectForColumn:aColumnIndex], aPoint);
+    return [_tableView allowsColumnResizing] && CGRectContainsPoint([self _cursorRectForColumn:aColumnIndex], aPoint);
 }

- (void)startResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)startResizingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    _isResizing = YES;

@@ -509,7 +602,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    [_tableView setDisableAutomaticResizing:YES];
 }

- (void)continueResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)continueResizingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
        newWidth = [tableColumn width] + aPoint.x - _previousTrackingLocation.x;
@@ -529,7 +622,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
    }
 }

- (void)stopResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+- (void)stopResizingTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint
 {
    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
    [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
@@ -552,7 +645,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        mouseOverLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
        overColumn = [self columnAtPoint:mouseOverLocation];

-    if (overColumn >= 0 && _CGRectContainsPoint([self _cursorRectForColumn:overColumn], mouseLocation))
+    if (overColumn >= 0 && CGRectContainsPoint([self _cursorRectForColumn:overColumn], mouseLocation))
    {
        var tableColumn = [[_tableView tableColumns] objectAtIndex:overColumn],
            width = [tableColumn width];
@@ -587,7 +680,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 - (void)layoutSubviews
 {
    var tableColumns = [_tableView tableColumns],
-        count = [tableColumns count];
+        count = [tableColumns count],
+        lineThickness = [self currentValueForThemeAttribute:@"divider-thickness"];

    for (var i = 0; i < count; i++)
    {
@@ -597,7 +691,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal

        // Make space for the gridline on the right.
        frame.origin.x -= 0.5;
-        frame.size.width -= 1.0;
+        frame.size.width -= lineThickness;
        frame.size.height -= 0.5;
        // 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.
@@ -622,9 +716,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        tableColumns = [_tableView tableColumns],
        exposedTableColumns = _tableView._exposedColumns,
        firstIndex = [exposedTableColumns firstIndex],
-        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1);
+        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1),
+        lineThickness = [self currentValueForThemeAttribute:@"divider-thickness"];

-    CGContextSetLineWidth(context, 1);
+    CGContextSetLineWidth(context, lineThickness);
    CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"divider-color"]);

    [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:exposedRange];
@@ -634,17 +729,19 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        columnMaxX;

    CGContextBeginPath(context);
+
    for (; columnArrayIndex < columnArrayCount; columnArrayIndex++)
    {
        // grab each column rect and add vertical lines
        var columnIndex = columnsArray[columnArrayIndex],
            columnToStroke = [self headerRectOfColumn:columnIndex];

-        columnMaxX = _CGRectGetMaxX(columnToStroke);
+        columnMaxX = CGRectGetMaxX(columnToStroke);

-        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
+        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5 * lineThickness, ROUND(CGRectGetMinY(columnToStroke)));
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5 * lineThickness, ROUND(CGRectGetMaxY(columnToStroke)) - 1.0);
    }
+
    CGContextClosePath(context);
    CGContextStrokePath(context);

@@ -28,3 +28,14 @@ CPFormFeedCharacter             = "\u000c";
 CPCarriageReturnCharacter       = "\u000d";
 CPBackTabCharacter              = "\u0019";
 CPDeleteCharacter               = "\u007f";
+
+CPIllegalTextMovement           = 0;
+CPOtherTextMovement             = 0;
+CPReturnTextMovement            = 16;
+CPTabTextMovement               = 17;
+CPBacktabTextMovement           = 18;
+CPLeftTextMovement              = 19;
+CPRightTextMovement             = 20;
+CPUpTextMovement                = 21;
+CPDownTextMovement              = 22;
+CPCancelTextMovement            = 23;
--- a/Show More
+++ b/Show More