Merge branch 'master' into coretext

Still needs a lot of work; there are bugs,
performance issues, and missing features.

.gitignore

@@ -9,7 +9,3 @@ WebSite
 *.xcodeproj/*.perspectivev3
 xcuserdata/
 !*.xcodeproj/project.pbxproj
-*.xCodeSupport/
-*.XcodeSupport/
-*.sublime-project
-*.sublime-workspace

.travis.yml

@@ -1,6 +0,0 @@
-language: node_js
-node_js:
-    - 0.8
-install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
-script: jake test
-env: PATH="$TRAVIS_BUILD_DIR/narwhal/bin:$PATH" CAPP_BUILD="$TRAVIS_BUILD_DIR/Build" NARWHAL_ENGINE=rhino

AppKit/AppKit.j

@@ -20,14 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CPToolTip.j"
 @import "CALayer.j"
-@import "CGGeometry.j"
-@import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
+@import "CPAttributedString+Additions.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
 @import "CPBrowser.j"
@@ -38,21 +36,16 @@
 @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"
@@ -62,7 +55,7 @@
 @import "CPFlashView.j"
 @import "CPFont.j"
 @import "CPFontManager.j"
-@import "CPGradient.j"
+@import "CPGeometry.j"
 @import "CPGraphics.j"
 @import "CPImage.j"
 @import "CPImageView.j"
@@ -74,7 +67,6 @@
 @import "CPOutlineView.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
-@import "CPPopover.j"
 @import "CPPopUpButton.j"
 @import "CPPredicateEditor.j"
 @import "CPPredicateEditorRowTemplate.j"
@@ -92,6 +84,7 @@
 @import "CPSound.j"
 @import "CPSplitView.j"
 @import "CPStepper.j"
+@import "CPString+Additions.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPTabView.j"
@@ -100,6 +93,7 @@
 @import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
+@import "_CPToolTip.j"
 @import "CPTreeNode.j"
 @import "CPUserDefaultsController.j"
 @import "CPView.j"
@@ -108,4 +102,3 @@
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"
-@import "CPWorkspace.j"

AppKit/CPAccordionView.j

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

AppKit/CPAlert.j

@@ -28,19 +28,15 @@
 @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
@@ -57,8 +53,6 @@ CPInformationalAlertStyle   = 1;
 */
 CPCriticalAlertStyle        = 2;
 
-var bottomHeight = 71;
-
 /*!
     @ingroup appkit
 
@@ -81,33 +75,32 @@ var bottomHeight = 71;
            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 : CPObject
+@implementation CPAlert : CPView
 {
-    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;
 
-    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
-    CPWindow            _window                 @accessors(property=window, readonly);
-    int                 _defaultWindowStyle;
+    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
@@ -124,21 +117,21 @@ var bottomHeight = 71;
 */
 + (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
 {
-    var newAlert = [[self alloc] init];
+    var alert = [[CPAlert alloc] init];
 
-    [newAlert setMessageText:aMessage];
-    [newAlert addButtonWithTitle:defaultButtonTitle];
+    [alert setMessageText:aMessage];
+    [alert addButtonWithTitle:defaultButtonTitle];
 
     if (alternateButtonTitle)
-        [newAlert addButtonWithTitle:alternateButtonTitle];
+        [alert addButtonWithTitle:alternateButtonTitle];
 
     if (otherButtonTitle)
-        [newAlert addButtonWithTitle:otherButtonTitle];
+        [alert addButtonWithTitle:otherButtonTitle];
 
     if (informativeText)
-        [newAlert setInformativeText:informativeText];
+        [alert setInformativeText:informativeText];
 
-    return newAlert;
+    return alert;
 }
 
 /*!
@@ -149,12 +142,12 @@ var bottomHeight = 71;
 */
 + (CPAlert)alertWithError:(CPString)anErrorMessage
 {
-    var newAlert = [[self alloc] init];
+    var alert = [[CPAlert alloc] init];
 
-    [newAlert setMessageText:anErrorMessage];
-    [newAlert setAlertStyle:CPCriticalAlertStyle];
+    [alert setMessageText:anErrorMessage];
+    [alert setAlertStyle:CPCriticalAlertStyle];
 
-    return newAlert;
+    return alert;
 }
 
 /*!
@@ -170,8 +163,7 @@ var bottomHeight = 71;
         _alertStyle         = CPWarningAlertStyle;
         _showHelp           = NO;
         _needsLayout        = YES;
-        _defaultWindowStyle = _CPModalWindowMask;
-        _themeView          = [_CPAlertThemeView new];
+        _defaultWindowStyle = CPTitledWindowMask;
 
         _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
         _alertImageView     = [[CPImageView alloc] init];
@@ -188,11 +180,6 @@ var bottomHeight = 71;
 
 #pragma mark Accessors
 
-- (CPTheme)theme
-{
-    return [_themeView theme];
-}
-
 /*!
     set the theme to use
 
@@ -210,20 +197,9 @@ var bottomHeight = 71;
 
     _window = nil; // will be regenerated at next layout
     _needsLayout = YES;
-    [_themeView setTheme:aTheme];
+    [super 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
@@ -358,16 +334,16 @@ var bottomHeight = 71;
 */
 - (void)_layoutMessageView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
         sizeWithFontCorrection = 6.0,
         messageLabelWidth,
         messageLabelTextSize;
 
-    [_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 setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
+    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
+    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
+    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
+    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
     [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
     messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
@@ -381,22 +357,22 @@ var bottomHeight = 71;
 */
 - (void)_layoutInformativeView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         sizeWithFontCorrection = 6.0,
         informativeLabelWidth,
         informativeLabelOriginY,
         informativeLabelTextSize;
 
-    [_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 setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
+    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
+    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
+    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
+    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
     [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
 
-    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
-    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
+    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)];
@@ -410,8 +386,8 @@ var bottomHeight = 71;
     if (!_accessoryView)
         return;
 
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
         accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
 
@@ -427,16 +403,16 @@ var bottomHeight = 71;
     if (!_showSuppressionButton)
         return;
 
-    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"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
 
-    [_suppressionButton setTextColor:[_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 setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
     [_suppressionButton sizeToFit];
 
     [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
@@ -448,17 +424,14 @@ var bottomHeight = 71;
 */
 - (CGSize)_layoutButtonsFromView:(CPView)lastView
 {
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
-        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
+    var inset = [self currentValueForThemeAttribute:@"content-inset"],
+        minimumSize = [self currentValueForThemeAttribute:@"size"],
+        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
+        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
         aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
         panelSize = [[_window contentView] frame].size,
         buttonsOriginY,
-        buttonMarginY,
-        buttonMarginX,
-        theme = [self theme],
         offsetX;
 
     [aRepresentativeButton setTheme:[self theme]];
@@ -471,19 +444,6 @@ var bottomHeight = 71;
     buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
     offsetX = panelSize.width - inset.right;
 
-    switch ([_window styleMask])
-    {
-        case _CPModalWindowMask:
-            buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
-            buttonMarginX = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-x"];
-            break;
-
-        default:
-            buttonMarginY = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-y"];
-            buttonMarginX = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-x"];
-            break;
-    }
-
     for (var i = [_buttons count] - 1; i >= 0 ; i--)
     {
         var button = _buttons[i];
@@ -495,14 +455,14 @@ var bottomHeight = 71;
             height = CGRectGetHeight(buttonFrame);
 
         offsetX -= width;
-        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
+        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
         offsetX -= 10;
     }
 
     if (_showHelp)
     {
-        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
+        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
             helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
             helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
 
@@ -527,7 +487,7 @@ var bottomHeight = 71;
     if (!_window)
         [self _createWindowWithStyle:nil];
 
-    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
+    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
         theImage = _icon,
         finalSize;
 
@@ -535,13 +495,13 @@ var bottomHeight = 71;
         switch (_alertStyle)
         {
             case CPWarningAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
+                theImage = [self currentValueForThemeAttribute:@"warning-image"];
                 break;
             case CPInformationalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
+                theImage = [self currentValueForThemeAttribute:@"information-image"];
                 break;
             case CPCriticalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
+                theImage = [self currentValueForThemeAttribute:@"error-image"];
                 break;
         }
 
@@ -559,7 +519,7 @@ var bottomHeight = 71;
     if (_showSuppressionButton)
         lastView = _suppressionButton;
     else if (_accessoryView)
-        lastView = _accessoryView;
+        lastView = _accessoryView
 
     finalSize = [self _layoutButtonsFromView:lastView];
     if ([_window styleMask] & CPDocModalWindowMask)
@@ -568,12 +528,6 @@ var bottomHeight = 71;
     [_window setFrameSize:finalSize];
     [_window center];
 
-    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
-    {
-        [_window setMovable:YES];
-        [_window setMovableByWindowBackground:YES];
-    }
-
     _needsLayout = NO;
 }
 
@@ -638,10 +592,9 @@ var bottomHeight = 71;
 - (void)_createWindowWithStyle:(int)forceStyle
 {
     var frame = CGRectMakeZero();
-    frame.size = [_themeView currentValueForThemeAttribute:@"size"];
+    frame.size = [self currentValueForThemeAttribute:@"size"];
 
-    _window = [[CPPanel alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
-    [_window setLevel:CPStatusWindowLevel];
+    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
 
     if (_title)
         [_window setTitle:_title];
@@ -678,10 +631,7 @@ var bottomHeight = 71;
 - (@action)_takeReturnCodeFrom:(id)aSender
 {
     if ([_window isSheet])
-    {
-        [_window orderOut:nil];
         [CPApp endSheet:_window returnCode:[aSender tag]];
-    }
     else
     {
         [CPApp abortModal];
@@ -696,19 +646,17 @@ var bottomHeight = 71;
 */
 - (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];
 }
 
-@end
-
-@implementation _CPAlertThemeView : CPView
+#pragma mark Theme Attributes
 
 + (CPString)defaultThemeClass
 {
@@ -717,40 +665,42 @@ var bottomHeight = 71;
 
 + (id)themeAttributes
 {
-    return @{
-            @"size": CGSizeMake(400.0, 110.0),
-            @"content-inset": CGInsetMake(15, 15, 15, 50),
-            @"informative-offset": 6,
-            @"button-offset": 10,
-            @"message-text-alignment": CPJustifiedTextAlignment,
-            @"message-text-color": [CPColor blackColor],
-            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
-            @"message-text-shadow-color": [CPNull null],
-            @"message-text-shadow-offset": CGSizeMakeZero(),
-            @"informative-text-alignment": CPJustifiedTextAlignment,
-            @"informative-text-color": [CPColor blackColor],
-            @"informative-text-font": [CPFont systemFontOfSize:12.0],
-            @"informative-text-shadow-color": [CPNull null],
-            @"informative-text-shadow-offset": CGSizeMakeZero(),
-            @"image-offset": CGPointMake(15, 12),
-            @"information-image": [CPNull null],
-            @"warning-image": [CPNull null],
-            @"error-image": [CPNull null],
-            @"help-image": [CPNull null],
-            @"help-image-left-offset": 15,
-            @"help-image-pressed": [CPNull null],
-            @"suppression-button-y-offset": 0.0,
-            @"suppression-button-x-offset": 0.0,
-            @"default-elements-margin": 3.0,
-            @"suppression-button-text-color": [CPColor blackColor],
-            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
-            @"suppression-button-text-shadow-color": [CPNull null],
-            @"suppression-button-text-shadow-offset": 0.0,
-            @"modal-window-button-margin-y": 0.0,
-            @"modal-window-button-margin-x": 0.0,
-            @"standard-window-button-margin-y": 0.0,
-            @"standard-window-button-margin-x": 0.0,
-        };
+    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
+                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
+                                                CGPointMake(15, 12),
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                [CPNull null],
+                                                0.0,
+                                                0.0,
+                                                3.0,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                [CPNull null],
+                                                0.0
+                                                ]
+                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
+                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
+                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
+                                                @"image-offset",
+                                                @"information-image",
+                                                @"warning-image",
+                                                @"error-image",
+                                                @"help-image",
+                                                @"help-image-left-offset",
+                                                @"help-image-pressed",
+                                                @"suppression-button-y-offset",
+                                                @"suppression-button-x-offset",
+                                                @"default-elements-margin",
+                                                @"suppression-button-text-color",
+                                                @"suppression-button-text-font",
+                                                @"suppression-button-text-shadow-color",
+                                                @"suppression-button-text-shadow-offset"
+                                                ]];
 }
 
 @end

AppKit/CPAnimation.j

@@ -122,30 +122,23 @@ 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;
@@ -314,9 +307,6 @@ ACTUAL_FRAME_RATE = 0;
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
         return [_delegate animation:self valueForProgress:t];
 
-    if (_animationCurve == CPAnimationLinear)
-        return t;
-
     var c1 = [],
         c2 = [];
 
@@ -331,7 +321,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(t, p1x, p1y, p2x, p2y, duration)
+var CubicBezierAtTime = function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration)
 {
     var ax = 0,
         bx = 0,

AppKit/CPApplication.j

@@ -20,26 +20,20 @@
  * 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",
-    CPEventModifierFlags = 0;
+    CPMainCibFileHumanFriendly  = @"Main cib file base name";
 
 CPApp = nil;
 
@@ -87,10 +81,8 @@ CPRunContinuesResponse  = -1002;
 @implementation CPApplication : CPResponder
 {
     CPArray                 _eventListeners;
-    int                     _eventListenerInsertionIndex;
 
     CPEvent                 _currentEvent;
-    CPWindow                _lastMouseMoveWindow;
 
     CPArray                 _windows;
     CPWindow                _keyWindow;
@@ -145,9 +137,10 @@ CPRunContinuesResponse  = -1002;
     if (self)
     {
         _eventListeners = [];
-        _eventListenerInsertionIndex = 0;
 
-        _windows = [[CPNull null]];
+        _windows = [];
+
+        [_windows addObject:nil];
     }
 
     return self;
@@ -226,22 +219,28 @@ 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],
-        delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
+        types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
+
+    if ([types count] > 0)
+        _documentController = [CPDocumentController sharedDocumentController];
+
+    var delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
 
     if (delegateClassName)
     {
         var delegateClass = objj_getClass(delegateClassName);
 
         if (delegateClass)
-            [self setDelegate:[[delegateClass alloc] init]];
+            if ([_documentController class] == delegateClass)
+                [self setDelegate:_documentController];
+            else
+                [self setDelegate:[[delegateClass alloc] init]];
     }
 
     var defaultCenter = [CPNotificationCenter defaultCenter];
@@ -250,23 +249,13 @@ CPRunContinuesResponse  = -1002;
         postNotificationName:CPApplicationWillFinishLaunchingNotification
         object:self];
 
-    var types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
-
-    if ([types count] > 0)
-        _documentController = [CPDocumentController sharedDocumentController];
-
     var needsUntitled = !!_documentController,
-        URLStrings = nil;
-
-#if PLATFORM(DOM)
-    URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings();
-#endif
-
-    var index = 0,
+        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
+        index = 0,
         count = [URLStrings count];
 
     for (; index < count; ++index)
-        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] && needsUntitled;
+        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] || needsUntitled;
 
     if (needsUntitled && [_delegate respondsToSelector:@selector(applicationShouldOpenUntitledFile:)])
         needsUntitled = [_delegate applicationShouldOpenUntitledFile:self];
@@ -349,7 +338,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>
@@ -385,7 +374,7 @@ CPRunContinuesResponse  = -1002;
             standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
 
         // FIXME move this into the CIB eventually
-        [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
+        [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
         [applicationLabel setAlignment:CPCenterTextAlignment];
         [versionLabel setAlignment:CPCenterTextAlignment];
         [copyrightLabel setAlignment:CPCenterTextAlignment];
@@ -412,7 +401,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 
-- (void)_documentController:(CPDocumentController)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
+- (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
 {
     // callback method for terminate:
     if (didCloseAll)
@@ -511,8 +500,6 @@ CPRunContinuesResponse  = -1002;
         if (_eventListeners[count]._callback === _CPRunModalLoop)
         {
             _eventListeners.splice(count, 1);
-            if (count <= _eventListenerInsertionIndex)
-                _eventListenerInsertionIndex--;
 
             return;
         }
@@ -560,7 +547,7 @@ CPRunContinuesResponse  = -1002;
 
 //    [theWindow._bridge _obscureWindowsBelowModalWindow];
 
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
 }
 
 /*!
@@ -589,75 +576,38 @@ CPRunContinuesResponse  = -1002;
 - (void)sendEvent:(CPEvent)anEvent
 {
     _currentEvent = anEvent;
-    CPEventModifierFlags = [anEvent modifierFlags];
 
-    var theWindow = [anEvent window];
-
-#if PLATFORM(DOM)
-    var willPropagate = [[theWindow platformWindow] _willPropagateCurrentDOMEvent];
+    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
 
     // temporarily pretend we won't propagate the event. we'll restore the saved value later
     // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
-#endif
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
 
     // 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))
-            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
-#endif
+            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
 
         return;
     }
 
-#if PLATFORM(DOM)
     // if we make it this far, then restore the original willPropagate value
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
-#endif
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
 
-    if ([anEvent type] == CPMouseMoved)
+    if (_eventListeners.length)
     {
-        if (theWindow !== _lastMouseMoveWindow)
-            [_lastMouseMoveWindow _mouseExitedResizeRect];
+        if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
+            _eventListeners.pop()._callback(anEvent);
 
-        _lastMouseMoveWindow = theWindow;
+        return;
     }
 
-    /*
-    Event listeners are processed from back to front so that newer event listeners normally take
-    precedence. If during the execution of a callback a new event listener is added, it should
-    be inserted after the current callback but before any higher priority callbacks. This makes
-    repeating event listeners (those that reinsert themselves) stable relative to each other.
-    */
-    for (var i = _eventListeners.length - 1; i >= 0; i--)
-    {
-        var listener = _eventListeners[i];
-
-        if (listener._mask & (1 << [anEvent type]))
-        {
-            _eventListeners.splice(i, 1);
-            // In case the callback wants to add more listeners.
-            _eventListenerInsertionIndex = i;
-            listener._callback(anEvent);
-
-            if (listener._dequeue)
-            {
-                // Don't process the event normally and don't send it to any other listener.
-                _eventListenerInsertionIndex = _eventListeners.length;
-                return;
-            }
-        }
-    }
-    _eventListenerInsertionIndex = _eventListeners.length;
-
-    if (theWindow)
-        [theWindow sendEvent:anEvent];
+    [[anEvent window] sendEvent:anEvent];
 }
 
 /*!
@@ -693,10 +643,6 @@ 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];
 }
 
@@ -705,8 +651,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)windows
 {
-    // Return all windows, but not the CPNull placeholder in _windows[0].
-    return [_windows subarrayWithRange:_CPMakeRange(1, [_windows count] - 1)];
+    return _windows;
 }
 
 /*!
@@ -934,44 +879,31 @@ CPRunContinuesResponse  = -1002;
 
 /*!
     Fires a callback function when an event matching a given mask occurs.
-
-    If multiple callbacks are set which match the same event, later callbacks
-    take priority over earlier callbacks, unless a new callback is set while
-    an existing callback is being processed in which case it's given the same
-    priority as the currently processing callback.
-
-    @param aCallback A js function to be fired.
-    @prarm aMask An event mask for the next event.
-    @param anExpiration The date for which this callback expires (not implemented).
+    @param 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 YES to remove the event from the queue after calling the callback,
-    NO to deliver it normally.
+    @param shouldDequeue (not implemented).
 */
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, aCallback, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
 }
 
 /*!
     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.
 
-    If multiple callbacks are set which match the same event, later callbacks
-    take priority over earlier callbacks, unless a new callback is set while
-    an existing callback is being processed in which case it's given the same
-    priority as the currently processing callback.
-
-    @param aTarget The target object for the callback.
-    @param aSelector The selector which should be called on the target object.
-    @param aMask The mask for a given event which should trigger the callback.
-    @param anExpiration The date for which the callback expires (not implemented).
+    @param 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 YES to remove the event from the queue after calling the callback,
-    NO to deliver it normally.
+    @param shouldDequeue (not implemented).
 */
 - (void)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.splice(_eventListenerInsertionIndex++, 0, _CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
 }
 
 /*!
@@ -994,22 +926,15 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {
-    if ([aWindow isSheet])
+    var styleMask = [aSheet styleMask];
+    if (!(styleMask & CPDocModalWindowMask))
     {
-        [CPException raise:CPInternalInconsistencyException reason:@"The target window of beginSheet: cannot be a sheet"];
+        [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
         return;
     }
 
-    [aSheet._windowView _enableSheet:YES];
-
-    // -dw- if a sheet is already visible, we skip this since it serves no purpose and causes
-    // orderOut: to be called on the sheet, which is not what we want.
-    if (![aWindow isVisible])
-    {
-        [aWindow orderFront:self];
-        [aSheet setPlatformWindow:[aWindow platformWindow]];
-    }
-
+    [aWindow orderFront:self];
+    [aSheet setPlatformWindow:[aWindow platformWindow]];
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 
@@ -1038,7 +963,7 @@ CPRunContinuesResponse  = -1002;
         if (context != nil && context["sheet"] === sheet)
         {
             context["returnCode"] = returnCode;
-            [aWindow _endSheet];
+            [aWindow _detachSheetWindow];
             return;
         }
     }
@@ -1071,15 +996,14 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)arguments
 {
-    // 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)
+    if (_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:
@@ -1099,9 +1023,8 @@ CPRunContinuesResponse  = -1002;
     if (!args || args.length == 0)
     {
         _args = [];
-        // 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 = @"#";
+        window.location.hash = @"#";
+
         return;
     }
 
@@ -1116,15 +1039,12 @@ CPRunContinuesResponse  = -1002;
 
     var hash = [toEncode componentsJoinedByString:@"/"];
 
-    // 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;
+    window.location.hash = @"#" + hash;
 }
 
 - (void)_reloadArguments
 {
-    // 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 : "";
+    _fullArgsString = window.location.hash;
 
     if (_fullArgsString.length)
     {
@@ -1238,7 +1158,7 @@ CPRunContinuesResponse  = -1002;
 
 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
 }
 
 @end
@@ -1246,32 +1166,24 @@ CPRunContinuesResponse  = -1002;
 var _CPModalSessionMake = function(aWindow, aStopCode)
 {
     return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
-};
+}
 
-var _CPEventListenerMake = function(anEventMask, aCallback, shouldDequeue)
+var _CPEventListenerMake = function(anEventMask, aCallback)
 {
-    return { _mask:anEventMask, _callback:aCallback, _dequeue:shouldDequeue };
-};
+    return { _mask:anEventMask, _callback:aCallback };
+}
 
 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
 {
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
 
     var theWindow = [anEvent window],
         modalSession = CPApp._currentSession;
 
-    /*
-        The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal, yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working at all from sheets.
-    */
-    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))
-    {
+    if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
-    }
-};
+}
 
 /*!
     Starts the GUI and Cappuccino frameworks. This function should be
@@ -1286,17 +1198,7 @@ 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")
-    {
-        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().");
-        }
-    }
+        window.parent._childAppIsStarting(window);
 #endif
 
     var mainBundle = [CPBundle mainBundle],
@@ -1353,7 +1255,7 @@ var _CPAppBootstrapperActions = nil;
     var defaultThemeName = [CPApplication defaultThemeName],
         themeURL = nil;
 
-    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
+    if (defaultThemeName === @"Aristo")
         themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
     else
         themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
@@ -1380,7 +1282,7 @@ var _CPAppBootstrapperActions = nil;
     if (mainCibFile)
     {
         [mainBundle loadCibFile:mainCibFile
-            externalNameTable:@{ CPCibOwner: CPApp }
+            externalNameTable:[CPDictionary dictionaryWithObject:CPApp forKey:CPCibOwner]
                  loadDelegate:self];
 
         return YES;
@@ -1398,25 +1300,26 @@ var _CPAppBootstrapperActions = nil;
     // FIXME: We should implement autoenabling.
     [mainMenu setAutoenablesItems:NO];
 
-    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var bundle = [CPBundle bundleForClass:[CPApplication class]],
+        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
 
-    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
-    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [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)]];
 
     [mainMenu addItem:newMenuItem];
 
     var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
 
-    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
-    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [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)]];
 
     [mainMenu addItem:openMenuItem];
 
     var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
         saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
 
-    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
-    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [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)]];
 
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
@@ -1437,8 +1340,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];
@@ -1467,16 +1370,3 @@ var _CPAppBootstrapperActions = nil;
 }
 
 @end
-
-
-@implementation CPEvent (CPApplicationModifierFlags)
-
-/*!
-    Returns the currently pressed modifier flags.
-*/
-+ (unsigned)modifierFlags
-{
-    return CPEventModifierFlags;
-}
-
-@end

AppKit/CPArrayController.j

@@ -564,9 +564,8 @@
 - (BOOL)setSelectionIndexes:(CPIndexSet)indexes
 {
     [self _selectionWillChange]
-    var r = [self __setSelectionIndexes:indexes avoidEmpty:NO];
+    [self __setSelectionIndexes:indexes];
     [self _selectionDidChange];
-    return r;
 }
 
 /*
@@ -575,7 +574,7 @@
 */
 - (BOOL)__setSelectionIndex:(int)theIndex
 {
-    return [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
+    [self __setSelectionIndexes:[CPIndexSet indexSetWithIndex:theIndex]];
 }
 
 /*
@@ -584,43 +583,28 @@
 */
 - (BOOL)__setSelectionIndexes:(CPIndexSet)indexes
 {
-    return [self __setSelectionIndexes:indexes avoidEmpty:_avoidsEmptySelection];
-}
+    if (!indexes)
+        indexes = [CPIndexSet indexSet];
 
-- (BOOL)__setSelectionIndexes:(CPIndexSet)indexes avoidEmpty:(BOOL)avoidEmpty
-{
-    var newIndexes = indexes;
-
-    if (!newIndexes)
-        newIndexes = [CPIndexSet indexSet];
-
-    if (![newIndexes count])
+    if (![indexes count])
     {
-        if (avoidEmpty && [[self arrangedObjects] count])
-            newIndexes = [CPIndexSet indexSetWithIndex:0];
+        if (_avoidsEmptySelection && [[self arrangedObjects] count])
+            indexes = [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.
-        [newIndexes removeIndexesInRange:CPMakeRange(objectsCount, [newIndexes lastIndex] + 1)];
+        [indexes removeIndexesInRange:CPMakeRange(objectsCount, [indexes lastIndex] + 1)];
         // When avoiding empty selection and the deleted selection was at the bottom, select the last item.
-        if (![newIndexes count] && avoidEmpty && objectsCount)
-            newIndexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
+        if (![indexes count] && _avoidsEmptySelection && objectsCount)
+            indexes = [CPIndexSet indexSetWithIndex:objectsCount - 1];
     }
 
-    if ([_selectionIndexes isEqualToIndexSet:newIndexes])
+    if ([_selectionIndexes isEqualToIndexSet:indexes])
         return NO;
 
-    // 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;
+    _selectionIndexes = [indexes copy];
 
     // 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.
@@ -652,11 +636,10 @@
     [self willChangeValueForKey:@"selectionIndexes"];
     [self _selectionWillChange];
 
-    var r = [self __setSelectedObjects:objects avoidEmpty:NO];
+    [self __setSelectedObjects:objects];
 
     [self didChangeValueForKey:@"selectionIndexes"];
     [self _selectionDidChange];
-    return r;
 }
 
 /*
@@ -664,11 +647,6 @@
     @ignore
 */
 - (BOOL)__setSelectedObjects:(CPArray)objects
-{
-    [self __setSelectedObjects:objects avoidEmpty:_avoidsEmptySelection];
-}
-
-- (BOOL)__setSelectedObjects:(CPArray)objects avoidEmpty:(BOOL)avoidEmpty
 {
     var set = [CPIndexSet indexSet],
         count = [objects count],
@@ -682,7 +660,7 @@
             [set addIndex:index];
     }
 
-    [self __setSelectionIndexes:set avoidEmpty:avoidEmpty];
+    [self __setSelectionIndexes:set];
     return YES;
 }
 
@@ -879,9 +857,6 @@
 
         [_arrangedObjects removeObjectAtIndex:pos];
         [_selectionIndexes shiftIndexesStartingAtIndex:pos by:-1];
-
-        // This will automatically handle the avoidsEmptySelection case.
-        [self __setSelectionIndexes:_selectionIndexes];
     }
 
     [self didChangeValueForKey:@"content"];
@@ -897,9 +872,7 @@
     if (![self canAdd])
         return;
 
-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
-
-    [self addObject:newObject];
+    [self insert:sender];
 }
 
 /*!
@@ -911,14 +884,9 @@
     if (![self canInsert])
         return;
 
-    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject],
-        lastSelectedIndex = [_selectionIndexes lastIndex];
-
-    if (lastSelectedIndex)
-        [self insertObject:newObject atArrangedObjectIndex:lastSelectedIndex];
-    else
-        [self addObject:newObject];
+    var newObject = [self automaticallyPreparesContent] ? [self newObject] : [self _defaultNewObject];
 
+    [self addObject:newObject];
 }
 
 /*!
@@ -930,15 +898,6 @@
     [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.
@@ -953,38 +912,36 @@
     _disableSetContent = YES;
 
     var arrangedObjects = [self arrangedObjects],
+        index = [anIndexSet lastIndex],
         position = CPNotFound,
         newSelectionIndexes = [_selectionIndexes copy];
 
-    [anIndexSet enumerateIndexesWithOptions:CPEnumerationReverse
-                                 usingBlock:function(anIndex)
+    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
         {
-            var object = [arrangedObjects objectAtIndex: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];
 
-            // 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];
-        }];
+        // 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];
 
+        index = [anIndexSet indexLessThanIndex:index];
+    }
     // Allow handlesContentAsCompoundValue reverse sets to trigger.
     [[CPBinder getBinding:@"contentArray" forObject:self] _contentArrayDidChange];
     _disableSetContent = NO;
@@ -1080,12 +1037,12 @@
 
 @implementation CPArrayController (CPBinder)
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding == @"contentArray")
+    if (theBinding == @"contentArray")
         return [_CPArrayControllerContentBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 @end
@@ -1097,47 +1054,22 @@
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        isCompound = [self handlesContentAsCompoundValue],
-        dotIndex = keyPath.lastIndexOf("."),
-        firstPart = dotIndex !== CPNotFound ? keyPath.substring(0, dotIndex) : nil,
-        isSelectionProxy = firstPart && [[destination valueForKeyPath:firstPart] isKindOfClass:CPControllerSelectionProxy],
-        newValue;
+        isCompound = [self handlesContentAsCompoundValue];
 
-    if (!isCompound && !isSelectionProxy)
+    if (!isCompound)
     {
         newValue = [destination mutableArrayValueForKeyPath:keyPath];
     }
     else
     {
-        // 1. If handlesContentAsCompoundValue we cannot just set up a proxy.
+        // handlesContentAsCompoundValue == YES so 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];
     }
 
-    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];
+    newValue = [self transformValue:newValue withOptions:options];
 
     if (isCompound)
     {

AppKit/CPAttributedString+Additions.j

@@ -0,0 +1,62 @@
+/*
+ * CPAttributedString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * 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
+ */
+
+
+/*
+    AppKit adds two methods to the CPAttributedString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPString.
+*/
+@implementation CPAttributedString (AppKitAdditions)
+/*!
+    Draws a string in the current graphics context.
+    This method and draws the reciver on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        line = CTLineCreateWithAttributedString([self copy]);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTLineDraw(line, context);
+}
+
+/*!
+    Draws a string in the current graphics context.
+
+    @param aRect - The rect for which the string should be drawn into
+*/
+- (void)drawInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        frameSetter = CTFramesetterCreateWithAttributedString([self copy]),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [self length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+@end

AppKit/CPBezierPath.j

@@ -20,6 +20,7 @@
  * 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>
@@ -61,11 +62,11 @@ var DefaultLineWidth = 1.0;
 /*!
     Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)aRect
++ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
 {
     var path = [self bezierPath];
 
-    [path appendBezierPathWithOvalInRect:aRect];
+    [path appendBezierPathWithOvalInRect:rect];
 
     return path;
 }
@@ -73,20 +74,11 @@ var DefaultLineWidth = 1.0;
 /*!
     Create a new CPBezierPath object initialized with a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithRect:(CGRect)aRect
++ (CPBezierPath)bezierPathWithRect:(CGRect)rect
 {
     var path = [self bezierPath];
 
-    [path appendBezierPathWithRect:aRect];
-
-    return path;
-}
-
-+ (CPBezierPath)bezierPathWithRoundedRect:(CGRect)aRect xRadius:(float)xRadius yRadius:(float)yRadius
-{
-    var path = [self bezierPath];
-
-    [path appendBezierPathWithRoundedRect:aRect xRadius:xRadius yRadius:yRadius];
+    [path appendBezierPathWithRect:rect];
 
     return path;
 }
@@ -174,19 +166,6 @@ var DefaultLineWidth = 1.0;
     CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }
 
-- (CGRect)bounds
-{
-    // TODO: this should return this. The controlPointBounds is not a tight fit.
-    // return CGPathGetBoundingBox(_path);
-
-    return [self controlPointBounds];
-}
-
-- (CGRect)controlPointBounds
-{
-    return CGPathGetBoundingBox(_path);
-}
-
 /*!
     Create a line segment between the first and last points in the subpath, closing it.
 */
@@ -294,15 +273,10 @@ 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:(CPBezierPath)other
+- (void)appendBezierPath:(NSBezierPath *)other
 {
     CGPathAddPath(_path, nil, other._path);
 }
@@ -315,21 +289,4 @@ 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

AppKit/CPBox.j

@@ -20,7 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPTextField.j"
 @import "CPView.j"
 
 // CPBoxType
@@ -36,16 +35,6 @@ 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
@@ -56,38 +45,15 @@ CPBelowBottom = 6;
 {
     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;
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([aBinding hasPrefix:CPDisplayPatternTitleBinding])
-        return [CPTitleWithPatternBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"box";
-}
-
-+ (id)themeAttributes
-{
-    return @{
-            @"background-color": [CPNull null],
-            @"border-color": [CPNull null],
-            @"border-width": 1.0,
-            @"corner-radius": 3.0,
-            @"inner-shadow-offset": CGSizeMakeZero(),
-            @"inner-shadow-size": 6.0,
-            @"inner-shadow-color": [CPNull null],
-            @"content-margin": CGSizeMakeZero(),
-        };
 }
 
 + (id)boxEnclosingView:(CPView)aView
@@ -95,7 +61,6 @@ CPBelowBottom = 6;
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
         enclosingView = [aView superview];
 
-    [box setAutoresizingMask:[aView autoresizingMask]];
     [box setFrameFromContentFrame:[aView frame]];
 
     [enclosingView replaceSubview:aView with:box];
@@ -105,16 +70,18 @@ CPBelowBottom = 6;
     return box;
 }
 
-- (id)initWithFrame:(CGRect)frameRect
+- (id)initWithFrame:(CPRect)frameRect
 {
     self = [super initWithFrame:frameRect];
 
     if (self)
     {
         _borderType = CPBezelBorder;
+        _fillColor = [CPColor clearColor];
+        _borderColor = [CPColor blackColor];
 
-        _titlePosition = CPNoTitle;
-        _titleView = [CPTextField labelWithTitle:@""];
+        _borderWidth = 1.0;
+        _contentMargin = CGSizeMake(0.0, 0.0);
 
         _contentView = [[CPView alloc] initWithFrame:[self bounds]];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -133,7 +100,7 @@ CPBelowBottom = 6;
 
     @return the border rectangle of the box
 */
-- (CGRect)borderRect
+- (CPRect)borderRect
 {
     return [self bounds];
 }
@@ -223,54 +190,58 @@ CPBelowBottom = 6;
 
 - (CPColor)borderColor
 {
-    return [self valueForThemeAttribute:@"border-color"];
+    return _borderColor;
 }
 
 - (void)setBorderColor:(CPColor)color
 {
-    if ([color isEqual:[self borderColor]])
+    if ([color isEqual:_borderColor])
         return;
 
-    [self setValue:color forThemeAttribute:@"border-color"];
+    _borderColor = color;
+    [self setNeedsDisplay:YES];
 }
 
 - (float)borderWidth
 {
-    return [self valueForThemeAttribute:@"border-width"];
+    return _borderWidth;
 }
 
 - (void)setBorderWidth:(float)width
 {
-    if (width === [self borderWidth])
+    if (width === _borderWidth)
         return;
 
-    [self setValue:width forThemeAttribute:@"border-width"];
+    _borderWidth = width;
+    [self setNeedsDisplay:YES];
 }
 
 - (float)cornerRadius
 {
-    return [self valueForThemeAttribute:@"corner-radius"];
+    return _cornerRadius;
 }
 
 - (void)setCornerRadius:(float)radius
 {
-    if (radius === [self cornerRadius])
+    if (radius === _cornerRadius)
         return;
 
-    [self setValue:radius forThemeAttribute:@"corner-radius"];
+    _cornerRadius = radius;
+    [self setNeedsDisplay:YES];
 }
 
 - (CPColor)fillColor
 {
-    return [self valueForThemeAttribute:@"background-color"];
+    return _fillColor;
 }
 
 - (void)setFillColor:(CPColor)color
 {
-    if ([color isEqual:[self fillColor]])
+    if ([color isEqual:_fillColor])
         return;
 
-    [self setValue:color forThemeAttribute:@"background-color"];
+    _fillColor = color;
+    [self setNeedsDisplay:YES];
 }
 
 - (CPView)contentView
@@ -283,160 +254,48 @@ CPBelowBottom = 6;
     if (aView === _contentView)
         return;
 
-    var borderWidth = [self borderWidth],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
-
-    [aView setFrame:CGRectInset([self bounds], contentMargin.width + borderWidth, contentMargin.height + borderWidth)];
+    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
     [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    //  A nil contentView is allowed (tested in Cocoa 2013-02-22).
-    if (!aView)
-        [_contentView removeFromSuperview];
-    else if (_contentView)
-        [self replaceSubview:_contentView with:aView];
-    else
-        [self addSubview:aView];
+    [self replaceSubview:_contentView with:aView];
 
     _contentView = aView;
 }
 
-- (CGSize)contentViewMargins
+- (CPSize)contentViewMargins
 {
-    return [self valueForThemeAttribute:@"content-margin"];
+    return _contentMargin;
 }
 
-- (void)setContentViewMargins:(CGSize)size
+- (void)setContentViewMargins:(CPSize)size
 {
      if (size.width < 0 || size.height < 0)
          [CPException raise:CPGenericException reason:@"Margins must be positive"];
 
-    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
+    _contentMargin = CGSizeMakeCopy(size);
+    [self setNeedsDisplay:YES];
 }
 
-- (void)setFrameFromContentFrame:(CGRect)aRect
+- (void)setFrameFromContentFrame:(CPRect)aRect
 {
-    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 setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
     [self setNeedsDisplay:YES];
 }
 
 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+    var contentFrame = [_contentView frame];
 
-    if (!contentFrame)
+    [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)
         return;
 
-    [_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)setValue:(id)aValue forKey:(CPString)aKey
-{
-    if (aKey === CPDisplayPatternTitleBinding)
-        [self setTitle:aValue || @""];
-    else
-        [super setValue:aValue forKey:aKey];
-}
-
-- (void)drawRect:(CGRect)rect
-{
     var bounds = [self bounds];
 
     switch (_boxType)
@@ -444,158 +303,89 @@ CPBelowBottom = 6;
         case CPBoxSeparator:
             // NSBox does not include a horizontal flag for the separator type. We have to determine
             // the type of separator to draw by the width and height of the frame.
-            if (_CGRectGetWidth(bounds) === 5.0)
-                return [self _drawVerticalSeparatorInRect:bounds];
-            else if (_CGRectGetHeight(bounds) === 5.0)
-                return [self _drawHorizontalSeparatorInRect:bounds];
+            if (CGRectGetWidth(bounds) === 5.0)
+                return [self _drawVerticalSeperatorInRect:bounds];
+            else if (CGRectGetHeight(bounds) === 5.0)
+                return [self _drawHorizontalSeperatorInRect:bounds];
 
             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;
-    }
-
-    // Primary or secondary type boxes always draw the same way, unless they are CPNoBorder.
-    if ((_boxType === CPBoxPrimary || _boxType === CPBoxSecondary) && _borderType !== CPNoBorder)
-    {
-        [self _drawPrimaryBorderInRect:bounds];
-        return;
-    }
-
     switch (_borderType)
     {
         case CPBezelBorder:
             [self _drawBezelBorderInRect:bounds];
             break;
 
-        case CPGrooveBorder:
+        default:
         case CPLineBorder:
             [self _drawLineBorderInRect:bounds];
             break;
-
-        case CPNoBorder:
-            [self _drawNoBorderInRect:bounds];
-            break;
     }
 }
 
-- (void)_drawHorizontalSeparatorInRect:(CGRect)aRect
+- (void)_drawHorizontalSeperatorInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextSetStrokeColor(context, [self borderColor]);
     CGContextSetLineWidth(context, 1.0);
 
-    CGContextMoveToPoint(context, _CGRectGetMinX(aRect), _CGRectGetMidY(aRect));
-    CGContextAddLineToPoint(context, _CGRectGetWidth(aRect), _CGRectGetMidY(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect) + 0.5);
+    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect) + 0.5);
     CGContextStrokePath(context);
 }
 
-- (void)_drawVerticalSeparatorInRect:(CGRect)aRect
+- (void)_drawVerticalSeperatorInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextSetStrokeColor(context, [self borderColor]);
     CGContextSetLineWidth(context, 1.0);
 
-    CGContextMoveToPoint(context, _CGRectGetMidX(aRect), _CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, _CGRectGetMidX(aRect), _CGRectGetHeight(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetMinY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetMinX(aRect) + 0.5, 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],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];
+        sides = [CPMinYEdge, CPMaxXEdge, CPMaxYEdge, CPMinXEdge],
+        sideGray = 190.0 / 255.0,
+        grays = [142.0 / 255.0, sideGray, sideGray, sideGray],
+        borderWidth = _borderWidth;
 
-    var baseRect = aRect;
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSaveGState(context);
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextRestoreGState(context);
-}
-
-- (void)_drawPrimaryBorderInRect:(CGRect)aRect
-{
-    // Draw the "primary" style CPBox.
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"],
-        baseRect = aRect;
-
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSaveGState(context);
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextBeginPath(context);
-    // Note we can't use the 0.5 inset rectangle when setting up clipping. The clipping has to be
-    // on integer coordinates for this to look right in Chrome.
-    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(baseRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
-    CGContextClip(context);
-    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextRestoreGState(context);
-}
-
-- (void)_drawNoBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
+    while (borderWidth--)
+        aRect = CPDrawTiledRects(aRect, aRect, sides, grays);
 
     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",
-    CPBoxTitle            = @"CPBoxTitle",
-    CPBoxTitlePosition    = @"CPBoxTitlePosition",
-    CPBoxTitleView        = @"CPBoxTitleView";
+    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
+    CPBoxFillColorKey     = @"CPBoxFillColorKey",
+    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
+    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
+    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
 
 @implementation CPBox (CPCoding)
 
@@ -608,16 +398,18 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
         _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
         _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];
 
-        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
-        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
-        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
+        _borderColor   = [aCoder decodeObjectForKey:CPBoxBorderColorKey];
+        _fillColor     = [aCoder decodeObjectForKey:CPBoxFillColorKey];
+
+        _cornerRadius  = [aCoder decodeFloatForKey:CPBoxCornerRadiusKey];
+        _borderWidth   = [aCoder decodeFloatForKey:CPBoxBorderWidthKey];
+
+        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
 
         _contentView   = [self subviews][0];
 
         [self setAutoresizesSubviews:YES];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self _manageTitlePositioning];
     }
 
     return self;
@@ -629,9 +421,14 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
 
     [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
     [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
-    [aCoder encodeObject:_title forKey:CPBoxTitle];
-    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
-    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
+
+    [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];
 }
 
 @end

AppKit/CPBrowser.j

@@ -24,16 +24,15 @@
 
 @import "CPControl.j"
 @import "CPImage.j"
-@import "CPScrollView.j"
 @import "CPTableView.j"
 @import "CPTextField.j"
-
-@global CPApp
+@import "CPScrollView.j"
 
 /*!
     @ingroup appkit
     @class CPBrowser
 */
+
 @implementation CPBrowser : CPControl
 {
     id              _delegate;
@@ -66,18 +65,18 @@
     CPArray         _columnWidths;
 }
 
-+ (CPString)defaultThemeClass
++ (CPImage)branchImage
 {
-    return "browser";
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
-+ (id)themeAttributes
++ (CPImage)highlightedBranchImage
 {
-    return @{
-        @"image-control-resize": [CPNull null],
-        @"image-control-leaf": [CPNull null],
-        @"image-control-leaf-pressed": [CPNull null]
-    };
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf-highlighted.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -259,7 +258,7 @@
         var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
             view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [view setImageScaling:CPImageScaleProportionallyDown];
+        [view setImageScaling:CPScaleProportionally];
 
         [column setDataView:view];
         [column setResizingMask:CPTableColumnNoResizing];
@@ -277,8 +276,8 @@
     var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
         view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];
 
-    [view setBranchImage:[self valueForThemeAttribute:@"image-control-leaf"]];
-    [view setHighlightedBranchImage:[self valueForThemeAttribute:@"image-control-leaf-pressed"]];
+    [view setBranchImage:[[self class] branchImage]];
+    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
 
     [column setDataView:view];
     [column setResizingMask:CPTableColumnNoResizing];
@@ -426,26 +425,11 @@
 
 - (void)keyDown:(CPEvent)anEvent
 {
-    var key = [anEvent charactersIgnoringModifiers],
-        column = [self selectedColumn];
-
-    if (column === CPNotFound)
+    var column = [self selectedColumn];
+    if (column === -1)
         return;
 
-    if (key === CPLeftArrowFunctionKey || key === CPRightArrowFunctionKey)
-    {
-        if (key === CPLeftArrowFunctionKey)
-        {
-            var previousColumn = column - 1,
-                selectedRow = [self selectedRowInColumn:previousColumn];
-
-            [self selectRow:selectedRow inColumn:previousColumn];
-        }
-        else
-            [self selectRow:0 inColumn:column + 1];
-    }
-    else
-        [_tableViews[column] keyDown:anEvent];
+    [_tableViews[column] keyDown:anEvent];
 }
 
 // SIZING
@@ -720,6 +704,8 @@
 @end
 
 
+var _CPBrowserResizeControlBackgroundImage = nil;
+
 @implementation _CPBrowserResizeControl : CPView
 {
     CGPoint     _mouseDownX;
@@ -728,14 +714,22 @@
     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])
-    {
-        var browser = [[CPBrowser alloc] init];
-        [self setBackgroundColor:[CPColor colorWithPatternImage:[browser valueForThemeAttribute:@"image-control-resize"]]];
-    }
-
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
 
     return self;
 }
@@ -825,13 +819,13 @@
     return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
 }
 
-- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)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:(CGPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
 {
     var count = theTableColumns.length;
     while (count--)
@@ -844,6 +838,30 @@
            [super dragViewForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragViewOffset];
 }
 
+- (void)moveUp:(id)sender
+{
+    [super moveUp:sender];
+    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
+}
+
+- (void)moveDown:(id)sender
+{
+    [super moveDown:sender];
+    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
+}
+
+- (void)moveLeft:(id)sender
+{
+    var previousColumn = [_browser selectedColumn] - 1,
+        selectedRow = [_browser selectedRowInColumn:previousColumn];
+
+    [_browser selectRow:selectedRow inColumn:previousColumn];
+}
+
+- (void)moveRight:(id)sender
+{
+    [_browser selectRow:0 inColumn:[_browser selectedColumn] + 1];
+}
 
 @end
 
@@ -883,12 +901,6 @@
     [_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];
@@ -970,7 +982,7 @@
         isHighlighted = [self themeState] & CPThemeStateSelectedDataView;
 
     [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
-    [imageView setImageScaling:CPImageScaleNone];
+    [imageView setImageScaling:CPScaleNone];
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder

AppKit/CPButton.j

@@ -25,26 +25,24 @@
 
 @import "CPControl.j"
 @import "CPStringDrawing.j"
-@import "CPText.j"
-@import "CPWindow_Constants.j"
+
 
 /* @group CPBezelStyle */
 
-                                       // IB style
-CPRoundedBezelStyle             = 1;   // Push
-CPRegularSquareBezelStyle       = 2;   // Bevel
+CPRoundedBezelStyle             = 1;
+CPRegularSquareBezelStyle       = 2;
 CPThickSquareBezelStyle         = 3;
 CPThickerSquareBezelStyle       = 4;
-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
+CPDisclosureBezelStyle          = 5;
+CPShadowlessSquareBezelStyle    = 6;
+CPCircularBezelStyle            = 7;
+CPTexturedSquareBezelStyle      = 8;
+CPHelpButtonBezelStyle          = 9;
+CPSmallSquareBezelStyle         = 10;
+CPTexturedRoundedBezelStyle     = 11;
+CPRoundRectBezelStyle           = 12;
+CPRecessedBezelStyle            = 13;
+CPRoundedDisclosureBezelStyle   = 14;
 CPHUDBezelStyle                 = -1;
 
 
@@ -60,11 +58,11 @@ CPMomentaryPushInButton = 7;
 CPMomentaryPushButton   = 0;
 CPMomentaryLight        = 7;
 
-CPNoButtonMask          = 0;
-CPContentsButtonMask    = 1;
-CPPushInButtonMask      = 2;
-CPGrayButtonMask        = 4;
-CPBackgroundButtonMask  = 8;
+CPNoButtonMask              = 0;
+CPContentsButtonMask        = 1;
+CPPushInButtonMask          = 2;
+CPGrayButtonMask            = 4;
+CPBackgroundButtonMask      = 8;
 
 CPNoCellMask                = CPNoButtonMask;
 CPContentsCellMask          = CPContentsButtonMask;
@@ -72,19 +70,16 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
-CPButtonStateMixed             = CPThemeState("mixed");
-CPButtonStateBezelStyleRounded = CPThemeState("rounded");
+CPButtonStateMixed                  = CPThemeState("mixed");
+CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
 
 // add all future correspondance between bezel styles and theme state here.
-var CPButtonBezelStyleStateMap = @{
-        CPRoundedBezelStyle: CPButtonStateBezelStyleRounded,
-        CPRoundRectBezelStyle: [CPNull null],
-    };
+var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonStateBezelStyleRounded, nil]
+                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];
 
-/// @cond IGNORE
-CPButtonDefaultHeight = 25.0;
+
+CPButtonDefaultHeight = 24.0;
 CPButtonImageOffset   = 3.0;
-/// @endcond
 
 /*!
     @ingroup appkit
@@ -116,16 +111,6 @@ CPButtonImageOffset   = 3.0;
     CPTimer             _continuousTimer;
     float               _periodicDelay;
     float               _periodicInterval;
-
-    BOOL                _isTracking;
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPTargetBinding || [aBinding hasPrefix:CPArgumentBinding])
-        return [CPActionBinding class];
-
-    return [super _binderClassForBinding:aBinding];
 }
 
 + (id)buttonWithTitle:(CPString)aTitle
@@ -151,19 +136,14 @@ CPButtonImageOffset   = 3.0;
 
 + (id)themeAttributes
 {
-    return @{
-            @"image": [CPNull null],
-            @"image-offset": 0.0,
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"content-inset": _CGInsetMakeZero(),
-            @"bezel-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
+                                       forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
 /*!
-    Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
-    @param aFrame The frame rectangle for the created button object.
-    @return An initialized CPView object or nil if the object couldn't be created.
+	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
 {
@@ -175,7 +155,7 @@ CPButtonImageOffset   = 3.0;
         [self setValue:CPCenterTextAlignment forThemeAttribute:@"alignment"];
         [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
-        [self setValue:CPImageScaleNone forThemeAttribute:@"image-scaling"];
+        [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
 
         [self setBezelStyle:CPRoundRectBezelStyle];
         [self setBordered:YES];
@@ -196,13 +176,11 @@ 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
@@ -228,20 +206,24 @@ 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;
+        anObjectValue = CPOnState
+
     else if (anObjectValue < CPOffState)
         if ([self allowsMixedState])
             anObjectValue = CPMixedState;
+
         else
             anObjectValue = CPOnState;
 
@@ -249,35 +231,24 @@ CPButtonImageOffset   = 3.0;
 
     switch ([self objectValue])
     {
-        case CPMixedState:
-            [self unsetThemeState:CPThemeStateSelected];
-            [self setThemeState:CPButtonStateMixed];
-            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-                [self setThemeState:CPThemeStateHighlighted];
-            else
-                [self unsetThemeState:CPThemeStateHighlighted];
-            break;
+        case CPMixedState:  [self unsetThemeState:CPThemeStateSelected];
+                            [self setThemeState:CPButtonStateMixed];
+                            break;
 
-        case CPOnState:
-            [self unsetThemeState:CPButtonStateMixed];
-            [self setThemeState:CPThemeStateSelected];
-            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-                [self setThemeState:CPThemeStateHighlighted];
-            else
-                [self unsetThemeState:CPThemeStateHighlighted];
-            break;
+        case CPOnState:     [self unsetThemeState:CPButtonStateMixed];
+                            [self setThemeState:CPThemeStateSelected];
+                            break;
 
-        case CPOffState:
-            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
+        case CPOffState:    [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed];
     }
 }
 
 /*!
-    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
 {
@@ -323,9 +294,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
 {
@@ -339,9 +310,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
 {
@@ -403,19 +374,11 @@ 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];
 }
@@ -439,20 +402,15 @@ CPButtonImageOffset   = 3.0;
     }
 }
 
-- (CPInteger)highlightsBy
-{
-    return _highlightsBy;
-}
-
 - (void)setButtonType:(CPButtonType)aButtonType
 {
     switch (aButtonType)
     {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
@@ -460,12 +418,12 @@ CPButtonImageOffset   = 3.0;
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
-        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
         case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
@@ -536,45 +494,20 @@ CPButtonImageOffset   = 3.0;
 
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
-    _isTracking = YES;
+    [self highlight:YES];
 
-    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;
+    return [super startTrackingAt:aPoint];
 }
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    _isTracking = NO;
+    [self highlight:NO];
+    [self invalidateTimers];
+
+    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
 
     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
@@ -596,18 +529,35 @@ CPButtonImageOffset   = 3.0;
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    return _CGRectInsetByInset(bounds, contentInset);
+    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;
 }
 
 - (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 bounds;
+        return _CGRectMakeZero();
 
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    return _CGRectInsetByInset(bounds, bezelInset);
+    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;
 }
 
 - (CGSize)_minimumFrameSize
@@ -691,51 +641,8 @@ CPButtonImageOffset   = 3.0;
 
     if (contentView)
     {
-        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 setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
+        [contentView setImage:[self currentValueForThemeAttribute:@"image"]];
         [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];
 
         [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
@@ -834,51 +741,9 @@ 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)
@@ -919,9 +784,7 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
     CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
     CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
     CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
-    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey",
-    CPButtonHighlightsByKey             = @"CPButtonHighlightsByKey",
-    CPButtonShowsStateByKey             = @"CPButtonShowsStateByKey";
+    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey";
 
 @implementation CPButton (CPCoding)
 
@@ -939,20 +802,9 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 
         _title = [aCoder decodeObjectForKey:CPButtonTitleKey];
         _alternateTitle = [aCoder decodeObjectForKey:CPButtonAlternateTitleKey];
-        _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.
-        }
+        if ([aCoder containsValueForKey:CPButtonAllowsMixedStateKey])
+            _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
 
         [self setImageDimsWhenDisabled:[aCoder decodeObjectForKey:CPButtonImageDimsWhenDisabledKey]];
 
@@ -991,9 +843,6 @@ 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];
 
@@ -1007,3 +856,6 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 }
 
 @end
+
+@import "CPCheckBox.j"
+@import "CPRadio.j"

AppKit/CPButtonBar.j

@@ -1,31 +1,5 @@
-/*
- * 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
@@ -38,7 +12,7 @@
 + (id)plusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
 
     [button setBordered:NO];
     [button setImage:image];
@@ -50,7 +24,7 @@
 + (id)minusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
     [button setBordered:NO];
     [button setImage:image];
@@ -62,7 +36,7 @@
 + (id)actionPopupButton
 {
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
 
     [button addItemWithTitle:nil];
     [[button lastItem] setImage:image];
@@ -81,17 +55,8 @@
 
 + (id)themeAttributes
 {
-    return @{
-            @"resize-control-inset": CGInsetMake(0.0, 0.0, 0.0, 0.0),
-            @"resize-control-size": CGSizeMakeZero(),
-            @"resize-control-color": [CPNull null],
-            @"bezel-color": [CPNull null],
-            @"button-bezel-color": [CPNull null],
-            @"button-text-color": [CPNull null],
-            @"button-image-plus": [CPNull null],
-            @"button-image-minus": [CPNull null],
-            @"button-image-action": [CPNull null],
-        };
+    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"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame

AppKit/CPCheckBox.j

@@ -44,12 +44,12 @@ CPCheckBoxImageOffset = 4.0;
     return @"check-box";
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding === CPValueBinding)
+    if (theBinding === CPValueBinding)
         return [_CPCheckBoxValueBinder class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -94,48 +94,54 @@ CPCheckBoxImageOffset = 4.0;
     [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
 }
 
-- (CPImage)image
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (CPImage)alternateImage
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (BOOL)startTrackingAt:(CGPoint)aPoint
-{
-    var startedTracking = [super startTrackingAt:aPoint];
-    [self highlight:YES];
-    return startedTracking;
-}
-
 @end
 
 @implementation _CPCheckBoxValueBinder : CPBinder
 {
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+- (void)setValueFor:(CPString)theBinding
 {
-    [super _updatePlaceholdersWithOptions:options];
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [destination valueForKeyPath:keyPath],
+        isPlaceholder = CPIsControllerMarker(newValue);
 
-    [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];
-}
+    if (isPlaceholder)
+    {
+        switch (newValue)
+        {
+            case CPMultipleValuesMarker:
+                newValue = CPMixedState;
+                break;
 
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setAllowsMixedState:(aValue === CPMixedState)];
-    [_source setState:aValue];
-}
+            case CPNoSelectionMarker:
+                newValue = CPOffState;
+                break;
 
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_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];
 }
 
 @end

AppKit/CPClipView.j

@@ -22,7 +22,6 @@
 
 @import "CPView.j"
 
-@class CPScrollView
 
 /*!
     @ingroup appkit
@@ -45,10 +44,10 @@
     if (_documentView == aView)
         return;
 
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
     if (_documentView)
     {
-        var defaultCenter = [CPNotificationCenter defaultCenter];
-
         [defaultCenter
             removeObserver:self
                       name:CPViewFrameDidChangeNotification
@@ -67,30 +66,24 @@
     if (_documentView)
     {
         [self addSubview:_documentView];
-        [self _observeDocumentView];
+
+        [_documentView setPostsFrameChangedNotifications:YES];
+        [_documentView setPostsBoundsChangedNotifications:YES];
+
+        [defaultCenter
+            addObserver:self
+               selector:@selector(viewFrameChanged:)
+                   name:CPViewFrameDidChangeNotification
+                 object:_documentView];
+
+        [defaultCenter
+            addObserver:self
+               selector:@selector(viewBoundsChanged:)
+                   name:CPViewBoundsDidChangeNotification
+                 object:_documentView];
     }
 }
 
-- (void)_observeDocumentView
-{
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    [_documentView setPostsFrameChangedNotifications:YES];
-    [_documentView setPostsBoundsChangedNotifications:YES];
-
-    [defaultCenter
-        addObserver:self
-           selector:@selector(viewFrameChanged:)
-               name:CPViewFrameDidChangeNotification
-             object:_documentView];
-
-    [defaultCenter
-        addObserver:self
-           selector:@selector(viewBoundsChanged:)
-               name:CPViewBoundsDidChangeNotification
-             object:_documentView];
-}
-
 /*!
     Returns the document view.
 */
@@ -240,12 +233,7 @@ var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
-    {
-        // Don't call setDocumentView: here. It calls addSubview:, but it's A) not necessary since the
-        // view hierarchy is fully encoded and B) dangerous if the subview is not fully decoded.
-        _documentView = [aCoder decodeObjectForKey:CPClipViewDocumentViewKey];
-        [self _observeDocumentView];
-    }
+        [self setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
 
     return self;
 }

AppKit/CPCollectionViewItem.j

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

AppKit/CPColor.j

@@ -21,7 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPGraphicsContext.j"
 
 @import "CGColor.j"
 
@@ -29,18 +28,6 @@
 @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,
@@ -67,8 +54,6 @@ var cachedBlackColor,
     cachedShadowColor,
     cachedClearColor;
 
-/// @endcond
-
 /*!
     @ingroup appkit
 
@@ -87,7 +72,7 @@ var cachedBlackColor,
 }
 
 /*!
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, 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.
@@ -101,13 +86,13 @@ var cachedBlackColor,
 */
 + (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)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))]];
+    return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
 }
 
 /*!
     @deprecated in favor of colorWithRed:green:blue:alpha:
 
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, 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.
@@ -182,12 +167,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];
     }
 }
 
@@ -207,17 +192,6 @@ 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])
 */
@@ -445,9 +419,7 @@ var cachedBlackColor,
         parts[3] ? parseFloat(parts[3], 10) : 1.0
     ];
 
-    // 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];
+    _cssString = aString;
 
     return self;
 }
@@ -461,23 +433,18 @@ var cachedBlackColor,
     {
         _components = components;
 
-        [self _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]) : "") + ")";
     }
 
     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
 {
@@ -565,14 +532,6 @@ 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:
@@ -674,36 +633,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 - (CPString)description
 {
-    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;
+    return [super description]+" "+[self cssString];
 }
 
 @end
@@ -748,10 +678,8 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-/// @cond IGNORE
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
-/// @endcond
 
 @implementation CPColor (CPCoding)
 
@@ -782,12 +710,13 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 @end
 
 
-/// @cond IGNORE
 var hexCharacters = "0123456789ABCDEF";
 
-/*
-    Used for the CPColor +colorWithHexString: implementation.
-    Returns an array of rgb components.
+/*!
+    Used for the CPColor \c +colorWithHexString: implementation
+    @ignore
+    @class CPColor
+    @return an array of rgb components
 */
 var hexToRGB = function(hex)
 {
@@ -825,552 +754,3 @@ 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:
-        case 4:
-            return [CPColor colorWithPatternImage:imageFactory(args[0], args[1], args[2], args[3])];
-
-        default:
-            throw("ERROR: Invalid argument count: " + args.length);
-    }
-}
-
-var imageFromSlices = function(slices, isVertical, imageFactory)
-{
-    var imageSlices = [];
-
-    for (var i = 0; i < slices.length; ++i)
-    {
-        var slice = slices[i];
-
-        imageSlices.push(slice ? imageFactory(slice[0], slice[1], slice[2], slice[3]) : nil);
-    }
-
-    switch (slices.length)
-    {
-        case 3:
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:isVertical]];
-
-        case 9:
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-
-        default:
-            throw("ERROR: Invalid number of image slices: " + slices.length);
-    }
-};
-
-var patternColorsFromPattern = function(pattern, attributes, imageFactory)
-{
-    if (pattern.match(/^.*\{[^}]+\}/))
-    {
-        var width = attributes["width"],
-            height = attributes["height"],
-            separator = attributes["separator"] || "-",
-            orientation = attributes["orientation"],
-            rightWidth,
-            bottomHeight,
-            centerWidthHeight,
-            centerIsNil,
-            numParts;
-
-        // positions are mandatory
-        if (pattern.indexOf("{position}") < 0)
-            throw("ERROR: Pattern strings must have a {position} placeholder (\"" + pattern + "\")");
-
-        if (orientation === undefined)
-        {
-            numParts = 9;
-
-            if (attributes["centerIsNil"] !== undefined)
-                centerIsNil = attributes["centerIsNil"];
-        }
-        else
-        {
-            numParts = 3;
-            isVertical = orientation === PatternIsVertical;
-
-            if (isVertical)
-            {
-                if (attributes["centerHeight"])
-                    centerWidthHeight = attributes["centerHeight"];
-            }
-            else
-            {
-                if (attributes["centerWidth"])
-                    centerWidthHeight = attributes["centerWidth"];
-            }
-        }
-
-        if (attributes["rightWidth"])
-            rightWidth = attributes["rightWidth"];
-
-        if (attributes["bottomHeight"])
-            bottomHeight = attributes["bottomHeight"];
-
-        var positions = attributes["positions"] || "@",
-            states = nil,
-            styles = nil;
-
-        if (numParts === 3)
-        {
-            if (positions === "@")
-            {
-                if (isVertical)
-                    positions = ["top", "center", "bottom"];
-                else
-                    positions = ["left", "center", "right"];
-            }
-            else if (positions === "#")
-                positions = ["0", "1", "2"];
-            else
-                throw("ERROR: Invalid positions: " + positions)
-        }
-        else // numParts === 9
-        {
-            if (positions === "@" || positions === "abbrev")
-                positions = ["top-left", "top", "top-right", "left", "center", "right", "bottom-left", "bottom", "bottom-right"];
-            else if (positions === "full")
-                positions = ["top-left", "top-center", "top-right", "center-left", "center-center", "center-right", "bottom-left", "bottom-center", "bottom-right"];
-            else if (positions === "#")
-                positions = ["0", "1", "2", "3", "4", "5", "6", "7", "8"];
-            else
-                throw("ERROR: Invalid positions: " + positions)
-        }
-
-        // states
-        if (pattern.indexOf("{state}") >= 0)
-        {
-            states = attributes["states"];
-
-            if (!states)
-                throw("ERROR: {state} placeholder in the pattern (\"" + pattern + "\") but no states item in the attributes");
-        }
-
-        // styles
-        if (pattern.indexOf("{style}") >= 0)
-        {
-            styles = attributes["styles"];
-
-            if (!styles)
-                throw("ERROR: {style} placeholder in the pattern (\"" + pattern + "\") but no styles item in the attributes");
-        }
-
-        // Now assemble the hierarchy
-        var placeholder = "{position}",
-            pos = pattern.indexOf(placeholder),
-            i;
-
-        for (i = 0; i < positions.length; ++i)
-            positions[i] = pattern.replace(placeholder, pos === 0 ? positions[i] + separator : separator + positions[i]);
-
-        var slices = positions,
-            object = slices,
-            key,
-            sep;
-
-        if (states)
-        {
-            placeholder = "{state}";
-            pos = pattern.indexOf(placeholder);
-            object = {};
-
-            for (i = 0; i < states.length; ++i)
-            {
-                var state = states[i];
-                key = state || "@";
-                sep = state ? separator : "";
-
-                object[key] = slices.slice(0);
-                replacePlaceholderInArray(object[key], placeholder, pos === 0 ? state + sep : sep + state);
-            }
-        }
-
-        if (styles)
-        {
-            placeholder = "{style}";
-            pos = pattern.indexOf(placeholder);
-
-            var styleObject = {};
-
-            for (i = 0; i < styles.length; ++i)
-            {
-                var style = styles[i];
-                key = style || "@";
-                sep = style ? separator : "";
-
-                if (states)
-                {
-                    styleObject[key] = cloneObject(object);
-                    replacePlaceholderInObject(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
-                }
-                else
-                {
-                    styleObject[key] = slices.slice(0);
-                    replacePlaceholderInArray(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
-                }
-            }
-
-            object = styleObject;
-        }
-
-        if (styles || states)
-        {
-            if (numParts === 3)
-                makeThreePartSlicesFromObject(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else
-                makeNinePartSlicesFromObject(object, width, height, rightWidth, bottomHeight, centerIsNil);
-
-            makeImagesFromObject(object, isVertical, imageFactory);
-            return object;
-        }
-        else
-        {
-            if (numParts === 3)
-                makeThreePartSlicesFromArray(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else
-                makeNinePartSlicesFromArray(object, width, height, rightWidth, bottomHeight, centerIsNil);
-
-            return imageFromSlices(object, isVertical, imageFactory);
-        }
-    }
-    else
-        throw("ERROR: No placeholders in slice pattern (\"" + pattern + "\")");
-};
-
-var replacePlaceholderInArray = function(array, find, replacement)
-{
-    for (var i = 0; i < array.length; ++i)
-        array[i] = array[i].replace(find, replacement);
-};
-
-var replacePlaceholderInObject = function(object, find, replacement)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                replacePlaceholderInArray(object[key], find, replacement);
-            else
-                replacePlaceholderInObject(object[key], find, replacement);
-};
-
-var cloneObject = function(object)
-{
-    var clone = {};
-
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                clone[key] = object[key].slice(0);
-            else if (typeof(object[key]) === "object")
-                clone[key] = cloneObject(object[key]);
-            else
-                clone[key] = object[key];
-
-    return clone;
-};
-
-var makeThreePartSlicesFromObject = function(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                makeThreePartSlicesFromArray(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else // object
-                makeThreePartSlicesFromObject(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-};
-
-var makeThreePartSlicesFromArray = function(array, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
-{
-    array[0] = [array[0], width, height];
-
-    if (isVertical)
-    {
-        array[1] = [array[1], width, centerWidthHeight ? centerWidthHeight : 1.0];
-        array[2] = [array[2], width, bottomHeight ? bottomHeight : height];
-    }
-    else
-    {
-        array[1] = [array[1], centerWidthHeight ? centerWidthHeight : 1.0, height];
-        array[2] = [array[2], rightWidth ? rightWidth : width, height];
-    }
-};
-
-var makeNinePartSlicesFromObject = function(object, width, height, rightWidth, bottomHeight, centerIsNil)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                makeNinePartSlicesFromArray(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
-            else // object
-                makeNinePartSlicesFromObject(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
-};
-
-var makeNinePartSlicesFromArray = function(array, width, height, rightWidth, bottomHeight, centerIsNil)
-{
-    rightWidth = rightWidth ? rightWidth : width;
-    bottomHeight = bottomHeight ? bottomHeight : height;
-
-    array[0] = [array[0], width, height];                // top-left
-    array[1] = [array[1], 1.0, height];                  // top
-    array[2] = [array[2], rightWidth, height];           // top-right
-    array[3] = [array[3], width, 1.0];                   // left
-    array[4] = centerIsNil ? nil : [array[4], 1.0, 1.0]; // center
-    array[5] = [array[5], rightWidth, 1.0];              // right
-    array[6] = [array[6], width, bottomHeight];          // bottom-left
-    array[7] = [array[7], 1.0, bottomHeight];            // bottom
-    array[8] = [array[8], rightWidth, bottomHeight];     // bottom-right
-};
-
-var makeImagesFromObject = function(object, isVertical, imageFactory)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                object[key] = imageFromSlices(object[key], isVertical, imageFactory);
-            else // object
-                makeImagesFromObject(object[key], isVertical, imageFactory);
-};
-
-/// @endcond

AppKit/CPColorPanel.j

@@ -20,32 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPApplication.j"
 @import "CPButton.j"
 @import "CPCookie.j"
 @import "CPPanel.j"
-@import "CPPasteboard.j"
 @import "CPView.j"
 
-@class CPSlider
-
-@global CPApp
-
-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
 
 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
 
@@ -58,6 +38,22 @@ 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
@@ -127,7 +123,7 @@ var SharedColorPanel = nil,
 
     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];
@@ -148,7 +144,7 @@ var SharedColorPanel = nil,
 - (void)setColor:(CPColor)aColor
 {
     _color = aColor;
-    [_previewView setBackgroundColor:_color];
+    [_previewView setBackgroundColor: _color];
 
     [CPApp sendAction:@selector(changeColor:) to:nil from:self];
 
@@ -252,8 +248,8 @@ var SharedColorPanel = nil,
         var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
             bounds = [[self contentView] bounds];
 
-        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin:CGPointMake(5, height)];
+        [view setFrameSize:CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin:CPPointMake(5, height)];
     }
 
     [_currentView removeFromSuperview];
@@ -303,7 +299,7 @@ var SharedColorPanel = nil,
         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,
@@ -343,7 +339,7 @@ var SharedColorPanel = nil,
 
     [previewBox addSubview:_previewView];
 
-    var _previewLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
+    var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
     [_previewLabel setStringValue:"Preview:"];
     [_previewLabel setTextColor:[CPColor blackColor]];
     [_previewLabel setAlignment:CPRightTextAlignment];
@@ -361,14 +357,14 @@ var SharedColorPanel = nil,
 
     [swatchBox addSubview:_swatchView];
 
-    var _swatchLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
-    [_swatchLabel setStringValue:"Swatches:"];
+    var _swatchLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
+    [_swatchLabel setStringValue: "Swatches:"];
     [_swatchLabel setTextColor:[CPColor blackColor]];
     [_swatchLabel setAlignment:CPRightTextAlignment];
 
 
-    var opacityLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
-    [opacityLabel setStringValue:"Opacity:"];
+    var opacityLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
+    [opacityLabel setStringValue: "Opacity:"];
     [opacityLabel setTextColor:[CPColor blackColor]];
     [opacityLabel setAlignment:CPRightTextAlignment];
 
@@ -393,7 +389,7 @@ var SharedColorPanel = nil,
     _action = nil;
     _activePicker = nil;
 
-    [_previewView setBackgroundColor:_color];
+    [_previewView setBackgroundColor: _color];
 
     if (buttonForLater)
         [self _setPicker:buttonForLater];
@@ -411,29 +407,28 @@ var SharedColorPanel = nil,
 
 
 CPColorDragType = "CPColorDragType";
-
 var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 /* @ignore */
 @implementation _CPColorPanelSwatches : CPView
 {
-    CPArray         _swatches;
+    CPView[]        _swatches;
     CPColor         _dragColor;
     CPColorPanel    _colorPanel;
     CPCookie        _swatchCookie;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)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 = [];
@@ -441,15 +436,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:CGRectMake(13 * i + 1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame: CPRectMake(13 * i + 1, 1, 12, 12)],
             fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
 
         [view setBackgroundColor:whiteColor];
-        [fillView setBackgroundColor:(i < colorList.length) ? colorList[i] : whiteColor];
+        [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
 
         [view addSubview:fillView];
 
-        [self addSubview:view];
+        [self addSubview: view];
 
         _swatches.push(view);
     }
@@ -466,7 +461,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var cookieValue = [_swatchCookie value];
 
-    if (!cookieValue)
+    if (cookieValue == "")
     {
         return [
             [CPColor blackColor],
@@ -485,7 +480,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;
 }
@@ -500,7 +495,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
@@ -533,7 +528,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
@@ -550,10 +545,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
     _dragColor = [[swatch subviews][0] backgroundColor];
 
-    var bounds = CGRectMakeCopy([swatch bounds]);
+    var bounds = CPRectCreateCopy([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]];
@@ -561,13 +556,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [dragView addSubview:dragFillView];
 
-    [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];
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
@@ -585,7 +580,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
@@ -596,7 +591,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPColorPanel    _colorPanel;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -637,10 +632,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];
 
-    var bounds = CGRectMake(0, 0, 15, 15);
+    var bounds = CPRectMake(0, 0, 15, 15);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame:bounds],
+    var dragView = [[CPView alloc] initWithFrame: bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
 
     [dragView setBackgroundColor:[CPColor blackColor]];
@@ -648,13 +643,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [dragView addSubview:dragFillView];
 
-    [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];
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType

AppKit/CPColorPicker.j

@@ -24,12 +24,6 @@
 
 @import "CPView.j"
 
-@class CPSlider
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPWheelColorPickerMode
-
 
 /*!
     @ingroup appkit
@@ -50,11 +44,10 @@
 */
 - (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
 {
-    if (self = [super init])
-    {
-        _panel = aPanel;
-        _mask  = aMask;
-    }
+    self = [super init];
+
+    _panel = aPanel;
+    _mask  = aMask;
 
     return self;
 }
@@ -83,6 +76,7 @@
 */
 - (void)setMode:(CPColorPanelMode)mode
 {
+    return;
 }
 
 /*!
@@ -91,6 +85,7 @@
 */
 - (void)setColor:(CPColor)aColor
 {
+    return;
 }
 
 @end
@@ -115,12 +110,12 @@
 
 - (id)initView
 {
-    var aFrame = _CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    aFrame = CPRectMake(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"];
@@ -133,9 +128,9 @@
     [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
     [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
 
-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:_CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
-    [_hueSaturationView setDelegate:self];
-    [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame: CPRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    [_hueSaturationView setDelegate: self];
+    [_hueSaturationView setAutoresizingMask: (CPViewWidthSizable | CPViewHeightSizable)];
 
     [_pickerView addSubview:_hueSaturationView];
     [_pickerView addSubview:_brightnessSlider];
@@ -228,64 +223,60 @@
     float       _radius;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
-    if (self = [super initWithFrame: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 PLATFORM(DOM)
-        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);
+    _DOMElement.appendChild(_wheelImage);
+    _DOMElement.appendChild(_blackWheelImage);
 #endif
 
-        [self setWheelSize:aFrame.size];
+    [self setWheelSize:aFrame.size];
 
-        _crosshair = [[CPView alloc] initWithFrame:CGRectMake(_radius - 2, _radius - 2, 4, 4)];
-        [_crosshair setBackgroundColor:[CPColor blackColor]];
+    _crosshair = [[CPView alloc] initWithFrame:CPRectMake(_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:(CGSize)aSize
+- (void)setFrameSize:(CPSize)aSize
 {
     [super setFrameSize:aSize];
     [self setWheelSize:aSize];
 }
 
-- (void)setWheelSize:(CGSize)aSize
+- (void)setWheelSize:(CPSize)aSize
 {
     var min = MIN(aSize.width, aSize.height);
 
-#if PLATFORM(DOM)
     _blackWheelImage.style.width = min;
     _blackWheelImage.style.height = min;
     _blackWheelImage.width = min;
@@ -299,7 +290,6 @@
     _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;
 
@@ -359,7 +349,7 @@
     _angle     = [self radiansToDegrees:angle];
     _distance  = (distance / _radius) * 100.0;
 
-    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
 }
 
 - (void)setPositionToColor:(CPColor)aColor

AppKit/CPColorSpace.j

@@ -1,64 +0,0 @@
-/*
- * 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
-

AppKit/CPColorWell.j

@@ -43,38 +43,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     BOOL    _bordered;
 
     CPColor _color;
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return [CPColorWellValueBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"colorwell";
-}
-
-+ (id)themeAttributes
-{
-    return @{
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"bezel-color": [CPNull null],
-            @"content-inset": _CGInsetMake(3.0, 3.0, 3.0, 3.0),
-            @"content-border-inset": _CGInsetMakeZero(),
-            @"content-border-color": [CPNull null],
-        };
-}
-
-- (void)_reverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    [theBinding reverseSetValueFor:@"color"];
+    CPView  _wellView;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -84,8 +53,11 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     if (self)
     {
         _active = NO;
+        _bordered = YES;
         _color = [CPColor whiteColor];
-        [self setBordered:YES];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 
         [self _registerForNotifications];
     }
@@ -110,23 +82,25 @@ 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 [self hasThemeState:CPThemeStateBordered];
+    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)];
 }
 
 // Managing Color From Color Wells
@@ -149,7 +123,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     _color = aColor;
 
-    [self setNeedsLayout];
+    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 }
 
 /*!
@@ -212,6 +186,31 @@ 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]];
@@ -230,11 +229,27 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [self deactivate];
 }
 
-- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+- (void)mouseDown:(CPEvent)anEvent
 {
-    [self highlight:NO];
+    if (![self isEnabled])
+        return;
 
-    if (!mouseIsUp || !CGRectContainsPoint([self bounds], aPoint) || ![self isEnabled])
+    [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])
         return;
 
     [self activate:YES];
@@ -245,104 +260,6 @@ 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 blackColor];
-
-    [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];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source color];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)theBinding
-{
-    [_source setColor:aValue];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setColor:aValue];
-}
-
 @end
 
 var CPColorWellColorKey     = "CPColorWellColorKey",
@@ -361,8 +278,11 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
     if (self)
     {
         _active = NO;
+        _bordered = [aCoder decodeBoolForKey:CPColorWellBorderedKey];
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
-        [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 
         [self _registerForNotifications];
     }
@@ -376,10 +296,19 @@ 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:[self isBordered] forKey:CPColorWellBorderedKey];
+    [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey];
 }
 
 @end

AppKit/CPCompatibility.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPEvent_Constants.j"
+@import "CPEvent.j"
 @import "CPPlatform.j"
 
 
@@ -38,58 +38,42 @@ CPWindowsOperatingSystem                = 1;
 CPOtherOperatingSystem                  = 2;
 
 // Features
-CPCSSRGBAFeature                        = 5;
+CPCSSRGBAFeature                        = 1 << 5;
 
-CPHTMLCanvasFeature                     = 6;
-CPHTMLContentEditableFeature            = 7;
-CPHTMLDragAndDropFeature                = 8;
+CPHTMLCanvasFeature                     = 1 << 6;
+CPHTMLContentEditableFeature            = 1 << 7;
+CPHTMLDragAndDropFeature                = 1 << 8;
 
-CPJavaScriptInnerTextFeature            = 9;
-CPJavaScriptTextContentFeature          = 10;
-CPJavaScriptClipboardEventsFeature      = 11;
-CPJavaScriptClipboardAccessFeature      = 12;
-CPJavaScriptCanvasDrawFeature           = 13;
-CPJavaScriptCanvasTransformFeature      = 14;
+CPJavaScriptInnerTextFeature            = 1 << 9;
+CPJavaScriptTextContentFeature          = 1 << 10;
+CPJavaScriptClipboardEventsFeature      = 1 << 11;
+CPJavaScriptClipboardAccessFeature      = 1 << 12;
+CPJavaScriptCanvasDrawFeature           = 1 << 13;
+CPJavaScriptCanvasTransformFeature      = 1 << 14;
 
-CPVMLFeature                            = 15;
+CPVMLFeature                            = 1 << 15;
 
-CPJavaScriptRemedialKeySupport          = 16;
-CPJavaScriptShadowFeature               = 20;
+CPJavaScriptRemedialKeySupport          = 1 << 16;
+CPJavaScriptShadowFeature               = 1 << 20;
 
-CPJavaScriptNegativeMouseWheelValues    = 22;
-CPJavaScriptMouseWheelValues_8_15       = 23;
+CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
+CPJavaScriptMouseWheelValues_8_15       = 1 << 23;
 
-CPOpacityRequiresFilterFeature          = 24;
+CPOpacityRequiresFilterFeature          = 1 << 24;
 
-// Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 25;
-CPHTML5DragAndDropSourceYOffBy1         = 26;
+//Internet explorer does not allow dynamically changing the type of an input element
+CPInputTypeCanBeChangedFeature          = 1 << 25;
+CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
 
-CPSOPDisabledFromFileURLs               = 27;
-
-// element.style.font can be set for an element not in the DOM.
-CPInputSetFontOutsideOfDOM              = 28;
-
-// Input elements have 1 px of extra padding on the left regardless of padding setting.
-CPInput1PxLeftPadding                   = 29;
-CPInputOnInputEventFeature              = 30;
-
-CPFileAPIFeature                        = 31;
-
-/*
-    When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
-*/
-CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
+CPSOPDisabledFromFileURLs               = 1 << 27;
 
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = [],
-    PLATFORM_BUGS                       = 0,
-    PLATFORM_STYLE_JS_PROPERTIES        = {};
+    PLATFORM_FEATURES                   = 0;
 
 // default these features to true
-PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
-PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;
+
+PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -99,7 +83,7 @@ if (typeof window !== "undefined" && window.opera)
 {
     PLATFORM_ENGINE = CPOperaBrowserEngine;
 
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 }
 
 // Internet Explorer
@@ -108,16 +92,13 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
     PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;
 
     // Features we can only be sure of with IE (no known independent tests)
-    PLATFORM_FEATURES[CPVMLFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
+    PLATFORM_FEATURES |= CPVMLFeature;
+    PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
 
-    PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = YES;
+    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
 
-    PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = NO;
-
-    // Tested in Internet Explore 8 and 9.
-    PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = NO;
+    PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
 }
 
 // WebKit
@@ -126,15 +107,15 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     PLATFORM_ENGINE = CPWebKitBrowserEngine;
 
     // Features we can only be sure of with WebKit (no known independent tests)
-    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
-    PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;
+    PLATFORM_FEATURES |= CPCSSRGBAFeature;
+    PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
 
     if (USER_AGENT.indexOf("Chrome") === -1)
-        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
+        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
 
-    PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardEventsFeature;
+    PLATFORM_FEATURES |= CPJavaScriptClipboardAccessFeature;
+    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
 
     var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
         versionEnd = USER_AGENT.indexOf(" ", versionStart),
@@ -144,26 +125,18 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
         minorVersion = parseInt(versionString.substr(versionDivision + 1));
 
     if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
 
     // FIXME this is a terrible hack to get around this bug:
     // https://bugs.webkit.org/show_bug.cgi?id=21548
     if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
 
     if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES[CPHTML5DragAndDropSourceYOffBy1] = YES;
-
-    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
-    if (majorVersion < 537)
-        PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
 
     if (USER_AGENT.indexOf("Chrome") === CPNotFound)
-        PLATFORM_FEATURES[CPSOPDisabledFromFileURLs] = YES;
-
-    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
-    if (majorVersion > 533)
-        PLATFORM_BUGS |= CPCanvasParentDrawErrorsOnMovementBug;
+        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
 }
 
 // KHTML
@@ -177,79 +150,46 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
     PLATFORM_ENGINE = CPGeckoBrowserEngine;
 
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
+    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 
     var index = USER_AGENT.indexOf("Firefox"),
         version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
 
     if (version >= 3.0)
-        PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
+        PLATFORM_FEATURES |= CPCSSRGBAFeature;
 
     if (version < 3.0)
-        PLATFORM_FEATURES[CPJavaScriptMouseWheelValues_8_15] = YES;
-
-    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
-    PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
 }
 
-// Feature-specific checks
+// Feature Specific Checks
 if (typeof document != "undefined")
 {
     var canvasElement = document.createElement("canvas");
-
-    // Detect canvas support
+    // Detect Canvas Support
     if (canvasElement && canvasElement.getContext)
     {
-        PLATFORM_FEATURES[CPHTMLCanvasFeature] = YES;
+        PLATFORM_FEATURES |= CPHTMLCanvasFeature;
 
-        // Any browser that supports canvas supports CSS opacity
-        PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = NO;
-
-        // Detect canvas setTransform/transform support
+        // Detect Canvas setTransform/transform support
         var context = document.createElement("canvas").getContext("2d");
 
         if (context && context.setTransform && context.transform)
-            PLATFORM_FEATURES[CPJavaScriptCanvasTransformFeature] = YES;
+            PLATFORM_FEATURES |= CPJavaScriptCanvasTransformFeature;
     }
 
     var DOMElement = document.createElement("div");
 
     // Detect whether we have innerText or textContent (or neither)
     if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES[CPJavaScriptInnerTextFeature] = YES;
+        PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
     else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES[CPJavaScriptTextContentFeature] = YES;
-
-    var DOMInputElement = document.createElement("input");
-
-    if ("oninput" in DOMInputElement)
-        PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
-    else if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("oninput", "return;");
-
-        if (typeof DOMInputElement.oninput === "function")
-            PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
-    }
-
-    // Detect FileAPI support
-    if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("type", "file");
-        PLATFORM_FEATURES[CPFileAPIFeature] = !!DOMInputElement["files"];
-    }
-    else
-        PLATFORM_FEATURES[CPFileAPIFeature] = NO;
+        PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
 }
 
 function CPFeatureIsCompatible(aFeature)
 {
-    return !!PLATFORM_FEATURES[aFeature];
-}
-
-function CPPlatformHasBug(aBug)
-{
-    return PLATFORM_BUGS & aBug;
+    return PLATFORM_FEATURES & aFeature;
 }
 
 function CPBrowserIsEngine(anEngine)
@@ -289,106 +229,3 @@ 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();
-}

AppKit/CPControl.j

@@ -20,58 +20,47 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPFormatter.j>
-@import <Foundation/CPTimer.j>
-
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
 @import "CPKeyValueBinding.j"
 
-@global CPApp
+CPLeftTextAlignment             = 0;
+CPRightTextAlignment            = 1;
+CPCenterTextAlignment           = 2;
+CPJustifiedTextAlignment        = 3;
+CPNaturalTextAlignment          = 4;
 
-CPLeftTextAlignment      = 0;
-CPRightTextAlignment     = 1;
-CPCenterTextAlignment    = 2;
-CPJustifiedTextAlignment = 3;
-CPNaturalTextAlignment   = 4;
+CPRegularControlSize            = 0;
+CPSmallControlSize              = 1;
+CPMiniControlSize               = 2;
 
-CPRegularControlSize = 0;
-CPSmallControlSize   = 1;
-CPMiniControlSize    = 2;
+CPLineBreakByWordWrapping       = 0;
+CPLineBreakByCharWrapping       = 1;
+CPLineBreakByClipping           = 2;
+CPLineBreakByTruncatingHead     = 3;
+CPLineBreakByTruncatingTail     = 4;
+CPLineBreakByTruncatingMiddle   = 5;
 
-CPLineBreakByWordWrapping     = 0;
-CPLineBreakByCharWrapping     = 1;
-CPLineBreakByClipping         = 2;
-CPLineBreakByTruncatingHead   = 3;
-CPLineBreakByTruncatingTail   = 4;
-CPLineBreakByTruncatingMiddle = 5;
+CPTopVerticalTextAlignment      = 1;
+CPCenterVerticalTextAlignment   = 2;
+CPBottomVerticalTextAlignment   = 3;
 
-CPTopVerticalTextAlignment    = 1;
-CPCenterVerticalTextAlignment = 2;
-CPBottomVerticalTextAlignment = 3;
+CPScaleProportionally           = 0;
+CPScaleToFit                    = 1;
+CPScaleNone                     = 2;
 
-// Deprecated for use with images, use the CPImageScale constants
-CPScaleProportionally = 0;
-CPScaleToFit          = 1;
-CPScaleNone           = 2;
+CPNoImage                       = 0;
+CPImageOnly                     = 1;
+CPImageLeft                     = 2;
+CPImageRight                    = 3;
+CPImageBelow                    = 4;
+CPImageAbove                    = 5;
+CPImageOverlaps                 = 6;
 
-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;
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
 
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -93,7 +82,6 @@ var CPControlBlackColor = [CPColor blackColor];
 @implementation CPControl : CPView
 {
     id                  _value;
-    CPFormatter         _formatter @accessors(property=formatter);
 
     // Target-Action Support
     id                  _target;
@@ -110,45 +98,52 @@ var CPControlBlackColor = [CPColor blackColor];
 
 + (CPDictionary)themeAttributes
 {
-    return @{
-            @"alignment": CPLeftTextAlignment,
-            @"vertical-alignment": CPTopVerticalTextAlignment,
-            @"line-break-mode": CPLineBreakByClipping,
-            @"text-color": [CPColor blackColor],
-            @"font": [CPFont systemFontOfSize:CPFontCurrentSystemSize],
-            @"text-shadow-color": [CPNull null],
-            @"text-shadow-offset": _CGSizeMakeZero(),
-            @"image-position": CPImageLeft,
-            @"image-scaling": CPScaleToFit,
-            @"min-size": _CGSizeMakeZero(),
-            @"max-size": _CGSizeMake(-1.0, -1.0),
-        };
+    return [CPDictionary dictionaryWithObjects:[CPLeftTextAlignment,
+                                                CPTopVerticalTextAlignment,
+                                                CPLineBreakByClipping,
+                                                [CPColor blackColor],
+                                                [CPFont systemFontOfSize:12.0],
+                                                [CPNull null],
+                                                _CGSizeMakeZero(),
+                                                CPImageLeft,
+                                                CPScaleToFit,
+                                                _CGSizeMakeZero(),
+                                                _CGSizeMake(-1.0, -1.0)]
+                                       forKeys:[@"alignment",
+                                                @"vertical-alignment",
+                                                @"line-break-mode",
+                                                @"text-color",
+                                                @"font",
+                                                @"text-shadow-color",
+                                                @"text-shadow-offset",
+                                                @"image-position",
+                                                @"image-scaling",
+                                                @"min-size",
+                                                @"max-size"]];
 }
 
 + (void)initialize
 {
-    if (self !== [CPControl class])
-        return;
+    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"];
 
-    [self exposeBinding:@"value"];
-    [self exposeBinding:@"objectValue"];
-    [self exposeBinding:@"stringValue"];
-    [self exposeBinding:@"integerValue"];
-    [self exposeBinding:@"intValue"];
-    [self exposeBinding:@"doubleValue"];
-    [self exposeBinding:@"floatValue"];
-
-    [self exposeBinding:@"enabled"];
+        [self exposeBinding:@"enabled"];
+    }
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
-    if (aBinding === CPValueBinding)
+    if (theBinding === CPValueBinding)
         return [_CPValueBinder class];
-    else if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
 
-    return [super _binderClassForBinding:aBinding];
+    return [super _binderClassForBinding:theBinding];
 }
 
 /*!
@@ -226,14 +221,10 @@ var CPControlBlackColor = [CPColor blackColor];
     @param anAction the action to send
     @param anObject the object to which the action will be sent
 */
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [self _reverseSetBinding];
-
-    var binding = [CPBinder getBinding:CPTargetBinding forObject:self];
-    [binding invokeAction];
-
-    return [CPApp sendAction:anAction to:anObject from:self];
+    [CPApp sendAction:anAction to:anObject from:self];
 }
 
 - (int)sendActionOn:(int)mask
@@ -389,18 +380,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    if (mouseIsUp)
-        [self highlight:NO];
-    else
-        [self highlight:YES];
-}
-
-/*!
-    Enabled controls accept first mouse by default.
-*/
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return [self isEnabled];
+    [self highlight:NO];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -522,46 +502,15 @@ var CPControlBlackColor = [CPColor blackColor];
 */
 - (CPString)stringValue
 {
-    if (_formatter && _value !== undefined)
-    {
-        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];
-
-        if (formattedValue !== nil && formattedValue !== undefined)
-            return formattedValue;
-    }
-
     return (_value === undefined || _value === nil) ? "" : String(_value);
 }
 
 /*!
     Sets the receiver's string value.
 */
-- (void)setStringValue:(CPString)aString
+- (void)setStringValue:(CPString)anObject
 {
-    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
-    if (aString === nil || aString === undefined)
-    {
-        CPLog.warn("nil or undefined sent to CPControl -setStringValue");
-        return;
-    }
-
-    var value;
-
-    if (_formatter)
-    {
-        value = nil;
-
-        if ([_formatter getObjectValue:@ref(value) forString:aString errorDescription:nil] === NO)
-        {
-            // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
-            if (!aString || [_formatter getObjectValue:@ref(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;  // Means the value is invalid
-        }
-    }
-    else
-        value = aString;
-
-    [self setObjectValue:value];
+    [self setObjectValue:anObject];
 }
 
 - (void)takeDoubleValueFrom:(id)sender
@@ -577,18 +526,21 @@ var CPControlBlackColor = [CPColor blackColor];
         [self setFloatValue:[sender floatValue]];
 }
 
+
 - (void)takeIntegerValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(integerValue)])
         [self setIntegerValue:[sender integerValue]];
 }
 
+
 - (void)takeIntValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(intValue)])
         [self setIntValue:[sender intValue]];
 }
 
+
 - (void)takeObjectValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(objectValue)])
@@ -607,7 +559,7 @@ var CPControlBlackColor = [CPColor blackColor];
     if ([note object] != self)
         return;
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 - (void)textDidChange:(CPNotification)note
@@ -616,7 +568,7 @@ var CPControlBlackColor = [CPColor blackColor];
     if ([note object] != self)
         return;
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 - (void)textDidEndEditing:(CPNotification)note
@@ -627,7 +579,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
     [self _reverseSetBinding];
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
 /*!
@@ -799,10 +751,9 @@ var CPControlBlackColor = [CPColor blackColor];
     Sets the image scaling of the control.
 
     <pre>
-    CPImageScaleProportionallyDown
-    CPImageScaleAxesIndependently
-    CPImageScaleNone
-    CPImageScaleProportionallyUpOrDown
+    CPScaleProportionally
+    CPScaleToFit
+    CPScaleNone
     </pre>
 */
 - (void)setImageScaling:(CPImageScaling)scaling
@@ -873,16 +824,17 @@ var CPControlBlackColor = [CPColor blackColor];
 
 @end
 
-var CPControlValueKey                   = @"CPControlValueKey",
-    CPControlControlStateKey            = @"CPControlControlStateKey",
-    CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
-    CPControlTargetKey                  = @"CPControlTargetKey",
-    CPControlActionKey                  = @"CPControlActionKey",
-    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
-    CPControlFormatterKey               = @"CPControlFormatterKey",
-    CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
+var CPControlValueKey           = "CPControlValueKey",
+    CPControlControlStateKey    = @"CPControlControlStateKey",
+    CPControlIsEnabledKey       = "CPControlIsEnabledKey",
 
-    __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
+    CPControlTargetKey          = "CPControlTargetKey",
+    CPControlActionKey          = "CPControlActionKey",
+    CPControlSendActionOnKey    = "CPControlSendActionOnKey",
+
+    CPControlSendsActionOnEndEditingKey = "CPControlSendsActionOnEndEditingKey";
+
+var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
 @implementation CPControl (CPCoding)
 
@@ -905,8 +857,6 @@ var CPControlValueKey                   = @"CPControlValueKey",
 
         [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]];
         [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
-
-        [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
     }
 
     return self;
@@ -932,13 +882,10 @@ var CPControlValueKey                   = @"CPControlValueKey",
     if (_target !== nil)
         [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];
 
-    if (_action !== nil)
+    if (_action !== NULL)
         [aCoder encodeObject:_action forKey:CPControlActionKey];
 
     [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];
-
-    if (_formatter !== nil)
-        [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
 }
 
 @end

AppKit/CPController.j

@@ -64,7 +64,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
         count = _editors.length;
 
     for (; index < count; ++index)
-        if (![[_editors objectAtIndex:index] commitEditing])
+        if (![[_editors objectAtIndex:i] commitEditing])
             return NO;
 
     return YES;

AppKit/CPCookie.j

@@ -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,12 +111,8 @@
     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 "";

AppKit/CPCursor.j

@@ -23,12 +23,9 @@ Cursor support by browser:
 
 @import <Foundation/CPObject.j>
 
-@global CPApp
-
 var currentCursor = nil,
     cursorStack = [],
-    cursors = {},
-    ieCursorMap = {};
+    cursors = {};
 
 @implementation CPCursor : CPObject
 {
@@ -39,20 +36,6 @@ 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])
@@ -61,30 +44,23 @@ var currentCursor = nil,
     return self;
 }
 
-/*!
-    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 is supported in CSS3 (but not IE).
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
 {
     _hotSpot = hotSpot;
     _image = image;
     return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }
 
-/*!
-    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
+// 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
 {
-    return [self initWithImage:image hotSpot:aHotSpot];
+    return [self initWithImage:image hotSpot:hotSpot];
 }
 
 + (void)hide
 {
-    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
+    [self _setCursorCSS:"none"]; // Not supported in IE
 }
 
 + (void)unhide
@@ -145,7 +121,6 @@ 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
@@ -155,40 +130,22 @@ 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)
-        {
-            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath],
-                extension = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) ? @"cur" : @"png";
-
-            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.%@), %@", themeResourcePath, cursorName, extension, aString];
-        }
-
+            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
         else
-        {
-            // 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;
-        }
-
+            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
@@ -206,36 +163,6 @@ 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];
@@ -261,21 +188,11 @@ 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];

AppKit/CPDictionaryController.j

@@ -1,168 +0,0 @@
-/*
- * CPDictionaryController.j
- * AppKit
- *
- * Adapted from Cocotron, by Johannes Fortmann
- *
- * Created by Blair Duncan
- * Copyright 2013, SGL Studio, BBDO Toronto All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPArrayController.j"
-
-@implementation CPDictionaryController : CPArrayController
-{
-    CPDictionary    _contentDictionary;
-
-    CPArray         _includedKeys @accessors(property=includedKeys);
-    CPArray         _excludedKeys @accessors(property=excludedKeys);
-
-    CPString        _initialKey @accessors(property=initialKey);
-    id              _initialValue @accessors(property=initialValue);
-}
-
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _initialKey = @"key";
-        _initialValue = @"value";
-    }
-
-    return self;
-}
-
-- (id)newObject
-{
-    var keys = [_contentDictionary allKeys],
-        newKey = _initialKey,
-        count = 0;
-
-    if ([keys containsObject:newKey])
-        while ([keys containsObject:newKey])
-            newKey = [CPString stringWithFormat:@"%@%i", _initialKey, ++count];
-
-    return [self _newObjectWithKey:newKey value:_initialValue];
-}
-
-- (id)_newObjectWithKey:(CPString)aKey value:(id)aValue
-{
-    var aNewObject = [_CPDictionaryControllerKeyValuePair new];
-
-    aNewObject._dictionary = _contentDictionary;
-    aNewObject._controller = self;
-    aNewObject._key = aKey;
-
-    if (aValue !== nil)
-        [aNewObject setValue:aValue];
-
-    return aNewObject;
-}
-
-- (CPDictionary)contentDictionary
-{
-    return _contentDictionary;
-}
-
-- (void)setContentDictionary:(CPDictionary)aDictionary
-{
-    if (aDictionary == _contentDictionary)
-        return;
-
-    if ([aDictionary isKindOfClass:[CPDictionary class]])
-        _contentDictionary = aDictionary;
-    else
-        _contentDictionary = nil;
-
-    var array = [CPArray array],
-        allKeys = [_contentDictionary allKeys];
-
-    [allKeys addObjectsFromArray:_includedKeys];
-
-    var iter = [[CPSet setWithArray:allKeys] objectEnumerator],
-        obj;
-
-    while ((obj = [iter nextObject]) !== nil)
-        if (![_excludedKeys containsObject:obj])
-            [array addObject:[self _newObjectWithKey:obj value:nil]];
-
-    [super setContent:array];
-}
-
-
-@end
-
-
-var CPIncludedKeys  = @"CPIncludedKeys",
-    CPExcludedKeys  = @"CPExcludedKeys";
-
-@implementation CPDictionaryController (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _includedKeys = [aCoder decodeObjectForKey:CPIncludedKeys];
-        _excludedKeys = [aCoder decodeObjectForKey:CPExcludedKeys];
-        _initialKey = @"key";
-        _initialValue = @"value";
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_includedKeys forKey:CPIncludedKeys];
-    [aCoder encodeObject:_excludedKeys forKey:CPExcludedKeys];
-}
-
-@end
-
-
-
-
-@implementation _CPDictionaryControllerKeyValuePair : CPObject
-{
-    CPString                _key @accessors(property=key);
-    CPDictionary            _dictionary @accessors(property=dictionary);
-    CPDictionaryController  _controller @accessors(property=controller);
-}
-
-- (id)value
-{
-   return [_dictionary objectForKey:_key];
-}
-
-- (void)setValue:(id)aValue
-{
-   [_dictionary setObject:aValue forKey:_key];
-}
-
-- (BOOL)isExplicitlyIncluded
-{
-    return [[_controller _includedKeys] containsObject:_key];
-}
-
-
-@end

AppKit/CPDocument.j

@@ -23,16 +23,12 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPArray.j>
 
-@import "CPAlert.j"
+@import "CPApplication.j"
 @import "CPResponder.j"
 @import "CPSavePanel.j"
 @import "CPViewController.j"
 @import "CPWindowController.j"
 
-@class CPDocumentController
-
-@global CPApp
-
 
 /*
     @global
@@ -129,7 +125,7 @@ var CPDocumentUntitledCount = 0;
     if (self)
     {
         _windowControllers = [];
-        _viewControllersForWindowControllers = @{};
+        _viewControllersForWindowControllers = [CPDictionary dictionary];
 
         _hasUndoManager = YES;
         _changeCount = 0;
@@ -146,7 +142,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];
 
@@ -215,7 +211,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."];
@@ -926,9 +922,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-};
+}
 
 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
     return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-};
+}

AppKit/CPDocumentController.j

@@ -25,10 +25,6 @@
 
 @import "CPDocument.j"
 @import "CPOpenPanel.j"
-@import "CPMenuItem.j"
-@import "CPWindowController.j"
-
-@global CPApp
 
 
 var CPSharedDocumentController = nil;
@@ -128,7 +124,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];
 }
@@ -148,7 +144,7 @@ var CPSharedDocumentController = nil;
     {
         var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];
 
-        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:@{ @"shouldDisplay": shouldDisplay }];
+        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:[CPDictionary dictionaryWithObject:shouldDisplay forKey:@"shouldDisplay"]];
 
         [self addDocument:result];
 
@@ -343,10 +339,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];
 }

AppKit/CPDragServer.j

@@ -20,17 +20,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPDragServer_Constants.j"
+@import "CPApplication.j"
 @import "CPEvent.j"
 @import "CPImageView.j"
 @import "CPPasteboard.j"
 @import "CPView.j"
-@import "CPWindow_Constants.j"
+@import "CPWindow.j"
 
-@class CPWindow  // This file is imported by CPWindow.j
-@class _CPDOMDataTransferPasteboard
 
-@global CPApp
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
+CPDragOperationEvery    = -1;
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
@@ -67,7 +72,7 @@ var CPDragServerSource             = nil,
 - (unsigned)draggingSourceOperationMask
 */
 
-- (CGPoint)draggingLocation
+- (CPPoint)draggingLocation
 {
     return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -248,7 +253,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
             _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
                                                                     target:self
                                                                   selector:@selector(_sendPeriodicDraggingUpdate:)
-                                                                  userInfo:@{ "platformWindow":aPlatformWindow, "location":aLocation }
+                                                                  userInfo:[CPDictionary dictionaryWithJSObject:{platformWindow:aPlatformWindow, location:aLocation}]
                                                                    repeats:NO];
 
         var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
@@ -456,7 +461,6 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     else if (type === CPKeyDown)
     {
         var characters = [anEvent characters];
-
         if (characters === CPEscapeFunctionKey)
         {
             _dragOperation = CPDragOperationNone;
@@ -473,7 +477,39 @@ 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:YES];
+        untilDate:nil inMode:0 dequeue:NO];
+}
+
+@end
+
+@implementation CPWindow (CPDraggingAdditions)
+
+/* @ignore */
+- (id)_dragHitTest:(CGPoint)aPoint pasteboard:(CPPasteboard)aPasteboard
+{
+    // If none of our views or ourselves has registered for drag events...
+    if (!_inclusiveRegisteredDraggedTypes)
+        return nil;
+
+// We don't need to do this because the only place this gets called
+// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
+// be safe?
+//    if (![self containsPoint:aPoint])
+//        return nil;
+
+    var adjustedPoint = [self convertPlatformWindowToBase:aPoint],
+        hitView = [_windowView hitTest:adjustedPoint];
+
+    while (hitView && ![aPasteboard availableTypeFromArray:[hitView registeredDraggedTypes]])
+        hitView = [hitView superview];
+
+    if (hitView)
+        return hitView;
+
+    if ([aPasteboard availableTypeFromArray:[self registeredDraggedTypes]])
+        return self;
+
+    return nil;
 }
 
 @end

AppKit/CPDragServer_Constants.j

@@ -1,30 +0,0 @@
-/*
- * 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;

AppKit/CPEvent.j

@@ -20,24 +20,166 @@
  * 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
 
-@global CPApp
+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";
 
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
-    _CPEventStartupMilliseconds         = new Date().getTime();
+    _CPEventUpperCaseRegex              = new RegExp("[A-Z]");
 
 /*!
     @ingroup appkit
@@ -47,7 +189,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 @implementation CPEvent : CPObject
 {
     CPEventType         _type;
-    CGPoint             _location;
+    CPPoint             _location;
     unsigned            _modifierFlags;
     CPTimeInterval      _timestamp;
     CPGraphicsContext   _context;
@@ -61,23 +203,12 @@ 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.
 
@@ -166,13 +297,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /* @ignore */
-- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
     if (self = [self _initWithType:anEventType])
     {
-        _location = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -186,13 +317,13 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /* @ignore */
-- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)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 = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -213,7 +344,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
     if (self = [self _initWithType:anEventType])
     {
-        _location = CGPointCreateCopy(aPoint);
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -258,7 +389,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the time the event occurred in seconds since startup.
+    Returns the time the event occurred.
 */
 - (CPTimeInterval)timestamp
 {
@@ -377,16 +508,6 @@ 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.
@@ -450,27 +571,31 @@ var _CPEventPeriodicEventPeriod         = 0,
     if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
         return YES;
 
-    // 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);
-
-        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-            c === CPEnterCharacter ||
-            c === CPNewlineCharacter ||
-            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey)
+        switch (_characters.charAt(i))
         {
-            return YES;
+            case CPBackspaceCharacter:
+            case CPDeleteCharacter:
+            case CPDeleteFunctionKey:
+            case CPTabCharacter:
+            case CPCarriageReturnCharacter:
+            case CPNewlineCharacter:
+            case CPSpaceFunctionKey:
+            case CPEscapeFunctionKey:
+            case CPPageUpFunctionKey:
+            case CPPageDownFunctionKey:
+            case CPLeftArrowFunctionKey:
+            case CPUpArrowFunctionKey:
+            case CPRightArrowFunctionKey:
+            case CPDownArrowFunctionKey:
+            case CPEndFunctionKey:
+            case CPHomeFunctionKey:
+                return YES;
         }
     }
-
-    return !firstResponderIsText;
+    // FIXME: More cases?
+    return NO;
 }
 
 /*!
@@ -500,34 +625,11 @@ 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:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
 }
 
 var CPEventClass = [CPEvent class];
@@ -549,3 +651,4 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie
 
     return aNativeEvent;
 }
+

AppKit/CPEvent_Constants.j

@@ -1,174 +0,0 @@
-/*
- * 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";

AppKit/CPFlashView.j

@@ -38,6 +38,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 #if PLATFORM(DOM)
     DOMElement      _DOMParamElement;
     DOMElement      _DOMObjectElement;
+    DOMElement      _DOMInnerObjectElement;
 #endif
 }
 
@@ -51,16 +52,22 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
         {
             _DOMObjectElement = document.createElement(@"object");
-            _DOMObjectElement.id = [self elementID];
             _DOMObjectElement.width = @"100%";
             _DOMObjectElement.height = @"100%";
             _DOMObjectElement.style.top = @"0px";
             _DOMObjectElement.style.left = @"0px";
             _DOMObjectElement.type = @"application/x-shockwave-flash";
+            _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID);
+
             _DOMParamElement = document.createElement(@"param");
             _DOMParamElement.name = @"movie";
 
+            _DOMInnerObjectElement = document.createElement(@"object");
+            _DOMInnerObjectElement.width = @"100%";
+            _DOMInnerObjectElement.height = @"100%";
+
             _DOMObjectElement.appendChild(_DOMParamElement);
+            _DOMObjectElement.appendChild(_DOMInnerObjectElement);
 
             _DOMElement.appendChild(_DOMObjectElement);
         }
@@ -82,7 +89,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
         _DOMParamElement.value = [aFlashMovie filename];
-        _DOMObjectElement.data = [aFlashMovie filename];
+        _DOMInnerObjectElement.data = [aFlashMovie filename];
     }
     else
         [self _rebuildIEObjects];
@@ -97,17 +104,14 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (void)setFlashVars:(CPDictionary)aDictionary
 {
     var varString = @"",
-        enumerator = [aDictionary keyEnumerator],
-        key;
-
-    if (key = [enumerator nextObject])
-        varString = [varString stringByAppendingFormat:@"%@=%@", key, [aDictionary objectForKey:key]];
+        enumerator = [aDictionary keyEnumerator];
 
+    var key;
     while (key = [enumerator nextObject])
         varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
 
     if (!_params)
-        _params = @{};
+        _params = [CPDictionary dictionary];
 
     [_params setObject:varString forKey:@"flashvars"];
     [self setParameters:_params];
@@ -137,12 +141,12 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 #if PLATFORM(DOM)
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
-        _paramElements = @{};
+        _paramElements = [CPDictionary dictionary];
 
         var enumerator = [_params keyEnumerator],
             key;
 
-        while (_DOMObjectElement && (key = [enumerator nextObject]) !== nil)
+        while (_DOMObjectElement && (key = [enumerator nextObject]))
         {
             var param = document.createElement(@"param");
             param.name = key;
@@ -174,26 +178,16 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
         paramEnumerator = [_params keyEnumerator],
         key;
 
-    while ((key = [paramEnumerator nextObject]) !== nil)
+    while (key = [paramEnumerator nextObject])
         paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
 
     _DOMObjectElement = document.createElement(@"object");
     _DOMElement.appendChild(_DOMObjectElement);
 
-    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object id=%@ classid=%@ width=%@ height=%@>%@</object>", [self elementID], IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
+    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
 }
 #endif
 
-- (CPString)elementID
-{
-    return @"CPFV_" + [self UID];
-}
-
-- (void)mouseMoved:(id)sommit
-{
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
-}
-
 - (void)mouseDragged:(CPEvent)anEvent
 {
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

AppKit/CPFont.j

@@ -28,85 +28,46 @@
 CPFontDefaultSystemFontFace = @"Arial, sans-serif";
 CPFontDefaultSystemFontSize = 12;
 
-/*!
-    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");
+var _CPFonts                        = {},
+    _CPFontSystemFontFace           = CPFontDefaultSystemFontFace,
+    _CPFontSystemFontSize           = 12,
+    _CPFontFallbackFaces            = CPFontDefaultSystemFontFace.split(", "),
+    _CPFontStripRegExp              = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
 
 
-#define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
 #define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
-#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFontCache[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
-#define _CPUserFont(aName, aSize, isBold, isItalic)  _CPCachedFont(aName, aSize, isBold, isItalic) || [[CPFont alloc] _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO]
-
-#define _CPSystemFontCacheKey(aSize, isBold)  (String(aSize) + (isBold ? "b" : ""))
-#define _CPCachedSystemFont(aSize, isBold)  _CPSystemFontCache[_CPSystemFontCacheKey(aSize, isBold)]
-#define _CPSystemFont(aSize, isBold)  (_CPCachedSystemFont(aSize, isBold) || [[CPFont alloc] _initWithName:_CPFontSystemFacePlaceholder size:aSize bold:isBold italic:NO system:YES])
+#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFonts[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
 
 /*!
-@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.
 
-### 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 default the system font face/size is Arial 12px, with a fallback to sans-serif. You may
+    configure this at runtime in two ways:
 
-- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
-  Note that if you change the system font face or size during runtime, the next time
-  any view using a system font is redrawn, it will show the new font.
-- By configuring Info.plist for your application or for AppKit. You can set the font face
-  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
-  by adding a CPSystemFontSize integer item to the Info.plist.
+    - 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.
 
-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.
+    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.
 
-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.
+    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:
 
-### 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
+    @code
 <key>CPSystemFontFace</key>
-<string>Asap</string>
-@endcode
+<string>Lucida Grande</string>
+	@endcode
 */
 @implementation CPFont : CPObject
 {
@@ -117,23 +78,19 @@ following:
     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)
-        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);
+        [self setSystemFontFace:systemFontFace];
 
     var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];
 
@@ -157,13 +114,7 @@ following:
 */
 + (CPString)setSystemFontFace:(CPString)aFace
 {
-    var normalizedFaces = _CPFontNormalizedNames(aFace);
-
-    if (normalizedFaces === _CPFontSystemFontFace)
-        return;
-
-    [self _invalidateSystemFontCache]
-    _CPFontSystemFontFace = aFace;
+    _CPFontSystemFontFace = _CPFontNormalizedNames(aFace);
 }
 
 /*!
@@ -174,156 +125,106 @@ following:
     return _CPFontSystemFontSize;
 }
 
-+ (float)systemFontSizeForControlSize:(CPControlSize)aSize
-{
-    // TODO These sizes should be themable or made less arbitrary in some other way.
-    switch (aSize)
-    {
-        case CPSmallControlSize:
-            return _CPFontSystemFontSize - 1;
-        case CPMiniControlSize:
-            return _CPFontSystemFontSize - 2;
-        case CPRegularControlSize:
-        default:
-            return _CPFontSystemFontSize;
-    }
-}
-
 /*!
     Sets the default system font size.
 */
 + (float)setSystemFontSize:(float)size
 {
-    if (size > 0 && size !== _CPFontSystemFontSize)
-    {
-        [self _invalidateSystemFontCache];
+    if (size > 0)
         _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). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, NO);
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:NO];
 }
 
 /*!
     Returns a font with the specified name, size and style.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @param italic whether the font should be italicized
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, italic);
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic: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). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @return the requested bold font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, NO);
+    return _CPCachedFont(aName, aSize, YES, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:NO];
 }
 
 /*!
     Returns a bold font with the specified name, size and style.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in px)
     @param italic whether the font should be italicized
     @return the requested font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, italic);
-}
-
-/*!
-    Internal font getter like fontWithName:size:italic: with a bold selector.
-*/
-+ (CPFont)_fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, bold, italic);
+    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:italic];
 }
 
 /*!
     Returns the system font scaled to the specified size
-    @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.
+    @param aSize the size of the font (in px)
     @return the requested system font
 */
-+ (CPFont)systemFontOfSize:(CGSize)aSize
++ (CPFont)systemFontOfSize:(CPSize)aSize
 {
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO italic:NO];
 }
 
 /*!
     Returns the bold system font scaled to the specified size
-    @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.
+    @param aSize the size of the font (in px)
     @return the requested bold system font
 */
-+ (CPFont)boldSystemFontOfSize:(CGSize)aSize
++ (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES italic:NO];
 }
 
-- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic system:(BOOL)isSystem
+/*  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
 {
     self = [super init];
 
     if (self)
     {
+        _name = _CPFontNormalizedNames(aName);
         _size = aSize;
         _ascender = 0;
         _descender = 0;
         _lineHeight = 0;
         _isBold = isBold;
         _isItalic = isItalic;
-        _isSystem = isSystem;
 
-        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;
-        }
+        _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
+
+        _CPFonts[_cssString] = self;
     }
 
     return self;
@@ -334,12 +235,10 @@ following:
 */
 - (float)ascender
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_ascender)
+        [self _getMetrics];
 
-    if (!font._ascender)
-        [font _getMetrics];
-
-    return font._ascender;
+    return _ascender;
 }
 
 /*!
@@ -348,12 +247,10 @@ following:
 */
 - (float)descender
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_descender)
+        [self _getMetrics];
 
-    if (!font._descender)
-        [font _getMetrics];
-
-    return font._descender;
+    return _descender;
 }
 
 /*!
@@ -363,12 +260,10 @@ following:
 */
 - (float)defaultLineHeightForFont
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_lineHeight)
+        [self _getMetrics];
 
-    if (!font._lineHeight)
-        [font _getMetrics];
-
-    return font._lineHeight;
+    return _lineHeight;
 }
 
 /*!
@@ -376,7 +271,7 @@ following:
 */
 - (float)size
 {
-    return _CPRealFontSize(_size);
+    return _size;
 }
 
 /*!
@@ -384,9 +279,7 @@ following:
 */
 - (CPString)cssString
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    return font._cssString;
+    return _cssString;
 }
 
 /*!
@@ -394,17 +287,9 @@ following:
 */
 - (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;
@@ -417,7 +302,7 @@ following:
 
 - (id)copy
 {
-    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
+    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic];
 }
 
 - (void)_getMetrics
@@ -434,8 +319,7 @@ following:
 var CPFontNameKey     = @"CPFontNameKey",
     CPFontSizeKey     = @"CPFontSizeKey",
     CPFontIsBoldKey   = @"CPFontIsBoldKey",
-    CPFontIsItalicKey = @"CPFontIsItalicKey",
-    CPFontIsSystemKey = @"CPFontIsSystemKey";
+    CPFontIsItalicKey = @"CPFontIsItalicKey";
 
 @implementation CPFont (CPCoding)
 
@@ -449,10 +333,9 @@ var CPFontNameKey     = @"CPFontNameKey",
     var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
         size = [aCoder decodeFloatForKey:CPFontSizeKey],
         isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
-        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey],
-        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];
+        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey];
 
-    return [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
+    return [self _initWithName:fontName size:size bold:isBold italic:isItalic];
 }
 
 /*!
@@ -465,7 +348,6 @@ var CPFontNameKey     = @"CPFontNameKey",
     [aCoder encodeFloat:_size forKey:CPFontSizeKey];
     [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
     [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
-    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
 }
 
 @end
@@ -474,7 +356,7 @@ var CPFontNameKey     = @"CPFontNameKey",
 // aName must be normalized
 var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
 {
-    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";
+    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + aSize + "px ";
 
     return properties + _CPFontConcatNameWithFallback(aName);
 };

AppKit/CPFontManager.j

@@ -24,21 +24,6 @@
 
 @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;
@@ -48,17 +33,7 @@ var CPSharedFontManager     = nil,
 */
 @implementation CPFontManager : CPObject
 {
-    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;
+    CPArray _availableFonts;
 }
 
 // Getting the Shared Font Manager
@@ -84,16 +59,6 @@ var CPSharedFontManager     = nil,
     CPFontManagerFactory = aClass;
 }
 
-- (id)init
-{
-    if (self = [super init])
-    {
-        _action = @selector(changeFont:);
-    }
-
-    return self;
-}
-
 /*!
     Returns an array of the available fonts
 */
@@ -101,9 +66,6 @@ var CPSharedFontManager     = nil,
 {
     if (!_availableFonts)
     {
-        _availableFonts = [];
-
-#if PLATFORM(DOM)
         _CPFontDetectSpan = document.createElement("span");
         _CPFontDetectSpan.fontSize = "24px";
         _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -115,16 +77,13 @@ 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;
 }
@@ -138,124 +97,43 @@ 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
-{
-    var tag = [sender tag];
-    _activeChange = tag === nil ? @{} : @{ @"addTraits": tag };
-
-    [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.
@@ -265,7 +143,7 @@ var _CPFontDetectFontAvailable = function(font)
         if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
             return true;
     return false;
-};
+}
 
 var _CPFontDetectCache = {};
 
@@ -287,7 +165,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)
@@ -297,6 +175,6 @@ var _CPFontDetectPickTwoDifferentFonts = function(candidates)
             if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
                 return [candidates[i], candidates[j]];
     return [candidates[0]];
-};
+}
 
 [CPFontManager setFontManagerFactory:[CPFontManager class]];

AppKit/CPGeometry.j

@@ -1,6 +1,6 @@
 /*
  * CPGeometry.j
- * Foundation
+ * AppKit
  *
  * Created by Francisco Tolmasky.
  * Copyright 2008, 280 North, Inc.
@@ -20,108 +20,34 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CGGeometry.j"
+@import "CGGeometry.j"
+
 
 CPMinXEdge = 0;
 CPMinYEdge = 1;
 CPMaxXEdge = 2;
 CPMaxYEdge = 3;
 
-/*!
-    Makes a CGPoint object out of two numbers provided as arguments
-    @group CGPoint
-    @param x the x-coordinate of the CGPoint
-    @param y the y-coordinate of the CGPoint
-    @return CGPoint a CGPoint with an X and Y coordinate equal to the function arguments
-*/
+// FIXME: the rest!
 CPMakePoint = CGPointMake;
-
-/*!
-    Creates and returns a new CGSize object from the provided dimensions.
-    @group CGSize
-    @param width the width for the new CGSize
-    @param height the height for the new CGSize
-    @return CGSize the new CGSize
-*/
 CPMakeSize = CGSizeMake;
-
-/*!
-    Returns a CGRect made of the specified arguments
-    @group CGRect
-    @param x the x-coordinate of the rectangle's origin
-    @param y the y-coordinate of the rectangle's origin
-    @param width the width of the new rectangle
-    @param height the height of the new rectangle
-    @return CGRect the new rectangle
-*/
 CPMakeRect = CGRectMake;
 
 /*!
-    Creates a copy of a specified point and returns the copy
-    @group CGPoint
-    @param the point to be copied
-    @return CGPoint the copy of the provided CGPoint
+    @addtogroup appkit
+    @{
 */
-CPPointCreateCopy = CGPointMakeCopy;
 
 /*!
-    Tests whether the two CGPoints are equal to each other by comparing their
-    \c x and \c y members.
-    @group @CGPoint
-    @param lhsPoint the first CGPoint to check
-    @param rhsPoint the second CGPoint to check
-    @return BOOL \c YES if the two points have the same x's, and the same y's.
-*/
-CPPointEqualToPoint = CGPointEqualToPoint;
-
-/*!
-    Tests whether the CGPoint is contained by the CGRect.
-    @group CGPoint
-    @param aPoint the CGPoint to check
-    @param aRect the CGRect to check
-    @return BOOL \c YES if the rect contains the point.
-*/
-CPPointInRect = function(aPoint, aRect)
+  Creates a copy of a specified point and returns the copy
+  @group CGPoint
+  @param the point to be copied
+  @return CGPoint the copy of the provided CGPoint
+  */
+function CPPointCreateCopy(aPoint)
 {
-    return CGRectContainsPoint(aRect, aPoint)
-};
-
-/*!
-    Test whether the two CGRects have the same origin and size
-    @group CGRect
-    @param lhsRect the first CGRect to compare
-    @param rhsRect the second CGRect to compare
-    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
-*/
-CPRectEqualToRect = CGRectEqualToRect;
-
-/*!
-    Returns \c YES if the CGRect has no area.
-    The test is performed by checking if the width and height are both zero.
-    @group CGRect
-    @param aRect the CGRect to test
-    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
-*/
-CPRectIsEmpty = CGRectIsEmpty;
-
-/*!
-    Returns a \c BOOL indicating whether CGRect \c possibleOuter
-    contains CGRect \c possibleInner.
-    @group CGRect
-    @param possibleOuter the CGRect to test if \c possibleInner is inside of
-    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
-    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
-*/
-CPRectContainsRect = CGRectContainsRect;
-
-/*!
-    Returns the intersection of the two provided rectangles as a new rectangle
-    @group CGRect
-    @param lhsRect the first rectangle used for calculation
-    @param rhsRect the second rectangle used for calculation
-    @return CGRect the intersection of the two rectangles
-*/
-CPRectIntersection = CGRectIntersection;
+    return { x: aPoint.x, y: aPoint.y };
+}
 
 /*!
   Makes a CGPoint object out of two numbers provided as arguments
@@ -129,8 +55,11 @@ CPRectIntersection = CGRectIntersection;
   @param x the x-coordinate of the CGPoint
   @param y the y-coordinate of the CGPoint
   @return CGPoint a CGPoint with an X and Y coordinate equal to the function arguments
-*/
-CPPointMake = CGPointMake;
+  */
+function CPPointMake(x, y)
+{
+    return { x: x, y: y };
+}
 
 /*!
     Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
@@ -139,7 +68,11 @@ CPPointMake = CGPointMake;
     @group CGRect
     @return CGRect a rectangle like \c aRect with an inset
 */
-CPRectInset = CGRectInset;
+function CPRectInset(aRect, dX, dY)
+{
+    return CPRectMake(  aRect.origin.x + dX, aRect.origin.y + dY,
+                        aRect.size.width - 2 * dX, aRect.size.height - 2 * dY);
+}
 
 /*!
     @group CGRect
@@ -147,7 +80,31 @@ CPRectInset = CGRectInset;
     @return void
     @deprecated
 */
-CPRectIntegral = CGRectIntegral;
+function CPRectIntegral(aRect)
+{
+    // FIXME!!!
+    alert("CPRectIntegral unimplemented");
+}
+
+/*!
+    Returns the intersection of the two provided rectangles as a new rectangle
+    @group CGRect
+    @param lhsRect the first rectangle used for calculation
+    @param rhsRect the second rectangle used for calculation
+    @return CGRect the intersection of the two rectangles
+*/
+function CPRectIntersection(lhsRect, rhsRect)
+{
+    var intersection = CPRectMake(
+        Math.max(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
+        Math.max(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
+        0, 0);
+
+    intersection.size.width = Math.min(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)) - CPRectGetMinX(intersection);
+    intersection.size.height = Math.min(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect)) - CPRectGetMinY(intersection);
+
+    return CPRectIsEmpty(intersection) ? CPRectMakeZero() : intersection;
+}
 
 /*!
     Creates a copy of the provided rectangle
@@ -155,7 +112,10 @@ CPRectIntegral = CGRectIntegral;
     @param aRect the CGRect that will be copied
     @return CGRect the rectangle copy
 */
-CPRectCreateCopy = CGRectCreateCopy;
+function CPRectCreateCopy(aRect)
+{
+    return { origin: CPPointCreateCopy(aRect.origin), size: CPSizeCreateCopy(aRect.size) };
+}
 
 /*!
     Returns a CGRect made of the specified arguments
@@ -166,7 +126,10 @@ CPRectCreateCopy = CGRectCreateCopy;
     @param height the height of the new rectangle
     @return CGRect the new rectangle
 */
-CPRectMake = CGRectMake;
+function CPRectMake(x, y, width, height)
+{
+    return { origin: CPPointMake(x, y), size: CPSizeMake(width, height) };
+}
 
 /*!
     Creates a new rectangle with its origin offset by \c dX and \c dY.
@@ -176,14 +139,36 @@ CPRectMake = CGRectMake;
     @param dY the amount added to the y-size of the new rectangle
     @return CGRect the new rectangle with modified size
 */
-CPRectOffset = CGRectOffset;
+function CPRectOffset(aRect, dX, dY)
+{
+    return CPRectMake(aRect.origin.x + dX, aRect.origin.y + dY, aRect.size.width, aRect.size.height);
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return CGRect
 */
-CPRectStandardize = CGRectStandardize;
+function CPRectStandardize(aRect)
+{
+    var width = CPRectGetWidth(aRect),
+        height = CPRectGetHeight(aRect),
+        standardized = CPRectCreateCopy(aRect);
+
+    if (width < 0.0)
+    {
+        standardized.origin.x += width;
+        standardized.size.width = -width;
+    }
+
+    if (height < 0.0)
+    {
+        standardized.origin.y += height;
+        standardized.size.height = -height;
+    }
+
+    return standardized;
+}
 
 /*!
     Returns the smallest rectangle that can contain the two argument \c CGRects.
@@ -192,7 +177,15 @@ CPRectStandardize = CGRectStandardize;
     @param rhsRect the second CGRect to use for the union calculation
     @return CGRect the union rectangle
 */
-CPRectUnion = CGRectUnion;
+function CPRectUnion(lhsRect, rhsRect)
+{
+    var minX = Math.min(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
+        minY = Math.min(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
+        maxX = Math.max(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)),
+        maxY = Math.max(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect));
+
+    return CPRectMake(minX, minY, maxX - minX, maxY - minY);
+}
 
 /*!
     Creates and returns a copy of the provided CGSize
@@ -200,7 +193,10 @@ CPRectUnion = CGRectUnion;
     @param aSize the CGSize to copy
     @return CGSize the copy of the CGSize
 */
-CPSizeCreateCopy = CGSizeCreateCopy;
+function CPSizeCreateCopy(aSize)
+{
+    return { width: aSize.width, height: aSize.height };
+}
 
 /*!
     Creates and returns a new CGSize object from the provided dimensions.
@@ -209,7 +205,10 @@ CPSizeCreateCopy = CGSizeCreateCopy;
     @param height the height for the new CGSize
     @return CGSize the new CGSize
 */
-CPSizeMake = CGSizeMake;
+function CPSizeMake(width, height)
+{
+    return { width: width, height: height };
+}
 
 /*!
     Returns \c YES if the CGRect, \c aRect, contains
@@ -219,63 +218,132 @@ CPSizeMake = CGSizeMake;
     @group CGRect
     @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
 */
-CPRectContainsPoint = CGRectContainsPoint;
+function CPRectContainsPoint(aRect, aPoint)
+{
+    return  aPoint.x >= CPRectGetMinX(aRect) &&
+            aPoint.y >= CPRectGetMinY(aRect) &&
+            aPoint.x < CPRectGetMaxX(aRect) &&
+            aPoint.y < CPRectGetMaxY(aRect);
+}
+
+/*!
+    Returns a \c BOOL indicating whether CGRect \c possibleOuter
+    contains CGRect \c possibleInner.
+    @group CGRect
+    @param possibleOuter the CGRect to test if \c possibleInner is inside of
+    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
+    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
+*/
+function CPRectContainsRect(possibleOuter, possibleInner)
+{
+    return CGRectContainsRect(possibleOuter, possibleInner);
+}
+
+/*!
+    Tests whether the two CGPoints are equal to each other by comparing their
+    \c x and \c y members.
+    @group @CGPoint
+    @param lhsPoint the first CGPoint to check
+    @param rhsPoint the second CGPoint to check
+    @return BOOL \c YES if the two points have the same x's, and the same y's.
+*/
+function CPPointEqualToPoint(lhsPoint, rhsPoint)
+{
+    return lhsPoint.x == rhsPoint.x && lhsPoint.y == rhsPoint.y;
+}
+
+/*!
+    Test whether the two CGRects have the same origin and size
+    @group CGRect
+    @param lhsRect the first CGRect to compare
+    @param rhsRect the second CGRect to compare
+    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
+*/
+function CPRectEqualToRect(lhsRect, rhsRect)
+{
+    return  CPPointEqualToPoint(lhsRect.origin, rhsRect.origin) &&
+            CPSizeEqualToSize(lhsRect.size, rhsRect.size);
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetHeight = CGRectGetHeight;
+function CPRectGetHeight(aRect)
+{
+    return aRect.size.height;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMaxX = CGRectGetMaxX;
+function CPRectGetMaxX(aRect)
+{
+    return aRect.origin.x + aRect.size.width;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMaxY = CGRectGetMaxY;
+function CPRectGetMaxY(aRect)
+{
+    return aRect.origin.y + aRect.size.height;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return float
 */
-CPRectGetMidX = CGRectGetMidX;
+function CPRectGetMidX(aRect)
+{
+    return aRect.origin.x + (aRect.size.width) / 2.0;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return float
 */
-CPRectGetMidY = CGRectGetMidY;
+function CPRectGetMidY(aRect)
+{
+    return aRect.origin.y + (aRect.size.height) / 2.0;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMinX = CGRectGetMinX;
+function CPRectGetMinX(aRect)
+{
+    return aRect.origin.x;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetMinY = CGRectGetMinY;
+function CPRectGetMinY(aRect)
+{
+    return aRect.origin.y;
+}
 
 /*!
     @group CGRect
     @param aRect a CGRect
     @return int
 */
-CPRectGetWidth = CGRectGetWidth;
+function CPRectGetWidth(aRect)
+{
+    return aRect.size.width;
+}
 
 /*!
     Returns \c YES if the two rectangles intersect
@@ -284,7 +352,22 @@ CPRectGetWidth = CGRectGetWidth;
     @param rhsRect the second CGRect
     @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
 */
-CPRectIntersectsRect = CGRectIntersectsRect;
+function CPRectIntersectsRect(lhsRect, rhsRect)
+{
+    return !CPRectIsEmpty(CPRectIntersection(lhsRect, rhsRect));
+}
+
+/*!
+    Returns \c YES if the CGRect has no area.
+    The test is performed by checking if the width and height are both zero.
+    @group CGRect
+    @param aRect the CGRect to test
+    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+*/
+function CPRectIsEmpty(aRect)
+{
+    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
+}
 
 /*!
     Returns \c YES if the CGRect has no area.
@@ -292,7 +375,10 @@ CPRectIntersectsRect = CGRectIntersectsRect;
     @group CGRect
     @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
 */
-CPRectIsNull = CGRectIsNull;
+function CPRectIsNull(aRect)
+{
+    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
+}
 
 /*!
     Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
@@ -303,7 +389,10 @@ CPRectIsNull = CGRectIsNull;
 
     @group CGRect
 */
-CPDivideRect = CGRectDivide;
+function CPDivideRect(inRect, slice, rem, amount, edge)
+{
+    CGRectDivide(inRect, slice, rem, amount, edge);
+}
 
 /*!
     Returns \c YES if the two CGSizes are identical.
@@ -312,7 +401,10 @@ CPDivideRect = CGRectDivide;
     @param rhsSize the second CGSize to compare
     @return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
 */
-CPSizeEqualToSize = CGSizeEqualToSize;
+function CPSizeEqualToSize(lhsSize, rhsSize)
+{
+    return lhsSize.width == rhsSize.width && lhsSize.height == rhsSize.height;
+}
 
 /*!
     Returns a human readable string of the provided CGPoint.
@@ -320,7 +412,10 @@ CPSizeEqualToSize = CGSizeEqualToSize;
     @param aPoint the point to represent
     @return CGPoint a string representation of the CGPoint
 */
-CPStringFromPoint = CGStringFromPoint;
+function CPStringFromPoint(aPoint)
+{
+    return "{" + aPoint.x + ", " + aPoint.y + "}";
+}
 
 /*!
     Returns a human readable string of the provided CGSize.
@@ -328,7 +423,10 @@ CPStringFromPoint = CGStringFromPoint;
     @param aSize the size to represent
     @return CGSize a string representation of the CGSize
 */
-CPStringFromSize = CGStringFromSize;
+function CPStringFromSize(aSize)
+{
+    return "{" + aSize.width + ", " + aSize.height + "}";
+}
 
 /*!
     Returns a human readable string of the provided CGRect.
@@ -336,7 +434,10 @@ CPStringFromSize = CGStringFromSize;
     @param aRect the rectangle to represent
     @return CGString the string representation of the rectangle
 */
-CPStringFromRect = CGStringFromRect;
+function CPStringFromRect(aRect)
+{
+    return "{" + CPStringFromPoint(aRect.origin) + ", " + CPStringFromSize(aRect.size) + "}";
+}
 
 /*!
     Returns a CGPoint from a string with a comma separated pair of integers.
@@ -344,7 +445,12 @@ CPStringFromRect = CGStringFromRect;
     @param aString a string containing two comma separated integers
     @return CGPoint the point object created from the string
 */
-CPPointFromString = CGPointFromString;
+function CPPointFromString(aString)
+{
+    var comma = aString.indexOf(',');
+
+    return { x:parseFloat(aString.substr(1, comma - 1), 10), y:parseFloat(aString.substring(comma + 1, aString.length), 10) };
+}
 
 /*!
     Returns a CGSize from a string containing a pair of comma separated integers.
@@ -352,7 +458,12 @@ CPPointFromString = CGPointFromString;
     @param aString a string containing two comma separated integers
     @return CGSize the size object created from the string
 */
-CPSizeFromString = CGSizeFromString;
+function CPSizeFromString(aString)
+{
+    var comma = aString.indexOf(',');
+
+    return { width:parseFloat(aString.substr(1, comma - 1), 10), height:parseFloat(aString.substring(comma + 1, aString.length), 10) };
+}
 
 /*!
     Returns a CGRect created from a string.
@@ -360,32 +471,53 @@ CPSizeFromString = CGSizeFromString;
     @param aString a string in the form generated by \c CPStringFromRect
     @return CGRect the rectangle created from the string
 */
-CPRectFromString = CGRectFromString;
+function CPRectFromString(aString)
+{
+    var comma = aString.indexOf(',', aString.indexOf(',') + 1);
+
+    return { origin:CPPointFromString(aString.substr(1, comma - 1)), size:CPSizeFromString(aString.substring(comma + 2, aString.length)) };
+}
 
 /*!
     @group CGPoint
     @param anEvent
     @return CGPoint
 */
-CPPointFromEvent = CGPointFromEvent;
+function CPPointFromEvent(anEvent)
+{
+    return CPPointMake(anEvent.clientX, anEvent.clientY, 0);
+}
 
 /*!
     Returns a zero sized CGSize.
     @group CGSize
     @return CGSize a size object with zeros for \c width and \c height
 */
-CPSizeMakeZero = CGSizeMakeZero;
+function CPSizeMakeZero()
+{
+    return CPSizeMake(0, 0);
+}
 
 /*!
     Returns a rectangle at origin \c (0,0) and size of \c (0,0).
     @group CGRect
     @return CGRect a zeroed out CGRect
 */
-CPRectMakeZero = CGRectMakeZero;
+function CPRectMakeZero()
+{
+    return CPRectMake(0, 0, 0, 0);
+}
 
 /*!
     Returns a point located at \c (0, 0).
     @group CGPoint
     @return CGPoint a point located at \c (0, 0)
 */
-CPPointMakeZero = CGPointMakeZero;
+function CPPointMakeZero()
+{
+    return CPPointMake(0, 0, 0);
+}
+
+/*!
+    @}
+*/

AppKit/CPGradient.j

@@ -1,168 +0,0 @@
-/*
- * 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 "CPBezierPath.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)initWithStartingColor:(CPColor)startingColor endingColor:(CPColor)endingColor
-{
-    return [self initWithColors:[startingColor, endingColor]];
-}
-
-- (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);
-
-    [self _drawInRect:rect atAngle:angle];
-
-    CGContextRestoreGState(ctx);
-}
-
-/*!
-    @ignore like draw in rect but apply no clipping.
-*/
-- (void)_drawInRect:(CGRect)rect atAngle:(float)angle
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort],
-
-        startPoint,
-        endPoint;
-
-    // Modulo of negative values doesn't work as expected in JS.
-    angle = ((angle % 360.0) + 360.0) % 360.0;
-
-    if (angle < 90.0)
-        startPoint = _CGPointMake(_CGRectGetMinX(rect), _CGRectGetMinY(rect));
-    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];
-}
-
-- (void)drawInBezierPath:(CPBezierPath)aPath angle:(float)anAngle
-{
-    [CPGraphicsContext saveGraphicsState];
-
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    // Nail down the path which CGContextDrawLinearGradient will cause to be filled.
-    // Note we don't do this by clipping to the path and then calling drawInRect:atAngle:
-    // as this would cut off any antialias of the drawing, plus any active context shadow.
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, aPath._path);
-    CGContextSetLineWidth(ctx, [aPath lineWidth]);
-    CGContextClosePath(ctx);
-
-    [self _drawInRect:[aPath bounds] atAngle:anAngle];
-
-    [CPGraphicsContext restoreGraphicsState];
-}
-
-- (void)drawFromPoint:(NSPoint)startingPoint toPoint:(NSPoint)endingPoint options:(NSGradientDrawingOptions)options
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    // TODO kCGGradientDrawsBeforeStartLocation and kCGGradientDrawsAfterEndLocation are not actually supported
-    // by CGContextDrawLinearGradient yet.
-    CGContextDrawLinearGradient(ctx, _gradient, startingPoint, endingPoint, options);
-}
-
-@end

AppKit/CPGraphics.j

@@ -23,16 +23,6 @@
 @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,
@@ -80,10 +70,7 @@ function CPDrawColorTiledRects(
         if (_CGRectIsEmpty(slice))
             continue;
 
-        var minX,
-            maxX,
-            minY,
-            maxY;
+        var minX, maxX, minY, maxY;
 
         if (side == CPMinXEdge || side == CPMaxXEdge)
         {
@@ -118,4 +105,4 @@ function CPDrawColorTiledRects(
     CGContextRestoreGState(context);
 
     return resultRect;
-}
+}

AppKit/CPGraphicsContext.j

@@ -25,8 +25,7 @@
 @import "CGContext.j"
 
 
-var CPGraphicsContextCurrent = nil,
-    CPGraphicsContextThreadStack = nil;
+var CPGraphicsContextCurrent = nil;
 
 /*!
     @ingroup appkit
@@ -53,29 +52,6 @@ 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
@@ -110,27 +86,4 @@ 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

AppKit/CPImage.j

@@ -25,10 +25,9 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPData.j>
 
-@import "CGGeometry.j"
-@import "CPCompatibility.j"
+@import "CPGeometry.j"
+
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -45,50 +44,20 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
 
 var imagesForNames = { },
-    AppKitImageForNames = { },
-    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
+    AppKitImageForNames = { };
 
-AppKitImageForNames[CPImageNameColorPanel]              = _CGSizeMake(26.0, 29.0);
-AppKitImageForNames[CPImageNameColorPanelHighlighted]   = _CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
 
-/*!
-    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()
+function CPImageInBundle(aFilename, aSize, aBundle)
 {
-    var filename = arguments[0],
-        size = nil,
-        bundle = nil;
+    if (!aBundle)
+        aBundle = [CPBundle mainBundle];
 
-    if (typeof(arguments[1]) === "number")
-    {
-        if (arguments[1] !== nil && arguments[1] !== undefined)
-            size = _CGSizeMake(arguments[1], arguments[2]);
+    if (aSize)
+        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
 
-        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]];
+    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
 }
 
 function CPAppKitImage(aFilename, aSize)
@@ -131,7 +100,7 @@ function CPAppKitImage(aFilename, aSize)
 
 - (id)init
 {
-    return [self initByReferencingFile:@"" size:_CGSizeMake(-1, -1)];
+    return [self initByReferencingFile:@"" size:CGSizeMake(-1, -1)];
 }
 
 /*!
@@ -148,7 +117,7 @@ function CPAppKitImage(aFilename, aSize)
 
     if (self)
     {
-        _size = _CGSizeMakeCopy(aSize);
+        _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
@@ -180,7 +149,7 @@ function CPAppKitImage(aFilename, aSize)
 */
 - (id)initWithContentsOfFile:(CPString)aFilename
 {
-    self = [self initByReferencingFile:aFilename size:_CGSizeMake(-1, -1)];
+    self = [self initByReferencingFile:aFilename size:CGSizeMake(-1, -1)];
 
     if (self)
         [self load];
@@ -188,20 +157,6 @@ 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.
 */
@@ -210,44 +165,13 @@ 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
 */
 - (void)setSize:(CGSize)aSize
 {
-    _size = _CGSizeMakeCopy(aSize);
+    _size = CGSizeMakeCopy(aSize);
 }
 
 /*!
@@ -302,14 +226,6 @@ function CPAppKitImage(aFilename, aSize)
     return _name;
 }
 
-/*!
-    Returns the underlying Image element for a single image.
-*/
-- (Image)image
-{
-    return _image;
-}
-
 /*!
     Sets the receiver's delegate.
     @param the delegate
@@ -364,7 +280,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onerror = function ()
         {
@@ -376,7 +292,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onabort = function ()
         {
@@ -388,7 +304,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.src = _filename;
 
@@ -398,11 +314,6 @@ function CPAppKitImage(aFilename, aSize)
 #endif
 }
 
-- (BOOL)isSingleImage
-{
-    return YES;
-}
-
 - (BOOL)isThreePartImage
 {
     return NO;
@@ -413,24 +324,6 @@ 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
 {
@@ -446,7 +339,7 @@ function CPAppKitImage(aFilename, aSize)
 
     // FIXME: IE is wrong on image sizes????
     if (!_size || (_size.width == -1 && _size.height == -1))
-        _size = _CGSizeMake(_image.width, _image.height);
+        _size = CGSizeMake(_image.width, _image.height);
 
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPImageDidLoadNotification
@@ -534,11 +427,6 @@ function CPAppKitImage(aFilename, aSize)
     return _isVertical;
 }
 
-- (BOOL)isSingleImage
-{
-    return NO;
-}
-
 - (BOOL)isThreePartImage
 {
     return YES;
@@ -603,11 +491,6 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
     return _imageSlices;
 }
 
-- (BOOL)isSingleImage
-{
-    return NO;
-}
-
 - (BOOL)isThreePartImage
 {
     return NO;

AppKit/CPImageView.j

@@ -26,8 +26,10 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
-@global CPImagesPboardType
-@global appkit_tag_dom_elements
+
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
 
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
@@ -39,7 +41,15 @@ CPImageAlignBottomLeft  = 6;
 CPImageAlignBottomRight = 7;
 CPImageAlignRight       = 8;
 
-var CPImageViewEmptyPlaceholderImage = nil;
+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;
 
 /*!
     @ingroup appkit
@@ -62,24 +72,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 + (void)initialize
 {
-    if (self !== [CPImageView class])
-        return;
-
     var bundle = [CPBundle bundleForClass:[CPView class]];
 
     CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding || aBinding === CPValueURLBinding || aBinding === CPValuePathBinding || aBinding === CPDataBinding)
-        return [CPImageViewValueBinder class];
-    else if ([aBinding hasPrefix:CPEditableBinding])
-        return [CPMultipleValueAndBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -243,7 +240,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     [super setImageScaling:anImageScaling];
 
 #if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
     {
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
     }
@@ -300,19 +297,19 @@ var CPImageViewEmptyPlaceholderImage = nil;
         imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
         x = 0.0,
         y = 0.0,
-        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
-        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
+        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
+        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
         boundsWidth = _CGRectGetWidth(bounds),
         boundsHeight = _CGRectGetHeight(bounds),
         width = boundsWidth - insetWidth,
         height = boundsHeight - insetHeight;
 
-    if (imageScaling === CPImageScaleAxesIndependently)
+    if (imageScaling === CPScaleToFit)
     {
-        #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
     {
@@ -321,19 +318,17 @@ var CPImageViewEmptyPlaceholderImage = nil;
         if (size.width == -1 && size.height == -1)
             return;
 
-        switch (imageScaling)
+        if (imageScaling === CPScaleProportionally)
         {
-            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:
+            // 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
+            {
                 var imageRatio = size.width / size.height,
                     viewRatio = width / height;
 
@@ -341,19 +336,26 @@ var CPImageViewEmptyPlaceholderImage = nil;
                     width = height * imageRatio;
                 else
                     height = width / imageRatio;
-                break;
+            }
 
-            case CPImageScaleAxesIndependently:
-            case CPImageScaleNone:
-                width = size.width;
-                height = size.height;
-                break;
-        }
-
-        #if PLATFORM(DOM)
+#if PLATFORM(DOM)
             _DOMImageElement.width = ROUND(width);
             _DOMImageElement.height = ROUND(height);
-        #endif
+#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
+        }
 
         var x,
             y;
@@ -404,7 +406,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
     _imageRect = _CGRectMake(x, y, width, height);
 
     if (_hasShadow)
-        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -455,53 +457,6 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 @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 (aValue == nil)
-        image = nil;
-    else if (aBinding === CPDataBinding)
-        image = [[CPImage alloc] initWithData:aValue];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        image = [CPImage cachedImageWithContentsOfFile:aValue];
-    else if (aBinding === CPValueBinding)
-        image = aValue;
-
-    [_source setImage:image];
-}
-
-- (void)valueForBinding:(CPString)aBinding
-{
-    var image = [_source image];
-
-    if (aBinding === CPDataBinding)
-        return [image data];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        return [image filename];
-    else if (aBinding === CPValueBinding)
-        return image;
-}
-
-@end
-
 var CPImageViewImageKey          = @"CPImageViewImageKey",
     CPImageViewImageScalingKey   = @"CPImageViewImageScalingKey",
     CPImageViewImageAlignmentKey = @"CPImageViewImageAlignmentKey",
@@ -528,9 +483,6 @@ 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];
@@ -544,7 +496,7 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
         [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
 
-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
             [self setEditable:YES];
 
         [self setNeedsLayout];
@@ -584,21 +536,3 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 }
 
 @end
-
-@implementation CPImage (CahedImage)
-
-+ (CPImage)cachedImageWithContentsOfFile:(CPString)aFile
-{
-    var cached_name = [CPString stringWithFormat:@"%@_%d", [self class], [aFile hash]],
-        image = [CPImage imageNamed:cached_name];
-
-    if (!image)
-    {
-        image = [[CPImage alloc] initWithContentsOfFile:aFile];
-        [image setName:cached_name];
-    }
-
-    return image;
-}
-
-@end

AppKit/CPKeyBinding.j

@@ -21,15 +21,13 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPArray.j>
 
-@import "CPEvent_Constants.j"
-@import "CPText.j"
+@import "CPEvent.j"
+
 
 CPStandardKeyBindings = {
     @"@.": @"cancelOperation:",
 
-    @"@a": @"selectAll:",
     @"^a": @"moveToBeginningOfParagraph:",
     @"^$a": @"moveToBeginningOfParagraphAndModifySelection:",
     @"^b": @"moveBackward:",
@@ -154,7 +152,7 @@ var CPKeyBindingCache = {};
 
 + (void)initialize
 {
-    if (self !== [CPKeyBinding class])
+    if ([self class] !== CPKeyBinding)
         return;
 
     [self createKeyBindingsFromJSObject:CPStandardKeyBindings];

AppKit/CPKeyValueBinding.j

@@ -26,14 +26,11 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
 @import <Foundation/CPDictionary.j>
-@import <Foundation/CPInvocation.j>
 @import <Foundation/CPValueTransformer.j>
-@import <Foundation/CPKeyValueObserving.j>
 
-@class CPButton
 
-var exposedBindingsMap = @{},
-    bindingsMap = @{};
+var exposedBindingsMap = [CPDictionary new],
+    bindingsMap = [CPDictionary new];
 
 var CPBindingOperationAnd = 0,
     CPBindingOperationOr  = 1;
@@ -41,10 +38,9 @@ var CPBindingOperationAnd = 0,
 @implementation CPBinder : CPObject
 {
     CPDictionary    _info;
-    id              _source @accessors(getter=source);
+    id              _source;
 
     JSObject        _suppressedNotifications;
-    JSObject        _placeholderForMarker;
 }
 
 + (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
@@ -97,9 +93,9 @@ var CPBindingOperationAnd = 0,
     if (!theBinding)
         return;
 
-    var info = theBinding._info,
-        observedObject = [info objectForKey:CPObservedObjectKey],
-        keyPath = [info objectForKey:CPObservedKeyPathKey];
+    var infoDictionary = theBinding._info,
+        observedObject = [infoDictionary objectForKey:CPObservedObjectKey],
+        keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey];
 
     [observedObject removeObserver:theBinding forKeyPath:keyPath];
     [bindings removeObjectForKey:aBinding];
@@ -108,7 +104,6 @@ var CPBindingOperationAnd = 0,
 + (void)unbindAllForObject:(id)anObject
 {
     var bindings = [bindingsMap objectForKey:[anObject UID]];
-
     if (!bindings)
         return;
 
@@ -123,32 +118,23 @@ var CPBindingOperationAnd = 0,
 
 - (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
 {
-    // We use [self init] here because subclasses override init. We can't override this method
-    // because their initialization has to occur before this method in this class is executed.
-    self = [self init];
+    self = [super init];
 
     if (self)
     {
         _source = aSource;
-        _info = @{
-                CPObservedObjectKey: aDestination,
-                CPObservedKeyPathKey: aKeyPath,
-            };
+        _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]];
-
         if (!bindings)
         {
-            bindings = @{};
+            bindings = [CPDictionary new];
             [bindingsMap setObject:bindings forKey:[_source UID]];
         }
 
@@ -159,44 +145,15 @@ var CPBindingOperationAnd = 0,
     return self;
 }
 
-- (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
-{
-    if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-    {
-       [CPException raise:CPGenericException
-                   reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + aValue];
-    }
-}
-
-- (void)setValueFor:(CPString)theBinding
+- (void)setValueFor:(CPString)aBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
         newValue = [destination valueForKeyPath:keyPath];
 
-    if (CPIsControllerMarker(newValue))
-    {
-        [self raiseIfNotApplicable:newValue forKeyPath:keyPath options:options];
-
-        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];
+    newValue = [self transformValue:newValue withOptions:options];
+    [_source setValue:newValue forKey:aBinding];
 }
 
 - (void)reverseSetValueFor:(CPString)aBinding
@@ -204,18 +161,10 @@ var CPBindingOperationAnd = 0,
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        newValue = [self valueForBinding:aBinding];
+        newValue = [_source valueForKeyPath: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
@@ -224,7 +173,6 @@ var CPBindingOperationAnd = 0,
         return;
 
     var objectSuppressions = _suppressedNotifications[[anObject UID]];
-
     if (objectSuppressions && objectSuppressions[aKeyPath])
         return;
 
@@ -243,7 +191,6 @@ var CPBindingOperationAnd = 0,
         if (!valueTransformer)
         {
             var valueTransformerClass = CPClassFromString(valueTransformerName);
-
             if (valueTransformerClass)
             {
                 valueTransformer = [[valueTransformerClass alloc] init];
@@ -257,13 +204,14 @@ 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;
@@ -301,7 +249,6 @@ var CPBindingOperationAnd = 0,
 
     var uid = [anObject UID],
         objectSuppressions = _suppressedNotifications[uid];
-
     if (!objectSuppressions)
         _suppressedNotifications[uid] = objectSuppressions = {};
 
@@ -318,57 +265,12 @@ var CPBindingOperationAnd = 0,
 
     var uid = [anObject UID],
         objectSuppressions = _suppressedNotifications[uid];
-
     if (!objectSuppressions)
         return;
 
     delete objectSuppressions[aKeyPath];
 }
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var count = [CPBinderPlaceholderMarkers count];
-
-    while (count--)
-    {
-        var marker = CPBinderPlaceholderMarkers[count],
-            optionName = CPBinderPlaceholderOptions[count],
-            isExplicit = [options containsKey:optionName],
-            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
-
-        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
-    }
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    [self _updatePlaceholdersWithOptions:options];
-}
-
-- (JSObject)_placeholderForMarker:(id)aMarker
-{
-    var placeholder = _placeholderForMarker[[aMarker UID]];
-
-    if (placeholder)
-        return placeholder.value;
-
-    return nil;
-}
-
-- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
-{
-    if (isDefault)
-    {
-        var existingPlaceholder = _placeholderForMarker[[aMarker UID]];
-
-        // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder.isDefault)
-            return;
-    }
-
-    _placeholderForMarker[[aMarker UID]] = { 'isDefault': isDefault, 'value': aPlaceholder };
-}
-
 @end
 
 @implementation CPObject (KeyValueBindingCreation)
@@ -378,7 +280,7 @@ var CPBindingOperationAnd = 0,
     [CPBinder exposeBinding:aBinding forClass:[self class]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
++ (Class)_binderClassForBinding:(CPString)theBinding
 {
     return [CPBinder class];
 }
@@ -409,10 +311,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];
 
@@ -431,7 +333,7 @@ var CPBindingOperationAnd = 0,
     [binderClass unbind:aBinding forObject:self];
 }
 
-- (CPString)_replacementKeyPathForBinding:(CPString)binding
+- (id)_replacementKeyPathForBinding:(CPString)binding
 {
     return binding;
 }
@@ -440,13 +342,13 @@ var CPBindingOperationAnd = 0,
 
 /*!
     @ignore
-    Provides stub implementations that simply calls super for the "objectValue" binding.
-    This class should not be necessary but assures backwards compliance with our old way of doing bindings.
-
-    IMPORTANT!
-    Every class with a value binding should implement a subclass to handle its specific value binding logic.
+    Provides stub implementations that simply call super for the "objectValue" binding
+    This class should not be necessary but assures backwards compliance with our old way of doing bindings
+    Every class with a value binding should implement a subclass to handle it's specific value binding logic
 */
 @implementation _CPValueBinder : CPBinder
+{
+}
 
 - (void)setValueFor:(CPString)theBinding
 {
@@ -460,9 +362,8 @@ var CPBindingOperationAnd = 0,
 
 @end
 
-@implementation _CPMultipleValueBooleanBinding : CPBinder
+@implementation _CPKeyValueOrBinding : CPBinder
 {
-    CPBindingOperationKind _operation;
 }
 
 - (void)setValueFor:(CPString)aBinding
@@ -472,14 +373,7 @@ var CPBindingOperationAnd = 0,
     if (!bindings)
         return;
 
-    var baseBinding = aBinding.replace(/\d$/, "");
-
-    [_source setValue:[self resolveMultipleValuesForBinding:baseBinding bindings:bindings booleanOperation:_operation] forKey:baseBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // read-only
+    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationOr) forKey:aBinding];
 }
 
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -487,146 +381,61 @@ var CPBindingOperationAnd = 0,
     [self setValueFor:context];
 }
 
-- (BOOL)resolveMultipleValuesForBinding:(CPString)aBinding bindings:(CPDictionary)bindings booleanOperation:(CPBindingOperationKind)operation
+@end
+
+@implementation _CPKeyValueAndBinding : CPBinder
 {
-    var bindingName = aBinding,
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var bindings = [bindingsMap objectForKey:[_source UID]];
+
+    if (!bindings)
+        return;
+
+    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationAnd) forKey:aBinding];
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObejct change:(CPDictionary)changes context:(id)context
+{
+    [self setValueFor:context];
+}
+
+@end
+
+var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
+{
+    var bindingName = key,
         theBinding,
-        count = 2;
+        count = 1;
 
     while (theBinding = [bindings objectForKey:bindingName])
     {
-        var info    = theBinding._info,
-            object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            options = [info objectForKey:CPOptionsKey],
-            value   = [object valueForKeyPath:keyPath];
+        var infoDictionary = theBinding._info,
+            object  = [infoDictionary objectForKey:CPObservedObjectKey],
+            keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey],
+            options = [infoDictionary objectForKey:CPOptionsKey];
 
-        if (CPIsControllerMarker(value))
-        {
-            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
-            value = [theBinding _placeholderForMarker:value];
-        }
-        else
-            value = [theBinding transformValue:value withOptions:options];
+        var value = [theBinding transformValue:[object valueForKeyPath:keyPath] withOptions:options];
 
-        if (operation === CPBindingOperationOr)
-        {
-            // Any true condition means true for OR
-            if (value)
-                return YES;
-        }
+        if (value == operation)
+            return operation;
 
-        // Any false condition means false for AND
-        else if (!value)
-            return NO;
-
-        bindingName = aBinding + (count++);
+        bindingName = [CPString stringWithFormat:@"%@%i", key, ++count];
     }
 
-    // If we get here, all OR conditions were false or all AND conditions were true
-    return operation === CPBindingOperationOr ? NO : YES;
+    return !operation;
 }
 
-@end
-
-@implementation CPMultipleValueAndBinding : _CPMultipleValueBooleanBinding
-
-- (id)init
+var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
-    if (self = [super init])
-        _operation = CPBindingOperationAnd;
+    var theBinding = [bindings objectForKey:targetKey],
+        infoDictionary = theBinding._info,
 
-    return self;
-}
-
-@end
-
-@implementation CPMultipleValueOrBinding : _CPMultipleValueBooleanBinding
-
-- (id)init
-{
-    if (self = [super init])
-        _operation = CPBindingOperationOr;
-
-    return self;
-}
-
-@end
-
-@implementation _CPMultipleValueActionBinding : CPBinder
-{
-    CPString _argumentBinding;
-    CPString _targetBinding;
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    // Called when the binding is first created
-    [self checkForNullBinding:theBinding initializing:YES];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // no-op
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    // context is the binding name
-    [self checkForNullBinding:context initializing:NO];
-}
-
-/*!
-    @ignore
-
-    When the value of a multiple-value argument binding changes,
-    if the binding is marked not to allow null arguments, we have to check
-    if the binding's value is nil and disable the button if it is.
-    Otherwise the button is enabled.
-*/
-- (void)checkForNullBinding:(CPString)theBinding initializing:(BOOL)isInitializing
-{
-    // Only done for buttons
-    if (![_source isKindOfClass:CPButton])
-        return;
-
-    // We start with the button enabled for the first argument during init,
-    // and subsequent checks can disable it.
-    if (isInitializing && theBinding === CPArgumentBinding)
-        [_source setEnabled:YES];
-
-    var bindings = [bindingsMap valueForKey:[_source UID]],
-        binding  = [bindings objectForKey:theBinding],
-        info     = binding._info,
-        options  = [info objectForKey:CPOptionsKey];
-
-    if (![options valueForKey:CPAllowsNullArgumentBindingOption])
-    {
-        var object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (value === nil || value === undefined)
-        {
-            [_source setEnabled:NO];
-            return;
-        }
-    }
-
-    // If a binding value changed and did not fail the null test, enable the button
-    if (!isInitializing)
-        [_source setEnabled:YES];
-}
-
-- (void)invokeAction
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]],
-        theBinding = [bindings objectForKey:CPTargetBinding],
-
-        info     = theBinding._info,
-        object   = [info objectForKey:CPObservedObjectKey],
-        keyPath  = [info objectForKey:CPObservedKeyPathKey],
-        options  = [info objectForKey:CPOptionsKey],
+        object   = [infoDictionary objectForKey:CPObservedObjectKey],
+        keyPath  = [infoDictionary objectForKey:CPObservedKeyPathKey],
+        options  = [infoDictionary objectForKey:CPOptionsKey],
 
         target   = [object valueForKeyPath:keyPath],
         selector = [options objectForKey:CPSelectorNameBindingOption];
@@ -634,195 +443,28 @@ var CPBindingOperationAnd = 0,
     if (!target || !selector)
         return;
 
-    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]],
-        bindingName = CPArgumentBinding,
+    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]];
+    [invocation setSelector:selector];
+
+    var bindingName = argumentKey,
         count = 1;
 
     while (theBinding = [bindings objectForKey:bindingName])
     {
-        info   = theBinding._info;
-        object = [info objectForKey:CPObservedObjectKey];
-        keyPath  = [info objectForKey:CPObservedKeyPathKey];
+        infoDictionary = theBinding._info;
 
-        [invocation setArgument:[object valueForKeyPath:keyPath] atIndex:++count];
+        keyPath = [infoDictionary objectForKey:CPObserverKeyPathKey];
+        object  = [[infoDictionary objectForKey:CPObservedObjectKey] valueForKeyPath:keyPath];
 
-        bindingName = CPArgumentBinding + count;
+        if (object)
+            [invocation setArgument:object atIndex:++count];
+
+        bindingName = [CPString stringWithFormat:@"%@%i", argumentKey, count];
     }
 
-    [invocation setSelector:selector];
-    [invocation invokeWithTarget:target];
+    [invocation invoke];
 }
 
-@end
-
-@implementation CPActionBinding : _CPMultipleValueActionBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _argumentBinding = CPArgumentBinding;
-        _targetBinding = CPTargetBinding;
-    }
-
-    return self;
-}
-
-@end
-
-@implementation CPDoubleClickActionBinding : _CPMultipleValueActionBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _argumentBinding = CPArgumentBinding;
-        _targetBinding = CPTargetBinding;
-    }
-
-    return self;
-}
-
-@end
-
-/*!
-    Abstract superclass for CPValueWithPatternBinding and CPTitleWithPatternBinding.
-*/
-@implementation _CPPatternBinding : CPBinder
-{
-    CPString _bindingKey;
-    CPString _patternPlaceholder;
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    // Strip off any trailing number from the binding name
-    var baseBinding = aBinding.replace(/\d$/, ""),
-        result = [self resolveMultipleValuesForBindings:bindings];
-
-    if (result.isPlaceholder)
-        [self setPlaceholderValue:result.value withMarker:result.marker forBinding:baseBinding];
-    else
-        [self setValue:result.value forBinding:baseBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // read-only
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-- (JSObject)resolveMultipleValuesForBindings:(CPDictionary)bindings
-{
-    var theBinding,
-        result = { value:@"", isPlaceholder:NO, marker:nil };
-
-    for (var count = 1; theBinding = [bindings objectForKey:_bindingKey + count]; ++count)
-    {
-        var info    = theBinding._info,
-            object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            options = [info objectForKey:CPOptionsKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (count === 1)
-            result.value = [options objectForKey:CPDisplayPatternBindingOption];
-
-        if (CPIsControllerMarker(value))
-        {
-            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
-
-            result.isPlaceholder = YES;
-            result.marker = value;
-
-            value = [theBinding _placeholderForMarker:value];
-        }
-        else
-            value = [theBinding transformValue:value withOptions:options];
-
-        if (value === nil || value === undefined)
-            value = @"";
-
-        result.value = result.value.replace("%{" + _patternPlaceholder + count + "}@", [value description]);
-    }
-
-    return result;
-}
-
-@end
-
-
-/*!
-    Users of this class must override setValue:forKey: and if the
-    key is CPDisplayPatternValueBinding, set the appropriate value
-    for the control class. For example, CPTextField uses setObjectValue.
-*/
-@implementation CPValueWithPatternBinding : _CPPatternBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _bindingKey = CPDisplayPatternValueBinding;
-        _patternPlaceholder = @"value";
-    }
-
-    return self;
-}
-
-@end
-
-
-/*!
-    Users of this class must override setValue:forKey: and if the
-    key is CPDisplayPatternTitleBinding, set the appropriate value
-    for the control class. For example, CPBox uses setTitle.
-*/
-@implementation CPTitleWithPatternBinding : _CPPatternBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _bindingKey = CPDisplayPatternTitleBinding;
-        _patternPlaceholder = @"title";
-    }
-
-    return self;
-}
-
-@end
-
-@implementation _CPStateMarker : CPObject
-{
-    CPString _name;
-}
-
-- (id)initWithName:(CPString)aName
-{
-    if (self = [super init])
-        _name = aName
-
-    return self;
-}
-
-- (CPString)description
-{
-    return "<" + _name + ">";
-}
-
-@end
-
-
 // Keys in options dictionary
 
 // Keys in dictionary returned by infoForBinding
@@ -831,51 +473,23 @@ CPObservedKeyPathKey    = @"CPObservedKeyPathKey";
 CPOptionsKey            = @"CPOptionsKey";
 
 // special markers
-CPNoSelectionMarker     = [[_CPStateMarker alloc] initWithName:@"NO SELECTION MARKER"];
-CPMultipleValuesMarker  = [[_CPStateMarker alloc] initWithName:@"MULTIPLE VALUES MARKER"];
-CPNotApplicableMarker   = [[_CPStateMarker alloc] initWithName:@"NOT APPLICABLE MARKER"];
-CPNullMarker            = [[_CPStateMarker alloc] initWithName:@"NULL MARKER"];
+CPMultipleValuesMarker  = @"CPMultipleValuesMarker";
+CPNoSelectionMarker     = @"CPNoSelectionMarker";
+CPNotApplicableMarker   = @"CPNotApplicableMarker";
+CPNullMarker            = @"CPNullMarker";
 
 // Binding name constants
-CPAlignmentBinding                        = @"alignment";
-CPArgumentBinding                         = @"argument";
-CPContentArrayBinding                     = @"contentArray";
-CPContentBinding                          = @"content";
-CPContentObjectBinding                    = @"contentObject";
-CPContentObjectsBinding                   = @"contentObjects";
-CPContentValuesBinding                    = @"contentValues";
-CPDisplayPatternTitleBinding              = @"displayPatternTitle";
-CPDisplayPatternValueBinding              = @"displayPatternValue";
-CPDoubleClickArgumentBinding              = @"doubleClickArgument";
-CPDoubleClickTargetBinding                = @"doubleClickTarget";
-CPEditableBinding                         = @"editable";
-CPEnabledBinding                          = @"enabled";
-CPFontBinding                             = @"font";
-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";
-CPTargetBinding                           = @"target";
-CPTextColorBinding                        = @"textColor";
-CPTitleBinding                            = @"title";
-CPToolTipBinding                          = @"toolTip";
-CPValueBinding                            = @"value";
-CPValueURLBinding                         = @"valueURL";
-CPValuePathBinding                        = @"valuePath";
-CPDataBinding                             = @"data";
+CPAlignmentBinding      = @"alignment";
+CPEditableBinding       = @"editable";
+CPEnabledBinding        = @"enabled";
+CPFontBinding           = @"font";
+CPHiddenBinding         = @"hidden";
+CPSelectedIndexBinding  = @"selectedIndex";
+CPTextColorBinding      = @"textColor";
+CPToolTipBinding        = @"toolTip";
+CPValueBinding          = @"value";
 
-// Binding options constants
+//Binding options constants
 CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
 CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgument";
 CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditable";
@@ -904,8 +518,4 @@ 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];
-
+}

AppKit/CPLevelIndicator.j

@@ -21,9 +21,6 @@
  */
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-
-@global CPApp
 
 CPTickMarkBelow                             = 0;
 CPTickMarkAbove                             = 1;
@@ -35,6 +32,14 @@ CPContinuousCapacityLevelIndicatorStyle     = 1;
 CPDiscreteCapacityLevelIndicatorStyle       = 2;
 CPRatingLevelIndicatorStyle                 = 3;
 
+var _CPLevelIndicatorBezelColor = nil,
+    _CPLevelIndicatorSegmentEmptyColor = nil,
+    _CPLevelIndicatorSegmentNormalColor = nil,
+    _CPLevelIndicatorSegmentWarningColor = nil,
+    _CPLevelIndicatorSegmentCriticalColor = nil,
+
+    _CPLevelIndicatorSpacing = 1;
+
 /*!
     @ingroup appkit
     @class CPLevelIndicator
@@ -57,21 +62,54 @@ CPRatingLevelIndicatorStyle                 = 3;
     BOOL                _isTracking;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "level-indicator";
-}
+    var bundle = [CPBundle bundleForClass:CPLevelIndicator];
 
-+ (id)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPNull null],
-            @"color-empty": [CPNull null],
-            @"color-normal": [CPNull null],
-            @"color-warning": [CPNull null],
-            @"color-critical": [CPNull null],
-            @"spacing": 1.0,
-        };
+    _CPLevelIndicatorBezelColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-left.png"] size:CGSizeMake(3.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-center.png"] size:CGSizeMake(1.0, 18.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-bezel-right.png"] size:CGSizeMake(3.0, 18.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentEmptyColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-empty-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentNormalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-normal-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentWarningColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-warning-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
+
+    _CPLevelIndicatorSegmentCriticalColor = [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-left.png"] size:CGSizeMake(3.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-center.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPLevelIndicator/level-indicator-segment-critical-right.png"] size:CGSizeMake(3.0, 17.0)]
+        ]
+        isVertical:NO
+    ]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -84,31 +122,37 @@ CPRatingLevelIndicatorStyle                 = 3;
         _maxValue = 2;
         _warningValue = 2;
         _criticalValue = 2;
+
+        [self _init];
     }
 
     return self;
 }
 
+- (void)_init
+{
+}
+
 - (void)layoutSubviews
 {
     var bezelView = [self layoutEphemeralSubviewNamed:"bezel"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:nil];
     // TODO Make themable.
-    [bezelView setBackgroundColor:[self valueForThemeAttribute:@"bezel-color"]];
+    [bezelView setBackgroundColor:_CPLevelIndicatorBezelColor];
 
     var segmentCount = _maxValue - _minValue;
 
     if (segmentCount <= 0)
         return;
 
-    var filledColor = [self valueForThemeAttribute:@"color-normal"],
+    var filledColor = _CPLevelIndicatorSegmentNormalColor,
         value = [self doubleValue];
 
-    if (value <= _criticalValue)
-        filledColor = [self valueForThemeAttribute:@"color-critical"];
-    else if (value <= _warningValue)
-        filledColor = [self valueForThemeAttribute:@"color-warning"];
+    if (value < _criticalValue)
+        filledColor = _CPLevelIndicatorSegmentCriticalColor;
+    else if (value < _warningValue)
+        filledColor = _CPLevelIndicatorSegmentWarningColor;
 
     for (var i = 0; i < segmentCount; i++)
     {
@@ -116,7 +160,7 @@ CPRatingLevelIndicatorStyle                 = 3;
                                                positioned:CPWindowAbove
                           relativeToEphemeralSubviewNamed:bezelView];
 
-        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]];
+        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : _CPLevelIndicatorSegmentEmptyColor];
     }
 }
 
@@ -147,12 +191,11 @@ CPRatingLevelIndicatorStyle                 = 3;
             return _CGRectMakeZero();
 
         var basicSegmentWidth = bounds.size.width / segmentCount,
-            segmentFrame = CGRectCreateCopy([self bounds]),
-            spacing = [self valueForThemeAttribute:@"spacing"];
+            segmentFrame = CGRectCreateCopy([self bounds]);
 
         segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
         segmentFrame.origin.x =  FLOOR(segment * basicSegmentWidth);
-        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - spacing;
+        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - _CPLevelIndicatorSpacing;
         segmentFrame.size.height = segmentHeight;
 
         return segmentFrame;
@@ -180,7 +223,7 @@ CPRatingLevelIndicatorStyle                 = 3;
     return _isEditable;
 }
 
-- (CPView)hitTest:(CGPoint)aPoint
+- (CPView)hitTest:(CPPoint)aPoint
 {
     // Don't swallow clicks when displayed in a table.
     if (![self isEditable])
@@ -210,7 +253,7 @@ CPRatingLevelIndicatorStyle                 = 3;
 
         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
@@ -342,6 +385,8 @@ var CPLevelIndicatorStyleKey                    = "CPLevelIndicatorStyleKey",
 
         _isEditable = [aCoder decodeBoolForKey:CPLevelIndicatorIsEditableKey];
 
+        [self _init];
+
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }

AppKit/CPMenu/CPMenu.j

@@ -25,10 +25,12 @@
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPString.j>
 
-@import "CPKeyValueBinding.j"
+@import "_CPMenuManager.j"
+@import "CPApplication.j"
+@import "CPClipView.j"
 @import "CPMenuItem.j"
+@import "CPPanel.j"
 
-@global CPApp
 
 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -36,8 +38,12 @@ CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";
 
 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";
 
+var MENUBAR_HEIGHT = 28.0;
+
 var _CPMenuBarVisible               = NO,
     _CPMenuBarTitle                 = @"",
+    _CPMenuBarIconImage             = nil,
+    _CPMenuBarIconImageAlphaValue   = 1.0,
     _CPMenuBarAttributes            = nil,
     _CPMenuBarSharedWindow          = nil;
 
@@ -74,10 +80,10 @@ var _CPMenuBarVisible               = NO,
 
 + (void)initialize
 {
-    if (self !== [CPMenu class])
+    if (self !== CPMenu)
         return;
 
-    [[self class] setMenuBarAttributes:@{}];
+    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
 }
 
 + (BOOL)menuBarVisible
@@ -103,8 +109,8 @@ var _CPMenuBarVisible               = NO,
         [_CPMenuBarSharedWindow setMenu:[CPApp mainMenu]];
 
         [_CPMenuBarSharedWindow setTitle:_CPMenuBarTitle];
-        [_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 setIconImage:_CPMenuBarIconImage];
+        [_CPMenuBarSharedWindow setIconImageAlphaValue:_CPMenuBarIconImageAlphaValue];
 
         [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
         [_CPMenuBarSharedWindow setTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTextColor"]];
@@ -148,13 +154,6 @@ var _CPMenuBarVisible               = NO,
     return _CPMenuBarImage;
 }
 
-+ (void)_setOrRemoveMenuBarAttribute:(id)aValue forKey:(id)aKey
-{
-    if (aValue === nil)
-        [_CPMenuBarAttributes removeObjectForKey:aKey];
-    else
-        [_CPMenuBarAttributes setObject:aValue forKey:aKey];
-}
 
 + (void)setMenuBarAttributes:(CPDictionary)attributes
 {
@@ -179,8 +178,8 @@ var _CPMenuBarVisible               = NO,
 
     else if (!textColor && !titleColor)
     {
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
+        [_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"];
     }
 
     if (!textShadowColor && titleShadowColor)
@@ -191,18 +190,18 @@ var _CPMenuBarVisible               = NO,
 
     else if (!textShadowColor && !titleShadowColor)
     {
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
     }
 
     if (!highlightColor)
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0 / 255.0 green:130.0 / 255.0 blue:186.0 / 255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
 
     if (!highlightTextColor)
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
 
     if (!highlightTextShadowColor)
-        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor blackColor] forKey:@"CPMenuBarHighlightTextShadowColor"];
 
     if (_CPMenuBarSharedWindow)
     {
@@ -231,14 +230,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
     if (self === [CPApp mainMenu])
-        return [CPMenu menuBarHeight];
+        return MENUBAR_HEIGHT;
 
     return 0.0;
 }
 
 + (float)menuBarHeight
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
+    return MENUBAR_HEIGHT;
 }
 
 // Creating a CPMenu Object
@@ -353,12 +352,8 @@ var _CPMenuBarVisible               = NO,
     while (count--)
         [_items[count] setMenu:nil];
 
-    _highlightedIndex = CPNotFound;
-
-    // Because we are changing _items directly, be sure to notify KVO
-    [self willChangeValueForKey:@"items"];
     _items = [CPMutableArray array];
-    [self didChangeValueForKey:@"items"];
+    _highlightedIndex = CPNotFound;
 }
 
 /*!
@@ -367,12 +362,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)itemChanged:(CPMenuItem)aMenuItem
 {
-    /*
-        During cib unarchiving, menu items will have a reference to their menu,
-        but of course the items are still being unarchived and the menu's _items
-        have not yet been instantiated. In that case we will not do anything here.
-    */
-    if ([aMenuItem menu] !== self || !_items)
+    if ([aMenuItem menu] !== self)
         return;
 
     [aMenuItem setValue:[aMenuItem valueForKey:@"changeCount"] + 1 forKey:@"changeCount"];
@@ -380,7 +370,7 @@ var _CPMenuBarVisible               = NO,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidChangeItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": [_items indexOfObjectIdenticalTo:aMenuItem] }];
+                    userInfo:[CPDictionary dictionaryWithObject:[_items indexOfObjectIdenticalTo:aMenuItem] forKey:@"CPMenuItemIndex"]];
 }
 
 // Finding Menu Items
@@ -613,9 +603,8 @@ var _CPMenuBarVisible               = NO,
 
 /*!
     Enables or disables the receiver’s menu items.
-    If the item has no target, an action binding is checked. If the target does not implement
-    the menu item's action method or the binding's selector, the item is disabled.
-    If the target responds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
+    If the target does not implement the menu item's action method the item is disabled.
+    If the target responsds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
 */
 - (void)update
 {
@@ -623,7 +612,6 @@ var _CPMenuBarVisible               = NO,
         return;
 
     var items = [self itemArray];
-
     for (var i = 0; i < [items count]; i++)
     {
         var item = [items objectAtIndex:i];
@@ -633,36 +621,12 @@ var _CPMenuBarVisible               = NO,
 
         var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
 
-        if (!validator)
-        {
-            // If targetForAction: returns nil, it could be that there is no action.
-            // If there is an action and nil is returned, no valid target could be found.
-            if ([item action] || [item target])
-                [item setEnabled:NO];
-            else
-            {
-                // Check to see if there is a target binding with an invalid selector
-                var info = [CPBinder infoForBinding:CPTargetBinding forObject:item];
-
-                if (info)
-                {
-                    var object = [info objectForKey:CPObservedObjectKey],
-                        keyPath = [info objectForKey:CPObservedKeyPathKey],
-                        options = [info objectForKey:CPOptionsKey],
-                        target = [object valueForKeyPath:keyPath],
-                        selector = [options valueForKey:CPSelectorNameBindingOption];
-
-                    if (target && selector && ![target respondsToSelector:CPSelectorFromString(selector)])
-                        [item setEnabled:NO];
-                }
-            }
-        }
-        else if (![validator respondsToSelector:[item action]])
-            [item setEnabled:NO];
+        if (!validator || ![validator respondsToSelector:[item action]])
+            [item _setEnabled:NO];
         else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            [item setEnabled:[validator validateMenuItem:item]];
+            [item _setEnabled:[validator validateMenuItem:item]];
         else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            [item setEnabled:[validator validateUserInterfaceItem:item]];
+            [item _setEnabled:[validator validateUserInterfaceItem:item]];
     }
 
     [[_menuWindow _menuView] tile];
@@ -707,13 +671,7 @@ var _CPMenuBarVisible               = NO,
     // highlightedItem is always enabled. Do there exist edge cases: disabling on closing a menu,
     // etc.? Requires further investigation and tests.
     if (highlightedItem && [highlightedItem isEnabled])
-    {
-        // Perform any action binding
-        var binding = [CPBinder getBinding:CPTargetBinding forObject:highlightedItem];
-        [binding invokeAction];
-
         [CPApp sendAction:[highlightedItem action] to:[highlightedItem target] from:highlightedItem];
-    }
 }
 
 //
@@ -753,7 +711,10 @@ var _CPMenuBarVisible               = NO,
     if (aView && !theWindow)
         throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";
 
-    [self _menuWillOpen];
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
 
     // Convert location to global coordinates if not already in them.
     if (aView)
@@ -841,10 +802,13 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    [aMenu _menuWillOpen];
+    var delegate = [aMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:aMenu];
 
     if (!aFont)
-        aFont = [CPFont systemFontOfSize:[CPFont systemFontSize]];
+        aFont = [CPFont systemFontOfSize:12.0];
 
     var theWindow = [aView window],
         menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
@@ -911,15 +875,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    if (_highlightedIndex < 0)
-        return nil;
-
-    var highlightedItem = _items[_highlightedIndex];
-
-    if ([highlightedItem isSeparatorItem])
-        return nil;
-
-    return highlightedItem;
+    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
 }
 
 // Managing the Delegate
@@ -934,22 +890,6 @@ var _CPMenuBarVisible               = NO,
     return _delegate;
 }
 
-- (void)_menuWillOpen
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:self];
-}
-
-- (void)_menuDidClose
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:self];
-}
-
 // Handling Tracking
 /*!
     Cancels tracking.
@@ -1014,7 +954,8 @@ var _CPMenuBarVisible               = NO,
 
     for (; index < count; ++index)
     {
-        var item = _items[index];
+        var item = _items[index],
+            modifierMask = [item keyEquivalentModifierMask];
 
         if ([anEvent _triggersKeyEquivalent:[item keyEquivalent] withModifierMask:[item keyEquivalentModifierMask]])
         {
@@ -1148,7 +1089,7 @@ var _CPMenuBarVisible               = NO,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidAddItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 - (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
@@ -1162,7 +1103,7 @@ var _CPMenuBarVisible               = NO,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidRemoveItemNotification
                       object:self
-                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 @end

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,33 +1,14 @@
-/*
- * _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 "_CPMenuManager.j"
+@import "_CPMenuWindow.j"
 
-@class _CPMenuView
 
-@global CPMenuDidAddItemNotification
-@global CPMenuDidChangeItemNotification
-@global CPMenuDidRemoveItemNotification
+var MENUBAR_HEIGHT          = 28.0,
+    MENUBAR_MARGIN          = 10.0,
+    MENUBAR_LEFT_MARGIN     = 10.0,
+    MENUBAR_RIGHT_MARGIN    = 10.0;
+
+var _CPMenuBarWindowBackgroundColor = nil,
+    _CPMenuBarWindowFont            = nil;
 
 @implementation _CPMenuBarWindow : CPPanel
 {
@@ -51,9 +32,19 @@
     CPColor     _highlightTextShadowColor;
 }
 
++ (void)initialize
+{
+    if (self != [_CPMenuBarWindow class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:12.0];
+}
+
 + (CPFont)font
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
+    return _CPMenuBarWindowFont;
 }
 
 - (id)init
@@ -61,7 +52,7 @@
     // This only shows up in browser land, so don't bother calculating metrics in desktop.
     var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
 
-    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];
+    contentRect.size.height = MENUBAR_HEIGHT;
 
     self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
 
@@ -83,7 +74,7 @@
 
         _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
-        [_titleField setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 1]];
+        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
         [_titleField setAlignment:CPCenterTextAlignment];
         [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
 
@@ -128,7 +119,12 @@
 - (void)setColor:(CPColor)aColor
 {
     if (!aColor)
-        [[self contentView] setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
+    {
+        if (!_CPMenuBarWindowBackgroundColor)
+            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
+
+        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
+    }
     else
         [[self contentView] setBackgroundColor:aColor];
 }
@@ -261,7 +257,7 @@
         items = [_menu itemArray],
         count = items.length;
 
-    for (var index = 0; index < count; ++index)
+    for (index = 0; index < count; ++index)
     {
         var item = items[index],
             menuItemView = [item _menuItemView];
@@ -320,11 +316,6 @@
     [self tile];
 }
 
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return YES;
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
@@ -344,7 +335,7 @@
 
 - (CPFont)font
 {
-    [CPFont systemFontOfSize:[CPFont systemFontSize]];
+    [CPFont systemFontOfSize:12.0];
 }
 
 - (void)tile
@@ -353,7 +344,7 @@
         index = 0,
         count = items.length,
 
-        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView],
+        x = MENUBAR_LEFT_MARGIN,
         y = 0.0,
         isLeftAligned = YES;
 
@@ -363,7 +354,7 @@
 
         if ([item isSeparatorItem])
         {
-            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
             isLeftAligned = NO;
 
             continue;
@@ -377,13 +368,13 @@
 
         if (isLeftAligned)
         {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
 
             x += CGRectGetWidth([menuItemView frame]);
         }
         else
         {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
 
             x = CGRectGetMinX([menuItemView frame]);
         }
@@ -461,3 +452,102 @@
 }
 
 @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

AppKit/CPMenu/_CPMenuManager.j

@@ -1,51 +1,16 @@
-/*
- * _CPMenuManager.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import <Foundation/CPObject.j>
-@import <Foundation/CPNotificationCenter.j>
-
-@import "CPEvent.j"
-@import "CPKeyBinding.j"
-
-@class CPWindow
-@class _CPMenuWindow
 
 
-@global CPApp
-@global CPMenuDidEndTrackingNotification
-@global _CPMenuWindowMenuBarBackgroundStyle
-@global _CPMenuWindowPopUpBackgroundStyle
-
-_CPMenuManagerScrollingStateUp      = -1;
-_CPMenuManagerScrollingStateDown    = 1;
+_CPMenuManagerScrollingStateUp      = -1,
+_CPMenuManagerScrollingStateDown    = 1,
 _CPMenuManagerScrollingStateNone    = 0;
 
-var STICKY_TIME_INTERVAL            = 0.4,
+var STICKY_TIME_INTERVAL            = 500,
     SharedMenuManager               = nil;
 
 @implementation _CPMenuManager: CPObject
 {
     CPTimeInterval      _startTime;
-    BOOL                _mouseWasDragged;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
 
@@ -60,8 +25,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
     CPMenuItem          _previousActiveItem;
     int                 _showTimerID;
-
-    int                 _menuBarButtonItemIndex;
 }
 
 + (_CPMenuManager)sharedMenuManager
@@ -97,12 +60,9 @@ var STICKY_TIME_INTERVAL            = 0.4,
 {
     var menu = [aMenuContainer menu];
 
-    if ([menu numberOfItems] <= 0)
-        return;
-
     CPApp._activeMenu = menu;
 
-    _startTime = [anEvent timestamp];
+    _startTime = [anEvent timestamp];//new Date();
     _scrollingState = _CPMenuManagerScrollingStateNone;
 
     _constraintRect = aRect;
@@ -121,22 +81,15 @@ var STICKY_TIME_INTERVAL            = 0.4,
             activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
 
         _menuBarButtonItemIndex = activeItemIndex;
-//        _menuBarButtonMenuContainer = aMenuContainer;
+        _menuBarButtonMenuContainer = aMenuContainer;
 
         if ([activeItem _isMenuBarButton])
             return [self trackMenuBarButtonEvent:anEvent];
     }
 
-    _mouseWasDragged = NO;
-
     [self trackEvent:anEvent];
 }
 
-- (void)_trackAgain
-{
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseDownMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
-}
-
 - (void)trackEvent:(CPEvent)anEvent
 {
     var type = [anEvent type],
@@ -146,6 +99,8 @@ var STICKY_TIME_INTERVAL            = 0.4,
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
+
     if (type === CPKeyDown)
     {
         var menu = trackingMenu,
@@ -161,18 +116,26 @@ var STICKY_TIME_INTERVAL            = 0.4,
         if ([menu numberOfItems])
             [self interpretKeyEvent:anEvent forMenu:menu];
 
-        [self _trackAgain];
         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];
 
-    if (!globalLocation)
-    {
-        [self _trackAgain];
+    // Remember this for the next periodic event.
+    _lastGlobalLocation = globalLocation;
+
+    if (!_lastGlobalLocation)
         return;
-    }
 
     // Find which menu window the mouse is currently on top of
     var activeMenuContainer = [self menuContainerForPoint:globalLocation],
@@ -183,45 +146,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
         activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
         activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
 
-    // Click outside the menu structure?
-    if (type === CPLeftMouseDown && (!activeMenuContainer || !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation)))
-    {
-        [self completeTracking];
-
-        /*
-        You can close and interact with a control in a single click. E.g. you can have a menu open,
-        click on a button outside of it and have the menu immediately close and the button activate,
-        without having to click once to close the menu and once to activate the button.
-
-        Since we normally dequeue the event after tracking it, we'll have to put it back on the stack
-        in this special case. Note that it's important the event is executed /right now/, since certain
-        controls such as HTML upload buttons need a native click event at the top of the stack trace
-        to activate - it's not something we can fake later.
-        */
-        [CPApp sendEvent:anEvent];
-
-        return;
-    }
-
-    [self _trackAgain];
-
-    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])
     {
@@ -231,7 +155,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
     var mouseOverMenuView = [activeItem view];
 
-    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
+    if (type === CPScrollWheel)
         [activeMenuContainer scrollByDelta:[anEvent deltaY]];
 
     if (type === CPPeriodic)
@@ -259,7 +183,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
         var menuContainerWindow = activeMenuContainer;
 
-        if (![menuContainerWindow isKindOfClass:CPWindow])
+        if (![menuContainerWindow isKindOfClass:[CPWindow class]])
             menuContainerWindow = [menuContainerWindow window];
 
         [menuContainerWindow
@@ -281,14 +205,10 @@ var STICKY_TIME_INTERVAL            = 0.4,
             _lastMouseOverMenuView = nil;
         }
 
-        if (activeItemIndex !== CPNotFound)
-            [activeMenu _highlightItemAtIndex:activeItemIndex];
+        [activeMenu _highlightItemAtIndex:activeItemIndex];
 
         if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
         {
-            if (type === CPLeftMouseDragged)
-                _mouseWasDragged = YES;
-
             var oldScrollingState = _scrollingState;
 
             _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
@@ -301,38 +221,8 @@ var STICKY_TIME_INTERVAL            = 0.4,
                     [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
             }
         }
-        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
-        {
-            /*
-                There are a few possibilites:
-
-                1. The user clicks and releases without dragging within the sticky time.
-                   This is considered a regular mouse click and not a drag. In this case
-                   we allow the user to track the menu by moving the mouse. The next
-                   mouse up will end tracking.
-
-                2. The user clicks and releases without dragging after the sticky time.
-                   This is considered a drag and release and tracking ends.
-
-                3. The user clicks, drags and then releases. Tracking ends.
-            */
-            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            {
-                /*
-                    Close the menu if:
-
-                    1. The mouse was dragged.
-                    2. The mouse is released in the menubar.
-                    3. The current item has a submenu with a custom action.
-                */
-                if (_mouseWasDragged ||
-                    [activeMenuContainer isMenuBar] ||
-                    [activeItem action] !== @selector(submenuAction:))
-                {
-                    [trackingMenu cancelTracking];
-                }
-            }
-        }
+        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] * 5)))
+            [trackingMenu cancelTracking];
     }
 
     // Prevent previous selected menu items from opening by stopping the timer if a
@@ -344,7 +234,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
     }
 
     // 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;
@@ -416,7 +306,11 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
     // Hide all submenus.
     [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-    [trackingMenu _menuDidClose];
+
+    var delegate = [trackingMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:trackingMenu];
 
     if (_trackingCallback)
         _trackingCallback([self trackingMenuContainer], trackingMenu);
@@ -485,8 +379,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
     var count = _menuContainerStack.length,
         index = count;
 
-    [newMenu _menuWillOpen];
-
     // Hide all menus up to the base menu...
     while (index--)
     {
@@ -498,7 +390,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
             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];
@@ -506,8 +398,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
 
         [_CPMenuWindow poolMenuWindow:menuContainer];
         [_menuContainerStack removeObjectAtIndex:index];
-
-        [menu _menuDidClose];
     }
 
     if (!newMenu)
@@ -544,7 +434,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
         var iter = [selectorNames objectEnumerator],
             obj;
 
-        while ((obj = [iter nextObject]) !== nil)
+        while (obj = [iter nextObject])
         {
             var aSelector = CPSelectorFromString(obj);
 
@@ -556,7 +446,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
     {
         if (!_keyBuffer)
         {
-            _startTime = [anEvent timestamp];
+            _startTime = [CPDate date];
             _keyBuffer = character;
 
             [CPEvent stopPeriodicEvents];
@@ -575,7 +465,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
     var iter = [[menu itemArray] objectEnumerator],
         obj;
 
-    while ((obj = [iter nextObject]) !== nil)
+    while (obj = [iter nextObject])
     {
         if ([obj isHidden] || ![obj isEnabled])
             continue;
@@ -593,7 +483,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
         _keyBuffer = Nil;
     }
     else
-        _startTime = [CPEvent currentTimestamp];
+        _startTime = [CPDate date];
 }
 
 - (void)scrollToBeginningOfDocument:(CPMenu)menu
@@ -621,7 +511,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
         return;
     }
 
-    var next = current + (last - first);
+    next = current + (last - first);
 
     if (next < [menu numberOfItems])
         [menu _highlightItemAtIndex:next];
@@ -649,7 +539,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
         return;
     }
 
-    var next = current - (last - first);
+    next = current - (last - first);
 
     if (next < 0)
         [menu _highlightItemAtIndex:0];
@@ -730,8 +620,6 @@ var STICKY_TIME_INTERVAL            = 0.4,
         if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
             [self moveDown:menu];
     }
-    else if (menu == [CPApp mainMenu])
-         [menu _highlightItemAtIndex:0];
 }
 
 - (void)moveUp:(CPMenu)menu
@@ -739,12 +627,7 @@ var STICKY_TIME_INTERVAL            = 0.4,
     var index = menu._highlightedIndex - 1;
 
     if (index < 0)
-    {
-        if (index != CPNotFound || menu == [CPApp mainMenu])
-            [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-
         return;
-    }
 
     [menu _highlightItemAtIndex:index];
 

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,29 +1,5 @@
-/*
- * _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,
@@ -34,6 +10,15 @@ _CPMenuWindowMenuBarBackgroundStyle         = 0;
 _CPMenuWindowPopUpBackgroundStyle           = 1;
 _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
+var STICKY_TIME_INTERVAL        = 500,
+
+    TOP_MARGIN                  = 5.0,
+    LEFT_MARGIN                 = 1.0,
+    RIGHT_MARGIN                = 1.0,
+    BOTTOM_MARGIN               = 5.0,
+
+    SCROLL_INDICATOR_HEIGHT     = 16.0;
+
 /*
     @ignore
 */
@@ -78,6 +63,17 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     _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();
@@ -96,24 +92,26 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
         _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
 
-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake([_menuView valueForThemeAttribute:@"menu-window-margin-inset"].left, [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top, 0.0, 0.0)];
+        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
         [_menuClipView setDocumentView:_menuView];
 
         [contentView addSubview:_menuClipView];
 
         _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [_moreAboveView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-above-image"]];
-        [_moreAboveView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-above-image"] size]];
+        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
+        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
 
         [contentView addSubview:_moreAboveView];
 
         _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [_moreBelowView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-below-image"]];
-        [_moreBelowView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-below-image"] size]];
+        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
+        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
 
         [contentView addSubview:_moreBelowView];
+
+        [self setShadowStyle:CPWindowShadowStyleMenu];
     }
 
     return self;
@@ -121,7 +119,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 + (float)_standardLeftMargin
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
+    return LEFT_MARGIN;
 }
 
 - (void)setFont:(CPFont)aFont
@@ -143,10 +141,36 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
         var bundle = [CPBundle bundleForClass:[self class]];
 
         if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];
+            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)]
+                ]]];
 
         else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
+
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
 
         _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
     }
@@ -164,13 +188,12 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     [aMenu _setMenuWindow:self];
     [_menuView setMenu:aMenu];
 
-    var menuViewSize = [_menuView frame].size,
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];
+    var menuViewSize = [_menuView frame].size;
 
-    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];
+    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
 
     [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
+    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
 }
 
 - (void)setMinWidth:(float)aWidth
@@ -228,9 +251,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     // FIXME: This gets called far too often.
     _unconstrainedFrame = _CGRectMakeCopy(aFrame);
 
-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
-        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
 
     // 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).
@@ -249,41 +270,41 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
 
     // This needs to happen before changing the frame.
-    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,
+    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,
 
-        topMargin = marginInset.top,
-        bottomMargin = marginInset.bottom,
+        topMargin = TOP_MARGIN,
+        bottomMargin = BOTTOM_MARGIN,
 
         contentView = [self contentView],
         bounds = [contentView bounds];
 
     if (moreAbove)
     {
-        topMargin += scrollIndicatorHeight;
+        topMargin += SCROLL_INDICATOR_HEIGHT;
 
         var frame = [_moreAboveView frame];
 
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
     }
 
     [_moreAboveView setHidden:!moreAbove];
 
     if (moreBelow)
     {
-        bottomMargin += scrollIndicatorHeight;
+        bottomMargin += SCROLL_INDICATOR_HEIGHT;
 
-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
+        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
     }
 
     [_moreBelowView setHidden:!moreBelow];
 
     var clipFrame = CGRectMakeZero();
 
-    clipFrame.origin.x = marginInset.left;
+    clipFrame.origin.x = LEFT_MARGIN;
     clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
+    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN;
     clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;
 
     [_menuClipView setFrame:clipFrame];
@@ -379,15 +400,15 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
     var frame = [self frame];
-    if (!CGRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
+    if (!CPRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
         return _CPMenuManagerScrollingStateNone;
 
     // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreAboveView isHidden])
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT &&  ![_moreAboveView isHidden])
         return _CPMenuManagerScrollingStateUp;
 
     // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT &&  ![_moreBelowView isHidden])
         return _CPMenuManagerScrollingStateDown;
 
     return _CPMenuManagerScrollingStateNone;
@@ -395,7 +416,7 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
 - (float)deltaYForItemAtIndex:(int)anIndex
 {
-    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
 }
 
 - (CGPoint)rectForItemAtIndex:(int)anIndex
@@ -426,44 +447,6 @@ _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
     CPFont  _font @accessors(property=font);
 }
 
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-view";
-}
-
-+ (id)themeAttributes
-{
-    return @{
-            @"menu-window-more-above-image": [CPNull null],
-            @"menu-window-more-below-image": [CPNull null],
-            @"menu-window-pop-up-background-style-color": [CPNull null],
-            @"menu-window-menu-bar-background-style-color": [CPNull null],
-            @"menu-window-margin-inset": CGInsetMake(5.0, 1.0, 1.0, 5.0),
-            @"menu-window-scroll-indicator-height": 16.0,
-            @"menu-bar-window-background-color": [CPNull null],
-            @"menu-bar-window-background-selected-color": [CPNull null],
-            @"menu-bar-window-font": [CPNull null],
-            @"menu-bar-window-height": 30.0,
-            @"menu-bar-window-margin": 10.0,
-            @"menu-bar-window-left-margin": 10.0,
-            @"menu-bar-window-right-margin": 10.0,
-            @"menu-bar-text-color": [CPNull null],
-            @"menu-bar-title-color": [CPNull null],
-            @"menu-bar-text-shadow-color": [CPNull null],
-            @"menu-bar-title-shadow-color": [CPNull null],
-            @"menu-bar-highlight-color": [CPNull null],
-            @"menu-bar-highlight-text-color": [CPNull null],
-            @"menu-bar-highlight-text-shadow-color": [CPNull null],
-            @"menu-bar-height": 28.0,
-            @"menu-bar-icon-image": [CPNull null],
-            @"menu-bar-icon-image-alpha-value": 1.0,
-            @"menu-general-icon-new": [CPNull null],
-            @"menu-general-icon-save": [CPNull null],
-            @"menu-general-icon-open": [CPNull null],
-        };
-}
-
 - (unsigned)numberOfUnhiddenItems
 {
     return _visibleMenuItemInfos.length;

AppKit/CPMenuItem/CPMenuItem.j

@@ -25,33 +25,29 @@
 @import <Foundation/CPString.j>
 
 @import "CPImage.j"
-@import "CPText.j"
+@import "CPMenu.j"
 @import "CPView.j"
 @import "_CPMenuItemView.j"
 
-@class CPMenu
 
-@global CPApp
-
-var CPMenuItemStringRepresentationDictionary = @{
-        CPEscapeFunctionKey:        "\u238B",
-        CPTabCharacter:             "\u21E5",
-        CPBackTabCharacter:         "\u21E4",
-        CPSpaceFunctionKey:         "\u2423",
-        CPCarriageReturnCharacter:  "\u23CE",
-        CPBackspaceCharacter:       "\u232B",
-        CPDeleteFunctionKey:        "\u232B",
-        CPDeleteCharacter:          "\u2326",
-        CPHomeFunctionKey:          "\u21F1",
-        CPEndFunctionKey:           "\u21F2",
-        CPPageUpFunctionKey:        "\u21DE",
-        CPPageDownFunctionKey:      "\u21DF",
-        CPUpArrowFunctionKey:       "\u2191",
-        CPDownArrowFunctionKey:     "\u2193",
-        CPLeftArrowFunctionKey:     "\u2190",
-        CPRightArrowFunctionKey:    "\u2192",
-        CPClearDisplayFunctionKey:  "\u2327",
-    };
+var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionary];
+[CPMenuItemStringRepresentationDictionary setObject:"\u238B" forKey:CPEscapeFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21E5" forKey:CPTabCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21E4" forKey:CPBackTabCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2423" forKey:CPSpaceFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u23CE" forKey:CPCarriageReturnCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPBackspaceCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u232B" forKey:CPDeleteFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2326" forKey:CPDeleteCharacter];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21F1" forKey:CPHomeFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21F2" forKey:CPEndFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21DE" forKey:CPPageUpFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u21DF" forKey:CPPageDownFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2191" forKey:CPUpArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2193" forKey:CPDownArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2190" forKey:CPLeftArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2192" forKey:CPRightArrowFunctionKey];
+[CPMenuItemStringRepresentationDictionary setObject:"\u2327" forKey:CPClearDisplayFunctionKey];
 
 /*!
     @ingroup appkit
@@ -105,16 +101,6 @@ var CPMenuItemStringRepresentationDictionary = @{
     _CPMenuItemView _menuItemView;
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
-    else if (aBinding === CPTargetBinding || [aBinding hasPrefix:CPArgumentBinding])
-        return [CPActionBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
 - (id)init
 {
     return [self initWithTitle:@"" action:nil keyEquivalent:nil];
@@ -162,6 +148,14 @@ var CPMenuItemStringRepresentationDictionary = @{
     @param isEnabled \c YES enables the item. \c NO disables it.
 */
 - (void)setEnabled:(BOOL)isEnabled
+{
+    if ([_menu autoenablesItems])
+        return;
+
+    [self _setEnabled:isEnabled];
+}
+
+- (void)_setEnabled:(BOOL)isEnabled
 {
     if (_isEnabled === isEnabled)
         return;
@@ -295,7 +289,7 @@ var CPMenuItemStringRepresentationDictionary = @{
 */
 - (void)setFont:(CPFont)aFont
 {
-    if ([_font isEqual:aFont])
+    if (_font == aFont)
         return;
 
     _font = aFont;
@@ -502,7 +496,6 @@ CPOffState
     if (_submenu)
     {
         [_submenu setSupermenu:_menu];
-        [_submenu setTitle:[self title]]
 
         [self setTarget:_menu];
         [self setAction:@selector(submenuAction:)];
@@ -946,33 +939,34 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
         _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];
 
         _isEnabled = DEFAULT_VALUE(CPMenuItemIsEnabledKey, YES);
-        _isHidden = [aCoder decodeBoolForKey:CPMenuItemIsHiddenKey];
-        _tag = [aCoder decodeIntForKey:CPMenuItemTagKey];
-        _state = [aCoder decodeIntForKey:CPMenuItemStateKey];
+        _isHidden = DEFAULT_VALUE(CPMenuItemIsHiddenKey, NO);
+        _tag = DEFAULT_VALUE(CPMenuItemTagKey, 0);
+        _state = DEFAULT_VALUE(CPMenuItemStateKey, CPOffState);
 
-        _image = [aCoder decodeObjectForKey:CPMenuItemImageKey];
-        _alternateImage = [aCoder decodeObjectForKey:CPMenuItemAlternateImageKey];
+        _image = DEFAULT_VALUE(CPMenuItemImageKey, nil);
+        _alternateImage = DEFAULT_VALUE(CPMenuItemAlternateImageKey, nil);
 //    CPImage         _onStateImage;
 //    CPImage         _offStateImage;
 //    CPImage         _mixedStateImage;
 
         // This order matters because setSubmenu: needs _menu to be around.
-        _menu = [aCoder decodeObjectForKey:CPMenuItemMenuKey];
-        [self setSubmenu:[aCoder decodeObjectForKey:CPMenuItemSubmenuKey]];
+        _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
+        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
 
         _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
-        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPMenuItemKeyEquivalentModifierMaskKey];
+        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
 
 //    int             _mnemonicLocation;
 
 //    BOOL            _isAlternate;
 
-        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey]];
+        // Default is 0.
+        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
 
 //    CPString        _toolTip;
 
-        _representedObject = [aCoder decodeObjectForKey:CPMenuItemRepresentedObjectKey];
-        _view = [aCoder decodeObjectForKey:CPMenuItemViewKey];
+        _representedObject = DEFAULT_VALUE(CPMenuItemRepresentedObjectKey, nil);
+        _view = DEFAULT_VALUE(CPMenuItemViewKey, nil);
     }
 
     return self;

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,30 +1,17 @@
-/*
- * _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 "CPView.j"
 
-@import "CPControl.j"
-@import "_CPImageAndTextView.j"
 
-@class _CPMenuBarWindow
-@class _CPMenuView
+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    = [];
 
 @implementation _CPMenuItemMenuBarView : CPView
 {
@@ -37,22 +24,31 @@
     BOOL                    _isDirty;
 
     _CPImageAndTextView     _imageAndTextView;
+    CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-bar-view";
-}
+    if (self !== [_CPMenuItemMenuBarView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"menu-item-selection-color": [CPNull null],
-            @"menu-item-text-shadow-color": [CPNull null],
-            @"horizontal-margin": 12.0,
-            @"submenu-indicator-margin": 3.0,
-            @"vertical-margin": 4.0,
-        };
+    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)view
@@ -66,7 +62,7 @@
 
     if (self)
     {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
 
         [_imageAndTextView setImagePosition:CPImageLeft];
         [_imageAndTextView setImageOffset:3.0];
@@ -75,6 +71,12 @@
 
         [self addSubview:_imageAndTextView];
 
+        _submenuIndicatorView = [[_CPMenuItemMenuBarSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 9.0, 6.0)];
+
+        [_submenuIndicatorView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
+
+        [self addSubview:_submenuIndicatorView];
+
         [self setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
     }
 
@@ -92,14 +94,14 @@
 - (CPColor)textShadowColor
 {
     if (![_menuItem isEnabled])
-        return [CPColor clearColor];
+        return [CPColor colorWithWhite:0.8 alpha:0.8];
 
     return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
 }
 
 - (void)update
 {
-    var x = [self valueForThemeAttribute:@"horizontal-margin"],
+    var x = HORIZONTAL_MARGIN,
         height = 0.0;
 
     [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
@@ -115,13 +117,41 @@
 
     imageAndTextViewFrame.origin.x = x;
     x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame)) + 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
+    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
+
+    var hasSubmenuIndicator = [_menuItem hasSubmenu] && [_menuItem action];
+
+    if (hasSubmenuIndicator)
+    {
+        [_submenuIndicatorView setHidden:NO];
+        [_submenuIndicatorView setColor:[self textColor]];
+        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
+
+        var submenuViewFrame = [_submenuIndicatorView frame];
+
+        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
+
+        x = CGRectGetMaxX(submenuViewFrame);
+        height = MAX(height, CGRectGetHeight(submenuViewFrame));
+    }
+    else
+        [_submenuIndicatorView setHidden:YES];
+
+    height += 2.0 * VERTICAL_MARGIN;
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
 
+    if (hasSubmenuIndicator)
+    {
+        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0) + 1.0;
+        [_submenuIndicatorView setFrame:submenuViewFrame];
+    }
+
+    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
+
     [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
+    [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
 }
 
@@ -134,11 +164,14 @@
     if (shouldHighlight)
     {
         if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView]];
+            [self setBackgroundColor:SelectionColor];
 
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
     }
     else
     {
@@ -147,7 +180,60 @@
         [_imageAndTextView setImage:[_menuItem image]];
         [_imageAndTextView setTextColor:[self textColor]];
         [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+
+        [_submenuIndicatorView setColor:[self textColor]];
+        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
     }
 }
 
 @end
+
+@implementation _CPMenuItemMenuBarSubmenuIndicatorView : CPView
+{
+    CPColor _color;
+    CPColor _shadowColor;
+}
+
+- (void)setColor:(CPColor)aColor
+{
+    if (_color === aColor)
+        return;
+
+    _color = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)setShadowColor:(CPColor)aColor
+{
+    if (_shadowColor === aColor)
+        return;
+
+    _shadowColor = aColor;
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+
+    bounds.size.height -= 1.0;
+    bounds.size.width -= 2.0;
+    bounds.origin.x += 1.0;
+
+    CGContextBeginPath(context);
+
+    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
+    CGContextAddLineToPoint(context, CGRectGetMidX(bounds), CGRectGetMaxY(bounds));
+
+    CGContextClosePath(context);
+
+    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor || [CPColor whiteColor]);
+    CGContextSetFillColor(context, _color || [CPColor blackColor]);
+    CGContextFillPath(context);
+}
+
+@end

AppKit/CPMenuItem/_CPMenuItemSeparatorView.j

@@ -1,29 +1,6 @@
-/*
- * _CPMenuItemSeparatorView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
 
 @import "CPView.j"
 
-@class _CPMenuItemStandardView
-
 
 @implementation _CPMenuItemSeparatorView : CPView
 {
@@ -54,8 +31,8 @@
     CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
     CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
 
-    CGContextSetStrokeColor(context, [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-color" forClass:_CPMenuItemStandardView]);
+    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
     CGContextStrokePath(context);
 }
 
-@end
+@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,38 +1,32 @@
-/*
- * _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"
-@import "CPImageView.j"
-@import "_CPImageAndTextView.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    = [];
 
 @implementation _CPMenuItemStandardView : CPView
 {
     CPMenuItem              _menuItem @accessors(property=menuItem);
 
     CPFont                  _font;
+    CPColor                 _textColor;
+    CPColor                 _textShadowColor;
 
     CGSize                  _minSize @accessors(readonly, property=minSize);
     BOOL                    _isDirty;
-    BOOL                    _highlighted;
 
     CPImageView             _stateView;
     _CPImageAndTextView     _imageAndTextView;
@@ -40,32 +34,26 @@
     CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-standard-view";
-}
+    if (self !== [_CPMenuItemStandardView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"submenu-indicator-color": [CPNull null],
-            @"menu-item-selection-color": [CPNull null],
-            @"menu-item-text-shadow-color": [CPNull null],
-            @"menu-item-text-color": [CPNull null],
-            @"menu-item-default-off-state-image": [CPNull null],
-            @"menu-item-default-off-state-highlighted-image": [CPNull null],
-            @"menu-item-default-on-state-image": [CPNull null],
-            @"menu-item-default-on-state-highlighted-image": [CPNull null],
-            @"menu-item-default-mixed-state-image": [CPNull null],
-            @"menu-item-default-mixed-state-highlighted-image": [CPNull null],
-            @"menu-item-separator-color": [CPNull null],
-            @"left-margin": 3.0,
-            @"right-margin": 17.0,
-            @"state-column-width": 14.0,
-            @"indentation-width": 17.0,
-            @"vertical-margin": 4.0,
-            @"right-columns-margin": 30.0,
-        };
+    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)view
@@ -75,7 +63,7 @@
 
 + (float)_standardLeftMargin
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -86,7 +74,7 @@
     {
         _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
 
-        [_stateView setImageScaling:CPImageScaleNone];
+        [_stateView setImageScaling:CPScaleNone];
 
         [self addSubview:_stateView];
 
@@ -107,7 +95,7 @@
 
         _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
 
-        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
         [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
 
         [self addSubview:_submenuIndicatorView];
@@ -123,10 +111,7 @@
     if (![_menuItem isEnabled])
         return [CPColor lightGrayColor];
 
-    if (_highlighted)
-        return [CPColor whiteColor];
-
-    return [self valueForThemeAttribute:@"menu-item-text-color"];
+    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
 }
 
 - (CPColor)textShadowColor
@@ -134,10 +119,7 @@
     if (![_menuItem isEnabled])
         return nil;
 
-    if (_highlighted)
-        return nil;
-
-    return [self valueForThemeAttribute:@"menu-item-text-shadow-color"];
+    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
 }
 
 - (void)setFont:(CPFont)aFont
@@ -147,34 +129,16 @@
 
 - (void)update
 {
-    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
+    var x = LEFT_MARGIN + [_menuItem indentationLevel] * 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];
 
-        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"];
+        x += STATE_COLUMN_WIDTH;
     }
     else
         [_stateView setHidden:YES];
@@ -198,7 +162,7 @@
         hasSubmenu = [_menuItem hasSubmenu];
 
     if (hasKeyEquivalent || hasSubmenu)
-        x += [self valueForThemeAttribute:@"right-columns-margin"];
+        x += RIGHT_COLUMNS_MARGIN;
 
     if (hasKeyEquivalent)
     {
@@ -209,9 +173,9 @@
         [_keyEquivalentView setTextColor:[self textColor]];
         [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
         [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, [self valueForThemeAttribute:@"vertical-margin"])];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
         [_keyEquivalentView sizeToFit];
-
+        
         var keyEquivalentViewFrame = [_keyEquivalentView frame];
 
         keyEquivalentViewFrame.origin.x = x;
@@ -219,7 +183,7 @@
         height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
 
         if (hasSubmenu)
-            x += [self valueForThemeAttribute:@"right-columns-margin"];
+            x += RIGHT_COLUMNS_MARGIN;
     }
     else
         [_keyEquivalentView setHidden:YES];
@@ -238,28 +202,28 @@
     else
         [_submenuIndicatorView setHidden:YES];
 
-    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
+    height += 2.0 * VERTICAL_MARGIN;
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
 
     if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];
+        [_stateView setFrameSize:CGSizeMake(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 + [self valueForThemeAttribute:@"right-margin"], height);
-
+    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
+    
     [self setAutoresizesSubviews:NO];
     [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
@@ -269,70 +233,39 @@
 {
     // FIXME: This should probably be even throw.
     if (![_menuItem isEnabled])
-        return;
-
-    _highlighted = shouldHighlight;
-
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_keyEquivalentView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+        return; 
 
     if (shouldHighlight)
     {
-        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];
+        [self setBackgroundColor:_CPMenuItemSelectionColor];
+
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_submenuIndicatorView setColor:[self textColor]];
+        [_imageAndTextView setTextColor:[CPColor whiteColor]];
+        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
+        [_submenuIndicatorView setColor:[CPColor whiteColor]];
+
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
     }
     else
     {
         [self setBackgroundColor:nil];
-        [_imageAndTextView setImage:[_menuItem image]];
-        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
-    }
 
+        [_imageAndTextView setImage:[_menuItem image]];
+        [_imageAndTextView setTextColor:[self textColor]];
+        [_keyEquivalentView setTextColor:[self textColor]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+
+        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+    }
+    
     if ([[_menuItem menu] showsStateColumn])
     {
         if (shouldHighlight)
-        {
-            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;
-            }
-        }
+            [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
         else
-        {
-            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;
-            }
-        }
+            [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
     }
 }
 
@@ -357,15 +290,15 @@
 {
     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);
 }

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,32 +1,22 @@
-/*
- * _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 "CPControl.j"
+@import <AppKit/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    = [];
 
 /*
     @ignore
@@ -48,22 +38,31 @@
     CPView                  _submenuView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-view";
+    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;
 }
 
-+ (id)themeAttributes
++ (float)leftMargin
 {
-    return @{};
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
 }
 
-// Not used in the Appkit
-// + (float)leftMargin
-// {
-//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-// }
-
 - (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
 {
     self = [super initWithFrame:aFrame];
@@ -177,7 +176,7 @@
 
 - (void)setFont:(CPFont)aFont
 {
-    if ([_font isEqual:aFont])
+    if (_font === aFont)
         return;
 
     _font = aFont;
@@ -246,6 +245,8 @@
     CGContextMoveToPoint(context, 1.0, 4.0);
     CGContextAddLineToPoint(context, 9.0, 4.0);
     CGContextAddLineToPoint(context, 5.0, 8.0);
+    CGContextAddLineToPoint(context, 1.0, 4.0);
+
     CGContextClosePath(context);
 
     CGContextSetFillColor(context, _color);

AppKit/CPObjectController.j

@@ -22,10 +22,8 @@
 
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPCountedSet.j>
-@import <Foundation/_CPCollectionKVCOperators.j>
 
 @import "CPController.j"
-@import "CPKeyValueBinding.j"
 
 /*!
     @class
@@ -53,9 +51,6 @@
 
 + (id)initialize
 {
-    if (self !== [CPObjectController class])
-        return;
-
     [self exposeBinding:@"editable"];
     [self exposeBinding:@"contentObject"];
 }
@@ -106,13 +101,11 @@
 {
     if (self = [super init])
     {
+        [self setContent:aContent];
         [self setEditable:YES];
         [self setObjectClass:[CPMutableDictionary class]];
 
         _observedKeys = [[CPCountedSet alloc] init];
-        _selection = [[CPControllerSelectionProxy alloc] initWithController:self];
-
-        [self setContent:aContent];
     }
 
     return self;
@@ -138,8 +131,8 @@
 
     _contentObject = aContent;
 
-    [self _selectionDidChange];
     [self didChangeValueForKey:@"contentObject"];
+    [self _selectionDidChange];
 }
 
 /*!
@@ -378,7 +371,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
         [self setObjectClass:objectClass || [CPMutableDictionary class]];
         [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
-        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
+        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey] || NO];
         [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];
 
         _observedKeys = [[CPCountedSet alloc] init];
@@ -520,12 +513,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
 {
-    if (aKeyPath.charAt(0) === "@")
+    if (aKeyPath.indexOf("@") === 0)
     {
-        // Simple collection operators are scalar and can't be proxied
-        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
-            return;
-
         var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self];
 
         proxy._options = options;
@@ -548,12 +537,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
 {
-    if (aKeyPath.charAt(0) === "@")
+    if (aKeyPath.indexOf("@") === 0)
     {
-        // Simple collection operators are scalar and can't be proxied
-        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
-            return;
-
         var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self],
             index = [_observationProxies indexOfObject:proxy];
 
@@ -578,7 +563,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
@@ -594,18 +579,16 @@ 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],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
 
-        [currentObject removeObserver:proxy forKeyPath:keyPath];
+        [anObject removeObserver:proxy forKeyPath:keyPath];
 
         if (operator)
             [self didChangeValueForKey:keyPath];
@@ -637,7 +620,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
-            operator = keyPath.charAt(0) === ".";
+            operator = keyPath.indexOf(".") === 0;
 
         if (operator)
             [self willChangeValueForKey:keyPath];
@@ -669,7 +652,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 {
     if (self = [super init])
     {
-        _cachedValues = @{};
+        _cachedValues = [CPDictionary dictionary];
         _observationProxies = [CPArray array];
         _controller = aController;
         _observedObjectsByKeyPath = {};
@@ -680,8 +663,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)_controllerMarkerForValues:(CPArray)theValues
 {
-    var count = [theValues count],
-        value;
+    var count = [theValues count];
 
     if (!count)
         value = CPNoSelectionMarker;
@@ -695,7 +677,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;
@@ -712,17 +694,11 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 - (id)valueForKeyPath:(CPString)theKeyPath
 {
     var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
+    value = [self _controllerMarkerForValues:values];
 
-    // Simple collection operators like @count return a scalar value, not an array or set
-    if ([values isKindOfClass:CPArray] || [values isKindOfClass:CPSet])
-    {
-        var value = [self _controllerMarkerForValues:values];
-        [_cachedValues setObject:value forKey:theKeyPath];
+    [_cachedValues setObject:value forKey:theKeyPath];
 
-        return value;
-    }
-    else
-        return values;
+    return value;
 }
 
 - (id)valueForKey:(CPString)theKeyPath
@@ -800,7 +776,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [proxy setNotifyObject:YES];
     [_observationProxies addObject:proxy];
 
-    // We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
+    // We keep are reference to the observed objects
+    // because the removeObserver: will be called after the selection changes
     var observedObjects = [_controller selectedObjects];
     _observedObjectsByKeyPath[aKeyPath] = observedObjects;
     [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
@@ -816,7 +793,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
     [_observationProxies removeObjectAtIndex:index];
 
-    _observedObjectsByKeyPath[aKeyPath] = nil;
+    _observedObjects = nil;
 }
 
 @end

AppKit/CPOpenPanel.j

@@ -47,9 +47,9 @@
         var options = { directoryURL: [self directoryURL],
                         canChooseFiles: [self canChooseFiles],
                         canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] },
+                        allowsMultipleSelection: [self allowsMultipleSelection] };
 
-            result = window.cpOpenPanel(options);
+        var result = window.cpOpenPanel(options);
 
         _URLs = result.URLs;
 

AppKit/CPOutlineView.j

@@ -20,11 +20,9 @@
  * 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";
@@ -35,21 +33,20 @@ CPOutlineViewItemWillExpandNotification         = @"CPOutlineViewItemWillExpandN
 CPOutlineViewSelectionDidChangeNotification     = @"CPOutlineViewSelectionDidChangeNotification";
 CPOutlineViewSelectionIsChangingNotification    = @"CPOutlineViewSelectionIsChangingNotification";
 
-var CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_                          = 1 << 1,
-    CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 2,
-    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 3,
+var CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_                       = 1 << 1,
+    CPOutlineViewDataSource_outlineView_shouldDeferDisplayingChildrenOfItem_                        = 1 << 2,
 
-    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 4,
-    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 5,
-    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 6,
-    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 7,
+    CPOutlineViewDataSource_outlineView_acceptDrop_item_childIndex_                                 = 1 << 3,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedItem_proposedChildIndex_               = 1 << 4,
+    CPOutlineViewDataSource_outlineView_validateDrop_proposedRow_proposedDropOperation_             = 1 << 5,
+    CPOutlineViewDataSource_outlineView_namesOfPromisedFilesDroppedAtDestination_forDraggedItems_   = 1 << 6,
 
-    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 8,
-    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 9,
+    CPOutlineViewDataSource_outlineView_itemForPersistentObject_                                    = 1 << 7,
+    CPOutlineViewDataSource_outlineView_persistentObjectForItem_                                    = 1 << 8,
 
-    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 10,
+    CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_                                    = 1 << 9,
 
-    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 11;
+    CPOutlineViewDataSource_outlineView_sortDescriptorsDidChange_                                   = 1 << 10;
 
 var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_                                  = 1 << 1,
     CPOutlineViewDelegate_outlineView_didClickTableColumn_                                          = 1 << 2,
@@ -65,7 +62,7 @@ var CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_
     CPOutlineViewDelegate_outlineView_shouldReorderColumn_toColumn_                                 = 1 << 12,
     CPOutlineViewDelegate_outlineView_shouldSelectItem_                                             = 1 << 13,
     CPOutlineViewDelegate_outlineView_shouldSelectTableColumn_                                      = 1 << 14,
-    CPOutlineViewDelegate_outlineView_shouldShowOutlineDisclosureControlForItem_                    = 1 << 15,
+    CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                                 = 1 << 15,
     CPOutlineViewDelegate_outlineView_shouldShowViewExpansionForTableColumn_item_                   = 1 << 16,
     CPOutlineViewDelegate_outlineView_shouldTrackView_forTableColumn_item_                          = 1 << 17,
     CPOutlineViewDelegate_outlineView_shouldTypeSelectForEvent_withCurrentSearchString_             = 1 << 18,
@@ -83,10 +80,6 @@ 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
@@ -143,7 +136,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, shouldShowOutlineDisclosureControl:NO, level:-1, row:-1, children:[], weight:0 };
+        _rootItemInfo = { isExpanded:YES, isExpandable:NO, level:-1, row:-1, children:[], weight:0 };
 
         _itemsForRows = [];
         _itemInfosForItems = { };
@@ -154,6 +147,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 
         _retargedChildIndex = nil;
         _shouldRetargetChildIndex = NO;
+        _startHoverTime = nil;
 
         [self setIndentationPerLevel:16.0];
         [self setIndentationMarkerFollowsDataView:YES];
@@ -231,12 +225,12 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     if (![aDataSource respondsToSelector:@selector(outlineView:numberOfChildrenOfItem:)])
         [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:numberOfChildrenOfItem:'"];
 
+    if (![aDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
+        [CPException raise:CPInternalInconsistencyException reason:"Data source must implement 'outlineView:objectValueForTableColumn:byItem:'"];
+
     _outlineViewDataSource = aDataSource;
     _implementedOutlineViewDataSourceMethods = 0;
 
-    if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:objectValueForTableColumn:byItem:)])
-        _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
-
     if ([_outlineViewDataSource respondsToSelector:@selector(outlineView:setObjectValue:forTableColumn:byItem:)])
         _implementedOutlineViewDataSourceMethods |= CPOutlineViewDataSource_outlineView_setObjectValue_forTableColumn_byItem_;
 
@@ -300,19 +294,6 @@ 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.
 
@@ -379,8 +360,9 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         var previousRowCount = [self numberOfRows];
 
         itemInfo.isExpanded = YES;
-        [self reloadItem:anItem reloadChildren:YES];
+        // XXX Shouldn't the items reload before the notification is sent?
         [self _noteItemDidExpand:anItem];
+        [self reloadItem:anItem reloadChildren:YES];
 
         // Shift selection indexes below so that the same items remain selected.
         var rowCountDelta = [self numberOfRows] - previousRowCount;
@@ -471,8 +453,9 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     }
     itemInfo.isExpanded = NO;
 
-    [self reloadItem:anItem reloadChildren:YES];
+    // XXX Shouldn't the items reload before the notification is sent?
     [self _noteItemDidCollapse:anItem];
+    [self reloadItem:anItem reloadChildren:YES];
 
     // Send selection notifications only after the items have loaded so that
     // the new selection is consistent with the actual rows for any observers.
@@ -707,13 +690,11 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 */
 - (CGRect)frameOfOutlineDisclosureControlAtRow:(CPInteger)aRow
 {
-    var theItem = [self itemAtRow:aRow];
-    if (![self isExpandable:theItem] || ![self _shouldShowOutlineDisclosureControlForItem:theItem])
+    if (![self isExpandable:[self itemAtRow:aRow]])
         return _CGRectMakeZero();
 
     var dataViewFrame = [self _frameOfOutlineDataViewAtRow:aRow],
-        disclosureWidth = _CGRectGetWidth([_disclosureControlPrototype frame]),
-        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - disclosureWidth, _CGRectGetMinY(dataViewFrame), disclosureWidth, _CGRectGetHeight(dataViewFrame));
+        frame = _CGRectMake(_CGRectGetMinX(dataViewFrame) - 10, _CGRectGetMinY(dataViewFrame), 10, _CGRectGetHeight(dataViewFrame));
 
     return frame;
 }
@@ -841,24 +822,29 @@ 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
@@ -884,7 +870,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_shouldShowOutlineDisclosureControlForItem_         , @selector(outlineView:shouldShowOutlineDisclosureControlForItem:),
+            CPOutlineViewDelegate_outlineView_shouldShowOutlineViewForItem_                      , @selector(outlineView:shouldShowOutlineViewForItem:),
             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:),
@@ -935,6 +921,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             name:CPOutlineViewSelectionIsChangingNotification
             object:self];
 
+
     if ([_outlineViewDelegate respondsToSelector:@selector(outlineViewItemWillExpand:)])
         [defaultCenter
             addObserver:_outlineViewDelegate
@@ -997,7 +984,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     _disclosureControlData = nil;
     _disclosureControlQueue = [];
 
-    // FIXME: really?
+    // fIXME: really?
     [self reloadData];
 }
 
@@ -1055,12 +1042,11 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     @ignore
     We need to offset the dataview and add the disclosure triangle.
 */
-- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CGPoint)theDragViewOffset
+- (CPView)_dragViewForColumn:(int)theColumnIndex event:(CPEvent)theDragEvent offset:(CPPointPointer)theDragViewOffset
 {
     var dragView = [[_CPColumnDragView alloc] initWithLineColor:[self gridColor]],
         tableColumn = [[self tableColumns] objectAtIndex:theColumnIndex],
-        defaultRowHeight = [self valueForThemeAttribute:@"default-row-height"],
-        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + defaultRowHeight),
+        bounds = _CGRectMake(0.0, 0.0, [tableColumn width], _CGRectGetHeight([self exposedRect]) + 23.0),
         columnRect = [self rectOfColumn:theColumnIndex],
         headerView = [tableColumn headerView],
         row = [_exposedRows firstIndex];
@@ -1074,7 +1060,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         dataViewFrame.origin.x = 0.0;
 
         // Offset by table header height - scroll position
-        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + defaultRowHeight;
+        dataViewFrame.origin.y = ( _CGRectGetMinY(dataViewFrame) - _CGRectGetMinY([self exposedRect]) ) + 23.0;
         [dataView setFrame:dataViewFrame];
 
         [dataView setObjectValue:[self _objectValueForTableColumn:tableColumn row:row]];
@@ -1134,14 +1120,13 @@ 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];
     }
@@ -1188,7 +1173,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     @ignore
 */
-- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CGPoint)theOffset
+- (id)_parentItemForUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex atMouseOffset:(CPPoint)theOffset
 {
     if (_shouldRetargetItem)
         return _retargetedItem;
@@ -1218,7 +1203,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
 /*!
     @ignore
 */
-- (CGRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CGPoint)theOffset
+- (CPRect)_rectForDropHighlightViewBetweenUpperRow:(int)theUpperRowIndex andLowerRow:(int)theLowerRowIndex offset:(CPPoint)theOffset
 {
     // Call super and the update x to reflect the current indentation level
     var rect = [super _rectForDropHighlightViewBetweenUpperRow:theUpperRowIndex andLowerRow:theLowerRowIndex offset:theOffset],
@@ -1299,12 +1284,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
             item = _itemsForRows[row],
             isExpandable = [self isExpandable:item];
 
-        if (!isExpandable)
-            continue;
-
-        var disclosureControlFrame = [self frameOfOutlineDisclosureControlAtRow:row];
-
-        if (_CGRectIsEmpty(disclosureControlFrame))
+       if (!isExpandable)
             continue;
 
         var control = [self _dequeueDisclosureControl];
@@ -1314,7 +1294,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:disclosureControlFrame];
+        [control setFrame:[self frameOfOutlineDisclosureControlAtRow:row]];
 
         [self addSubview:control];
     }
@@ -1367,7 +1347,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
         [self collapseItem:item];
 
     else
-        [self expandItem:item expandChildren:([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask)];
+        [self expandItem:item];
 }
 
 /*!
@@ -1442,7 +1422,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemWillExpandNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 /*!
@@ -1453,7 +1433,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemDidExpandNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 /*!
@@ -1464,7 +1444,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemWillCollapseNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 /*!
@@ -1475,73 +1455,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff  = 0,
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPOutlineViewItemDidCollapseNotification
                       object:self
-                    userInfo:@{ "CPObject": item }];
-}
-
-- (void)keyDown:(CPEvent)anEvent
-{
-    var character = [anEvent charactersIgnoringModifiers],
-        modifierFlags = [anEvent modifierFlags];
-
-    // 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)
-        return [super keyDown:anEvent];
-
-    var rows = [self selectedRowIndexes],
-        indexes = [],
-        items = [];
-
-    [rows getIndexes:indexes maxCount:-1 inIndexRange:nil];
-
-    var i = 0,
-        c = [indexes count];
-
-    for (; i < c; i++)
-        items.push([self itemAtRow:indexes[i]]);
-
-    if (character === CPRightArrowFunctionKey)
-    {
-        for (var i = 0; i < c; i++)
-            [self expandItem:items[i]];
-    }
-    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]];
-    }
-
-    [super keyDown:anEvent];
-}
-
-- (BOOL)_dataSourceRespondsToObjectValueForTableColumn
-{
-    return _implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_objectValue_forTableColumn_byItem_;
-}
-
-- (BOOL)_delegateRespondsToDataViewForTableColumn
-{
-    return _implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_;
+                    userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]];
 }
 
 @end
@@ -1582,9 +1496,8 @@ 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)
@@ -1608,7 +1521,6 @@ 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.
@@ -1639,7 +1551,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 
                 if (!childItemInfo)
                 {
-                    childItemInfo = { isExpanded:NO, isExpandable:NO, shouldShowOutlineDisclosureControl:YES, children:[], weight:1 };
+                    childItemInfo = { isExpanded:NO, isExpandable:NO, children:[], weight:1 };
                     itemInfosForItems[[childItem UID]] = childItemInfo;
                 }
 
@@ -1690,7 +1602,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
         }
     }//end of with
     return descendants;
-};
+}
 
 @implementation _CPOutlineViewTableViewDataSource : CPObject
 {
@@ -1741,7 +1653,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:(CGPoint)theOffset
+- (int)_childIndexForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
 {
     if (_outlineView._shouldRetargetChildIndex)
         return _outlineView._retargedChildIndex;
@@ -1765,7 +1677,7 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return childIndex;
 }
 
-- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CGPoint)theOffset
+- (void)_parentItemForDropOperation:(CPTableViewDropOperation)theDropOperation row:(int)theRow offset:(CPPoint)theOffset
 {
     if (theDropOperation === CPTableViewDropAbove)
         return [_outlineView _parentItemForUpperRow:theRow - 1 andLowerRow:theRow atMouseOffset:theOffset]
@@ -1837,14 +1749,27 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
     return self;
 }
 
-- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
+- (CPView)tableView:(CPTableView)theTableView dataViewForTableColumn:(CPTableColumn)theTableColumn row:(int)theRow
 {
-    return SHOULD_SELECT_ITEM(_outlineView, [_outlineView itemAtRow:theRow]);
+    var dataView = nil;
+
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
+            dataView = [_outlineView._outlineViewDelegate outlineView:_outlineView
+                                           dataViewForTableColumn:theTableColumn
+                                                             item:[_outlineView itemAtRow:theRow]];
+
+    if (!dataView)
+        dataView = [theTableColumn dataViewForRow:theRow];
+
+    return dataView;
 }
 
-- (BOOL)selectionShouldChangeInTableView:(CPTableView)theTableView
+- (BOOL)tableView:(CPTableView)theTableView shouldSelectRow:(int)theRow
 {
-    return SELECTION_SHOULD_CHANGE(_outlineView);
+    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_shouldSelectItem_))
+        return [_outlineView._outlineViewDelegate outlineView:_outlineView shouldSelectItem:[_outlineView itemAtRow:theRow]];
+
+    return YES;
 }
 
 - (BOOL)tableView:(CPTableView)aTableView shouldEditTableColumn:(CPTableColumn)aColumn row:(int)aRow
@@ -1888,19 +1813,6 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
         return [_outlineView._outlineViewDelegate outlineView:_outlineView menuForTableColumn:aTableColumn item:item]
     }
 
-    // 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];
-}
-
-- (CPView)tableView:(CPTableView)aTableView dataViewForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
-{
-    if ((_outlineView._implementedOutlineViewDelegateMethods & CPOutlineViewDelegate_outlineView_dataViewForTableColumn_item_))
-    {
-        var item = [_outlineView itemAtRow:aRow];
-        return [_outlineView._outlineViewDelegate outlineView:_outlineView dataViewForTableColumn:aTableColumn item:item]
-    }
-
     return nil;
 }
 
@@ -1935,41 +1847,42 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
 - (void)drawRect:(CGRect)aRect
 {
     var bounds = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+        context = [[CPGraphicsContext currentContext] graphicsPort];
 
     CGContextBeginPath(context);
 
-    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);
-    }
+    CGContextTranslateCTM(context, _CGRectGetWidth(bounds) / 2.0, _CGRectGetHeight(bounds) / 2.0);
+    CGContextRotateCTM(context, _angle);
+    CGContextTranslateCTM(context, -_CGRectGetWidth(bounds) / 2.0, -_CGRectGetHeight(bounds) / 2.0);
 
     // Center, but crisp.
-    CGContextTranslateCTM(context, FLOOR((width - 9.0) / 2.0), FLOOR((height - 8.0) / 2.0));
+    CGContextTranslateCTM(context, FLOOR((_CGRectGetWidth(bounds) - 9.0) / 2.0), FLOOR((_CGRectGetHeight(bounds) - 8.0) / 2.0));
 
     CGContextMoveToPoint(context, 0.0, 0.0);
     CGContextAddLineToPoint(context, 9.0, 0.0);
     CGContextAddLineToPoint(context, 4.5, 8.0);
-    CGContextClosePath(context);
+    CGContextAddLineToPoint(context, 0.0, 0.0);
 
+    CGContextClosePath(context);
     CGContextSetFillColor(context,
         colorForDisclosureTriangle([self hasThemeState:CPThemeStateSelected],
             [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);
+    }
 
-    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.7]);
+    else
+        CGContextAddLineToPoint(context, 4.5, 8.0);
+
+    CGContextSetStrokeColor(context, [CPColor colorWithCalibratedWhite:1.0 alpha: 0.8]);
     CGContextStrokePath(context);
 }
 
@@ -2033,8 +1946,7 @@ var CPOutlineViewIndentationPerLevelKey = @"CPOutlineViewIndentationPerLevelKey"
 @end
 
 
-var colorForDisclosureTriangle = function(isSelected, isHighlighted)
-{
+var colorForDisclosureTriangle = function(isSelected, isHighlighted) {
     return isSelected
         ? (isHighlighted
             ? [CPColor colorWithCalibratedWhite:0.9 alpha: 1.0]
@@ -2042,4 +1954,4 @@ var colorForDisclosureTriangle = function(isSelected, isHighlighted)
         : (isHighlighted
             ? [CPColor colorWithCalibratedWhite:0.4 alpha: 1.0]
             : [CPColor colorWithCalibratedWhite:0.5 alpha: 1.0]);
-};
+}

AppKit/CPPanel.j

@@ -114,9 +114,4 @@ CPDocModalWindowMask    = 1 << 6;
     return NO;
 }
 
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
-
 @end

AppKit/CPPasteboard.j

@@ -22,7 +22,6 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
-@import <Foundation/CPData.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
@@ -74,12 +73,12 @@ var CPPasteboards = nil,
 */
 + (void)initialize
 {
-    if (self !== [CPPasteboard class])
+    if (self != [CPPasteboard class])
         return;
 
     [self setVersion:1.0];
 
-    CPPasteboards = @{};
+    CPPasteboards = [CPDictionary dictionary];
 
     if (typeof window.cpPasteboardWithName !== "undefined")
         supportsNativePasteboard = YES;
@@ -118,11 +117,11 @@ var CPPasteboards = nil,
 
     if (self)
     {
-//        _name = aName;
+        _name = aName;
         _types = [];
 
-        _owners = @{};
-        _provided = @{};
+        _owners = [CPDictionary dictionary];
+        _provided = [CPDictionary dictionary];
 
         _changeCount = 0;
 
@@ -188,8 +187,8 @@ var CPPasteboards = nil,
 {
     [_types setArray:types];
 
-    _owners = @{};
-    _provided = @{};
+    _owners = [CPDictionary dictionary];
+    _provided = [CPDictionary dictionary];
 
     var count = _types.length;
 
@@ -248,14 +247,14 @@ var CPPasteboards = nil,
 
 // Determining Types
 /*!
-    Checks the pasteboard's types for a match with the types listed in the specified array. The array should
+    Checks the pasteboard's types for a match with the types listen in the specified array. The array should
     be ordered by the requestor's most preferred data type first.
     @param anArray an array of requested types ordered by preference
     @return the highest match with the pasteboard's supported types or \c nil if no match was found
 */
 - (CPString)availableTypeFromArray:(CPArray)anArray
 {
-    return [anArray firstObjectCommonWithArray:[self types]];
+    return [[self types] firstObjectCommonWithArray:anArray];
 }
 
 /*!

AppKit/CPPopUpButton.j

@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CGGeometry.j"
 @import "CPButton.j"
-@import "CPKeyValueBinding.j"
+@import "CPGeometry.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,7 +193,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 - (void)removeAllItems
 {
     [[self menu] removeAllItems];
-    [self synchronizeTitleAndSelectedItem];
 }
 
 /*!
@@ -246,6 +245,22 @@ 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.
@@ -571,18 +586,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
             if ([indexes containsIndex:0] && [self pullsDown])
                 [self _firstItemDidChange];
 
-            if (![self pullsDown] && [indexes containsIndex:indexOfSelectedItem])
-            {
-                // If the selected item is removed the first item becomes selected.
-                indexOfSelectedItem = 0;
-            }
-            else
-            {
-                // See whether the index has changed, despite the actual item not changing.
-                while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                        index <= indexOfSelectedItem)
-                    --indexOfSelectedItem;
-            }
+            // See whether the index has changed, despite the actual item not changing.
+            while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
+                    index <= indexOfSelectedItem)
+                --indexOfSelectedItem;
 
             [self selectItemAtIndex:indexOfSelectedItem];
         }
@@ -679,7 +686,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     if ([self pullsDown])
     {
         var positionedItem = nil,
-            location = CGPointMake(0.0, CGRectGetMaxY(bounds) - 1);
+            location = CGPointMake(0.0, CGRectGetMaxY(bounds));
     }
     else
     {
@@ -768,286 +775,6 @@ 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",

AppKit/CPPopover.j

@@ -1,367 +0,0 @@
-/*
- * CPPopover.j
- * AppKit
- *
- * Created by Antoine Mercadal.
- * Copyright 2011 Antoine Mercadal.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CPButton.j"
-@import "CPColor.j"
-@import "CPImage.j"
-@import "CPImageView.j"
-@import "CPResponder.j"
-@import "CPView.j"
-@import "_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_didClose_     = 1 << 4;
-
-
-/*! @ingroup appkit
-    @class CPPopover
-
-    This class represent a widget that displays a popover
-    view relative to another one.
-
-    Delegate can implement:
-
-    @code
-    – popoverShouldClose:(CPPopover)aPopOver
-    – popoverWillShow:(CPPopover)aPopOver
-    – popoverDidShow:(CPPopover)aPopOver
-    – popoverWillClose:(CPPopover)aPopOver
-    – popoverDidClose:(CPPopover)aPopOver
-    @endcode
-*/
-@implementation CPPopover : CPResponder
-{
-    @outlet CPViewController    _contentViewController  @accessors(property=contentViewController);
-    @outlet id                  _delegate               @accessors(getter=delegate);
-
-    BOOL                        _animates               @accessors(property=animates);
-    int                         _appearance             @accessors(property=appearance);
-    int                         _behavior               @accessors(getter=behavior);
-
-    _CPPopoverWindow            _popoverWindow;
-    int                         _implementedDelegateMethods;
-}
-
-
-#pragma mark -
-#pragma mark Initialization
-
-/*!
-    Initialize the CPPopover witn default values
-
-    @returns an initialized CPPopover
-*/
-- (CPPopover)init
-{
-    if (self = [super init])
-    {
-        _animates      = YES;
-        _appearance    = CPPopoverAppearanceMinimal;
-        _behavior      = CPPopoverBehaviorApplicationDefined;
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Getters / Setters
-
-/*!
-    Returns the current rect of the popover
-
-    @return CGRect representing the frame of the popover
-*/
-- (CGRect)positioningRect
-{
-    if (![_popoverWindow isVisible])
-        return CGRectMakeZero();
-
-    return [_popoverWindow frame];
-}
-
-/*! Sets the frame of the popover
-    @param aRect the desired frame
-*/
-- (void)setPositioningRect:(CGRect)aRect
-{
-    if (![_popoverWindow isVisible])
-        return;
-
-    [_popoverWindow setFrame:aRect];
-}
-
-/*!
-    Returns the size of the popover's view
-
-    @return CGSize representing the size of the popover's view
-*/
-- (CGSize)contentSize
-{
-    if (![_popoverWindow isVisible])
-        return CGRectMakeZero();
-
-    return [[_contentViewController view] frameSize];
-}
-
-/*!
-    Sets the size of of the popover's view
-
-    @param aSize the desired size
-*/
-- (void)setContentSize:(CGSize)aSize
-{
-    [[_contentViewController view] setFrameSize:aSize];
-}
-
-/*!
-    Indicates if CPPopover is visible
-
-    @returns \c YES if visible
-*/
-- (BOOL)isShown
-{
-    return [_popoverWindow isVisible];
-}
-
-/*!
-Set the behavior of the CPPopover. It can be:
-
-- \c CPPopoverBehaviorTransient: the popover will close if another control outside the popover becomes the responder
-- \c CPPopoverBehaviorApplicationDefined: (DEFAULT) the application is responsible for closing the popover
-
-@param aBehavior the desired behavior
-*/
-- (void)setBehavior:(int)aBehavior
-{
-    if (_behavior == aBehavior)
-        return;
-
-    _behavior = aBehavior;
-    [_popoverWindow setStyleMask:[self styleMaskForBehavior]];
-}
-
-- (void)setDelegate:(id)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(popoverWillShow:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_willShow_;
-
-    if ([_delegate respondsToSelector:@selector(popoverDidShow:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_didShow_;
-
-    if ([_delegate respondsToSelector:@selector(popoverShouldClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_shouldClose_;
-
-    if ([_delegate respondsToSelector:@selector(popoverWillClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_willClose_;
-
-    if ([_delegate respondsToSelector:@selector(popoverDidClose:)])
-        _implementedDelegateMethods |= CPPopoverDelegate_popover_didClose_;
-}
-
-#pragma mark -
-#pragma mark Positioning
-
-/*!
-    Show the popover
-
-    @param positioningRect if set, the popover will be positionned to a random rect relative to the window
-    @param positioningView if set, the popover will be positioned relative to this view
-    @param preferredEdge: \c CPRectEdge representing the preferred positioning.
-*/
-- (void)showRelativeToRect:(CGRect)positioningRect ofView:(CPView)positioningView preferredEdge:(CPRectEdge)preferredEdge
-{
-    if (!positioningView)
-        [CPException raise:CPInvalidArgumentException reason:"positionView must not be nil"];
-
-    if (!_contentViewController)
-        [CPException raise:CPInternalInconsistencyException reason:@"contentViewController must not be nil"];
-
-    // If the popover is currently closing, do nothing. That is what Cocoa does.
-    if ([_popoverWindow isClosing])
-        return;
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_)
-        [_delegate popoverWillShow:self];
-
-    if (!_popoverWindow)
-    {
-        _popoverWindow = [[_CPPopoverWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:[self styleMaskForBehavior]];
-    }
-
-    [_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 (!_animates && _implementedDelegateMethods & CPPopoverDelegate_popover_didShow_)
-        [_delegate popoverDidShow:self];
-}
-
-- (unsigned)styleMaskForBehavior
-{
-    return (_behavior == CPPopoverBehaviorTransient) ? CPClosableOnBlurWindowMask : 0;
-}
-
-/*!
-    Closes the popover
-*/
-- (void)close
-{
-    [self _close];
-}
-
-/*!
-    Closes the popover
-*/
-- (void)_close
-{
-    if ([_popoverWindow isClosing] || ![self isShown])
-        return;
-
-    if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_)
-        [_delegate popoverWillClose:self];
-
-    [_popoverWindow close];
-
-    // popoverDidClose will be sent from popoverWindowDidClose, since
-    // the popover window will close asynchronously when animating.
-}
-
-
-#pragma mark -
-#pragma mark Action
-
-/*!
-    Close the popover
-
-    @param sender the sender of the action
-*/
-- (IBAction)performClose:(id)sender
-{
-    if ([_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)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _appearance = [aCoder decodeIntForKey:CPPopoverAppearanceKey];
-        _animates = [aCoder decodeBoolForKey:CPPopoverAnimatesKey];
-        _contentViewController = [aCoder decodeObjectForKey:CPPopoverContentViewControllerKey];
-        [self setDelegate:[aCoder decodeObjectForKey:CPPopoverDelegateKey]];
-        [self setBehavior:[aCoder decodeIntForKey:CPPopoverBehaviorKey]];
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_appearance forKey:CPPopoverAppearanceKey];
-    [aCoder encodeBool:_animates forKey:CPPopoverAnimatesKey];
-    [aCoder encodeObject:_contentViewController forKey:CPPopoverContentViewControllerKey];
-    [aCoder encodeObject:_delegate forKey:CPPopoverDelegateKey];
-    [aCoder encodeInt:_behavior forKey:CPPopoverBehaviorKey];
-}
-
-@end

AppKit/CPProgressIndicator.j

@@ -23,26 +23,29 @@
 @import "CGGeometry.j"
 @import "CPImageView.j"
 @import "CPView.j"
-@import "CPWindow_Constants.j"
 
 
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorBarStyle = 0;
+CPProgressIndicatorBarStyle         = 0;
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorSpinningStyle = 1;
+CPProgressIndicatorSpinningStyle    = 1;
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorHUDBarStyle = 2;
+CPProgressIndicatorHUDBarStyle      = 2;
 
-var CPProgressIndicatorSpinningStyleColors = [];
+var CPProgressIndicatorSpinningStyleColors  = nil,
+
+    CPProgressIndicatorClassName            = nil,
+    CPProgressIndicatorStyleIdentifiers     = nil,
+    CPProgressIndicatorStyleSizes           = nil;
 
 /*!
     @ingroup appkit
@@ -61,39 +64,77 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
     CPControlSize               _controlSize;
 
-    BOOL                        _indeterminate;
+    BOOL                        _isIndeterminate;
     CPProgressIndicatorStyle    _style;
 
     BOOL                        _isAnimating;
 
     BOOL                        _isDisplayedWhenStoppedSet;
     BOOL                        _isDisplayedWhenStopped;
+
+    CPView                      _barView;
 }
 
-+ (CPString)defaultThemeClass
+/*
+    @ignore
+*/
++ (void)initialize
 {
-    return @"progress-indicator";
-}
+    if (self != [CPProgressIndicator class])
+        return;
 
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"indeterminate-bar-color": [CPNull null],
-            @"bar-color": [CPNull null],
-            @"default-height": 20,
-            @"bezel-color": [CPNull null],
-            @"spinning-mini-gif": [CPNull null],
-            @"spinning-small-gif": [CPNull null],
-            @"spinning-regular-gif": [CPNull null],
-        };
-}
+    var bundle = [CPBundle bundleForClass:self];
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding || aBinding === @"isIndeterminate")
-        return [_CPProgressIndicatorBinder class];
+    CPProgressIndicatorSpinningStyleColors = [];
 
-    return [super _binderClassForBinding:aBinding];
+    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)];
+    }
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -112,7 +153,8 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
         _controlSize = CPRegularControlSize;
 
-        [self setNeedsLayout];
+        [self updateBackgroundColor];
+        [self drawBar];
     }
 
     return self;
@@ -274,12 +316,12 @@ var CPProgressIndicatorSpinningStyleColors = [];
     Specifies whether this progress indicator should be indeterminate or display progress based on it's max and min.
     @param isDeterminate \c YES makes the indicator indeterminate
 */
-- (void)setIndeterminate:(BOOL)indeterminate
+- (void)setIndeterminate:(BOOL)isIndeterminate
 {
-    if (_indeterminate == indeterminate)
+    if (_isIndeterminate == isIndeterminate)
         return;
 
-    _indeterminate = indeterminate;
+    _isIndeterminate = isIndeterminate;
 
     [self updateBackgroundColor];
 }
@@ -289,7 +331,7 @@ var CPProgressIndicatorSpinningStyleColors = [];
 */
 - (BOOL)isIndeterminate
 {
-    return _indeterminate;
+    return _isIndeterminate;
 }
 
 /*!
@@ -303,8 +345,6 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
     _style = aStyle;
 
-    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-
     [self updateBackgroundColor];
 }
 
@@ -316,7 +356,8 @@ var CPProgressIndicatorSpinningStyleColors = [];
     if (_style == CPProgressIndicatorSpinningStyle)
         [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
     else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + _CPControlIdentifierForControlSize(_controlSize)][0].height)];
 }
 
 /*!
@@ -366,71 +407,56 @@ var CPProgressIndicatorSpinningStyleColors = [];
 /* @ignore */
 - (void)drawBar
 {
-    [self setNeedsLayout];
-}
+    if (_style == CPProgressIndicatorSpinningStyle)
+        return;
 
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
-{
-    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
+    if (!_barView)
     {
-        var width = CGRectGetWidth([self bounds]),
-            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
-
-        if (barWidth > 0.0 && barWidth < 4.0)
-            barWidth = 4.0;
-
-        if (_indeterminate)
-            barWidth = width;
-
-        return _CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];
+        [self addSubview:_barView];
     }
 
-    return nil;
+    [_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)];
 }
 
 /* @ignore */
 - (void)updateBackgroundColor
-{
-    if ([CPProgressIndicatorSpinningStyleColors count] === 0)
-    {
-        CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
-        CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
-        CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
-    }
-
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
 {
     if (YES)//_isBezeled)
     {
         if (_style == CPProgressIndicatorSpinningStyle)
         {
-            // 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];
+            [_barView removeFromSuperview];
+
+            _barView = nil;
 
             [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
         }
         else
         {
-           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+            [self setBackgroundColor:_CPControlThreePartImagePattern(
+                NO,
+                CPProgressIndicatorStyleSizes,
+                CPProgressIndicatorClassName,
+                @"BezelBorder",
+                CPProgressIndicatorStyleIdentifiers[_style],
+                _CPControlIdentifierForControlSize(_controlSize))];
 
-           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                                 positioned:CPWindowBelow
-                            relativeToEphemeralSubviewNamed:nil];
-
-           if (_indeterminate)
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
-           else
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
+            [self drawBar];
         }
     }
     else
@@ -450,13 +476,11 @@ var CPProgressIndicatorSpinningStyleColors = [];
         _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
         _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
         _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
-        _indeterminate              = [aCoder decodeObjectForKey:@"_indeterminate"];
-        _style                      = [aCoder decodeIntForKey:@"_style"];
+        _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
+        _style                      = [aCoder decodeObjectForKey:@"_style"];
         _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
         _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
         _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
-
-        [self updateBackgroundColor];
     }
 
     return self;
@@ -464,71 +488,17 @@ var CPProgressIndicatorSpinningStyleColors = [];
 
 - (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:_indeterminate forKey:@"_indeterminate"];
-    [aCoder encodeInt:_style forKey:@"_style"];
+    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
+    [aCoder encodeObject:_style forKey:@"_style"];
     [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
     [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
     [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
 }
 
 @end
-
-
-@implementation _CPProgressIndicatorBinder : CPBinder
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var value = aBinding === CPValueBinding ? 0.0 : YES;
-
-    [self _setPlaceholder:value forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNullMarker isDefault:YES];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        return [_source doubleValue];
-    else if (aBinding === @"isIndeterminate")
-        [_source isIndeterminate];
-    else
-        return [super valueForBinding:aBinding];
-}
-
-- (BOOL)_setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        [_source setDoubleValue:aValue];
-    else if (aBinding === @"isIndeterminate")
-        [_source setIndeterminate:aValue];
-    else
-        return NO;
-
-    return YES;
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (![self _setValue:aValue forBinding:aBinding])
-        [super setValue:aValue forBinding:aBinding];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    if (![self _setValue:aValue forBinding:aBinding])
-        [super setPlaceholderValue:aValue withMarker:aMarker forBinding:aBinding];
-}
-
-@end

AppKit/CPRadio.j

@@ -25,8 +25,6 @@
 
 @import "CPButton.j"
 
-@global CPApp
-
 
 /*!
     @ingroup appkit
@@ -152,14 +150,6 @@ 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";
@@ -183,143 +173,33 @@ 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
 {
-    CPArray _radios;
+    CPSet   _radios;
     CPRadio _selectedRadio;
 
-    BOOL    _enabled @accessors(getter=enabled);
-    BOOL    _hidden @accessors(getter=hidden);
-
     id      _target @accessors(property=target);
     SEL     _action @accessors(property=action);
 }
 
-+ (void)initialize
-{
-    if (self !== [CPRadioGroup class])
-        return;
-
-    [self exposeBinding:CPSelectedValueBinding];
-    [self exposeBinding:CPSelectedTagBinding];
-    [self exposeBinding:CPSelectedIndexBinding];
-
-    [self exposeBinding:CPEnabledBinding];
-    [self exposeBinding:CPHiddenBinding];
-}
-
 - (id)init
 {
     self = [super init];
 
     if (self)
     {
-        _radios = [];
+        _radios = [CPSet set];
         _selectedRadio = nil;
-        _enabled = YES;
-        _hidden = NO;
     }
 
     return self;
 }
 
-/*!
-    Selects the radio button at the given index within the group.
-    If index is -1, all of the radio buttons are turned off.
-*/
-- (void)selectRadioAtIndex:(int)index
-{
-    if (index === -1)
-        [self _setSelectedRadio:nil];
-    else
-    {
-        var radio = [_radios objectAtIndex:index];
-
-        [self _setSelectedRadio:radio];
-        [radio setState:CPOnState];
-    }
-}
-
-/*!
-    Selects the first radio button within the group with the given tag.
-    If a radio button with the given tag is found, selects it
-    and returns YES. Otherwise returns NO.
-*/
-- (BOOL)selectRadioWithTag:(int)tag
-{
-    var index = [_radios indexOfObjectPassingTest:function(radio)
-                    {
-                        return [radio tag] === tag;
-                    }];
-
-    if (index !== CPNotFound)
-    {
-        [self selectRadioAtIndex:index];
-        return YES;
-    }
-    else
-        return NO;
-}
-
-/*!
-    Returns the CPRadio that is currently selected within the group,
-    or nil if none are selected.
-*/
-- (CPRadio)selectedRadio
-{
-    return _selectedRadio;
-}
-
-/*!
-    Returns the index of the selected radio within the array of radio buttons.
-    Buttons are numbered going left to right and top to bottom. Returns -1
-    if no radio within the group is selected.
-*/
-- (int)selectedRadioIndex
-{
-    return [_radios indexOfObject:_selectedRadio];
-}
-
-- (CPArray)radios
-{
-    return _radios;
-}
-
-- (void)setEnabled:(BOOL)enabled
-{
-    [_radios makeObjectsPerformSelector:@selector(setEnabled:) withObject:enabled];
-}
-
-- (void)setHidden:(BOOL)hidden
-{
-    [_radios makeObjectsPerformSelector:@selector(setHidden:) withObject:hidden];
-}
-
-#pragma mark Private
-
 - (void)_addRadio:(CPRadio)aRadio
 {
-    if ([_radios indexOfObject:aRadio] === CPNotFound)
-        [_radios addObject:aRadio];
+    [_radios addObject:aRadio];
 
     if ([aRadio state] === CPOnState)
         [self _setSelectedRadio:aRadio];
@@ -333,30 +213,25 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [_radios removeObject:aRadio];
 }
 
-/*!
-    Selects the first radio button within the group with the given tag.
-    If a radio button with the given tag is found, selects it
-    and returns YES. Otherwise returns NO.
-*/
-- (void)_selectRadioWithTitle:(CPString)aTitle
-{
-    var index = [_radios indexOfObjectPassingTest:function(radio)
-                    {
-                        return [radio title] === aTitle;
-                    }];
-
-    [self selectRadioAtIndex:index];
-}
-
 - (void)_setSelectedRadio:(CPRadio)aRadio
 {
     if (_selectedRadio === aRadio)
         return;
 
     [_selectedRadio setState:CPOffState];
-
     _selectedRadio = aRadio;
-    [_CPRadioGroupSelectionBinder reverseSetValueForObject:self];
+
+    [CPApp sendAction:_action to:_target from:self];
+}
+
+- (CPRadio)selectedRadio
+{
+    return _selectedRadio;
+}
+
+- (CPArray)radios
+{
+    return [_radios allObjects];
 }
 
 @end
@@ -386,100 +261,3 @@ var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
 }
 
 @end
-
-@implementation CPRadioGroup (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPSelectedValueBinding   ||
-        aBinding === CPSelectedTagBinding     ||
-        aBinding === CPSelectedIndexBinding)
-    {
-        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
-
-        return [CPClassFromString(@"_CPRadioGroup" + capitalizedBinding + "Binder") class];
-    }
-    else if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
-    else if ([aBinding hasPrefix:CPHiddenBinding])
-        return [CPMultipleValueOrBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-@end
-
-var binderForObject = {};
-
-@implementation _CPRadioGroupSelectionBinder : CPBinder
-{
-    CPString _selectionBinding @accessors;
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        binderForObject[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = binderForObject[[aSource UID]];
-    [binder reverseSetValueFor:[binder _selectionBinding]];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [self setValue:aValue forBinding:aBinding];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedIndexBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectRadioAtIndex:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source selectedRadioIndex];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedTagBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectRadioWithTag:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedRadio] tag];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedValueBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source _selectRadioWithTitle:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedRadio] title];
-}
-
-@end

AppKit/CPResponder.j

@@ -21,11 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
 
-@import "CPEvent.j"
-
-@class CPKeyBinding
 
 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -82,22 +82,6 @@
 }
 
 /*! @cond */
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return [CPPredicateEditorValueBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"predicate";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
 - (void)_initRuleEditorShared
 {
     [super _initRuleEditorShared];
@@ -173,40 +157,28 @@
     return trees;
 }
 
-- (CPMutableArray)_mergeTree:(CPArray)aTree
+- (id)_mergeTree:(id)tree
 {
-    var mergedTree = [CPMutableArray array];
-    if (aTree == nil)
-        return mergedTree;
+    var merged = [CPMutableArray array],
+        titles = [CPMutableArray array],
+        count = [tree count];
 
-    var icount = [aTree count];
-    for (var i = 0; i < icount; i++)
+    for (var i = 0; i < count; i++)
     {
-        var anode = [aTree objectAtIndex:i],
-            jcount = [mergedTree count],
-            merged = NO;
+        var t = tree[i],
+            title = [CPString stringWithString:[t title]];
 
-        for (var j = 0; j < jcount; j++)
+        if ([titles containsObject:title])
         {
-            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;
-            }
+            CPLogConsole("CPPredicateEditor does not support templates merging yet. Ignoring duplicate template: " + [t description]);
+            continue;
         }
 
-        if (!merged)
-            [mergedTree addObject:anode];
+        [merged addObject:t];
+        [titles addObject:title];
     }
 
-    return mergedTree;
+    return merged;
 }
 
 - (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
@@ -220,7 +192,7 @@
         var children = [CPArray array],
             itemsCount = 0,
             menuIndex = -1,
-            itemArray,
+            itemsArray,
 
             templateView = [templateViews objectAtIndex:count],
             isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
@@ -228,7 +200,7 @@
         if (isPopup)
         {
             itemArray = [[templateView itemArray] valueForKey:@"title"];
-            itemsCount = [itemArray count];
+            itemsCount = [itemArray count],
             menuIndex = 0;
         }
 
@@ -255,19 +227,14 @@
 
 - (void)setObjectValue:(id)objectValue
 {
-    var ov = [self objectValue];
-    if ((ov == nil) != (objectValue == nil) || ![ov isEqual:objectValue])
-    {
-        [self _setPredicate:objectValue];
+    if (![[objectValue predicateFormat] isEqualToString:[[super predicate] predicateFormat]]) // ??
         [self _reflectPredicate:objectValue];
-    }
 }
 
 - (void)_reflectPredicate:(id)predicate
 {
     var animation = _currentAnimation;
     _currentAnimation = nil;
-    _sendAction = NO;
 
     if (predicate != nil)
     {
@@ -344,9 +311,9 @@
             treeChild = [rootItems objectAtIndex:i];
 
             var currentView = [templateViews objectAtIndex:[treeChild indexIntoTemplate]],
-                title = [treeChild title];
+                menuItemIndex = [treeChild menuItemIndex];
 
-            if (title == nil || [title isEqual:[currentView titleOfSelectedItem]])
+            if (menuItemIndex == -1 || [[treeChild title] isEqual:[currentView titleOfSelectedItem]])
             {
                 var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
                 [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
@@ -360,11 +327,7 @@
         rootItems = [treeChild children];
     }
 
-    var row = @{
-            @"criteria": criteria,
-            @"displayValues": values,
-            @"rowType": rowType,
-        };
+    var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"];
 
     return row;
 }
@@ -373,15 +336,16 @@
 
 - (void)_updatePredicate
 {
+    [self willChangeValueForKey:@"objectValue"];
     [self _updatePredicateFromRows];
+    [self didChangeValueForKey:@"objectValue"];
 }
 
 - (void)_updatePredicateFromRows
 {
     var rootRowsArray = [super _rootRowsArray],
         subpredicates = [CPMutableArray array],
-        count,
-        count2 = count = [rootRowsArray count],
+        count = count2 = [rootRowsArray count],
         predicate;
 
     while (count--)
@@ -398,7 +362,7 @@
     else
         predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:subpredicates];
 
-    [self _setPredicate:predicate];
+    [super _setPredicate:predicate];
 }
 
 - (id)_predicateFromRowItem:(id)rowItem
@@ -409,13 +373,12 @@
     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],
-                predicate = [self _predicateFromRowItem:subrow];
-
+            var subrow = [subrows objectAtIndex:i];
+            var predicate = [self _predicateFromRowItem:subrow];
             [subpredicates addObject:predicate];
         }
     }
@@ -451,6 +414,7 @@
 
 - (void)_sendRuleAction
 {
+    [self _updatePredicate];
     [super _sendRuleAction];
 }
 
@@ -519,11 +483,9 @@ 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];
     }
@@ -539,19 +501,4 @@ var CPPredicateTemplatesKey = @"CPPredicateTemplates";
 
 @end
 
-@implementation CPPredicateEditorValueBinder : CPBinder
-{
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source _reflectPredicate:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source _reflectPredicate:aValue];
-}
-
-@end
-/*! @endcond */
+/*! @endcond */

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -20,28 +20,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPPredicate.j>
-
-@import "CPCheckBox.j"
-@import "CPPopUpButton.j"
-@import "CPMenuItem.j"
-@import "CPTextField.j"
-
-// NOTE: CPDatePicker is not implemented yet
-@class CPDatePicker
-
-
-CPUndefinedAttributeType     = 0;
-CPInteger16AttributeType     = 100;
-CPInteger32AttributeType     = 200;
-CPInteger64AttributeType     = 300;
-CPDecimalAttributeType       = 400;
-CPDoubleAttributeType        = 500;
-CPFloatAttributeType         = 600;
-CPStringAttributeType        = 700;
-CPBooleanAttributeType       = 800;
-CPDateAttributeType          = 900;
-CPBinaryDataAttributeType    = 1000;
+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
@@ -196,8 +185,7 @@ 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;
     }
@@ -292,7 +280,7 @@ CPTransformableAttributeType = 1800;
 */
 - (CPArray)leftExpressions
 {
-    if (_templateType == 1 && !_leftIsWildcard)
+    if (_templateType ==1 && !_leftIsWildcard)
     {
         var view = [_views objectAtIndex:0];
         return [[view itemArray] valueForKey:@"representedObject"];
@@ -594,7 +582,7 @@ CPTransformableAttributeType = 1800;
 
 - (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
 {
-    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+    var popup = [[CPPopUpButton alloc] initWithFrame:CPMakeRect(0, 0, 100, 18)],
         count = [expressions count];
 
     for (var i = 0; i < count; i++)
@@ -697,7 +685,6 @@ CPTransformableAttributeType = 1800;
     [textField setBordered:YES];
     [textField setEditable:YES];
     [textField setFont:[CPFont systemFontOfSize:10]];
-    [textField setSendsActionOnEndEditing:YES];
 
     return textField;
 }
@@ -798,4 +785,4 @@ var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
 }
 
 @end
-/*! @endcond */
+/*! @endcond */

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

@@ -1,40 +0,0 @@
-/*
- * 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;

AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j

@@ -1,25 +1,9 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
+@class _CPPredicateEditorTree;
 @implementation _CPPredicateEditorRowNode : CPObject
 {
     _CPPredicateEditorTree                   tree @accessors;
@@ -30,21 +14,25 @@
 
 + (id)rowNodeFromTree:(id)aTree
 {
-    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:{}];
+    var mapTable = {};
+    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:mapTable];
 }
 
 + (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable
 {
-    var views,
+    var node,
+        views,
         copiedContainer;
 
-    var uuid = [[aTree template] UID],
-        cachedNode = templateTable[uuid],
-        node = [[_CPPredicateEditorRowNode alloc] init];
+    node = [[_CPPredicateEditorRowNode alloc] init];
+    node.tree = aTree;
 
-    [node setTree:aTree];
+    var template = [aTree template],
+        uuid = [template UID];
 
-    if (!cachedNode)
+    var cachedNode = templateTable[uuid];
+
+    if (cachedNode == nil)
     {
         views = [CPMutableArray array];
         copiedContainer = [CPMutableArray array];
@@ -56,8 +44,8 @@
         copiedContainer = [cachedNode copiedTemplateContainer];
     }
 
-    [node setTemplateViews:views];
-    [node setCopiedTemplateContainer:copiedContainer];
+    node.templateViews = views;
+    node.copiedTemplateContainer = copiedContainer;
 
     var nodeChildren = [CPMutableArray array],
         treeChildren = [aTree children],
@@ -78,9 +66,7 @@
 
 - (BOOL)applyTemplate:(id)template withViews:(id)views forOriginalTemplate:(id)originalTemplate
 {
-    var t = [tree template],
-        count = [children count];
-
+    var t = [tree template];
     if (t !== template)
     {
         [templateViews setArray:views];
@@ -88,7 +74,8 @@
         [copiedTemplateContainer addObject:template];
     }
 
-    for (var i = 0; i < count; i++)
+    var count = [children count];
+    for (var i; i < count; i++)
         [children[i] applyTemplate:template withViews:views forOriginalTemplate:originalTemplate];
 }
 
@@ -102,8 +89,9 @@
 
 - (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]];
@@ -130,8 +118,7 @@
 - (id)displayValue
 {
     var title = [self title];
-
-    if (title !== nil)
+    if (title != nil)
         return title;
 
     return [self templateView];
@@ -142,4 +129,4 @@
     return [CPString stringWithFormat:@"<%@ %@ %@ tree:%@ tviews:%@", [self className],[self UID], [self title], [tree UID], [templateViews description]];
 }
 
-@end
+@end

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

@@ -1,25 +1,8 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
 @implementation _CPPredicateEditorTree : CPObject
 {
     CPPredicateEditorRowTemplate         template @accessors;

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -1,35 +1,19 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPURLConnection.j>
-@import <Foundation/CPURLRequest.j>
 
-var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
+var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
 
 @implementation _CPRuleEditorLocalizer : CPObject
 {
     CPDictionary    _dictionary @accessors(property=dictionary);
     CPURLConnection connection;
-    CPURLRequest    request;
+    CPURLRequest    resquest;
 }
 
 - (void)loadContentOfURL:(CPURL)aURL
@@ -40,10 +24,9 @@ var LocalizerStringsRegex = 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]];
     }
@@ -51,7 +34,7 @@ var LocalizerStringsRegex = 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;
@@ -59,19 +42,17 @@ var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)
 
 - (void)loadContent:(CPString)aContent
 {
-    var dict = @{},
+    var dict = [CPDictionary dictionary],
         lines = [aContent componentsSeparatedByString:"\n"],
         count = [lines count];
 
     for (var i = 0 ; i < count ; i++)
     {
         var line = [lines objectAtIndex:i];
-
         if (line.length > 1)
         {
-            var match = LocalizerStringsRegex.exec(line);
-
-            if (match && match.length >= 3)
+            var match = regex.exec(line);
+            if (match.length >= 3)
                 [dict setObject:match[2] forKey:match[1]];
         }
     }
@@ -83,15 +64,12 @@ var LocalizerStringsRegex = 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
+}

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -1,103 +1,64 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@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,
-    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";
-}
+    IE_FILTER = "progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dfdfdf')";
 
 @implementation _CPRuleEditorPopUpButton : CPPopUpButton
 {
     CPInteger radius;
 }
 
-- (void)_sharedInit
++ (void)initialize
 {
-    [self setBordered:NO];
-
-#if PLATFORM(DOM)
-    var style = _DOMElement.style;
-    style.border = "1px solid " + BORDER_COLOR;
-    style[GRADIENT_PROPERTY] = GRADIENT_NORMAL;
-#endif
+    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))";
+    }
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
-        [self _sharedInit];
+    {
+        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];
+     }
 
     return self;
 }
 
-- (id)initWithCoder:(CPCoder)aCoder
+- (id)hitTest:(CPPoint)point
 {
-    self = [super initWithCoder:aCoder];
-    [self _sharedInit];
-
-    return self;
-}
-
-- (id)hitTest:(CGPoint)point
-{
-    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+    var slice = [self superview];
+    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
         return nil;
 
     return self;
 }
 
+- (void)setHighlighted:(BOOL)shouldHighlight
+{
+    _DOMElement.style.backgroundImage = (shouldHighlight) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
+}
+
 - (BOOL)sliceIsEditable
 {
-    var superview = [self superview];
-    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
+    return [[self superview] isEditable];
 }
 
 - (BOOL)trackMouse:(CPEvent)theEvent
@@ -119,32 +80,34 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
 
 - (void)layoutSubviews
 {
-#if PLATFORM(DOM)
-    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    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 context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds],
-        arrow_width = FLOOR(CGRectGetHeight(bounds) / 3.5);
+    var bounds = [self bounds],
+        context = [[CPGraphicsContext currentContext] graphicsPort];
+
+    var 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);
@@ -158,46 +121,37 @@ else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     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
 {
-    if (self = [super initWithFrame:aFrame])
-        [self _sharedInit];
-
-    return self;
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-    [self _sharedInit];
+    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;
+    }
 
     return self;
 }
 
 - (void)layoutSubviews
 {
-#if PLATFORM(DOM)
-    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    radius = FLOOR(CGRectGetHeight([self bounds])/2);
 
     var style = _DOMElement.style,
         radiusCSS = radius + "px";
 
     style.borderRadius = radiusCSS;
-    style[GRADIENT_PROPERTY] = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
-#endif
+    style.backgroundImage = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
 
     [super layoutSubviews];
 }
 
 @end
+

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -1,34 +1,17 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import "CPView.j"
-
 @implementation _CPRuleEditorViewSlice : CPView
 {
     CPRuleEditor _ruleEditor;
     int          _indentation           @accessors(property=indentation);
     int          _rowIndex              @accessors(property=rowIndex);
-    CGRect       _animationTargetRect   @accessors(property=_animationTargetRect);
+    CPRect       _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
@@ -58,14 +41,14 @@
     _selected = select;
 }
 
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         bounds = [self bounds],
-        maxX = CGRectGetWidth(bounds),
+        maxX = CGRectGetWidth(bounds) - 2,
         maxY = CGRectGetHeight(bounds);
 
-    // Draw background
+// Draw background
     if ([self _isSelected])
         _backgroundColor = [_ruleEditor _selectedRowColor];
     else
@@ -78,33 +61,33 @@
     CGContextSetFillColor(context, _backgroundColor);
     CGContextFillRect(context, rect);
 
-    // Draw Top Border
+// Draw Top Border
     CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 0, 0);
+    CGContextMoveToPoint(context, 1, 0);
     CGContextAddLineToPoint(context, maxX, 0);
+    CGContextClosePath(context);
     CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
     CGContextStrokePath(context);
 
-    // Draw Bottom Border
+// Draw Bottom Border
     CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 0, maxY);
-    CGContextAddLineToPoint(context, maxX, maxY);
-
+    CGContextMoveToPoint(context, 1, maxY - 0.5);
+    CGContextAddLineToPoint(context, maxX, maxY - 0.5);
+    CGContextClosePath(context);
     var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
-
     CGContextSetStrokeColor(context, bottomColor);
     CGContextStrokePath(context);
 }
 
 - (void)mouseDown:(CPEvent)theEvent
 {
-    if (_editable)
+    if (editable)
         [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
 }
 
 - (void)mouseUp:(CPEvent)theEvent
 {
-    if (_editable)
+    if (editable)
         [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
 }
 
@@ -123,4 +106,4 @@
     return [CPString stringWithFormat:@"<%@ %p index:%d indentation:%d>",[self className],self,[self rowIndex],[self indentation]];
 }
 
-@end
+@end

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -1,27 +1,11 @@
 /*
- * 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
+ *     Created by cacaodev@gmail.com.
+ *     Copyright (c) 2011 Pear, Inc. All rights reserved.
  */
 
-@import "CPRuleEditor_Constants.j"
 @import "_CPRuleEditorViewSlice.j"
 @import "_CPRuleEditorPopUpButton.j"
-
-@global CPApp
+@import "CPRuleEditor.j"
 
 var CONTROL_HEIGHT = 16.,
     BUTTON_HEIGHT = 16.;
@@ -34,7 +18,7 @@ var CONTROL_HEIGHT = 16.,
     CPMutableArray  _ruleOptionInitialViewFrames;
     CPButton        _addButton;
     CPButton        _subtractButton;
-
+    BOOL            editable;
     CPRuleEditorRowType _rowType @accessors;
     CPRuleEditorRowType _plusButtonRowType;
 }
@@ -53,14 +37,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];
 
@@ -70,36 +54,26 @@ var CONTROL_HEIGHT = 16.,
     [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
 }
 
-- (CPButton)_createRowButton
-{
-    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
-    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
-    [button setAlignment:CPCenterTextAlignment];
-    [button setAutoresizingMask:CPViewMinXMargin];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
 - (CPButton)_createAddRowButton
 {
-    var button = [self _createRowButton];
-
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
     [button setImage:[_ruleEditor _addImage]];
+
     [button setAction:@selector(_addOption:)];
     [button setTarget:self];
+    [button setAutoresizingMask:CPViewMinXMargin];
 
     return button;
 }
 
 - (CPButton)_createDeleteRowButton
 {
-    var button = [self _createRowButton];
-
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
     [button setImage:[_ruleEditor _removeImage]];
+
     [button setAction:@selector(_deleteOption:)];
     [button setTarget:self];
+    [button setAutoresizingMask:CPViewMinXMargin];
 
     return button;
 }
@@ -113,14 +87,12 @@ var CONTROL_HEIGHT = 16.,
 
 - (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
 {
-    var title = [[itemsArray objectAtIndex:index] title],
-        font = [_ruleEditor font],
+    var title = [[itemsArray objectAtIndex:index] title];
+    var 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);
 
-        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
-
-    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
+    var popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
     [popup setValue:font forThemeAttribute:@"font"];
 
     var count = [itemsArray count];
@@ -137,18 +109,16 @@ var CONTROL_HEIGHT = 16.,
     return [CPMenuItem separatorItem];
 }
 
-- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
+- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString )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)];
+    text = [[_ruleEditor standardLocalizer] localizedStringForString:text];
 
+    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:localizedText];
+    [textField setStringValue:text];
+    [textField sizeToFit];
 
     return textField;
 }
@@ -212,10 +182,9 @@ var CONTROL_HEIGHT = 16.,
         parent,
         numberOfCriteria,
         numberOfChildren,
-        firstResponderIndex,
+        firstResponderIndex;
 
-        ruleItems = [CPMutableArray array],
-        responder = [[self window] firstResponder];
+    var ruleItems = [CPMutableArray array];
 
     [self _emptyRulePartSubviews];
 
@@ -223,6 +192,7 @@ var CONTROL_HEIGHT = 16.,
     numberOfCriteria = [criteria count];
 
     firstResponderIndex = numberOfCriteria - 1;
+    var responder = [[self window] firstResponder];
     if (responder)
         firstResponderIndex = [_ruleOptionViews indexOfObjectIdenticalTo:responder];
 
@@ -243,16 +213,16 @@ var CONTROL_HEIGHT = 16.,
         numberOfChildren = [childItems count];
         if (numberOfChildren > 1)
         {
-            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren],
-                selectedIndex = [childItems indexOfObject:criterion];
+            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren];
 
+            var selectedIndex = [childItems indexOfObject:criterion];
             if (selectedIndex == CPNotFound)
                 break;
 
             for (var j = 0; j < numberOfChildren; ++j)
             {
-                var childItem = [childItems objectAtIndex:j],
-                    childValue = [childValues objectAtIndex:j];
+                var childItem = [childItems objectAtIndex:j];
+                var childValue = [childValues objectAtIndex:j];
 
                 if ([childValue isKindOfClass:[CPMenuItem class]])
                 {
@@ -271,11 +241,7 @@ var CONTROL_HEIGHT = 16.,
                     }
                 }
 
-                repObject = @{
-                        @"item": childItem,
-                        @"value": childValue,
-                        @"indexInCriteria": i
-                    };
+                repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"];
                 [menuItem setRepresentedObject:repObject];
                 [menuItems addObject:menuItem];
             }
@@ -284,8 +250,8 @@ var CONTROL_HEIGHT = 16.,
         }
         else
         {
-            var value = [childValues objectAtIndex:0],
-                type = [value valueType];
+            var value = [childValues objectAtIndex:0];
+            var type = [value valueType];
 
             if (type === 0)
                 ruleView = [self _createStaticTextFieldWithStringValue:value];
@@ -321,7 +287,7 @@ var CONTROL_HEIGHT = 16.,
 
     [_correspondingRuleItems setArray:ruleItems];
 
-    if (!_editable)
+    if (!editable)
         [self _updateEnabledStateForSubviews];
 
     [self _relayoutSubviewsWidthChanged:YES];
@@ -342,6 +308,7 @@ var CONTROL_HEIGHT = 16.,
 
 - (void)layoutSubviews
 {
+    // CPLogConsole(_cmd);
     [self _relayoutSubviewsWidthChanged:YES];
 }
 
@@ -352,11 +319,11 @@ var CONTROL_HEIGHT = 16.,
         leftButtonMinX,
         rowHeight = [_ruleEditor rowHeight],
         count = [_ruleOptionViews count],
-        sliceFrame = [self frame],
-
-        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
+        sliceFrame = [self frame];
 
+    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];
 
@@ -372,8 +339,7 @@ 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;
@@ -403,9 +369,14 @@ var CONTROL_HEIGHT = 16.,
     [self _setRowTypeToAddFromPlusButton:type];
 }
 
+- (BOOL)isEditable
+{
+    return editable;
+}
+
 - (void)setEditable:(BOOL)value
 {
-    [super setEditable:value]
+    editable = value;
 //  [self _updateEnabledStateForSubviews];
     [self _updateButtonVisibilities];
 }
@@ -447,7 +418,7 @@ var CONTROL_HEIGHT = 16.,
 
 - (float)_rowButtonsRightHorizontalPadding
 {
-    return ([[_ruleEditor superview] isKindOfClass:[CPClipView class]]) ? 18. : 10.;
+    return 10.;
 }
 
 - (void)_setRowTypeToAddFromPlusButton:(int)type
@@ -481,7 +452,7 @@ var CONTROL_HEIGHT = 16.,
     [self layoutSubviews];
 }
 
-- (void)drawRect:(CGRect)rect
+- (void)drawRect:(CPRect)rect
 {
     [super drawRect:rect];
 }
@@ -493,16 +464,22 @@ 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])
-        [self _sendRuleAction:nil];
+        [_ruleEditor _sendRuleAction];
 }
 
 @end
@@ -514,17 +491,19 @@ var CONTROL_HEIGHT = 16.,
 - (id)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
-    if (self)
+    if (self != nil)
     {
+        [self setBordered:NO];
+        [self setEditable:NO];
         [self setDrawsBackground:NO];
     }
 
     return self;
 }
 
-- (id)hitTest:(CGPoint)point
+- (id)hitTest:(CPPoint)point
 {
-    if (!CGRectContainsPoint([self frame], point))
+    if (!CPRectContainsPoint([self frame], point))
         return nil;
 
     return [self superview];

AppKit/CPScroller.j

@@ -5,9 +5,6 @@
  * 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
@@ -23,14 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../Foundation/Foundation.h"
-
-@import "CPAnimation.j"
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "CPViewAnimation.j"
 
-@global CPApp
 
 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -57,25 +48,12 @@ var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScroll
     NAMES_FOR_PARTS     = {},
     PARTS_FOR_NAMES     = {};
 
-var _CACHED_THEME_SCROLLER = nil; // This is used by the class methods to pull the theme attributes.
-
 NAMES_FOR_PARTS[CPScrollerDecrementLine]    = @"decrement-line";
 NAMES_FOR_PARTS[CPScrollerIncrementLine]    = @"increment-line";
 NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
 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;
@@ -90,19 +68,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     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";
@@ -110,49 +77,50 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 + (id)themeAttributes
 {
-    return @{
-            @"scroller-width": 7.0,
-            @"knob-slot-color": [CPNull null],
-            @"decrement-line-color": [CPNull null],
-            @"increment-line-color": [CPNull null],
-            @"knob-color": [CPNull null],
-            @"decrement-line-size":_CGSizeMakeZero(),
-            @"increment-line-size":_CGSizeMakeZero(),
-            @"track-inset":_CGInsetMakeZero(),
-            @"knob-inset": _CGInsetMakeZero(),
-            @"minimum-knob-length":21.0,
-            @"track-border-overlay": 9.0
-        };
+    return [CPDictionary dictionaryWithJSObject:{
+        @"scroller-width": 15.0,
+        @"knob-slot-color": [CPColor lightGrayColor],
+        @"decrement-line-color": [CPNull null],
+        @"increment-line-color": [CPNull null],
+        @"knob-color": [CPColor grayColor],
+        @"decrement-line-size":_CGSizeMakeZero(),
+        @"increment-line-size":_CGSizeMakeZero(),
+        @"track-inset":_CGInsetMakeZero(),
+        @"knob-inset": _CGInsetMakeZero(),
+        @"minimum-knob-length":21.0
+    }]
 }
 
-+ (float)scrollerWidth
+
+// Calculating Layout
+
+- (id)initWithFrame:(CGRect)aFrame
 {
-    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+
+        _hitPart = CPScrollerNoPart;
+
+        [self _calculateIsVertical];
+    }
+
+    return self;
 }
 
+// Determining CPScroller Size
 /*!
     Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidthInStyle:(int)aStyle
++ (float)scrollerWidth
 {
-    if (!_CACHED_THEME_SCROLLER)
-        _CACHED_THEME_SCROLLER = [[self alloc] init];
-
-    if (aStyle == CPScrollerStyleLegacy)
-        return [_CACHED_THEME_SCROLLER valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-
-    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"scroller-width"];
-}
-
-/*!
-    Returns the CPScroller's overlay value.
-*/
-+ (float)scrollerOverlay
-{
-    if (!_CACHED_THEME_SCROLLER)
-        _CACHED_THEME_SCROLLER = [[self alloc] init];
-
-    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"track-border-overlay"];
+    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
 }
 
 /*!
@@ -164,92 +132,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     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 = @{
-                CPViewAnimationTargetKey: self,
-                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
-            };
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-
-        // We have to choose an orientation. If for some bizarre reason width === height,
-        // punt and choose vertical.
-        [self _setIsVertical:_CGRectGetHeight(aFrame) >= _CGRectGetWidth(aFrame)];
-    }
-
-    return self;
-}
-
-
-#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
@@ -265,6 +147,27 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [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
 */
@@ -273,50 +176,17 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _knobProportion;
 }
 
-/*!
-    Set the knob's proportion
-    @param aProportion the desired proportion
-*/
-- (void)setKnobProportion:(float)aProportion
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
 {
-    if (!_IS_NUMERIC(aProportion))
-        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];
+    var themeState = _themeState;
 
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
 
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
 
-
-#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
+// Calculating Layout
 
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -338,9 +208,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     // 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;
 
@@ -463,35 +330,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _usableParts;
 }
 
-/*!
-    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
-
+// Drawing the Parts
 /*!
     Draws the specified arrow and sets the highlight.
     @param anArrow the arrow to draw
@@ -540,12 +379,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 - (void)layoutSubviews
 {
-    [self _adjustScrollerSize];
     [self checkSpaceForParts];
 
     var index = 0,
-        count = PARTS_ARRANGEMENT.length,
-        view;
+        count = PARTS_ARRANGEMENT.length;
 
     for (; index < count; ++index)
     {
@@ -621,8 +458,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     [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]];
+    [self sendAction:[self action] to:[self target]];
 }
 
 /*!
@@ -651,13 +487,13 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
         if ([anEvent modifierFlags] & CPAlternateKeyMask)
         {
-            if (_trackingPart === CPScrollerDecrementLine)
+            if (_trackingPart == CPScrollerDecrementLine)
                 _hitPart = CPScrollerDecrementPage;
 
-            else if (_trackingPart === CPScrollerIncrementLine)
+            else if (_trackingPart == CPScrollerIncrementLine)
                 _hitPart = CPScrollerIncrementPage;
 
-            else if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
+            else if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
             {
                 var knobRect = [self rectForPart:CPScrollerKnob],
                     knobWidth = ![self isVertical] ? _CGRectGetWidth(knobRect) : _CGRectGetHeight(knobRect),
@@ -685,11 +521,11 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     {
         _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-        if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
+        if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
         {
             var hitPart = [self testPart:[anEvent locationInWindow]];
 
-            if (hitPart === CPScrollerDecrementPage || hitPart === CPScrollerIncrementPage)
+            if (hitPart == CPScrollerDecrementPage || hitPart == CPScrollerIncrementPage)
             {
                 _trackingPart = hitPart;
                 _hitPart = hitPart;
@@ -705,13 +541,18 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 }
 
-- (void)_setIsVertical:(BOOL)isVertical
+- (void)_calculateIsVertical
 {
-    _isVertical = isVertical;
+    // Recalculate isVertical.
+    var bounds = [self bounds],
+        width = _CGRectGetWidth(bounds),
+        height = _CGRectGetHeight(bounds);
 
-    if (_isVertical)
+    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
+
+    if (_isVertical === 1)
         [self setThemeState:CPThemeStateVertical];
-    else
+    else if (_isVertical === 0)
         [self unsetThemeState:CPThemeStateVertical];
 }
 
@@ -723,20 +564,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [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])
@@ -746,65 +573,19 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     switch (_hitPart)
     {
-        case CPScrollerKnob:
-            return [self trackKnob:anEvent];
+        case CPScrollerKnob:            return [self trackKnob:anEvent];
 
         case CPScrollerDecrementLine:
         case CPScrollerIncrementLine:
         case CPScrollerDecrementPage:
-        case CPScrollerIncrementPage:
-            return [self trackScrollButtons:anEvent];
+        case CPScrollerIncrementPage:   return [self trackScrollButtons:anEvent];
     }
 }
 
-- (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",
-    CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
-    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey          = @"CPScrollerStyleKey";
+var CPScrollerControlSizeKey = "CPScrollerControlSize",
+    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
 
 @implementation CPScroller (CPCoding)
 
@@ -817,7 +598,6 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
 
         _knobProportion = 1.0;
-
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
             _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
 
@@ -825,22 +605,20 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
 
         _hitPart = CPScrollerNoPart;
 
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
+        [self _calculateIsVertical];
 
-        var paramAnimFadeOut = @{
-                CPViewAnimationTargetKey: self,
-                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
-            };
+        // Adjust the size of the scroller if the size from cib
+        // isn't equal to the scrollerWidth
+        var frame = [self frame],
+            scrollerWidth = [CPScroller scrollerWidth];
 
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
+        if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
+            frame.size.width = scrollerWidth;
 
-        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+        if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
+            frame.size.height = scrollerWidth;
 
-        [self _setIsVertical:[aCoder decodeBoolForKey:CPScrollerIsVerticalKey]];
+        [self setFrame:frame];
     }
 
     return self;
@@ -851,9 +629,7 @@ var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
     [super encodeWithCoder:aCoder];
 
     [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
-    [aCoder encodeInt:_isVertical forKey:CPScrollerIsVerticalKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
-    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }
 
 @end

AppKit/CPSearchField.j

@@ -21,19 +21,22 @@
  */
 
 @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 = @"   ";
@@ -67,14 +70,16 @@ var RECENT_SEARCH_PREFIX = @"   ";
     return @"searchfield"
 }
 
-+ (CPDictionary)themeAttributes
++ (void)initialize
 {
-    return @{
-            @"image-search": [CPNull null],
-            @"image-find": [CPNull null],
-            @"image-cancel": [CPNull null],
-            @"image-cancel-pressed": [CPNull null]
-        };
+    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)];
 }
 
 - (id)initWithFrame:(CGRect)frame
@@ -165,10 +170,10 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)resetSearchButton
 {
     var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];
+        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
 
     [button setBordered:NO];
-    [button setImageScaling:CPImageScaleAxesIndependently];
+    [button setImageScaling:CPScaleToFit];
     [button setImage:searchButtonImage];
     [button setAutoresizingMask:CPViewMaxXMargin];
 }
@@ -188,7 +193,6 @@ var RECENT_SEARCH_PREFIX = @"   ";
         [_cancelButton setAutoresizingMask:CPViewMinXMargin];
         [_cancelButton setTarget:self];
         [_cancelButton setAction:@selector(cancelOperation:)];
-        [_cancelButton setButtonType:CPMomentaryChangeButton];
         [self _updateCancelButtonVisibility];
         [self addSubview:_cancelButton];
     }
@@ -211,9 +215,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     var button = [self cancelButton];
     [button setBordered:NO];
-    [button setImageScaling:CPImageScaleAxesIndependently];
-    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
-    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
+    [button setImageScaling:CPScaleToFit];
+    [button setImage:CPSearchFieldCancelImage];
+    [button setAlternateImage:CPSearchFieldCancelPressedImage];
     [button setAutoresizingMask:CPViewMinXMargin];
     [button setTarget:self];
     [button setAction:@selector(cancelOperation:)];
@@ -254,9 +258,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
-
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
+    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
 }
 
 /*!
@@ -266,9 +268,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
-
-    return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
+    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
 }
 
 // Managing Menu Templates
@@ -501,12 +501,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
     if (_CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
     {
         if (_searchMenuTemplate == nil)
-        {
-            if ([_searchButton target] && [_searchButton action])
-                [_searchButton mouseDown:anEvent];
-            else
-                [self _sendAction:self];
-        }
+            [self _sendAction:self];
         else
            [self _showMenu];
     }
@@ -679,7 +674,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
         return;
 
     var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
 
     var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
 

AppKit/CPSegmentedControl.j

@@ -23,10 +23,7 @@
 @import <Foundation/CPArray.j>
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "_CPImageAndTextView.j"
 
-@global CPApp
 
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
@@ -58,33 +55,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 + (id)themeAttributes
 {
-    return @{
-            @"alignment": CPCenterTextAlignment,
-            @"vertical-alignment": CPCenterVerticalTextAlignment,
-            @"image-position": CPImageLeft,
-            @"image-scaling": CPImageScaleNone,
-            @"bezel-inset": _CGInsetMakeZero(),
-            @"content-inset": _CGInsetMakeZero(),
-            @"left-segment-bezel-color": [CPNull null],
-            @"right-segment-bezel-color": [CPNull null],
-            @"center-segment-bezel-color": [CPNull null],
-            @"divider-bezel-color": [CPNull null],
-            @"divider-thickness": 1.0,
-            @"default-height": 24.0,
-        };
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([self _isSelectionBinding:aBinding])
-        return [_CPSegmentedControlBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (BOOL)_isSelectionBinding:(CPString)aBinding
-{
-    return (aBinding === CPSelectedIndexBinding || aBinding === CPSelectedLabelBinding || aBinding === CPSelectedTagBinding);
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _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"]];
 }
 
 - (id)initWithFrame:(CGRect)aRect
@@ -104,19 +76,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     return self;
 }
 
-- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
-{
-    if ([[self class] _isSelectionBinding:aBinding] && _trackingMode !== CPSegmentSwitchTrackingSelectOne)
-        CPLog.warn("Binding " + aBinding + " needs CPSegmentSwitchTrackingSelectOne tracking mode");
-    else
-        [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
-}
-
-- (void)_reverseSetBinding
-{
-    [_CPSegmentedControlBinder reverseSetValueForObject:self];
-}
-
 /*!
     Returns the tag of the selected segment.
 */
@@ -156,15 +115,13 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
 
+    // Make space for/remove space used by dividers.
     var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        frame = [self frame],
-        widthOfAllSegments = 0,
-        dividerExtraSpace = ([_segments count] - 1) * thickness;
+        delta = thickness * (dividersAfter - dividersBefore),
+        frame = [self frame];
 
-    for (var i = 0; i < [_segments count]; i++)
-        widthOfAllSegments += [_segments[i] width];
-
-    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
+    if (delta)
+        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
 
     [self tileWithChangedSegment:0];
 }
@@ -215,21 +172,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     return NO;
 }
 
-- (BOOL)_selectSegmentWithLabel:(CPString)aLabel
-{
-    var index = 0;
-
-    for (; index < _segments.length; ++index)
-        if (_segments[index].label == aLabel)
-        {
-            [self setSelectedSegment:index];
-
-            return YES;
-        }
-
-    return NO;
-}
-
 // Specifying Tracking Mode
 
 - (BOOL)isTracking
@@ -424,14 +366,11 @@ CPSegmentSwitchTrackingMomentary = 2;
     @param aSegment the segment to enable/disable
     @throws CPRangeException if \c aSegment is out of bounds
 */
-- (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
+- (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
 {
-    if ([_segments[aSegment] enabled] === shouldBeEnabled)
-        return;
+    [_segments[aSegment] setEnabled:isEnabled];
 
-    [_segments[aSegment] setEnabled:shouldBeEnabled];
-
-    if (shouldBeEnabled)
+    if (isEnabled)
         _themeStates[aSegment] &= ~CPThemeStateDisabled;
     else
         _themeStates[aSegment] |= CPThemeStateDisabled;
@@ -521,7 +460,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        return CGRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
+        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                             bezelInset.top,
                             contentInset.right,
                             height);
@@ -857,7 +796,6 @@ CPSegmentSwitchTrackingMomentary = 2;
             return;
 
         var highlighted = [self testSegment:location] === _trackingSegment;
-
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
@@ -944,74 +882,6 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 
 @end
 
-var CPSegmentedControlBindersMap = {},
-    CPSegmentedControlNoSelectionPlaceholder = "CPSegmentedControlNoSelectionPlaceholder";
-
-@implementation _CPSegmentedControlBinder : CPBinder
-{
-    CPString _selectionBinding @accessors(readonly, getter=selectionBinding);
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = CPSegmentedControlBindersMap[[aSource UID]];
-    [binder reverseSetValueFor:[binder selectionBinding]];
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        CPSegmentedControlBindersMap[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:CPSegmentedControlNoSelectionPlaceholder forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    if (aValue == CPSegmentedControlNoSelectionPlaceholder)
-        [_source setSelected:NO forSegment:[_source selectedSegment]];
-    else
-        [self setValue:aValue forBinding:aBinding];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (aBinding == CPSelectedIndexBinding)
-        [_source setSelectedSegment:aValue];
-    else if (aBinding == CPSelectedTagBinding)
-        [_source selectSegmentWithTag:aValue];
-    else if (aBinding == CPSelectedLabelBinding)
-        [_source _selectSegmentWithLabel:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    var selectedIndex = [_source selectedSegment];
-
-    if (aBinding == CPSelectedIndexBinding)
-        return selectedIndex;
-    else if (aBinding == CPSelectedTagBinding)
-        return [_source tagForSegment:selectedIndex];
-    else if (aBinding == CPSelectedLabelBinding)
-        return [_source labelForSegment:selectedIndex];
-}
-
-@end
 
 @implementation _CPSegmentItem : CPObject
 {

AppKit/CPShadow.j

@@ -31,9 +31,11 @@
 */
 @implementation CPShadow : CPObject
 {
-    CGSize      _offset @accessors(property=shadowOffset);
-    float       _blurRadius @accessors(property=shadowBlurRadius);
-    CPColor     _color @accessors(property=shadowColor);
+    CPSize      _offset;
+    float       _blurRadius;
+    CPColor     _color;
+
+    CPString    _cssString;
 }
 
 /*!
@@ -49,7 +51,7 @@
 }
 
 /* @ignore */
-- (id)_initWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+- (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
     self = [super init];
 
@@ -58,16 +60,35 @@
         _offset = anOffset;
         _blurRadius = aBlurRadius;
         _color = aColor;
+
+        _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
     }
 
     return self;
 }
 
-- (void)set
+/*!
+    Returns the shadow's offset.
+*/
+- (CGSize)shadowOffset
 {
-   var context = [[CPGraphicsContext currentContext] graphicsPort];
+    return _offset;
+}
 
-   CGContextSetShadowWithColor(context, _offset, _blurRadius, _color);
+/*!
+    Returns the shadow's blur radius
+*/
+- (float)shadowBlurRadius
+{
+    return _blurRadius;
+}
+
+/*!
+    Returns the shadow's color.
+*/
+- (CPColor)shadowColor
+{
+    return _color;
 }
 
 /*!
@@ -75,7 +96,7 @@
 */
 - (CPString)cssString
 {
-    return [_color cssString] + " " + ROUND(_offset.width) + @"px " + ROUND(_offset.height) + @"px " + ROUND(_blurRadius) + @"px";
+    return _cssString;
 }
 
-@end
+@end

AppKit/CPShadowView.j

@@ -24,43 +24,71 @@
 
 @import "CGGeometry.j"
 @import "CPImage.j"
+@import "CPImageView.j"
 @import "CPView.j"
 
 
 CPLightShadow   = 0;
 CPHeavyShadow   = 1;
 
-CPThemeStateShadowViewLight = CPThemeState("shadowview-style-light");
-CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
+var CPShadowViewLightBackgroundColor    = nil,
+    CPShadowViewHeavyBackgroundColor    = nil;
 
+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;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "shadow-view";
-}
+    if (self != [CPShadowView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPNull null],
-            @"content-inset": CGInsetMakeZero()
-        };
-}
+    var bundle = [CPBundle bundleForClass:[self class]];
 
-+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
-{
-    var shadowView = [CPShadowView new],
-        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];
+    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)],
 
-    return CGRectMake(_CGRectGetMinX(aFrame) - inset.left, _CGRectGetMinY(aFrame) - inset.top, _CGRectGetWidth(aFrame) + inset.left + inset.right, _CGRectGetHeight(aFrame) + inset.top + inset.bottom);
+            [[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)]
+        ]]];
 }
 
 + (id)shadowViewEnclosingView:(CPView)aView
@@ -70,25 +98,20 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
 
 + (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
 {
-    var shadowView = [[self alloc] initWithFrame:[aView frame]];
+    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
+    [shadowView setWeight:aWeight];
 
-    if (shadowView)
-    {
-        [shadowView setWeight:aWeight];
+    var size = [shadowView frame].size,
+        width = size.width - [shadowView leftInset] - [shadowView rightInset],
+        height = size.height - [shadowView topInset] - [shadowView bottomInset],
+        enclosingView = [aView superview];
 
-        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];
-    }
+    [shadowView setHitTests:[aView hitTests]];
+    [shadowView setAutoresizingMask:[aView autoresizingMask]];
+    [aView removeFromSuperview];
+    [shadowView addSubview:aView];
+    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
+    [enclosingView addSubview:shadowView];
 
     return shadowView;
 }
@@ -99,7 +122,9 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
 
     if (self)
     {
-        [self setWeight:CPLightShadow];
+        _weight = CPLightShadow;
+
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
         [self setHitTests:NO];
     }
@@ -115,45 +140,54 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     _weight = aWeight;
 
     if (_weight == CPLightShadow)
-        [self setThemeState:CPThemeStateShadowViewLight];
-    else
-        [self setThemeState:CPThemeStateShadowViewHeavy];
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
-    [self setNeedsLayout];
+    else
+        [self setBackgroundColor:CPShadowViewHeavyBackgroundColor];
 }
 
 - (float)leftInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].left;
+    return _weight == CPLightShadow ? LIGHT_LEFT_INSET : HEAVY_LEFT_INSET;
 }
 
 - (float)rightInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].right;
+    return _weight == CPLightShadow ? LIGHT_RIGHT_INSET : HEAVY_RIGHT_INSET;
 }
 
 - (float)topInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].top;
+    return _weight == CPLightShadow ? LIGHT_TOP_INSET : HEAVY_TOP_INSET;
 }
 
 - (float)bottomInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].bottom;
+    return _weight == CPLightShadow ? LIGHT_BOTTOM_INSET : HEAVY_BOTTOM_INSET;
 }
 
 - (float)horizontalInset
 {
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
+    if (_weight == CPLightShadow)
+        return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
 
-    return currentContentInset.left + currentContentInset.right;
+    return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
 }
 
 - (float)verticalInset
 {
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
+    if (_weight == CPLightShadow)
+        return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
 
-    return currentContentInset.top + currentContentInset.bottom;
+    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);
 }
 
 - (CGRect)frameForContentFrame:(CGRect)aFrame
@@ -166,11 +200,4 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     [self setFrame:[self frameForContentFrame:aFrame]];
 }
 
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-}
-
 @end

AppKit/CPSlider.j

@@ -21,7 +21,6 @@
  */
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
 
 
 /*! SLIDER STATES */
@@ -40,8 +39,6 @@ CPCircularSlider    = 1;
     double          _altIncrementValue;
 
     BOOL            _isVertical;
-
-    CGSize          _dragOffset;
 }
 
 + (CPString)defaultThemeClass
@@ -51,12 +48,8 @@ CPCircularSlider    = 1;
 
 + (id)themeAttributes
 {
-    return @{
-            @"knob-color": [CPNull null],
-            @"knob-size": _CGSizeMakeZero(),
-            @"track-width": 0.0,
-            @"track-color": [CPNull null],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
+                                       forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame

AppKit/CPSliderColorPicker.j

@@ -20,14 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPColorPicker.j"
-@import "CPSlider.j"
-@import "CPTextField.j"
 @import "CPView.j"
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPSliderColorPickerMode
+@import "CPColorPicker.j"
 
 
 /*
@@ -66,166 +60,166 @@
 
 - (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
 {
-    return [super initWithPickerMask:mask colorPanel:owningColorPanel];
+    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
 }
 
 - (id)initView
 {
-    var aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    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
@@ -256,35 +250,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];
 }
 
@@ -313,13 +307,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
@@ -339,12 +333,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
@@ -352,27 +346,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;
         }
     }

AppKit/CPSound.j

@@ -21,7 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPRunLoop.j>
 
 CPSoundLoadStateEmpty       = 0;
 CPSoundLoadStateLoading     = 1;
@@ -46,7 +45,6 @@ CPSoundPlayBackStatePause   = 2;
     CPString            _name       @accessors(property=name);
     id                  _delegate   @accessors(property=delegate);
 
-    BOOL                _playRequestBeforeLoad;
     HTMLAudioElement    _audioTag;
     int                 _loadStatus;
     int                 _playBackStatus;
@@ -60,10 +58,9 @@ CPSoundPlayBackStatePause   = 2;
     if (self = [super init])
     {
         _loadStatus = CPSoundLoadStateEmpty;
-//        _loops = NO;
+        _loops = NO;
         _audioTag = document.createElement("audio");
         _audioTag.preload = YES;
-        _playRequestBeforeLoad = NO;
 
         _audioTag.addEventListener("canplay", function()
         {
@@ -141,12 +138,6 @@ CPSoundPlayBackStatePause   = 2;
 - (void)_soundDidload
 {
     _loadStatus = CPSoundLoadStateCanBePlayed;
-
-    if (_playRequestBeforeLoad)
-    {
-        _playRequestBeforeLoad = NO;
-        [self play];
-    }
 }
 
 /*! @ignore
@@ -176,12 +167,6 @@ CPSoundPlayBackStatePause   = 2;
 */
 - (BOOL)play
 {
-    if (_loadStatus === CPSoundLoadStateLoading)
-    {
-        _playRequestBeforeLoad = YES;
-        return YES;
-    }
-
     if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
         || (_playBackStatus === CPSoundPlayBackStatePlay))
         return NO;

AppKit/CPSplitView.j

@@ -20,44 +20,16 @@
  * 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 ShouldSuppressResizeNotifications   = 1,
-    DidPostWillResizeNotification       = 1 << 1,
-    DidSuppressResizeNotification       = 1 << 2;
+var CPSplitViewHorizontalImage = nil,
+    CPSplitViewVerticalImage = nil;
 
 /*!
     @ingroup appkit
@@ -73,29 +45,24 @@ var ShouldSuppressResizeNotifications   = 1,
 
 @implementation CPSplitView : CPView
 {
-    id              _delegate;
-    BOOL            _isVertical;
-    BOOL            _isPaneSplitter;
+    id          _delegate;
+    BOOL        _isVertical;
+    BOOL        _isPaneSplitter;
 
-    int             _currentDivider;
-    float           _initialOffset;
-    CPDictionary    _preCollapsePositions;
+    int         _currentDivider;
+    float       _initialOffset;
+    float       _preCollapsePosition;
 
-    CPString        _originComponent;
-    CPString        _sizeComponent;
+    CPString    _originComponent;
+    CPString    _sizeComponent;
 
-    CPArray         _DOMDividerElements;
-    CPString        _dividerImagePath;
-    int             _drawingDivider;
+    CPArray     _DOMDividerElements;
+    CPString    _dividerImagePath;
+    int         _drawingDivider;
 
-    CPString        _autosaveName;
-    BOOL            _shouldAutosave;
-    CGSize          _shouldRestoreFromAutosaveUnlessFrameSize;
+    BOOL        _needsResizeSubviews;
 
-    BOOL            _needsResizeSubviews;
-    int             _suppressResizeNotificationsMask;
-
-    CPArray         _buttonBars;
+    CPArray     _buttonBars;
 }
 
 + (CPString)defaultThemeClass
@@ -105,28 +72,32 @@ var ShouldSuppressResizeNotifications   = 1,
 
 + (id)themeAttributes
 {
-    return @{
-            @"divider-thickness": 1.0,
-            @"pane-divider-thickness": 10.0,
-            @"pane-divider-color": [CPColor grayColor],
-            @"horizontal-divider-color": [CPNull null],
-            @"vertical-divider-color": [CPNull null],
-        };
+    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)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
-        _suppressResizeNotificationsMask = 0;
-        _preCollapsePositions = [CPMutableDictionary new];
         _currentDivider = CPNotFound;
 
         _DOMDividerElements = [];
         _buttonBars = [];
 
-        _shouldAutosave = YES;
-
         [self _setVertical:YES];
     }
 
@@ -171,17 +142,14 @@ var ShouldSuppressResizeNotifications   = 1,
         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];
 
 }
@@ -194,7 +162,7 @@ var ShouldSuppressResizeNotifications   = 1,
 
     _originComponent = [self isVertical] ? "x" : "y";
     _sizeComponent = [self isVertical] ? "width" : "height";
-    _dividerImagePath = [self isVertical] ? [[self valueForThemeAttribute:@"vertical-divider-color"] filename] : [[self valueForThemeAttribute:@"horizontal-divider-color"] filename];
+    _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
 
     return changed;
 }
@@ -257,6 +225,7 @@ var ShouldSuppressResizeNotifications   = 1,
         rect = CGRectMakeZero();
 
     rect.size = [self frame].size;
+
     rect.size[_sizeComponent] = [self dividerThickness];
     rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];
 
@@ -365,33 +334,28 @@ var ShouldSuppressResizeNotifications   = 1,
 
     _needsResizeSubviews = NO;
 
-    [self resizeSubviewsWithOldSize:[self _calculateSize]];
-}
-
-- (CGSize)_calculateSize
-{
     var subviews = [self subviews],
         count = subviews.length,
-        size = CGSizeMakeZero();
+        oldSize = CGSizeMakeZero();
 
     if ([self isVertical])
     {
-        size.width += [self dividerThickness] * (count - 1);
-        size.height = CGRectGetHeight([self frame]);
+        oldSize.width += [self dividerThickness] * (count - 1);
+        oldSize.height = CGRectGetHeight([self frame]);
     }
     else
     {
-        size.width = CGRectGetWidth([self frame]);
-        size.height += [self dividerThickness] * (count - 1);
+        oldSize.width = CGRectGetWidth([self frame]);
+        oldSize.height += [self dividerThickness] * (count - 1);
     }
 
     while (count--)
-        size[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
+        oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
 
-    return size;
+    [self resizeSubviewsWithOldSize:oldSize];
 }
 
-- (BOOL)cursorAtPoint:(CGPoint)aPoint hitDividerAtIndex:(int)anIndex
+- (BOOL)cursorAtPoint:(CPPoint)aPoint hitDividerAtIndex:(int)anIndex
 {
     var frame = [_subviews[anIndex] frame],
         startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
@@ -444,14 +408,11 @@ var ShouldSuppressResizeNotifications   = 1,
 
     if (type == CPLeftMouseUp)
     {
-        // We disabled autosaving during tracking.
-        _shouldAutosave = YES;
-
         if (_currentDivider != CPNotFound)
         {
             _currentDivider = CPNotFound;
-            [self _autosave];
             [self _updateResizeCursor:anEvent];
+            [self _postNotificationDidResize];
         }
 
         return;
@@ -459,11 +420,10 @@ var ShouldSuppressResizeNotifications   = 1,
 
     if (type == CPLeftMouseDown)
     {
-        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-            count = [_subviews count] - 1;
+        var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
         _currentDivider = CPNotFound;
-
+        var count = [_subviews count] - 1;
         for (var i = 0; i < count; i++)
         {
             var frame = [_subviews[i] frame],
@@ -476,20 +436,19 @@ var ShouldSuppressResizeNotifications   = 1,
                     [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
                 {
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
-                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i],
-                        preCollapsePosition = [_preCollapsePositions objectForKey:"" + i] || 0;
+                        maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
 
                     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];
                     }
@@ -499,8 +458,6 @@ var ShouldSuppressResizeNotifications   = 1,
                     _currentDivider = i;
                     _initialOffset = startPosition - point[_originComponent];
 
-                    // Don't autosave during a resize. We'll wait until it's done.
-                    _shouldAutosave = NO;
                     [self _postNotificationWillResize];
                 }
             }
@@ -569,37 +526,19 @@ var ShouldSuppressResizeNotifications   = 1,
         // 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 frameA = [_subviews[i] frame],
-                sizeA = frameA.size[_sizeComponent],
-                startPosition = frameA.origin[_originComponent] + sizeA,
-                frameB = [_subviews[i + 1] frame],
-                sizeB = frameB.size[_sizeComponent],
+            var frame = [_subviews[i] frame],
+                size = frame.size[_sizeComponent],
+                startPosition = frame.origin[_originComponent] + size,
                 canShrink = [self _realPositionForPosition:startPosition - 1 ofDividerAtIndex:i] < startPosition,
                 canGrow = [self _realPositionForPosition:startPosition + 1 ofDividerAtIndex:i] > startPosition,
                 cursor = [CPCursor arrowCursor];
 
-            if (sizeA === 0)
+            if (size === 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];
@@ -658,15 +597,7 @@ var ShouldSuppressResizeNotifications   = 1,
 {
     // not sure where this should override other positions?
     if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
-    {
-        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;
-    }
+        position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
 
     var proposedMax = [self maxPossiblePositionOfDividerAtIndex:dividerIndex],
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
@@ -674,37 +605,19 @@ var ShouldSuppressResizeNotifications   = 1,
         actualMin = proposedMin;
 
     if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-
-        if (_IS_NUMERIC(proposedActualMin))
-            actualMin = proposedActualMin;
-    }
+        actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
 
     if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
-    {
-        var proposedActualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
-
-        if (_IS_NUMERIC(proposedActualMax))
-            actualMax = proposedActualMax;
-    }
+        actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
     var viewA = _subviews[dividerIndex],
-        viewB = _subviews[dividerIndex + 1],
         realPosition = MAX(MIN(position, actualMax), actualMin);
 
-    // Is this position past the halfway point to collapse?
-    if (position < proposedMin + (actualMin - proposedMin) / 2)
+    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;
 }
 
@@ -715,77 +628,43 @@ var ShouldSuppressResizeNotifications   = 1,
 */
 - (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],
-        viewA = _subviews[dividerIndex],
+    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
+
+    var viewA = _subviews[dividerIndex],
         frameA = [viewA frame],
         viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame],
-        preCollapsePosition = 0,
-        preSize = frameA.size[_sizeComponent];
+        frameB = [viewB frame];
 
+    _preCollapsePosition = 0;
+
+    var preSize = frameA.size[_sizeComponent];
     frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
-
     if (preSize !== 0 && frameA.size[_sizeComponent] === 0)
-        preCollapsePosition = preSize;
-
-    if (preSize !== frameA.size[_sizeComponent])
-    {
-        SPLIT_VIEW_MAYBE_POST_WILL_RESIZE();
-        [_subviews[dividerIndex] setFrame:frameA];
-        SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
-    }
+        _preCollapsePosition = preSize;
+    [_subviews[dividerIndex] setFrame:frameA];
 
     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 = frameB.origin[_originComponent];
-
+        _preCollapsePosition = preSize;
     frameB.origin[_originComponent] = realPosition + [self dividerThickness];
-
-    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];
+    [_subviews[dividerIndex + 1] setFrame:frameB];
 
     [self setNeedsDisplay:YES];
-
-    if (SPLIT_VIEW_DID_SUPPRESS_RESIZE_NOTIFICATION())
-        [self _postNotificationDidResize];
-
-    SPLIT_VIEW_SUPPRESS_RESIZE_NOTIFICATIONS(NO);
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
-    if (_shouldRestoreFromAutosaveUnlessFrameSize)
-        _shouldAutosave = NO;
-    else
-        [self _adjustSubviewsWithCalculatedSize];
+    [self _adjustSubviewsWithCalculatedSize];
 
     [super setFrameSize:aSize];
 
-    if (_shouldRestoreFromAutosaveUnlessFrameSize)
-        _shouldAutosave = YES;
-
     [self setNeedsDisplay:YES];
 }
 
-- (void)resizeSubviewsWithOldSize:(CGSize)oldSize
+- (void)resizeSubviewsWithOldSize:(CPSize)oldSize
 {
     if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
     {
@@ -793,104 +672,67 @@ var ShouldSuppressResizeNotifications   = 1,
         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,
-        oldFlexibleSpace = 0,
+        totalSizableSpace = 0,
+        nonSizableSpace = 0,
+        lastSizableIndex = -1,
         totalSizablePanes = 0,
-        isSizableMap = {},
-        viewSizes = [],
-        delegateRespondsToShouldAdjust = [_delegate respondsToSelector:@selector(splitView:shouldAdjustSizeOfSubview:)];
+        isVertical = [self isVertical];
 
-    // 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 = !delegateRespondsToShouldAdjust || [_delegate splitView:self shouldAdjustSizeOfSubview:view],
-            size = [view frame].size[_sizeComponent];
-
-        isSizableMap[index] = isSizable;
-        viewSizes.push(size);
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
         if (isSizable)
         {
-            oldFlexibleSpace += size;
+            totalSizableSpace += [view frame].size[_sizeComponent];
+            lastSizableIndex = index;
             totalSizablePanes++;
         }
     }
 
-    // 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;
+    if (totalSizablePanes === count)
+        totalSizableSpace = 0;
 
-    if (newFlexibleSpace < 0)
-    {
-        remainingFixedPixelsToRemove = -newFlexibleSpace;
-        newFlexibleSpace = 0;
-    }
-
-    var remainingFixedPanes = count - totalSizablePanes;
+    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;
 
     for (index = 0; index < count; ++index)
     {
         var view = _subviews[index],
             viewFrame = CGRectMakeCopy(bounds),
-            isSizable = isSizableMap[index],
-            targetSize = 0;
+            isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
-        // The last area must take up exactly the remaining space, fixed or not.
         if (index + 1 === count)
-            targetSize = boundsSize - viewFrame.origin[_originComponent];
-        // Try to keep fixed size areas the same size.
-        else if (!isSizable)
-        {
-            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;
+            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)
+        {
+            viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
+            remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
+        }
+
+        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;
     }
 
-    SPLIT_VIEW_MAYBE_POST_DID_RESIZE();
+    [self _postNotificationDidResize];
 }
 
 /*!
@@ -907,11 +749,6 @@ 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;
@@ -994,7 +831,6 @@ 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)
@@ -1026,168 +862,12 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 - (void)_postNotificationWillResize
 {
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification
-                                                        object:self
-                                                      userInfo:userInfo];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
 }
 
 - (void)_postNotificationDidResize
 {
-    var userInfo = nil;
-
-    if (_currentDivider !== CPNotFound)
-        userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider };
-
-    [[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++)
-        {
-            var item = preCollapseArray[i];
-
-            if (item === nil)
-                [_preCollapsePositions removeObjectForKey:String(i)];
-            else
-                [_preCollapsePositions setObject:item forKey:String(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;
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self];
 }
 
 @end
@@ -1195,8 +875,7 @@ 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",
-    CPSplitViewAutosaveNameKey      = "CPSplitViewAutosaveNameKey";
+    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
 
 @implementation CPSplitView (CPCoding)
 
@@ -1206,43 +885,11 @@ 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 = [];
 
@@ -1252,14 +899,6 @@ 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;
@@ -1280,8 +919,6 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 
     [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
     [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
-
-    [aCoder encodeObject:_autosaveName forKey:CPSplitViewAutosaveNameKey];
 }
 
 @end

AppKit/CPStepper.j

@@ -20,21 +20,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPControl.j"
-@import "CPButton.j"
-@import "CPTextField.j"
+@import <AppKit/CPControl.j>
+@import <AppKit/CPButton.j>
+@import <AppKit/CPTextField.j>
 
 
+var CPStepperButtonsSize = CPSizeMake(19, 13);
 
-/*!
-    CPStepper is an implementation of Cocoa NSStepper.
+/*! CPStepper is an  implementation of Cocoa NSStepper.
 
-    This control displays a two part button that can be used to increase or decrease a value with a given interval.
+    This control display 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);
@@ -46,8 +45,7 @@
 #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
@@ -55,24 +53,18 @@
 */
 + (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
 {
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMakeZero()];
-
+    var stepper = [[CPStepper alloc] initWithFrame:CPRectMake(0, 0, 19, 25)];
     [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
@@ -80,24 +72,7 @@
     return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
 }
 
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding || aBinding == CPMinValueBinding || aBinding == CPMaxValueBinding)
-        return [_CPStepperValueBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"doubleValue";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
-/*!
-    Initializes a CPStepper.
+/*! Initializes the CPStepper
     @param aFrame the frame of the control
     @return initialized CPStepper
 */
@@ -109,43 +84,33 @@
         _minValue       = 0.0;
         _increment      = 1.0;
         _valueWraps     = YES;
-        _autorepeat     = YES;
 
         [self setDoubleValue:0.0];
-        [self _init];
+
+        _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];
     }
 
     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
@@ -156,31 +121,19 @@
     [_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
 {
-    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];
+    if (aFrame.size.width >= CGRectGetWidth(aFrame))
+        [super setFrame:aFrame];
 }
 
-/*! @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];
@@ -189,28 +142,16 @@
     [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
 }
 
-- (void)_sizeToFit
-{
-    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
-}
-
-/*!
-    Set if CPStepper should autorepeat.
+/*! set if CPStepper should autorepeat
     @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
 */
 - (void)setAutorepeat:(BOOL)shouldAutoRepeat
 {
-    if (shouldAutoRepeat !== _autorepeat)
-    {
-        [_buttonUp setContinuous:shouldAutoRepeat];
-        [_buttonDown setContinuous:shouldAutoRepeat];
-    }
-
-    [self setContinuous:shouldAutoRepeat];
+    [_buttonUp setContinuous:shouldAutoRepeat];
+    [_buttonDown 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
@@ -226,7 +167,8 @@
 #pragma mark -
 #pragma mark Actions
 
-/*! @ignore */
+/*! @ignore
+*/
 - (IBAction)_buttonDidClick:(id)aSender
 {
     if (![self isEnabled])
@@ -237,11 +179,11 @@
     else
         [self setDoubleValue:([self doubleValue] - _increment)];
 
-    [self sendAction:[self action] to:[self target]];
+    if (_target && _action && [_target respondsToSelector:_action])
+        [self sendAction:_action to:_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
@@ -249,8 +191,7 @@
     [_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
@@ -269,55 +210,25 @@
 
 + (id)themeAttributes
 {
-    return @{
-            @"bezel-color-up-button": [CPNull null],
-            @"bezel-color-down-button": [CPNull null],
-            @"up-button-size": _CGSizeMakeZero(),
-            @"down-button-size": _CGSizeMakeZero(),
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null]]
+                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button"]];
 }
 
 @end
 
-@implementation _CPStepperValueBinder : CPBinder
-{
-}
 
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
-
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:placeholder forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNullMarker isDefault:YES];
-}
-
-@end
-
-var CPStepperMinValue   = @"CPStepperMinValue",
-    CPStepperMaxValue   = @"CPStepperMaxValue",
-    CPStepperValueWraps = @"CPStepperValueWraps",
-    CPStepperAutorepeat = @"CPStepperAutorepeat",
-    CPStepperIncrement  = @"CPStepperIncrement";
-
-@implementation CPStepper (CPCoding)
+@implementation CPStepper (CPCodingCompliance)
 
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
     {
-        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
-        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue];
-        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue];
-        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps];
-        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat];
-
-        [self _init];
+        _maxValue   = [aCoder decodeObjectForKey:@"_maxValue"];
+        _minValue   = [aCoder decodeObjectForKey:@"_minValue"];
+        _increment  = [aCoder decodeObjectForKey:@"_increment"];
+        _buttonUp   = [aCoder decodeObjectForKey:@"_buttonUp"];
+        _buttonDown = [aCoder decodeObjectForKey:@"_buttonDown"];
     }
-
     return self;
 }
 
@@ -325,16 +236,11 @@ var CPStepperMinValue   = @"CPStepperMinValue",
 {
     [super encodeWithCoder:aCoder];
 
-    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
-
-    if (_minValue)
-        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
-    if (_maxValue)
-        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
-    if (_valueWraps)
-        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
-    if (_autorepeat)
-        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
+    [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"];
 }
 
 @end

AppKit/CPString+Additions.j

@@ -0,0 +1,72 @@
+/*
+ * CPString+Additions.j
+ * AppKit
+ *
+ * Created by Randy Luecke
+ * Copyright 2011, RCLConcepts, LLC.
+ *
+ * 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
+ */
+
+
+/*
+    AppKit adds two methods to the CPString class to support drawing string directly in an CPView.
+
+    AppKit also adds similar methods to CPAttributedString.
+    The two drawing methods draw a string object with a single set of attributes that apply to the entire string.
+    To draw a string with multiple attributes, such as multiple text fonts, you must use an attributed string.
+*/
+@implementation CPString (AppKitAdditions)
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it on a single "infinately long" line.
+
+    @param aPoint - The starting point to draw the string
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawAtPoint:(CGPoint)aPoint withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        run = _CTRunCreate([self copy], attributes);
+
+    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
+    CTRunDraw(run, context, nil);
+}
+
+/*!
+    Draws a string in the current graphics context.
+    This method applies the attributes to the entier string
+    and displays it within the given rect.
+
+    @param aRect - The rect for which the string should be drawn into
+    @param attributes - the dictionary of attributes to apply to the string
+*/
+- (void)drawInRect:(CGRect)aRect withAttributes:(CPDictionary)attributes
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        string = [[CPAttributedString alloc] initWithString:self attributes:attributes];
+        frameSetter = CTFramesetterCreateWithAttributedString(string),
+        path = CGPathCreateMutable();
+
+    CGPathAddRect(path, nil, aRect);
+    
+    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [string length]), path, nil);
+
+    CTFrameDraw(frame, context);
+}
+
+@end

AppKit/CPStringDrawing.j

@@ -22,7 +22,6 @@
 
 @import <Foundation/CPString.j>
 
-@import "CGGeometry.j"
 @import "CPPlatformString.j"
 
 

AppKit/CPTabView.j

@@ -1,25 +1,3 @@
-/*
- * 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"
@@ -67,6 +45,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     if (self = [super initWithFrame:aFrame])
     {
         _items = [CPArray array];
+        _selectedIndex = CPNotFound;
 
         [self _init];
         [self setTabViewType:CPTopTabsBezelBorder];
@@ -77,17 +56,18 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
 - (void)_init
 {
-    _selectedIndex = CPNotFound;
-
-    _tabs = [[CPSegmentedControl alloc] initWithFrame:_CGRectMake(0, 0, 0, 0)];
+    _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];
 }
@@ -270,15 +250,17 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     Selects the item at the specified index.
     @param anIndex the index of the item to display.
 */
-- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
+- (void)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 NO;
+        return;
 
     if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
         [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
@@ -288,8 +270,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
     if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
         [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
-
-    return YES;
 }
 
 /*!
@@ -298,10 +278,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    if (_selectedIndex != CPNotFound)
-        return [_items objectAtIndex:_selectedIndex];
-
-    return nil;
+    return [_items objectAtIndex:_selectedIndex];
 }
 
 // Modifying the font
@@ -340,9 +317,21 @@ 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)
     {
@@ -358,29 +347,6 @@ 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];
-    }
 }
 
 /*!
@@ -441,30 +407,29 @@ 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]];
-}
 
-- (void)_setContentViewFromItem:(CPTabViewItem)anItem
-{
-    [_box setContentView:[anItem view]];
+    [_box setContentView:[[_items objectAtIndex:_selectedIndex] view]];
 }
 
 - (void)_updateItems
@@ -479,7 +444,9 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     }
 
     if (_selectedIndex === CPNotFound)
+    {
         [self selectFirstTabViewItem:self];
+    }
 }
 
 @end
@@ -502,43 +469,29 @@ 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]];
 
-        self.selectOnAwake = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
-        _type = [aCoder decodeIntForKey:CPTabViewTypeKey];
+        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
     }
 
     return self;
 }
 
-- (void)awakeFromCib
-{
-    if (self.selectOnAwake)
-    {
-        [self selectTabViewItem:self.selectOnAwake];
-        delete self.selectOnAwake;
-    }
-
-    var type = _type;
-    _type = nil;
-    [self setTabViewType:type];
-
-    [self setNeedsLayout];
-}
-
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
 
     [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
-
-    var selected = [self selectedTabViewItem];
-    if (selected)
-        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];
+    [aCoder encodeObject:[self selectedTabViewItem] forKey:CPTabViewSelectedItemKey];
 
     [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
     [aCoder encodeObject:_font forKey:CPTabViewFontKey];

AppKit/CPTabViewItem.j

@@ -60,7 +60,6 @@ CPPressedTab    = 2;
     CPView      _auxiliaryView;
 
     CPTabView   _tabView;
-    unsigned    _tabState;      // Looks like it is not yet implemented
 }
 
 - (id)init
@@ -133,13 +132,7 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
-    if (_view == aView)
-        return;
-
     _view = aView;
-
-    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewFromItem:self];
 }
 
 /*!

AppKit/CPTableColumn.j

@@ -26,11 +26,8 @@
 @import <Foundation/CPSortDescriptor.j>
 @import <Foundation/CPString.j>
 
-@import "CPTextField.j"
+@import "CPTableHeaderView.j"
 
-@global CPTableViewColumnDidResizeNotification
-
-@class _CPTableColumnHeaderView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
@@ -52,7 +49,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     CPTableView         _tableView;
     CPView              _headerView;
     CPView              _dataView;
-    CPData              _dataViewData;
+    Object              _dataViewData;
 
     float               _width;
     float               _minWidth;
@@ -86,7 +83,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
     if (self)
     {
-        _dataViewData = nil;
+        _dataViewData = { };
 
         _width = 100.0;
         _minWidth = 10.0;
@@ -135,7 +132,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 {
     var min = [self minWidth],
         max = [self maxWidth],
-        newWidth = ROUND(MIN(MAX(width, min), max));
+        newWidth = MIN(MAX(width, min), max);
 
     [self setWidth:newWidth];
 
@@ -395,12 +392,12 @@ CPTableColumnUserResizingMask   = 1 << 1;
 - (void)setDataView:(CPView)aView
 {
     if (_dataView)
-        _dataViewData = nil;
+        _dataViewData[[_dataView UID]] = nil;
 
     [aView setThemeState:CPThemeStateTableDataView];
 
     _dataView = aView;
-    _dataViewData = [CPKeyedArchiver archivedDataWithRootObject:aView];
+    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
 }
 
 - (CPView)dataView
@@ -424,12 +421,24 @@ CPTableColumnUserResizingMask   = 1 << 1;
 /*!
     @ignore
 */
-- (id)_newDataView
+- (id)_newDataViewForRow:(int)aRowIndex
 {
-    if (!_dataViewData)
-        return nil;
+    var dataView = [self dataViewForRow:aRowIndex],
+        dataViewUID = [dataView UID];
 
-    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData];
+    var x = [self tableView]._cachedDataViews[dataViewUID];
+    if (x && x.length)
+        return x.pop();
+
+    // if we haven't cached an archive of the data view, do it now
+    if (!_dataViewData[dataViewUID])
+        _dataViewData[dataViewUID] = [CPKeyedArchiver archivedDataWithRootObject:dataView];
+
+    // unarchive the data view cache
+    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData[dataViewUID]];
+    newDataView.identifier = dataViewUID;
+
+    // make sure only we have control over the size and placement
     [newDataView setAutoresizingMask:CPViewNotSizable];
 
     return newDataView;
@@ -485,23 +494,16 @@ CPTableColumnUserResizingMask   = 1 << 1;
 */
 - (CPSortDescriptor)sortDescriptorPrototype
 {
-    if (_sortDescriptorPrototype)
-        return _sortDescriptorPrototype;
-
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        binding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    return [binding _defaultSortDescriptorPrototype];
+    return _sortDescriptorPrototype;
 }
 
 /*!
-    If YES the tablecolumn will no longer be visible in the tableview.
-    If NO the tablecolumn will be visible in the tableview.
+    If NO the tablecolumn will no longer be visible in the tableview
+    If YES the tablecolumn will be visible in the tableview.
 */
 - (void)setHidden:(BOOL)shouldBeHidden
 {
     shouldBeHidden = !!shouldBeHidden
-
     if (_isHidden === shouldBeHidden)
         return;
 
@@ -548,7 +550,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [[CPNotificationCenter defaultCenter]
     postNotificationName:CPTableViewColumnDidResizeNotification
                   object:[self tableView]
-                userInfo:@{ @"CPTableColumn": self, @"CPOldWidth": oldWidth }];
+                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
 }
 
 @end
@@ -567,30 +569,6 @@ 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)
@@ -616,22 +594,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
 
     if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
-    {
-        // 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];
-    }
+        [[self tableView] _establishBindingsIfUnbound:anObject];
 }
 
 /*!
@@ -700,11 +663,8 @@ 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
@@ -721,6 +681,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
     }
 }
 
+//- (void)objectValue
+//{
+//    return nil;
+//}
+
 @end
 
 var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
@@ -745,7 +710,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 
     if (self)
     {
-        _dataViewData = nil;
+        _dataViewData = { };
 
         _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
         _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
@@ -754,6 +719,7 @@ 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];

AppKit/CPTableHeaderView.j

@@ -22,15 +22,9 @@
 
 @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
@@ -45,22 +39,13 @@
 
 + (id)themeAttributes
 {
-    return @{
-            @"background-color": [CPNull null],
-            @"text-alignment": CPLeftTextAlignment,
-            @"line-break-mode": CPLineBreakByTruncatingTail,
-            @"text-inset": CGInsetMakeZero(),
-            @"text-color": [CPNull null],
-            @"font": [CPNull null],
-            @"text-shadow-color": [CPNull null],
-            @"text-shadow-offset": CGSizeMakeZero(),
-        };
+    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"]];
 }
 
 - (void)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
-
     if (self)
         [self _init];
 
@@ -89,11 +74,10 @@
 
     [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
     [_textField setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
-    [_textField setFont:[self currentValueForThemeAttribute:@"font"]];
+    [_textField setFont:[self currentValueForThemeAttribute:@"text-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
@@ -118,52 +102,7 @@
 
 - (void)setFont:(CPFont)aFont
 {
-    [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"]
+    [self setValue:aFont forThemeAttribute:"text-font"];
 }
 
 - (void)_setIndicatorImage:(CPImage)anImage
@@ -183,10 +122,6 @@
 
 var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
     _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
-    _CPTableColumnHeaderViewTextColorKey = @"_CPTableColumnHeaderViewTextColorKey",
-    _CPTableColumnHeaderViewTextShadowColorKey = @"_CPTableColumnHeaderViewTextShadowColorKey",
-    _CPTableColumnHeaderViewAlignmentKey = @"_CPTableColumnHeaderViewAlignmentKey",
-    _CPTableColumnHeaderViewLineBreakModeKey = @"_CPTableColumnHeaderViewLineBreakModeKey",
     _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
 
 @implementation _CPTableColumnHeaderView (CPCoding)
@@ -199,10 +134,6 @@ 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;
@@ -214,11 +145,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
     [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
     [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
-    [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];
+    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
 }
 
 @end
@@ -247,10 +174,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 + (id)themeAttributes
 {
-    return @{
-            @"background-color": [CPNull null],
-            @"divider-color": [CPColor grayColor],
-        };
+    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPColor grayColor]]
+                                       forKeys:[@"background-color", @"divider-color"]];
 }
 
 - (void)_init
@@ -331,9 +256,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     {
         var headerView = [_tableView._tableColumns[column] headerView];
         [headerView setThemeState:CPThemeStateHighlighted];
-
-        if (_tableView._editingColumn == column)
-            [[self window] makeFirstResponder:_tableView];
     }
 
     _pressedColumn = column;
@@ -564,8 +486,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     [self stopTrackingTableColumn:_activeColumn at:aLocation];
 
     [self setNeedsDisplay:YES];
-
-    [_tableView _enqueueDraggingViews];
 }
 
 - (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
@@ -714,7 +634,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         columnMaxX;
 
     CGContextBeginPath(context);
-
     for (; columnArrayIndex < columnArrayCount; columnArrayIndex++)
     {
         // grab each column rect and add vertical lines
@@ -724,9 +643,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         columnMaxX = _CGRectGetMaxX(columnToStroke);
 
         CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
     }
-
     CGContextClosePath(context);
     CGContextStrokePath(context);
 

AppKit/CPTheme.j

@@ -21,11 +21,9 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPMutableArray.j>
 @import <Foundation/CPString.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-@class CPView
 
 var CPThemesByName          = { },
     CPThemeDefaultTheme     = nil,
@@ -85,7 +83,7 @@ var CPThemesByName          = { },
     if (self)
     {
         _name = aName;
-        _attributes = @{};
+        _attributes = [CPDictionary dictionary];
 
         CPThemesByName[_name] = self;
     }
@@ -147,7 +145,7 @@ var CPThemesByName          = { },
                 className = [aClass defaultThemeClass];
             else if ([aClass respondsToSelector:@selector(themeClass)])
             {
-                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
+                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass",CPStringFromClass([anObject class]));
                 className = [aClass themeClass];
             }
             else
@@ -257,7 +255,7 @@ var CPThemesByName          = { },
         attributeNames = [attributes keyEnumerator],
         objectThemeClass = [anObject themeClass];
 
-    while ((attributeName = [attributeNames nextObject]) !== nil)
+    while (attributeName = [attributeNames nextObject])
         [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
 }
 
@@ -270,7 +268,7 @@ var CPThemesByName          = { },
 
     if (!attributes)
     {
-        attributes = @{};
+        attributes = [CPDictionary dictionary];
 
         [_attributes setObject:attributes forKey:aClass];
     }
@@ -420,9 +418,6 @@ CPThemeStateEditing         = CPThemeState("editing");
 CPThemeStateVertical        = CPThemeState("vertical");
 CPThemeStateDefault         = CPThemeState("default");
 CPThemeStateCircular        = CPThemeState("circular");
-CPThemeStateAutocompleting  = CPThemeState("autocompleting");
-CPThemeStateMainWindow      = CPThemeState("mainWindow");
-CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 
 @implementation _CPThemeAttribute : CPObject
 {
@@ -443,7 +438,7 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
         _cache = { };
         _name = aName;
         _defaultValue = aDefaultValue;
-        _values = @{};
+        _values = [CPDictionary dictionary];
     }
 
     return self;
@@ -474,9 +469,9 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
     _cache = {};
 
     if (aValue === undefined || aValue === nil)
-        _values = @{};
+        _values = [CPDictionary dictionary];
     else
-        _values = @{ String(CPThemeStateNormal): aValue };
+        _values = [CPDictionary dictionaryWithObject:aValue forKey:String(CPThemeStateNormal)];
 }
 
 - (void)setValue:(id)aValue forState:(CPThemeState)aState
@@ -584,8 +579,7 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
         _cache = {};
 
         _name = [aCoder decodeObjectForKey:@"name"];
-        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
-        _values = @{};
+        _values = [CPDictionary dictionary];
 
         if ([aCoder containsValueForKey:@"value"])
         {
@@ -617,7 +611,6 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_name forKey:@"name"];
-    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];
 
     var keys = [_values allKeys],
         count = keys.length;
@@ -633,7 +626,7 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
     }
     else
     {
-        var encodedValues = @{};
+        var encodedValues = [CPDictionary dictionary];
 
         while (count--)
         {
@@ -673,7 +666,7 @@ var numberOfOnes = function(aNumber)
     cachedNumberOfOnes[slot] = count;
 
     return count;
-};
+}
 
 numberOfOnes.displayName = "numberOfOnes";
 

AppKit/CPThemeBlend.j

@@ -33,7 +33,7 @@
 
 @implementation CPThemeBlend : CPObject
 {
-    CPBundle    _bundle @accessors(getter=bundle);
+    CPBundle    _bundle;
     CPArray     _themes;
     id          _loadDelegate;
 }

AppKit/CPToolbar.j

@@ -28,7 +28,6 @@
 @import "CPPopUpButton.j"
 @import "CPToolbarItem.j"
 
-@global CPApp
 
 /*
     @global
@@ -51,11 +50,6 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;
 
-
-CPToolbarSizeModeDefault                = 0;
-CPToolbarSizeModeRegular                = 1;
-CPToolbarSizeModeSmall                  = 2;
-
 var CPToolbarsByIdentifier              = nil,
     CPToolbarConfigurationsByIdentifier = nil;
 
@@ -89,12 +83,10 @@ var CPToolbarsByIdentifier              = nil,
 @implementation CPToolbar : CPObject
 {
     CPString                _identifier;
-    CPToolbarDisplayMode    _displayMode @accessors(property=displayMode);
+    CPToolbarDisplayMode    _displayMode;
     BOOL                    _showsBaselineSeparator;
     BOOL                    _allowsUserCustomization;
     BOOL                    _isVisible;
-    int                     _sizeMode @accessors(property=sizeMode);
-    int                     _desiredHeight;
 
     id                      _delegate;
 
@@ -115,11 +107,11 @@ var CPToolbarsByIdentifier              = nil,
 /* @ignore */
 + (void)initialize
 {
-    if (self !== [CPToolbar class])
+    if (self != [CPToolbar class])
         return;
 
-    CPToolbarsByIdentifier = @{};
-    CPToolbarConfigurationsByIdentifier = @{};
+    CPToolbarsByIdentifier = [CPDictionary dictionary];
+    CPToolbarConfigurationsByIdentifier = [CPDictionary dictionary];
 }
 
 /* @ignore */
@@ -156,8 +148,6 @@ var CPToolbarsByIdentifier              = nil,
 
         _identifier = anIdentifier;
         _isVisible = YES;
-        _sizeMode = CPToolbarSizeModeDefault;
-        _desiredHeight = 0;
 
         [CPToolbar _addToolbar:self forIdentifier:_identifier];
     }
@@ -212,16 +202,6 @@ 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;
@@ -229,13 +209,7 @@ var CPToolbarsByIdentifier              = nil,
 
 - (void)_setWindow:(CPWindow)aWindow
 {
-    if (_window)
-        [[CPNotificationCenter defaultCenter] removeObserver:self name:_CPWindowDidChangeFirstResponderNotification object:_window];
-
     _window = aWindow;
-
-    if (_window)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autoValidateVisibleItems) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
 }
 
 /*!
@@ -252,33 +226,18 @@ 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:[self _toolbarViewFrame]];
+        _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
 
         [_toolbarView setToolbar:self];
         [_toolbarView setAutoresizingMask:CPViewWidthSizable];
@@ -298,17 +257,13 @@ var CPToolbarsByIdentifier              = nil,
     // _defaultItems may have been loaded from Cib
     _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];
 
-    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+    if (_delegate)
     {
-        var itemIdentifiersFromDelegate = [_delegate toolbarDefaultItemIdentifiers:self];
+        var itemIdentifiersFromDelegate = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
 
-        // If we get items both from the Cib and from the delegate method, put the delegate items before the
-        // Cib ones.
         if (itemIdentifiersFromDelegate)
-            _itemIdentifiers = [itemIdentifiersFromDelegate arrayByAddingObjectsFromArray:_itemIdentifiers];
+            _itemIdentifiers = [_itemIdentifiers arrayByAddingObjectsFromArray:itemIdentifiersFromDelegate];
     }
-    // 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];
@@ -377,26 +332,12 @@ 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--)
-    {
-        var item = [toolbarItems objectAtIndex:count];
-        if (!isAutovalidation || [item autovalidates])
-            [item validate];
-    }
+        [toolbarItems[count] validate];
 }
 
 /* @ignore */
@@ -486,8 +427,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
     CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
     CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey",
-    CPToolbarSizeModeKey                = @"CPToolbarSizeModeKey";
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
 
 @implementation CPToolbar (CPCoding)
 
@@ -506,7 +446,6 @@ 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];
@@ -553,7 +492,6 @@ 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];
@@ -570,10 +508,14 @@ 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
@@ -598,24 +540,16 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     BOOL                _FIXME_isHUD;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return @"toolbar-view";
-}
+    if (self !== [_CPToolbarView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return @{
-            @"item-margin": 10.0,
-            @"extra-item-width": 20.0,
-            @"extra-item-extra-image": [CPNull null],
-            @"extra-item-extra-alternate-image": [CPNull null],
-            @"content-inset": _CGInsetMake(4.0, 4.0, 4.0, 10),
-            @"regular-size-height": 59.0,
-            @"small-size-height": 46.0,
-            @"image-item-separator-color": [CPNull null],
-            @"image-item-separator-size": CGRectMake(0.0, 0.0, 2.0, 32.0),
-        };
+    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)initWithFrame:(CGRect)aFrame
@@ -629,12 +563,14 @@ 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;
@@ -679,7 +615,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 = [];
@@ -690,7 +626,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     // minimum width for hiding items.
     if (itemsWidth < minWidth)
     {
-        itemsWidth -= [self valueForThemeAttribute:@"extra-item-width"];
+        itemsWidth -= TOOLBAR_EXTRA_ITEMS_WIDTH;
 
         _visibleItems = [_visibleItems copy];
 
@@ -706,7 +642,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             var item = itemsSortedByVisibilityPriority[--count],
                 view = [self viewForItem:item];
 
-            minWidth -= [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
+            minWidth -= [view minSize].width + TOOLBAR_ITEM_MARGIN;
 
             [_visibleItems removeObjectIdenticalTo:item];
             [invisibleItemsSortedByPriority addObject:item];
@@ -729,24 +665,6 @@ 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,
@@ -766,7 +684,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];
     }
@@ -801,25 +719,23 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
                 remainingSpace += proposedWidth - constrainedWidth;
             }
 
-            [view setFrameSize:_CGSizeMake(constrainedWidth, height)];
+            [view setFrameSize:CGSizeMake(constrainedWidth, height)];
         }
     }
 
     // Now that all the visible items are the correct width, give them their final frames.
     var index = 0,
         count = _visibleItems.length,
-        x = contentInset.left,
-        contentInset = [self valueForThemeAttribute:@"content-inset"],
-        y = contentInset.top;
+        x = TOOLBAR_ITEM_MARGIN;
 
     for (; index < count; ++index)
     {
         var view = [self viewForItem:_visibleItems[index]],
-            viewWidth = _CGRectGetWidth([view frame]);
+            viewWidth = CGRectGetWidth([view frame]);
 
-        [view setFrame:_CGRectMake(x, y, viewWidth, height)];
+        [view setFrame:CGRectMake(x, 0.0, viewWidth, height)];
 
-        x += viewWidth + [self valueForThemeAttribute:@"item-margin"];
+        x += viewWidth + TOOLBAR_ITEM_MARGIN;
     }
 
     var needsAdditionalItemsButton = NO;
@@ -851,14 +767,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:[self valueForThemeAttribute:@"extra-item-extra-image"]];
+        [[_additionalItemsButton itemArray][0] setImage:_CPToolbarViewExtraItemsImage];
 
         var index = 0,
             count = [_invisibleItems count],
@@ -924,7 +840,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     count = items.length;
 
-    _minWidth = [self valueForThemeAttribute:@"item-margin"];
+    _minWidth = TOOLBAR_ITEM_MARGIN;
     _viewsForToolbarItems = { };
 
     for (; index < count; ++index)
@@ -939,17 +855,12 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
         [self addSubview:view];
 
-        _minWidth += [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
+        _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
     }
 
     [self tile];
 }
 
-- (void)layoutSubviews
-{
-    [_additionalItemsButton setAlternateImage:[self valueForThemeAttribute:@"extra-item-extra-alternate-image"]];
-}
-
 @end
 
 /* @ignore */
@@ -965,9 +876,10 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
         return CPOrderedAscending;
 
     return CPOrderedDescending;
-};
+}
 
-var LABEL_MARGIN    = 2.0;
+var TOP_MARGIN      = 5.0,
+    LABEL_MARGIN    = 2.0;
 
 @implementation _CPToolbarItemView : CPControl
 {
@@ -994,12 +906,12 @@ var LABEL_MARGIN    = 2.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];
@@ -1046,7 +958,13 @@ var LABEL_MARGIN    = 2.0;
 
         if (identifier === CPToolbarSeparatorItemIdentifier)
         {
-            _view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+            _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")];
+
             [self addSubview:_view];
         }
 
@@ -1078,7 +996,7 @@ var LABEL_MARGIN    = 2.0;
         {
             _imageView = [[CPImageView alloc] initWithFrame:[self bounds]];
 
-            [_imageView setImageScaling:CPImageScaleProportionallyDown];
+            [_imageView setImageScaling:CPScaleProportionally];
 
             [self addSubview:_imageView];
         }
@@ -1096,13 +1014,8 @@ var LABEL_MARGIN    = 2.0;
 
     _labelSize = [_labelField frame].size;
 
-    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);
+    _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
+    _maxSize = CGSizeMake(MIN(_labelSize.width, maxSize.width), 100000000.0);
 
     [_toolbar tile];
 }
@@ -1119,31 +1032,20 @@ var LABEL_MARGIN    = 2.0;
         width = _CGRectGetWidth(bounds);
 
     if (identifier === CPToolbarSeparatorItemIdentifier)
-    {
-        var itemSeparatorColor = [_toolbar valueForThemeAttribute:@"image-item-separator-color"],
-            itemSeparatorSize = [_toolbar valueForThemeAttribute:@"image-item-separator-size"];
+        return [_view setFrame:CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
 
-        [_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],
-        iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
-        height = _CGRectGetHeight(bounds) - (iconOnly ? 0 : _labelSize.height),
+        height = _CGRectGetHeight(bounds) - _labelSize.height - LABEL_MARGIN - TOP_MARGIN,
         viewWidth = MIN(itemMaxSize.width, width),
         viewHeight =  MIN(itemMaxSize.height, height);
 
-    [view setFrame:_CGRectMake(ROUND((width - viewWidth) / 2.0),
-                               ROUND((height - viewHeight) / 2.0),
-                               viewWidth,
-                               viewHeight)];
+    [view setFrame:CGRectMake(  ROUND((width - viewWidth) / 2.0),
+                                TOP_MARGIN + ROUND((height - viewHeight) / 2.0),
+                                viewWidth,
+                                viewHeight)];
 
-    // 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)];
+    [_labelField setFrameOrigin:CGPointMake(ROUND((width - _labelSize.width) / 2.0), TOP_MARGIN + height + LABEL_MARGIN)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -1163,10 +1065,6 @@ var LABEL_MARGIN    = 2.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)
@@ -1210,7 +1108,7 @@ var LABEL_MARGIN    = 2.0;
         if (alternateImage)
             [_imageView setImage:alternateImage];
 
-        [_labelField setTextShadowOffset:_CGSizeMakeZero()];
+        [_labelField setTextShadowOffset:CGSizeMakeZero()];
     }
     else
     {
@@ -1219,7 +1117,7 @@ var LABEL_MARGIN    = 2.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]];