This will be Cappuccino 0.9.7-alpha1.

Fixed: nib2cib error on case sensitive filesystems.
Before this fix, nib2cib compilation would fail with `require error: couldn't find "OS"`.
2026-09-09 12:17:13 +00:00 · 2013-01-30 14:52:48 +00:00 · 2013-01-30 11:52:28 +00:00 · 2013-01-30 11:38:39 +00:00 · 2013-01-30 11:35:59 +00:00 · 2013-01-30 11:17:29 +00:00
2513 changed files with 130885 additions and 33537 deletions
@@ -9,3 +9,5 @@ WebSite
 *.xcodeproj/*.perspectivev3
 xcuserdata/
 !*.xcodeproj/project.pbxproj
+*.xCodeSupport/
+*.XcodeSupport/
@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+    - 0.8
+before_install:
+    - jdk_switcher use openjdk6
+install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
+script: jake test
+env: PATH=$HOME/build/$TRAVIS_REPO_SLUG/narwhal/bin:$PATH CAPP_BUILD=$HOME/build/$TRAVIS_REPO_SLUG/Build NARWHAL_ENGINE=rhino
@@ -20,7 +20,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "_CPToolTip.j"
@import "CALayer.j"
+@import "CGGeometry.j"
+@import "CPAccordionView.j"
@import "CPAlert.j"
@import "CPAnimation.j"
@import "CPApplication.j"
@@ -35,16 +38,21 @@
@import "CPCibBindingConnector.j"
@import "CPCibConnector.j"
@import "CPCibControlConnector.j"
+@import "CPCibHelpConnector.j"
@import "CPCibLoading.j"
@import "CPCibOutletConnector.j"
+@import "CPCibRuntimeAttributesConnector.j"
@import "CPClipView.j"
@import "CPCollectionView.j"
@import "CPCollectionViewItem.j"
@import "CPColor.j"
@import "CPColorPanel.j"
+@import "CPColorSpace.j"
@import "CPColorWell.j"
+@import "CPComboBox.j"
@import "CPCompatibility.j"
@import "CPControl.j"
+@import "CPController.j"
@import "CPCookie.j"
@import "CPCursor.j"
@import "CPDocument.j"
@@ -54,7 +62,7 @@
@import "CPFlashView.j"
@import "CPFont.j"
@import "CPFontManager.j"
-@import "CPGeometry.j"
+@import "CPGradient.j"
@import "CPGraphics.j"
@import "CPImage.j"
@import "CPImageView.j"
@@ -92,7 +100,6 @@
@import "CPTokenField.j"
@import "CPToolbar.j"
@import "CPToolbarItem.j"
-@import "_CPToolTip.j"
@import "CPTreeNode.j"
@import "CPUserDefaultsController.j"
@import "CPView.j"
@@ -101,3 +108,4 @@
@import "CPWebView.j"
@import "CPWindow.j"
@import "CPWindowController.j"
+@import "CPWorkspace.j"
@@ -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;
 }
@@ -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,33 @@ 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;

-    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
@@ -117,21 +124,21 @@ CPCriticalAlertStyle        = 2;
 */
 + (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
 {
-    var alert = [[self alloc] init];
+    var newAlert = [[self alloc] init];

-    [alert setMessageText:aMessage];
-    [alert addButtonWithTitle:defaultButtonTitle];
+    [newAlert setMessageText:aMessage];
+    [newAlert addButtonWithTitle:defaultButtonTitle];

    if (alternateButtonTitle)
-        [alert addButtonWithTitle:alternateButtonTitle];
+        [newAlert addButtonWithTitle:alternateButtonTitle];

    if (otherButtonTitle)
-        [alert addButtonWithTitle:otherButtonTitle];
+        [newAlert addButtonWithTitle:otherButtonTitle];

    if (informativeText)
-        [alert setInformativeText:informativeText];
+        [newAlert setInformativeText:informativeText];

-    return alert;
+    return newAlert;
 }

 /*!
@@ -142,12 +149,12 @@ CPCriticalAlertStyle        = 2;
 */
 + (CPAlert)alertWithError:(CPString)anErrorMessage
 {
-    var alert = [[self alloc] init];
+    var newAlert = [[self alloc] init];

-    [alert setMessageText:anErrorMessage];
-    [alert setAlertStyle:CPCriticalAlertStyle];
+    [newAlert setMessageText:anErrorMessage];
+    [newAlert setAlertStyle:CPCriticalAlertStyle];

-    return alert;
+    return newAlert;
 }

 /*!
@@ -163,7 +170,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 +188,11 @@ CPCriticalAlertStyle        = 2;

 #pragma mark Accessors

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

@@ -197,9 +210,20 @@ CPCriticalAlertStyle        = 2;

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

+- (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)aStyle
@@ -334,16 +358,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,22 +381,22 @@ 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,
-    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin,
+    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
+    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
    informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];

    [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];
@@ -386,8 +410,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 +427,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 +448,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]];
@@ -442,8 +469,25 @@ CPCriticalAlertStyle        = 2;
        panelSize.height = minimumSize.height;

    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
+
+    if ([_window styleMask] & _CPModalWindowMask)
+        buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height / 2 + 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 +499,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 +531,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 +539,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 +563,7 @@ CPCriticalAlertStyle        = 2;
    if (_showSuppressionButton)
        lastView = _suppressionButton;
    else if (_accessoryView)
-        lastView = _accessoryView
+        lastView = _accessoryView;

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

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

@@ -592,9 +642,10 @@ 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 setLevel:CPStatusWindowLevel];

    if (_title)
        [_window setTitle:_title];
@@ -631,7 +682,10 @@ CPCriticalAlertStyle        = 2;
 - (@action)_takeReturnCodeFrom:(id)aSender
 {
    if ([_window isSheet])
+    {
+        [_window orderOut:nil];
        [CPApp endSheet:_window returnCode:[aSender tag]];
+    }
    else
    {
        [CPApp abortModal];
@@ -646,17 +700,19 @@ CPCriticalAlertStyle        = 2;
 */
 - (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
 {
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-            [_delegate alertDidEnd:self returnCode:returnCode];
-
    if (_didEndSelector)
        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);

    _modalDelegate = nil;
    _didEndSelector = nil;
+
+    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+        [_delegate alertDidEnd:self returnCode:returnCode];
 }

-#pragma mark Theme Attributes
+@end
+
+@implementation _CPAlertThemeView : CPView

 + (CPString)defaultThemeClass
 {
@@ -681,7 +737,11 @@ CPCriticalAlertStyle        = 2;
                                                [CPColor blackColor],
                                                [CPFont systemFontOfSize:12.0],
                                                [CPNull null],
-                                                0.0
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                0.0,
+                                                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",
@@ -699,7 +759,11 @@ CPCriticalAlertStyle        = 2;
                                                @"suppression-button-text-color",
                                                @"suppression-button-text-font",
                                                @"suppression-button-text-shadow-color",
-                                                @"suppression-button-text-shadow-offset"
+                                                @"suppression-button-text-shadow-offset",
+                                                @"modal-window-button-margin-y",
+                                                @"modal-window-button-margin-x",
+                                                @"standard-window-button-margin-y",
+                                                @"standard-window-button-margin-x"
                                                ]];
 }

@@ -122,23 +122,30 @@ 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;
@@ -306,7 +313,7 @@ ACTUAL_FRAME_RATE = 0;

    if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
        return [_delegate animation:self valueForProgress:t];
-    
+
    if (_animationCurve == CPAnimationLinear)
        return t;

@@ -324,7 +331,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,
@@ -20,20 +20,26 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#import "../Foundation/CPRange.h"
+
@import <Foundation/CPBundle.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"

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

 CPApp = nil;

@@ -83,6 +89,7 @@ CPRunContinuesResponse  = -1002;
    CPArray                 _eventListeners;

    CPEvent                 _currentEvent;
+    CPWindow                _lastMouseMoveWindow;

    CPArray                 _windows;
    CPWindow                _keyWindow;
@@ -138,9 +145,7 @@ CPRunContinuesResponse  = -1002;
    {
        _eventListeners = [];

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

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

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

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

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

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

    var defaultCenter = [CPNotificationCenter defaultCenter];
@@ -249,13 +248,23 @@ CPRunContinuesResponse  = -1002;
        postNotificationName:CPApplicationWillFinishLaunchingNotification
        object:self];

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

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

    if (needsUntitled && [_delegate respondsToSelector:@selector(applicationShouldOpenUntitledFile:)])
        needsUntitled = [_delegate applicationShouldOpenUntitledFile:self];
@@ -338,7 +347,7 @@ CPRunContinuesResponse  = -1002;
    Copyright - Human readable copyright information.
    </pre>

-    If you choose not the include any of the above keys, they will default 
+    If you choose not the include any of the above keys, they will default
    to the following respective keys in your info.plist file.

    <pre>
@@ -374,7 +383,7 @@ CPRunContinuesResponse  = -1002;
            standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];

        // FIXME move this into the CIB eventually
-        [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
+        [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
        [applicationLabel setAlignment:CPCenterTextAlignment];
        [versionLabel setAlignment:CPCenterTextAlignment];
        [copyrightLabel setAlignment:CPCenterTextAlignment];
@@ -401,7 +410,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)
@@ -576,38 +585,60 @@ CPRunContinuesResponse  = -1002;
 - (void)sendEvent:(CPEvent)anEvent
 {
    _currentEvent = anEvent;
+    CPEventModifierFlags = [anEvent modifierFlags];

-    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
+    var theWindow = [anEvent window];
+
+#if PLATFORM(DOM)
+    var willPropagate = [[theWindow 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];
+    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
+#endif

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

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

        return;
    }

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

    if (_eventListeners.length)
    {
        if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
-            _eventListeners.pop()._callback(anEvent);
+        {
+            var listener = _eventListeners.pop();
+            listener._callback(anEvent);

-        return;
+            if (listener._dequeue)
+                return;
+        }
    }

-    [[anEvent window] sendEvent:anEvent];
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
+    }
+
+    if (theWindow)
+        [theWindow sendEvent:anEvent];
 }

 /*!
@@ -643,6 +674,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];
 }

@@ -651,7 +686,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)];
 }

 /*!
@@ -879,31 +915,33 @@ 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).
+    @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.push(_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).
+    @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.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
 }

 /*!
@@ -926,15 +964,22 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {
-    var styleMask = [aSheet styleMask];
-    if (!(styleMask & CPDocModalWindowMask))
+    if ([aWindow isSheet])
    {
-        [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
+        [CPException raise:CPInternalInconsistencyException reason:@"The target window of beginSheet: cannot be a sheet"];
        return;
    }

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

@@ -963,7 +1008,7 @@ CPRunContinuesResponse  = -1002;
        if (context != nil && context["sheet"] === sheet)
        {
            context["returnCode"] = returnCode;
-            [aWindow _detachSheetWindow];
+            [aWindow _endSheet];
            return;
        }
    }
@@ -996,14 +1041,15 @@ 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;
 }

 /*!
-    Sets the arguments of your application. 
+    Sets the arguments of your application.
    That is, set the slash seperated values of an array as the window location hash.

    For example if you pass an array:
@@ -1023,8 +1069,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;
    }

@@ -1039,12 +1086,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)
    {
@@ -1158,7 +1208,7 @@ CPRunContinuesResponse  = -1002;

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

@end
@@ -1166,24 +1216,32 @@ CPRunContinuesResponse  = -1002;
 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;

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

 /*!
    Starts the GUI and Cappuccino frameworks. This function should be
@@ -1198,7 +1256,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],
@@ -1255,7 +1323,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"];
@@ -1300,26 +1368,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]];
@@ -1340,8 +1407,8 @@ var _CPAppBootstrapperActions = nil;
    [editMenu addItem:undoMenuItem];
    [editMenu addItem:redoMenuItem];

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

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

@end
+
+
+@implementation CPEvent (CPApplicationModifierFlags)
+
+/*!
+    Returns the currently pressed modifier flags.
+*/
+ (unsigned)modifierFlags
+{
+    return CPEventModifierFlags;
+}
+
+@end
@@ -564,8 +564,9 @@
 - (BOOL)setSelectionIndexes:(CPIndexSet)indexes
 {
    [self _selectionWillChange]
-    [self __setSelectionIndexes:indexes];
+    var r = [self __setSelectionIndexes:indexes avoidEmpty:NO];
    [self _selectionDidChange];
+    return r;
 }

 /*
@@ -574,7 +575,7 @@
 */
 - (BOOL)__setSelectionIndex:(int)theIndex
 {
-    [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
+    return [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
 }

 /*
@@ -583,28 +584,43 @@
 */
 - (BOOL)__setSelectionIndexes:(CPIndexSet)indexes
 {
-    if (!indexes)
-        indexes = [CPIndexSet indexSet];
+    return [self __setSelectionIndexes:indexes avoidEmpty:_avoidsEmptySelection];
+}

-    if (![indexes count])
+- (BOOL)__setSelectionIndexes:(CPIndexSet)indexes avoidEmpty:(BOOL)avoidEmpty
+{
+    var newIndexes = indexes;
+
+    if (!newIndexes)
+        newIndexes = [CPIndexSet indexSet];
+
+    if (![newIndexes count])
    {
-        if (_avoidsEmptySelection && [[self arrangedObjects] count])
-            indexes = [CPIndexSet indexSetWithIndex:0];
+        if (avoidEmpty && [[self arrangedObjects] count])
+            newIndexes = [CPIndexSet indexSetWithIndex:0];
    }
    else
    {
        var objectsCount = [[self arrangedObjects] count];
+
+        // Don't trash the input - the caller might depend on it or we might have been
+        // given _selectionIndexes as the input in which case the equality test below
+        // would always succeed despite our change below.
+        newIndexes = [newIndexes copy];
+
        // Remove out of bounds indexes.
-        [indexes removeIndexesInRange:CPMakeRange(objectsCount, [indexes lastIndex] + 1)];
+        [newIndexes removeIndexesInRange:CPMakeRange(objectsCount, [newIndexes lastIndex] + 1)];
        // When avoiding empty selection and the deleted selection was at the bottom, select the last item.
-        if (![indexes count] && _avoidsEmptySelection && objectsCount)
-            indexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
+        if (![newIndexes count] && avoidEmpty && objectsCount)
+            newIndexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
    }

-    if ([_selectionIndexes isEqualToIndexSet:indexes])
+    if ([_selectionIndexes isEqualToIndexSet:newIndexes])
        return NO;

-    _selectionIndexes = [indexes copy];
+    // If we haven't already created our own index instance, make sure to copy it here so that
+    // the copy the user sent in is decoupled from our internal copy.
+    _selectionIndexes = indexes === newIndexes ? [indexes copy] : newIndexes;

    // Push back the new selection to the model for selectionIndexes if we have one.
    // There won't be an infinite loop because of the equality check above.
@@ -636,10 +652,11 @@
    [self willChangeValueForKey:@"selectionIndexes"];
    [self _selectionWillChange];

-    [self __setSelectedObjects:objects];
+    var r = [self __setSelectedObjects:objects avoidEmpty:NO];

    [self didChangeValueForKey:@"selectionIndexes"];
    [self _selectionDidChange];
+    return r;
 }

 /*
@@ -647,6 +664,11 @@
    @ignore
 */
 - (BOOL)__setSelectedObjects:(CPArray)objects
+{
+    [self __setSelectedObjects:objects avoidEmpty:_avoidsEmptySelection];
+}
+
+- (BOOL)__setSelectedObjects:(CPArray)objects avoidEmpty:(BOOL)avoidEmpty
 {
    var set = [CPIndexSet indexSet],
        count = [objects count],
@@ -660,7 +682,7 @@
            [set addIndex:index];
    }

-    [self __setSelectionIndexes:set];
+    [self __setSelectionIndexes:set avoidEmpty:avoidEmpty];
    return YES;
 }

@@ -857,6 +879,9 @@

        [_arrangedObjects removeObjectAtIndex:pos];
        [_selectionIndexes shiftIndexesStartingAtIndex:pos by:-1];
+
+        // This will automatically handle the avoidsEmptySelection case.
+        [self __setSelectionIndexes:_selectionIndexes];
    }

    [self didChangeValueForKey:@"content"];
@@ -898,6 +923,15 @@
    [self removeObjectsAtArrangedObjectIndexes:_selectionIndexes];
 }

+/*!
+    Removes the object at the specified index in the controller's arranged objects from the content array.
+    @param int index - index of the object to remove.
+*/
+- (void)removeObjectAtArrangedObjectIndex:(int)index
+{
+    [self removeObjectsAtArrangedObjectIndexes:[CPIndexSet indexSetWithIndex:index]];
+}
+
 /*!
    Removes the objects at the specified indexes in the controller's arranged objects from the content array.
    @param CPIndexSet indexes - indexes of the objects to remove.
@@ -912,36 +946,38 @@
    _disableSetContent = YES;

    var arrangedObjects = [self arrangedObjects],
-        index = [anIndexSet lastIndex],
        position = CPNotFound,
        newSelectionIndexes = [_selectionIndexes copy];

-    while (index !== CPNotFound)
-    {
-        var object = [arrangedObjects objectAtIndex:index];
-
-        // First try the simple case which should work if there are no sort descriptors.
-        if ([_contentObject objectAtIndex:index] === object)
-            [_contentObject removeObjectAtIndex:index];
-        else
+    [anIndexSet enumerateIndexesWithOptions:CPEnumerationReverse
+                                 usingBlock:function(anIndex)
        {
-            // Since we don't have a reverse mapping between the sorted order and the
-            // unsorted one, we'll just simply have to remove an arbitrary pointer. It might
-            // 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];
-            [_contentObject removeObjectAtIndex:contentIndex];
-        }
-        [arrangedObjects removeObjectAtIndex:index];
+            var object = [arrangedObjects objectAtIndex:anIndex];

-        // Deselect this row if it was selected, and either way shift all selection indexes
-        // following it up by 1.
-        [newSelectionIndexes removeIndex:index];
-        [newSelectionIndexes shiftIndexesStartingAtIndex:index by:-1];
+            // First try the simple case which should work if there are no sort descriptors.
+            if ([_contentObject objectAtIndex:anIndex] === object)
+                [_contentObject removeObjectAtIndex:anIndex];
+            else
+            {
+                // Since we don't have a reverse mapping between the sorted order and the
+                // unsorted one, we'll just simply have to remove an arbitrary pointer. It might
+                // 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.
+                var contentIndex = [_contentObject indexOfObjectIdenticalTo:object];
+                [_contentObject removeObjectAtIndex:contentIndex];
+            }
+            [arrangedObjects removeObjectAtIndex:anIndex];
+
+            if (!_avoidsEmptySelection || [newSelectionIndexes count] > 1)
+            {
+                [newSelectionIndexes removeIndex:anIndex];
+                [newSelectionIndexes shiftIndexesStartingAtIndex:anIndex by:-1];
+            }
+            else if ([newSelectionIndexes lastIndex] !== anIndex)
+                [newSelectionIndexes shiftIndexesStartingAtIndex:anIndex by:-1];
+        }];

-        index = [anIndexSet indexLessThanIndex:index];
-    }
    // Allow handlesContentAsCompoundValue reverse sets to trigger.
    [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
    _disableSetContent = NO;
@@ -1054,22 +1090,46 @@
    var destination = [_info objectForKey:CPObservedObjectKey],
        keyPath = [_info objectForKey:CPObservedKeyPathKey],
        options = [_info objectForKey:CPOptionsKey],
-        isCompound = [self handlesContentAsCompoundValue];
+        isCompound = [self handlesContentAsCompoundValue],
+        dotIndex = keyPath.lastIndexOf("."),
+        firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
+        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy],
+        newValue;

-    if (!isCompound)
+    if (!isCompound && !isSelectionProxy)
    {
        newValue = [destination mutableArrayValueForKeyPath:keyPath];
    }
    else
    {
-        // handlesContentAsCompoundValue == YES so we cannot just set up a proxy.
+        // 1. If handlesContentAsCompoundValue we cannot just set up a proxy.
        // Every read and every write must go through transformValue and
        // reverseTransformValue, and the resulting object cannot be described by
        // a key path.
+
+        // 2. If isSelectionProxy, we don't want to proxy a proxy - that's bad
+        // for performance and won't work with markers.
+
        newValue = [destination valueForKeyPath:keyPath];
    }

-    newValue = [self transformValue:newValue withOptions:options];
+    var isPlaceholder = CPIsControllerMarker(newValue);
+    if (isPlaceholder)
+    {
+        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        {
+           [CPException raise:CPGenericException
+                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
+        }
+
+        newValue = [self _placeholderForMarker:newValue];
+
+        // This seems to be what Cocoa does.
+        if (!newValue)
+            newValue = [CPMutableArray array];
+    }
+    else
+        newValue = [self transformValue:newValue withOptions:options];

    if (isCompound)
    {
@@ -20,7 +20,6 @@
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 * Copyright 2009 280 North, Inc.
-
 */

@import <Foundation/CPObject.j>
@@ -166,6 +165,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 CGPathGetPathBoundingBox(_path);
+
+    return [self controlPointBounds];
+}
+
+- (CGRect)controlPointBounds
+{
+    return CGPathGetBoundingBox(_path);
+}
+
 /*!
    Create a line segment between the first and last points in the subpath, closing it.
 */
@@ -273,10 +285,15 @@ 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.
 */
- (void)appendBezierPath:(NSBezierPath *)other
+- (void)appendBezierPath:(CPBezierPath)other
 {
    CGPathAddPath(_path, nil, other._path);
 }
@@ -289,4 +306,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
@@ -35,6 +36,16 @@ CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;

+// CPTitlePosition
+CPNoTitle     = 0;
+CPAboveTop    = 1;
+CPAtTop       = 2;
+CPBelowTop    = 3;
+CPAboveBottom = 4;
+CPAtBottom    = 5;
+CPBelowBottom = 6;
+
+
 /*!
    @ingroup appkit
    @class CPBox
@@ -45,15 +56,11 @@ CPGrooveBorder  = 3;
 {
    CPBoxType       _boxType;
    CPBorderType    _borderType;
-
-    CPColor         _borderColor;
-    CPColor         _fillColor;
-
-    float           _cornerRadius;
-    float           _borderWidth;
-
-    CPSize          _contentMargin;
    CPView          _contentView;
+
+    CPString        _title @accessors(getter=title);
+    int             _titlePosition @accessors(getter=titlePosition);
+    CPTextField     _titleView;
 }

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

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

    [enclosingView replaceSubview:aView with:box];
@@ -71,18 +78,34 @@ CPGrooveBorder  = 3;
    return box;
 }

- (id)initWithFrame:(CPRect)frameRect
+ (CPString)defaultThemeClass
+{
+    return @"box";
+}
+
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 1.0, 3.0, CGSizeMakeZero(), 6.0, [CPNull null], CGSizeMakeZero()]
+                                       forKeys:[   @"background-color",
+                                                   @"border-color",
+                                                   @"border-width",
+                                                   @"corner-radius",
+                                                   @"inner-shadow-offset",
+                                                   @"inner-shadow-size",
+                                                   @"inner-shadow-color",
+                                                   @"content-margin"]];
+}
+
+- (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:@""];

        _contentView = [[CPView alloc] initWithFrame:[self bounds]];
        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -101,7 +124,7 @@ CPGrooveBorder  = 3;

    @return the border rectangle of the box
 */
- (CPRect)borderRect
+- (CGRect)borderRect
 {
    return [self bounds];
 }
@@ -191,58 +214,54 @@ CPGrooveBorder  = 3;

 - (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
@@ -255,49 +274,146 @@ CPGrooveBorder  = 3;
    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];

    _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
 {
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
+    var offset = [self _titleHeightOffset],
+        borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+
+    [self setFrame:CGRectInset(aRect, -(contentMargin.width + borderWidth), -(contentMargin.height + offset[0] + borderWidth))];
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+    if (aTitle == _title)
+        return;
+
+    _title = aTitle;
+
+    [self _manageTitlePositioning];
+}
+
+- (void)setTitlePosition:(int)aTitlePotisition
+{
+    if (aTitlePotisition == _titlePosition)
+        return;
+
+    _titlePosition = aTitlePotisition;
+
+    [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)
+    {
+        [_titleView removeFromSuperview];
+        [self setNeedsDisplay:YES];
+        return;
+    }
+
+    [_titleView setStringValue:_title];
+    [_titleView sizeToFit];
+    [self addSubview:_titleView];
+
+    switch (_titlePosition)
+    {
+        case CPAtTop:
+        case CPAboveTop:
+        case CPBelowTop:
+            [_titleView setFrameOrigin:CGPointMake(5.0, 0.0)];
+            [_titleView setAutoresizingMask:CPViewNotSizable];
+            break;
+
+        case CPAboveBottom:
+        case CPAtBottom:
+        case CPBelowBottom:
+            var h = [_titleView frameSize].height;
+            [_titleView setFrameOrigin:CGPointMake(5.0, [self frameSize].height - h)];
+            [_titleView setAutoresizingMask:CPViewMinYMargin];
+            break;
+    }
+
+    [self sizeToFit];
    [self setNeedsDisplay:YES];
 }

 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame];
+    var contentFrame = [_contentView frame],
+        offset = [self _titleHeightOffset],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];

-    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
-                                  contentFrame.size.height + _contentMargin.height * 2)];
-
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
-}
-
- (void)drawRect:(CPRect)rect
-{
-    if (_borderType === CPNoBorder)
+    if (!contentFrame)
        return;

-    var bounds = [self bounds];
+    [_contentView setFrameOrigin:CGPointMake(contentMargin.width, contentMargin.height + offset[1])];
+}
+
+- (float)_titleHeightOffset
+{
+    if (_titlePosition == CPNoTitle)
+        return [0.0, 0.0];
+
+    switch (_titlePosition)
+    {
+        case CPAtTop:
+            return [[_titleView frameSize].height, [_titleView frameSize].height];
+
+        case CPAtBottom:
+            return [[_titleView frameSize].height, 0.0];
+
+        default:
+            return [0.0, 0.0];
+    }
+}
+
+- (void)drawRect:(CGRect)rect
+{
+    var bounds = CGRectMakeCopy([self bounds]);

    switch (_boxType)
    {
@@ -312,16 +428,30 @@ CPGrooveBorder  = 3;
            break;
    }

+    if (_titlePosition == CPAtTop)
+    {
+        bounds.origin.y += [_titleView frameSize].height;
+        bounds.size.height -= [_titleView frameSize].height;
+    }
+    if (_titlePosition == CPAtBottom)
+    {
+        bounds.size.height -= [_titleView frameSize].height;
+    }
+
    switch (_borderType)
    {
        case CPBezelBorder:
            [self _drawBezelBorderInRect:bounds];
            break;

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

@@ -332,8 +462,8 @@ CPGrooveBorder  = 3;
    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);
 }

@@ -344,49 +474,71 @@ CPGrooveBorder  = 3;
    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);
+    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
+
+    // clip the canvas to the actual content view in order to only display inner shadow
+    CGContextBeginPath(context);
+    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(aRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
+    CGContextClip(context);
+
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextSetStrokeColor(context, [self borderColor]);
+
+    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
+    CGContextSetLineWidth(context, borderWidth);
+    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
+}
+
+
+- (void)_drawNoBorderInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort];

    CGContextSetFillColor(context, [self fillColor]);
    CGContextFillRect(context, aRect);
 }

- (void)_drawLineBorderInRect:(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);
-}

@end

 var CPBoxTypeKey          = @"CPBoxTypeKey",
    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
-    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
-    CPBoxFillColorKey     = @"CPBoxFillColorKey",
-    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
-    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
+    CPBoxTitle            = @"CPBoxTitle",
+    CPBoxTitlePosition    = @"CPBoxTitlePosition",
+    CPBoxTitleView        = @"CPBoxTitleView";

@implementation CPBox (CPCoding)

@@ -399,18 +551,16 @@ 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];

        _contentView   = [self subviews][0];

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

    return self;
@@ -422,14 +572,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 encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
+    [aCoder encodeObject:_title forKey:CPBoxTitle];
+    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
+    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
 }

@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
+ (id)themeAttributes
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
-                                                    pathForResource:"browser-leaf-highlighted.png"]
-                                              size:CGSizeMake(9,9)];
+    return [CPDictionary dictionaryWithJSObject:{
+        @"image-control-resize": [CPNull null],
+        @"image-control-leaf": [CPNull null],
+        @"image-control-leaf-pressed": [CPNull null]
+    }];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -258,7 +259,7 @@
        var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
            view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];

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

        [column setDataView:view];
        [column setResizingMask:CPTableColumnNoResizing];
@@ -276,8 +277,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];
@@ -704,8 +705,6 @@
@end


-var _CPBrowserResizeControlBackgroundImage = nil;
-
@implementation _CPBrowserResizeControl : CPView
 {
    CGPoint     _mouseDownX;
@@ -714,22 +713,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;
 }
@@ -819,13 +810,13 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    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--)
@@ -901,6 +892,12 @@ var _CPBrowserResizeControlBackgroundImage = nil;
    [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
 }

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

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

 - (void)encodeWithCoder:(CPCoder)aCoder
@@ -25,24 +25,26 @@

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

 /* @group CPBezelStyle */

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


@@ -78,7 +80,7 @@ var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonSt
                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];


-CPButtonDefaultHeight = 24.0;
+CPButtonDefaultHeight = 25.0;
 CPButtonImageOffset   = 3.0;

 /*!
@@ -111,6 +113,8 @@ CPButtonImageOffset   = 3.0;
    CPTimer             _continuousTimer;
    float               _periodicDelay;
    float               _periodicInterval;
+
+    BOOL                _isTracking;
 }

 + (id)buttonWithTitle:(CPString)aTitle
@@ -141,9 +145,9 @@ CPButtonImageOffset   = 3.0;
 }

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

        [self setBezelStyle:CPRoundRectBezelStyle];
        [self setBordered:YES];
@@ -176,11 +180,13 @@ CPButtonImageOffset   = 3.0;
    // Continuous button defaults.
    _periodicInterval   = 0.05;
    _periodicDelay      = 0.5;
+
+    [self setButtonType:CPMomentaryPushInButton];
 }

 // Setting the state
 /*!
-	Returns a Boolean value indicating whether the button allows a mixed state.
+    Returns a Boolean value indicating whether the button allows a mixed state.
    @return \c YES if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
@@ -206,24 +212,20 @@ CPButtonImageOffset   = 3.0;
 }

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

@@ -231,24 +233,35 @@ CPButtonImageOffset   = 3.0;

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

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

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

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

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

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

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

    _showsStateBy = aMask;

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

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

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

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

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

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

        case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
@@ -494,20 +520,43 @@ CPButtonImageOffset   = 3.0;

 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
-    [self highlight:YES];
+    _isTracking = YES;

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

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

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

 - (void)invalidateTimers
@@ -529,35 +578,18 @@ CPButtonImageOffset   = 3.0;
 {
    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];

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

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

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

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

 - (CGSize)_minimumFrameSize
@@ -641,8 +673,51 @@ CPButtonImageOffset   = 3.0;

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

        [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
@@ -741,9 +816,51 @@ CPButtonImageOffset   = 3.0;
        return NO;

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

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

@implementation CPButton (NS)
@@ -784,7 +901,9 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
    CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
    CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
-    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey";
+    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey",
+    CPButtonHighlightsByKey             = @"CPButtonHighlightsByKey",
+    CPButtonShowsStateByKey             = @"CPButtonShowsStateByKey";

@implementation CPButton (CPCoding)

@@ -802,9 +921,20 @@ var CPButtonImageKey                    = @"CPButtonImageKey",

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

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

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

@@ -843,6 +973,9 @@ var CPButtonImageKey                    = @"CPButtonImageKey",

    [aCoder encodeBool:_allowsMixedState forKey:CPButtonAllowsMixedStateKey];

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

@@ -857,5 +990,5 @@ var CPButtonImageKey                    = @"CPButtonImageKey",

@end

-@import "CPCheckBox.j"
-@import "CPRadio.j"
+//@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];
@@ -55,8 +81,24 @@

 + (id)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 [CPDictionary dictionaryWithObjects:[   CGInsetMake(0.0, 0.0, 0.0, 0.0),
+                                                   CGSizeMakeZero(),
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [CPNull null],
+                                                   [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",
+                                                   @"button-image-plus",
+                                                   @"button-image-minus",
+                                                   @"button-image-action"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -94,54 +94,48 @@ CPCheckBoxImageOffset = 4.0;
    [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
 }

+- (CPImage)image
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (CPImage)alternateImage
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    var startedTracking = [super startTrackingAt:aPoint];
+    [self highlight:YES];
+    return startedTracking;
+}
+
@end

@implementation _CPCheckBoxValueBinder : CPBinder
 {
 }

- (void)setValueFor:(CPString)theBinding
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
 {
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
+    [super _updatePlaceholdersWithOptions:options];

-    if (isPlaceholder)
-    {
-        switch (newValue)
-        {
-            case CPMultipleValuesMarker:
-                newValue = CPMixedState;
-                break;
+    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
+}

-            case CPNoSelectionMarker:
-                newValue = CPOffState;
-                break;
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setAllowsMixedState:(aValue === CPMixedState)];
+    [_source setState:aValue];
+}

-            case CPNotApplicableMarker:
-                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-                    [CPException raise:CPGenericException reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
-
-                newValue = CPOffState;
-                break;
-        }
-
-        if (newValue === CPMixedState)
-        {
-            [_source setAllowsMixedState:YES];
-        }
-        else
-        {
-            // Cocoa will always set allowsMixedState to NO
-            // This behavior will be fine for Cappuccino as well if we (like Cocoa)
-            // default the CPConditionallySetsEnabledBindingOption to YES
-            [_source setAllowsMixedState:NO];
-        }
-    }
-
-    [_source setState:newValue];
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setState:aValue];
 }

@end
@@ -22,6 +22,7 @@

@import "CPView.j"

+@class CPScrollView

 /*!
    @ingroup appkit
@@ -26,8 +26,12 @@
@import <Foundation/CPKeyedArchiver.j>
@import <Foundation/CPKeyedUnarchiver.j>

-@import "CPView.j"
@import "CPCollectionViewItem.j"
+@import "CPCompatibility.j"
+@import "CPPasteboard.j"
+@import "CPView.j"
+
+@class CPClipView


 /*!
@@ -40,23 +44,23 @@

    @par Delegate Methods

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

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

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

-    @delegate -(CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
+    @delegate - (CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
    Invoked to obtain the data types supported by the specified indices for placement on the pasteboard.
    @param collectionView the collection view the items reside in
    @param indices the indices to obtain drag types
@@ -242,13 +246,15 @@
    Sets the content of the collection view to the content in \c anArray.
    This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.
    It's the responsibility of your custom collection view item to interpret the object.
-    @param anArray the content array
+
+    If the new content array is smaller than the previous one, note that [receiver selectionIndexes] may
+    refer to out of range indices. \c selectionIndexes is not changed as a result of calling the
+    \c setContent: method.
+
+    @param anArray a content array
 */
 - (void)setContent:(CPArray)anArray
 {
-    // reset the _selectionIndexes
-    [self setSelectionIndexes:[CPIndexSet indexSet]];
-
    _content = anArray;

    [self reloadContent];
@@ -284,9 +290,11 @@

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

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

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

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

    _selectionIndexes = anIndexSet;

    var index = CPNotFound;

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

    var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
@@ -401,7 +413,8 @@
    }

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

    [self tile];
@@ -473,7 +486,7 @@
    }

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

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

@@ -636,9 +651,9 @@

    if (index >= 0 && index < _items.length)
    {
-        if (_allowsMultipleSelection && ([anEvent modifierFlags] & CPCommandKeyMask || [anEvent modifierFlags] & CPShiftKeyMask))
+        if (_allowsMultipleSelection && ([anEvent modifierFlags] & CPPlatformActionKeyMask || [anEvent modifierFlags] & CPShiftKeyMask))
        {
-            if ([anEvent modifierFlags] & CPCommandKeyMask)
+            if ([anEvent modifierFlags] & CPPlatformActionKeyMask)
            {
                var indexes = [_selectionIndexes copy];

@@ -665,6 +680,13 @@
            indexes = [CPIndexSet indexSetWithIndex:index];

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

 - (void)mouseDragged:(CPEvent)anEvent
 {
+    // Don't crash if we never registered the intial click.
+    if (!_mouseDownEvent)
+        return;
+
    var locationInWindow = [anEvent locationInWindow],
        mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];

@@ -965,14 +991,15 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 {
    [super awakeFromCib];

-    if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
+    var prototypeView = [_itemPrototype view];
+    if (prototypeView && (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero())))
    {
        var item = _itemPrototype;

        if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
-            _minItemSize = [[item view] frameSize];
+            _minItemSize = [prototypeView frameSize];
        else if (CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
-            _maxItemSize = [[item view] frameSize];
+            _maxItemSize = [prototypeView frameSize];
    }
 }

@@ -989,11 +1016,11 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK

        _itemSize = CGSizeMakeZero();

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

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

        _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];

@@ -21,6 +21,7 @@
 */

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

@import "CGColor.j"

@@ -28,6 +29,18 @@
@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,
    _greenComponent      = 1,
    _blueComponent       = 2,
@@ -54,6 +67,8 @@ var cachedBlackColor,
    cachedShadowColor,
    cachedClearColor;

+/// @endcond
+
 /*!
    @ingroup appkit

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

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

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

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

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

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

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

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

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

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

    return self;
 }

+- (void)_initCSSStringFromComponents
+{
+    var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+    _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+        parseInt(_components[0] * 255.0) + ", " +
+        parseInt(_components[1] * 255.0) + ", " +
+        parseInt(_components[2] * 255.0) +
+        (hasAlpha ?  (", " + _components[3]) : "") + ")";
+}
+
 /* @ignore */
 - (id)_initWithPatternImage:(CPImage)anImage
 {
@@ -532,6 +565,14 @@ var cachedBlackColor,
    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 index values are ordered as:
@@ -633,7 +674,36 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image

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

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

@end

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

@implementation CPColor (CPCoding)

@@ -710,13 +782,12 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
@end


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

-/*!
-    Used for the CPColor \c +colorWithHexString: implementation
-    @ignore
-    @class CPColor
-    @return an array of rgb components
+/*
+    Used for the CPColor +colorWithHexString: implementation.
+    Returns an array of rgb components.
 */
 var hexToRGB = function(hex)
 {
@@ -754,3 +825,551 @@ var byteToHex = function(n)
    return hexCharacters.charAt((n - n % 16) / 16) +
           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:
+            return [CPColor colorWithPatternImage:imageFactory(args[0], args[1], args[2])];
+
+        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]) : 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) === "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,31 @@
 * 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 "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 +57,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 +126,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];
@@ -144,7 +147,7 @@ CPColorPickerViewHeight = 370;
 - (void)setColor:(CPColor)aColor
 {
    _color = aColor;
-    [_previewView setBackgroundColor: _color];
+    [_previewView setBackgroundColor:_color];

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

@@ -248,8 +251,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];
@@ -299,7 +302,7 @@ CPColorPickerViewHeight = 370;
        bounds = [contentView bounds];

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

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

    [previewBox addSubview:_previewView];

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

    [swatchBox addSubview:_swatchView];

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


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

@@ -389,7 +392,7 @@ CPColorPickerViewHeight = 370;
    _action = nil;
    _activePicker = nil;

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

    if (buttonForLater)
        [self _setPicker:buttonForLater];
@@ -407,28 +410,29 @@ CPColorPickerViewHeight = 370;


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

 /* @ignore */
@implementation _CPColorPanelSwatches : CPView
 {
-    CPView[]        _swatches;
+    CPArray         _swatches;
    CPColor         _dragColor;
    CPColorPanel    _colorPanel;
    CPCookie        _swatchCookie;
 }

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

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

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

    var whiteColor = [CPColor whiteColor];

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

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

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

        [view addSubview:fillView];

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

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

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

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

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

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

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

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

 - (void)mouseDragged:(CPEvent)anEvent
@@ -545,10 +549,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
    _dragColor = [[swatch subviews][0] backgroundColor];

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

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

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

    [dragView addSubview:dragFillView];

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

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

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

@end
@@ -591,7 +595,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
    CPColorPanel    _colorPanel;
 }

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

@@ -632,10 +636,10 @@ 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],
+    var dragView = [[CPView alloc] initWithFrame:bounds],
        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];

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

    [dragView addSubview:dragFillView];

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

 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
@@ -24,6 +24,12 @@

@import "CPView.j"

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

 /*!
    @ingroup appkit
@@ -44,10 +50,11 @@
 */
 - (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
 {
-    self = [super init];
-
-    _panel = aPanel;
-    _mask  = aMask;
+    if (self = [super init])
+    {
+        _panel = aPanel;
+        _mask  = aMask;
+    }

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

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

@end
@@ -110,12 +115,12 @@

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

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

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

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

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

    [_pickerView addSubview:_hueSaturationView];
    [_pickerView addSubview:_brightnessSlider];
@@ -223,60 +228,64 @@
    float       _radius;
 }

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

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

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

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

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

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

    return self;
 }

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

- (void)setFrameSize:(CPSize)aSize
+- (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);

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

    _radius = min / 2.0;

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

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

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

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

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

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

    _color = aColor;

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

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

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

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

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

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

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

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

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

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

@end
@@ -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"


@@ -67,13 +67,29 @@ CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;

 CPSOPDisabledFromFileURLs               = 1 << 27;

+// element.style.font can be set for an element not in the DOM.
+CPInputSetFontOutsideOfDOM              = 1 << 28;
+
+// Input elements have 1 px of extra padding on the left regardless of padding setting.
+CPInput1PxLeftPadding                   = 1 << 29;
+CPInputOnInputEventFeature              = 1 << 30;
+
+// 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;
+
 var USER_AGENT                          = "",
    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = 0;
+    PLATFORM_FEATURES                   = 0,
+    PLATFORM_BUGS                       = 0,
+    PLATFORM_STYLE_JS_PROPERTIES        = {};

 // default these features to true

 PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
+PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;

 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
    USER_AGENT = window.navigator.userAgent;
@@ -99,6 +115,9 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;

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

 // WebKit
@@ -135,8 +154,16 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;

+    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
+    if (majorVersion < 537)
+        PLATFORM_FEATURES |= CPInput1PxLeftPadding;
+
    if (USER_AGENT.indexOf("Chrome") === CPNotFound)
        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
+
+    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
+    if (majorVersion > 533)
+        PLATFORM_BUGS |= CPCanvasParentDrawErrorsOnMovementBug;
 }

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

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

 // Feature Specific Checks
@@ -185,6 +215,16 @@ if (typeof document != "undefined")
        PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
    else if (DOMElement.textContent != undefined)
        PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
+
+    var DOMInputElement = document.createElement("input");
+    if ("oninput" in DOMInputElement)
+        PLATFORM_FEATURES |= CPInputOnInputEventFeature;
+    else if (typeof DOMInputElement.setAttribute === "function")
+    {
+        DOMInputElement.setAttribute("oninput", "return;");
+        if (typeof DOMInputElement.oninput === "function")
+            PLATFORM_FEATURES |= CPInputOnInputEventFeature;
+    }
 }

 function CPFeatureIsCompatible(aFeature)
@@ -192,6 +232,11 @@ function CPFeatureIsCompatible(aFeature)
    return PLATFORM_FEATURES & aFeature;
 }

+function CPPlatformHasBug(aBug)
+{
+    return PLATFORM_BUGS & aBug;
+}
+
 function CPBrowserIsEngine(anEngine)
 {
    return PLATFORM_ENGINE === anEngine;
@@ -229,3 +274,106 @@ 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;
+            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();
+}
@@ -22,48 +22,58 @@

 #import "../Foundation/Ref.h"

-@import "../Foundation/CPFormatter.j"
+@import <Foundation/CPFormatter.j>
+@import <Foundation/CPTimer.j>
+
@import "CPFont.j"
@import "CPShadow.j"
@import "CPView.j"
@import "CPKeyValueBinding.j"

-CPLeftTextAlignment             = 0;
-CPRightTextAlignment            = 1;
-CPCenterTextAlignment           = 2;
-CPJustifiedTextAlignment        = 3;
-CPNaturalTextAlignment          = 4;
+@global CPApp

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

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

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

-CPScaleProportionally           = 0;
-CPScaleToFit                    = 1;
-CPScaleNone                     = 2;
+CPTopVerticalTextAlignment    = 1;
+CPCenterVerticalTextAlignment = 2;
+CPBottomVerticalTextAlignment = 3;

-CPNoImage                       = 0;
-CPImageOnly                     = 1;
-CPImageLeft                     = 2;
-CPImageRight                    = 3;
-CPImageBelow                    = 4;
-CPImageAbove                    = 5;
-CPImageOverlaps                 = 6;
+// Deprecated for use with images, use the CPImageScale constants
+CPScaleProportionally = 0;
+CPScaleToFit          = 1;
+CPScaleNone           = 2;

-CPOnState                       = 1;
-CPOffState                      = 0;
-CPMixedState                    = -1;
+CPImageScaleProportionallyDown     = 0;
+CPImageScaleAxesIndependently      = 1;
+CPImageScaleNone                   = 2;
+CPImageScaleProportionallyUpOrDown = 3;
+
+CPNoImage       = 0;
+CPImageOnly     = 1;
+CPImageLeft     = 2;
+CPImageRight    = 3;
+CPImageBelow    = 4;
+CPImageAbove    = 5;
+CPImageOverlaps = 6;
+
+CPOnState    = 1;
+CPOffState   = 0;
+CPMixedState = -1;

 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -106,7 +116,7 @@ var CPControlBlackColor = [CPColor blackColor];
                                                CPTopVerticalTextAlignment,
                                                CPLineBreakByClipping,
                                                [CPColor blackColor],
-                                                [CPFont systemFontOfSize:12.0],
+                                                [CPFont systemFontOfSize:CPFontCurrentSystemSize],
                                                [CPNull null],
                                                _CGSizeMakeZero(),
                                                CPImageLeft,
@@ -128,18 +138,18 @@ var CPControlBlackColor = [CPColor blackColor];

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

-        [self exposeBinding:@"enabled"];
-    }
+    [self exposeBinding:@"value"];
+    [self exposeBinding:@"objectValue"];
+    [self exposeBinding:@"stringValue"];
+    [self exposeBinding:@"integerValue"];
+    [self exposeBinding:@"intValue"];
+    [self exposeBinding:@"doubleValue"];
+    [self exposeBinding:@"floatValue"];
+
+    [self exposeBinding:@"enabled"];
 }

 + (Class)_binderClassForBinding:(CPString)theBinding
@@ -385,7 +395,18 @@ var CPControlBlackColor = [CPColor blackColor];

 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    [self highlight:NO];
+    if (mouseIsUp)
+        [self highlight:NO];
+    else
+        [self highlight:YES];
+}
+
+/*!
+    Enabled controls accept first mouse by default.
+*/
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return [self isEnabled];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -507,7 +528,7 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (CPString)stringValue
 {
-    if (_formatter && _value !== undefined && _value !== nil)
+    if (_formatter && _value !== undefined)
    {
        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];

@@ -526,7 +547,7 @@ var CPControlBlackColor = [CPColor blackColor];
    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
    if (aString === nil || aString === undefined)
    {
-        CPLog.warn("nil sent to CPControl -setStringValue");
+        CPLog.warn("nil or undefined sent to CPControl -setStringValue");
        return;
    }

@@ -784,9 +805,10 @@ var CPControlBlackColor = [CPColor blackColor];
    Sets the image scaling of the control.

    <pre>
-    CPScaleProportionally
-    CPScaleToFit
-    CPScaleNone
+    CPImageScaleProportionallyDown
+    CPImageScaleAxesIndependently
+    CPImageScaleNone
+    CPImageScaleProportionallyUpOrDown
    </pre>
 */
 - (void)setImageScaling:(CPImageScaling)scaling
@@ -857,17 +879,16 @@ var CPControlBlackColor = [CPColor blackColor];

@end

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

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

@implementation CPControl (CPCoding)

@@ -890,6 +911,8 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";

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

    return self;
@@ -919,6 +942,9 @@ var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
        [aCoder encodeObject:_action forKey:CPControlActionKey];

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

@end
@@ -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;
@@ -111,8 +111,12 @@
    for (var i = 0; i < ca.length; i++)
    {
        var c = ca[i];
-        while (c.charAt(0) == ' ') c = c.substring(1, c.length);
-        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
+
+        while (c.charAt(0) == ' ')
+            c = c.substring(1, c.length);
+
+        if (c.indexOf(nameEQ) == 0)
+            return c.substring(nameEQ.length, c.length);
    }
 #endif
    return "";
@@ -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
@@ -121,6 +145,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 +155,38 @@ 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];
+            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.cur), %@", themeResourcePath, cursorName, 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 +204,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 +259,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];
@@ -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
@@ -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."];
@@ -922,9 +926,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
    return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-}
+};

 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
    return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-}
+};
@@ -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];
 }
@@ -339,10 +343,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,16 @@
 * 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"

+@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 +66,7 @@ var CPDragServerSource             = nil,
 - (unsigned)draggingSourceOperationMask
 */

- (CPPoint)draggingLocation
+- (CGPoint)draggingLocation
 {
    return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -461,6 +455,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
    else if (type === CPKeyDown)
    {
        var characters = [anEvent characters];
+
        if (characters === CPEscapeFunctionKey)
        {
            _dragOperation = CPDragOperationNone;
@@ -477,7 +472,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];
+        untilDate:nil inMode:0 dequeue:YES];
 }

@end
@@ -0,0 +1,30 @@
+/*
+ * CPDragServer_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
+ */
+
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
+CPDragOperationEvery    = -1;
@@ -20,166 +20,24 @@
 * 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,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]");
+    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
+    _CPEventStartupMilliseconds         = new Date().getTime();

 /*!
    @ingroup appkit
@@ -189,7 +47,7 @@ var _CPEventPeriodicEventPeriod         = 0,
@implementation CPEvent : CPObject
 {
    CPEventType         _type;
-    CPPoint             _location;
+    CGPoint             _location;
    unsigned            _modifierFlags;
    CPTimeInterval      _timestamp;
    CPGraphicsContext   _context;
@@ -203,12 +61,23 @@ var _CPEventPeriodicEventPeriod         = 0,
    BOOL                _isARepeat;
    unsigned            _keyCode;
    DOMEvent            _DOMEvent;
+    int                 _data1;
+    int                 _data2;
+    short               _subtype;

    float               _deltaX;
    float               _deltaY;
    float               _deltaZ;
 }

+/*!
+    Returns the current time in fractional seconds since startup.
+*/
+ (CPTimeInterval)currentTimestamp
+{
+    return (new Date().getTime() - _CPEventStartupMilliseconds) / 1000;
+}
+
 /*!
    Creates a new keyboard event.

@@ -297,13 +166,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;
@@ -317,13 +186,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;
@@ -344,7 +213,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
    if (self = [self _initWithType:anEventType])
    {
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
        _modifierFlags = modifierFlags;
        _timestamp = aTimestamp;
        _context = aGraphicsContext;
@@ -389,7 +258,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }

 /*!
-    Returns the time the event occurred.
+    Returns the time the event occurred in seconds since startup.
 */
 - (CPTimeInterval)timestamp
 {
@@ -508,6 +377,16 @@ var _CPEventPeriodicEventPeriod         = 0,
    return _DOMEvent;
 }

+- (int)data1
+{
+    return _data1;
+}
+
+- (int)data2
+{
+    return _data2;
+}
+
 // Getting Scroll Wheel Event Information
 /*!
    Returns the change in the x-axis for a mouse event.
@@ -571,10 +450,12 @@ var _CPEventPeriodicEventPeriod         = 0,
    if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
        return YES;

-    // Cocoa does not consider space, backspace, or escape a key equivalent
-    // if the first responder is a text field (presumably a subclass of NSText).
+    // Cocoa allows almost any key as a key equivalent unless the first responder is a
+    // text field (presumably a subclass of NSText.)
    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];

+    // Some keys are accepted as key equivalents even if the first responder is a text
+    // field.
    for (var i = 0; i < characterCount; i++)
    {
        var c = _characters.charAt(i);
@@ -583,18 +464,13 @@ var _CPEventPeriodicEventPeriod         = 0,
            c === CPEnterCharacter ||
            c === CPNewlineCharacter ||
            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey ||
-            (!firstResponderIsText &&
-                (c === CPSpaceFunctionKey ||
-                 c === CPDeleteCharacter ||
-                 c === CPBackspaceCharacter)))
+            c === CPEscapeFunctionKey)
        {
            return YES;
        }
    }

-    // FIXME: More cases?
-    return NO;
+    return !firstResponderIsText;
 }

 /*!
@@ -624,11 +500,34 @@ var _CPEventPeriodicEventPeriod         = 0,
    _CPEventPeriodicEventTimer = nil;
 }

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

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

 var CPEventClass = [CPEvent class];
@@ -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";
@@ -104,10 +104,10 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (void)setFlashVars:(CPDictionary)aDictionary
 {
    var varString = @"",
-        enumerator = [aDictionary keyEnumerator];
+        enumerator = [aDictionary keyEnumerator],
+        key;

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

    if (!_params)
@@ -146,7 +146,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
        var enumerator = [_params keyEnumerator],
            key;

-        while (_DOMObjectElement && (key = [enumerator nextObject]))
+        while (_DOMObjectElement && (key = [enumerator nextObject]) !== nil)
        {
            var param = document.createElement(@"param");
            param.name = key;
@@ -178,7 +178,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
        paramEnumerator = [_params keyEnumerator],
        key;

-    while (key = [paramEnumerator nextObject])
+    while ((key = [paramEnumerator nextObject]) !== nil)
        paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];

    _DOMObjectElement = document.createElement(@"object");
@@ -28,46 +28,85 @@
 CPFontDefaultSystemFontFace = @"Arial, sans-serif";
 CPFontDefaultSystemFontSize = 12;

-var _CPFonts                        = {},
-    _CPFontSystemFontFace           = CPFontDefaultSystemFontFace,
-    _CPFontSystemFontSize           = 12,
-    _CPFontFallbackFaces            = CPFontDefaultSystemFontFace.split(", "),
-    _CPFontStripRegExp              = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
+/*!
+    To create a font of a size that will dynamically reflect the current
+    system font size, use this for the size argument.
+*/
+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");


+#define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
 #define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
-#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFonts[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
+#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFontCache[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
+#define _CPUserFont(aName, aSize, isBold, isItalic)  _CPCachedFont(aName, aSize, isBold, isItalic) || [[CPFont alloc] _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO]
+
+#define _CPSystemFontCacheKey(aSize, isBold)  (String(aSize) + (isBold ? "b" : ""))
+#define _CPCachedSystemFont(aSize, isBold)  _CPSystemFontCache[_CPSystemFontCacheKey(aSize, isBold)]
+#define _CPSystemFont(aSize, isBold)  (_CPCachedSystemFont(aSize, isBold) || [[CPFont alloc] _initWithName:_CPFontSystemFacePlaceholder size:aSize bold:isBold italic:NO system:YES])

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

-    The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
-    The primary method for getting a particular font is through one of the class methods that take
-    a name and/or size as arguments, and return the appropriate CPFont.
+The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
+The primary method for getting a particular font is through one of the class methods that take
+a name and/or size as arguments, and return the appropriate CPFont.

-    By default the system font face/size is Arial 12px, with a fallback to sans-serif. You may
-    configure this at runtime in two ways:
+### System fonts
+When you create a font using \c -systemFontOfSize: or \c -boldSystemFontOfSize:, a proxy font is
+created that always refers to the current system font face and size. By default the system
+font face/size is Arial 12px, with a fallback to sans-serif 12px. You may configure this at
+runtime in two ways:

-    - By sending [CPFont @link CPFont::setSystemFontFace: setSystemFontFace:@endlink] and/or [CPFont @link CPFont::setSystemFontSize: setSystemFontSize:@endlink].
-    - By configuring Info.plist for your application or for AppKit. You can set the font face
-      by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
-      by adding a CPSystemFontSize integer item to the Info.plist.
+- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
+  Note that if you change the system font face or size during runtime, the next time
+  any view using a system font is redrawn, it will show the new font.
+- By configuring Info.plist for your application or for AppKit. You can set the font face
+  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
+  by adding a CPSystemFontSize integer item to the Info.plist.

-    Note that in either case, you can specify a comma-delimited list of fonts as the font face.
-    The browser will use the first available font in the list. CPFont always ensures that Arial
-    and sans-serif are in the generated CSS string, so there is no need to add them to the end
-    of your font list.
+Note that in either case, you can specify a comma-delimited list of fonts as the font face.
+Do not quote enclose font faces that contain spaces, that is done automatically when a CSS
+representation of a font is requested.

-    If you are using nib2cib, you should use the second method (using Info.plist),
-    and be sure to run nib2cib again any time you modify the CPSystemFontFace or CPSystemFontSize items.
-    For example, you might add this to your application's Info.plist to set the system font to Lucida Grande,
-    with an automatic fallback to Arial or sans-serif:
+The browser will use the first available font in the list you supply. CPFont always ensures
+that Arial and sans-serif are in the CSS representation of a font as a fallback, so there is
+no need to add them to the end of your font list.

-    @code
+### nib2cib conversion
+Fonts are converted by nib2cib according to the following algorithm:
+
+- If the font family is Lucida Grande, then a system font will be created.
+- If the font is Lucida Grande 13 (plain), the "default" font will be used at runtime.
+  The default font is taken from the "font" theme attribute if one exists,
+  otherwise from the current system font face and size.
+- Lucida Grande of any size other than 13 will retain its size.
+- Fonts using any family other than Lucida Grande will be used as is, including the size.
+
+### Using custom web fonts
+The configurability of CPFont makes it easy to use a custom web font as the system font.
+For example, if you want to use the google font Asap as the system font, you would do the
+following:
+
+- Add a <link> to the <head> of index-debug.html and index.html:
+@code
+<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
+@endcode
+- Specify Asap as the system font in Info.plist by adding the following item:
+@code
 <key>CPSystemFontFace</key>
-<string>Lucida Grande</string>
-	@endcode
+<string>Asap</string>
+@endcode
 */
@implementation CPFont : CPObject
 {
@@ -78,19 +117,23 @@ var _CPFonts                        = {},
    float       _lineHeight;
    BOOL        _isBold         @accessors(readonly, getter=isBold);
    BOOL        _isItalic       @accessors(readonly, getter=isItalic);
+    BOOL        _isSystem       @accessors(readonly, getter=isSystem);

    CPString    _cssString;
 }

 + (void)initialize
 {
+    if (self !== [CPFont class])
+        return;
+
    var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];

    if (!systemFontFace)
        systemFontFace = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontFace"];

    if (systemFontFace)
-        [self setSystemFontFace:systemFontFace];
+        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);

    var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];

@@ -114,7 +157,13 @@ var _CPFonts                        = {},
 */
 + (CPString)setSystemFontFace:(CPString)aFace
 {
-    _CPFontSystemFontFace = _CPFontNormalizedNames(aFace);
+    var normalizedFaces = _CPFontNormalizedNames(aFace);
+
+    if (normalizedFaces === _CPFontSystemFontFace)
+        return;
+
+    [self _invalidateSystemFontCache]
+    _CPFontSystemFontFace = aFace;
 }

 /*!
@@ -125,106 +174,156 @@ var _CPFonts                        = {},
    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.
 */
 + (float)setSystemFontSize:(float)size
 {
-    if (size > 0)
+    if (size > 0 && size !== _CPFontSystemFontSize)
+    {
+        [self _invalidateSystemFontCache];
        _CPFontSystemFontSize = size;
+    }
+}
+
+ (void)_invalidateSystemFontCache
+{
+    var systemSize = String(_CPFontSystemFontSize),
+        currentSize = String(CPFontCurrentSystemSize);
+
+    for (key in _CPSystemFontCache)
+    {
+        if (_CPSystemFontCache.hasOwnProperty(key) &&
+            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
+        {
+            delete _CPSystemFontCache[key];
+        }
+    }
 }

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

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

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

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

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

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

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

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

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

    return self;
@@ -235,10 +334,12 @@ var _CPFonts                        = {},
 */
 - (float)ascender
 {
-    if (!_ascender)
-        [self _getMetrics];
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;

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

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

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

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

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

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

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

 /*!
@@ -287,9 +394,17 @@ var _CPFonts                        = {},
 */
 - (CPString)familyName
 {
+    if (_isSystem)
+        return _CPFontSystemFontFace;
+
    return _name;
 }

+- (BOOL)isSystemSize
+{
+    return _size <= 0;
+}
+
 - (BOOL)isEqual:(id)anObject
 {
    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
@@ -302,7 +417,7 @@ var _CPFonts                        = {},

 - (id)copy
 {
-    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic];
+    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
 }

 - (void)_getMetrics
@@ -319,7 +434,8 @@ var _CPFonts                        = {},
 var CPFontNameKey     = @"CPFontNameKey",
    CPFontSizeKey     = @"CPFontSizeKey",
    CPFontIsBoldKey   = @"CPFontIsBoldKey",
-    CPFontIsItalicKey = @"CPFontIsItalicKey";
+    CPFontIsItalicKey = @"CPFontIsItalicKey",
+    CPFontIsSystemKey = @"CPFontIsSystemKey";

@implementation CPFont (CPCoding)

@@ -333,9 +449,10 @@ var CPFontNameKey     = @"CPFontNameKey",
    var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
        size = [aCoder decodeFloatForKey:CPFontSizeKey],
        isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
-        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey];
+        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey],
+        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];

-    return [self _initWithName:fontName size:size bold:isBold italic:isItalic];
+    return [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
 }

 /*!
@@ -348,6 +465,7 @@ var CPFontNameKey     = @"CPFontNameKey",
    [aCoder encodeFloat:_size forKey:CPFontSizeKey];
    [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
    [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
+    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
 }

@end
@@ -356,7 +474,7 @@ var CPFontNameKey     = @"CPFontNameKey",
 // aName must be normalized
 var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
 {
-    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + aSize + "px ";
+    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";

    return properties + _CPFontConcatNameWithFallback(aName);
 };
@@ -24,6 +24,21 @@

@import "CPFont.j"

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

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

 // Getting the Shared Font Manager
@@ -59,6 +84,16 @@ var CPSharedFontManager     = nil,
    CPFontManagerFactory = aClass;
 }

+- (id)init
+{
+    if (self = [super init])
+    {
+        _action = @selector(changeFont:);
+    }
+
+    return self;
+}
+
 /*!
    Returns an array of the available fonts
 */
@@ -66,6 +101,9 @@ var CPSharedFontManager     = nil,
 {
    if (!_availableFonts)
    {
+        _availableFonts = [];
+
+#if PLATFORM(DOM)
        _CPFontDetectSpan = document.createElement("span");
        _CPFontDetectSpan.fontSize = "24px";
        _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -77,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;
 }
@@ -97,43 +138,123 @@ var CPSharedFontManager     = nil,
    return _CPFontDetectFontAvailable(aFontName);
 }

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

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

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

 var _CPFontDetectCache = {};

@@ -165,7 +286,7 @@ var _CPFontDetectCompareFonts = function(fontA, fontB)
        bHeight = _CPFontDetectSpan.offsetHeight;

    return (a.w != bWidth || a.h != bHeight);
-}
+};

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

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

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

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

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


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

 /*!
    @ingroup appkit
@@ -52,6 +53,28 @@ 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
@@ -86,4 +109,27 @@ var CPGraphicsContextCurrent = nil;
    return _graphicsPort;
 }

+/*!
+    (Not implemented. Always returns Cappuccino's default, `YES`.)
+
+    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
+    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
+
+    Note: Cappuccino is flipped by default.
+*/
+- (BOOL)isFlipped
+{
+    return YES;
+}
+
+- (void)saveGraphicsState
+{
+    CGContextSaveGState(_graphicsPort);
+}
+
+- (void)restoreGraphicsState
+{
+    CGContextRestoreGState(_graphicsPort);
+}
+
@end
@@ -25,9 +25,10 @@
@import <Foundation/CPObject.j>
@import <Foundation/CPRunLoop.j>
@import <Foundation/CPString.j>
+@import <Foundation/CPData.j>

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

 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -44,20 +45,50 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";

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

 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);

-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)
@@ -117,7 +148,7 @@ function CPAppKitImage(aFilename, aSize)

    if (self)
    {
-        _size = CPSizeCreateCopy(aSize);
+        _size = CGSizeCreateCopy(aSize);
        _filename = aFilename;
        _loadStatus = CPImageLoadStatusInitialized;
    }
@@ -157,6 +188,20 @@ function CPAppKitImage(aFilename, aSize)
    return self;
 }

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

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

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

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

    _image.src = _filename;

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

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

-
-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
+@global CPImagesPboardType
+@global appkit_tag_dom_elements

 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
@@ -41,15 +39,7 @@ CPImageAlignBottomLeft  = 6;
 CPImageAlignBottomRight = 7;
 CPImageAlignRight       = 8;

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

 /*!
    @ingroup appkit
@@ -72,11 +62,22 @@ var LEFT_SHADOW_INSET       = 3.0,

 + (void)initialize
 {
+    if (self !== [CPImageView class])
+        return;
+
    var bundle = [CPBundle bundleForClass:[CPView class]];

    CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }

+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding === CPValueBinding || theBinding === CPValueURLBinding || theBinding === CPValuePathBinding || theBinding === CPDataBinding)
+        return [CPImageViewValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
@@ -240,7 +241,7 @@ var LEFT_SHADOW_INSET       = 3.0,
    [super setImageScaling:anImageScaling];

 #if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
    {
        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
    }
@@ -297,19 +298,19 @@ var LEFT_SHADOW_INSET       = 3.0,
        imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
        x = 0.0,
        y = 0.0,
-        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
-        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
+        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
+        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
        boundsWidth = _CGRectGetWidth(bounds),
        boundsHeight = _CGRectGetHeight(bounds),
        width = boundsWidth - insetWidth,
        height = boundsHeight - insetHeight;

-    if (imageScaling === CPScaleToFit)
+    if (imageScaling === CPImageScaleAxesIndependently)
    {
-#if PLATFORM(DOM)
-        _DOMImageElement.width = ROUND(width);
-        _DOMImageElement.height = ROUND(height);
-#endif
+        #if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(width);
+            _DOMImageElement.height = ROUND(height);
+        #endif
    }
    else
    {
@@ -318,17 +319,19 @@ var LEFT_SHADOW_INSET       = 3.0,
        if (size.width == -1 && size.height == -1)
            return;

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

@@ -336,26 +339,19 @@ var LEFT_SHADOW_INSET       = 3.0,
                    width = height * imageRatio;
                else
                    height = width / imageRatio;
-            }
+                break;

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

        var x,
            y;
@@ -406,7 +402,7 @@ var LEFT_SHADOW_INSET       = 3.0,
    _imageRect = _CGRectMake(x, y, width, height);

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

 - (void)mouseDown:(CPEvent)anEvent
@@ -457,6 +453,39 @@ var LEFT_SHADOW_INSET       = 3.0,

@end

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

    self = [super initWithCoder:aCoder];
@@ -496,7 +528,7 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
        [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
        [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];

-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
            [self setEditable:YES];

        [self setNeedsLayout];
@@ -21,13 +21,15 @@
 */

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

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

 CPStandardKeyBindings = {
    @"@.": @"cancelOperation:",

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

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

    [self createKeyBindingsFromJSObject:CPStandardKeyBindings];
@@ -27,6 +27,7 @@
@import <Foundation/CPArray.j>
@import <Foundation/CPDictionary.j>
@import <Foundation/CPValueTransformer.j>
+@import <Foundation/CPKeyValueObserving.j>


 var exposedBindingsMap = [CPDictionary new],
@@ -41,6 +42,7 @@ var CPBindingOperationAnd = 0,
    id              _source;

    JSObject        _suppressedNotifications;
+    JSObject        _placeholderForMarker;
 }

 + (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
@@ -125,10 +127,13 @@ var CPBindingOperationAnd = 0,
        _source = aSource;
        _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
        _suppressedNotifications = {};
+        _placeholderForMarker = {};

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

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

        var bindings = [bindingsMap objectForKey:[_source UID]];
@@ -145,15 +150,40 @@ var CPBindingOperationAnd = 0,
    return self;
 }

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

-    newValue = [self transformValue:newValue withOptions:options];
-    [_source setValue:newValue forKey:aBinding];
+    if (isPlaceholder)
+    {
+        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        {
+           [CPException raise:CPGenericException
+                       reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + newValue];
+        }
+
+        var value = [self _placeholderForMarker:newValue];
+        [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
+    }
+    else
+    {
+        var value = [self transformValue:newValue withOptions:options];
+        [self setValue:value forBinding:theBinding];
+    }
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setValue:aValue forKey:aBinding];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setValue:aValue forKey:aBinding];
 }

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

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

 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -204,14 +242,13 @@ var CPBindingOperationAnd = 0,
    if (valueTransformer)
        aValue = [valueTransformer transformedValue:aValue];

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

    return aValue;
 }

- (id)reverseTransformValue:(id)aValue withOptions: (CPDictionary)options
+- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
 {
    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
        valueTransformer;
@@ -271,6 +308,47 @@ var CPBindingOperationAnd = 0,
    delete objectSuppressions[aKeyPath];
 }

+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    var count = [CPBinderPlaceholderMarkers count];
+
+    while (count--)
+    {
+        var marker = CPBinderPlaceholderMarkers[count],
+            optionName = CPBinderPlaceholderOptions[count],
+            isExplicit = [options containsKey:optionName],
+            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
+        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
+    }
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
+{
+    [self _updatePlaceholdersWithOptions:options];
+}
+
+- (void)_placeholderForMarker:aMarker
+{
+    var placeholder = _placeholderForMarker[aMarker];
+    if (placeholder)
+        return placeholder['value'];
+    return nil;
+}
+
+- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
+{
+    if (isDefault)
+    {
+        var existingPlaceholder = _placeholderForMarker[aMarker];
+
+        // Don't overwrite an explicitly set placeholder with a default.
+        if (existingPlaceholder && !existingPlaceholder['isDefault'])
+            return;
+    }
+
+    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
+}
+
@end

@implementation CPObject (KeyValueBindingCreation)
@@ -311,10 +389,10 @@ var CPBindingOperationAnd = 0,
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
    if (!anObject || !aKeyPath)
-        return CPLog.error("Invalid object or path on "+self+" for "+aBinding);
+        return CPLog.error("Invalid object or path on " + self + " for " + aBinding);

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

    var binderClass = [[self class] _binderClassForBinding:aBinding];

@@ -404,7 +482,7 @@ var CPBindingOperationAnd = 0,

@end

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

    return !operation;
-}
+};

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

    [invocation invoke];
-}
+};

 // Keys in options dictionary

@@ -479,15 +557,37 @@ CPNotApplicableMarker   = @"CPNotApplicableMarker";
 CPNullMarker            = @"CPNullMarker";

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

 //Binding options constants
 CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
@@ -518,4 +618,8 @@ CPValueTransformerBindingOption                     = @"CPValueTransformer";
 CPIsControllerMarker = function(/*id*/anObject)
 {
    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
-}
+};
+
+var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
+    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
+
@@ -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,56 +57,23 @@ var _CPLevelIndicatorBezelColor = nil,
    BOOL                _isTracking;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    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
-    ]];
+    return "level-indicator";
 }

+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjectsAndKeys:[CPNull null], @"bezel-color",
+                                                      [CPNull null], @"color-empty",
+                                                      [CPNull null], @"color-normal",
+                                                      [CPNull null], @"color-warning",
+                                                      [CPNull null], @"color-critical",
+                                                      1.0,           @"spacing"];
+}
+
+
+
 - (id)initWithFrame:(CGRect)aFrame
 {
    self = [super initWithFrame:aFrame];
@@ -139,20 +101,20 @@ var _CPLevelIndicatorBezelColor = nil,
                                           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++)
    {
@@ -160,7 +122,7 @@ var _CPLevelIndicatorBezelColor = nil,
                                               positioned:CPWindowAbove
                          relativeToEphemeralSubviewNamed:bezelView];

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

@@ -191,11 +153,12 @@ var _CPLevelIndicatorBezelColor = nil,
            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.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;
@@ -223,7 +186,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])
@@ -253,7 +216,7 @@ var _CPLevelIndicatorBezelColor = nil,

        var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
            bounds = [self bounds],
-            oldValue = [self doubleValue];
+            oldValue = [self doubleValue],
            newValue = oldValue;

        // Moving the mouse outside of the widget to the left sets it
@@ -25,12 +25,9 @@
@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPString.j>

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

+@global CPApp

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

 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";

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

@@ -80,7 +73,7 @@ var _CPMenuBarVisible               = NO,

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

    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
@@ -109,8 +102,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"]];
@@ -178,8 +171,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"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
    }

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

    else if (!textShadowColor && !titleShadowColor)
    {
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[[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"];
+        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];

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

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

    if (_CPMenuBarSharedWindow)
    {
@@ -230,14 +223,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
    if (self === [CPApp mainMenu])
-        return MENUBAR_HEIGHT;
+        return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];

    return 0.0;
 }

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

 // Creating a CPMenu Object
@@ -352,8 +345,12 @@ var _CPMenuBarVisible               = NO,
    while (count--)
        [_items[count] setMenu:nil];

-    _items = [CPMutableArray array];
    _highlightedIndex = CPNotFound;
+
+    // Because we are changing _items directly, be sure to notify KVO
+    [self willChangeValueForKey:@"items"];
+    _items = [CPMutableArray array];
+    [self didChangeValueForKey:@"items"];
 }

 /*!
@@ -802,7 +799,7 @@ var _CPMenuBarVisible               = NO,
    [aMenu _menuWillOpen];

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

    var theWindow = [aView window],
        menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
@@ -972,8 +969,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]])
        {
@@ -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:12.0];
-}
-
 + (CPFont)font
 {
-    return _CPMenuBarWindowFont;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
 }

 - (id)init
@@ -52,7 +61,7 @@ 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];

@@ -74,7 +83,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];

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

@@ -119,12 +128,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];
 }
@@ -257,7 +261,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
        items = [_menu itemArray],
        count = items.length;

-    for (index = 0; index < count; ++index)
+    for (var index = 0; index < count; ++index)
    {
        var item = items[index],
            menuItemView = [item _menuItemView];
@@ -316,6 +320,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);
@@ -335,7 +344,7 @@ var _CPMenuBarWindowBackgroundColor = nil,

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

 - (void)tile
@@ -344,7 +353,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 +363,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 +377,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]);
        }
@@ -452,102 +461,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,17 +1,51 @@
+/*
+ * _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


-_CPMenuManagerScrollingStateUp      = -1,
-_CPMenuManagerScrollingStateDown    = 1,
+@global CPApp
+@global CPMenuDidEndTrackingNotification
+@global _CPMenuWindowMenuBarBackgroundStyle
+@global _CPMenuWindowPopUpBackgroundStyle
+
+_CPMenuManagerScrollingStateUp      = -1;
+_CPMenuManagerScrollingStateDown    = 1;
 _CPMenuManagerScrollingStateNone    = 0;

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

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

@@ -26,6 +60,8 @@ var STICKY_TIME_INTERVAL            = 500,

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

 + (_CPMenuManager)sharedMenuManager
@@ -66,7 +102,7 @@ var STICKY_TIME_INTERVAL            = 500,

    CPApp._activeMenu = menu;

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

    _constraintRect = aRect;
@@ -85,13 +121,13 @@ var STICKY_TIME_INTERVAL            = 500,
            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;

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

        if ([activeItem _isMenuBarButton])
            return [self trackMenuBarButtonEvent:anEvent];
    }

-    _hasMouseGoneUpAfterStartedTracking = NO;
+    _mouseWasDragged = NO;

    [self trackEvent:anEvent];
 }
@@ -125,22 +161,10 @@ var STICKY_TIME_INTERVAL            = 500,
        return;
    }

-    if (_keyBuffer)
-    {
-        if (([CPDate date] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
-            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
-
-        if (type === CPPeriodic)
-            return;
-    }
-
    // Periodic events don't have a valid location.
    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];

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

    // Find which menu window the mouse is currently on top of
@@ -152,6 +176,23 @@ var STICKY_TIME_INTERVAL            = 500,
        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;

+    if (_keyBuffer)
+    {
+        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
+            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
+
+        if (type === CPPeriodic)
+            return;
+    }
+
+    // unhighlight when mouse is moved off the menu
+    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
+                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
+        [activeMenu _highlightItemAtIndex:CPNotFound];
+
+    // Remember this for the next periodic event.
+    _lastGlobalLocation = globalLocation;
+
    // If the item isn't enabled its as if we clicked on nothing.
    if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
    {
@@ -161,7 +202,7 @@ var STICKY_TIME_INTERVAL            = 500,

    var mouseOverMenuView = [activeItem view];

-    if (type === CPScrollWheel)
+    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
        [activeMenuContainer scrollByDelta:[anEvent deltaY]];

    if (type === CPPeriodic)
@@ -189,7 +230,7 @@ var STICKY_TIME_INTERVAL            = 500,

        var menuContainerWindow = activeMenuContainer;

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

        [menuContainerWindow
@@ -211,10 +252,14 @@ var STICKY_TIME_INTERVAL            = 500,
            _lastMouseOverMenuView = nil;
        }

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

        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
        {
+            if (type === CPLeftMouseDragged)
+                _mouseWasDragged = YES;
+
            var oldScrollingState = _scrollingState;

            _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
@@ -229,17 +274,35 @@ var STICKY_TIME_INTERVAL            = 500,
        }
        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
        {
-            if (_hasMouseGoneUpAfterStartedTracking)
-            {
-                // Don't close the menu if the current item has a submenu
-                // and did not override it's default action
-                if ([activeItem action] === @selector(submenuAction:))
-                    return;
+            /*
+                There are a few possibilites:

-                [trackingMenu cancelTracking];
+                1. The user clicks and releases without dragging within the sticky time.
+                   This is considered a regular mouse click and not a drag. In this case
+                   we allow the user to track the menu by moving the mouse. The next
+                   mouse up will end tracking.
+
+                2. The user clicks and releases without dragging after the sticky time.
+                   This is considered a drag and release and tracking ends.
+
+                3. The user clicks, drags and then releases. Tracking ends.
+            */
+            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
+            {
+                /*
+                    Close the menu if:
+
+                    1. The mouse was dragged.
+                    2. The mouse is released in the menubar.
+                    3. The current item has a submenu with a custom action.
+                */
+                if (_mouseWasDragged ||
+                    [activeMenuContainer isMenuBar] ||
+                    [activeItem action] !== @selector(submenuAction:))
+                {
+                    [trackingMenu cancelTracking];
+                }
            }
-            else
-                _hasMouseGoneUpAfterStartedTracking = YES;
        }
    }

@@ -252,7 +315,7 @@ var STICKY_TIME_INTERVAL            = 500,
    }

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

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

        [menuContainer orderOut:self];
@@ -452,7 +515,7 @@ var STICKY_TIME_INTERVAL            = 500,
        var iter = [selectorNames objectEnumerator],
            obj;

-        while (obj = [iter nextObject])
+        while ((obj = [iter nextObject]) !== nil)
        {
            var aSelector = CPSelectorFromString(obj);

@@ -464,7 +527,7 @@ var STICKY_TIME_INTERVAL            = 500,
    {
        if (!_keyBuffer)
        {
-            _startTime = [CPDate date];
+            _startTime = [anEvent timestamp];
            _keyBuffer = character;

            [CPEvent stopPeriodicEvents];
@@ -483,7 +546,7 @@ var STICKY_TIME_INTERVAL            = 500,
    var iter = [[menu itemArray] objectEnumerator],
        obj;

-    while (obj = [iter nextObject])
+    while ((obj = [iter nextObject]) !== nil)
    {
        if ([obj isHidden] || ![obj isEnabled])
            continue;
@@ -501,7 +564,7 @@ var STICKY_TIME_INTERVAL            = 500,
        _keyBuffer = Nil;
    }
    else
-        _startTime = [CPDate date];
+        _startTime = [CPEvent currentTimestamp];
 }

 - (void)scrollToBeginningOfDocument:(CPMenu)menu
@@ -529,7 +592,7 @@ var STICKY_TIME_INTERVAL            = 500,
        return;
    }

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

    if (next < [menu numberOfItems])
        [menu _highlightItemAtIndex:next];
@@ -557,7 +620,7 @@ var STICKY_TIME_INTERVAL            = 500,
        return;
    }

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

    if (next < 0)
        [menu _highlightItemAtIndex:0];
@@ -645,8 +708,11 @@ var STICKY_TIME_INTERVAL            = 500,
    var index = menu._highlightedIndex - 1;

    if (index < 0)
+    {
+        if (index != CPNotFound)
+            [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,14 +34,7 @@ _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;
+var STICKY_TIME_INTERVAL        = 500;

 /*
    @ignore
@@ -63,17 +80,6 @@ var STICKY_TIME_INTERVAL        = 500,
    _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();
@@ -92,26 +98,24 @@ 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];
-
-        [self setShadowStyle:CPWindowShadowStyleMenu];
    }

    return self;
@@ -119,7 +123,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
@@ -141,36 +145,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;
    }
@@ -188,12 +166,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
@@ -251,7 +230,9 @@ var STICKY_TIME_INTERVAL        = 500,
    // FIXME: This gets called far too often.
    _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).
@@ -270,41 +251,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];
@@ -400,15 +381,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;
@@ -416,7 +397,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
@@ -447,6 +428,49 @@ var STICKY_TIME_INTERVAL        = 500,
    CPFont  _font @accessors(property=font);
 }

+
+ (CPString)defaultThemeClass
+{
+    return "menu-view";
+}
+
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null], CGInsetMake(5.0, 1.0, 1.0, 5.0), 16.0,
+                                                    [CPNull null], [CPNull null], [CPNull null], 30.0, 10.0, 10.0, 10.0,
+                                                    [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 28.0, [CPNull null], 1.0,
+                                                    [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[    @"menu-window-more-above-image",
+                                                    @"menu-window-more-below-image",
+                                                    @"menu-window-pop-up-background-style-color",
+                                                    @"menu-window-menu-bar-background-style-color",
+                                                    @"menu-window-margin-inset",
+                                                    @"menu-window-scroll-indicator-height",
+
+                                                    @"menu-bar-window-background-color",
+                                                    @"menu-bar-window-background-selected-color",
+                                                    @"menu-bar-window-font",
+                                                    @"menu-bar-window-height",
+                                                    @"menu-bar-window-margin",
+                                                    @"menu-bar-window-left-margin",
+                                                    @"menu-bar-window-right-margin",
+
+                                                    @"menu-bar-text-color",
+                                                    @"menu-bar-title-color",
+                                                    @"menu-bar-text-shadow-color",
+                                                    @"menu-bar-title-shadow-color",
+                                                    @"menu-bar-highlight-color",
+                                                    @"menu-bar-highlight-text-color",
+                                                    @"menu-bar-highlight-text-shadow-color",
+                                                    @"menu-bar-height",
+                                                    @"menu-bar-icon-image",
+                                                    @"menu-bar-icon-image-alpha-value",
+
+                                                    @"menu-general-icon-new",
+                                                    @"menu-general-icon-save",
+                                                    @"menu-general-icon-open"]];
+}
+
 - (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 = [CPDictionary dictionaryWithObjectsAndKeys:
+        "\u238B", CPEscapeFunctionKey,
+        "\u21E5", CPTabCharacter,
+        "\u21E4", CPBackTabCharacter,
+        "\u2423", CPSpaceFunctionKey,
+        "\u23CE", CPCarriageReturnCharacter,
+        "\u232B", CPBackspaceCharacter,
+        "\u232B", CPDeleteFunctionKey,
+        "\u2326", CPDeleteCharacter,
+        "\u21F1", CPHomeFunctionKey,
+        "\u21F2", CPEndFunctionKey,
+        "\u21DE", CPPageUpFunctionKey,
+        "\u21DF", CPPageDownFunctionKey,
+        "\u2191", CPUpArrowFunctionKey,
+        "\u2193", CPDownArrowFunctionKey,
+        "\u2190", CPLeftArrowFunctionKey,
+        "\u2192", CPRightArrowFunctionKey,
+        "\u2327", CPClearDisplayFunctionKey
+    ];

 /*!
    @ingroup appkit
@@ -281,7 +285,7 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
 */
 - (void)setFont:(CPFont)aFont
 {
-    if (_font == aFont)
+    if ([_font isEqual:aFont])
        return;

    _font = aFont;
@@ -932,34 +936,33 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
        _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];

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

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

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

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

 //    int             _mnemonicLocation;

 //    BOOL            _isAlternate;

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

 //    CPString        _toolTip;

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

    return self;
@@ -1,17 +1,30 @@
-@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
 {
@@ -27,28 +40,20 @@ var SelectionColor                              = nil,
    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;
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], 8.0, 3.0, 4.0]
+                                       forKeys:[    @"submenu-indicator-color",
+                                                    @"menu-item-selection-color",
+                                                    @"menu-item-text-shadow-color",
+                                                    @"horizontal-margin",
+                                                    @"submenu-indicator-margin",
+                                                    @"vertical-margin"]];
 }

 + (id)view
@@ -62,7 +67,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];
@@ -101,7 +106,7 @@ var SelectionColor                              = nil,

 - (void)update
 {
-    var x = HORIZONTAL_MARGIN,
+    var x = [self valueForThemeAttribute:@"horizontal-margin"],
        height = 0.0;

    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
@@ -129,7 +134,7 @@ var SelectionColor                              = nil,

        var submenuViewFrame = [_submenuIndicatorView frame];

-        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
+        submenuViewFrame.origin.x = x + [self valueForThemeAttribute:@"submenu-indicator-margin"];

        x = CGRectGetMaxX(submenuViewFrame);
        height = MAX(height, CGRectGetHeight(submenuViewFrame));
@@ -137,7 +142,7 @@ var SelectionColor                              = 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];
@@ -148,10 +153,8 @@ var SelectionColor                              = nil,
        [_submenuIndicatorView setFrame:submenuViewFrame];
    }

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

@@ -164,11 +167,11 @@ var SelectionColor                              = nil,
    if (shouldHighlight)
    {
        if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:SelectionColor];
+            [self setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView]];

        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];

        [_submenuIndicatorView setColor:[CPColor whiteColor]];
        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
@@ -1,3 +1,24 @@
+/*
+ * _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"

@@ -35,4 +56,4 @@
    CGContextStrokePath(context);
 }

-@end
+@end
@@ -1,21 +1,28 @@
+/*
+ * _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
 {
@@ -34,26 +41,29 @@ 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;
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 3.0, 17.0, 14.0, 17.0, 4.0, 30.0]
+                                       forKeys:[    @"submenu-indicator-color",
+                                                    @"menu-item-selection-color",
+                                                    @"menu-item-text-shadow-color",
+                                                    @"menu-item-default-off-state-image",
+                                                    @"menu-item-default-off-state-highlighted-image",
+                                                    @"menu-item-default-on-state-image",
+                                                    @"menu-item-default-on-state-highlighted-image",
+                                                    @"menu-item-default-mixed-state-image",
+                                                    @"menu-item-default-mixed-state-highlighted-image",
+                                                    @"left-margin",
+                                                    @"right-margin",
+                                                    @"state-column-width",
+                                                    @"indentation-width",
+                                                    @"vertical-margin",
+                                                    @"right-columns-margin"]];
 }

 + (id)view
@@ -63,7 +73,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
@@ -74,7 +84,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
    {
        _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];

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

        [self addSubview:_stateView];

@@ -95,7 +105,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];
@@ -129,16 +139,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 +190,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,9 +201,9 @@ 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];

        keyEquivalentViewFrame.origin.x = x;
@@ -183,7 +211,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,28 +230,28 @@ 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)
    {
        keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
        [_keyEquivalentView setFrame:keyEquivalentViewFrame];
    }
-    
+
    if (hasSubmenu)
    {
        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
        [_submenuIndicatorView setFrame:submenuViewFrame];
    }

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

    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];
+        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
+        [_keyEquivalentView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
    }
    else
    {
@@ -254,18 +282,54 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
        [_imageAndTextView setImage:[_menuItem image]];
        [_imageAndTextView setTextColor:[self textColor]];
        [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];

        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
    }
-    
+
    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;
+            }
+        }
    }
 }

@@ -290,15 +354,15 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
    var context = [[CPGraphicsContext currentContext] graphicsPort],
        bounds = [self bounds];
-    
+
    CGContextBeginPath(context);
-    
+
    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-    
+
    CGContextClosePath(context);
-    
+
    CGContextSetFillColor(context, _color);
    CGContextFillPath(context);
 }
@@ -1,22 +1,38 @@
+/*
+ * _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"

+@global CPApp

-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    = [];
+// var LEFT_MARGIN                 = 3.0,
+//     RIGHT_MARGIN                = 16.0,
+//     STATE_COLUMN_WIDTH          = 14.0,
+//     INDENTATION_WIDTH           = 17.0,
+//     VERTICAL_MARGIN             = 4.0;

 /*
    @ignore
@@ -38,31 +54,23 @@ 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
+ (id)themeAttributes
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return [CPDictionary dictionaryWithObjects:[]
+                                       forKeys:[]];
 }

+// Not used in the Appkit
+// + (float)leftMargin
+// {
+//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+// }
+
 - (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
 {
    self = [super initWithFrame:aFrame];
@@ -176,7 +184,7 @@ var _CPMenuItemSelectionColor                   = nil,

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

    _font = aFont;
@@ -24,6 +24,7 @@
@import <Foundation/CPCountedSet.j>

@import "CPController.j"
+@import "CPKeyValueBinding.j"

 /*!
    @class
@@ -51,6 +52,9 @@

 + (id)initialize
 {
+    if (self !== [CPObjectController class])
+        return;
+
    [self exposeBinding:@"editable"];
    [self exposeBinding:@"contentObject"];
 }
@@ -131,8 +135,8 @@

    _contentObject = aContent;

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

 /*!
@@ -371,7 +375,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

        [self setObjectClass:objectClass || [CPMutableDictionary class]];
        [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
-        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey] || NO];
+        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
        [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];

        _observedKeys = [[CPCountedSet alloc] init];
@@ -579,6 +583,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

 - (void)removeObjectAtIndex:(unsigned)anIndex
 {
+    var currentObject = [self objectAtIndex:anIndex];
+
    for (var i = 0, count = [_observationProxies count]; i < count; i++)
    {
        var proxy = [_observationProxies objectAtIndex:i],
@@ -588,7 +594,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
        if (operator)
            [self willChangeValueForKey:keyPath];

-        [anObject removeObserver:proxy forKeyPath:keyPath];
+        [currentObject removeObserver:proxy forKeyPath:keyPath];

        if (operator)
            [self didChangeValueForKey:keyPath];
@@ -663,7 +669,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

 - (id)_controllerMarkerForValues:(CPArray)theValues
 {
-    var count = [theValues count];
+    var count = [theValues count],
+        value;

    if (!count)
        value = CPNoSelectionMarker;
@@ -677,7 +684,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
        {
            value = [theValues objectAtIndex:0];

-            for (var i = 0, count= [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
+            for (var i = 0, count = [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
            {
                if (![value isEqual:[theValues objectAtIndex:i]])
                    value = CPMultipleValuesMarker;
@@ -693,8 +700,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo

 - (id)valueForKeyPath:(CPString)theKeyPath
 {
-    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
-    value = [self _controllerMarkerForValues:values];
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath],
+        value = [self _controllerMarkerForValues:values];

    [_cachedValues setObject:value forKey:theKeyPath];

@@ -776,8 +783,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
    [proxy setNotifyObject:YES];
    [_observationProxies addObject:proxy];

-    // We keep are reference to the observed objects
-    // because the removeObserver: will be called after the selection changes
+    // We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
    var observedObjects = [_controller selectedObjects];
    _observedObjectsByKeyPath[aKeyPath] = observedObjects;
    [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
@@ -793,7 +799,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";
@@ -62,7 +64,7 @@ var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_
    CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                                 = 1 << 12,
    CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 13,
    CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                                      = 1 << 14,
-    CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                                 = 1 << 15,
+    CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_                    = 1 << 15,
    CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_                   = 1 << 16,
    CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_                          = 1 << 17,
    CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_             = 1 << 18,
@@ -80,6 +82,10 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    CPOutlineViewCoalesceSelectionNotificationStateOn   = 1,
    CPOutlineViewCoalesceSelectionNotificationStateDid  = 2;

+#define SELECTION_SHOULD_CHANGE(anOutlineView) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_selectionShouldChangeInOutlineView_) || [(anOutlineView)._outlineViewDelegate selectionShouldChangeInOutlineView:(anOutlineView)])
+
+#define SHOULD_SELECT_ITEM(anOutlineView, anItem) (!((anOutlineView)._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_) || [(anOutlineView)._outlineViewDelegate outlineView:(anOutlineView) shouldSelectItem:(anItem)])
+
 /*!
    @ingroup appkit
    @class CPOutlineView
@@ -136,7 +142,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        _selectionHighlightStyle = CPTableViewSelectionHighlightStyleSourceList;

        // The root item has weight "0", thus represents the weight solely of its descendants.
-        _rootItemInfo = { isExpanded:YES, isExpandable:NO, level:-1, row:-1, children:[], weight:0 };
+        _rootItemInfo = { isExpanded:YES, isExpandable:NO, shouldShowOutlineDisclosureControl:NO, level:-1, row:-1, children:[], weight:0 };

        _itemsForRows = [];
        _itemInfosForItems = { };
@@ -147,7 +153,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,

        _retargedChildIndex = nil;
        _shouldRetargetChildIndex = NO;
-        _startHoverTime = nil;

        [self setIndentationPerLevel:16.0];
        [self setIndentationMarkerFollowsDataView:YES];
@@ -294,6 +299,19 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    return itemInfo.isExpandable;
 }

+- (BOOL)_shouldShowOutlineDisclosureControlForItem:(id)anItem
+{
+    if (!anItem)
+        return YES;
+
+    var itemInfo = _itemInfosForItems[[anItem UID]];
+
+    if (!itemInfo)
+        return YES;
+
+    return itemInfo.shouldShowOutlineDisclosureControl;
+}
+
 /*!
    Used to find if an item is already expanded.

@@ -360,9 +378,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;
@@ -453,9 +470,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.
@@ -690,11 +706,13 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (CGRect)frameOfOutlineDisclosureControlAtRow:(CPInteger)aRow
 {
-    if (![self isExpandable:[self itemAtRow:aRow]])
+    var theItem = [self itemAtRow:aRow];
+    if (![self isExpandable:theItem] || ![self _shouldShowOutlineDisclosureControlForItem:theItem])
        return _CGRectMakeZero();

    var dataViewFrame = [self _frameOfOutlineDataViewAtRow:aRow],
-        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - 10, _CGRectGetMinY(dataViewFrame), 10, _CGRectGetHeight(dataViewFrame));
+        disclosureWidth = _CGRectGetWidth([_disclosureControlPrototype frame]),
+        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - disclosureWidth, _CGRectGetMinY(dataViewFrame), disclosureWidth, _CGRectGetHeight(dataViewFrame));

    return frame;
 }
@@ -822,29 +840,24 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                          name:CPOutlineViewSelectionIsChangingNotification
                        object:self];

-
-
        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
            [defaultCenter
                removeObserver:_outlineViewDelegate
                          name:CPOutlineViewItemWillExpandNotification
                        object:self];

-
        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemDidExpand:)])
            [defaultCenter
                removeObserver:_outlineViewDelegate
                          name:CPOutlineViewItemDidExpandNotification
                        object:self];

-
        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillCollapse:)])
            [defaultCenter
                removeObserver:_outlineViewDelegate
                          name:CPOutlineViewItemWillCollapseNotification
                        object:self];

-
        if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemDidCollapse:)])
            [defaultCenter
                removeObserver:_outlineViewDelegate
@@ -870,7 +883,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
            CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                      , @selector(outlineView:shouldReorderColumn:toColumn:),
            CPOutlineViewDelegate_outlineView_shouldSelectItem_                                  , @selector(outlineView:shouldSelectItem:),
            CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                           , @selector(outlineView:shouldSelectTableColumn:),
-            CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                      , @selector(outlineView:shouldShowOutlineViewForItem:),
+            CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_         , @selector(outlineView:shouldShowOutlineDisclosureControlForItem:),
            CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_        , @selector(outlineView:shouldShowViewExpansionForTableColumn:item:),
            CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_               , @selector(outlineView:shouldTrackView:forTableColumn:item:),
            CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_  , @selector(outlineView:shouldTypeSelectForEvent:withCurrentSearchString:),
@@ -921,7 +934,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
            name:CPOutlineViewSelectionIsChangingNotification
            object:self];

-
    if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
        [defaultCenter
            addObserver:_outlineViewDelegate
@@ -984,7 +996,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    _disclosureControlData = nil;
    _disclosureControlQueue = [];

-    // fIXME: really?
+    // FIXME: really?
    [self reloadData];
 }

@@ -1042,11 +1054,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:(int)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];
@@ -1060,7 +1073,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]];
@@ -1120,13 +1133,14 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        if (_dragHoverTimer)
            [_dragHoverTimer invalidate];

-        var autoExpandCallBack = function(){
+        var autoExpandCallBack = function()
+        {
            if (_dropItem)
            {
                [_dropOperationFeedbackView blink];
                [CPTimer scheduledTimerWithTimeInterval:.3 callback:objj_msgSend(self, "expandItem:", _dropItem) repeats:NO];
            }
-        }
+        };

        _dragHoverTimer = [CPTimer scheduledTimerWithTimeInterval:.8 callback:autoExpandCallBack repeats:NO];
    }
@@ -1173,7 +1187,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
    @ignore
 */
- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
+- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
 {
    if (_shouldRetargetItem)
        return _retargetedItem;
@@ -1203,7 +1217,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
+- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)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],
@@ -1284,7 +1298,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
            item = _itemsForRows[row],
            isExpandable = [self isExpandable:item];

-       if (!isExpandable)
+        if (!isExpandable)
+            continue;
+
+        var disclosureControlFrame = [self frameOfOutlineDisclosureControlAtRow:row];
+
+        if (_CGRectIsEmpty(disclosureControlFrame))
            continue;

        var control = [self _dequeueDisclosureControl];
@@ -1294,7 +1313,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        [control setState:[self isItemExpanded:item] ? CPOnState : CPOffState];
        var selector = [self isRowSelected:row] ? @"setThemeState:" : @"unsetThemeState:";
        [control performSelector:CPSelectorFromString(selector) withObject:CPThemeStateSelected];
-        [control setFrame:[self frameOfOutlineDisclosureControlAtRow:row]];
+        [control setFrame:disclosureControlFrame];

        [self addSubview:control];
    }
@@ -1347,7 +1366,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
        [self collapseItem:item];

    else
-        [self expandItem:item];
+        [self expandItem:item expandChildren:([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask)];
 }

 /*!
@@ -1458,7 +1477,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }

-
 - (void)keyDown:(CPEvent)anEvent
 {
    var character = [anEvent charactersIgnoringModifiers],
@@ -1467,7 +1485,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    // Check for the key events manually, as opposed to waiting for CPWindow to sent the actual action message
    // in _processKeyboardUIKey:, because we might not want to handle the arrow events.

-    if (character !== CPRightArrowFunctionKey && character !== CPLeftArrowFunctionKey) 
+    if (character !== CPRightArrowFunctionKey && character !== CPLeftArrowFunctionKey)
        return [super keyDown:anEvent];

    var rows = [self selectedRowIndexes],
@@ -1481,7 +1499,6 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,

    for (; i < c; i++)
        items.push([self itemAtRow:indexes[i]]);
-   

    if (character === CPRightArrowFunctionKey)
    {
@@ -1490,12 +1507,32 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
    }
    else if (character === CPLeftArrowFunctionKey)
    {
+        // When a single, collapsed item is selected and the left arrow key is pressed, the parent
+        // should be selected if possible.
+        if (c == 1)
+        {
+            var theItem = items[0];
+            if (![self isItemExpanded:theItem])
+            {
+                var parent = [self parentForItem:theItem],
+                    shouldSelect = parent && SELECTION_SHOULD_CHANGE(self) && SHOULD_SELECT_ITEM(self, parent);
+                if (shouldSelect)
+                {
+                    var rowIndex = [self rowForItem:parent];
+                    [self selectRowIndexes:[CPIndexSet indexSetWithIndex:rowIndex] byExtendingSelection:NO];
+                    [self scrollRowToVisible:rowIndex];
+                    return;
+                }
+            }
+        }
+
        for (var i = 0; i < c; i++)
-            [self collapseItem:items[i]]; 
+            [self collapseItem:items[i]];
    }

    [super keyDown:anEvent];
 }
+
@end

 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
@@ -1534,8 +1571,9 @@ var _reloadItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem)

        itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:newItem];
        itemInfo.isExpanded = itemInfo.isExpandable && itemInfo.isExpanded;
+        itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:newItem];
    }
-}
+};

 // FIX ME: We're using with() here because Safari fails if we use anOutlineView._itemInfosForItems or whatever...
 var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anItem,  /*BOOL*/ isIntermediate)
@@ -1559,6 +1597,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
                return [];

            itemInfo.isExpandable = [dataSource outlineView:anOutlineView isItemExpandable:anItem];
+            itemInfo.shouldShowOutlineDisclosureControl = !(_implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_) || [_outlineViewDelegate outlineView:self shouldShowOutlineDisclosureControlForItem:anItem];

            // If we were previously expanded, but now no longer expandable, "de-expand".
            // NOTE: we are *not* collapsing, thus no notification is posted.
@@ -1589,7 +1628,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt

                if (!childItemInfo)
                {
-                    childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
+                    childItemInfo = { isExpanded:NO, isExpandable:NO, shouldShowOutlineDisclosureControl:YES, children:[], weight:1 };
                    itemInfosForItems[[childItem UID]] = childItemInfo;
                }

@@ -1640,7 +1679,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
        }
    }//end of with
    return descendants;
-}
+};

@implementation _CPOutlineViewTableViewDataSource : CPObject
 {
@@ -1691,7 +1730,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:(int)theRow offset:(CGPoint)theOffset
 {
    if (_outlineView._shouldRetargetChildIndex)
        return _outlineView._retargedChildIndex;
@@ -1715,7 +1754,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:(int)theRow offset:(CGPoint)theOffset
 {
    if (theDropOperation === CPTableViewDropAbove)
        return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]
@@ -1792,9 +1831,9 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
    var dataView = nil;

    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
-            dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
-                                           dataViewForTableColumn:theTableColumn
-                                                             item:[_outlineView itemAtRow:theRow]];
+        dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
+                                       dataViewForTableColumn:theTableColumn
+                                                         item:[_outlineView itemAtRow:theRow]];

    if (!dataView)
        dataView = [theTableColumn dataViewForRow:theRow];
@@ -1804,10 +1843,12 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt

 - (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
 {
-    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_))
-        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectItem:[_outlineView itemAtRow:theRow]];
+    return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
+}

-    return YES;
+- (BOOL)selectionShouldChangeInTableView:(CPTableView)theTableView
+{
+    return SELECTION_SHOULD_CHANGE(_outlineView);
 }

 - (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
@@ -1851,7 +1892,9 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
        return [_outlineView._outlineViewDelegate outlineView:_outlineView menuForTableColumn:aTableColumn item:item]
    }

-    return nil;
+    // We reimplement CPView menuForEvent: because we can't call it directly. CPTableView implements menuForEvent:
+    // to call this delegate method.
+    return [_outlineView menu] || [[_outlineView class] defaultMenu];
 }

@end
@@ -1885,16 +1928,22 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 - (void)drawRect:(CGRect)aRect
 {
    var bounds = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort];
+        context = [[CPGraphicsContext currentContext] graphicsPort],
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);

    CGContextBeginPath(context);

-    CGContextTranslateCTM(context, _CGRectGetWidth(bounds) / 2.0, _CGRectGetHeight(bounds) / 2.0);
-    CGContextRotateCTM(context, _angle);
-    CGContextTranslateCTM(context, -_CGRectGetWidth(bounds) / 2.0, -_CGRectGetHeight(bounds) / 2.0);
+    if (_angle)
+    {
+        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);
+    }

    // Center, but crisp.
-    CGContextTranslateCTM(context, FLOOR((_CGRectGetWidth(bounds) - 9.0) / 2.0), FLOOR((_CGRectGetHeight(bounds) - 8.0) / 2.0));
+    CGContextTranslateCTM(context, FLOOR((width - 9.0) / 2.0), FLOOR((height - 8.0) / 2.0));

    CGContextMoveToPoint(context, 0.0, 0.0);
    CGContextAddLineToPoint(context, 9.0, 0.0);
@@ -1907,20 +1956,14 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
            [self hasThemeState:CPThemeStateHighlighted]));
    CGContextFillPath(context);

-
    CGContextBeginPath(context);
    CGContextMoveToPoint(context, 0.0, 0.0);

+    CGContextAddLineToPoint(context, 4.5, 8.0);
    if (_angle === 0.0)
-    {
-        CGContextAddLineToPoint(context, 4.5, 8.0);
        CGContextAddLineToPoint(context, 9.0, 0.0);
-    }

-    else
-        CGContextAddLineToPoint(context, 4.5, 8.0);
-
-    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.8]);
+    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.7]);
    CGContextStrokePath(context);
 }

@@ -1984,7 +2027,8 @@ var CPOutlineViewIndentationPerLevelKey = @"CPOutlineViewIndentationPerLevelKey"
@end


-var colorForDisclosureTriangle = function(isSelected, isHighlighted) {
+var colorForDisclosureTriangle = function(isSelected, isHighlighted)
+{
    return isSelected
        ? (isHighlighted
            ? [CPColor colorWithCalibratedWhite:0.9 alpha: 1.0]
@@ -1992,4 +2036,4 @@ var colorForDisclosureTriangle = function(isSelected, isHighlighted) {
        : (isHighlighted
            ? [CPColor colorWithCalibratedWhite:0.4 alpha: 1.0]
            : [CPColor colorWithCalibratedWhite:0.5 alpha: 1.0]);
-}
+};
@@ -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>

@@ -73,7 +74,7 @@ var CPPasteboards = nil,
 */
 + (void)initialize
 {
-    if (self != [CPPasteboard class])
+    if (self !== [CPPasteboard class])
        return;

    [self setVersion:1.0];
@@ -117,7 +118,7 @@ var CPPasteboards = nil,

    if (self)
    {
-        _name = aName;
+//        _name = aName;
        _types = [];

        _owners = [CPDictionary dictionary];
@@ -20,12 +20,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import "CGGeometry.j"
@import "CPButton.j"
-@import "CPGeometry.j"
+@import "CPKeyValueBinding.j"
@import "CPMenu.j"
@import "CPMenuItem.j"

-
 var VISIBLE_MARGIN = 7.0;

 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
@@ -86,7 +86,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");

        [self setPullsDown:shouldPullDown];

-        var options = CPKeyValueObservingOptionNew |CPKeyValueObservingOptionOld;/* |CPKeyValueObservingOptionInitial;*/
+        var options = CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld; // | CPKeyValueObservingOptionInitial;
        [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
        [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
        [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
@@ -193,6 +193,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 - (void)removeAllItems
 {
    [[self menu] removeAllItems];
+    [self synchronizeTitleAndSelectedItem];
 }

 /*!
@@ -245,22 +246,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
    return _selectedIndex;
 }

-/*!
-    @ignore
-*/
- (int)selectedTag
-{
-    return [[self selectedItem] tag];
-}
-
-/*!
-    @ignore
-*/
- (void)_setSelectedTag:(int)aTag
-{
-    [self selectItemWithTag:aTag];
-}
-
 // Setting the Current Selection
 /*!
    Selects the specified menu item.
@@ -586,10 +571,18 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
            if ([indexes containsIndex:0] && [self pullsDown])
                [self _firstItemDidChange];

-            // See whether the index has changed, despite the actual item not changing.
-            while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                    index <= indexOfSelectedItem)
-                --indexOfSelectedItem;
+            if (![self pullsDown] && [indexes containsIndex:indexOfSelectedItem])
+            {
+                // If the selected item is removed the first item becomes selected.
+                indexOfSelectedItem = 0;
+            }
+            else
+            {
+                // See whether the index has changed, despite the actual item not changing.
+                while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
+                        index <= indexOfSelectedItem)
+                    --indexOfSelectedItem;
+            }

            [self selectItemAtIndex:indexOfSelectedItem];
        }
@@ -775,6 +768,286 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
            [[self selectedItem] setState:CPOffState];
 }

+- (void)_reverseSetBinding
+{
+    [_CPPopUpButtonSelectionBinder reverseSetValueForObject:self];
+
+    [super _reverseSetBinding];
+}
+
+@end
+
+@implementation CPPopUpButton (BindingSupport)
+
+ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPSelectedIndexBinding ||
+        aBinding == CPSelectedObjectBinding ||
+        aBinding == CPSelectedTagBinding ||
+        aBinding == CPSelectedValueBinding ||
+        aBinding == CPContentBinding ||
+        aBinding == CPContentObjectsBinding ||
+        aBinding == CPContentValuesBinding)
+    {
+        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
+
+        return [CPClassFromString(@"_CPPopUpButton" + capitalizedBinding + "Binder") class];
+    }
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+@end
+
+@implementation _CPPopUpButtonContentBinder : CPBinder
+{
+}
+
+- (CPInteger)_getInsertNullOffset
+{
+    var options = [_info objectForKey:CPOptionsKey];
+
+    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
+}
+
+- (CPString)_getNullPlaceholder
+{
+    var options = [_info objectForKey:CPOptionsKey],
+        placeholder = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
+
+    if (placeholder === [CPNull null])
+        placeholder = @"";
+
+    return placeholder;
+}
+
+- (id)transformValue:(CPArray)contentArray withOptions:(CPDictionary)options
+{
+    // Desactivate the full array transformation forced by super because we don't want this. We want individual transformations (see below).
+    return contentArray;
+}
+
+- (void)setValue:(CPArray)contentArray forBinding:(CPString)aBinding
+{
+    [self _setContent:contentArray];
+    [self _setContentValuesIfNeeded:contentArray];
+}
+
+- (void)valueForBinding:(CPString)aBinding
+{
+    return [self _content];
+}
+
+- (void)_setContent:(CPArray)aValue
+{
+    var count = [aValue count],
+        options = [_info objectForKey:CPOptionsKey],
+        offset = [self _getInsertNullOffset];
+
+    if (count + offset != [_source numberOfItems])
+    {
+        [_source removeAllItems];
+
+        if (offset)
+            [_source addItemWithTitle:[self _getNullPlaceholder]];
+
+        for (var i = 0; i < count; i++)
+        {
+            var item = [[CPMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:nil];
+            [self _setValue:[aValue objectAtIndex:i] forItem:item withOptions:options];
+            [_source addItem:item];
+        }
+    }
+    else
+    {
+        for (var i = 0; i < count; i++)
+        {
+            [self _setValue:[aValue objectAtIndex:i] forItem:[_source itemAtIndex:i + offset] withOptions:options];
+        }
+    }
+}
+
+- (void)_setContentValuesIfNeeded:(CPArray)values
+{
+    var offset = [self _getInsertNullOffset];
+
+    if (![_source infoForBinding:CPContentValuesBinding])
+    {
+        if (offset)
+            [[_source itemAtIndex:0] setTitle:[self _getNullPlaceholder]];
+
+        var count = [values count];
+
+        for (var i = 0; i < count; i++)
+            [[_source itemAtIndex:i + offset] setTitle:[[values objectAtIndex:i] description]];
+    }
+}
+
+- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
+{
+    var value = [self _transformValue:aValue withOptions:options];
+    [aMenuItem setRepresentedObject:value];
+}
+
+- (id)_transformValue:(id)aValue withOptions:(CPDictionary)options
+{
+    return [super transformValue:aValue withOptions:options];
+}
+
+- (CPArray)_content
+{
+    return [_source valueForKeyPath:@"itemArray.representedObject"];
+}
+
+@end
+
+@implementation _CPPopUpButtonContentValuesBinder : _CPPopUpButtonContentBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [super _setContent:aValue];
+}
+
+- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
+{
+    if (aValue === [CPNull null])
+        aValue = nil;
+
+    var value = [self _transformValue:aValue withOptions:options];
+    [aMenuItem setTitle:value];
+}
+
+- (CPArray)_content
+{
+    return [_source valueForKeyPath:@"itemArray.title"];
+}
+
+@end
+
+var binderForObject = {};
+
+@implementation _CPPopUpButtonSelectionBinder : CPBinder
+{
+    CPString _selectionBinding @accessors;
+}
+
+- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
+{
+    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
+
+    if (self)
+    {
+        binderForObject[[aSource UID]] = self;
+        _selectionBinding = aName;
+    }
+
+    return self;
+}
+
+ (void)reverseSetValueForObject:(id)aSource
+{
+    var binder = binderForObject[[aSource UID]];
+    [binder reverseSetValueFor:[binder _selectionBinding]];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [self setValue:aValue forBinding:aBinding];
+}
+
+- (CPInteger)_getInsertNullOffset
+{
+    var options = [[CPBinder infoForBinding:CPContentBinding forObject:_source] objectForKey:CPOptionsKey];
+
+    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedIndexBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectItemAtIndex:aValue + [self _getInsertNullOffset]];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source indexOfSelectedItem] - [self _getInsertNullOffset];
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedObjectBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    var index = [_source indexOfItemWithRepresentedObject:aValue],
+        offset = [self _getInsertNullOffset];
+
+    // If the content binding has the option CPNullPlaceholderBindingOption and the object to select is nil, select the first item (i.e., the placeholder).
+    // Other cases to consider:
+    // 1. no binding:
+    // 1.1 there's no item with a represented object matching the object to select.
+    // 1.2 the object to select is nil/CPNull
+    // 2. there's a binding:
+    // 2.1 there's a CPNullPlaceholderBindingOption:
+    // 2.1.1 there's no item with a represented object matching the object to select?
+    // 2.1.2 the object to select is nil/CPNull
+    // 2.2 there's no CPNullPlaceholderBindingOption:
+    // 2.2.1 there's no item with a represented object matching the object to select?
+    // 2.2.2 the object to select is nil/CPNull
+    // More cases? Behaviour that depends on array controller settings?
+
+    if (offset === 1 && index === CPNotFound)
+        index = 0;
+
+    [_source selectItemAtIndex:index];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedItem] representedObject];
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedTagBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectItemWithTag:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedItem] tag];
+}
+
+@end
+
+@implementation _CPPopUpButtonSelectedValueBinder : _CPPopUpButtonSelectionBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectItemWithTitle:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source titleOfSelectedItem];
+}
+
@end

 var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",
@@ -28,33 +28,35 @@
@import "CPImageView.j"
@import "CPResponder.j"
@import "CPView.j"
-@import "_CPAttachedWindow.j"
+@import "_CPPopoverWindow.j"


 CPPopoverBehaviorApplicationDefined = 0;
 CPPopoverBehaviorTransient          = 1;
 CPPopoverBehaviorSemitransient      = 2;

-
 var CPPopoverDelegate_popover_willShow_     = 1 << 0,
    CPPopoverDelegate_popover_didShow_      = 1 << 1,
    CPPopoverDelegate_popover_shouldClose_  = 1 << 2,
-    CPPopoverDelegate_popover_willClose_   = 1 << 3,
+    CPPopoverDelegate_popover_willClose_    = 1 << 3,
    CPPopoverDelegate_popover_didClose_     = 1 << 4;


 /*! @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:
-        – popoverShouldClose:(CPPopover)aPopOver
-        – popoverWillShow:(CPPopover)aPopOver
-        – popoverDidShow:(CPPopover)aPopOver
-        – popoverWillClose:(CPPopover)aPopOver
-        – popoverDidClose:(CPPopover)aPopOver
+
+    @code
+    – popoverShouldClose:(CPPopover)aPopOver
+    – popoverWillShow:(CPPopover)aPopOver
+    – popoverDidShow:(CPPopover)aPopOver
+    – popoverWillClose:(CPPopover)aPopOver
+    – popoverDidClose:(CPPopover)aPopOver
+    @endcode
 */
@implementation CPPopover : CPResponder
 {
@@ -62,33 +64,29 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
    @outlet id                  _delegate               @accessors(getter=delegate);

    BOOL                        _animates               @accessors(property=animates);
-    BOOL                        _shown                  @accessors(getter=shown);
    int                         _appearance             @accessors(property=appearance);
    int                         _behavior               @accessors(getter=behavior);

-    BOOL                        _needsCompute;
-    _CPAttachedWindow           _attachedWindow;
+    _CPPopoverWindow            _popoverWindow;
    int                         _implementedDelegateMethods;
 }


 #pragma mark -
-#pragma mark INitialization
+#pragma mark Initialization

 /*!
    Initialize the CPPopover witn default values

-    @returns anInitialized CPPopover
+    @returns an initialized CPPopover
 */
 - (CPPopover)init
 {
    if (self = [super init])
    {
-        _animates       = YES;
-        _appearance     = CPPopoverAppearanceMinimal;
-        _behavior       = CPPopoverBehaviorApplicationDefined;
-        _needsCompute   = YES;
-        _shown          = NO;
+        _animates      = YES;
+        _appearance    = CPPopoverAppearanceMinimal;
+        _behavior      = CPPopoverBehaviorApplicationDefined;
    }

    return self;
@@ -101,34 +99,37 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*!
    Returns the current rect of the popover

-    @return CPRect represeting the frame of the popover
+    @return CGRect representing the frame of the popover
 */
- (CPRect)positionningRect
+- (CGRect)positioningRect
 {
-    if (!_attachedWindow || ![_attachedWindow isVisible])
-        return nil;
-    return [_attachedWindow frame];
+    if (![_popoverWindow isVisible])
+        return CGRectMakeZero();
+
+    return [_popoverWindow frame];
 }

 /*! Sets the frame of the popover
    @param aRect the desired frame
 */
- (void)setPositionningRect:(CPRect)aRect
+- (void)setPositioningRect:(CGRect)aRect
 {
-    if (!_attachedWindow || ![_attachedWindow isVisible])
+    if (![_popoverWindow isVisible])
        return;
-    [_attachedWindow setFrame:aRect];
+
+    [_popoverWindow setFrame:aRect];
 }

 /*!
    Returns the size of the popover's view

-    @return CPSize represeting the size of the popover's view
+    @return CGSize representing the size of the popover's view
 */
- (CPRect)contentSize
+- (CGSize)contentSize
 {
-    if (!_attachedWindow || ![_attachedWindow isVisible])
-        return nil;
+    if (![_popoverWindow isVisible])
+        return CGRectMakeZero();
+
    return [[_contentViewController view] frameSize];
 }

@@ -137,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];
 }
@@ -145,32 +146,30 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*!
    Indicates if CPPopover is visible

-    @returns YES if visible
+    @returns \c YES if visible
 */
- (BOOL)shown
+- (BOOL)isShown
 {
-    if (!_attachedWindow)
-        return NO;
-    return [_attachedWindow isVisible];
+    return [_popoverWindow isVisible];
 }

 /*!
-    Set the behaviour of the CPPopover. It can be
-        - CPPopoverBehaviorTransient: the popover will be close if another control outside the popover become the responder
-        - CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
+Set the behavior of the CPPopover. It can be:

-    @param aBehaviour the desired behaviour
+- \c CPPopoverBehaviorTransient: the popover will close if another control outside the popover becomes the responder
+- \c CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
+
+@param aBehavior the desired behavior
 */
- (void)setBehaviour:(int)aBehaviour
+- (void)setBehavior:(int)aBehavior
 {
-    if (_behavior == aBehaviour)
+    if (_behavior == aBehavior)
        return;

-    _behavior = aBehaviour;
-    _needsCompute = YES;
+    _behavior = aBehavior;
+    [_popoverWindow setStyleMask:[self styleMaskForBehavior]];
 }

-
 - (void)setDelegate:(id)aDelegate
 {
    if (_delegate === aDelegate)
@@ -196,62 +195,75 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 }

 #pragma mark -
-#pragma mark Positionning
+#pragma mark Positioning

 /*!
    Show the popover

    @param positioningRect if set, the popover will be positionned to a random rect relative to the window
    @param positioningView if set, the popover will be positioned relative to this view
-    @param preferredEdge: CPRectEdge representing the prefered positionning.
+    @param preferredEdge: \c CPRectEdge representing the preferred positioning.
 */
- (void)showRelativeToRect:(CPRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
+- (void)showRelativeToRect:(CGRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
 {
+    if (!positioningView)
+        [CPException raise:CPInvalidArgumentException reason:"positionView must not be nil"];
+
+    if (!_contentViewController)
+        [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
+
+    // If the popover is currently closing, do nothing. That is what Cocoa does.
+    if ([_popoverWindow isClosing])
+        return;
+
    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
        [_delegate popoverWillShow:self];

-    if (!_contentViewController)
-         [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
-
-    if (_needsCompute)
+    if (!_popoverWindow)
    {
-        var styleMask = (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : nil;
-        _attachedWindow = [[_CPAttachedWindow alloc] initWithContentRect:CPRectMakeZero() styleMask:styleMask];
+        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
    }

-    [_attachedWindow setAppearance:_appearance];
-    [_attachedWindow setAnimates:_animates];
-    [_attachedWindow setMovableByWindowBackground:NO];
-    [_attachedWindow setFrame:[_attachedWindow frameRectForContentRect:[[_contentViewController view] frame]]];
-    [_attachedWindow setContentView:[_contentViewController view]];
+    [_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 (positioningRect)
-        [_attachedWindow positionRelativeToRect:positioningRect preferredEdge:preferredEdge];
-    else if (positioningView)
-        [_attachedWindow positionRelativeToView:positioningView preferredEdge:preferredEdge];
-    else
-        [CPException raise:CPInvalidArgumentException reason:@"you must set positioningRect or positioningRect"];
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+    if (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
        [_delegate popoverDidShow:self];
 }

+- (unsigned)styleMaskForBehavior
+{
+    return (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : 0;
+}
+
 /*!
    Closes the popover
 */
 - (void)close
 {
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
-        if (![_delegate popoverShouldClose:self])
-            return;
+    [self _close];
+}
+
+/*!
+    Closes the popover
+*/
+- (void)_close
+{
+    if ([_popoverWindow isClosing] || ![self isShown])
+        return;

    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
        [_delegate popoverWillClose:self];

-    [_attachedWindow close];
+    [_popoverWindow close];

-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
-        [_delegate popoverDidClose:self];
+    // popoverDidClose will be sent from popoverWindowDidClose, since
+    // the popover window will close asynchronously when animating.
 }


@@ -261,15 +273,68 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 /*!
    Close the popover

-    @param aSender the sender of the action
+    @param sender the sender of the action
 */
- (IBAction)performClose:(id)aSender
+- (IBAction)performClose:(id)sender
 {
-    [self close];
+    if ([_popoverWindow isClosing])
+        return;
+
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_shouldClose_)
+        if (![_delegate popoverShouldClose:self])
+            return;
+
+    [self _close];
+}
+
+
+#pragma mark -
+#pragma mark Delegates
+
+/*! @ignore */
+- (BOOL)popoverWindowShouldClose:(_CPPopoverWindow)aPopoverWindow
+{
+    [self performClose:self];
+
+    // We return NO, because we want the CPPopover to determine
+    // if the popover window can be closed and to give us a chance
+    // to send delegate messages.
+    return NO;
+}
+
+/*! @ignore */
+- (void)popoverWindowDidClose:(_CPPopoverWindow)aPopoverWindow
+{
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_)
+        [_delegate popoverDidClose:self];
+}
+
+/*! @ignore */
+- (void)popoverWindowDidShow:(_CPPopoverWindow)aPopoverWindow
+{
+    if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
+        [_delegate popoverDidShow:self];
 }

@end

+@implementation CPPopover (Deprecated)
+
+- (void)setBehaviour:(int)aBehavior
+{
+    _CPReportLenientDeprecation(self, _cmd, @selector(setBehavior:));
+
+    [self setBehavior:aBehavior];
+}
+
+@end
+
+var CPPopoverNeedsNewPopoverWindowKey = @"CPPopoverNeedsNewPopoverWindowKey",
+    CPPopoverAppearanceKey = @"CPPopoverAppearanceKey",
+    CPPopoverAnimatesKey = @"CPPopoverAnimatesKey",
+    CPPopoverContentViewControllerKey = @"CPPopoverContentViewControllerKey",
+    CPPopoverDelegateKey = @"CPPopoverDelegateKey",
+    CPPopoverBehaviorKey = @"CPPopoverBehaviorKey";

@implementation CPPopover (CPCoding)

@@ -279,12 +344,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,

    if (self)
    {
-        _needsCompute = [aCoder decodeIntForKey:@"_needsCompute"];
-        _appearance = [aCoder decodeIntForKey:@"_appearance"];
-        _animates = [aCoder decodeBoolForKey:@"_animates"];
-        _contentViewController = [aCoder decodeObjectForKey:@"_contentViewController"];
-        [self setDelegate:[aCoder decodeObjectForKey:@"_delegate"]];
-        [self setBehaviour:[aCoder decodeIntForKey:@"_behavior"]];
+        _appearance = [aCoder decodeIntForKey:CPPopoverAppearanceKey];
+        _animates = [aCoder decodeBoolForKey:CPPopoverAnimatesKey];
+        _contentViewController = [aCoder decodeObjectForKey:CPPopoverContentViewControllerKey];
+        [self setDelegate:[aCoder decodeObjectForKey:CPPopoverDelegateKey]];
+        [self setBehavior:[aCoder decodeIntForKey:CPPopoverBehaviorKey]];
    }
    return self;
 }
@@ -293,12 +357,11 @@ var CPPopoverDelegate_popover_willShow_     = 1 << 0,
 {
    [super encodeWithCoder:aCoder];

-    [aCoder encodeInt:_behavior forKey:@"_behavior"];
-    [aCoder encodeInt:_appearance forKey:@"_appearance"];
-    [aCoder encodeBool:_needsCompute forKey:@"_needsCompute"];
-    [aCoder encodeObject:_contentViewController forKey:@"_contentViewController"];
-    [aCoder encodeObject:_delegate forKey:@"_delegate"];
-    [aCoder encodeObject:_animates forKey:@"_animates"];
+    [aCoder encodeInt:_appearance forKey:CPPopoverAppearanceKey];
+    [aCoder encodeBool:_animates forKey:CPPopoverAnimatesKey];
+    [aCoder encodeObject:_contentViewController forKey:CPPopoverContentViewControllerKey];
+    [aCoder encodeObject:_delegate forKey:CPPopoverDelegateKey];
+    [aCoder encodeInt:_behavior forKey:CPPopoverBehaviorKey];
 }

-@end
+@end
@@ -23,6 +23,7 @@
@import "CGGeometry.j"
@import "CPImageView.j"
@import "CPView.j"
+@import "CPWindow_Constants.j"


 /*
@@ -41,11 +42,7 @@ CPProgressIndicatorSpinningStyle    = 1;
 */
 CPProgressIndicatorHUDBarStyle      = 2;

-var CPProgressIndicatorSpinningStyleColors  = nil,
-
-    CPProgressIndicatorClassName            = nil,
-    CPProgressIndicatorStyleIdentifiers     = nil,
-    CPProgressIndicatorStyleSizes           = nil;
+var CPProgressIndicatorSpinningStyleColors  = nil;

 /*!
    @ingroup appkit
@@ -71,70 +68,17 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

    BOOL                        _isDisplayedWhenStoppedSet;
    BOOL                        _isDisplayedWhenStopped;
-
-    CPView                      _barView;
 }

-/*
-    @ignore
-*/
-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self != [CPProgressIndicator class])
-        return;
+    return @"progress-indicator";
+}

-    var bundle = [CPBundle bundleForClass:self];
-
-    CPProgressIndicatorSpinningStyleColors = [];
-
-    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
-    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.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)];
-    }
+ (CPDictionary)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 25, [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[@"indeterminate-bar-color", @"bar-color", @"default-height", @"bezel-color", @"spinning-mini-gif", @"spinning-small-gif", @"spinning-regular-gif"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -153,8 +97,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

        _controlSize = CPRegularControlSize;

-        [self updateBackgroundColor];
-        [self drawBar];
+        [self setNeedsLayout];
    }

    return self;
@@ -345,6 +288,8 @@ var CPProgressIndicatorSpinningStyleColors  = nil,

    _style = aStyle;

+    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
    [self updateBackgroundColor];
 }

@@ -356,8 +301,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"])];
 }

 /*!
@@ -407,56 +351,71 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 /* @ignore */
 - (void)drawBar
 {
-    if (_style == CPProgressIndicatorSpinningStyle)
-        return;
+    [self setNeedsLayout];
+}

-    if (!_barView)
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
+{
+    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
    {
-        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];
-        [self addSubview:_barView];
+        var width = CGRectGetWidth([self bounds]),
+            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+
+        if (barWidth > 0.0 && barWidth < 4.0)
+            barWidth = 4.0;
+
+        if (_isIndeterminate)
+            barWidth = width;
+
+        return _CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
    }

-    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
-        NO,
-        CPProgressIndicatorStyleSizes,
-        CPProgressIndicatorClassName,
-        @"Bar",
-        CPProgressIndicatorStyleIdentifiers[_style],
-        _CPControlIdentifierForControlSize(_controlSize))];
-
-    var width = CGRectGetWidth([self bounds]),
-        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
-
-    if (barWidth > 0.0 && barWidth < 4.0)
-        barWidth = 4.0;
-
-    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
+    return nil;
 }

 /* @ignore */
 - (void)updateBackgroundColor
 {
+    [self setNeedsLayout];
+}
+
+- (void)layoutSubviews
+{
+    CPProgressIndicatorSpinningStyleColors = [];
+
+    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
+    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
+    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
+
    if (YES)//_isBezeled)
    {
        if (_style == CPProgressIndicatorSpinningStyle)
        {
-            [_barView removeFromSuperview];
-
-            _barView = nil;
+            // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
+            [self layoutEphemeralSubviewNamed:"bar-view"
+                                   positioned:CPWindowBelow
+              relativeToEphemeralSubviewNamed:nil];

            [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
        }
        else
        {
-            [self setBackgroundColor:_CPControlThreePartImagePattern(
-                NO,
-                CPProgressIndicatorStyleSizes,
-                CPProgressIndicatorClassName,
-                @"BezelBorder",
-                CPProgressIndicatorStyleIdentifiers[_style],
-                _CPControlIdentifierForControlSize(_controlSize))];
+           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
+                                                 positioned:CPWindowBelow
+                            relativeToEphemeralSubviewNamed:nil];
+
+           if (_isIndeterminate)
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
+           else
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];

-            [self drawBar];
        }
    }
    else
@@ -477,10 +436,12 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
        _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
        _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
        _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
-        _style                      = [aCoder decodeObjectForKey:@"_style"];
+        _style                      = [aCoder decodeIntForKey:@"_style"];
        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
        _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
+
+        [self updateBackgroundColor];
    }

    return self;
@@ -488,14 +449,19 @@ 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.
+    var backgroundColor = [self backgroundColor];
+    [self setBackgroundColor:nil];
    [super encodeWithCoder:aCoder];
+    [self setBackgroundColor:backgroundColor];

    [aCoder encodeObject:_minValue forKey:@"_minValue"];
    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
-    [aCoder encodeObject:_style forKey:@"_style"];
+    [aCoder encodeInt:_style forKey:@"_style"];
    [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
    [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
    [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
@@ -25,6 +25,8 @@

@import "CPButton.j"

+@global CPApp
+

 /*!
    @ingroup appkit
@@ -150,6 +152,14 @@ CPRadioImageOffset = 4.0;
        [_radioGroup _setSelectedRadio:self];
 }

+- (void)sendAction:(SEL)anAction to:(id)anObject
+{
+    [super sendAction:anAction to:anObject];
+
+    if (_radioGroup)
+        [CPApp sendAction:[_radioGroup action] to:[_radioGroup target] from:_radioGroup];
+}
+
@end

 var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
@@ -173,6 +183,23 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
    [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
 }

+- (CPImage)image
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (CPImage)alternateImage
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    var startedTracking = [super startTrackingAt:aPoint];
+    [self highlight:YES];
+    return startedTracking;
+}
+
@end

@implementation CPRadioGroup : CPObject
@@ -220,8 +247,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";

    [_selectedRadio setState:CPOffState];
    _selectedRadio = aRadio;
-
-    [CPApp sendAction:_action to:_target from:self];
 }

 - (CPRadio)selectedRadio
@@ -21,7 +21,11 @@
 */

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

+@import "CPEvent.j"
+
+@class CPKeyBinding

 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;
@@ -82,6 +82,22 @@
 }

 /*! @cond */
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding == CPValueBinding)
+        return [CPPredicateEditorValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
+- (id)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return @"predicate";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
 - (void)_initRuleEditorShared
 {
    [super _initRuleEditorShared];
@@ -157,28 +173,40 @@
    return trees;
 }

- (id)_mergeTree:(id)tree
+- (CPMutableArray)_mergeTree:(CPArray)aTree
 {
-    var merged = [CPMutableArray array],
-        titles = [CPMutableArray array],
-        count = [tree count];
+    var mergedTree = [CPMutableArray array];
+    if (aTree == nil)
+        return mergedTree;

-    for (var i = 0; i < count; i++)
+    var icount = [aTree count];
+    for (var i = 0; i < icount; i++)
    {
-        var t = tree[i],
-            title = [CPString stringWithString:[t title]];
+        var anode = [aTree objectAtIndex:i],
+            jcount = [mergedTree count],
+            merged = NO;

-        if ([titles containsObject:title])
+        for (var j = 0; j < jcount; j++)
        {
-            CPLogConsole("CPPredicateEditor does not support templates merging yet. Ignoring duplicate template: " + [t description]);
-            continue;
+            var mergednode = [mergedTree objectAtIndex:j];
+
+            if ([[mergednode title] isEqualToString:[anode title]])
+            {
+                var children1 = [mergednode children],
+                    children2 = [anode children],
+                    children12 = [children1 arrayByAddingObjectsFromArray:children2],
+                    mergedChildren = [self _mergeTree:children12];
+
+                [mergednode setChildren:mergedChildren];
+                merged = YES;
+            }
        }

-        [merged addObject:t];
-        [titles addObject:title];
+        if (!merged)
+            [mergedTree addObject:anode];
    }

-    return merged;
+    return mergedTree;
 }

 - (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
@@ -192,7 +220,7 @@
        var children = [CPArray array],
            itemsCount = 0,
            menuIndex = -1,
-            itemsArray,
+            itemArray,

            templateView = [templateViews objectAtIndex:count],
            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
@@ -200,7 +228,7 @@
        if (isPopup)
        {
            itemArray = [[templateView itemArray] valueForKey:@"title"];
-            itemsCount = [itemArray count],
+            itemsCount = [itemArray count];
            menuIndex = 0;
        }

@@ -227,14 +255,19 @@

 - (void)setObjectValue:(id)objectValue
 {
-    if (![[objectValue predicateFormat] isEqualToString:[[super predicate] predicateFormat]]) // ??
+    var ov = [self objectValue];
+    if ((ov == nil) != (objectValue == nil) || ![ov isEqual:objectValue])
+    {
+        [self _setPredicate:objectValue];
        [self _reflectPredicate:objectValue];
+    }
 }

 - (void)_reflectPredicate:(id)predicate
 {
    var animation = _currentAnimation;
    _currentAnimation = nil;
+    _sendAction = NO;

    if (predicate != nil)
    {
@@ -311,9 +344,9 @@
            treeChild = [rootItems objectAtIndex:i];

            var currentView = [templateViews objectAtIndex:[treeChild indexIntoTemplate]],
-                menuItemIndex = [treeChild menuItemIndex];
+                title = [treeChild title];

-            if (menuItemIndex == -1 || [[treeChild title] isEqual:[currentView titleOfSelectedItem]])
+            if (title == nil || [title isEqual:[currentView titleOfSelectedItem]])
            {
                var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
                [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
@@ -336,16 +369,15 @@

 - (void)_updatePredicate
 {
-    [self willChangeValueForKey:@"objectValue"];
    [self _updatePredicateFromRows];
-    [self didChangeValueForKey:@"objectValue"];
 }

 - (void)_updatePredicateFromRows
 {
    var rootRowsArray = [super _rootRowsArray],
        subpredicates = [CPMutableArray array],
-        count = count2 = [rootRowsArray count],
+        count,
+        count2 = count = [rootRowsArray count],
        predicate;

    while (count--)
@@ -362,7 +394,7 @@
    else
        predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:subpredicates];

-    [super _setPredicate:predicate];
+    [self _setPredicate:predicate];
 }

 - (id)_predicateFromRowItem:(id)rowItem
@@ -373,12 +405,13 @@
    if (rowType == CPRuleEditorRowTypeCompound)
    {
        var subrows = [rowItem valueForKey:_subrowsArrayKeyPath],
-        count = [subrows count];
+            count = [subrows count];

        for (var i = 0; i < count; i++)
        {
-            var subrow = [subrows objectAtIndex:i];
-            var predicate = [self _predicateFromRowItem:subrow];
+            var subrow = [subrows objectAtIndex:i],
+                predicate = [self _predicateFromRowItem:subrow];
+
            [subpredicates addObject:predicate];
        }
    }
@@ -414,7 +447,6 @@

 - (void)_sendRuleAction
 {
-    [self _updatePredicate];
    [super _sendRuleAction];
 }

@@ -483,9 +515,11 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
 - (id)initWithCoder:(id)aCoder
 {
    self = [super initWithCoder:aCoder];
+
    if (self != nil)
    {
        var nibTemplates = [aCoder decodeObjectForKey:CPPredicateTemplatesKey];
+
        if (nibTemplates != nil)
            [self setRowTemplates:nibTemplates];
    }
@@ -501,4 +535,19 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";

@end

-/*! @endcond */
+@implementation CPPredicateEditorValueBinder : CPBinder
+{
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source _reflectPredicate:nil];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source _reflectPredicate:aValue];
+}
+
+@end
+/*! @endcond */
@@ -20,17 +20,28 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-CPUndefinedAttributeType     = 0,
-CPInteger16AttributeType     = 100,
-CPInteger32AttributeType     = 200,
-CPInteger64AttributeType     = 300,
-CPDecimalAttributeType       = 400,
-CPDoubleAttributeType        = 500,
-CPFloatAttributeType         = 600,
-CPStringAttributeType        = 700,
-CPBooleanAttributeType       = 800,
-CPDateAttributeType          = 900,
-CPBinaryDataAttributeType    = 1000,
+@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;
+CPInteger64AttributeType     = 300;
+CPDecimalAttributeType       = 400;
+CPDoubleAttributeType        = 500;
+CPFloatAttributeType         = 600;
+CPStringAttributeType        = 700;
+CPBooleanAttributeType       = 800;
+CPDateAttributeType          = 900;
+CPBinaryDataAttributeType    = 1000;
 CPTransformableAttributeType = 1800;

@implementation CPPredicateEditorRowTemplate : CPObject
@@ -185,7 +196,8 @@ CPTransformableAttributeType = 1800;
        if (![[self operators] containsObject:[predicate predicateOperatorType]])
            return 0;

-        if (!_rightIsWildcard && ![[self rightExpressions] containsObject:[predicate rightExpression]]) return 0;
+        if (!_rightIsWildcard && ![[self rightExpressions] containsObject:[predicate rightExpression]])
+            return 0;

        return 1;
    }
@@ -280,7 +292,7 @@ CPTransformableAttributeType = 1800;
 */
 - (CPArray)leftExpressions
 {
-    if (_templateType ==1 && !_leftIsWildcard)
+    if (_templateType == 1 && !_leftIsWildcard)
    {
        var view = [_views objectAtIndex:0];
        return [[view itemArray] valueForKey:@"representedObject"];
@@ -582,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++)
@@ -685,6 +697,7 @@ CPTransformableAttributeType = 1800;
    [textField setBordered:YES];
    [textField setEditable:YES];
    [textField setFont:[CPFont systemFontOfSize:10]];
+    [textField setSendsActionOnEndEditing:YES];

    return textField;
 }
@@ -785,4 +798,4 @@ var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
 }

@end
-/*! @endcond */
+/*! @endcond */
@@ -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;
@@ -14,25 +30,21 @@

 + (id)rowNodeFromTree:(id)aTree
 {
-    var mapTable = {};
-    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:mapTable];
+    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:{}];
 }

 + (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable
 {
-    var node,
-        views,
+    var views,
        copiedContainer;

-    node = [[_CPPredicateEditorRowNode alloc] init];
-    node.tree = aTree;
+    var uuid = [[aTree template] UID],
+        cachedNode = templateTable[uuid],
+        node = [[_CPPredicateEditorRowNode alloc] init];

-    var template = [aTree template],
-        uuid = [template UID];
+    [node setTree:aTree];

-    var cachedNode = templateTable[uuid];
-
-    if (cachedNode == nil)
+    if (!cachedNode)
    {
        views = [CPMutableArray array];
        copiedContainer = [CPMutableArray array];
@@ -44,8 +56,8 @@
        copiedContainer = [cachedNode copiedTemplateContainer];
    }

-    node.templateViews = views;
-    node.copiedTemplateContainer = copiedContainer;
+    [node setTemplateViews:views];
+    [node setCopiedTemplateContainer:copiedContainer];

    var nodeChildren = [CPMutableArray array],
        treeChildren = [aTree children],
@@ -66,7 +78,9 @@

 - (BOOL)applyTemplate:(id)template withViews:(id)views forOriginalTemplate:(id)originalTemplate
 {
-    var t = [tree template];
+    var t = [tree template],
+        count = [children count];
+
    if (t !== template)
    {
        [templateViews setArray:views];
@@ -74,8 +88,7 @@
        [copiedTemplateContainer addObject:template];
    }

-    var count = [children count];
-    for (var i; i < count; i++)
+    for (var i = 0; i < count; i++)
        [children[i] applyTemplate:template withViews:views forOriginalTemplate:originalTemplate];
 }

@@ -89,9 +102,8 @@

 - (void)copyTemplateIfNecessary
 {
-    if ([copiedTemplateContainer count] == 0)
+    if ([copiedTemplateContainer count] === 0)
    {
-        CPLogConsole("COPYING TEMPLATE");
        var copy = [[tree template] copy];
        [copiedTemplateContainer addObject:copy];
        [templateViews addObjectsFromArray:[copy templateViews]];
@@ -118,7 +130,8 @@
 - (id)displayValue
 {
    var title = [self title];
-    if (title != nil)
+
+    if (title !== nil)
        return title;

    return [self templateView];
@@ -129,4 +142,4 @@
    return [CPString stringWithFormat:@"<%@ %@ %@ tree:%@ tviews:%@", [self className],[self UID], [self title], [tree UID], [templateViews description]];
 }

-@end
+@end
@@ -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,19 +1,35 @@
 /*
- *     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 regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
+var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");

@implementation _CPRuleEditorLocalizer : CPObject
 {
    CPDictionary    _dictionary @accessors(property=dictionary);
    CPURLConnection connection;
-    CPURLRequest    resquest;
+    CPURLRequest    request;
 }

 - (void)loadContentOfURL:(CPURL)aURL
@@ -24,9 +40,10 @@ var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");

 - (void)reloadIfNeeded
 {
-    if (connection != nil) // Connection waiting
+    if (connection !== nil) // Connection waiting
    {
        connection = nil;
+
        var data = [CPURLConnection sendSynchronousRequest:request returningResponse:NULL];
        [self loadContent:[data rawString]];
    }
@@ -34,7 +51,7 @@ var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");

 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)rawString
 {
-    if (connection != nil && rawString != nil)
+    if (connection !== nil && rawString !== nil)
        [self loadContent:rawString];

    connection = nil;
@@ -49,10 +66,12 @@ var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
    for (var i = 0 ; i < count ; i++)
    {
        var line = [lines objectAtIndex:i];
+
        if (line.length > 1)
        {
-            var match = regex.exec(line);
-            if (match.length >= 3)
+            var match = LocalizerStringsRegex.exec(line);
+
+            if (match && match.length >= 3)
                [dict setObject:match[2] forKey:match[1]];
        }
    }
@@ -64,12 +83,15 @@ var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
 {
    [self reloadIfNeeded];

-    if (_dictionary != nil && aString != nil)
+    if (_dictionary !== nil && aString !== nil)
    {
        var localized = [_dictionary objectForKey:aString];
-        if (localized != nil)
-                return localized;
+
+        if (localized !== nil)
+            return localized;
    }

    return aString;
-}
+}
+
+@end
@@ -1,64 +1,103 @@
 /*
- *     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";
+
 var GRADIENT_NORMAL,
    GRADIENT_HIGHLIGHTED,
-    IE_FILTER = "progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dfdfdf')";
+    GRADIENT_PROPERTY;
+
+if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+{
+    GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_START_COLOR + "), to(" + GRADIENT_END_COLOR + "))",
+    GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_END_COLOR + "), to(" + GRADIENT_START_COLOR + "))";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+{
+    GRADIENT_NORMAL = "-moz-linear-gradient(top, " + GRADIENT_START_COLOR + ", " + GRADIENT_END_COLOR + ")",
+    GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top, " + GRADIENT_END_COLOR + ", " + GRADIENT_START_COLOR + ")";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+{
+    GRADIENT_NORMAL = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_START_COLOR + "', endColorstr='" + GRADIENT_END_COLOR + "')";
+    GRADIENT_HIGHLIGHTED = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_END_COLOR + "', endColorstr='" + GRADIENT_START_COLOR + "')";
+    GRADIENT_PROPERTY = "filter";
+}else
+{
+    GRADIENT_NORMAL = GRADIENT_START_COLOR;
+    GRADIENT_HIGHLIGHTED = GRADIENT_END_COLOR;
+    GRADIENT_PROPERTY = "background";
+}

@implementation _CPRuleEditorPopUpButton : CPPopUpButton
 {
    CPInteger radius;
 }

-+ (void)initialize
+- (void)_sharedInit
 {
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-    {
-        GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(rgb(252, 252, 252)), to(rgb(223, 223, 223)))",
-        GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(rgb(223, 223, 223)), to(rgb(252, 252, 252)))";
-    }
-    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-    {
-        GRADIENT_NORMAL = "-moz-linear-gradient(top,  rgb(252, 252, 252),  rgb(223, 223, 223))",
-        GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top,  rgb(223, 223, 223),  rgb(252, 252, 252))";
-    }
+    [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
 {
    if (self = [super initWithFrame:aFrame])
-    {
-        var style = _DOMElement.style;
-        style.backgroundImage = GRADIENT_NORMAL;
-        style.border = "1px solid rgb(189, 189, 189)";
-        style.filter = IE_FILTER;
-
-        [self setTextColor:[CPColor colorWithWhite:101/255 alpha:1]];
-        [self setBordered:NO];
-     }
+        [self _sharedInit];

    return self;
 }

- (id)hitTest:(CPPoint)point
+- (id)initWithCoder:(CPCoder)aCoder
 {
-    var slice = [self superview];
-    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+    self = [super initWithCoder:aCoder];
+    [self _sharedInit];
+
+    return self;
+}
+
+- (id)hitTest:(CGPoint)point
+{
+    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
        return nil;

    return self;
 }

- (void)setHighlighted:(BOOL)shouldHighlight
-{
-    _DOMElement.style.backgroundImage = (shouldHighlight) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
-}
-
 - (BOOL)sliceIsEditable
 {
-    return [[self superview] isEditable];
+    var superview = [self superview];
+    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
 }

 - (BOOL)trackMouse:(CPEvent)theEvent
@@ -80,34 +119,32 @@ var GRADIENT_NORMAL,

 - (void)layoutSubviews
 {
-    radius = FLOOR(CGRectGetHeight([self bounds])/2);
-
+#if PLATFORM(DOM)
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
    var style = _DOMElement.style,
        radiusCSS = radius + "px";

-    //style.webkitBorderRadius = radiusCSS;
-    //style.mozBorderRadius = radiusCSS;
    style.borderRadius = radiusCSS;
+#endif

    [super layoutSubviews];
 }

 - (void)drawRect:(CGRect)aRect
 {
-    var bounds = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    var arrow_width = FLOOR(CGRectGetHeight(bounds)/3.5);
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds],
+        arrow_width = FLOOR(CGRectGetHeight(bounds) / 3.5);

    CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);

    var arrowsPath = [CPBezierPath bezierPath];
    [arrowsPath moveToPoint:CGPointMake(0, 1)];
    [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
-    [arrowsPath lineToPoint:CGPointMake(arrow_width/2, arrow_width + 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width / 2, arrow_width + 1)];
    [arrowsPath closePath];

-    CGContextSetFillColor(context, [CPColor colorWithWhite:101/255 alpha:1]);
+    CGContextSetFillColor(context, [CPColor colorWithWhite:101 / 255 alpha:1]);
    [arrowsPath fill];

    CGContextScaleCTM(context, 1 , -1);
@@ -121,37 +158,46 @@ var GRADIENT_NORMAL,
    CPInteger radius;
 }

+- (void)_sharedInit
+{
+    [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
 {
-    self = [super initWithFrame:aFrame];
-    if (self)
-    {
-        [self setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
-        [self setTextColor:[CPColor colorWithWhite:150/255 alpha:1]];
-        [self setAlignment:CPCenterTextAlignment];
-        [self setAutoresizingMask:CPViewMinXMargin];
-        [self setImagePosition:CPImageOnly];
-        [self setBordered:NO];
-        var style = _DOMElement.style;
-        style.border = "1px solid rgb(189, 189, 189)";
-        style.filter = IE_FILTER;
-    }
+    if (self = [super initWithFrame:aFrame])
+        [self _sharedInit];
+
+    return self;
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+    [self _sharedInit];

    return self;
 }

 - (void)layoutSubviews
 {
-    radius = FLOOR(CGRectGetHeight([self bounds])/2);
+#if PLATFORM(DOM)
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);

    var style = _DOMElement.style,
        radiusCSS = radius + "px";

    style.borderRadius = radiusCSS;
-    style.backgroundImage = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+#endif

    [super layoutSubviews];
 }

@end
-
@@ -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
@@ -41,11 +58,11 @@
    _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
@@ -63,7 +80,7 @@

 // Draw Top Border
    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 1, 0);
+    CGContextMoveToPoint(context, 0, 0);
    CGContextAddLineToPoint(context, maxX, 0);
    CGContextClosePath(context);
    CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
@@ -71,8 +88,8 @@

 // Draw Bottom Border
    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 1, maxY - 0.5);
-    CGContextAddLineToPoint(context, maxX, maxY - 0.5);
+    CGContextMoveToPoint(context, 0, maxY);
+    CGContextAddLineToPoint(context, maxX, maxY);
    CGContextClosePath(context);
    var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
    CGContextSetStrokeColor(context, bottomColor);
@@ -81,13 +98,13 @@

 - (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 setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
+    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
+    [_addButton setHidden:!_editable];
+    [_subtractButton setHidden:!_editable];
    [self addSubview:_addButton];
    [self addSubview:_subtractButton];

@@ -54,26 +70,36 @@ var CONTROL_HEIGHT = 16.,
    [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
 }

- (CPButton)_createAddRowButton
+- (CPButton)_createRowButton
 {
    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setImage:[_ruleEditor _addImage]];
+    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
+    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
+    [button setAlignment:CPCenterTextAlignment];
+    [button setAutoresizingMask:CPViewMinXMargin];
+    [button setImagePosition:CPImageOnly];

+    return button;
+}
+
+- (CPButton)_createAddRowButton
+{
+    var button = [self _createRowButton];
+
+    [button setImage:[_ruleEditor _addImage]];
    [button setAction:@selector(_addOption:)];
    [button setTarget:self];
-    [button setAutoresizingMask:CPViewMinXMargin];

    return button;
 }

 - (CPButton)_createDeleteRowButton
 {
-    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setImage:[_ruleEditor _removeImage]];
+    var button = [self _createRowButton];

+    [button setImage:[_ruleEditor _removeImage]];
    [button setAction:@selector(_deleteOption:)];
    [button setTarget:self];
-    [button setAutoresizingMask:CPViewMinXMargin];

    return button;
 }
@@ -87,12 +113,14 @@ var CONTROL_HEIGHT = 16.,

 - (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
 {
-    var title = [[itemsArray objectAtIndex:index] title];
-    var font = [_ruleEditor font],
+    var title = [[itemsArray objectAtIndex:index] title],
+        font = [_ruleEditor font],
        width = [title sizeWithFont:font].width + 20,
-        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT);
+        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),

-    var popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
+        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
+
+    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
    [popup setValue:font forThemeAttribute:@"font"];

    var count = [itemsArray count];
@@ -109,16 +137,18 @@ var CONTROL_HEIGHT = 16.,
    return [CPMenuItem separatorItem];
 }

- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString )text
+- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
 {
-    text = [[_ruleEditor standardLocalizer] localizedStringForString:text];
+    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];
+
+    [textField setFrameSize:CGSizeMake(size.width + 4, CONTROL_HEIGHT + 2)];

-    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)];
-    var font = [_ruleEditor font];
-    font = [CPFont fontWithName:font._name size:font._size + 2];
    [textField setValue:font forThemeAttribute:@"font"];
-    [textField setStringValue:text];
-    [textField sizeToFit];
+    [textField setStringValue:localizedText];

    return textField;
 }
@@ -182,9 +212,10 @@ var CONTROL_HEIGHT = 16.,
        parent,
        numberOfCriteria,
        numberOfChildren,
-        firstResponderIndex;
+        firstResponderIndex,

-    var ruleItems = [CPMutableArray array];
+        ruleItems = [CPMutableArray array],
+        responder = [[self window] firstResponder];

    [self _emptyRulePartSubviews];

@@ -192,7 +223,6 @@ var CONTROL_HEIGHT = 16.,
    numberOfCriteria = [criteria count];

    firstResponderIndex = numberOfCriteria - 1;
-    var responder = [[self window] firstResponder];
    if (responder)
        firstResponderIndex = [_ruleOptionViews indexOfObjectIdenticalTo:responder];

@@ -213,16 +243,16 @@ var CONTROL_HEIGHT = 16.,
        numberOfChildren = [childItems count];
        if (numberOfChildren > 1)
        {
-            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren];
+            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren],
+                selectedIndex = [childItems indexOfObject:criterion];

-            var selectedIndex = [childItems indexOfObject:criterion];
            if (selectedIndex == CPNotFound)
                break;

            for (var j = 0; j < numberOfChildren; ++j)
            {
-                var childItem = [childItems objectAtIndex:j];
-                var childValue = [childValues objectAtIndex:j];
+                var childItem = [childItems objectAtIndex:j],
+                    childValue = [childValues objectAtIndex:j];

                if ([childValue isKindOfClass:[CPMenuItem class]])
                {
@@ -250,8 +280,8 @@ var CONTROL_HEIGHT = 16.,
        }
        else
        {
-            var value = [childValues objectAtIndex:0];
-            var type = [value valueType];
+            var value = [childValues objectAtIndex:0],
+                type = [value valueType];

            if (type === 0)
                ruleView = [self _createStaticTextFieldWithStringValue:value];
@@ -287,7 +317,7 @@ var CONTROL_HEIGHT = 16.,

    [_correspondingRuleItems setArray:ruleItems];

-    if (!editable)
+    if (!_editable)
        [self _updateEnabledStateForSubviews];

    [self _relayoutSubviewsWidthChanged:YES];
@@ -308,7 +338,6 @@ var CONTROL_HEIGHT = 16.,

 - (void)layoutSubviews
 {
-    // CPLogConsole(_cmd);
    [self _relayoutSubviewsWidthChanged:YES];
 }

@@ -319,11 +348,11 @@ var CONTROL_HEIGHT = 16.,
        leftButtonMinX,
        rowHeight = [_ruleEditor rowHeight],
        count = [_ruleOptionViews count],
-        sliceFrame = [self frame];
+        sliceFrame = [self frame],
+
+        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);

-    var buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT)/2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
    [_addButton setFrame:buttonFrame];
-
    buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
    [_subtractButton setFrame:buttonFrame];

@@ -339,7 +368,8 @@ var CONTROL_HEIGHT = 16.,
        var ruleOptionView = _ruleOptionViews[i],
            optionFrame = _ruleOptionFrames[i];

-        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame))/2 - 2;
+        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
+
        if (widthChanged)
        {
            optionFrame.origin.x = optionViewOriginX;
@@ -369,14 +399,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];
 }
@@ -418,7 +443,7 @@ var CONTROL_HEIGHT = 16.,

 - (float)_rowButtonsRightHorizontalPadding
 {
-    return 10.;
+    return ([[_ruleEditor superview] isKindOfClass:[CPClipView class]]) ? 18. : 10.;
 }

 - (void)_setRowTypeToAddFromPlusButton:(int)type
@@ -452,7 +477,7 @@ var CONTROL_HEIGHT = 16.,
    [self layoutSubviews];
 }

- (void)drawRect:(CPRect)rect
+- (void)drawRect:(CGRect)rect
 {
    [super drawRect:rect];
 }
@@ -464,22 +489,16 @@ 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];
    [_ruleEditor _sendRuleAction];
 }

 - (void)_textDidChange:(CPNotification)aNotif
 {
    if ([[aNotif object] superview] == self && [_ruleEditor _sendsActionOnIncompleteTextChange])
-        [_ruleEditor _sendRuleAction];
+        [self _sendRuleAction:nil];
 }

@end
@@ -491,19 +510,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
+- (id)hitTest:(CGPoint)point
 {
-    if (!CPRectContainsPoint([self frame], point))
+    if (!CGRectContainsPoint([self frame], point))
        return nil;

    return [self superview];
@@ -5,6 +5,9 @@
 * Created by Francisco Tolmasky.
 * Copyright 2008, 280 North, Inc.
 *
+ * Modified to match Lion style by Antoine Mercadal 2011
+ * <antoine.mercadal@archipelproject.org>
+ *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
@@ -20,8 +23,14 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import "CPControl.j"
+#include "../Foundation/Foundation.h"

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

 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -54,6 +63,17 @@ NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
 NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";


+CPScrollerStyleLegacy           = 0;
+CPScrollerStyleOverlay          = 1;
+
+CPScrollerKnobStyleDefault      = 0;
+CPScrollerKnobStyleDark         = 1;
+CPScrollerKnobStyleLight        = 2;
+
+CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
+CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
+CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
+
@implementation CPScroller : CPControl
 {
    CPControlSize           _controlSize;
@@ -68,8 +88,19 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    CPScrollerPart          _trackingPart;
    float                   _trackingFloatValue;
    CGPoint                 _trackingStartPoint;
+
+    CPViewAnimation         _animationScroller;
+
+    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
+    int                     _style;
+    CPTimer                 _timerFadeOut;
+    BOOL                    _isMouseOver;
 }

+
+#pragma mark -
+#pragma mark Class methods
+
 + (CPString)defaultThemeClass
 {
    return "scroller";
@@ -78,49 +109,43 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 + (id)themeAttributes
 {
    return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 15.0,
-        @"knob-slot-color": [CPColor lightGrayColor],
+        @"scroller-width": 7.0,
+        @"knob-slot-color": [CPNull null],
        @"decrement-line-color": [CPNull null],
        @"increment-line-color": [CPNull null],
-        @"knob-color": [CPColor grayColor],
+        @"knob-color": [CPNull null],
        @"decrement-line-size":_CGSizeMakeZero(),
        @"increment-line-size":_CGSizeMakeZero(),
        @"track-inset":_CGInsetMakeZero(),
        @"knob-inset": _CGInsetMakeZero(),
-        @"minimum-knob-length":21.0
-    }]
+        @"minimum-knob-length":21.0,
+        @"track-border-overlay": 9.0
+    }];
 }

-
-// Calculating Layout
-
- (id)initWithFrame:(CGRect)aFrame
+ (float)scrollerWidth
 {
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _controlSize = CPRegularControlSize;
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
-        _hitPart = CPScrollerNoPart;
-
-        [self _calculateIsVertical];
-    }
-
-    return self;
+    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
 }

-// Determining CPScroller Size
 /*!
    Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidth
+ (float)scrollerWidthInStyle:(int)aStyle
 {
-    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
+    var scroller = [[self alloc] init];
+
+    if (aStyle == CPScrollerStyleLegacy)
+        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
+    return [scroller currentValueForThemeAttribute:@"scroller-width"];
+}
+
+/*!
+    Returns the CPScroller's overlay value.
+*/
+ (float)scrollerOverlay
+{
+    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
 }

 /*!
@@ -132,6 +157,87 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    return [self scrollerWidth];
 }

+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+
+        _hitPart = CPScrollerNoPart;
+        _allowFadingOut = YES;
+        _isMouseOver = NO;
+        _style = CPScrollerStyleOverlay;
+        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
+                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
+
+        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
+        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
+        [_animationScroller setDelegate:self];
+        [self setAlphaValue:0.0];
+        [self _calculateIsVertical];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Getters / Setters
+
+/*!
+    Returns the scroller's style
+*/
+- (void)style
+{
+    return _style;
+}
+
+/*!
+    Set the scroller's control size
+    @param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
+*/
+- (void)setStyle:(id)aStyle
+{
+    if (_style != nil && _style === aStyle)
+        return;
+
+    _style = aStyle;
+
+    if (_style === CPScrollerStyleLegacy)
+    {
+        [self fadeIn];
+        [self setThemeState:CPThemeStateScrollViewLegacy];
+    }
+    else
+    {
+        _allowFadingOut = YES;
+        [self unsetThemeState:CPThemeStateScrollViewLegacy];
+    }
+
+    //[self _adjustScrollerSize];
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+}
+
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
 /*!
    Sets the scroller's size.
    @param aControlSize the scroller's size
@@ -147,27 +253,6 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    [self setNeedsDisplay:YES];
 }

-/*!
-    Returns the scroller's control size
-*/
- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
- (void)setKnobProportion:(float)aProportion
-{
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
 /*!
    Return's the knob's proportion
 */
@@ -176,17 +261,50 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    return _knobProportion;
 }

- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+/*!
+    Set the knob's proportion
+    @param aProportion the desired proportion
+*/
+- (void)setKnobProportion:(float)aProportion
 {
-    var themeState = _themeState;
+    if (!_IS_NUMERIC(aProportion))
+        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];

-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));

-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
 }

-// Calculating Layout
+
+#pragma mark -
+#pragma mark Privates
+
+/*! @ignore */
+- (void)_adjustScrollerSize
+{
+    var frame = [self frame],
+        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
+
+    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
+        frame.size.width = scrollerWidth;
+
+    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
+        frame.size.height = scrollerWidth;
+
+    [self setFrame:frame];
+}
+
+/*! @ignore */
+- (void)_performFadeOut:(CPTimer)aTimer
+{
+    [self fadeOut];
+    _timerFadeOut = nil;
+}
+
+
+#pragma mark -
+#pragma mark Utilities

 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -208,6 +326,9 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    // The ordering of these tests is important.  We check the knob and
    // page rects first since they may overlap with the arrows.

+    if (![self hasThemeState:CPThemeStateSelected])
+        return CPScrollerNoPart;
+
    if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
        return CPScrollerKnob;

@@ -330,7 +451,35 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    return _usableParts;
 }

-// Drawing the Parts
+/*!
+    Display the scroller
+*/
+- (void)fadeIn
+{
+    if (_isMouseOver && _knobProportion != 1.0)
+        [self setThemeState:CPThemeStateSelected];
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    [self setAlphaValue:1.0];
+}
+
+/*!
+    Start the fade out anination
+*/
+- (void)fadeOut
+{
+    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
+        return;
+
+    [_animationScroller startAnimation];
+}
+
+
+#pragma mark -
+#pragma mark  Drawing
+
 /*!
    Draws the specified arrow and sets the highlight.
    @param anArrow the arrow to draw
@@ -379,10 +528,12 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";

 - (void)layoutSubviews
 {
+    [self _adjustScrollerSize];
    [self checkSpaceForParts];

    var index = 0,
-        count = PARTS_ARRANGEMENT.length;
+        count = PARTS_ARRANGEMENT.length,
+        view;

    for (; index < count; ++index)
    {
@@ -457,7 +608,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    }

    [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-    
+
    if (type === CPLeftMouseDragged)
        [self sendAction:[self action] to:[self target]];
 }
@@ -565,6 +716,20 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    [self setNeedsLayout];
 }

+
+#pragma mark -
+#pragma mark Overrides
+
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+{
+    var themeState = _themeState;
+
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
+
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
    if (![self isEnabled])
@@ -583,10 +748,53 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
    }
 }

+- (void)mouseEntered:(CPEvent)anEvent
+{
+    [super mouseEntered:anEvent];
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    if (![self isEnabled])
+        return;
+
+    _allowFadingOut = NO;
+    _isMouseOver = YES;
+
+    if ([self alphaValue] > 0 && _knobProportion != 1.0)
+        [self setThemeState:CPThemeStateSelected];
+}
+
+- (void)mouseExited:(CPEvent)anEvent
+{
+    [super mouseExited:anEvent];
+
+    if ([self isHidden] || ![self isEnabled] || !_isMouseOver)
+        return;
+
+    _allowFadingOut = YES;
+    _isMouseOver = NO;
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    _timerFadeOut = [CPTimer scheduledTimerWithTimeInterval:1.2 target:self selector:@selector(_performFadeOut:) userInfo:nil repeats:NO];
+}
+
+
+#pragma mark -
+#pragma mark Delegates
+
+- (void)animationDidEnd:(CPAnimation)animation
+{
+    [self unsetThemeState:CPThemeStateSelected];
+}
+
@end

-var CPScrollerControlSizeKey = "CPScrollerControlSize",
-    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
+var CPScrollerControlSizeKey = @"CPScrollerControlSize",
+    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
+    CPScrollerStyleKey = @"CPScrollerStyleKey";

@implementation CPScroller (CPCoding)

@@ -595,10 +803,12 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",
    if (self = [super initWithCoder:aCoder])
    {
        _controlSize = CPRegularControlSize;
+
        if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
            _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];

        _knobProportion = 1.0;
+
        if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
            _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];

@@ -606,20 +816,20 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",

        _hitPart = CPScrollerNoPart;

+        _allowFadingOut = YES;
+        _isMouseOver = NO;
+
+        var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
+                                                           forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
+
+        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
+        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
+        [_animationScroller setDelegate:self];
+        [self setAlphaValue:0.0];
+
        [self _calculateIsVertical];

-        // Adjust the size of the scroller if the size from cib
-        // isn't equal to the scrollerWidth
-        var frame = [self frame],
-            scrollerWidth = [CPScroller scrollerWidth];
-
-        if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-            frame.size.width = scrollerWidth;
-
-        if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-            frame.size.height = scrollerWidth;
-
-        [self setFrame:frame];
+        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
    }

    return self;
@@ -631,6 +841,7 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",

    [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
    [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
+    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }

@end
@@ -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,15 @@ 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 [CPDictionary dictionaryWithJSObject:
+        {
+            @"image-search": [CPNull null],
+            @"image-find": [CPNull null],
+            @"image-cancel": [CPNull null],
+            @"image-cancel-pressed": [CPNull null]
+        }];
 }

 - (id)initWithFrame:(CGRect)frame
@@ -170,10 +166,10 @@ 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:CPScaleToFit];
+    [button setImageScaling:CPImageScaleAxesIndependently];
    [button setImage:searchButtonImage];
    [button setAutoresizingMask:CPViewMaxXMargin];
 }
@@ -193,6 +189,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
        [_cancelButton setTarget:self];
        [_cancelButton setAction:@selector(cancelOperation:)];
+        [_cancelButton setButtonType:CPMomentaryChangeButton];
        [self _updateCancelButtonVisibility];
        [self addSubview:_cancelButton];
    }
@@ -215,9 +212,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
    var button = [self cancelButton];
    [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
-    [button setImage:CPSearchFieldCancelImage];
-    [button setAlternateImage:CPSearchFieldCancelPressedImage];
+    [button setImageScaling:CPImageScaleAxesIndependently];
+    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
+    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
    [button setAutoresizingMask:CPViewMinXMargin];
    [button setTarget:self];
    [button setAction:@selector(cancelOperation:)];
@@ -258,7 +255,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 +267,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
@@ -501,7 +502,12 @@ var RECENT_SEARCH_PREFIX = @"   ";
    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];
    }
@@ -674,7 +680,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;
@@ -55,7 +58,7 @@ CPSegmentSwitchTrackingMomentary = 2;

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPImageScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
                                       forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
 }

@@ -115,13 +118,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];
 }
@@ -366,11 +371,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 +468,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);
@@ -796,6 +804,7 @@ CPSegmentSwitchTrackingMomentary = 2;
            return;

        var highlighted = [self testSegment:location] === _trackingSegment;
+
        if (highlighted != _trackingHighlighted)
        {
            _trackingHighlighted = highlighted;
@@ -31,7 +31,7 @@
 */
@implementation CPShadow : CPObject
 {
-    CPSize      _offset;
+    CGSize      _offset;
    float       _blurRadius;
    CPColor     _color;

@@ -51,7 +51,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];

@@ -61,7 +61,7 @@
        _blurRadius = aBlurRadius;
        _color = aColor;

-        _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
+        _cssString = [_color cssString] + " " + ROUND(anOffset.width) + @"px " + ROUND(anOffset.height) + @"px " + ROUND(_blurRadius) + @"px";
    }

    return self;
@@ -99,4 +99,4 @@
    return _cssString;
 }

-@end
+@end
@@ -24,71 +24,44 @@

@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
 */
-
@implementation CPShadowView : CPView
 {
    CPShadowWeight  _weight;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self != [CPShadowView class])
-        return;
+    return "shadow-view";
+}

-    var bundle = [CPBundle bundleForClass:[self class]];
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithJSObject:
+        {
+            @"bezel-color": [CPNull null],
+            @"content-inset": CGInsetMakeZero()
+        }];
+}

-    CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
+{
+    var shadowView = [CPShadowView new],
+        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];

-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
-            nil,
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
-
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
-        ]]];
-
-    CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-        [
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
-
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
-            nil,
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
-
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
-            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
-        ]]];
+    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
@@ -98,20 +71,25 @@ var LIGHT_LEFT_INSET    = 3.0,

 + (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
 {
-    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
-    [shadowView setWeight:aWeight];
+    var shadowView = [[self alloc] initWithFrame:[aView frame]];

-    var size = [shadowView frame].size,
-        width = size.width - [shadowView leftInset] - [shadowView rightInset],
-        height = size.height - [shadowView topInset] - [shadowView bottomInset],
-        enclosingView = [aView superview];
+    if (shadowView)
+    {
+        [shadowView setWeight:aWeight];

-    [shadowView setHitTests:[aView hitTests]];
-    [shadowView setAutoresizingMask:[aView autoresizingMask]];
-    [aView removeFromSuperview];
-    [shadowView addSubview:aView];
-    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
-    [enclosingView addSubview:shadowView];
+        var size = [shadowView frame].size,
+            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(inset.left, inset.top, width, height)];
+        [enclosingView addSubview:shadowView];
+    }

    return shadowView;
 }
@@ -122,9 +100,7 @@ var LIGHT_LEFT_INSET    = 3.0,

    if (self)
    {
-        _weight = CPLightShadow;
-
-        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
+        [self setWeight:CPLightShadow];

        [self setHitTests:NO];
    }
@@ -140,54 +116,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
@@ -200,4 +167,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
@@ -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


 /*
@@ -60,166 +66,166 @@

 - (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
 {
-    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
+    return [super initWithPickerMask:mask colorPanel:owningColorPanel];
 }

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

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

-    _rgbLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 10, 100, 20)];
-    [_rgbLabel setStringValue: "Red, Green, Blue"];
+    _rgbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 10, 100, 20)];
+    [_rgbLabel setStringValue:"Red, Green, Blue"];
    [_rgbLabel setTextColor:[CPColor blackColor]];

-    _redLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 37, 15, 20)];
-    [_redLabel setStringValue: "R"];
+    _redLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 37, 15, 20)];
+    [_redLabel setStringValue:"R"];
    [_redLabel setTextColor:[CPColor blackColor]];

-    _redSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 35, aFrame.size.width - 70, 20)];
-    [_redSlider setMaxValue: 1.0];
-    [_redSlider setMinValue: 0.0];
-    [_redSlider setTarget: self];
-    [_redSlider setAction: @selector(sliderChanged:)];
-    [_redSlider setAutoresizingMask: CPViewWidthSizable];
+    _redSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 35, aFrame.size.width - 70, 20)];
+    [_redSlider setMaxValue:1.0];
+    [_redSlider setMinValue:0.0];
+    [_redSlider setTarget:self];
+    [_redSlider setAction:@selector(sliderChanged:)];
+    [_redSlider setAutoresizingMask:CPViewWidthSizable];

    // red value input box
-    _redValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 30, 45, 28)];
-    [_redValue setAutoresizingMask: CPViewMinXMargin];
-    [_redValue setEditable: YES];
-    [_redValue setBezeled: YES];
-    [_redValue setDelegate: self];
-    [_contentView addSubview: _redValue];
+    _redValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 30, 45, 28)];
+    [_redValue setAutoresizingMask:CPViewMinXMargin];
+    [_redValue setEditable:YES];
+    [_redValue setBezeled:YES];
+    [_redValue setDelegate:self];
+    [_contentView addSubview:_redValue];

-    _greenLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 63, 15, 20)];
-    [_greenLabel setStringValue: "G"];
+    _greenLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 63, 15, 20)];
+    [_greenLabel setStringValue:"G"];
    [_greenLabel setTextColor:[CPColor blackColor]];

-    _greenSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 61, aFrame.size.width - 70, 20)];
-    [_greenSlider setMaxValue: 1.0];
-    [_greenSlider setMinValue: 0.0];
-    [_greenSlider setTarget: self];
-    [_greenSlider setAction: @selector(sliderChanged:)];
-    [_greenSlider setAutoresizingMask: CPViewWidthSizable];
+    _greenSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 61, aFrame.size.width - 70, 20)];
+    [_greenSlider setMaxValue:1.0];
+    [_greenSlider setMinValue:0.0];
+    [_greenSlider setTarget:self];
+    [_greenSlider setAction:@selector(sliderChanged:)];
+    [_greenSlider setAutoresizingMask:CPViewWidthSizable];

    // green value input box
-    _greenValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 56, 45, 28)];
-    [_greenValue setAutoresizingMask: CPViewMinXMargin];
-    [_greenValue setEditable: YES];
-    [_greenValue setBezeled: YES];
-    [_greenValue setDelegate: self];
-    [_contentView addSubview: _greenValue];
+    _greenValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 56, 45, 28)];
+    [_greenValue setAutoresizingMask:CPViewMinXMargin];
+    [_greenValue setEditable:YES];
+    [_greenValue setBezeled:YES];
+    [_greenValue setDelegate:self];
+    [_contentView addSubview:_greenValue];

-    _blueLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 90, 15, 20)];
-    [_blueLabel setStringValue: "B"];
+    _blueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 90, 15, 20)];
+    [_blueLabel setStringValue:"B"];
    [_blueLabel setTextColor:[CPColor blackColor]];

-    _blueSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 87, aFrame.size.width - 70, 20)];
-    [_blueSlider setMaxValue: 1.0];
-    [_blueSlider setMinValue: 0.0];
-    [_blueSlider setTarget: self];
-    [_blueSlider setAction: @selector(sliderChanged:)];
-    [_blueSlider setAutoresizingMask: CPViewWidthSizable];
+    _blueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 87, aFrame.size.width - 70, 20)];
+    [_blueSlider setMaxValue:1.0];
+    [_blueSlider setMinValue:0.0];
+    [_blueSlider setTarget:self];
+    [_blueSlider setAction:@selector(sliderChanged:)];
+    [_blueSlider setAutoresizingMask:CPViewWidthSizable];

    // blue value input box
-    _blueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 82, 45, 28)];
-    [_blueValue setAutoresizingMask: CPViewMinXMargin];
-    [_blueValue setEditable: YES];
-    [_blueValue setBezeled: YES];
-    [_blueValue setDelegate: self];
-    [_contentView addSubview: _blueValue];
+    _blueValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 82, 45, 28)];
+    [_blueValue setAutoresizingMask:CPViewMinXMargin];
+    [_blueValue setEditable:YES];
+    [_blueValue setBezeled:YES];
+    [_blueValue setDelegate:self];
+    [_contentView addSubview:_blueValue];

-    _hsbLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 120, 190, 20)];
-    [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
+    _hsbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 120, 190, 20)];
+    [_hsbLabel setStringValue:"Hue, Saturation, Brightness"];
    [_hsbLabel setTextColor:[CPColor blackColor]];

-    _hueLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 145, 15, 20)];
-    [_hueLabel setStringValue: "H"];
+    _hueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 145, 15, 20)];
+    [_hueLabel setStringValue:"H"];
    [_hueLabel setTextColor:[CPColor blackColor]];

-    _hueSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 143, aFrame.size.width - 70, 20)];
-    [_hueSlider setMaxValue: 359.0];
-    [_hueSlider setMinValue: 0.0];
-    [_hueSlider setTarget: self];
-    [_hueSlider setAction: @selector(sliderChanged:)];
-    [_hueSlider setAutoresizingMask: CPViewWidthSizable];
+    _hueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 143, aFrame.size.width - 70, 20)];
+    [_hueSlider setMaxValue:359.0];
+    [_hueSlider setMinValue:0.0];
+    [_hueSlider setTarget:self];
+    [_hueSlider setAction:@selector(sliderChanged:)];
+    [_hueSlider setAutoresizingMask:CPViewWidthSizable];

    // hue value input box
-    _hueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 138, 45, 28)];
-    [_hueValue setAutoresizingMask: CPViewMinXMargin];
-    [_hueValue setEditable: YES];
-    [_hueValue setBezeled: YES];
-    [_hueValue setDelegate: self];
-    [_contentView addSubview: _hueValue];
+    _hueValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 138, 45, 28)];
+    [_hueValue setAutoresizingMask:CPViewMinXMargin];
+    [_hueValue setEditable:YES];
+    [_hueValue setBezeled:YES];
+    [_hueValue setDelegate:self];
+    [_contentView addSubview:_hueValue];

-    _saturationLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 170, 15, 20)];
-    [_saturationLabel setStringValue: "S"];
+    _saturationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 170, 15, 20)];
+    [_saturationLabel setStringValue:"S"];
    [_saturationLabel setTextColor:[CPColor blackColor]];

-    _saturationSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 168, aFrame.size.width - 70, 20)];
-    [_saturationSlider setMaxValue: 100.0];
-    [_saturationSlider setMinValue: 0.0];
-    [_saturationSlider setTarget: self];
-    [_saturationSlider setAction: @selector(sliderChanged:)];
-    [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
+    _saturationSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 168, aFrame.size.width - 70, 20)];
+    [_saturationSlider setMaxValue:100.0];
+    [_saturationSlider setMinValue:0.0];
+    [_saturationSlider setTarget:self];
+    [_saturationSlider setAction:@selector(sliderChanged:)];
+    [_saturationSlider setAutoresizingMask:CPViewWidthSizable];

    // saturation value input box
-    _saturationValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 164, 45, 28)];
-    [_saturationValue setAutoresizingMask: CPViewMinXMargin];
-    [_saturationValue setEditable: YES];
-    [_saturationValue setBezeled: YES];
-    [_saturationValue setDelegate: self];
-    [_contentView addSubview: _saturationValue];
+    _saturationValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 164, 45, 28)];
+    [_saturationValue setAutoresizingMask:CPViewMinXMargin];
+    [_saturationValue setEditable:YES];
+    [_saturationValue setBezeled:YES];
+    [_saturationValue setDelegate:self];
+    [_contentView addSubview:_saturationValue];

-    _brightnessLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 196, 15, 20)];
-    [_brightnessLabel setStringValue: "B"];
+    _brightnessLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 196, 15, 20)];
+    [_brightnessLabel setStringValue:"B"];
    [_brightnessLabel setTextColor:[CPColor blackColor]];

-    _brightnessSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 194, aFrame.size.width - 70, 20)];
-    [_brightnessSlider setMaxValue: 100.0];
-    [_brightnessSlider setMinValue: 0.0];
-    [_brightnessSlider setTarget: self];
-    [_brightnessSlider setAction: @selector(sliderChanged:)];
-    [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 194, aFrame.size.width - 70, 20)];
+    [_brightnessSlider setMaxValue:100.0];
+    [_brightnessSlider setMinValue:0.0];
+    [_brightnessSlider setTarget:self];
+    [_brightnessSlider setAction:@selector(sliderChanged:)];
+    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable];

    // brightness value input box
-    _brightnessValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 190, 45, 28)];
-    [_brightnessValue setAutoresizingMask: CPViewMinXMargin];
-    [_brightnessValue setEditable: YES];
-    [_brightnessValue setBezeled: YES];
-    [_brightnessValue setDelegate: self];
-    [_contentView addSubview: _brightnessValue];
+    _brightnessValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 190, 45, 28)];
+    [_brightnessValue setAutoresizingMask:CPViewMinXMargin];
+    [_brightnessValue setEditable:YES];
+    [_brightnessValue setBezeled:YES];
+    [_brightnessValue setDelegate:self];
+    [_contentView addSubview:_brightnessValue];

-    _hexLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 230, 30, 20)];
-    [_hexLabel setStringValue: "Hex"];
+    _hexLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 230, 30, 20)];
+    [_hexLabel setStringValue:"Hex"];
    [_hexLabel setTextColor:[CPColor blackColor]];

    //hex input box
-    _hexValue = [[CPTextField alloc] initWithFrame: CGRectMake(32, 225, 80, 28)];
-    [_hexValue setEditable: YES];
-    [_hexValue setBezeled: YES];
-    [_hexValue setDelegate: self];
-    [_contentView addSubview: _hexValue];
+    _hexValue = [[CPTextField alloc] initWithFrame:CGRectMake(32, 225, 80, 28)];
+    [_hexValue setEditable:YES];
+    [_hexValue setBezeled:YES];
+    [_hexValue setDelegate:self];
+    [_contentView addSubview:_hexValue];

-    [_contentView addSubview: _rgbLabel];
-    [_contentView addSubview: _redLabel];
-    [_contentView addSubview: _greenLabel];
-    [_contentView addSubview: _blueLabel];
-    [_contentView addSubview: _redSlider];
-    [_contentView addSubview: _greenSlider];
-    [_contentView addSubview: _blueSlider];
+    [_contentView addSubview:_rgbLabel];
+    [_contentView addSubview:_redLabel];
+    [_contentView addSubview:_greenLabel];
+    [_contentView addSubview:_blueLabel];
+    [_contentView addSubview:_redSlider];
+    [_contentView addSubview:_greenSlider];
+    [_contentView addSubview:_blueSlider];

-    [_contentView addSubview: _hsbLabel];
-    [_contentView addSubview: _hueLabel];
-    [_contentView addSubview: _saturationLabel];
-    [_contentView addSubview: _brightnessLabel];
-    [_contentView addSubview: _hueSlider];
-    [_contentView addSubview: _saturationSlider];
-    [_contentView addSubview: _brightnessSlider];
+    [_contentView addSubview:_hsbLabel];
+    [_contentView addSubview:_hueLabel];
+    [_contentView addSubview:_saturationLabel];
+    [_contentView addSubview:_brightnessLabel];
+    [_contentView addSubview:_hueSlider];
+    [_contentView addSubview:_saturationSlider];
+    [_contentView addSubview:_brightnessSlider];

-    [_contentView addSubview: _hexLabel];
+    [_contentView addSubview:_hexLabel];
 }

 - (CPView)provideNewView:(BOOL)initialRequest
@@ -250,35 +256,35 @@
    {
        case    _hueSlider:
        case    _saturationSlider:
-        case    _brightnessSlider:      newColor = [CPColor colorWithHue: [_hueSlider floatValue]
-                                                              saturation: [_saturationSlider floatValue]
-                                                              brightness: [_brightnessSlider floatValue]
-                                                                   alpha: alpha];
+        case    _brightnessSlider:      newColor = [CPColor colorWithHue:[_hueSlider floatValue]
+                                                              saturation:[_saturationSlider floatValue]
+                                                              brightness:[_brightnessSlider floatValue]
+                                                                   alpha:alpha];

-                                        [self updateRGBSliders: newColor];
+                                        [self updateRGBSliders:newColor];
                                        break;

        case    _redSlider:
        case    _greenSlider:
-        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue]
-                                                                             green: [_greenSlider floatValue]
-                                                                              blue: [_blueSlider floatValue]
-                                                                             alpha: alpha];
+        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed:[_redSlider floatValue]
+                                                                             green:[_greenSlider floatValue]
+                                                                              blue:[_blueSlider floatValue]
+                                                                             alpha:alpha];

-                                        [self updateHSBSliders: newColor];
+                                        [self updateHSBSliders:newColor];
                                        break;
    }

    [self updateLabels];
-    [self updateHex: newColor];
-    [colorPanel setColor: newColor];
+    [self updateHex:newColor];
+    [colorPanel setColor:newColor];
 }

 - (void)setColor:(CPColor)aColor
 {
-    [self updateRGBSliders: aColor];
-    [self updateHSBSliders: aColor];
-    [self updateHex: aColor];
+    [self updateRGBSliders:aColor];
+    [self updateHSBSliders:aColor];
+    [self updateHex:aColor];
    [self updateLabels];
 }

@@ -307,13 +313,13 @@

 - (void)updateLabels
 {
-    [_hueValue setStringValue: ROUND([_hueSlider floatValue])];
-    [_saturationValue setStringValue: ROUND([_saturationSlider floatValue])];
-    [_brightnessValue setStringValue: ROUND([_brightnessSlider floatValue])];
+    [_hueValue setStringValue:ROUND([_hueSlider floatValue])];
+    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue])];
+    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue])];

-    [_redValue setStringValue: ROUND([_redSlider floatValue] * 255)];
-    [_greenValue setStringValue: ROUND([_greenSlider floatValue] * 255)];
-    [_blueValue setStringValue: ROUND([_blueSlider floatValue] * 255)];
+    [_redValue setStringValue:ROUND([_redSlider floatValue] * 255)];
+    [_greenValue setStringValue:ROUND([_greenSlider floatValue] * 255)];
+    [_blueValue setStringValue:ROUND([_blueSlider floatValue] * 255)];
 }

 - (CPImage)provideNewButtonImage
@@ -333,12 +339,12 @@

    if (field === _hexValue)
    {
-        var newColor = [CPColor colorWithHexString: value];
+        var newColor = [CPColor colorWithHexString:value];

        if (newColor)
        {
-            [self setColor: newColor];
-            [[self colorPanel] setColor: newColor];
+            [self setColor:newColor];
+            [[self colorPanel] setColor:newColor];
        }
    }
    else
@@ -346,27 +352,27 @@
        switch (field)
        {
            case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged: _redSlider];
+                                   [self sliderChanged:_redSlider];
                                   break;

            case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged: _greenSlider];
+                                   [self sliderChanged:_greenSlider];
                                   break;

            case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged: _blueSlider];
+                                   [self sliderChanged:_blueSlider];
                                   break;

            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
-                                   [self sliderChanged: _hueSlider];
+                                   [self sliderChanged:_hueSlider];
                                   break;

            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged: _saturationSlider];
+                                   [self sliderChanged:_saturationSlider];
                                   break;

            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged: _brightnessSlider];
+                                   [self sliderChanged:_brightnessSlider];
                                   break;
        }
    }
@@ -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;
@@ -20,16 +20,44 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+#include "../Foundation/Foundation.h"
+
@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) \
+    { \
+        [self _postNotificationWillResize]; \
+        _suppressResizeNotificationsMask |= DidPostWillResizeNotification; \
+    }
+
+#define SPLIT_VIEW_MAYBE_POST_DID_RESIZE() \
+    if ((_suppressResizeNotificationsMask & ShouldSuppressResizeNotifications) !== 0) \
+        _suppressResizeNotificationsMask |= DidSuppressResizeNotification; \
+    else \
+        [self _postNotificationDidResize];
+
+#define SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION() \
+    ((_suppressResizeNotificationsMask & DidSuppressResizeNotification) !== 0)
+
+#define SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(shouldSuppress) \
+    if (shouldSuppress) \
+        _suppressResizeNotificationsMask |= ShouldSuppressResizeNotifications; \
+    else \
+        _suppressResizeNotificationsMask = 0;

 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";

-var CPSplitViewHorizontalImage = nil,
-    CPSplitViewVerticalImage = nil;
+var ShouldSuppressResizeNotifications   = 1,
+    DidPostWillResizeNotification       = 1 << 1,
+    DidSuppressResizeNotification       = 1 << 2;

 /*!
    @ingroup appkit
@@ -45,24 +73,29 @@ var CPSplitViewHorizontalImage = nil,

@implementation CPSplitView : CPView
 {
-    id          _delegate;
-    BOOL        _isVertical;
-    BOOL        _isPaneSplitter;
+    id              _delegate;
+    BOOL            _isVertical;
+    BOOL            _isPaneSplitter;

-    int         _currentDivider;
-    float       _initialOffset;
-    float       _preCollapsePosition;
+    int             _currentDivider;
+    float           _initialOffset;
+    CPDictionary    _preCollapsePositions;

-    CPString    _originComponent;
-    CPString    _sizeComponent;
+    CPString        _originComponent;
+    CPString        _sizeComponent;

-    CPArray     _DOMDividerElements;
-    CPString    _dividerImagePath;
-    int         _drawingDivider;
+    CPArray         _DOMDividerElements;
+    CPString        _dividerImagePath;
+    int             _drawingDivider;

-    BOOL        _needsResizeSubviews;
+    CPString        _autosaveName;
+    BOOL            _shouldAutosave;
+    CGSize          _shouldRestoreFromAutosaveUnlessFrameSize;

-    CPArray     _buttonBars;
+    BOOL            _needsResizeSubviews;
+    int             _suppressResizeNotificationsMask;
+
+    CPArray         _buttonBars;
 }

 + (CPString)defaultThemeClass
@@ -72,32 +105,31 @@ var CPSplitViewHorizontalImage = nil,

 + (id)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 = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSplitView/CPSplitViewHorizontal.png"] size:CPSizeMake(5.0, 10.0)];
-    CPSplitViewVerticalImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSplitView/CPSplitViewVertical.png"] size:CPSizeMake(10.0, 5.0)];
+    return [CPDictionary dictionaryWithObjects:[1.0,
+                                                10.0,
+                                                [CPColor grayColor],
+                                                [CPNull null],
+                                                [CPNull null]]
+                                       forKeys:[@"divider-thickness",
+                                                @"pane-divider-thickness",
+                                                @"pane-divider-color",
+                                                @"horizontal-divider-color",
+                                                @"vertical-divider-color"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
 {
    if (self = [super initWithFrame:aFrame])
    {
+        _suppressResizeNotificationsMask = 0;
+        _preCollapsePositions = [CPMutableDictionary new];
        _currentDivider = CPNotFound;

        _DOMDividerElements = [];
        _buttonBars = [];

+        _shouldAutosave = YES;
+
        [self _setVertical:YES];
    }

@@ -142,14 +174,17 @@ var CPSplitViewHorizontalImage = nil,
        count = _subviews.length;

    if ([self isVertical])
+    {
        for (; index < count; ++index)
            [_subviews[index] setFrame:CGRectMake(ROUND((eachSize + dividerThickness) * index), 0, eachSize, frame.size.height)];
+    }
    else
+    {
        for (; index < count; ++index)
            [_subviews[index] setFrame:CGRectMake(0, ROUND((eachSize + dividerThickness) * index), frame.size.width, eachSize)];
+    }

    [self setNeedsDisplay:YES];
-
    [self _postNotificationDidResize];

 }
@@ -162,7 +197,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;
 }
@@ -225,7 +260,6 @@ var CPSplitViewHorizontalImage = nil,
        rect = CGRectMakeZero();

    rect.size = [self frame].size;
-
    rect.size[_sizeComponent] = [self dividerThickness];
    rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];

@@ -334,28 +368,33 @@ var CPSplitViewHorizontalImage = nil,

    _needsResizeSubviews = NO;

+    [self resizeSubviewsWithOldSize:[self _calculateSize]];
+}
+
+- (CGSize)_calculateSize
+{
    var subviews = [self subviews],
        count = subviews.length,
-        oldSize = CGSizeMakeZero();
+        size = CGSizeMakeZero();

    if ([self isVertical])
    {
-        oldSize.width += [self dividerThickness] * (count - 1);
-        oldSize.height = CGRectGetHeight([self frame]);
+        size.width += [self dividerThickness] * (count - 1);
+        size.height = CGRectGetHeight([self frame]);
    }
    else
    {
-        oldSize.width = CGRectGetWidth([self frame]);
-        oldSize.height += [self dividerThickness] * (count - 1);
+        size.width = CGRectGetWidth([self frame]);
+        size.height += [self dividerThickness] * (count - 1);
    }

    while (count--)
-        oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
+        size[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];

-    [self resizeSubviewsWithOldSize:oldSize];
+    return size;
 }

- (BOOL)cursorAtPoint:(CPPoint)aPoint hitDividerAtIndex:(int)anIndex
+- (BOOL)cursorAtPoint:(CGPoint)aPoint hitDividerAtIndex:(int)anIndex
 {
    var frame = [_subviews[anIndex] frame],
        startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
@@ -408,11 +447,14 @@ var CPSplitViewHorizontalImage = nil,

    if (type == CPLeftMouseUp)
    {
+        // We disabled autosaving during tracking.
+        _shouldAutosave = YES;
+
        if (_currentDivider != CPNotFound)
        {
            _currentDivider = CPNotFound;
+            [self _autosave];
            [self _updateResizeCursor:anEvent];
-            [self _postNotificationDidResize];
        }

        return;
@@ -420,10 +462,11 @@ var CPSplitViewHorizontalImage = nil,

    if (type == CPLeftMouseDown)
    {
-        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+            count = [_subviews count] - 1;

        _currentDivider = CPNotFound;
-        var count = [_subviews count] - 1;
+
        for (var i = 0; i < count; i++)
        {
            var frame = [_subviews[i] frame],
@@ -436,19 +479,20 @@ var CPSplitViewHorizontalImage = nil,
                    [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
                {
                    var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
-                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
+                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i],
+                        preCollapsePosition = [_preCollapsePositions objectForKey:"" + i] || 0;

                    if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
                    {
                        if ([self isSubviewCollapsed:_subviews[i]])
-                            [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                            [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                        else
                            [self setPosition:minPosition ofDividerAtIndex:i];
                    }
                    else if ([_delegate splitView:self canCollapseSubview:_subviews[i + 1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
                    {
                        if ([self isSubviewCollapsed:_subviews[i + 1]])
-                            [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                            [self setPosition:preCollapsePosition ? preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                        else
                            [self setPosition:maxPosition ofDividerAtIndex:i];
                    }
@@ -458,6 +502,8 @@ var CPSplitViewHorizontalImage = nil,
                    _currentDivider = i;
                    _initialOffset = startPosition - point[_originComponent];

+                    // Don't autosave during a resize. We'll wait until it's done.
+                    _shouldAutosave = NO;
                    [self _postNotificationWillResize];
                }
            }
@@ -526,19 +572,37 @@ var CPSplitViewHorizontalImage = nil,
        // If we are currently tracking, keep the resize cursor active even outside of hit areas.
        if (_currentDivider === i || (_currentDivider == CPNotFound && [self cursorAtPoint:point hitDividerAtIndex:i]))
        {
-            var frame = [_subviews[i] frame],
-                size = frame.size[_sizeComponent],
-                startPosition = frame.origin[_originComponent] + size,
+            var frameA = [_subviews[i] frame],
+                sizeA = frameA.size[_sizeComponent],
+                startPosition = frameA.origin[_originComponent] + sizeA,
+                frameB = [_subviews[i + 1] frame],
+                sizeB = frameB.size[_sizeComponent],
                canShrink = [self _realPositionForPosition:startPosition - 1 ofDividerAtIndex:i] < startPosition,
                canGrow = [self _realPositionForPosition:startPosition + 1 ofDividerAtIndex:i] > startPosition,
                cursor = [CPCursor arrowCursor];

-            if (size === 0)
+            if (sizeA === 0)
                canGrow = YES; // Subview is collapsed.
            else if (!canShrink &&
-                [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                [_delegate splitView:self canCollapseSubview:_subviews[i]])
+                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                     [_delegate splitView:self canCollapseSubview:_subviews[i]])
+            {
                canShrink = YES; // Subview is collapsible.
+            }
+
+            if (sizeB === 0)
+            {
+                // Right/lower subview is collapsed.
+                canGrow = NO;
+                // It's safe to assume it can always be uncollapsed.
+                canShrink = YES;
+            }
+            else if (!canGrow &&
+                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
+                     [_delegate splitView:self canCollapseSubview:_subviews[i + 1]])
+            {
+                canGrow = YES; // Right/lower subview is collapsible.
+            }

            if (_isVertical && canShrink && canGrow)
                cursor = [CPCursor resizeLeftRightCursor];
@@ -597,7 +661,15 @@ var CPSplitViewHorizontalImage = nil,
 {
    // not sure where this should override other positions?
    if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
-        position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
+    {
+        var proposedPosition = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
+
+        // Silently ignore bad positions which could result from odd delegate responses. We don't want these
+        // bad results to go into the system and cause havoc with frame sizes as the split view tries to resize
+        // its subviews.
+        if (_IS_NUMERIC(proposedPosition))
+            position = proposedPosition;
+    }

    var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
        proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
@@ -605,19 +677,37 @@ var CPSplitViewHorizontalImage = nil,
        actualMin = proposedMin;

    if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
-        actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
+    {
+        var proposedActualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
+
+        if (_IS_NUMERIC(proposedActualMin))
+            actualMin = proposedActualMin;
+    }

    if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
-        actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
+    {
+        var proposedActualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
+
+        if (_IS_NUMERIC(proposedActualMax))
+            actualMax = proposedActualMax;
+    }

    var viewA = _subviews[dividerIndex],
+        viewB = _subviews[dividerIndex + 1],
        realPosition = MAX(MIN(position, actualMax), actualMin);

-    if (position <  proposedMin + (actualMin - proposedMin) / 2)
+    // Is this position past the halfway point to collapse?
+    if (position < proposedMin + (actualMin - proposedMin) / 2)
        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
            if ([_delegate splitView:self canCollapseSubview:viewA])
                realPosition = proposedMin;

+    // We can also collapse to the right.
+    if (position > proposedMax - (proposedMax - actualMax) / 2)
+        if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
+            if ([_delegate splitView:self canCollapseSubview:viewB])
+                realPosition = proposedMax;
+
    return realPosition;
 }

@@ -628,43 +718,77 @@ var CPSplitViewHorizontalImage = nil,
 */
 - (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
+    // Any manual changes to the divider position should override anything we are restoring from
+    // autosave.
+    _shouldRestoreFromAutosaveUnlessFrameSize = nil;
+
+    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(YES);
    [self _adjustSubviewsWithCalculatedSize];

-    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
-
-    var viewA = _subviews[dividerIndex],
+    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex],
+        viewA = _subviews[dividerIndex],
        frameA = [viewA frame],
        viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame];
+        frameB = [viewB frame],
+        preCollapsePosition = 0,
+        preSize = frameA.size[_sizeComponent];

-    _preCollapsePosition = 0;
-
-    var preSize = frameA.size[_sizeComponent];
    frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
+
    if (preSize !== 0 && frameA.size[_sizeComponent] === 0)
-        _preCollapsePosition = preSize;
-    [_subviews[dividerIndex] setFrame:frameA];
+        preCollapsePosition = preSize;
+
+    if (preSize !== frameA.size[_sizeComponent])
+    {
+        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
+        [_subviews[dividerIndex] setFrame:frameA];
+        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
+    }

    preSize = frameB.size[_sizeComponent];
+
+    var preOrigin = frameB.origin[_originComponent];
    frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
+
    if (preSize !== 0 && frameB.size[_sizeComponent] === 0)
-        _preCollapsePosition = preSize;
+        preCollapsePosition = frameB.origin[_originComponent];
+
    frameB.origin[_originComponent] = realPosition + [self dividerThickness];
-    [_subviews[dividerIndex + 1] setFrame:frameB];
+
+    if (preSize !== frameB.size[_sizeComponent] || preOrigin !== frameB.origin[_originComponent])
+    {
+        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
+        [_subviews[dividerIndex + 1] setFrame:frameB];
+        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
+    }
+
+    if (preCollapsePosition)
+        [_preCollapsePositions setObject:preCollapsePosition forKey:"" + dividerIndex];

    [self setNeedsDisplay:YES];
+
+    if (SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION())
+        [self _postNotificationDidResize];
+
+    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(NO);
 }

 - (void)setFrameSize:(CGSize)aSize
 {
-    [self _adjustSubviewsWithCalculatedSize];
+    if (_shouldRestoreFromAutosaveUnlessFrameSize)
+        _shouldAutosave = NO;
+    else
+        [self _adjustSubviewsWithCalculatedSize];

    [super setFrameSize:aSize];

+    if (_shouldRestoreFromAutosaveUnlessFrameSize)
+        _shouldAutosave = YES;
+
    [self setNeedsDisplay:YES];
 }

- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
+- (void)resizeSubviewsWithOldSize:(CGSize)oldSize
 {
    if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
    {
@@ -672,67 +796,104 @@ var CPSplitViewHorizontalImage = nil,
        return;
    }

+    [self adjustSubviews];
+}
+
+- (void)adjustSubviews
+{
+    var count = [_subviews count];
+
+    if (!count)
+        return;
+
+    SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
    [self _postNotificationWillResize];

    var index = 0,
-        count = [_subviews count],
        bounds = [self bounds],
+        boundsSize = bounds.size[_sizeComponent],
+        oldSize = [self _calculateSize],
        dividerThickness = [self dividerThickness],
        totalDividers = count - 1,
-        totalSizableSpace = 0,
-        nonSizableSpace = 0,
-        lastSizableIndex = -1,
+        oldFlexibleSpace = 0,
        totalSizablePanes = 0,
-        isVertical = [self isVertical];
+        isSizableMap = {},
+        viewSizes = [],
+        delegateRespondsToShouldAdjust = [_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)];

+    // What we want to do is to preserve non resizable sizes first, and then to preserve the ratio of size to available
+    // non fixed space for every other subview. E.g. assume fixed space was 20 pixels initially, view 1 was 20 and
+    // view 2 was 30 pixels, for a total of 70 pixels. Then the new total size becomes 140 pixels. Now we want the fixed
+    // space to still be 20 pixels, view 1 to be 48 pixels and view 2 to be 72 pixels. This way the relative size of
+    // view 1 to view 2 remains the same - view 1 was 66% of view 2 initially and after the resize view 1 is still
+    // 66% of view 2's size.
+    //
+    // For this calculation, we can consider the dividers themselves to also be fixed size areas - they should remain
+    // the same size before and after.
+
+    // How much flexible size do we have in pre-resize pixels?
    for (index = 0; index < count; ++index)
    {
        var view = _subviews[index],
-            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
+            isSizable = !delegateRespondsToShouldAdjust || [_delegate splitView:self shouldAdjustSizeOfSubview:view],
+            size = [view frame].size[_sizeComponent];
+
+        isSizableMap[index] = isSizable;
+        viewSizes.push(size);

        if (isSizable)
        {
-            totalSizableSpace += [view frame].size[_sizeComponent];
-            lastSizableIndex = index;
+            oldFlexibleSpace += size;
            totalSizablePanes++;
        }
    }

-    if (totalSizablePanes === count)
-        totalSizableSpace = 0;
+    // nonSizableSpace is the number of fixed pixels in pre-resize terms and the desired number post-resize.
+    var nonSizableSpace = oldSize[_sizeComponent] - oldFlexibleSpace,
+        newFlexibleSpace = boundsSize - nonSizableSpace,
+        remainingFixedPixelsToRemove = 0;

-    var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0,
-        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent],
-        oldDimension = (oldSize[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace),
-        ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace) / oldDimension;
+    if (newFlexibleSpace < 0)
+    {
+        remainingFixedPixelsToRemove = -newFlexibleSpace;
+        newFlexibleSpace = 0;
+    }
+
+    var remainingFixedPanes = count - totalSizablePanes;

    for (index = 0; index < count; ++index)
    {
        var view = _subviews[index],
            viewFrame = CGRectMakeCopy(bounds),
-            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
+            isSizable = isSizableMap[index],
+            targetSize = 0;

+        // The last area must take up exactly the remaining space, fixed or not.
        if (index + 1 === count)
-            viewFrame.size[_sizeComponent] = bounds.size[_sizeComponent] - viewFrame.origin[_originComponent];
-
-        else if (totalSizableSpace && isSizable && lastSizableIndex === index)
-            viewFrame.size[_sizeComponent] = MAX(0, ROUND([view frame].size[_sizeComponent] + remainingFlexibleSpace))
-
-        else if (isSizable || !totalSizableSpace)
+            targetSize = boundsSize - viewFrame.origin[_originComponent];
+        // Try to keep fixed size areas the same size.
+        else if (!isSizable)
        {
-            viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
-            remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
+            var removedFixedPixels = MIN(remainingFixedPixelsToRemove / remainingFixedPanes, viewSizes[index]);
+            targetSize = viewSizes[index] - removedFixedPixels;
+            remainingFixedPixelsToRemove -= removedFixedPixels;
+            remainingFixedPanes--;
        }
+        // (new size / flexible size available) == (old size / old flexible size available)
+        else if (oldFlexibleSpace > 0)
+            targetSize = newFlexibleSpace * viewSizes[index] / oldFlexibleSpace;
+        // oldFlexibleSpace <= 0 so all flexible areas were crushed. When we get space, allocate it evenly.
+        // totalSizablePanes cannot be 0 since isSizable.
+        else
+            targetSize = newFlexibleSpace / totalSizablePanes;

-        else if (totalSizableSpace && !isSizable)
-            viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
-
-        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;
-
+        targetSize = MAX(0, ROUND(targetSize));
+        viewFrame.size[_sizeComponent] = targetSize;
        [view setFrame:viewFrame];
+        bounds.origin[_originComponent] += targetSize + dividerThickness;
    }

-    [self _postNotificationDidResize];
+    SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
 }

 /*!
@@ -749,6 +910,11 @@ Notifies the delegate when the subviews will be resized.
 - (void)splitViewWillResizeSubviews:(CPNotification)aNotification;
@endcode

+Allows the delegate to specify which of the CPSplitView's subviews should adjust if the window is resized.
+@code
+- (BOOL)splitView:(CPSplitView)aSplitView shouldAdjustSizeOfSubview:(CPView)aSubView
+@endcode
+
 Lets the delegate specify a different rect for which the user can drag the splitView divider.
@code
 - (CGRect)splitView:(CPSplitView)aSplitView effectiveRect:(CGRect)aRect forDrawnRect:(CGRect)aDrawnRect ofDividerAtIndex:(int)aDividerIndex;
@@ -831,6 +997,7 @@ The sum of the views and the sum of the dividers should be equal to the size of
    @param CPButtonBar - The supplied button bar.
    @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
 {
    if (!aButtonBar)
@@ -862,12 +1029,161 @@ The sum of the views and the sum of the dividers should be equal to the size of

 - (void)_postNotificationWillResize
 {
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
+    var userInfo = nil;
+
+    if (_currentDivider !== CPNotFound)
+        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
+                                                        object:self
+                                                      userInfo:userInfo];
 }

 - (void)_postNotificationDidResize
 {
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self];
+    var userInfo = nil;
+
+    if (_currentDivider !== CPNotFound)
+        userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification
+                                                        object:self
+                                                      userInfo:userInfo];
+
+
+    // TODO Cocoa always autosaves on "viewDidEndLiveResize". If Cappuccino adds support for this we
+    // should do the same.
+    [self _autosave];
+}
+
+/*!
+    Set the name under which the split view divider positions is automatically saved to CPUserDefaults.
+
+    @param autosaveName the name to save under or nil to not save
+*/
+- (void)setAutosaveName:(CPString)autosaveName
+{
+    if (_autosaveName == autosaveName)
+        return;
+
+    _autosaveName = autosaveName;
+}
+
+/*!
+    Get the name under which the split view divider position is automatically saved to CPUserDefaults.
+
+    @return the name to save under or nil if no autosave is active
+*/
+- (CPString)autosaveName
+{
+    return _autosaveName;
+}
+
+/*!
+    @ignore
+*/
+- (void)_autosave
+{
+    if (_shouldRestoreFromAutosaveUnlessFrameSize || !_shouldAutosave || !_autosaveName)
+        return;
+
+    var userDefaults = [CPUserDefaults standardUserDefaults],
+        autosaveName = [self _framesKeyForAutosaveName:[self autosaveName]],
+        autosavePrecollapseName = [self _precollapseKeyForAutosaveName:[self autosaveName]],
+        count = [_subviews count],
+        positions = [CPMutableArray new],
+        preCollapseArray = [CPMutableArray new];
+
+    for (var i = 0; i < count; i++)
+    {
+        var frame = [_subviews[i] frame];
+        [positions addObject:CGStringFromRect(frame)];
+        [preCollapseArray addObject:[_preCollapsePositions objectForKey:"" + i]];
+    }
+
+    [userDefaults setObject:positions forKey:autosaveName];
+    [userDefaults setObject:preCollapseArray forKey:autosavePrecollapseName];
+}
+
+/*!
+    This is called sometime later after a split view has been restored from a Cib.
+    See notes in initWithCoder.
+
+    @ignore
+*/
+- (void)_restoreFromAutosaveIfNeeded
+{
+    if (_shouldRestoreFromAutosaveUnlessFrameSize && !_CGSizeEqualToSize([self frameSize], _shouldRestoreFromAutosaveUnlessFrameSize))
+    {
+        [self _restoreFromAutosave];
+    }
+
+    _shouldRestoreFromAutosaveUnlessFrameSize = nil;
+}
+
+/*!
+    @ignore
+*/
+- (void)_restoreFromAutosave
+{
+    if (!_autosaveName)
+        return;
+
+    var autosaveName = [self _framesKeyForAutosaveName:[self autosaveName]],
+        autosavePrecollapseName = [self _precollapseKeyForAutosaveName:[self autosaveName]],
+        userDefaults = [CPUserDefaults standardUserDefaults],
+        frames = [userDefaults objectForKey:autosaveName],
+        preCollapseArray = [userDefaults objectForKey:autosavePrecollapseName];
+
+    if (frames)
+    {
+        var dividerThickness = [self dividerThickness],
+            position = 0;
+
+        _shouldAutosave = NO;
+
+        for (var i = 0, count = [frames count] - 1; i < count; i++)
+        {
+            var frame = CGRectFromString(frames[i]);
+            position += frame.size[_sizeComponent];
+
+            [self setPosition:position ofDividerAtIndex:i];
+
+            position += dividerThickness;
+        }
+
+        _shouldAutosave = YES;
+    }
+
+    if (preCollapseArray)
+    {
+        _preCollapsePositions = [CPMutableDictionary new];
+
+        for (var i = 0, count = [preCollapseArray count]; i < count; i++)
+            [_preCollapsePositions setObject:preCollapseArray[i] forKey:i + ""];
+    }
+}
+
+/*!
+    @ignore
+*/
+- (CPString)_framesKeyForAutosaveName:(CPString)theAutosaveName
+{
+    if (!theAutosaveName)
+        return nil;
+
+    return @"CPSplitView Subview Frames " + theAutosaveName;
+}
+
+/*!
+    @ignore
+*/
+- (CPString)_precollapseKeyForAutosaveName:(CPString)theAutosaveName
+{
+    if (!theAutosaveName)
+        return nil;
+
+    return @"CPSplitView Subview Precollapse Positions " + theAutosaveName;
 }

@end
@@ -875,7 +1191,8 @@ The sum of the views and the sum of the dividers should be equal to the size of
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
    CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",
-    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
+    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey",
+    CPSplitViewAutosaveNameKey      = "CPSplitViewAutosaveNameKey";

@implementation CPSplitView (CPCoding)

@@ -885,11 +1202,43 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
+    // We need to restore this property before calling super's initWithCoder:.
+    _autosaveName = [aCoder decodeObjectForKey:CPSplitViewAutosaveNameKey];
+
+    /*
+
+    It is common for the main window of a Cappuccino app window to be resized to match the browser
+    window size at the end of the UI being loaded from a cib. But at decoding time (now) whatever
+    window size was originally saved will be in place, so if we try to restore the autosaved divider
+    positions now they might be constrained to the wrong positions due to the difference in frame size,
+    and in addition they might move later when the window is resized.
+
+    The workaround is to restore the position once now (so it's approximately correct during loading),
+    and then once more in the next runloop cycle when any `setFullPlatformWindow` calls are done.
+
+    (However if the frame size doesn't change before the next cycle, we should not restore the position
+    again because that would overwrite any changes the app developer might have made in user code.)
+
+    The other consideration is that any parent split views need to be restored before any child
+    subviews, otherwise the parent restore will also change the positioning of the child.
+
+    */
+    if (_autosaveName)
+    {
+        // Schedule /before/ [super initWithCoder:]. This way this instance's _restoreFromAutosaveIfNeeded
+        // will happen before that of any subviews loaded by [super initWithCoder:].
+        [[CPRunLoop currentRunLoop] performSelector:@selector(_restoreFromAutosaveIfNeeded) target:self argument:nil order:0 modes:[CPDefaultRunLoopMode]];
+    }
+
    self = [super initWithCoder:aCoder];

    if (self)
    {
+        _suppressResizeNotificationsMask = 0;
+        _preCollapsePositions = [CPMutableDictionary new];
+
        _currentDivider = CPNotFound;
+        _shouldAutosave = YES;

        _DOMDividerElements = [];

@@ -899,6 +1248,14 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",

        _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
        [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
+
+        if (_autosaveName)
+        {
+            [self _restoreFromAutosave];
+            // Remember the frame size we had at this point so that we can restore again if it changes
+            // before the next runloop cycle. See above notes.
+            _shouldRestoreFromAutosaveUnlessFrameSize = [self frameSize];
+        }
    }

    return self;
@@ -919,6 +1276,8 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",

    [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
    [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
+
+    [aCoder encodeObject:_autosaveName forKey:CPSplitViewAutosaveNameKey];
 }

@end
@@ -20,20 +20,21 @@
 * 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"


-var CPStepperButtonsSize = CPSizeMake(19, 13);

-/*! CPStepper is an  implementation of Cocoa NSStepper.
+/*!
+    CPStepper is an implementation of Cocoa NSStepper.

-    This control display a two part button that can be used to increase or decrease a value with a given interval.
+    This control displays a two part button that can be used to increase or decrease a value with a given interval.
 */
@implementation CPStepper: CPControl
 {
    BOOL        _valueWraps     @accessors(property=valueWraps);
+    BOOL        _autorepeat     @accessors(getter=autorepeat);
    int         _increment      @accessors(property=increment);
    int         _maxValue       @accessors(property=maxValue);
    int         _minValue       @accessors(property=minValue);
@@ -45,7 +46,8 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
 #pragma mark -
 #pragma mark Initialization

-/*! Initializes a CPStepper with given values
+/*!
+    Initializes a CPStepper with given values.
    @param aValue the initial value of the CPStepper
    @param minValue the minimal acceptable value of the stepper
    @param maxValue the maximal acceptable value of the stepper
@@ -53,18 +55,24 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:CPRectMake(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;
 }

-/*! Initializes a CPStepper with default values:
+/*!
+    Initializes a CPStepper with default values:
        - minValue = 0.0
        - maxValue = 59.0
        - value = 0.0
+
    @return Initialized CPStepper
 */
 + (CPStepper)stepper
@@ -72,7 +80,24 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }

-/*! Initializes the CPStepper
+ (Class)_binderClassForBinding:(CPString)theBinding
+{
+    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
+        return [_CPStepperValueBinder class];
+
+    return [super _binderClassForBinding:theBinding];
+}
+
+- (id)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return @"doubleValue";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
+/*!
+    Initializes a CPStepper.
    @param aFrame the frame of the control
    @return initialized CPStepper
 */
@@ -84,33 +109,43 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
        _minValue       = 0.0;
        _increment      = 1.0;
        _valueWraps     = YES;
+        _autorepeat     = YES;

        [self setDoubleValue:0.0];
-
-        _buttonUp = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, 0, CPStepperButtonsSize.width, CPStepperButtonsSize.height)];
-        [_buttonUp setContinuous:YES];
-        [_buttonUp setTarget:self];
-        [_buttonUp setAction:@selector(_buttonDidClick:)];
-        [_buttonUp setAutoresizingMask:CPViewNotSizable];
-        [self addSubview:_buttonUp];
-
-        _buttonDown = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, CPStepperButtonsSize.height, CPStepperButtonsSize.width, CPStepperButtonsSize.height - 1)];
-        [_buttonDown setContinuous:YES];
-        [_buttonDown setTarget:self];
-        [_buttonDown setAction:@selector(_buttonDidClick:)];
-        [_buttonDown setAutoresizingMask:CPViewNotSizable];
-        [self addSubview:_buttonDown];
-
-        [self setNeedsLayout];
+        [self _init];
    }

    return self;
 }

+/*! @ignore */
+
+- (void)_init
+{
+    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    [_buttonUp setContinuous:_autorepeat];
+    [_buttonUp setTarget:self];
+    [_buttonUp setAction:@selector(_buttonDidClick:)];
+    [_buttonUp setAutoresizingMask:CPViewNotSizable];
+    [self addSubview:_buttonUp];
+
+    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    [_buttonDown setContinuous:_autorepeat];
+    [_buttonDown setTarget:self];
+    [_buttonDown setAction:@selector(_buttonDidClick:)];
+    [_buttonDown setAutoresizingMask:CPViewNotSizable];
+
+    [self setContinuous:_autorepeat];
+    [self addSubview:_buttonDown];
+
+    [self setNeedsLayout];
+}
+
 #pragma mark -
 #pragma mark Superclass overrides

-/*! set if the CPStepper is enabled or not
+/*!
+    Set if the CPStepper is enabled or not.
    @param shouldEnabled BOOL that define if stepper is enabled or not.
 */
 - (void)setEnabled:(BOOL)shouldEnabled
@@ -121,19 +156,31 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
    [_buttonDown setEnabled:shouldEnabled];
 }

-/*! set the frame of the CPStepper and check if width is not smaller than theme min-size
-    @param aFrame the frame
-*/
+
 - (void)setFrame:(CGRect)aFrame
 {
-    if (aFrame.size.width >= CGRectGetWidth(aFrame))
-        [super setFrame:aFrame];
+    var upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
+        frame = _CGRectMakeCopy(aFrame);
+
+    frame.size.width = MAX(minSize.width, frame.size.width);
+    frame.size.height = MAX(minSize.height, frame.size.height);
+    [super setFrame:frame];
 }

-/*! @ignore
-*/
+/*! @ignore */
 - (void)layoutSubviews
 {
+    var aFrame = [self frame],
+        upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
+        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
+
+    [_buttonUp setFrame:upFrame];
+    [_buttonDown setFrame:downFrame];
+
    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
@@ -142,16 +189,28 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }

-/*! set if CPStepper should autorepeat
+- (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
 */
 - (void)setAutorepeat:(BOOL)shouldAutoRepeat
 {
-    [_buttonUp setContinuous:shouldAutoRepeat];
-    [_buttonDown setContinuous:shouldAutoRepeat];
+    if (shouldAutoRepeat !== _autorepeat)
+    {
+        [_buttonUp setContinuous:shouldAutoRepeat];
+        [_buttonDown setContinuous:shouldAutoRepeat];
+    }
+
+    [self setContinuous:shouldAutoRepeat];
 }

-/*! set the current value of the stepper
+/*!
+    Set the current value of the stepper.
    @param aValue a float containing the value
 */
 - (void)setDoubleValue:(float)aValue
@@ -167,8 +226,7 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
 #pragma mark -
 #pragma mark Actions

-/*! @ignore
-*/
+/*! @ignore */
 - (IBAction)_buttonDidClick:(id)aSender
 {
    if (![self isEnabled])
@@ -179,11 +237,11 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
    else
        [self setDoubleValue:([self doubleValue] - _increment)];

-    if (_target && _action && [_target respondsToSelector:_action])
-        [self sendAction:_action to:_target];
+    [self sendAction:[self action] to:[self target]];
 }

-/*! @perform a programatic click on up button
+/*!
+    Perform a programatic click on up button.
    @param aSender sender of the action
 */
 - (IBAction)performClickUp:(id)aSender
@@ -191,7 +249,8 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
    [_buttonUp performClick:aSender];
 }

-/*! @perform a programatic click on down button
+/*!
+    Perform a programatic click on down button.
    @param aSender sender of the action
 */
 - (IBAction)performClickDown:(id)aSender
@@ -210,25 +269,51 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null]]
-                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()]
+                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]];
 }

@end

+@implementation _CPStepperValueBinder : CPBinder
+{
+}

-@implementation CPStepper (CPCodingCompliance)
+- (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
+
+var CPStepperMinValue   = @"CPStepperMinValue",
+    CPStepperMaxValue   = @"CPStepperMaxValue",
+    CPStepperValueWraps = @"CPStepperValueWraps",
+    CPStepperAutorepeat = @"CPStepperAutorepeat",
+    CPStepperIncrement  = @"CPStepperIncrement";
+
+@implementation CPStepper (CPCoding)

 - (id)initWithCoder:(CPCoder)aCoder
 {
    if (self = [super initWithCoder:aCoder])
    {
-        _maxValue   = [aCoder decodeObjectForKey:@"_maxValue"];
-        _minValue   = [aCoder decodeObjectForKey:@"_minValue"];
-        _increment  = [aCoder decodeObjectForKey:@"_increment"];
-        _buttonUp   = [aCoder decodeObjectForKey:@"_buttonUp"];
-        _buttonDown = [aCoder decodeObjectForKey:@"_buttonDown"];
+        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
+        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue];
+        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue];
+        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps];
+        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat];
+
+        [self _init];
    }
+
    return self;
 }

@@ -236,11 +321,16 @@ var CPStepperButtonsSize = CPSizeMake(19, 13);
 {
    [super encodeWithCoder:aCoder];

-    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
-    [aCoder encodeObject:_minValue forKey:@"_minValue"];
-    [aCoder encodeObject:_increment forKey:@"_increment"];
-    [aCoder encodeObject:_buttonUp forKey:@"_buttonUp"];
-    [aCoder encodeObject:_buttonDown forKey:@"_buttonDown"];
+    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
+
+    if (_minValue)
+        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
+    if (_maxValue)
+        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
+    if (_valueWraps)
+        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
+    if (_autorepeat)
+        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
 }

@end
@@ -22,6 +22,7 @@

@import <Foundation/CPString.j>

+@import "CGGeometry.j"
@import "CPPlatformString.j"


@@ -1,3 +1,25 @@
+/*
+ * CPTabView.j
+ * AppKit
+ *
+ * Created by Derek Hammer.
+ * Copyright 2010, Derek Hammer.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
@import "CPBox.j"
@import "CPSegmentedControl.j"
@import "CPTabViewItem.j"
@@ -45,7 +67,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    if (self = [super initWithFrame:aFrame])
    {
        _items = [CPArray array];
-        _selectedIndex = CPNotFound;

        [self _init];
        [self setTabViewType:CPTopTabsBezelBorder];
@@ -56,18 +77,17 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,

 - (void)_init
 {
-    _tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+    _selectedIndex = CPNotFound;
+
+    _tabs = [[CPSegmentedControl alloc] initWithFrame:_CGRectMake(0, 0, 0, 0)];
    [_tabs setHitTests:NO];

    var height = [_tabs valueForThemeAttribute:@"default-height"];
-    [_tabs setFrameSize:CGSizeMake(0, height)];
+    [_tabs setFrameSize:_CGSizeMake(0, height)];

    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
    [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];

-    [_box setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-    [_tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
-
    [self addSubview:_box];
    [self addSubview:_tabs];
 }
@@ -250,17 +270,15 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    Selects the item at the specified index.
    @param anIndex the index of the item to display.
 */
- (void)selectTabViewItemAtIndex:(unsigned)anIndex
+- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
 {
-    var aTabViewItem = [_items objectAtIndex:anIndex];
-
    if (anIndex === _selectedIndex)
        return;

    var aTabViewItem = [self tabViewItemAtIndex:anIndex];

    if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
-        return;
+        return NO;

    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
@@ -270,6 +288,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,

    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
+
+    return YES;
 }

 /*!
@@ -278,7 +298,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    return [_items objectAtIndex:_selectedIndex];
+    if (_selectedIndex != CPNotFound)
+        return [_items objectAtIndex:_selectedIndex];
+
+    return nil;
 }

 // Modifying the font
@@ -317,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)
    {
@@ -347,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];
+    }
 }

 /*!
@@ -407,29 +441,30 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 {
    var segmentIndex = [_tabs testSegment:[_tabs convertPoint:[anEvent locationInWindow] fromView:nil]];

-    if (segmentIndex != CPNotFound)
-    {
-        [self selectTabViewItemAtIndex:segmentIndex];
+    if (segmentIndex != CPNotFound && [self selectTabViewItemAtIndex:segmentIndex])
        [_tabs trackSegment:anEvent];
-    }
 }

 - (void)_repositionTabs
 {
-    var horizontalCenterOfSelf = CGRectGetWidth([self bounds]) / 2,
-        verticalCenterOfTabs = CGRectGetHeight([_tabs bounds]) / 2;
+    var horizontalCenterOfSelf = _CGRectGetWidth([self bounds]) / 2,
+        verticalCenterOfTabs = _CGRectGetHeight([_tabs bounds]) / 2;

    if (_type === CPBottomTabsBezelBorder)
-        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
+        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, _CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
    else
-        [_tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
+        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
 }

 - (void)_setSelectedIndex:(CPNumber)index
 {
    _selectedIndex = index;
+    [self _setContentViewFromItem:[_items objectAtIndex:_selectedIndex]];
+}

-    [_box setContentView:[[_items objectAtIndex:_selectedIndex] view]];
+- (void)_setContentViewFromItem:(CPTabViewItem)anItem
+{
+    [_box setContentView:[anItem view]];
 }

 - (void)_updateItems
@@ -444,9 +479,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
    }

    if (_selectedIndex === CPNotFound)
-    {
        [self selectFirstTabViewItem:self];
-    }
 }

@end
@@ -469,18 +502,19 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
        [_tabs setFont:_font];

        _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
+        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];

        [self _updateItems];
-        [self _repositionTabs];
-
-        var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
-
-        if (selected)
-            [self selectTabViewItem:selected];

        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];

+        var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
+        if (selected)
+            [self selectTabViewItem:selected];
+
        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
+
+        [self setNeedsLayout];
    }

    return self;
@@ -491,7 +525,10 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
    [super encodeWithCoder:aCoder];

    [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
-    [aCoder encodeObject:[self selectedTabViewItem] forKey:CPTabViewSelectedItemKey];
+
+    var selected = [self selectedTabViewItem];
+    if (selected)
+        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];

    [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
    [aCoder encodeObject:_font forKey:CPTabViewFontKey];
@@ -60,6 +60,7 @@ CPPressedTab    = 2;
    CPView      _auxiliaryView;

    CPTabView   _tabView;
+    unsigned    _tabState;      // Looks like it is not yet implemented
 }

 - (id)init
@@ -132,7 +133,13 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
+    if (_view == aView)
+        return;
+
    _view = aView;
+
+    if ([_tabView selectedTabViewItem] == 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;
@@ -132,7 +135,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 {
    var min = [self minWidth],
        max = [self maxWidth],
-        newWidth = MIN(MAX(width, min), max);
+        newWidth = ROUND(MIN(MAX(width, min), max));

    [self setWidth:newWidth];

@@ -494,16 +497,23 @@ 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];
 }

 /*!
-    If NO the tablecolumn will no longer be visible in the tableview
-    If YES the tablecolumn will be visible in the tableview.
+    If YES the tablecolumn will no longer be visible in the tableview.
+    If NO the tablecolumn will be visible in the tableview.
 */
 - (void)setHidden:(BOOL)shouldBeHidden
 {
    shouldBeHidden = !!shouldBeHidden
+
    if (_isHidden === shouldBeHidden)
        return;

@@ -569,6 +579,30 @@ 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)
@@ -594,7 +628,22 @@ CPTableColumnUserResizingMask   = 1 << 1;
    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];

    if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
-        [[self tableView] _establishBindingsIfUnbound:anObject];
+    {
+        // Bind the table to the array controller this column is bound to.
+        // Note that anObject might not be the array controller. E.g. the keypath could be something like
+        // somePathTo.anArrayController.arrangedObjects.aKey. Cocoa doesn't support this but it is consistent
+        // and it makes sense.
+        var acIndex = aKeyPath.lastIndexOf("arrangedObjects."),
+            arrayController = anObject;
+
+        if (acIndex > 1)
+        {
+            var firstPart = aKeyPath.substring(0, acIndex - 1);
+            arrayController = [anObject valueForKeyPath:firstPart];
+        }
+
+        [[self tableView] _establishBindingsIfUnbound:arrayController];
+    }
 }

 /*!
@@ -663,8 +712,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
            bindingInfo = binding._info,
            destination = [bindingInfo objectForKey:CPObservedObjectKey],
            keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
+            options = [bindingInfo objectForKey:CPOptionsKey],
            dotIndex = keyPath.lastIndexOf(".");

+        newValue = [binding reverseTransformValue:newValue withOptions:options];
+
        if (dotIndex === CPNotFound)
            [[destination valueForKeyPath:keyPath] replaceObjectAtIndex:aRow withObject:newValue];
        else
@@ -681,11 +733,6 @@ CPTableColumnUserResizingMask   = 1 << 1;
    }
 }

-//- (void)objectValue
-//{
-//    return nil;
-//}
-
@end

 var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
@@ -719,7 +766,6 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
        [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
        [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
-        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];

        _resizingMask  = [aCoder decodeIntForKey:CPTableColumnResizingMaskKey];
        _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];
@@ -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
@@ -39,13 +45,14 @@

 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
-                                       forKeys:[@"background-color", @"text-alignment", @"text-inset", @"text-color", @"text-font", @"text-shadow-color", @"text-shadow-offset"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], CPLeftTextAlignment, CPLineBreakByTruncatingTail, CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
+                                       forKeys:[@"background-color", @"text-alignment", @"line-break-mode", @"text-inset", @"text-color", @"font", @"text-shadow-color", @"text-shadow-offset"]];
 }

 - (void)initWithFrame:(CGRect)frame
 {
    self = [super initWithFrame:frame];
+
    if (self)
        [self _init];

@@ -74,10 +81,11 @@

    [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
    [_textField setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
-    [_textField setFont:[self currentValueForThemeAttribute:@"text-font"]];
+    [_textField setFont:[self currentValueForThemeAttribute:@"font"]];
    [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
    [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
    [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
+    [_textField setLineBreakMode:[self currentValueForThemeAttribute:@"line-break-mode"]];
 }

 - (void)setStringValue:(CPString)string
@@ -102,7 +110,52 @@

 - (void)setFont:(CPFont)aFont
 {
-    [self setValue:aFont forThemeAttribute:"text-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 +175,10 @@

 var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
    _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
+    _CPTableColumnHeaderViewTextColorKey = @"_CPTableColumnHeaderViewTextColorKey",
+    _CPTableColumnHeaderViewTextShadowColorKey = @"_CPTableColumnHeaderViewTextShadowColorKey",
+    _CPTableColumnHeaderViewAlignmentKey = @"_CPTableColumnHeaderViewAlignmentKey",
+    _CPTableColumnHeaderViewLineBreakModeKey = @"_CPTableColumnHeaderViewLineBreakModeKey",
    _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";

@implementation _CPTableColumnHeaderView (CPCoding)
@@ -134,6 +191,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 +206,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
@@ -643,7 +708,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
        columnMaxX = _CGRectGetMaxX(columnToStroke);

        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
    }
    CGContextClosePath(context);
    CGContextStrokePath(context);
@@ -23,12 +23,26 @@
@import <Foundation/CPArray.j>
@import <Foundation/CPIndexSet.j>

+@import "CPDragServer_Constants.j"
@import "CGGradient.j"
-
+@import "CPCompatibility.j"
@import "CPControl.j"
-@import "CPTableColumn.j"
-@import "_CPCornerView.j"
+@import "CPImageView.j"
@import "CPScroller.j"
+@import "CPScrollView.j"
+@import "CPTableColumn.j"
+@import "CPTableHeaderView.j"
+@import "CPText.j"
+@import "_CPCornerView.j"
+
+@class CPButton
+@class CPClipView
+@class CPUserDefaults
+@class CPTableHeaderView
+@class CPClipView
+@class CPButton
+
+@global CPApp


 CPTableViewColumnDidMoveNotification        = @"CPTableViewColumnDidMoveNotification";
@@ -87,9 +101,9 @@ CPTableViewSelectionHighlightStyleNone = -1;
 CPTableViewSelectionHighlightStyleRegular = 0;
 CPTableViewSelectionHighlightStyleSourceList = 1;

-CPTableViewGridNone                    = 0;
-CPTableViewSolidVerticalGridLineMask   = 1 << 0;
-CPTableViewSolidHorizontalGridLineMask = 1 << 1;
+CPTableViewGridNone                     = 0;
+CPTableViewSolidVerticalGridLineMask    = 1 << 0;
+CPTableViewSolidHorizontalGridLineMask  = 1 << 1;

 CPTableViewNoColumnAutoresizing = 0;
 CPTableViewUniformColumnAutoresizingStyle = 1; // FIX ME: This is FUBAR
@@ -221,6 +235,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;

    SEL                 _doubleAction;
    CPInteger           _clickedRow;
+    CPInteger           _clickedColumn;
    unsigned            _columnAutoResizingStyle;

    int                 _lastTrackedRowIndex;
@@ -239,6 +254,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    BOOL                _disableAutomaticResizing @accessors(property=disableAutomaticResizing);
    BOOL                _lastColumnShouldSnap;
    BOOL                _implementsCustomDrawRow;
+    BOOL                _contentBindingExpicitelySet;

    CPTableColumn       _draggedColumn;
    CPArray             _differedColumnDataToRemove;
@@ -257,8 +273,26 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:["alternating-row-colors", "grid-color", "highlighted-grid-color", "selection-color", "sourcelist-selection-color", "sort-image", "sort-image-reversed"]];
+    return [CPDictionary dictionaryWithObjects:[[CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                25.0]
+                                       forKeys:[@"alternating-row-colors",
+                                                @"grid-color",
+                                                @"highlighted-grid-color",
+                                                @"selection-color",
+                                                @"sourcelist-selection-color",
+                                                @"sort-image",
+                                                @"sort-image-reversed",
+                                                @"selection-radius",
+                                                @"image-generic-file",
+                                                @"default-row-height"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -288,7 +322,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        _numberOfHiddenColumns = 0;

        _intercellSpacing = _CGSizeMake(3.0, 2.0);
-        _rowHeight = 23.0;
+        _rowHeight = [self valueForThemeAttribute:@"default-row-height"];

        [self setGridColor:[CPColor colorWithHexString:@"dce0e2"]];
        [self setGridStyleMask:CPTableViewGridNone];
@@ -305,6 +339,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
        _retargetedDropOperation = nil;
        _dragOperationDefaultMask = nil;
        _destinationDragStyle = CPTableViewDraggingDestinationFeedbackStyleRegular;
+        _contentBindingExpicitelySet = NO;

        [self setBackgroundColor:[CPColor whiteColor]];
        [self _init];
@@ -321,8 +356,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 */
 - (void)_init
 {
-    _tableViewFlags = 0;
-    _lastSelectedRow = -1;
+    _lastSelectedRow = _clickedColumn = _clickedRow = -1;

    _selectedColumnIndexes = [CPIndexSet indexSet];
    _selectedRowIndexes = [CPIndexSet indexSet];
@@ -335,19 +369,17 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
    if (!_alternatingRowBackgroundColors)
        _alternatingRowBackgroundColors = [[CPColor whiteColor], [CPColor colorWithHexString:@"e4e7ff"]];

-    _selectionHighlightColor = [CPColor colorWithHexString:@"5f83b9"];
-
    _tableColumnRanges = [];
    _dirtyTableColumnRangeIndex = 0;
    _numberOfHiddenColumns = 0;

    _objectValues = { };
    _dataViewsForTableColumns = { };
-    _dataViews =  [];
    _numberOfRows = 0;
    _exposedRows = [CPIndexSet indexSet];
    _exposedColumns = [CPIndexSet indexSet];
    _cachedDataViews = { };
+
    _cachedRowHeights = [];

    _groupRows = [CPIndexSet indexSet];
@@ -509,6 +541,11 @@ NOT YET IMPLEMENTED
    _objectValues = { };
    _cachedRowHeights = [];

+    // Otherwise, if we have a row marked as group with a
+    // index greater than the new number or rows
+    // it keeps the the graphical group style.
+    [_groupRows removeAllIndexes];
+
    // This updates the size too.
    [self noteNumberOfRowsChanged];

@@ -537,8 +574,12 @@ NOT YET IMPLEMENTED
 }

 /*
-    * - clickedColumn
+    Returns the index of the the column the user clicked to trigger an action, or -1 if no column was clicked.
 */
+- (CPInteger)clickedColumn
+{
+    return _clickedColumn;
+}

 /*!
    Returns the index of the the row the user clicked to trigger an action, or -1 if no row was clicked.
@@ -678,6 +719,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setRowHeight:(unsigned)aRowHeight
 {
+    // Accept row heights such as "0".
    aRowHeight = +aRowHeight;

    if (_rowHeight === aRowHeight)
@@ -721,7 +763,7 @@ NOT YET IMPLEMENTED

 - (void)setAlternatingRowBackgroundColors:(CPArray)alternatingRowBackgroundColors
 {
-    [self setValue:alternatingRowBackgroundColors forThemeAttribute:"alternating-row-colors"];
+    [self setValue:alternatingRowBackgroundColors forThemeAttribute:@"alternating-row-colors"];

    [self setNeedsDisplay:YES];
 }
@@ -763,10 +805,6 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionHighlightStyle:(unsigned)aSelectionHighlightStyle
 {
-    //early return for IE.
-    if (aSelectionHighlightStyle == CPTableViewSelectionHighlightStyleSourceList && !CPFeatureIsCompatible(CPHTMLCanvasFeature))
-        return;
-
    _selectionHighlightStyle = aSelectionHighlightStyle;
    [self setNeedsDisplay:YES];

@@ -783,7 +821,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionHighlightColor:(CPColor)aColor
 {
-    [self setValue:aColor forThemeAttribute:"selection-color"];
+    [self setValue:aColor forThemeAttribute:@"selection-color"];

    [self setNeedsDisplay:YES];
 }
@@ -809,7 +847,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setSelectionGradientColors:(CPDictionary)aDictionary
 {
-    [self setValue:aDictionary forThemeAttribute:"sourcelist-selection-color"];
+    [self setValue:aDictionary forThemeAttribute:@"sourcelist-selection-color"];

    [self setNeedsDisplay:YES];
 }
@@ -833,7 +871,7 @@ NOT YET IMPLEMENTED
 */
 - (void)setGridColor:(CPColor)aColor
 {
-    [self setValue:aColor forThemeAttribute:"grid-color"];
+    [self setValue:aColor forThemeAttribute:@"grid-color"];

    [self setNeedsDisplay:YES];
 }
@@ -953,6 +991,7 @@ NOT YET IMPLEMENTED
 */
 - (void)_moveColumn:(unsigned)fromIndex toColumn:(unsigned)toIndex
 {
+    // Convert parameters such as "0" to 0.
    fromIndex = +fromIndex;
    toIndex = +toIndex;

@@ -976,6 +1015,13 @@ NOT YET IMPLEMENTED
        columnIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(fromIndex, toIndex)];

    [self reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
+
+    // Notify even if programmatically moving a column as in Cocoa.
+    // TODO Only notify when a column drag operation ends, not each time a column reaches a new slot?
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPTableViewColumnDidMoveNotification
+                                                        object:self
+                                                      userInfo:[CPDictionary dictionaryWithObjects:[fromIndex, toIndex]
+                                                                                           forKeys:[@"CPOldColumn", @"CPNewColumn"]]];
 }

 /*!
@@ -1258,7 +1304,7 @@ NOT YET IMPLEMENTED
 */
 - (int)selectedColumn
 {
-    [_selectedColumnIndexes lastIndex];
+    return [_selectedColumnIndexes lastIndex];
 }

 /*!
@@ -1510,6 +1556,8 @@ NOT YET IMPLEMENTED

    if ([scrollView isKindOfClass:[CPScrollView class]] && [scrollView documentView] === self)
        [scrollView _updateCornerAndHeaderView];
+
+    [self setNeedsLayout];
 }

 // Complexity:
@@ -1561,6 +1609,7 @@ NOT YET IMPLEMENTED
 */
 - (CGRect)rectOfColumn:(CPInteger)aColumnIndex
 {
+    // Convert e.g. "0" to 0.
    aColumnIndex = +aColumnIndex;

    if (aColumnIndex < 0 || aColumnIndex >= NUMBER_OF_COLUMNS())
@@ -1790,7 +1839,7 @@ NOT YET IMPLEMENTED
 {
    if (_implementedDelegateMethods & CPTableViewDelegate_tableView_heightOfRow_)
    {
-            return idx = [_cachedRowHeights indexOfObject:aPoint
+            return [_cachedRowHeights indexOfObject:aPoint
                                            inSortedRange:nil
                                                  options:0
                                          usingComparator:function(aPoint, rowCache)
@@ -1984,7 +2033,7 @@ NOT YET IMPLEMENTED
    // so we should size the last resized to fit

    // find the last visisble column
-    while (count-- && [_tableColumns[count] isHidden]) ;
+    while (count-- && [_tableColumns[count] isHidden]);

    // find the max x, but subtract a single pixel since the spacing isn't applicable here.
    var delta = superviewWidth - _CGRectGetMaxX([self rectOfColumn:count]) - ([self intercellSpacing].width || 1),
@@ -2632,7 +2681,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    if (_allowsColumnSelection)
    {
        [self _noteSelectionIsChanging];
-        if (modifierFlags & CPCommandKeyMask)
+        if (modifierFlags & CPPlatformActionKeyMask)
        {
            if ([self isColumnSelected:clickedColumn])
                [self deselectColumn:clickedColumn];
@@ -2683,7 +2732,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        oldMainSortDescriptor = [[self sortDescriptors] objectAtIndex: 0];

    // Remove every main descriptor equivalents (normally only one)
-    while ((descriptor = [e nextObject]) != nil)
+    while ((descriptor = [e nextObject]) !== nil)
    {
        if ([[descriptor key] isEqual: [newMainSortDescriptor key]])
            [outdatedDescriptors addObject:descriptor];
@@ -2723,7 +2772,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (CPImage)_tableHeaderSortImage
 {
-    return [self currentValueForThemeAttribute:"sort-image"];
+    return [self currentValueForThemeAttribute:@"sort-image"];
 }

 /*!
@@ -2731,7 +2780,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (CPImage)_tableHeaderReverseSortImage
 {
-    return [self currentValueForThemeAttribute:"sort-image-reversed"];
+    return [self currentValueForThemeAttribute:@"sort-image-reversed"];
 }

 /*!
@@ -2785,7 +2834,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
-    return [[CPImage alloc] initWithContentsOfFile:@"Frameworks/AppKit/Resources/GenericFile.png" size:CGSizeMake(32,32)];
+    return [self valueForThemeAttribute:@"image-generic-file"];
 }

 /*!
@@ -2821,11 +2870,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
            var dataView = [self _newDataViewForRow:row tableColumn:tableColumn];

            [dataView setFrame:[self frameOfDataViewAtColumn:columnIndex row:row]];
-            [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
-
-            // If the column uses content bindings, allow them to override the objectValueForTableColumn.
-            [tableColumn _prepareDataView:dataView forRow:row];

+            [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];
            [view addSubview:dataView];

            row = [theDraggedRows indexGreaterThanIndex:row];
@@ -2845,11 +2891,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    // Copy the dataviews add them to a transparent drag view and use that drag view
    // to make it appear we are dragging images of those rows (as you would do in regular Cocoa)
 */
- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
+- (CPView)_dragViewForColumn:(int)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];
@@ -2863,22 +2910,17 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        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]];
+        [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];
        [dragView addSubview:dataView];

        row = [_exposedRows indexGreaterThanIndex:row];
    }

-    // Add the column header view
-    var headerFrame = [headerView frame];
-    headerFrame.origin = _CGPointMakeZero();
-
-    var columnHeaderView = [[_CPTableColumnHeaderView alloc] initWithFrame:headerFrame];
-    [columnHeaderView setStringValue:[headerView stringValue]];
-    [columnHeaderView setThemeState:[headerView themeState]];
+    // Add a copy of the header view.
+    var columnHeaderView = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:headerView]];
    [dragView addSubview:columnHeaderView];

    [dragView setBackgroundColor:[CPColor whiteColor]];
@@ -3044,7 +3086,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    return _sortDescriptors;
 }

-
 /*!
    @ignore
 */
@@ -3266,11 +3307,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
                isTextField = [dataView isKindOfClass:[CPTextField class]];

            [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
-            [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];

-            // This gives the table column an opportunity to apply its bindings.
-            // It will override the value set above if there is a binding.
-            [tableColumn _prepareDataView:dataView forRow:row];
+            [self _setObjectValueForTableColumn:tableColumn row:row forView:dataView];

            if (isColumnSelected || [self isRowSelected:row])
                [dataView setThemeState:CPThemeStateSelectedDataView];
@@ -3328,6 +3366,30 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    }
 }

+- (void)_setObjectValueForTableColumn:(CPTableColumn)aTableColumn row:(CPInteger)aRow forView:(CPView)aDataView
+{
+    if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_objectValueForTableColumn_row_)
+        [aDataView setObjectValue:[self _objectValueForTableColumn:aTableColumn row:aRow]];
+
+    // This gives the table column an opportunity to apply its bindings.
+    // It will override the value set above if there is a binding.
+
+    if (_contentBindingExpicitelySet)
+        [self _prepareContentBindedDataView:aDataView forRow:aRow];
+    else
+    // For both cell-based and view-based
+        [aTableColumn _prepareDataView:aDataView forRow:aRow];
+}
+
+- (void)_prepareContentBindedDataView:(CPView)dataView forRow:(CPInteger)aRow
+{
+    var binder = [CPTableContentBinder getBinding:@"content" forObject:self],
+        content = [binder content],
+        rowContent = [content objectAtIndex:aRow];
+
+    [dataView setObjectValue:rowContent];
+}
+
 /*!
    @ignore
 */
@@ -3351,12 +3413,15 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
            rowIndex = 0,
            rowsCount = rowArray.length;

-        for (; rowIndex < rowsCount; ++rowIndex)
+        if (dataViewsForTableColumn)
        {
-            var row = rowArray[rowIndex],
-                dataView = dataViewsForTableColumn[row];
+            for (; rowIndex < rowsCount; ++rowIndex)
+            {
+                var row = rowArray[rowIndex],
+                    dataView = dataViewsForTableColumn[row];

-            [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
+                [dataView setFrame:[self frameOfDataViewAtColumn:column row:row]];
+            }
        }
    }
 }
@@ -3368,6 +3433,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_commitDataViewObjectValue:(id)sender
 {
+    /*
+        makeFirstResponder at the end of this method causes the dataview to resign.
+        If the dataview resigning triggers the action (as CPTextField does), we come right
+        back here and start an infinite loop. So we have to check this flag first.
+    */
+    if ([sender respondsToSelector:@selector(sendsActionOnEndEditing)] && [sender sendsActionOnEndEditing] && _editingCellIndex === nil)
+        return;
+
    _editingCellIndex = nil;

    if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_setObjectValue_forTableColumn_row_)
@@ -3425,7 +3498,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        [aTableColumn setDataView:dataView];
    }

-
    return [aTableColumn _newDataViewForRow:aRow];
 }

@@ -3497,8 +3569,20 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 {
    [super setNeedsDisplay:aFlag];
    [_tableDrawView setNeedsDisplay:aFlag];
+
+    [[self headerView] setNeedsDisplay:YES];
 }

+/*!
+    @ignore
+*/
+- (void)setNeedsLayout
+{
+    [super setNeedsLayout];
+    [[self headerView] setNeedsLayout];
+}
+
+
 /*!
    @ignore
 */
@@ -3680,12 +3764,13 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        [_selectedColumnIndexes getIndexes:indexes maxCount:-1 inIndexRange:exposedRange];
    }

-    var count = count2 = [indexes count];
+    var count,
+        count2 = count = [indexes count];

    if (!count)
        return;

-    var drawGradient = (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
+    var drawGradient = (CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList && [_selectedRowIndexes count] >= 1),
        deltaHeight = 0.5 * (_gridStyleMask & CPTableViewSolidHorizontalGridLineMask);

    CGContextBeginPath(context);
@@ -3705,7 +3790,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    {
        var topGroupLineColor = [CPColor colorWithCalibratedWhite:212.0 / 255.0 alpha:1.0],
            bottomGroupLineColor = [CPColor colorWithCalibratedWhite:185.0 / 255.0 alpha:1.0],
-            gradientGroupColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [212.0 / 255.0, 212.0 / 255.0, 212.0 / 255.0,1.0, 197.0 / 255.0, 197.0 / 255.0, 197.0 / 255.0,1.0], [0,1], 2);
+            gradientGroupColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [212.0 / 255.0, 212.0 / 255.0, 212.0 / 255.0, 1.0, 197.0 / 255.0, 197.0 / 255.0, 197.0 / 255.0, 1.0], [0, 1], 2);
    }

    while (count--)
@@ -3752,7 +3837,25 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
            CGContextStrokePath(context);
        }
        else
-            CGContextAddRect(context, rowRect);
+        {
+            var radius = [self currentValueForThemeAttribute:@"selection-radius"];
+
+            if (radius > 0)
+            {
+                var minX = CGRectGetMinX(rowRect),
+                    maxX = CGRectGetMaxX(rowRect),
+                    minY = CGRectGetMinY(rowRect),
+                    maxY = CGRectGetMaxY(rowRect);
+
+                CGContextMoveToPoint(context, minX + radius, minY);
+                CGContextAddArcToPoint(context, maxX, minY, maxX, minY + radius, radius);
+                CGContextAddArcToPoint(context, maxX, maxY, maxX - radius, maxY, radius);
+                CGContextAddArcToPoint(context, minX, maxY, minX, maxY - radius, radius);
+                CGContextAddArcToPoint(context, minX, minY, minX + radius, minY, radius);
+            }
+            else
+                CGContextAddRect(context, rowRect);
+        }
    }

    CGContextClosePath(context);
@@ -3801,7 +3904,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    }

    CGContextClosePath(context);
-    CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:"highlighted-grid-color"]);
+    CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"highlighted-grid-color"]);
    CGContextStrokePath(context);
 }

@@ -3812,7 +3915,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (void)_drawGroupRowsForRects:(CPArray)rects
 {
-    if (_selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList || !rects.length)
+    if ((CPFeatureIsCompatible(CPHTMLCanvasFeature) && _selectionHighlightStyle === CPTableViewSelectionHighlightStyleSourceList) || !rects.length)
        return;

    var context = [[CPGraphicsContext currentContext] graphicsPort],
@@ -3823,8 +3926,8 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    var gradientCache = [self selectionGradientColors],
        topLineColor = [CPColor colorWithHexString:"d3d3d3"],
        bottomLineColor = [CPColor colorWithHexString:"bebebd"],
-        gradientColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0,1.0,
-                                                                                            199.0 / 255.0, 199.0 / 255.0, 199.0 / 255.0,1.0], [0,1], 2),
+        gradientColor = CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [220.0 / 255.0, 220.0 / 255.0, 220.0 / 255.0, 1.0,
+                                                                                            199.0 / 255.0, 199.0 / 255.0, 199.0 / 255.0, 1.0], [0, 1], 2),
        drawGradient = YES;

    while (i--)
@@ -3970,9 +4073,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 */
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
+    // Try to become the first responder, but if we can't, that's okay.
+    [[self window] makeFirstResponder:self];
+
    var row = [self rowAtPoint:aPoint];

-    //if the user clicks outside a row then deselect everything
+    // If the user clicks outside a row then deselect everything.
    if (row < 0 && _allowsEmptySelection)
        [self selectRowIndexes:[CPIndexSet indexSet] byExtendingSelection:NO];

@@ -3997,7 +4103,6 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    if (row >= 0 && !(_implementedDataSourceMethods & CPTableViewDataSource_tableView_writeRowsWithIndexes_toPasteboard_))
        [self _updateSelectionWithMouseAtRow:row];

-    [[self window] makeFirstResponder:self];
    return YES;
 }

@@ -4058,7 +4163,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
            if ([self canDragRowsWithIndexes:_draggedRowIndexes atPoint:aPoint] && [_dataSource tableView:self writeRowsWithIndexes:_draggedRowIndexes toPasteboard:pboard])
            {
                var currentEvent = [CPApp currentEvent],
-                    offset = CPPointMakeZero(),
+                    offset = CGPointMakeZero(),
                    tableColumns = [_tableColumns objectsAtIndexes:_exposedColumns];

                // We deviate from the default Cocoa implementation here by asking for a view in stead of an image
@@ -4075,13 +4180,13 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
                                                     tableColumns:tableColumns
                                                            event:currentEvent
                                                           offset:offset];
-                    view = [[CPImageView alloc] initWithFrame:CPMakeRect(0, 0, [image size].width, [image size].height)];
+                    view = [[CPImageView alloc] initWithFrame:CGRectMake(0, 0, [image size].width, [image size].height)];
                    [view setImage:image];
                }

                var bounds = [view bounds],
-                    viewLocation = CPPointMake(aPoint.x - CGRectGetWidth(bounds) / 2 + offset.x, aPoint.y - CGRectGetHeight(bounds) / 2 + offset.y);
-                [self dragView:view at:viewLocation offset:CPPointMakeZero() event:[CPApp currentEvent] pasteboard:pboard source:self slideBack:YES];
+                    viewLocation = CGPointMake(aPoint.x - CGRectGetWidth(bounds) / 2 + offset.x, aPoint.y - CGRectGetHeight(bounds) / 2 + offset.y);
+                [self dragView:view at:viewLocation offset:CGPointMakeZero() event:[CPApp currentEvent] pasteboard:pboard source:self slideBack:YES];
                _startTrackingPoint = nil;

                return NO;
@@ -4123,7 +4228,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    _isSelectingSession = NO;

    var CLICK_TIME_DELTA = 1000,
-        columnIndex,
+        columnIndex = -1,
        column,
        rowIndex,
        shouldEdit = YES;
@@ -4131,6 +4236,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_writeRowsWithIndexes_toPasteboard_)
    {
        rowIndex = [self rowAtPoint:aPoint];
+
        if (rowIndex !== -1)
        {
            if ([_draggedRowIndexes count] > 0)
@@ -4152,12 +4258,15 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
            || [self infoForBinding:@"content"]))
    {
        columnIndex = [self columnAtPoint:lastPoint];
+
        if (columnIndex !== -1)
        {
            column = _tableColumns[columnIndex];
+
            if ([column isEditable])
            {
                rowIndex = [self rowAtPoint:aPoint];
+
                if (rowIndex !== -1)
                {
                    if (_implementedDelegateMethods & CPTableViewDelegate_tableView_shouldEditTableColumn_row_)
@@ -4177,6 +4286,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    if ([[CPApp currentEvent] clickCount] === 2 && _doubleAction)
    {
        _clickedRow = [self rowAtPoint:aPoint];
+        _clickedColumn = [self columnAtPoint:lastPoint];
        [self sendAction:_doubleAction to:_target];
    }
 }
@@ -4255,7 +4365,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    // If there is no (the default) or to little inter cell spacing we create some room for the CPTableViewDropAbove indicator
    // This probably doesn't work if the row height is smaller than or around 5.0
    if ([self intercellSpacing].height < 5.0)
-        rowRect = CPRectInset(rowRect, 0.0, 5.0 - [self intercellSpacing].height);
+        rowRect = CGRectInset(rowRect, 0.0, 5.0 - [self intercellSpacing].height);

    // If the altered row rect contains the drag point we show the drop on
    // We don't show the drop on indicator if we are dragging below the last row
@@ -4303,7 +4413,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewOnRow:(int)theRowIndex
+- (CGRect)_rectForDropHighlightViewOnRow:(int)theRowIndex
 {
    if (theRowIndex >= [self numberOfRows])
        theRowIndex = [self numberOfRows] - 1;
@@ -4314,7 +4424,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 /*!
    @ignore
 */
- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
+- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CGPoint)theOffset
 {
    if (theLowerRowIndex > [self numberOfRows])
        theLowerRowIndex = [self numberOfRows];
@@ -4543,6 +4653,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
    return YES;
 }

+/*!
+    @ignore
+*/
+- (BOOL)needsPanelToBecomeKey
+{
+    return YES;
+}
+
 /*!
    @ignore
 */
@@ -4637,19 +4755,19 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        while (![_delegate tableView:self shouldSelectRow:i] && (i < [self numberOfRows] || i > 0))
            shouldGoUpward ? i-- : i++; //check to see if the row can be selected if it can't be then see if the next row can be selected

-        //if the index still can be selected after the loop then just return
-         if (![_delegate tableView:self shouldSelectRow:i])
-             return;
+        // If the index still can be selected after the loop then just return.
+        if (![_delegate tableView:self shouldSelectRow:i])
+            return;
    }

-    // if we go upward and see that this row is already selected we should deselect the row below
-    if ([selectedIndexes containsIndex:i] && extend)
+    // If we go upward and see that this row is already selected we should deselect the row below.
+    if (extend && [selectedIndexes containsIndex:i])
    {
-        // the row we're on is the last to be selected
+        // The row we're on is the last to be selected.
        var differedLastSelectedRow = i;

        // no remove the one before/after it
-        shouldGoUpward ? i++  : i--;
+        shouldGoUpward ? i++ : i--;

        [selectedIndexes removeIndex:i];

@@ -4661,7 +4779,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        if ([selectedIndexes containsIndex:i])
        {
            i = shouldGoUpward ? [selectedIndexes firstIndex] -1 : [selectedIndexes lastIndex] + 1;
-            i = MIN(MAX(i,0), [self numberOfRows] - 1);
+            i = MIN(MAX(i, 0), [self numberOfRows] - 1);
        }

        [selectedIndexes addIndex:i];
@@ -4686,6 +4804,14 @@ Your delegate can implement this method to avoid subclassing the tableview to ad

@implementation CPTableView (Bindings)

+ (id)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == @"content")
+        return [CPTableContentBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
 /*!
    @ignore
 */
@@ -4703,17 +4829,45 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
 - (void)_establishBindingsIfUnbound:(id)destination
 {
    if ([[self infoForBinding:@"content"] objectForKey:CPObservedObjectKey] !== destination)
-        [self bind:@"content" toObject:destination withKeyPath:@"arrangedObjects" options:nil];
+    {
+        [super bind:@"content" toObject:destination withKeyPath:@"arrangedObjects" options:nil];
+        _contentBindingExpicitelySet = NO;
+    }

-    if ([[self infoForBinding:@"selectionIndexes"] objectForKey:CPObservedObjectKey] !== destination)
-        [self bind:@"selectionIndexes" toObject:destination withKeyPath:@"selectionIndexes" options:nil];
+    // If the content binding was set manually assume the user is taking manual control of establishing bindings.
+    if (!_contentBindingExpicitelySet)
+    {
+        if ([[self infoForBinding:@"selectionIndexes"] objectForKey:CPObservedObjectKey] !== destination)
+            [self bind:@"selectionIndexes" toObject:destination withKeyPath:@"selectionIndexes" options:nil];

-    //[self bind:@"sortDescriptors" toObject:destination withKeyPath:@"sortDescriptors" options:nil];
+        if ([[self infoForBinding:@"sortDescriptors"] objectForKey:CPObservedObjectKey] !== destination)
+            [self bind:@"sortDescriptors" toObject:destination withKeyPath:@"sortDescriptors" options:nil];
+    }
 }

- (void)setContent:(CPArray)content
+- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
-    [self reloadData];
+    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
+
+    if (aBinding == @"content")
+        _contentBindingExpicitelySet = YES;
+}
+
+@end
+
+@implementation CPTableContentBinder : CPBinder
+{
+    id _content @accessors(property=content);
+}
+
+- (void)setValueFor:(id)aBinding
+{
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey];
+
+    _content = [destination valueForKey:keyPath];
+
+    [_source reloadData];
 }

@end
@@ -4761,15 +4915,14 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",
        _tableColumns = [aCoder decodeObjectForKey:CPTableViewTableColumnsKey] || [];
        [_tableColumns makeObjectsPerformSelector:@selector(setTableView:) withObject:self];

-        if ([aCoder containsValueForKey:CPTableViewRowHeightKey])
-            _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey];
-        else
-            _rowHeight = 23.0;
+        _rowHeight = [aCoder decodeFloatForKey:CPTableViewRowHeightKey] || [self valueForThemeAttribute:@"default-row-height"];
+        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey];

-        _intercellSpacing = [aCoder decodeSizeForKey:CPTableViewIntercellSpacingKey] || _CGSizeMake(3.0, 2.0);
+        if (_CGSizeEqualToSize(_intercellSpacing, _CGSizeMakeZero()))
+            _intercellSpacing = _CGSizeMake(3.0, 2.0);

        [self setGridColor:[aCoder decodeObjectForKey:CPTableViewGridColorKey]];
-        _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey] || CPTableViewGridNone;
+        _gridStyleMask = [aCoder decodeIntForKey:CPTableViewGridStyleMaskKey];

        _usesAlternatingRowBackgroundColors = [aCoder decodeObjectForKey:CPTableViewUsesAlternatingBackgroundKey];
        [self setAlternatingRowBackgroundColors:[aCoder decodeObjectForKey:CPTableViewAlternatingRowColorsKey]];
@@ -4836,9 +4989,8 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",

    while (index != CPNotFound)
    {
-        var indexSet = (switchFlag) ? otherSet : self;
-
-        otherIndex = [indexSet indexGreaterThanOrEqualToIndex:index];
+        var indexSet = (switchFlag) ? otherSet : self,
+            otherIndex = [indexSet indexGreaterThanOrEqualToIndex:index];

        if (otherIndex == index)
        {
@@ -4938,15 +5090,17 @@ var CPTableViewDataSourceKey                = @"CPTableViewDataSourceKey",

    isBlinking = YES;

-    var showCallback = function() {
+    var showCallback = function()
+    {
        objj_msgSend(self, "setHidden:", NO)
        isBlinking = NO;
-    }
+    };

-    var hideCallback = function() {
+    var hideCallback = function()
+    {
        objj_msgSend(self, "setHidden:", YES)
        isBlinking = YES;
-    }
+    };

    objj_msgSend(self, "setHidden:", YES);
    [CPTimer scheduledTimerWithTimeInterval:0.1 callback:showCallback repeats:NO];
@@ -1,4 +1,3 @@
-
 /*
 * CPTextField.j
 * AppKit
@@ -26,17 +25,21 @@
@import "CPControl.j"
@import "CPStringDrawing.j"
@import "CPCompatibility.j"
+@import "CPText.j"
+@import "CPWindow_Constants.j"
@import "_CPImageAndTextView.j"

+@class CPPasteboard

-CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with a squared corners. */
+@global CPApp
+@global CPStringPboardType
+
+CPTextFieldSquareBezel          = 0;    /*! A textfield bezel with squared corners. */
 CPTextFieldRoundedBezel         = 1;    /*! A textfield bezel with rounded corners. */

 CPTextFieldDidFocusNotification = @"CPTextFieldDidFocusNotification";
 CPTextFieldDidBlurNotification  = @"CPTextFieldDidBlurNotification";

-#if PLATFORM(DOM)
-
 var CPTextFieldDOMInputElement = nil,
    CPTextFieldDOMPasswordInputElement = nil,
    CPTextFieldDOMStandardInputElement = nil,
@@ -47,12 +50,42 @@ var CPTextFieldDOMInputElement = nil,
    CPTextFieldInputIsActive = NO,
    CPTextFieldCachedSelectStartFunction = nil,
    CPTextFieldCachedDragFunction = nil,
-    CPTextFieldBlurFunction = nil;
-
-#endif
+    CPTextFieldBlurHandler = nil,
+    CPTextFieldInputFunction = nil;

 var CPSecureTextFieldCharacter = "\u2022";

+
+function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resigning, didBlurRef)
+{
+    if (owner && domElement != inputElement.parentNode)
+        return;
+
+    if (!resigning && [[owner window] isKeyWindow])
+    {
+        /*
+            Browsers blur text fields when a click occurs anywhere outside the text field. That is normal for browsers, but in Cocoa the key view retains focus unless the click target accepts first responder. So if we lost focus but were not told to resign and our window is still key, restore focus.
+        */
+        window.setTimeout(function()
+        {
+            inputElement.focus();
+        }, 0.0);
+    }
+
+    CPTextFieldHandleBlur(anEvent, AT_REF(owner));
+    AT_DEREF(didBlurRef, YES);
+
+    return true;
+}
+
+function CPTextFieldHandleBlur(anEvent, ownerRef)
+{
+    AT_DEREF(ownerRef, nil);
+
+    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+}
+
+
@implementation CPString (CPTextFieldAdditions)

 /*!
@@ -169,7 +202,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

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

@@ -188,32 +221,45 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        CPTextFieldDOMInputElement.style.background = "transparent";
        CPTextFieldDOMInputElement.style.outline = "none";

-        CPTextFieldBlurFunction = function(anEvent)
+        CPTextFieldBlurHandler = function(anEvent)
        {
-            if (CPTextFieldInputOwner && CPTextFieldInputOwner._DOMElement != CPTextFieldDOMInputElement.parentNode)
-                return;
+            return CPTextFieldBlurFunction(
+                        anEvent,
+                        CPTextFieldInputOwner,
+                        CPTextFieldInputOwner._DOMElement,
+                        CPTextFieldDOMInputElement,
+                        CPTextFieldInputResigning,
+                        AT_REF(CPTextFieldInputDidBlur));
+        };

-            if (!CPTextFieldInputResigning)
+        if (CPFeatureIsCompatible(CPInputOnInputEventFeature))
+        {
+            CPTextFieldInputFunction = function(anEvent)
            {
-                [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-                return;
+                if (!CPTextFieldInputOwner)
+                    return;
+
+                var cappEvent = [CPEvent keyEventWithType:CPKeyUp
+                                                 location:_CGPointMakeZero()
+                                            modifierFlags:0
+                                                timestamp:[CPEvent currentTimestamp]
+                                             windowNumber:[[CPApp keyWindow] windowNumber]
+                                                  context:nil
+                                               characters:nil
+                              charactersIgnoringModifiers:nil
+                                                isARepeat:NO
+                                                  keyCode:nil];
+
+                [CPTextFieldInputOwner keyUp:cappEvent];
+
+                [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
            }

-            CPTextFieldHandleBlur(anEvent, CPTextFieldDOMInputElement);
-            CPTextFieldInputDidBlur = YES;
-
-            return true;
+            CPTextFieldDOMInputElement.oninput = CPTextFieldInputFunction;
        }

-        CPTextFieldHandleBlur = function(anEvent)
-        {
-            CPTextFieldInputOwner = nil;
-
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-        }
-
-        //FIXME make this not onblur
-        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurFunction;
+        // FIXME make this not onblur
+        CPTextFieldDOMInputElement.onblur = CPTextFieldBlurHandler;

        CPTextFieldDOMStandardInputElement = CPTextFieldDOMInputElement;
    }
@@ -242,7 +288,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
            CPTextFieldDOMPasswordInputElement.style.outline = "none";
            CPTextFieldDOMPasswordInputElement.type = "password";

-            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurFunction;
+            CPTextFieldDOMPasswordInputElement.onblur = CPTextFieldBlurHandler;
        }

        CPTextFieldDOMInputElement = CPTextFieldDOMPasswordInputElement;
@@ -289,6 +335,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    if (shouldBeEditable)
        _isSelectable = YES;

+    if (_isEditable)
+        [self setThemeState:CPThemeStateEditable];
+    else
+        [self unsetThemeState:CPThemeStateEditable];
+
    // We only allow first responder status if the field is editable and enabled.
    if (!shouldBeEditable && [[self window] firstResponder] === self)
        [[self window] makeFirstResponder:nil];
@@ -470,31 +521,44 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 /* @ignore */
 - (BOOL)becomeFirstResponder
 {
-#if PLATFORM(DOM)
-    if (CPTextFieldInputOwner && [CPTextFieldInputOwner window] !== [self window])
-        [[CPTextFieldInputOwner window] makeFirstResponder:nil];
-#endif
+    // As long as we are the first responder we need to monitor the key status of our window.
+    [self _setObserveWindowKeyNotifications:YES];

+    _isEditing = NO;
+
+    if ([[self window] isKeyWindow])
+        [self _becomeFirstKeyResponder];
+
+    return YES;
+}
+
+/*!
+    A text field can be the first responder without necessarily being the focus of keyboard input. For example, it might be the first responder of window A but window B is the main and key window. It's important we don't put a focused input field into a text field in a non-key window, even if that field is the first responder, because the key window might also have a first responder text field which the user will expect to receive keyboard input.
+
+    Since a first responder but non-key window text field can't receive input it should not even look like an active text field (Cocoa has a "slightly active" text field look it uses when another window is the key window, but Cappuccino doesn't today.)
+*/
+- (void)_becomeFirstKeyResponder
+{
    [self setThemeState:CPThemeStateEditing];

    [self _updatePlaceholderState];

    [self setNeedsLayout];

-    _isEditing = NO;
    _stringValue = [self stringValue];

 #if PLATFORM(DOM)

    var element = [self _inputElement],
-        font = [self currentValueForThemeAttribute:@"font"];
-
-    // generate the font metric
-    [font _getMetrics];
+        font = [self currentValueForThemeAttribute:@"font"],
+        lineHeight = [font defaultLineHeightForFont];

    element.value = _stringValue;
    element.style.color = [[self currentValueForThemeAttribute:@"text-color"] cssString];
-    element.style.font = [font cssString];
+
+    if (CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
+        element.style.font = [font cssString];
+
    element.style.zIndex = 1000;

    switch ([self alignment])
@@ -512,42 +576,41 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    switch (verticalAlign)
    {
        case CPTopVerticalTextAlignment:
-            var topPoint = (_CGRectGetMinY(contentRect) + 1) + "px"; // for the same reason we have a -1 for the left, we also have a + 1 here
+            var topPoint = _CGRectGetMinY(contentRect) + "px";
            break;

        case CPCenterVerticalTextAlignment:
-            var topPoint = (_CGRectGetMidY(contentRect) - (font._lineHeight / 2) + 1) + "px";
+            var topPoint = (_CGRectGetMidY(contentRect) - (lineHeight / 2)) + "px";
            break;

        case CPBottomVerticalTextAlignment:
-            var topPoint = (_CGRectGetMaxY(contentRect) - font._lineHeight) + "px";
+            var topPoint = (_CGRectGetMaxY(contentRect) - lineHeight) + "px";
            break;

        default:
-            var topPoint = (_CGRectGetMinY(contentRect) + 1) + "px";
+            var topPoint = _CGRectGetMinY(contentRect) + "px";
            break;
    }

    element.style.top = topPoint;
-    element.style.left = (_CGRectGetMinX(contentRect) - 1) + "px"; // why -1?
+    var left = _CGRectGetMinX(contentRect);
+
+    // If the browser has a built in left padding, compensate for it. We need the input text to be exactly on top of the original text.
+    if (CPFeatureIsCompatible(CPInput1PxLeftPadding))
+        left -= 1;
+
+    element.style.left = left + "px";
    element.style.width = _CGRectGetWidth(contentRect) + "px";
-    element.style.height = font._lineHeight + "px"; // private ivar for the line height of the DOM text at this particular size
+    element.style.height = ROUND(lineHeight) + "px";
+    element.style.lineHeight = ROUND(lineHeight) + "px";
+    element.style.verticalAlign = "top";
+    element.style.cursor = "auto";

    _DOMElement.appendChild(element);

-    window.setTimeout(function()
-    {
-        element.focus();
-
-        // Select the text if the textfield became first responder through keyboard interaction
-        if (!_willBecomeFirstResponderByClick)
-            [self selectText:self];
-
-        _willBecomeFirstResponderByClick = NO;
-
-        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
-        CPTextFieldInputOwner = self;
-    }, 0.0);
+    // The font change above doesn't work for some browsers if the element isn't already appendChild'ed.
+    if (!CPFeatureIsCompatible(CPInputSetFontOutsideOfDOM))
+        element.style.font = [font cssString];

    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

@@ -561,50 +624,94 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [[self window] platformWindow]._DOMBodyElement.ondrag = function () {};
        [[self window] platformWindow]._DOMBodyElement.onselectstart = function () {};
    }
-#endif

-    return YES;
+    CPTextFieldInputOwner = self;
+
+    window.setTimeout(function()
+    {
+        /*
+            setTimeout handlers are not guaranteed to fire in the order they were initiated. This can cause a race condition when several windows with text fields are opened quickly, resulting in several instances of this timeout function being fired, perhaps out of order. So we have to check that by the time this function is fired, CPTextFieldInputOwner has not been changed to another text field in the meantime.
+        */
+        if (CPTextFieldInputOwner !== self)
+            return;
+
+        element.focus();
+
+        // Select the text if the textfield became first responder through keyboard interaction
+        if (!_willBecomeFirstResponderByClick)
+            [self _selectText:self immediately:YES];
+
+        _willBecomeFirstResponderByClick = NO;
+
+        [self textDidFocus:[CPNotification notificationWithName:CPTextFieldDidFocusNotification object:self userInfo:nil]];
+    }, 0.0);
+
+#endif
 }

 /* @ignore */
 - (BOOL)resignFirstResponder
 {
-    [self unsetThemeState:CPThemeStateEditing];
-
 #if PLATFORM(DOM)

    var element = [self _inputElement],
+        newValue = element.value,
        error = @"";

+    if (newValue !== _stringValue)
+    {
+        [self _setStringValue:newValue];
+    }
+
    // If there is a formatter, always give it a chance to reject the resignation,
    // even if the value has not changed.
-    if ([self _valueIsValid:element.value] === NO)
+    if ([self _valueIsValid:newValue] === NO)
    {
-        [self setThemeState:CPThemeStateEditing];
        element.focus();
        return NO;
    }

 #endif

+    // When we are no longer the first responder we don't worry about the key status of our window anymore.
+    [self _setObserveWindowKeyNotifications:NO];
+
+    [self _resignFirstKeyResponder];
+
+    _isEditing = NO;
+    [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
+
+    if ([self sendsActionOnEndEditing])
+        [self sendAction:[self action] to:[self target]];
+
+    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
+
+    return YES;
+}
+
+- (void)_resignFirstKeyResponder
+{
+    [self unsetThemeState:CPThemeStateEditing];
+
    // Cache the formatted string
    _stringValue = [self stringValue];

    _willBecomeFirstResponderByClick = NO;

    [self _updatePlaceholderState];
-
    [self setNeedsLayout];

 #if PLATFORM(DOM)

+    var element = [self _inputElement];
+
    CPTextFieldInputResigning = YES;

    if (CPTextFieldInputIsActive)
        element.blur();

    if (!CPTextFieldInputDidBlur)
-        CPTextFieldBlurFunction();
+        CPTextFieldBlurHandler();

    CPTextFieldInputDidBlur = NO;
    CPTextFieldInputResigning = NO;
@@ -624,20 +731,32 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    }

 #endif
+}

-    // post CPControlTextDidEndEditingNotification
-    if (_isEditing)
+- (void)_setObserveWindowKeyNotifications:(BOOL)shouldObserve
+{
+    if (shouldObserve)
    {
-        _isEditing = NO;
-        [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:nil]];
-
-        if ([self sendsActionOnEndEditing])
-            [self sendAction:[self action] to:[self target]];
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidResignKey:) name:CPWindowDidResignKeyNotification object:[self window]];
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_windowDidBecomeKey:) name:CPWindowDidBecomeKeyNotification object:[self window]];
    }
+    else
+    {
+        [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidResignKeyNotification object:[self window]];
+        [[CPNotificationCenter defaultCenter] removeObserver:self name:CPWindowDidBecomeKeyNotification object:[self window]];
+    }
+}

-    [self textDidBlur:[CPNotification notificationWithName:CPTextFieldDidBlurNotification object:self userInfo:nil]];
+- (void)_windowDidResignKey:(CPNotification)aNotification
+{
+    if (![[self window] isKeyWindow])
+        [self _resignFirstKeyResponder];
+}

-    return YES;
+- (void)_windowDidBecomeKey:(CPNotification)aNotification
+{
+    if ([[self window] isKeyWindow] && [[self window] firstResponder] === self)
+        [self _becomeFirstKeyResponder];
 }

 - (BOOL)_valueIsValid:(CPString)aValue
@@ -651,7 +770,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        var acceptInvalidValue = NO;

        if ([_delegate respondsToSelector:@selector(control:didFailToFormatString:errorDescription:)])
-            acceptInvalidValue = [_delegate control:self didFailToFormatString:[self _inputElement] errorDescription:error];
+            acceptInvalidValue = [_delegate control:self didFailToFormatString:aValue errorDescription:error];

        if (acceptInvalidValue === NO)
            return NO;
@@ -663,11 +782,20 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 }

 /*!
-    Text fields require panels to become key window, so this returns \c YES.
+    Text fields require panels to become key window, so this returns \c YES
+    if the text field is ready to become the first responder as well.
 */
 - (BOOL)needsPanelToBecomeKey
 {
-    return YES;
+    return [self acceptsFirstResponder];
+}
+
+/*!
+    Only text fields that can become first responder accepts first mouse.
+*/
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return [self acceptsFirstResponder];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -774,6 +902,13 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");

 - (void)insertNewline:(id)sender
 {
+    var newValue = [self _inputElement].value;
+
+    if (newValue !== _stringValue)
+    {
+        [self _setStringValue:newValue];
+    }
+
    if ([self _valueIsValid:_stringValue])
    {
        // If _isEditing == YES then the target action can also be called via
@@ -1010,7 +1145,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    However, since you don't know how tall it needs to be if you change the font, sizeToFit will still be
    useful for making the textfield an appropriate height.
 */
-
 - (void)sizeToFit
 {
    [self setFrameSize:[self _minimumFrameSize]];
@@ -1037,8 +1171,16 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        textSize = [text sizeWithFont:font inWidth:textSize.width];
    }
    else
+    {
        textSize = [text sizeWithFont:font];

+        // Account for possible fractional pixels at right edge
+        textSize.width += 1;
+    }
+
+    // Account for possible fractional pixels at bottom edge
+    textSize.height += 1;
+
    frameSize.height = textSize.height + contentInset.top + contentInset.bottom;

    if ([self isBezeled])
@@ -1064,24 +1206,36 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 */
 - (void)selectText:(id)sender
 {
-    // FIXME Should this really make the text field the first responder?
+    [self _selectText:sender immediately:NO];
+}

+- (void)_selectText:(id)sender immediately:(BOOL)immediately
+{
+    // Selecting the text in a field makes it the first responder
    if (([self isEditable] || [self isSelectable]))
    {
+        var wind = [self window];
+
 #if PLATFORM(DOM)
        var element = [self _inputElement];

-        if ([[self window] firstResponder] === self)
-            window.setTimeout(function() { element.select(); }, 0);
-        else if ([self window] !== nil && [[self window] makeFirstResponder:self])
-            window.setTimeout(function() {[self selectText:sender];}, 0);
+        if ([wind firstResponder] === self)
+        {
+            if (immediately)
+                element.select();
+            else
+                window.setTimeout(function() { element.select(); }, 0);
+        }
+        else if (wind !== nil && [wind makeFirstResponder:self])
+            [self _selectText:sender immediately:immediately];
 #else
        // Even if we can't actually select the text we need to preserve the first
        // responder side effect.
-        if ([self window] !== nil && [[self window] firstResponder] !== self)
-            [[self window] makeFirstResponder:self];
+        if (wind !== nil && [wind firstResponder] !== self)
+            [wind makeFirstResponder:self];
 #endif
    }
+
 }

 - (void)copy:(id)sender
@@ -1108,7 +1262,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [self copy:sender];
        [self deleteBackward:sender];
    }
-    else
+    // If we don't have an oninput listener, we won't detect the change made by the cut and need to fake a key up "soon".
+    else if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
        [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(keyUp:) userInfo:nil repeats:NO];
 }

@@ -1130,7 +1285,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
        [self setStringValue:newValue];
        [self setSelectedRange:CPMakeRange(selectedRange.location + pasteString.length, 0)];
    }
-    else
+    // If we don't have an oninput listener, we won't detect the change made by the cut and need to fake a key up "soon".
+    else if (!CPFeatureIsCompatible(CPInputOnInputEventFeature))
        [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(keyUp:) userInfo:nil repeats:NO];
 }

@@ -1296,30 +1452,14 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 {
    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];

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

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

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

 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
@@ -1346,7 +1486,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
    else
    {
        var view = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
-        //[view setImagePosition:CPNoImage];

        [view setHitTests:NO];

@@ -1422,7 +1561,7 @@ var secureStringForString = function(aString)
        return "";

    return Array(aString.length + 1).join(CPSecureTextFieldCharacter);
-}
+};


 var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
@@ -1492,47 +1631,25 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
 {
 }

- (void)setValueFor:(CPString)theBinding
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
 {
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
+    [super _updatePlaceholdersWithOptions:options];

-    if (isPlaceholder)
-    {
-        switch (newValue)
-        {
-            case CPMultipleValuesMarker:
-                newValue = [options objectForKey:CPMultipleValuesPlaceholderBindingOption] || @"Multiple Values";
-                break;
+    [self _setPlaceholder:@"Multiple Values" forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:@"No Selection" forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:@"Not Applicable" forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:@"" forMarker:CPNullMarker isDefault:YES];
+}

-            case CPNoSelectionMarker:
-                newValue = [options objectForKey:CPNoSelectionPlaceholderBindingOption] || @"No Selection";
-                break;
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setPlaceholderString:aValue];
+    [_source setObjectValue:nil];
+}

-            case CPNotApplicableMarker:
-                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-                    [CPException raise:CPGenericException
-                                reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
-
-                newValue = [options objectForKey:CPNotApplicablePlaceholderBindingOption] || @"Not Applicable";
-                break;
-
-            case CPNullMarker:
-                newValue = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
-                break;
-        }
-
-        [_source setPlaceholderString:newValue];
-        [_source setObjectValue:nil];
-    }
-    else
-    {
-        newValue = [self transformValue:newValue withOptions:options];
-        [_source setObjectValue:newValue];
-    }
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setObjectValue:aValue];
 }

@end
@@ -21,9 +21,11 @@
 */

@import <Foundation/CPObject.j>
+@import <Foundation/CPMutableArray.j>
@import <Foundation/CPString.j>
@import <Foundation/CPKeyedUnarchiver.j>

+@class CPView

 var CPThemesByName          = { },
    CPThemeDefaultTheme     = nil,
@@ -145,7 +147,7 @@ var CPThemesByName          = { },
                className = [aClass defaultThemeClass];
            else if ([aClass respondsToSelector:@selector(themeClass)])
            {
-                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass",CPStringFromClass([anObject class]));
+                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
                className = [aClass themeClass];
            }
            else
@@ -255,7 +257,7 @@ var CPThemesByName          = { },
        attributeNames = [attributes keyEnumerator],
        objectThemeClass = [anObject themeClass];

-    while (attributeName = [attributeNames nextObject])
+    while ((attributeName = [attributeNames nextObject]) !== nil)
        [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
 }

@@ -418,6 +420,9 @@ CPThemeStateEditing         = CPThemeState("editing");
 CPThemeStateVertical        = CPThemeState("vertical");
 CPThemeStateDefault         = CPThemeState("default");
 CPThemeStateCircular        = CPThemeState("circular");
+CPThemeStateAutocompleting  = CPThemeState("autocompleting");
+CPThemeStateMainWindow      = CPThemeState("mainWindow");
+CPThemeStateKeyWindow       = CPThemeState("keyWindow");

@implementation _CPThemeAttribute : CPObject
 {
@@ -579,6 +584,7 @@ CPThemeStateCircular        = CPThemeState("circular");
        _cache = {};

        _name = [aCoder decodeObjectForKey:@"name"];
+        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
        _values = [CPDictionary dictionary];

        if ([aCoder containsValueForKey:@"value"])
@@ -611,6 +617,7 @@ CPThemeStateCircular        = CPThemeState("circular");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
    [aCoder encodeObject:_name forKey:@"name"];
+    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];

    var keys = [_values allKeys],
        count = keys.length;
@@ -666,7 +673,7 @@ var numberOfOnes = function(aNumber)
    cachedNumberOfOnes[slot] = count;

    return count;
-}
+};

 numberOfOnes.displayName = "numberOfOnes";

@@ -33,7 +33,7 @@

@implementation CPThemeBlend : CPObject
 {
-    CPBundle    _bundle;
+    CPBundle    _bundle @accessors(getter=bundle);
    CPArray     _themes;
    id          _loadDelegate;
 }
@@ -28,6 +28,7 @@
@import "CPPopUpButton.j"
@import "CPToolbarItem.j"

+@global CPApp

 /*
    @global
@@ -50,6 +51,11 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;

+
+CPToolbarSizeModeDefault                = 0;
+CPToolbarSizeModeRegular                = 1;
+CPToolbarSizeModeSmall                  = 2;
+
 var CPToolbarsByIdentifier              = nil,
    CPToolbarConfigurationsByIdentifier = nil;

@@ -83,10 +89,12 @@ var CPToolbarsByIdentifier              = nil,
@implementation CPToolbar : CPObject
 {
    CPString                _identifier;
-    CPToolbarDisplayMode    _displayMode;
+    CPToolbarDisplayMode    _displayMode @accessors(property=displayMode);
    BOOL                    _showsBaselineSeparator;
    BOOL                    _allowsUserCustomization;
    BOOL                    _isVisible;
+    int                     _sizeMode @accessors(property=sizeMode);
+    int                     _desiredHeight;

    id                      _delegate;

@@ -107,7 +115,7 @@ var CPToolbarsByIdentifier              = nil,
 /* @ignore */
 + (void)initialize
 {
-    if (self != [CPToolbar class])
+    if (self !== [CPToolbar class])
        return;

    CPToolbarsByIdentifier = [CPDictionary dictionary];
@@ -148,6 +156,8 @@ var CPToolbarsByIdentifier              = nil,

        _identifier = anIdentifier;
        _isVisible = YES;
+        _sizeMode = CPToolbarSizeModeDefault;
+        _desiredHeight = 0;

        [CPToolbar _addToolbar:self forIdentifier:_identifier];
    }
@@ -202,6 +212,16 @@ var CPToolbarsByIdentifier              = nil,
    [_window _noteToolbarChanged];
 }

+- (void)setSizeMode:(CPToolbarSizeMode)aSize
+{
+    if (aSize === _sizeMode)
+        return;
+    _sizeMode = aSize;
+
+    [[self _toolbarView] setFrame:[self _toolbarViewFrame]];
+    [_window _noteToolbarChanged];
+}
+
 - (CPWindow)_window
 {
    return _window;
@@ -209,7 +229,13 @@ var CPToolbarsByIdentifier              = nil,

 - (void)_setWindow:(CPWindow)aWindow
 {
+    if (_window)
+        [[CPNotificationCenter defaultCenter] removeObserver:self object:_window];
+
    _window = aWindow;
+
+    if (_window)
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autoValidateVisibleItems) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
 }

 /*!
@@ -226,18 +252,33 @@ var CPToolbarsByIdentifier              = nil,
    [self _reloadToolbarItems];
 }

+- (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
+{
+    if (_displayMode === aDisplayMode)
+        return;
+    _displayMode = aDisplayMode;
+
+    [self _reloadToolbarItems];
+}
+
 /* @ignore */
 - (void)_loadConfiguration
 {

 }

+- (CGRect)_toolbarViewFrame
+{
+    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [_toolbarView valueForThemeAttribute:@"regular-size-height"] : [_toolbarView valueForThemeAttribute:@"small-size-height"]);
+    return CGRectMake(0.0, 0.0, 1200.0, height);
+}
+
 /* @ignore */
 - (CPView)_toolbarView
 {
    if (!_toolbarView)
    {
-        _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
+        _toolbarView = [[_CPToolbarView alloc] initWithFrame:[self _toolbarViewFrame]];

        [_toolbarView setToolbar:self];
        [_toolbarView setAutoresizingMask:CPViewWidthSizable];
@@ -257,13 +298,17 @@ var CPToolbarsByIdentifier              = nil,
    // _defaultItems may have been loaded from Cib
    _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];

-    if (_delegate)
+    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
    {
-        var itemIdentifiersFromDelegate = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
+        var itemIdentifiersFromDelegate = [_delegate toolbarDefaultItemIdentifiers:self];

+        // If we get items both from the Cib and from the delegate method, put the delegate items before the
+        // Cib ones.
        if (itemIdentifiersFromDelegate)
-            _itemIdentifiers = [_itemIdentifiers arrayByAddingObjectsFromArray:itemIdentifiersFromDelegate];
+            _itemIdentifiers = [itemIdentifiersFromDelegate arrayByAddingObjectsFromArray:_itemIdentifiers];
    }
+    // If we didn't load from a cib and the delegate hasn't been set yet, we'll just work with an empty list
+    // at this point.

    var index = 0,
        count = [_itemIdentifiers count];
@@ -332,12 +377,26 @@ var CPToolbarsByIdentifier              = nil,
    each visible toolbar item.
 */
 - (void)validateVisibleItems
+{
+    [self _validateVisibleItems:NO]
+}
+
+- (void)_autoValidateVisibleItems
+{
+    [self _validateVisibleItems:YES]
+}
+
+- (void)_validateVisibleItems:(BOOL)isAutovalidation
 {
    var toolbarItems = [self visibleItems],
        count = [toolbarItems count];

    while (count--)
-        [toolbarItems[count] validate];
+    {
+        var item = [toolbarItems objectAtIndex:count];
+        if (!isAutovalidation || [item autovalidates])
+            [item validate];
+    }
 }

 /* @ignore */
@@ -427,7 +486,8 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
    CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
    CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
    CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey",
+    CPToolbarSizeModeKey                = @"CPToolbarSizeModeKey";

@implementation CPToolbar (CPCoding)

@@ -446,6 +506,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
        _showsBaselineSeparator = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
        _allowsUserCustomization = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
        _isVisible = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
+        _sizeMode = [aCoder decodeIntForKey:CPToolbarSizeModeKey];

        _identifiedItems = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
        _defaultItems = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
@@ -492,6 +553,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
    [aCoder encodeBool:_showsBaselineSeparator forKey:CPToolbarShowsBaselineSeparatorKey];
    [aCoder encodeBool:_allowsUserCustomization forKey:CPToolbarAllowsUserCustomizationKey];
    [aCoder encodeBool:_isVisible forKey:CPToolbarIsVisibleKey];
+    [aCoder encodeInt:_sizeMode forKey:CPToolbarSizeModeKey]

    [aCoder encodeObject:_identifiedItems forKey:CPToolbarIdentifiedItemsKey];
    [aCoder encodeObject:_defaultItems forKey:CPToolbarDefaultItemsKey];
@@ -508,14 +570,10 @@ var _CPToolbarViewBackgroundColor = nil,
    _CPToolbarViewExtraItemsImage = nil,
    _CPToolbarViewExtraItemsAlternateImage = nil;

-var TOOLBAR_TOP_MARGIN          = 5.0,
-    TOOLBAR_ITEM_MARGIN         = 10.0,
-    TOOLBAR_EXTRA_ITEMS_WIDTH   = 20.0;
-
 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
    return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
-}
+};

 /* @ignore */
@implementation _CPToolbarView : CPView
@@ -540,16 +598,32 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
    BOOL                _FIXME_isHUD;
 }

-+ (void)initialize
+ (CPString)defaultThemeClass
 {
-    if (self !== [_CPToolbarView class])
-        return;
+    return @"toolbar-view";
+}

-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size: CPSizeMake(10.0, 15.0)];
-
-    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:CGSizeMake(10.0, 15.0)];
+ (id)themeAttributes
+{
+    return [CPDictionary dictionaryWithObjects:[10.0,
+                                                20.0,
+                                                [CPNull null],
+                                                [CPNull null],
+                                                _CGInsetMake(4.0, 4.0, 4.0, 10),
+                                                59.0,
+                                                46.0,
+                                                [CPNull null],
+                                                CGRectMake(0.0, 0.0, 2.0, 32.0)]
+                                       forKeys:[
+                                               @"item-margin",
+                                               @"extra-item-width",
+                                               @"extra-item-extra-image",
+                                               @"extra-item-extra-alternate-image",
+                                               @"content-inset",
+                                               @"regular-size-height",
+                                               @"small-size-height",
+                                               @"image-item-separator-color",
+                                               @"image-item-separator-size"]];
 }

 - (id)initWithFrame:(CGRect)aFrame
@@ -563,14 +637,12 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        _labelColor = [CPColor blackColor];
        _labelShadowColor = [CPColor colorWithWhite:1.0 alpha:0.75];

-        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
+        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
        [_additionalItemsButton setBordered:NO];

        [_additionalItemsButton setImagePosition:CPImageOnly];
        [[_additionalItemsButton menu] setShowsStateColumn:NO];
        [[_additionalItemsButton menu] setAutoenablesItems:NO];
-
-        [_additionalItemsButton setAlternateImage:_CPToolbarViewExtraItemsAlternateImage];
    }

    return self;
@@ -615,7 +687,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
    // We begin by recalculating the visible items.
    var items = [_toolbar items],
-        itemsWidth = CGRectGetWidth([self bounds]),
+        itemsWidth = _CGRectGetWidth([self bounds]),
        minWidth = _minWidth,
        // FIXME: This should be a CPSet.
        invisibleItemsSortedByPriority = [];
@@ -626,7 +698,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
    // minimum width for hiding items.
    if (itemsWidth < minWidth)
    {
-        itemsWidth -= TOOLBAR_EXTRA_ITEMS_WIDTH;
+        itemsWidth -= [self valueForThemeAttribute:@"extra-item-width"];

        _visibleItems = [_visibleItems copy];

@@ -642,7 +714,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
            var item = itemsSortedByVisibilityPriority[--count],
                view = [self viewForItem:item];

-            minWidth -= [view minSize].width + TOOLBAR_ITEM_MARGIN;
+            minWidth -= [view minSize].width + [self valueForThemeAttribute:@"item-margin"];

            [_visibleItems removeObjectIdenticalTo:item];
            [invisibleItemsSortedByPriority addObject:item];
@@ -665,6 +737,24 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
            height = minSize.height;
    }

+    // We'll figure out the proper height for the toolbar depending on its items.
+    // If nothing has a minimum size we'll use the standard toolbar size for the
+    // sizeMode, indicated by a 0 _desiredHeight.
+    var contentInset = [self valueForThemeAttribute:@"content-inset"],
+        newDesiredHeight = height ? height + contentInset.top + contentInset.bottom : 0;
+
+    if (newDesiredHeight != _toolbar._desiredHeight)
+    {
+        // FIXME Probably the toolbar view shouldn't be telling the toolbar which height it should be. Maybe refactor
+        // to just have the toolbar scan the toolbar items whenever the items change.
+        _toolbar._desiredHeight = newDesiredHeight;
+
+        [self setFrame:[_toolbar _toolbarViewFrame]];
+        [_toolbar._window _noteToolbarChanged];
+        // The above will cause tile to be called again.
+        return;
+    }
+
    // Determine all the items that have flexible width.
    // Also determine the height of the toolbar.
    var count = _visibleItems.length,
@@ -684,7 +774,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
        // static width (min==max). This handles the case where the user did setView:
        // with a view of a different size than minSize/maxSize
        else
-            [view setFrameSize:CGSizeMake(minSize.width, height)];
+            [view setFrameSize:_CGSizeMake(minSize.width, height)];

        [view setHidden:NO];
    }
@@ -719,23 +809,25 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
                remainingSpace += proposedWidth - constrainedWidth;
            }

-            [view setFrameSize:CGSizeMake(constrainedWidth, height)];
+            [view setFrameSize:_CGSizeMake(constrainedWidth, height)];
        }
    }

    // Now that all the visible items are the correct width, give them their final frames.
    var index = 0,
        count = _visibleItems.length,
-        x = TOOLBAR_ITEM_MARGIN;
+        x = contentInset.left,
+        contentInset = [self valueForThemeAttribute:@"content-inset"],
+        y = contentInset.top;

    for (; index < count; ++index)
    {
        var view = [self viewForItem:_visibleItems[index]],
-            viewWidth = CGRectGetWidth([view frame]);
+            viewWidth = _CGRectGetWidth([view frame]);

-        [view setFrame:CGRectMake(x, 0.0, viewWidth, height)];
+        [view setFrame:_CGRectMake(x, y, viewWidth, height)];

-        x += viewWidth + TOOLBAR_ITEM_MARGIN;
+        x += viewWidth + [self valueForThemeAttribute:@"item-margin"];
    }

    var needsAdditionalItemsButton = NO;
@@ -767,14 +859,14 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

    if (needsAdditionalItemsButton)
    {
-        [_additionalItemsButton setFrameOrigin:CGPointMake(itemsWidth + 5.0, (CGRectGetHeight([self bounds]) - CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];
+        [_additionalItemsButton setFrameOrigin:_CGPointMake(itemsWidth + 5.0, (_CGRectGetHeight([self bounds]) - _CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];

        [self addSubview:_additionalItemsButton];

        [_additionalItemsButton removeAllItems];

        [_additionalItemsButton addItemWithTitle:@"Additional Items"];
-        [[_additionalItemsButton itemArray][0] setImage:_CPToolbarViewExtraItemsImage];
+        [[_additionalItemsButton itemArray][0] setImage:[self valueForThemeAttribute:@"extra-item-extra-image"]];

        var index = 0,
            count = [_invisibleItems count],
@@ -840,7 +932,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

    count = items.length;

-    _minWidth = TOOLBAR_ITEM_MARGIN;
+    _minWidth = [self valueForThemeAttribute:@"item-margin"];
    _viewsForToolbarItems = { };

    for (; index < count; ++index)
@@ -855,12 +947,17 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)

        [self addSubview:view];

-        _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
+        _minWidth += [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
    }

    [self tile];
 }

+- (void)layoutSubviews
+{
+    [_additionalItemsButton setAlternateImage:[self valueForThemeAttribute:@"extra-item-extra-alternate-image"]];
+}
+
@end

 /* @ignore */
@@ -876,10 +973,9 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
        return CPOrderedAscending;

    return CPOrderedDescending;
-}
+};

-var TOP_MARGIN      = 5.0,
-    LABEL_MARGIN    = 2.0;
+var LABEL_MARGIN    = 2.0;

@implementation _CPToolbarItemView : CPControl
 {
@@ -906,12 +1002,12 @@ var TOP_MARGIN      = 5.0,
    {
        _toolbarItem = aToolbarItem;

-        _labelField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        _labelField = [[CPTextField alloc] initWithFrame:_CGRectMakeZero()];

        [_labelField setFont:[CPFont systemFontOfSize:11.0]];
        [_labelField setTextColor:[self FIXME_labelColor]];
        [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
-        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
        [_labelField setAutoresizingMask:CPViewWidthSizable | CPViewMinXMargin];

        [self addSubview:_labelField];
@@ -958,13 +1054,7 @@ var TOP_MARGIN      = 5.0,

        if (identifier === CPToolbarSeparatorItemIdentifier)
        {
-            _view = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 2.0, 32.0)];
-
-            // FIXME: Get rid of this old API!!!
-            sizes = {};
-            sizes[@"CPToolbarItemSeparator"] = [CGSizeMake(2.0, 26.0), CGSizeMake(2.0, 1.0), CGSizeMake(2.0, 26.0)];
-            [_view setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
-
+            _view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
            [self addSubview:_view];
        }

@@ -996,7 +1086,7 @@ var TOP_MARGIN      = 5.0,
        {
            _imageView = [[CPImageView alloc] initWithFrame:[self bounds]];

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

            [self addSubview:_imageView];
        }
@@ -1014,8 +1104,13 @@ var TOP_MARGIN      = 5.0,

    _labelSize = [_labelField frame].size;

-    _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
-    _maxSize = CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);
+    var iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
+        labelOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeLabelOnly;
+    [_labelField setHidden:iconOnly];
+    [_view setHidden:labelOnly];
+
+    _minSize = _CGSizeMake(MAX(_labelSize.width, minSize.width), (labelOnly ? 0 : minSize.height) + (iconOnly ? 0 : _labelSize.height + LABEL_MARGIN));
+    _maxSize = _CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);

    [_toolbar tile];
 }
@@ -1032,20 +1127,31 @@ var TOP_MARGIN      = 5.0,
        width = _CGRectGetWidth(bounds);

    if (identifier === CPToolbarSeparatorItemIdentifier)
-        return [_view setFrame:CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
+    {
+        var itemSeparatorColor = [_toolbar valueForThemeAttribute:@"image-item-separator-color"],
+            itemSeparatorSize = [_toolbar valueForThemeAttribute:@"image-item-separator-size"];

+        [_view setFrame:_CGRectMake(ROUND((width - itemSeparatorSize.size.width) / 2.0), 0.0, itemSeparatorSize.size.width, _CGRectGetHeight(bounds))];
+        [_view setBackgroundColor:itemSeparatorColor];
+
+        return;
+    }
+
+    // The view is centred in the available space above the label.
    var view = _view || _imageView,
        itemMaxSize = [_toolbarItem maxSize],
-        height = _CGRectGetHeight(bounds) - _labelSize.height - LABEL_MARGIN - TOP_MARGIN,
+        iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
+        height = _CGRectGetHeight(bounds) - (iconOnly ? 0 : _labelSize.height),
        viewWidth = MIN(itemMaxSize.width, width),
        viewHeight =  MIN(itemMaxSize.height, height);

-    [view setFrame:CGRectMake(  ROUND((width - viewWidth) / 2.0),
-                                TOP_MARGIN + ROUND((height - viewHeight) / 2.0),
-                                viewWidth,
-                                viewHeight)];
+    [view setFrame:_CGRectMake(ROUND((width - viewWidth) / 2.0),
+                               ROUND((height - viewHeight) / 2.0),
+                               viewWidth,
+                               viewHeight)];

-    [_labelField setFrameOrigin:CGPointMake(ROUND((width - _labelSize.width) / 2.0), TOP_MARGIN + height + LABEL_MARGIN)];
+    // Label is always drawn at the bottom of the view. So if the view is really tall but the icon is tiny, the icon is centred above the label while the label remains on the bottom.
+    [_labelField setFrameOrigin:_CGPointMake(ROUND((width - _labelSize.width) / 2.0), _CGRectGetHeight(bounds) - _labelSize.height)];
 }

 - (void)mouseDown:(CPEvent)anEvent
@@ -1065,6 +1171,10 @@ var TOP_MARGIN      = 5.0,

 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
+    // Tiling is very expensive so try to avoid it. The CPToolbarItem should already be careful to not notifying about its enabled state needlessly.
+    if ([self isEnabled] === shouldBeEnabled)
+        return;
+
    [super setEnabled:shouldBeEnabled];

    if (shouldBeEnabled)
@@ -1108,7 +1218,7 @@ var TOP_MARGIN      = 5.0,
        if (alternateImage)
            [_imageView setImage:alternateImage];

-        [_labelField setTextShadowOffset:CGSizeMakeZero()];
+        [_labelField setTextShadowOffset:_CGSizeMakeZero()];
    }
    else
    {
@@ -1117,7 +1227,7 @@ var TOP_MARGIN      = 5.0,
        if (image)
            [_imageView setImage:image];

-        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
    }

    [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
@@ -20,615 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
-@import "CPImage.j"
-@import "CPView.j"
-
-
-CPToolbarItemVisibilityPriorityStandard = 0;
-CPToolbarItemVisibilityPriorityLow      = -1000;
-CPToolbarItemVisibilityPriorityHigh     = 1000;
-CPToolbarItemVisibilityPriorityUser     = 2000;
-
-CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItem";
-CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItem";
-CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItem";
-CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItem";
-CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
-CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
-CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
-
-/*!
-    @ingroup appkit
-    @class CPToolbarItem
-
-    A representation of an item in a CPToolbar.
-*/
-@implementation CPToolbarItem : CPObject
-{
-    CPString    _itemIdentifier;
-
-    CPToolbar   _toolbar;
-
-    CPString    _label;
-    CPString    _paletteLabel;
-    CPString    _toolTip;
-    int         _tag;
-    id          _target;
-    SEL         _action;
-    BOOL        _isEnabled;
-    CPImage     _image;
-    CPImage     _alternateImage;
-
-    CPView      _view;
-
-    CGSize      _minSize;
-    CGSize      _maxSize;
-
-    int         _visibilityPriority;
-
-    BOOL        _autovalidates;
-}
-
- (id)init
-{
-    return [self initWithItemIdentifier:@""];
-}
-
-// Creating a Toolbar Item
-/*!
-    Initializes the toolbar item with a specified identifier.
-    @param anItemIdentifier the item's identifier
-    @return the initialized toolbar item
-*/
- (id)initWithItemIdentifier:(CPString)anItemIdentifier
-{
-    self = [super init];
-
-    if (self)
-    {
-        _itemIdentifier = anItemIdentifier;
-
-        _tag = 0;
-        _isEnabled = YES;
-
-        _minSize = CGSizeMakeZero();
-        _maxSize = CGSizeMakeZero();
-
-        _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
-        _autovalidates = YES;
-    }
-
-    return self;
-}
-
-// Managing Attributes
-/*!
-    Returns the item's identifier.
-*/
- (CPString)itemIdentifier
-{
-    return _itemIdentifier;
-}
-
-/*!
-    Returns the toolbar of which this item is a part.
-*/
- (CPToolbar)toolbar
-{
-    return _toolbar;
-}
-
-/* @ignore */
- (void)_setToolbar:(CPToolbar)aToolbar
-{
-    _toolbar = aToolbar;
-}
-
-/*!
-    Returns the item's label
-*/
- (CPString)label
-{
-    return _label;
-}
-
-/*!
-    Sets the item's label.
-    @param aLabel the new label for the item
-*/
- (void)setLabel:(CPString)aLabel
-{
-    _label = aLabel;
-}
-
-/*!
-    Returns the palette label.
-*/
- (CPString)paletteLabel
-{
-    return _paletteLabel;
-}
-
-/*!
-    Sets the palette label
-    @param aPaletteLabel the new palette label
-*/
- (void)setPaletteLabel:(CPString)aPaletteLabel
-{
-    _paletteLabel = aPaletteLabel;
-}
-
-/*!
-    Returns the item's tooltip. A tooltip pops up
-    next to the cursor when the user hovers over
-    the item with the mouse.
-*/
- (CPString)toolTip
-{
-    if ([_view respondsToSelector:@selector(toolTip)])
-        return [_view toolTip];
-
-    return _toolTip;
-}
-
-/*!
-    Sets the item's tooltip. A tooltip pops up next to the cursor when the user hovers over the item with the mouse.
-    @param aToolTip the new item tool tip
-*/
- (void)setToolTip:(CPString)aToolTip
-{
-    if ([_view respondsToSelector:@selector(setToolTip:)])
-        [_view setToolTip:aToolTip];
-
-    _toolTip = aToolTip;
-}
-
-/*!
-    Returns the item's tag.
-*/
- (int)tag
-{
-    if ([_view respondsToSelector:@selector(tag)])
-        return [_view tag];
-
-    return _tag;
-}
-
-/*!
-    Sets the item's tag.
-    @param aTag the new tag for the item
-*/
- (void)setTag:(int)aTag
-{
-    if ([_view respondsToSelector:@selector(setTag:)])
-        [_view setTag:aTag];
-
-    _tag = aTag;
-}
-
-/*!
-    Returns the item's action target.
-*/
- (id)target
-{
-    if (_view)
-        return [_view respondsToSelector:@selector(target)] ? [_view target] : nil;
-
-    return _target;
-}
-
-/*!
-    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause
-    the action to be passed on to the first responder.
-    @param aTarget the new target
-*/
- (void)setTarget:(id)aTarget
-{
-    if (!_view)
-        _target = aTarget;
-
-    else if ([_view respondsToSelector:@selector(setTarget:)])
-        [_view setTarget:aTarget];
-}
-
-/*!
-    Returns the action that is triggered when the user clicks this item.
-*/
- (SEL)action
-{
-    if (_view)
-        return [_view respondsToSelector:@selector(action)] ? [_view action] : nil;
-
-    return _action;
-}
-
-/*!
-    Sets the action that is triggered when the user clicks this item.
-    @param anAction the new action
-*/
- (void)setAction:(SEL)anAction
-{
-    if (!_view)
-        _action = anAction;
-
-    else if ([_view respondsToSelector:@selector(setAction:)])
-        [_view setAction:anAction];
-}
-
-/*!
-    Returns \c YES if the item is enabled.
-*/
- (BOOL)isEnabled
-{
-    if ([_view respondsToSelector:@selector(isEnabled)])
-        return [_view isEnabled];
-
-    return _isEnabled;
-}
-
-/*!
-    Sets whether the item is enabled.
-    @param aFlag \c YES enables the item
-*/
- (void)setEnabled:(BOOL)shouldBeEnabled
-{
-    if ([_view respondsToSelector:@selector(setEnabled:)])
-        [_view setEnabled:shouldBeEnabled];
-
-    _isEnabled = shouldBeEnabled;
-}
-
-/*!
-    Returns the item's image
-*/
- (CPImage)image
-{
-    if ([_view respondsToSelector:@selector(image)])
-        return [_view image];
-
-    return _image;
-}
-
-/*!
-    Sets the item's image.
-    @param anImage the new item image
-*/
- (void)setImage:(CPImage)anImage
-{
-    if ([_view respondsToSelector:@selector(setImage:)])
-        [_view setImage:anImage];
-
-    _image = anImage;
-
-    if (!_image)
-        return;
-
-    if (_minSize.width === 0 && _minSize.height === 0 &&
-        _maxSize.width === 0 && _maxSize.height === 0)
-    {
-        var imageSize = [_image size];
-
-        if (imageSize.width > 0 || imageSize.height > 0)
-        {
-            [self setMinSize:imageSize];
-            [self setMaxSize:imageSize];
-        }
-    }
-}
-
-/*!
-    Sets the alternate image. This image is displayed on the item when the user is clicking it.
-    @param anImage the new alternate image
-*/
- (void)setAlternateImage:(CPImage)anImage
-{
-    if ([_view respondsToSelector:@selector(setAlternateImage:)])
-        [_view setAlternateImage:anImage];
-
-    _alternateImage = anImage;
-}
-
-/*!
-    Returns the alternate image. This image is displayed on the item when the user is clicking it.
-*/
- (CPImage)alternateImage
-{
-    if ([_view respondsToSelector:@selector(alternateIamge)])
-        return [_view alternateImage];
-
-    return _alternateImage;
-}
-
-/*!
-    Returns the item's view.
-*/
- (CPView)view
-{
-    return _view;
-}
-
-/*!
-    Sets the item's view
-    @param aView the item's new view
-*/
- (void)setView:(CPView)aView
-{
-    if (_view == aView)
-        return;
-
-    _view = aView;
-
-    if (_view)
-    {
-        // Tags get forwarded.
-        if (_tag !== 0 && [_view respondsToSelector:@selector(setTag:)])
-            [_view setTag:_tag];
-
-        _target = nil;
-        _action = nil;
-    }
-}
-
-/*!
-    Returns the item's minimum size.
-*/
- (CGSize)minSize
-{
-    return _minSize;
-}
-
-/*!
-    Sets the item's minimum size.
-    @param aMinSize the new minimum size
-*/
- (void)setMinSize:(CGSize)aMinSize
-{
-    if (!aMinSize.height || !aMinSize.width)
-        return;
-
-    _minSize = CGSizeMakeCopy(aMinSize);
-
-    // Try to provide some sanity: Make maxSize >= minSize
-    _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
-}
-
-/*!
-    Returns the item's maximum size.
-*/
- (CGSize)maxSize
-{
-    return _maxSize;
-}
-
-/*!
-    Sets the item's new maximum size.
-    @param aMaxSize the new maximum size
-*/
- (void)setMaxSize:(CGSize)aMaxSize
-{
-    if (!aMaxSize.height || !aMaxSize.width)
-        return;
-
-    _maxSize = CGSizeMakeCopy(aMaxSize);
-
-    // Try to provide some sanity: Make minSize <= maxSize
-    _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
-}
-
-// Visibility Priority
-/*!
-    Returns the item's visibility priority. The value will be one of:
-<pre>
-CPToolbarItemVisibilityPriorityStandard
-CPToolbarItemVisibilityPriorityLow
-CPToolbarItemVisibilityPriorityHigh
-CPToolbarItemVisibilityPriorityUser
-</pre>
-*/
- (int)visibilityPriority
-{
-    return _visibilityPriority;
-}
-
-/*!
-    Sets the item's visibility priority. The value must be one of:
-<pre>
-CPToolbarItemVisibilityPriorityStandard
-CPToolbarItemVisibilityPriorityLow
-CPToolbarItemVisibilityPriorityHigh
-CPToolbarItemVisibilityPriorityUser
-</pre>
-    @param aVisiblityPriority the priority
-*/
- (void)setVisibilityPriority:(int)aVisibilityPriority
-{
-    _visibilityPriority = aVisibilityPriority;
-}
-
- (void)validate
-{
-    var action = [self action],
-        target = [self target];
-
-    // View items do not do any target-action analysis.
-    if (_view)
-    {
-        if ([target respondsToSelector:@selector(validateToolbarItem:)])
-            [self setEnabled:[target validateToolbarItem:self]];
-
-        return;
-    }
-
-    if (!action)
-        return [self setEnabled:NO];
-
-    if (target && ![target respondsToSelector:action])
-        return [self setEnabled:NO];
-
-    target = [CPApp targetForAction:action to:target from:self];
-
-    if (!target)
-        return [self setEnabled:NO];
-
-    if ([target respondsToSelector:@selector(validateToolbarItem:)])
-        [self setEnabled:[target validateToolbarItem:self]];
-    else
-        [self setEnabled:YES];
-}
-
- (BOOL)autovalidates
-{
-    return _autovalidates;
-}
-
- (void)setAutovalidates:(BOOL)shouldAutovalidate
-{
-    _autovalidates = !!shouldAutovalidate;
-}
-
-@end
-
-var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
-    CPToolbarItemLabelKey               = @"CPToolbarItemLabelKey",
-    CPToolbarItemPaletteLabelKey        = @"CPToolbarItemPaletteLabelKey",
-    CPToolbarItemToolTipKey             = @"CPToolbarItemToolTipKey",
-    CPToolbarItemTagKey                 = @"CPToolbarItemTagKey",
-    CPToolbarItemTargetKey              = @"CPToolbarItemTargetKey",
-    CPToolbarItemActionKey              = @"CPToolbarItemActionKey",
-    CPToolbarItemEnabledKey             = @"CPToolbarItemEnabledKey",
-    CPToolbarItemImageKey               = @"CPToolbarItemImageKey",
-    CPToolbarItemAlternateImageKey      = @"CPToolbarItemAlternateImageKey",
-    CPToolbarItemViewKey                = @"CPToolbarItemViewKey",
-    CPToolbarItemMinSizeKey             = @"CPToolbarItemMinSizeKey",
-    CPToolbarItemMaxSizeKey             = @"CPToolbarItemMaxSizeKey",
-    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey",
-    CPToolbarItemAutovalidatesKey       = @"CPToolbarItemAutovalidatesKey";
-
-@implementation CPToolbarItem (CPCoding)
-
- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemItemIdentifierKey];
-
-        _minSize = [aCoder decodeSizeForKey:CPToolbarItemMinSizeKey];
-        _maxSize = [aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey];
-
-        [self setLabel:[aCoder decodeObjectForKey:CPToolbarItemLabelKey]];
-        [self setPaletteLabel:[aCoder decodeObjectForKey:CPToolbarItemPaletteLabelKey]];
-        [self setToolTip:[aCoder decodeObjectForKey:CPToolbarItemToolTipKey]];
-
-        [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
-        [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
-        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
-
-        [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
-
-        [self setImage:[aCoder decodeObjectForKey:CPToolbarItemImageKey]];
-        [self setAlternateImage:[aCoder decodeObjectForKey:CPToolbarItemAlternateImageKey]];
-
-        [self setView:[aCoder decodeObjectForKey:CPToolbarItemViewKey]];
-
-        [self setVisibilityPriority:[aCoder decodeIntForKey:CPToolbarItemVisibilityPriorityKey]];
-        [self setAutovalidates:[aCoder decodeBoolForKey:CPToolbarItemAutovalidatesKey]];
-    }
-
-    return self;
-}
-
- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_itemIdentifier forKey:CPToolbarItemItemIdentifierKey];
-
-    [aCoder encodeObject:[self label] forKey:CPToolbarItemLabelKey];
-    [aCoder encodeObject:[self paletteLabel] forKey:CPToolbarItemPaletteLabelKey];
-
-    [aCoder encodeObject:[self toolTip] forKey:CPToolbarItemToolTipKey];
-
-    [aCoder encodeObject:[self tag] forKey:CPToolbarItemTagKey];
-    [aCoder encodeObject:[self target] forKey:CPToolbarItemTargetKey];
-    [aCoder encodeObject:[self action] forKey:CPToolbarItemActionKey];
-
-    [aCoder encodeObject:[self isEnabled] forKey:CPToolbarItemEnabledKey];
-
-    [aCoder encodeObject:[self image] forKey:CPToolbarItemImageKey];
-    [aCoder encodeObject:[self alternateImage] forKey:CPToolbarItemAlternateImageKey];
-
-    [aCoder encodeObject:[self view] forKey:CPToolbarItemViewKey];
-
-    [aCoder encodeSize:[self minSize] forKey:CPToolbarItemMinSizeKey];
-    [aCoder encodeSize:[self maxSize] forKey:CPToolbarItemMaxSizeKey];
-
-    [aCoder encodeObject:[self visibilityPriority] forKey:CPToolbarItemVisibilityPriorityKey];
-    [aCoder encodeBool:[self autovalidates] forKey:CPToolbarItemAutovalidatesKey];
-}
-
-@end
-
-@implementation CPToolbarItem (CPCopying)
-
- (id)copy
-{
-    var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
-
-    if (_view)
-        [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
-
-    [copy _setToolbar:_toolbar];
-
-    [copy setLabel:_label];
-    [copy setPaletteLabel:_paletteLabel];
-    [copy setToolTip:[self toolTip]];
-
-    [copy setTag:[self tag]];
-    [copy setTarget:[self target]];
-    [copy setAction:[self action]];
-
-    [copy setEnabled:[self isEnabled]];
-
-    [copy setImage:[self image]];
-    [copy setAlternateImage:[self alternateImage]];
-
-    [copy setMinSize:_minSize];
-    [copy setMaxSize:_maxSize];
-
-    [copy setVisibilityPriority:[self visibilityPriority]];
-    [copy setAutovalidates:[self autovalidates]];
-
-    return copy;
-}
-
-@end
-
-// Standard toolbar identifiers
-
-@implementation CPToolbarItem (Standard)
-
-/* @ignore */
-+ (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
-{
-    switch (anItemIdentifier)
-    {
-        case CPToolbarSeparatorItemIdentifier:          return [_CPToolbarSeparatorItem new];
-        case CPToolbarSpaceItemIdentifier:              return [_CPToolbarSpaceItem new];
-        case CPToolbarFlexibleSpaceItemIdentifier:      return [_CPToolbarFlexibleSpaceItem new];
-        case CPToolbarShowColorsItemIdentifier:         return [_CPToolbarShowColorsItem new];
-        case CPToolbarShowFontsItemIdentifier:          return nil;
-        case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
-        case CPToolbarPrintItemIdentifier:              return nil;
-    }
-
-    return nil;
-}
-
-@end

+@import "_CPToolbarItem.j"
@import "_CPToolbarFlexibleSpaceItem.j"
@import "_CPToolbarShowColorsItem.j"
@import "_CPToolbarSeparatorItem.j"
@@ -1,3 +1,24 @@
+/*
+ * CPTreeNode.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/CPIndexPath.j>
@@ -23,9 +23,15 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPString.j>
-@import <AppKit/CPController.j>
+@import <Foundation/CPUserDefaults.j>
+
+@import "CPController.j"
+
+@global CPUserDefaultsDidChangeNotification
+

 var SharedUserDefaultsController = nil;

@@ -34,6 +40,7 @@ var SharedUserDefaultsController = nil;
    CPUserDefaults  _defaults           @accessors(readonly, property=defaults);
    CPDictionary    _initialValues      @accessors(property=initialValues);
    BOOL            _appliesImmediately @accessors(property=appliesImmediately);
+    id              _valueProxy;
 }

 + (id)sharedUserDefaultsController
@@ -180,7 +187,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
    var keys = [_cachedValues allKeys],
        keysCount = [keys count];

-    while(keysCount--)
+    while (keysCount--)
    {
        var key = keys[keysCount];
        [self willChangeValueForKey:key];
@@ -194,7 +201,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
    var keys = [_cachedValues allKeys],
        keysCount = [keys count];

-    while(keysCount--)
+    while (keysCount--)
    {
        var key = keys[keysCount];
        [[_controller defaults] setObject:[_cachedValues objectForKey:key] forKey:key];
@@ -207,7 +214,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
        keys = [_cachedValues allKeys],
        keysCount = [keys count];

-    while(keysCount--)
+    while (keysCount--)
    {
        var key = keys[keysCount];
        [self willChangeValueForKey:key];
@@ -229,7 +236,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
        keys = [_cachedValues allKeys],
        keysCount = [keys count];

-    while(keysCount--)
+    while (keysCount--)
    {
        var key = keys[keysCount],
            value = [_cachedValues objectForKey:key],
@@ -250,7 +257,7 @@ var CPUserDefaultsControllerSharedKey = "CPUserDefaultsControllerSharedKey";
        keys = [_cachedValues allKeys],
        keysCount = [keys count];

-    while(keysCount--)
+    while (keysCount--)
    {
        var key = keys[keysCount],
            value = [_cachedValues objectForKey:key],
@@ -26,14 +26,24 @@

@import "CGAffineTransform.j"
@import "CGGeometry.j"
-
@import "CPColor.j"
-@import "CPGeometry.j"
@import "CPGraphicsContext.j"
@import "CPResponder.j"
@import "CPTheme.j"
@import "_CPDisplayServer.j"

+@class _CPToolTip
+@class CPWindow
+@class _CPMenuItemView
+@class CPPlatformWindow
+@class CPMenu
+@class CPClipView
+@class CPScrollView
+
+@global appkit_tag_dom_elements
+@global CPWindowAbove
+@global CPBorderlessWindowMask
+@global CPScreenSaverWindowLevel

 /*
    @global
@@ -98,6 +108,7 @@ var CPViewFlags                     = { },
    CPViewHasCustomDrawRect         = 1 << 0,
    CPViewHasCustomLayoutSubviews   = 1 << 1;

+
 /*!
    @ingroup appkit
    @class CPView
@@ -141,6 +152,7 @@ var CPViewFlags                     = { },
    BOOL                _postsFrameChangedNotifications;
    BOOL                _postsBoundsChangedNotifications;
    BOOL                _inhibitFrameAndBoundsChangedNotifications;
+    BOOL                _inLiveResize;

 #if PLATFORM(DOM)
    DOMElement          _DOMElement;
@@ -188,7 +200,10 @@ var CPViewFlags                     = { },
    unsigned            _viewClassFlags;

    // ToolTips
-    CPString            _toolTip    @accessors(property=toolTip);
+    CPString            _toolTip    @accessors(getter=toolTip);
+    Function            _toolTipFunctionIn;
+    Function            _toolTipFunctionOut;
+    BOOL                _toolTipInstalled;
 }

 /*
@@ -214,7 +229,7 @@ var CPViewFlags                     = { },
    CachedNotificationCenter = [CPNotificationCenter defaultCenter];
 }

- (void)setupViewFlags
+- (void)_setupViewFlags
 {
    var theClass = [self class],
        classUID = [theClass UID];
@@ -235,6 +250,13 @@ var CPViewFlags                     = { },
    _viewClassFlags = CPViewFlags[classUID];
 }

+- (void)_setupToolTipHandlers
+{
+    _toolTipInstalled = NO;
+    _toolTipFunctionIn = function(e) { [_CPToolTip scheduleToolTipForView:self]; }
+    _toolTipFunctionOut = function(e) { [_CPToolTip invalidateCurrentToolTipIfNeeded]; };
+}
+
 + (CPSet)keyPathsForValuesAffectingFrame
 {
    return [CPSet setWithObjects:@"frameOrigin", @"frameSize"];
@@ -291,6 +313,9 @@ var CPViewFlags                     = { },
        CPDOMDisplayServerSetStyleLeftTop(_DOMElement, NULL, _CGRectGetMinX(aFrame), _CGRectGetMinY(aFrame));
        CPDOMDisplayServerSetStyleSize(_DOMElement, width, height);

+        if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
+            _DOMElement.setAttribute("data-cappuccino-view", [self className]);
+
        _DOMImageParts = [];
        _DOMImageSizes = [];
 #endif
@@ -298,7 +323,8 @@ var CPViewFlags                     = { },
        _theme = [CPTheme defaultTheme];
        _themeState = CPThemeStateNormal;

-        [self setupViewFlags];
+        [self _setupToolTipHandlers];
+        [self _setupViewFlags];

        [self _loadThemeAttributes];
    }
@@ -306,6 +332,82 @@ var CPViewFlags                     = { },
    return self;
 }

+
+/*!
+    Sets the tooltip for the receiver.
+
+    @param aToolTip the tooltip
+*/
+- (void)setToolTip:(CPString)aToolTip
+{
+    if (_toolTip == aToolTip)
+        return;
+
+    if (aToolTip && ![aToolTip isKindOfClass:CPString])
+        aToolTip = [aToolTip description];
+
+    _toolTip = aToolTip;
+
+    if (_toolTip)
+        [self _installToolTipEventHandlers];
+    else
+        [self _uninstallToolTipEventHandlers];
+}
+
+/*! @ignore
+
+    Install the handlers for the tooltip
+*/
+- (void)_installToolTipEventHandlers
+{
+    if (_toolTipInstalled)
+        return;
+
+#if PLATFORM(DOM)
+    if (_DOMElement.addEventListener)
+    {
+        _DOMElement.addEventListener("mouseover", _toolTipFunctionIn, NO);
+        _DOMElement.addEventListener("keypress", _toolTipFunctionOut, NO);
+        _DOMElement.addEventListener("mouseout", _toolTipFunctionOut, NO);
+    }
+    else if (_DOMElement.attachEvent)
+    {
+        _DOMElement.attachEvent("onmouseover", _toolTipFunctionIn);
+        _DOMElement.attachEvent("onkeypress", _toolTipFunctionOut);
+        _DOMElement.attachEvent("onmouseout", _toolTipFunctionOut);
+    }
+#endif
+
+    _toolTipInstalled = YES;
+}
+
+/*! @ignore
+
+    Uninstall the handlers for the tooltip
+*/
+- (void)_uninstallToolTipEventHandlers
+{
+    if (!_toolTipInstalled)
+        return;
+
+#if PLATFORM(DOM)
+    if (_DOMElement.removeEventListener)
+    {
+        _DOMElement.removeEventListener("mouseover", _toolTipFunctionIn, NO);
+        _DOMElement.removeEventListener("keypress", _toolTipFunctionOut, NO);
+        _DOMElement.removeEventListener("mouseout", _toolTipFunctionOut, NO);
+    }
+    else if (_DOMElement.detachEvent)
+    {
+        _DOMElement.detachEvent("onmouseover", _toolTipFunctionIn);
+        _DOMElement.detachEvent("onkeypress", _toolTipFunctionOut);
+        _DOMElement.detachEvent("onmouseout", _toolTipFunctionOut);
+    }
+#endif
+
+    _toolTipInstalled = NO;
+}
+
 /*!
    Returns the container view of the receiver
    @return the receiver's containing view
@@ -365,10 +467,13 @@ var CPViewFlags                     = { },
 /* @ignore */
 - (void)_insertSubview:(CPView)aSubview atIndex:(int)anIndex
 {
+    if (aSubview === self)
+        [CPException raise:CPInvalidArgumentException reason:"can't add a view as a subview of itself"];
+
    // We will have to adjust the z-index of all views starting at this index.
    var count = _subviews.length;

-    // dirty the key view loop, in case the window wants to auto recalculate it
+    // Dirty the key view loop, in case the window wants to auto recalculate it
    [[self window] _dirtyKeyViewLoop];

    // If this is already one of our subviews, remove it.
@@ -449,7 +554,7 @@ var CPViewFlags                     = { },
    if (!_superview)
        return;

-    // dirty the key view loop, in case the window wants to auto recalculate it
+    // Dirty the key view loop, in case the window wants to auto recalculate it
    [[self window] _dirtyKeyViewLoop];

    [_superview willRemoveSubview:self];
@@ -471,7 +576,7 @@ var CPViewFlags                     = { },
 */
 - (void)replaceSubview:(CPView)aSubview with:(CPView)aView
 {
-    if (aSubview._superview != self)
+    if (aSubview._superview !== self)
        return;

    var index = [_subviews indexOfObjectIdenticalTo:aSubview];
@@ -527,7 +632,7 @@ var CPViewFlags                     = { },
    var addedSubview = nil,
        addedSubviewEnumerator = [addedSubviews objectEnumerator];

-    while (addedSubview = [addedSubviewEnumerator nextObject])
+    while ((addedSubview = [addedSubviewEnumerator nextObject]) !== nil)
        [self addSubview:addedSubview];

    // If the order is fine, no need to reorder.
@@ -635,7 +740,7 @@ var CPViewFlags                     = { },
 }

 /*!
-    Called when the receiver is about to be remove one of its subviews.
+    Called when the receiver is about to remove one of its subviews.
    @param aView the view that will be removed
 */
 - (void)willRemoveSubview:(CPView)aView
@@ -706,7 +811,7 @@ var CPViewFlags                     = { },

 /*!
    Sets the frame size of the receiver to the dimensions and origin of the provided rectangle in the coordinate system
-    of the superview. The method also posts an CPViewFrameDidChangeNotification to the notification
+    of the superview. The method also posts a CPViewFrameDidChangeNotification to the notification
    center if the receiver is configured to do so. If the frame is the same as the current frame, the method simply
    returns (and no notification is posted).
    @param aFrame the rectangle specifying the new origin and size  of the receiver
@@ -759,7 +864,7 @@ var CPViewFlags                     = { },
 }

 /*!
-    Returns the center of the receiver's frame to the provided point. The point is defined in the superview's coordinate system.
+    Returns the center of the receiver's frame in the superview's coordinate system.
    @return CGPoint the center point of the receiver's frame
 */
 - (CGPoint)center
@@ -844,26 +949,90 @@ var CPViewFlags                     = { },
        }
        else
        {
-            var images = [[_backgroundColor patternImage] imageSlices];
+            var images = [[_backgroundColor patternImage] imageSlices],
+                partIndex = 0;

            if (_backgroundType === BackgroundVerticalThreePartImage)
            {
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width, size.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+                var top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
+                    bottom = _DOMImageSizes[2] ? _DOMImageSizes[2].height : 0;
+
+                // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
+                if (top)
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, top);
+                    partIndex++;
+                }
+                if (_DOMImageSizes[1])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, size.height - top - bottom);
+                    partIndex++;
+                }
+                if (bottom)
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, bottom);
+                }
            }
            else if (_backgroundType === BackgroundHorizontalThreePartImage)
            {
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, size.height);
+                var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
+                    right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0;
+
+                // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
+                if (left)
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], left, size.height);
+                    partIndex++;
+                }
+                if (_DOMImageSizes[1])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width - left - right, size.height);
+                    partIndex++;
+                }
+                if (right)
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], right, size.height);
+                }
            }
            else if (_backgroundType === BackgroundNinePartImage)
            {
-                var width = size.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
-                    height = size.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
+                var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
+                    right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0,
+                    top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
+                    bottom = _DOMImageSizes[6] ? _DOMImageSizes[6].height : 0,
+                    width = size.width - left - right,
+                    height = size.height - top - bottom;

-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
-                CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
+                if (_DOMImageSizes[0])
+                    partIndex++;
+                if (_DOMImageSizes[1])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, top);
+                    partIndex++;
+                }
+                if (_DOMImageSizes[2])
+                    partIndex++;
+                if (_DOMImageSizes[3])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[3].width, height);
+                    partIndex++;
+                }
+                if (_DOMImageSizes[4])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, height);
+                    partIndex++;
+                }
+                if (_DOMImageSizes[5])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[5].width, height);
+                    partIndex++;
+                }
+                if (_DOMImageSizes[6])
+                    partIndex++;
+                if (_DOMImageSizes[7])
+                {
+                    CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, _DOMImageSizes[7].height);
+                }
            }
        }
    }
@@ -1328,10 +1497,9 @@ var CPViewFlags                     = { },
    Returns \c YES by default.
    @return \c YES, if the view object accepts first mouse-down event. \c NO, otherwise.
 */
-//FIXME: should be NO by default?
 - (BOOL)acceptsFirstMouse:(CPEvent)anEvent
 {
-    return YES;
+    return NO;
 }

 /*!
@@ -1357,9 +1525,9 @@ var CPViewFlags                     = { },
    @param aPoint the point to test
    @return returns the containing view, or nil if the point is not contained
 */
- (CPView)hitTest:(CPPoint)aPoint
+- (CPView)hitTest:(CGPoint)aPoint
 {
-    if (_isHidden || !_hitTests || !CPRectContainsPoint(_frame, aPoint))
+    if (_isHidden || !_hitTests || !_CGRectContainsPoint(_frame, aPoint))
        return nil;

    var view = nil,
@@ -1435,17 +1603,18 @@ var CPViewFlags                     = { },
        colorHasAlpha = colorExists && [_backgroundColor alphaComponent] < 1.0,
        supportsRGBA = CPFeatureIsCompatible(CPCSSRGBAFeature),
        colorNeedsDOMElement = colorHasAlpha && !supportsRGBA,
-        amount = 0;
+        amount = 0,
+        slices;

    if ([patternImage isThreePartImage])
    {
        _backgroundType = [patternImage isVertical] ? BackgroundVerticalThreePartImage : BackgroundHorizontalThreePartImage;
-        amount = 3 - _DOMImageParts.length;
+        amount = 3;
    }
    else if ([patternImage isNinePartImage])
    {
        _backgroundType = BackgroundNinePartImage;
-        amount = 9 - _DOMImageParts.length;
+        amount = 9;
    }
    else
    {
@@ -1453,6 +1622,34 @@ var CPViewFlags                     = { },
        amount = (colorNeedsDOMElement ? 1 : 0) - _DOMImageParts.length;
    }

+    // Prepare multipart image data and reduce number of required DOM parts by number of empty slices in the multipart image to save needless DOM elements.
+    if (_backgroundType === BackgroundVerticalThreePartImage || _backgroundType === BackgroundHorizontalThreePartImage || _backgroundType === BackgroundNinePartImage)
+    {
+        slices = [patternImage imageSlices];
+
+        // We won't need more divs than there are slices.
+        amount = MIN(amount, slices.length);
+
+        for (var i = 0, count = slices.length; i < count; i++)
+        {
+            var image = slices[i],
+                size = [image size];
+
+            if (!size || (size.width == 0 && size.height == 0))
+                size = nil;
+
+            _DOMImageSizes[i] = size;
+
+            // If there's a nil slice or a slice with no size, it won't need a div.
+            if (!size)
+                amount--;
+        }
+
+        // Now that we know how many divs we really need, compare that to number we actually have.
+        amount -= _DOMImageParts.length;
+    }
+
+    // Make sure the number of divs we have match our needs.
    if (amount > 0)
    {
        while (amount--)
@@ -1494,64 +1691,148 @@ var CPViewFlags                     = { },
    }
    else
    {
-        var slices = [patternImage imageSlices],
-            count = MIN(_DOMImageParts.length, slices.length),
-            frameSize = _frame.size;
+        var frameSize = _frame.size,
+            partIndex = 0;

-        while (count--)
+        for (var i = 0; i < slices.length; i++)
        {
-            var image = slices[count],
-                size = _DOMImageSizes[count] = image ? [image size] : _CGSizeMakeZero();
+            var size = _DOMImageSizes[i];

-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[count], size.width, size.height);
+            if (!size)
+                continue;

-            _DOMImageParts[count].style.background = image ? "url(\"" + [image filename] + "\")" : "";
+            var image = slices[i];
+
+            // // If image was nil, size should have been nil too.
+            // assert(image != nil);
+
+            CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], size.width, size.height);
+
+            _DOMImageParts[partIndex].style.background = "url(\"" + [image filename] + "\")";

            if (!supportsRGBA)
            {
                if (CPFeatureIsCompatible(CPOpacityRequiresFilterFeature))
-                    try { _DOMImageParts[count].style.removeAttribute("filter") } catch (anException) { }
+                    try { _DOMImageParts[partIndex].style.removeAttribute("filter") } catch (anException) { }
                else
-                    _DOMImageParts[count].style.opacity = 1.0;
+                    _DOMImageParts[partIndex].style.opacity = 1.0;
            }
+
+            partIndex++;
        }

        if (_backgroundType == BackgroundNinePartImage)
        {
-            var width = frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width,
-                height = frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[6].height;
+            var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
+                right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0,
+                top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
+                bottom = _DOMImageSizes[6] ? _DOMImageSizes[6].height : 0,
+                width = frameSize.width - left - right,
+                height = frameSize.height - top - bottom;

-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], width, _DOMImageSizes[0].height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[3], _DOMImageSizes[3].width, height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[4], width, height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[5], _DOMImageSizes[5].width, height);
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[7], width, _DOMImageSizes[7].height);
+            partIndex = 0;

-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
-            CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[2], NULL, 0.0, 0.0);
-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[3], NULL, 0.0, _DOMImageSizes[1].height);
-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[4], NULL, _DOMImageSizes[0].width, _DOMImageSizes[0].height);
-            CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[5], NULL, 0.0, _DOMImageSizes[1].height);
-            CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[6], NULL, 0.0, 0.0);
-            CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[7], NULL, _DOMImageSizes[6].width, 0.0);
-            CPDOMDisplayServerSetStyleRightBottom(_DOMImageParts[8], NULL, 0.0, 0.0);
+            if (_DOMImageSizes[0])
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                partIndex++;
+            }
+            if (_DOMImageSizes[1])
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, left, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, _DOMImageSizes[1].height);
+                partIndex++;
+            }
+            if (_DOMImageSizes[2])
+            {
+                CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                partIndex++;
+            }
+            if (_DOMImageSizes[3])
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, top);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[3].width, height);
+                partIndex++;
+            }
+            if (_DOMImageSizes[4])
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, left, top);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, height);
+                partIndex++;
+            }
+            if (_DOMImageSizes[5])
+            {
+                CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[partIndex], NULL, 0.0, top);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], _DOMImageSizes[5].width, height);
+                partIndex++;
+            }
+            if (_DOMImageSizes[6])
+            {
+                CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                partIndex++;
+            }
+            if (_DOMImageSizes[7])
+            {
+                CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[partIndex], NULL, left, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], width, _DOMImageSizes[7].height);
+                partIndex++;
+            }
+            if (_DOMImageSizes[8])
+            {
+                CPDOMDisplayServerSetStyleRightBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+            }
        }
        else if (_backgroundType == BackgroundVerticalThreePartImage)
        {
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width, frameSize.height - _DOMImageSizes[0].height - _DOMImageSizes[2].height);
+            var top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
+                bottom = _DOMImageSizes[2] ? _DOMImageSizes[2].height : 0;

-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, 0.0, _DOMImageSizes[0].height);
-            CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[2], NULL, 0.0, 0.0);
+            partIndex = 0;
+
+            // Make sure to repeat the top and bottom pieces horizontally if they're not the exact width needed.
+            if (top)
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, top);
+                partIndex++;
+            }
+            if (_DOMImageSizes[1])
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, top);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, frameSize.height - top - bottom);
+                partIndex++;
+            }
+            if (bottom)
+            {
+                CPDOMDisplayServerSetStyleLeftBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, bottom);
+            }
        }
        else if (_backgroundType == BackgroundHorizontalThreePartImage)
        {
-            CPDOMDisplayServerSetStyleSize(_DOMImageParts[1], frameSize.width - _DOMImageSizes[0].width - _DOMImageSizes[2].width, frameSize.height);
+            var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
+                right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0;

-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[0], NULL, 0.0, 0.0);
-            CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[1], NULL, _DOMImageSizes[0].width, 0.0);
-            CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[2], NULL, 0.0, 0.0);
+            partIndex = 0;
+
+            // Make sure to repeat the left and right pieces vertically if they're not the exact height needed.
+            if (left)
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], left, frameSize.height);
+                partIndex++;
+            }
+            if (_DOMImageSizes[1])
+            {
+                CPDOMDisplayServerSetStyleLeftTop(_DOMImageParts[partIndex], NULL, left, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width - left - right, frameSize.height);
+                partIndex++;
+            }
+            if (right)
+            {
+                CPDOMDisplayServerSetStyleRightTop(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
+                CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], right, frameSize.height);
+            }
        }
    }
 #endif
@@ -1765,7 +2046,7 @@ setBoundsOrigin:
    @param aSourceObject the drag operation controller
    @param slideBack Whether the view should 'slide back' if the drag is rejected
 */
- (void)dragView:(CPView)aView at:(CPPoint)aLocation offset:(CPSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+- (void)dragView:(CPView)aView at:(CGPoint)aLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
    [_window dragView:aView at:[self convertPoint:aLocation toView:nil] offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
 }
@@ -1815,7 +2096,7 @@ setBoundsOrigin:
    Draws the receiver into \c aRect. This method should be overridden by subclasses.
    @param aRect the area that should be drawn into
 */
- (void)drawRect:(CPRect)aRect
+- (void)drawRect:(CGRect)aRect
 {

 }
@@ -1835,7 +2116,7 @@ setBoundsOrigin:
    Marks the area denoted by \c aRect as dirty, and initiates a redraw on it.
    @param aRect the area that needs to be redrawn
 */
- (void)setNeedsDisplayInRect:(CPRect)aRect
+- (void)setNeedsDisplayInRect:(CGRect)aRect
 {
    if (!(_viewClassFlags & CPViewHasCustomDrawRect))
        return;
@@ -1883,7 +2164,7 @@ setBoundsOrigin:
    Draws the receiver into the area defined by \c aRect.
    @param aRect the area to be drawn
 */
- (void)displayRect:(CPRect)aRect
+- (void)displayRect:(CGRect)aRect
 {
    [self viewWillDraw];

@@ -1920,6 +2201,7 @@ setBoundsOrigin:
    {
        var graphicsPort = CGBitmapGraphicsContextCreate();

+#if PLATFORM(DOM)
        _DOMContentsElement = graphicsPort.DOMElement;

        _DOMContentsElement.style.zIndex = -100;
@@ -1936,7 +2218,11 @@ setBoundsOrigin:
        _DOMContentsElement.style.width = ROUND(_CGRectGetWidth(_frame)) + "px";
        _DOMContentsElement.style.height = ROUND(_CGRectGetHeight(_frame)) + "px";

-#if PLATFORM(DOM)
+        // The performance implications of this aren't clear, but without this subviews might not be redrawn when this
+        // view moves.
+        if (CPPlatformHasBug(CPCanvasParentDrawErrorsOnMovementBug))
+            _DOMElement.style.webkitTransform = 'translateX(0)';
+
        CPDOMDisplayServerAppendChild(_DOMElement, _DOMContentsElement);
 #endif
        _graphicsContext = [CPGraphicsContext graphicsContextWithGraphicsPort:graphicsPort flipped:YES];
@@ -2128,6 +2414,43 @@ setBoundsOrigin:
 {
 }

+/*!
+    Return yes if the receiver is in a live-resize operation.
+*/
+- (BOOL)inLiveResize
+{
+    return _inLiveResize;
+}
+
+/*!
+    Not implemented.
+
+    A view will be sent this message before a window begins a resize operation. The
+    receiver might choose to simplify its drawing operations during a live resize
+    for speed.
+
+    Subclasses should call super.
+*/
+- (void)viewWillStartLiveResize
+{
+    _inLiveResize = YES;
+}
+
+/*!
+    Not implemented.
+
+    A view will be sent this message after a window finishes a resize operation. The
+    receiver which simplified its drawing operations in viewWillStartLiveResize might
+    stop doing so now. Note the view might no longer be in a window, so use
+    [self setNeedsDisplay:YES] if a final non-simplified redraw is required.
+
+    Subclasses should call super.
+*/
+- (void)viewDidEndLiveResize
+{
+    _inLiveResize = NO;
+}
+
@end

@implementation CPView (KeyView)
@@ -2543,6 +2866,50 @@ setBoundsOrigin:
    return (_themeAttributes && _themeAttributes[aName] !== undefined);
 }

+/*!
+    Registers theme values encoded in an array at runtime. The format of the data in the array
+    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
+    CPColorWithImages() in place of PatternColor(). For more information see the comments
+    at the top of ThemeDescriptors.j.
+
+    @param themeValues array of theme values
+*/
+- (void)registerThemeValues:(CPArray)themeValues
+{
+    for (var i = 0; i < themeValues.length; ++i)
+    {
+        var attributeValueState = themeValues[i],
+            attribute = attributeValueState[0],
+            value = attributeValueState[1],
+            state = attributeValueState[2];
+
+        if (state)
+            [self setValue:value forThemeAttribute:attribute inState:state];
+        else
+            [self setValue:value forThemeAttribute:attribute];
+    }
+}
+
+/*!
+    Registers theme values encoded in an array at runtime. The format of the data in the array
+    is the same as that used by ThemeDescriptors.j, with the exception that you need to use
+    CPColorWithImages() in place of PatternColor(). The values in \c inheritedValues are
+    registered first, then those in \c themeValues override/augment the inherited values.
+    For more information see the comments at the top of ThemeDescriptors.j.
+
+    @param themeValues array of base theme values
+    @param inheritedValues array of overridden/additional theme values
+*/
+- (void)registerThemeValues:(CPArray)themeValues inherit:(CPArray)inheritedValues
+{
+    // Register inherited values first, then override those with the subtheme values.
+    if (inheritedValues)
+        [self registerThemeValues:inheritedValues];
+
+    if (themeValues)
+        [self registerThemeValues:themeValues];
+}
+
 - (CPView)createEphemeralSubviewNamed:(CPString)aViewName
 {
    return nil;
@@ -2607,6 +2974,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
    CPViewBoundsKey                 = @"CPViewBoundsKey",
    CPViewFrameKey                  = @"CPViewFrameKey",
    CPViewHitTestsKey               = @"CPViewHitTestsKey",
+    CPViewToolTipKey                = @"CPViewToolTipKey",
    CPViewIsHiddenKey               = @"CPViewIsHiddenKey",
    CPViewOpacityKey                = @"CPViewOpacityKey",
    CPViewSubviewsKey               = @"CPViewSubviewsKey",
@@ -2661,7 +3029,13 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",

        _autoresizesSubviews = ![aCoder containsValueForKey:CPViewAutoresizesSubviewsKey] || [aCoder decodeBoolForKey:CPViewAutoresizesSubviewsKey];

-        _hitTests = ![aCoder containsValueForKey:CPViewHitTestsKey] || [aCoder decodeObjectForKey:CPViewHitTestsKey];
+        _hitTests = ![aCoder containsValueForKey:CPViewHitTestsKey] || [aCoder decodeBoolForKey:CPViewHitTestsKey];
+
+        [self _setupToolTipHandlers];
+        _toolTip = [aCoder decodeObjectForKey:CPViewToolTipKey];
+
+        if (_toolTip)
+            [self _installToolTipEventHandlers];

        // DOM SETUP
 #if PLATFORM(DOM)
@@ -2681,10 +3055,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
        }
 #endif

-        if ([aCoder containsValueForKey:CPViewIsHiddenKey])
-            [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];
-        else
-            _isHidden = NO;
+        [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];

        if ([aCoder containsValueForKey:CPViewOpacityKey])
            [self setAlphaValue:[aCoder decodeIntForKey:CPViewOpacityKey]];
@@ -2692,8 +3063,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
            _opacity = 1.0;

        [self setBackgroundColor:[aCoder decodeObjectForKey:CPViewBackgroundColorKey]];
-
-        [self setupViewFlags];
+        [self _setupViewFlags];

        _theme = [CPTheme defaultTheme];
        _themeClass = [aCoder decodeObjectForKey:CPViewThemeClassKey];
@@ -2774,6 +3144,9 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
    if (_isHidden)
        [aCoder encodeBool:_isHidden forKey:CPViewIsHiddenKey];

+    if (_toolTip)
+        [aCoder encodeObject:_toolTip forKey:CPViewToolTipKey];
+
    var nextKeyView = [self nextKeyView];

    if (nextKeyView !== nil && ![nextKeyView isEqual:self])
@@ -2799,7 +3172,7 @@ var _CPViewFullScreenModeStateMake = function(aView)
    var superview = aView._superview;

    return { autoresizingMask:aView._autoresizingMask, frame:CGRectMakeCopy(aView._frame), index:(superview ? [superview._subviews indexOfObjectIdenticalTo:aView] : 0), superview:superview };
-}
+};

 var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
 {
@@ -2896,4 +3269,4 @@ var _CPViewGetTransform = function(/*CPView*/ fromView, /*CPView */ toView)
    }*/

    return transform;
-}
+};
@@ -22,6 +22,7 @@

@import "CPAnimation.j"

+@class CPWindow

 CPViewAnimationTargetKey = @"CPViewAnimationTargetKey";
 CPViewAnimationStartFrameKey = @"CPViewAnimationStartFrameKey";
--- a/Show More
+++ b/Show More