Fixed: menus not closing on left click.

Previously, clicking outside a menu on a control would not close the menu. Also clicking on the menu header again would open a second menu.

This error was caused by the control receiving the click and starting its own tracking, depriving the menu of the mouse up event it was awaiting.

The behaviour to wait for the mouse up was wrong to begin with. Menus should close on mouse down.

This fix closes the menu on left mouse down anywhere but the menu, while still allowing the click to pass through to any control underneath the cursor.

Fixes #1833.

.gitignore

@@ -5,3 +5,11 @@ Demos
 ./Aristo
 WebSite
 .push-package
+*.xcodeproj/*.pbxuser
+*.xcodeproj/*.perspectivev3
+xcuserdata/
+!*.xcodeproj/project.pbxproj
+*.xCodeSupport/
+*.XcodeSupport/
+*.sublime-project
+*.sublime-workspace

.travis.yml

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

AppKit/AppKit.j

@@ -20,10 +20,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "_CPToolTip.j"
 @import "CALayer.j"
+@import "CGGeometry.j"
+@import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
 @import "CPApplication.j"
+@import "CPArrayController.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
 @import "CPBrowser.j"
@@ -31,18 +35,24 @@
 @import "CPButtonBar.j"
 @import "CPCheckBox.j"
 @import "CPCib.j"
+@import "CPCibBindingConnector.j"
 @import "CPCibConnector.j"
 @import "CPCibControlConnector.j"
+@import "CPCibHelpConnector.j"
 @import "CPCibLoading.j"
 @import "CPCibOutletConnector.j"
+@import "CPCibRuntimeAttributesConnector.j"
 @import "CPClipView.j"
-@import "CPCollectionViewItem.j"
 @import "CPCollectionView.j"
+@import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
+@import "CPColorSpace.j"
 @import "CPColorWell.j"
+@import "CPComboBox.j"
 @import "CPCompatibility.j"
 @import "CPControl.j"
+@import "CPController.j"
 @import "CPCookie.j"
 @import "CPCursor.j"
 @import "CPDocument.j"
@@ -52,37 +62,50 @@
 @import "CPFlashView.j"
 @import "CPFont.j"
 @import "CPFontManager.j"
-@import "CPGeometry.j"
+@import "CPGradient.j"
+@import "CPGraphics.j"
 @import "CPImage.j"
 @import "CPImageView.j"
+@import "CPKeyBinding.j"
+@import "CPLevelIndicator.j"
 @import "CPMenu.j"
 @import "CPMenuItem.j"
 @import "CPOpenPanel.j"
 @import "CPOutlineView.j"
 @import "CPPanel.j"
 @import "CPPasteboard.j"
+@import "CPPopover.j"
 @import "CPPopUpButton.j"
+@import "CPPredicateEditor.j"
+@import "CPPredicateEditorRowTemplate.j"
 @import "CPProgressIndicator.j"
 @import "CPRadio.j"
 @import "CPResponder.j"
-@import "CPSearchField.j"
-@import "CPScrollView.j"
+@import "CPRuleEditor.j"
 @import "CPScroller.j"
+@import "CPScrollView.j"
+@import "CPSearchField.j"
 @import "CPSecureTextField.j"
 @import "CPSegmentedControl.j"
 @import "CPShadow.j"
 @import "CPSlider.j"
+@import "CPSound.j"
 @import "CPSplitView.j"
-@import "CPTabView.j"
+@import "CPStepper.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
+@import "CPTabView.j"
+@import "CPText.j"
 @import "CPTextField.j"
+@import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
 @import "CPTreeNode.j"
+@import "CPUserDefaultsController.j"
 @import "CPView.j"
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"
+@import "CPWorkspace.j"

AppKit/CPAccordionView.j

@@ -26,11 +26,16 @@
 @import <Foundation/CPIndexSet.j>
 @import <Foundation/CPString.j>
 
-@import <AppKit/CPView.j>
-
-#import "CoreGraphics/CGGeometry.h"
+@import "CPView.j"
+@import "CPButton.j"
 
 
+/*!
+  @ingroup appkit
+  @class CPAccordionViewItem
+
+  <p>A CPAccordionViewItem represents a single section of a CPAccordionView.</p>
+*/
 @implementation CPAccordionViewItem : CPObject
 {
     CPString    _identifier @accessors(property=identifier);
@@ -43,6 +48,10 @@
     return [self initWithIdentifier:@""];
 }
 
+/*!
+  Initializes a new CPAccordionViewItem with the specified identifier. This identifier may
+  then be used in subsequent methods to provide abstract introspection of the CPAccordionView.
+*/
 - (id)initWithIdentifier:(CPString)anIdentifier
 {
     self = [super init];
@@ -55,6 +64,25 @@
 
 @end
 
+/*!
+  @ingroup appkit
+  @class CPAccordionView
+
+  <p>CPAccordionView provides a container for CPAccordionViewItem objects and manages layout state
+  for all sub-layout items.</p>
+
+  <strong>Example</strong><br />
+  <pre>
+var myAccordionView = [[CPAccordionView alloc] initWithFrame:CGRectMakeZero()];
+var firstItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"firstSection"]];
+[firstItem setView:[[CPView alloc] initWithFrame:CGRectMakeZero()]];
+var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection"]];
+[secondItem setView:[[CPView alloc] initWithFrame:CGRectMakeZero()]];
+[myAccordionView addItem:firstItem];
+[myAccordionView addItem:secondItem];
+[myAccordionView setAutoresizingMask: CPViewWidthSizable | CPViewHeightSizable];
+  </pre>
+*/
 @implementation CPAccordionView : CPView
 {
     CPInteger       _dirtyItemIndex;
@@ -64,7 +92,10 @@
     CPMutableArray  _itemViews;
     CPIndexSet      _expandedItemIndexes;
 }
-
+/*!
+    Initializes the receiver for usage with the specified bounding rectangle
+    @return the initialized view
+*/
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -95,7 +126,11 @@
 {
     return _items;
 }
-
+/*!
+  Append a CPAccordionViewItem to the receiver. Note that the CPAccordionViewItem must contain
+  a valid CPView derived component or a TypeError will be generated when the contents of the
+  ViewItem are disclosed.
+*/
 - (void)addItem:(CPAccordionViewItem)anItem
 {
     [self insertItem:anItem atIndex:_items.length];
@@ -178,7 +213,7 @@
 
     if ([itemView isCollapsed])
         [self expandItemAtIndex:anIndex];
-    
+
     else
         [self collapseItemAtIndex:anIndex];
 }
@@ -192,7 +227,7 @@
 {
     var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
 
-    [indexSet removeIndexes:_expandedIndexes];
+    [indexSet removeIndexes:_expandedItemIndexes];
 
     return indexSet;
 }
@@ -202,12 +237,12 @@
     var itemView = _itemViews[anIndex];
     if (!itemView)
         return;
-    
+
     if (!isEnabled)
         [self collapseItemAtIndex:anIndex];
     else
         [self expandItemAtIndex:anIndex];
-    
+
     [itemView setEnabled:isEnabled];
 }
 
@@ -235,7 +270,7 @@
 {
     if (_items.length <= 0)
         return [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), 0.0)];
-    
+
     if (_dirtyItemIndex === CPNotFound)
         return;
 
@@ -356,7 +391,7 @@
 
         [_contentView setFrameSize:_CGSizeMake(aWidth, contentHeight)];
         [self setFrame:_CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
-    }    
+    }
 }
 
 - (void)resizeSubviewsWithOldSize:(CGSize)aSize
@@ -373,7 +408,7 @@
 /*
     else if (aKeyPath === "itemHeaderPrototype")
     {
-        
+
     }
 */
 }

AppKit/CPAlert.j

@@ -6,7 +6,9 @@
  * Copyright 2008, Jake MacMullin.
  *
  * 11/10/2008 Ross Boucher
- *     - Make it conform to style guidelines, general cleanup and ehancements
+ *     - Make it conform to style guidelines, general cleanup and enhancements
+ * 11/10/2010 Antoine Mercadal
+ *     - Enhancements, better compliance with Cocoa API
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -26,39 +28,40 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
-@import <AppKit/CPApplication.j>
-@import <AppKit/CPButton.j>
-@import <AppKit/CPColor.j>
-@import <AppKit/CPFont.j>
-@import <AppKit/CPImage.j>
-@import <AppKit/CPImageView.j>
-@import <AppKit/CPPanel.j>
-@import <AppKit/CPTextField.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
 */
-CPWarningAlertStyle =        0;
+CPWarningAlertStyle         = 0;
 /*
     @global
     @group CPAlertStyle
 */
-CPInformationalAlertStyle =  1;
+CPInformationalAlertStyle   = 1;
 /*
     @global
     @group CPAlertStyle
 */
-CPCriticalAlertStyle =       2;
+CPCriticalAlertStyle        = 2;
 
-
-var CPAlertWarningImage,
-    CPAlertInformationImage,
-    CPAlertErrorImage;
+var bottomHeight = 71;
 
 /*!
     @ingroup appkit
-    
+
     CPAlert is an alert panel that can be displayed modally to present the
     user with a message and one or more options.
 
@@ -74,41 +77,84 @@ var CPAlertWarningImage,
     @delegate -(void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
     Called when the user dismisses the alert by clicking one of the buttons.
     @param theAlert the alert panel that the user dismissed
-    @param returnCode the index of the button that the user clicked (starting from 0, 
+    @param returnCode the index of the button that the user clicked (starting from 0,
            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
 {
-    CPPanel         _alertPanel;
+    BOOL                _showHelp               @accessors(property=showsHelp);
+    BOOL                _showSuppressionButton  @accessors(property=showsSuppressionButton);
 
-    CPTextField     _messageLabel;
-    CPImageView     _alertImageView;
+    CPAlertStyle        _alertStyle             @accessors(property=alertStyle);
+    CPString            _title                  @accessors(property=title);
+    CPView              _accessoryView          @accessors(property=accessoryView);
+    CPImage             _icon                   @accessors(property=icon);
 
-    CPAlertStyle    _alertStyle;
-    CPString        _windowTitle;
-    int             _windowStyle;
-    int             _buttonCount;
-    CPArray         _buttons;
+    CPArray             _buttons                @accessors(property=buttons, readonly);
+    CPCheckBox          _suppressionButton      @accessors(property=suppressionButton, readonly);
 
-    id              _delegate;
+    id                  _delegate               @accessors(property=delegate);
+    id                  _modalDelegate;
+    SEL                 _didEndSelector;
+
+    _CPAlertThemeView   _themeView              @accessors(property=themeView, readonly);
+    CPWindow            _window                 @accessors(property=window, readonly);
+    int                 _defaultWindowStyle;
+
+    CPImageView         _alertImageView;
+    CPTextField         _informativeLabel;
+    CPTextField         _messageLabel;
+    CPButton            _alertHelpButton;
+
+    BOOL                _needsLayout;
 }
 
-+ (void)initialize
+#pragma mark Creating Alerts
+
+/*!
+    Returns a CPAlert object with the provided info
+
+    @param aMessage the main body text of the alert
+    @param defaultButton the title of the default button
+    @param alternateButton if not nil, the title of a second button
+    @param otherButton if not nil, the title of the third button
+    @param informativeText if not nil the informative text of the alert
+    @return fully initialized CPAlert
+*/
++ (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
 {
-    if (self != CPAlert)
-        return;
+    var newAlert = [[self alloc] init];
 
-    var bundle = [CPBundle bundleForClass:[self class]];   
+    [newAlert setMessageText:aMessage];
+    [newAlert addButtonWithTitle:defaultButtonTitle];
 
-    CPAlertWarningImage     = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-warning.png"] 
-                                                                 size:CGSizeMake(32.0, 32.0)];
-                                                             
-    CPAlertInformationImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-information.png"] 
-                                                                 size:CGSizeMake(32.0, 32.0)];
-                                                                 
-    CPAlertErrorImage       = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPAlert/dialog-error.png"] 
-                                                                 size:CGSizeMake(32.0, 32.0)];
+    if (alternateButtonTitle)
+        [newAlert addButtonWithTitle:alternateButtonTitle];
+
+    if (otherButtonTitle)
+        [newAlert addButtonWithTitle:otherButtonTitle];
+
+    if (informativeText)
+        [newAlert setInformativeText:informativeText];
+
+    return newAlert;
+}
+
+/*!
+    Return an CPAlert with type error
+
+    @param anErrorMessage the message of the alert
+    @return fully initialized CPAlert
+*/
++ (CPAlert)alertWithError:(CPString)anErrorMessage
+{
+    var newAlert = [[self alloc] init];
+
+    [newAlert setMessageText:anErrorMessage];
+    [newAlert setAlertStyle:CPCriticalAlertStyle];
+
+    return newAlert;
 }
 
 /*!
@@ -116,166 +162,423 @@ var CPAlertWarningImage,
 */
 - (id)init
 {
-    if (self = [super init])
-    {
-        _buttonCount = 0;
-        _buttons = [CPArray array];
-        _alertStyle = CPWarningAlertStyle;
+    self = [super init];
 
-        [self setWindowStyle:nil];
+    if (self)
+    {
+        _buttons            = [];
+        _alertStyle         = CPWarningAlertStyle;
+        _showHelp           = NO;
+        _needsLayout        = YES;
+        _defaultWindowStyle = _CPModalWindowMask;
+        _themeView          = [_CPAlertThemeView new];
+
+        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
+        _alertImageView     = [[CPImageView alloc] init];
+        _informativeLabel   = [[CPTextField alloc] init];
+        _suppressionButton  = [CPCheckBox checkBoxWithTitle:@"Do not show this message again"];
+
+        _alertHelpButton    = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
+        [_alertHelpButton setTarget:self];
+        [_alertHelpButton setAction:@selector(_showHelp:)];
     }
-    
+
     return self;
 }
 
-/*!
-    Sets the window appearance.
-    @param styleMask - Either CPHUDBackgroundWindowMask or nil for standard.
-*/
-- (void)setWindowStyle:(int)styleMask
+#pragma mark Accessors
+
+- (CPTheme)theme
 {
-    _windowStyle = styleMask;
-    
-    _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 400.0, 110.0) styleMask:styleMask ? styleMask | CPTitledWindowMask : CPTitledWindowMask];
-    [_alertPanel setFloatingPanel:YES];
-    [_alertPanel center];
-
-    [_messageLabel setTextColor:(styleMask & CPHUDBackgroundWindowMask) ? [CPColor whiteColor] : [CPColor blackColor]];
-
-    var count = [_buttons count];
-    for(var i=0; i < count; i++)
-    {
-        var button = _buttons[i];
-        
-        [button setFrameSize:CGSizeMake([button frame].size.width, (styleMask == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
-        
-        [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
-
-        [[_alertPanel contentView] addSubview:button];
-    }
-    
-    if (!_messageLabel)
-    {
-        var bounds = [[_alertPanel contentView] bounds];
-
-        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMake(57.0, 10.0, CGRectGetWidth(bounds) - 73.0, 62.0)];
-        [_messageLabel setFont:[CPFont boldSystemFontOfSize:13.0]];
-        [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
-        [_messageLabel setAlignment:CPJustifiedTextAlignment];
-        [_messageLabel setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-
-        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
-    }
-
-    [[_alertPanel contentView] addSubview:_messageLabel];
-    [[_alertPanel contentView] addSubview:_alertImageView];
+    return [_themeView theme];
 }
 
 /*!
-    Sets the window's title. If this is not defined, a default title based on your warning level will be used.
-    @param aTitle the title to use in place of the default. Set to nil to use default.
+    set the theme to use
+
+    @param the theme to use
 */
-- (void)setTitle:(CPString)aTitle
+- (void)setTheme:(CPTheme)aTheme
 {
-    _windowTitle = aTitle;
+    if (aTheme === [self theme])
+        return;
+
+    if (aTheme === [CPTheme defaultHudTheme])
+        _defaultWindowStyle = CPTitledWindowMask | CPHUDBackgroundWindowMask;
+    else
+        _defaultWindowStyle = CPTitledWindowMask;
+
+    _window = nil; // will be regenerated at next layout
+    _needsLayout = YES;
+    [_themeView setTheme:aTheme];
 }
 
-/*!
-    Gets the window's title.
-*/
-- (CPString)title
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
 {
-    return _windowTitle;
+    [_themeView setValue:aValue forThemeAttribute:aName];
 }
 
-/*!
-    Gets the window's style.
+- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(CPThemeState)aState
+{
+    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
+}
+
+
+/*! @deprecated
+*/
+- (void)setWindowStyle:(int)aStyle
+{
+    CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
+    [self setTheme:(aStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+}
+
+/*! @deprecated
 */
 - (int)windowStyle
 {
-    return _windowStyle;
+    CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
+    return _defaultWindowStyle;
+}
+
+
+/*!
+    set the text of the alert's message
+
+    @param aText CPString containing the text
+*/
+- (void)setMessageText:(CPString)aText
+{
+    [_messageLabel setStringValue:aText];
+    _needsLayout = YES;
 }
 
 /*!
-    Sets the receiver’s delegate.
-    @param delegate - Delegate for the alert. nil removes the delegate.
-*/
-- (void)setDelegate:(id)delegate
-{
-    _delegate = delegate;
-}
-
-/*!
-    Gets the receiver's delegate.
-*/
-- (void)delegate
-{
-    return _delegate;
-}
-
-/*!
-    Sets the alert style of the receiver.
-    @param style - Alert style for the alert.
-*/
-- (void)setAlertStyle:(CPAlertStyle)style
-{
-    _alertStyle = style;
-}
-
-/*!
-    Gets the alert style.
-*/
-- (CPAlertStyle)alertStyle
-{
-    return _alertStyle;
-}
-
-/*!
-    Set’s the receiver’s message text, or title, to a given text.
-    @param messageText - Message text for the alert.
-*/
-- (void)setMessageText:(CPString)messageText
-{
-    [_messageLabel setStringValue:messageText];
-}
-
-/*! 
-    Return's the receiver's message text body.
+    return the content of the message text
+    @return CPString containing the message text
 */
 - (CPString)messageText
 {
     return [_messageLabel stringValue];
 }
 
+/*!
+    set the text of the alert's informative text
+
+    @param aText CPString containing the informative text
+*/
+- (void)setInformativeText:(CPString)aText
+{
+    [_informativeLabel setStringValue:aText];
+    _needsLayout = YES;
+}
+
+/*!
+    return the content of the message text
+
+    @return CPString containing the message text
+*/
+- (CPString)informativeText
+{
+    return [_informativeLabel stringValue];
+}
+
+/*!
+    Sets the title of the alert window.
+    This API is not present in Cocoa.
+    @param aTitle CPString containing the window title
+*/
+- (void)setTitle:(CPString)aTitle
+{
+    _title = aTitle;
+    [_window setTitle:aTitle];
+}
+
+/*!
+    set the accessory view
+
+    @param aView the accessory view
+*/
+- (void)setAccessoryView:(CPView)aView
+{
+    _accessoryView = aView;
+    _needsLayout = YES;
+}
+
+/*!
+    set if alert shows the suppression button
+
+    @param shouldShowSuppressionButton YES or NO
+*/
+- (void)setShowsSuppressionButton:(BOOL)shouldShowSuppressionButton
+{
+    _showSuppressionButton = shouldShowSuppressionButton;
+    _needsLayout = YES;
+}
+
+#pragma mark Accessing Buttons
+
 /*!
     Adds a button with a given title to the receiver.
     Buttons will be added starting from the right hand side of the \c CPAlert panel.
     The first button will have the index 0, the second button 1 and so on.
 
+    The first button will automatically be given a key equivalent of Return,
+    and any button titled "Cancel" will be given a key equivalent of Escape.
+
     You really shouldn't need more than 3 buttons.
+
+    @param title the title of the button
 */
-- (void)addButtonWithTitle:(CPString)title
+- (void)addButtonWithTitle:(CPString)aTitle
 {
-    var bounds = [[_alertPanel contentView] bounds],
-        button = [[CPButton alloc] initWithFrame:CGRectMake(CGRectGetWidth(bounds) - ((_buttonCount + 1) * 90.0), CGRectGetHeight(bounds) - 34.0, 80.0, (_windowStyle == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
-    
-    [button setTitle:title];
+    var bounds = [[_window contentView] bounds],
+        count = [_buttons count],
+
+        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+
+    [button setTitle:aTitle];
+    [button setTag:count];
     [button setTarget:self];
-    [button setTag:_buttonCount];
-    [button setAction:@selector(_notifyDelegate:)];
-    
-    [button setTheme:(_windowStyle === CPHUDBackgroundWindowMask) ? [CPTheme themeNamed:"Aristo-HUD"] : [CPTheme defaultTheme]];
-    [button setAutoresizingMask:CPViewMinXMargin | CPViewMinYMargin];
+    [button setAction:@selector(_takeReturnCodeFrom:)];
 
-    [[_alertPanel contentView] addSubview:button];
-    
-    if (_buttonCount == 0)
-        [_alertPanel setDefaultButton:button];
+    [[_window contentView] addSubview:button];
 
-    _buttonCount++;
-    [_buttons addObject:button];
+    if (count == 0)
+        [button setKeyEquivalent:CPCarriageReturnCharacter];
+    else if ([aTitle lowercaseString] === @"cancel")
+        [button setKeyEquivalent:CPEscapeFunctionKey];
+
+    [_buttons insertObject:button atIndex:0];
 }
 
+#pragma mark Layout
+
+/*!
+    @ignore
+*/
+- (void)_layoutMessageView
+{
+    var inset = [_themeView 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 setLineBreakMode:CPLineBreakByWordWrapping];
+
+    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
+    messageLabelTextSize = [[_messageLabel stringValue] sizeWithFont:[_messageLabel font] inWidth:messageLabelWidth];
+
+    [_messageLabel setFrame:CGRectMake(inset.left, inset.top, messageLabelTextSize.width, messageLabelTextSize.height + sizeWithFontCorrection)];
+}
+
+/*!
+    @ignore
+*/
+- (void)_layoutInformativeView
+{
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [_themeView 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 setLineBreakMode:CPLineBreakByWordWrapping];
+
+    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
+    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
+    informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];
+
+    [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];
+}
+
+/*!
+    @ignore
+*/
+- (void)_layoutAccessoryView
+{
+    if (!_accessoryView)
+        return;
+
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
+        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
+
+    [_accessoryView setFrameOrigin:CGPointMake(inset.left, accessoryViewOriginY)];
+    [[_window contentView] addSubview:_accessoryView];
+}
+
+/*!
+    @ignore
+*/
+- (void)_layoutSuppressionButton
+{
+    if (!_showSuppressionButton)
+        return;
+
+    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
+        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
+        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
+
+    [_suppressionButton setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
+    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
+    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
+    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
+    [_suppressionButton sizeToFit];
+
+    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
+    [[_window contentView] addSubview:_suppressionButton];
+}
+
+/*!
+    @ignore
+*/
+- (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"],
+        aRepresentativeButton = [_buttons objectAtIndex:0],
+        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
+        panelSize = [[_window contentView] frame].size,
+        buttonsOriginY,
+        buttonMarginY,
+        buttonMarginX,
+        theme = [self theme],
+        offsetX;
+
+    [aRepresentativeButton setTheme:[self theme]];
+    [aRepresentativeButton sizeToFit];
+
+    panelSize.height = CGRectGetMaxY([lastView frame]) + defaultElementsMargin + [aRepresentativeButton frameSize].height;
+    if (panelSize.height < minimumSize.height)
+        panelSize.height = minimumSize.height;
+
+    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
+    offsetX = panelSize.width - inset.right;
+
+    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];
+        [button setTheme:[self theme]];
+        [button sizeToFit];
+
+        var buttonFrame = [button frame],
+            width = MAX(80.0, CGRectGetWidth(buttonFrame)),
+            height = CGRectGetHeight(buttonFrame);
+
+        offsetX -= width;
+        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
+        offsetX -= 10;
+    }
+
+    if (_showHelp)
+    {
+        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
+            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
+            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
+            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
+
+        [_alertHelpButton setImage:helpImage];
+        [_alertHelpButton setAlternateImage:helpImagePressed];
+        [_alertHelpButton setBordered:NO];
+        [_alertHelpButton setFrame:helpFrame];
+    }
+
+    panelSize.height += [aRepresentativeButton frameSize].height + inset.bottom + buttonOffset;
+    return panelSize;
+}
+
+/*!
+    @ignore
+*/
+- (void)layout
+{
+    if (!_needsLayout)
+        return;
+
+    if (!_window)
+        [self _createWindowWithStyle:nil];
+
+    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
+        theImage = _icon,
+        finalSize;
+
+    if (!theImage)
+        switch (_alertStyle)
+        {
+            case CPWarningAlertStyle:
+                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
+                break;
+            case CPInformationalAlertStyle:
+                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
+                break;
+            case CPCriticalAlertStyle:
+                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
+                break;
+        }
+
+    [_alertImageView setImage:theImage];
+
+    var imageSize = theImage ? [theImage size] : CGSizeMakeZero();
+    [_alertImageView setFrame:CGRectMake(iconOffset.x, iconOffset.y, imageSize.width, imageSize.height)];
+
+    [self _layoutMessageView];
+    [self _layoutInformativeView];
+    [self _layoutAccessoryView];
+    [self _layoutSuppressionButton];
+
+    var lastView = _informativeLabel;
+    if (_showSuppressionButton)
+        lastView = _suppressionButton;
+    else if (_accessoryView)
+        lastView = _accessoryView;
+
+    finalSize = [self _layoutButtonsFromView:lastView];
+    if ([_window styleMask] & CPDocModalWindowMask)
+        finalSize.height -= 26; // adjust the absence of title bar
+
+    [_window setFrameSize:finalSize];
+    [_window center];
+
+    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
+    {
+        [_window setMovable:YES];
+        [_window setMovableByWindowBackground:YES];
+    }
+
+    _needsLayout = NO;
+}
+
+#pragma mark Displaying Alerts
+
 /*!
     Displays the \c CPAlert panel as a modal dialog. The user will not be
     able to interact with any other controls until s/he has dismissed the alert
@@ -283,34 +586,171 @@ var CPAlertWarningImage,
 */
 - (void)runModal
 {
-    var theTitle;
-    
-    switch (_alertStyle)
+    if (!([_window styleMask] & _defaultWindowStyle))
     {
-        case CPWarningAlertStyle:       [_alertImageView setImage:CPAlertWarningImage];
-                                        theTitle = @"Warning";
-                                        break;
-        case CPInformationalAlertStyle: [_alertImageView setImage:CPAlertInformationImage];
-                                        theTitle = @"Information";
-                                        break;
-        case CPCriticalAlertStyle:      [_alertImageView setImage:CPAlertErrorImage];
-                                        theTitle = @"Error";
-                                        break;
+        _needsLayout = YES;
+        [self _createWindowWithStyle:_defaultWindowStyle];
     }
-    
-    [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
-    
-    [CPApp runModalForWindow:_alertPanel];
+
+    [self layout];
+    [CPApp runModalForWindow:_window];
 }
 
-/* @ignore */
-- (void)_notifyDelegate:(id)button
-{
-    [CPApp abortModal];
-    [_alertPanel close];
+/*!
+    Runs the receiver modally as an alert sheet attached to a specified window.
 
-    if (_delegate && [_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-        [_delegate alertDidEnd:self returnCode:[button tag]];
+    @param window The parent window for the sheet.
+    @param modalDelegate The delegate for the modal-dialog session.
+    @param alertDidEndSelector Message the alert sends to modalDelegate after the sheet is dismissed.
+    @param contextInfo Contextual data passed to modalDelegate in didEndSelector message.
+*/
+- (void)beginSheetModalForWindow:(CPWindow)aWindow modalDelegate:(id)modalDelegate didEndSelector:(SEL)alertDidEndSelector contextInfo:(id)contextInfo
+{
+    if (!([_window styleMask] & CPDocModalWindowMask))
+    {
+        _needsLayout = YES;
+        [self _createWindowWithStyle:CPDocModalWindowMask];
+    }
+
+    [self layout];
+
+    _modalDelegate = modalDelegate;
+    _didEndSelector = alertDidEndSelector;
+
+    [CPApp beginSheet:_window modalForWindow:aWindow modalDelegate:self didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:contextInfo];
+}
+
+/*!
+    Runs the receiver modally as an alert sheet attached to a specified window.
+
+    @param window The parent window for the sheet.
+*/
+- (void)beginSheetModalForWindow:(CPWindow)aWindow
+{
+    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
+}
+
+#pragma mark Private
+
+/*!
+    @ignore
+*/
+- (void)_createWindowWithStyle:(int)forceStyle
+{
+    var frame = CGRectMakeZero();
+    frame.size = [_themeView currentValueForThemeAttribute:@"size"];
+
+    _window = [[CPPanel alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
+    [_window setLevel:CPStatusWindowLevel];
+
+    if (_title)
+        [_window setTitle:_title];
+
+    var contentView = [_window contentView],
+        count = [_buttons count];
+
+    if (count)
+        while (count--)
+            [contentView addSubview:_buttons[count]];
+    else
+        [self addButtonWithTitle:@"OK"];
+
+    [contentView addSubview:_messageLabel];
+    [contentView addSubview:_alertImageView];
+    [contentView addSubview:_informativeLabel];
+
+    if (_showHelp)
+        [contentView addSubview:_alertHelpButton];
+}
+
+/*!
+    @ignore
+*/
+- (@action)_showHelp:(id)aSender
+{
+    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
+        [_delegate alertShowHelp:self];
+}
+
+/*
+    @ignore
+*/
+- (@action)_takeReturnCodeFrom:(id)aSender
+{
+    if ([_window isSheet])
+    {
+        [_window orderOut:nil];
+        [CPApp endSheet:_window returnCode:[aSender tag]];
+    }
+    else
+    {
+        [CPApp abortModal];
+        [_window close];
+
+        [self _alertDidEnd:_window returnCode:[aSender tag] contextInfo:nil];
+    }
+}
+
+/*!
+    @ignore
+*/
+- (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
+{
+    if (_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
+
++ (CPString)defaultThemeClass
+{
+    return @"alert";
+}
+
++ (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,
+        };
 }
 
 @end

AppKit/CPAnimation.j

@@ -21,6 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
+@import <Foundation/CPTimer.j>
 
 @import "CAMediaTimingFunction.j"
 
@@ -48,14 +49,14 @@ CPAnimationLinear       = 3;
 
 ACTUAL_FRAME_RATE = 0;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPAnimation
 
     Manages an animation. Contains timing and progress information.
 
     @par Delegate Methods
-    
+
     @delegate -(BOOL)animationShouldStart:(CPAnimation)animation;
     Called at the beginning of \c -startAnimation.
     @param animation the animation that will start
@@ -81,13 +82,13 @@ ACTUAL_FRAME_RATE = 0;
 {
     CPTimeInterval          _lastTime;
     CPTimeInterval          _duration;
-    
+
     CPAnimationCurve        _animationCurve;
     CAMediaTimingFunction   _timingFunction;
-    
+
     float                   _frameRate;
     float                   _progress;
-    
+
     id                      _delegate;
     CPTimer                 _timer;
 }
@@ -101,7 +102,7 @@ ACTUAL_FRAME_RATE = 0;
 - (id)initWithDuration:(float)aDuration animationCurve:(CPAnimationCurve)anAnimationCurve
 {
     self = [super init];
-    
+
     if (self)
     {
         _progress = 0.0;
@@ -110,36 +111,43 @@ ACTUAL_FRAME_RATE = 0;
 
         [self setAnimationCurve:anAnimationCurve];
     }
-    
+
     return self;
 }
 
 /*!
     Sets the animation's pace.
     @param anAnimationCurve the animation's pace
-    @throws CPInvalidArgumentException if an invalid animation curve is specified 
+    @throws CPInvalidArgumentException if an invalid animation curve is specified
 */
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
+    var timingFunctionName;
+
     switch (anAnimationCurve)
     {
-        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
-                                    break;
-                                    
-        case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
-                                    break;
-                                    
-        case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
-                                    break;
-                                    
-        case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
-                                    break;
+        case CPAnimationEaseInOut:
+            timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
+            break;
 
-        default:                    [CPException raise:CPInvalidArgumentException
-                                                reason:"Invalid value provided for animation curve"];
-                                    break;
+        case CPAnimationEaseIn:
+            timingFunctionName = kCAMediaTimingFunctionEaseIn;
+            break;
+
+        case CPAnimationEaseOut:
+            timingFunctionName = kCAMediaTimingFunctionEaseOut;
+            break;
+
+        case CPAnimationLinear:
+            timingFunctionName = kCAMediaTimingFunctionLinear;
+            break;
+
+        default:
+            [CPException raise:CPInvalidArgumentException
+                        reason:@"Invalid value provided for animation curve"];
+            break;
     }
-    
+
     _animationCurve = anAnimationCurve;
     _timingFunction = [CAMediaTimingFunction functionWithName:timingFunctionName];
 }
@@ -161,7 +169,7 @@ ACTUAL_FRAME_RATE = 0;
 {
     if (aDuration < 0)
         [CPException raise:CPInvalidArgumentException reason:"aDuration can't be negative"];
-        
+
     _duration = aDuration;
 }
 
@@ -182,7 +190,7 @@ ACTUAL_FRAME_RATE = 0;
 {
     if (frameRate < 0)
         [CPException raise:CPInvalidArgumentException reason:"frameRate can't be negative"];
-        
+
     _frameRate = frameRate;
 }
 
@@ -221,13 +229,13 @@ ACTUAL_FRAME_RATE = 0;
     // If we're already animating, or our delegate stops us, animate.
     if (_timer || _delegate && [_delegate respondsToSelector:@selector(animationShouldStart:)] && ![_delegate animationShouldStart:self])
         return;
-    
+
     if (_progress === 1.0)
         _progress = 0.0;
-    
+
     ACTUAL_FRAME_RATE = 0;
     _lastTime = new Date();
-    
+
     _timer = [CPTimer scheduledTimerWithTimeInterval:0.0 target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
 }
 
@@ -242,14 +250,14 @@ ACTUAL_FRAME_RATE = 0;
     _lastTime = currentTime;
 
     ++ACTUAL_FRAME_RATE;
-    
+
     [self setCurrentProgress:progress];
-    
+
     if (progress === 1.0)
     {
         [_timer invalidate];
         _timer = nil;
-        
+
         if ([_delegate respondsToSelector:@selector(animationDidEnd:)])
             [_delegate animationDidEnd:self];
     }
@@ -262,10 +270,10 @@ ACTUAL_FRAME_RATE = 0;
 {
     if (!_timer)
         return;
-    
+
     [_timer invalidate];
     _timer = nil;
-    
+
     if ([_delegate respondsToSelector:@selector(animationDidStop:)])
         [_delegate animationDidStop:self];
 }
@@ -302,17 +310,20 @@ ACTUAL_FRAME_RATE = 0;
 - (float)currentValue
 {
     var t = [self currentProgress];
-    
+
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
         return [_delegate animation:self valueForProgress:t];
-    
+
+    if (_animationCurve == CPAnimationLinear)
+        return t;
+
     var c1 = [],
         c2 = [];
-  
+
     [_timingFunction getControlPointAtIndex:1 values:c1];
     [_timingFunction getControlPointAtIndex:2 values:c2];
- 
-    return CubicBezierAtTime(t,c1[0],c1[1],c2[0],c2[1],_duration);
+
+    return CubicBezierAtTime(t, c1[0], c1[1], c2[0], c2[1], _duration);
 }
 
 @end
@@ -320,28 +331,104 @@ ACTUAL_FRAME_RATE = 0;
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function CubicBezierAtTime(t,p1x,p1y,p2x,p2y,duration)
+var CubicBezierAtTime = function(t, p1x, p1y, p2x, p2y, duration)
 {
-    var ax=0,bx=0,cx=0,ay=0,by=0,cy=0;
+    var ax = 0,
+        bx = 0,
+        cx = 0,
+        ay = 0,
+        by = 0,
+        cy = 0;
     // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
-    function sampleCurveX(t) {return ((ax*t+bx)*t+cx)*t;};
-    function sampleCurveY(t) {return ((ay*t+by)*t+cy)*t;};
-    function sampleCurveDerivativeX(t) {return (3.0*ax*t+2.0*bx)*t+cx;};
+    function sampleCurveX(t)
+    {
+        return ((ax * t + bx) * t + cx) * t;
+    }
+
+    function sampleCurveY(t)
+    {
+        return ((ay * t + by) * t + cy) * t;
+    }
+
+    function sampleCurveDerivativeX(t)
+    {
+        return (3.0 * ax * t + 2.0 * bx) * t + cx;
+    }
+
     // The epsilon value to pass given that the animation is going to run over |duration| seconds. The longer the animation, the more precision is needed in the timing function result to avoid ugly discontinuities.
-    function solveEpsilon(duration) {return 1.0/(200.0*duration);};
-    function solve(x,epsilon) {return sampleCurveY(solveCurveX(x,epsilon));};
+    function solveEpsilon(duration)
+    {
+        return 1.0 / (200.0 * duration);
+    }
+
+    function solve(x, epsilon)
+    {
+        return sampleCurveY(solveCurveX(x, epsilon));
+    }
+
     // Given an x value, find a parametric value it came from.
-    function solveCurveX(x,epsilon) {var t0,t1,t2,x2,d2,i;
-        function fabs(n) {if(n>=0) {return n;}else {return 0-n;}}; 
+    function solveCurveX(x, epsilon)
+    {
+        var t0,
+            t1,
+            t2 = x,
+            x2,
+            d2,
+            i = 0;
+
         // First try a few iterations of Newton's method -- normally very fast.
-        for(t2=x, i=0; i<8; i++) {x2=sampleCurveX(t2)-x; if(fabs(x2)<epsilon) {return t2;} d2=sampleCurveDerivativeX(t2); if(fabs(d2)<1e-6) {break;} t2=t2-x2/d2;}
+        for (; i < 8; i++)
+        {
+            x2 = sampleCurveX(t2) - x;
+
+            if (ABS(x2) < epsilon)
+                return t2;
+
+            d2 = sampleCurveDerivativeX(t2);
+
+            if (ABS(d2) < 1e-6)
+                break;
+
+            t2 = t2 - x2 / d2;
+        }
+
         // Fall back to the bisection method for reliability.
-        t0=0.0; t1=1.0; t2=x; if(t2<t0) {return t0;} if(t2>t1) {return t1;}
-        while(t0<t1) {x2=sampleCurveX(t2); if(fabs(x2-x)<epsilon) {return t2;} if(x>x2) {t0=t2;}else {t1=t2;} t2=(t1-t0)*.5+t0;}
+        t0 = 0.0;
+        t1 = 1.0;
+        t2 = x;
+
+        if (t2 < t0)
+            return t0;
+
+        if (t2 > t1)
+            return t1;
+
+        while (t0 < t1)
+        {
+            x2 = sampleCurveX(t2);
+
+            if (ABS(x2 - x) < epsilon)
+                return t2;
+
+            if (x > x2)
+                t0 = t2;
+
+            else
+                t1 = t2;
+
+            t2 = (t1 - t0) * 0.5 + t0;
+        }
+
         return t2; // Failure.
     };
     // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
-    cx=3.0*p1x; bx=3.0*(p2x-p1x)-cx; ax=1.0-cx-bx; cy=3.0*p1y; by=3.0*(p2y-p1y)-cy; ay=1.0-cy-by;
+    cx = 3.0 * p1x;
+    bx = 3.0 * (p2x - p1x) - cx;
+    ax = 1.0 - cx - bx;
+    cy = 3.0 * p1y;
+    by = 3.0 * (p2y - p1y) - cy;
+    ay = 1.0 - cy - by;
+
     // Convert from input time to parametric value in curve, then from that to output time.
     return solve(t, solveEpsilon(duration));
 };

AppKit/CPBezierPath.j

@@ -4,7 +4,7 @@
  * Created by Ross Boucher.
  * Copyright 2009, 280 North, Inc.
  *
- * Adapted from Kevin Wojniak, portions Copyright 2009 Kevin Wojniak. 
+ * Adapted from Kevin Wojniak, portions Copyright 2009 Kevin Wojniak.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,26 +20,26 @@
  * 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 <AppKit/CPGraphicsContext.j>
 @import <Foundation/CPObject.j>
 
+@import "CPGraphicsContext.j"
+
 
 // Class defaults
 
 var DefaultLineWidth = 1.0;
 
 
-/*! 
+/*!
     @ingroup appkit
     @class CPBezierPath
 
     A CPBezierPath allows you to create paths for drawing to the screen using a simpler API than CoreGraphics.
-    Paths can form any shape, including regular polgyons like squares and triangles; circles, arcs; or complex
-    line segments. 
-    
+    Paths can form any shape, including regular polygons like squares and triangles; circles, arcs; or complex
+    line segments.
+
     A path can be stroked and filled using the relevant method. The currently active fill and stroke color will
     be used, which can be set by calling setFill: and setStroke: on any CPColor object (or set: for both).
 */
@@ -61,24 +61,33 @@ var DefaultLineWidth = 1.0;
 /*!
     Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
++ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)aRect
 {
     var path = [self bezierPath];
-    
-    [path appendBezierPathWithOvalInRect:rect];
-    
+
+    [path appendBezierPathWithOvalInRect:aRect];
+
     return path;
 }
 
 /*!
     Create a new CPBezierPath object initialized with a rectangular path.
 */
-+ (CPBezierPath)bezierPathWithRect:(CGRect)rect
++ (CPBezierPath)bezierPathWithRect:(CGRect)aRect
 {
     var path = [self bezierPath];
-    
-    [path appendBezierPathWithRect:rect];
-    
+
+    [path appendBezierPathWithRect:aRect];
+
+    return path;
+}
+
++ (CPBezierPath)bezierPathWithRoundedRect:(CGRect)aRect xRadius:(float)xRadius yRadius:(float)yRadius
+{
+    var path = [self bezierPath];
+
+    [path appendBezierPathWithRoundedRect:aRect xRadius:xRadius yRadius:yRadius];
+
     return path;
 }
 
@@ -165,6 +174,19 @@ var DefaultLineWidth = 1.0;
     CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }
 
+- (CGRect)bounds
+{
+    // TODO: this should return this. The controlPointBounds is not a tight fit.
+    // return CGPathGetBoundingBox(_path);
+
+    return [self controlPointBounds];
+}
+
+- (CGRect)controlPointBounds
+{
+    return CGPathGetBoundingBox(_path);
+}
+
 /*!
     Create a line segment between the first and last points in the subpath, closing it.
 */
@@ -183,7 +205,6 @@ var DefaultLineWidth = 1.0;
     CGContextBeginPath(ctx);
     CGContextAddPath(ctx, _path);
     CGContextSetLineWidth(ctx, [self lineWidth]);
-    CGContextClosePath(ctx);
     CGContextStrokePath(ctx);
 }
 
@@ -273,13 +294,19 @@ var DefaultLineWidth = 1.0;
     CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
 }
 
+- (void)appendBezierPathWithArcFromPoint:(CGPoint)fromPoint toPoint:(CGPoint)toPoint radius:(float)radius
+{
+    CGPathAddArcToPoint(_path, null, fromPoint.x, fromPoint.y, toPoint.x, toPoint.y, radius);
+}
+
 /*!
     Append the contents of a CPBezierPath object.
 */
-- (void)appendBezierPath:(NSBezierPath *)other
+- (void)appendBezierPath:(CPBezierPath)other
 {
     CGPathAddPath(_path, nil, other._path);
 }
+
 /*!
     Remove all path elements; clears path.
 */
@@ -288,4 +315,21 @@ var DefaultLineWidth = 1.0;
     _path = CGPathCreateMutable();
 }
 
+- (void)addClip
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextAddPath(ctx, _path);
+    CGContextClip(ctx);
+}
+
+- (void)setClip
+{
+    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextBeginPath(ctx);
+    CGContextAddPath(ctx, _path);
+    CGContextClip(ctx);
+}
+
 @end

AppKit/CPBox.j

@@ -19,27 +19,75 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
+@import "CPTextField.j"
 @import "CPView.j"
 
+// CPBoxType
+CPBoxPrimary    = 0;
+CPBoxSecondary  = 1;
+CPBoxSeparator  = 2;
+CPBoxOldStyle   = 3;
+CPBoxCustom     = 4;
+
 // CPBorderType
 CPNoBorder      = 0;
-CPLineBorder    = 1;    
+CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
+// CPTitlePosition
+CPNoTitle     = 0;
+CPAboveTop    = 1;
+CPAtTop       = 2;
+CPBelowTop    = 3;
+CPAboveBottom = 4;
+CPAtBottom    = 5;
+CPBelowBottom = 6;
+
+
+/*!
+    @ingroup appkit
+    @class CPBox
+
+    A CPBox is a simple view which can display a border.
+*/
 @implementation CPBox : CPView
 {
+    CPBoxType       _boxType;
     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
@@ -47,29 +95,31 @@ CPGrooveBorder  = 3;
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
         enclosingView = [aView superview];
 
+    [box setAutoresizingMask:[aView autoresizingMask]];
     [box setFrameFromContentFrame:[aView frame]];
 
     [enclosingView replaceSubview:aView with:box];
-    
+
     [box setContentView:aView];
-    
+
     return box;
 }
 
-- (id)initWithFrame:(CPRect)frameRect
+- (id)initWithFrame:(CGRect)frameRect
 {
     self = [super initWithFrame:frameRect];
-    
+
     if (self)
     {
-        _fillColor = [CPColor clearColor];
-        _borderColor = [CPColor blackColor];
+        _borderType = CPBezelBorder;
 
-        _borderWidth = 1.0;
-        _contentMargin = CGSizeMake(0.0, 0.0);
+        _titlePosition = CPNoTitle;
+        _titleView = [CPTextField labelWithTitle:@""];
 
         _contentView = [[CPView alloc] initWithFrame:[self bounds]];
+        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
+        [self setAutoresizesSubviews:YES];
         [self addSubview:_contentView];
     }
 
@@ -78,76 +128,149 @@ CPGrooveBorder  = 3;
 
 // Configuring Boxes
 
-- (CPRect)borderRect
+/*!
+    Returns the receiver's border rectangle.
+
+    @return the border rectangle of the box
+*/
+- (CGRect)borderRect
 {
     return [self bounds];
 }
 
+/*!
+    Returns the receiver's border type. Possible values are:
+
+    <pre>
+    CPNoBorder
+    CPLineBorder
+    CPBezelBorder
+    CPGrooveBorder
+    </pre>
+
+    @return the border type of the box
+*/
 - (CPBorderType)borderType
 {
     return _borderType;
 }
 
-- (void)setBorderType:(CPBorderType)value
+
+/*!
+    Sets the receiver's border type. Valid values are:
+
+    <pre>
+    CPNoBorder
+    CPLineBorder
+    CPBezelBorder
+    CPGrooveBorder
+    </pre>
+
+    @param borderType the border type to use
+*/
+- (void)setBorderType:(CPBorderType)aBorderType
 {
-    _borderType = value;
+    if (_borderType === aBorderType)
+        return;
+
+    _borderType = aBorderType;
+    [self setNeedsDisplay:YES];
+}
+
+/*!
+    Returns the receiver's box type. Possible values are:
+
+    <pre>
+    CPBoxPrimary
+    CPBoxSecondary
+    CPBoxSeparator
+    CPBoxOldStyle
+    CPBoxCustom
+    </pre>
+
+    (In the current implementation, all values act the same except CPBoxSeparator.)
+
+    @return the box type of the box.
+*/
+- (CPBoxType)boxType
+{
+    return _boxType;
+}
+
+/*!
+    Sets the receiver's box type. Valid values are:
+
+    <pre>
+    CPBoxPrimary
+    CPBoxSecondary
+    CPBoxSeparator
+    CPBoxOldStyle
+    CPBoxCustom
+    </pre>
+
+    (In the current implementation, all values act the same except CPBoxSeparator.)
+
+    @param aBoxType the box type of the box.
+*/
+- (void)setBoxType:(CPBoxType)aBoxType
+{
+    if (_boxType === aBoxType)
+        return;
+
+    _boxType = aBoxType;
     [self setNeedsDisplay:YES];
 }
 
 - (CPColor)borderColor
 {
-    return _borderColor;
+    return [self valueForThemeAttribute:@"border-color"];
 }
 
 - (void)setBorderColor:(CPColor)color
 {
-    if ([color isEqual:_borderColor])
+    if ([color isEqual:[self borderColor]])
         return;
 
-    _borderColor = color;
-    [self setNeedsDisplay:YES];
+    [self setValue:color forThemeAttribute:@"border-color"];
 }
 
 - (float)borderWidth
 {
-    return _borderWidth;
+    return [self valueForThemeAttribute:@"border-width"];
 }
 
 - (void)setBorderWidth:(float)width
 {
-    if (width === _borderWidth)
+    if (width === [self borderWidth])
         return;
 
-    _borderWidth = width;
-    [self setNeedsDisplay:YES];
+    [self setValue:width forThemeAttribute:@"border-width"];
 }
 
 - (float)cornerRadius
 {
-    return _cornerRadius;
+    return [self valueForThemeAttribute:@"corner-radius"];
 }
 
 - (void)setCornerRadius:(float)radius
 {
-    if (radius === _cornerRadius)
+    if (radius === [self cornerRadius])
         return;
 
-    _cornerRadius = radius;
-    [self setNeedsDisplay:YES];
+    [self setValue:radius forThemeAttribute:@"corner-radius"];
 }
 
 - (CPColor)fillColor
 {
-    return _fillColor;
+    return [self valueForThemeAttribute:@"background-color"];
 }
 
 - (void)setFillColor:(CPColor)color
 {
-    if ([color isEqual:_fillColor])
+    if ([color isEqual:[self fillColor]])
         return;
 
-    _fillColor = color;
-    [self setNeedsDisplay:YES];
+    [self setValue:color forThemeAttribute:@"background-color"];
 }
 
 - (CPView)contentView
@@ -160,85 +283,355 @@ CPGrooveBorder  = 3;
     if (aView === _contentView)
         return;
 
-    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
-    [self replaceSubview:_contentView with:aView];
-    
-    _contentView = aView;    
+    var borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+
+    [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];
+
+    _contentView = aView;
 }
 
-- (CPSize)contentViewMargins
+- (CGSize)contentViewMargins
 {
-    return _contentMargin;
+    return [self valueForThemeAttribute:@"content-margin"];
 }
 
-- (void)setContentViewMargins:(CPSize)size
+- (void)setContentViewMargins:(CGSize)size
 {
-     if(size.width < 0 || size.height < 0)
+     if (size.width < 0 || size.height < 0)
          [CPException raise:CPGenericException reason:@"Margins must be positive"];
-         
-    _contentMargin = CGSizeMakeCopy(size);
-    [self setNeedsDisplay:YES];
+
+    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
 }
 
-- (void)setFrameFromContentFrame:(CPRect)aRect
+- (void)setFrameFromContentFrame:(CGRect)aRect
 {
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
+    var offset = [self _titleHeightOffset],
+        borderWidth = [self borderWidth],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+
+    [self setFrame:CGRectInset(aRect, -(contentMargin.width + borderWidth), -(contentMargin.height + offset[0] + borderWidth))];
+}
+
+- (void)setTitle:(CPString)aTitle
+{
+    if (aTitle == _title)
+        return;
+
+    _title = aTitle;
+
+    [self _manageTitlePositioning];
+}
+
+- (void)setTitlePosition:(int)aTitlePotisition
+{
+    if (aTitlePotisition == _titlePosition)
+        return;
+
+    _titlePosition = aTitlePotisition;
+
+    [self _manageTitlePositioning];
+}
+
+- (CPFont)titleFont
+{
+    return [_titleView font];
+}
+
+- (void)setTitleFont:(CPFont)aFont
+{
+    [_titleView setFont:aFont];
+}
+
+/*!
+    Return the text field used to display the receiver's title.
+
+    This is the Cappuccino equivalent to the `titleCell` method.
+*/
+- (CPTextField)titleView
+{
+    return _titleView;
+}
+
+- (void)_manageTitlePositioning
+{
+    if (_titlePosition == CPNoTitle)
+    {
+        [_titleView removeFromSuperview];
+        [self setNeedsDisplay:YES];
+        return;
+    }
+
+    [_titleView setStringValue:_title];
+    [_titleView sizeToFit];
+    [self addSubview:_titleView];
+
+    switch (_titlePosition)
+    {
+        case CPAtTop:
+        case CPAboveTop:
+        case CPBelowTop:
+            [_titleView setFrameOrigin:CGPointMake(5.0, 0.0)];
+            [_titleView setAutoresizingMask:CPViewNotSizable];
+            break;
+
+        case CPAboveBottom:
+        case CPAtBottom:
+        case CPBelowBottom:
+            var h = [_titleView frameSize].height;
+            [_titleView setFrameOrigin:CGPointMake(5.0, [self frameSize].height - h)];
+            [_titleView setAutoresizingMask:CPViewMinYMargin];
+            break;
+    }
+
+    [self sizeToFit];
     [self setNeedsDisplay:YES];
 }
 
 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame];
-    
-    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2, 
-                                  contentFrame.size.height + _contentMargin.height * 2)];
-    
-    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
+    var contentFrame = [_contentView frame],
+        offset = [self _titleHeightOffset],
+        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+
+    if (!contentFrame)
+        return;
+
+    [_contentView setFrameOrigin:CGPointMake(contentMargin.width, contentMargin.height + offset[1])];
 }
 
-- (void)drawRect:(CPRect)rect
+- (float)_titleHeightOffset
 {
-    var bounds = [self bounds],
-        aContext = [[CPGraphicsContext currentContext] graphicsPort],
-        border2 = _borderWidth/2,
+    if (_titlePosition == CPNoTitle)
+        return [0.0, 0.0];
 
-        strokeRect = CGRectMake(bounds.origin.x + border2, 
-                                bounds.origin.y + border2, 
-                                bounds.size.width - _borderWidth, 
-                                bounds.size.height - _borderWidth),
-                                
-        fillRect = CGRectMake(bounds.origin.x + border2, 
-                              bounds.origin.y + border2, 
-                              bounds.size.width - _borderWidth, 
-                              bounds.size.height - _borderWidth);
-
-    CGContextSetFillColor(aContext, [self fillColor]);
-    CGContextSetStrokeColor(aContext, [self borderColor]);
-    CGContextSetLineWidth(aContext, _borderWidth);
-
-    switch(_borderType)
+    switch (_titlePosition)
     {
-        case CPLineBorder:  CGContextFillRoundedRectangleInRect(aContext, fillRect, _cornerRadius, YES, YES, YES, YES);
-                            CGContextStrokeRoundedRectangleInRect(aContext, strokeRect, _cornerRadius, YES, YES, YES, YES);
-                            break;
+        case CPAtTop:
+            return [[_titleView frameSize].height, [_titleView frameSize].height];
 
-        case CPBezelBorder: CGContextFillRoundedRectangleInRect(aContext, fillRect, _cornerRadius, YES, YES, YES, YES);
-                            CGContextSetStrokeColor(aContext, [CPColor colorWithWhite:190.0/255.0 alpha:1.0]);
-                            CGContextBeginPath(aContext);
-                            CGContextMoveToPoint(aContext, strokeRect.origin.x, strokeRect.origin.y);
-                            CGContextAddLineToPoint(aContext, CGRectGetMinX(strokeRect), CGRectGetMaxY(strokeRect)),
-                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(strokeRect), CGRectGetMaxY(strokeRect)),
-                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(strokeRect), CGRectGetMinY(strokeRect)),
-                            CGContextStrokePath(aContext);
-                            CGContextSetStrokeColor(aContext, [CPColor colorWithWhite:142.0/255.0 alpha:1.0]);
-                            CGContextBeginPath(aContext);
-                            CGContextMoveToPoint(aContext, bounds.origin.x, strokeRect.origin.y);
-                            CGContextAddLineToPoint(aContext, CGRectGetMaxX(bounds), CGRectGetMinY(strokeRect));
-                            CGContextStrokePath(aContext);
-                            break;
+        case CPAtBottom:
+            return [[_titleView frameSize].height, 0.0];
 
-        default:            break;
+        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)
+    {
+        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];
+
+            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:
+        case CPLineBorder:
+            [self _drawLineBorderInRect:bounds];
+            break;
+
+        case CPNoBorder:
+            [self _drawNoBorderInRect:bounds];
+            break;
+    }
+}
+
+- (void)_drawHorizontalSeparatorInRect:(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));
+    CGContextStrokePath(context);
+}
+
+- (void)_drawVerticalSeparatorInRect:(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));
+    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"];
+
+    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];
+
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextFillRect(context, aRect);
+}
+
+@end
+
+var CPBoxTypeKey          = @"CPBoxTypeKey",
+    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
+    CPBoxTitle            = @"CPBoxTitle",
+    CPBoxTitlePosition    = @"CPBoxTitlePosition",
+    CPBoxTitleView        = @"CPBoxTitleView";
+
+@implementation CPBox (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
+        _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];
+
+        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
+        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
+        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
+
+        _contentView   = [self subviews][0];
+
+        [self setAutoresizesSubviews:YES];
+        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        [self _manageTitlePositioning];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [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];
+}
+
 @end

AppKit/CPBrowser.j

@@ -20,16 +20,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/CPIndexSet.j>
+
 @import "CPControl.j"
 @import "CPImage.j"
-@import "CPTableView.j"
 @import "CPScrollView.j"
+@import "CPTableView.j"
+@import "CPTextField.j"
 
-/*! 
+@global CPApp
+
+/*!
     @ingroup appkit
-    @class CPBrowser    
+    @class CPBrowser
 */
-
 @implementation CPBrowser : CPControl
 {
     id              _delegate;
@@ -62,60 +66,65 @@
     CPArray         _columnWidths;
 }
 
-+ (CPImage)branchImage
++ (CPString)defaultThemeClass
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
-                                                    pathForResource:"browser-leaf.png"]
-                                              size:CGSizeMake(9,9)];
+    return "browser";
 }
 
-+ (CPImage)highlightedBranchImage
++ (id)themeAttributes
 {
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[self class]] 
-                                                    pathForResource:"browser-leaf-highlighted.png"]
-                                              size:CGSizeMake(9,9)];
+    return @{
+        @"image-control-resize": [CPNull null],
+        @"image-control-leaf": [CPNull null],
+        @"image-control-leaf-pressed": [CPNull null]
+    };
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
-        _rowHeight = 23.0;
-        _defaultColumnWidth = 140.0;
-        _minColumnWidth = 80.0;
-        _imageWidth = 23.0;
-        _leafWidth = 13.0;
-        _columnWidths = [];
-
-        _pathSeparator = "/";
-        _tableViews = [];
-        _tableDelegates = [];
-        _allowsMultipleSelection = YES;
-        _allowsEmptySelection = YES;
-        _tableViewClass = [_CPBrowserTableView class];
-
-        _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-        [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
-        [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelected];
-        [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
-
-        _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
-
-        [_horizontalScrollView setHasVerticalScroller:NO];
-        [_horizontalScrollView setAutohidesScrollers:YES];
-        [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-        
-        _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
-        [_contentView setAutoresizingMask:CPViewHeightSizable];
-        
-        [_horizontalScrollView setDocumentView:_contentView];
-
-        [self addSubview:_horizontalScrollView];
+        [self _init];
     }
 
     return self;
 }
 
+- (void)_init
+{
+    _rowHeight = 23.0;
+    _defaultColumnWidth = 140.0;
+    _minColumnWidth = 80.0;
+    _imageWidth = 23.0;
+    _leafWidth = 13.0;
+    _columnWidths = [];
+
+    _pathSeparator = "/";
+    _tableViews = [];
+    _tableDelegates = [];
+    _allowsMultipleSelection = YES;
+    _allowsEmptySelection = YES;
+    _tableViewClass = [_CPBrowserTableView class];
+
+    _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+    [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
+    [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelectedDataView];
+    [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
+
+    _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
+
+    [_horizontalScrollView setHasVerticalScroller:NO];
+    [_horizontalScrollView setAutohidesScrollers:YES];
+    [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+    _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
+    [_contentView setAutoresizingMask:CPViewHeightSizable];
+
+    [_horizontalScrollView setDocumentView:_contentView];
+
+    [self addSubview:_horizontalScrollView];
+}
+
 - (void)setPrototypeView:(CPView)aPrototypeView
 {
     _prototypeView = [CPKeyedUnarchiver unarchiveObjectWithData:
@@ -129,7 +138,7 @@
 }
 
 - (void)setDelegate:(id)anObject
-{    
+{
     _delegate = anObject;
     _delegateSupportsImages = [_delegate respondsToSelector:@selector(browser:imageValueForItem:)];
 
@@ -167,12 +176,10 @@
     if (columnIndex >= _tableViews.length)
         return;
 
-    var oldValue = _tableViews.length - 1;
+    var oldValue = _tableViews.length - 1,
+        indexPlusOne = columnIndex + 1; // unloads all later columns.
 
-    // unloads all later columns.
-    var indexPlusOne = columnIndex + 1;
-
-    [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"] 
+    [[_tableViews.slice(indexPlusOne) valueForKey:"enclosingScrollView"]
       makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
     _tableViews = _tableViews.slice(0, indexPlusOne);
@@ -196,10 +203,10 @@
         selectionIndexes = [lastColumn selectedRowIndexes];
 
     if (lastIndex >= 0 && [selectionIndexes count] > 1)
-        [CPException raise:CPInvalidArgumentException 
+        [CPException raise:CPInvalidArgumentException
                     reason:"Can't add column, column "+lastIndex+" has invalid selection."];
 
-    var index = lastIndex+1,
+    var index = lastIndex + 1,
         item = index === 0 ? _rootItem : [_tableDelegates[lastIndex] childAtIndex:[selectionIndexes firstIndex]];
 
     if (index > 0 && item && [self isLeafItem:item])
@@ -213,8 +220,6 @@
     [table setAllowsEmptySelection:_allowsEmptySelection];
     [table registerForDraggedTypes:[self registeredDraggedTypes]];
 
-    [self setNextResponder:table];
-
     [self _addTableColumnsToTableView:table forColumnIndex:index];
 
     var delegate = [[_CPBrowserTableDelegate alloc] init];
@@ -233,7 +238,7 @@
     [table setAction:@selector(_tableViewClicked:)];
     [table setDoubleAction:@selector(_tableViewDoubleClicked:)];
     [table setDraggingDestinationFeedbackStyle:CPTableViewDraggingDestinationFeedbackStyleRegular];
-    
+
     var scrollView = [[_CPBrowserScrollView alloc] initWithFrame:CGRectMakeZero()];
     [scrollView _setBrowser:self];
     [scrollView setDocumentView:table];
@@ -254,7 +259,7 @@
         var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
             view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [view setImageScaling:CPScaleProportionally];
+        [view setImageScaling:CPImageScaleProportionallyDown];
 
         [column setDataView:view];
         [column setResizingMask:CPTableColumnNoResizing];
@@ -272,12 +277,12 @@
     var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
         view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];
 
-    [view setBranchImage:[[self class] branchImage]];
-    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
-    
+    [view setBranchImage:[self valueForThemeAttribute:@"image-control-leaf"]];
+    [view setHighlightedBranchImage:[self valueForThemeAttribute:@"image-control-leaf-pressed"]];
+
     [column setDataView:view];
     [column setResizingMask:CPTableColumnNoResizing];
-    
+
     [aTableView addTableColumn:column];
 }
 
@@ -300,7 +305,7 @@
             tableHeight = CGRectGetHeight([tableView bounds]);
 
         [[tableView tableColumnWithIdentifier:"Image"] setWidth:_imageWidth];
-        [[tableView tableColumnWithIdentifier:"Content"] setWidth:width - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - scrollerWidth - scrollerWidth];
+        [[tableView tableColumnWithIdentifier:"Content"] setWidth:[self columnContentWidthForColumnWidth:width]];
         [[tableView tableColumnWithIdentifier:"Leaf"] setWidth:_leafWidth];
 
         [tableView setRowHeight:_rowHeight];
@@ -314,6 +319,39 @@
     [_contentView setFrameSize:CGSizeMake(xOrigin, height)];
 }
 
+- (unsigned)rowAtPoint:(CGPoint)aPoint
+{
+    var column = [self columnAtPoint:aPoint];
+    if (column === -1)
+        return -1;
+
+    var tableView = _tableViews[column];
+    return [tableView rowAtPoint:[tableView convertPoint:aPoint fromView:self]];
+}
+
+- (unsigned)columnAtPoint:(CGPoint)aPoint
+{
+    var adjustedPoint = [_contentView convertPoint:aPoint fromView:self];
+
+    for (var i = 0, count = _tableViews.length; i < count; i++)
+    {
+        var frame = [[_tableViews[i] enclosingScrollView] frame];
+        if (CGRectContainsPoint(frame, adjustedPoint))
+            return i;
+    }
+
+    return -1;
+}
+
+- (CGRect)rectOfRow:(unsigned)aRow inColumn:(unsigned)aColumn
+{
+    var tableView = _tableViews[aColumn],
+        rect = [tableView rectOfRow:aRow];
+
+    rect.origin = [self convertPoint:rect.origin fromView:tableView];
+    return rect;
+}
+
 // ITEMS
 
 - (id)itemAtRow:(int)row inColumn:(int)column
@@ -357,6 +395,10 @@
 
 // CLICK EVENTS
 
+- (void)trackMouse:(CPEvent)anEvent
+{
+}
+
 - (void)_column:(unsigned)columnIndex clickedRow:(unsigned)rowIndex
 {
     [self setLastColumn:columnIndex];
@@ -382,16 +424,42 @@
     [self sendAction:_doubleAction to:_target];
 }
 
+- (void)keyDown:(CPEvent)anEvent
+{
+    var key = [anEvent charactersIgnoringModifiers],
+        column = [self selectedColumn];
+
+    if (column === CPNotFound)
+        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];
+}
+
 // SIZING
 
 - (float)columnContentWidthForColumnWidth:(float)aWidth
 {
-    return aWidth - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - [CPScroller scrollerWidth];
+    var columnSpacing = [_tableViews[0] intercellSpacing].width;
+    return aWidth - (_leafWidth + columnSpacing + (_delegateSupportsImages ? _imageWidth + columnSpacing : 0)) - columnSpacing - [CPScroller scrollerWidth];
 }
 
 - (float)columnWidthForColumnContentWidth:(float)aWidth
 {
-    return aWidth + (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) + [CPScroller scrollerWidth];
+    var columnSpacing = [_tableViews[0] intercellSpacing].width;
+    return aWidth + (_leafWidth + columnSpacing + (_delegateSupportsImages ? _imageWidth + columnSpacing: 0)) + columnSpacing + [CPScroller scrollerWidth];
 }
 
 - (void)setImageWidth:(float)aWidth
@@ -453,7 +521,7 @@
     [_contentView scrollRectToVisible:[[[self tableViewInColumn:columnIndex] enclosingScrollView] frame]];
 }
 
-– (void)scrollRowToVisible:(unsigned)rowIndex inColumn:(unsigned)columnIndex
+- (void)scrollRowToVisible:(unsigned)rowIndex inColumn:(unsigned)columnIndex
 {
     [self scrollColumnToVisible:columnIndex];
     [[self tableViewInColumn:columnIndex] scrollRowToVisible:rowIndex];
@@ -526,6 +594,9 @@
 
 - (CPIndexSet)selectedRowIndexesInColumn:(unsigned)column
 {
+    if (column < 0 || column > [self lastColumn] +1)
+        return [CPIndexSet indexSet];
+
     return [[self tableViewInColumn:column] selectedRowIndexes];
 }
 
@@ -537,7 +608,7 @@
     if ([_delegate respondsToSelector:@selector(browser:selectionIndexesForProposedSelection:inColumn:)])
         indexSet = [_delegate browser:self selectionIndexesForProposedSelection:indexSet inColumn:column];
 
-    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)] && 
+    if ([_delegate respondsToSelector:@selector(browser:shouldSelectRowIndexes:inColumn:)] &&
        ![_delegate browser:self shouldSelectRowIndexes:indexSet inColumn:column])
         return;
 
@@ -551,8 +622,6 @@
 
     [[self tableViewInColumn:column] selectRowIndexes:indexSet byExtendingSelection:NO];
 
-    [self setNextResponder:[self tableViewInColumn:[self lastColumn]]];
-
     [self scrollColumnToVisible:column];
 
     if ([_delegate respondsToSelector:@selector(browserSelectionDidChange:)])
@@ -604,6 +673,53 @@
 
 @end
 
+@implementation CPBrowser (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        [self _init];
+
+        _allowsEmptySelection = [aCoder decodeBoolForKey:@"CPBrowserAllowsEmptySelectionKey"];
+        _allowsMultipleSelection = [aCoder decodeBoolForKey:@"CPBrowserAllowsMultipleSelectionKey"];
+        _prototypeView = [aCoder decodeObjectForKey:@"CPBrowserPrototypeViewKey"];
+        _rowHeight = [aCoder decodeFloatForKey:@"CPBrowserRowHeightKey"];
+        _imageWidth = [aCoder decodeFloatForKey:@"CPBrowserImageWidthKey"];
+        _minColumnWidth = [aCoder decodeFloatForKey:@"CPBrowserMinColumnWidthKey"];
+        _columnWidths = [aCoder decodeObjectForKey:@"CPBrowserColumnWidthsKey"];
+
+        [self setDelegate:[aCoder decodeObjectForKey:@"CPBrowserDelegateKey"]];
+        [self setAutohidesScroller:[aCoder decodeBoolForKey:@"CPBrowserAutohidesScrollerKey"]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // Don't encode the subviews, they're transient and will be recreated from data.
+    var actualSubviews = _subviews;
+    _subviews = [];
+    [super encodeWithCoder:aCoder];
+    _subviews = actualSubviews;
+
+    [aCoder encodeBool:[self autohidesScroller] forKey:@"CPBrowserAutohidesScrollerKey"];
+    [aCoder encodeBool:_allowsEmptySelection forKey:@"CPBrowserAllowsEmptySelectionKey"];
+    [aCoder encodeBool:_allowsMultipleSelection forKey:@"CPBrowserAllowsMultipleSelectionKey"];
+    [aCoder encodeObject:_delegate forKey:@"CPBrowserDelegateKey"];
+    [aCoder encodeObject:_prototypeView forKey:@"CPBrowserPrototypeViewKey"];
+    [aCoder encodeFloat:_rowHeight forKey:@"CPBrowserRowHeightKey"];
+    [aCoder encodeFloat:_imageWidth forKey:@"CPBrowserImageWidthKey"];
+    [aCoder encodeFloat:_minColumnWidth forKey:@"CPBrowserMinColumnWidthKey"];
+    [aCoder encodeObject:_columnWidths forKey:@"CPBrowserColumnWidthsKey"];
+}
+
+@end
+
+
 @implementation _CPBrowserResizeControl : CPView
 {
     CGPoint     _mouseDownX;
@@ -612,6 +728,18 @@
     unsigned    _width;
 }
 
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        var browser = [[CPBrowser alloc] init];
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[browser valueForThemeAttribute:@"image-control-resize"]]];
+    }
+
+
+    return self;
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
     _mouseDownX = [anEvent locationInWindow].x;
@@ -626,9 +754,11 @@
     [_browser setWidth:_width + deltaX ofColumn:_index];
 }
 
-@end
+- (void)mouseUp:(CPEvent)anEvent
+{
+}
 
-var _CPBrowserResizeControlBackgroundImage = nil;
+@end
 
 @implementation _CPBrowserScrollView : CPScrollView
 {
@@ -636,24 +766,11 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     CPBrowser                _browser @accessors;
 }
 
-+ (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;
-}
-
 - (void)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
         _resizeControl = [[_CPBrowserResizeControl alloc] initWithFrame:CGRectMakeZero()];
-        [_resizeControl setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
         [self addSubview:_resizeControl];
     }
 
@@ -708,13 +825,13 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
 }
 
-- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
 {
     return [_browser draggingImageForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragImageOffset] ||
            [super dragImageForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragImageOffset];
 }
 
-- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragViewOffset
 {
     var count = theTableColumns.length;
     while (count--)
@@ -727,33 +844,11 @@ var _CPBrowserResizeControlBackgroundImage = nil;
            [super dragViewForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragViewOffset];
 }
 
-- (void)moveUp:(id)sender
-{
-    [super moveUp:sender];
-    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
-}
-
-- (void)moveDown:(id)sender
-{
-    [super moveDown:sender];
-    [_browser selectRow:[self selectedRow] inColumn:[_browser selectedColumn]];
-}
-
-- (void)moveLeft:(id)sender
-{    
-    var previousColumn = [_browser selectedColumn] - 1,
-        selectedRow = [_browser selectedRowInColumn:previousColumn];
-
-    [_browser selectRow:selectedRow inColumn:previousColumn];
-}
-
-- (void)moveRight:(id)sender
-{    
-    [_browser selectRow:0 inColumn:[_browser selectedColumn] + 1];
-}
 
 @end
 
+@import <Foundation/CPObject.j>
+
 @implementation _CPBrowserTableDelegate : CPObject
 {
     CPBrowser   _browser @accessors;
@@ -788,6 +883,12 @@ var _CPBrowserResizeControlBackgroundImage = nil;
     [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
 }
 
+- (void)tableViewSelectionDidChange:(CPNotification)aNotification
+{
+    var selectedIndexes = [[aNotification object] selectedRowIndexes];
+    [_browser selectRowIndexes:selectedIndexes inColumn:_index];
+}
+
 - (id)childAtIndex:(unsigned)index
 {
     return [_delegate browser:_browser child:index ofItem:_item];
@@ -804,7 +905,7 @@ var _CPBrowserResizeControlBackgroundImage = nil;
 - (CPDragOperation)tableView:(CPTableView)aTableView validateDrop:(id)info proposedRow:(int)row proposedDropOperation:(CPTableViewDropOperation)operation
 {
     if ([_delegate respondsToSelector:@selector(browser:validateDrop:proposedRow:column:dropOperation:)])
-        [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
+        return [_delegate browser:_browser validateDrop:info proposedRow:row column:_index dropOperation:operation];
     else
         return CPDragOperationNone;
 }
@@ -865,11 +966,11 @@ var _CPBrowserResizeControlBackgroundImage = nil;
 {
     var imageView = [self layoutEphemeralSubviewNamed:@"image-view"
                                            positioned:CPWindowAbove
-                      relativeToEphemeralSubviewNamed:nil];
+                      relativeToEphemeralSubviewNamed:nil],
+        isHighlighted = [self themeState] & CPThemeStateSelectedDataView;
 
-    var isHighlighted = [self themeState] & CPThemeStateSelected;
     [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
-    [imageView setImageScaling:CPScaleNone];
+    [imageView setImageScaling:CPImageScaleNone];
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder

AppKit/CPButton.j

@@ -25,26 +25,26 @@
 
 @import "CPControl.j"
 @import "CPStringDrawing.j"
-
-#include "CoreGraphics/CGGeometry.h"
-
+@import "CPText.j"
+@import "CPWindow_Constants.j"
 
 /* @group CPBezelStyle */
 
-CPRoundedBezelStyle             = 1;
-CPRegularSquareBezelStyle       = 2;
+                                       // IB style
+CPRoundedBezelStyle             = 1;   // Push
+CPRegularSquareBezelStyle       = 2;   // Bevel
 CPThickSquareBezelStyle         = 3;
 CPThickerSquareBezelStyle       = 4;
-CPDisclosureBezelStyle          = 5;
-CPShadowlessSquareBezelStyle    = 6;
-CPCircularBezelStyle            = 7;
-CPTexturedSquareBezelStyle      = 8;
-CPHelpButtonBezelStyle          = 9;
-CPSmallSquareBezelStyle         = 10;
-CPTexturedRoundedBezelStyle     = 11;
-CPRoundRectBezelStyle           = 12;
-CPRecessedBezelStyle            = 13;
-CPRoundedDisclosureBezelStyle   = 14;
+CPDisclosureBezelStyle          = 5;   // Disclosure triangle
+CPShadowlessSquareBezelStyle    = 6;   // Square
+CPCircularBezelStyle            = 7;   // Round
+CPTexturedSquareBezelStyle      = 8;   // Textured
+CPHelpButtonBezelStyle          = 9;   // Help
+CPSmallSquareBezelStyle         = 10;  // Gradient
+CPTexturedRoundedBezelStyle     = 11;  // Round Textured
+CPRoundRectBezelStyle           = 12;  // Round Rect
+CPRecessedBezelStyle            = 13;  // Recessed
+CPRoundedDisclosureBezelStyle   = 14;  // Disclosure
 CPHUDBezelStyle                 = -1;
 
 
@@ -60,11 +60,11 @@ CPMomentaryPushInButton = 7;
 CPMomentaryPushButton   = 0;
 CPMomentaryLight        = 7;
 
-CPNoButtonMask              = 0;
-CPContentsButtonMask        = 1;
-CPPushInButtonMask          = 2;
-CPGrayButtonMask            = 4;
-CPBackgroundButtonMask      = 8;
+CPNoButtonMask          = 0;
+CPContentsButtonMask    = 1;
+CPPushInButtonMask      = 2;
+CPGrayButtonMask        = 4;
+CPBackgroundButtonMask  = 8;
 
 CPNoCellMask                = CPNoButtonMask;
 CPContentsCellMask          = CPContentsButtonMask;
@@ -72,9 +72,21 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
-CPButtonStateMixed  = CPThemeState("mixed");
+CPButtonStateMixed             = CPThemeState("mixed");
+CPButtonStateBezelStyleRounded = CPThemeState("rounded");
 
-/*! 
+// add all future correspondance between bezel styles and theme state here.
+var CPButtonBezelStyleStateMap = @{
+        CPRoundedBezelStyle: CPButtonStateBezelStyleRounded,
+        CPRoundRectBezelStyle: [CPNull null],
+    };
+
+/// @cond IGNORE
+CPButtonDefaultHeight = 25.0;
+CPButtonImageOffset   = 3.0;
+/// @endcond
+
+/*!
     @ingroup appkit
     @class CPButton
 
@@ -85,12 +97,9 @@ CPButtonStateMixed  = CPThemeState("mixed");
 @implementation CPButton : CPControl
 {
     BOOL                _allowsMixedState;
-    
+
     CPString            _title;
     CPString            _alternateTitle;
-    
-    CPImage             _image;
-    CPImage             _alternateImage;
 
     CPInteger           _showsStateBy;
     CPInteger           _highlightsBy;
@@ -99,6 +108,24 @@ CPButtonStateMixed  = CPThemeState("mixed");
     // NS-style Display Properties
     CPBezelStyle        _bezelStyle;
     CPControlSize       _controlSize;
+
+    CPString            _keyEquivalent;
+    unsigned            _keyEquivalentModifierMask;
+
+    CPTimer             _continuousDelayTimer;
+    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
@@ -117,41 +144,66 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return button;
 }
 
-+ (CPString)themeClass
++ (CPString)defaultThemeClass
 {
     return @"button";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
-                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
+    return @{
+            @"image": [CPNull null],
+            @"image-offset": 0.0,
+            @"bezel-inset": _CGInsetMakeZero(),
+            @"content-inset": _CGInsetMakeZero(),
+            @"bezel-color": [CPNull null],
+        };
 }
 
+/*!
+    Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
+    @param aFrame The frame rectangle for the created button object.
+    @return An initialized CPView object or nil if the object couldn't be created.
+*/
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         // Should we instead override the defaults?
         [self setValue:CPCenterTextAlignment forThemeAttribute:@"alignment"];
         [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
-        [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
-        
-        _controlSize = CPRegularControlSize;
-        
-//        [self setBezelStyle:CPRoundRectBezelStyle];
+        [self setValue:CPImageScaleNone forThemeAttribute:@"image-scaling"];
+
+        [self setBezelStyle:CPRoundRectBezelStyle];
         [self setBordered:YES];
+
+        [self _init];
     }
-    
+
     return self;
 }
 
+- (void)_init
+{
+    _controlSize = CPRegularControlSize;
+
+    _keyEquivalent = @"";
+    _keyEquivalentModifierMask = 0;
+
+    // Continuous button defaults.
+    _periodicInterval   = 0.05;
+    _periodicDelay      = 0.5;
+
+    [self setButtonType:CPMomentaryPushInButton];
+}
+
 // Setting the state
 /*!
-    Returns \c YES if the button has a 'mixed' state in addition to on and off.
+    Returns a Boolean value indicating whether the button allows a mixed state.
+    @return \c YES if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
 {
@@ -175,21 +227,21 @@ CPButtonStateMixed  = CPThemeState("mixed");
         [self setState:CPOnState];
 }
 
+/*!
+    Sets the value of the button using an Objective-J object.
+    @param anObjectValue The value of the button interpreted as an Objective-J object.
+*/
 - (void)setObjectValue:(id)anObjectValue
 {
     if (!anObjectValue || anObjectValue === @"" || ([anObjectValue intValue] === 0))
         anObjectValue = CPOffState;
-
     else if (![anObjectValue isKindOfClass:[CPNumber class]])
         anObjectValue = CPOnState;
-
-    else if (anObjectValue > CPOnState)
-        anObjectValue = CPOnState
-
+    else if (anObjectValue >= CPOnState)
+        anObjectValue = CPOnState;
     else if (anObjectValue < CPOffState)
         if ([self allowsMixedState])
             anObjectValue = CPMixedState;
-
         else
             anObjectValue = CPOnState;
 
@@ -197,18 +249,36 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
     switch ([self objectValue])
     {
-        case CPMixedState:  [self unsetThemeState:CPThemeStateSelected];
-                            [self setThemeState:CPButtonStateMixed];
-                            break;
+        case CPMixedState:
+            [self unsetThemeState:CPThemeStateSelected];
+            [self setThemeState:CPButtonStateMixed];
+            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+                [self setThemeState:CPThemeStateHighlighted];
+            else
+                [self unsetThemeState:CPThemeStateHighlighted];
+            break;
 
-        case CPOnState:     [self unsetThemeState:CPButtonStateMixed];
-                            [self setThemeState:CPThemeStateSelected];
-                            break;
+        case CPOnState:
+            [self unsetThemeState:CPButtonStateMixed];
+            [self setThemeState:CPThemeStateSelected];
+            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+                [self setThemeState:CPThemeStateHighlighted];
+            else
+                [self unsetThemeState:CPThemeStateHighlighted];
+            break;
 
-        case CPOffState:    [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed];
+        case CPOffState:
+            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
     }
 }
 
+/*!
+    Returns the button's next state.
+    @return The button's state. A button can have two or three states.
+    If it has two, this value is either \c CPOffState (the normal or unpressed state)
+    or \c CPOnState (the alternate or pressed state).
+    If it has three, this value can be \c CPOnState (the feature is in effect everywhere), \c CPOffState (the feature is in effect nowhere), or \c CPMixedState (the feature is in effect somewhere).
+*/
 - (CPInteger)nextState
 {
    if ([self allowsMixedState])
@@ -221,8 +291,16 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return 1 - [self state];
 }
 
+/*!
+    Sets the button's next state to \c aState.
+    @param aState Possible states are any of the CPButton globals:
+    \c CPOffState, \c CPOnState, \c CPMixedState
+*/
 - (void)setNextState
 {
+    if ([self infoForBinding:CPValueBinding])
+        [self setAllowsMixedState:NO];
+
     [self setState:[self nextState]];
 }
 
@@ -244,17 +322,27 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return [self intValue];
 }
 
+/*!
+    Sets the title displayed by the button when in its normal state.
+    @param aTitle The string to set as the button's title. This title is always shown on buttons
+    that don’t use their alternate contents when highlighting or displaying their alternate state.
+*/
 - (void)setTitle:(CPString)aTitle
 {
     if (_title === aTitle)
         return;
-    
+
     _title = aTitle;
-    
+
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
 
+/*!
+    Returns the title displayed on the button when it’s in its normal state.
+    @return    The title displayed on the receiver when it’s in its normal state
+    or the empty string if the button doesn’t display a title.
+*/
 - (CPString)title
 {
     return _title;
@@ -264,7 +352,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 {
     if (_alternateTitle === aTitle)
         return;
-    
+
     _alternateTitle = aTitle;
 
     [self setNeedsLayout];
@@ -278,18 +366,12 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
 - (void)setImage:(CPImage)anImage
 {
-    if (_image === anImage)
-        return;
-    
-    _image = anImage;
-    
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
+    [self setValue:anImage forThemeAttribute:@"image"];
 }
 
 - (CPImage)image
 {
-    return _image;
+    return [self valueForThemeAttribute:@"image" inState:CPThemeStateNormal];
 }
 
 /*!
@@ -298,13 +380,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 */
 - (void)setAlternateImage:(CPImage)anImage
 {
-    if (_alternateImage === anImage)
-        return;
-    
-    _alternateImage = anImage;
-    
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
+    [self setValue:anImage forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
 }
 
 /*!
@@ -312,16 +388,34 @@ CPButtonStateMixed  = CPThemeState("mixed");
 */
 - (CPImage)alternateImage
 {
-    return _alternateImage;
+    return [self valueForThemeAttribute:@"image" inState:CPThemeStateHighlighted];
+}
+
+- (void)setImageOffset:(float)theImageOffset
+{
+    [self setValue:theImageOffset forThemeAttribute:@"image-offset"];
+}
+
+- (float)imageOffset
+{
+    return [self valueForThemeAttribute:@"image-offset"];
 }
 
 - (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];
 }
@@ -345,15 +439,20 @@ CPButtonStateMixed  = CPThemeState("mixed");
     }
 }
 
+- (CPInteger)highlightsBy
+{
+    return _highlightsBy;
+}
+
 - (void)setButtonType:(CPButtonType)aButtonType
 {
     switch (aButtonType)
     {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
@@ -361,25 +460,25 @@ CPButtonStateMixed  = CPThemeState("mixed");
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
                                         break;
 
-        case CPOnOffButton:             [self setHighlightsBy:CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
                                         break;
 
         case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
                                         [self setShowsStateBy:CPContentsCellMask];
                                         break;
 
-        case CPSwitchButton:            [CPException raise:CPInvalidArgumentException 
+        case CPSwitchButton:            [CPException raise:CPInvalidArgumentException
                                                     reason:"The CPSwitchButton type is not supported in Cappuccino, use the CPCheckBox class instead."];
 
-        case CPRadioButton:             [CPException raise:CPInvalidArgumentException 
+        case CPRadioButton:             [CPException raise:CPInvalidArgumentException
                                                     reason:"The CPRadioButton type is not supported in Cappuccino, use the CPRadio class instead."];
 
-        default:                        [CPException raise:CPInvalidArgumentException 
+        default:                        [CPException raise:CPInvalidArgumentException
                                                     reason:"Unknown button type."];
     }
 
@@ -395,7 +494,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
     _imageDimsWhenDisabled = imageShouldDimWhenDisabled;
 
-    if (_imageDimsWhenDisabled)
+    if ([self hasThemeState:CPThemeStateDisabled])
     {
         [self setNeedsDisplay:YES];
         [self setNeedsLayout];
@@ -407,63 +506,124 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return _imageDimsWhenDisabled;
 }
 
+- (void)setPeriodicDelay:(float)aDelay interval:(float)anInterval
+{
+    _periodicDelay      = aDelay;
+    _periodicInterval   = anInterval;
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    if ([self isContinuous])
+    {
+        _continuousDelayTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicDelay callback: function()
+        {
+            if (!_continuousTimer)
+                _continuousTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicInterval target:self selector:@selector(onContinousEvent:) userInfo:anEvent repeats:YES];
+        }
+
+        repeats:NO];
+    }
+
+    [super mouseDown:anEvent];
+}
+
+- (void)onContinousEvent:(CPTimer)aTimer
+{
+    if (_target && _action && [_target respondsToSelector:_action])
+        [_target performSelector:_action withObject:self];
+}
+
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
-    [self highlight:YES];
-    
-    return [super startTrackingAt:aPoint];
+    _isTracking = 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;
 }
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    [self highlight:NO];
-
-    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
+    _isTracking = NO;
 
     if (mouseIsUp && CGRectContainsPoint([self bounds], aPoint))
         [self setNextState];
+    else
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            [self highlight:[self state] != CPOffState];
+        else
+            [self highlight:NO];
+    }
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+    [self invalidateTimers];
+}
+
+- (void)invalidateTimers
+{
+    if (_continuousTimer)
+    {
+        [_continuousTimer invalidate];
+        _continuousTimer = nil;
+    }
+
+    if (_continuousDelayTimer)
+    {
+        [_continuousDelayTimer invalidate];
+        _continuousDelayTimer = nil;
+    }
 }
 
 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    if (_CGInsetIsEmpty(contentInset))
-        return bounds;
-
-    bounds.origin.x += contentInset.left;
-    bounds.origin.y += contentInset.top;
-    bounds.size.width -= contentInset.left + contentInset.right;
-    bounds.size.height -= contentInset.top + contentInset.bottom;
-    
-    return bounds;
+    return _CGRectInsetByInset(bounds, contentInset);
 }
 
 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
+    // Is this necessary? The theme itself can just change its inset to a zero inset when !CPThemeStateBordered.
     if (![self isBordered])
-        return _CGRectMakeZero();
+        return bounds;
 
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    if (_CGInsetIsEmpty(bezelInset))
-        return bounds;
-
-    bounds.origin.x += bezelInset.left;
-    bounds.origin.y += bezelInset.top;
-    bounds.size.width -= bezelInset.left + bezelInset.right;
-    bounds.size.height -= bezelInset.top + bezelInset.bottom;
-
-    return bounds;
+    return _CGRectInsetByInset(bounds, bezelInset);
 }
 
-/*!
-    Adjust the size of the button to fit the title and surrounding button image.
-*/
-- (void)sizeToFit
+- (CGSize)_minimumFrameSize
 {
-    var size = [([self title] || " ") sizeWithFont:[self currentValueForThemeAttribute:@"font"]],
-        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
+    var size = CGSizeMakeZero(),
+        contentView = [self ephemeralSubviewNamed:@"content-view"];
+
+    if (contentView)
+    {
+        [contentView sizeToFit];
+        size = [contentView frameSize];
+    }
+    else
+        size = [([self title] || " ") sizeWithFont:[self currentValueForThemeAttribute:@"font"]];
+
+    var contentInset = [self currentValueForThemeAttribute:@"content-inset"],
         minSize = [self currentValueForThemeAttribute:@"min-size"],
         maxSize = [self currentValueForThemeAttribute:@"max-size"];
 
@@ -476,17 +636,30 @@ CPButtonStateMixed  = CPThemeState("mixed");
     if (maxSize.height >= 0.0)
         size.height = MIN(size.height, maxSize.height);
 
-    [self setFrameSize:size];
+    return size;
+}
+
+/*!
+    Adjust the size of the button to fit the title and surrounding button image.
+*/
+- (void)sizeToFit
+{
+    [self layoutSubviews];
+
+    [self setFrameSize:[self _minimumFrameSize]];
+
+    if ([self ephemeralSubviewNamed:@"content-view"])
+        [self layoutSubviews];
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
     if (aName === "bezel-view")
         return [self bezelRectForBounds:[self bounds]];
-    
+
     else if (aName === "content-view")
         return [self contentRectForBounds:[self bounds]];
-    
+
     return [super rectForEphemeralSubviewNamed:aName];
 }
 
@@ -497,7 +670,7 @@ CPButtonStateMixed  = CPThemeState("mixed");
         var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
         [view setHitTests:NO];
-        
+
         return view;
     }
     else
@@ -518,8 +691,52 @@ CPButtonStateMixed  = CPThemeState("mixed");
 
     if (contentView)
     {
-        [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
-        [contentView setImage:([self hasThemeState:CPThemeStateHighlighted] && _alternateImage) ? _alternateImage : _image];
+        var title = nil,
+            image = nil;
+
+        if (_isTracking)
+        {
+            if (_highlightsBy & CPContentsCellMask)
+            {
+                if (_showsStateBy & CPContentsCellMask)
+                {
+                    title = ([self state] == CPOffState && _alternateTitle) ? _alternateTitle : _title;
+                    image = ([self state] == CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
+                }
+                else
+                {
+                    title = [self alternateTitle];
+                    image = [self alternateImage];
+                }
+            }
+            else if (_showsStateBy & CPContentsCellMask)
+            {
+                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
+                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
+            }
+            else
+            {
+                title = _title;
+                image = [self image];
+            }
+        }
+        else
+        {
+            if (_showsStateBy & CPContentsCellMask)
+            {
+                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
+                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
+            }
+            else
+            {
+                title = _title;
+                image = [self image];
+            }
+        }
+
+        [contentView setText:title];
+        [contentView setImage:image];
+        [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];
 
         [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
         [contentView setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
@@ -530,17 +747,10 @@ CPButtonStateMixed  = CPThemeState("mixed");
         [contentView setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
         [contentView setImagePosition:[self currentValueForThemeAttribute:@"image-position"]];
         [contentView setImageScaling:[self currentValueForThemeAttribute:@"image-scaling"]];
+        [contentView setDimsImage:[self hasThemeState:CPThemeStateDisabled] && _imageDimsWhenDisabled];
     }
 }
 
-- (void)setDefaultButton:(BOOL)shouldBeDefaultButton
-{
-    if (shouldBeDefaultButton)
-        [self setThemeState:CPThemeStateDefault];
-    else
-        [self unsetThemeState:CPThemeStateDefault];
-}
-
 - (void)setBordered:(BOOL)shouldBeBordered
 {
     if (shouldBeBordered)
@@ -554,26 +764,164 @@ CPButtonStateMixed  = CPThemeState("mixed");
     return [self hasThemeState:CPThemeStateBordered];
 }
 
+/*!
+    Sets the keyboard shortcut for this button. For special keys see
+    CPEvent.j CP...FunctionKey and CPText.j CP...Character.
+
+    @param aString the keyboard shortcut as a string
+*/
+- (void)setKeyEquivalent:(CPString)aString
+{
+    _keyEquivalent = aString || @"";
+
+    // Check if the key equivalent is the enter key
+    // Treat \r and \n as the same key equivalent. See issue #710.
+    if (aString === CPNewlineCharacter || aString === CPCarriageReturnCharacter)
+        [self setThemeState:CPThemeStateDefault];
+    else
+        [self unsetThemeState:CPThemeStateDefault];
+}
+
+- (void)viewWillMoveToWindow:(CPWindow)aWindow
+{
+    var selfWindow = [self window];
+
+    if (selfWindow === aWindow || aWindow === nil)
+        return;
+
+    if ([selfWindow defaultButton] === self)
+        [selfWindow setDefaultButton:nil];
+
+    if ([self keyEquivalent] === CPNewlineCharacter || [self keyEquivalent] === CPCarriageReturnCharacter)
+        [aWindow setDefaultButton:self];
+}
+
+/*!
+    Returns the keyboard shortcut for this button.
+*/
+- (CPString)keyEquivalent
+{
+    return _keyEquivalent;
+}
+
+/*!
+    Returns the mask used with this button's key equivalent.
+*/
+- (void)setKeyEquivalentModifierMask:(unsigned)aMask
+{
+    _keyEquivalentModifierMask = aMask;
+}
+
+/*!
+    Sets the mask to be used with this button's key equivalent.
+*/
+- (unsigned)keyEquivalentModifierMask
+{
+    return _keyEquivalentModifierMask;
+}
+
+/*!
+    Checks the button's key equivalent against that in the event, and if they
+    match simulates a button click.
+*/
+- (BOOL)performKeyEquivalent:(CPEvent)anEvent
+{
+    // Don't handle the key equivalent for the default window because the window will handle it for us
+    if ([[self window] defaultButton] === self)
+        return NO;
+
+    if (![anEvent _triggersKeyEquivalent:[self keyEquivalent] withModifierMask:[self keyEquivalentModifierMask]])
+        return NO;
+
+    [self performClick:nil];
+
+    return YES;
+}
+
+/*!
+    Perform a click on the receiver.
+
+    @param sender - The sender object
+*/
+- (void)performClick:(id)sender
+{
+    // This is slightly different from [super performClick:] in that the highlight behaviour is dependent on
+    // highlightsBy and showsStateBy.
+    if (![self isEnabled])
+        return;
+
+    [self setState:[self nextState]];
+
+    var shouldHighlight = NO;
+
+    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
+    {
+        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
+            shouldHighlight = [self state] == CPOffState;
+        else
+            shouldHighlight = YES;
+    }
+
+    [self highlight:shouldHighlight];
+
+    try
+    {
+        [self sendAction:[self action] to:[self target]];
+    }
+    catch (e)
+    {
+        throw e;
+    }
+    finally
+    {
+        if (shouldHighlight)
+            [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
+    }
+}
+
 @end
 
 @implementation CPButton (NS)
 
 - (void)setBezelStyle:(unsigned)aBezelStyle
 {
+    if (aBezelStyle === _bezelStyle)
+        return;
+
+    var currentState = [CPButtonBezelStyleStateMap objectForKey:_bezelStyle],
+        newState = [CPButtonBezelStyleStateMap objectForKey:aBezelStyle];
+
+    if (currentState)
+        [self unsetThemeState:currentState];
+
+    if (newState)
+        [self setThemeState:newState];
+
+    _bezelStyle = aBezelStyle;
 }
 
 - (unsigned)bezelStyle
 {
+    return _bezelStyle;
 }
 
 @end
 
 
-var CPButtonImageKey                = @"CPButtonImageKey",
-    CPButtonAlternateImageKey       = @"CPButtonAlternateImageKey",
-    CPButtonTitleKey                = @"CPButtonTitleKey",
-    CPButtonAlternateTitleKey       = @"CPButtonAlternateTitleKey",
-    CPButtonIsBorderedKey           = @"CPButtonIsBorderedKey";
+var CPButtonImageKey                    = @"CPButtonImageKey",
+    CPButtonAlternateImageKey           = @"CPButtonAlternateImageKey",
+    CPButtonTitleKey                    = @"CPButtonTitleKey",
+    CPButtonAlternateTitleKey           = @"CPButtonAlternateTitleKey",
+    CPButtonIsBorderedKey               = @"CPButtonIsBorderedKey",
+    CPButtonAllowsMixedStateKey         = @"CPButtonAllowsMixedStateKey",
+    CPButtonImageDimsWhenDisabledKey    = @"CPButtonImageDimsWhenDisabledKey",
+    CPButtonImagePositionKey            = @"CPButtonImagePositionKey",
+    CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
+    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
+    CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
+    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey",
+    CPButtonHighlightsByKey             = @"CPButtonHighlightsByKey",
+    CPButtonShowsStateByKey             = @"CPButtonShowsStateByKey";
 
 @implementation CPButton (CPCoding)
 
@@ -584,21 +932,48 @@ var CPButtonImageKey                = @"CPButtonImageKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-    
+
     if (self)
     {
-        _controlSize = CPRegularControlSize;
+        [self _init];
+
+        _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.
+        }
+
+        [self setImageDimsWhenDisabled:[aCoder decodeObjectForKey:CPButtonImageDimsWhenDisabledKey]];
+
+        if ([aCoder containsValueForKey:CPButtonImagePositionKey])
+            [self setImagePosition:[aCoder decodeIntForKey:CPButtonImagePositionKey]];
+
+        if ([aCoder containsValueForKey:CPButtonKeyEquivalentKey])
+            [self setKeyEquivalent:CFData.decodeBase64ToUtf16String([aCoder decodeObjectForKey:CPButtonKeyEquivalentKey])];
+
+        if ([aCoder containsValueForKey:CPButtonPeriodicDelayKey])
+            _periodicDelay = [aCoder decodeObjectForKey:CPButtonPeriodicDelayKey];
+
+        if ([aCoder containsValueForKey:CPButtonPeriodicIntervalKey])
+            _periodicInterval = [aCoder decodeObjectForKey:CPButtonPeriodicIntervalKey];
+
+        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPButtonKeyEquivalentMaskKey];
 
-        [self setImage:[aCoder decodeObjectForKey:CPButtonImageKey]];
-        [self setAlternateImage:[aCoder decodeObjectForKey:CPButtonAlternateImageKey]];
-        
-        [self setTitle:[aCoder decodeObjectForKey:CPButtonTitleKey]];
-        [self setAlternateTitle:[aCoder decodeObjectForKey:CPButtonAlternateTitleKey]];
-        
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }
-    
+
     return self;
 }
 
@@ -609,15 +984,26 @@ var CPButtonImageKey                = @"CPButtonImageKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_image forKey:CPButtonImageKey];
-    [aCoder encodeObject:_alternateImage forKey:CPButtonAlternateImageKey];
+    [self invalidateTimers];
 
     [aCoder encodeObject:_title forKey:CPButtonTitleKey];
     [aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];
+
+    [aCoder encodeBool:_allowsMixedState forKey:CPButtonAllowsMixedStateKey];
+
+    [aCoder encodeInt:_highlightsBy forKey:CPButtonHighlightsByKey];
+    [aCoder encodeInt:_showsStateBy forKey:CPButtonShowsStateByKey];
+
+    [aCoder encodeBool:[self imageDimsWhenDisabled] forKey:CPButtonImageDimsWhenDisabledKey];
+    [aCoder encodeInt:[self imagePosition] forKey:CPButtonImagePositionKey];
+
+    if (_keyEquivalent)
+        [aCoder encodeObject:CFData.encodeBase64Utf16String(_keyEquivalent) forKey:CPButtonKeyEquivalentKey];
+
+    [aCoder encodeInt:_keyEquivalentModifierMask forKey:CPButtonKeyEquivalentMaskKey];
+
+    [aCoder encodeObject:_periodicDelay forKey:CPButtonPeriodicDelayKey];
+    [aCoder encodeObject:_periodicInterval forKey:CPButtonPeriodicIntervalKey];
 }
 
 @end
-
-@import "CPCheckBox.j"
-@import "CPRadio.j"

AppKit/CPButtonBar.j

@@ -1,7 +1,31 @@
+/*
+ * CPButtonBar.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
-@import <AppKit/CPView.j>
+@import "CPView.j"
+@import "CPWindow_Constants.j"
 
-#include "CoreGraphics/CGGeometry.h"
+@class CPSplitView
+
+@global CPPopUpButtonStatePullsDown
 
 
 @implementation CPButtonBar : CPView
@@ -14,8 +38,9 @@
 + (id)plusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];
 
+    [button setBordered:NO];
     [button setImage:image];
     [button setImagePosition:CPImageOnly];
 
@@ -25,23 +50,48 @@
 + (id)minusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:self] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];
 
+    [button setBordered:NO];
     [button setImage:image];
     [button setImagePosition:CPImageOnly];
 
     return button;
 }
 
-+ (CPString)themeClass
++ (id)actionPopupButton
+{
+    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
+        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];
+
+    [button addItemWithTitle:nil];
+    [[button lastItem] setImage:image];
+    [button setImagePosition:CPImageOnly];
+    [button setValue:CGInsetMake(0, 0, 0, 0) forThemeAttribute:"content-inset"];
+
+    [button setPullsDown:YES];
+
+    return button;
+}
+
++ (CPString)defaultThemeClass
 {
     return @"button-bar";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color"]];
+    return @{
+            @"resize-control-inset": CGInsetMake(0.0, 0.0, 0.0, 0.0),
+            @"resize-control-size": CGSizeMakeZero(),
+            @"resize-control-color": [CPNull null],
+            @"bezel-color": [CPNull null],
+            @"button-bezel-color": [CPNull null],
+            @"button-text-color": [CPNull null],
+            @"button-image-plus": [CPNull null],
+            @"button-image-minus": [CPNull null],
+            @"button-image-action": [CPNull null],
+        };
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -82,25 +132,8 @@
     _buttons = [CPArray arrayWithArray:buttons];
 
     for (var i = 0, count = [_buttons count]; i < count; i++)
-    {
-        var button = _buttons[i];
+        [_buttons[i] setBordered:YES];
 
-        var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
-            highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
-            disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled];
-
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered];    
-
-        // FIXME shouldn't need this
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled|CPThemeStateBordered|CPPopUpButtonStatePullsDown];    
-
-        [button setBordered:YES];
-    }
-    
     [self setNeedsLayout];
 }
 
@@ -176,6 +209,11 @@
 {
     [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
+    var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
+        highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
+        disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled],
+        textColor = [self valueForThemeAttribute:@"button-text-color" inState:CPThemeStateNormal];
+
     var buttonsNotHidden = [CPArray arrayWithArray:_buttons],
         count = [buttonsNotHidden count];
 
@@ -184,13 +222,23 @@
             [buttonsNotHidden removeObject:buttonsNotHidden[count]];
 
     var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -1,
-        height = CGRectGetHeight([self bounds]) - 1;
+        bounds = [self bounds],
+        height = CGRectGetHeight(bounds) - 1,
+        frameWidth = CGRectGetWidth(bounds),
+        resizeRect = _hasResizeControl ? [self rectForEphemeralSubviewNamed:"resize-control-view"] : CGRectMakeZero(),
+        resizeWidth = CGRectGetWidth(resizeRect),
+        availableWidth = frameWidth - resizeWidth - 1;
 
     for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
-    {   
+    {
         var button = buttonsNotHidden[i],
             width = CGRectGetWidth([button frame]);
 
+        if (availableWidth > width)
+            availableWidth -= width;
+        else
+            break;
+
         if (_resizeControlIsLeftAligned)
         {
             [button setFrame:CGRectMake(currentButtonOffset - width, 1, width, height)];
@@ -202,6 +250,16 @@
             currentButtonOffset += width - 1;
         }
 
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal | CPThemeStateBordered];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted | CPThemeStateBordered];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled | CPThemeStateBordered];
+        [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];
+
+        // FIXME shouldn't need this
+        [button setValue:normalColor forThemeAttribute:@"bezel-color" inState:CPThemeStateNormal | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
+        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inState:CPThemeStateHighlighted | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
+        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inState:CPThemeStateDisabled | CPThemeStateBordered | CPPopUpButtonStatePullsDown];
+
         [self addSubview:button];
     }
 
@@ -216,6 +274,12 @@
     }
 }
 
+- (void)setFrameSize:(CGSize)aSize
+{
+    [super setFrameSize:aSize];
+    [self setNeedsLayout];
+}
+
 @end
 
 var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
@@ -246,4 +310,3 @@ var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
 }
 
 @end
-

AppKit/CPCheckBox.j

@@ -23,6 +23,8 @@
 @import "CPButton.j"
 
 
+CPCheckBoxImageOffset = 4.0;
+
 @implementation CPCheckBox : CPButton
 {
 }
@@ -37,11 +39,19 @@
     return [self buttonWithTitle:aTitle];
 }
 
-+ (CPString)themeClass
++ (CPString)defaultThemeClass
 {
     return @"check-box";
 }
 
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding === CPValueBinding)
+        return [_CPCheckBoxValueBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -55,10 +65,77 @@
         [self setImagePosition:CPImageLeft];
         [self setAlignment:CPLeftTextAlignment];
 
-        [self setBordered:YES];
+        [self setBordered:NO];
     }
 
     return self;
 }
 
+- (void)takeStateFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    var count = objects.length,
+        value = [objects[0] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState;
+
+    [self setAllowsMixedState:NO];
+    [self setState:value];
+
+    while (count-- > 1)
+    {
+        if (value !== ([objects[count] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState))
+        {
+            [self setAllowsMixedState:YES];
+            [self setState:CPMixedState];
+        }
+    }
+}
+
+- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
+}
+
+- (CPImage)image
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (CPImage)alternateImage
+{
+    return [self currentValueForThemeAttribute:@"image"];
+}
+
+- (BOOL)startTrackingAt:(CGPoint)aPoint
+{
+    var startedTracking = [super startTrackingAt:aPoint];
+    [self highlight:YES];
+    return startedTracking;
+}
+
+@end
+
+@implementation _CPCheckBoxValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source setAllowsMixedState:(aValue === CPMixedState)];
+    [_source setState:aValue];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setState:aValue];
+}
+
 @end

AppKit/CPClipView.j

@@ -22,14 +22,13 @@
 
 @import "CPView.j"
 
-#include "CoreGraphics/CGGeometry.h"
+@class CPScrollView
 
-
-/*! 
+/*!
     @ingroup appkit
     @class CPClipView
 
-    CPClipView allows you to define a clip rect and display only that portion of its containing view.  
+    CPClipView allows you to define a clip rect and display only that portion of its containing view.
     It is used to hold the document view in a CPScrollView.
 */
 @implementation CPClipView : CPView
@@ -46,10 +45,10 @@
     if (_documentView == aView)
         return;
 
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-    
     if (_documentView)
     {
+        var defaultCenter = [CPNotificationCenter defaultCenter];
+
         [defaultCenter
             removeObserver:self
                       name:CPViewFrameDidChangeNotification
@@ -59,33 +58,39 @@
             removeObserver:self
                       name:CPViewBoundsDidChangeNotification
                     object:_documentView];
-        
+
         [_documentView removeFromSuperview];
     }
-    
+
     _documentView = aView;
-    
+
     if (_documentView)
     {
         [self addSubview:_documentView];
-        
-		[_documentView setPostsFrameChangedNotifications:YES];
-		[_documentView setPostsBoundsChangedNotifications:YES];
-
-		[defaultCenter
-            addObserver:self
-               selector:@selector(viewFrameChanged:)
-                   name:CPViewFrameDidChangeNotification 
-                 object:_documentView];
-
-		[defaultCenter
-            addObserver:self
-               selector:@selector(viewBoundsChanged:)
-                   name:CPViewBoundsDidChangeNotification 
-                 object:_documentView];
+        [self _observeDocumentView];
     }
 }
 
+- (void)_observeDocumentView
+{
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+
+    [_documentView setPostsFrameChangedNotifications:YES];
+    [_documentView setPostsBoundsChangedNotifications:YES];
+
+    [defaultCenter
+        addObserver:self
+           selector:@selector(viewFrameChanged:)
+               name:CPViewFrameDidChangeNotification
+             object:_documentView];
+
+    [defaultCenter
+        addObserver:self
+           selector:@selector(viewBoundsChanged:)
+               name:CPViewBoundsDidChangeNotification
+             object:_documentView];
+}
+
 /*!
     Returns the document view.
 */
@@ -106,7 +111,7 @@
         return _CGPointMakeZero();
 
     var documentFrame = [_documentView frame];
-    
+
     aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(_CGRectGetWidth(documentFrame) - _CGRectGetWidth(_bounds), 0.0)));
     aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(_CGRectGetHeight(documentFrame) - _CGRectGetHeight(_bounds), 0.0)));
 
@@ -117,7 +122,7 @@
 {
     if (_CGPointEqualToPoint(_bounds.origin, aPoint))
         return;
-        
+
     [super setBoundsOrigin:aPoint];
 
     var superview = [self superview],
@@ -126,7 +131,7 @@
         // FIXME: Should CPScrollView be finding out about this on its own somehow?
         scrollViewClass = objj_getClass("CPScrollView");
 
-    if([superview isKindOfClass:scrollViewClass])
+    if ([superview isKindOfClass:scrollViewClass])
         [superview reflectScrolledClipView:self];
 }
 
@@ -166,12 +171,12 @@
 - (void)_constrainScrollPoint
 {
     var oldScrollPoint = [self bounds].origin;
-    
-    // Call scrollToPoint: because the current scroll point may no longer make 
+
+    // Call scrollToPoint: because the current scroll point may no longer make
     // sense given the new frame of the document view.
     [self scrollToPoint:oldScrollPoint];
-    
-    // scrollToPoint: takes care of reflectScrollClipView: for us, so bail if 
+
+    // scrollToPoint: takes care of reflectScrollClipView: for us, so bail if
     // the scroll points are not equal (meaning scrollToPoint: didn't early bail).
     if (!CGPointEqualToPoint(oldScrollPoint, [self bounds].origin))
         return;
@@ -187,20 +192,42 @@
         [superview reflectScrolledClipView:self];
 }
 
-- (BOOL)autoscroll:(CPEvent)anEvent 
+- (BOOL)autoscroll:(CPEvent)anEvent
 {
     var bounds = [self bounds],
-        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        superview = [self superview],
+        deltaX = 0,
+        deltaY = 0;
 
-    if (CPRectContainsPoint(bounds, eventLocation))
+    if (CGRectContainsPoint(bounds, eventLocation))
         return NO;
 
-    var newRect = CGRectMakeZero();
+    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasVerticalScroller])
+    {
+        if (eventLocation.y < CGRectGetMinY(bounds))
+            deltaY = CGRectGetMinY(bounds) - eventLocation.y;
+        else if (eventLocation.y > CGRectGetMaxY(bounds))
+            deltaY = CGRectGetMaxY(bounds) - eventLocation.y;
+        if (deltaY < -bounds.size.height)
+            deltaY = -bounds.size.height;
+        if (deltaY > bounds.size.height)
+            deltaY = bounds.size.height;
+    }
 
-    newRect.origin = eventLocation;
-    newRect.size = CPSizeMake(10, 10);
+    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasHorizontalScroller])
+    {
+        if (eventLocation.x < CGRectGetMinX(bounds))
+            deltaX = CGRectGetMinX(bounds) - eventLocation.x;
+        else if (eventLocation.x > CGRectGetMaxX(bounds))
+            deltaX = CGRectGetMaxX(bounds) - eventLocation.x;
+        if (deltaX < -bounds.size.width)
+            deltaX = -bounds.size.width;
+        if (deltaX > bounds.size.width)
+            deltaX = bounds.size.width;
+    }
 
-	return [_documentView scrollRectToVisible:newRect];
+    return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
 }
 
 @end
@@ -213,15 +240,20 @@ var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     if (self = [super initWithCoder:aCoder])
-        [self setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
-    
+    {
+        // Don't call setDocumentView: here. It calls addSubview:, but it's A) not necessary since the
+        // view hierarchy is fully encoded and B) dangerous if the subview is not fully decoded.
+        _documentView = [aCoder decodeObjectForKey:CPClipViewDocumentViewKey];
+        [self _observeDocumentView];
+    }
+
     return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-    
+
     [aCoder encodeObject:_documentView forKey:CPClipViewDocumentViewKey];
 }
 

AppKit/CPCollectionViewItem.j

@@ -28,6 +28,32 @@
 @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/CPColorPanel.j

@@ -23,8 +23,30 @@
 @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";
 
 var PREVIEW_HEIGHT = 20.0,
@@ -35,24 +57,8 @@ 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
 
@@ -61,7 +67,7 @@ CPColorPickerViewHeight = 370;
     obtain the panel, call the \c +sharedColorPanel method.
 */
 @implementation CPColorPanel : CPPanel
-{    
+{
     _CPColorPanelToolbar    _toolbar;
     _CPColorPanelSwatches   _swatchView;
     _CPColorPanelPreview    _previewView;
@@ -80,8 +86,8 @@ CPColorPickerViewHeight = 370;
     int             _mode;
 }
 
-/*! 
-    A list of color pickers is collected here, and any color panel created will contain 
+/*!
+    A list of color pickers is collected here, and any color panel created will contain
     any picker in this list up to this point. In other words, call before creating a color panel.
 */
 + (void)provideColorPickerClass:(Class)aColorPickerSubclass
@@ -96,7 +102,7 @@ CPColorPickerViewHeight = 370;
 {
     if (!SharedColorPanel)
         SharedColorPanel = [[CPColorPanel alloc] init];
-    
+
     return SharedColorPanel;
 }
 
@@ -107,7 +113,7 @@ CPColorPickerViewHeight = 370;
 + (void)setPickerMode:(CPColorPanelMode)mode
 {
     var panel = [CPColorPanel sharedColorPanel];
-    [panel setMode: mode];
+    [panel setMode:mode];
 }
 
 /*
@@ -116,23 +122,23 @@ CPColorPickerViewHeight = 370;
 */
 - (id)init
 {
-    self = [super initWithContentRect:CGRectMake(500.0, 50.0, 219.0, 370.0) 
+    self = [super initWithContentRect:CGRectMake(500.0, 50.0, 219.0, 370.0)
                             styleMask:(CPTitledWindowMask | CPClosableWindowMask | CPResizableWindowMask)];
 
     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];
-        
+
         [self setFloatingPanel:YES];
         [self setBecomesKeyOnlyIfNeeded:YES];
-        
-        [self setMinSize:CGSizeMake(219.0, 342.0)];
+
+        [self setMinSize:CGSizeMake(219.0, 363.0)];
         [self setMaxSize:CGSizeMake(323.0, 537.0)];
     }
-    
+
     return self;
 }
 
@@ -142,13 +148,13 @@ CPColorPickerViewHeight = 370;
 - (void)setColor:(CPColor)aColor
 {
     _color = aColor;
-    [_previewView setBackgroundColor: _color];
-    
+    [_previewView setBackgroundColor:_color];
+
     [CPApp sendAction:@selector(changeColor:) to:nil from:self];
 
     if (_target && _action)
         [CPApp sendAction:_action to:_target from:self];
-        
+
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPColorPanelColorDidChangeNotification
                       object:self];
@@ -165,7 +171,7 @@ CPColorPickerViewHeight = 370;
 - (void)setColor:(CPColor)aColor updatePicker:(BOOL)bool
 {
     [self setColor:aColor];
-    
+
     if (bool)
         [_activePicker setColor:_color];
 }
@@ -232,30 +238,30 @@ CPColorPickerViewHeight = 370;
 {
     var picker = _colorPickers[[sender tag]],
         view = [picker provideNewView:NO];
-    
+
     if (!view)
         view = [picker provideNewView:YES];
-        
+
     if (view == _currentView)
         return;
-        
+
     if (_currentView)
         [view setFrame:[_currentView frame]];
     else
     {
-        var height = (TOOLBAR_HEIGHT+10+PREVIEW_HEIGHT+5+SWATCH_HEIGHT+32),
+        var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
             bounds = [[self contentView] bounds];
 
-        [view setFrameSize: CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin: CPPointMake(5, height)];
+        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin:CGPointMake(5, height)];
     }
-    
+
     [_currentView removeFromSuperview];
     [[self contentView] addSubview:view];
-    
+
     _currentView = view;
     _activePicker = picker;
-    
+
     [picker setColor:[self color]];
 }
 
@@ -285,7 +291,7 @@ CPColorPickerViewHeight = 370;
     _colorPickers = [];
 
     var count = [ColorPickerClasses count];
-    for (var i=0; i<count; i++)
+    for (var i = 0; i < count; i++)
     {
         var currentPickerClass = ColorPickerClasses[i],
             currentPicker = [[currentPickerClass alloc] initWithPickerMask:0 colorPanel:self];
@@ -297,29 +303,29 @@ CPColorPickerViewHeight = 370;
         bounds = [contentView bounds];
 
     _toolbar = [[CPView alloc] initWithFrame:CGRectMake(0, 6, CGRectGetWidth(bounds), TOOLBAR_HEIGHT)];
-    [_toolbar setAutoresizingMask: CPViewWidthSizable];  
+    [_toolbar setAutoresizingMask:CPViewWidthSizable];
 
     var totalToolbarWidth = count * ICON_WIDTH + (count - 1) * ICON_PADDING,
         leftOffset = (CGRectGetWidth(bounds) - totalToolbarWidth) / 2.0,
         buttonForLater = nil;
 
-    for (var i=0; i<count; i++)
+    for (var i = 0; i < count; i++)
     {
         var image = [_colorPickers[i] provideNewButtonImage],
             highlightImage = [_colorPickers[i] provideNewAlternateButtonImage],
-            button = [[CPButton alloc] initWithFrame:CGRectMake(leftOffset + i*(ICON_WIDTH+ICON_PADDING), 0, ICON_WIDTH, ICON_WIDTH)];
-            
+            button = [[CPButton alloc] initWithFrame:CGRectMake(leftOffset + i * (ICON_WIDTH + ICON_PADDING), 0, ICON_WIDTH, ICON_WIDTH)];
+
         [button setTag:i];
         [button setTarget:self];
         [button setAction:@selector(_setPicker:)];
         [button setBordered:NO];
-        [button setAutoresizingMask:CPViewMinXMargin|CPViewMaxXMargin];
-        
+        [button setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
+
         [button setImage:image];
         [button setAlternateImage:highlightImage];
-        
+
         [_toolbar addSubview:button];
-        
+
         if (!buttonForLater)
             buttonForLater = button;
     }
@@ -330,15 +336,15 @@ CPColorPickerViewHeight = 370;
     _previewView = [[_CPColorPanelPreview alloc] initWithFrame:CGRectInset([previewBox bounds], 2.0, 2.0)];
 
     [_previewView setColorPanel:self];
-    [_previewView setAutoresizingMask:CPViewWidthSizable];  
+    [_previewView setAutoresizingMask:CPViewWidthSizable];
 
     [previewBox setBackgroundColor:[CPColor colorWithWhite:0.8 alpha:1.0]];
     [previewBox setAutoresizingMask:CPViewWidthSizable];
 
     [previewBox addSubview:_previewView];
 
-    var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
-    [_previewLabel setStringValue: "Preview:"];
+    var _previewLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
+    [_previewLabel setStringValue:"Preview:"];
     [_previewLabel setTextColor:[CPColor blackColor]];
     [_previewLabel setAlignment:CPRightTextAlignment];
 
@@ -350,26 +356,27 @@ CPColorPickerViewHeight = 370;
 
     _swatchView = [[_CPColorPanelSwatches alloc] initWithFrame:CGRectInset([swatchBox bounds], 1.0, 1.0)];
 
-    [_swatchView setColorPanel: self];
-    [_swatchView setAutoresizingMask: CPViewWidthSizable];  
+    [_swatchView setColorPanel:self];
+    [_swatchView setAutoresizingMask:CPViewWidthSizable];
 
     [swatchBox addSubview:_swatchView];
 
-    var _swatchLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
-    [_swatchLabel setStringValue: "Swatches:"];
+    var _swatchLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
+    [_swatchLabel setStringValue:"Swatches:"];
     [_swatchLabel setTextColor:[CPColor blackColor]];
     [_swatchLabel setAlignment:CPRightTextAlignment];
 
 
-    var opacityLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
-    [opacityLabel setStringValue: "Opacity:"];
+    var opacityLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
+    [opacityLabel setStringValue:"Opacity:"];
     [opacityLabel setTextColor:[CPColor blackColor]];
     [opacityLabel setAlignment:CPRightTextAlignment];
 
     _opacitySlider = [[CPSlider alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 34, CGRectGetWidth(bounds) - 86, 20.0)];
-    
+
     [_opacitySlider setMinValue:0.0];
     [_opacitySlider setMaxValue:1.0];
+    [_opacitySlider setAutoresizingMask:CPViewWidthSizable];
 
     [_opacitySlider setTarget:self];
     [_opacitySlider setAction:@selector(setOpacity:)];
@@ -386,7 +393,7 @@ CPColorPickerViewHeight = 370;
     _action = nil;
     _activePicker = nil;
 
-    [_previewView setBackgroundColor: _color];
+    [_previewView setBackgroundColor:_color];
 
     if (buttonForLater)
         [self _setPicker:buttonForLater];
@@ -404,48 +411,49 @@ CPColorPickerViewHeight = 370;
 
 
 CPColorDragType = "CPColorDragType";
+
 var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 /* @ignore */
 @implementation _CPColorPanelSwatches : CPView
 {
-    CPView[]        _swatches;
+    CPArray         _swatches;
     CPColor         _dragColor;
     CPColorPanel    _colorPanel;
     CPCookie        _swatchCookie;
 }
 
--(id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
-    [self setBackgroundColor: [CPColor grayColor]];
-    
+
+    [self setBackgroundColor:[CPColor grayColor]];
+
     [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
 
     var whiteColor = [CPColor whiteColor];
 
-    _swatchCookie = [[CPCookie alloc] initWithName: CPColorPanelSwatchesCookie];
+    _swatchCookie = [[CPCookie alloc] initWithName:CPColorPanelSwatchesCookie];
     var colorList = [self startingColorList];
-        
+
     _swatches = [];
-    
-    for(var i=0; i < 50; i++)
+
+    for (var i = 0; i < 50; i++)
     {
         // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-        var view = [[CPView alloc] initWithFrame: CPRectMake(13*i+1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame:CGRectMake(13 * i + 1, 1, 12, 12)],
             fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
-        
+
         [view setBackgroundColor:whiteColor];
-        [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
+        [fillView setBackgroundColor:(i < colorList.length) ? colorList[i] : whiteColor];
 
         [view addSubview:fillView];
 
-        [self addSubview: view];
-        
+        [self addSubview:view];
+
         _swatches.push(view);
     }
-        
+
     return self;
 }
 
@@ -457,7 +465,8 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 - (CPArray)startingColorList
 {
     var cookieValue = [_swatchCookie value];
-    if(cookieValue == "")
+
+    if (!cookieValue)
     {
         return [
             [CPColor blackColor],
@@ -471,12 +480,12 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
             [CPColor yellowColor]
         ];
     }
-    
-    var cookieValue = eval(cookieValue);
-    var result = [];
-    
-    for(var i=0; i<cookieValue.length; i++)
-        result.push([CPColor colorWithHexString: cookieValue[i]]);
+
+    var cookieValue = eval(cookieValue),
+        result = [];
+
+    for (var i = 0; i < cookieValue.length; i++)
+        result.push([CPColor colorWithHexString:cookieValue[i]]);
 
     return result;
 }
@@ -485,13 +494,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var result = [];
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    for(var i=0; i<_swatches.length; i++)
+    for (var i = 0; i < _swatches.length; i++)
         result.push([[[_swatches[i] subviews][0] backgroundColor] hexString]);
-        
+
     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
@@ -520,63 +529,63 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil],
         bounds = [self bounds];
-    
-    if(!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
+
+    if (!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
         return NO;
 
-    [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
+    [_colorPanel setColor:[self colorAtIndex:FLOOR(point.x / 13)] updatePicker:YES];
 }
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-     if(point.x > [self bounds].size.width - 1 || point.x < 1)
+     if (point.x > [self bounds].size.width - 1 || point.x < 1)
         return NO;
 
     [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];
- 
+
     var swatch = _swatches[FLOOR(point.x / 13)];
-    
+
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
     _dragColor = [[swatch subviews][0] backgroundColor];
-    
-    var bounds = CPRectCreateCopy([swatch bounds]);
+
+    var bounds = CGRectMakeCopy([swatch bounds]);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame: bounds];
+    var dragView = [[CPView alloc] initWithFrame:bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
-    
+
     [dragView setBackgroundColor:[CPColor blackColor]];
     [dragFillView setBackgroundColor:_dragColor];
-    
+
     [dragView addSubview:dragFillView];
 
-    [self dragView: dragView
-                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset: CPPointMake(0.0, 0.0)
-             event: anEvent
-        pasteboard: nil
-            source: self
-         slideBack: YES];
+    [self dragView:dragView
+                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset:CGPointMake(0.0, 0.0)
+             event:anEvent
+        pasteboard:nil
+            source:self
+         slideBack:YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
-    if(aType == CPColorDragType)
+    if (aType == CPColorDragType)
         [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
 }
 
 - (void)performDragOperation:(id <CPDraggingInfo>)aSender
-{    
+{
     var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
         pasteboard = [aSender draggingPasteboard],
         swatch = nil;
 
-    if(![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
+    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
@@ -587,12 +596,12 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPColorPanel    _colorPanel;
 }
 
-- (id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
-    
+
     return self;
 }
 
@@ -610,9 +619,9 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var pasteboard = [aSender draggingPasteboard];
 
-    if(![pasteboard availableTypeFromArray:[CPColorDragType]])
+    if (![pasteboard availableTypeFromArray:[CPColorDragType]])
         return NO;
-        
+
     var color = [CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]];
     [_colorPanel setColor:color updatePicker:YES];
 }
@@ -626,31 +635,31 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];    
-    
-    var bounds = CPRectMake(0, 0, 15, 15);
-    
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];
+
+    var bounds = CGRectMake(0, 0, 15, 15);
+
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame: bounds];
+    var dragView = [[CPView alloc] initWithFrame:bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
-    
+
     [dragView setBackgroundColor:[CPColor blackColor]];
     [dragFillView setBackgroundColor:[self backgroundColor]];
-    
+
     [dragView addSubview:dragFillView];
-    
-    [self dragView: dragView
-                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset: CPPointMake(0.0, 0.0)
-             event: anEvent
-        pasteboard: nil
-            source: self
-         slideBack: YES];
+
+    [self dragView:dragView
+                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset:CGPointMake(0.0, 0.0)
+             event:anEvent
+        pasteboard:nil
+            source:self
+         slideBack:YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
-    if(aType == CPColorDragType)
+    if (aType == CPColorDragType)
         [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:[self backgroundColor]] forType:aType];
 }
 

AppKit/CPColorPicker.j

@@ -21,11 +21,17 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPColorPanel.j"
 
-#include "Platform/Platform.h"
+@import "CPView.j"
 
-/*! 
+@class CPSlider
+
+@global CPColorPickerViewWidth
+@global CPColorPickerViewHeight
+@global CPWheelColorPickerMode
+
+
+/*!
     @ingroup appkit
     @class CPColorPicker
 
@@ -44,10 +50,11 @@
 */
 - (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
 {
-    self = [super init];
-
-    _panel = aPanel;
-    _mask  = aMask;
+    if (self = [super init])
+    {
+        _panel = aPanel;
+        _mask  = aMask;
+    }
 
     return self;
 }
@@ -76,7 +83,6 @@
 */
 - (void)setMode:(CPColorPanelMode)mode
 {
-    return;
 }
 
 /*!
@@ -85,7 +91,6 @@
 */
 - (void)setColor:(CPColor)aColor
 {
-    return;
 }
 
 @end
@@ -102,20 +107,20 @@
 
     CPColor         _cachedColor;
 }
- 
-- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
+
+- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
 {
     return [super initWithPickerMask:mask colorPanel: owningColorPanel];
 }
 
--(id)initView
+- (id)initView
 {
-    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    var aFrame = _CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
 
     _pickerView = [[CPView alloc] initWithFrame:aFrame];
-    [_pickerView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    [_pickerView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:_CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
 
     [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
     [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
@@ -128,25 +133,25 @@
     [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
     [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
 
-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame: CPRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
-    [_hueSaturationView setDelegate: self];
-    [_hueSaturationView setAutoresizingMask: (CPViewWidthSizable | CPViewHeightSizable)];
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:_CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    [_hueSaturationView setDelegate:self];
+    [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];
 
     [_pickerView addSubview:_hueSaturationView];
     [_pickerView addSubview:_brightnessSlider];
 }
 
--(void)brightnessSliderDidChange:(id)sender
+- (void)brightnessSliderDidChange:(id)sender
 {
     [self updateColor];
 }
 
--(void)colorWheelDidChange:(id)sender
+- (void)colorWheelDidChange:(id)sender
 {
     [self updateColor];
 }
 
--(void)updateColor
+- (void)updateColor
 {
     var hue        = [_hueSaturationView angle],
         saturation = [_hueSaturationView distance],
@@ -223,60 +228,64 @@
     float       _radius;
 }
 
--(id)initWithFrame:(CPRect)aFrame
+- (id)initWithFrame:(CGRect)aFrame
 {
-    self = [super initWithFrame:aFrame];
-
-    var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
-
-    _wheelImage = new Image();
-    _wheelImage.src = path;
-    _wheelImage.style.position = "absolute";
-
-    path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
-
-    _blackWheelImage = new Image();
-    _blackWheelImage.src = path;
-    _blackWheelImage.style.opacity = "0";
-    _blackWheelImage.style.filter = "alpha(opacity=0)"
-    _blackWheelImage.style.position = "absolute";
-
+    if (self = [super initWithFrame:aFrame])
+    {
 #if PLATFORM(DOM)
-    _DOMElement.appendChild(_wheelImage);
-    _DOMElement.appendChild(_blackWheelImage);
+        var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
+
+        _wheelImage = new Image();
+        _wheelImage.src = path;
+        _wheelImage.style.position = "absolute";
+
+        path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
+
+        _blackWheelImage = new Image();
+        _blackWheelImage.src = path;
+        _blackWheelImage.style.opacity = "0";
+        _blackWheelImage.style.filter = "alpha(opacity=0)"
+        _blackWheelImage.style.position = "absolute";
+
+        _DOMElement.appendChild(_wheelImage);
+        _DOMElement.appendChild(_blackWheelImage);
 #endif
 
-    [self setWheelSize:aFrame.size];
+        [self setWheelSize:aFrame.size];
 
-    _crosshair = [[CPView alloc] initWithFrame:CPRectMake(_radius - 2, _radius - 2, 4, 4)];
-    [_crosshair setBackgroundColor:[CPColor blackColor]];
+        _crosshair = [[CPView alloc] initWithFrame:CGRectMake(_radius - 2, _radius - 2, 4, 4)];
+        [_crosshair setBackgroundColor:[CPColor blackColor]];
 
-    var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
-    [view setBackgroundColor:[CPColor whiteColor]];
+        var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
+        [view setBackgroundColor:[CPColor whiteColor]];
 
-    [_crosshair addSubview:view];
+        [_crosshair addSubview:view];
 
-    [self addSubview:_crosshair];
+        [self addSubview:_crosshair];
+    }
 
     return self;
 }
 
--(void)setWheelBrightness:(float)brightness
+- (void)setWheelBrightness:(float)brightness
 {
+#if PLATFORM(DOM)
     _blackWheelImage.style.opacity = 1.0 - brightness;
-    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness)*100 + ")"
+    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness) * 100 + ")"
+#endif
 }
 
--(void)setFrameSize:(CPSize)aSize
+- (void)setFrameSize:(CGSize)aSize
 {
     [super setFrameSize:aSize];
     [self setWheelSize:aSize];
 }
 
--(void)setWheelSize:(CPSize)aSize
+- (void)setWheelSize:(CGSize)aSize
 {
     var min = MIN(aSize.width, aSize.height);
 
+#if PLATFORM(DOM)
     _blackWheelImage.style.width = min;
     _blackWheelImage.style.height = min;
     _blackWheelImage.width = min;
@@ -290,87 +299,85 @@
     _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;
 
     [self setAngle:[self degreesToRadians:_angle] distance:(_distance / 100.0) * _radius];
 }
 
--(void)setDelegate:(id)aDelegate
+- (void)setDelegate:(id)aDelegate
 {
     _delegate = aDelegate;
 }
 
--(id)delegate
+- (id)delegate
 {
     return _delegate;
 }
 
--(float)angle
+- (float)angle
 {
     return _angle;
 }
 
--(float)distance
+- (float)distance
 {
     return _distance;
 }
 
--(void)mouseDown:(CPEvent)anEvent
+- (void)mouseDown:(CPEvent)anEvent
 {
     [self reposition:anEvent];
 }
 
--(void)mouseDragged:(CPEvent)anEvent
+- (void)mouseDragged:(CPEvent)anEvent
 {
     [self reposition:anEvent];
 }
 
--(void)reposition:(CPEvent)anEvent
+- (void)reposition:(CPEvent)anEvent
 {
     var bounds   = [self bounds],
-        location = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
-    var midX   = CGRectGetMidX(bounds);
-    var midY   = CGRectGetMidY(bounds);
-
-    var distance = MIN(SQRT((location.x - midX)*(location.x - midX) + (location.y - midY)*(location.y - midY)), _radius);
-    var angle    = ATAN2(location.y - midY, location.x - midX);
+        location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
+        midX     = CGRectGetMidX(bounds),
+        midY     = CGRectGetMidY(bounds),
+        distance = MIN(SQRT((location.x - midX) * (location.x - midX) + (location.y - midY) * (location.y - midY)), _radius),
+        angle    = ATAN2(location.y - midY, location.x - midX);
 
     [self setAngle:angle distance:distance];
 
     [_delegate colorWheelDidChange:self];
 }
 
--(void)setAngle:(int)angle distance:(float)distance
+- (void)setAngle:(int)angle distance:(float)distance
 {
-    var bounds = [self bounds];
-    var midX   = CGRectGetMidX(bounds);
-    var midY   = CGRectGetMidY(bounds);
+    var bounds = [self bounds],
+        midX   = CGRectGetMidX(bounds),
+        midY   = CGRectGetMidY(bounds);
 
     _angle     = [self radiansToDegrees:angle];
     _distance  = (distance / _radius) * 100.0;
 
-    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
 }
 
--(void)setPositionToColor:(CPColor)aColor
+- (void)setPositionToColor:(CPColor)aColor
 {
     var hsb    = [aColor hsbComponents],
-        bounds = [self bounds];
-
-    var angle    = [self degreesToRadians:hsb[0]],
+        bounds = [self bounds],
+        angle    = [self degreesToRadians:hsb[0]],
         distance = (hsb[1] / 100.0) * _radius;
 
     [self setAngle:angle distance:distance];
 }
 
--(int)radiansToDegrees:(float)radians
+- (int)radiansToDegrees:(float)radians
 {
     return ((-radians / PI) * 180 + 360) % 360;
 }
 
--(float)degreesToRadians:(float)degrees
+- (float)degreesToRadians:(float)degrees
 {
     return -(((degrees - 360) / 180) * PI);
 }

AppKit/CPColorSpace.j

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

AppKit/CPColorWell.j

@@ -29,7 +29,7 @@
 
 var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiveNotification";
 
-/*! 
+/*!
     @ingroup appkit
     @class CPColorWell
 
@@ -41,27 +41,55 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     BOOL    _active;
     BOOL    _bordered;
-    
+
     CPColor _color;
-    CPView  _wellView;
+}
+
++ (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"];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         _active = NO;
-        _bordered = YES;
         _color = [CPColor whiteColor];
-        
-        [self drawBezelWithHighlight:NO];
-        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
-        
+        [self setBordered:YES];
+
         [self _registerForNotifications];
     }
-    
+
     return self;
 }
 
@@ -82,25 +110,23 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
              object:[CPColorPanel sharedColorPanel]];
 }
 
+/*!
+    Sets whether the color well is bordered.
+*/
+- (void)setBordered:(BOOL)shouldBeBordered
+{
+    if (shouldBeBordered)
+        [self setThemeState:CPThemeStateBordered];
+    else
+        [self unsetThemeState:CPThemeStateBordered];
+}
+
 /*!
     Returns whether the color well is bordered
 */
 - (BOOL)isBordered
 {
-    return _bordered;
-}
-
-/*!
-    Sets the color well's current color.
-*/
-- (void)setBordered:(BOOL)bordered
-{
-    if (_bordered == bordered)
-        return;
-        
-    _bordered = bordered;
-    
-    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+    return [self hasThemeState:CPThemeStateBordered];
 }
 
 // Managing Color From Color Wells
@@ -120,10 +146,10 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     if (_color == aColor)
         return;
-    
+
     _color = aColor;
-    
-    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+
+    [self setNeedsLayout];
 }
 
 /*!
@@ -137,7 +163,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 // Activating and Deactivating Color Wells
 /*!
-    Activates the color well, displays the color panel, and makes the panel's current color the same as its own. 
+    Activates the color well, displays the color panel, and makes the panel's current color the same as its own.
     If exclusive is \c YES, deactivates any other CPColorWells. \c NO, keeps them active.
     @param shouldBeExclusive whether other color wells should be deactivated.
 */
@@ -152,9 +178,9 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     if ([self isActive])
         return;
-        
+
     _active = YES;
-    
+
     [[CPNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(colorPanelDidChangeColor:)
@@ -169,9 +195,9 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     if (![self isActive])
         return;
-    
+
     _active = NO;
-    
+
     [[CPNotificationCenter defaultCenter]
         removeObserver:self
                   name:CPColorPanelColorDidChangeNotification
@@ -186,35 +212,10 @@ 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]];
-    
+
     [self sendAction:[self action] to:[self target]];
 }
 
@@ -229,31 +230,119 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [self deactivate];
 }
 
-- (void)mouseDown:(CPEvent)anEvent
+- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    [self drawBezelWithHighlight:YES];
-}
+    [self highlight:NO];
 
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    [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]))
+    if (!mouseIsUp || !CGRectContainsPoint([self bounds], aPoint) || ![self isEnabled])
         return;
-        
+
     [self activate:YES];
 
     var colorPanel = [CPColorPanel sharedColorPanel];
-    
+
     [colorPanel setColor:_color];
     [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",
@@ -268,19 +357,16 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-    
+
     if (self)
     {
         _active = NO;
-        _bordered = [aCoder decodeObjectForKey:CPColorWellBorderedKey];
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
-
-        [self drawBezelWithHighlight:NO];
-        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
+        [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
 
         [self _registerForNotifications];
     }
-    
+
     return self;
 }
 
@@ -290,19 +376,10 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // We do this in order to avoid encoding the _wellView, which 
-    // should just automatically be created programmatically as needed.
-    var actualSubviews = _subviews;
-    
-    _subviews = [_subviews copy];
-    [_subviews removeObjectIdenticalTo:_wellView];
-    
     [super encodeWithCoder:aCoder];
-    
-    _subviews = actualSubviews;
-    
+
     [aCoder encodeObject:_color forKey:CPColorWellColorKey];
-    [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey];
+    [aCoder encodeObject:[self isBordered] forKey:CPColorWellBorderedKey];
 }
 
 @end

AppKit/CPCompatibility.j

@@ -20,9 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPEvent.j"
+@import "CPEvent_Constants.j"
 @import "CPPlatform.j"
 
+
 // Browser Engines
 CPUnknownBrowserEngine                  = 0;
 CPGeckoBrowserEngine                    = 1;
@@ -37,84 +38,104 @@ CPWindowsOperatingSystem                = 1;
 CPOtherOperatingSystem                  = 2;
 
 // Features
-CPCSSRGBAFeature                        = 1 << 5;
+CPCSSRGBAFeature                        = 5;
 
-CPHTMLCanvasFeature                     = 1 << 6;
-CPHTMLContentEditableFeature            = 1 << 7;
-CPHTMLDragAndDropFeature                = 1 << 8;
+CPHTMLCanvasFeature                     = 6;
+CPHTMLContentEditableFeature            = 7;
+CPHTMLDragAndDropFeature                = 8;
 
-CPJavascriptInnerTextFeature            = 1 << 9;
-CPJavascriptTextContentFeature          = 1 << 10;
-CPJavascriptClipboardEventsFeature      = 1 << 11;
-CPJavascriptClipboardAccessFeature      = 1 << 12;
-CPJavaScriptCanvasDrawFeature           = 1 << 13;
-CPJavaScriptCanvasTransformFeature      = 1 << 14;
+CPJavaScriptInnerTextFeature            = 9;
+CPJavaScriptTextContentFeature          = 10;
+CPJavaScriptClipboardEventsFeature      = 11;
+CPJavaScriptClipboardAccessFeature      = 12;
+CPJavaScriptCanvasDrawFeature           = 13;
+CPJavaScriptCanvasTransformFeature      = 14;
 
-CPVMLFeature                            = 1 << 15;
+CPVMLFeature                            = 15;
 
-CPJavascriptRemedialKeySupport          = 1 << 16;
-CPJavaScriptShadowFeature               = 1 << 20;
+CPJavaScriptRemedialKeySupport          = 16;
+CPJavaScriptShadowFeature               = 20;
 
-CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
-CPJavaScriptMouseWheelValues_8_15       = 1 << 23
+CPJavaScriptNegativeMouseWheelValues    = 22;
+CPJavaScriptMouseWheelValues_8_15       = 23;
 
-CPOpacityRequiresFilterFeature          = 1 << 24;
+CPOpacityRequiresFilterFeature          = 24;
 
-//Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 1 << 25;
-CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
+// Internet explorer does not allow dynamically changing the type of an input element
+CPInputTypeCanBeChangedFeature          = 25;
+CPHTML5DragAndDropSourceYOffBy1         = 26;
 
+CPSOPDisabledFromFileURLs               = 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;
 
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = 0;
+    PLATFORM_FEATURES                   = [],
+    PLATFORM_BUGS                       = 0,
+    PLATFORM_STYLE_JS_PROPERTIES        = {};
 
 // default these features to true
-
-PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
+PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
+PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
 
 // Opera
-if (window.opera)
+if (typeof window !== "undefined" && window.opera)
 {
     PLATFORM_ENGINE = CPOperaBrowserEngine;
-    
-    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
+
+    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
 }
 
 // Internet Explorer
-else if (window.attachEvent) // Must follow Opera check.
+else if (typeof window !== "undefined" && window.attachEvent) // Must follow Opera check.
 {
     PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;
-    
-    // Features we can only be sure of with IE (no known independent tests)
-    PLATFORM_FEATURES |= CPVMLFeature;
-    PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
-    PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
-    
-    PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
 
-    PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
+    // 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[CPOpacityRequiresFilterFeature] = YES;
+
+    PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = NO;
+
+    // Tested in Internet Explore 8 and 9.
+    PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = NO;
 }
 
 // WebKit
 else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
 {
     PLATFORM_ENGINE = CPWebKitBrowserEngine;
-    
+
     // Features we can only be sure of with WebKit (no known independent tests)
-    PLATFORM_FEATURES |= CPCSSRGBAFeature;
-    PLATFORM_FEATURES |= CPHTMLContentEditableFeature;
+    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
+    PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;
 
     if (USER_AGENT.indexOf("Chrome") === -1)
-        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
+        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
+
+    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),
         versionString = USER_AGENT.substring(versionStart, versionEnd),
@@ -122,16 +143,27 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
         majorVersion = parseInt(versionString.substring(0, versionDivision)),
         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;
+    if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
+        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
 
     // FIXME this is a terrible hack to get around this bug:
     // https://bugs.webkit.org/show_bug.cgi?id=21548
     if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
+        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
 
     if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
+        PLATFORM_FEATURES[CPHTML5DragAndDropSourceYOffBy1] = YES;
+
+    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
+    if (majorVersion < 537)
+        PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
+
+    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;
 }
 
 // KHTML
@@ -144,47 +176,80 @@ else if (USER_AGENT.indexOf("KHTML") != -1) // Must follow WebKit check.
 else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
     PLATFORM_ENGINE = CPGeckoBrowserEngine;
-    
-    PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
-    
+
+    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
+
     var index = USER_AGENT.indexOf("Firefox"),
         version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
-    
+
     if (version >= 3.0)
-        PLATFORM_FEATURES |= CPCSSRGBAFeature;
+        PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
 
     if (version < 3.0)
-        PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
+        PLATFORM_FEATURES[CPJavaScriptMouseWheelValues_8_15] = YES;
+
+    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
+    PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
 }
 
-// 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;
-    
-        // Detect Canvas setTransform/transform support
+        PLATFORM_FEATURES[CPHTMLCanvasFeature] = YES;
+
+        // Any browser that supports canvas supports CSS opacity
+        PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = NO;
+
+        // Detect canvas setTransform/transform support
         var context = document.createElement("canvas").getContext("2d");
-        
+
         if (context && context.setTransform && context.transform)
-            PLATFORM_FEATURES |= CPJavaScriptCanvasTransformFeature;
+            PLATFORM_FEATURES[CPJavaScriptCanvasTransformFeature] = YES;
     }
-    
+
     var DOMElement = document.createElement("div");
-    
+
     // Detect whether we have innerText or textContent (or neither)
     if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES |= CPJavascriptInnerTextFeature;
+        PLATFORM_FEATURES[CPJavaScriptInnerTextFeature] = YES;
     else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES |= CPJavascriptTextContentFeature;
+        PLATFORM_FEATURES[CPJavaScriptTextContentFeature] = YES;
+
+    var DOMInputElement = document.createElement("input");
+
+    if ("oninput" in DOMInputElement)
+        PLATFORM_FEATURES[CPInputOnInputEventFeature] = 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;
 }
 
 function CPFeatureIsCompatible(aFeature)
 {
-    return PLATFORM_FEATURES & aFeature;
+    return !!PLATFORM_FEATURES[aFeature];
+}
+
+function CPPlatformHasBug(aBug)
+{
+    return PLATFORM_BUGS & aBug;
 }
 
 function CPBrowserIsEngine(anEngine)
@@ -224,3 +289,106 @@ else
     CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
+
+/*!
+    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
+    CPBrowserStyleProperty('transition') -> WebkitTransition
+
+    While technically not a style property, style related event handler names are also supported.
+    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
+
+    CSS is only available in platform(dom), so don't rely too heavily on it.
+*/
+function CPBrowserStyleProperty(aProperty)
+{
+    var lowerProperty = aProperty.toLowerCase();
+
+    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
+    {
+        var r = nil;
+
+#if PLATFORM(DOM)
+        var testElement = document.createElement('div');
+
+        switch (lowerProperty)
+        {
+            case 'transitionend':
+                var candidates = {
+                        'WebkitTransition' : 'webkitTransitionEnd',
+                        'MozTransition'    : 'transitionend',
+                        'OTransition'      : 'oTransitionEnd',
+                        'msTransition'     : 'MSTransitionEnd',
+                        'transition'       : 'transitionend'
+                    };
+
+                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
+                break;
+            default:
+                var prefixes = ["Webkit", "Moz", "O", "ms"],
+                    strippedProperty = aProperty.split('-').join(' '),
+                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
+
+                for (var i = 0; i < prefixes.length; i++)
+                {
+                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
+                    if (prefixes[i] + aProperty in testElement.style)
+                    {
+                        r = prefixes[i] + aProperty;
+                        break;
+                    }
+                    else if (prefixes[i] + capProperty in testElement.style)
+                    {
+                        r = prefixes[i] + capProperty;
+                        break;
+                    }
+                }
+
+                if (!r && lowerProperty in testElement.style)
+                    r = lowerProperty;
+
+                break;
+        }
+#endif
+
+        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
+    }
+
+    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
+}
+
+function CPBrowserCSSProperty(aProperty)
+{
+    var browserProperty = CPBrowserStyleProperty(aProperty);
+
+    if (!browserProperty)
+        return nil;
+
+    var prefixes = {
+            'Webkit': '-webkit-',
+            'Moz': '-moz-',
+            'O': '-o-',
+            'ms': '-ms-'
+        };
+
+    for (var prefix in prefixes)
+    {
+        if (browserProperty.substring(0, prefix.length) == prefix)
+        {
+            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
+                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
+
+            // If there were any capitalized words in the browserProperty, insert a "-" between each one
+            if (parts && parts.length > 0)
+                browserPropertyWithoutPrefix = parts.join("-");
+
+            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
+        }
+    }
+
+    var parts = browserProperty.match(/[A-Z][a-z]+/g);
+
+    if (parts && parts.length > 0)
+        browserProperty = parts.join("-");
+
+    return browserProperty.toLowerCase();
+}

AppKit/CPController.j

@@ -0,0 +1,88 @@
+//
+// CPController.j
+// AppKit
+//
+// Created by Ross Boucher 1/15/09
+// Copyright 280 North
+//
+// Adapted from GNUStep
+// Copyright (C) 2007 Free Software Foundation, Inc
+// Released under the LGPL.
+//
+
+
+@import <Foundation/CPObject.j>
+
+var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
+
+@implementation CPController : CPObject
+{
+    CPArray     _editors;
+    CPArray     _declaredKeys;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    if (self)
+    {
+        _editors = [];
+        _declaredKeys = [];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    if ([_declaredKeys count] > 0)
+        [aCoder encodeObject:_declaredKeys forKey:CPControllerDeclaredKeysKey];
+}
+
+- (id)initWithCoder:(CPCoder)aDecoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        _editors = [];
+        _declaredKeys = [aDecoder decodeObjectForKey:CPControllerDeclaredKeysKey] || [];
+    }
+
+    return self;
+}
+
+- (BOOL)isEditing
+{
+    return [_editors count] > 0;
+}
+
+- (BOOL)commitEditing
+{
+    var index = 0,
+        count = _editors.length;
+
+    for (; index < count; ++index)
+        if (![[_editors objectAtIndex:index] commitEditing])
+            return NO;
+
+    return YES;
+}
+
+- (void)discardEditing
+{
+    [_editors makeObjectsPerformSelector:@selector(discardEditing)];
+}
+
+- (void)objectDidBeginEditing:(id)anEditor
+{
+    [_editors addObject:anEditor];
+}
+
+- (void)objectDidEndEditing:(id)anEditor
+{
+    [_editors removeObject:anEditor];
+}
+
+@end

AppKit/CPCookie.j

@@ -24,7 +24,7 @@
 @import <Foundation/CPString.j>
 
 
-/*! 
+/*!
     @ingroup appkit
     @class CPCookie
     CPCookie is the Cappuccino interface to a web browser cookie. You can set the name
@@ -33,7 +33,7 @@
 {
     CPString    _cookieName;
     CPString    _cookieValue;
-    
+
     CPString    _expires;
 }
 
@@ -44,7 +44,7 @@
 - (id)initWithName:(CPString)aName
 {
     self = [super init];
-    
+
     _cookieName  = aName;
     _cookieValue = [self _readCookieValue];
 
@@ -83,30 +83,43 @@
 */
 - (void)setValue:(CPString)value expires:(CPDate)date domain:(CPString)domain
 {
-    if(date)
-        var expires = "; expires="+date.toGMTString();
-    else 
+    if (date)
+        var expires = "; expires=" + date.toGMTString();
+    else
         var expires = "";
-        
-    if(domain)
-        domain = "; domain="+domain;
-    else 
+
+    if (domain)
+        domain = "; domain=" + domain;
+    else
         domain = "";
-        
-	document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;        
+
+#if PLATFORM(DOM)
+    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
+#else
+    _cookieValue = value;
+    _expires = expires;
+#endif
 }
 
 /* @ignore */
 - (CPString)_readCookieValue
 {
-	var nameEQ = _cookieName + "=";
-	var ca = document.cookie.split(';');
-	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);
-	}
-	return "";
+#if PLATFORM(DOM)
+    var nameEQ = _cookieName + "=",
+        ca = document.cookie.split(';');
+
+    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);
+    }
+#endif
+    return "";
 }
 
 @end

AppKit/CPCursor.j

@@ -1,34 +1,56 @@
 /*
-Testing browsers:
-    WebKit r50235 (Safari 4.0.3+)
-    FireFox 3.5
-    Opera 10.0.0
-
-Implemented class methods:
-    Webkit : All
-    IE     : All
-    FireFox Win : All
-    FireFox Mac : All except closedHandCursor disappearingItemCursor // Firefox mac does not support url cursors
-    Opera       : All except resizeLeftRightCursor resizeUpDownCursor operationNotAllowedCursor dragCopyCursor dragLinkCursor contextualMenuCursor openHandCursor closedHandCursor disappearingItemCursor // Opera does not support url cursors so these won't work with images
+Cursor support by browser:
+    OS X 10.6/Chrome 8       : All
+    OS X 10.6/Safari 5       : All
+    OS X 10.6/Firefox 3      : All except disappearingItemCursor (no url() support)
+    OS X 10.6/Firefox 3.5    : All except disappearingItemCursor (no url() support)
+    OS X 10.6/Firefox 3.6    : All except disappearingItemCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
+    OS X 10.6/Firefox 4.0b10 : All
+    OS X/Opera 9             : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor  (no url() support)
+    OS X/Opera 10            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
+    OS X/Opera 11            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
+    Win XP/Chrome 8          : All
+    Win XP/Safari 5          : All
+    Win XP/Firefox 3         : All
+    Win XP/Firefox 3.5       : All
+    Win XP/Firefox 3.6       : All
+    Win XP/Firefox 4.0b10    : All
+    Win XP/Opera 10          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
+    Win XP/Opera 11          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
+    Win XP/IE 7              : All
+    Win XP/IE 8              : All
 */
 
-#include "Platform/Platform.h"
+@import <Foundation/CPObject.j>
+
+@global CPApp
 
 var currentCursor = nil,
     cursorStack = [],
     cursors = {},
-    cursorURLFormat = nil;
+    ieCursorMap = {};
 
 @implementation CPCursor : CPObject
 {
-    CPString _cssString;
+    CPString _cssString @accessors(readonly);
+    CPString _hotSpot @accessors(readonly, getter=hotSpot);
+    CPImage  _image @accessors(readonly, getter=image);
     BOOL     _isSetOnMouseEntered @accessors(readwrite, getter=isSetOnMouseEntered, setter=setOnMouseEntered:);
     BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }
 
-+ (CPCursor)currentCursor
++ (void)initialize
 {
-    return currentCursor;
+    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
@@ -39,161 +61,35 @@ var currentCursor = nil,
     return self;
 }
 
-+ (CPCursor)cursorWithCSSString:(CPString)cssString
+/*!
+    Init a cursor with the given image and hotspot.
+    hotspot is supported in CSS3 (but not IE).
+*/
+- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
 {
-    var cursor = cursors[cssString];
-
-    if (typeof cursor == 'undefined')
-    {
-        cursor = [[CPCursor alloc] initWithCSSString:cssString];
-        cursors[cssString] = cursor;
-    }
-
-    return cursor;
+    _hotSpot = hotSpot;
+    _image = image;
+    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
 }
 
-+ (CPCursor)cursorWithImageNamed:(CPString)imageName
+/*!
+    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
 {
-    if (!cursorURLFormat)
-    {
-        cursorURLFormat = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/%@.cur)";
-
-        if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-            cursorURLFormat += ", default";
-    }
-    
-    var url = [CPString stringWithFormat:cursorURLFormat, imageName];
-    
-    return [[CPCursor alloc] initWithCSSString:url];
-}
-
-- (CPString)_cssString
-{
-    return _cssString;
-}
-
-+ (CPCursor)arrowCursor
-{
-    return [CPCursor cursorWithCSSString:@"default"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)crosshairCursor
-{
-    return [CPCursor cursorWithCSSString:@"crosshair"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)IBeamCursor
-{
-    return [CPCursor cursorWithCSSString:@"text"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)pointingHandCursor
-{
-    return [CPCursor cursorWithCSSString:@"pointer"]; // WebKit | FF | opera | IE
-}
-
-+ (CPCursor)resizeDownCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-        
-    return [CPCursor cursorWithCSSString:"s-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeUpCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"n-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeLeftCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"w-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeRightCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"e-resize"]; // WebKit | FF | opera
-}
-
-+ (CPCursor)resizeLeftRightCursor
-{
-    return [CPCursor cursorWithCSSString:@"col-resize"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)resizeUpDownCursor
-{
-    return [CPCursor cursorWithCSSString:@"row-resize"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)operationNotAllowedCursor
-{
-    return [CPCursor cursorWithCSSString:@"not-allowed"]; // WebKit | FF | IE
-}
-
-+ (CPCursor)dragCopyCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"copy"]; // WebKit | FF
-}
-
-+ (CPCursor)dragLinkCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"alias"]; // WebKit | FF
-}
-
-+ (CPCursor)contextualMenuCursor
-{
-    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
-
-    return [CPCursor cursorWithCSSString:@"context-menu"]; // WebKit | FF Mac . Not impl FF Win.
-}
-
-+ (CPCursor)openHandCursor
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-webkit-grab"];
-    else if (CPBrowserIsEngine(CPGeckoBrowserEngine) || CPBrowserIsEngine(CPOperaBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"move"];
-
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only. move in FFMac|Opera 
-}
-
-+ (CPCursor)closedHandCursor
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-        return [CPCursor cursorWithCSSString:@"-webkit-grabbing"];
-
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only 
-}
-
-+ (CPCursor)disappearingItemCursor
-{
-    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // None
+    return [self initWithImage:image hotSpot:aHotSpot];
 }
 
 + (void)hide
 {
-    [self _setCursorCSS:"none"]; // Not supported in IE
+    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
 }
 
 + (void)unhide
 {
-    [self _setCursorCSS:[currentCursor _cssString]]
+    [self _setCursorCSS:[currentCursor _cssString]];
 }
 
 + (void)setHiddenUntilMouseMoves:(BOOL)flag
@@ -204,43 +100,6 @@ var currentCursor = nil,
         [CPCursor unhide];
 }
 
-- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
-{
-    return [self initWithCSSString:"url(" + [image filename] + ")"];
-}
-
-- (void)mouseEntered:(CPEvent)event
-{
-}
-
-- (void)mouseExited:(CPEvent)event
-{
-}
-
-- (void)set
-{
-    currentCursor = self; 
-
-#if PLATFORM(DOM)
-    [[self class] _setCursorCSS:_cssString];
-#endif
-
-}
-
-+ (void)_setCursorCSS:(CPString)aString
-{
-#if PLATFORM(DOM)
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-    for (var i = 0, count = [platformWindows count]; i < count; i++)
-        platformWindows[i]._DOMBodyElement.style.cursor = aString;
-#endif
-}
-
-- (void)push
-{
-    currentCursor = cursorStack.push(self);
-}
-
 - (void)pop
 {
     [CPCursor pop];
@@ -255,6 +114,207 @@ var currentCursor = nil,
     }
 }
 
+- (void)push
+{
+    currentCursor = cursorStack.push(self);
+}
+
+- (void)set
+{
+    currentCursor = self;
+
+#if PLATFORM(DOM)
+    [[self class] _setCursorCSS:_cssString];
+#endif
+}
+
+- (void)mouseEntered:(CPEvent)event
+{
+}
+
+- (void)mouseExited:(CPEvent)event
+{
+}
+
++ (CPCursor)currentCursor
+{
+    return currentCursor;
+}
+
++ (void)_setCursorCSS:(CPString)aString
+{
+#if PLATFORM(DOM)
+    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
+
+    for (var i = 0, count = [platformWindows count]; i < count; i++)
+        platformWindows[i]._DOMBodyElement.style.cursor = aString;
+#endif
+}
+
+// Internal method that is used to return the system cursors.  Caches the system cursors for performance.
++ (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
+{
+    var cursor = cursors[cursorName];
+
+    if (typeof cursor === "undefined")
+    {
+        var cssString;
+
+        if (doesHaveImage)
+        {
+            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath],
+                extension = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) ? @"cur" : @"png";
+
+            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.%@), %@", themeResourcePath, cursorName, extension, 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;
+        }
+
+        cursor = [[CPCursor alloc] initWithCSSString:cssString];
+        cursors[cursorName] = cursor;
+    }
+
+    return cursor;
+}
+
++ (CPCursor)arrowCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
+}
+
++ (CPCursor)crosshairCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"crosshair" hasImage:NO];
+}
+
++ (CPCursor)IBeamCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"text" hasImage:NO];
+}
+
++ (CPCursor)pointingHandCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
+}
+
++ (CPCursor)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];
+}
+
++ (CPCursor)resizeUpCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"n-resize" hasImage:NO];
+}
+
++ (CPCursor)resizeLeftCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"w-resize" hasImage:NO];
+}
+
++ (CPCursor)resizeRightCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"e-resize" hasImage:NO];
+}
+
++ (CPCursor)resizeLeftRightCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
+}
+
++ (CPCursor)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];
+}
+
++ (CPCursor)dragCopyCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"copy" hasImage:YES];
+}
+
++ (CPCursor)dragLinkCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"alias" hasImage:YES];
+}
+
++ (CPCursor)contextualMenuCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"context-menu" hasImage:YES];
+}
+
++ (CPCursor)openHandCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"move" hasImage:YES];
+}
+
++ (CPCursor)closedHandCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"-moz-grabbing" hasImage:YES];
+}
+
++ (CPCursor)disappearingItemCursor
+{
+    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"auto" hasImage:YES];
+}
+
+@end
+
+@implementation CPCursor(CPCoding)
+
 - (id)initWithCoder:(CPCoder)coder
 {
     if (self = [super init])
@@ -269,4 +329,3 @@ var currentCursor = nil,
 }
 
 @end
-

AppKit/CPDictionaryController.j

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

AppKit/CPDocument.j

@@ -23,11 +23,16 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPArray.j>
 
+@import "CPAlert.j"
 @import "CPResponder.j"
 @import "CPSavePanel.j"
 @import "CPViewController.j"
 @import "CPWindowController.j"
 
+@class CPDocumentController
+
+@global CPApp
+
 
 /*
     @global
@@ -82,12 +87,12 @@ CPDocumentDidFailToSaveNotification = @"CPDocumentDidFailToSaveNotification";
 
 var CPDocumentUntitledCount = 0;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPDocument
 
     CPDocument is used to represent a document/file in a Cappuccino application.
-    In a document-based application, generally multiple documents are open simutaneously
+    In a document-based application, generally multiple documents are open simultaneously
     (multiple text documents, slide presentations, spreadsheets, etc.), and multiple
     CPDocuments should be used to represent this.
 */
@@ -120,18 +125,18 @@ var CPDocumentUntitledCount = 0;
 - (id)init
 {
     self = [super init];
-    
+
     if (self)
     {
         _windowControllers = [];
-        _viewControllersForWindowControllers = [CPDictionary dictionary];
+        _viewControllersForWindowControllers = @{};
 
         _hasUndoManager = YES;
         _changeCount = 0;
 
         [self setNextResponder:CPApp];
     }
-    
+
     return self;
 }
 
@@ -141,13 +146,13 @@ 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];
-    
+
     if (self)
         [self setFileType:aType];
-    
+
     return self;
 }
 
@@ -165,7 +170,7 @@ var CPDocumentUntitledCount = 0;
 - (id)initWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
 {
     self = [self init];
-    
+
     if (self)
     {
         [self setFileURL:anAbsoluteURL];
@@ -173,7 +178,7 @@ var CPDocumentUntitledCount = 0;
 
         [self readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
     }
-    
+
     return self;
 }
 
@@ -190,7 +195,7 @@ var CPDocumentUntitledCount = 0;
 - (id)initForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
 {
     self = [self init];
-    
+
     if (self)
     {
         [self setFileURL:anAbsoluteURL];
@@ -198,7 +203,7 @@ var CPDocumentUntitledCount = 0;
 
         [self readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
     }
-    
+
     return self;
 }
 
@@ -207,13 +212,13 @@ var CPDocumentUntitledCount = 0;
     throws an exception.
     @param aType the format of the data
     @param anError not used
-    @throws CPUnsupportedMethodException if this method hasn't been overriden by the subclass
+    @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
     @return the document data
 */
-- (CPData)dataOfType:(CPString)aType
+- (CPData)dataOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:"dataOfType: must be overridden by the document subclass."];
+                reason:"dataOfType:error: must be overridden by the document subclass."];
 }
 
 /*!
@@ -281,7 +286,7 @@ var CPDocumentUntitledCount = 0;
         {
             var view = [viewController view],
                 viewFrame = [view frame];
-            
+
             viewFrame.origin = CGPointMake(50, 50);
 
             var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
@@ -381,14 +386,14 @@ var CPDocumentUntitledCount = 0;
 {
     if (_fileURL)
         return [_fileURL lastPathComponent];
-    
+
     if (!_untitledDocumentIndex)
         _untitledDocumentIndex = ++CPDocumentUntitledCount;
-	
-	if (_untitledDocumentIndex == 1)
-	   return @"Untitled";
 
-	return @"Untitled " + _untitledDocumentIndex;
+    if (_untitledDocumentIndex == 1)
+       return @"Untitled";
+
+    return @"Untitled " + _untitledDocumentIndex;
 }
 
 - (CPString)viewCibName
@@ -457,7 +462,7 @@ var CPDocumentUntitledCount = 0;
         return;
 
     _fileURL = aFileURL;
-    
+
     [_windowControllers makeObjectsPerformSelector:@selector(synchronizeWindowTitleWithDocumentName)];
 }
 
@@ -473,21 +478,8 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)saveToURL:(CPURL)anAbsoluteURL ofType:(CPString)aTypeName forSaveOperation:(CPSaveOperationType)aSaveOperation delegate:(id)aDelegate didSaveSelector:(SEL)aDidSaveSelector contextInfo:(id)aContextInfo
 {
-    if (anAbsoluteURL.isLocalStorageURL())
-        [[CPDocumentController sharedDocumentController] _addLocalDocumentURL:anAbsoluteURL];
-
-    var data = nil;
-
-    if ([self respondsToSelector:@selector(dataOfType:error:)])
-    {
-        CPLog.warn("[" + CPStringFromClass([self class]) + " " + CPStringFromSelector(@selector(dataOfType:error:)) + "] is deprecated, please implement " + CPStringFromSelector(@selector(dataOfType:)) + " instead and simply throw exceptions when necessary.");
-
-        data = [self dataOfType:[self fileType] error:nil];
-    }
-    else
-        data = [self dataOfType:[self fileType]];
-
-    var oldChangeCount = _changeCount;
+    var data = [self dataOfType:[self fileType] error:nil],
+        oldChangeCount = _changeCount;
 
     _writeRequest = [CPURLRequest requestWithURL:anAbsoluteURL];
 
@@ -522,21 +514,21 @@ var CPDocumentUntitledCount = 0;
     // If we got this far and it wasn't an HTTP request, then everything is fine.
     if (![aResponse isKindOfClass:[CPHTTPURLResponse class]])
         return;
-    
+
     var statusCode = [aResponse statusCode];
-    
+
     // Nothing to do if everything is hunky dory.
     if (statusCode === 200)
         return;
-    
+
     var session = aConnection.session;
-    
+
     if (aConnection == _readConnection)
     {
         [aConnection cancel];
-            
+
         alert("There was an error retrieving the document.");
-        
+
         objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
     }
     else
@@ -545,23 +537,23 @@ var CPDocumentUntitledCount = 0;
         if (statusCode == 409)
         {
             [aConnection cancel];
-            
+
             if (confirm("There already exists a file with that name, would you like to overwrite it?"))
             {
                 [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
-    
+
                 [aConnection start];
             }
-            else        
+            else
             {
                 if (session.saveOperation != CPSaveToOperation)
                 {
                     _changeCount += session.changeCount;
                     [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
                 }
-                
+
                 _writeRequest = nil;
-    
+
                 objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
                 [self _sendDocumentSavedNotification:NO];
             }
@@ -576,7 +568,7 @@ var CPDocumentUntitledCount = 0;
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)aData
 {
     var session = aConnection.session;
-        
+
     // READ
     if (aConnection == _readConnection)
     {
@@ -588,9 +580,9 @@ var CPDocumentUntitledCount = 0;
     {
         if (session.saveOperation != CPSaveToOperation)
             [self setFileURL:session.absoluteURL];
-            
+
         _writeRequest = nil;
-        
+
         objj_msgSend(session.delegate, session.didSaveSelector, self, YES, session.contextInfo);
         [self _sendDocumentSavedNotification:YES];
     }
@@ -603,17 +595,17 @@ var CPDocumentUntitledCount = 0;
 - (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
 {
     var session = aConnection.session;
-        
+
     if (_readConnection == aConnection)
         objj_msgSend(session.delegate, session.didReadSelector, self, NO, session.contextInfo);
-    
+
     else
-    {        
+    {
         if (session.saveOperation != CPSaveToOperation)
         {
             _changeCount += session.changeCount;
             [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
-        }        
+        }
 
         _writeRequest = nil;
 
@@ -656,9 +648,9 @@ var CPDocumentUntitledCount = 0;
     else if (aChangeType == CPChangeCleared)
         _changeCount = 0;
     /*else if (aChangeType == CPCHangeReadOtherContents)
-        
-    else if (aChangeType == CPChangeAutosaved)*/ 
-    
+
+    else if (aChangeType == CPChangeAutosaved)*/
+
     [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
 }
 
@@ -698,9 +690,9 @@ var CPDocumentUntitledCount = 0;
 {
     if (_hasUndoManager == aFlag)
         return;
-    
+
     _hasUndoManager = aFlag;
-    
+
     if (!_hasUndoManager)
         [self setUndoManager:nil];
 }
@@ -709,7 +701,7 @@ var CPDocumentUntitledCount = 0;
 - (void)_undoManagerWillCloseGroup:(CPNotification)aNotification
 {
     var undoManager = [aNotification object];
-    
+
     if ([undoManager isUndoing] || [undoManager isRedoing])
         return;
 
@@ -736,13 +728,13 @@ var CPDocumentUntitledCount = 0;
 - (void)setUndoManager:(CPUndoManager)anUndoManager
 {
     var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
     if (_undoManager)
     {
         [defaultCenter removeObserver:self
                                  name:CPUndoManagerDidUndoChangeNotification
                                object:_undoManager];
-                               
+
         [defaultCenter removeObserver:self
                                  name:CPUndoManagerDidRedoChangeNotification
                                object:_undoManager];
@@ -751,17 +743,17 @@ var CPDocumentUntitledCount = 0;
                                  name:CPUndoManagerWillCloseUndoGroupNotification
                                object:_undoManager];
     }
-    
+
     _undoManager = anUndoManager;
-    
+
     if (_undoManager)
     {
-    
+
         [defaultCenter addObserver:self
                           selector:@selector(_undoManagerDidUndoChange:)
                               name:CPUndoManagerDidUndoChangeNotification
                             object:_undoManager];
-                            
+
         [defaultCenter addObserver:self
                           selector:@selector(_undoManagerDidRedoChange:)
                               name:CPUndoManagerDidRedoChangeNotification
@@ -787,7 +779,7 @@ var CPDocumentUntitledCount = 0;
 
     return _undoManager;
 }
- 
+
 /*
     Implemented as a delegate of a CPWindow
     @ignore
@@ -816,7 +808,7 @@ var CPDocumentUntitledCount = 0;
         [[CPNotificationCenter defaultCenter]
             postNotificationName:CPDocumentWillSaveNotification
                           object:self];
-        
+
         [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
     }
     else
@@ -874,7 +866,7 @@ var CPDocumentUntitledCount = 0;
     [[CPDocumentController sharedDocumentController] removeDocument:self];
 }
 
-- (void)shouldCloseWindowController:(CPWindowController)controller delegate:(id)delegate shouldCloseSelector:(SEL)selector contextInfo:(Object)info 
+- (void)shouldCloseWindowController:(CPWindowController)controller delegate:(id)delegate shouldCloseSelector:(SEL)selector contextInfo:(Object)info
 {
     if ([controller shouldCloseDocument] || ([_windowControllers count] < 2 && [_windowControllers indexOfObject:controller] !== CPNotFound))
         [self canCloseDocumentWithDelegate:self shouldCloseSelector:@selector(_document:shouldClose:context:) contextInfo:{delegate:delegate, selector:selector, context:info}];
@@ -891,7 +883,7 @@ var CPDocumentUntitledCount = 0;
     objj_msgSend(context.delegate, context.selector, aDocument, shouldClose, context.context);
 }
 
-- (void)canCloseDocumentWithDelegate:(id)aDelegate shouldCloseSelector:(SEL)aSelector contextInfo:(Object)context 
+- (void)canCloseDocumentWithDelegate:(id)aDelegate shouldCloseSelector:(SEL)aSelector contextInfo:(Object)context
 {
     if (![self isDocumentEdited])
         return [aDelegate respondsToSelector:aSelector] && objj_msgSend(aDelegate, aSelector, self, YES, context);
@@ -934,9 +926,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-}
+};
 
 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
     return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-}
+};

AppKit/CPDocumentController.j

@@ -24,12 +24,16 @@
 @import <Foundation/CPBundle.j>
 
 @import "CPDocument.j"
-@import "CPOpenPanel.j";
+@import "CPOpenPanel.j"
+@import "CPMenuItem.j"
+@import "CPWindowController.j"
+
+@global CPApp
 
 
 var CPSharedDocumentController = nil;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPDocumentController
     This class is responsible for managing an application's open documents.
@@ -38,11 +42,10 @@ var CPSharedDocumentController = nil;
 {
     CPArray _documents;
     CPArray _documentTypes;
-    CPArray _localDocumentURLs;
 }
 
 /*!
-    Returns the singleton instance of the application's document controller. If it has not 
+    Returns the singleton instance of the application's document controller. If it has not
     been created yet, it will be created then returned.
     @return a CPDocumentController
 */
@@ -50,7 +53,7 @@ var CPSharedDocumentController = nil;
 {
     if (!CPSharedDocumentController)
         [[self alloc] init];
-    
+
     return CPSharedDocumentController;
 }
 
@@ -63,27 +66,11 @@ var CPSharedDocumentController = nil;
 
     if (self)
     {
+        _documents = [[CPArray alloc] init];
+
         if (!CPSharedDocumentController)
             CPSharedDocumentController = self;
 
-        _localDocumentURLs = [CPSet set];
-
-        if (window.localStorage)
-        {
-            var localDocumentURLs = localStorage.getItem(CPDocumentControllerLocalDocumentURLsKey);
-
-            if (localDocumentURLs)
-            {
-                localDocumentURLs = JSON.parse(localDocumentURLs);
-
-                var count = [localDocumentURLs count];
-
-                while (count--)
-                    [_localDocumentURLs addObject:new CFURL(localDocumentURLs[count])];
-            }
-        }
-
-        _documents = [];
         _documentTypes = [[[CPBundle mainBundle] infoDictionary] objectForKey:@"CPBundleDocumentTypes"];
     }
     return self;
@@ -102,16 +89,16 @@ var CPSharedDocumentController = nil;
 {
     var index = 0,
         count = [_documents count];
-	
-	for (; index < count; ++index)
+
+    for (; index < count; ++index)
     {
         var theDocument = _documents[index];
-        
-		if ([[theDocument fileURL] isEqual:aURL])
-			return theDocument;
+
+        if ([[theDocument fileURL] isEqual:aURL])
+            return theDocument;
     }
-	
-	return nil;
+
+    return nil;
 }
 
 /*!
@@ -122,10 +109,10 @@ var CPSharedDocumentController = nil;
 - (void)openUntitledDocumentOfType:(CPString)aType display:(BOOL)shouldDisplay
 {
     var theDocument = [self makeUntitledDocumentOfType:aType error:nil];
-    
+
     if (theDocument)
         [self addDocument:theDocument];
-    
+
     if (shouldDisplay)
     {
         [theDocument makeWindowControllers];
@@ -141,7 +128,7 @@ var CPSharedDocumentController = nil;
     @param anError not used
     @return the created document
 */
-- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:({CPError})anError
+- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
 {
     return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
 }
@@ -161,7 +148,7 @@ var CPSharedDocumentController = nil;
     {
         var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];
 
-        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:[CPDictionary dictionaryWithObject:shouldDisplay forKey:@"shouldDisplay"]];
+        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:@{ @"shouldDisplay": shouldDisplay }];
 
         [self addDocument:result];
 
@@ -194,7 +181,7 @@ var CPSharedDocumentController = nil;
     @param aType the document type
     @param aDelegate the delegate to notify
     @param aSelector the selector to notify with
-    @param aContextInfo the context infomration passed to the delegate
+    @param aContextInfo the context information passed to the delegate
 */
 - (CPDocument)makeDocumentWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
 {
@@ -227,7 +214,7 @@ var CPSharedDocumentController = nil;
         return;
 
     [aDocument makeWindowControllers];
-    
+
     if ([aContextInfo objectForKey:@"shouldDisplay"])
         [aDocument showWindows];
 }
@@ -236,12 +223,12 @@ var CPSharedDocumentController = nil;
     Opens a new document in the application.
     @param aSender the requesting object
 */
-- (@action)newDocument:(id)aSender
+- (CFAction)newDocument:(id)aSender
 {
     [self openUntitledDocumentOfType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] display:YES];
 }
 
--(void)openDocument:(id)aSender
+- (void)openDocument:(id)aSender
 {
     var openPanel = [CPOpenPanel openPanel];
 
@@ -293,17 +280,17 @@ var CPSharedDocumentController = nil;
 {
     var index = 0,
         count = _documentTypes.length,
-        
+
         extension = [[anAbsoluteURL pathExtension] lowercaseString],
         starType = nil;
-    
+
     for (; index < count; ++index)
     {
         var documentType = _documentTypes[index],
             extensions = [documentType objectForKey:@"CFBundleTypeExtensions"],
             extensionIndex = 0,
             extensionCount = extensions.length;
-        
+
         for (; extensionIndex < extensionCount; ++extensionIndex)
         {
             var thisExtension = [extensions[extensionIndex] lowercaseString];
@@ -329,11 +316,11 @@ var CPSharedDocumentController = nil;
     for (;i < count; ++i)
     {
         var documentType = _documentTypes[i];
-        
+
         if ([documentType objectForKey:@"CPBundleTypeName"] == aType)
             return documentType;
     }
-    
+
     return nil;
 }
 
@@ -353,13 +340,13 @@ var CPSharedDocumentController = nil;
 
 @implementation CPDocumentController (Closing)
 
-- (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info 
+- (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];
 }
@@ -407,13 +394,14 @@ var CPSharedDocumentController = nil;
 
 - (void)noteNewRecentDocument:(CPDocument)aDocument
 {
-    [self noteNewRecentDocumentURL:[[aDocument fileURL] absoluteString]];
+    [self noteNewRecentDocumentURL:[aDocument fileURL]];
 }
 
-- (void)noteNewRecentDocumentURL:(CPString)aURL
+- (void)noteNewRecentDocumentURL:(CPURL)aURL
 {
+    var urlAsString = [aURL isKindOfClass:CPString] ? aURL : [aURL absoluteString];
     if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
-        window.cpNoteNewRecentDocumentPath(aURL);
+        window.cpNoteNewRecentDocumentPath(urlAsString);
 
    [self _updateRecentDocumentsMenu];
 }
@@ -472,41 +460,3 @@ var CPSharedDocumentController = nil;
 }
 
 @end
-
-var CPDocumentControllerLocalDocumentURLsKey = @"Cappuccino.CPDocumentController.documentURLs";
-
-@implementation CPDocumentController (LocalStorage)
-
-- (void)_addLocalDocumentURL:(CPURL)aURL
-{
-    if (!window.localStorage)
-        return;
-
-    [_localDocumentURLs addObject:aURL];
-
-    var stringURLs = [],
-        URL = nil,
-        URLEnumerator = [_localDocumentURLs objectEnumerator];
-
-    while (URL = [URLEnumerator nextObject])
-        stringURLs.push(URL + "");
-
-    localStorage.setItem(CPDocumentControllerLocalDocumentURLsKey, JSON.stringify(stringURLs));
-}
-
-- (void)_removeLocalDocumentURL:(CPURL)aURL
-{
-    if (!window.localStorage)
-        return;
-
-    [_localDocumentURLs removeObject:aURL];
-
-    localStorage.setItem(CPDocumentControllerLocalDocumentURLsKey, JSON.stringify([self allObjects]));
-}
-
-- (CPSet)localDocumentURLs
-{
-    return [_localDocumentURLs copy];
-}
-
-@end

AppKit/CPDragServer.j

@@ -20,52 +20,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <AppKit/CPView.j>
-@import <AppKit/CPEvent.j>
-@import <AppKit/CPPasteboard.j>
-@import <AppKit/CPImageView.j>
+@import "CPDragServer_Constants.j"
+@import "CPEvent.j"
+@import "CPImageView.j"
+@import "CPPasteboard.j"
+@import "CPView.j"
+@import "CPWindow_Constants.j"
 
-#import "CoreGraphics/CGGeometry.h"
-#import "Platform/Platform.h"
+@class CPWindow  // This file is imported by CPWindow.j
+@class _CPDOMDataTransferPasteboard
 
-
-CPDragOperationNone     = 0,
-CPDragOperationCopy     = 1 << 1,
-CPDragOperationLink     = 1 << 1,
-CPDragOperationGeneric  = 1 << 2,
-CPDragOperationPrivate  = 1 << 3,
-CPDragOperationMove     = 1 << 4,
-CPDragOperationDelete   = 1 << 5,
-CPDragOperationEvery    = -1;
+@global CPApp
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
-var    CPDragServerPreviousEvent      = nil,
-CPDragServerAutoscrollInterval = nil;
-/*
-var CPDragServerAutoscroll = function()
-{
-    [CPDragServerSource autoscroll:CPDragServerPreviousEvent];
-}
+var CPDragServerPreviousEvent = nil,
+    CPDragServerPeriodicUpdateInterval = 0.05;
 
-    if (CPDragServerAutoscrollInterval === nil)
-    {
-        if ([CPDragServerSource respondsToSelector:@selector(autoscroll:)])
-            CPDragServerAutoscrollInterval = setInterval(CPDragServerAutoscroll, 100);
-    }
+var CPSharedDragServer = nil;
 
-    CPDragServerPreviousEvent = anEvent;
-
-        if (CPDragServerAutoscrollInterval !== nil)
-            clearInterval(CPDragServerAutoscrollInterval);
-
-        CPDragServerAutoscrollInterval = nil;
-*/
-
-var CPSharedDragServer     = nil;
-
-var CPDragServerSource             = nil;
-var CPDragServerDraggingInfo       = nil;
+var CPDragServerSource             = nil,
+    CPDragServerDraggingInfo       = nil;
 
 /*
     CPDraggingInfo is a container of information about a specific dragging session.
@@ -92,7 +67,7 @@ var CPDragServerDraggingInfo       = nil;
 - (unsigned)draggingSourceOperationMask
 */
 
-- (CPPoint)draggingLocation
+- (CGPoint)draggingLocation
 {
     return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -150,10 +125,13 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
     CGPoint         _draggingLocation;
     id              _draggingDestination;
+    BOOL            _draggingDestinationWantsPeriodicUpdates;
 
     CGPoint         _startDragLocation;
     BOOL            _shouldSlideBack;
     unsigned        _dragOperation;
+
+    CPTimer         _draggingUpdateTimer;
 }
 
 /*
@@ -234,34 +212,105 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
 - (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
 {
-    var dragOperation = CPDragOperationCopy;
+    [_draggingUpdateTimer invalidate];
+    _draggingUpdateTimer = nil;
+
+    var dragOperation = CPDragOperationCopy,
     // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
-    var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
+        draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
 
     if (draggingDestination)
         _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];
 
-    if(draggingDestination !== _draggingDestination)
+    if (draggingDestination !== _draggingDestination)
     {
-        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingExited:)])
+        if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
             [_draggingDestination draggingExited:CPDragServerDraggingInfo];
 
         _draggingDestination = draggingDestination;
 
-        if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingEntered:)])
+        if ([_draggingDestination respondsToSelector:@selector(wantsPeriodicDraggingUpdates)])
+            _draggingDestinationWantsPeriodicUpdates = [_draggingDestination wantsPeriodicDraggingUpdates];
+        else
+            _draggingDestinationWantsPeriodicUpdates = YES;
+
+        if ([_draggingDestination respondsToSelector:@selector(draggingEntered:)])
             dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
     }
-    else if (_draggingDestination && [_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
+    else if ([_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
         dragOperation = [_draggingDestination draggingUpdated:CPDragServerDraggingInfo];
 
     if (!_draggingDestination)
         dragOperation = CPDragOperationNone;
+    else
+    {
+        if (_draggingDestinationWantsPeriodicUpdates)
+            _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
+                                                                    target:self
+                                                                  selector:@selector(_sendPeriodicDraggingUpdate:)
+                                                                  userInfo:@{ "platformWindow":aPlatformWindow, "location":aLocation }
+                                                                   repeats:NO];
+
+        var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
+        if (scrollView)
+        {
+            var contentView = [scrollView contentView],
+                bounds = [contentView bounds],
+                insetBounds = CGRectInset(bounds, 30, 30),
+                eventLocation = [contentView convertPoint:_draggingLocation fromView:nil],
+                deltaX = 0,
+                deltaY = 0;
+
+            if (!CGRectContainsPoint(insetBounds, eventLocation))
+            {
+                if ([scrollView hasVerticalScroller])
+                {
+                    if (eventLocation.y < _CGRectGetMinY(insetBounds))
+                        deltaY = _CGRectGetMinY(insetBounds) - eventLocation.y;
+                    else if (eventLocation.y > _CGRectGetMaxY(insetBounds))
+                        deltaY = _CGRectGetMaxY(insetBounds) - eventLocation.y;
+                    if (deltaY < -insetBounds.size.height)
+                        deltaY = -insetBounds.size.height;
+                    if (deltaY > insetBounds.size.height)
+                        deltaY = insetBounds.size.height;
+                }
+
+                if ([scrollView hasHorizontalScroller])
+                {
+                    if (eventLocation.x < _CGRectGetMinX(insetBounds))
+                        deltaX = _CGRectGetMinX(insetBounds) - eventLocation.x;
+                    else if (eventLocation.x > _CGRectGetMaxX(insetBounds))
+                        deltaX = _CGRectGetMaxX(insetBounds) - eventLocation.x;
+                    if (deltaX < -insetBounds.size.width)
+                        deltaX = -insetBounds.size.width;
+                    if (deltaX > insetBounds.size.width)
+                        deltaX = insetBounds.size.width;
+                }
+
+                var scrollPoint = _CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY);
+
+                [contentView scrollToPoint:scrollPoint];
+                [[scrollView _headerView] scrollPoint:scrollPoint];
+
+            }
+        }
+    }
 
     return dragOperation;
 }
 
+- (void)_sendPeriodicDraggingUpdate:(CPTimer)aTimer
+{
+    var userInfo = [aTimer userInfo];
+    _dragOperation = [self draggingUpdatedInPlatformWindow:[userInfo objectForKey:@"platformWindow"]
+                                                  location:[userInfo objectForKey:@"location"]];
+}
+
 - (void)draggingEndedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
 {
+    [_draggingUpdateTimer invalidate];
+    _draggingUpdateTimer = nil;
+
     [_draggedView removeFromSuperview];
 
     if (![CPPlatform supportsDragAndDrop])
@@ -277,8 +326,8 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
 - (void)performDragOperationInPlatformWindow:(CPPlatformWindow)aPlatformWindow
 {
-    if (_draggingDestination && 
-        (![_draggingDestination respondsToSelector:@selector(prepareForDragOperation:)] || [_draggingDestination prepareForDragOperation:CPDragServerDraggingInfo]) && 
+    if (_draggingDestination &&
+        (![_draggingDestination respondsToSelector:@selector(prepareForDragOperation:)] || [_draggingDestination prepareForDragOperation:CPDragServerDraggingInfo]) &&
         (![_draggingDestination respondsToSelector:@selector(performDragOperation:)] || [_draggingDestination performDragOperation:CPDragServerDraggingInfo]) &&
         [_draggingDestination respondsToSelector:@selector(concludeDragOperation:)])
         [_draggingDestination concludeDragOperation:CPDragServerDraggingInfo];
@@ -404,46 +453,27 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         // Stop tracking events.
         return;
     }
+    else if (type === CPKeyDown)
+    {
+        var characters = [anEvent characters];
 
-    [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-    _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
+        if (characters === CPEscapeFunctionKey)
+        {
+            _dragOperation = CPDragOperationNone;
+            [self draggingEndedInPlatformWindow:platformWindow globalLocation:CGPointMakeZero() operation:_dragOperation];
+            return;
+        }
+    }
+    else
+    {
+        [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
+        _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
+    }
 
     // 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
-        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;
+        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
+        untilDate:nil inMode:0 dequeue:YES];
 }
 
 @end

AppKit/CPDragServer_Constants.j

@@ -0,0 +1,30 @@
+/*
+ * CPDragServer_Constants.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPDragOperationNone     = 0;
+CPDragOperationCopy     = 1 << 1;
+CPDragOperationLink     = 1 << 1;
+CPDragOperationGeneric  = 1 << 2;
+CPDragOperationPrivate  = 1 << 3;
+CPDragOperationMove     = 1 << 4;
+CPDragOperationDelete   = 1 << 5;
+CPDragOperationEvery    = -1;

AppKit/CPEvent.j

@@ -20,93 +20,26 @@
  * 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>
 
-#include "CoreGraphics/CGGeometry.h"
+@import "CPCompatibility.j"
+@import "CGGeometry.j"
+@import "CPText.j"
 
+@class CPTextField
 
-CPLeftMouseDown                         = 1;
-CPLeftMouseUp                           = 2;
-CPRightMouseDown                        = 3;
-CPRightMouseUp                          = 4;
-CPMouseMoved                            = 5;
-CPLeftMouseDragged                      = 6;
-CPRightMouseDragged                     = 7;
-CPMouseEntered                          = 8;
-CPMouseExited                           = 9;
-CPKeyDown                               = 10;
-CPKeyUp                                 = 11;
-CPFlagsChanged                          = 12;
-CPAppKitDefined                         = 13;
-CPSystemDefined                         = 14;
-CPApplicationDefined                    = 15;
-CPPeriodic                              = 16;
-CPCursorUpdate                          = 17; 
-CPScrollWheel                           = 22;
-CPOtherMouseDown                        = 25;
-CPOtherMouseUp                          = 26;
-CPOtherMouseDragged                     = 27;
-
-// iPhone Event Types
-CPTouchStart                            = 28;
-CPTouchMove                             = 29;
-CPTouchEnd                              = 30;
-CPTouchCancel                           = 31;
-                                        
-                                        
-CPAlphaShiftKeyMask                     = 1 << 16;
-CPShiftKeyMask                          = 1 << 17;
-CPControlKeyMask                        = 1 << 18;
-CPAlternateKeyMask                      = 1 << 19;
-CPCommandKeyMask                        = 1 << 20;
-CPNumericPadKeyMask                     = 1 << 21;
-CPHelpKeyMask                           = 1 << 22;
-CPFunctionKeyMask                       = 1 << 23;
-CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
-
-CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
-CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
-CPRightMouseDownMask                    = 1 << CPRightMouseDown;
-CPRightMouseUpMask                      = 1 << CPRightMouseUp;
-CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
-CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
-CPMouseMovedMask                        = 1 << CPMouseMoved;
-CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
-CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
-CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
-CPMouseEnteredMask                      = 1 << CPMouseEntered;
-CPMouseExitedMask                       = 1 << CPMouseExited;
-CPCursorUpdateMask                      = 1 << CPCursorUpdate;
-CPKeyDownMask                           = 1 << CPKeyDown;
-CPKeyUpMask                             = 1 << CPKeyUp;
-CPFlagsChangedMask                      = 1 << CPFlagsChanged;
-CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
-CPSystemDefinedMask                     = 1 << CPSystemDefined;
-CPApplicationDefinedMask                = 1 << CPApplicationDefined;
-CPPeriodicMask                          = 1 << CPPeriodic;
-CPScrollWheelMask                       = 1 << CPScrollWheel;
-CPAnyEventMask                          = 0xffffffff;
-
-CPDOMEventDoubleClick                   = "dblclick",
-CPDOMEventMouseDown                     = "mousedown",
-CPDOMEventMouseUp                       = "mouseup",
-CPDOMEventMouseMoved                    = "mousemove",
-CPDOMEventMouseDragged                  = "mousedrag",
-CPDOMEventKeyUp                         = "keyup",
-CPDOMEventKeyDown                       = "keydown",
-CPDOMEventKeyPress                      = "keypress";
-CPDOMEventCopy                          = "copy";
-CPDOMEventPaste                         = "paste";
-CPDOMEventScrollWheel                   = "mousewheel";
-CPDOMEventTouchStart                    = "touchstart";
-CPDOMEventTouchMove                     = "touchmove";
-CPDOMEventTouchEnd                      = "touchend";
-CPDOMEventTouchCancel                   = "touchcancel";
+@global CPApp
 
 var _CPEventPeriodicEventPeriod         = 0,
-    _CPEventPeriodicEventTimer          = nil;
+    _CPEventPeriodicEventTimer          = nil,
+    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
+    _CPEventStartupMilliseconds         = new Date().getTime();
 
-/*! 
+/*!
     @ingroup appkit
     @class CPEvent
     CPEvent encapsulates the details of a Cappuccino keyboard or mouse event.
@@ -114,7 +47,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 @implementation CPEvent : CPObject
 {
     CPEventType         _type;
-    CPPoint             _location;
+    CGPoint             _location;
     unsigned            _modifierFlags;
     CPTimeInterval      _timestamp;
     CPGraphicsContext   _context;
@@ -128,14 +61,26 @@ 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.
+
     @param anEventType the event type. Must be one of CPKeyDown, CPKeyUp or CPFlagsChanged
     @param aPoint the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -155,12 +100,13 @@ var _CPEventPeriodicEventPeriod         = 0,
     characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)repeatKey keyCode:(unsigned short)code
 {
     return [[self alloc] _initKeyEventWithType:anEventType location:aPoint modifierFlags:modifierFlags
-        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext 
+        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext
         characters:characters charactersIgnoringModifiers:unmodCharacters isARepeat:repeatKey keyCode:code];
 }
 
 /*!
-    Creates a new mouse event
+    Creates a new mouse event.
+
     @param anEventType the event type
     @param aPoint the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -173,7 +119,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     @throws CPInternalInconsistencyException if an invalid event type is provided
     @return the new mouse event
 */
-+ (id)mouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags 
++ (id)mouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
@@ -182,7 +128,8 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Creates a new custom event
+    Creates a new custom event.
+
     @param anEventType the event type. Must be one of CPAppKitDefined, CPSystemDefined, CPApplicationDefined or CPPeriodic
     @param aLocation the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -203,17 +150,29 @@ var _CPEventPeriodicEventPeriod         = 0,
         timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext subtype:aSubtype data1:aData1 data2:aData2];
 }
 
+- (id)_initWithType:(CPEventType)anEventType
+{
+    if (self = [super init])
+    {
+        _type = anEventType;
+
+        // Make sure these are 0 rather than nil.
+        _deltaX = 0;
+        _deltaY = 0;
+        _deltaZ = 0;
+    }
+
+    return self;
+}
+
 /* @ignore */
-- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags 
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
-    self = [super init];
-    
-    if (self)
+    if (self = [self _initWithType:anEventType])
     {
-        _type = anEventType;
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -222,21 +181,18 @@ var _CPEventPeriodicEventPeriod         = 0,
         _pressure = aPressure;
         _window = [CPApp windowWithWindowNumber:aWindowNumber];
     }
-    
+
     return self;
 }
 
 /* @ignore */
-- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
-    self = [super init];
-    
-    if (self)
+    if (self = [self _initWithType:anEventType])
     {
-        _type = anEventType;
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -246,7 +202,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         _keyCode = code;
         _windowNumber = aWindowNumber;
     }
-    
+
     return self;
 }
 
@@ -255,29 +211,26 @@ var _CPEventPeriodicEventPeriod         = 0,
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
 {
-    self = [super init];
-    
-    if (self)
+    if (self = [self _initWithType:anEventType])
     {
-        _type = anEventType;
-        _location = CPPointCreateCopy(aPoint);
+        _location = CGPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
         _subtype = aSubtype;
         _data1 = aData1;
         _data2 = aData2;
-    }   
+    }
 
     return self;
 }
 
 /*!
     Returns the location of the mouse (for mouse events).
-    If this is not a mouse event, it returns \c nil.
-    If \c window returns \c nil, then
-    the mouse coordinates will be based on the screen coordinates.
+    If the receiver is not a mouse event, it returns \c nil.
+    If \c window returns \c nil, then the mouse coordinates will be based on the screen coordinates.
     Otherwise, the coordinates are relative to the window's coordinates.
+
     @return the location of the mouse, or \c nil for non-mouse events.
 */
 - (CGPoint)locationInWindow
@@ -297,7 +250,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns event information as a bit mask
+    Returns event information as a bit mask.
 */
 - (unsigned)modifierFlags
 {
@@ -305,7 +258,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the time the event occurred
+    Returns the time the event occurred in seconds since startup.
 */
 - (CPTimeInterval)timestamp
 {
@@ -321,7 +274,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the event's associated window
+    Returns the event's associated window.
 */
 - (CPWindow)window
 {
@@ -352,7 +305,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the number of clicks that caused this event. (mouse only)
+    Returns the number of clicks that caused this event (mouse only).
 */
 - (int)clickCount
 {
@@ -360,7 +313,8 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the characters associated with this event (keyboard only)
+    Returns the characters associated with this event (keyboard only).
+
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (CPString)characters
@@ -370,6 +324,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Returns the character ignoring any modifiers (except shift).
+
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (CPString)charactersIgnoringModifiers
@@ -379,6 +334,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Returns \c YES if the keyboard event was caused by the key being held down.
+
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (BOOL)isARepeat
@@ -388,6 +344,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Returns the key's key code.
+
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (unsigned short)keyCode
@@ -420,7 +377,17 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _DOMEvent;
 }
 
-// Getting Scroll Wheel Event Infomration
+- (int)data1
+{
+    return _data1;
+}
+
+- (int)data2
+{
+    return _data2;
+}
+
+// Getting Scroll Wheel Event Information
 /*!
     Returns the change in the x-axis for a mouse event.
 */
@@ -445,45 +412,122 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _deltaZ;
 }
 
+- (BOOL)_triggersKeyEquivalent:(CPString)aKeyEquivalent withModifierMask:aKeyEquivalentModifierMask
+{
+    if (!aKeyEquivalent)
+        return NO;
+
+    if (_CPEventUpperCaseRegex.test(aKeyEquivalent))
+        aKeyEquivalentModifierMask |= CPShiftKeyMask;
+
+    // Windows and Linux don't have command keys, so just switch it to ctrl.
+    if (!CPBrowserIsOperatingSystem(CPMacOperatingSystem) && (aKeyEquivalentModifierMask & CPCommandKeyMask))
+    {
+        aKeyEquivalentModifierMask |= CPControlKeyMask;
+        aKeyEquivalentModifierMask &= ~CPCommandKeyMask;
+    }
+
+    if ((_modifierFlags & (CPShiftKeyMask | CPAlternateKeyMask | CPCommandKeyMask | CPControlKeyMask)) !== aKeyEquivalentModifierMask)
+        return NO;
+
+    // Treat \r and \n as the same key equivalent. See issue #710.
+    if (_characters === CPNewlineCharacter || _characters === CPCarriageReturnCharacter)
+        return CPNewlineCharacter === aKeyEquivalent || CPCarriageReturnCharacter === aKeyEquivalent;
+
+    return [_characters caseInsensitiveCompare:aKeyEquivalent] === CPOrderedSame;
+}
+
 - (BOOL)_couldBeKeyEquivalent
 {
-    // FIXME: More cases? Space?
-    return  _type === CPKeyDown &&
-            _modifierFlags & (CPCommandKeyMask | CPControlKeyMask) &&
-            [_characters length] > 0;
+    if (_type !== CPKeyDown)
+        return NO;
+
+    var characterCount = _characters.length;
+
+    if (!characterCount)
+        return NO;
+
+    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)
+        {
+            return YES;
+        }
+    }
+
+    return !firstResponderIsText;
 }
 
 /*!
     Generates periodic events every \c aPeriod seconds.
+
     @param aDelay the number of seconds before the first event
     @param aPeriod the length of time in seconds between successive events
 */
 + (void)startPeriodicEventsAfterDelay:(CPTimeInterval)aDelay withPeriod:(CPTimeInterval)aPeriod
 {
     _CPEventPeriodicEventPeriod = aPeriod;
-    
+
     // FIXME: OH TIMERS!!!
     _CPEventPeriodicEventTimer = window.setTimeout(function() { _CPEventPeriodicEventTimer = window.setInterval(_CPEventFirePeriodEvent, aPeriod * 1000.0); }, aDelay * 1000.0);
 }
 
 /*!
-    Stops the periodic events from being generated
+    Stops the periodic events from being generated.
 */
 + (void)stopPeriodicEvents
 {
     if (_CPEventPeriodicEventTimer === nil)
         return;
-    
+
     window.clearTimeout(_CPEventPeriodicEventTimer);
-    
+
     _CPEventPeriodicEventTimer = nil;
 }
 
+- (CPString)description
+{
+    switch (_type)
+    {
+        case CPKeyDown:
+        case CPKeyUp:
+        case CPFlagsChanged:
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
+        case CPLeftMouseDown:
+        case CPLeftMouseUp:
+        case CPRightMouseDown:
+        case CPRightMouseUp:
+        case CPMouseMoved:
+        case CPLeftMouseDragged:
+        case CPRightMouseDragged:
+        case CPMouseEntered:
+        case CPMouseExited:
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
+        default:
+            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
+    }
+}
+
 @end
 
 function _CPEventFirePeriodEvent()
 {
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
 }
 
 var CPEventClass = [CPEvent class];
@@ -505,4 +549,3 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie
 
     return aNativeEvent;
 }
-

AppKit/CPEvent_Constants.j

@@ -0,0 +1,174 @@
+/*
+ * CPEvent_Constants.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPLeftMouseDown                         = 1;
+CPLeftMouseUp                           = 2;
+CPRightMouseDown                        = 3;
+CPRightMouseUp                          = 4;
+CPMouseMoved                            = 5;
+CPLeftMouseDragged                      = 6;
+CPRightMouseDragged                     = 7;
+CPMouseEntered                          = 8;
+CPMouseExited                           = 9;
+CPKeyDown                               = 10;
+CPKeyUp                                 = 11;
+CPFlagsChanged                          = 12;
+CPAppKitDefined                         = 13;
+CPSystemDefined                         = 14;
+CPApplicationDefined                    = 15;
+CPPeriodic                              = 16;
+CPCursorUpdate                          = 17;
+CPScrollWheel                           = 22;
+CPOtherMouseDown                        = 25;
+CPOtherMouseUp                          = 26;
+CPOtherMouseDragged                     = 27;
+
+// iPhone Event Types
+CPTouchStart                            = 28;
+CPTouchMove                             = 29;
+CPTouchEnd                              = 30;
+CPTouchCancel                           = 31;
+
+CPAlphaShiftKeyMask                     = 1 << 16;
+CPShiftKeyMask                          = 1 << 17;
+CPControlKeyMask                        = 1 << 18;
+CPAlternateKeyMask                      = 1 << 19;
+CPCommandKeyMask                        = 1 << 20;
+CPNumericPadKeyMask                     = 1 << 21;
+CPHelpKeyMask                           = 1 << 22;
+CPFunctionKeyMask                       = 1 << 23;
+CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
+
+CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
+CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
+CPRightMouseDownMask                    = 1 << CPRightMouseDown;
+CPRightMouseUpMask                      = 1 << CPRightMouseUp;
+CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
+CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
+CPMouseMovedMask                        = 1 << CPMouseMoved;
+CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
+CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
+CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
+CPMouseEnteredMask                      = 1 << CPMouseEntered;
+CPMouseExitedMask                       = 1 << CPMouseExited;
+CPCursorUpdateMask                      = 1 << CPCursorUpdate;
+CPKeyDownMask                           = 1 << CPKeyDown;
+CPKeyUpMask                             = 1 << CPKeyUp;
+CPFlagsChangedMask                      = 1 << CPFlagsChanged;
+CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
+CPSystemDefinedMask                     = 1 << CPSystemDefined;
+CPApplicationDefinedMask                = 1 << CPApplicationDefined;
+CPPeriodicMask                          = 1 << CPPeriodic;
+CPScrollWheelMask                       = 1 << CPScrollWheel;
+CPAnyEventMask                          = 0xffffffff;
+
+CPUpArrowFunctionKey                    = "\uF700";
+CPDownArrowFunctionKey                  = "\uF701";
+CPLeftArrowFunctionKey                  = "\uF702";
+CPRightArrowFunctionKey                 = "\uF703";
+CPF1FunctionKey                         = "\uF704";
+CPF2FunctionKey                         = "\uF705";
+CPF3FunctionKey                         = "\uF706";
+CPF4FunctionKey                         = "\uF707";
+CPF5FunctionKey                         = "\uF708";
+CPF6FunctionKey                         = "\uF709";
+CPF7FunctionKey                         = "\uF70A";
+CPF8FunctionKey                         = "\uF70B";
+CPF9FunctionKey                         = "\uF70C";
+CPF10FunctionKey                        = "\uF70D";
+CPF11FunctionKey                        = "\uF70E";
+CPF12FunctionKey                        = "\uF70F";
+CPF13FunctionKey                        = "\uF710";
+CPF14FunctionKey                        = "\uF711";
+CPF15FunctionKey                        = "\uF712";
+CPF16FunctionKey                        = "\uF713";
+CPF17FunctionKey                        = "\uF714";
+CPF18FunctionKey                        = "\uF715";
+CPF19FunctionKey                        = "\uF716";
+CPF20FunctionKey                        = "\uF717";
+CPF21FunctionKey                        = "\uF718";
+CPF22FunctionKey                        = "\uF719";
+CPF23FunctionKey                        = "\uF71A";
+CPF24FunctionKey                        = "\uF71B";
+CPF25FunctionKey                        = "\uF71C";
+CPF26FunctionKey                        = "\uF71D";
+CPF27FunctionKey                        = "\uF71E";
+CPF28FunctionKey                        = "\uF71F";
+CPF29FunctionKey                        = "\uF720";
+CPF30FunctionKey                        = "\uF721";
+CPF31FunctionKey                        = "\uF722";
+CPF32FunctionKey                        = "\uF723";
+CPF33FunctionKey                        = "\uF724";
+CPF34FunctionKey                        = "\uF725";
+CPF35FunctionKey                        = "\uF726";
+CPInsertFunctionKey                     = "\uF727";
+CPDeleteFunctionKey                     = "\uF728";
+CPHomeFunctionKey                       = "\uF729";
+CPBeginFunctionKey                      = "\uF72A";
+CPEndFunctionKey                        = "\uF72B";
+CPPageUpFunctionKey                     = "\uF72C";
+CPPageDownFunctionKey                   = "\uF72D";
+CPPrintScreenFunctionKey                = "\uF72E";
+CPScrollLockFunctionKey                 = "\uF72F";
+CPPauseFunctionKey                      = "\uF730";
+CPSysReqFunctionKey                     = "\uF731";
+CPBreakFunctionKey                      = "\uF732";
+CPResetFunctionKey                      = "\uF733";
+CPStopFunctionKey                       = "\uF734";
+CPMenuFunctionKey                       = "\uF735";
+CPUserFunctionKey                       = "\uF736";
+CPSystemFunctionKey                     = "\uF737";
+CPPrintFunctionKey                      = "\uF738";
+CPClearLineFunctionKey                  = "\uF739";
+CPClearDisplayFunctionKey               = "\uF73A";
+CPInsertLineFunctionKey                 = "\uF73B";
+CPDeleteLineFunctionKey                 = "\uF73C";
+CPInsertCharFunctionKey                 = "\uF73D";
+CPDeleteCharFunctionKey                 = "\uF73E";
+CPPrevFunctionKey                       = "\uF73F";
+CPNextFunctionKey                       = "\uF740";
+CPSelectFunctionKey                     = "\uF741";
+CPExecuteFunctionKey                    = "\uF742";
+CPUndoFunctionKey                       = "\uF743";
+CPRedoFunctionKey                       = "\uF744";
+CPFindFunctionKey                       = "\uF745";
+CPHelpFunctionKey                       = "\uF746";
+CPModeSwitchFunctionKey                 = "\uF747";
+CPEscapeFunctionKey                     = "\u001B";
+CPSpaceFunctionKey                      = "\u0020";
+
+
+CPDOMEventDoubleClick                   = "dblclick";
+CPDOMEventMouseDown                     = "mousedown";
+CPDOMEventMouseUp                       = "mouseup";
+CPDOMEventMouseMoved                    = "mousemove";
+CPDOMEventMouseDragged                  = "mousedrag";
+CPDOMEventKeyUp                         = "keyup";
+CPDOMEventKeyDown                       = "keydown";
+CPDOMEventKeyPress                      = "keypress";
+CPDOMEventCopy                          = "copy";
+CPDOMEventPaste                         = "paste";
+CPDOMEventScrollWheel                   = "mousewheel";
+CPDOMEventTouchStart                    = "touchstart";
+CPDOMEventTouchMove                     = "touchmove";
+CPDOMEventTouchEnd                      = "touchend";
+CPDOMEventTouchCancel                   = "touchcancel";

AppKit/CPFlashMovie.j

@@ -22,7 +22,8 @@
 
 @import <Foundation/CPObject.j>
 
-/*! 
+
+/*!
     @ingroup appkit
     @class CPFlashMovie
 
@@ -51,10 +52,10 @@
 - (id)initWithFile:(CPString)aFilename
 {
     self = [super init];
-    
+
     if (self)
         _filename = aFilename;
-    
+
     return self;
 }
 

AppKit/CPFlashView.j

@@ -23,7 +23,6 @@
 @import "CPFlashMovie.j"
 @import "CPView.j"
 
-#include "Platform/Platform.h"
 
 var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 
@@ -33,50 +32,43 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 @implementation CPFlashView : CPView
 {
     CPFlashMovie    _flashMovie;
-    
+
     CPDictionary    _params;
     CPDictionary    _paramElements;
-#if PLATFORM(DOM)    
+#if PLATFORM(DOM)
     DOMElement      _DOMParamElement;
     DOMElement      _DOMObjectElement;
-    DOMElement      _DOMInnerObjectElement;
 #endif
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
 #if PLATFORM(DOM)
         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);
         }
         else
             [self _rebuildIEObjects];
 #endif
     }
-    
+
     return self;
 }
 
@@ -84,13 +76,13 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 {
     if (_flashMovie == aFlashMovie)
         return;
-        
+
     _flashMovie = aFlashMovie;
 #if PLATFORM(DOM)
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
         _DOMParamElement.value = [aFlashMovie filename];
-        _DOMInnerObjectElement.data = [aFlashMovie filename];
+        _DOMObjectElement.data = [aFlashMovie filename];
     }
     else
         [self _rebuildIEObjects];
@@ -105,15 +97,18 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (void)setFlashVars:(CPDictionary)aDictionary
 {
     var varString = @"",
-        enumerator = [aDictionary keyEnumerator];
-    
-    var key;
+        enumerator = [aDictionary keyEnumerator],
+        key;
+
+    if (key = [enumerator nextObject])
+        varString = [varString stringByAppendingFormat:@"%@=%@", key, [aDictionary objectForKey:key]];
+
     while (key = [enumerator nextObject])
         varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
-    
+
     if (!_params)
-        _params = [CPDictionary dictionary];
-    
+        _params = @{};
+
     [_params setObject:varString forKey:@"flashvars"];
     [self setParameters:_params];
 }
@@ -130,28 +125,31 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     {
         var elements = [_paramElements allValues],
             count = [elements count];
-        
+
         for (var i = 0; i < count; i++)
             _DOMObjectElement.removeChild([elements objectAtIndex:i]);
     }
 #endif
-    _params = aDictionary;
+    if (!_params)
+        _params = aDictionary;
+    else
+        [_params addEntriesFromDictionary:aDictionary];
 #if PLATFORM(DOM)
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
-        _paramElements = [CPDictionary dictionary];
-        
+        _paramElements = @{};
+
         var enumerator = [_params keyEnumerator],
             key;
-        
-        while (key = [enumerator nextObject] && _DOMObjectElement)
+
+        while (_DOMObjectElement && (key = [enumerator nextObject]) !== nil)
         {
             var param = document.createElement(@"param");
             param.name = key;
             param.value = [_params objectForKey:key];
-            
+
             _DOMObjectElement.appendChild(param);
-            
+
             [_paramElements setObject:param forKey:key];
         }
     }
@@ -171,21 +169,31 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     _DOMElement.innerHTML = @"";
     if (![_flashMovie filename])
         return;
-    
+
     var paramString = [CPString stringWithFormat:@"<param name='movie' value='%@' />", [_flashMovie filename]],
         paramEnumerator = [_params keyEnumerator],
         key;
-    
-    while (key = [paramEnumerator nextObject])
+
+    while ((key = [paramEnumerator nextObject]) !== nil)
         paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
-    
+
     _DOMObjectElement = document.createElement(@"object");
     _DOMElement.appendChild(_DOMObjectElement);
-    
-    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
+
+    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object id=%@ classid=%@ width=%@ height=%@>%@</object>", [self elementID], IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
 }
 #endif
 
+- (CPString)elementID
+{
+    return @"CPFV_" + [self UID];
+}
+
+- (void)mouseMoved:(id)sommit
+{
+    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+}
+
 - (void)mouseDragged:(CPEvent)anEvent
 {
     [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];

AppKit/CPFont.j

@@ -20,98 +20,363 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-var _CPFonts                = {},
-    _CPFontSystemFontFace   = @"Arial, sans-serif",
-    _CPWrapRegExp           = new RegExp("\\s*,\\s*", "g");
+@import <Foundation/CPObject.j>
+@import <Foundation/CPBundle.j>
+
+@import "CPView.j"
+
+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");
 
 
-#define _CPCreateCSSString(aName, aSize, isBold) (isBold ? @"bold " : @"") + ROUND(aSize) + @"px " + ((aName === _CPFontSystemFontFace) ? aName : (@"\"" + aName.replace(_CPWrapRegExp, '", "') + @"\", " + _CPFontSystemFontFace))
-#define _CPCachedFont(aName, aSize, isBold) _CPFonts[_CPCreateCSSString(aName, aSize, isBold)]
+#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]
 
-/*! 
-    @ingroup appkit
-    @class CPFont
+#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])
 
-    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.
+/*!
+@ingroup appkit
+@class CPFont
+
+The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
+The primary method for getting a particular font is through one of the class methods that take
+a name and/or size as arguments, and return the appropriate CPFont.
+
+### System fonts
+When you create a font using \c -systemFontOfSize: or \c -boldSystemFontOfSize:, a proxy font is
+created that always refers to the current system font face and size. By default the system
+font face/size is Arial 12px, with a fallback to sans-serif 12px. You may configure this at
+runtime in two ways:
+
+- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
+  Note that if you change the system font face or size during runtime, the next time
+  any view using a system font is redrawn, it will show the new font.
+- By configuring Info.plist for your application or for AppKit. You can set the font face
+  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
+  by adding a CPSystemFontSize integer item to the Info.plist.
+
+Note that in either case, you can specify a comma-delimited list of fonts as the font face.
+Do not quote enclose font faces that contain spaces, that is done automatically when a CSS
+representation of a font is requested.
+
+The browser will use the first available font in the list you supply. CPFont always ensures
+that Arial and sans-serif are in the CSS representation of a font as a fallback, so there is
+no need to add them to the end of your font list.
+
+### nib2cib conversion
+Fonts are converted by nib2cib according to the following algorithm:
+
+- If the font family is Lucida Grande, then a system font will be created.
+- If the font is Lucida Grande 13 (plain), the "default" font will be used at runtime.
+  The default font is taken from the "font" theme attribute if one exists,
+  otherwise from the current system font face and size.
+- Lucida Grande of any size other than 13 will retain its size.
+- Fonts using any family other than Lucida Grande will be used as is, including the size.
+
+### Using custom web fonts
+The configurability of CPFont makes it easy to use a custom web font as the system font.
+For example, if you want to use the google font Asap as the system font, you would do the
+following:
+
+- Add a <link> to the <head> of index-debug.html and index.html:
+@code
+<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
+@endcode
+- Specify Asap as the system font in Info.plist by adding the following item:
+@code
+<key>CPSystemFontFace</key>
+<string>Asap</string>
+@endcode
 */
 @implementation CPFont : CPObject
 {
     CPString    _name;
     float       _size;
-    BOOL        _isBold;
-    
+    float       _ascender;
+    float       _descender;
+    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);
+
+    var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];
+
+    if (!systemFontSize)
+        systemFontSize = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontSize"];
+
+    if (systemFontSize)
+        _CPFontSystemFontSize = systemFontSize;
+}
+
+/*!
+    Returns the default system font face, which may consist of several comma-separated family names.
+*/
++ (CPString)systemFontFace
+{
+    return _CPFontSystemFontFace;
+}
+
+/*!
+    Sets the default system font face, which may consist of several comma-separated family names.
+*/
++ (CPString)setSystemFontFace:(CPString)aFace
+{
+    var normalizedFaces = _CPFontNormalizedNames(aFace);
+
+    if (normalizedFaces === _CPFontSystemFontFace)
+        return;
+
+    [self _invalidateSystemFontCache]
+    _CPFontSystemFontFace = aFace;
+}
+
+/*!
+    Returns the default system font size.
+*/
++ (float)systemFontSize
+{
+    return _CPFontSystemFontSize;
+}
+
++ (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];
+        _CPFontSystemFontSize = size;
+    }
+}
+
++ (void)_invalidateSystemFontCache
+{
+    var systemSize = String(_CPFontSystemFontSize),
+        currentSize = String(CPFontCurrentSystemSize);
+
+    for (key in _CPSystemFontCache)
+    {
+        if (_CPSystemFontCache.hasOwnProperty(key) &&
+            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
+        {
+            delete _CPSystemFontCache[key];
+        }
+    }
+}
+
 /*!
     Returns a font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPCachedFont(aName, aSize, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO];
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, NO);
+}
+
+/*!
+    Returns a font with the specified name, size and style.
+    @param aName the name of the font
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
+    @param italic whether the font should be italicized
+    @return the requested font
+*/
++ (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
+{
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, italic);
 }
 
 /*!
     Returns a bold font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
     @return the requested bold font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPCachedFont(aName, aSize, YES) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES];
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, NO);
+}
+
+/*!
+    Returns a bold font with the specified name, size and style.
+    @param aName the name of the font
+    @param aSize the size of the font (in px). 0 or negative will create a font
+           in the current system font size.
+    @param italic whether the font should be italicized
+    @return the requested font
+*/
++ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
+{
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, italic);
+}
+
+/*!
+    Internal font getter like fontWithName:size:italic: with a bold selector.
+*/
++ (CPFont)_fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
+{
+    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, bold, italic);
 }
 
 /*!
     Returns the system font scaled to the specified size
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 creates a static font
+           in the current system font size. Negative creates a font
+           that dynamically tracks the current system font size.
     @return the requested system font
 */
-+ (CPFont)systemFontOfSize:(CPSize)aSize
++ (CPFont)systemFontOfSize:(CGSize)aSize
 {
-    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO];
+    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
 }
 
 /*!
     Returns the bold system font scaled to the specified size
-    @param aSize the size of the font (in points)
+    @param aSize the size of the font (in px). 0 creates a static font
+           in the current system font size. Negative creates a font
+           that dynamically tracks the current system font size.
     @return the requested bold system font
 */
-+ (CPFont)boldSystemFontOfSize:(CPSize)aSize
++ (CPFont)boldSystemFontOfSize:(CGSize)aSize
 {
-    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES];
+    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
 }
 
-/*  FIXME Font Descriptor
-    @ignore
-*/
-- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
-{   
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic system:(BOOL)isSystem
+{
     self = [super init];
-    
+
     if (self)
     {
-        _name = aName;
         _size = aSize;
+        _ascender = 0;
+        _descender = 0;
+        _lineHeight = 0;
         _isBold = isBold;
-        
-        _cssString = _CPCreateCSSString(_name, _size, _isBold);
-        
-        _CPFonts[_cssString] = self;
+        _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;
+        }
     }
-    
+
     return self;
 }
 
 /*!
-    Returns the font size (in points)
+    Returns the distance of the longest ascender's top y-coordinate from the baseline (in CSS px)
+*/
+- (float)ascender
+{
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+
+    if (!font._ascender)
+        [font _getMetrics];
+
+    return font._ascender;
+}
+
+/*!
+    Returns the bottom y coordinate (in CSS px), offset from the baseline, of the receiver's longest descender.
+    Thus, if the longest descender extends 2 px below the baseline, descender will return –2.
+*/
+- (float)descender
+{
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+
+    if (!font._descender)
+        [font _getMetrics];
+
+    return font._descender;
+}
+
+/*!
+    Returns the default line height.
+
+    NOTE: This was moved from NSFont to NSLayoutManager in Cocoa, but since there is no CPLayoutManager, it has been kept here.
+*/
+- (float)defaultLineHeightForFont
+{
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+
+    if (!font._lineHeight)
+        [font _getMetrics];
+
+    return font._lineHeight;
+}
+
+/*!
+    Returns the font size (in CSS px)
 */
 - (float)size
 {
-    return _size;
+    return _CPRealFontSize(_size);
 }
 
 /*!
@@ -119,7 +384,9 @@ var _CPFonts                = {},
 */
 - (CPString)cssString
 {
-    return _cssString;
+    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+
+    return font._cssString;
 }
 
 /*!
@@ -127,24 +394,48 @@ var _CPFonts                = {},
 */
 - (CPString)familyName
 {
+    if (_isSystem)
+        return _CPFontSystemFontFace;
+
     return _name;
 }
 
+- (BOOL)isSystemSize
+{
+    return _size <= 0;
+}
+
 - (BOOL)isEqual:(id)anObject
 {
-    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === [self cssString];
+    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
 }
 
 - (CPString)description
 {
-    return [CPString stringWithFormat:@"%@ %@ %f pt.", [super description], [self familyName], [self size]];
+    return [CPString stringWithFormat:@"%@ %@", [super description], [self cssString]];
+}
+
+- (id)copy
+{
+    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
+}
+
+- (void)_getMetrics
+{
+    var metrics = [CPString metricsOfFont:self];
+
+    _ascender = [metrics objectForKey:@"ascender"];
+    _descender = [metrics objectForKey:@"descender"];
+    _lineHeight = [metrics objectForKey:@"lineHeight"];
 }
 
 @end
 
-var CPFontNameKey   = @"CPFontNameKey",
-    CPFontSizeKey   = @"CPFontSizeKey",
-    CPFontIsBoldKey = @"CPFontIsBoldKey";
+var CPFontNameKey     = @"CPFontNameKey",
+    CPFontSizeKey     = @"CPFontSizeKey",
+    CPFontIsBoldKey   = @"CPFontIsBoldKey",
+    CPFontIsItalicKey = @"CPFontIsItalicKey",
+    CPFontIsSystemKey = @"CPFontIsSystemKey";
 
 @implementation CPFont (CPCoding)
 
@@ -155,9 +446,13 @@ var CPFontNameKey   = @"CPFontNameKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
-    return [self _initWithName:[aCoder decodeObjectForKey:CPFontNameKey]
-        size:[aCoder decodeFloatForKey:CPFontSizeKey]
-        bold:[aCoder decodeBoolForKey:CPFontIsBoldKey]];
+    var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
+        size = [aCoder decodeFloatForKey:CPFontSizeKey],
+        isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
+        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey],
+        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];
+
+    return [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
 }
 
 /*!
@@ -169,6 +464,51 @@ var CPFontNameKey   = @"CPFontNameKey",
     [aCoder encodeObject:_name forKey:CPFontNameKey];
     [aCoder encodeFloat:_size forKey:CPFontSizeKey];
     [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
+    [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
+    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
 }
 
 @end
+
+
+// aName must be normalized
+var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
+{
+    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";
+
+    return properties + _CPFontConcatNameWithFallback(aName);
+};
+
+var _CPFontConcatNameWithFallback = function(aName)
+{
+    var names = _CPFontNormalizedNameArray(aName),
+        fallbackFaces = _CPFontFallbackFaces.slice(0);
+
+    // Remove the fallback names used in the names passed in
+    for (var i = 0; i < names.length; ++i)
+    {
+        for (var j = 0; j < fallbackFaces.length; ++j)
+        {
+            if (names[i].toLowerCase() === fallbackFaces[j].toLowerCase())
+            {
+                fallbackFaces.splice(j, 1);
+                break;
+            }
+        }
+
+        if (names[i].indexOf(" ") > 0)
+            names[i] = '"' + names[i] + '"';
+    }
+
+    return names.concat(fallbackFaces).join(", ");
+};
+
+var _CPFontNormalizedNameArray = function(aName)
+{
+    var names = aName.split(",");
+
+    for (var i = 0; i < names.length; ++i)
+        names[i] = names[i].replace(_CPFontStripRegExp, "");
+
+    return names;
+};

AppKit/CPFontManager.j

@@ -22,7 +22,22 @@
 
 @import <Foundation/CPObject.j>
 
-@import <AppKit/CPFont.j>
+@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,
@@ -33,7 +48,17 @@ var CPSharedFontManager     = nil,
 */
 @implementation CPFontManager : CPObject
 {
-    CPArray _availableFonts;
+    CPArray         _availableFonts;
+
+    id              _target @accessors(property=target);
+    SEL             _action @accessors(property=action);
+
+    id              _delegate @accessors(property=delegate);
+
+    CPFont          _selectedFont;
+    BOOL            _multiple @accessors(getter=isMultiple, setter=setMultiple:);
+
+    CPDictionary    _activeChange;
 }
 
 // Getting the Shared Font Manager
@@ -45,7 +70,7 @@ var CPSharedFontManager     = nil,
 {
     if (!CPSharedFontManager)
         CPSharedFontManager = [[CPFontManagerFactory alloc] init];
-    
+
     return CPSharedFontManager;
 }
 
@@ -59,13 +84,26 @@ var CPSharedFontManager     = nil,
     CPFontManagerFactory = aClass;
 }
 
+- (id)init
+{
+    if (self = [super init])
+    {
+        _action = @selector(changeFont:);
+    }
+
+    return self;
+}
+
 /*!
     Returns an array of the available fonts
 */
 - (CPArray)availableFonts
 {
     if (!_availableFonts)
-    {   
+    {
+        _availableFonts = [];
+
+#if PLATFORM(DOM)
         _CPFontDetectSpan = document.createElement("span");
         _CPFontDetectSpan.fontSize = "24px";
         _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -74,15 +112,19 @@ var CPSharedFontManager     = nil,
         div.style.top = "-1000px";
         div.appendChild(_CPFontDetectSpan);
         document.getElementsByTagName("body")[0].appendChild(div);
-    
-	   _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
-    
-        _availableFonts = [];
-        for (var i = 0; i < _CPFontDetectAllFonts.length; i++) {
+
+        _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
+
+        for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
+        {
             var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
-		    if (available)
+            if (available)
                 _availableFonts.push(_CPFontDetectAllFonts[i]);
         }
+#else
+        // If there's no font detection, just assume all fonts are available.
+        _availableFonts = _CPFontDetectAllFonts;
+#endif
     }
     return _availableFonts;
 }
@@ -96,79 +138,165 @@ 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",*/ 
-        "American Typewriter", 
-        /* "Andale Mono","Andale Mono IPA","Andy", */
-        "Apple Chancery","Arial","Arial Black","Arial Narrow","Arial Rounded MT Bold","Arial Unicode MS",
-        /* "Avant Garde","Avantgarde","Baby Kruffy","Base 02","Baskerville","Baskerville Old Face","Bauhaus 93","Beesknees ITC","Bell MT","Berlin Sans FB","Berlin Sans FB Demi","Bernard MT Condensed","Bickley Script",*/
-        "Big Caslon","Bitstream Vera Sans","Bitstream Vera Sans Mono","Bitstream Vera Serif",
-        /* "Blackadder ITC","Blackletter686 BT","Bodoni MT","Bodoni MT Black","Bodoni MT Condensed","Bodoni MT Poster Compressed","Book Antiqua","Bookman","Bookman Old Style","Bradley Hand ITC","Braggadocio","Britannic Bold","Broadway","Broadway BT",*/
+        /* "04b_21", "A Charming Font", "Abadi MT Condensed", "Abadi MT Condensed Extra Bold", "Abadi MT Condensed Light", "Academy Engraved LET", "Agency FB", "Alba", "Alba Matter", "Alba Super", "Algerian",*/
+        "American Typewriter",
+        /* "Andale Mono", "Andale Mono IPA", "Andy", */
+        "Apple Chancery", "Arial", "Arial Black", "Arial Narrow", "Arial Rounded MT Bold", "Arial Unicode MS",
+        /* "Avant Garde", "Avantgarde", "Baby Kruffy", "Base 02", "Baskerville", "Baskerville Old Face", "Bauhaus 93", "Beesknees ITC", "Bell MT", "Berlin Sans FB", "Berlin Sans FB Demi", "Bernard MT Condensed", "Bickley Script",*/
+        "Big Caslon", "Bitstream Vera Sans", "Bitstream Vera Sans Mono", "Bitstream Vera Serif",
+        /* "Blackadder ITC", "Blackletter686 BT", "Bodoni MT", "Bodoni MT Black", "Bodoni MT Condensed", "Bodoni MT Poster Compressed", "Book Antiqua", "Bookman", "Bookman Old Style", "Bradley Hand ITC", "Braggadocio", "Britannic Bold", "Broadway", "Broadway BT",*/
         "Brush Script MT",
-        /* "BudHand","CAMPBELL","Calibri","Californian FB","Calisto MT","Calligraph421 BT",*/
+        /* "BudHand", "CAMPBELL", "Calibri", "Californian FB", "Calisto MT", "Calligraph421 BT",*/
         "Cambria",
-        /* "Candara","Capitals",*/
-        "Caslon","Castellar","Cataneo BT","Centaur","Century Gothic","Century Schoolbook","Century Schoolbook L",
-        /* "Champignon","Charcoal","Charter","Charter BT","Chicago","Chick","Chiller","ClearlyU","Colonna MT",*/
-        "Comic Sans", "Comic Sans MS","Consolas","Constantia","Cooper Black","Copperplate","Copperplate Gothic Bold","Copperplate Gothic Light","Corbel","Courier","Courier New",
-        /* "Croobie","Curlz MT","Desdemona","Didot","DomBold BT","Edwardian Script ITC","Engravers MT","Eras Bold ITC","Eras Demi ITC","Eras Light ITC","Eras Medium ITC","Eurostile","FIRSTHOME","Fat","Felix Titling","Fine Hand","Fixed","Footlight MT Light","Forte","Franklin Gothic Book","Franklin Gothic Demi","Franklin Gothic Demi Cond","Franklin Gothic Heavy","Franklin Gothic Medium","Franklin Gothic Medium Cond","Freestyle Script","French Script MT","Freshbot","Frosty",*/
+        /* "Candara", "Capitals",*/
+        "Caslon", "Castellar", "Cataneo BT", "Centaur", "Century Gothic", "Century Schoolbook", "Century Schoolbook L",
+        /* "Champignon", "Charcoal", "Charter", "Charter BT", "Chicago", "Chick", "Chiller", "ClearlyU", "Colonna MT",*/
+        "Comic Sans", "Comic Sans MS", "Consolas", "Constantia", "Cooper Black", "Copperplate", "Copperplate Gothic Bold", "Copperplate Gothic Light", "Corbel", "Courier", "Courier New",
+        /* "Croobie", "Curlz MT", "Desdemona", "Didot", "DomBold BT", "Edwardian Script ITC", "Engravers MT", "Eras Bold ITC", "Eras Demi ITC", "Eras Light ITC", "Eras Medium ITC", "Eurostile", "FIRSTHOME", "Fat", "Felix Titling", "Fine Hand", "Fixed", "Footlight MT Light", "Forte", "Franklin Gothic Book", "Franklin Gothic Demi", "Franklin Gothic Demi Cond", "Franklin Gothic Heavy", "Franklin Gothic Medium", "Franklin Gothic Medium Cond", "Freestyle Script", "French Script MT", "Freshbot", "Frosty",*/
         "Futura",
-        /* "GENUINE","Gadget","Garamond",*/
-        "Geneva","Georgia","Georgia Ref", "Geeza Pro", "Gigi","Gill Sans","Gill Sans MT","Gill Sans MT Condensed","Gill Sans MT Ext Condensed Bold","Gill Sans Ultra Bold","Gill Sans Ultra Bold Condensed",
-        /* "GlooGun","Gloucester MT Extra Condensed","Goudy Old Style","Goudy Stout","Haettenschweiler","Harlow Solid Italic","Harrington",*/
-        "Helvetica","Helvetica Narrow","Helvetica Neue","Herculanum","High Tower Text","Highlight LET","Hoefler Text","Impact","Imprint MT Shadow",
-        /* "Informal Roman","Jenkins v2.0","John Handy LET","Jokerman","Jokerman LET","Jokewood","Juice ITC","Kabel Ult BT","Kartika","Kino MT","Kristen ITC","Kunstler Script","La Bamba LET", */
-        "Lucida","Lucida Bright","Lucida Calligraphy","Lucida Console","Lucida Fax","Lucida Grande","Lucida Handwriting","Lucida Sans","Lucida Sans Typewriter","Lucida Sans Unicode", 
-        /* "Luxi Mono","Luxi Sans","Luxi Serif","MARKETPRO","MS Reference Sans Serif","MS Reference Serif","Magneto","Maiandra GD", */ 
+        /* "GENUINE", "Gadget", "Garamond",*/
+        "Geneva", "Georgia", "Georgia Ref", "Geeza Pro", "Gigi", "Gill Sans", "Gill Sans MT", "Gill Sans MT Condensed", "Gill Sans MT Ext Condensed Bold", "Gill Sans Ultra Bold", "Gill Sans Ultra Bold Condensed",
+        /* "GlooGun", "Gloucester MT Extra Condensed", "Goudy Old Style", "Goudy Stout", "Haettenschweiler", "Harlow Solid Italic", "Harrington",*/
+        "Helvetica", "Helvetica Narrow", "Helvetica Neue", "Herculanum", "High Tower Text", "Highlight LET", "Hoefler Text", "Impact", "Imprint MT Shadow",
+        /* "Informal Roman", "Jenkins v2.0", "John Handy LET", "Jokerman", "Jokerman LET", "Jokewood", "Juice ITC", "Kabel Ult BT", "Kartika", "Kino MT", "Kristen ITC", "Kunstler Script", "La Bamba LET", */
+        "Lucida", "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "Lucida Grande", "Lucida Handwriting", "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
+        /* "Luxi Mono", "Luxi Sans", "Luxi Serif", "MARKETPRO", "MS Reference Sans Serif", "MS Reference Serif", "Magneto", "Maiandra GD", */
         "Marker Felt",
-        /* "Matisse ITC","Matura MT Script Capitals","Mead Bold","Mekanik LET","Mercurius Script MT Bold", */
-        "Microsoft Sans Serif","Milano LET","Minion Web","MisterEarl BT","Mistral","Monaco","Monotype Corsiva","Monotype.com","New Century Schoolbook","New York","News Gothic MT",
-        /* "Niagara Engraved","Niagara Solid","Nimbus Mono L","Nimbus Roman No9 L","OCR A Extended","OCRB","Odessa LET","Old English Text MT","OldDreadfulNo7 BT","One Stroke Script LET","Onyx","Optima","Orange LET","Palace Script MT","Palatino","Palatino Linotype", */
+        /* "Matisse ITC", "Matura MT Script Capitals", "Mead Bold", "Mekanik LET", "Mercurius Script MT Bold", */
+        "Microsoft Sans Serif", "Milano LET", "Minion Web", "MisterEarl BT", "Mistral", "Monaco", "Monotype Corsiva", "Monotype.com", "New Century Schoolbook", "New York", "News Gothic MT",
+        /* "Niagara Engraved", "Niagara Solid", "Nimbus Mono L", "Nimbus Roman No9 L", "OCR A Extended", "OCRB", "Odessa LET", "Old English Text MT", "OldDreadfulNo7 BT", "One Stroke Script LET", "Onyx", "Optima", "Orange LET", "Palace Script MT", "Palatino", "Palatino Linotype", */
         "Papyrus",
-        /* "ParkAvenue BT","Pepita MT","Perpetua","Perpetua Titling MT","Placard Condensed","Playbill","Poornut","Pristina","Pump Demi Bold LET","Pussycat","Quixley LET","Rage Italic","Rage Italic LET","Ravie","Rockwell","Rockwell Condensed","Rockwell Extra Bold","Ruach LET","Runic MT Condensed","Sand","Script MT Bold","Scruff LET","Segoe UI","Showcard Gothic","Skia","Smudger LET","Snap ITC","Square721 BT","Staccato222 BT","Stencil","Sylfaen", */
-        "Tahoma","Techno","Tempus Sans ITC","Terminal","Textile","Times","Times New Roman","Tiranti Solid LET","Trebuchet MS",
-        /* "Tw Cen MT","Tw Cen MT Condensed","Tw Cen MT Condensed Extra Bold","URW Antiqua T","URW Bookman L","URW Chancery L","URW Gothic L","URW Palladio L","Univers","University Roman LET","Utopia", */
-        "Verdana","Verdana Ref", /* "Victorian LET","Viner Hand ITC","Vivaldi","Vladimir Script","Vrinda","Weltron Urban","Westwood LET","Wide Latin","Zapf Chancery", */
+        /* "ParkAvenue BT", "Pepita MT", "Perpetua", "Perpetua Titling MT", "Placard Condensed", "Playbill", "Poornut", "Pristina", "Pump Demi Bold LET", "Pussycat", "Quixley LET", "Rage Italic", "Rage Italic LET", "Ravie", "Rockwell", "Rockwell Condensed", "Rockwell Extra Bold", "Ruach LET", "Runic MT Condensed", "Sand", "Script MT Bold", "Scruff LET", "Segoe UI", "Showcard Gothic", "Skia", "Smudger LET", "Snap ITC", "Square721 BT", "Staccato222 BT", "Stencil", "Sylfaen", */
+        "Tahoma", "Techno", "Tempus Sans ITC", "Terminal", "Textile", "Times", "Times New Roman", "Tiranti Solid LET", "Trebuchet MS",
+        /* "Tw Cen MT", "Tw Cen MT Condensed", "Tw Cen MT Condensed Extra Bold", "URW Antiqua T", "URW Bookman L", "URW Chancery L", "URW Gothic L", "URW Palladio L", "Univers", "University Roman LET", "Utopia", */
+        "Verdana", "Verdana Ref", /* "Victorian LET", "Viner Hand ITC", "Vivaldi", "Vladimir Script", "Vrinda", "Weltron Urban", "Westwood LET", "Wide Latin", "Zapf Chancery", */
         "Zapfino"];
 
 // Compare against the reference fonts. Return true if it produces a different size than at least one of them.
-var _CPFontDetectFontAvailable = function(font) {
-	for (var i = 0; i < _CPFontDetectReferenceFonts.length; i++)
-		if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
-			return true;
-	return false;
-}
+var _CPFontDetectFontAvailable = function(font)
+{
+    for (var i = 0; i < _CPFontDetectReferenceFonts.length; i++)
+        if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
+            return true;
+    return false;
+};
 
 var _CPFontDetectCache = {};
 
 // Compares two given fonts. Returns true if they produce different sizes (i.e. fontA didn't fallback to fontB)
-var _CPFontDetectCompareFonts = function(fontA, fontB) {
+var _CPFontDetectCompareFonts = function(fontA, fontB)
+{
     var a;
-    if (_CPFontDetectCache[fontA]) {
+    if (_CPFontDetectCache[fontA])
         a = _CPFontDetectCache[fontA];
-    } else {
-    	_CPFontDetectSpan.style.fontFamily = '"' + fontA + '"';
+
+    else
+    {
+        _CPFontDetectSpan.style.fontFamily = '"' + fontA + '"';
         _CPFontDetectCache[fontA] = a = { w: _CPFontDetectSpan.offsetWidth, h: _CPFontDetectSpan.offsetHeight };
     }
-	
-	_CPFontDetectSpan.style.fontFamily= '"' + fontB + '", "' + fontA + '"';
-	var bWidth = _CPFontDetectSpan.offsetWidth;
-	var bHeight = _CPFontDetectSpan.offsetHeight;
-	
-	return (a.w != bWidth || a.h != bHeight);
-}
+
+    _CPFontDetectSpan.style.fontFamily = '"' + fontB + '", "' + fontA + '"';
+    var bWidth = _CPFontDetectSpan.offsetWidth,
+        bHeight = _CPFontDetectSpan.offsetHeight;
+
+    return (a.w != bWidth || a.h != bHeight);
+};
 
 // Test the candidate fonts pairwise until we find two that are different. Otherwise return the first.
-var _CPFontDetectPickTwoDifferentFonts = function(candidates) {
-	for (var i = 0; i < candidates.length; i++)
-		for (var j = 0; j < i; j++)
-			if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
-				return [candidates[i], candidates[j]];
-	return [candidates[0]];
-}
+var _CPFontDetectPickTwoDifferentFonts = function(candidates)
+{
+    for (var i = 0; i < candidates.length; i++)
+        for (var j = 0; j < i; j++)
+            if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
+                return [candidates[i], candidates[j]];
+    return [candidates[0]];
+};
 
 [CPFontManager setFontManagerFactory:[CPFontManager class]];

AppKit/CPGradient.j

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

@@ -0,0 +1,121 @@
+/*
+ * CPGraphics.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2010, 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 "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,
+   /* CGRect */ clipRect,
+   /* CPRectEdge[] */ sides,
+   /* float[] */ grays)
+{
+    if (sides.length != grays.length)
+        [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and grays (length: " + grays.length + ") must have the same length."];
+
+    var colors = [];
+
+    for (var i = 0; i < grays.length; ++i)
+        colors.push([CPColor colorWithCalibratedWhite:grays[i] alpha:1.0]);
+
+    return CPDrawColorTiledRects(boundsRect, clipRect, sides, colors);
+}
+
+function CPDrawColorTiledRects(
+   /* CGRect */ boundsRect,
+   /* CGRect */ clipRect,
+   /* CPRectEdge[] */ sides,
+   /* CPColor[] */ colors)
+{
+    if (sides.length != colors.length)
+        [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and colors (length: " + colors.length + ") must have the same length."];
+
+    var resultRect = _CGRectMakeCopy(boundsRect),
+        slice = _CGRectMakeZero(),
+        remainder = _CGRectMakeZero(),
+        context = [[CPGraphicsContext currentContext] graphicsPort];
+
+    CGContextSaveGState(context);
+    CGContextSetLineWidth(context, 1.0);
+
+    for (var sideIndex = 0; sideIndex < sides.length; ++sideIndex)
+    {
+        var side = sides[sideIndex];
+
+        CGRectDivide(resultRect, slice, remainder, 1.0, side);
+        resultRect = remainder;
+        slice = CGRectIntersection(slice, clipRect);
+
+        // Cocoa docs say that only slices that are within the clipRect are actually drawn
+        if (_CGRectIsEmpty(slice))
+            continue;
+
+        var minX,
+            maxX,
+            minY,
+            maxY;
+
+        if (side == CPMinXEdge || side == CPMaxXEdge)
+        {
+            // Make sure we have at least 1 pixel to draw a line
+            if (_CGRectGetWidth(slice) < 1.0)
+                continue;
+
+            minX = _CGRectGetMinX(slice) + 0.5;
+            maxX = minX;
+            minY = _CGRectGetMinY(slice);
+            maxY = _CGRectGetMaxY(slice);
+        }
+        else // CPMinYEdge || CPMaxYEdge
+        {
+            // Make sure we have at least 1 pixel to draw a line
+            if (_CGRectGetHeight(slice) < 1.0)
+                continue;
+
+            minX = _CGRectGetMinX(slice);
+            maxX = _CGRectGetMaxX(slice);
+            minY = _CGRectGetMinY(slice) + 0.5;
+            maxY = minY;
+        }
+
+        CGContextBeginPath(context);
+        CGContextMoveToPoint(context, minX, minY);
+        CGContextAddLineToPoint(context, maxX, maxY);
+        CGContextSetStrokeColor(context, colors[sideIndex]);
+        CGContextStrokePath(context);
+    }
+
+    CGContextRestoreGState(context);
+
+    return resultRect;
+}

AppKit/CPGraphicsContext.j

@@ -20,7 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-var CPGraphicsContextCurrent    = nil;
+@import <Foundation/CPObject.j>
+
+@import "CGContext.j"
+
+
+var CPGraphicsContextCurrent = nil,
+    CPGraphicsContextThreadStack = nil;
 
 /*!
     @ingroup appkit
@@ -28,7 +34,7 @@ var CPGraphicsContextCurrent    = nil;
 */
 @implementation CPGraphicsContext : CPObject
 {
-    CPContext   _graphicsPort;
+    CGContext   _graphicsPort;
 }
 
 /*!
@@ -47,6 +53,29 @@ var CPGraphicsContextCurrent    = nil;
     CPGraphicsContextCurrent = aGraphicsContext;
 }
 
++ (void)saveGraphicsState
+{
+    if (!CPGraphicsContextCurrent)
+        return;
+
+    if (!CPGraphicsContextThreadStack)
+        CPGraphicsContextThreadStack = [CPMutableArray array];
+
+    [CPGraphicsContextThreadStack addObject:CPGraphicsContextCurrent];
+    [CPGraphicsContextCurrent saveGraphicsState];
+}
+
++ (void)restoreGraphicsState
+{
+    var lastContext = [CPGraphicsContextThreadStack lastObject];
+
+    if (lastContext)
+    {
+        [lastContext restoreGraphicsState];
+        [CPGraphicsContextThreadStack removeLastObject];
+    }
+}
+
 /*!
     Creates a graphics context with a provided port.
     @param aContext the context to initialize with
@@ -66,10 +95,10 @@ var CPGraphicsContextCurrent    = nil;
 - (id)initWithGraphicsPort:(CPContext)aGraphicsPort
 {
     self = [super init];
-    
+
     if (self)
         _graphicsPort = aGraphicsPort;
-    
+
     return self;
 }
 
@@ -81,4 +110,27 @@ var CPGraphicsContextCurrent    = nil;
     return _graphicsPort;
 }
 
+/*!
+    (Not implemented. Always returns Cappuccino's default, `YES`.)
+
+    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
+    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
+
+    Note: Cappuccino is flipped by default.
+*/
+- (BOOL)isFlipped
+{
+    return YES;
+}
+
+- (void)saveGraphicsState
+{
+    CGContextSaveGState(_graphicsPort);
+}
+
+- (void)restoreGraphicsState
+{
+    CGContextRestoreGState(_graphicsPort);
+}
+
 @end

AppKit/CPImage.j

@@ -25,11 +25,10 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 @import <Foundation/CPString.j>
+@import <Foundation/CPData.j>
 
-@import "CPGeometry.j"
-
-#include "Platform/Platform.h"
-
+@import "CGGeometry.j"
+@import "CPCompatibility.j"
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -46,20 +45,50 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
 
 var imagesForNames = { },
-    AppKitImageForNames = { };
+    AppKitImageForNames = { },
+    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
 
-AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
-AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanel]              = _CGSizeMake(26.0, 29.0);
+AppKitImageForNames[CPImageNameColorPanelHighlighted]   = _CGSizeMake(26.0, 29.0);
 
-function CPImageInBundle(aFilename, aSize, aBundle)
+/*!
+    Returns a resource image with a relative path and size
+    in a bundle.
+
+    @param filename A filename or relative path to a resource image.
+    @param width    Width of the image. May be omitted.
+    @param height   Height of the image. May be omitted if width is omitted.
+    @param size     Instead of passing width/height, a CGSize may be passed.
+    @param bundle   Bundle in which the image resource can be found.
+                    If omitted, defaults to the main bundle.
+    @return CPImage
+*/
+function CPImageInBundle()
 {
-    if (!aBundle)
-        aBundle = [CPBundle mainBundle];
+    var filename = arguments[0],
+        size = nil,
+        bundle = nil;
 
-    if (aSize)
-        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
+    if (typeof(arguments[1]) === "number")
+    {
+        if (arguments[1] !== nil && arguments[1] !== undefined)
+            size = _CGSizeMake(arguments[1], arguments[2]);
 
-    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
+        bundle = arguments[3];
+    }
+    else if (typeof(arguments[1]) === "object")
+    {
+        size = arguments[1];
+        bundle = arguments[2];
+    }
+
+    if (!bundle)
+        bundle = [CPBundle mainBundle];
+
+    if (size)
+        return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename] size:size];
+
+    return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename]];
 }
 
 function CPAppKitImage(aFilename, aSize)
@@ -67,7 +96,7 @@ function CPAppKitImage(aFilename, aSize)
     return CPImageInBundle(aFilename, aSize, [CPBundle bundleForClass:[CPView class]]);
 }
 
-/*! 
+/*!
     @ingroup appkit
     @class CPImage
 
@@ -75,7 +104,7 @@ function CPAppKitImage(aFilename, aSize)
     all image types supported by the browser.
 
     @par Delegate Methods
-    
+
     @delegate -(void)imageDidLoad:(CPImage)image;
     Called when the specified image has finished loading.
     @param image the image that loaded
@@ -102,7 +131,7 @@ function CPAppKitImage(aFilename, aSize)
 
 - (id)init
 {
-    return [self initByReferencingFile:@"" size:CGSizeMake(-1, -1)];
+    return [self initByReferencingFile:@"" size:_CGSizeMake(-1, -1)];
 }
 
 /*!
@@ -119,7 +148,7 @@ function CPAppKitImage(aFilename, aSize)
 
     if (self)
     {
-        _size = CPSizeCreateCopy(aSize);
+        _size = _CGSizeMakeCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
@@ -151,7 +180,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];
@@ -159,6 +188,20 @@ function CPAppKitImage(aFilename, aSize)
     return self;
 }
 
+/*!
+    Initializes the receiver with the specified data. The method loads the data into memory.
+    @param someData the CPData object representing the image
+    @return the initialized image
+*/
+- (id)initWithData:(CPData)someData
+{
+    var base64 = [someData base64],
+        type = [base64 hasPrefix:@"/9j/4AAQSkZJRgABAQEASABIAAD/"] ? @"jpg" : @"png",
+        dataURL = "data:image/" + type + ";base64," + base64;
+
+    return [self initWithContentsOfFile:dataURL];
+}
+
 /*!
     Returns the path of the file associated with this image.
 */
@@ -167,13 +210,44 @@ 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);
 }
 
 /*!
@@ -193,6 +267,9 @@ function CPAppKitImage(aFilename, aSize)
 
     var imageOrSize = AppKitImageForNames[aName];
 
+    if (!imageOrSize)
+        return nil;
+
     if (!imageOrSize.isa)
     {
         imageOrSize = CPAppKitImage("CPImage/" + aName + ".png", imageOrSize);
@@ -205,17 +282,19 @@ function CPAppKitImage(aFilename, aSize)
     return imageOrSize;
 }
 
-- (void)setName:(CPString)aName
+- (BOOL)setName:(CPString)aName
 {
     if (_name === aName)
-        return;
+        return YES;
 
-    if (imagesForNames[aName] === self)
-        imagesForNames[aName] = nil;
+    if (imagesForNames[aName])
+        return NO;
 
     _name = aName;
 
     imagesForNames[aName] = self;
+
+    return YES;
 }
 
 - (CPString)name
@@ -223,6 +302,14 @@ function CPAppKitImage(aFilename, aSize)
     return _name;
 }
 
+/*!
+    Returns the underlying Image element for a single image.
+*/
+- (Image)image
+{
+    return _image;
+}
+
 /*!
     Sets the receiver's delegate.
     @param the delegate
@@ -277,7 +364,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        }
+        };
 
     _image.onerror = function ()
         {
@@ -289,7 +376,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        }
+        };
 
     _image.onabort = function ()
         {
@@ -301,7 +388,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        }
+        };
 
     _image.src = _filename;
 
@@ -311,6 +398,11 @@ function CPAppKitImage(aFilename, aSize)
 #endif
 }
 
+- (BOOL)isSingleImage
+{
+    return YES;
+}
+
 - (BOOL)isThreePartImage
 {
     return NO;
@@ -321,6 +413,24 @@ function CPAppKitImage(aFilename, aSize)
     return NO;
 }
 
+- (CPString)description
+{
+    var filename = [self filename],
+        size = [self size];
+
+    if (filename.indexOf("data:") === 0)
+    {
+        var index = filename.indexOf(",");
+
+        if (index > 0)
+            filename = [CPString stringWithFormat:@"%s,%s...%s", filename.substr(0, index), filename.substr(index + 1, 10), filename.substr(filename.length - 10)];
+        else
+            filename = "data:<unknown type>";
+    }
+
+    return [CPString stringWithFormat:ImageDescriptionFormat, [super description], filename, size.width, size.height];
+}
+
 /* @ignore */
 - (void)_derefFromImage
 {
@@ -336,7 +446,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
@@ -424,6 +534,11 @@ function CPAppKitImage(aFilename, aSize)
     return _isVertical;
 }
 
+- (BOOL)isSingleImage
+{
+    return NO;
+}
+
 - (BOOL)isThreePartImage
 {
     return YES;
@@ -488,6 +603,11 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
     return _imageSlices;
 }
 
+- (BOOL)isSingleImage
+{
+    return NO;
+}
+
 - (BOOL)isThreePartImage
 {
     return NO;

AppKit/CPImageView.j

@@ -26,25 +26,22 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
-#include "Platform/Platform.h"
-#include "Platform/DOM/CPDOMDisplayServer.h"
+@global CPImagesPboardType
+@global appkit_tag_dom_elements
 
-#include "CoreGraphics/CGGeometry.h"
+CPImageAlignCenter      = 0;
+CPImageAlignTop         = 1;
+CPImageAlignTopLeft     = 2;
+CPImageAlignTopRight    = 3;
+CPImageAlignLeft        = 4;
+CPImageAlignBottom      = 5;
+CPImageAlignBottomLeft  = 6;
+CPImageAlignBottomRight = 7;
+CPImageAlignRight       = 8;
 
-CPScaleProportionally   = 0;
-CPScaleToFit            = 1;
-CPScaleNone             = 2;
+var CPImageViewEmptyPlaceholderImage = nil;
 
-var CPImageViewShadowBackgroundColor = 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
     @class CPImageView
 
@@ -52,20 +49,41 @@ var LEFT_SHADOW_INSET       = 3.0,
 */
 @implementation CPImageView : CPControl
 {
-    DOMElement      _DOMImageElement;
-    
-    BOOL            _hasShadow;
-    CPView          _shadowView;
+    DOMElement          _DOMImageElement;
 
-    BOOL            _isEditable;
+    BOOL                _hasShadow;
+    CPView              _shadowView;
 
-    CGRect          _imageRect;
+    BOOL                _isEditable;
+
+    CGRect              _imageRect;
+    CPImageAlignment    _imageAlignment;
+}
+
++ (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];
-    
+
     if (self)
     {
 #if PLATFORM(DOM)
@@ -81,11 +99,11 @@ var LEFT_SHADOW_INSET       = 3.0,
         }
 
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-        
+
         _DOMImageElement.style.visibility = "hidden";
 #endif
     }
-    
+
     return self;
 }
 
@@ -106,29 +124,29 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)setObjectValue:(CPImage)anImage
 {
     var oldImage = [self objectValue];
-    
+
     if (oldImage === anImage)
         return;
-        
+
     [super setObjectValue:anImage];
-    
+
     var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
     if (oldImage)
         [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage];
 
     var newImage = [self objectValue];
-    
+
 #if PLATFORM(DOM)
-    _DOMImageElement.src = newImage ? [newImage filename] : "";
+    _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
 #endif
 
     var size = [newImage size];
-    
+
     if (size && size.width === -1 && size.height === -1)
     {
         [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage];
-        
+
 #if PLATFORM(DOM)
         _DOMImageElement.width = 0;
         _DOMImageElement.height = 0;
@@ -147,7 +165,7 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)imageDidLoad:(CPNotification)aNotification
 {
     [self hideOrDisplayContents];
-    
+
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
@@ -169,28 +187,52 @@ var LEFT_SHADOW_INSET       = 3.0,
 {
     if (_hasShadow == shouldHaveShadow)
         return;
-    
+
     _hasShadow = shouldHaveShadow;
 
     if (_hasShadow)
     {
         _shadowView = [[CPShadowView alloc] initWithFrame:[self bounds]];
-                        
+
         [self addSubview:_shadowView];
-        
+
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }
     else
     {
         [_shadowView removeFromSuperview];
-        
+
         _shadowView = nil;
     }
-    
+
     [self hideOrDisplayContents];
 }
 
+/*!
+    Sets the type of image alignment that should be used to
+    render the image.
+    @param anImageAlignment the type of scaling to use
+*/
+- (void)setImageAlignment:(CPImageAlignment)anImageAlignment
+{
+    if (_imageAlignment == anImageAlignment)
+        return;
+
+    _imageAlignment = anImageAlignment;
+
+    if (![self image])
+        return;
+
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
+}
+
+- (unsigned)imageAlignment
+{
+    return _imageAlignment;
+}
+
 /*!
     Sets the type of image scaling that should be used to
     render the image.
@@ -199,14 +241,14 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)setImageScaling:(CPImageScaling)anImageScaling
 {
     [super setImageScaling:anImageScaling];
-    
+
 #if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
     {
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
     }
 #endif
-    
+
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
@@ -258,68 +300,101 @@ var LEFT_SHADOW_INSET       = 3.0,
         imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
         x = 0.0,
         y = 0.0,
-        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
-        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
+        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
+        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
         boundsWidth = _CGRectGetWidth(bounds),
         boundsHeight = _CGRectGetHeight(bounds),
         width = boundsWidth - insetWidth,
         height = boundsHeight - insetHeight;
 
-    if (imageScaling === CPScaleToFit)
+    if (imageScaling === CPImageScaleAxesIndependently)
     {
-#if PLATFORM(DOM)
-        _DOMImageElement.width = ROUND(width);
-        _DOMImageElement.height = ROUND(height);
-#endif
+        #if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(width);
+            _DOMImageElement.height = ROUND(height);
+        #endif
     }
     else
     {
         var size = [image size];
-        
+
         if (size.width == -1 && size.height == -1)
             return;
 
-        if (imageScaling === CPScaleProportionally)
+        switch (imageScaling)
         {
-            // The max size it can be is size.width x size.height, so only
-            // only proportion otherwise.
-            if (width >= size.width && height >= size.height)
-            {
-                width = size.width;
-                height = size.height;
-            }
-            else
-            {
+            case CPImageScaleProportionallyDown:
+                if (width >= size.width && height >= size.height)
+                {
+                    width = size.width;
+                    height = size.height;
+                    break;
+                }
+
+                // intentionally fall through to the next case
+
+            case CPImageScaleProportionallyUpOrDown:
                 var imageRatio = size.width / size.height,
                     viewRatio = width / height;
-                    
+
                 if (viewRatio > imageRatio)
                     width = height * imageRatio;
                 else
                     height = width / imageRatio;
-            }
+                break;
 
-#if PLATFORM(DOM)
+            case CPImageScaleAxesIndependently:
+            case CPImageScaleNone:
+                width = size.width;
+                height = size.height;
+                break;
+        }
+
+        #if PLATFORM(DOM)
             _DOMImageElement.width = ROUND(width);
             _DOMImageElement.height = ROUND(height);
-#endif
-        }
-        else
+        #endif
+
+        var x,
+            y;
+
+        switch (_imageAlignment)
         {
-            width = size.width;
-            height = size.height;
-        }
-    
-        if (imageScaling == CPScaleNone)
-        {
-#if PLATFORM(DOM)
-            _DOMImageElement.width = ROUND(size.width);
-            _DOMImageElement.height = ROUND(size.height);
-#endif
+            case CPImageAlignLeft:
+            case CPImageAlignTopLeft:
+            case CPImageAlignBottomLeft:
+                x = 0.0;
+                break;
+
+            case CPImageAlignRight:
+            case CPImageAlignTopRight:
+            case CPImageAlignBottomRight:
+                x = boundsWidth - width;
+                break;
+
+            default:
+                x = (boundsWidth - width) / 2.0;
+                break;
         }
 
-        var x = (boundsWidth - width) / 2.0,
-            y = (boundsHeight - height) / 2.0;
+        switch (_imageAlignment)
+        {
+            case CPImageAlignTop:
+            case CPImageAlignTopLeft:
+            case CPImageAlignTopRight:
+                y = 0.0;
+                break;
+
+            case CPImageAlignBottom:
+            case CPImageAlignBottomLeft:
+            case CPImageAlignBottomRight:
+                y = boundsHeight - height;
+                break;
+
+            default:
+                y = (boundsHeight - height) / 2.0;
+                break;
+        }
 
 #if PLATFORM(DOM)
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
@@ -327,9 +402,9 @@ var LEFT_SHADOW_INSET       = 3.0,
     }
 
     _imageRect = _CGRectMake(x, y, width, height);
-    
+
     if (_hasShadow)
-        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -365,7 +440,7 @@ var LEFT_SHADOW_INSET       = 3.0,
     return _isEditable;
 }
 
-- (void)performDragOperation:(CPDraggingInfo)aSender
+- (BOOL)performDragOperation:(CPDraggingInfo)aSender
 {
     var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
 
@@ -374,14 +449,64 @@ var LEFT_SHADOW_INSET       = 3.0,
         [self setImage:images[0]];
         [self sendAction:[self action] to:[self target]];
     }
+
+    return YES;
 }
 
 @end
 
-var CPImageViewImageKey         = @"CPImageViewImageKey",
-    CPImageViewImageScalingKey  = @"CPImageViewImageScalingKey",
-    CPImageViewHasShadowKey     = @"CPImageViewHasShadowKey",
-    CPImageViewIsEditableKey    = @"CPImageViewIsEditableKey";
+@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",
+    CPImageViewHasShadowKey      = @"CPImageViewHasShadowKey",
+    CPImageViewIsEditableKey     = @"CPImageViewIsEditableKey";
 
 @implementation CPImageView (CPCoding)
 
@@ -403,10 +528,13 @@ var CPImageViewImageKey         = @"CPImageViewImageKey",
         _DOMImageElement.setAttribute("draggable", "true");
         _DOMImageElement.style["-khtml-user-drag"] = "element";
     }
+
+    if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
+        _DOMImageElement.setAttribute("data-cappuccino-view", [self className]);
 #endif
 
     self = [super initWithCoder:aCoder];
-    
+
     if (self)
     {
 #if PLATFORM(DOM)
@@ -414,14 +542,15 @@ var CPImageViewImageKey         = @"CPImageViewImageKey",
 #endif
 
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
-        
-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
+        [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
+
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
             [self setEditable:YES];
 
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }
-    
+
     return self;
 }
 
@@ -432,25 +561,44 @@ var CPImageViewImageKey         = @"CPImageViewImageKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // We do this in order to avoid encoding the _shadowView, which 
+    // We do this in order to avoid encoding the _shadowView, which
     // should just automatically be created programmatically as needed.
     if (_shadowView)
     {
         var actualSubviews = _subviews;
-        
+
         _subviews = [_subviews copy];
         [_subviews removeObjectIdenticalTo:_shadowView];
     }
-        
+
     [super encodeWithCoder:aCoder];
-    
+
     if (_shadowView)
         _subviews = actualSubviews;
-    
+
     [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
+    [aCoder encodeInt:_imageAlignment forKey:CPImageViewImageAlignmentKey];
 
     if (_isEditable)
         [aCoder encodeBool:_isEditable forKey:CPImageViewIsEditableKey];
 }
 
 @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

@@ -0,0 +1,265 @@
+/*
+ * CPKeyBinding.j
+ * AppKit
+ *
+ * Created by Nicholas Small.
+ * Copyright 2010, 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/CPArray.j>
+
+@import "CPEvent_Constants.j"
+@import "CPText.j"
+
+CPStandardKeyBindings = {
+    @"@.": @"cancelOperation:",
+
+    @"@a": @"selectAll:",
+    @"^a": @"moveToBeginningOfParagraph:",
+    @"^$a": @"moveToBeginningOfParagraphAndModifySelection:",
+    @"^b": @"moveBackward:",
+    @"^$b": @"moveBackwardAndModifySelection:",
+    @"^~b": @"moveWordBackward:",
+    @"^~$b": @"moveWordBackwardAndModifySelection:",
+    @"^d": @"deleteForward:",
+    @"^e": @"moveToEndOfParagraph:",
+    @"^$e": @"moveToEndOfParagraphAndModifySelection:",
+    @"^f": @"moveForward:",
+    @"^$f": @"moveForwardAndModifySelection:",
+    @"^~f": @"moveWordForward:",
+    @"^~$f": @"moveWordForwardAndModifySelection:",
+    @"^h": @"deleteBackward:",
+    @"^k": @"deleteToEndOfParagraph:",
+    @"^l": @"centerSelectionInVisibleArea:",
+    @"^n": @"moveDown:",
+    @"^$n": @"moveDownAndModifySelection:",
+    @"^o": [@"insertNewlineIgnoringFieldEditor:", @"moveBackward:"],
+    @"^p": @"moveUp:",
+    @"^$p": @"moveUpAndModifySelection:",
+    @"^t": @"transpose:",
+    @"^v": @"pageDown:",
+    @"^$v": @"pageDownAndModifySelection:",
+    @"^y": @"yank:"
+};
+
+CPStandardKeyBindings[CPNewlineCharacter] = @"insertNewline:";
+CPStandardKeyBindings[CPCarriageReturnCharacter] = @"insertNewline:";
+CPStandardKeyBindings[CPEnterCharacter] = @"insertNewline:";
+CPStandardKeyBindings[@"~" + CPNewlineCharacter] = @"insertNewlineIgnoringFieldEditor:";
+CPStandardKeyBindings[@"~" + CPCarriageReturnCharacter] = @"insertNewlineIgnoringFieldEditor:";
+CPStandardKeyBindings[@"~" + CPEnterCharacter] = @"insertNewlineIgnoringFieldEditor:";
+CPStandardKeyBindings[@"^" + CPNewlineCharacter] = @"insertLineBreak:";
+CPStandardKeyBindings[@"^" + CPCarriageReturnCharacter] = @"insertLineBreak:";
+CPStandardKeyBindings[@"^" + CPEnterCharacter] = @"insertLineBreak:";
+
+CPStandardKeyBindings[CPBackspaceCharacter] = @"deleteBackward:";
+CPStandardKeyBindings[@"~" + CPBackspaceCharacter] = @"deleteWordBackward:";
+CPStandardKeyBindings[CPDeleteCharacter] = @"deleteBackward:";
+CPStandardKeyBindings[@"@" + CPDeleteCharacter] = @"deleteToBeginningOfLine:";
+CPStandardKeyBindings[@"~" + CPDeleteCharacter] = @"deleteWordBackward:";
+CPStandardKeyBindings[@"^" + CPDeleteCharacter] = @"deleteBackwardByDecomposingPreviousCharacter:";
+CPStandardKeyBindings[@"^~" + CPDeleteCharacter] = @"deleteWordBackward:";
+
+CPStandardKeyBindings[CPDeleteFunctionKey] = @"deleteForward:";
+CPStandardKeyBindings[@"~" + CPDeleteFunctionKey] = @"deleteWordForward:";
+
+CPStandardKeyBindings[CPTabCharacter] = @"insertTab:";
+CPStandardKeyBindings[@"~" + CPTabCharacter] = @"insertTabIgnoringFieldEditor:";
+CPStandardKeyBindings[@"^" + CPTabCharacter] = @"selectNextKeyView:";
+CPStandardKeyBindings[CPBackTabCharacter] = @"insertBacktab:";
+CPStandardKeyBindings[@"^" + CPBackTabCharacter] = @"selectPreviousKeyView:";
+
+CPStandardKeyBindings[CPEscapeFunctionKey] = @"cancelOperation:";
+CPStandardKeyBindings[@"~" + CPEscapeFunctionKey] = @"complete:";
+CPStandardKeyBindings[CPF5FunctionKey] = @"complete:";
+
+CPStandardKeyBindings[CPLeftArrowFunctionKey] = @"moveLeft:";
+CPStandardKeyBindings[@"~" + CPLeftArrowFunctionKey] = @"moveWordLeft:";
+CPStandardKeyBindings[@"^" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLine:";
+CPStandardKeyBindings[@"@" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLine:";
+CPStandardKeyBindings[@"$" + CPLeftArrowFunctionKey] = @"moveLeftAndModifySelection:";
+CPStandardKeyBindings[@"$~" + CPLeftArrowFunctionKey] = @"moveWordLeftAndModifySelection:";
+CPStandardKeyBindings[@"$^" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLineAndModifySelection:";
+CPStandardKeyBindings[@"$@" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLineAndModifySelection:";
+CPStandardKeyBindings[@"@^" + CPLeftArrowFunctionKey] = @"makeBaseWritingDirectionRightToLeft:";
+CPStandardKeyBindings[@"@^~" + CPLeftArrowFunctionKey] = @"makeTextWritingDirectionRightToLeft:";
+
+CPStandardKeyBindings[CPRightArrowFunctionKey] = @"moveRight:";
+CPStandardKeyBindings[@"~" + CPRightArrowFunctionKey] = @"moveWordRight:";
+CPStandardKeyBindings[@"^" + CPRightArrowFunctionKey] = @"moveToRightEndOfLine:";
+CPStandardKeyBindings[@"@" + CPRightArrowFunctionKey] = @"moveToRightEndOfLine:";
+CPStandardKeyBindings[@"$" + CPRightArrowFunctionKey] = @"moveRightAndModifySelection:";
+CPStandardKeyBindings[@"$~" + CPRightArrowFunctionKey] = @"moveWordRightAndModifySelection:";
+CPStandardKeyBindings[@"$^" + CPRightArrowFunctionKey] = @"moveToRightEndOfLineAndModifySelection:";
+CPStandardKeyBindings[@"$@" + CPRightArrowFunctionKey] = @"moveToRightEndOfLineAndModifySelection:";
+CPStandardKeyBindings[@"@^" + CPRightArrowFunctionKey] = @"makeBaseWritingDirectionLeftToRight:";
+CPStandardKeyBindings[@"@^~" + CPRightArrowFunctionKey] = @"makeTextWritingDirectionLeftToRight:";
+
+CPStandardKeyBindings[CPUpArrowFunctionKey] = @"moveUp:";
+CPStandardKeyBindings[@"~" + CPUpArrowFunctionKey] = [@"moveBackward:", @"moveToBeginningOfParagraph:"];
+CPStandardKeyBindings[@"^" + CPUpArrowFunctionKey] = @"scrollPageUp:";
+CPStandardKeyBindings[@"@" + CPUpArrowFunctionKey] = @"moveToBeginningOfDocument:";
+CPStandardKeyBindings[@"$" + CPUpArrowFunctionKey] = @"moveUpAndModifySelection:";
+CPStandardKeyBindings[@"$~" + CPUpArrowFunctionKey] = @"moveParagraphBackwardAndModifySelection:";
+CPStandardKeyBindings[@"$@" + CPUpArrowFunctionKey] = @"moveToBeginningOfDocumentAndModifySelection:";
+
+CPStandardKeyBindings[CPDownArrowFunctionKey] = @"moveDown:";
+CPStandardKeyBindings[@"~" + CPDownArrowFunctionKey] = [@"moveForward:", @"moveToEndOfParagraph:"];
+CPStandardKeyBindings[@"^" + CPDownArrowFunctionKey] = @"scrollPageDown:";
+CPStandardKeyBindings[@"@" + CPDownArrowFunctionKey] = @"moveToEndOfDocument:";
+CPStandardKeyBindings[@"$" + CPDownArrowFunctionKey] = @"moveDownAndModifySelection:";
+CPStandardKeyBindings[@"$~" + CPDownArrowFunctionKey] = @"moveParagraphForwardAndModifySelection:";
+CPStandardKeyBindings[@"$@" + CPDownArrowFunctionKey] = @"moveToEndOfDocumentAndModifySelection:";
+CPStandardKeyBindings[@"@^" + CPDownArrowFunctionKey] = @"makeBaseWritingDirectionNatural:";
+CPStandardKeyBindings[@"@^~" + CPDownArrowFunctionKey] = @"makeTextWritingDirectionNatural:";
+
+CPStandardKeyBindings[CPHomeFunctionKey] = @"scrollToBeginningOfDocument:";
+CPStandardKeyBindings[@"$" + CPHomeFunctionKey] = @"moveToBeginningOfDocumentAndModifySelection:";
+CPStandardKeyBindings[CPEndFunctionKey] = @"scrollToEndOfDocument:";
+CPStandardKeyBindings[@"$" + CPEndFunctionKey] = @"moveToEndOfDocumentAndModifySelection:";
+
+CPStandardKeyBindings[CPPageUpFunctionKey] = @"scrollPageUp:";
+CPStandardKeyBindings[@"~" + CPPageUpFunctionKey] = @"pageUp:";
+CPStandardKeyBindings[@"$" + CPPageUpFunctionKey] = @"pageUpAndModifySelection:";
+CPStandardKeyBindings[CPPageDownFunctionKey] = @"scrollPageDown:";
+CPStandardKeyBindings[@"~" + CPPageDownFunctionKey] = @"pageDown:";
+CPStandardKeyBindings[@"$" + CPPageDownFunctionKey] = @"pageDownAndModifySelection:";
+
+var CPKeyBindingCache = {};
+
+@implementation CPKeyBinding : CPObject
+{
+    CPString    _key;
+    unsigned    _modifierFlags;
+
+    CPArray     _selectors;
+
+    CPString    _cacheName;
+}
+
++ (void)initialize
+{
+    if (self !== [CPKeyBinding class])
+        return;
+
+    [self createKeyBindingsFromJSObject:CPStandardKeyBindings];
+}
+
++ (void)createKeyBindingsFromJSObject:(JSObject)anObject
+{
+    var binding;
+    for (binding in anObject)
+        [self cacheKeyBinding:[[CPKeyBinding alloc] initWithPhysicalKeyString:binding selectors:anObject[binding]]];
+}
+
++ (void)cacheKeyBinding:(CPKeyBinding)aBinding
+{
+    if (!aBinding)
+        return;
+
+    CPKeyBindingCache[[aBinding _cacheName]] = aBinding;
+}
+
++ (CPKeyBinding)keyBindingForKey:(CPString)aKey modifierFlags:(unsigned)aFlag
+{
+    var tempBinding = [[self alloc] initWithKey:aKey modifierFlags:aFlag selectors:nil];
+    return CPKeyBindingCache[[tempBinding _cacheName]];
+}
+
++ (CPArray)selectorsForKey:(CPString)aKey modifierFlags:(unsigned)aFlag
+{
+    return [[self keyBindingForKey:aKey modifierFlags:aFlag] selectors];
+}
+
+- (id)initWithPhysicalKeyString:(CPString)binding selectors:(CPArray)selectors
+{
+    var components = binding.split(@""),
+        modifierFlags = ([components containsObject:@"$"] ? CPShiftKeyMask : 0) |
+                        ([components containsObject:@"^"] ? CPControlKeyMask : 0) |
+                        ([components containsObject:@"~"] ? CPAlternateKeyMask : 0) |
+                        ([components containsObject:@"@"] ? CPCommandKeyMask : 0);
+
+    if (![selectors isKindOfClass:CPArray])
+        selectors = [selectors];
+
+    return [self initWithKey:[components lastObject] modifierFlags:modifierFlags selectors:selectors];
+}
+
+- (id)initWithKey:(CPString)aKey modifierFlags:(unsigned)aFlag selectors:(CPArray)selectors
+{
+    self = [super init];
+
+    if (self)
+    {
+        _key = aKey;
+        _modifierFlags = aFlag;
+
+        _selectors = selectors;
+
+        // We normalize our key binding string in order to properly cache it.
+        // We want to ensure the modifiers are always in the same order.
+        var cacheName = [];
+
+        if (_modifierFlags & CPCommandKeyMask)
+            cacheName.push(@"@");
+        if (_modifierFlags & CPControlKeyMask)
+            cacheName.push(@"^");
+        if (_modifierFlags & CPAlternateKeyMask)
+            cacheName.push(@"~");
+        if (_modifierFlags & CPShiftKeyMask)
+            cacheName.push(@"$");
+
+        cacheName.push(_key);
+
+        _cacheName = cacheName.join(@"");
+    }
+
+    return self;
+}
+
+- (CPString)key
+{
+    return _key;
+}
+
+- (unsigned)modifierFlags
+{
+    return _modifierFlags;
+}
+
+- (CPArray)selectors
+{
+    return _selectors;
+}
+
+- (CPString)_cacheName
+{
+    return _cacheName;
+}
+
+- (BOOL)isEqual:(CPKeyBinding)rhs
+{
+    return _key === [rhs key] && _modifierFlags === [rhs modifierFlags];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<KeyBinding string: '%@' modifierFlags: 0x%lx selectors: %@>", _key, _modifierFlags, _selectors];
+}
+
+@end

AppKit/CPKeyValueBinding.j

@@ -0,0 +1,911 @@
+/*
+ * CPKeyValueBinding.j
+ * AppKit
+ *
+ * Created by Ross Boucher 1/13/09
+ * Copyright 280 North, Inc.
+ *
+ * Adapted from GNUStep
+ * Released under the LGPL.
+ *
+ * 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/CPArray.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPInvocation.j>
+@import <Foundation/CPValueTransformer.j>
+@import <Foundation/CPKeyValueObserving.j>
+
+@class CPButton
+
+var exposedBindingsMap = @{},
+    bindingsMap = @{};
+
+var CPBindingOperationAnd = 0,
+    CPBindingOperationOr  = 1;
+
+@implementation CPBinder : CPObject
+{
+    CPDictionary    _info;
+    id              _source @accessors(getter=source);
+
+    JSObject        _suppressedNotifications;
+    JSObject        _placeholderForMarker;
+}
+
++ (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
+{
+    var bindings = [exposedBindingsMap objectForKey:[aClass UID]];
+
+    if (!bindings)
+    {
+        bindings = [];
+        [exposedBindingsMap setObject:bindings forKey:[aClass UID]];
+    }
+
+    bindings.push(aBinding);
+}
+
++ (CPArray)exposedBindingsForClass:(Class)aClass
+{
+    return [[exposedBindingsMap objectForKey:[aClass UID]] copy];
+}
+
++ (CPBinder)getBinding:(CPString)aBinding forObject:(id)anObject
+{
+    return [[bindingsMap objectForKey:[anObject UID]] objectForKey:aBinding];
+}
+
++ (CPDictionary)infoForBinding:(CPString)aBinding forObject:(id)anObject
+{
+    var theBinding = [self getBinding:aBinding forObject:anObject];
+
+    if (theBinding)
+        return theBinding._info;
+
+    return nil;
+}
+
++ (CPDictionary)allBindingsForObject:(id)anObject
+{
+    return [bindingsMap objectForKey:[anObject UID]];
+}
+
++ (void)unbind:(CPString)aBinding forObject:(id)anObject
+{
+    var bindings = [bindingsMap objectForKey:[anObject UID]];
+
+    if (!bindings)
+        return;
+
+    var theBinding = [bindings objectForKey:aBinding];
+
+    if (!theBinding)
+        return;
+
+    var info = theBinding._info,
+        observedObject = [info objectForKey:CPObservedObjectKey],
+        keyPath = [info objectForKey:CPObservedKeyPathKey];
+
+    [observedObject removeObserver:theBinding forKeyPath:keyPath];
+    [bindings removeObjectForKey:aBinding];
+}
+
++ (void)unbindAllForObject:(id)anObject
+{
+    var bindings = [bindingsMap objectForKey:[anObject UID]];
+
+    if (!bindings)
+        return;
+
+    var allKeys = [bindings allKeys],
+        count = allKeys.length;
+
+    while (count--)
+        [anObject unbind:[bindings objectForKey:allKeys[count]]];
+
+    [bindingsMap removeObjectForKey:[anObject UID]];
+}
+
+- (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];
+
+    if (self)
+    {
+        _source = aSource;
+        _info = @{
+                CPObservedObjectKey: aDestination,
+                CPObservedKeyPathKey: aKeyPath,
+            };
+        _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 = @{};
+            [bindingsMap setObject:bindings forKey:[_source UID]];
+        }
+
+        [bindings setObject:self forKey:aName];
+        [self setValueFor:aBinding];
+    }
+
+    return self;
+}
+
+- (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
+{
+    if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+    {
+       [CPException raise:CPGenericException
+                   reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + aValue];
+    }
+}
+
+- (void)setValueFor:(CPString)theBinding
+{
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [destination valueForKeyPath:keyPath];
+
+    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];
+}
+
+- (void)reverseSetValueFor:(CPString)aBinding
+{
+    var destination = [_info objectForKey:CPObservedObjectKey],
+        keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        options = [_info objectForKey:CPOptionsKey],
+        newValue = [self valueForBinding:aBinding];
+
+    newValue = [self reverseTransformValue:newValue withOptions:options];
+
+    [self suppressSpecificNotificationFromObject:destination keyPath:keyPath];
+    [destination setValue:newValue forKeyPath:keyPath];
+    [self unsuppressSpecificNotificationFromObject:destination keyPath:keyPath];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source valueForKeyPath:aBinding];
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
+{
+    if (!changes)
+        return;
+
+    var objectSuppressions = _suppressedNotifications[[anObject UID]];
+
+    if (objectSuppressions && objectSuppressions[aKeyPath])
+        return;
+
+    [self setValueFor:context];
+}
+
+- (id)transformValue:(id)aValue withOptions:(CPDictionary)options
+{
+    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
+        valueTransformer;
+
+    if (valueTransformerName)
+    {
+        valueTransformer = [CPValueTransformer valueTransformerForName:valueTransformerName];
+
+        if (!valueTransformer)
+        {
+            var valueTransformerClass = CPClassFromString(valueTransformerName);
+
+            if (valueTransformerClass)
+            {
+                valueTransformer = [[valueTransformerClass alloc] init];
+                [valueTransformerClass setValueTransformer:valueTransformer forName:valueTransformerName];
+            }
+        }
+    }
+    else
+        valueTransformer = [options objectForKey:CPValueTransformerBindingOption];
+
+    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
+{
+    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
+        valueTransformer;
+
+    if (valueTransformerName)
+        valueTransformer = [CPValueTransformer valueTransformerForName:valueTransformerName];
+    else
+        valueTransformer = [options objectForKey:CPValueTransformerBindingOption];
+
+    if (valueTransformer && [[valueTransformer class] allowsReverseTransformation])
+        aValue = [valueTransformer reverseTransformedValue:aValue];
+
+    return aValue;
+}
+
+- (BOOL)continuouslyUpdatesValue
+{
+    var options = [_info objectForKey:CPOptionsKey];
+    return [[options objectForKey:CPContinuouslyUpdatesValueBindingOption] boolValue];
+}
+
+- (BOOL)handlesContentAsCompoundValue
+{
+    var options = [_info objectForKey:CPOptionsKey];
+    return [[options objectForKey:CPHandlesContentAsCompoundValueBindingOption] boolValue];
+}
+
+/*!
+    Use this to avoid reacting to the notifications coming out of a reverseTransformedValue:.
+*/
+- (void)suppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
+{
+    if (!anObject)
+        return;
+
+    var uid = [anObject UID],
+        objectSuppressions = _suppressedNotifications[uid];
+
+    if (!objectSuppressions)
+        _suppressedNotifications[uid] = objectSuppressions = {};
+
+    objectSuppressions[aKeyPath] = YES;
+}
+
+/*!
+    Use this to cancel suppressSpecificNotificationFromObject:keyPath:.
+*/
+- (void)unsuppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
+{
+    if (!anObject)
+        return;
+
+    var uid = [anObject UID],
+        objectSuppressions = _suppressedNotifications[uid];
+
+    if (!objectSuppressions)
+        return;
+
+    delete objectSuppressions[aKeyPath];
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
+{
+    var count = [CPBinderPlaceholderMarkers count];
+
+    while (count--)
+    {
+        var marker = CPBinderPlaceholderMarkers[count],
+            optionName = CPBinderPlaceholderOptions[count],
+            isExplicit = [options containsKey:optionName],
+            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
+
+        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
+    }
+}
+
+- (void)_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)
+
++ (void)exposeBinding:(CPString)aBinding
+{
+    [CPBinder exposeBinding:aBinding forClass:[self class]];
+}
+
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    return [CPBinder class];
+}
+
+- (CPArray)exposedBindings
+{
+    var exposedBindings = [],
+        theClass = [self class];
+
+    while (theClass)
+    {
+        var temp = [CPBinder exposedBindingsForClass:theClass];
+
+        if (temp)
+            [exposedBindings addObjectsFromArray:temp];
+
+        theClass = [theClass superclass];
+    }
+
+    return exposedBindings;
+}
+
+- (Class)valueClassForBinding:(CPString)binding
+{
+    return [CPString class];
+}
+
+- (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);
+
+    //if (![[self exposedBindings] containsObject:aBinding])
+    //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
+
+    var binderClass = [[self class] _binderClassForBinding:aBinding];
+
+    [self unbind:aBinding];
+    [[binderClass alloc] initWithBinding:[self _replacementKeyPathForBinding:aBinding] name:aBinding to:anObject keyPath:aKeyPath options:options from:self];
+}
+
+- (CPDictionary)infoForBinding:(CPString)aBinding
+{
+    return [CPBinder infoForBinding:aBinding forObject:self];
+}
+
+- (void)unbind:(CPString)aBinding
+{
+    var binderClass = [[self class] _binderClassForBinding:aBinding];
+    [binderClass unbind:aBinding forObject:self];
+}
+
+- (CPString)_replacementKeyPathForBinding:(CPString)binding
+{
+    return binding;
+}
+
+@end
+
+/*!
+    @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.
+*/
+@implementation _CPValueBinder : CPBinder
+
+- (void)setValueFor:(CPString)theBinding
+{
+    [super setValueFor:@"objectValue"];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    [super reverseSetValueFor:@"objectValue"];
+}
+
+@end
+
+@implementation _CPMultipleValueBooleanBinding : CPBinder
+{
+    CPBindingOperationKind _operation;
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var bindings = [bindingsMap valueForKey:[_source UID]];
+
+    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
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
+{
+    [self setValueFor:context];
+}
+
+- (BOOL)resolveMultipleValuesForBinding:(CPString)aBinding bindings:(CPDictionary)bindings booleanOperation:(CPBindingOperationKind)operation
+{
+    var bindingName = aBinding,
+        theBinding,
+        count = 2;
+
+    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];
+
+        if (CPIsControllerMarker(value))
+        {
+            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
+            value = [theBinding _placeholderForMarker:value];
+        }
+        else
+            value = [theBinding transformValue:value withOptions:options];
+
+        if (operation === CPBindingOperationOr)
+        {
+            // Any true condition means true for OR
+            if (value)
+                return YES;
+        }
+
+        // Any false condition means false for AND
+        else if (!value)
+            return NO;
+
+        bindingName = aBinding + (count++);
+    }
+
+    // If we get here, all OR conditions were false or all AND conditions were true
+    return operation === CPBindingOperationOr ? NO : YES;
+}
+
+@end
+
+@implementation CPMultipleValueAndBinding : _CPMultipleValueBooleanBinding
+
+- (id)init
+{
+    if (self = [super init])
+        _operation = CPBindingOperationAnd;
+
+    return self;
+}
+
+@end
+
+@implementation CPMultipleValueOrBinding : _CPMultipleValueBooleanBinding
+
+- (id)init
+{
+    if (self = [super init])
+        _operation = CPBindingOperationOr;
+
+    return self;
+}
+
+@end
+
+@implementation _CPMultipleValueActionBinding : CPBinder
+{
+    CPString _argumentBinding;
+    CPString _targetBinding;
+}
+
+- (void)setValueFor:(CPString)theBinding
+{
+    // Called when the binding is first created
+    [self checkForNullBinding:theBinding initializing:YES];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    // no-op
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
+{
+    // context is the binding name
+    [self checkForNullBinding:context initializing:NO];
+}
+
+/*!
+    @ignore
+
+    When the value of a multiple-value argument binding changes,
+    if the binding is marked not to allow null arguments, we have to check
+    if the binding's value is nil and disable the button if it is.
+    Otherwise the button is enabled.
+*/
+- (void)checkForNullBinding:(CPString)theBinding initializing:(BOOL)isInitializing
+{
+    // Only done for buttons
+    if (![_source isKindOfClass:CPButton])
+        return;
+
+    // We start with the button enabled for the first argument during init,
+    // and subsequent checks can disable it.
+    if (isInitializing && theBinding === CPArgumentBinding)
+        [_source setEnabled:YES];
+
+    var bindings = [bindingsMap valueForKey:[_source UID]],
+        binding  = [bindings objectForKey:theBinding],
+        info     = binding._info,
+        options  = [info objectForKey:CPOptionsKey];
+
+    if (![options valueForKey:CPAllowsNullArgumentBindingOption])
+    {
+        var object  = [info objectForKey:CPObservedObjectKey],
+            keyPath = [info objectForKey:CPObservedKeyPathKey],
+            value   = [object valueForKeyPath:keyPath];
+
+        if (value === nil || value === undefined)
+        {
+            [_source setEnabled:NO];
+            return;
+        }
+    }
+
+    // If a binding value changed and did not fail the null test, enable the button
+    if (!isInitializing)
+        [_source setEnabled:YES];
+}
+
+- (void)invokeAction
+{
+    var bindings = [bindingsMap valueForKey:[_source UID]],
+        theBinding = [bindings objectForKey:CPTargetBinding],
+
+        info     = theBinding._info,
+        object   = [info objectForKey:CPObservedObjectKey],
+        keyPath  = [info objectForKey:CPObservedKeyPathKey],
+        options  = [info objectForKey:CPOptionsKey],
+
+        target   = [object valueForKeyPath:keyPath],
+        selector = [options objectForKey:CPSelectorNameBindingOption];
+
+    if (!target || !selector)
+        return;
+
+    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]],
+        bindingName = CPArgumentBinding,
+        count = 1;
+
+    while (theBinding = [bindings objectForKey:bindingName])
+    {
+        info   = theBinding._info;
+        object = [info objectForKey:CPObservedObjectKey];
+        keyPath  = [info objectForKey:CPObservedKeyPathKey];
+
+        [invocation setArgument:[object valueForKeyPath:keyPath] atIndex:++count];
+
+        bindingName = CPArgumentBinding + count;
+    }
+
+    [invocation setSelector:selector];
+    [invocation invokeWithTarget:target];
+}
+
+@end
+
+@implementation CPActionBinding : _CPMultipleValueActionBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _argumentBinding = CPArgumentBinding;
+        _targetBinding = CPTargetBinding;
+    }
+
+    return self;
+}
+
+@end
+
+@implementation CPDoubleClickActionBinding : _CPMultipleValueActionBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _argumentBinding = CPArgumentBinding;
+        _targetBinding = CPTargetBinding;
+    }
+
+    return self;
+}
+
+@end
+
+/*!
+    Abstract superclass for CPValueWithPatternBinding and CPTitleWithPatternBinding.
+*/
+@implementation _CPPatternBinding : CPBinder
+{
+    CPString _bindingKey;
+    CPString _patternPlaceholder;
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var bindings = [bindingsMap valueForKey:[_source UID]];
+
+    if (!bindings)
+        return;
+
+    // Strip off any trailing number from the binding name
+    var baseBinding = aBinding.replace(/\d$/, ""),
+        result = [self resolveMultipleValuesForBindings:bindings];
+
+    if (result.isPlaceholder)
+        [self setPlaceholderValue:result.value withMarker:result.marker forBinding:baseBinding];
+    else
+        [self setValue:result.value forBinding:baseBinding];
+}
+
+- (void)reverseSetValueFor:(CPString)theBinding
+{
+    // read-only
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
+{
+    [self setValueFor:context];
+}
+
+- (JSObject)resolveMultipleValuesForBindings:(CPDictionary)bindings
+{
+    var theBinding,
+        result = { value:@"", isPlaceholder:NO, marker:nil };
+
+    for (var count = 1; theBinding = [bindings objectForKey:_bindingKey + count]; ++count)
+    {
+        var info    = theBinding._info,
+            object  = [info objectForKey:CPObservedObjectKey],
+            keyPath = [info objectForKey:CPObservedKeyPathKey],
+            options = [info objectForKey:CPOptionsKey],
+            value   = [object valueForKeyPath:keyPath];
+
+        if (count === 1)
+            result.value = [options objectForKey:CPDisplayPatternBindingOption];
+
+        if (CPIsControllerMarker(value))
+        {
+            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
+
+            result.isPlaceholder = YES;
+            result.marker = value;
+
+            value = [theBinding _placeholderForMarker:value];
+        }
+        else
+            value = [theBinding transformValue:value withOptions:options];
+
+        if (value === nil || value === undefined)
+            value = @"";
+
+        result.value = result.value.replace("%{" + _patternPlaceholder + count + "}@", [value description]);
+    }
+
+    return result;
+}
+
+@end
+
+
+/*!
+    Users of this class must override setValue:forKey: and if the
+    key is CPDisplayPatternValueBinding, set the appropriate value
+    for the control class. For example, CPTextField uses setObjectValue.
+*/
+@implementation CPValueWithPatternBinding : _CPPatternBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _bindingKey = CPDisplayPatternValueBinding;
+        _patternPlaceholder = @"value";
+    }
+
+    return self;
+}
+
+@end
+
+
+/*!
+    Users of this class must override setValue:forKey: and if the
+    key is CPDisplayPatternTitleBinding, set the appropriate value
+    for the control class. For example, CPBox uses setTitle.
+*/
+@implementation CPTitleWithPatternBinding : _CPPatternBinding
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _bindingKey = CPDisplayPatternTitleBinding;
+        _patternPlaceholder = @"title";
+    }
+
+    return self;
+}
+
+@end
+
+@implementation _CPStateMarker : CPObject
+{
+    CPString _name;
+}
+
+- (id)initWithName:(CPString)aName
+{
+    if (self = [super init])
+        _name = aName
+
+    return self;
+}
+
+- (CPString)description
+{
+    return "<" + _name + ">";
+}
+
+@end
+
+
+// Keys in options dictionary
+
+// Keys in dictionary returned by infoForBinding
+CPObservedObjectKey     = @"CPObservedObjectKey";
+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"];
+
+// 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";
+
+// Binding options constants
+CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
+CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgument";
+CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditable";
+CPConditionallySetsEnabledBindingOption             = @"CPConditionallySetsEnabled";
+CPConditionallySetsHiddenBindingOption              = @"CPConditionallySetsHidden";
+CPContinuouslyUpdatesValueBindingOption             = @"CPContinuouslyUpdatesValue";
+CPCreatesSortDescriptorBindingOption                = @"CPCreatesSortDescriptor";
+CPDeletesObjectsOnRemoveBindingsOption              = @"CPDeletesObjectsOnRemove";
+CPDisplayNameBindingOption                          = @"CPDisplayName";
+CPDisplayPatternBindingOption                       = @"CPDisplayPattern";
+CPHandlesContentAsCompoundValueBindingOption        = @"CPHandlesContentAsCompoundValue";
+CPInsertsNullPlaceholderBindingOption               = @"CPInsertsNullPlaceholder";
+CPInvokesSeparatelyWithArrayObjectsBindingOption    = @"CPInvokesSeparatelyWithArrayObjects";
+CPMultipleValuesPlaceholderBindingOption            = @"CPMultipleValuesPlaceholder";
+CPNoSelectionPlaceholderBindingOption               = @"CPNoSelectionPlaceholder";
+CPNotApplicablePlaceholderBindingOption             = @"CPNotApplicablePlaceholder";
+CPNullPlaceholderBindingOption                      = @"CPNullPlaceholder";
+CPPredicateFormatBindingOption                      = @"CPPredicateFormat";
+CPRaisesForNotApplicableKeysBindingOption           = @"CPRaisesForNotApplicableKeys";
+CPSelectorNameBindingOption                         = @"CPSelectorName";
+CPSelectsAllWhenSettingContentBindingOption         = @"CPSelectsAllWhenSettingContent";
+CPValidatesImmediatelyBindingOption                 = @"CPValidatesImmediately";
+CPValueTransformerNameBindingOption                 = @"CPValueTransformerName";
+CPValueTransformerBindingOption                     = @"CPValueTransformer";
+
+CPIsControllerMarker = function(/*id*/anObject)
+{
+    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
+};
+
+var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
+    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
+

AppKit/CPLevelIndicator.j

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

AppKit/CPMenu/CPMenu.j

@@ -25,15 +25,10 @@
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPString.j>
 
-@import "_CPMenuManager.j"
-@import "CPApplication.j"
-@import "CPClipView.j"
+@import "CPKeyValueBinding.j"
 @import "CPMenuItem.j"
-@import "CPPanel.j"
-
-#include "../CoreGraphics/CGGeometry.h"
-#include "../Platform/Platform.h"
 
+@global CPApp
 
 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -41,21 +36,17 @@ CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";
 
 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";
 
-var MENUBAR_HEIGHT = 28.0;
-
 var _CPMenuBarVisible               = NO,
     _CPMenuBarTitle                 = @"",
-    _CPMenuBarIconImage             = nil,
-    _CPMenuBarIconImageAlphaValue   = 1.0,
     _CPMenuBarAttributes            = nil,
     _CPMenuBarSharedWindow          = nil;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPMenu
 
-    Menus provide the user with a list of actions and/or submenus. Submenus themselves are full fledged menus 
-    and so a heirarchical structure appears.
+    Menus provide the user with a list of actions and/or submenus. Submenus themselves are full fledged menus
+    and so a hierarchical structure appears.
 */
 @implementation CPMenu : CPObject
 {
@@ -69,13 +60,13 @@ var _CPMenuBarVisible               = NO,
     float           _minimumWidth;
 
     CPMutableArray  _items;
-    
+
     BOOL            _autoenablesItems;
     BOOL            _showsStateColumn;
 
     id              _delegate;
-    
-    CPMenuItem      _highlightedIndex;
+
+    int             _highlightedIndex;
     _CPMenuWindow   _menuWindow;
 }
 
@@ -83,7 +74,10 @@ var _CPMenuBarVisible               = NO,
 
 + (void)initialize
 {
-    [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
+    if (self !== [CPMenu class])
+        return;
+
+    [[self class] setMenuBarAttributes:@{}];
 }
 
 + (BOOL)menuBarVisible
@@ -95,7 +89,7 @@ var _CPMenuBarVisible               = NO,
 {
     if (_CPMenuBarVisible === menuBarShouldBeVisible)
         return;
-    
+
     _CPMenuBarVisible = menuBarShouldBeVisible;
 
     if ([CPPlatform supportsNativeMainMenu])
@@ -105,13 +99,13 @@ var _CPMenuBarVisible               = NO,
     {
         if (!_CPMenuBarSharedWindow)
             _CPMenuBarSharedWindow = [[_CPMenuBarWindow alloc] init];
-        
+
         [_CPMenuBarSharedWindow setMenu:[CPApp mainMenu]];
-        
+
         [_CPMenuBarSharedWindow setTitle:_CPMenuBarTitle];
-        [_CPMenuBarSharedWindow setIconImage:_CPMenuBarIconImage];
-        [_CPMenuBarSharedWindow setIconImageAlphaValue:_CPMenuBarIconImageAlphaValue];
-        
+        [_CPMenuBarSharedWindow setIconImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image" forClass:_CPMenuView]];
+        [_CPMenuBarSharedWindow setIconImageAlphaValue:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image-alpha-value" forClass:_CPMenuView]];
+
         [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
         [_CPMenuBarSharedWindow setTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTextColor"]];
         [_CPMenuBarSharedWindow setTitleColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTitleColor"]];
@@ -120,12 +114,12 @@ var _CPMenuBarVisible               = NO,
         [_CPMenuBarSharedWindow setHighlightColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarHighlightColor"]];
         [_CPMenuBarSharedWindow setHighlightTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarHighlightTextColor"]];
         [_CPMenuBarSharedWindow setHighlightTextShadowColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarHighlightTextShadowColor"]];
-        
+
         [_CPMenuBarSharedWindow orderFront:self];
     }
     else
         [_CPMenuBarSharedWindow orderOut:self];
-        
+
 // FIXME: There must be a better way to do this.
 #if PLATFORM(DOM)
     [[CPPlatformWindow primaryPlatformWindow] resizeEvent:nil];
@@ -154,14 +148,21 @@ 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
 {
     if (_CPMenuBarAttributes == attributes)
         return;
-        
+
     _CPMenuBarAttributes = [attributes copy];
-    
+
     var textColor = [attributes objectForKey:@"CPMenuBarTextColor"],
         titleColor = [attributes objectForKey:@"CPMenuBarTitleColor"],
         textShadowColor = [attributes objectForKey:@"CPMenuBarTextShadowColor"],
@@ -169,40 +170,40 @@ var _CPMenuBarVisible               = NO,
         highlightColor = [attributes objectForKey:@"CPMenuBarHighlightColor"],
         highlightTextColor = [attributes objectForKey:@"CPMenuBarHighlightTextColor"],
         highlightTextShadowColor = [attributes objectForKey:@"CPMenuBarHighlightTextShadowColor"];
-    
+
     if (!textColor && titleColor)
         [_CPMenuBarAttributes setObject:titleColor forKey:@"CPMenuBarTextColor"];
-    
+
     else if (textColor && !titleColor)
         [_CPMenuBarAttributes setObject:textColor forKey:@"CPMenuBarTitleColor"];
-    
+
     else if (!textColor && !titleColor)
     {
-        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTextColor"];
-        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTitleColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
     }
-    
+
     if (!textShadowColor && titleShadowColor)
         [_CPMenuBarAttributes setObject:titleShadowColor forKey:@"CPMenuBarTextShadowColor"];
-    
+
     else if (textShadowColor && !titleShadowColor)
         [_CPMenuBarAttributes setObject:textShadowColor forKey:@"CPMenuBarTitleShadowColor"];
-    
+
     else if (!textShadowColor && !titleShadowColor)
     {
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleShadowColor"];
     }
-    
+
     if (!highlightColor)
-        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0/255.0 green:130.0/255.0 blue:186.0/255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
-    
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];
+
     if (!highlightTextColor)
-        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
-    
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextColor"];
+
     if (!highlightTextShadowColor)
-        [_CPMenuBarAttributes setObject:[CPColor blackColor] forKey:@"CPMenuBarHighlightTextShadowColor"];
-    
+        [self _setOrRemoveMenuBarAttribute:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextShadowColor"];
+
     if (_CPMenuBarSharedWindow)
     {
         [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
@@ -230,14 +231,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
     if (self === [CPApp mainMenu])
-        return MENUBAR_HEIGHT;
-    
+        return [CPMenu menuBarHeight];
+
     return 0.0;
 }
 
 + (float)menuBarHeight
 {
-    return MENUBAR_HEIGHT;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
 }
 
 // Creating a CPMenu Object
@@ -249,18 +250,18 @@ var _CPMenuBarVisible               = NO,
 - (id)initWithTitle:(CPString)aTitle
 {
     self = [super init];
-    
+
     if (self)
     {
         _title = aTitle;
         _items = [];
-        
+
         _autoenablesItems = YES;
         _showsStateColumn = YES;
 
         [self setMinimumWidth:0];
     }
-    
+
     return self;
 }
 
@@ -277,22 +278,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)insertItem:(CPMenuItem)aMenuItem atIndex:(unsigned)anIndex
 {
-    var menu = [aMenuItem menu];
-
-    if (menu)
-        if (menu !== self)
-            [CPException raise:CPInternalInconsistencyException reason:@"Attempted to insert item into menu that was already in another menu."];
-        else
-            return;
-
-    [aMenuItem setMenu:self];
-    [_items insertObject:aMenuItem atIndex:anIndex];
-    
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidAddItemNotification
-                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
-
+    [self insertObject:aMenuItem inItemsAtIndex:anIndex];
 }
 
 /*!
@@ -306,7 +292,7 @@ var _CPMenuBarVisible               = NO,
 - (CPMenuItem)insertItemWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent atIndex:(unsigned)anIndex
 {
     var item = [[CPMenuItem alloc] initWithTitle:aTitle action:anAction keyEquivalent:aKeyEquivalent];
-    
+
     [self insertItem:item atIndex:anIndex];
 
     return item;
@@ -349,16 +335,30 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)removeItemAtIndex:(unsigned)anIndex
 {
-    if (anIndex < 0 || anIndex >= _items.length)
-        return;
-    
-    [_items[anIndex] setMenu:nil];
-    [_items removeObjectAtIndex:anIndex];
-    
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidRemoveItemNotification
-                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+    [self removeObjectFromItemsAtIndex:anIndex];
+}
+
+/*!
+    Removes all the menu items in the receiver.
+    This method is more efficient than removing menu items individually.
+
+    Unlike the other remove methods, this method does not post CPMenuDidChangeItemNotification notifications.
+*/
+- (void)removeAllItems
+{
+    var count = [_items count];
+
+    // Remove the connection to this menu in case
+    // someone else has a reference to the menu item.
+    while (count--)
+        [_items[count] setMenu:nil];
+
+    _highlightedIndex = CPNotFound;
+
+    // Because we are changing _items directly, be sure to notify KVO
+    [self willChangeValueForKey:@"items"];
+    _items = [CPMutableArray array];
+    [self didChangeValueForKey:@"items"];
 }
 
 /*!
@@ -367,13 +367,20 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)itemChanged:(CPMenuItem)aMenuItem
 {
-    if ([aMenuItem menu] != self)
+    /*
+        During cib unarchiving, menu items will have a reference to their menu,
+        but of course the items are still being unarchived and the menu's _items
+        have not yet been instantiated. In that case we will not do anything here.
+    */
+    if ([aMenuItem menu] !== self || !_items)
         return;
-    
+
+    [aMenuItem setValue:[aMenuItem valueForKey:@"changeCount"] + 1 forKey:@"changeCount"];
+
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidChangeItemNotification
                       object:self
-                    userInfo:[CPDictionary dictionaryWithObject:[_items indexOfObjectIdenticalTo:aMenuItem] forKey:@"CPMenuItemIndex"]];
+                    userInfo:@{ @"CPMenuItemIndex": [_items indexOfObjectIdenticalTo:aMenuItem] }];
 }
 
 // Finding Menu Items
@@ -385,10 +392,10 @@ var _CPMenuBarVisible               = NO,
 - (CPMenuItem)itemWithTag:(int)aTag
 {
     var index = [self indexOfItemWithTag:aTag];
-    
+
     if (index == CPNotFound)
         return nil;
-    
+
     return _items[index];
 }
 
@@ -400,10 +407,10 @@ var _CPMenuBarVisible               = NO,
 - (CPMenuItem)itemWithTitle:(CPString)aTitle
 {
     var index = [self indexOfItemWithTitle:aTitle];
-    
+
     if (index == CPNotFound)
         return nil;
-    
+
     return _items[index];
 }
 
@@ -442,7 +449,7 @@ var _CPMenuBarVisible               = NO,
 {
     if ([aMenuItem menu] !== self)
         return CPNotFound;
-        
+
     return [_items indexOfObjectIdenticalTo:aMenuItem];
 }
 
@@ -455,7 +462,7 @@ var _CPMenuBarVisible               = NO,
 {
     var index = 0,
         count = _items.length;
-    
+
     for (; index < count; ++index)
         if ([_items[index] title] === aTitle)
             return index;
@@ -472,7 +479,7 @@ var _CPMenuBarVisible               = NO,
 {
     var index = 0,
         count = _items.length;
-    
+
     for (; index < count; ++index)
         if ([_items[index] tag] == aTag)
             return index;
@@ -490,11 +497,11 @@ var _CPMenuBarVisible               = NO,
 {
     var index = 0,
         count = _items.length;
-    
+
     for (; index < count; ++index)
     {
         var item = _items[index];
-        
+
         if ([item target] == aTarget && (!anAction || [item action] == anAction))
             return index;
     }
@@ -511,7 +518,7 @@ var _CPMenuBarVisible               = NO,
 {
     var index = 0,
         count = _items.length;
-    
+
     for (; index < count; ++index)
         if ([[_items[index] representedObject] isEqual:anObject])
             return index;
@@ -528,7 +535,7 @@ var _CPMenuBarVisible               = NO,
 {
     var index = 0,
         count = _items.length;
-    
+
     for (; index < count; ++index)
         if ([_items[index] submenu] == aMenu)
             return index;
@@ -546,7 +553,7 @@ var _CPMenuBarVisible               = NO,
 {
     [aMenuItem setTarget:aMenuItem];
     [aMenuItem setAction:@selector(submenuAction:)];
-    
+
     [aMenuItem setSubmenu:aMenu];
 }
 
@@ -558,7 +565,6 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)submenuAction:(id)aSender
 {
-
 }
 
 /*!
@@ -606,11 +612,60 @@ var _CPMenuBarVisible               = NO,
 }
 
 /*!
-    Not implemented.
+    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.
 */
 - (void)update
 {
+    if (![self autoenablesItems])
+        return;
 
+    var items = [self itemArray];
+
+    for (var i = 0; i < [items count]; i++)
+    {
+        var item = [items objectAtIndex:i];
+
+        if ([item hasSubmenu])
+            continue;
+
+        var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
+
+        if (!validator)
+        {
+            // 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];
+        else if ([validator respondsToSelector:@selector(validateMenuItem:)])
+            [item setEnabled:[validator validateMenuItem:item]];
+        else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
+            [item setEnabled:[validator validateUserInterfaceItem:item]];
+    }
+
+    [[_menuWindow _menuView] tile];
 }
 
 // Managing the Title
@@ -652,7 +707,13 @@ var _CPMenuBarVisible               = NO,
     // highlightedItem is always enabled. Do there exist edge cases: disabling on closing a menu,
     // etc.? Requires further investigation and tests.
     if (highlightedItem && [highlightedItem isEnabled])
+    {
+        // Perform any action binding
+        var binding = [CPBinder getBinding:CPTargetBinding forObject:highlightedItem];
+        [binding invokeAction];
+
         [CPApp sendAction:[highlightedItem action] to:[highlightedItem target] from:highlightedItem];
+    }
 }
 
 //
@@ -683,7 +744,7 @@ var _CPMenuBarVisible               = NO,
         itemIndex = [self indexOfItem:anItem];
 
         if (itemIndex === CPNotFound)
-            throw   "In call to popUpMenuPositioningItem:atLocation:inView:callback:, menu item " + 
+            throw   "In call to popUpMenuPositioningItem:atLocation:inView:callback:, menu item " +
                     anItem  + " is not present in menu " + self;
     }
 
@@ -692,10 +753,7 @@ var _CPMenuBarVisible               = NO,
     if (aView && !theWindow)
         throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";
 
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:aMenu];
+    [self _menuWillOpen];
 
     // Convert location to global coordinates if not already in them.
     if (aView)
@@ -747,6 +805,9 @@ var _CPMenuBarVisible               = NO,
     }
 
     // Show it.
+    if ([CPPlatform isBrowser])
+        [menuWindow setPlatformWindow:[[aView window] platformWindow]];
+
     [menuWindow orderFront:self];
 
     // Track it.
@@ -780,13 +841,10 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    var delegate = [aMenu delegate];
-    
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:aMenu];
-    
+    [aMenu _menuWillOpen];
+
     if (!aFont)
-        aFont = [CPFont systemFontOfSize:12.0];
+        aFont = [CPFont systemFontOfSize:[CPFont systemFontSize]];
 
     var theWindow = [aView window],
         menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
@@ -816,6 +874,9 @@ var _CPMenuBarVisible               = NO,
         [menuWindow setFrameOrigin:CGRectIntersection(unconstrainedFrame, constraintRect).origin];
     }
 
+    if ([CPPlatform isBrowser])
+        [menuWindow setPlatformWindow:[[aView window] platformWindow]];
+
     [menuWindow orderFront:self];
 
     [[_CPMenuManager sharedMenuManager]
@@ -850,7 +911,15 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
+    if (_highlightedIndex < 0)
+        return nil;
+
+    var highlightedItem = _items[_highlightedIndex];
+
+    if ([highlightedItem isSeparatorItem])
+        return nil;
+
+    return highlightedItem;
 }
 
 // Managing the Delegate
@@ -865,9 +934,25 @@ var _CPMenuBarVisible               = NO,
     return _delegate;
 }
 
+- (void)_menuWillOpen
+{
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:self];
+}
+
+- (void)_menuDidClose
+{
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:self];
+}
+
 // Handling Tracking
 /*!
-	Cancels tracking.
+    Cancels tracking.
 */
 - (void)cancelTracking
 {
@@ -927,22 +1012,11 @@ var _CPMenuBarVisible               = NO,
         characters = [anEvent charactersIgnoringModifiers],
         modifierFlags = [anEvent modifierFlags];
 
-    for(; index < count; ++index)
+    for (; index < count; ++index)
     {
-        var item = _items[index],
-            modifierMask = [item keyEquivalentModifierMask];
+        var item = _items[index];
 
-        if ([item keyEquivalent] === [[item keyEquivalent] uppercaseString])
-            modifierMask |= CPShiftKeyMask;
-
-        if (CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) && (modifierMask & CPCommandKeyMask))
-        {
-            modifierMask |= CPControlKeyMask;
-            modifierMask &= ~CPCommandKeyMask;
-        }
-
-        if ((modifierFlags & (CPShiftKeyMask | CPAlternateKeyMask | CPCommandKeyMask | CPControlKeyMask)) == modifierMask &&
-            [characters caseInsensitiveCompare:[item keyEquivalent]] == CPOrderedSame)
+        if ([anEvent _triggersKeyEquivalent:[item keyEquivalent] withModifierMask:[item keyEquivalentModifierMask]])
         {
             if ([item isEnabled])
                 [self performActionForItemAtIndex:index];
@@ -950,7 +1024,7 @@ var _CPMenuBarVisible               = NO,
             {
                 //beep?
             }
-            
+
             return YES;
         }
 
@@ -969,19 +1043,11 @@ var _CPMenuBarVisible               = NO,
 - (void)performActionForItemAtIndex:(unsigned)anIndex
 {
     var item = _items[anIndex];
-    
+
     [CPApp sendAction:[item action] to:[item target] from:item];
 }
 
 //
-/*
-    @ignore
-*/
-- (BOOL)_itemIsHighlighted:(CPMenuItem)aMenuItem
-{
-    return _items[_highlightedIndex] == aMenuItem;
-}
-
 /*
     @ignore
 */
@@ -997,6 +1063,9 @@ var _CPMenuBarVisible               = NO,
 
     if (_highlightedIndex !== CPNotFound)
         [[_items[_highlightedIndex] _menuItemView] highlight:YES];
+
+    if (_highlightedIndex !== CPNotFound && _menuWindow)
+        [_menuWindow._menuView scrollRectToVisible:[[_items[_highlightedIndex] _menuItemView] frame]];
 }
 
 - (void)_setMenuName:(CPString)aName
@@ -1042,6 +1111,61 @@ var _CPMenuBarVisible               = NO,
 
 @end
 
+@implementation CPMenu (CPKeyValueCoding)
+
+- (CPUInteger)countOfItems
+{
+    return [_items count];
+}
+
+- (CPMenuItem)objectInItemsAtIndex:(CPUInteger)anIndex
+{
+    return [_items objectAtIndex:anIndex];
+}
+
+- (CPArray)itemsAtIndexes:(CPIndexSet)indexes
+{
+    return [_items objectsAtIndexes:indexes];
+}
+
+@end
+
+@implementation CPMenu (CPKeyValueObserving)
+
+- (void)insertObject:(CPMenuItem)aMenuItem inItemsAtIndex:(CPUInteger)anIndex
+{
+    var menu = [aMenuItem menu];
+
+    if (menu)
+        if (menu !== self)
+            [CPException raise:CPInternalInconsistencyException reason:@"Attempted to insert item into menu that was already in another menu."];
+        else
+            return;
+
+    [aMenuItem setMenu:self];
+    [_items insertObject:aMenuItem atIndex:anIndex];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidAddItemNotification
+                      object:self
+                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+}
+
+- (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
+{
+    if (anIndex < 0 || anIndex >= [_items count])
+        return;
+
+    [[_items objectAtIndex:anIndex] setMenu:nil];
+    [_items removeObjectAtIndex:anIndex];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidRemoveItemNotification
+                      object:self
+                    userInfo:@{ @"CPMenuItemIndex": anIndex }];
+}
+
+@end
 
 var CPMenuTitleKey              = @"CPMenuTitleKey",
     CPMenuNameKey               = @"CPMenuNameKey",
@@ -1058,7 +1182,7 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
     {
         _title = [aCoder decodeObjectForKey:CPMenuTitleKey];
@@ -1068,9 +1192,11 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
         _showsStateColumn = ![aCoder containsValueForKey:CPMenuShowsStateColumnKey] || [aCoder decodeBoolForKey:CPMenuShowsStateColumnKey];
 
+        _autoenablesItems = YES;
+
         [self setMinimumWidth:0];
     }
-    
+
     return self;
 }
 

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,53 +1,59 @@
+/*
+ * _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
+ */
 
-#include "../CoreGraphics/CGGeometry.h"
-#include "../Platform/Platform.h"
+@import "CPPanel.j"
+@import "_CPMenuManager.j"
 
-@import "_CPMenuWindow.j"
+@class _CPMenuView
 
-
-var MENUBAR_HEIGHT          = 28.0,
-    MENUBAR_MARGIN          = 10.0,
-    MENUBAR_LEFT_MARGIN     = 10.0,
-    MENUBAR_RIGHT_MARGIN    = 10.0;
-
-var _CPMenuBarWindowBackgroundColor = nil,
-    _CPMenuBarWindowFont            = nil;
+@global CPMenuDidAddItemNotification
+@global CPMenuDidChangeItemNotification
+@global CPMenuDidRemoveItemNotification
 
 @implementation _CPMenuBarWindow : CPPanel
 {
     CPMenu      _menu;
     CPView      _highlightView;
     CPArray     _menuItemViews;
-    
+
     CPMenuItem  _trackingMenuItem;
-    
+
     CPImageView _iconImageView;
     CPTextField _titleField;
-    
+
     CPColor     _textColor;
     CPColor     _titleColor;
-    
+
     CPColor     _textShadowColor;
     CPColor     _titleShadowColor;
-    
+
     CPColor     _highlightColor;
     CPColor     _highlightTextColor;
     CPColor     _highlightTextShadowColor;
 }
 
-+ (void)initialize
-{
-    if (self != [_CPMenuBarWindow class])
-        return;
-        
-    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuBarWindowFont = [CPFont boldSystemFontOfSize:12.0];
-}
-
 + (CPFont)font
 {
-    return _CPMenuBarWindowFont;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
 }
 
 - (id)init
@@ -55,7 +61,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
     // This only shows up in browser land, so don't bother calculating metrics in desktop.
     var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
 
-    contentRect.size.height = MENUBAR_HEIGHT;
+    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];
 
     self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
 
@@ -63,27 +69,27 @@ var _CPMenuBarWindowBackgroundColor = nil,
     {
         [self setLevel:CPMainMenuWindowLevel];
         [self setAutoresizingMask:CPWindowWidthSizable];
-     
+
         var contentView = [self contentView];
-        
+
         [contentView setAutoresizesSubviews:NO];
-        
+
         [self setBecomesKeyOnlyIfNeeded:YES];
-        
+
         //
         _iconImageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
-        
+
         [contentView addSubview:_iconImageView];
-        
+
         _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
-        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
+        [_titleField setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 1]];
         [_titleField setAlignment:CPCenterTextAlignment];
         [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
-        
+
         [contentView addSubview:_titleField];
     }
-    
+
     return self;
 }
 
@@ -102,7 +108,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
     [_titleField setStringValue:aTitle];
     [_titleField sizeToFit];
-    
+
     [self tile];
 }
 
@@ -122,12 +128,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 - (void)setColor:(CPColor)aColor
 {
     if (!aColor)
-    {
-        if (!_CPMenuBarWindowBackgroundColor)
-            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
-            
-        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
-    }
+        [[self contentView] setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
     else
         [[self contentView] setBackgroundColor:aColor];
 }
@@ -136,9 +137,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_textColor == aColor)
         return;
-    
+
     _textColor = aColor;
-    
+
     [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
 }
 
@@ -146,9 +147,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_titleColor == aColor)
         return;
-    
+
     _titleColor = aColor;
-    
+
     [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
 }
 
@@ -156,9 +157,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_textShadowColor == aColor)
         return;
-    
+
     _textShadowColor = aColor;
-    
+
     [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
 }
 
@@ -166,9 +167,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_titleShadowColor == aColor)
         return;
-    
+
     _titleShadowColor = aColor;
-    
+
     [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
 }
 
@@ -176,7 +177,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_highlightColor == aColor)
         return;
-    
+
     _highlightColor = aColor;
 }
 
@@ -184,7 +185,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_highlightTextColor == aColor)
         return;
-    
+
     _highlightTextColor = aColor;
 
 //    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
@@ -194,9 +195,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_highlightTextShadowColor == aColor)
         return;
-    
+
     _highlightTextShadowColor = aColor;
-    
+
 //    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
 }
 
@@ -204,9 +205,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
 {
     if (_menu == aMenu)
         return;
-    
+
     var defaultCenter = [CPNotificationCenter defaultCenter];
-    
+
     if (_menu)
     {
         [defaultCenter
@@ -223,16 +224,16 @@ var _CPMenuBarWindowBackgroundColor = nil,
             removeObserver:self
                       name:CPMenuDidRemoveItemNotification
                     object:_menu];
-                    
+
         var items = [_menu itemArray],
             count = items.length;
-        
+
         while (count--)
             [[items[count] _menuItemView] removeFromSuperview];
     }
 
     _menu = aMenu;
-    
+
     if (_menu)
     {
         [defaultCenter
@@ -240,41 +241,41 @@ var _CPMenuBarWindowBackgroundColor = nil,
               selector:@selector(menuDidAddItem:)
                   name:CPMenuDidAddItemNotification
                 object:_menu];
-    
+
         [defaultCenter
             addObserver:self
               selector:@selector(menuDidChangeItem:)
                   name:CPMenuDidChangeItemNotification
                 object:_menu];
-                
+
         [defaultCenter
             addObserver:self
               selector:@selector(menuDidRemoveItem:)
                   name:CPMenuDidRemoveItemNotification
                 object:_menu];
     }
-    
+
     _menuItemViews = [];
-    
+
     var contentView = [self contentView],
         items = [_menu itemArray],
         count = items.length;
-    
-    for (index = 0; index < count; ++index)
+
+    for (var index = 0; index < count; ++index)
     {
         var item = items[index],
             menuItemView = [item _menuItemView];
-            
+
         _menuItemViews.push(menuItemView);
 
         [menuItemView setTextColor:_textColor];
         [menuItemView setHidden:[item isHidden]];
-        
+
         [menuItemView synchronizeWithMenuItem];
-        
+
         [contentView addSubview:menuItemView];
     }
-        
+
     [self tile];
 }
 
@@ -285,7 +286,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
     [menuItemView setHidden:[menuItem isHidden]];
     [menuItemView synchronizeWithMenuItem];
-    
+
     [self tile];
 }
 
@@ -301,9 +302,9 @@ var _CPMenuBarWindowBackgroundColor = nil,
     [menuItemView setHidden:[menuItem isHidden]];
 
     [menuItemView synchronizeWithMenuItem];
-    
+
     [[self contentView] addSubview:menuItemView];
-    
+
     [self tile];
 }
 
@@ -315,10 +316,15 @@ var _CPMenuBarWindowBackgroundColor = nil,
     [_menuItemViews removeObjectAtIndex:index];
 
     [menuItemView removeFromSuperview];
-        
+
     [self tile];
 }
 
+- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
+{
+    return YES;
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
     var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
@@ -338,7 +344,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
 
 - (CPFont)font
 {
-    [CPFont systemFontOfSize:12.0];
+    [CPFont systemFontOfSize:[CPFont systemFontSize]];
 }
 
 - (void)tile
@@ -346,46 +352,46 @@ var _CPMenuBarWindowBackgroundColor = nil,
     var items = [_menu itemArray],
         index = 0,
         count = items.length,
-        
-        x = MENUBAR_LEFT_MARGIN,
+
+        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView],
         y = 0.0,
         isLeftAligned = YES;
-    
+
     for (; index < count; ++index)
     {
         var item = items[index];
-        
+
         if ([item isSeparatorItem])
         {
-            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
             isLeftAligned = NO;
-            
+
             continue;
         }
-        
+
          if ([item isHidden])
             continue;
 
         var menuItemView = [item _menuItemView],
             frame = [menuItemView frame];
-        
+
         if (isLeftAligned)
         {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
 
             x += CGRectGetWidth([menuItemView frame]);
         }
         else
         {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
-     
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
+
             x = CGRectGetMinX([menuItemView frame]);
         }
     }
-    
+
     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
@@ -393,7 +399,7 @@ var _CPMenuBarWindowBackgroundColor = nil,
         var iconFrame = [_iconImageView frame],
             iconWidth = CGRectGetWidth(iconFrame),
             totalWidth = iconWidth + CGRectGetWidth(titleFrame);
-        
+
         [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
         [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
     }
@@ -455,102 +461,3 @@ var _CPMenuBarWindowBackgroundColor = nil,
 }
 
 @end
-
-@implementation _CPMenuBarView : _CPMenuView
-{
-}
-
-- (CGRect)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var bounds = [self bounds];
-
-    if (!CGRectContainsPoint(bounds, aPoint))
-        return CPNotFound;
-
-    var x = aPoint.x,
-        low = 0,
-        high = _visibleMenuItemInfos.length - 1;
-
-    while (low <= high)
-    {
-        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle],
-            frame = [info.view frame];
-
-        if (x < CGRectGetMinX(frame))
-            high = middle - 1;
-
-        else if (x > CGRectGetMaxX(frame))
-            low = middle + 1;
-
-        else
-            return info.index;
-   }
-
-   return CPNotFound;
-}
-
-- (void)tile
-{
-    var items = [_menu itemArray],
-        index = 0,
-        count = items.length,
-
-        x = MENUBAR_LEFT_MARGIN,
-        y = 0.0,
-        isLeftAligned = YES;
-
-    for (; index < count; ++index)
-    {
-        var item = items[index];
-        
-        if ([item isSeparatorItem])
-        {
-            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
-            isLeftAligned = NO;
-            
-            continue;
-        }
-        
-         if ([item isHidden])
-            continue;
-
-        var menuItemView = [item _menuItemView],
-            frame = [menuItemView frame];
-        
-        if (isLeftAligned)
-        {
-            [menuItemView setFrameOrigin:CGPointMake(x, (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
-     
-            x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
-        }
-        else
-        {
-            [menuItemView setFrameOrigin:CGPointMake(x - CGRectGetWidth(frame), (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
-     
-            x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
-        }
-    }
-    
-    var bounds = [[self contentView] bounds],
-        titleFrame = [_titleField frame];
-    
-    if ([_iconImageView isHidden])
-        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
-    else
-    {
-        var iconFrame = [_iconImageView frame],
-            iconWidth = CGRectGetWidth(iconFrame),
-            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
-        
-        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
-        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
-    }
-}
-
-@end

AppKit/CPMenu/_CPMenuManager.j

@@ -1,20 +1,51 @@
-
-#include "../CoreGraphics/CGGeometry.h"
+/*
+ * _CPMenuManager.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import <Foundation/CPObject.j>
+@import <Foundation/CPNotificationCenter.j>
+
+@import "CPEvent.j"
+@import "CPKeyBinding.j"
+
+@class CPWindow
+@class _CPMenuWindow
 
 
-_CPMenuManagerScrollingStateUp      = -1,
-_CPMenuManagerScrollingStateDown    = 1,
+@global CPApp
+@global CPMenuDidEndTrackingNotification
+@global _CPMenuWindowMenuBarBackgroundStyle
+@global _CPMenuWindowPopUpBackgroundStyle
+
+_CPMenuManagerScrollingStateUp      = -1;
+_CPMenuManagerScrollingStateDown    = 1;
 _CPMenuManagerScrollingStateNone    = 0;
 
-var STICKY_TIME_INTERVAL        = 500;
-
-var SharedMenuManager = nil;
+var STICKY_TIME_INTERVAL            = 0.4,
+    SharedMenuManager               = nil;
 
 @implementation _CPMenuManager: CPObject
 {
     CPTimeInterval      _startTime;
+    BOOL                _mouseWasDragged;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
 
@@ -24,6 +55,13 @@ var SharedMenuManager = nil;
     CPMutableArray      _menuContainerStack;
 
     Function            _trackingCallback;
+
+    CPString            _keyBuffer;
+
+    CPMenuItem          _previousActiveItem;
+    int                 _showTimerID;
+
+    int                 _menuBarButtonItemIndex;
 }
 
 + (_CPMenuManager)sharedMenuManager
@@ -39,7 +77,7 @@ var SharedMenuManager = nil;
     if (SharedMenuManager)
         return SharedMenuManager;
 
-    return [super init];    
+    return [super init];
 }
 
 - (id)trackingMenuContainer
@@ -59,9 +97,12 @@ var SharedMenuManager = nil;
 {
     var menu = [aMenuContainer menu];
 
+    if ([menu numberOfItems] <= 0)
+        return;
+
     CPApp._activeMenu = menu;
 
-    _startTime = [anEvent timestamp];//new Date();
+    _startTime = [anEvent timestamp];
     _scrollingState = _CPMenuManagerScrollingStateNone;
 
     _constraintRect = aRect;
@@ -70,25 +111,32 @@ var SharedMenuManager = nil;
 
     if (menu === [CPApp mainMenu])
     {
-        var globalLocation = [anEvent globalLocation];
+        var globalLocation = [anEvent globalLocation],
 
-        // Find which menu window the mouse is currently on top of
-        var menuLocation = [aMenuContainer convertGlobalToBase:globalLocation];
+            // Find which menu window the mouse is currently on top of
+            menuLocation = [aMenuContainer convertGlobalToBase:globalLocation],
 
-        // Find out the item the mouse is currently on top of
-        var activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
+            // Find out the item the mouse is currently on top of
+            activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
             activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
 
         _menuBarButtonItemIndex = activeItemIndex;
-        _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],
@@ -96,25 +144,84 @@ var SharedMenuManager = nil;
 
     // Close Menu Event.
     if (type === CPAppKitDefined)
-        return [self completeTracking]
+        return [self completeTracking];
 
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
+    if (type === CPKeyDown)
+    {
+        var menu = trackingMenu,
+            submenu = [[menu  highlightedItem] submenu];
+
+        // get the current active menu
+        while (submenu && [submenu._menuWindow isVisible])
+        {
+            menu = submenu;
+            submenu = [[menu  highlightedItem] submenu];
+        }
+
+        if ([menu numberOfItems])
+            [self interpretKeyEvent:anEvent forMenu:menu];
+
+        [self _trackAgain];
+        return;
+    }
 
     // Periodic events don't have a valid location.
     var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
 
-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
+    if (!globalLocation)
+    {
+        [self _trackAgain];
+        return;
+    }
 
     // Find which menu window the mouse is currently on top of
     var activeMenuContainer = [self menuContainerForPoint:globalLocation],
         activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation];
+        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
 
-    // Find out the item the mouse is currently on top of
-    var activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
+        // Find out the item the mouse is currently on top of
+        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
         activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
 
+    // 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])
     {
@@ -124,11 +231,13 @@ var SharedMenuManager = nil;
 
     var mouseOverMenuView = [activeItem view];
 
+    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
+        [activeMenuContainer scrollByDelta:[anEvent deltaY]];
+
     if (type === CPPeriodic)
     {
         if (_scrollingState === _CPMenuManagerScrollingStateUp)
             [activeMenuContainer scrollUp];
-
         else if (_scrollingState === _CPMenuManagerScrollingStateDown)
             [activeMenuContainer scrollDown];
     }
@@ -138,29 +247,31 @@ var SharedMenuManager = nil;
     {
         if (!_lastMouseOverMenuView)
             [activeMenu _highlightItemAtIndex:CPNotFound];
-        
+
         if (_lastMouseOverMenuView != mouseOverMenuView)
         {
             [mouseOverMenuView mouseExited:anEvent];
             // FIXME: Possibly multiple of these?
             [_lastMouseOverMenuView mouseEntered:anEvent];
-            
+
             _lastMouseOverMenuView = mouseOverMenuView;
         }
 
         var menuContainerWindow = activeMenuContainer;
 
-        if (![menuContainerWindow isKindOfClass:[CPWindow class]])
+        if (![menuContainerWindow isKindOfClass:CPWindow])
             menuContainerWindow = [menuContainerWindow window];
 
         [menuContainerWindow
-            sendEvent:[CPEvent mouseEventWithType:type location:menuLocation modifierFlags:[anEvent modifierFlags]
-            timestamp:[anEvent timestamp]
-         windowNumber:menuContainerWindow
-              context:nil
-          eventNumber:0
-           clickCount:[anEvent clickCount]
-             pressure:[anEvent pressure]]];
+            sendEvent:[CPEvent mouseEventWithType:type
+                                         location:menuLocation
+                                    modifierFlags:[anEvent modifierFlags]
+                                        timestamp:[anEvent timestamp]
+                                     windowNumber:menuContainerWindow
+                                          context:nil
+                                      eventNumber:0
+                                       clickCount:[anEvent clickCount]
+                                         pressure:[anEvent pressure]]];
     }
     else
     {
@@ -169,11 +280,15 @@ var SharedMenuManager = nil;
             [_lastMouseOverMenuView mouseExited:anEvent];
             _lastMouseOverMenuView = nil;
         }
-        
-        [activeMenu _highlightItemAtIndex:activeItemIndex];
-        
-        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown)
+
+        if (activeItemIndex !== CPNotFound)
+            [activeMenu _highlightItemAtIndex:activeItemIndex];
+
+        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
         {
+            if (type === CPLeftMouseDragged)
+                _mouseWasDragged = YES;
+
             var oldScrollingState = _scrollingState;
 
             _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
@@ -182,34 +297,89 @@ var SharedMenuManager = nil;
             {
                 if (_scrollingState === _CPMenuManagerScrollingStateNone)
                     [CPEvent stopPeriodicEvents];
-            
                 else if (oldScrollingState === _CPMenuManagerScrollingStateNone)
                     [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
             }
         }
-        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            [trackingMenu cancelTracking];
+        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
+        {
+            /*
+                There are a few possibilites:
+
+                1. The user clicks and releases without dragging within the sticky time.
+                   This is considered a regular mouse click and not a drag. In this case
+                   we allow the user to track the menu by moving the mouse. The next
+                   mouse up will end tracking.
+
+                2. The user clicks and releases without dragging after the sticky time.
+                   This is considered a drag and release and tracking ends.
+
+                3. The user clicks, drags and then releases. Tracking ends.
+            */
+            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
+            {
+                /*
+                    Close the menu if:
+
+                    1. The mouse was dragged.
+                    2. The mouse is released in the menubar.
+                    3. The current item has a submenu with a custom action.
+                */
+                if (_mouseWasDragged ||
+                    [activeMenuContainer isMenuBar] ||
+                    [activeItem action] !== @selector(submenuAction:))
+                {
+                    [trackingMenu cancelTracking];
+                }
+            }
+        }
+    }
+
+    // Prevent previous selected menu items from opening by stopping the timer if a
+    // new item is selected before the timer runs out
+    if (_previousActiveItem !== activeItem)
+    {
+        clearTimeout(_showTimerID);
+        _showTimerID = undefined;
     }
 
     // If the item has a submenu, show it.
-    if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:))
+    if ([activeItem hasSubmenu]) // && [activeItem action] === @selector(submenuAction:))
     {
-        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex];
+        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
+            newMenuOrigin;
 
         if ([activeMenuContainer isMenuBar])
-            var newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
+            newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
         else
-            var newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
+            newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
 
         newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
 
-        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+        // Only start a new timer if the previous was cancelled
+        if (_showTimerID === undefined)
+        {
+            // Close the current menu item because we are going to select a new one after a short delay
+            [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
+
+            if (![activeMenuContainer isMenuBar])
+            {
+                _showTimerID = setTimeout(function()
+                {
+                    [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+                }, 250);
+            }
+            else
+                [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+        }
     }
 
-    // This handles both the case where we've moved away from the menu, and where 
+    // This handles both the case where we've moved away from the menu, and where
     // we've moved to an item without a submenu.
     else
         [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
+
+    _previousActiveItem = activeItem;
 }
 
 - (void)trackMenuBarButtonEvent:(CPEvent)anEvent
@@ -219,16 +389,15 @@ var SharedMenuManager = nil;
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
-    var globalLocation = [anEvent globalLocation];
+    var globalLocation = [anEvent globalLocation],
 
-    // Find which menu window the mouse is currently on top of
-    var menu = [self trackingMenu],
+        // Find which menu window the mouse is currently on top of
+        menu = [self trackingMenu],
         trackingMenuContainer = [self trackingMenuContainer],
         menuLocation = [trackingMenuContainer convertGlobalToBase:globalLocation];
 
     if ([trackingMenuContainer itemIndexAtPoint:menuLocation] === _menuBarButtonItemIndex)
         [menu _highlightItemAtIndex:_menuBarButtonItemIndex];
-
     else
         [menu _highlightItemAtIndex:CPNotFound];
 
@@ -245,23 +414,15 @@ var SharedMenuManager = nil;
     // Stop all periodic events at this point.
     [CPEvent stopPeriodicEvents];
 
-    // Get the highlighted item from the original menu.
-    var highlightedItem = [trackingMenu highlightedItem];
-
     // Hide all submenus.
     [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-
-    var delegate = [trackingMenu delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:trackingMenu];
+    [trackingMenu _menuDidClose];
 
     if (_trackingCallback)
         _trackingCallback([self trackingMenuContainer], trackingMenu);
 
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidEndTrackingNotification
-                      object:trackingMenu];
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidEndTrackingNotification
+                                                        object:trackingMenu];
 
     CPApp._activeMenu = nil;
 }
@@ -324,6 +485,8 @@ var SharedMenuManager = nil;
     var count = _menuContainerStack.length,
         index = count;
 
+    [newMenu _menuWillOpen];
+
     // Hide all menus up to the base menu...
     while (index--)
     {
@@ -335,7 +498,7 @@ var SharedMenuManager = nil;
             break;
 
         // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
+        if (menu === newMenu) //&& [menu supermenu] === baseMenu)
             return [newMenu _highlightItemAtIndex:CPNotFound];
 
         [menuContainer orderOut:self];
@@ -343,6 +506,8 @@ var SharedMenuManager = nil;
 
         [_CPMenuWindow poolMenuWindow:menuContainer];
         [_menuContainerStack removeObjectAtIndex:index];
+
+        [menu _menuDidClose];
     }
 
     if (!newMenu)
@@ -361,10 +526,247 @@ var SharedMenuManager = nil;
     if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
         [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
     else
-        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];        
-    
+        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
+
     [menuWindow setFrameOrigin:aGlobalLocation];
     [menuWindow orderFront:self];
 }
 
+/// handle keyboard navigation
+- (void)interpretKeyEvent:(CPEvent)anEvent forMenu:(CPMenu)menu
+{
+    var modifierFlags = [anEvent modifierFlags],
+        character = [anEvent charactersIgnoringModifiers],
+        selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
+
+    if (selectorNames)
+    {
+        var iter = [selectorNames objectEnumerator],
+            obj;
+
+        while ((obj = [iter nextObject]) !== nil)
+        {
+            var aSelector = CPSelectorFromString(obj);
+
+            if ([self respondsToSelector:aSelector])
+                [self performSelector:aSelector withObject:menu];
+        }
+    }
+    else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
+    {
+        if (!_keyBuffer)
+        {
+            _startTime = [anEvent timestamp];
+            _keyBuffer = character;
+
+            [CPEvent stopPeriodicEvents];
+            [CPEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
+        }
+        else
+            _keyBuffer += character;
+
+        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:NO];
+        _lastGlobalLocation = Nil;
+    }
+}
+
+- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu clearBuffer:(BOOL)shouldClear
+{
+    var iter = [[menu itemArray] objectEnumerator],
+        obj;
+
+    while ((obj = [iter nextObject]) !== nil)
+    {
+        if ([obj isHidden] || ![obj isEnabled])
+            continue;
+
+        if ([[[obj title] commonPrefixWithString:characters options:CPCaseInsensitiveSearch] length] == [characters length])
+        {
+            [menu _highlightItemAtIndex:iter._index];
+            break;
+        }
+    }
+
+    if (shouldClear)
+    {
+        [CPEvent stopPeriodicEvents];
+        _keyBuffer = Nil;
+    }
+    else
+        _startTime = [CPEvent currentTimestamp];
+}
+
+- (void)scrollToBeginningOfDocument:(CPMenu)menu
+{
+    [menu _highlightItemAtIndex:0];
+}
+
+- (void)scrollToEndOfDocument:(CPMenu)menu
+{
+    [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+}
+
+- (void)scrollPageDown:(CPMenu)menu
+{
+    var menuWindow = menu._menuWindow,
+        menuClipView = menuWindow._menuClipView,
+        bottom = [menuClipView bounds].size.height,
+        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
+        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
+        current = [menu indexOfItem:[menu highlightedItem]];
+
+    if (current == CPNotFound)
+    {
+        [menu _highlightItemAtIndex:0];
+        return;
+    }
+
+    var next = current + (last - first);
+
+    if (next < [menu numberOfItems])
+        [menu _highlightItemAtIndex:next];
+    else
+        [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+
+    var item = [menu highlightedItem];
+
+    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+        [self moveDown:menu];
+}
+
+- (void)scrollPageUp:(CPMenu)menu
+{
+    var menuWindow = menu._menuWindow,
+        menuClipView = menuWindow._menuClipView,
+        bottom = [menuClipView bounds].size.height,
+        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
+        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
+        current = [menu indexOfItem:[menu highlightedItem]];
+
+    if (current == CPNotFound)
+    {
+        [menu _highlightItemAtIndex:0];
+        return;
+    }
+
+    var next = current - (last - first);
+
+    if (next < 0)
+        [menu _highlightItemAtIndex:0];
+    else
+        [menu _highlightItemAtIndex:next];
+
+    var item = [menu highlightedItem];
+
+    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+        [self moveUp:menu];
+}
+
+- (void)moveLeft:(CPMenu)menu
+{
+    if ([menu supermenu])
+    {
+        if ([menu supermenu] == [CPApp mainMenu])
+        {
+            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
+            [self moveUp:[CPApp mainMenu]];
+
+            var activeItem = [[CPApp mainMenu] highlightedItem],
+                menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
+
+            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
+        }
+        else
+            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
+    }
+}
+
+- (void)moveRight:(CPMenu)menu
+{
+    var activeItem = [menu highlightedItem];
+
+    if ([activeItem hasSubmenu])
+    {
+        if ([[activeItem submenu] numberOfItems])
+        {
+            var activeItemIndex = [menu indexOfItem:activeItem],
+                activeMenuContainer = menu._menuWindow,
+                activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
+                newMenuOrigin;
+
+            if ([activeMenuContainer isMenuBar])
+                newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
+            else
+                newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
+
+            newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
+
+            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
+            [self moveDown:[activeItem submenu]];
+        }
+    }
+    else if ([self trackingMenu] == [CPApp mainMenu])
+    {
+        [self showMenu:nil fromMenu:menu atPoint:CGPointMakeZero()];
+        [self moveDown:[CPApp mainMenu]];
+
+        var activeItem = [[CPApp mainMenu] highlightedItem],
+            menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
+
+        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
+    }
+}
+
+- (void)moveDown:(CPMenu)menu
+{
+    var index = menu._highlightedIndex + 1;
+
+    if (index < [menu numberOfItems])
+    {
+        [menu _highlightItemAtIndex:index];
+
+        var item = [menu highlightedItem];
+
+        if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+            [self moveDown:menu];
+    }
+    else if (menu == [CPApp mainMenu])
+         [menu _highlightItemAtIndex:0];
+}
+
+- (void)moveUp:(CPMenu)menu
+{
+    var index = menu._highlightedIndex - 1;
+
+    if (index < 0)
+    {
+        if (index != CPNotFound || menu == [CPApp mainMenu])
+            [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
+
+        return;
+    }
+
+    [menu _highlightItemAtIndex:index];
+
+    var item = [menu highlightedItem];
+
+    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
+        [self moveUp:menu];
+}
+
+- (void)insertNewline:(CPMenu)menu
+{
+    if ([[menu highlightedItem] hasSubmenu])
+        [self moveRight:menu];
+    else
+        [menu cancelTracking]
+}
+
+- (void)cancelOperation:(CPMenu)menu
+{
+    [menu _highlightItemAtIndex:CPNotFound];
+    [CPEvent stopPeriodicEvents];
+    [[self trackingMenu] cancelTracking];
+}
+
 @end

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,25 +1,39 @@
+/*
+ * _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
+ */
 
-#include "../CoreGraphics/CGGeometry.h"
-
+@import "CPClipView.j"
+@import "CPImageView.j"
+@import "CPWindow.j"
+@import "_CPMenuManager.j"
 
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,
-    
+
     _CPMenuWindowBackgroundColors           = [];
-    
+
 _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
 */
@@ -27,10 +41,10 @@ var STICKY_TIME_INTERVAL        = 500,
 {
     _CPMenuView         _menuView;
     CPClipView          _menuClipView;
-    
+
     CPImageView         _moreAboveView;
     CPImageView         _moreBelowView;
-    
+
     CGRect              _unconstrainedFrame;
     CGRect              _constraintRect;
 }
@@ -64,17 +78,6 @@ var STICKY_TIME_INTERVAL        = 500,
     _CPMenuWindowPool.push(aMenuWindow);
 }
 
-+ (void)initialize
-{
-    if (self != [_CPMenuWindow class])
-        return;
-    
-    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
-    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
-}
-
 - (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
 {
     _constraintRect = _CGRectMakeZero();
@@ -90,37 +93,35 @@ var STICKY_TIME_INTERVAL        = 500,
         [self setAcceptsMouseMovedEvents:YES];
 
         var contentView = [self contentView];
-        
-        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
-        
-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
-        [_menuClipView setDocumentView:_menuView];
-        
-        [contentView addSubview:_menuClipView];
-        
-        _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-        
-        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
-        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
-        
-        [contentView addSubview:_moreAboveView];
-        
-        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-    
-        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
-        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
-        
-        [contentView addSubview:_moreBelowView];
 
-        [self setShadowStyle:CPWindowShadowStyleMenu];
+        _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 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]];
+
+        [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]];
+
+        [contentView addSubview:_moreBelowView];
     }
-    
+
     return self;
 }
 
 + (float)_standardLeftMargin
 {
-    return LEFT_MARGIN;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
 }
 
 - (void)setFont:(CPFont)aFont
@@ -136,43 +137,17 @@ var STICKY_TIME_INTERVAL        = 500,
 + (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
 {
     var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
-    
+
     if (!color)
     {
         var bundle = [CPBundle bundleForClass:[self class]];
 
         if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-                [
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded0.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow1.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded2.png"] size:CGSizeMake(4.0, 4.0)],
-                    
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-                    
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
-                ]]];
-        
+            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];
+
         else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-                [
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
-                    
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-                    
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
-                ]]];
-                
+            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];
+
         _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
     }
 
@@ -188,13 +163,14 @@ var STICKY_TIME_INTERVAL        = 500,
 {
     [aMenu _setMenuWindow:self];
     [_menuView setMenu:aMenu];
-    
-    var menuViewSize = [_menuView frame].size;
-    
-    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
-    
+
+    var menuViewSize = [_menuView frame].size,
+        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];
+
+    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];
+
     [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
+    [_menuClipView setFrame:CGRectMake(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
 }
 
 - (void)setMinWidth:(float)aWidth
@@ -209,10 +185,16 @@ var STICKY_TIME_INTERVAL        = 500,
     return [_menuView menu];
 }
 
+- (_CPMenuView)_menuView
+{
+    return _menuView;
+}
+
 - (void)orderFront:(id)aSender
 {
+    [[self menu] update];
     [self setFrame:_unconstrainedFrame];
-    
+
     [super orderFront:aSender];
 }
 
@@ -246,7 +228,9 @@ var STICKY_TIME_INTERVAL        = 500,
     // FIXME: This gets called far too often.
     _unconstrainedFrame = _CGRectMakeCopy(aFrame);
 
-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
+        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
+        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];
 
     // We don't want to simply intersect the visible frame and the unconstrained frame.
     // We should be allowing as much of the width to fit as possible (pushing back and forward).
@@ -265,37 +249,42 @@ var STICKY_TIME_INTERVAL        = 500,
     [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
 
     // This needs to happen before changing the frame.
-    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + LEFT_MARGIN, CGRectGetMinY(aFrame) + TOP_MARGIN),
-        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + TOP_MARGIN,
-        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - BOTTOM_MARGIN,
+    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + marginInset.left, CGRectGetMinY(aFrame) + marginInset.top),
+        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + marginInset.top,
+        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - marginInset.bottom,
+
+        topMargin = marginInset.top,
+        bottomMargin = marginInset.bottom,
 
-        topMargin = TOP_MARGIN,
-        bottomMargin = BOTTOM_MARGIN,
-        
         contentView = [self contentView],
         bounds = [contentView bounds];
 
     if (moreAbove)
     {
-        topMargin += SCROLL_INDICATOR_HEIGHT;
-    
+        topMargin += scrollIndicatorHeight;
+
         var frame = [_moreAboveView frame];
-        
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
+
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
     }
 
     [_moreAboveView setHidden:!moreAbove];
 
     if (moreBelow)
     {
-        bottomMargin += SCROLL_INDICATOR_HEIGHT;
-    
-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - SCROLL_INDICATOR_HEIGHT - BOTTOM_MARGIN)];
+        bottomMargin += scrollIndicatorHeight;
+
+        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
     }
-    
+
     [_moreBelowView setHidden:!moreBelow];
 
-    var clipFrame = CGRectMake(LEFT_MARGIN, topMargin, CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN, CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin)
+    var clipFrame = CGRectMakeZero();
+
+    clipFrame.origin.x = marginInset.left;
+    clipFrame.origin.y = topMargin;
+    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
+    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;
 
     [_menuClipView setFrame:clipFrame];
     [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
@@ -348,24 +337,29 @@ var STICKY_TIME_INTERVAL        = 500,
     return [self canScrollUp] || [self canScrollDown];
 }
 
-- (void)scrollUp
+- (void)scrollByDelta:(float)theDelta
 {
-    if (CGRectGetMinY(_unconstrainedFrame) >= CGRectGetMinY(_constraintRect))
+    if (theDelta === 0.0)
         return;
 
-    _unconstrainedFrame.origin.y += 10;
+    if (theDelta > 0.0 && ![self canScrollDown])
+        return;
 
+    if (theDelta < 0.0 && ![self canScrollUp])
+        return;
+
+    _unconstrainedFrame.origin.y -= theDelta;
     [self setFrame:_unconstrainedFrame];
 }
 
+- (void)scrollUp
+{
+    [self scrollByDelta:-10.0];
+}
+
 - (void)scrollDown
 {
-    if (CGRectGetMaxY(_unconstrainedFrame) <= CGRectGetHeight(_constraintRect))
-        return;
-
-    _unconstrainedFrame.origin.y -= 10;
-
-    [self setFrame:_unconstrainedFrame];
+    [self scrollByDelta:10.0];
 }
 
 @end
@@ -385,16 +379,15 @@ var STICKY_TIME_INTERVAL        = 500,
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
     var frame = [self frame];
-
-    if (![self canScroll])
+    if (!CGRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
         return _CPMenuManagerScrollingStateNone;
 
     // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT)
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreAboveView isHidden])
         return _CPMenuManagerScrollingStateUp;
 
     // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT)
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
         return _CPMenuManagerScrollingStateDown;
 
     return _CPMenuManagerScrollingStateNone;
@@ -402,7 +395,7 @@ var STICKY_TIME_INTERVAL        = 500,
 
 - (float)deltaYForItemAtIndex:(int)anIndex
 {
-    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
 }
 
 - (CGPoint)rectForItemAtIndex:(int)anIndex
@@ -429,10 +422,48 @@ var STICKY_TIME_INTERVAL        = 500,
 {
     CPArray _menuItemViews;
     CPArray _visibleMenuItemInfos;
-    
+
     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;
@@ -463,7 +494,7 @@ var STICKY_TIME_INTERVAL        = 500,
     while (low <= high)
     {
         var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle]
+            info = _visibleMenuItemInfos[middle],
             frame = [info.view frame];
 
         if (y < CGRectGetMinY(frame))
@@ -481,7 +512,7 @@ var STICKY_TIME_INTERVAL        = 500,
 
 - (void)tile
 {
-    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];   
+    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
 
     _menuItemViews = [];
     _visibleMenuItemInfos = [];
@@ -501,15 +532,15 @@ var STICKY_TIME_INTERVAL        = 500,
     for (; index < count; ++index)
     {
         var item = items[index],
-            view = [item _menuItemView];        
-        
+            view = [item _menuItemView];
+
         _menuItemViews.push(view);
-        
+
         if ([item isHidden])
             continue;
 
         _visibleMenuItemInfos.push({ view:view, index:index });
-        
+
         [view setFont:_font];
         [view setShowsStateColumn:showsStateColumn];
         [view synchronizeWithMenuItem];

AppKit/CPMenuItem/CPMenuItem.j

@@ -25,11 +25,35 @@
 @import <Foundation/CPString.j>
 
 @import "CPImage.j"
-@import "CPMenu.j"
+@import "CPText.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",
+    };
+
+/*!
     @ingroup appkit
     @class CPMenuItem
 
@@ -43,42 +67,54 @@
 
     CPString        _title;
     //CPAttributedString  _attributedTitle;
-    
+
     CPFont          _font;
-                  
+
     id              _target;
     SEL             _action;
-                    
+
     BOOL            _isEnabled;
     BOOL            _isHidden;
-                    
+
     int             _tag;
     int             _state;
-                    
+
     CPImage         _image;
     CPImage         _alternateImage;
     CPImage         _onStateImage;
     CPImage         _offStateImage;
     CPImage         _mixedStateImage;
-                    
+
     CPMenu          _submenu;
     CPMenu          _menu;
-                    
+
     CPString        _keyEquivalent;
     unsigned        _keyEquivalentModifierMask;
-                    
+
     int             _mnemonicLocation;
-                    
+
     BOOL            _isAlternate;
     int             _indentationLevel;
-                    
+
     CPString        _toolTip;
     id              _representedObject;
     CPView          _view;
-    
+
+    int             _changeCount;
+
     _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];
@@ -94,19 +130,21 @@
 - (id)initWithTitle:(CPString)aTitle action:(SEL)anAction keyEquivalent:(CPString)aKeyEquivalent
 {
     self = [super init];
-    
+
     if (self)
     {
+        _changeCount = 0;
         _isSeparator = NO;
 
         _title = aTitle;
         _action = anAction;
-        
+
         _isEnabled = YES;
-        
+        _isHidden = NO;
+
         _tag = 0;
         _state = CPOffState;
-        
+
         _keyEquivalent = aKeyEquivalent || @"";
         _keyEquivalentModifierMask = CPPlatformActionKeyMask;
 
@@ -114,7 +152,7 @@
 
         _mnemonicLocation = CPNotFound;
     }
-    
+
     return self;
 }
 
@@ -125,13 +163,12 @@
 */
 - (void)setEnabled:(BOOL)isEnabled
 {
-    if ([_menu autoenablesItems])
+    if (_isEnabled === isEnabled)
         return;
 
-    _isEnabled = isEnabled;
+    _isEnabled = !!isEnabled;
 
     [_menuItemView setDirty];
-
     [_menu itemChanged:self];
 }
 
@@ -152,7 +189,7 @@
 {
     if (_isHidden == isHidden)
         return;
-    
+
     _isHidden = isHidden;
 
     [_menu itemChanged:self];
@@ -173,9 +210,9 @@
 {
     if (_isHidden)
         return YES;
-    
+
     var supermenu = [_menu supermenu];
-    
+
     if ([[supermenu itemAtIndex:[supermenu indexOfItemWithSubmenu:_menu]] isHiddenOrHasHiddenAncestor])
         return YES;
 
@@ -228,11 +265,11 @@
 
     if (_title == aTitle)
         return;
-    
+
     _title = aTitle;
-    
+
     [_menuItemView setDirty];
-    
+
     [_menu itemChanged:self];
 }
 
@@ -258,13 +295,13 @@
 */
 - (void)setFont:(CPFont)aFont
 {
-    if (_font == aFont)
+    if ([_font isEqual:aFont])
         return;
-        
+
     _font = aFont;
 
     [_menu itemChanged:self];
-    
+
     [_menuItemView setDirty];
 }
 
@@ -316,9 +353,9 @@ CPOffState
 {
     if (_state == aState)
         return;
-    
+
     _state = aState;
-    
+
     [_menu itemChanged:self];
 
     [_menuItemView setDirty];
@@ -346,11 +383,11 @@ CPOffState
 {
     if (_image == anImage)
         return;
-    
+
     _image = anImage;
 
     [_menuItemView setDirty];
-    
+
     [_menu itemChanged:self];
 }
 
@@ -388,7 +425,7 @@ CPOffState
 {
     if (_onStateImage == anImage)
         return;
-    
+
     _onStateImage = anImage;
     [_menu itemChanged:self];
 }
@@ -409,7 +446,7 @@ CPOffState
 {
     if (_offStateImage == anImage)
         return;
-    
+
     _offStateImage = anImage;
     [_menu itemChanged:self];
 }
@@ -430,7 +467,7 @@ CPOffState
 {
     if (_mixedStateImage == anImage)
         return;
-    
+
     _mixedStateImage = anImage;
     [_menu itemChanged:self];
 }
@@ -444,7 +481,7 @@ CPOffState
     return _mixedStateImage;
 }
 
-// Managing Subemenus
+// Managing Submenus
 /*!
     Sets the submenu for this item
     @param aMenu the submenu
@@ -458,13 +495,14 @@ CPOffState
 
     if (supermenu)
         [CPException raise:CPInvalidArgumentException
-		   reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
+           reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
 
     _submenu = aMenu;
 
     if (_submenu)
     {
         [_submenu setSupermenu:_menu];
+        [_submenu setTitle:[self title]]
 
         [self setTarget:_menu];
         [self setAction:@selector(submenuAction:)];
@@ -591,21 +629,25 @@ CPControlKeyMask
         return @"";
 
     var string = _keyEquivalent.toUpperCase(),
-        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask || string === _keyEquivalent;
+        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask ||
+                    (string === _keyEquivalent && _keyEquivalent.toLowerCase() !== _keyEquivalent.toUpperCase());
+
+    if ([CPMenuItemStringRepresentationDictionary objectForKey:string])
+        string = [CPMenuItemStringRepresentationDictionary objectForKey:string];
 
     if (CPBrowserIsOperatingSystem(CPMacOperatingSystem))
     {
         if (_keyEquivalentModifierMask & CPCommandKeyMask)
-            string = "⌘" + string;
+            string = "\u2318" + string;
 
         if (needsShift)
-            string = "⇧" + string;
+            string = "\u21E7" + string;
 
         if (_keyEquivalentModifierMask & CPAlternateKeyMask)
-            string = "⌥" + string;
+            string = "\u2325" + string;
 
         if (_keyEquivalentModifierMask & CPControlKeyMask)
-            string = "^" + string;
+            string = "\u2303" + string;
     }
     else
     {
@@ -642,20 +684,20 @@ CPControlKeyMask
 }
 
 /*!
-    Sets the title of the menu item and the mnemonic character. The mnemonic chracter should be preceded by an '&'.
+    Sets the title of the menu item and the mnemonic character. The mnemonic character should be preceded by an '&'.
     @param aTitle the title string with a denoted mnemonic
 */
 - (void)setTitleWithMnemonicLocation:(CPString)aTitle
 {
     var location = [aTitle rangeOfString:@"&"].location;
-    
+
     if (location == CPNotFound)
         [self setTitle:aTitle];
     else
     {
         [self setTitle:[aTitle substringToIndex:location] + [aTitle substringFromIndex:location + 1]];
         [self setMnemonicLocation:location];
-    }    
+    }
 }
 
 /*!
@@ -696,7 +738,7 @@ CPControlKeyMask
 {
     if (aLevel < 0)
         [CPException raise:CPInvalidArgumentException reason:"setIndentationLevel: argument must be greater than or equal to 0."];
-        
+
     _indentationLevel = MIN(15, aLevel);
 }
 
@@ -755,11 +797,11 @@ CPControlKeyMask
 {
     if (_view === aView)
         return;
-    
+
     _view = aView;
-    
+
     [_menuItemView setDirty];
-    
+
     [_menu itemChanged:self];
 }
 
@@ -781,7 +823,48 @@ CPControlKeyMask
     return [[self menu] highlightedItem] == self;
 }
 
-//
+#pragma mark CPObject Overrides
+
+/*!
+    Returns a copy of the item. The copy does not belong If the item has a submenu, it is NOT copied.
+*/
+- (id)copy
+{
+    var item = [[CPMenuItem alloc] init];
+
+    // No point in going through accessors and doing lots of unnecessary state checking/updating
+    item._isSeparator = _isSeparator;
+
+    [item setTitle:_title];
+    [item setFont:_font];
+    [item setTarget:_target];
+    [item setAction:_action];
+    [item setEnabled:_isEnabled];
+    [item setHidden:_isHidden]
+    [item setTag:_tag];
+    [item setState:_state];
+    [item setImage:_image];
+    [item setAlternateImage:_alternateImage];
+    [item setOnStateImage:_onStateImage];
+    [item setOffStateImage:_offStateImage];
+    [item setMixedStateImage:_mixedStateImage];
+    [item setKeyEquivalent:_keyEquivalent];
+    [item setKeyEquivalentModifierMask:_keyEquivalentModifierMask];
+    [item setMnemonicLocation:_mnemonicLocation];
+    [item setAlternate:_isAlternate];
+    [item setIndentationLevel:_indentationLevel];
+    [item setToolTip:_toolTip];
+    [item setRepresentedObject:_representedObject];
+
+    return item;
+}
+
+- (id)mutableCopy
+{
+    return [self copy];
+}
+
+#pragma mark Internal
 
 /*
     @ignore
@@ -790,7 +873,7 @@ CPControlKeyMask
 {
     if (!_menuItemView)
         _menuItemView = [[_CPMenuItemView alloc] initWithFrame:CGRectMakeZero() forMenuItem:self];
-    
+
     return _menuItemView;
 }
 
@@ -804,6 +887,11 @@ CPControlKeyMask
     return ![self submenu] && [self menu] === [CPApp mainMenu];
 }
 
+- (CPString)description
+{
+    return [super description] + @" target: " + [self target] + @" action: " + CPStringFromSelector([self action]);
+}
+
 @end
 
 var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
@@ -844,50 +932,49 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
     {
+        _changeCount = 0;
         _isSeparator = [aCoder containsValueForKey:CPMenuItemIsSeparatorKey] && [aCoder decodeBoolForKey:CPMenuItemIsSeparatorKey];
 
         _title = [aCoder decodeObjectForKey:CPMenuItemTitleKey];
-        
+
 //        _font;
-                  
+
         _target = [aCoder decodeObjectForKey:CPMenuItemTargetKey];
         _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];
 
         _isEnabled = DEFAULT_VALUE(CPMenuItemIsEnabledKey, YES);
-        _isHidden = DEFAULT_VALUE(CPMenuItemIsHiddenKey, NO);
-        _tag = DEFAULT_VALUE(CPMenuItemTagKey, 0);
-        _state = DEFAULT_VALUE(CPMenuItemStateKey, CPOffState);
-//    int             _state;
+        _isHidden = [aCoder decodeBoolForKey:CPMenuItemIsHiddenKey];
+        _tag = [aCoder decodeIntForKey:CPMenuItemTagKey];
+        _state = [aCoder decodeIntForKey:CPMenuItemStateKey];
 
-        _image = DEFAULT_VALUE(CPMenuItemImageKey, nil);
-        _alternateImage = DEFAULT_VALUE(CPMenuItemAlternateImageKey, nil);
+        _image = [aCoder decodeObjectForKey:CPMenuItemImageKey];
+        _alternateImage = [aCoder decodeObjectForKey:CPMenuItemAlternateImageKey];
 //    CPImage         _onStateImage;
 //    CPImage         _offStateImage;
 //    CPImage         _mixedStateImage;
 
         // This order matters because setSubmenu: needs _menu to be around.
-        _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
-        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
+        _menu = [aCoder decodeObjectForKey:CPMenuItemMenuKey];
+        [self setSubmenu:[aCoder decodeObjectForKey:CPMenuItemSubmenuKey]];
 
         _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
-        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
+        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPMenuItemKeyEquivalentModifierMaskKey];
 
 //    int             _mnemonicLocation;
 
 //    BOOL            _isAlternate;
 
-        // Default is 0.
-        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
+        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey]];
 
 //    CPString        _toolTip;
 
-        _representedObject = DEFAULT_VALUE(CPMenuItemRepresentedObjectKey, nil);
-        _view = DEFAULT_VALUE(CPMenuItemViewKey, nil);
+        _representedObject = [aCoder decodeObjectForKey:CPMenuItemRepresentedObjectKey];
+        _view = [aCoder decodeObjectForKey:CPMenuItemViewKey];
     }
-    
+
     return self;
 }
 
@@ -901,11 +988,11 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
         [aCoder encodeBool:_isSeparator forKey:CPMenuItemIsSeparatorKey];
 
     [aCoder encodeObject:_title forKey:CPMenuItemTitleKey];
-        
+
     [aCoder encodeObject:_target forKey:CPMenuItemTargetKey];
     [aCoder encodeObject:_action forKey:CPMenuItemActionKey];
 
-    ENCODE_IFNOT(CPMenuItemIsEnabledKey, _isEnabled, YES); 
+    ENCODE_IFNOT(CPMenuItemIsEnabledKey, _isEnabled, YES);
     ENCODE_IFNOT(CPMenuItemIsHiddenKey, _isHidden, NO);
 
     ENCODE_IFNOT(CPMenuItemTagKey, _tag, 0);
@@ -913,7 +1000,7 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
 
     ENCODE_IFNOT(CPMenuItemImageKey, _image, nil);
     ENCODE_IFNOT(CPMenuItemAlternateImageKey, _alternateImage, nil);
-    
+
     ENCODE_IFNOT(CPMenuItemSubmenuKey, _submenu, nil);
     ENCODE_IFNOT(CPMenuItemMenuKey, _menu, nil);
 

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,14 +1,30 @@
-var HORIZONTAL_MARGIN           = 8.0,
-    SUBMENU_INDICATOR_MARGIN    = 3.0,
-    VERTICAL_MARGIN             = 4.0;
+/*
+ * _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
+ */
 
-var SelectionColor                              = nil,
-    SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-    
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@import "CPControl.j"
+@import "_CPImageAndTextView.j"
+
+@class _CPMenuBarWindow
+@class _CPMenuView
 
 @implementation _CPMenuItemMenuBarView : CPView
 {
@@ -21,31 +37,22 @@ var SelectionColor                              = nil,
     BOOL                    _isDirty;
 
     _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuIndicatorView;
 }
 
-+ (void)initialize
++ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemMenuBarView class])
-        return;
+    return "menu-item-bar-view";
+}
 
-    var bundle = [CPBundle bundleForClass:self];
-
-    SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
-
-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-    
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
++ (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,
+        };
 }
 
 + (id)view
@@ -59,20 +66,15 @@ var SelectionColor                              = nil,
 
     if (self)
     {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];
 
         [_imageAndTextView setImagePosition:CPImageLeft];
+        [_imageAndTextView setImageOffset:3.0];
         [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
         [_imageAndTextView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
 
         [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];
     }
 
@@ -90,14 +92,14 @@ var SelectionColor                              = nil,
 - (CPColor)textShadowColor
 {
     if (![_menuItem isEnabled])
-        return [CPColor colorWithWhite:0.8 alpha:0.8];
+        return [CPColor clearColor];
 
     return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
 }
 
 - (void)update
 {
-    var x = HORIZONTAL_MARGIN,
+    var x = [self valueForThemeAttribute:@"horizontal-margin"],
         height = 0.0;
 
     [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
@@ -113,41 +115,13 @@ var SelectionColor                              = nil,
 
     imageAndTextViewFrame.origin.x = x;
     x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
-
-    var hasSubmenuIndicator = [_menuItem hasSubmenu] && [_menuItem action];
-
-    if (hasSubmenuIndicator)
-    {
-        [_submenuIndicatorView setHidden:NO];
-        [_submenuIndicatorView setColor:[self textColor]];
-        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
-
-        var submenuViewFrame = [_submenuIndicatorView frame];
-
-        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
-
-        x = CGRectGetMaxX(submenuViewFrame);
-        height = MAX(height, CGRectGetHeight(submenuViewFrame));
-    }
-    else
-        [_submenuIndicatorView setHidden:YES];
-
-    height += 2.0 * VERTICAL_MARGIN;
+    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame)) + 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
-    
-    if (hasSubmenuIndicator)
-    {
-        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0) + 1.0;
-        [_submenuIndicatorView setFrame:submenuViewFrame];
-    }
 
-    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
-    
     [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
+    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
     [self setAutoresizesSubviews:YES];
 }
 
@@ -160,14 +134,11 @@ var SelectionColor                              = nil,
     if (shouldHighlight)
     {
         if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:SelectionColor];
+            [self setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView]];
 
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-
-        [_submenuIndicatorView setColor:[CPColor whiteColor]];
-        [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
+        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
     }
     else
     {
@@ -176,60 +147,7 @@ var SelectionColor                              = nil,
         [_imageAndTextView setImage:[_menuItem image]];
         [_imageAndTextView setTextColor:[self textColor]];
         [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-
-        [_submenuIndicatorView setColor:[self textColor]];
-        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
     }
 }
 
 @end
-
-@implementation _CPMenuItemMenuBarSubmenuIndicatorView : CPView
-{
-    CPColor _color;
-    CPColor _shadowColor;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color === aColor)
-        return;
-
-    _color = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)setShadowColor:(CPColor)aColor
-{
-    if (_shadowColor === aColor)
-        return;
-
-    _shadowColor = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds];
-    
-    bounds.size.height -= 1.0;
-    bounds.size.width -= 2.0;
-    bounds.origin.x += 1.0;
-
-    CGContextBeginPath(context);
-    
-    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
-    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMinY(bounds));
-    CGContextAddLineToPoint(context, CGRectGetMidX(bounds), CGRectGetMaxY(bounds));
-    
-    CGContextClosePath(context);
-    
-    CGContextSetShadowWithColor(context, CGSizeMake(0.0, 1.0), 1.1, _shadowColor || [CPColor whiteColor]);
-    CGContextSetFillColor(context, _color || [CPColor blackColor]);
-    CGContextFillPath(context);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemSeparatorView.j

@@ -1,5 +1,28 @@
+/*
+ * _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 <AppKit/CPView.j>
+@import "CPView.j"
+
+@class _CPMenuItemStandardView
 
 
 @implementation _CPMenuItemSeparatorView : CPView
@@ -27,12 +50,12 @@
         bounds = [self bounds];
 
     CGContextBeginPath(context);
-    
+
     CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
     CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-    
-    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
+
+    CGContextSetStrokeColor(context, [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-color" forClass:_CPMenuItemStandardView]);
     CGContextStrokePath(context);
 }
 
-@end
+@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,29 +1,38 @@
-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;
+/*
+ * _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
+ */
 
-var SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-    
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@import "CPControl.j"
+@import "CPImageView.j"
+@import "_CPImageAndTextView.j"
 
 @implementation _CPMenuItemStandardView : CPView
 {
     CPMenuItem              _menuItem @accessors(property=menuItem);
 
     CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
 
     CGSize                  _minSize @accessors(readonly, property=minSize);
     BOOL                    _isDirty;
+    BOOL                    _highlighted;
 
     CPImageView             _stateView;
     _CPImageAndTextView     _imageAndTextView;
@@ -31,26 +40,32 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     CPView                  _submenuIndicatorView;
 }
 
-+ (void)initialize
++ (CPString)defaultThemeClass
 {
-    if (self !== [_CPMenuItemStandardView class])
-        return;
+    return "menu-item-standard-view";
+}
 
-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0]
-    
-    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
++ (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,
+        };
 }
 
 + (id)view
@@ -60,7 +75,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 
 + (float)_standardLeftMargin
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -71,7 +86,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     {
         _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
 
-        [_stateView setImageScaling:CPScaleNone];
+        [_stateView setImageScaling:CPImageScaleNone];
 
         [self addSubview:_stateView];
 
@@ -92,7 +107,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 
         _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
 
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
         [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
 
         [self addSubview:_submenuIndicatorView];
@@ -108,7 +123,10 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     if (![_menuItem isEnabled])
         return [CPColor lightGrayColor];
 
-    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
+    if (_highlighted)
+        return [CPColor whiteColor];
+
+    return [self valueForThemeAttribute:@"menu-item-text-color"];
 }
 
 - (CPColor)textShadowColor
@@ -116,7 +134,10 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     if (![_menuItem isEnabled])
         return nil;
 
-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
+    if (_highlighted)
+        return nil;
+
+    return [self valueForThemeAttribute:@"menu-item-text-shadow-color"];
 }
 
 - (void)setFont:(CPFont)aFont
@@ -126,16 +147,34 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 
 - (void)update
 {
-    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
+    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
         height = 0.0,
         hasStateColumn = [[_menuItem menu] showsStateColumn];
 
     if (hasStateColumn)
     {
         [_stateView setHidden:NO];
-        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
 
-        x += STATE_COLUMN_WIDTH;
+        switch ([_menuItem state])
+        {
+            case CPOnState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
+                break;
+
+            case CPOffState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
+                break;
+
+            case CPMixedState:
+                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
+                break;
+
+            default:
+                break;
+        }
+
+        x += [self valueForThemeAttribute:@"state-column-width"];
     }
     else
         [_stateView setHidden:YES];
@@ -159,7 +198,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
         hasSubmenu = [_menuItem hasSubmenu];
 
     if (hasKeyEquivalent || hasSubmenu)
-        x += RIGHT_COLUMNS_MARGIN;
+        x += [self valueForThemeAttribute:@"right-columns-margin"];
 
     if (hasKeyEquivalent)
     {
@@ -170,9 +209,9 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
         [_keyEquivalentView setTextColor:[self textColor]];
         [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
         [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, [self valueForThemeAttribute:@"vertical-margin"])];
         [_keyEquivalentView sizeToFit];
-        
+
         var keyEquivalentViewFrame = [_keyEquivalentView frame];
 
         keyEquivalentViewFrame.origin.x = x;
@@ -180,7 +219,7 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
         height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
 
         if (hasSubmenu)
-            x += RIGHT_COLUMNS_MARGIN;
+            x += [self valueForThemeAttribute:@"right-columns-margin"];
     }
     else
         [_keyEquivalentView setHidden:YES];
@@ -199,28 +238,28 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
     else
         [_submenuIndicatorView setHidden:YES];
 
-    height += 2.0 * VERTICAL_MARGIN;
+    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
 
     if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
+        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];
 
     if (hasKeyEquivalent)
     {
         keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
         [_keyEquivalentView setFrame:keyEquivalentViewFrame];
     }
-    
+
     if (hasSubmenu)
     {
         submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
         [_submenuIndicatorView setFrame:submenuViewFrame];
     }
 
-    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
-    
+    _minSize = CGSizeMake(x + [self valueForThemeAttribute:@"right-margin"], height);
+
     [self setAutoresizesSubviews:NO];
     [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
@@ -230,37 +269,71 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
     // FIXME: This should probably be even throw.
     if (![_menuItem isEnabled])
-        return; 
+        return;
+
+    _highlighted = shouldHighlight;
+
+    [_imageAndTextView setTextColor:[self textColor]];
+    [_keyEquivalentView setTextColor:[self textColor]];
+    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
+    [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
 
     if (shouldHighlight)
     {
-        [self setBackgroundColor:_CPMenuItemSelectionColor];
-
+        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
-        [_submenuIndicatorView setColor:[CPColor whiteColor]];
-
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_submenuIndicatorView setColor:[self textColor]];
     }
     else
     {
         [self setBackgroundColor:nil];
-
         [_imageAndTextView setImage:[_menuItem image]];
-        [_imageAndTextView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
-
-        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
+        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
+    }
+
+    if ([[_menuItem menu] showsStateColumn])
+    {
+        if (shouldHighlight)
+        {
+            switch ([_menuItem state])
+            {
+                case CPOnState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image"]];
+                    break;
+
+                case CPOffState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-highlighted-image"]];
+                    break;
+
+                case CPMixedState:
+                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-highlighted-image"]];
+                    break;
+
+                default:
+                    break;
+            }
+        }
+        else
+        {
+            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;
+            }
+        }
     }
-    
-    if (shouldHighlight)
-        [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
-    else
-        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
 }
 
 @end
@@ -284,15 +357,15 @@ var SUBMENU_INDICATOR_COLOR                     = nil,
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         bounds = [self bounds];
-    
+
     CGContextBeginPath(context);
-    
+
     CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
     CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
     CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-    
+
     CGContextClosePath(context);
-    
+
     CGContextSetFillColor(context, _color);
     CGContextFillPath(context);
 }

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,20 +1,32 @@
+/*
+ * _CPMenuItemView.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPControl.j"
 
 @import "_CPMenuItemSeparatorView.j"
 @import "_CPMenuItemStandardView.j"
 @import "_CPMenuItemMenuBarView.j"
 
-
-var LEFT_MARGIN                 = 3.0,
-    RIGHT_MARGIN                = 16.0,
-    STATE_COLUMN_WIDTH          = 14.0,
-    INDENTATION_WIDTH           = 17.0,
-    VERTICAL_MARGIN             = 4.0;
-    
-var _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-    
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
+@global CPApp
 
 /*
     @ignore
@@ -32,36 +44,26 @@ var _CPMenuItemSelectionColor                   = nil,
     BOOL                    _isDirty;
     BOOL                    _showsStateColumn;
 
-    CPImageView             _stateView;
     _CPImageAndTextView     _imageAndTextView;
     CPView                  _submenuView;
 }
 
-+ (void)initialize
++ (CPString)defaultThemeClass
 {
-    if (self != [_CPMenuItemView class])
-        return;
-    
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0]
-    
-    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
+    return "menu-item-view";
 }
 
-+ (float)leftMargin
++ (id)themeAttributes
 {
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+    return @{};
 }
 
+// Not used in the Appkit
+// + (float)leftMargin
+// {
+//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
+// }
+
 - (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
 {
     self = [super initWithFrame:aFrame];
@@ -71,12 +73,12 @@ var _CPMenuItemSelectionColor                   = nil,
         _menuItem = aMenuItem;
         _showsStateColumn = YES;
         _isDirty = YES;
-        
+
         [self setAutoresizingMask:CPViewWidthSizable];
 
         [self synchronizeWithMenuItem];
     }
-    
+
     return self;
 }
 
@@ -110,7 +112,7 @@ var _CPMenuItemSelectionColor                   = nil,
             _view = menuItemView;
         }
     }
-    
+
     else if ([_menuItem menu] == [CPApp mainMenu])
     {
         if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
@@ -128,7 +130,7 @@ var _CPMenuItemSelectionColor                   = nil,
             [_view removeFromSuperview];
             _view = [_CPMenuItemStandardView view];
         }
-        
+
         [_view setMenuItem:_menuItem];
     }
 
@@ -159,7 +161,7 @@ var _CPMenuItemSelectionColor                   = nil,
 {
     if (![_menuItem hasSubmenu])
         return NO;
-        
+
     return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
 }
 
@@ -175,7 +177,7 @@ var _CPMenuItemSelectionColor                   = nil,
 
 - (void)setFont:(CPFont)aFont
 {
-    if (_font === aFont)
+    if ([_font isEqual:aFont])
         return;
 
     _font = aFont;
@@ -190,7 +192,7 @@ var _CPMenuItemSelectionColor                   = nil,
 {
     if (_textColor == aColor)
         return;
-    
+
     _textColor = aColor;
 
     [_imageAndTextView setTextColor:[self textColor]];
@@ -206,7 +208,7 @@ var _CPMenuItemSelectionColor                   = nil,
 {
     if (_textShadowColor == aColor)
         return;
-    
+
     _textShadowColor = aColor;
 
     [_imageAndTextView setTextShadowColor:[self textShadowColor]];
@@ -231,25 +233,23 @@ var _CPMenuItemSelectionColor                   = nil,
         return;
 
     _color = aColor;
-    
+
     [self setNeedsDisplay:YES];
 }
 
 - (void)drawRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort];
-    
+
     CGContextBeginPath(context);
-    
+
     CGContextMoveToPoint(context, 1.0, 4.0);
     CGContextAddLineToPoint(context, 9.0, 4.0);
     CGContextAddLineToPoint(context, 5.0, 8.0);
-    CGContextAddLineToPoint(context, 1.0, 4.0);
-    
     CGContextClosePath(context);
-    
+
     CGContextSetFillColor(context, _color);
     CGContextFillPath(context);
 }
 
-@end
+@end

AppKit/CPObjectController.j

@@ -0,0 +1,822 @@
+/*
+ * CPObjectController.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPCountedSet.j>
+@import <Foundation/_CPCollectionKVCOperators.j>
+
+@import "CPController.j"
+@import "CPKeyValueBinding.j"
+
+/*!
+    @class
+
+    CPObjectController is a bindings-compatible controller class.
+    Properties of the content object of an object of this class can be bound to user interface elements to change and access their values.
+
+    The content of an CPObjectController instance is an CPMutableDictionary object by default.
+    This allows a single CPObjectController instance to be used to manage several properties accessed by key value paths.
+    The default content object class can be changed by calling setObjectClass:, which a subclass must override.
+*/
+@implementation CPObjectController : CPController
+{
+    id              _contentObject;
+    id              _selection;
+
+    Class           _objectClass;
+    CPString        _objectClassName;
+
+    BOOL            _isEditable;
+    BOOL            _automaticallyPreparesContent;
+
+    CPCountedSet    _observedKeys;
+}
+
++ (id)initialize
+{
+    if (self !== [CPObjectController class])
+        return;
+
+    [self exposeBinding:@"editable"];
+    [self exposeBinding:@"contentObject"];
+}
+
++ (CPSet)keyPathsForValuesAffectingContentObject
+{
+    return [CPSet setWithObjects:"content"];
+}
+
++ (BOOL)automaticallyNotifiesObserversForKey:(CPString)aKey
+{
+    if (aKey === @"contentObject")
+        return NO;
+
+    return YES;
+}
+
++ (CPSet)keyPathsForValuesAffectingCanAdd
+{
+    return [CPSet setWithObject:"editable"];
+}
+
++ (CPSet)keyPathsForValuesAffectingCanInsert
+{
+    return [CPSet setWithObject:"editable"];
+}
+
++ (CPSet)keyPathsForValuesAffectingCanRemove
+{
+    return [CPSet setWithObjects:"editable", "selection"];
+}
+
+/*!
+    @ignore
+*/
+- (id)init
+{
+    return [self initWithContent:nil];
+}
+
+/*!
+    Inits and returns a CPObjectController object with the given content.
+
+    @param id aContent - The object the controller will use.
+    @return id the CPObjectConroller instance.
+*/
+- (id)initWithContent:(id)aContent
+{
+    if (self = [super init])
+    {
+        [self setEditable:YES];
+        [self setObjectClass:[CPMutableDictionary class]];
+
+        _observedKeys = [[CPCountedSet alloc] init];
+        _selection = [[CPControllerSelectionProxy alloc] initWithController:self];
+
+        [self setContent:aContent];
+    }
+
+    return self;
+}
+
+/*!
+    Returns the controller's content object.
+    @return id - The content object of the controller.
+*/
+- (id)content
+{
+    return _contentObject;
+}
+
+/*!
+    Sets the content object for the controller.
+    @param id aContent - The new content object for the controller.
+*/
+- (void)setContent:(id)aContent
+{
+    [self willChangeValueForKey:@"contentObject"];
+    [self _selectionWillChange];
+
+    _contentObject = aContent;
+
+    [self _selectionDidChange];
+    [self didChangeValueForKey:@"contentObject"];
+}
+
+/*!
+    @ignore
+*/
+- (void)_setContentObject:(id)aContent
+{
+    [self setContent:aContent];
+}
+
+/*!
+    @ignore
+*/
+- (id)_contentObject
+{
+    return [self content];
+}
+
+/*!
+    Sets whether the controller automatically creates and inserts new content objects automatically when loading from a cib file.
+    If you pass YES and the controller uses prepareContent to create the content object.
+    The default is NO.
+
+    @param BOOL shouldAutomaticallyPrepareContent - YES if the content should be prepared, otherwise NO.
+*/
+- (void)setAutomaticallyPreparesContent:(BOOL)shouldAutomaticallyPrepareContent
+{
+    _automaticallyPreparesContent = shouldAutomaticallyPrepareContent;
+}
+
+/*!
+    Returns if the controller prepares the content automatically.
+    @return BOOL - YES if the content is prepared, otherwise NO.
+*/
+- (BOOL)automaticallyPreparesContent
+{
+    return _automaticallyPreparesContent;
+}
+
+/*!
+    Overridden by a subclass that require control over the creation of new objects.
+*/
+- (void)prepareContent
+{
+    [self setContent:[self newObject]];
+}
+
+/*!
+    Sets the object class when creating new objects.
+    @param Class - the class of new objects that will be created.
+*/
+- (void)setObjectClass:(Class)aClass
+{
+    _objectClass = aClass;
+}
+
+/*!
+    Returns the class of what new objects will be when they are created.
+
+    @return Class - The class of new objects.
+*/
+- (Class)objectClass
+{
+    return _objectClass;
+}
+
+/*!
+    @ignore
+*/
+- (id)_defaultNewObject
+{
+    return [[[self objectClass] alloc] init];
+}
+
+/*!
+    Creates and returns a new object of the appropriate class.
+    @return id - The object created.
+*/
+- (id)newObject
+{
+    return [self _defaultNewObject];
+}
+
+/*!
+    Sets the controller's content object.
+    @param id anObject - The object to set for the controller.
+*/
+- (void)addObject:(id)anObject
+{
+    [self setContent:anObject];
+
+    var binderClass = [[self class] _binderClassForBinding:@"contentObject"];
+    [[binderClass getBinding:@"contentObject" forObject:self] reverseSetValueFor:@"contentObject"];
+}
+
+/*!
+    Removes a given object from the controller.
+    @param id anObject - The object to remove from the receiver.
+*/
+- (void)removeObject:(id)anObject
+{
+    if ([self content] === anObject)
+        [self setContent:nil];
+
+    var binderClass = [[self class] _binderClassForBinding:@"contentObject"];
+    [[binderClass getBinding:@"contentObject" forObject:self] reverseSetValueFor:@"contentObject"];
+}
+
+/*!
+    Creates and adds a sets the object as the controller's content.
+    @param id aSender - The sender of the message.
+*/
+- (void)add:(id)aSender
+{
+    // FIXME: This should happen on the next run loop?
+    [self addObject:[self newObject]];
+}
+
+/*!
+    @return BOOL - YES if you can added to the controller using add:
+*/
+- (BOOL)canAdd
+{
+    return [self isEditable];
+}
+
+/*!
+    Removes the content object from the controller.
+    @param id aSender - The sender of the message.
+*/
+- (void)remove:(id)aSender
+{
+    // FIXME: This should happen on the next run loop?
+    [self removeObject:[self content]];
+}
+
+/*!
+    @return BOOL - Returns YES if you can remove the controller's content using remove:
+*/
+- (BOOL)canRemove
+{
+    return [self isEditable] && [[self selectedObjects] count];
+}
+
+/*!
+    Sets whether the controller allows for the editing of the content.
+    @param BOOL shouldBeEditable - YES if the content should be editable, otherwise NO.
+*/
+- (void)setEditable:(BOOL)shouldBeEditable
+{
+    _isEditable = shouldBeEditable;
+}
+
+/*!
+    @return BOOL - Returns YES if the content of the controller is editable, otherwise NO.
+*/
+- (BOOL)isEditable
+{
+    return _isEditable;
+}
+
+/*!
+    @return CPArray - Returns an array of all objects to be affected by editing.
+*/
+- (CPArray)selectedObjects
+{
+    return [[_CPObservableArray alloc] initWithArray:[_contentObject]];
+}
+
+/*!
+    Returns a proxy object representing the controller's selection.
+*/
+- (id)selection
+{
+    return _selection;
+}
+
+/*!
+    @ignore
+*/
+- (void)_selectionWillChange
+{
+    [_selection controllerWillChange];
+    [self willChangeValueForKey:@"selection"];
+}
+
+/*!
+    @ignore
+*/
+- (void)_selectionDidChange
+{
+    if (_selection === undefined || _selection === nil)
+        _selection = [[CPControllerSelectionProxy alloc] initWithController:self];
+
+    [_selection controllerDidChange];
+    [self didChangeValueForKey:@"selection"];
+}
+
+/*!
+    @return id - Returns the keys which are being observed.
+*/
+- (id)observedKeys
+{
+    return _observedKeys;
+}
+
+- (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
+{
+   [_observedKeys addObject:aKeyPath];
+   [super addObserver:anObserver forKeyPath:aKeyPath options:options context:context];
+}
+
+- (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
+{
+   [_observedKeys removeObject:aKeyPath];
+   [super removeObserver:anObserver forKeyPath:aKeyPath];
+}
+
+@end
+
+var CPObjectControllerContentKey                        = @"CPObjectControllerContentKey",
+    CPObjectControllerObjectClassNameKey                = @"CPObjectControllerObjectClassNameKey",
+    CPObjectControllerIsEditableKey                     = @"CPObjectControllerIsEditableKey",
+    CPObjectControllerAutomaticallyPreparesContentKey   = @"CPObjectControllerAutomaticallyPreparesContentKey";
+
+@implementation CPObjectController (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        var objectClassName = [aCoder decodeObjectForKey:CPObjectControllerObjectClassNameKey],
+            objectClass = CPClassFromString(objectClassName);
+
+        [self setObjectClass:objectClass || [CPMutableDictionary class]];
+        [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
+        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
+        [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];
+
+        _observedKeys = [[CPCountedSet alloc] init];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:[self content] forKey:CPObjectControllerContentKey];
+
+    if (_objectClass)
+        [aCoder encodeObject:CPStringFromClass(_objectClass) forKey:CPObjectControllerObjectClassNameKey];
+    else if (_objectClassName)
+        [aCoder encodeObject:_objectClassName forKey:CPObjectControllerObjectClassNameKey];
+
+    [aCoder encodeBool:[self isEditable] forKey:CPObjectControllerIsEditableKey];
+    [aCoder encodeBool:[self automaticallyPreparesContent] forKey:CPObjectControllerAutomaticallyPreparesContentKey];
+}
+
+- (void)awakeFromCib
+{
+    if (![self content] && [self automaticallyPreparesContent])
+        [self prepareContent];
+}
+
+@end
+
+@implementation _CPObservationProxy : CPObject
+{
+    id      _keyPath;
+    id      _observer;
+    id      _object;
+
+    BOOL    _notifyObject;
+
+    id      _context;
+    int     _options;
+}
+
+- (id)initWithKeyPath:(id)aKeyPath observer:(id)anObserver object:(id)anObject
+{
+    if (self = [super init])
+    {
+        _keyPath  = aKeyPath;
+        _observer = anObserver;
+        _object   = anObject;
+    }
+
+    return self;
+}
+
+- (id)observer
+{
+    return _observer;
+}
+
+- (id)keyPath
+{
+    return _keyPath;
+}
+
+- (id)context
+{
+   return _context;
+}
+
+- (int)options
+{
+   return _options;
+}
+
+- (void)setNotifyObject:(BOOL)notify
+{
+   _notifyObject = notify;
+}
+
+- (BOOL)isEqual:(id)anObject
+{
+    if ([anObject class] === [self class])
+    {
+        if (anObject._observer === _observer && [anObject._keyPath isEqual:_keyPath] && [anObject._object isEqual:_object])
+            return YES;
+    }
+
+    return NO;
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)change context:(id)context
+{
+    if (_notifyObject)
+        [_object observeValueForKeyPath:aKeyPath ofObject:_object change:change context:context];
+
+    [_observer observeValueForKeyPath:aKeyPath ofObject:_object change:change context:context];
+}
+
+- (CPString)description
+{
+    return [super description] + [CPString stringWithFormat:@"observation proxy for %@ on key path %@", _observer, _keyPath];
+}
+
+@end
+
+// FIXME: This should subclass CPMutableArray not _CPJavaScriptArray
+@implementation _CPObservableArray : _CPJavaScriptArray
+{
+    CPArray     _observationProxies;
+}
+
++ (id)alloc
+{
+    var a = [];
+    a.isa = self;
+
+    var ivars = class_copyIvarList(self),
+        count = ivars.length;
+
+    while (count--)
+        a[ivar_getName(ivars[count])] = nil;
+
+    return a;
+}
+
+- (CPString)description
+{
+    return "<_CPObservableArray: " + [super description] + " >";
+}
+
+- (id)initWithArray:(CPArray)anArray
+{
+    self = [super initWithArray:anArray];
+
+    self.isa = [_CPObservableArray class];
+    self._observationProxies = [];
+
+    return self;
+}
+
+- (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
+{
+    if (aKeyPath.charAt(0) === "@")
+    {
+        // Simple collection operators are scalar and can't be proxied
+        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
+            return;
+
+        var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self];
+
+        proxy._options = options;
+        proxy._context = context;
+
+        [_observationProxies addObject:proxy];
+
+        var dotIndex = aKeyPath.indexOf("."),
+            remaining = aKeyPath.substring(dotIndex + 1),
+            indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];
+
+        [self addObserver:proxy toObjectsAtIndexes:indexes forKeyPath:remaining options:options context:context];
+    }
+    else
+    {
+        var indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];
+        [self addObserver:anObserver toObjectsAtIndexes:indexes forKeyPath:aKeyPath options:options context:context];
+    }
+}
+
+- (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
+{
+    if (aKeyPath.charAt(0) === "@")
+    {
+        // Simple collection operators are scalar and can't be proxied
+        if ([_CPCollectionKVCOperator isSimpleCollectionOperator:aKeyPath])
+            return;
+
+        var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObserver object:self],
+            index = [_observationProxies indexOfObject:proxy];
+
+        proxy = [_observationProxies objectAtIndex:index];
+
+        var dotIndex = aKeyPath.indexOf("."),
+            remaining = aKeyPath.substring(dotIndex + 1),
+            indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];
+
+        [self removeObserver:proxy fromObjectsAtIndexes:indexes forKeyPath:remaining];
+    }
+    else
+    {
+        var indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];
+        [self removeObserver:anObserver fromObjectsAtIndexes:indexes forKeyPath:aKeyPath];
+    }
+}
+
+- (void)insertObject:(id)anObject atIndex:(unsigned)anIndex
+{
+    for (var i = 0, count = [_observationProxies count]; i < count; i++)
+    {
+        var proxy = [_observationProxies objectAtIndex:i],
+            keyPath = [proxy keyPath],
+            operator = keyPath.charAt(0) === ".";
+
+        if (operator)
+            [self willChangeValueForKey:keyPath];
+
+        [anObject addObserver:proxy forKeyPath:keyPath options:[proxy options] context:[proxy context]];
+
+        if (operator)
+            [self didChangeValueForKey:keyPath];
+    }
+
+    [super insertObject:anObject atIndex:anIndex];
+}
+
+- (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) === ".";
+
+        if (operator)
+            [self willChangeValueForKey:keyPath];
+
+        [currentObject removeObserver:proxy forKeyPath:keyPath];
+
+        if (operator)
+            [self didChangeValueForKey:keyPath];
+    }
+
+    [super removeObjectAtIndex:anIndex];
+}
+
+- (_CPObservableArray)objectsAtIndexes:(CPIndexSet)theIndexes
+{
+    return [_CPObservableArray arrayWithArray:[super objectsAtIndexes:theIndexes]];
+}
+
+- (void)addObject:(id)anObject
+{
+   [self insertObject:anObject atIndex:[self count]];
+}
+
+- (void)removeLastObject
+{
+   [self removeObjectAtIndex:[self count]];
+}
+
+- (void)replaceObjectAtIndex:(unsigned)anIndex withObject:(id)anObject
+{
+    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) === ".";
+
+        if (operator)
+            [self willChangeValueForKey:keyPath];
+
+        [currentObject removeObserver:proxy forKeyPath:keyPath];
+        [anObject addObserver:proxy forKeyPath:keyPath options:[proxy options] context:[proxy context]];
+
+        if (operator)
+            [self didChangeValueForKey:keyPath];
+    }
+
+    [super replaceObjectAtIndex:anIndex withObject:anObject];
+}
+
+@end
+
+@implementation CPControllerSelectionProxy : CPObject
+{
+    id                  _controller;
+    id                  _keys;
+
+    CPDictionary        _cachedValues;
+    CPArray             _observationProxies;
+
+    Object              _observedObjectsByKeyPath;
+}
+
+- (id)initWithController:(id)aController
+{
+    if (self = [super init])
+    {
+        _cachedValues = @{};
+        _observationProxies = [CPArray array];
+        _controller = aController;
+        _observedObjectsByKeyPath = {};
+    }
+
+    return self;
+}
+
+- (id)_controllerMarkerForValues:(CPArray)theValues
+{
+    var count = [theValues count],
+        value;
+
+    if (!count)
+        value = CPNoSelectionMarker;
+    else if (count === 1)
+        value = [theValues objectAtIndex:0];
+    else
+    {
+        if ([_controller alwaysUsesMultipleValuesMarker])
+            value = CPMultipleValuesMarker;
+        else
+        {
+            value = [theValues objectAtIndex:0];
+
+            for (var i = 0, count = [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
+            {
+                if (![value isEqual:[theValues objectAtIndex:i]])
+                    value = CPMultipleValuesMarker;
+            }
+        }
+    }
+
+    if (value === nil || value.isa && [value isEqual:[CPNull null]])
+        value = CPNullMarker;
+
+    return value;
+}
+
+- (id)valueForKeyPath:(CPString)theKeyPath
+{
+    var values = [[_controller selectedObjects] valueForKeyPath:theKeyPath];
+
+    // Simple collection operators like @count return a scalar value, not an array or set
+    if ([values isKindOfClass:CPArray] || [values isKindOfClass:CPSet])
+    {
+        var value = [self _controllerMarkerForValues:values];
+        [_cachedValues setObject:value forKey:theKeyPath];
+
+        return value;
+    }
+    else
+        return values;
+}
+
+- (id)valueForKey:(CPString)theKeyPath
+{
+    return [self valueForKeyPath:theKeyPath];
+}
+
+- (void)setValue:(id)theValue forKeyPath:(CPString)theKeyPath
+{
+    [[_controller selectedObjects] setValue:theValue forKeyPath:theKeyPath];
+    [_cachedValues removeObjectForKey:theKeyPath];
+
+    // Allow handlesContentAsCompoundValue to work, based on observation of Cocoa's
+    // NSArrayController - when handlesContentAsCompoundValue and setValue:forKey:@"selection.X"
+    // is called, the array controller causes the compound value to be rewritten if
+    // handlesContentAsCompoundValue == YES. Note that
+    // A) this doesn't use observation (observe: X is not visible in backtraces)
+    // B) it only happens through the selection proxy and not on arrangedObject.X, content.X
+    // or even selectedObjects.X.
+    // FIXME The main code for this should somehow be in CPArrayController and also work
+    // for table based row edits.
+    [[CPBinder getBinding:@"contentArray" forObject:_controller] _contentArrayDidChange];
+}
+
+- (void)setValue:(id)theValue forKey:(CPString)theKeyPath
+{
+    [self setValue:theKeyPath forKeyPath:theKeyPath];
+}
+
+- (unsigned)count
+{
+    return [_cachedValues count];
+}
+
+- (id)keyEnumerator
+{
+    return [_cachedValues keyEnumerator];
+}
+
+- (void)controllerWillChange
+{
+    _keys = [_cachedValues allKeys];
+
+    if (!_keys)
+        return;
+
+    for (var i = 0, count = _keys.length; i < count; i++)
+        [self willChangeValueForKey:_keys[i]];
+
+    [_cachedValues removeAllObjects];
+}
+
+- (void)controllerDidChange
+{
+    [_cachedValues removeAllObjects];
+
+    if (!_keys)
+        return;
+
+    for (var i = 0, count = _keys.length; i < count; i++)
+        [self didChangeValueForKey:_keys[i]];
+
+   _keys = nil;
+}
+
+- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)change context:(id)context
+{
+    [_cachedValues removeObjectForKey:aKeyPath];
+}
+
+- (void)addObserver:(id)anObject forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
+{
+    var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObject object:self];
+
+    [proxy setNotifyObject:YES];
+    [_observationProxies addObject:proxy];
+
+    // We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
+    var observedObjects = [_controller selectedObjects];
+    _observedObjectsByKeyPath[aKeyPath] = observedObjects;
+    [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
+}
+
+- (void)removeObserver:(id)anObject forKeyPath:(CPString)aKeyPath
+{
+    var proxy = [[_CPObservationProxy alloc] initWithKeyPath:aKeyPath observer:anObject object:self],
+        index = [_observationProxies indexOfObject:proxy];
+
+    var observedObjects = _observedObjectsByKeyPath[aKeyPath];
+    [observedObjects removeObserver:[_observationProxies objectAtIndex:index] forKeyPath:aKeyPath];
+
+    [_observationProxies removeObjectAtIndex:index];
+
+    _observedObjectsByKeyPath[aKeyPath] = nil;
+}
+
+@end

AppKit/CPOpenPanel.j

@@ -1,5 +1,26 @@
+/*
+ * CPOpenPanel.j
+ * AppKit
+ *
+ * Created by Ross Boucher.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
-@import <AppKit/CPPanel.j>
+@import "CPPanel.j"
 
 
 @implementation CPOpenPanel : CPPanel
@@ -26,9 +47,9 @@
         var options = { directoryURL: [self directoryURL],
                         canChooseFiles: [self canChooseFiles],
                         canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] };
+                        allowsMultipleSelection: [self allowsMultipleSelection] },
 
-        var result = window.cpOpenPanel(options);
+            result = window.cpOpenPanel(options);
 
         _URLs = result.URLs;
 

AppKit/CPPanel.j

@@ -26,7 +26,7 @@
 CPOKButton      = 1;
 CPCancelButton  = 0;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPPanel
 
@@ -51,7 +51,7 @@ CPCancelButton  = 0;
     @global
     @class CPWindow
 */
-CPDocModalWindowMask			= 1 << 6;
+CPDocModalWindowMask    = 1 << 6;
 
 @implementation CPPanel : CPWindow
 {
@@ -114,4 +114,9 @@ CPDocModalWindowMask			= 1 << 6;
     return NO;
 }
 
+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+
 @end

AppKit/CPPasteboard.j

@@ -22,11 +22,10 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
+@import <Foundation/CPData.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
-#include "Platform/Platform.h"
-
 
 CPGeneralPboard         = @"CPGeneralPboard";
 CPFontPboard            = @"CPFontPboard";
@@ -52,18 +51,18 @@ CPImagePboardType       = @"CPImagePboardType";
 var CPPasteboards = nil,
     supportsNativePasteboard = NO;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPPasteboard
 
-    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations. 
+    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations.
 */
 @implementation CPPasteboard : CPObject
 {
     CPArray         _types;
     CPDictionary    _owners;
     CPDictionary    _provided;
-    
+
     unsigned        _changeCount;
     CPString        _stateUID;
 
@@ -75,12 +74,12 @@ var CPPasteboards = nil,
 */
 + (void)initialize
 {
-    if (self != [CPPasteboard class])
+    if (self !== [CPPasteboard class])
         return;
 
     [self setVersion:1.0];
-    
-    CPPasteboards = [CPDictionary dictionary];
+
+    CPPasteboards = @{};
 
     if (typeof window.cpPasteboardWithName !== "undefined")
         supportsNativePasteboard = YES;
@@ -105,10 +104,10 @@ var CPPasteboards = nil,
 
     if (pasteboard)
         return pasteboard;
-    
+
     pasteboard = [[CPPasteboard alloc] _initWithName:aName];
     [CPPasteboards setObject:pasteboard forKey:aName];
-    
+
     return pasteboard;
 }
 
@@ -116,15 +115,15 @@ var CPPasteboards = nil,
 - (id)_initWithName:(CPString)aName
 {
     self = [super init];
-    
+
     if (self)
     {
-        _name = aName;
+//        _name = aName;
         _types = [];
-        
-        _owners = [CPDictionary dictionary];
-        _provided = [CPDictionary dictionary];
-        
+
+        _owners = @{};
+        _provided = @{};
+
         _changeCount = 0;
 
         if (supportsNativePasteboard)
@@ -133,7 +132,7 @@ var CPPasteboards = nil,
             [self _synchronizePasteboard];
         }
     }
-    
+
     return self;
 }
 
@@ -147,17 +146,17 @@ var CPPasteboards = nil,
 {
     var i = 0,
         count = types.length;
-    
+
     for (; i < count; ++i)
     {
         var type = types[i];
-        
-        if(![_owners objectForKey:type])
+
+        if (![_owners objectForKey:type])
         {
             [_types addObject:type];
             [_provided removeObjectForKey:type];
         }
-        
+
         [_owners setObject:anOwner forKey:type];
     }
 
@@ -189,11 +188,11 @@ var CPPasteboards = nil,
 {
     [_types setArray:types];
 
-    _owners = [CPDictionary dictionary];
-    _provided = [CPDictionary dictionary];
+    _owners = @{};
+    _provided = @{};
 
     var count = _types.length;
-    
+
     while (count--)
         [_owners setObject:anOwner forKey:_types[count]];
 
@@ -249,14 +248,14 @@ var CPPasteboards = nil,
 
 // Determining Types
 /*!
-    Checks the pasteboard's types for a match with the types listen in the specified array. The array should
+    Checks the pasteboard's types for a match with the types listed in the specified array. The array should
     be ordered by the requestor's most preferred data type first.
     @param anArray an array of requested types ordered by preference
     @return the highest match with the pasteboard's supported types or \c nil if no match was found
 */
 - (CPString)availableTypeFromArray:(CPArray)anArray
 {
-    return [[self types] firstObjectCommonWithArray:anArray];
+    return [anArray firstObjectCommonWithArray:[self types]];
 }
 
 /*!
@@ -285,18 +284,18 @@ var CPPasteboards = nil,
 - (CPData)dataForType:(CPString)aType
 {
     var data = [_provided objectForKey:aType];
-    
+
     if (data)
         return data;
-        
+
     var owner = [_owners objectForKey:aType];
-    
+
     if (owner)
     {
-        [owner pasteboard:self provideDataForType:aType];        
+        [owner pasteboard:self provideDataForType:aType];
         return [_provided objectForKey:aType];
     }
-    
+
     if (aType === CPStringPboardType)
         return [self dataForType:UTF8PboardType];
 
@@ -341,10 +340,10 @@ var CPPasteboards = nil,
 - (id)propertyListForType:(CPString)aType
 {
     var data = [self dataForType:aType];
-    
+
     if (data)
         return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
-        
+
     return nil;
 }
 
@@ -362,9 +361,9 @@ var CPPasteboards = nil,
 - (CPString)_generateStateUID
 {
     var bits = 32;
-        
+
     _stateUID = @"";
-    
+
     while (bits--)
         _stateUID += FLOOR(RAND() * 16.0).toString(16).toUpperCase();
 

AppKit/CPPopover.j

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

@@ -20,36 +20,31 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <AppKit/CGGeometry.j>
-@import <AppKit/CPImageView.j>
-@import <AppKit/CPView.j>
-
-#include "CoreGraphics/CGGeometry.h"
+@import "CGGeometry.j"
+@import "CPImageView.j"
+@import "CPView.j"
+@import "CPWindow_Constants.j"
 
 
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorBarStyle         = 0;
+CPProgressIndicatorBarStyle = 0;
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorSpinningStyle    = 1;
+CPProgressIndicatorSpinningStyle = 1;
 /*
     @global
     @group CPProgressIndicatorStyle
 */
-CPProgressIndicatorHUDBarStyle      = 2;
+CPProgressIndicatorHUDBarStyle = 2;
 
-var CPProgressIndicatorSpinningStyleColors  = nil,
+var CPProgressIndicatorSpinningStyleColors = [];
 
-    CPProgressIndicatorClassName            = nil,
-    CPProgressIndicatorStyleIdentifiers     = nil,
-    CPProgressIndicatorStyleSizes           = nil;
-
-/*! 
+/*!
     @ingroup appkit
     @class CPProgressIndicator
 
@@ -61,104 +56,65 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     double                      _minValue;
     double                      _maxValue;
-    
+
     double                      _doubleValue;
-    
+
     CPControlSize               _controlSize;
-    
-    BOOL                        _isIndeterminate;
+
+    BOOL                        _indeterminate;
     CPProgressIndicatorStyle    _style;
-    
+
     BOOL                        _isAnimating;
-    
+
     BOOL                        _isDisplayedWhenStoppedSet;
     BOOL                        _isDisplayedWhenStopped;
-    
-    CPView                      _barView;
 }
 
-/*
-    @ignore
-*/
-+ (void)initialize
++ (CPString)defaultThemeClass
 {
-    if (self != [CPProgressIndicator class])
-        return;
-    
-    var bundle = [CPBundle bundleForClass:self];
-    
-    CPProgressIndicatorSpinningStyleColors = [];
-    
-    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
-        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
-    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)]];
+    return @"progress-indicator";
+}
 
-    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 = [];
++ (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],
+        };
+}
 
-    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
-    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
-    CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
-    
-    var regularIdentifier = _CPControlIdentifierForControlSize(CPRegularControlSize),
-        smallIdentifier = _CPControlIdentifierForControlSize(CPSmallControlSize),
-        miniIdentifier = _CPControlIdentifierForControlSize(CPMiniControlSize);
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding === CPValueBinding || aBinding === @"isIndeterminate")
+        return [_CPProgressIndicatorBinder class];
 
-    CPProgressIndicatorStyleSizes = [];
-
-    // Bar Sttyle
-    var prefixes = [
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
-    ];
-
-    for (var i = 0, count = prefixes.length; i<count; i++)
-    {
-        var prefix = prefixes[i];
-        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-        CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-        CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
-    }
+    return [super _binderClassForBinding:aBinding];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         _minValue = 0.0;
         _maxValue = 100.0;
-        
+
         _doubleValue = 0.0;
-        
+
         _style = CPProgressIndicatorBarStyle;
         _isDisplayedWhenStoppedSet = NO;
-        
+
         _controlSize = CPRegularControlSize;
-        
-        [self updateBackgroundColor];
-        [self drawBar];
+
+        [self setNeedsLayout];
     }
-    
+
     return self;
 }
 
@@ -176,7 +132,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)startAnimation:(id)aSender
 {
     _isAnimating = YES;
-    
+
     [self _hideOrDisplay];
 }
 
@@ -215,7 +171,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)setDoubleValue:(double)aValue
 {
     _doubleValue = MIN(MAX(aValue, _minValue), _maxValue);
-    
+
     [self drawBar];
 }
 
@@ -270,7 +226,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_controlSize == aControlSize)
         return;
-    
+
     _controlSize = aControlSize;
 
     [self updateBackgroundColor];
@@ -292,7 +248,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*
-    Not yet impemented.
+    Not yet implemented.
 */
 - (CPControlTint)controlTint
 {
@@ -318,12 +274,12 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     Specifies whether this progress indicator should be indeterminate or display progress based on it's max and min.
     @param isDeterminate \c YES makes the indicator indeterminate
 */
-- (void)setIndeterminate:(BOOL)isIndeterminate
+- (void)setIndeterminate:(BOOL)indeterminate
 {
-    if (_isIndeterminate == isIndeterminate)
+    if (_indeterminate == indeterminate)
         return;
-    
-    _isIndeterminate = isIndeterminate;
+
+    _indeterminate = indeterminate;
 
     [self updateBackgroundColor];
 }
@@ -333,7 +289,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 */
 - (BOOL)isIndeterminate
 {
-    return _isIndeterminate;
+    return _indeterminate;
 }
 
 /*!
@@ -344,9 +300,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_style == aStyle)
         return;
-    
+
     _style = aStyle;
-    
+
+    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+
     [self updateBackgroundColor];
 }
 
@@ -358,9 +316,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     if (_style == CPProgressIndicatorSpinningStyle)
         [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
     else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + 
-            _CPControlIdentifierForControlSize(_controlSize)][0].height)];
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
 }
 
 /*!
@@ -372,11 +328,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_isDisplayedWhenStoppedSet && _isDisplayedWhenStopped == isDisplayedWhenStopped)
         return;
-        
+
     _isDisplayedWhenStoppedSet = YES;
-    
+
     _isDisplayedWhenStopped = isDisplayedWhenStopped;
-    
+
     [self _hideOrDisplay];
 }
 
@@ -387,10 +343,10 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_isDisplayedWhenStoppedSet)
         return _isDisplayedWhenStopped;
-    
+
     if (_style == CPProgressIndicatorBarStyle || _style == CPProgressIndicatorHUDBarStyle)
         return YES;
-    
+
     return NO;
 }
 
@@ -403,63 +359,78 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)setFrameSize:(CGSize)aSize
 {
     [super setFrameSize:aSize];
-    
+
     [self drawBar];
 }
 
 /* @ignore */
 - (void)drawBar
 {
-    if (_style == CPProgressIndicatorSpinningStyle)
-        return;
-    
-    if (!_barView)
+    [self setNeedsLayout];
+}
+
+- (CPView)createEphemeralSubviewNamed:(CPString)aName
+{
+    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
+}
+
+- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
+{
+    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
     {
-        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];        
-        [self addSubview:_barView];
+        var width = CGRectGetWidth([self bounds]),
+            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+
+        if (barWidth > 0.0 && barWidth < 4.0)
+            barWidth = 4.0;
+
+        if (_indeterminate)
+            barWidth = width;
+
+        return _CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
     }
-    
-    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
-        NO,
-        CPProgressIndicatorStyleSizes,
-        CPProgressIndicatorClassName,
-        @"Bar",
-        CPProgressIndicatorStyleIdentifiers[_style],
-        _CPControlIdentifierForControlSize(_controlSize))];
 
-    var width = CGRectGetWidth([self bounds]),
-        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
-
-    if (barWidth > 0.0 && barWidth < 4.0)
-        barWidth = 4.0;
-
-    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
+    return nil;
 }
 
 /* @ignore */
 - (void)updateBackgroundColor
+{
+    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)
         {
-            [_barView removeFromSuperview];
-            
-            _barView = nil;
-            
+            // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
+            [self layoutEphemeralSubviewNamed:"bar-view"
+                                   positioned:CPWindowBelow
+              relativeToEphemeralSubviewNamed:nil];
+
             [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
         }
         else
         {
-            [self setBackgroundColor:_CPControlThreePartImagePattern(
-                NO,
-                CPProgressIndicatorStyleSizes,
-                CPProgressIndicatorClassName,
-                @"BezelBorder",
-                CPProgressIndicatorStyleIdentifiers[_style],
-                _CPControlIdentifierForControlSize(_controlSize))];
-                
-            [self drawBar];
+           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+
+           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
+                                                 positioned:CPWindowBelow
+                            relativeToEphemeralSubviewNamed:nil];
+
+           if (_indeterminate)
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
+           else
+               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
         }
     }
     else
@@ -467,3 +438,97 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 @end
+
+
+@implementation CPProgressIndicator (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _minValue                   = [aCoder decodeObjectForKey:@"_minValue"];
+        _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
+        _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
+        _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
+        _indeterminate              = [aCoder decodeObjectForKey:@"_indeterminate"];
+        _style                      = [aCoder decodeIntForKey:@"_style"];
+        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
+        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
+        _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
+
+        [self updateBackgroundColor];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    // Don't encode the background colour. It can be recreated based on the flags
+    // and if encoded causes hardcoded image paths in the cib while just wasting space.
+    var backgroundColor = [self backgroundColor];
+    [self setBackgroundColor:nil];
+    [super encodeWithCoder:aCoder];
+    [self setBackgroundColor:backgroundColor];
+
+    [aCoder encodeObject:_minValue forKey:@"_minValue"];
+    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
+    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
+    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
+    [aCoder encodeObject:_indeterminate forKey:@"_indeterminate"];
+    [aCoder encodeInt:_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,28 +25,31 @@
 
 @import "CPButton.j"
 
+@global CPApp
+
+
 /*!
     @ingroup appkit
-    
+
     from this mailing list thread:
-    http://groups.google.com/group/objectivej/browse_thread/thread/7c41cbd9cbee9ea3    
-    
+    http://groups.google.com/group/objectivej/browse_thread/thread/7c41cbd9cbee9ea3
+
     -----------------------------------
-    
+
     Creating a checkbox is easy enough:
-    
+
     checkbox = [[CPCheckBox alloc] initWithFrame:aFrame];
-    
+
     That's basically all there is to it. Radio buttons are very similar,
     the key difference is the introduction of a new class CPRadioGroup,
     which defines which radio buttons are part of the same group:
-    
+
     [myRadioButton setRadioGroup:aRadioGroup];
-    
+
     Every radio button receives a unique radio group by default (so if you
     do nothing further, they will all behave independently), but you can
     use an existing radio button's group with other buttons as so:
-    
+
     button1 = [[CPRadio alloc] initWithFrame:aFrame];
     ...
     button2 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
@@ -55,13 +58,16 @@
     button3 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
     radioGroup]];
     ...etc...
-    
+
     Here, all the radio buttons will act "together". [[button1 radioGroup]
     allRadios] returns every button that's part of this group, and
     [[button1 radioGroup] selectedRadio] returns the currently selected
     option.
 
 */
+
+CPRadioImageOffset = 4.0;
+
 @implementation CPRadio : CPButton
 {
     CPRadioGroup    _radioGroup;
@@ -86,7 +92,7 @@
     return button;
 }
 
-+ (CPString)themeClass
++ (CPString)defaultThemeClass
 {
     return @"radio";
 }
@@ -95,7 +101,7 @@
 - (id)initWithFrame:(CGRect)aFrame radioGroup:(CPRadioGroup)aRadioGroup
 {
     self = [super initWithFrame:aFrame];
-    
+
     if (self)
     {
         [self setRadioGroup:aRadioGroup];
@@ -109,8 +115,8 @@
 
         [self setBordered:YES];
     }
-    
-    return self; 
+
+    return self;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -141,11 +147,19 @@
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
-    
+
     if ([self state] === CPOnState)
         [_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";
@@ -169,33 +183,143 @@ 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
 {
-    CPSet   _radios;
+    CPArray _radios;
     CPRadio _selectedRadio;
 
+    BOOL    _enabled @accessors(getter=enabled);
+    BOOL    _hidden @accessors(getter=hidden);
+
     id      _target @accessors(property=target);
     SEL     _action @accessors(property=action);
 }
 
++ (void)initialize
+{
+    if (self !== [CPRadioGroup class])
+        return;
+
+    [self exposeBinding:CPSelectedValueBinding];
+    [self exposeBinding:CPSelectedTagBinding];
+    [self exposeBinding:CPSelectedIndexBinding];
+
+    [self exposeBinding:CPEnabledBinding];
+    [self exposeBinding:CPHiddenBinding];
+}
+
 - (id)init
 {
     self = [super init];
 
     if (self)
     {
-        _radios = [CPSet set];
+        _radios = [];
         _selectedRadio = nil;
+        _enabled = YES;
+        _hidden = NO;
     }
 
     return self;
 }
 
+/*!
+    Selects the radio button at the given index within the group.
+    If index is -1, all of the radio buttons are turned off.
+*/
+- (void)selectRadioAtIndex:(int)index
+{
+    if (index === -1)
+        [self _setSelectedRadio:nil];
+    else
+    {
+        var radio = [_radios objectAtIndex:index];
+
+        [self _setSelectedRadio:radio];
+        [radio setState:CPOnState];
+    }
+}
+
+/*!
+    Selects the first radio button within the group with the given tag.
+    If a radio button with the given tag is found, selects it
+    and returns YES. Otherwise returns NO.
+*/
+- (BOOL)selectRadioWithTag:(int)tag
+{
+    var index = [_radios indexOfObjectPassingTest:function(radio)
+                    {
+                        return [radio tag] === tag;
+                    }];
+
+    if (index !== CPNotFound)
+    {
+        [self selectRadioAtIndex:index];
+        return YES;
+    }
+    else
+        return NO;
+}
+
+/*!
+    Returns the CPRadio that is currently selected within the group,
+    or nil if none are selected.
+*/
+- (CPRadio)selectedRadio
+{
+    return _selectedRadio;
+}
+
+/*!
+    Returns the index of the selected radio within the array of radio buttons.
+    Buttons are numbered going left to right and top to bottom. Returns -1
+    if no radio within the group is selected.
+*/
+- (int)selectedRadioIndex
+{
+    return [_radios indexOfObject:_selectedRadio];
+}
+
+- (CPArray)radios
+{
+    return _radios;
+}
+
+- (void)setEnabled:(BOOL)enabled
+{
+    [_radios makeObjectsPerformSelector:@selector(setEnabled:) withObject:enabled];
+}
+
+- (void)setHidden:(BOOL)hidden
+{
+    [_radios makeObjectsPerformSelector:@selector(setHidden:) withObject:hidden];
+}
+
+#pragma mark Private
+
 - (void)_addRadio:(CPRadio)aRadio
 {
-    [_radios addObject:aRadio];
+    if ([_radios indexOfObject:aRadio] === CPNotFound)
+        [_radios addObject:aRadio];
 
     if ([aRadio state] === CPOnState)
         [self _setSelectedRadio:aRadio];
@@ -209,25 +333,30 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [_radios removeObject:aRadio];
 }
 
+/*!
+    Selects the first radio button within the group with the given tag.
+    If a radio button with the given tag is found, selects it
+    and returns YES. Otherwise returns NO.
+*/
+- (void)_selectRadioWithTitle:(CPString)aTitle
+{
+    var index = [_radios indexOfObjectPassingTest:function(radio)
+                    {
+                        return [radio title] === aTitle;
+                    }];
+
+    [self selectRadioAtIndex:index];
+}
+
 - (void)_setSelectedRadio:(CPRadio)aRadio
 {
     if (_selectedRadio === aRadio)
         return;
 
     [_selectedRadio setState:CPOffState];
+
     _selectedRadio = aRadio;
-
-    [CPApp sendAction:_action to:_target from:self];
-}
-
-- (CPRadio)selectedRadio
-{
-    return _selectedRadio;
-}
-
-- (CPArray)radios
-{
-    return [_radios allObjects];
+    [_CPRadioGroupSelectionBinder reverseSetValueForObject:self];
 }
 
 @end
@@ -257,3 +386,100 @@ var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
 }
 
 @end
+
+@implementation CPRadioGroup (BindingSupport)
+
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding === CPSelectedValueBinding   ||
+        aBinding === CPSelectedTagBinding     ||
+        aBinding === CPSelectedIndexBinding)
+    {
+        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
+
+        return [CPClassFromString(@"_CPRadioGroup" + capitalizedBinding + "Binder") class];
+    }
+    else if ([aBinding hasPrefix:CPEnabledBinding])
+        return [CPMultipleValueAndBinding class];
+    else if ([aBinding hasPrefix:CPHiddenBinding])
+        return [CPMultipleValueOrBinding class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+@end
+
+var binderForObject = {};
+
+@implementation _CPRadioGroupSelectionBinder : CPBinder
+{
+    CPString _selectionBinding @accessors;
+}
+
+- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
+{
+    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
+
+    if (self)
+    {
+        binderForObject[[aSource UID]] = self;
+        _selectionBinding = aName;
+    }
+
+    return self;
+}
+
++ (void)reverseSetValueForObject:(id)aSource
+{
+    var binder = binderForObject[[aSource UID]];
+    [binder reverseSetValueFor:[binder _selectionBinding]];
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [self setValue:aValue forBinding:aBinding];
+}
+
+@end
+
+@implementation _CPRadioGroupSelectedIndexBinder : _CPRadioGroupSelectionBinder
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectRadioAtIndex:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [_source selectedRadioIndex];
+}
+
+@end
+
+@implementation _CPRadioGroupSelectedTagBinder : _CPRadioGroupSelectionBinder
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source selectRadioWithTag:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedRadio] tag];
+}
+
+@end
+
+@implementation _CPRadioGroupSelectedValueBinder : _CPRadioGroupSelectionBinder
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source _selectRadioWithTitle:aValue];
+}
+
+- (id)valueForBinding:(CPString)aBinding
+{
+    return [[_source selectedRadio] title];
+}
+
+@end

AppKit/CPResponder.j

@@ -21,24 +21,29 @@
  */
 
 @import <Foundation/CPObject.j>
+@import <Foundation/CPObjJRuntime.j>
 
+@import "CPEvent.j"
 
-CPDeleteKeyCode     = 8;
-CPTabKeyCode        = 9;
-CPReturnKeyCode     = 13;
-CPEscapeKeyCode     = 27;
-CPSpaceKeyCode      = 32;
-CPPageUpKeyCode     = 33;
-CPPageDownKeyCode   = 34;
-CPLeftArrowKeyCode  = 37;
-CPUpArrowKeyCode    = 38;
-CPRightArrowKeyCode = 39;
-CPDownArrowKeyCode  = 40;
+@class CPKeyBinding
+
+CPDeleteKeyCode         = 8;
+CPTabKeyCode            = 9;
+CPReturnKeyCode         = 13;
+CPEscapeKeyCode         = 27;
+CPSpaceKeyCode          = 32;
+CPPageUpKeyCode         = 33;
+CPPageDownKeyCode       = 34;
+CPLeftArrowKeyCode      = 37;
+CPUpArrowKeyCode        = 38;
+CPRightArrowKeyCode     = 39;
+CPDownArrowKeyCode      = 40;
+CPDeleteForwardKeyCode  = 46;
 
 /*!
     @ingroup appkit
     @class CPResponder
-    
+
     Subclasses of CPResonder can be part of the responder chain.
 */
 @implementation CPResponder : CPObject
@@ -104,42 +109,24 @@ CPDownArrowKeyCode  = 40;
 
     for (; index < count; ++index)
     {
-        var event = events[index];
+        var event = events[index],
+            modifierFlags = [event modifierFlags],
+            character = [event charactersIgnoringModifiers],
+            selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
 
-        switch([event keyCode])
+        if (selectorNames)
         {
-            case CPPageUpKeyCode:       [self doCommandBySelector:@selector(pageUp:)];
-                                        break;
-            case CPPageDownKeyCode:     [self doCommandBySelector:@selector(pageDown:)];
-                                        break;
-            case CPLeftArrowKeyCode:    [self doCommandBySelector:@selector(moveLeft:)];
-                                        break;
-            case CPRightArrowKeyCode:   [self doCommandBySelector:@selector(moveRight:)];
-                                        break;
-            case CPUpArrowKeyCode:      [self doCommandBySelector:@selector(moveUp:)];
-                                        break;
-            case CPDownArrowKeyCode:    [self doCommandBySelector:@selector(moveDown:)];
-                                        break;
-            case CPDeleteKeyCode:       [self doCommandBySelector:@selector(deleteBackward:)];
-                                        break;
-            case CPReturnKeyCode:
-            case 3:                     [self doCommandBySelector:@selector(insertLineBreak:)];
-                                        break;
-            
-            case CPEscapeKeyCode:       [self doCommandBySelector:@selector(cancel:)];
-                                        break;
+            for (var s = 0, scount = selectorNames.length; s < scount; s++)
+            {
+                var selector = selectorNames[s];
+                if (!selector)
+                    continue;
 
-            case CPTabKeyCode:          var shift = [event modifierFlags] & CPShiftKeyMask;
-
-                                        if (!shift)
-                                            [self doCommandBySelector:@selector(insertTab:)];
-                                        else
-                                            [self doCommandBySelector:@selector(insertBackTab:)];
-
-                                        break;
-
-            default:                    [self insertText:[event characters]];
+                [self doCommandBySelector:CPSelectorFromString(selector)];
+            }
         }
+        else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)) && [self respondsToSelector:@selector(insertText:)])
+            [self insertText:[event characters]];
     }
 }
 
@@ -239,11 +226,27 @@ CPDownArrowKeyCode  = 40;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*
-    FIXME This description is bad.
-    Based on \c anEvent, the receiver should simulate the event.
-    @param anEvent the event to simulate
-    @return \c YES if the event receiver simulated the  event
+/*!
+    Notifies the receiver that the user has pressed or released a modifier key (Shift, Control, and so on).
+    @param anEvent information about the key press
+*/
+- (void)flagsChanged:(CPEvent)anEvent
+{
+    [_nextResponder performSelector:_cmd withObject:anEvent];
+}
+
+/*!
+    Overridden by subclasses to handle a key equivalent.
+
+    If the character code or codes in \c anEvent match the receiver’s key equivalent,
+    the receiver should respond to the event and return \c YES. The default implementation
+    does nothing and returns \c NO.
+
+    You should extract the characters for a key equivalent using
+    \ref CPEvent::charactersIgnoringModifiers "[anEvent charactersIgnoringModifiers]".
+
+    @param anEvent An event object that represents the key equivalent pressed
+    @return \c YES if theEvent is a key equivalent that the receiver handled, \c NO if it is not a key equivalent that it should handle.
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
@@ -269,10 +272,6 @@ CPDownArrowKeyCode  = 40;
     [[self nextResponder] insertNewline:aSender];
 }
 
-- (void)cancel:(id)sender
-{
-}
-
 - (void)insertTab:(id)sender
 {
 }
@@ -312,10 +311,10 @@ CPDownArrowKeyCode  = 40;
 */
 - (BOOL)tryToPerform:(SEL)aSelector with:(id)anObject
 {
-    if([self respondsToSelector:aSelector])
+    if ([self respondsToSelector:aSelector])
     {
         [self performSelector:aSelector withObject:anObject];
-        
+
         return YES;
     }
 
@@ -354,7 +353,8 @@ CPDownArrowKeyCode  = 40;
 
 @end
 
-var CPResponderNextResponderKey = @"CPResponderNextResponderKey";
+var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
+    CPResponderMenuKey = @"CPResponderMenuKey";
 
 @implementation CPResponder (CPCoding)
 
@@ -366,10 +366,13 @@ var CPResponderNextResponderKey = @"CPResponderNextResponderKey";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
-        _nextResponder = [aCoder decodeObjectForKey:CPResponderNextResponderKey];
-    
+    {
+        [self setNextResponder:[aCoder decodeObjectForKey:CPResponderNextResponderKey]];
+        [self setMenu:[aCoder decodeObjectForKey:CPResponderMenuKey]];
+    }
+
     return self;
 }
 
@@ -382,6 +385,8 @@ var CPResponderNextResponderKey = @"CPResponderNextResponderKey";
     // This will come out nil on the other side with decodeObjectForKey:
     if (_nextResponder !== nil)
         [aCoder encodeConditionalObject:_nextResponder forKey:CPResponderNextResponderKey];
+
+    [aCoder encodeObject:_menu forKey:CPResponderMenuKey];
 }
 
 @end

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -0,0 +1,557 @@
+/*
+ * CPPredicateEditor.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2011, cacaodev.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPRuleEditor.j"
+@import "_CPPredicateEditorTree.j"
+@import "_CPPredicateEditorRowNode.j"
+@import "CPPredicateEditorRowTemplate.j"
+
+@implementation CPPredicateEditor : CPRuleEditor
+{
+    CPArray _allTemplates;
+    CPArray _rootTrees;
+    CPArray _rootHeaderTrees;
+    id      _predicateTarget @accessors(property=target);
+    SEL     _predicateAction @accessors(property=action);
+}
+
+#pragma mark public methods
+/*!
+    @ingroup appkit
+    @class CPPredicateEditor
+
+    @brief CPPredicateEditor is a subclass of CPRuleEditor that is specialized for editing CPPredicate objects.
+
+    CPPredicateEditor provides a CPPredicate property—objectValue (inherited from CPControl)—that you can get and set directly, and that you can bind using bindings (you typically configure a predicate editor in Interface Builder). CPPredicateEditor depends on another class, CPPredicateEditorRowTemplate, that describes the available predicates and how to display them.
+
+    Unlike CPRuleEditor, CPPredicateEditor does not depend on its delegate to populate its rows (and does not call the populating delegate methods). Instead, its rows are populated from its objectValue property (an instance of CPPredicate). CPPredicateEditor relies on instances CPPredicateEditorRowTemplate, which are responsible for mapping back and forth between the displayed view values and various predicates.
+
+    CPPredicateEditor exposes one property, rowTemplates, which is an array of CPPredicateEditorRowTemplate objects.
+*/
+
+/*!
+    @brief Returns the row templates for the receiver.
+    @return The row templates for the receiver.
+    @discussion Until otherwise set, this contains a single compound CPPredicateEditorRowTemplate object.
+    @see setRowTemplates:
+*/
+- (CPArray)rowTemplates
+{
+    return _allTemplates;
+}
+
+/*!
+    @brief Sets the row templates for the receiver.
+    @param rowTemplates An array of CPPredicateEditorRowTemplate objects.
+    @see rowTemplates
+*/
+- (void)setRowTemplates:(id)rowTemplates
+{
+    if (_allTemplates == rowTemplates)
+        return;
+
+    _allTemplates = rowTemplates;
+
+    [self _updateItemsByCompoundTemplates];
+    [self _updateItemsBySimpleTemplates];
+
+    if ([self numberOfRows] > 0)
+    {
+        var predicate = [super predicate];
+        [self _reflectPredicate:predicate];
+    }
+}
+
+/*! @cond */
++ (Class)_binderClassForBinding:(CPString)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];
+
+    _rootTrees = [CPArray array];
+    _rootHeaderTrees = [CPArray array];
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+    if (self != nil)
+    {
+        var initialTemplate = [[CPPredicateEditorRowTemplate alloc] initWithCompoundTypes:[CPAndPredicateType, CPOrPredicateType]];
+        _allTemplates = [CPArray arrayWithObject:initialTemplate];
+    }
+
+    return self;
+}
+
+- (id)objectValue
+{
+    return [super predicate];
+}
+
+- (void)_updateItemsBySimpleTemplates
+{
+    var templates = [CPMutableArray array],
+        count = [_allTemplates count],
+        t;
+
+    while (count--)
+    {
+        var t = _allTemplates[count];
+        if ([t _rowType] == CPRuleEditorRowTypeSimple)
+            [templates insertObject:t atIndex:0];
+    }
+
+    var trees = [self _constructTreesForTemplates:templates];
+    if ([trees count] > 0)
+        _rootTrees = [self _mergeTree:trees];
+}
+
+- (void)_updateItemsByCompoundTemplates
+{
+    var templates = [CPMutableArray array],
+        count = [_allTemplates count],
+        t;
+
+    while (count--)
+    {
+        var t = _allTemplates[count];
+        if ([t _rowType] == CPRuleEditorRowTypeCompound)
+            [templates insertObject:t atIndex:0];
+    }
+
+    var trees = [self _constructTreesForTemplates:templates];
+    if ([trees count] > 0)
+        _rootHeaderTrees = [self _mergeTree:trees];
+}
+
+- (CPArray)_constructTreesForTemplates:(id)templates
+{
+    var trees = [CPMutableArray array],
+        count = [templates count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var tree = [self _constructTreeForTemplate:templates[i]];
+        [trees addObjectsFromArray:tree];
+    }
+
+    return trees;
+}
+
+- (CPMutableArray)_mergeTree:(CPArray)aTree
+{
+    var mergedTree = [CPMutableArray array];
+    if (aTree == nil)
+        return mergedTree;
+
+    var icount = [aTree count];
+    for (var i = 0; i < icount; i++)
+    {
+        var anode = [aTree objectAtIndex:i],
+            jcount = [mergedTree count],
+            merged = NO;
+
+        for (var j = 0; j < jcount; j++)
+        {
+            var mergednode = [mergedTree objectAtIndex:j];
+
+            if ([[mergednode title] isEqualToString:[anode title]])
+            {
+                var children1 = [mergednode children],
+                    children2 = [anode children],
+                    children12 = [children1 arrayByAddingObjectsFromArray:children2],
+                    mergedChildren = [self _mergeTree:children12];
+
+                [mergednode setChildren:mergedChildren];
+                merged = YES;
+            }
+        }
+
+        if (!merged)
+            [mergedTree addObject:anode];
+    }
+
+    return mergedTree;
+}
+
+- (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
+{
+    var tree = [CPArray array],
+        templateViews = [aTemplate templateViews],
+        count = [templateViews count];
+
+    while (count--)
+    {
+        var children = [CPArray array],
+            itemsCount = 0,
+            menuIndex = -1,
+            itemArray,
+
+            templateView = [templateViews objectAtIndex:count],
+            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
+
+        if (isPopup)
+        {
+            itemArray = [[templateView itemArray] valueForKey:@"title"];
+            itemsCount = [itemArray count];
+            menuIndex = 0;
+        }
+
+        for (; menuIndex < itemsCount; menuIndex++)
+        {
+            var item = [_CPPredicateEditorTree new];
+            [item setIndexIntoTemplate:count];
+            [item setTemplate:aTemplate];
+            [item setMenuItemIndex:menuIndex];
+            if (isPopup)
+                [item setTitle:[itemArray objectAtIndex:menuIndex]];
+
+            [children addObject:item];
+        }
+
+        [children makeObjectsPerformSelector:@selector(setChildren:) withObject:tree];
+        tree = children;
+    }
+
+    return tree;
+}
+
+#pragma mark Set the Predicate
+
+- (void)setObjectValue:(id)objectValue
+{
+    var ov = [self objectValue];
+    if ((ov == nil) != (objectValue == nil) || ![ov isEqual:objectValue])
+    {
+        [self _setPredicate:objectValue];
+        [self _reflectPredicate:objectValue];
+    }
+}
+
+- (void)_reflectPredicate:(id)predicate
+{
+    var animation = _currentAnimation;
+    _currentAnimation = nil;
+    _sendAction = NO;
+
+    if (predicate != nil)
+    {
+        if ((_nestingMode == CPRuleEditorNestingModeSimple || _nestingMode == CPRuleEditorNestingModeCompound)
+            && [predicate isKindOfClass:[CPComparisonPredicate class]])
+            predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:[CPArray arrayWithObject:predicate]];
+
+        var row = [self _rowObjectFromPredicate:predicate];
+        if (row != nil)
+            [_boundArrayOwner setValue:[CPArray arrayWithObject:row] forKey:_boundArrayKeyPath];
+    }
+
+    [self setAnimation:animation];
+}
+
+- (id)_rowObjectFromPredicate:(CPPredicate)predicate
+{
+    var quality, // TODO: We should use this ref somewhere !
+        type,
+        matchedTemplate = [CPPredicateEditorRowTemplate _bestMatchForPredicate:predicate inTemplates:[self rowTemplates] quality:quality];
+
+    if (matchedTemplate == nil)
+        return nil;
+
+    var copyTemplate = [matchedTemplate copy],
+        subpredicates = [matchedTemplate displayableSubpredicatesOfPredicate:predicate];
+
+    if (subpredicates == nil)
+    {
+        [copyTemplate _setComparisonPredicate:predicate];
+        type = CPRuleEditorRowTypeSimple;
+    }
+    else
+    {
+        [copyTemplate _setCompoundPredicate:predicate];
+        type = CPRuleEditorRowTypeCompound;
+    }
+
+    var row = [self _rowFromTemplate:copyTemplate originalTemplate:matchedTemplate withRowType:type];
+
+    if (subpredicates == nil)
+        return row;
+
+    var count = [subpredicates count],
+        subrows = [CPMutableArray array];
+
+    for (var i = 0; i < count; i++)
+    {
+        var subrow = [self _rowObjectFromPredicate:subpredicates[i]];
+        if (subrow != nil)
+            [subrows addObject:subrow];
+    }
+
+    [row setValue:subrows forKey:[super subrowsKeyPath]];
+
+    return row;
+}
+
+- (id)_rowFromTemplate:(CPPredicateEditorRowTemplate)aTemplate originalTemplate:(CPPredicateEditorRowTemplate)originalTemplate withRowType:(CPRuleEditorRowType)rowType
+{
+    var criteria = [CPArray array],
+        values = [CPArray array],
+        templateViews = [aTemplate templateViews],
+        rootItems,
+        count;
+
+    rootItems = (rowType == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
+
+    while ((count = [rootItems count]) > 0)
+    {
+        var treeChild;
+        for (var i = 0; i < count; i++)
+        {
+            treeChild = [rootItems objectAtIndex:i];
+
+            var currentView = [templateViews objectAtIndex:[treeChild indexIntoTemplate]],
+                title = [treeChild title];
+
+            if (title == nil || [title isEqual:[currentView titleOfSelectedItem]])
+            {
+                var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
+                [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
+
+                [criteria addObject:node];
+                [values addObject:[node displayValue]];
+                break;
+            }
+        }
+
+        rootItems = [treeChild children];
+    }
+
+    var row = @{
+            @"criteria": criteria,
+            @"displayValues": values,
+            @"rowType": rowType,
+        };
+
+    return row;
+}
+
+#pragma mark Get the predicate
+
+- (void)_updatePredicate
+{
+    [self _updatePredicateFromRows];
+}
+
+- (void)_updatePredicateFromRows
+{
+    var rootRowsArray = [super _rootRowsArray],
+        subpredicates = [CPMutableArray array],
+        count,
+        count2 = count = [rootRowsArray count],
+        predicate;
+
+    while (count--)
+    {
+        var item = [rootRowsArray objectAtIndex:count],
+            subpredicate = [self _predicateFromRowItem:item];
+
+        if (subpredicate != nil)
+            [subpredicates insertObject:subpredicate atIndex:0];
+    }
+
+    if (_nestingMode != CPRuleEditorNestingModeList && count2 == 1)
+        predicate = [subpredicates lastObject];
+    else
+        predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:subpredicates];
+
+    [self _setPredicate:predicate];
+}
+
+- (id)_predicateFromRowItem:(id)rowItem
+{
+    var subpredicates = [CPArray array],
+        rowType = [rowItem valueForKey:_typeKeyPath];
+
+    if (rowType == CPRuleEditorRowTypeCompound)
+    {
+        var subrows = [rowItem valueForKey:_subrowsArrayKeyPath],
+            count = [subrows count];
+
+        for (var i = 0; i < count; i++)
+        {
+            var subrow = [subrows objectAtIndex:i],
+                predicate = [self _predicateFromRowItem:subrow];
+
+            [subpredicates addObject:predicate];
+        }
+    }
+
+    var criteria = [rowItem valueForKey:_itemsKeyPath],
+        displayValues = [rowItem valueForKey:_valuesKeyPath],
+        count = [criteria count],
+        lastItem = [criteria lastObject],
+        template = [lastItem templateForRow],
+        templateViews = [template templateViews];
+
+    for (var j = 0; j < count; j++)
+    {
+        var view = [templateViews objectAtIndex:j],
+            value = [displayValues objectAtIndex:j];
+        [[criteria objectAtIndex:j] setTemplateViews:templateViews];
+
+        if ([view isKindOfClass:[CPPopUpButton class]])
+            [view selectItemWithTitle:value];
+        else if ([view respondsToSelector:@selector(setObjectValue:)])
+            [view setObjectValue:[value objectValue]];
+    }
+
+    return [template predicateWithSubpredicates:subpredicates];
+}
+
+- (CPCompoundPredicateType)_compoundPredicateTypeForRootRows
+{
+    return CPAndPredicateType;
+}
+
+#pragma mark Control delegate
+
+- (void)_sendRuleAction
+{
+    [super _sendRuleAction];
+}
+
+- (BOOL)_sendsActionOnIncompleteTextChange
+{
+    return NO;
+}
+
+/*
+- (void)_setDefaultTargetAndActionOnView:(CPView)view
+{
+    if ([view isKindOfClass:[CPControl class]])
+    {
+        [view setTarget:self];
+        [view setAction:@selector(_templateControlValueDidChange:)];
+    }
+}
+- (void)_templateControlValueDidChange:(id)sender
+{
+}
+- (void)controlTextDidBeginEditing:(CPNotification)notification
+{
+}
+- (void)controlTextDidEndEditing:(CPNotification)notification
+{
+}
+- (void)controlTextDidChange:(CPNotification)notification
+{
+}
+*/
+
+#pragma mark RuleEditor delegate methods
+
+- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(int)type
+{
+    if (rowItem == nil)
+    {
+        var trees = (type == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
+        return [trees count];
+    }
+    return [[rowItem children] count];
+}
+
+- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(int)type
+{
+    if (rowItem == nil)
+    {
+        var trees = (type == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
+        return [_CPPredicateEditorRowNode rowNodeFromTree:trees[childIndex]];
+    }
+
+    return [[rowItem children] objectAtIndex:childIndex];
+}
+
+- (id)_queryValueForItem:(id)rowItem inRow:(int)rowIndex
+{
+    return [rowItem displayValue];
+}
+
+@end
+
+var CPPredicateTemplatesKey = @"CPPredicateTemplates";
+
+@implementation CPPredicateEditor (CPCoding)
+
+- (id)initWithCoder:(id)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self != nil)
+    {
+        var nibTemplates = [aCoder decodeObjectForKey:CPPredicateTemplatesKey];
+
+        if (nibTemplates != nil)
+            [self setRowTemplates:nibTemplates];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(id)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    [aCoder encodeObject:_allTemplates forKey:CPPredicateTemplatesKey];
+}
+
+@end
+
+@implementation CPPredicateEditorValueBinder : CPBinder
+{
+}
+
+- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
+{
+    [_source _reflectPredicate:nil];
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source _reflectPredicate:aValue];
+}
+
+@end
+/*! @endcond */

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -0,0 +1,801 @@
+/*
+ * CPPredicateEditorRowTemplate.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2011, cacaodev.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPPredicate.j>
+
+@import "CPCheckBox.j"
+@import "CPPopUpButton.j"
+@import "CPMenuItem.j"
+@import "CPTextField.j"
+
+// NOTE: CPDatePicker is not implemented yet
+@class CPDatePicker
+
+
+CPUndefinedAttributeType     = 0;
+CPInteger16AttributeType     = 100;
+CPInteger32AttributeType     = 200;
+CPInteger64AttributeType     = 300;
+CPDecimalAttributeType       = 400;
+CPDoubleAttributeType        = 500;
+CPFloatAttributeType         = 600;
+CPStringAttributeType        = 700;
+CPBooleanAttributeType       = 800;
+CPDateAttributeType          = 900;
+CPBinaryDataAttributeType    = 1000;
+CPTransformableAttributeType = 1800;
+
+@implementation CPPredicateEditorRowTemplate : CPObject
+{
+    int            _templateType @accessors(readwrite, getter=_templateType, setter=_setTemplateType:);
+    unsigned   _predicateOptions @accessors(readwrite, setter=_setOptions:);
+    unsigned  _predicateModifier @accessors(readwrite, setter=_setModifier:);
+    unsigned  _leftAttributeType @accessors(readwrite, getter=leftAttributeType, setter=_setLeftAttributeType:);
+    unsigned _rightAttributeType @accessors(readwrite, getter=rightAttributeType, setter=_setRightAttributeType:);
+    BOOL         _leftIsWildcard @accessors(property=leftIsWildcard);
+    BOOL        _rightIsWildcard @accessors(property=rightIsWildcard);
+    CPArray               _views @accessors(setter=setTemplateViews:);
+
+}
+
+/*!
+    @ingroup appkit
+    @class CPPredicateEditorRowTemplate
+
+    @brief CPPredicateEditorRowTemplate describes available predicates and how to display them.
+
+    You can create instances of CPPredicateEditorRowTemplate programmatically or in Interface Builder. By default, a non-compound row template has three views: a popup (or static text field) on the left, a popup or static text field for operators, and either a popup or other view on the right.  You can subclass CPPredicateEditorRowTemplate to create a row template with different numbers or types of views.
+
+    CPPredicateEditorRowTemplate is a concrete class, but it has five primitive methods which are called by CPPredicateEditor: -#templateViews, -#matchForPredicate:, -#setPredicate:, -#displayableSubpredicatesOfPredicate:, and -#predicateWithSubpredicates:. CPPredicateEditorRowTemplate implements all of them, but you can override them for custom templates. The primitive methods are used by an instance of CPPredicateEditor as follows.
+
+    First, an instance of CPPredicateEditor is created, and some row templates are set on it—either through a nib file or programmatically. The first thing predicate editor does is ask each of the templates for their views, using templateViews.
+
+    After setting up the predicate editor, you typically send it a  CPPredicateEditor#setObjectValue: message to restore a saved predicate. CPPredicateEditor needs to determine which of its templates should display each predicate in the predicate tree. It does this by sending each of its row templates a matchForPredicate: message and choosing the one that returns the highest value.
+
+    After finding the best match for a predicate, CPPredicateEditor copies that template to get fresh views, inserts them into the proper row, and then sets the predicate on the template using setPredicate:. Within that method, the CPPredicateEditorRowTemplate object must set its views' values to represent that predicate.
+
+    CPPredicateEditorRowTemplate next asks the template for the “displayable sub-predicates” of the predicate by sending a -#displayableSubpredicatesOfPredicate: message. If a template represents a predicate in its entirety, or if the predicate has no subpredicates, it can return nil for this.  Otherwise, it should return a list of predicates to be made into sub-rows of that template's row. The whole process repeats for each sub-predicate.
+
+    At this point, the user sees the predicate that was saved.  If the user then makes some changes to the views of the templates, this causes CPPredicateEditor to recompute its predicate by asking each of the templates to return the predicate represented by the new view values, passing in the subpredicates represented by the sub-rows (an empty array if there are none, or nil if they aren't supported by that predicate type).
+*/
+
+/*!
+    @name Initializing a Template
+*/
+
+/*!
+    @brief Initializes and returns a “pop-up-pop-up-pop-up”-style row template.
+    @param leftExpressions An array of CPExpression objects that represent the left hand side of a predicate.
+    @param rightExpressions An array of CPExpression objects that represent the right hand side of a predicate.
+    @param modifier A modifier for the predicate (see @c CPComparisonPredicateModifier for possible values).
+    @param operators An array of CPNumber objects specifying the operator type (see @c CPPredicateOperatorType for possible values).
+    @param options Options for the predicate (see @c CPComparisonPredicateOptions for possible values).
+    @return A row template of the “pop-up-pop-up-pop-up”-form, with the left and right popups representing the left and right expression arrays -#leftExpressions and -#rightExpressions, and the center popup representing the operators.
+*/
+- (id)initWithLeftExpressions:(CPArray)leftExpressions rightExpressions:(CPArray)rightExpressions modifier:(int)modifier operators:(CPArray)operators options:(int)options
+{
+    self = [super init];
+    if (self != nil)
+    {
+        _templateType = 1;
+        _leftIsWildcard = NO;
+        _rightIsWildcard = NO;
+        _leftAttributeType = 0;
+        _rightAttributeType = 0;
+        _predicateModifier = modifier;
+        _predicateOptions = options;
+
+        var leftView = [self _viewFromExpressions:leftExpressions],
+            rightView = [self _viewFromExpressions:rightExpressions],
+            middleView = [self _viewFromOperatorTypes:operators];
+
+        _views = [[CPArray alloc] initWithObjects:leftView, middleView, rightView];
+    }
+
+    return self;
+}
+
+/*!
+    @brief Initializes and returns a “pop-up-pop-up-view”-style row template.
+    @param leftExpressions An array of CPExpression objects that represent the left hand side of a predicate.
+    @param attributeType An attribute type for the right hand side of a predicate. This value dictates the type of view created, and how the control’s object value is coerced before putting it into a predicate.
+    @param modifier A modifier for the predicate (see @c CPComparisonPredicateModifier for possible values).
+    @param operators An array of CPNumber objects specifying the operator type (see @c CPPredicateOperatorType for possible values).
+    @param options Options for the predicate (see CPComparisonPredicateOptions for possible values).
+    @return A row template initialized using the given arguments.
+*/
+- (id)initWithLeftExpressions:(CPArray )leftExpressions rightExpressionAttributeType:(CPAttributeType)attributeType modifier:(CPComparisonPredicateModifier)modifier operators:(CPArray )operators options:(int)options
+{
+    self = [super init];
+    if (self != nil)
+    {
+        var leftView = [self _viewFromExpressions:leftExpressions],
+            middleView = [self _viewFromOperatorTypes:operators],
+            rightView = [self _viewFromAttributeType:attributeType];
+
+        _templateType = 1;
+        _leftIsWildcard = NO;
+        _rightIsWildcard = YES;
+        _leftAttributeType = 0;
+        _rightAttributeType = attributeType;
+        _predicateModifier = modifier;
+        _predicateOptions = options;
+        _views = [[CPArray alloc] initWithObjects:leftView, middleView, rightView];
+    }
+
+    return self;
+}
+
+/*!
+    @brief Initializes and returns a row template suitable for displaying compound predicates.
+    @param compoundTypes An array of CPNumber objects specifying compound predicate types. See @c CPCompoundPredicateTypes for possible values.
+    @return A row template initialized for displaying compound predicates of the types specified by @a compoundTypes.
+    @discussion CPPredicateEditor contains such a template by default.
+*/
+- (id)initWithCompoundTypes:(CPArray )compoundTypes
+{
+    self = [super init];
+    if (self != nil)
+    {
+        var leftView = [self _viewFromCompoundTypes:compoundTypes],
+            rightView = [[CPPopUpButton alloc] init];
+
+        [rightView addItemWithTitle:@"of the following are true"];
+
+        _templateType = 2;
+        _leftIsWildcard = NO;
+        _rightIsWildcard = NO;
+        _rightAttributeType = 0;
+        _views = [[CPArray alloc] initWithObjects:leftView, rightView];
+    }
+    return self;
+}
+
+/*!
+    @name Primitive Methods
+*/
+
+/*!
+    @brief Returns a positive number if the receiver can represent a given predicate, and 0 if it cannot.
+    @return A positive number if the template can represent predicate, and @c 0 if it cannot.
+    @discussion By default, returns values in the range @c 0 to @c 1.
+    The highest match among all the templates determines which template is responsible for displaying the predicate. You can override this to determine which predicates your custom template handles.
+*/
+- (double)matchForPredicate:(CPPredicate)predicate
+{
+    // How exactly this value (float 0-1) is computed ?
+    if ([self _templateType] == 2 && [predicate isKindOfClass:[CPCompoundPredicate class]])
+    {
+        if ([[self compoundTypes] containsObject:[predicate compoundPredicateType]])
+                return 1;
+    }
+    else if ([self _templateType] == 1 && [predicate isKindOfClass:[CPComparisonPredicate class]])
+    {
+        if (!_leftIsWildcard && ![[self leftExpressions] containsObject:[predicate leftExpression]])
+            return 0;
+
+        if (![[self operators] containsObject:[predicate predicateOperatorType]])
+            return 0;
+
+        if (!_rightIsWildcard && ![[self rightExpressions] containsObject:[predicate rightExpression]])
+            return 0;
+
+        return 1;
+    }
+
+    return 0;
+}
+
+/*!
+    @brief Returns the views for the receiver.
+    @return The views for the receiver.
+    @discussion Instances of CPPopUpButton are treated specially by CPPredicateEditor; their menu items are merged into a single popup button, and matching menu item titles are combined. In this way, a single tree is built from the separate templates.
+*/
+- (CPArray)templateViews
+{
+    return _views;
+}
+
+/*!
+    @brief Sets the value of the views according to the given predicate.
+    @param predicate The predicate value for the receiver.
+    @discussion This method is only called if -#matchForPredicate: returned a positive value for the receiver.
+
+    You can override this to set the values of custom views.
+*/
+- (void)setPredicate:(CPPredicate)predicate
+{
+    if (_templateType == 2)
+        [self _setCompoundPredicate:predicate];
+    else
+        [self _setComparisonPredicate:predicate];
+}
+
+/*!
+    @brief Returns the subpredicates that should be made sub-rows of a given predicate.
+    @param predicate A predicate object.
+    @return The subpredicates that should be made sub-rows of @a predicate. For compound predicates (instances of CPCompoundPredicate), the array of subpredicates; for other types of predicate, returns @c nil. If a template represents a predicate in its entirety, or if the predicate has no subpredicates, returns @c nil.
+    @discussion You can override this method to create custom templates that handle complicated compound predicates.
+*/
+- (CPArray)displayableSubpredicatesOfPredicate:(CPPredicate)predicate
+{
+    if ([predicate isKindOfClass:[CPCompoundPredicate class]])
+    {
+        var subpredicates = [predicate subpredicates];
+        if ([subpredicates count] == 0)
+            return nil;
+
+        return subpredicates;
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the predicate represented by the receiver’s views' values and the given sub-predicates.
+    @param subpredicates An array of predicates.
+    @return The predicate represented by the values of the template's views and the given @a subpredicates. You can override this method to return the predicate represented by your custom views.
+    @discussion This method is only called if -#matchForPredicate: returned a positive value for the receiver.
+
+    You can override this method to return the predicate represented by a custom view.
+*/
+- (CPPredicate)predicateWithSubpredicates:(CPArray)subpredicates
+{
+    if (_templateType == 2)
+    {
+        var type = [[_views[0] selectedItem] representedObject];
+        return [[CPCompoundPredicate alloc] initWithType:type subpredicates:subpredicates];
+    }
+
+    if (_templateType == 1)
+    {
+        var lhs = [self _leftExpression],
+            rhs = [self _rightExpression],
+            operator = [[_views[1] selectedItem] representedObject];
+
+        return [CPComparisonPredicate predicateWithLeftExpression:lhs
+                                                  rightExpression:rhs
+                                                         modifier:[self modifier]
+                                                             type:operator
+                                                          options:[self options]];
+    }
+
+    return nil;
+}
+
+/*!
+    @name Information About a Row Template
+*/
+
+/*!
+    @brief Returns the left hand expressions for the receiver.
+    @return The left hand expressions for the receiver.
+*/
+- (CPArray)leftExpressions
+{
+    if (_templateType == 1 && !_leftIsWildcard)
+    {
+        var view = [_views objectAtIndex:0];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the right hand expressions for the receiver.
+    @return The right hand expressions for the receiver.
+*/
+- (CPArray)rightExpressions
+{
+    if (_templateType == 1 && !_rightIsWildcard)
+    {
+        var view = [_views objectAtIndex:2];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the compound predicate types for the receiver.
+    @return An array of CPNumber objects specifying compound predicate types. See @c CompoundPredicateTypes for possible values.
+*/
+- (CPArray)compoundTypes
+{
+    if (_templateType == 2)
+    {
+        var view = [_views objectAtIndex:0];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the comparison predicate modifier for the receiver.
+    @return The comparison predicate modifier for the receiver.
+*/
+- (CPComparisonPredicateModifier)modifier
+{
+    if (_templateType == 1)
+        return _predicateModifier;
+
+    return nil;
+}
+
+/*!
+    @brief Returns Returns the array of operators for the receiver.
+    @return The array of operators for the receiver.
+*/
+- (CPArray)operators
+{
+    if (_templateType == 1)
+    {
+        var view = [_views objectAtIndex:1];
+        return [[view itemArray] valueForKey:@"representedObject"];
+    }
+
+    return nil;
+}
+
+/*!
+    @brief Returns the comparison predicate options for the receiver.
+    @return The comparison predicate options for the receiver. See @c CPComparisonPredicateOptions for possible values. Returns @c 0 if this does not apply (for example, for a compound template initialized with -#initWithCompoundTypes:).
+*/
+- (int)options
+{
+    if (_templateType == 1)
+        return _predicateOptions;
+
+    return nil;
+}
+
+/*!
+    @brief Returns the attribute type of the receiver’s right expression.
+    @return The attribute type of the receiver’s right expression.
+*/
+- (CPAttributeType)rightExpressionAttributeType
+{
+    return _rightAttributeType;
+}
+
+/*!
+    @brief Returns the attribute type of the receiver’s left expression.
+    @return The attribute type of the receiver’s left expression.
+*/
+- (CPAttributeType)leftExpressionAttributeType
+{
+    return _leftAttributeType;
+}
+
+/*! @cond */
++ (id)_bestMatchForPredicate:(CPPredicate)predicate inTemplates:(CPArray)templates quality:(double)quality
+{
+    var count = [templates count],
+        match_value = 0,
+        templateIndex = CPNotFound,
+        i;
+
+    for (i = 0; i < count; i++)
+    {
+        var template = [templates objectAtIndex:i],
+            amatch = [template matchForPredicate:predicate];
+
+        if (amatch > match_value)
+        {
+            templateIndex = i;
+            match_value = amatch;
+        }
+    }
+
+    if (templateIndex == CPNotFound)
+    {
+        [CPException raise:CPRangeException reason:@"Unable to find template matching predicate: " +  [predicate predicateFormat]];
+        return nil;
+    }
+
+    return [templates objectAtIndex:templateIndex];
+}
+
+- (void)_setCompoundPredicate:(CPCompoundPredicate)predicate
+{
+    var left = [_views objectAtIndex:0],
+        type = [predicate compoundPredicateType],
+        index = [left indexOfItemWithRepresentedObject:type];
+
+    [left selectItemAtIndex:index];
+}
+
+- (void)_setComparisonPredicate:(CPComparisonPredicate)predicate
+{
+    var left = [_views objectAtIndex:0],
+        middle = [_views objectAtIndex:1],
+        right = [_views objectAtIndex:2],
+        leftExpression = [predicate leftExpression],
+        rightExpression = [predicate rightExpression],
+        operator = [predicate predicateOperatorType];
+
+    if (_leftIsWildcard)
+        [left setObjectValue:[leftExpression constantValue]];
+    else
+    {
+        var index = [left indexOfItemWithRepresentedObject:leftExpression];
+        [left selectItemAtIndex:index];
+    }
+
+    var op_index = [middle indexOfItemWithRepresentedObject:operator];
+    [middle selectItemAtIndex:op_index];
+
+    if (_rightIsWildcard)
+        [right setObjectValue:[rightExpression constantValue]];
+    else
+    {
+        var index = [right indexOfItemWithRepresentedObject:rightExpression];
+        [right selectItemAtIndex:index];
+    }
+}
+
+- (CPExpression)_leftExpression
+{
+    return [self _expressionFromView:_views[0] forAttributeType:_leftAttributeType];
+}
+
+- (CPExpression)_rightExpression
+{
+    return [self _expressionFromView:_views[2] forAttributeType:_rightAttributeType];
+}
+
+- (CPExpression)_expressionFromView:(CPView)aView forAttributeType:(CPAttributeType)attributeType
+{
+    if (attributeType == 0)
+        return [[aView selectedItem] representedObject];
+
+    var value;
+    if (attributeType >= CPInteger16AttributeType && attributeType <= CPFloatAttributeType)
+        value = [aView intValue];
+    else if (attributeType == CPBooleanAttributeType)
+        value = [aView state];
+    else
+        value = [aView stringValue];
+
+    return [CPExpression expressionForConstantValue:value];
+}
+
+- (int)_rowType
+{
+    return (_templateType - 1);
+}
+
+- (id)copy
+{
+    return [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:self]];
+}
+
++ (id)_operatorsForAttributeType:(CPAttributeType)attributeType
+{
+    var operators_array = [CPMutableArray array];
+
+    switch (attributeType)
+    {
+        case CPInteger16AttributeType   : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPInteger32AttributeType   : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPInteger64AttributeType   : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPDecimalAttributeType     : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPDoubleAttributeType      : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPFloatAttributeType       : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        case CPStringAttributeType      : [operators_array addObjects:99,4,5,8,9];
+            break;
+        case CPBooleanAttributeType     : [operators_array addObjects:4,5];
+            break;
+        case CPDateAttributeType        : [operators_array addObjects:4,5,0,2,1,3];
+            break;
+        default : CPLogConsole("Cannot create operators for an CPAttributeType " + attributeType);
+            break;
+    }
+
+    return operators_array;
+}
+
+- (int)_templateType
+{
+    return _templateType;
+}
+
+- (id)_displayValueForPredicateOperator:(int)operator
+{
+    var value;
+
+    switch (operator)
+    {
+        case CPLessThanPredicateOperatorType            : value = @"is less than";
+            break;
+        case CPLessThanOrEqualToPredicateOperatorType   : value = @"is less than or equal to";
+            break;
+        case CPGreaterThanPredicateOperatorType         : value = @"is greater than";
+            break;
+        case CPGreaterThanOrEqualToPredicateOperatorType : value = @"is greater than or equal to";
+            break;
+        case CPEqualToPredicateOperatorType             : value = @"is";
+            break;
+        case CPNotEqualToPredicateOperatorType          : value = @"is not";
+            break;
+        case CPMatchesPredicateOperatorType             : value = @"matches";
+            break;
+        case CPLikePredicateOperatorType                : value = @"is like";
+            break;
+        case CPBeginsWithPredicateOperatorType          : value = @"begins with";
+            break;
+        case CPEndsWithPredicateOperatorType            : value = @"ends with";
+            break;
+        case CPInPredicateOperatorType                  : value = @"in";
+            break;
+        case CPContainsPredicateOperatorType            : value = @"contains";
+            break;
+        case CPBetweenPredicateOperatorType             : value = @"between";
+            break;
+        default : CPLogConsole(@"unknown predicate operator %d" + operator);
+    }
+
+    return value;
+}
+
+- (id)_displayValueForCompoundPredicateType:(unsigned int)predicateType
+{
+    var value;
+    switch (predicateType)
+    {
+        case CPNotPredicateType: value = @"None";
+            break;
+        case CPAndPredicateType: value = @"All";
+            break;
+        case CPOrPredicateType: value = @"Any";
+            break;
+        default : value = [CPString stringWithFormat:@"unknown compound predicate type %d",predicateType];
+    }
+
+    return value;
+}
+
+- (id)_displayValueForConstantValue:(id)value
+{
+    return [value description]; // number, date, string, ... localize
+}
+
+- (id)_displayValueForKeyPath:(CPString)keyPath
+{
+    return keyPath; // localize
+}
+
+- (CPPopUpButton)_viewFromExpressions:(CPArray)expressions
+{
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+        count = [expressions count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var exp = expressions[i],
+            type = [exp expressionType],
+            title;
+
+        switch (type)
+        {
+            case CPKeyPathExpressionType: title = [self _displayValueForKeyPath:[exp keyPath]];
+                break;
+            case CPConstantValueExpressionType: title = [self _displayValueForConstantValue:[exp constantValue]];
+                break;
+            default: [CPException raise:CPInvalidArgumentException reason:@"Invalid Expression type " + type];
+                break;
+        }
+
+        var item = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+        [item setRepresentedObject:exp];
+        [popup addItem:item];
+    }
+
+    [popup sizeToFit];
+
+    return popup;
+}
+
+- (CPPopUpButton)_viewFromOperatorTypes:(CPArray)operators
+{
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+        count = [operators count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var op = operators[i],
+            title = [self _displayValueForPredicateOperator:op],
+            item = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+
+        [item setRepresentedObject:op];
+        [popup addItem:item];
+    }
+
+    [popup sizeToFit];
+
+    return popup;
+}
+
+- (CPView)_viewFromCompoundTypes:(CPArray)compoundTypes
+{
+    var popup = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 100, 18)],
+        count = [compoundTypes count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var type = compoundTypes[i],
+            title = [self _displayValueForCompoundPredicateType:type],
+            item = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+
+        [item setRepresentedObject:type];
+        [popup addItem:item];
+    }
+
+    [popup sizeToFit];
+
+    return popup;
+}
+
+- (CPView)_viewFromAttributeType:(CPAttributeType)attributeType
+{
+    var view;
+
+    if (attributeType >= CPInteger16AttributeType && attributeType <= CPFloatAttributeType)
+    {
+        view = [self _textFieldWithFrame:CGRectMake(0, 0, 50, 26)];
+    }
+    else if (attributeType == CPStringAttributeType)
+    {
+        view = [self _textFieldWithFrame:CGRectMake(0, 0, 150, 26)];
+    }
+    else if (attributeType == CPBooleanAttributeType)
+    {
+        view = [[CPCheckBox alloc] initWithFrame:CGRectMake(0, 0, 50, 26)];
+    }
+    else if (attributeType == CPDateAttributeType)
+        view = [[CPDatePicker alloc] initWithFrame:CGRectMake(0, 0, 150, 26)];
+    else
+        return nil;
+
+    [view setTag:attributeType];
+
+    return view;
+}
+
+- (CPTextField)_textFieldWithFrame:(CGRect)frame
+{
+    var textField = [[CPTextField alloc] initWithFrame:frame];
+    [textField setBezeled:YES];
+    [textField setBezelStyle:CPTextFieldSquareBezel];
+    [textField setBordered:YES];
+    [textField setEditable:YES];
+    [textField setFont:[CPFont systemFontOfSize:10]];
+    [textField setSendsActionOnEndEditing:YES];
+
+    return textField;
+}
+
+- (void)_setOptions:(unsigned int)options
+{
+    _predicateOptions = options;
+}
+
+- (void)_setModifier:(unsigned int)modifier
+{
+    _predicateModifier = modifier;
+}
+
+- (CPString)description
+{
+    if (_templateType == 2)
+        return [CPString stringWithFormat:@"<%@ %p %@>",[self className],self,[[self compoundTypes] componentsJoinedByString:@", "]];
+    else if (_templateType == 1 && _rightIsWildcard)
+        return [CPString stringWithFormat:@"<%@ %p [%@] [%@] %d>",[self className],self,[[self leftExpressions] componentsJoinedByString:@", "],[[self operators] componentsJoinedByString:@", "],[self rightExpressionAttributeType]];
+    else
+        return [CPString stringWithFormat:@"<%@ %p [%@] [%@] [%@]>",[self className],self,[[self leftExpressions] componentsJoinedByString:@", "],[[self operators] componentsJoinedByString:@", "],[[self rightExpressions] componentsJoinedByString:@", "]];
+}
+
+/*
+- (void)_setLeftExpressionObject:(id)object
+{
+}
+- (void)_setRightExpressionObject:(id)object
+{
+}
+- (BOOL)_predicateIsNoneAreTrue:(id)predicate
+{
+}
+- (id)_viewFromExpressionObject:(id)object
+{
+}
+*/
+@end
+
+var CPPredicateTemplateTypeKey = @"CPPredicateTemplateType",
+    CPPredicateTemplateOptionsKey = @"CPPredicateTemplateOptions",
+    CPPredicateTemplateModifierKey = @"CPPredicateTemplateModifier",
+    CPPredicateTemplateLeftAttributeTypeKey = @"CPPredicateTemplateLeftAttributeType",
+    CPPredicateTemplateRightAttributeTypeKey = @"CPPredicateTemplateRightAttributeType",
+    CPPredicateTemplateLeftIsWildcardKey = @"CPPredicateTemplateLeftIsWildcard",
+    CPPredicateTemplateRightIsWildcardKey = @"CPPredicateTemplateRightIsWildcard",
+    CPPredicateTemplateViewsKey = @"CPPredicateTemplateViews";
+
+@implementation CPPredicateEditorRowTemplate (CPCoding)
+
+- (id)initWithCoder:(CPCoder)coder
+{
+    self = [super init];
+    if (self != nil)
+    {
+        _templateType = [coder decodeIntForKey:CPPredicateTemplateTypeKey];
+        _predicateOptions = [coder decodeIntForKey:CPPredicateTemplateOptionsKey];
+        _predicateModifier = [coder decodeIntForKey:CPPredicateTemplateModifierKey];
+        _leftAttributeType = [coder decodeIntForKey:CPPredicateTemplateLeftAttributeTypeKey];
+        _rightAttributeType = [coder decodeIntForKey:CPPredicateTemplateRightAttributeTypeKey];
+        _leftIsWildcard = [coder decodeBoolForKey:CPPredicateTemplateLeftIsWildcardKey];
+        _rightIsWildcard = [coder decodeBoolForKey:CPPredicateTemplateRightIsWildcardKey];
+        _views = [coder decodeObjectForKey:CPPredicateTemplateViewsKey];
+
+        // In Xcode 4, when the menu item title == template's expression keypath, representedObject is empty.
+        // So we need to regenerate expressions from titles.
+        if (_templateType == 1 && _leftIsWildcard == NO)
+        {
+            var itemArray = [_views[0] itemArray],
+                count = [itemArray count];
+
+            for (var i = 0; i < count; i++)
+            {
+                var item = itemArray[i];
+                if ([item representedObject] == nil)
+                {
+                    var exp = [CPExpression expressionForKeyPath:[item title]];
+                    [item setRepresentedObject:exp];
+                }
+            }
+        }
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)coder
+{
+    [coder encodeInt:_templateType forKey:CPPredicateTemplateTypeKey];
+    [coder encodeInt:_predicateOptions forKey:CPPredicateTemplateOptionsKey];
+    [coder encodeInt:_predicateModifier forKey:CPPredicateTemplateModifierKey];
+    [coder encodeInt:_leftAttributeType forKey:CPPredicateTemplateLeftAttributeTypeKey];
+    [coder encodeInt:_rightAttributeType forKey:CPPredicateTemplateRightAttributeTypeKey];
+    [coder encodeBool:_leftIsWildcard forKey:CPPredicateTemplateLeftIsWildcardKey];
+    [coder encodeBool:_rightIsWildcard forKey:CPPredicateTemplateRightIsWildcardKey];
+    [coder encodeObject:_views forKey:CPPredicateTemplateViewsKey];
+}
+
+@end
+/*! @endcond */

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

@@ -0,0 +1,40 @@
+/*
+ * CPRuleEditor_Constants.j
+ * AppKit
+ *
+ * Created by cacaodev.
+ * Copyright 2011, cacaodev.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+CPRuleEditorPredicateLeftExpression     = "CPRuleEditorPredicateLeftExpression";
+CPRuleEditorPredicateRightExpression    = "CPRuleEditorPredicateRightExpression";
+CPRuleEditorPredicateComparisonModifier = "CPRuleEditorPredicateComparisonModifier";
+CPRuleEditorPredicateOptions            = "CPRuleEditorPredicateOptions";
+CPRuleEditorPredicateOperatorType       = "CPRuleEditorPredicateOperatorType";
+CPRuleEditorPredicateCustomSelector     = "CPRuleEditorPredicateCustomSelector";
+CPRuleEditorPredicateCompoundType       = "CPRuleEditorPredicateCompoundType";
+
+CPRuleEditorRowsDidChangeNotification   = "CPRuleEditorRowsDidChangeNotification";
+CPRuleEditorRulesDidChangeNotification  = "CPRuleEditorRulesDidChangeNotification";
+
+CPRuleEditorNestingModeSingle   = 0;        // Only a single row is allowed.  Plus/minus buttons will not be shown
+CPRuleEditorNestingModeList     = 1;        // Allows a single list, with no nesting and no compound rows
+CPRuleEditorNestingModeCompound = 2;        // Unlimited nesting and compound rows; this is the default
+CPRuleEditorNestingModeSimple   = 3;        // One compound row at the top with subrows beneath it, and no further nesting allowed
+
+CPRuleEditorRowTypeSimple       = 0;
+CPRuleEditorRowTypeCompound     = 1;

AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j

@@ -0,0 +1,145 @@
+/*
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@implementation _CPPredicateEditorRowNode : CPObject
+{
+    _CPPredicateEditorTree                   tree @accessors;
+    CPMutableArray                  templateViews @accessors;
+    CPMutableArray        copiedTemplateContainer @accessors;
+    CPArray                              children @accessors(copy);
+}
+
++ (id)rowNodeFromTree:(id)aTree
+{
+    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:{}];
+}
+
++ (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable
+{
+    var views,
+        copiedContainer;
+
+    var uuid = [[aTree template] UID],
+        cachedNode = templateTable[uuid],
+        node = [[_CPPredicateEditorRowNode alloc] init];
+
+    [node setTree:aTree];
+
+    if (!cachedNode)
+    {
+        views = [CPMutableArray array];
+        copiedContainer = [CPMutableArray array];
+        templateTable[uuid] = node;
+    }
+    else
+    {
+        views = [cachedNode templateViews];
+        copiedContainer = [cachedNode copiedTemplateContainer];
+    }
+
+    [node setTemplateViews:views];
+    [node setCopiedTemplateContainer:copiedContainer];
+
+    var nodeChildren = [CPMutableArray array],
+        treeChildren = [aTree children],
+        count = [treeChildren count];
+
+    for (var i = 0; i < count; i++)
+    {
+        var treeChild = treeChildren[i],
+            child = [_CPPredicateEditorRowNode _rowNodeFromTree:treeChild withTemplateTable:templateTable];
+
+        [nodeChildren addObject:child];
+    }
+
+    [node setChildren:nodeChildren];
+
+    return node;
+}
+
+- (BOOL)applyTemplate:(id)template withViews:(id)views forOriginalTemplate:(id)originalTemplate
+{
+    var t = [tree template],
+        count = [children count];
+
+    if (t !== template)
+    {
+        [templateViews setArray:views];
+        [copiedTemplateContainer removeAllObjects];
+        [copiedTemplateContainer addObject:template];
+    }
+
+    for (var i = 0; i < count; i++)
+        [children[i] applyTemplate:template withViews:views forOriginalTemplate:originalTemplate];
+}
+
+- (BOOL)isEqual:(id)node
+{
+    if (![node isKindOfClass:[_CPPredicateEditorRowNode class]])
+        return NO;
+
+    return (tree === [node tree]);
+}
+
+- (void)copyTemplateIfNecessary
+{
+    if ([copiedTemplateContainer count] === 0)
+    {
+        var copy = [[tree template] copy];
+        [copiedTemplateContainer addObject:copy];
+        [templateViews addObjectsFromArray:[copy templateViews]];
+    }
+}
+
+- (CPView)templateView
+{
+    [self copyTemplateIfNecessary];
+    return [templateViews objectAtIndex:[tree indexIntoTemplate]];
+}
+
+- (id)templateForRow
+{
+    [self copyTemplateIfNecessary];
+    return [copiedTemplateContainer lastObject];
+}
+
+- (CPString)title
+{
+    return [tree title];
+}
+
+- (id)displayValue
+{
+    var title = [self title];
+
+    if (title !== nil)
+        return title;
+
+    return [self templateView];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<%@ %@ %@ tree:%@ tviews:%@", [self className],[self UID], [self title], [tree UID], [templateViews description]];
+}
+
+@end

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

@@ -0,0 +1,50 @@
+/*
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPString.j>
+
+@implementation _CPPredicateEditorTree : CPObject
+{
+    CPPredicateEditorRowTemplate         template @accessors;
+    CPString                                title @accessors(copy);
+    CPArray                              children @accessors(copy);
+    CPInteger                   indexIntoTemplate @accessors;
+    CPInteger                       menuItemIndex @accessors;
+}
+
+- (id)copy
+{
+    var tree = [[_CPPredicateEditorTree alloc] init];
+    [tree setTemplate:template];
+    [tree setTitle:title];
+    [tree setMenuItemIndex:menuItemIndex];
+    [tree setIndexIntoTemplate:indexIntoTemplate];
+    [tree setChildren:children];
+
+    return tree;
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<%@: %p (%@) [%d-%d] T:%p at:%d> [\r%@\r]", [self className], self, title, indexIntoTemplate, menuItemIndex, template, [template rightExpressionAttributeType], children];
+}
+
+@end
+

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -0,0 +1,97 @@
+/*
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPDictionary.j>
+@import <Foundation/CPString.j>
+@import <Foundation/CPURLConnection.j>
+@import <Foundation/CPURLRequest.j>
+
+var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
+
+@implementation _CPRuleEditorLocalizer : CPObject
+{
+    CPDictionary    _dictionary @accessors(property=dictionary);
+    CPURLConnection connection;
+    CPURLRequest    request;
+}
+
+- (void)loadContentOfURL:(CPURL)aURL
+{
+    request = [CPURLRequest requestWithURL:aURL];
+    connection = [CPURLConnection connectionWithRequest:request delegate:self];
+}
+
+- (void)reloadIfNeeded
+{
+    if (connection !== nil) // Connection waiting
+    {
+        connection = nil;
+
+        var data = [CPURLConnection sendSynchronousRequest:request returningResponse:NULL];
+        [self loadContent:[data rawString]];
+    }
+}
+
+- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)rawString
+{
+    if (connection !== nil && rawString !== nil)
+        [self loadContent:rawString];
+
+    connection = nil;
+}
+
+- (void)loadContent:(CPString)aContent
+{
+    var dict = @{},
+        lines = [aContent componentsSeparatedByString:"\n"],
+        count = [lines count];
+
+    for (var i = 0 ; i < count ; i++)
+    {
+        var line = [lines objectAtIndex:i];
+
+        if (line.length > 1)
+        {
+            var match = LocalizerStringsRegex.exec(line);
+
+            if (match && match.length >= 3)
+                [dict setObject:match[2] forKey:match[1]];
+        }
+    }
+
+    _dictionary = [CPDictionary dictionaryWithDictionary:dict];
+}
+
+- (CPString)localizedStringForString:(CPString)aString
+{
+    [self reloadIfNeeded];
+
+    if (_dictionary !== nil && aString !== nil)
+    {
+        var localized = [_dictionary objectForKey:aString];
+
+        if (localized !== nil)
+            return localized;
+    }
+
+    return aString;
+}
+
+@end

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -0,0 +1,203 @@
+/*
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPBezierPath.j"
+@import "CPPopUpButton.j"
+
+@class _CPRuleEditorViewSlice
+
+var GRADIENT_START_COLOR = "#fcfcfc",
+    GRADIENT_END_COLOR = "#dfdfdf",
+    BORDER_COLOR = "#BDBDBD";
+
+var GRADIENT_NORMAL,
+    GRADIENT_HIGHLIGHTED,
+    GRADIENT_PROPERTY;
+
+if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+{
+    GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_START_COLOR + "), to(" + GRADIENT_END_COLOR + "))",
+    GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(" + GRADIENT_END_COLOR + "), to(" + GRADIENT_START_COLOR + "))";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+{
+    GRADIENT_NORMAL = "-moz-linear-gradient(top, " + GRADIENT_START_COLOR + ", " + GRADIENT_END_COLOR + ")",
+    GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top, " + GRADIENT_END_COLOR + ", " + GRADIENT_START_COLOR + ")";
+    GRADIENT_PROPERTY = "background";
+}
+else if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+{
+    GRADIENT_NORMAL = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_START_COLOR + "', endColorstr='" + GRADIENT_END_COLOR + "')";
+    GRADIENT_HIGHLIGHTED = "progid:DXImageTransform.Microsoft.gradient(startColorstr='" + GRADIENT_END_COLOR + "', endColorstr='" + GRADIENT_START_COLOR + "')";
+    GRADIENT_PROPERTY = "filter";
+}else
+{
+    GRADIENT_NORMAL = GRADIENT_START_COLOR;
+    GRADIENT_HIGHLIGHTED = GRADIENT_END_COLOR;
+    GRADIENT_PROPERTY = "background";
+}
+
+@implementation _CPRuleEditorPopUpButton : CPPopUpButton
+{
+    CPInteger radius;
+}
+
+- (void)_sharedInit
+{
+    [self setBordered:NO];
+
+#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];
+
+    return self;
+}
+
+- (id)hitTest:(CGPoint)point
+{
+    if (!CGRectContainsPoint([self frame], point) || ![self sliceIsEditable])
+        return nil;
+
+    return self;
+}
+
+- (BOOL)sliceIsEditable
+{
+    var superview = [self superview];
+    return ![superview isKindOfClass:[_CPRuleEditorViewSlice]] || [superview isEditable];
+}
+
+- (BOOL)trackMouse:(CPEvent)theEvent
+{
+    if (![self sliceIsEditable])
+        return NO;
+
+    return [super trackMouse:theEvent];
+}
+
+- (CGRect)contentRectForBounds:(CGRect)bounds
+{
+    var contentRect = [super contentRectForBounds:bounds];
+    contentRect.origin.x += radius;
+    contentRect.size.width -= 2 * radius;
+
+    return contentRect;
+}
+
+- (void)layoutSubviews
+{
+#if PLATFORM(DOM)
+    radius = FLOOR(CGRectGetHeight([self bounds]) / 2);
+    var style = _DOMElement.style,
+        radiusCSS = radius + "px";
+
+    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);
+
+    CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);
+
+    var arrowsPath = [CPBezierPath bezierPath];
+    [arrowsPath moveToPoint:CGPointMake(0, 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
+    [arrowsPath lineToPoint:CGPointMake(arrow_width / 2, arrow_width + 1)];
+    [arrowsPath closePath];
+
+    CGContextSetFillColor(context, [CPColor colorWithWhite:101 / 255 alpha:1]);
+    [arrowsPath fill];
+
+    CGContextScaleCTM(context, 1 , -1);
+    [arrowsPath fill];
+}
+
+@end
+
+@implementation _CPRuleEditorButton : CPButton
+{
+    CPInteger radius;
+}
+
+- (void)_sharedInit
+{
+    [self setBordered:NO];
+
+#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];
+
+    return self;
+}
+
+- (void)layoutSubviews
+{
+#if PLATFORM(DOM)
+    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
+
+    [super layoutSubviews];
+}
+
+@end

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -0,0 +1,126 @@
+/*
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPView.j"
+
+@implementation _CPRuleEditorViewSlice : CPView
+{
+    CPRuleEditor _ruleEditor;
+    int          _indentation           @accessors(property=indentation);
+    int          _rowIndex              @accessors(property=rowIndex);
+    CGRect       _animationTargetRect   @accessors(property=_animationTargetRect);
+    BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
+    BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
+    CPColor      _backgroundColor       @accessors(property=backgroundColor);
+    BOOL         _editable              @accessors(getter=isEditable, setter=setEditable:);
+}
+
+- (void)removeFromSuperview
+{
+    [super removeFromSuperview];
+}
+
+- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
+{
+    if (self = [super initWithFrame:frame])
+    {
+        _ruleEditor = editor;
+        _selected = NO;
+        _lastSelected = NO;
+    }
+
+    return self;
+}
+
+- (void)_setSelected:(BOOL)select
+{
+    if (select == _selected)
+        return;
+
+    var selector = select ? @"setThemeState:" : @"unsetThemeState:";
+    [[self subviews] makeObjectsPerformSelector:CPSelectorFromString(selector)  withObject:CPThemeStateSelectedDataView];
+    _selected = select;
+}
+
+- (void)drawRect:(CGRect)rect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds],
+        maxX = CGRectGetWidth(bounds),
+        maxY = CGRectGetHeight(bounds);
+
+    // Draw background
+    if ([self _isSelected])
+        _backgroundColor = [_ruleEditor _selectedRowColor];
+    else
+    {
+        var colors = [_ruleEditor _backgroundColors],
+            count = [colors count];
+        _backgroundColor = [colors objectAtIndex:(_rowIndex % count)];
+    }
+
+    CGContextSetFillColor(context, _backgroundColor);
+    CGContextFillRect(context, rect);
+
+    // Draw Top Border
+    CGContextBeginPath(context);
+    CGContextMoveToPoint(context, 0, 0);
+    CGContextAddLineToPoint(context, maxX, 0);
+    CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
+    CGContextStrokePath(context);
+
+    // Draw Bottom Border
+    CGContextBeginPath(context);
+    CGContextMoveToPoint(context, 0, maxY);
+    CGContextAddLineToPoint(context, maxX, maxY);
+
+    var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
+
+    CGContextSetStrokeColor(context, bottomColor);
+    CGContextStrokePath(context);
+}
+
+- (void)mouseDown:(CPEvent)theEvent
+{
+    if (_editable)
+        [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
+}
+
+- (void)mouseUp:(CPEvent)theEvent
+{
+    if (_editable)
+        [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
+}
+
+/*
+- (void)rightMouseDown:(CPEvent)theEvent
+{
+    [_ruleEditor _rightMouseDownOnSlice:self withEvent:theEvent];
+}
+*/
+
+// =========
+// ! DEBUG
+// =========
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"<%@ %p index:%d indentation:%d>",[self className],self,[self rowIndex],[self indentation]];
+}
+
+@end

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -0,0 +1,533 @@
+/*
+ * Created by cacaodev@gmail.com.
+ * Copyright (c) 2011 Pear, Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPRuleEditor_Constants.j"
+@import "_CPRuleEditorViewSlice.j"
+@import "_CPRuleEditorPopUpButton.j"
+
+@global CPApp
+
+var CONTROL_HEIGHT = 16.,
+    BUTTON_HEIGHT = 16.;
+
+@implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
+{
+    CPMutableArray  _ruleOptionViews;
+    CPMutableArray  _ruleOptionFrames;
+    CPMutableArray  _correspondingRuleItems;
+    CPMutableArray  _ruleOptionInitialViewFrames;
+    CPButton        _addButton;
+    CPButton        _subtractButton;
+
+    CPRuleEditorRowType _rowType @accessors;
+    CPRuleEditorRowType _plusButtonRowType;
+}
+
+- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
+{
+    if (self = [super initWithFrame:frame ruleEditorView:editor])
+        [self _initShared];
+
+    return self;
+}
+
+- (void)_initShared
+{
+    _correspondingRuleItems = [[CPMutableArray alloc] init];
+    _ruleOptionFrames = [[CPMutableArray alloc] init];
+    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
+    _ruleOptionViews = [[CPMutableArray alloc] init];
+     _editable = [_ruleEditor isEditable];
+
+    _addButton = [self _createAddRowButton];
+    _subtractButton = [self _createDeleteRowButton];
+    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
+    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
+    [_addButton setHidden:!_editable];
+    [_subtractButton setHidden:!_editable];
+    [self addSubview:_addButton];
+    [self addSubview:_subtractButton];
+
+    [self setAutoresizingMask:CPViewWidthSizable];
+
+    var center = [CPNotificationCenter defaultCenter];
+    [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
+}
+
+- (CPButton)_createRowButton
+{
+    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
+    [button setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
+    [button setTextColor:[CPColor colorWithWhite:150 / 255 alpha:1]];
+    [button setAlignment:CPCenterTextAlignment];
+    [button setAutoresizingMask:CPViewMinXMargin];
+    [button setImagePosition:CPImageOnly];
+
+    return button;
+}
+
+- (CPButton)_createAddRowButton
+{
+    var button = [self _createRowButton];
+
+    [button setImage:[_ruleEditor _addImage]];
+    [button setAction:@selector(_addOption:)];
+    [button setTarget:self];
+
+    return button;
+}
+
+- (CPButton)_createDeleteRowButton
+{
+    var button = [self _createRowButton];
+
+    [button setImage:[_ruleEditor _removeImage]];
+    [button setAction:@selector(_deleteOption:)];
+    [button setTarget:self];
+
+    return button;
+}
+
+- (CPMenuItem)_createMenuItemWithTitle:(CPString )title
+{
+    title = [[_ruleEditor standardLocalizer] localizedStringForString:title];
+    var mItem = [[CPMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+    return mItem;
+}
+
+- (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
+{
+    var title = [[itemsArray objectAtIndex:index] title],
+        font = [_ruleEditor font],
+        width = [title sizeWithFont:font].width + 20,
+        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),
+
+        popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
+
+    [popup setTextColor:[CPColor colorWithWhite:101 / 255 alpha:1]];
+    [popup setValue:font forThemeAttribute:@"font"];
+
+    var count = [itemsArray count];
+    for (var i = 0; i < count; i++)
+        [popup addItem:[itemsArray objectAtIndex:i]];
+
+    [popup selectItemAtIndex:index];
+
+    return popup;
+}
+
+- (CPMenuItem)_createMenuSeparatorItem
+{
+    return [CPMenuItem separatorItem];
+}
+
+- (_CPRuleEditorTextField)_createStaticTextFieldWithStringValue:(CPString)text
+{
+    var textField = [[_CPRuleEditorTextField alloc] initWithFrame: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)];
+
+    [textField setValue:font forThemeAttribute:@"font"];
+    [textField setStringValue:localizedText];
+
+    return textField;
+}
+
+- (void)_addOption:(id)sender
+{
+    if (_rowIndex == [_ruleEditor numberOfRows] - 1)
+        [self setNeedsDisplay:YES];
+
+    var type = _plusButtonRowType;
+    if ([_ruleEditor nestingMode] == CPRuleEditorNestingModeCompound && ([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask))
+        type = CPRuleEditorRowTypeCompound;
+
+    [_ruleEditor _addOptionFromSlice:self ofRowType:type];
+}
+
+- (void)_deleteOption:(id)sender
+{
+    [_ruleEditor _deleteSlice:self];
+}
+
+- (void)_ruleOptionPopupChangedAction:(CPMenuItem )sender
+{
+    var layoutdict = [sender representedObject],
+        newItem = [layoutdict objectForKey:@"item"],
+        indexInCriteria = [layoutdict objectForKey:@"indexInCriteria"],
+        oldItem = [_correspondingRuleItems objectAtIndex:indexInCriteria];
+
+    if (![newItem isEqual:oldItem])
+    {
+        [_correspondingRuleItems replaceObjectAtIndex:indexInCriteria withObject:newItem];
+        [_ruleEditor _changedItem:oldItem toItem:newItem inRow:_rowIndex atCriteriaIndex:indexInCriteria];
+    }
+}
+
+- (BOOL)validateMenuItem:(CPMenuItem )menuItem
+{
+    return [_ruleEditor _validateItem:menuItem value:[[menuItem representedObject] valueForKey:@"item"] inRow:_rowIndex];
+}
+
+- (void)_emptyRulePartSubviews
+{
+    var count = [_ruleOptionViews count];
+
+    while (count--)
+        [_ruleOptionViews[count] removeFromSuperview];
+
+    [_ruleOptionViews removeAllObjects];
+    [_ruleOptionFrames removeAllObjects];
+    [_ruleOptionInitialViewFrames removeAllObjects];
+}
+
+- (void)_reconfigureSubviews
+{
+    var ruleItems,
+        criteria,
+        repObject,
+        menuItem,
+        ruleView,
+        criterion,
+        parent,
+        numberOfCriteria,
+        numberOfChildren,
+        firstResponderIndex,
+
+        ruleItems = [CPMutableArray array],
+        responder = [[self window] firstResponder];
+
+    [self _emptyRulePartSubviews];
+
+    criteria = [_ruleEditor criteriaForRow:_rowIndex];
+    numberOfCriteria = [criteria count];
+
+    firstResponderIndex = numberOfCriteria - 1;
+    if (responder)
+        firstResponderIndex = [_ruleOptionViews indexOfObjectIdenticalTo:responder];
+
+    for (var i = 0; i < numberOfCriteria; i++)
+    {
+        ruleView = nil;
+        parent = nil;
+        criterion = [criteria objectAtIndex:i];
+
+        if (i > 0)
+            parent = [criteria objectAtIndex:i - 1];
+
+        var childItems = [],
+            childValues = [];
+
+        [_ruleEditor _getAllAvailableItems:childItems values:childValues asChildrenOfItem:parent inRow:_rowIndex];
+
+        numberOfChildren = [childItems count];
+        if (numberOfChildren > 1)
+        {
+            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren],
+                selectedIndex = [childItems indexOfObject:criterion];
+
+            if (selectedIndex == CPNotFound)
+                break;
+
+            for (var j = 0; j < numberOfChildren; ++j)
+            {
+                var childItem = [childItems objectAtIndex:j],
+                    childValue = [childValues objectAtIndex:j];
+
+                if ([childValue isKindOfClass:[CPMenuItem class]])
+                {
+                    [[childValue menu] removeItem:childValue];
+                    menuItem = childValue;
+                }
+                else
+                {
+                    if ([childValue isEqualToString:@""])
+                        menuItem = [self _createMenuSeparatorItem];
+                    else
+                    {
+                        menuItem = [self _createMenuItemWithTitle:childValue];
+                        [menuItem setTarget:self];
+                        [menuItem setAction:@selector(_ruleOptionPopupChangedAction:)];
+                    }
+                }
+
+                repObject = @{
+                        @"item": childItem,
+                        @"value": childValue,
+                        @"indexInCriteria": i
+                    };
+                [menuItem setRepresentedObject:repObject];
+                [menuItems addObject:menuItem];
+            }
+
+            ruleView = [self _createPopUpButtonWithItems:menuItems selectedItemIndex:selectedIndex];
+        }
+        else
+        {
+            var value = [childValues objectAtIndex:0],
+                type = [value valueType];
+
+            if (type === 0)
+                ruleView = [self _createStaticTextFieldWithStringValue:value];
+            else
+            {
+                if (type !== 1)
+                {
+                    [CPException raise:CPInternalInconsistencyException reason:@"Display value must be a string or a menu item"];
+                    continue;
+                }
+
+                ruleView = value;
+                [ruleView setTarget:self];
+                [ruleView setAction:@selector(_sendRuleAction:)];
+                if ([ruleView respondsToSelector:@selector(setDelegate:)])
+                    [ruleView setDelegate:self];
+            }
+        }
+
+        if (ruleView != nil)
+        {
+            [_ruleOptionViews addObject:ruleView];
+            var frame = [ruleView frame];
+            [_ruleOptionInitialViewFrames addObject:frame];
+            [_ruleOptionFrames addObject:frame];
+
+            if (!criterion)
+                criterion = [CPNull null];
+
+            [ruleItems addObject:criterion];
+        }
+    }
+
+    [_correspondingRuleItems setArray:ruleItems];
+
+    if (!_editable)
+        [self _updateEnabledStateForSubviews];
+
+    [self _relayoutSubviewsWidthChanged:YES];
+
+    if (firstResponderIndex != CPNotFound)
+    {
+        var aView = [_ruleOptionViews objectAtIndex:firstResponderIndex];
+        [[self window] makeFirstResponder:aView]; // This is not working. bug in CPPopUpButton firstResponder ?
+    }
+
+    //[self setNeedsDisplay:YES];
+}
+
+- (void)_updateEnabledStateForSubviews
+{
+    [_ruleOptionViews makeObjectsPerformSelector:@selector(setEnabled:) withObject:NO];
+}
+
+- (void)layoutSubviews
+{
+    [self _relayoutSubviewsWidthChanged:YES];
+}
+
+- (void)_relayoutSubviewsWidthChanged:(BOOL)widthChanged
+{
+    var optionViewOriginX,
+        leftHorizontalPadding,
+        leftButtonMinX,
+        rowHeight = [_ruleEditor rowHeight],
+        count = [_ruleOptionViews count],
+        sliceFrame = [self frame],
+
+        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT) / 2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
+
+    [_addButton setFrame:buttonFrame];
+    buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
+    [_subtractButton setFrame:buttonFrame];
+
+    if (widthChanged)
+    {
+        optionViewOriginX = [self _leftmostViewFixedHorizontalPadding] + [self _indentationHorizontalPadding] * _indentation;
+        leftHorizontalPadding = [self _rowButtonsLeftHorizontalPadding];
+        leftButtonMinX = CGRectGetMinX(buttonFrame);
+    }
+
+    for (var i = 0; i < count; i++)
+    {
+        var ruleOptionView = _ruleOptionViews[i],
+            optionFrame = _ruleOptionFrames[i];
+
+        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 2;
+
+        if (widthChanged)
+        {
+            optionFrame.origin.x = optionViewOriginX;
+            if (i == count - 1 && ![self _isRulePopup:ruleOptionView])
+            {
+                var initialFrame = _ruleOptionInitialViewFrames[i];
+                optionFrame.size.width = MIN(CGRectGetWidth(initialFrame), leftButtonMinX - leftHorizontalPadding - optionViewOriginX);
+            }
+        }
+
+        [ruleOptionView setFrame:optionFrame];
+        [self addSubview:ruleOptionView];
+
+        if (widthChanged)
+            optionViewOriginX += CGRectGetWidth(optionFrame) + [self _interviewHorizontalPadding];
+    }
+}
+
+- (void)_updateButtonVisibilities
+{
+    [_addButton setHidden:[_ruleEditor _shouldHideAddButtonForSlice:self]];
+    [_subtractButton setHidden:[_ruleEditor _shouldHideSubtractButtonForSlice:self]];
+}
+
+- (void)_configurePlusButtonByRowType:(CPRuleEditorRowType)type
+{
+    [self _setRowTypeToAddFromPlusButton:type];
+}
+
+- (void)setEditable:(BOOL)value
+{
+    [super setEditable:value]
+//  [self _updateEnabledStateForSubviews];
+    [self _updateButtonVisibilities];
+}
+
+- (float)_alignmentGridWidth
+{
+    return [_ruleEditor _alignmentGridWidth];
+}
+
+- (float)_indentationHorizontalPadding
+{
+    return 30.;
+}
+
+- (float)_interviewHorizontalPadding
+{
+    return 6.;
+}
+
+- (float)_leftmostViewFixedHorizontalPadding
+{
+    return 7.;
+}
+
+- (float)_minimumVerticalPopupPadding
+{
+    return 2.;
+}
+
+- (float)_rowButtonsInterviewHorizontalPadding
+{
+    return 6.;
+}
+
+- (float)_rowButtonsLeftHorizontalPadding
+{
+    return 10.;
+}
+
+- (float)_rowButtonsRightHorizontalPadding
+{
+    return ([[_ruleEditor superview] isKindOfClass:[CPClipView class]]) ? 18. : 10.;
+}
+
+- (void)_setRowTypeToAddFromPlusButton:(int)type
+{
+    _plusButtonRowType = type;
+}
+
+- (void)setNeedsDisplay:(BOOL)flag
+{
+    [super setNeedsDisplay:flag];
+}
+
+- (BOOL)_nestingModeShouldHideAddButton
+{
+    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
+}
+
+- (BOOL)_nestingModeShouldHideSubtractButton
+{
+    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
+}
+
+- (BOOL)containsDisplayValue:(id)value
+{
+    return [[_ruleEditor displayValuesForRow:_rowIndex] containsObject:value];
+    // Ou alors avec _correspondingRuleItems
+}
+
+- (void)viewDidMoveToWindow
+{
+    [self layoutSubviews];
+}
+
+- (void)drawRect:(CGRect)rect
+{
+    [super drawRect:rect];
+}
+
+- (BOOL)_isRulePopup:(CPView)view
+{
+    if ([view isKindOfClass:[_CPRuleEditorPopUpButton class]])
+        return YES;
+    return NO;
+}
+
+- (void)_sendRuleAction:(id)sender
+{
+    [_ruleEditor _updatePredicate];
+    [_ruleEditor _sendRuleAction];
+}
+
+- (void)_textDidChange:(CPNotification)aNotif
+{
+    if ([[aNotif object] superview] == self && [_ruleEditor _sendsActionOnIncompleteTextChange])
+        [self _sendRuleAction:nil];
+}
+
+@end
+
+@implementation _CPRuleEditorTextField : CPTextField
+{
+}
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self)
+    {
+        [self setDrawsBackground:NO];
+    }
+
+    return self;
+}
+
+- (id)hitTest:(CGPoint)point
+{
+    if (!CGRectContainsPoint([self frame], point))
+        return nil;
+
+    return [self superview];
+}
+
+@end

AppKit/CPSavePanel.j

@@ -1,5 +1,26 @@
+/*
+ * CPSavePanel.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
-@import <AppKit/CPPanel.j>
+@import "CPPanel.j"
 
 
 @implementation CPSavePanel : CPPanel

AppKit/CPScreen.j

@@ -1,13 +1,45 @@
-
+/*
+ * CPScreen.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2009, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 @import <Foundation/CPObject.j>
 
-#import "CoreGraphics/CGGeometry.h"
-#import "Platform/Platform.h"
+/*!
+    @ingroup appkit
+    @class CPScreen
 
+    A CPScreen object describes the attributes of a display device available
+    to Cappuccino.
+*/
 @implementation CPScreen : CPObject
 {
 }
 
+/*!
+    Returns the position and size of the visible area of the receiving screen.
+    This will normally be smaller than the full size of the screen to account
+    for system UI elements. For example, on a Mac the top of the visible frame
+    is placed below the bottom of the menu bar.
+
+    @return the visible screen rectangle
+*/
 - (CGRect)visibleFrame
 {
 #if PLATFORM(DOM)
@@ -17,4 +49,4 @@
 #endif
 }
 
-@end
+@end

AppKit/CPScroller.j

@@ -5,6 +5,9 @@
  * Created by Francisco Tolmasky.
  * Copyright 2008, 280 North, Inc.
  *
+ * Modified to match Lion style by Antoine Mercadal 2011
+ * <antoine.mercadal@archipelproject.org>
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,10 +23,14 @@
  * 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"
 
-#include "CoreGraphics/CGGeometry.h"
-
+@global CPApp
 
 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -41,21 +48,34 @@ CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
 
-/*! 
+/*!
     @ingroup appkit
-    @class CPScroller    
+    @class CPScroller
 */
 
 var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
     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;
@@ -70,58 +90,69 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     CPScrollerPart          _trackingPart;
     float                   _trackingFloatValue;
     CGPoint                 _trackingStartPoint;
+
+    CPViewAnimation         _animationScroller;
+
+    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
+    int                     _style;
+    CPTimer                 _timerFadeOut;
+    BOOL                    _isMouseOver;
 }
 
-+ (CPString)themeClass
+
+#pragma mark -
+#pragma mark Class methods
+
++ (CPString)defaultThemeClass
 {
     return "scroller";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null],
-                                                    _CGSizeMakeZero(), _CGSizeMakeZero(), _CGInsetMakeZero(), _CGInsetMakeZero(), _CGSizeMakeZero()]
-                                       forKeys:[    @"knob-slot-color",
-                                                    @"decrement-line-color",
-                                                    @"increment-line-color",
-                                                    @"knob-color",
-                                                    @"decrement-line-size",
-                                                    @"increment-line-size",
-                                                    @"track-inset",
-                                                    @"knob-inset",
-                                                    @"minimum-knob-length"]];
+    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
+        };
 }
 
-
-// Calculating Layout
-
-- (id)initWithFrame:(CGRect)aFrame
++ (float)scrollerWidth
 {
-    self = [super initWithFrame:aFrame];
-    
-    if (self)
-    {
-        _controlSize = CPRegularControlSize;
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-        
-        _hitPart = CPScrollerNoPart;
-
-        [self _calculateIsVertical];
-    }
-
-    return self;
+    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
 }
 
-// Determining CPScroller Size
 /*!
     Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidth
++ (float)scrollerWidthInStyle:(int)aStyle
 {
-    return 15.0;//[self scrollerWidthForControlSize:CPRegularControlSize];
+    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"];
 }
 
 /*!
@@ -130,7 +161,93 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 */
 + (float)scrollerWidthForControlSize:(CPControlSize)aControlSize
 {
-    return 15.0;//_CPScrollerWidths[aControlSize];
+    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;
 }
 
 /*!
@@ -148,27 +265,6 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     [self setNeedsDisplay:YES];
 }
 
-/*!
-    Returns the scroller's control size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
-- (void)setKnobProportion:(float)aProportion
-{
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
 /*!
     Return's the knob's proportion
 */
@@ -177,17 +273,50 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     return _knobProportion;
 }
 
-- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+/*!
+    Set the knob's proportion
+    @param aProportion the desired proportion
+*/
+- (void)setKnobProportion:(float)aProportion
 {
-    var themeState = _themeState;
-    
-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
-    
-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+    if (!_IS_NUMERIC(aProportion))
+        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];
+
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
 }
 
-// Calculating Layout
+
+#pragma mark -
+#pragma mark Privates
+
+/*! @ignore */
+- (void)_adjustScrollerSize
+{
+    var frame = [self frame],
+        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
+
+    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
+        frame.size.width = scrollerWidth;
+
+    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
+        frame.size.height = scrollerWidth;
+
+    [self setFrame:frame];
+}
+
+/*! @ignore */
+- (void)_performFadeOut:(CPTimer)aTimer
+{
+    [self fadeOut];
+    _timerFadeOut = nil;
+}
+
+
+#pragma mark -
+#pragma mark Utilities
 
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -205,25 +334,28 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 - (CPScrollerPart)testPart:(CGPoint)aPoint
 {
     aPoint = [self convertPoint:aPoint fromView:nil];
-    
-    // The ordering of these tests is important.  We check the knob and 
+
+    // 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;
-    
+
     if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementPage], aPoint))
         return CPScrollerDecrementPage;
-    
+
     if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementPage], aPoint))
         return CPScrollerIncrementPage;
-    
+
     if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementLine], aPoint))
         return CPScrollerDecrementLine;
-    
+
     if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementLine], aPoint))
         return CPScrollerIncrementLine;
-    
+
     if (CGRectContainsPoint([self rectForPart:CPScrollerKnobSlot], aPoint))
         return CPScrollerKnobSlot;
 
@@ -241,7 +373,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     if (_knobProportion === 1.0)
     {
         _usableParts = CPNoScrollerParts;
-    
+
         _partRects[CPScrollerDecrementPage] = CGRectMakeZero();
         _partRects[CPScrollerKnob]          = CGRectMakeZero();
         _partRects[CPScrollerIncrementPage] = CGRectMakeZero();
@@ -250,7 +382,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
         // In this case, the slot is the entirety of the scroller.
         _partRects[CPScrollerKnobSlot] = CGRectMakeCopy(bounds);
-        
+
         return;
     }
 
@@ -260,31 +392,31 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     var knobInset = [self currentValueForThemeAttribute:@"knob-inset"],
         trackInset = [self currentValueForThemeAttribute:@"track-inset"],
         width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds); 
-    
+        height = _CGRectGetHeight(bounds);
+
     if ([self isVertical])
     {
         var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
             incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
             effectiveDecrementLineHeight = decrementLineSize.height + trackInset.top,
             effectiveIncrementLineHeight = incrementLineSize.height + trackInset.bottom,
-            slotHeight = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
+            slotSize = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
             minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
             knobWidth = width - knobInset.left - knobInset.right,
-            knobHeight = MAX(minimumKnobLength, (slotHeight * _knobProportion)),
-            knobLocation = effectiveDecrementLineHeight + (slotHeight - knobHeight) * [self floatValue];
+            knobHeight = MAX(minimumKnobLength, (slotSize * _knobProportion)),
+            knobLocation = effectiveDecrementLineHeight + (slotSize - knobHeight) * [self floatValue];
 
         _partRects[CPScrollerDecrementPage] = _CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
         _partRects[CPScrollerKnob]          = _CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
         _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
-        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotSize);
         _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
         _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
-        
-        if(height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
+
+        if (height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
             _partRects[CPScrollerKnob] = _CGRectMakeZero();
-        
-        if(height < decrementLineSize.height + incrementLineSize.height - 2)
+
+        if (height < decrementLineSize.height + incrementLineSize.height - 2)
         {
             _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
             _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
@@ -296,28 +428,28 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
         var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
             incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
             effectiveDecrementLineWidth = decrementLineSize.width + trackInset.left,
-            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right;
-            slotWidth = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
+            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right,
+            slotSize = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
             minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
-            knobWidth = MAX(minimumKnobLength, (slotWidth * _knobProportion)),
+            knobWidth = MAX(minimumKnobLength, (slotSize * _knobProportion)),
             knobHeight = height - knobInset.top - knobInset.bottom,
-            knobLocation = effectiveDecrementLineWidth + (slotWidth - knobWidth) * [self floatValue];
+            knobLocation = effectiveDecrementLineWidth + (slotSize - knobWidth) * [self floatValue];
 
         _partRects[CPScrollerDecrementPage] = _CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
         _partRects[CPScrollerKnob]          = _CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
         _partRects[CPScrollerIncrementPage] = _CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
-        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, height - trackInset.top - trackInset.bottom);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotSize, height - trackInset.top - trackInset.bottom);
         _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
         _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
-        
-        if(width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
+
+        if (width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
             _partRects[CPScrollerKnob] = _CGRectMakeZero();
-        
-        if(width < decrementLineSize.width + incrementLineSize.width - 2)
+
+        if (width < decrementLineSize.width + incrementLineSize.width - 2)
         {
             _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
             _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotHeight);
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotSize);
         }
     }
 }
@@ -331,7 +463,35 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     return _usableParts;
 }
 
-// Drawing the Parts
+/*!
+    Display the scroller
+*/
+- (void)fadeIn
+{
+    if (_isMouseOver && _knobProportion != 1.0)
+        [self setThemeState:CPThemeStateSelected];
+
+    if (_timerFadeOut)
+        [_timerFadeOut invalidate];
+
+    [self setAlphaValue:1.0];
+}
+
+/*!
+    Start the fade out anination
+*/
+- (void)fadeOut
+{
+    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
+        return;
+
+    [_animationScroller startAnimation];
+}
+
+
+#pragma mark -
+#pragma mark  Drawing
+
 /*!
     Draws the specified arrow and sets the highlight.
     @param anArrow the arrow to draw
@@ -358,9 +518,9 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 - (CPView)createViewForPart:(CPScrollerPart)aPart
 {
     var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-    
+
     [view setHitTests:NO];
-    
+
     return view;
 }
 
@@ -374,26 +534,28 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
     [view setHitTests:NO];
-        
+
     return view;
 }
 
 - (void)layoutSubviews
 {
+    [self _adjustScrollerSize];
     [self checkSpaceForParts];
 
     var index = 0,
-        count = PARTS_ARRANGEMENT.length;
+        count = PARTS_ARRANGEMENT.length,
+        view;
 
     for (; index < count; ++index)
     {
         var part = PARTS_ARRANGEMENT[index];
-    
+
         if (index === 0)
             view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowBelow relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index + 1]];
         else
             view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowAbove relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index - 1]];
-        
+
         if (view)
             [view setBackgroundColor:[self currentValueForThemeAttribute:NAMES_FOR_PARTS[part] + "-color"]];
     }
@@ -403,7 +565,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     Caches images for the scroll arrow and knob.
 */
 - (void)drawParts
-{   
+{
     [self drawKnobSlot];
     [self drawKnob];
     [self drawArrow:CPScrollerDecrementArrow highlight:NO];
@@ -426,40 +588,41 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 - (void)trackKnob:(CPEvent)anEvent
 {
     var type = [anEvent type];
-    
+
     if (type === CPLeftMouseUp)
     {
         _hitPart = CPScrollerNoPart;
-        
+
         return;
     }
-    
+
     if (type === CPLeftMouseDown)
     {
         _trackingFloatValue = [self floatValue];
         _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
     }
-    
+
     else if (type === CPLeftMouseDragged)
     {
         var knobRect = [self rectForPart:CPScrollerKnob],
             knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
             remainder = ![self isVertical] ? (_CGRectGetWidth(knobSlotRect) - _CGRectGetWidth(knobRect)) : (_CGRectGetHeight(knobSlotRect) - _CGRectGetHeight(knobRect));
-            
+
         if (remainder <= 0)
             [self setFloatValue:0.0];
         else
         {
-            var location = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+            var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
                 delta = ![self isVertical] ? location.x - _trackingStartPoint.x : location.y - _trackingStartPoint.y;
 
             [self setFloatValue:_trackingFloatValue + delta / remainder];
         }
     }
-    
+
     [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 
-    [self sendAction:[self action] to:[self target]];
+    if (type === CPLeftMouseDragged)
+        [self sendAction:[self action] to:[self target]];
 }
 
 /*!
@@ -474,27 +637,27 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     {
         [self highlight:NO];
         [CPEvent stopPeriodicEvents];
-        
+
         _hitPart = CPScrollerNoPart;
-        
+
         return;
     }
-    
+
     if (type === CPLeftMouseDown)
     {
         _trackingPart = [self hitPart];
-        
+
         _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
         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),
@@ -502,58 +665,53 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
                     remainder = (![self isVertical] ? _CGRectGetWidth(knobSlotRect) : _CGRectGetHeight(knobSlotRect)) - knobWidth;
 
                 [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - _CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - _CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];
-                
+
                 _hitPart = CPScrollerKnob;
-                
-                [self sendAction:[self action] to:[self target]];        
-                
+
+                [self sendAction:[self action] to:[self target]];
+
                 // Now just track the knob.
                 return [self trackKnob:anEvent];
             }
         }
-        
+
         [self highlight:YES];
         [self sendAction:[self action] to:[self target]];
-        
+
         [CPEvent startPeriodicEventsAfterDelay:0.5 withPeriod:0.04];
     }
-    
+
     else if (type === CPLeftMouseDragged)
     {
         _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;
             }
         }
-        
+
         [self highlight:CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint)];
     }
     else if (type == CPPeriodic && CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint))
         [self sendAction:[self action] to:[self target]];
-    
+
     [CPApp setTarget:self selector:@selector(trackScrollButtons:) forNextEventMatchingMask:CPPeriodicMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 
 }
 
-- (void)_calculateIsVertical
+- (void)_setIsVertical:(BOOL)isVertical
 {
-    // Recalculate isVertical.
-    var bounds = [self bounds],
-        width = _CGRectGetWidth(bounds),
-        height = _CGRectGetHeight(bounds);
+    _isVertical = isVertical;
 
-    _isVertical = width < height ? 1 : (width > height ? 0 : -1);
-
-    if (_isVertical === 1)
+    if (_isVertical)
         [self setThemeState:CPThemeStateVertical];
-    else if (_isVertical === 0)
+    else
         [self unsetThemeState:CPThemeStateVertical];
 }
 
@@ -565,28 +723,88 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     [self setNeedsLayout];
 }
 
+
+#pragma mark -
+#pragma mark Overrides
+
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
+{
+    var themeState = _themeState;
+
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
+
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
+}
+
 - (void)mouseDown:(CPEvent)anEvent
 {
     if (![self isEnabled])
         return;
-    
+
     _hitPart = [self testPart:[anEvent locationInWindow]];
-    
+
     switch (_hitPart)
     {
-        case CPScrollerKnob:            return [self trackKnob:anEvent];
-        
-        case CPScrollerDecrementLine:   
-        case CPScrollerIncrementLine:   
+        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",
-    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
+var CPScrollerControlSizeKey    = @"CPScrollerControlSize",
+    CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
+    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
+    CPScrollerStyleKey          = @"CPScrollerStyleKey";
 
 @implementation CPScroller (CPCoding)
 
@@ -599,25 +817,43 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
 
         _knobProportion = 1.0;
+
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
             _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
 
         _partRects = [];
-        
+
         _hitPart = CPScrollerNoPart;
 
-        [self _calculateIsVertical];
+        _allowFadingOut = YES;
+        _isMouseOver = NO;
+
+        var paramAnimFadeOut = @{
+                CPViewAnimationTargetKey: self,
+                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
+            };
+
+        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
+        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
+        [_animationScroller setDelegate:self];
+        [self setAlphaValue:0.0];
+
+        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+
+        [self _setIsVertical:[aCoder decodeBoolForKey:CPScrollerIsVerticalKey]];
     }
-    
+
     return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [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

@@ -20,26 +20,30 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPButton.j"
+@import "CPMenu.j"
+@import "CPMenuItem.j"
 @import "CPTextField.j"
 
-#include "Platform/Platform.h"
+@class CPUserDefaults
+
+@global CPApp
 
 CPSearchFieldRecentsTitleMenuItemTag    = 1000;
 CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;
 
-var CPSearchFieldSearchImage = nil,
-    CPSearchFieldFindImage = nil,
-    CPSearchFieldCancelImage = nil,
-    CPSearchFieldCancelPressedImage = nil;
+var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
 
-/*! 
+var RECENT_SEARCH_PREFIX = @"   ";
+
+/*!
     @ingroup appkit
     @class CPSearchField
     The CPSearchField class defines the programmatic interface for text fields that are optimized for text-based searches. A CPSearchField object directly inherits from the CPTextField class. The search field implemented by these classes presents a standard user interface for searches, including a search button, a cancel button, and a pop-up icon menu for listing recent search strings and custom search categories.
 
-    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.    
+    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.
 */
 @implementation CPSearchField : CPTextField
 {
@@ -50,62 +54,81 @@ var CPSearchFieldSearchImage = nil,
 
     CPString    _recentsAutosaveName;
     CPArray     _recentSearches;
-    
+
     int         _maximumRecents;
     BOOL        _sendsWholeSearchString;
     BOOL        _sendsSearchStringImmediately;
+    BOOL        _canResignFirstResponder;
     CPTimer     _partialStringTimer;
 }
 
-+ (void)initialize
++ (CPString)defaultThemeClass
 {
-    if (self != [CPSearchField class])
-        return;
+    return @"searchfield"
+}
 
-    var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:CGSizeMake(25, 22)];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:CGSizeMake(25, 22)];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:CGSizeMake(22, 22)];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:CGSizeMake(22, 22)];
++ (CPDictionary)themeAttributes
+{
+    return @{
+            @"image-search": [CPNull null],
+            @"image-find": [CPNull null],
+            @"image-cancel": [CPNull null],
+            @"image-cancel-pressed": [CPNull null]
+        };
 }
 
 - (id)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame])
     {
-        _recentSearches = [CPArray array];
         _maximumRecents = 10;
         _sendsWholeSearchString = NO;
         _sendsSearchStringImmediately = NO;
         _recentsAutosaveName = nil;
 
-        [self _initWithFrame:frame];
+        [self _init];
 #if PLATFORM(DOM)
         _cancelButton._DOMElement.style.cursor = "default";
         _searchButton._DOMElement.style.cursor = "default";
-#endif          
+#endif
     }
-    
+
     return self;
 }
 
-- (void)_initWithFrame:(CGRect)frame
+- (void)_init
 {
+    _recentSearches = [CPArray array];
+
     [self setBezeled:YES];
     [self setBezelStyle:CPTextFieldRoundedBezel];
     [self setBordered:YES];
     [self setEditable:YES];
-    [self setDelegate:self];
-    
-    _cancelButton = [[CPButton alloc] initWithFrame:CGRectMake(frame.size.width - 27,(frame.size.height-22)/2,22,22)];
+    [self setContinuous:YES];
+
+    var bounds = [self bounds],
+        cancelButton = [[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]],
+        searchButton = [[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]];
+
+    [self setCancelButton:cancelButton];
     [self resetCancelButton];
-    [_cancelButton setHidden:YES];
-    [_cancelButton setAutoresizingMask:CPViewMinXMargin];
-    [self addSubview:_cancelButton];
-    
-    _searchButton = [[CPButton alloc] initWithFrame:CGRectMake(5,(frame.size.height-25)/2,25,25)];
+
+    [self setSearchButton:searchButton];
     [self resetSearchButton];
-    [self addSubview:_searchButton];
+
+    _canResignFirstResponder = YES;
+}
+
+- (void)viewWillMoveToSuperview:(CPView)aView
+{
+    [super viewWillMoveToSuperview:aView];
+
+    // First we remove any observer that may have been in place to avoid memory leakage.
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:self];
+
+    // Register the observe here if we need to.
+    if (aView)
+        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
 }
 
 // Managing Buttons
@@ -114,8 +137,16 @@ var CPSearchFieldSearchImage = nil,
     @param button The search button.
 */
 - (void)setSearchButton:(CPButton)button
-{ 
-    _searchButton = button;
+{
+    if (button != _searchButton)
+    {
+        [_searchButton removeFromSuperview];
+        _searchButton = button;
+
+        [_searchButton setFrame:[self searchButtonRectForBounds:[self bounds]]];
+        [_searchButton setAutoresizingMask:CPViewMaxXMargin];
+        [self addSubview:_searchButton];
+    }
 }
 
 /*!
@@ -133,30 +164,13 @@ var CPSearchFieldSearchImage = nil,
 */
 - (void)resetSearchButton
 {
-    var searchButtonImage, 
-        action, 
-        target,
-        button = [self searchButton];
-        
-    if (_searchMenuTemplate === nil)
-    {
-        searchButtonImage = CPSearchFieldSearchImage;
-        action = @selector(_sendAction:);
-        target = self;
-    }
-    else
-    {
-        searchButtonImage = CPSearchFieldFindImage;
-        action = @selector(_showMenu:);
-        target = self;
-    }
-    
+    var button = [self searchButton],
+        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];
+
     [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
+    [button setImageScaling:CPImageScaleAxesIndependently];
     [button setImage:searchButtonImage];
     [button setAutoresizingMask:CPViewMaxXMargin];
-    [button setTarget:target];
-    [button setAction:action];
 }
 
 /*!
@@ -165,7 +179,19 @@ var CPSearchFieldSearchImage = nil,
 */
 - (void)setCancelButton:(CPButton)button
 {
-    _cancelButton = button;
+    if (button != _cancelButton)
+    {
+        [_cancelButton removeFromSuperview];
+        _cancelButton = button;
+
+        [_cancelButton setFrame:[self cancelButtonRectForBounds:[self bounds]]];
+        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
+        [_cancelButton setTarget:self];
+        [_cancelButton setAction:@selector(cancelOperation:)];
+        [_cancelButton setButtonType:CPMomentaryChangeButton];
+        [self _updateCancelButtonVisibility];
+        [self addSubview:_cancelButton];
+    }
 }
 
 /*!
@@ -179,18 +205,18 @@ var CPSearchFieldSearchImage = nil,
 
 /*!
     Resets the cancel button to its default attributes.
-    This method resets the target, action, regular image, and pressed image. By default, when users click the cancel button, the delete: action message is sent up the responder chain. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
+    This method resets the target, action, regular image, and pressed image. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
 */
 - (void)resetCancelButton
 {
     var button = [self cancelButton];
     [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
-    [button setImage:CPSearchFieldCancelImage];
-    [button setAlternateImage:CPSearchFieldCancelPressedImage];
+    [button setImageScaling:CPImageScaleAxesIndependently];
+    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
+    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
     [button setAutoresizingMask:CPViewMinXMargin];
     [button setTarget:self];
-    [button setAction:@selector(_searchFieldCancel:)];
+    [button setAction:@selector(cancelOperation:)];
 }
 
 // Custom Layout
@@ -200,23 +226,25 @@ var CPSearchFieldSearchImage = nil,
     @return The updated bounding rectangle to use for the search text field. The default value is the value passed into the rect parameter.
     Subclasses can override this method to return a new bounding rectangle for the text-field object. You might use this method to provide a custom layout for the search field control.
 */
-- (CPRect)searchTextRectForBounds:(CPRect)rect
+- (CGRect)searchTextRectForBounds:(CGRect)rect
 {
-    var leftOffset = 0, width = rect.size.width;
-    
+    var leftOffset = 0,
+        width = _CGRectGetWidth(rect),
+        bounds = [self bounds];
+
     if (_searchButton)
     {
-        var searchRect = [_searchButton frame];
-        leftOffset = searchRect.origin.x + searchRect.size.width;
+        var searchBounds = [self searchButtonRectForBounds:bounds];
+        leftOffset = _CGRectGetMaxX(searchBounds) + 2;
     }
-    
+
     if (_cancelButton)
     {
-        var cancelRect = [_cancelButton frame];
-        width = cancelRect.origin.x - leftOffset;
+        var cancelRect = [self cancelButtonRectForBounds:bounds];
+        width = _CGRectGetMinX(cancelRect) - leftOffset;
     }
-    
-    return CPMakeRect(leftOffset,rect.origin.y,width,rect.size.height);
+
+    return _CGRectMake(leftOffset, _CGRectGetMinY(rect), width, _CGRectGetHeight(rect));
 }
 
 /*!
@@ -224,9 +252,11 @@ var CPSearchFieldSearchImage = nil,
     @param rect The current bounding rectangle for the search button.
     Subclasses can override this method to return a new bounding rectangle for the search button. You might use this method to provide a custom layout for the search field control.
 */
-- (CPRect)searchButtonRectForBounds:(CPRect)rect
+- (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    return [_searchButton frame];
+    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
+
+    return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
 }
 
 /*!
@@ -234,9 +264,11 @@ var CPSearchFieldSearchImage = nil,
     @param rect The updated bounding rectangle to use for the cancel button. The default value is the value passed into the rect parameter.
     Subclasses can override this method to return a new bounding rectangle for the cancel button. You might use this method to provide a custom layout for the search field control.
 */
-- (CPRect)cancelButtonRectForBounds:(CPRect)rect
+- (CGRect)cancelButtonRectForBounds:(CGRect)rect
 {
-    return [_cancelButton frame];
+    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
+
+    return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
 }
 
 // Managing Menu Templates
@@ -254,10 +286,10 @@ var CPSearchFieldSearchImage = nil,
     @param menu The menu template to use.
     The receiver looks for the tag constants described in ŇMenu tagsÓ to determine how to populate the menu with items related to recent searches. See ŇConfiguring a Search MenuÓ for a sample of how you might set up the search menu template.
 */
-- (void)setSearchMenuTemplate:(CPMenu)menu
+- (void)setSearchMenuTemplate:(CPMenu)aMenu
 {
-    _searchMenuTemplate = menu;
-    
+    _searchMenuTemplate = aMenu;
+
     [self resetSearchButton];
     [self _loadRecentSearchList];
     [self _updateSearchMenu];
@@ -269,8 +301,8 @@ var CPSearchFieldSearchImage = nil,
     @return \c YES if the action message is sent all at once when the user clicks the search button or presses return; otherwise, NO if the search string is sent after each keystroke. The default value is NO.
 */
 - (BOOL)sendsWholeSearchString
-{ 
-    return _sendsWholeSearchString; 
+{
+    return _sendsWholeSearchString;
 }
 
 /*!
@@ -287,8 +319,8 @@ var CPSearchFieldSearchImage = nil,
     @return \c YES if the text field sends its action immediately upon notification of any changes to the search field; otherwise, NO.
 */
 - (BOOL)sendsSearchStringImmediately
-{ 
-    return _sendsSearchStringImmediately; 
+{
+    return _sendsSearchStringImmediately;
 }
 
 /*!
@@ -306,7 +338,7 @@ var CPSearchFieldSearchImage = nil,
     @return The maximum number of search strings that can appear in the menu. This value is between 0 and 254.
 */
 - (int)maximumRecents
-{ 
+{
     return _maximumRecents;
 }
 
@@ -320,13 +352,13 @@ var CPSearchFieldSearchImage = nil,
         max = 254;
     else if (max < 0)
         max = 10;
-    
+
     _maximumRecents = max;
 }
 
 /*!
     Returns the list of recent search strings for the control.
-    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty. 
+    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty.
  */
 - (CPArray)recentSearches
 {
@@ -342,8 +374,8 @@ var CPSearchFieldSearchImage = nil,
 {
     var max = MIN([self maximumRecents], [searches count]),
         searches = [searches subarrayWithRange:CPMakeRange(0, max)];
-    
-    _recentSearches = searches;    
+
+    _recentSearches = searches;
     [self _autosaveRecentSearchList];
 }
 
@@ -353,7 +385,7 @@ var CPSearchFieldSearchImage = nil,
 */
 - (CPString)recentsAutosaveName
 {
-    return _recentsAutosaveName; 
+    return _recentsAutosaveName;
 }
 
 /*!
@@ -364,24 +396,24 @@ var CPSearchFieldSearchImage = nil,
 {
     if (_recentsAutosaveName != nil)
         [self _deregisterForAutosaveNotification];
-        
+
     _recentsAutosaveName = name;
-    
+
     if (_recentsAutosaveName != nil)
       [self _registerForAutosaveNotification];
 }
 
 // Private methods and subclassing
 
-- (CPRect)contentRectForBounds:(CPRect)bounds
+- (CGRect)contentRectForBounds:(CGRect)bounds
 {
-    var superbounds = [super contentRectForBounds:bounds];    
+    var superbounds = [super contentRectForBounds:bounds];
     return [self searchTextRectForBounds:superbounds];
 }
 
 + (double)_keyboardDelayForPartialSearchString:(CPString)string
 {
-    return (6 - MIN([string length],4))/10;
+    return (6 - MIN([string length], 4)) / 10;
 }
 
 - (CPMenu)menu
@@ -399,7 +431,7 @@ var CPSearchFieldSearchImage = nil,
     [_cancelButton setHidden:([[self stringValue] length] === 0)];
 }
 
-- (void)controlTextDidChange:(CPNotification)aNotification
+- (void)_searchFieldTextDidChange:(CPNotification)aNotification
 {
     if (![self sendsWholeSearchString])
     {
@@ -409,15 +441,15 @@ var CPSearchFieldSearchImage = nil,
         {
             [_partialStringTimer invalidate];
             var timeInterval = [CPSearchField _keyboardDelayForPartialSearchString:[self stringValue]];
-    
-            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval 
-                                                                   target:self 
-                                                                 selector:@selector(_sendPartialString) 
-                                                                 userInfo:nil 
-                                                                  repeats:NO];         
+
+            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval
+                                                                   target:self
+                                                                 selector:@selector(_sendPartialString)
+                                                                 userInfo:nil
+                                                                  repeats:NO];
         }
     }
-    
+
     [self _updateCancelButtonVisibility];
 }
 
@@ -440,70 +472,116 @@ var CPSearchFieldSearchImage = nil,
 {
     if (string === nil || string === @"" || [_recentSearches containsObject:string])
         return;
-        
+
     var searches = [CPMutableArray arrayWithArray:_recentSearches];
     [searches addObject:string];
     [self setRecentSearches:searches];
     [self _updateSearchMenu];
 }
 
-- (BOOL)trackMouse:(CPEvent)event
+- (CPView)hitTest:(CGPoint)aPoint
 {
-    var rect,
-        point,
-        location = [event locationInWindow];
-    
-    point = [self convertPoint:location fromView:nil];
-    
-    rect = [self searchButtonRectForBounds:[self frame]];
-    if (CPRectContainsPoint(rect,point))
-    {
-        return [[self searchButton] trackMouse:event];
-    }
-    
-    rect = [self cancelButtonRectForBounds:[self frame]];
-    if (CPRectContainsPoint(rect,point))
-    {
-        return [[self cancelButton] trackMouse:event];
-    }
-    
-    return [super trackMouse:event];
+    // Make sure a hit anywhere within the search field returns the search field itself
+    if (_CGRectContainsPoint([self frame], aPoint))
+        return self;
+    else
+        return nil;
 }
 
-- (CPMenu)_defaultSearchMenuTemplate
+- (BOOL)resignFirstResponder
 {
-    var template, item;
-    
-    template = [[CPMenu alloc] init];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent searches" 
-                                      action:NULL 
+    return _canResignFirstResponder && [super resignFirstResponder];
+}
+
+- (void)mouseDown:(CPEvent)anEvent
+{
+    var location = [anEvent locationInWindow],
+        point = [self convertPoint:location fromView:nil];
+
+    if (_CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
+    {
+        if (_searchMenuTemplate == nil)
+        {
+            if ([_searchButton target] && [_searchButton action])
+                [_searchButton mouseDown:anEvent];
+            else
+                [self _sendAction:self];
+        }
+        else
+           [self _showMenu];
+    }
+    else if (_CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
+        [_cancelButton mouseDown:anEvent];
+    else
+        [super mouseDown:anEvent];
+}
+
+/*!
+    Provides the common case items for a recent searches menu. If there are not recent searches,
+    displays a single disabled item:
+
+        No Recent Searches
+
+    If there are 1 more recent searches, it displays:
+
+        Recent Searches
+           recent search 1
+           recent search 2
+           etc.
+        ---------------------
+        Clear Recent Searches
+
+    If you wish to add items before or after the template, you can. If you put items
+    before, a separator will automatically be placed before the default template item.
+    If you add items after the default template, it is your responsibility to add a separator.
+
+    To add a custom item:
+
+    item = [[CPMenuItem alloc] initWithTitle:@"google"
+                                      action:@selector(google:)
+                               keyEquivalent:@""];
+    [item setTag:700];
+    [item setTarget:self];
+    [template addItem:item];
+
+    Be sure that your custom items do not use tags in the range 1000-1003 inclusive.
+    If you wish to maintain state in custom menu items that you add, you will need to maintain
+    the item state yourself, then in the action method of the custom items, modify the items
+    in the search menu template and send [searchField setSearchMenuTemplate:template] to update the menu.
+*/
+- (CPMenu)defaultSearchMenuTemplate
+{
+    var template = [[CPMenu alloc] init],
+        item;
+
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent Searches"
+                                      action:nil
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldRecentsTitleMenuItemTag];
     [item setEnabled:NO];
     [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item" 
-                                      action:@selector(_searchFieldSearch:) 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item"
+                                      action:@selector(_searchFieldSearch:)
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldRecentsMenuItemTag];
     [item setTarget:self];
     [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"Clear recent searches" 
-                                      action:@selector(_searchFieldClearRecents:) 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"Clear Recent Searches"
+                                      action:@selector(_searchFieldClearRecents:)
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldClearRecentsMenuItemTag];
     [item setTarget:self];
     [template addItem:item];
-    
-    item = [[CPMenuItem alloc] initWithTitle:@"No recent searches" 
-                                      action:NULL 
+
+    item = [[CPMenuItem alloc] initWithTitle:@"No Recent Searches"
+                                      action:nil
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldNoRecentsMenuItemTag];
     [item setEnabled:NO];
     [template addItem:item];
-    
+
     return template;
 }
 
@@ -511,95 +589,128 @@ var CPSearchFieldSearchImage = nil,
 {
     if (_searchMenuTemplate === nil)
         return;
-        
-    var i, menu = [[CPMenu alloc] init],
+
+    var menu = [[CPMenu alloc] init],
         countOfRecents = [_recentSearches count],
         numberOfItems = [_searchMenuTemplate numberOfItems];
-    
-    for (i = 0; i < numberOfItems; i++)
+
+    for (var i = 0; i < numberOfItems; i++)
     {
-        var item = [_searchMenuTemplate itemAtIndex:i],
-            tag = [item tag];
-        
-        if (!(tag === CPSearchFieldRecentsTitleMenuItemTag && countOfRecents === 0) &&
-            !(tag === CPSearchFieldClearRecentsMenuItemTag && countOfRecents === 0) &&
-            !(tag === CPSearchFieldNoRecentsMenuItemTag && countOfRecents != 0)    &&
-            !(tag === CPSearchFieldRecentsMenuItemTag))
+        var item = [[_searchMenuTemplate itemAtIndex:i] copy];
+
+        switch ([item tag])
         {
-            var itemAction, itemTarget;
-            switch (tag)
+            case CPSearchFieldRecentsTitleMenuItemTag:
+                if (countOfRecents === 0)
+                    continue;
+
+                if ([menu numberOfItems] > 0)
+                    [self _addSeparatorToMenu:menu];
+                break;
+
+            case CPSearchFieldRecentsMenuItemTag:
             {
-                case CPSearchFieldRecentsTitleMenuItemTag : itemAction = NULL; itemTarget = NULL; break;
-                case CPSearchFieldClearRecentsMenuItemTag : itemAction = @selector(_searchFieldClearRecents:); itemTarget = self; break;
-                case CPSearchFieldNoRecentsMenuItemTag : itemAction = NULL; itemTarget = NULL; break;
-                default: itemAction = [item action]; itemTarget = [item target]; break;
+                var itemAction = @selector(_searchFieldSearch:);
+
+                for (var recentIndex = 0; recentIndex < countOfRecents; ++recentIndex)
+                {
+                    // RECENT_SEARCH_PREFIX is a hack until CPMenuItem -setIndentationLevel works
+                    var recentItem = [[CPMenuItem alloc] initWithTitle:RECENT_SEARCH_PREFIX + [_recentSearches objectAtIndex:recentIndex]
+                                                                 action:itemAction
+                                                          keyEquivalent:[item keyEquivalent]];
+                    [item setTarget:self];
+                    [menu addItem:recentItem];
+                }
+
+                continue;
             }
-            
-            if (tag === CPSearchFieldClearRecentsMenuItemTag || tag === CPSearchFieldRecentsTitleMenuItemTag)
-            {
-                var separator = [CPMenuItem separatorItem];
-                [separator setEnabled:NO];
-                [menu addItem:separator];
+
+            case CPSearchFieldClearRecentsMenuItemTag:
+                if (countOfRecents === 0)
+                    continue;
+
+                if ([menu numberOfItems] > 0)
+                    [self _addSeparatorToMenu:menu];
+
+                [item setAction:@selector(_searchFieldClearRecents:)];
+                [item setTarget:self];
+                break;
+
+            case CPSearchFieldNoRecentsMenuItemTag:
+                if (countOfRecents !== 0)
+                    continue;
+
+                if ([menu numberOfItems] > 0)
+                    [self _addSeparatorToMenu:menu];
+                break;
             }
-        
-            var templateItem = [[CPMenuItem alloc] initWithTitle:[item title] 
-                                                          action:itemAction 
-                                                   keyEquivalent:[item keyEquivalent]];
-            [templateItem setTarget:itemTarget];
-            [templateItem setEnabled:([item isEnabled] && itemAction != NULL)];
-            [templateItem setTag:tag];
-            [menu addItem:templateItem];
-        }
-        else if (tag === CPSearchFieldRecentsMenuItemTag)
-        {
-            var j;
-            for (j = 0; j < countOfRecents; j++)
-            {
-                var rencentItem = [[CPMenuItem alloc] initWithTitle:[_recentSearches objectAtIndex:j] 
-                                                             action:@selector(_searchFieldSearch:) 
-                                                      keyEquivalent:[item keyEquivalent]];
-                [rencentItem setTarget:self];
-                [menu addItem:rencentItem];
-            }
-        }
-    }    
+
+        [item setEnabled:([item isEnabled] && [item action] != nil && [item target] != nil)];
+        [menu addItem:item];
+    }
+
+    [menu setDelegate:self];
+
     _searchMenu = menu;
 }
 
-- (void)_showMenu:(id)sender
+- (void)_addSeparatorToMenu:(CPMenu)aMenu
+{
+    var separator = [CPMenuItem separatorItem];
+    [separator setEnabled:NO];
+    [aMenu addItem:separator];
+}
+
+- (void)menuWillOpen:(CPMenu)menu
+{
+    _canResignFirstResponder = NO;
+}
+
+- (void)menuDidClose:(CPMenu)menu
+{
+    _canResignFirstResponder = YES;
+
+    [self becomeFirstResponder];
+}
+
+- (void)_showMenu
 {
     if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled])
         return;
-        
+
     var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
-    
+        location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+
     var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
-    
-    [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:sender];
+
+    [self selectAll:nil];
+    [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:self];
 }
 
 - (void)_sendPartialString
 {
-    [[self target] performSelector:[self action] withObject:self];
+    [super sendAction:[self action] to:[self target]];
+    [_partialStringTimer invalidate];
 }
 
-- (void)_searchFieldCancel:(id)sender
-{   
+- (void)cancelOperation:(id)sender
+{
     [self setObjectValue:@""];
-    [self _sendPartialString];
+    [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
+
     [self _updateCancelButtonVisibility];
 }
 
 - (void)_searchFieldSearch:(id)sender
 {
-    var searchString = [sender title];
-    
+    var searchString = [[sender title] substringFromIndex:[RECENT_SEARCH_PREFIX length]];
+
     if ([sender tag] != CPSearchFieldRecentsMenuItemTag)
         [self _addStringToRecentSearches:searchString];
-    
+
     [self setObjectValue:searchString];
     [self _sendPartialString];
+    [self selectAll:nil];
 
     [self _updateCancelButtonVisibility];
 }
@@ -608,58 +719,42 @@ var CPSearchFieldSearchImage = nil,
 {
     [self setRecentSearches:[CPArray array]];
     [self _updateSearchMenu];
+    [self setStringValue:@""];
+    [self _updateCancelButtonVisibility];
  }
 
 - (void)_registerForAutosaveNotification
 {
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:@"CPAutosavedRecentsChangedNotification" object:nil];
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
 }
 
 - (void)_deregisterForAutosaveNotification
 {
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:@"CPAutosavedRecentsChangedNotification" object:nil];
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
 }
 
 - (void)_autosaveRecentSearchList
-{  
-    if (_recentsAutosaveName != nil) 
-        [[CPNotificationCenter defaultCenter] postNotificationName:@"CPAutosavedRecentsChangedNotification" object:_recentsAutosaveName];
+{
+    if (_recentsAutosaveName != nil)
+        [[CPNotificationCenter defaultCenter] postNotificationName:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
 }
 
 - (void)_updateAutosavedRecents:(id)notification
 {
-    var list = [self recentSearches],
-        name = [notification object],
-        bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
-        cookie_name = [bundle_name lowercaseString] + "." + [notification object],
-
-        cookie = [[CPCookie alloc] initWithName:cookie_name],
-        cookie_value = [list componentsJoinedByString:@","];
-    
-    [cookie setValue:cookie_value 
-             expires:[[CPDate alloc] initWithTimeIntervalSinceNow:3600*24*365] 
-              domain:(window.location.href.hostname)];
+    var name = [notification object];
+    [[CPUserDefaults standardUserDefaults] setObject:_recentSearches forKey:name];
 }
 
 - (void)_loadRecentSearchList
 {
-    var list,
-        name = [self recentsAutosaveName];
-    
+    var name = [self recentsAutosaveName];
     if (name === nil)
         return;
 
-    var bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
-        cookie_name = [bundle_name lowercaseString] + "." + name,     
+    var list = [[CPUserDefaults standardUserDefaults] objectForKey:name];
 
-        cookie = [[CPCookie alloc] initWithName:cookie_name];
-
-    if (cookie != nil)
-    {
-        var cookie_value = [cookie value];
-        list = (cookie_value != @"") ? [cookie_value componentsSeparatedByString:@","] : [CPArray array];
+    if (list !== nil)
         _recentSearches = list;
-    }
 }
 
 @end
@@ -668,7 +763,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
     CPSendsWholeSearchStringKey         = @"CPSendsWholeSearchStringKey",
     CPSendsSearchStringImmediatelyKey   = @"CPSendsSearchStringImmediatelyKey",
     CPMaximumRecentsKey                 = @"CPMaximumRecentsKey",
-    CPSearchMenuTemplateKey             = @"CPSearchMenuTemplateKey";   
+    CPSearchMenuTemplateKey             = @"CPSearchMenuTemplateKey";
 
 @implementation CPSearchField (CPCoding)
 
@@ -677,7 +772,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
     [_searchButton removeFromSuperview];
     [_cancelButton removeFromSuperview];
 
-    [super encodeWithCoder:coder];    
+    [super encodeWithCoder:coder];
 
     if (_searchButton)
         [self addSubview:_searchButton];
@@ -690,6 +785,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
 
     if (_recentsAutosaveName)
         [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
+
     if (_searchMenuTemplate)
         [coder encodeObject:_searchMenuTemplate forKey:CPSearchMenuTemplateKey];
 }
@@ -698,18 +794,17 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
 {
     if (self = [super initWithCoder:coder])
     {
-        [self _initWithFrame:[self frame]];
-
-        _recentsAutosaveName      = [coder decodeObjectForKey:CPRecentsAutosaveNameKey];
+        [self setRecentsAutosaveName:[coder decodeObjectForKey:CPRecentsAutosaveNameKey]];
         _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
         _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
         _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
 
         var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
+
         if (template)
             [self setSearchMenuTemplate:template];
-            
-        [self setDelegate:self];
+
+        [self _init];
     }
 
     return self;

AppKit/CPSecureTextField.j

@@ -1,6 +1,28 @@
+/*
+ * CPSecureTextField.j
+ * AppKit
+ *
+ * Created by Francisco Tolmasky.
+ * Copyright 2008, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
 
 @import "CPTextField.j"
 
+
 /*!
     @ingroup appkit
 */

AppKit/CPSegmentedControl.j

@@ -23,14 +23,16 @@
 @import <Foundation/CPArray.j>
 
 @import "CPControl.j"
+@import "CPWindow_Constants.j"
+@import "_CPImageAndTextView.j"
 
-#include "CoreGraphics/CGGeometry.h"
+@global CPApp
 
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
 CPSegmentSwitchTrackingMomentary = 2;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPSegmentedControl
 
@@ -49,40 +51,78 @@ CPSegmentSwitchTrackingMomentary = 2;
     BOOL                    _trackingHighlighted;
 }
 
-+ (CPString)themeClass
++ (CPString)defaultThemeClass
 {
     return "segmented-control";
 }
 
 + (id)themeAttributes
 {
-    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"]];
+    return @{
+            @"alignment": CPCenterTextAlignment,
+            @"vertical-alignment": CPCenterVerticalTextAlignment,
+            @"image-position": CPImageLeft,
+            @"image-scaling": CPImageScaleNone,
+            @"bezel-inset": _CGInsetMakeZero(),
+            @"content-inset": _CGInsetMakeZero(),
+            @"left-segment-bezel-color": [CPNull null],
+            @"right-segment-bezel-color": [CPNull null],
+            @"center-segment-bezel-color": [CPNull null],
+            @"divider-bezel-color": [CPNull null],
+            @"divider-thickness": 1.0,
+            @"default-height": 24.0,
+        };
+}
+
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if ([self _isSelectionBinding:aBinding])
+        return [_CPSegmentedControlBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
++ (BOOL)_isSelectionBinding:(CPString)aBinding
+{
+    return (aBinding === CPSelectedIndexBinding || aBinding === CPSelectedLabelBinding || aBinding === CPSelectedTagBinding);
 }
 
 - (id)initWithFrame:(CGRect)aRect
 {
     _segments = [];
     _themeStates = [];
-    
+
     self = [super initWithFrame:aRect];
-    
+
     if (self)
     {
         _selectedSegment = -1;
-        
+
         _trackingMode = CPSegmentSwitchTrackingSelectOne;
     }
-    
+
     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.
 */
 - (int)selectedTag
 {
-    return _segments[_selectedSegment].tag;
+    return [_segments[_selectedSegment] tag];
 }
 
 // Specifying the number of segments
@@ -94,11 +134,13 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     if (_segments.length == aCount)
         return;
-        
-    var height = CGRectGetHeight([self bounds]);
-    
+
+    var height = CGRectGetHeight([self bounds]),
+        dividersBefore = MAX(0, _segments.length - 1),
+        dividersAfter = MAX(0, aCount - 1);
+
     if (_segments.length < aCount)
-    {        
+    {
         for (var index = _segments.length; index < aCount; ++index)
         {
             _segments[index] = [[_CPSegmentItem alloc] init];
@@ -114,6 +156,16 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
 
+    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
+        frame = [self frame],
+        widthOfAllSegments = 0,
+        dividerExtraSpace = ([_segments count] - 1) * thickness;
+
+    for (var i = 0; i < [_segments count]; i++)
+        widthOfAllSegments += [_segments[i] width];
+
+    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
+
     [self tileWithChangedSegment:0];
 }
 
@@ -151,15 +203,30 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (BOOL)selectSegmentWithTag:(int)aTag
 {
     var index = 0;
-    
+
     for (; index < _segments.length; ++index)
         if (_segments[index].tag == aTag)
         {
             [self setSelectedSegment:index];
-            
+
             return YES;
         }
-    
+
+    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;
 }
 
@@ -174,28 +241,28 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     if (_trackingMode == aTrackingMode)
         return;
-        
+
     _trackingMode = aTrackingMode;
-    
+
     if (_trackingMode == CPSegmentSwitchTrackingSelectOne)
     {
         var index = 0,
             selected = NO;
-        
+
         for (; index < _segments.length; ++index)
-            if (_segments[index].selected)
+            if ([_segments[index] selected])
                 if (selected)
                     [self setSelected:NO forSegment:index];
                 else
                     selected = YES;
     }
-    
+
     else if (_trackingMode == CPSegmentSwitchTrackingMomentary)
     {
         var index = 0;
-        
+
         for (; index < _segments.length; ++index)
-            if (_segments[index].selected)
+            if ([_segments[index] selected])
                 [self setSelected:NO forSegment:index];
     }
 }
@@ -217,8 +284,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
 {
-    _segments[aSegment].width = aWidth;
-    
+    [_segments[aSegment] setWidth:aWidth];
+
     [self tileWithChangedSegment:aSegment];
 }
 
@@ -229,7 +296,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (float)widthForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].width;
+    return [_segments[aSegment] width];
 }
 
 /*!
@@ -240,9 +307,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setImage:(CPImage)anImage forSegment:(unsigned)aSegment
 {
-    var segment = _segments[aSegment];
-    
-    segment.image = anImage;
+    [_segments[aSegment] setImage:anImage];
 
     [self tileWithChangedSegment:aSegment];
 }
@@ -254,7 +319,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPImage)imageForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].image;
+    return [_segments[aSegment] image];
 }
 
 /*!
@@ -265,10 +330,8 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setLabel:(CPString)aLabel forSegment:(unsigned)aSegment
 {
-    var segment = _segments[aSegment];
-        
-    _segments[aSegment].label = aLabel;
-    
+    [_segments[aSegment] setLabel:aLabel];
+
     [self tileWithChangedSegment:aSegment];
 }
 
@@ -279,7 +342,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPString)labelForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].label;
+    return [_segments[aSegment] label];
 }
 
 /*!
@@ -290,7 +353,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setMenu:(CPMenu)aMenu forSegment:(unsigned)aSegment
 {
-    _segments[aSegment].menu = aMenu;
+    [_segments[aSegment] setMenu:aMenu];
 }
 
 /*!
@@ -300,7 +363,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (CPMenu)menuForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].menu;
+    return [_segments[aSegment] menu];
 }
 
 /*!
@@ -313,12 +376,12 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (void)setSelected:(BOOL)isSelected forSegment:(unsigned)aSegment
 {
     var segment = _segments[aSegment];
-    
+
     // If we're already in this state, bail.
-    if (segment.selected == isSelected)
+    if ([segment selected] == isSelected)
         return;
-    
-    segment.selected = isSelected;
+
+    [segment setSelected:isSelected];
 
     _themeStates[aSegment] = isSelected ? CPThemeStateSelected : CPThemeStateNormal;
 
@@ -326,18 +389,18 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (isSelected)
     {
         var oldSelectedSegment = _selectedSegment;
-        
+
         _selectedSegment = aSegment;
-        
+
         if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1)
         {
-            _segments[oldSelectedSegment].selected = NO;
+            [_segments[oldSelectedSegment] setSelected:NO];
             _themeStates[oldSelectedSegment] = CPThemeStateNormal;
 
             [self drawSegmentBezel:oldSelectedSegment highlight:NO];
         }
     }
-    
+
     if (_trackingMode != CPSegmentSwitchTrackingMomentary)
         [self drawSegmentBezel:aSegment highlight:NO];
 
@@ -352,18 +415,23 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isSelectedForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].selected;
+    return [_segments[aSegment] selected];
 }
 
 /*!
-    Enables/diables the specified segment.
+    Enables/disables the specified segment.
     @param isEnabled \c YES enables the segment
-    @param aSegment the segment to enable/disble
+    @param aSegment the segment to enable/disable
     @throws CPRangeException if \c aSegment is out of bounds
 */
-- (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
+- (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
 {
-    if (isEnabled)
+    if ([_segments[aSegment] enabled] === shouldBeEnabled)
+        return;
+
+    [_segments[aSegment] setEnabled:shouldBeEnabled];
+
+    if (shouldBeEnabled)
         _themeStates[aSegment] &= ~CPThemeStateDisabled;
     else
         _themeStates[aSegment] |= CPThemeStateDisabled;
@@ -379,7 +447,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (BOOL)isEnabledForSegment:(unsigned)aSegment
 {
-    return !(_themeStates[aSegment] & CPThemeStateDisabled)
+    return [_segments[aSegment] enabled];
 }
 
 /*!
@@ -389,7 +457,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setTag:(int)aTag forSegment:(unsigned)aSegment
 {
-    _segments[aSegment].tag = aTag;
+    [_segments[aSegment] setTag:aTag];
 }
 
 /*!
@@ -398,7 +466,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (int)tagForSegment:(unsigned)aSegment
 {
-    return _segments[aSegment].tag;
+    return [_segments[aSegment] tag];
 }
 
 // Drawings
@@ -453,7 +521,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
+        return CGRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                             bezelInset.top,
                             contentInset.right,
                             height);
@@ -461,7 +529,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     else if (aName.indexOf("segment-bezel") === 0)
     {
         var segment = parseInt(aName.substring("segment-bezel-".length), 10),
-            frame = CGRectCreateCopy(_segments[segment].frame);
+            frame = CGRectCreateCopy([_segments[segment] frame]);
 
         if (segment === 0)
         {
@@ -495,7 +563,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName.substring(0, "segment-content".length) == "segment-content")
+    if ([aName hasPrefix:@"segment-content"])
         return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
 
     return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
@@ -510,10 +578,10 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     themeState |= _themeState & CPThemeStateDisabled;
 
-    var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color" 
-                                            inState:themeState];
+    var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color"
+                                            inState:themeState],
 
-    var leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
+        leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
                                                positioned:CPWindowBelow
                           relativeToEphemeralSubviewNamed:nil];
 
@@ -523,41 +591,39 @@ CPSegmentSwitchTrackingMomentary = 2;
 
     themeState |= _themeState & CPThemeStateDisabled;
 
-    var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color" 
-                                             inState:themeState];
+    var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color"
+                                             inState:themeState],
 
-    var rightBezelView = [self layoutEphemeralSubviewNamed:@"right-segment-bezel"
+        rightBezelView = [self layoutEphemeralSubviewNamed:@"right-segment-bezel"
                                                positioned:CPWindowBelow
                           relativeToEphemeralSubviewNamed:nil];
 
     [rightBezelView setBackgroundColor:rightCapColor];
 
-    for (var i=0, count = _themeStates.length; i<count; i++)
+    for (var i = 0, count = _themeStates.length; i < count; i++)
     {
         var themeState = _themeStates[i];
 
         themeState |= _themeState & CPThemeStateDisabled;
 
-        var bezelColor = [self valueForThemeAttribute:@"center-segment-bezel-color" 
-                                              inState:themeState];
+        var bezelColor = [self valueForThemeAttribute:@"center-segment-bezel-color"
+                                              inState:themeState],
 
-        var bezelView = [self layoutEphemeralSubviewNamed:"segment-bezel-"+i 
-                                               positioned:CPWindowBelow 
+            bezelView = [self layoutEphemeralSubviewNamed:"segment-bezel-" + i
+                                               positioned:CPWindowBelow
                           relativeToEphemeralSubviewNamed:nil];
 
         [bezelView setBackgroundColor:bezelColor];
 
 
-        //layout image/title views
-        var segment = _segments[i];
-
-
-        var contentView = [self layoutEphemeralSubviewNamed:@"segment-content-"+i
+        // layout image/title views
+        var segment = _segments[i],
+            contentView = [self layoutEphemeralSubviewNamed:@"segment-content-" + i
                                                  positioned:CPWindowAbove
-                            relativeToEphemeralSubviewNamed:@"segment-bezel-"+i];
+                            relativeToEphemeralSubviewNamed:@"segment-bezel-" + i];
 
-        [contentView setText:segment.label];
-        [contentView setImage:segment.image];
+        [contentView setText:[segment label]];
+        [contentView setImage:[segment image]];
 
         [contentView setFont:[self valueForThemeAttribute:@"font" inState:themeState]];
         [contentView setTextColor:[self valueForThemeAttribute:@"text-color" inState:themeState]];
@@ -566,27 +632,27 @@ CPSegmentSwitchTrackingMomentary = 2;
         [contentView setLineBreakMode:[self valueForThemeAttribute:@"line-break-mode" inState:themeState]];
         [contentView setTextShadowColor:[self valueForThemeAttribute:@"text-shadow-color" inState:themeState]];
         [contentView setTextShadowOffset:[self valueForThemeAttribute:@"text-shadow-offset" inState:themeState]];
-        [contentView setImageScaling:[self valueForThemeAttribute:@"image-scaling" inState:themeState]];        
-        
-        if (segment.image && segment.label)
+        [contentView setImageScaling:[self valueForThemeAttribute:@"image-scaling" inState:themeState]];
+
+        if ([segment image] && [segment label])
             [contentView setImagePosition:[self valueForThemeAttribute:@"image-position" inState:themeState]];
-        else if (segment.image)
+        else if ([segment image])
             [contentView setImagePosition:CPImageOnly];
 
         if (i == count - 1)
             continue;
 
-        var borderState = _themeStates[i] | _themeStates[i+1];
-        
+        var borderState = _themeStates[i] | _themeStates[i + 1];
+
         borderState = (borderState & CPThemeStateSelected & ~CPThemeStateHighlighted) ? CPThemeStateSelected : CPThemeStateNormal;
 
         borderState |= _themeState & CPThemeStateDisabled;
 
         var borderColor = [self valueForThemeAttribute:@"divider-bezel-color"
-                                               inState:borderState];
+                                               inState:borderState],
 
-        var borderView = [self layoutEphemeralSubviewNamed:"divider-bezel-"+i 
-                                                positioned:CPWindowBelow 
+            borderView = [self layoutEphemeralSubviewNamed:"divider-bezel-" + i
+                                                positioned:CPWindowBelow
                            relativeToEphemeralSubviewNamed:nil];
 
         [borderView setBackgroundColor:borderColor];
@@ -609,48 +675,53 @@ CPSegmentSwitchTrackingMomentary = 2;
         return;
 
     var segment = _segments[aSegment],
-        segmentWidth = segment.width,
+        segmentWidth = [segment width],
         themeState = _themeStates[aSegment] | (_themeState & CPThemeStateDisabled),
         contentInset = [self valueForThemeAttribute:@"content-inset" inState:themeState],
-        font = [self valueForThemeAttribute:@"font" inState:themeState];
+        font = [self font];
 
     if (!segmentWidth)
     {
-        if (segment.image && segment.label)
-            segmentWidth = [segment.label sizeWithFont:font].width + [segment.image size].width + contentInset.left + contentInset.right;
+        if ([segment image] && [segment label])
+            segmentWidth = [[segment label] sizeWithFont:font].width + [[segment image] size].width + contentInset.left + contentInset.right;
         else if (segment.image)
-            segmentWidth = [segment.image size].width + contentInset.left + contentInset.right;
+            segmentWidth = [[segment image] size].width + contentInset.left + contentInset.right;
         else if (segment.label)
-            segmentWidth = [segment.label sizeWithFont:font].width + contentInset.left + contentInset.right;
+            segmentWidth = [[segment label] sizeWithFont:font].width + contentInset.left + contentInset.right;
         else
             segmentWidth = 0.0;
     }
 
-    var delta = segmentWidth - CGRectGetWidth(segment.frame);
+    var delta = segmentWidth - CGRectGetWidth([segment frame]);
 
     if (!delta)
-        return;
+    {
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
 
-    // Update Contorl Size
+        return;
+    }
+
+    // Update control size
     var frame = [self frame];
-    
+
     [self setFrameSize:CGSizeMake(CGRectGetWidth(frame) + delta, CGRectGetHeight(frame))];
 
-    // Update Segment Width
-    segment.width = segmentWidth;
-    segment.frame = [self frameForSegment:aSegment];;
+    // Update segment width
+    [segment setWidth:segmentWidth];
+    [segment setFrame:[self frameForSegment:aSegment]];
 
-    // Update Following Segments Widths
+    // Update following segments widths
     var index = aSegment + 1;
-    
+
     for (; index < _segments.length; ++index)
     {
-        _segments[index].frame.origin.x += delta;
-        
+        [_segments[index] frame].origin.x += delta;
+
         [self drawSegmentBezel:index highlight:NO];
         [self drawSegment:index highlight:NO];
     }
-    
+
     [self drawSegmentBezel:aSegment highlight:NO];
     [self drawSegment:aSegment highlight:NO];
 
@@ -696,14 +767,14 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     var location = [self convertPoint:aPoint fromView:nil],
         count = _segments.length;
-    
+
     while (count--)
-        if (CGRectContainsPoint(_segments[count].frame, aPoint))
+        if (CGRectContainsPoint([_segments[count] frame], aPoint))
             return count;
 
     if (_segments.length)
     {
-        var adjustedLastFrame = CGRectCreateCopy(_segments[_segments.length - 1].frame);
+        var adjustedLastFrame = CGRectCreateCopy([_segments[_segments.length - 1] frame]);
         adjustedLastFrame.size.width = CGRectGetWidth([self bounds]) - adjustedLastFrame.origin.x;
 
         if (CGRectContainsPoint(adjustedLastFrame, aPoint))
@@ -717,7 +788,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     if (![self isEnabled])
         return;
-    
+
     [self trackSegment:anEvent];
 }
 
@@ -731,10 +802,10 @@ CPSegmentSwitchTrackingMomentary = 2;
     @param anEvent the event to handle
 */
 - (void)trackSegment:(CPEvent)anEvent
-{     
+{
     var type = [anEvent type],
         location = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-        
+
     if (type == CPLeftMouseUp)
     {
         if (_trackingSegment == -1)
@@ -745,30 +816,30 @@ CPSegmentSwitchTrackingMomentary = 2;
             if (_trackingMode == CPSegmentSwitchTrackingSelectAny)
             {
                 [self setSelected:![self isSelectedForSegment:_trackingSegment] forSegment:_trackingSegment];
-                
+
                 // With ANY, _selectedSegment means last pressed.
                 _selectedSegment = _trackingSegment;
             }
             else
                 [self setSelected:YES forSegment:_trackingSegment];
-        
+
             [self sendAction:[self action] to:[self target]];
-            
+
             if (_trackingMode == CPSegmentSwitchTrackingMomentary)
             {
                 [self setSelected:NO forSegment:_trackingSegment];
-                
+
                 _selectedSegment = -1;
             }
         }
 
         [self drawSegmentBezel:_trackingSegment highlight:NO];
-        
+
         _trackingSegment = -1;
-        
+
         return;
     }
-    
+
     if (type == CPLeftMouseDown)
     {
         var trackingSegment = [self testSegment:location];
@@ -779,13 +850,14 @@ CPSegmentSwitchTrackingMomentary = 2;
             [self drawSegmentBezel:_trackingSegment highlight:YES];
         }
     }
-    
+
     else if (type == CPLeftMouseDragged)
     {
         if (_trackingSegment == -1)
             return;
 
         var highlighted = [self testSegment:location] === _trackingSegment;
+
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
@@ -793,14 +865,14 @@ CPSegmentSwitchTrackingMomentary = 2;
             [self drawSegmentBezel:_trackingSegment highlight:_trackingHighlighted];
         }
     }
-    
+
     [CPApp setTarget:self selector:@selector(trackSegment:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
 - (void)setFont:(CPFont)aFont
 {
     [super setFont:aFont];
-    
+
     [self tileWithChangedSegment:0];
 }
 
@@ -816,12 +888,12 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-    
+
     if (self)
     {
         var frame = [self frame],
             originalWidth = frame.size.width;
-        
+
         frame.size.width = 0;
 
         [self setFrame:frame];
@@ -832,38 +904,38 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 
         if ([aCoder containsValueForKey:CPSegmentedControlSelectedKey])
             _selectedSegment = [aCoder decodeIntForKey:CPSegmentedControlSelectedKey];
-        else    
+        else
             _selectedSegment = -1;
-        
+
         if ([aCoder containsValueForKey:CPSegmentedControlTrackingModeKey])
             _trackingMode = [aCoder decodeIntForKey:CPSegmentedControlTrackingModeKey];
         else
             _trackingMode = CPSegmentSwitchTrackingSelectOne;
-        
+
         // HACK
 
         for (var i = 0; i < _segments.length; i++)
         {
-            _themeStates[i] = _segments[i].selected ? CPThemeStateSelected : CPThemeStateNormal;
+            _themeStates[i] = [_segments[i] selected] ? CPThemeStateSelected : CPThemeStateNormal;
             [self tileWithChangedSegment:i];
         }
 
         var difference = MAX(originalWidth - [self frame].size.width, 0.0),
             remainingWidth = FLOOR(difference / _segments.length);
 
-        for (var i=0; i < _segments.length; i++)
-            [self setWidth:_segments[i].width + remainingWidth forSegment:i];
+        for (var i = 0; i < _segments.length; i++)
+            [self setWidth:[_segments[i] width] + remainingWidth forSegment:i];
 
         [self tileWithChangedSegment:0];
     }
-    
+
     return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-    
+
     [aCoder encodeObject:_segments forKey:CPSegmentedControlSegmentsKey];
     [aCoder encodeInt:_selectedSegment forKey:CPSegmentedControlSelectedKey];
     [aCoder encodeInt:_segmentStyle forKey:CPSegmentedControlSegmentStyleKey];
@@ -872,18 +944,86 @@ 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
 {
-    CPImage     image;
-    CPString    label;
-    CPMenu      menu;
-    BOOL        selected;
-    BOOL        enabled;
-    int         tag;
-    int         width;
+    CPImage     image       @accessors;
+    CPString    label       @accessors;
+    CPMenu      menu        @accessors;
+    BOOL        selected    @accessors;
+    BOOL        enabled     @accessors;
+    int         tag         @accessors;
+    int         width       @accessors;
 
-    CGRect      frame;
+    CGRect      frame       @accessors;
 }
 
 - (id)init
@@ -894,8 +1034,8 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
         label        = @"";
         menu         = nil;
         selected     = NO;
-        enabled      = NO;
-        tag          = 0;
+        enabled      = YES;
+        tag          = -1;
         width        = 0;
 
         frame        = CGRectMakeZero();
@@ -918,7 +1058,7 @@ var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
     {
         image        = [aCoder decodeObjectForKey:CPSegmentItemImageKey];
@@ -931,7 +1071,7 @@ var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
 
         frame        = CGRectMakeZero();
     }
-    
+
     return self;
 }
 
@@ -947,4 +1087,3 @@ var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
 }
 
 @end
-

AppKit/CPShadow.j

@@ -23,19 +23,17 @@
 @import <Foundation/CPObject.j>
 
 
-/*! 
-    @deprecated 
+/*!
+    @deprecated
     @class CPShadow
 
     Instances of this class contain the attributes of a drop shadow used in Cappuccino.
 */
 @implementation CPShadow : CPObject
 {
-    CPSize      _offset;
-    float       _blurRadius;
-    CPColor     _color;
-    
-    CPString    _cssString;
+    CGSize      _offset @accessors(property=shadowOffset);
+    float       _blurRadius @accessors(property=shadowBlurRadius);
+    CPColor     _color @accessors(property=shadowColor);
 }
 
 /*!
@@ -51,44 +49,25 @@
 }
 
 /* @ignore */
-- (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
+- (id)_initWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
     self = [super init];
-    
+
     if (self)
     {
         _offset = anOffset;
         _blurRadius = aBlurRadius;
         _color = aColor;
-        
-        _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
     }
-    
+
     return self;
 }
 
-/*!
-    Returns the shadow's offset.
-*/
-- (CGSize)shadowOffset
+- (void)set
 {
-    return _offset;
-}
+   var context = [[CPGraphicsContext currentContext] graphicsPort];
 
-/*!
-    Returns the shadow's blur radius
-*/
-- (float)shadowBlurRadius
-{
-    return _blurRadius;
-}
-
-/*!
-    Returns the shadow's color.
-*/
-- (CPColor)shadowColor
-{
-    return _color;
+   CGContextSetShadowWithColor(context, _offset, _blurRadius, _color);
 }
 
 /*!
@@ -96,7 +75,7 @@
 */
 - (CPString)cssString
 {
-    return _cssString;
+    return [_color cssString] + " " + ROUND(_offset.width) + @"px " + ROUND(_offset.height) + @"px " + ROUND(_blurRadius) + @"px";
 }
 
-@end
+@end

AppKit/CPShadowView.j

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

AppKit/CPSlider.j

@@ -21,8 +21,8 @@
  */
 
 @import "CPControl.j"
+@import "CPWindow_Constants.j"
 
-#include "CoreGraphics/CGGeometry.h"
 
 /*! SLIDER STATES */
 
@@ -40,17 +40,23 @@ CPCircularSlider    = 1;
     double          _altIncrementValue;
 
     BOOL            _isVertical;
+
+    CGSize          _dragOffset;
 }
 
-+ (CPString)themeClass
++ (CPString)defaultThemeClass
 {
     return "slider";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
-                                       forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
+    return @{
+            @"knob-color": [CPNull null],
+            @"knob-size": _CGSizeMakeZero(),
+            @"track-width": 0.0,
+            @"track-color": [CPNull null],
+        };
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -61,14 +67,14 @@ CPCircularSlider    = 1;
     {
         _minValue = 0.0;
         _maxValue = 100.0;
-        
+
         [self setObjectValue:50.0];
-        
+
         [self setContinuous:YES];
 
         [self _recalculateIsVertical];
     }
-    
+
     return self;
 }
 
@@ -76,11 +82,11 @@ CPCircularSlider    = 1;
 {
     if (_minValue === aMinimumValue)
         return;
-    
+
     _minValue = aMinimumValue;
 
     var doubleValue = [self doubleValue];
-    
+
     if (doubleValue < _minValue)
         [self setDoubleValue:_minValue];
 
@@ -98,11 +104,11 @@ CPCircularSlider    = 1;
 {
     if (_maxValue === aMaximumValue)
         return;
-    
+
     _maxValue = aMaximumValue;
-    
+
     var doubleValue = [self doubleValue];
-    
+
     if (doubleValue > _maxValue)
         [self setDoubleValue:_maxValue];
 
@@ -169,27 +175,27 @@ CPCircularSlider    = 1;
             bounds.size.height = trackWidth;
         }
     }
-    
+
     return bounds;
 }
 
 - (CGRect)knobRectForBounds:(CGRect)bounds
 {
     var knobSize = [self currentValueForThemeAttribute:@"knob-size"];
-    
+
     if (knobSize.width <= 0 || knobSize.height <= 0)
         return _CGRectMakeZero();
-    
+
     var knobRect = _CGRectMake(0.0, 0.0, knobSize.width, knobSize.height),
         trackRect = [self trackRectForBounds:bounds];
-    
+
     // No track, do our best to approximate a place for this thing.
     if (!trackRect || _CGRectIsEmpty(trackRect))
         trackRect = bounds;
 
     if ([self hasThemeState:CPThemeStateCircular])
     {
-        var angle = 3*PI_2 - (1.0 - [self doubleValue] - _minValue) / (_maxValue - _minValue) * PI2,
+        var angle = 3 * PI_2 - (1.0 - [self doubleValue] - _minValue) / (_maxValue - _minValue) * PI2,
             radius = CGRectGetWidth(trackRect) / 2.0 - 8.0;
 
         knobRect.origin.x = radius * COS(angle) + CGRectGetMidX(trackRect) - 3.0;
@@ -198,7 +204,7 @@ CPCircularSlider    = 1;
     else if ([self isVertical])
     {
         knobRect.origin.x = _CGRectGetMidX(trackRect) - knobSize.width / 2.0;
-        knobRect.origin.y = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
+        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
     }
     else
     {
@@ -213,10 +219,10 @@ CPCircularSlider    = 1;
 {
     if (aName === "track-view")
         return [self trackRectForBounds:[self bounds]];
-    
+
     else if (aName === "knob-view")
         return [self knobRectForBounds:[self bounds]];
-    
+
     return [super rectForEphemeralSubviewNamed:aName];
 }
 
@@ -225,12 +231,12 @@ CPCircularSlider    = 1;
     if (aName === "track-view" || aName === "knob-view")
     {
         var view = [[CPView alloc] init];
-        
+
         [view setHitTests:NO];
-        
+
         return view;
     }
-    
+
     return [super createEphemeralSubviewNamed:aName];
 }
 
@@ -256,7 +262,7 @@ CPCircularSlider    = 1;
     var bounds = [self bounds],
         width = _CGRectGetWidth(bounds),
         height = _CGRectGetHeight(bounds);
-    
+
     _isVertical = width < height ? 1 : (width > height ? 0 : -1);
 
     if (_isVertical === 1)
@@ -282,7 +288,7 @@ CPCircularSlider    = 1;
     var knobView = [self layoutEphemeralSubviewNamed:@"knob-view"
                                           positioned:CPWindowAbove
                      relativeToEphemeralSubviewNamed:@"track-view"];
-      
+
     if (knobView)
         [knobView setBackgroundColor:[self currentValueForThemeAttribute:"knob-color"]];
 }
@@ -320,7 +326,7 @@ CPCircularSlider    = 1;
 
         var minValue = [self minValue];
 
-        return MAX(0.0, MIN(1.0, (aPoint.y - _CGRectGetMinY(trackRect)) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (_CGRectGetMaxY(trackRect) - aPoint.y) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
     }
     else
     {
@@ -339,44 +345,43 @@ CPCircularSlider    = 1;
 {
     var bounds = [self bounds],
         knobRect = [self knobRectForBounds:_CGRectMakeCopy(bounds)];
-    
+
     if (_CGRectContainsPoint(knobRect, aPoint))
         _dragOffset = _CGSizeMake(_CGRectGetMidX(knobRect) - aPoint.x, _CGRectGetMidY(knobRect) - aPoint.y);
-    
-    else 
+    else
     {
         var trackRect = [self trackRectForBounds:bounds];
-        
+
         if (trackRect && _CGRectContainsPoint(trackRect, aPoint))
         {
             _dragOffset = _CGSizeMakeZero();
-            
+
             [self setObjectValue:[self _valueAtPoint:aPoint]];
         }
-    
+
         else
             return NO;
     }
-    
+
     [self setHighlighted:YES];
-    
+
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
-    
-    return YES;   
+
+    return YES;
 }
 
 - (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
 {
     [self setObjectValue:[self _valueAtPoint:_CGPointMake(aPoint.x + _dragOffset.width, aPoint.y + _dragOffset.height)]];
-    
+
     return YES;
 }
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
     [self setHighlighted:NO];
-    
+
     if ([_target respondsToSelector:@selector(sliderDidFinish:)])
         [_target sliderDidFinish:self];
 
@@ -384,18 +389,35 @@ CPCircularSlider    = 1;
     [self setNeedsDisplay:YES];
 }
 
+- (BOOL)isContinuous
+{
+    return (_sendActionOn & CPLeftMouseDraggedMask) !== 0;
+}
+
 /*!
     @ignore
-    shoudl we have _continuous?
+    should we have _continuous?
 */
 - (void)setContinuous:(BOOL)flag
 {
     if (flag)
         _sendActionOn |= CPLeftMouseDraggedMask;
-    else 
+    else
         _sendActionOn &= ~CPLeftMouseDraggedMask;
 }
 
+- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
+{
+    var count = objects.length,
+        value = [objects[0] valueForKeyPath:aKeyPath];
+
+    [self setObjectValue:value];
+
+    while (count-- > 1)
+        if (value !== ([objects[count] valueForKeyPath:aKeyPath]))
+            return [self setFloatValue:1.0];
+}
+
 @end
 
 var CPSliderMinValueKey             = "CPSliderMinValueKey",
@@ -415,8 +437,6 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
     {
         _altIncrementValue = [aCoder decodeDoubleForKey:CPSliderAltIncrValueKey];
 
-        [self setContinuous:YES];
-
         [self _recalculateIsVertical];
 
         [self setNeedsLayout];
@@ -442,14 +462,14 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
 - (id)value
 {
     CPLog.warn("[CPSlider value] is deprecated, use doubleValue or objectValue instead.");
-    
-    return [self doubleValue];    
+
+    return [self doubleValue];
 }
 
 - (void)setValue:(id)aValue
 {
     CPLog.warn("[CPSlider setValue:] is deprecated, use setDoubleValue: or setObjectValue: instead.");
-    
+
     [self setObjectValue:aValue];
 }
 

AppKit/CPSliderColorPicker.j

@@ -21,21 +21,29 @@
  */
 
 @import "CPColorPicker.j"
+@import "CPSlider.j"
+@import "CPTextField.j"
+@import "CPView.j"
+
+@global CPColorPickerViewWidth
+@global CPColorPickerViewHeight
+@global CPSliderColorPickerMode
+
 
 /*
     @ignore
 */
 @implementation CPSliderColorPicker : CPColorPicker
-{    
+{
     CPView      _contentView;
-    
+
     CPSlider    _redSlider;
     CPSlider    _greenSlider;
     CPSlider    _blueSlider;
     CPSlider    _hueSlider;
     CPSlider    _saturationSlider;
     CPSlider    _brightnessSlider;
-    
+
     CPTextField _rgbLabel;
     CPTextField _hsbLabel;
     CPTextField _redLabel;
@@ -45,346 +53,245 @@
     CPTextField _saturationLabel;
     CPTextField _brightnessLabel;
     CPTextField _hexLabel;
+    CPTextField _hexValue;
 
-#if PLATFORM(DOM)
-    DOMElement  _redValue;
-    DOMElement  _greenValue;
-    DOMElement  _blueValue;
-    DOMElement  _hueValue;
-    DOMElement  _saturationValue;
-    DOMElement  _brightnessValue;
-    DOMElement  _hexValue;
-#endif
+    CPTextField _hexValue;
+    CPTextField _redValue;
+    CPTextField _greenValue;
+    CPTextField _blueValue;
+    CPTextField _hueValue;
+    CPTextField _saturationValue;
+    CPTextField _brightnessValue;
 }
 
-- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
+- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
 {
-    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
+    return [super initWithPickerMask:mask colorPanel:owningColorPanel];
 }
-  
--(id)initView
+
+- (id)initView
 {
-    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);    
-    
+    var aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+
     _contentView = [[CPView alloc] initWithFrame:aFrame];
-    [_contentView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-    
-    _rgbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 10, 100, 20)];
-    [_rgbLabel setStringValue: "Red, Green, Blue"];
+    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+    _rgbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 10, 100, 20)];
+    [_rgbLabel setStringValue:"Red, Green, Blue"];
     [_rgbLabel setTextColor:[CPColor blackColor]];
 
-    _redLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 35, 15, 20)];
-    [_redLabel setStringValue: "R"];
+    _redLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 37, 15, 20)];
+    [_redLabel setStringValue:"R"];
     [_redLabel setTextColor:[CPColor blackColor]];
-    
-    _redSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 35, aFrame.size.width - 70, 20)];
-    [_redSlider setMaxValue: 1.0];
-    [_redSlider setMinValue: 0.0];
-    [_redSlider setTarget: self];
-    [_redSlider setAction: @selector(sliderChanged:)];
-    [_redSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
-    var updateFunction = function(aDOMEvent) 
-    { 
-        if(isNaN(this.value))
-            return;
-           
-        switch(this)
-        {
-            case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; 
-                                   //[self sliderChanged: _redSlider];
-                                   break;
-                                   
-            case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; 
-                                   //[self sliderChanged: _greenSlider];
-                                   break;
-                                   
-            case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(this.value), 255) / 255.0, 0)]; 
-                                   //[self sliderChanged: _blueSlider];
-                                   break;
+    _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];
 
-            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(this.value), 360), 0)]; 
-                                   //[self sliderChanged: _hueSlider];
-                                   break;
-                                   
-            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(this.value), 100), 0)]; 
-                                   //[self sliderChanged: _saturationSlider];
-                                   break;
+    // 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];
 
-            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(this.value), 100), 0)]; 
-                                   //[self sliderChanged: _brightnessSlider];
-                                   break;
-        }
-        
-        this.blur();
-    };
-
-    var keypressFunction = function(aDOMEvent)
-    {
-        aDOMEvent = aDOMEvent || window.event;
-        if (aDOMEvent.keyCode == 13) 
-        { 
-            updateFunction(aDOMEvent);
-            
-            if(aDOMEvent.preventDefault)
-                aDOMEvent.preventDefault(); 
-            else if(aDOMEvent.stopPropagation)
-                aDOMEvent.stopPropagation();
-        } 
-    }
-
-    //red value input box
-    var redValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 35, 45, 20)];
-    [redValue setAutoresizingMask: CPViewMinXMargin];
-    
-    _redValue = document.createElement("input");
-    _redValue.style.width = "40px";
-    _redValue.style.backgroundColor = "transparent";
-    _redValue.style.border = "1px solid black";
-    _redValue.style.color = "black";
-    _redValue.style.position = "absolute";
-    _redValue.style.top = "0px";
-    _redValue.style.left = "0px";
-    _redValue.onchange = updateFunction;
-    
-    redValue._DOMElement.appendChild(_redValue);
-    [_contentView addSubview: redValue];
-#endif
-
-    _greenLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 58, 15, 20)];
-    [_greenLabel setStringValue: "G"];
+    _greenLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 63, 15, 20)];
+    [_greenLabel setStringValue:"G"];
     [_greenLabel setTextColor:[CPColor blackColor]];
 
-    _greenSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 58, aFrame.size.width - 70, 20)];
-    [_greenSlider setMaxValue: 1.0];
-    [_greenSlider setMinValue: 0.0];
-    [_greenSlider setTarget: self];
-    [_greenSlider setAction: @selector(sliderChanged:)];
-    [_greenSlider setAutoresizingMask: CPViewWidthSizable];
+    _greenSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 61, aFrame.size.width - 70, 20)];
+    [_greenSlider setMaxValue:1.0];
+    [_greenSlider setMinValue:0.0];
+    [_greenSlider setTarget:self];
+    [_greenSlider setAction:@selector(sliderChanged:)];
+    [_greenSlider setAutoresizingMask:CPViewWidthSizable];
 
-#if PLATFORM(DOM)
-    //green value input box
-    var greenValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 58, 45, 20)];
-    [greenValue setAutoresizingMask: CPViewMinXMargin];
+    // 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 = _redValue.cloneNode(false);
-    _greenValue.onchange = updateFunction;
-    
-    greenValue._DOMElement.appendChild(_greenValue);
-    [_contentView addSubview: greenValue];
-#endif
-
-    _blueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 81, 15, 20)];
-    [_blueLabel setStringValue: "B"];
+    _blueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 90, 15, 20)];
+    [_blueLabel setStringValue:"B"];
     [_blueLabel setTextColor:[CPColor blackColor]];
 
-    _blueSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 81, aFrame.size.width - 70, 20)];
-    [_blueSlider setMaxValue: 1.0];
-    [_blueSlider setMinValue: 0.0];
-    [_blueSlider setTarget: self];
-    [_blueSlider setAction: @selector(sliderChanged:)];
-    [_blueSlider setAutoresizingMask: CPViewWidthSizable];
+    _blueSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 87, aFrame.size.width - 70, 20)];
+    [_blueSlider setMaxValue:1.0];
+    [_blueSlider setMinValue:0.0];
+    [_blueSlider setTarget:self];
+    [_blueSlider setAction:@selector(sliderChanged:)];
+    [_blueSlider setAutoresizingMask:CPViewWidthSizable];
 
-#if PLATFORM(DOM)
-    //blue value input box
-    var blueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 81, 45, 20)];
-    [blueValue setAutoresizingMask: CPViewMinXMargin];
+    // 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 = _redValue.cloneNode(false);
-    _blueValue.onchange = updateFunction;
-
-    blueValue._DOMElement.appendChild(_blueValue);
-    [_contentView addSubview: blueValue];
-#endif
-    _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
-    [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
+    _hsbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 120, 190, 20)];
+    [_hsbLabel setStringValue:"Hue, Saturation, Brightness"];
     [_hsbLabel setTextColor:[CPColor blackColor]];
 
-    _hueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 145, 15, 20)];
-    [_hueLabel setStringValue: "H"];
+    _hueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 145, 15, 20)];
+    [_hueLabel setStringValue:"H"];
     [_hueLabel setTextColor:[CPColor blackColor]];
-    
-    _hueSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 145, aFrame.size.width - 70, 20)];
-    [_hueSlider setMaxValue: 359.0];
-    [_hueSlider setMinValue: 0.0];
-    [_hueSlider setTarget: self];
-    [_hueSlider setAction: @selector(sliderChanged:)];
-    [_hueSlider setAutoresizingMask: CPViewWidthSizable];
 
-#if PLATFORM(DOM)
-    //red value input box
-    var hueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 145, 45, 20)];
-    [hueValue setAutoresizingMask: CPViewMinXMargin];
+    _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];
 
-    _hueValue = _redValue.cloneNode(false);
-    _hueValue.onchange = updateFunction;
+    // 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._DOMElement.appendChild(_hueValue);
-    [_contentView addSubview: hueValue];
-#endif
-    _saturationLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 168, 15, 20)];
-    [_saturationLabel setStringValue: "S"];
+    _saturationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 170, 15, 20)];
+    [_saturationLabel setStringValue:"S"];
     [_saturationLabel setTextColor:[CPColor blackColor]];
 
-    _saturationSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 168, aFrame.size.width - 70, 20)];
-    [_saturationSlider setMaxValue: 100.0];
-    [_saturationSlider setMinValue: 0.0];
-    [_saturationSlider setTarget: self];
-    [_saturationSlider setAction: @selector(sliderChanged:)];
-    [_saturationSlider setAutoresizingMask: CPViewWidthSizable];
+    _saturationSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 168, aFrame.size.width - 70, 20)];
+    [_saturationSlider setMaxValue:100.0];
+    [_saturationSlider setMinValue:0.0];
+    [_saturationSlider setTarget:self];
+    [_saturationSlider setAction:@selector(sliderChanged:)];
+    [_saturationSlider setAutoresizingMask:CPViewWidthSizable];
 
-#if PLATFORM(DOM)
-    //green value input box
-    var saturationValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 168, 45, 20)];
-    [saturationValue setAutoresizingMask: CPViewMinXMargin];
+    // 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 = _redValue.cloneNode(false);
-    _saturationValue.onchange = updateFunction;
-
-    saturationValue._DOMElement.appendChild(_saturationValue);
-    [_contentView addSubview: saturationValue];
-#endif
-    _brightnessLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 191, 15, 20)];
-    [_brightnessLabel setStringValue: "B"];
+    _brightnessLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 196, 15, 20)];
+    [_brightnessLabel setStringValue:"B"];
     [_brightnessLabel setTextColor:[CPColor blackColor]];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame: CPRectMake(15, 191, aFrame.size.width - 70, 20)];
-    [_brightnessSlider setMaxValue: 100.0];
-    [_brightnessSlider setMinValue: 0.0];
-    [_brightnessSlider setTarget: self];
-    [_brightnessSlider setAction: @selector(sliderChanged:)];
-    [_brightnessSlider setAutoresizingMask: CPViewWidthSizable];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(15, 194, aFrame.size.width - 70, 20)];
+    [_brightnessSlider setMaxValue:100.0];
+    [_brightnessSlider setMinValue:0.0];
+    [_brightnessSlider setTarget:self];
+    [_brightnessSlider setAction:@selector(sliderChanged:)];
+    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable];
 
-#if PLATFORM(DOM)
-    //blue value input box
-    var brightnessValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 191, 45, 20)];
-    [brightnessValue setAutoresizingMask: CPViewMinXMargin];
+    // 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 = _redValue.cloneNode(false);
-    _brightnessValue.onchange = updateFunction;
-
-    brightnessValue._DOMElement.appendChild(_brightnessValue);
-    [_contentView addSubview: brightnessValue];
-#endif
-    _hexLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 230, 30, 20)];
-    [_hexLabel setStringValue: "Hex"];
+    _hexLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 230, 30, 20)];
+    [_hexLabel setStringValue:"Hex"];
     [_hexLabel setTextColor:[CPColor blackColor]];
 
-#if PLATFORM(DOM)
     //hex input box
-    _hexValue = _redValue.cloneNode(false);
-    _hexValue.style.top = "228px";
-    _hexValue.style.width = "80px";
-    _hexValue.style.left = "35px";
-    _hexValue.onkeypress = function(aDOMEvent) 
-    { 
-        aDOMEvent = aDOMEvent || window.event;
-        if (aDOMEvent.keyCode == 13) 
-        { 
-            var newColor = [CPColor colorWithHexString: this.value];
-            
-            if(newColor)
-            {
-                [self setColor: newColor];
-                [[self colorPanel] setColor: newColor];
-            }
-            
-            if(aDOMEvent.preventDefault)
-                aDOMEvent.preventDefault(); 
-            else if(aDOMEvent.stopPropagation)
-                aDOMEvent.stopPropagation();
-            
-            this.blur();
-        } 
-    };
+    _hexValue = [[CPTextField alloc] initWithFrame:CGRectMake(32, 225, 80, 28)];
+    [_hexValue setEditable:YES];
+    [_hexValue setBezeled:YES];
+    [_hexValue setDelegate:self];
+    [_contentView addSubview:_hexValue];
 
-    _contentView._DOMElement.appendChild(_hexValue);
-#endif
+    [_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: _hexLabel];
+    [_contentView addSubview:_hsbLabel];
+    [_contentView addSubview:_hueLabel];
+    [_contentView addSubview:_saturationLabel];
+    [_contentView addSubview:_brightnessLabel];
+    [_contentView addSubview:_hueSlider];
+    [_contentView addSubview:_saturationSlider];
+    [_contentView addSubview:_brightnessSlider];
+
+    [_contentView addSubview:_hexLabel];
 }
 
-- (CPView)provideNewView:(BOOL)initialRequest 
+- (CPView)provideNewView:(BOOL)initialRequest
 {
-    if (initialRequest) 
+    if (initialRequest)
         [self initView];
-    
+
     return _contentView;
 }
 
-- (int)currentMode 
+- (int)currentMode
 {
     return CPSliderColorPickerMode;
 }
 
-- (BOOL)supportsMode:(int)mode 
+- (BOOL)supportsMode:(int)mode
 {
     return (mode == CPSliderColorPickerMode) ? YES : NO;
 }
 
--(void)sliderChanged:(id)sender
+- (void)sliderChanged:(id)sender
 {
     var newColor,
         colorPanel = [self colorPanel],
         alpha = [colorPanel opacity];
 
-    switch(sender)
+    switch (sender)
     {
         case    _hueSlider:
         case    _saturationSlider:
-        case    _brightnessSlider:      newColor = [CPColor colorWithHue: [_hueSlider floatValue]
-                                                              saturation: [_saturationSlider floatValue]
-                                                              brightness: [_brightnessSlider floatValue]
-                                                                   alpha: alpha];
-                                                              
-                                        [self updateRGBSliders: newColor];
+        case    _brightnessSlider:      newColor = [CPColor colorWithHue:[_hueSlider floatValue]
+                                                              saturation:[_saturationSlider floatValue]
+                                                              brightness:[_brightnessSlider floatValue]
+                                                                   alpha:alpha];
+
+                                        [self updateRGBSliders:newColor];
                                         break;
-                                        
+
         case    _redSlider:
         case    _greenSlider:
-        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue]
-                                                                             green: [_greenSlider floatValue]
-                                                                              blue: [_blueSlider floatValue]
-                                                                             alpha: alpha];
-                                                              
-                                        [self updateHSBSliders: newColor];
+        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed:[_redSlider floatValue]
+                                                                             green:[_greenSlider floatValue]
+                                                                              blue:[_blueSlider floatValue]
+                                                                             alpha:alpha];
+
+                                        [self updateHSBSliders:newColor];
                                         break;
     }
-        
+
     [self updateLabels];
-    [self updateHex: newColor];
-    [colorPanel setColor: newColor];
+    [self updateHex:newColor];
+    [colorPanel setColor:newColor];
 }
 
--(void)setColor:(CPColor)aColor
+- (void)setColor:(CPColor)aColor
 {
-    [self updateRGBSliders: aColor];
-    [self updateHSBSliders: aColor];
-    [self updateHex: aColor];
+    [self updateRGBSliders:aColor];
+    [self updateHSBSliders:aColor];
+    [self updateHex:aColor];
     [self updateLabels];
 }
 
--(void)updateHSBSliders:(CPColor)aColor
+- (void)updateHSBSliders:(CPColor)aColor
 {
     var hsb = [aColor hsbComponents];
-        
+
     [_hueSlider setFloatValue:hsb[0]];
     [_saturationSlider setFloatValue:hsb[1]];
     [_brightnessSlider setFloatValue:hsb[2]];
@@ -392,9 +299,7 @@
 
 - (void)updateHex:(CPColor)aColor
 {
-#if PLATFORM(DOM)
-    _hexValue.value = [aColor hexString];
-#endif
+    [_hexValue setStringValue:[aColor hexString]];
 }
 
 - (void)updateRGBSliders:(CPColor)aColor
@@ -408,15 +313,13 @@
 
 - (void)updateLabels
 {
-#if PLATFORM(DOM)
-    _hueValue.value        = ROUND([_hueSlider floatValue]);      
-    _saturationValue.value = ROUND([_saturationSlider floatValue]);
-    _brightnessValue.value = ROUND([_brightnessSlider floatValue]);
-    
-    _redValue.value        = ROUND([_redSlider floatValue] * 255);
-    _greenValue.value      = ROUND([_greenSlider floatValue] * 255);
-    _blueValue.value       = ROUND([_blueSlider floatValue] * 255);
-#endif
+    [_hueValue setStringValue:ROUND([_hueSlider floatValue])];
+    [_saturationValue setStringValue:ROUND([_saturationSlider floatValue])];
+    [_brightnessValue setStringValue:ROUND([_brightnessSlider floatValue])];
+
+    [_redValue setStringValue:ROUND([_redSlider floatValue] * 255)];
+    [_greenValue setStringValue:ROUND([_greenSlider floatValue] * 255)];
+    [_blueValue setStringValue:ROUND([_blueSlider floatValue] * 255)];
 }
 
 - (CPImage)provideNewButtonImage
@@ -429,4 +332,50 @@
     return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"slider_button_h.png"] size:CGSizeMake(32, 32)];
 }
 
+- (void)controlTextDidEndEditing:(CPNotification)aNotification
+{
+    var field = [aNotification object],
+        value = [[field stringValue] stringByTrimmingWhitespace];
+
+    if (field === _hexValue)
+    {
+        var newColor = [CPColor colorWithHexString:value];
+
+        if (newColor)
+        {
+            [self setColor:newColor];
+            [[self colorPanel] setColor:newColor];
+        }
+    }
+    else
+    {
+        switch (field)
+        {
+            case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
+                                   [self sliderChanged:_redSlider];
+                                   break;
+
+            case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
+                                   [self sliderChanged:_greenSlider];
+                                   break;
+
+            case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
+                                   [self sliderChanged:_blueSlider];
+                                   break;
+
+            case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
+                                   [self sliderChanged:_hueSlider];
+                                   break;
+
+            case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
+                                   [self sliderChanged:_saturationSlider];
+                                   break;
+
+            case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
+                                   [self sliderChanged:_brightnessSlider];
+                                   break;
+        }
+    }
+}
+
 @end

AppKit/CPSound.j

@@ -0,0 +1,318 @@
+/*
+ * CPSound.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal
+ * Copyright 2010, Antoine Mercadal
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPRunLoop.j>
+
+CPSoundLoadStateEmpty       = 0;
+CPSoundLoadStateLoading     = 1;
+CPSoundLoadStateCanBePlayed = 2;
+CPSoundLoadStateError       = 3;
+
+CPSoundPlayBackStatePlay    = 0;
+CPSoundPlayBackStateStop    = 1;
+CPSoundPlayBackStatePause   = 2;
+
+
+/*!
+    CPSound provides a way to load and play sounds. In the browser it relies on the
+    HTML5 audio tag being available.
+
+    CPSound delegate:
+        - sound:didFinishPlaying: called when sound has finished to played
+
+*/
+@implementation CPSound : CPObject
+{
+    CPString            _name       @accessors(property=name);
+    id                  _delegate   @accessors(property=delegate);
+
+    BOOL                _playRequestBeforeLoad;
+    HTMLAudioElement    _audioTag;
+    int                 _loadStatus;
+    int                 _playBackStatus;
+}
+
+#pragma mark -
+#pragma mark Initialization
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _loadStatus = CPSoundLoadStateEmpty;
+//        _loops = NO;
+        _audioTag = document.createElement("audio");
+        _audioTag.preload = YES;
+        _playRequestBeforeLoad = NO;
+
+        _audioTag.addEventListener("canplay", function()
+        {
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            [self _soundDidload];
+        }, true);
+
+        _audioTag.addEventListener("ended", function()
+        {
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            [self _soundDidEnd];
+        }, true);
+
+        _audioTag.addEventListener("error", function()
+        {
+            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+            [self _soundError];
+        }, true);
+    }
+
+    return self;
+}
+
+/*!
+    Initialize with the sound contents of the URL represented by aFile.
+
+    @param aFile CPString the path of the sound
+    @param byRef ignored (Cocoa compatibility)
+*/
+- (id)initWithContentsOfFile:(CPString)aFile byReference:(BOOL)byRef
+{
+    if (self = [self init])
+    {
+        _loadStatus = CPSoundLoadStateLoading;
+        _audioTag.src = aFile;
+    }
+
+    return self;
+}
+
+/*!
+    Initialize with the sound contents of the file located at aURL.
+
+    @param aURL CPURL containing the URL of the sound
+    @param byRef ignored (Cocoa compatibility)
+*/
+- (id)initWithContentsOfURL:(CPURL)aURL byReference:(BOOL)byRef
+{
+    return [self initWithContentsOfFile:[aURL absoluteString] byReference:NO];
+}
+
+/*!
+    Initialize with the sound contents of someData.
+
+    @param someData CPData containing the sound
+    @param byRef ignored (Cocoa compatibility)
+*/
+- (id)initWithData:(CPData)someData
+{
+    if (self = [self init])
+    {
+        _loadStatus = CPSoundLoadStateLoading;
+        _audioTag.src = [someData rawString];
+    }
+
+    return self;
+}
+
+
+#pragma mark -
+#pragma mark Events listener
+
+/*! @ignore
+*/
+- (void)_soundDidload
+{
+    _loadStatus = CPSoundLoadStateCanBePlayed;
+
+    if (_playRequestBeforeLoad)
+    {
+        _playRequestBeforeLoad = NO;
+        [self play];
+    }
+}
+
+/*! @ignore
+*/
+- (void)_soundDidEnd
+{
+    if (![self loops])
+        [self stop];
+}
+
+/*! @ignore
+*/
+- (void)_soundError
+{
+    _loadStatus = CPSoundLoadStateError;
+    CPLog.error("Cannot load sound. Maybe the format of your sound is not compatible with your browser.");
+}
+
+
+#pragma mark -
+#pragma mark Media controls
+
+/*!
+    Play the sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)play
+{
+    if (_loadStatus === CPSoundLoadStateLoading)
+    {
+        _playRequestBeforeLoad = YES;
+        return YES;
+    }
+
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus === CPSoundPlayBackStatePlay))
+        return NO;
+
+    _audioTag.play();
+    _playBackStatus = CPSoundPlayBackStatePlay;
+
+    return YES;
+}
+
+/*!
+    Stop the sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)stop
+{
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus === CPSoundPlayBackStateStop))
+        return NO;
+
+    _audioTag.pause();
+    _audioTag.currentTime = 0.0;
+    _playBackStatus = CPSoundPlayBackStateStop;
+
+    if (_delegate && [_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
+        [_delegate sound:self didFinishPlaying:YES];
+
+    return YES;
+}
+
+/*!
+    Pause the sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)pause
+{
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus === CPSoundPlayBackStatePause))
+        return NO;
+
+    _audioTag.pause();
+    _playBackStatus = CPSoundPlayBackStatePause;
+
+    return YES;
+}
+
+/*!
+    Resume playback of a paused sound.
+
+    @return YES when the receiver is playing its audio data, NO otherwise.
+*/
+- (BOOL)resume
+{
+    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
+        || (_playBackStatus !== CPSoundPlayBackStatePause))
+        return NO;
+
+    _audioTag.play();
+    _playBackStatus = CPSoundPlayBackStatePlay;
+
+    return YES;
+}
+
+/*!
+    Return YES if the sound is in loop mode.
+
+    @return BOOL YES if in loop mode, NO otherwise
+*/
+- (BOOL)loops
+{
+    return _audioTag.loop;
+}
+
+/*!
+    Specifies whether the sound should repeat.
+
+    @param BOOL YES for loop mode, NO otherwise
+*/
+- (void)setLoops:(BOOL)shouldLoop
+{
+    _audioTag.loop = shouldLoop;
+}
+
+/*!
+    Returns the volume of the receiver.
+
+    @return double from 0.0 to 1.0
+*/
+- (double)volume
+{
+    return _audioTag.volume;
+}
+
+/*!
+    Set the volume the sound should be played at.
+
+    @param double a volume value between 0.0 and 1.0
+*/
+- (void)setVolume:(double)aVolume
+{
+    if (aVolume > 1.0)
+        aVolume = 1.0;
+    else if (aVolume < 0.0)
+        aVolume = 0.0;
+
+    _audioTag.volume = aVolume;
+}
+
+#pragma mark -
+#pragma mark Accessors
+
+/*!
+    Returns the duration in seconds of the sound.
+
+    @return double the duration
+*/
+- (double)duration
+{
+    return _audioTag.duration;
+}
+
+/*!
+    Returns if the sound is playing or not.
+
+    @return BOOL YES if the sound is playing, NO otherwise
+*/
+- (BOOL)isPlaying
+{
+    return (_playBackStatus === CPSoundPlayBackStatePlay);
+}
+
+@end

AppKit/CPStepper.j

@@ -0,0 +1,340 @@
+/*
+ * CPStepper.j
+ * AppKit
+ *
+ * Created by Antoine Mercadal
+ * Copyright 2009, Antoine Mercadal
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import "CPControl.j"
+@import "CPButton.j"
+@import "CPTextField.j"
+
+
+
+/*!
+    CPStepper is an implementation of Cocoa NSStepper.
+
+    This control displays a two part button that can be used to increase or decrease a value with a given interval.
+*/
+@implementation CPStepper: CPControl
+{
+    BOOL        _valueWraps     @accessors(property=valueWraps);
+    BOOL        _autorepeat     @accessors(getter=autorepeat);
+    int         _increment      @accessors(property=increment);
+    int         _maxValue       @accessors(property=maxValue);
+    int         _minValue       @accessors(property=minValue);
+
+    CPButton    _buttonDown;
+    CPButton    _buttonUp;
+}
+
+#pragma mark -
+#pragma mark Initialization
+
+/*!
+    Initializes a CPStepper with given values.
+    @param aValue the initial value of the CPStepper
+    @param minValue the minimal acceptable value of the stepper
+    @param maxValue the maximal acceptable value of the stepper
+    @return Initialized CPStepper
+*/
++ (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
+{
+    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMakeZero()];
+
+    [stepper setDoubleValue:aValue];
+    [stepper setMinValue:aMinValue];
+    [stepper setMaxValue:aMaxValue];
+
+    // _sizeToFit will put the good size for the stepper depending of the current theme
+    [stepper _sizeToFit];
+
+    return stepper;
+}
+
+/*!
+    Initializes a CPStepper with default values:
+        - minValue = 0.0
+        - maxValue = 59.0
+        - value = 0.0
+
+    @return Initialized CPStepper
+*/
++ (CPStepper)stepper
+{
+    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
+}
+
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding || aBinding == CPMinValueBinding || aBinding == CPMaxValueBinding)
+        return [_CPStepperValueBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return @"doubleValue";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
+/*!
+    Initializes a CPStepper.
+    @param aFrame the frame of the control
+    @return initialized CPStepper
+*/
+- (id)initWithFrame:(CGRect)aFrame
+{
+    if (self = [super initWithFrame:aFrame])
+    {
+        _maxValue       = 59.0;
+        _minValue       = 0.0;
+        _increment      = 1.0;
+        _valueWraps     = YES;
+        _autorepeat     = YES;
+
+        [self setDoubleValue:0.0];
+        [self _init];
+    }
+
+    return self;
+}
+
+/*! @ignore */
+
+- (void)_init
+{
+    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    [_buttonUp setContinuous:_autorepeat];
+    [_buttonUp setTarget:self];
+    [_buttonUp setAction:@selector(_buttonDidClick:)];
+    [_buttonUp setAutoresizingMask:CPViewNotSizable];
+    [self addSubview:_buttonUp];
+
+    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
+    [_buttonDown setContinuous:_autorepeat];
+    [_buttonDown setTarget:self];
+    [_buttonDown setAction:@selector(_buttonDidClick:)];
+    [_buttonDown setAutoresizingMask:CPViewNotSizable];
+
+    [self setContinuous:_autorepeat];
+    [self addSubview:_buttonDown];
+
+    [self setNeedsLayout];
+}
+
+#pragma mark -
+#pragma mark Superclass overrides
+
+/*!
+    Set if the CPStepper is enabled or not.
+    @param shouldEnabled BOOL that define if stepper is enabled or not.
+*/
+- (void)setEnabled:(BOOL)shouldEnabled
+{
+    [super setEnabled:shouldEnabled];
+
+    [_buttonUp setEnabled:shouldEnabled];
+    [_buttonDown setEnabled:shouldEnabled];
+}
+
+
+- (void)setFrame:(CGRect)aFrame
+{
+    var upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
+        frame = _CGRectMakeCopy(aFrame);
+
+    frame.size.width = MAX(minSize.width, frame.size.width);
+    frame.size.height = MAX(minSize.height, frame.size.height);
+    [super setFrame:frame];
+}
+
+/*! @ignore */
+- (void)layoutSubviews
+{
+    var aFrame = [self frame],
+        upSize = [self valueForThemeAttribute:@"up-button-size"],
+        downSize = [self valueForThemeAttribute:@"down-button-size"],
+        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
+        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
+
+    [_buttonUp setFrame:upFrame];
+    [_buttonDown setFrame:downFrame];
+
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
+    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
+    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
+}
+
+- (void)_sizeToFit
+{
+    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
+}
+
+/*!
+    Set if CPStepper should autorepeat.
+    @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
+*/
+- (void)setAutorepeat:(BOOL)shouldAutoRepeat
+{
+    if (shouldAutoRepeat !== _autorepeat)
+    {
+        [_buttonUp setContinuous:shouldAutoRepeat];
+        [_buttonDown setContinuous:shouldAutoRepeat];
+    }
+
+    [self setContinuous:shouldAutoRepeat];
+}
+
+/*!
+    Set the current value of the stepper.
+    @param aValue a float containing the value
+*/
+- (void)setDoubleValue:(float)aValue
+{
+    if (aValue > _maxValue)
+        [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
+    else if (aValue < _minValue)
+        [super setDoubleValue:_valueWraps ? _maxValue : _minValue];
+    else
+        [super setDoubleValue:aValue];
+}
+
+#pragma mark -
+#pragma mark Actions
+
+/*! @ignore */
+- (IBAction)_buttonDidClick:(id)aSender
+{
+    if (![self isEnabled])
+        return;
+
+    if (aSender == _buttonUp)
+        [self setDoubleValue:([self doubleValue] + _increment)];
+    else
+        [self setDoubleValue:([self doubleValue] - _increment)];
+
+    [self sendAction:[self action] to:[self target]];
+}
+
+/*!
+    Perform a programatic click on up button.
+    @param aSender sender of the action
+*/
+- (IBAction)performClickUp:(id)aSender
+{
+    [_buttonUp performClick:aSender];
+}
+
+/*!
+    Perform a programatic click on down button.
+    @param aSender sender of the action
+*/
+- (IBAction)performClickDown:(id)aSender
+{
+    [_buttonDown performClick:aSender];
+}
+
+
+#pragma mark -
+#pragma mark Theming
+
++ (CPString)defaultThemeClass
+{
+    return @"stepper";
+}
+
++ (id)themeAttributes
+{
+    return @{
+            @"bezel-color-up-button": [CPNull null],
+            @"bezel-color-down-button": [CPNull null],
+            @"up-button-size": _CGSizeMakeZero(),
+            @"down-button-size": _CGSizeMakeZero(),
+        };
+}
+
+@end
+
+@implementation _CPStepperValueBinder : CPBinder
+{
+}
+
+- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
+{
+    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
+
+    [super _updatePlaceholdersWithOptions:options];
+
+    [self _setPlaceholder:placeholder forMarker:CPMultipleValuesMarker isDefault:YES];
+    [self _setPlaceholder:placeholder forMarker:CPNoSelectionMarker isDefault:YES];
+    [self _setPlaceholder:placeholder forMarker:CPNotApplicableMarker isDefault:YES];
+    [self _setPlaceholder:placeholder forMarker:CPNullMarker isDefault:YES];
+}
+
+@end
+
+var CPStepperMinValue   = @"CPStepperMinValue",
+    CPStepperMaxValue   = @"CPStepperMaxValue",
+    CPStepperValueWraps = @"CPStepperValueWraps",
+    CPStepperAutorepeat = @"CPStepperAutorepeat",
+    CPStepperIncrement  = @"CPStepperIncrement";
+
+@implementation CPStepper (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super initWithCoder:aCoder])
+    {
+        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
+        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue];
+        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue];
+        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps];
+        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat];
+
+        [self _init];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+
+    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
+
+    if (_minValue)
+        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
+    if (_maxValue)
+        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
+    if (_valueWraps)
+        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
+    if (_autorepeat)
+        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
+}
+
+@end

AppKit/CPStringDrawing.j

@@ -22,11 +22,24 @@
 
 @import <Foundation/CPString.j>
 
+@import "CGGeometry.j"
 @import "CPPlatformString.j"
 
 
+var CPStringSizeWithFontInWidthCache = {};
+
+CPStringSizeCachingEnabled = YES;
+
 @implementation CPString (CPStringDrawing)
 
+/*!
+    Returns a dictionary with the items "ascender", "descender", "lineHeight"
+*/
++ (CPDictionary)metricsOfFont:(CPFont)aFont
+{
+    return [CPPlatformString metricsOfFont:aFont];
+}
+
 /*!
     Returns the string
 */
@@ -42,7 +55,19 @@
 
 - (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
 {
-    return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
+    if (!CPStringSizeCachingEnabled)
+        return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
+
+    var cacheKey = self + [aFont cssString] + aWidth,
+        size = CPStringSizeWithFontInWidthCache[cacheKey];
+
+    if (size === undefined)
+    {
+        size = [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
+        CPStringSizeWithFontInWidthCache[cacheKey] = size;
+    }
+
+    return CGSizeMakeCopy(size);
 }
 
 @end

AppKit/CPTabViewItem.j

@@ -22,7 +22,7 @@
 
 @import <Foundation/CPObject.j>
 
-@import <AppKit/CPView.j>
+@import "CPView.j"
 
 
 /*
@@ -44,7 +44,7 @@ CPBackgroundTab = 1;
 */
 CPPressedTab    = 2;
 
-/*! 
+/*!
     @ingroup appkit
     @class CPTabViewItem
 
@@ -55,11 +55,12 @@ CPPressedTab    = 2;
 {
     id          _identifier;
     CPString    _label;
-    
+
     CPView      _view;
     CPView      _auxiliaryView;
-    
+
     CPTabView   _tabView;
+    unsigned    _tabState;      // Looks like it is not yet implemented
 }
 
 - (id)init
@@ -74,10 +75,10 @@ CPPressedTab    = 2;
 - (id)initWithIdentifier:(id)anIdentifier
 {
     self = [super init];
-    
+
     if (self)
         _identifier = anIdentifier;
-        
+
     return self;
 }
 
@@ -132,7 +133,13 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
+    if (_view == aView)
+        return;
+
     _view = aView;
+
+    if ([_tabView selectedTabViewItem] == self)
+        [_tabView _setContentViewFromItem:self];
 }
 
 /*!
@@ -145,8 +152,8 @@ CPPressedTab    = 2;
 
 // Assigning an Auxiliary View
 /*!
-    Sets the tab's auxillary view.
-    @param anAuxillaryView the new auxillary view
+    Sets the tab's auxiliary view.
+    @param anAuxiliaryView the new auxiliary view
 */
 - (void)setAuxiliaryView:(CPView)anAuxiliaryView
 {
@@ -154,7 +161,7 @@ CPPressedTab    = 2;
 }
 
 /*!
-    Returns the tab's auxillary view
+    Returns the tab's auxiliary view
 */
 - (CPView)auxiliaryView
 {
@@ -191,16 +198,16 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-    
+
     if (self)
     {
         _identifier     = [aCoder decodeObjectForKey:CPTabViewItemIdentifierKey];
         _label          = [aCoder decodeObjectForKey:CPTabViewItemLabelKey];
-        
+
         _view           = [aCoder decodeObjectForKey:CPTabViewItemViewKey];
         _auxiliaryView  = [aCoder decodeObjectForKey:CPTabViewItemAuxViewKey];
     }
-    
+
     return self;
 }
 
@@ -208,7 +215,7 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 {
     [aCoder encodeObject:_identifier    forKey:CPTabViewItemIdentifierKey];
     [aCoder encodeObject:_label         forKey:CPTabViewItemLabelKey];
-    
+
     [aCoder encodeObject:_view          forKey:CPTabViewItemViewKey];
     [aCoder encodeObject:_auxiliaryView forKey:CPTabViewItemAuxViewKey];
 }

AppKit/CPTableColumn.j

@@ -22,23 +22,37 @@
 
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPObject.j>
+@import <Foundation/CPIndexSet.j>
 @import <Foundation/CPSortDescriptor.j>
 @import <Foundation/CPString.j>
 
-@import "CPTableHeaderView.j"
+@import "CPTextField.j"
 
-#include "CoreGraphics/CGGeometry.h"
+@global CPTableViewColumnDidResizeNotification
+
+@class _CPTableColumnHeaderView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
 CPTableColumnUserResizingMask   = 1 << 1;
 
+/*!
+    @class CPTableColumn
+
+    A CPTableColumn contains a dataview to display for its column of the CPTableView.
+    A CPTableColumn determines its own size constrains and resizing behavior.
+
+    The default dataview is a CPTextField but you can set it to any view you'd like. See -setDataView: for documentation including theme states.
+
+    To customize the text of the column header you can simply call setStringValue: on the headerview of a table column.
+    For example: [[myTableColumn headerView] setStringValue:"My Title"];
+*/
 @implementation CPTableColumn : CPObject
 {
     CPTableView         _tableView;
     CPView              _headerView;
     CPView              _dataView;
-    Object              _dataViewData;
+    CPData              _dataViewData;
 
     float               _width;
     float               _minWidth;
@@ -50,57 +64,91 @@ CPTableColumnUserResizingMask   = 1 << 1;
     CPSortDescriptor    _sortDescriptorPrototype;
     BOOL                _isHidden;
     CPString            _headerToolTip;
-    
+
     BOOL _disableResizingPosting @accessors(property=disableResizingPosting);
 }
 
+/*!
+    @ignore
+*/
 - (id)init
 {
     return [self initWithIdentifier:@""];
 }
 
+/*!
+    Initializes a newly created CPTableColumn with a given identifier.
+
+*/
 - (id)initWithIdentifier:(id)anIdentifier
 {
     self = [super init];
 
     if (self)
     {
-        _dataViewData = { };
+        _dataViewData = nil;
 
         _width = 100.0;
         _minWidth = 10.0;
         _maxWidth = 1000000.0;
         _resizingMask = CPTableColumnAutoresizingMask | CPTableColumnUserResizingMask;
         _disableResizingPosting = NO;
-        
+
         [self setIdentifier:anIdentifier];
 
         var header = [[_CPTableColumnHeaderView alloc] initWithFrame:CGRectMakeZero()];
         [self setHeaderView:header];
-        
-        var textDataView = [CPTextField new];
-        [textDataView setLineBreakMode:CPLineBreakByTruncatingTail];
-        [textDataView setValue:[CPColor colorWithHexString:@"333333"] forThemeAttribute:@"text-color"];
-        [textDataView setValue:[CPColor whiteColor] forThemeAttribute:@"text-color" inState:CPThemeStateSelected];
-        [textDataView setValue:[CPFont boldSystemFontOfSize:12] forThemeAttribute:@"font" inState:CPThemeStateSelected];
-        [textDataView setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
-        [self setDataView:textDataView];
+
+        [self setDataView:[CPTextField new]];
     }
 
     return self;
 }
 
-
+/*!
+    Set the columns's parent tableview
+*/
 - (void)setTableView:(CPTableView)aTableView
 {
     _tableView = aTableView;
 }
 
+/*!
+    Return the column's parent tableview
+*/
 - (CPTableView)tableView
 {
     return _tableView;
 }
 
+/*!
+    @ignore
+    this method tries to resize a column called via the tableview via autoresizing
+    it returns the delta from the actual resize and the proposed resize
+
+    for example if the column should have been resized 50px but the maxWidth was hit only
+    after 25px then the return value would be 25px;
+
+    if no edge has been hit zero will be returned
+*/
+- (int)_tryToResizeToWidth:(int)width
+{
+    var min = [self minWidth],
+        max = [self maxWidth],
+        newWidth = ROUND(MIN(MAX(width, min), max));
+
+    [self setWidth:newWidth];
+
+    return newWidth - width;
+}
+
+/*!
+    Set the width of the column
+    Default value is: 100
+
+    If the value is greater than the maxWidth the maxWidth will be reset with the supplied width here
+    If the value is less than the minWidth the minWidth will be reset with the supplied width.
+*/
 - (void)setWidth:(float)aWidth
 {
     aWidth = +aWidth;
@@ -123,29 +171,36 @@ CPTableColumnUserResizingMask   = 1 << 1;
     {
         var index = [[tableView tableColumns] indexOfObjectIdenticalTo:self],
             dirtyTableColumnRangeIndex = tableView._dirtyTableColumnRangeIndex;
-            
+
         if (dirtyTableColumnRangeIndex < 0)
             tableView._dirtyTableColumnRangeIndex = index;
         else
             tableView._dirtyTableColumnRangeIndex = MIN(index,  tableView._dirtyTableColumnRangeIndex);
-        
+
         var rows = tableView._exposedRows,
-            columns = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(index, [tableView._exposedColumns lastIndex] - index + 1)];        
-        
+            columns = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(index, [tableView._exposedColumns lastIndex] - index + 1)];
+
         // FIXME: Would be faster with some sort of -setNeedsDisplayInColumns: that updates a dirtyTableColumnForDisplay cache; then marked columns would relayout their data views at display time.
         [tableView _layoutDataViewsInRows:rows columns:columns];
         [tableView tile];
-        
+
         if (!_disableResizingPosting)
             [self _postDidResizeNotificationWithOldWidth:oldWidth];
     }
 }
 
+/*!
+    Returns the column's width
+*/
 - (float)width
 {
     return _width;
 }
 
+/*!
+    Sets the minimum width of the column.
+    Default value is 10.
+*/
 - (void)setMinWidth:(float)aMinWidth
 {
     aMinWidth = +aMinWidth;
@@ -162,11 +217,18 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [self setWidth:newWidth];
 }
 
+/*!
+    Returns the minimum width of the column.
+*/
 - (float)minWidth
 {
     return _minWidth;
 }
 
+/*!
+    Sets the maximum width of the table column.
+    Default value is: 1000000
+*/
 - (void)setMaxWidth:(float)aMaxWidth
 {
     aMaxWidth = +aMaxWidth;
@@ -183,21 +245,42 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [self setWidth:newWidth];
 }
 
+/*!
+    Returns the maximum width of the column
+*/
 - (float)maxWidth
 {
     return _maxWidth;
 }
 
+/*!
+<pre>
+    Set the resizing mask of the column.
+    By default the column can be resized automatically with the tableview and manually by the user
+
+    Possible masking values are:
+    CPTableColumnNoResizing
+    CPTableColumnAutoresizingMask
+    CPTableColumnUserResizingMask
+</pre>
+*/
 - (void)setResizingMask:(unsigned)aResizingMask
 {
     _resizingMask = aResizingMask;
 }
 
+
+/*!
+    Returns the resizing mask of the column
+*/
 - (unsigned)resizingMask
 {
     return _resizingMask;
 }
 
+/*!
+    Sizes the column to fix the column header text.
+*/
 - (void)sizeToFit
 {
     var width = _CGRectGetWidth([_headerView frame]);
@@ -211,7 +294,16 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [self setWidth:width];
 }
 
-//Setting Component Cells
+
+/*!
+    Sets the header view for the column.
+    The headerview handles the display of sort indicators, text, etc.
+
+    If you do not want a headerview for you table you should call setHeaderView: on your CPTableView instance.
+    Passing nil here will throw an exception.
+
+    In order to customize the text of the column header see - (CPView)headerView;
+*/
 - (void)setHeaderView:(CPView)aView
 {
     if (!aView)
@@ -225,37 +317,90 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [tableHeaderView setNeedsDisplay:YES];
 }
 
+/*!
+    Returns the headerview for the column.
+
+    In order to change the text of the headerview for a column you should call setStringValue: on the headerview.
+    For example: [[myTableColumn headerView] setStringValue:"My Column"];
+*/
 - (CPView)headerView
 {
     return _headerView;
 }
 
 /*!
-    This method set's the "prototype" view which will be used to create all table cells in this column.
-    
-    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each 
+    This method sets the "prototype" view which will be used to create all table cells in this column.
+
+    It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each
     individual cell that is shown. As a result, changes made after calling this method won't be reflected.
 
     Example:
-    
+        @code
         [tableColumn setDataView:someView]; // snapshot taken
         [[tableColumn dataView] setSomething:x]; //won't work
+        @endcode
 
     This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
-
+        @code
         [someView setSomething:x];
         [tableColumn setDataView:someView];
+        @endcode
+
+    @note you should implement CPKeyedArchiving otherwise you might see unexpected results.
+    This is done by adding the following methods to your class:
+    @endnote
+
+    @code
+    - (id)initWithCoder(CPCoder)aCoder;
+    - (void)encodeWithCoder:(CPCoder)aCoder;
+    @endcode
+
+    Example:
+    Say you have two instance variables in your object that need to be set up each time an object is create.
+    We will call these instance variables "image" and "text".
+    Your CPCoding methods will look like the following:
+
+    @code
+    - (id)initWithCoder:(CPCoder)aCoder
+    {
+        self = [super initWithCoder:aCoder];
+
+        if (self)
+        {
+            image = [aCoder decodeObjectForKey:"MyDataViewImage"];
+            text = [aCoder decodeObjectForKey:"MyDataViewText"];
+        }
+
+        return self;
+    }
+
+    - (void)encodeWithCoder:(CPCoder)aCoder
+    {
+        [super encodeWithCoder:aCoder];
+
+        [aCoder encodeObject:image forKey:"MyDataViewImage"];
+        [aCoder encodeObject:text forKey:"MyDataViewText"];
+    }
+    @endcode
+
+    @section Themeing
+
+    When you set a dataview and it is added to the tableview the theme state will be set to \c CPThemeStateTableDataView
+    When the dataview becomes selected the theme state will be set to \c CPThemeStateSelectedDataView.
+
+    If the dataview shows up in a group row of the tableview the theme state will be set to \c CPThemeStateGroupRow.
+
+    You should overide \c setThemeState: and \c unsetThemeState: to handle these theme state changes in your dataview.
 */
 - (void)setDataView:(CPView)aView
 {
-    if (_dataView === aView)
-        return;
-
     if (_dataView)
-        _dataViewData[[_dataView UID]] = nil;
+        _dataViewData = nil;
+
+    [aView setThemeState:CPThemeStateTableDataView];
 
     _dataView = aView;
-    _dataViewData[[aView UID]] = [CPKeyedArchiver archivedDataWithRootObject:aView];
+    _dataViewData = [CPKeyedArchiver archivedDataWithRootObject:aView];
 }
 
 - (CPView)dataView
@@ -267,7 +412,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     Returns the CPView object used by the CPTableView to draw values for the receiver.
 
     By default, this method just calls dataView. Subclassers can override if they need to
-    potentially use different cells for different rows. Subclasses should expect this method
+    potentially use different "cells" or dataViews for different rows. Subclasses should expect this method
     to be invoked with row equal to -1 in cases where no actual row is involved but the table
     view needs to get some generic cell info.
 */
@@ -276,29 +421,23 @@ CPTableColumnUserResizingMask   = 1 << 1;
     return [self dataView];
 }
 
-- (id)_newDataViewForRow:(int)aRowIndex
+/*!
+    @ignore
+*/
+- (id)_newDataView
 {
-    var dataView = [self dataViewForRow:aRowIndex],
-        dataViewUID = [dataView UID];
+    if (!_dataViewData)
+        return nil;
 
-    var x = [self tableView]._cachedDataViews[dataViewUID];
-    if (x && x.length)
-    return x.pop();
+    var newDataView = [CPKeyedUnarchiver unarchiveObjectWithData:_dataViewData];
+    [newDataView setAutoresizingMask:CPViewNotSizable];
 
-    // 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;
-    
     return newDataView;
 }
 
 //Setting the Identifier
 
-/*
+/*!
     Sets the receiver identifier to anIdentifier.
 */
 - (void)setIdentifier:(id)anIdentifier
@@ -306,7 +445,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     _identifier = anIdentifier;
 }
 
-/*
+/*!
     Returns the object used by the data source to identify the attribute corresponding to the receiver.
 */
 - (id)identifier
@@ -316,7 +455,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 //Controlling Editability
 
-/*
+/*!
     Controls whether the user can edit cells in the receiver by double-clicking them.
 */
 - (void)setEditable:(BOOL)shouldBeEditable
@@ -324,33 +463,57 @@ CPTableColumnUserResizingMask   = 1 << 1;
     _isEditable = shouldBeEditable;
 }
 
-/*
-    Returns YES if the user can edit cells associated with the receiver by double-clicking the 
-    column in the NSTableView, NO otherwise.
+/*!
+    Returns YES if the user can edit cells associated with the receiver by double-clicking the
+    column in the CPTableView, NO otherwise.
 */
 - (BOOL)isEditable
 {
     return _isEditable;
 }
 
-//Sorting
+/*!
+    Sets the sort descriptor prototype for the column.
+*/
 - (void)setSortDescriptorPrototype:(CPSortDescriptor)aSortDescriptor
 {
     _sortDescriptorPrototype = aSortDescriptor;
 }
 
+/*!
+    Returns the sort descriptor prototype for the column.
+*/
 - (CPSortDescriptor)sortDescriptorPrototype
 {
-    return _sortDescriptorPrototype;
+    if (_sortDescriptorPrototype)
+        return _sortDescriptorPrototype;
+
+    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
+        binding = [binderClass getBinding:CPValueBinding forObject:self];
+
+    return [binding _defaultSortDescriptorPrototype];
 }
 
-//Setting Column Visibility
-
+/*!
+    If YES the tablecolumn will no longer be visible in the tableview.
+    If NO the tablecolumn will be visible in the tableview.
+*/
 - (void)setHidden:(BOOL)shouldBeHidden
 {
+    shouldBeHidden = !!shouldBeHidden
+
+    if (_isHidden === shouldBeHidden)
+        return;
+
     _isHidden = shouldBeHidden;
+
+    [[self headerView] setHidden:shouldBeHidden];
+    [[self tableView] _tableColumnVisibilityDidChange:self];
 }
 
+/*!
+    Returns the visibility status of the column.
+*/
 - (BOOL)isHidden
 {
     return _isHidden;
@@ -358,8 +521,8 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 //Setting Tool Tips
 
-/*
-    Sets the tooltip string that is displayed when the cursor pauses over the 
+/*!
+    Sets the tooltip string that is displayed when the cursor pauses over the
     header cell of the receiver.
 */
 - (void)setHeaderToolTip:(CPString)aToolTip
@@ -367,17 +530,195 @@ CPTableColumnUserResizingMask   = 1 << 1;
     _headerToolTip = aToolTip;
 }
 
+/*!
+    Returns the tooltip for the column header
+*/
 - (CPString)headerToolTip
 {
     return _headerToolTip;
 }
 
+/*!
+    @ignore
+*/
 - (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
 {
+    [[self tableView] _didResizeTableColumn:self];
+
     [[CPNotificationCenter defaultCenter]
     postNotificationName:CPTableViewColumnDidResizeNotification
                   object:[self tableView]
-                userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]];
+                userInfo:@{ @"CPTableColumn": self, @"CPOldWidth": oldWidth }];
+}
+
+@end
+
+@implementation CPTableColumnValueBinder : CPBinder
+{
+}
+
+- (void)setValueFor:(CPString)aBinding
+{
+    var tableView = [_source tableView],
+        column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
+        rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [tableView numberOfRows])],
+        columnIndexes = [CPIndexSet indexSetWithIndex:column];
+
+    [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
+}
+
+- (CPSortDescriptor)_defaultSortDescriptorPrototype
+{
+    if (![self createsSortDescriptor])
+        return nil;
+
+    var keyPath = [_info objectForKey:CPObservedKeyPathKey],
+        dotIndex = keyPath.indexOf(".");
+
+    if (dotIndex === CPNotFound)
+        return nil;
+
+    var firstPart = keyPath.substring(0, dotIndex),
+        key = keyPath.substring(dotIndex + 1);
+
+    return [CPSortDescriptor sortDescriptorWithKey:key ascending:YES];
+}
+
+- (BOOL)createsSortDescriptor
+{
+    var options = [_info objectForKey:CPOptionsKey],
+        optionValue = [options objectForKey:CPCreatesSortDescriptorBindingOption];
+    return optionValue === nil ? YES : [optionValue boolValue];
+}
+
+@end
+
+@implementation CPTableColumn (Bindings)
+
++ (id)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPValueBinding)
+        return [CPTableColumnValueBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
+/*!
+    Binds the receiver to an object.
+
+    @param CPString aBinding - The binding you wish to make. Typically CPValueBinding.
+    @param id anObject - The object to bind the receiver to.
+    @param CPString aKeyPath - The key path you wish to bind the receiver to.
+    @param CPDictionary options - A dictionary of options for the binding. This parameter is optional, pass nil if you do not wish to use it.
+*/
+- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
+{
+    [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
+
+    if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
+    {
+        // 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];
+    }
+}
+
+/*!
+    @ignore
+*/
+- (void)_prepareDataView:(CPView)aDataView forRow:(unsigned)aRow
+{
+    var bindingsDictionary = [CPBinder allBindingsForObject:self],
+        keys = [bindingsDictionary allKeys];
+
+    for (var i = 0, count = [keys count]; i < count; i++)
+    {
+        var bindingName = keys[i],
+            bindingPath = [aDataView _replacementKeyPathForBinding:bindingName],
+            binding = [bindingsDictionary objectForKey:bindingName],
+            bindingInfo = binding._info,
+            destination = [bindingInfo objectForKey:CPObservedObjectKey],
+            keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
+            dotIndex = keyPath.lastIndexOf("."),
+            value;
+
+        if (dotIndex === CPNotFound)
+            value = [[destination valueForKeyPath:keyPath] objectAtIndex:aRow];
+        else
+        {
+            /*
+                Optimize the prototypical use case where the key path describes a value
+                in an array. Without this optimization, we call CPArray's valueForKey
+                which generates as many values as objects in the array, of which we then
+                pick one and throw away the rest.
+
+                The optimization is to get the array and access the value directly. This
+                turns the operation into a single access regardless of how long the model
+                array is.
+            */
+
+            var firstPart = keyPath.substring(0, dotIndex),
+                secondPart = keyPath.substring(dotIndex + 1),
+                firstValue = [destination valueForKeyPath:firstPart];
+
+            if ([firstValue isKindOfClass:CPArray])
+                value = [[firstValue objectAtIndex:aRow] valueForKeyPath:secondPart];
+            else
+                value = [[firstValue valueForKeyPath:secondPart] objectAtIndex:aRow];
+        }
+
+        value = [binding transformValue:value withOptions:[bindingInfo objectForKey:CPOptionsKey]];
+        [aDataView setValue:value forKey:@"objectValue"];
+    }
+}
+
+/*!
+    @ignore
+*/
+- (void)_reverseSetDataView:(CPView)aDataView forRow:(unsigned)aRow
+{
+    var bindingsDictionary = [CPBinder allBindingsForObject:self],
+        keys = [bindingsDictionary allKeys],
+        newValue = [aDataView valueForKey:@"objectValue"];
+
+    for (var i = 0, count = [keys count]; i < count; i++)
+    {
+        var bindingName = keys[i],
+            bindingPath = [aDataView _replacementKeyPathForBinding:bindingName],
+            binding = [bindingsDictionary objectForKey:bindingName],
+            bindingInfo = binding._info,
+            destination = [bindingInfo objectForKey:CPObservedObjectKey],
+            keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
+            options = [bindingInfo objectForKey:CPOptionsKey],
+            dotIndex = keyPath.lastIndexOf(".");
+
+        newValue = [binding reverseTransformValue:newValue withOptions:options];
+
+        if (dotIndex === CPNotFound)
+            [[destination valueForKeyPath:keyPath] replaceObjectAtIndex:aRow withObject:newValue];
+        else
+        {
+            var firstPart = keyPath.substring(0, dotIndex),
+                secondPart = keyPath.substring(dotIndex + 1),
+                firstValue = [destination valueForKeyPath:firstPart];
+
+            if ([firstValue isKindOfClass:CPArray])
+                 [[firstValue objectAtIndex:aRow] setValue:newValue forKeyPath:secondPart];
+            else
+                 [[firstValue valueForKeyPath:secondPart] replaceObjectAtIndex:aRow withObject:newValue];
+        }
+    }
 }
 
 @end
@@ -388,17 +729,23 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
     CPTableColumnWidthKey        = @"CPTableColumnWidthKey",
     CPTableColumnMinWidthKey     = @"CPTableColumnMinWidthKey",
     CPTableColumnMaxWidthKey     = @"CPTableColumnMaxWidthKey",
-    CPTableColumnResizingMaskKey = @"CPTableColumnResizingMaskKey";
+    CPTableColumnResizingMaskKey = @"CPTableColumnResizingMaskKey",
+    CPTableColumnIsHiddenKey     = @"CPTableColumnIsHiddenKey",
+    CPSortDescriptorPrototypeKey = @"CPSortDescriptorPrototypeKey",
+    CPTableColumnIsEditableKey   = @"CPTableColumnIsEditableKey";
 
 @implementation CPTableColumn (CPCoding)
 
+/*!
+    @ignore
+*/
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
 
     if (self)
     {
-        _dataViewData = { };
+        _dataViewData = nil;
 
         _width = [aCoder decodeFloatForKey:CPTableColumnWidthKey];
         _minWidth = [aCoder decodeFloatForKey:CPTableColumnMinWidthKey];
@@ -407,60 +754,84 @@ 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 decodeBoolForKey:CPTableColumnResizingMaskKey];
+        _resizingMask  = [aCoder decodeIntForKey:CPTableColumnResizingMaskKey];
+        _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];
+        _isEditable = [aCoder decodeBoolForKey:CPTableColumnIsEditableKey];
+
+        _sortDescriptorPrototype = [aCoder decodeObjectForKey:CPSortDescriptorPrototypeKey];
     }
 
     return self;
 }
 
+/*!
+    @ignore
+*/
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_identifier forKey:CPTableColumnIdentifierKey];
 
-    [aCoder encodeObject:_width forKey:CPTableColumnWidthKey];
-    [aCoder encodeObject:_minWidth forKey:CPTableColumnMinWidthKey];
-    [aCoder encodeObject:_maxWidth forKey:CPTableColumnMaxWidthKey];
+    [aCoder encodeFloat:_width forKey:CPTableColumnWidthKey];
+    [aCoder encodeFloat:_minWidth forKey:CPTableColumnMinWidthKey];
+    [aCoder encodeFloat:_maxWidth forKey:CPTableColumnMaxWidthKey];
 
     [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
     [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
 
     [aCoder encodeObject:_resizingMask forKey:CPTableColumnResizingMaskKey];
+    [aCoder encodeBool:_isHidden forKey:CPTableColumnIsHiddenKey];
+    [aCoder encodeBool:_isEditable forKey:CPTableColumnIsEditableKey];
+
+    [aCoder encodeObject:_sortDescriptorPrototype forKey:CPSortDescriptorPrototypeKey];
 }
 
 @end
 
 @implementation CPTableColumn (NSInCompatibility)
-
+/*!
+    @ignore
+*/
 - (void)setHeaderCell:(CPView)aView
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"setHeaderCell: is not supported. -setHeaderCell:aView instead."];
+                reason:@"setHeaderCell: is not supported. Use -setHeaderView:aView instead."];
 }
 
+/*!
+    @ignore
+*/
 - (CPView)headerCell
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"headCell is not supported. -headerView instead."];
+                reason:@"headCell is not supported. Use -headerView instead."];
 }
 
+/*!
+    @ignore
+*/
 - (void)setDataCell:(CPView)aView
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"setDataCell: is not supported. Use -setHeaderCell:aView instead."];
+                reason:@"setDataCell: is not supported. Use -setDataView:aView instead."];
 }
 
+/*!
+    @ignore
+*/
 - (CPView)dataCell
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"dataCell is not supported. Use -dataCell instead."];
+                reason:@"dataCell is not supported. Use -dataView instead."];
 }
 
+/*!
+    @ignore
+*/
 - (id)dataCellForRow:(int)row
 {
     [CPException raise:CPUnsupportedMethodException
                 reason:@"dataCellForRow: is not supported. Use -dataViewForRow:row instead."];
 }
 
-@end
+@end

AppKit/CPTableHeaderView.j

@@ -20,54 +20,80 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@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
 {
-    _CPImageAndTextView _textField;
+    _CPImageAndTextView     _textField;
+}
+
++ (CPString)defaultThemeClass
+{
+    return @"columnHeader";
+}
+
++ (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(),
+        };
 }
 
 - (void)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
+
     if (self)
-    {   
         [self _init];
-    }
-    
+
     return self;
 }
 
 - (void)_init
 {
-    _textField = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(5, 1, CGRectGetWidth([self bounds]) - 10, CGRectGetHeight([self bounds]) - 1)];
-    [_textField setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
-    
+    _textField = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+
+    [_textField setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
     [_textField setLineBreakMode:CPLineBreakByTruncatingTail];
-    [_textField setTextColor: [CPColor colorWithHexString: @"333333"]];
-    [_textField setFont:[CPFont boldSystemFontOfSize:12.0]];
     [_textField setAlignment:CPLeftTextAlignment];
     [_textField setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_textField setTextShadowColor:[CPColor whiteColor]];
-    [_textField setTextShadowOffset:CGSizeMake(0,1)];
 
     [self addSubview:_textField];
 }
 
 - (void)layoutSubviews
 {
-    var themeState = [self themeState];
+    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color"]];
 
-    if(themeState & CPThemeStateSelected && themeState & CPThemeStateHighlighted)
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted-pressed.png", CGSizeMake(1.0, 22.0))]];
-    else if (themeState & CPThemeStateSelected)
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-highlighted.png", CGSizeMake(1.0, 22.0))]];
-    else if (themeState & CPThemeStateHighlighted)
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview-pressed.png", CGSizeMake(1.0, 22.0))]];
-    else 
-        [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
+    var inset = [self currentValueForThemeAttribute:@"text-inset"],
+        bounds = [self bounds];
+
+    [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
+    [_textField setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
+    [_textField setFont:[self currentValueForThemeAttribute:@"font"]];
+    [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
+    [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
+    [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
+    [_textField setLineBreakMode:[self currentValueForThemeAttribute:@"line-break-mode"]];
 }
 
 - (void)setStringValue:(CPString)string
@@ -92,31 +118,75 @@
 
 - (void)setFont:(CPFont)aFont
 {
-    [_textField setFont:aFont];
+    [self setValue:aFont forThemeAttribute:@"font"];
 }
 
-- (void)setValue:(id)aValue forThemeAttribute:(id)aKey
+- (CPFont)font
 {
-    [_textField setValue:aValue forThemeAttribute:aKey];
+    return [self currentValueForThemeAttribute:@"font"]
+}
+
+- (void)setAlignment:(CPTextAlignment)alignment
+{
+    [self setValue:alignment forThemeAttribute:@"text-alignment"];
+}
+
+- (CPTextAlignment)alignment
+{
+    return [self currentValueForThemeAttribute:@"text-alignment"]
+}
+
+- (void)setLineBreakMode:(CPLineBreakMode)mode
+{
+    [self setValue:mode forThemeAttribute:@"line-break-mode"];
+}
+
+- (CPLineBreakMode)lineBreakMode
+{
+    return [self currentValueForThemeAttribute:@"line-break-mode"]
+}
+
+- (void)setTextColor:(CPColor)aColor
+{
+    [self setValue:aColor forThemeAttribute:@"text-color"];
+}
+
+- (CPColor)textColor
+{
+    return [self currentValueForThemeAttribute:@"text-color"]
+}
+
+- (void)setTextShadowColor:(CPColor)aColor
+{
+    [self setValue:aColor forThemeAttribute:@"text-shadow-color"];
+}
+
+- (CPColor)textShadowColor
+{
+    return [self currentValueForThemeAttribute:@"text-shadow-color"]
 }
 
 - (void)_setIndicatorImage:(CPImage)anImage
 {
-	if (anImage)
-	{
-		[_textField setImage:anImage];
-		[_textField setImagePosition:CPImageRight];
-	}
-	else
-	{
-		[_textField setImagePosition:CPNoImage];
-	}
+    if (anImage)
+    {
+        [_textField setImage:anImage];
+        [_textField setImagePosition:CPImageRight];
+    }
+    else
+    {
+        [_textField setImagePosition:CPNoImage];
+    }
 }
 
 @end
 
 var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
     _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
+    _CPTableColumnHeaderViewTextColorKey = @"_CPTableColumnHeaderViewTextColorKey",
+    _CPTableColumnHeaderViewTextShadowColorKey = @"_CPTableColumnHeaderViewTextShadowColorKey",
+    _CPTableColumnHeaderViewAlignmentKey = @"_CPTableColumnHeaderViewAlignmentKey",
+    _CPTableColumnHeaderViewLineBreakModeKey = @"_CPTableColumnHeaderViewLineBreakModeKey",
     _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
 
 @implementation _CPTableColumnHeaderView (CPCoding)
@@ -129,6 +199,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
         [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
         [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
+        [self setTextColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextColorKey]];
+        [self setTextShadowColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextShadowColorKey]];
+        [self setAlignment:[aCoder decodeIntForKey:_CPTableColumnHeaderViewAlignmentKey]];
+        [self setLineBreakMode:[aCoder decodeIntForKey:_CPTableColumnHeaderViewLineBreakModeKey]];
     }
 
     return self;
@@ -137,37 +211,63 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-    
+
     [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
     [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
-    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
+    [aCoder encodeObject:[self font] forKey:_CPTableColumnHeaderViewFontKey];
+    [aCoder encodeObject:[self textColor] forKey:_CPTableColumnHeaderViewTextColorKey];
+    [aCoder encodeObject:[self textShadowColor] forKey:_CPTableColumnHeaderViewTextShadowColorKey];
+    [aCoder encodeInt:[self alignment] forKey:_CPTableColumnHeaderViewAlignmentKey];
+    [aCoder encodeInt:[self lineBreakMode] forKey:_CPTableColumnHeaderViewLineBreakModeKey];
 }
 
 @end
 
 @implementation CPTableHeaderView : CPView
 {
-    int _resizedColumn @accessors(readonly, property=resizedColumn);
-    int _draggedColumn @accessors(readonly, property=draggedColumn);
-    int _pressedColumn @accessors(readonly, property=pressedColumn);
-    
-    float _draggedDistance @accessors(readonly, property=draggedDistance);
-    float _lastLocation;
-    float _columnOldWidth;
-    
-    CPTableView _tableView @accessors(property=tableView);
+    CGPoint                 _mouseDownLocation;
+    CGPoint                 _previousTrackingLocation;
+    int                     _activeColumn;
+    int                     _pressedColumn;
+
+    BOOL                    _isResizing;
+    BOOL                    _isDragging;
+    BOOL                    _isTrackingColumn;
+    BOOL                    _drawsColumnLines;
+
+    float                   _columnOldWidth;
+
+    CPTableView             _tableView @accessors(property=tableView);
+}
+
++ (CPString)defaultThemeClass
+{
+    return @"tableHeaderRow";
+}
+
++ (id)themeAttributes
+{
+    return @{
+            @"background-color": [CPNull null],
+            @"divider-color": [CPColor grayColor],
+        };
 }
 
 - (void)_init
 {
-    _resizedColumn = -1;
-    _draggedColumn = -1;
+    _mouseDownLocation = _CGPointMakeZero();
+    _previousTrackingLocation = _CGPointMakeZero();
+    _activeColumn = -1;
     _pressedColumn = -1;
-    _draggedDistance = 0.0;
-    _lastLocation = nil;
-    _columnOldWidth = nil;
 
-    [self setBackgroundColor:[CPColor colorWithPatternImage:CPAppKitImage("tableview-headerview.png", CGSizeMake(1.0, 22.0))]];
+    _isResizing = NO;
+    _isDragging = NO;
+    _isTrackingColumn = NO;
+    _drawsColumnLines = YES;
+
+    _columnOldWidth = 0.0;
+
+    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -182,39 +282,41 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 - (int)columnAtPoint:(CGPoint)aPoint
 {
-    return [_tableView columnAtPoint:CGPointMake(aPoint.x, 0)];
+    return [_tableView columnAtPoint:CGPointMake(aPoint.x, aPoint.y)];
 }
 
 - (CGRect)headerRectOfColumn:(int)aColumnIndex
 {
-    var tableColumns = [_tableView tableColumns];
+    var headerRect = CGRectMakeCopy([self bounds]),
+        columnRect = [_tableView rectOfColumn:aColumnIndex];
 
-    if (aColumnIndex < 0 || aColumnIndex > [tableColumns count])
-        [CPException raise:"invalid" reason:"tried to get headerRectOfColumn: on invalid column"];
+    headerRect.origin.x = _CGRectGetMinX(columnRect);
+    headerRect.size.width = _CGRectGetWidth(columnRect);
 
-    // UPDATE COLUMN RANGES ?
-        
-    var tableRange = _tableView._tableColumnRanges[aColumnIndex],
-        bounds = [self bounds];
+    return headerRect;
+}
 
-    var rMinX = ROUND(tableRange.location);
-    bounds.origin.x = rMinX;
-    bounds.size.width = FLOOR(tableRange.length + tableRange.location - rMinX);
-    
-    return bounds;
+- (void)setDrawsColumnLines:(BOOL)aFlag
+{
+    _drawsColumnLines = aFlag;
+}
+
+- (BOOL)drawsColumnLines
+{
+    return _drawsColumnLines;
 }
 
 - (CGRect)_cursorRectForColumn:(int)column
 {
     if (column == -1 || !([_tableView._tableColumns[column] resizingMask] & CPTableColumnUserResizingMask))
-        return CGRectMakeZero();
+        return _CGRectMakeZero();
 
     var rect = [self headerRectOfColumn:column];
 
-    rect.origin.x = CGRectGetMaxX(rect) - 5;
+    rect.origin.x = _CGRectGetMaxX(rect) - 5;
     rect.size.width = 20;
 
-    return rect;    
+    return rect;
 }
 
 - (void)_setPressedColumn:(CPInteger)column
@@ -223,117 +325,298 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     {
         var headerView = [_tableView._tableColumns[_pressedColumn] headerView];
         [headerView unsetThemeState:CPThemeStateHighlighted];
-    }    
-    
+    }
+
     if (column != -1)
     {
         var headerView = [_tableView._tableColumns[column] headerView];
         [headerView setThemeState:CPThemeStateHighlighted];
+
+        if (_tableView._editingColumn == column)
+            [[self window] makeFirstResponder:_tableView];
     }
-    
+
     _pressedColumn = column;
 }
 
 - (void)mouseDown:(CPEvent)theEvent
 {
-    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],
-        clickedColumn = [self columnAtPoint:mouseLocation];    
-    
-    // should we send column -1 ?
-    [_tableView _sendDelegateDidMouseDownInHeader:clickedColumn];
-    
-    var resizeLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
-        resizedColumn = [self columnAtPoint:resizeLocation];
-    
-    if (resizedColumn == -1)
-        return;
-
-    // 2 different tracking methods: one for resizing/stop-resizing, another one for selection/reordering
-    if ([_tableView allowsColumnResizing]
-        && CGRectContainsPoint([self _cursorRectForColumn:resizedColumn], mouseLocation))
-    {
-        _resizedColumn = resizedColumn;
-        [_tableView._tableColumns[_resizedColumn] setDisableResizingPosting:YES];
-        [_tableView setDisableAutomaticResizing:YES];
-        [self trackResizeWithEvent:theEvent];
-    }
-    else
-    {
-        [self _setPressedColumn:clickedColumn];
-        [self trackMouseWithEvent:theEvent];
-    }    
+    [self trackMouse:theEvent];
 }
 
-- (void)trackMouseWithEvent:(CPEvent)theEvent
+- (void)trackMouse:(CPEvent)theEvent
 {
-    var type = [theEvent type];
-    
-    if (type == CPLeftMouseUp)
-    {
-        var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
-            clickedColumn = [self columnAtPoint:location];
+    var type = [theEvent type],
+        currentLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil];
 
-        [self _setPressedColumn:-1];
-        
-        if (clickedColumn != -1)
-            [_tableView _didClickTableColumn:clickedColumn modifierFlags:[theEvent modifierFlags]];
-        
-        return;
-    }
+    // Take the right columns resize tracking area into account
+    currentLocation.x -= 5.0;
 
-    [CPApp setTarget:self selector:@selector(trackMouseWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPLeftMouseDownMask untilDate:nil inMode:nil dequeue:YES];
-}
-
-- (void)trackResizeWithEvent:(CPEvent)anEvent
-{
-    var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        tableColumn = [[_tableView tableColumns] objectAtIndex:_resizedColumn],
-        type = [anEvent type];
-
-    if (_lastLocation == nil)
-        _lastLocation = location;
-
-    if (_columnOldWidth == nil)
-        _columnOldWidth = [tableColumn width];
+    var columnIndex = [self columnAtPoint:currentLocation],
+        shouldResize = [self shouldResizeTableColumn:columnIndex at:_CGPointMake(currentLocation.x + 5.0, currentLocation.y)];
 
     if (type === CPLeftMouseUp)
-    {   
-        [self _updateResizeCursor:anEvent];
-                
-        [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
-        [tableColumn setDisableResizingPosting:NO];        
-        [_tableView setDisableAutomaticResizing:NO];
-
-        _resizedColumn = -1;
-        _lastLocation = nil;
-        _columnOldWidth = nil;
-
-        return;
-    }            
-    else if (type === CPLeftMouseDragged)
     {
-        var newWidth = [tableColumn width] + location.x - _lastLocation.x;
-        
-        if (newWidth < [tableColumn minWidth])
-            [[CPCursor resizeRightCursor] set];
-        else if (newWidth > [tableColumn maxWidth])
-            [[CPCursor resizeLeftCursor] set];
+        if (shouldResize)
+            [self stopResizingTableColumn:_activeColumn at:currentLocation];
+        else if ([self _shouldStopTrackingTableColumn:columnIndex at:currentLocation])
+        {
+            [_tableView _didClickTableColumn:columnIndex modifierFlags:[theEvent modifierFlags]];
+            [self stopTrackingTableColumn:columnIndex at:currentLocation];
+
+            _isTrackingColumn = NO;
+        }
+
+        [self _updateResizeCursor:[CPApp currentEvent]];
+
+        _activeColumn = CPNotFound;
+        return;
+    }
+
+    if (type === CPLeftMouseDown)
+    {
+        if (columnIndex === -1)
+            return;
+
+        _mouseDownLocation = currentLocation;
+        _activeColumn = columnIndex;
+
+        [_tableView _sendDelegateDidMouseDownInHeader:columnIndex];
+
+        if (shouldResize)
+            [self startResizingTableColumn:columnIndex at:currentLocation];
         else
         {
-            _tableView._lastColumnShouldSnap = NO;
-            [tableColumn setWidth:newWidth];
-            // FIXME: there has to be a better way to do this...
-            // We should refactor the auto resizing crap.
-            // We need to figure out the exact cocoa behavior here though. 
-            _lastLocation = location;
+            [self startTrackingTableColumn:columnIndex at:currentLocation];
+            _isTrackingColumn = YES;
+        }
+    }
+    else if (type === CPLeftMouseDragged)
+    {
+        if (shouldResize)
+            [self continueResizingTableColumn:_activeColumn at:currentLocation];
+        else
+        {
+            if (_activeColumn === columnIndex && _CGRectContainsPoint([self headerRectOfColumn:columnIndex], currentLocation))
+            {
+                if (_isTrackingColumn && _pressedColumn !== -1)
+                {
+                    if (![self continueTrackingTableColumn:columnIndex at:currentLocation])
+                        return; // Stop tracking the column, because it's being dragged
+                } else
+                    [self startTrackingTableColumn:columnIndex at:currentLocation];
 
-            [[CPCursor resizeLeftRightCursor] set];
-            [self setNeedsLayout];
-            [self setNeedsDisplay:YES];
+            } else if (_isTrackingColumn && _pressedColumn !== -1)
+                [self stopTrackingTableColumn:_activeColumn at:currentLocation];
         }
     }
 
-    [CPApp setTarget:self selector:@selector(trackResizeWithEvent:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+    _previousTrackingLocation = currentLocation;
+    [CPApp setTarget:self selector:@selector(trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
+}
+
+- (void)startTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    [self _setPressedColumn:aColumnIndex];
+}
+
+- (BOOL)continueTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    if ([self _shouldDragTableColumn:aColumnIndex at:aPoint])
+    {
+        var columnRect = [self headerRectOfColumn:aColumnIndex],
+            offset = _CGPointMakeZero(),
+            view = [_tableView _dragViewForColumn:aColumnIndex event:[CPApp currentEvent] offset:offset],
+            viewLocation = _CGPointMakeZero();
+
+        viewLocation.x = ( _CGRectGetMinX(columnRect) + offset.x ) + ( aPoint.x - _mouseDownLocation.x );
+        viewLocation.y = _CGRectGetMinY(columnRect) + offset.y;
+
+        [self dragView:view at:viewLocation offset:_CGSizeMakeZero() event:[CPApp currentEvent]
+            pasteboard:[CPPasteboard pasteboardWithName:CPDragPboard] source:self slideBack:YES];
+
+        return NO;
+    }
+
+    return YES;
+}
+
+- (BOOL)_shouldStopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    return _isTrackingColumn && _activeColumn === aColumnIndex &&
+        _CGRectContainsPoint([self headerRectOfColumn:aColumnIndex], aPoint);
+}
+
+- (void)stopTrackingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    [self _setPressedColumn:CPNotFound];
+    [self _updateResizeCursor:[CPApp currentEvent]];
+}
+
+- (BOOL)_shouldDragTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    return [_tableView allowsColumnReordering] && ABS(aPoint.x - _mouseDownLocation.x) >= 10.0;
+}
+
+- (CGRect)_headerRectOfLastVisibleColumn
+{
+    var tableColumns = [_tableView tableColumns],
+        columnIndex = [tableColumns count];
+
+    while (columnIndex--)
+    {
+        var tableColumn = [tableColumns objectAtIndex:columnIndex];
+
+        if (![tableColumn isHidden])
+            return [self headerRectOfColumn:columnIndex];
+    }
+
+    return nil;
+}
+
+- (void)_constrainDragView:(CPView)theDragView at:(CGPoint)aPoint
+{
+    var tableColumns = [_tableView tableColumns],
+        lastColumnRect = [self _headerRectOfLastVisibleColumn],
+        activeColumnRect = [self headerRectOfColumn:_activeColumn],
+        dragWindow = [theDragView window],
+        frame = [dragWindow frame];
+
+    // Convert the frame origin from the global coordinate system to the windows' coordinate system
+    frame.origin = [[self window] convertGlobalToBase:frame.origin];
+    // the from the window to the view
+    frame.origin = [self convertPoint:frame.origin fromView:nil];
+
+    // This effectively clamps the value between the minimum and maximum
+    frame.origin.x = MAX(0.0, MIN(_CGRectGetMinX(frame), _CGRectGetMaxX(lastColumnRect) - _CGRectGetWidth(activeColumnRect)));
+
+    // Make sure the column cannot move vertically
+    frame.origin.y = _CGRectGetMinY(lastColumnRect);
+
+    // Convert the calculated origin back to the window coordinate system
+    frame.origin = [self convertPoint:frame.origin toView:nil];
+    // Then back to the global coordinate system
+    frame.origin = [[self window] convertBaseToGlobal:frame.origin];
+
+    [dragWindow setFrame:frame];
+}
+
+- (void)_moveColumn:(int)aFromIndex toColumn:(int)aToIndex
+{
+    [_tableView moveColumn:aFromIndex toColumn:aToIndex];
+    _activeColumn = aToIndex;
+    _pressedColumn = _activeColumn;
+}
+
+- (void)draggedView:(CPView)aView beganAt:(CGPoint)aPoint
+{
+    _isDragging = YES;
+
+    var column = [[_tableView tableColumns] objectAtIndex:_activeColumn];
+
+    [[column headerView] setHidden:YES];
+    [_tableView _setDraggedColumn:column];
+
+    [self setNeedsDisplay:YES];
+}
+
+- (void)draggedView:(CPView)aView movedTo:(CGPoint)aPoint
+{
+    [self _constrainDragView:aView at:aPoint];
+
+    var dragWindow = [aView window],
+        dragWindowFrame = [dragWindow frame];
+
+    var hoverPoint = CGPointCreateCopy(aPoint);
+
+    if (aPoint.x < _previousTrackingLocation.x)
+        hoverPoint = _CGPointMake(_CGRectGetMinX(dragWindowFrame), _CGRectGetMinY(dragWindowFrame));
+    else if (aPoint.x > _previousTrackingLocation.x)
+        hoverPoint = _CGPointMake(_CGRectGetMaxX(dragWindowFrame), _CGRectGetMinY(dragWindowFrame));
+
+    // Convert the hover point from the global coordinate system to windows' coordinate system
+    hoverPoint = [[self window] convertGlobalToBase:hoverPoint];
+    // then to the view
+    hoverPoint = [self convertPoint:hoverPoint fromView:nil];
+
+    var hoveredColumn = [self columnAtPoint:hoverPoint];
+
+    if (hoveredColumn !== -1)
+    {
+        var columnRect = [self headerRectOfColumn:hoveredColumn],
+            columnCenterPoint = [self convertPoint:CGPointMake(_CGRectGetMidX(columnRect), _CGRectGetMidY(columnRect)) fromView:self];
+        if (hoveredColumn < _activeColumn && hoverPoint.x < columnCenterPoint.x)
+            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
+        else if (hoveredColumn > _activeColumn && hoverPoint.x > columnCenterPoint.x)
+            [self _moveColumn:_activeColumn toColumn:hoveredColumn];
+    }
+
+    _previousTrackingLocation = aPoint;
+}
+
+- (void)draggedView:(CPImage)aView endedAt:(CGPoint)aLocation operation:(CPDragOperation)anOperation
+{
+    _isDragging = NO;
+    _isTrackingColumn = NO; // We need to do this explicitly because the mouse up section of trackMouse is never reached
+
+    [_tableView _setDraggedColumn:nil];
+    [[[[_tableView tableColumns] objectAtIndex:_activeColumn] headerView] setHidden:NO];
+    [self stopTrackingTableColumn:_activeColumn at:aLocation];
+
+    [self setNeedsDisplay:YES];
+
+    [_tableView _enqueueDraggingViews];
+}
+
+- (BOOL)shouldResizeTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    if (_isResizing)
+        return YES;
+
+    if (_isTrackingColumn)
+        return NO;
+
+    return [_tableView allowsColumnResizing] && _CGRectContainsPoint([self _cursorRectForColumn:aColumnIndex], aPoint);
+}
+
+- (void)startResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    _isResizing = YES;
+
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
+
+    [tableColumn setDisableResizingPosting:YES];
+    [_tableView setDisableAutomaticResizing:YES];
+}
+
+- (void)continueResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
+        newWidth = [tableColumn width] + aPoint.x - _previousTrackingLocation.x;
+
+    if (newWidth < [tableColumn minWidth])
+        [[CPCursor resizeRightCursor] set];
+    else if (newWidth > [tableColumn maxWidth])
+        [[CPCursor resizeLeftCursor] set];
+    else
+    {
+        _tableView._lastColumnShouldSnap = NO;
+        [tableColumn setWidth:newWidth];
+
+        [[CPCursor resizeLeftRightCursor] set];
+        [self setNeedsLayout];
+        [self setNeedsDisplay:YES];
+    }
+}
+
+- (void)stopResizingTableColumn:(int)aColumnIndex at:(CGPoint)aPoint
+{
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex];
+    [tableColumn _postDidResizeNotificationWithOldWidth:_columnOldWidth];
+    [tableColumn setDisableResizingPosting:NO];
+    [_tableView setDisableAutomaticResizing:NO];
+
+    _isResizing = NO;
 }
 
 - (void)_updateResizeCursor:(CPEvent)theEvent
@@ -345,15 +628,15 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         return;
     }
 
-    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],    
+    var mouseLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil],
         mouseOverLocation = CGPointMake(mouseLocation.x - 5, mouseLocation.y),
         overColumn = [self columnAtPoint:mouseOverLocation];
-    
-    if (overColumn >= 0 && CGRectContainsPoint([self _cursorRectForColumn:overColumn], mouseLocation))
+
+    if (overColumn >= 0 && _CGRectContainsPoint([self _cursorRectForColumn:overColumn], mouseLocation))
     {
         var tableColumn = [[_tableView tableColumns] objectAtIndex:overColumn],
             width = [tableColumn width];
-            
+
         if (width == [tableColumn minWidth])
             [[CPCursor resizeRightCursor] set];
         else if (width == [tableColumn maxWidth])
@@ -365,14 +648,8 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         [[CPCursor arrowCursor] set];
 }
 
-- (void)viewDidMoveToWindow
-{
-    //if ([_tableView allowsColumnResizing])
-    //    [[self window] setAcceptsMouseMovedEvents:YES];
-}
-
 - (void)mouseEntered:(CPEvent)theEvent
-{   
+{
     [self _updateResizeCursor:theEvent];
 }
 
@@ -390,31 +667,33 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 - (void)layoutSubviews
 {
     var tableColumns = [_tableView tableColumns],
-        count = [tableColumns count];    
-    
-    for (var i = 0; i < count; i++) 
+        count = [tableColumns count];
+
+    for (var i = 0; i < count; i++)
     {
         var column = [tableColumns objectAtIndex:i],
-            headerView = [column headerView];
-        
-        var frame = [self headerRectOfColumn:i];
+            headerView = [column headerView],
+            frame = [self headerRectOfColumn:i];
+
+        // Make space for the gridline on the right.
+        frame.origin.x -= 0.5;
+        frame.size.width -= 1.0;
         frame.size.height -= 0.5;
-        if (i > 0) 
-        {
-            frame.origin.x += 0.5;
-            frame.size.width -= 1;
-        }
-        
+        // Note: we're not adding in intercell spacing here. This setting only affects the regular
+        // table cell data views, not the header. Verified in Cocoa on March 29th, 2011.
+
         [headerView setFrame:frame];
-        
-        if([headerView superview] != self)
+
+        if ([headerView superview] != self)
             [self addSubview:headerView];
     }
+
+    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color"]];
 }
 
 - (void)drawRect:(CGRect)aRect
 {
-    if (!_tableView)
+    if (!_tableView || ![self drawsColumnLines])
         return;
 
     var context = [[CPGraphicsContext currentContext] graphicsPort],
@@ -426,55 +705,42 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1);
 
     CGContextSetLineWidth(context, 1);
-    CGContextSetStrokeColor(context, [_tableView gridColor]);
+    CGContextSetStrokeColor(context, [self currentValueForThemeAttribute:@"divider-color"]);
 
     [exposedColumnIndexes getIndexes:columnsArray maxCount:-1 inIndexRange:exposedRange];
 
     var columnArrayIndex = 0,
         columnArrayCount = columnsArray.length,
         columnMaxX;
-        
+
     CGContextBeginPath(context);
-    for(; columnArrayIndex < columnArrayCount; columnArrayIndex++)
+
+    for (; columnArrayIndex < columnArrayCount; columnArrayIndex++)
     {
         // grab each column rect and add vertical lines
         var columnIndex = columnsArray[columnArrayIndex],
             columnToStroke = [self headerRectOfColumn:columnIndex];
-            
-        columnMaxX = CGRectGetMaxX(columnToStroke);
-        
-        CGContextMoveToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(CGRectGetMaxY(columnToStroke)));
+
+        columnMaxX = _CGRectGetMaxX(columnToStroke);
+
+        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
+        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
     }
-    
+
     CGContextClosePath(context);
     CGContextStrokePath(context);
-        
-/*
-    var maxY = CGRectGetMaxY([self bounds]);
-    // draw normal gradient for remaining space
-    if (supportsCanvasGradient)
+
+    /*if (_isDragging)
     {
-        aRect.origin.x = columnMaxX - 0.5;
-        aRect.size.width -= columnMaxX;
-        CGContextBeginPath(context);
-        CGContextAddRect(context, CGRectMake(columnMaxX + 1, 0, CGRectGetMaxX([self bounds]) - columnMaxX, CGRectGetHeight([self bounds])));
-        CGContextClosePath(context);    
-        CGContextDrawLinearGradient(context, [_CPTableColumnHeaderView headerGradient], CGPointMake(0,0), CGPointMake(0, maxY - 1),0);
-    }   
-   
-    // Draw bottom line
-    CGContextBeginPath(context);    
-    CGContextMoveToPoint(context, 0, maxY - 0.5);
-    CGContextAddLineToPoint(context, CGRectGetMaxX([self bounds]), maxY - 0.5);
-    CGContextClosePath(context);
-    CGContextStrokePath(context);
-*/   
+        CGContextSetFillColor(context, [CPColor grayColor]);
+        CGContextFillRect(context, [self headerRectOfColumn:_activeColumn])
+    }*/
 }
 
 @end
 
-var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
+var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey",
+    CPTableHeaderViewDrawsColumnLines = @"CPTableHeaderViewDrawsColumnLines";
 
 @implementation CPTableHeaderView (CPCoding)
 
@@ -484,6 +750,15 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
     {
         [self _init];
         _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey];
+
+        // FIX ME: Take this out before 1.0
+        if ([aCoder containsValueForKey:CPTableHeaderViewDrawsColumnLines])
+            _drawsColumnLines = [aCoder decodeBoolForKey:CPTableHeaderViewDrawsColumnLines];
+        else
+        {
+            _drawsColumnLines = YES;
+            CPLog.warn("The tableview header being decoded is using an old cib. Please run Nib2Cib.");
+        }
     }
 
     return self;
@@ -493,7 +768,7 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey";
 {
     [super encodeWithCoder:aCoder];
     [aCoder encodeObject:_tableView forKey:CPTableHeaderViewTableViewKey];
+    [aCoder encodeBool:_drawsColumnLines forKey:CPTableHeaderViewDrawsColumnLines];
 }
 
 @end
-

AppKit/CPText.j

@@ -0,0 +1,30 @@
+/*
+ * CPText.j
+ * AppKit
+ *
+ * Created by Alexander Ljungberg.
+ * Copyright 2010, WireLoad, 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
+ */
+
+CPEnterCharacter                = "\u0003";
+CPBackspaceCharacter            = "\u0008";
+CPTabCharacter                  = "\u0009";
+CPNewlineCharacter              = "\u000a";
+CPFormFeedCharacter             = "\u000c";
+CPCarriageReturnCharacter       = "\u000d";
+CPBackTabCharacter              = "\u0019";
+CPDeleteCharacter               = "\u007f";

AppKit/CPTheme.j

@@ -21,11 +21,15 @@
  */
 
 @import <Foundation/CPObject.j>
+@import <Foundation/CPMutableArray.j>
 @import <Foundation/CPString.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-var CPThemesByName      = { },
-    CPThemeDefaultTheme = nil;
+@class CPView
+
+var CPThemesByName          = { },
+    CPThemeDefaultTheme     = nil,
+    CPThemeDefaultHudTheme  = nil;
 
 
 /*!
@@ -48,6 +52,27 @@ var CPThemesByName      = { },
     return CPThemeDefaultTheme;
 }
 
+/*!
+    Set the default HUD theme. If set to nil, the default described in defaultHudTheme
+    will be used.
+*/
++ (void)setDefaultHudTheme:(CPTheme)aTheme
+{
+    CPThemeDefaultHudTheme = aTheme;
+}
+
+/*!
+    The default HUD theme is (sometimes) used for windows with the CPHUDBackgroundWindowMask
+    style mask. The default is theme with the name of the default theme with -HUD appended
+    at the end.
+*/
++ (CPTheme)defaultHudTheme
+{
+    if (!CPThemeDefaultHudTheme)
+        CPThemeDefaultHudTheme = [CPTheme themeNamed:[[self defaultTheme] name] + "-HUD"];
+    return CPThemeDefaultHudTheme;
+}
+
 + (CPTheme)themeNamed:(CPString)aName
 {
     return CPThemesByName[aName];
@@ -60,7 +85,7 @@ var CPThemesByName      = { },
     if (self)
     {
         _name = aName;
-        _attributes = [CPDictionary dictionary];
+        _attributes = @{};
 
         CPThemesByName[_name] = self;
     }
@@ -73,9 +98,110 @@ var CPThemesByName      = { },
     return _name;
 }
 
-- (_CPThemeAttribute)_attributeWithName:(CPString)aName forClass:(CPString)aClass
+/*!
+    Returns an array of names of themed classes defined in this theme, as found in its
+    ThemeDescriptors.j file.
+
+    NOTE: The names are not class names (such as "CPButton"), but the names returned
+    by the class' +defaultThemeClass method. For example, the name for CPCheckBox is "check-box",
+    as defined in CPCheckBox::themeClass.
+*/
+- (CPArray)classNames
 {
-    var attributes = [_attributes objectForKey:aClass];
+    return [_attributes allKeys];
+}
+
+/*!
+    Returns a dictionary of all theme attributes defined for the given class, as found in the
+    theme's ThemeDescriptors.j file. The keys of the dictionary are attribute names, and the values
+    are instances of _CPThemeAttribute.
+
+    For a description of valid values for \c aClass, see \ref attributeNamesForClass:.
+
+    @param aClass The themed class whose attributes you want to retrieve
+    @return       A dictionary of attributes or nil
+*/
+- (CPDictionary)attributesForClass:(id)aClass
+{
+    if (!aClass)
+        return nil;
+
+    var className = nil;
+
+    if ([aClass isKindOfClass:[CPString class]])
+    {
+        // See if it is a class name
+        var theClass = CPClassFromString(aClass);
+
+        if (theClass)
+            aClass = theClass;
+        else
+            className = aClass;
+    }
+
+    if (!className)
+    {
+        if ([aClass isKindOfClass:[CPView class]])
+        {
+            if ([aClass respondsToSelector:@selector(defaultThemeClass)])
+                className = [aClass defaultThemeClass];
+            else if ([aClass respondsToSelector:@selector(themeClass)])
+            {
+                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
+                className = [aClass themeClass];
+            }
+            else
+                return nil;
+        }
+        else
+            [CPException raise:CPInvalidArgumentException reason:@"aClass must be a class object or a string."];
+    }
+
+    return [_attributes objectForKey:className];
+}
+
+/*!
+    Returns an array of names of all theme attributes defined for the given class, as found in the
+    theme's ThemeDescriptors.j file.
+
+    The \c aClass parameter can be one of the following:
+
+    - A class instance, for example the result of [CPCheckBox class]. The class must be a subclass
+      of CPView.
+    - A class name, for example "CPCheckBox".
+    - A themed class name, for example "check-box".
+
+    If \c aClass does not refer to a themed class in this theme, nil is returned.
+
+    @param aClass The themed class whose attributes you want to retrieve
+    @return       An array of attribute names or nil
+*/
+- (CPDictionary)attributeNamesForClass:(id)aClass
+{
+    var attributes = [self attributesForClass:aClass];
+
+    if (attributes)
+        return [attributes allKeys];
+    else
+        return [CPArray array];
+}
+
+/*!
+    Returns a theme attribute defined for the given class, as found in the
+    theme's ThemeDescriptors.j file.
+
+    \c aName should be the attribute name as you would pass to the method
+    CPView::valueForThemeAttribute:.
+
+    For a description of valid values for \c aClass, see \ref attributeNamesForClass:.
+
+    @param aName  The name of the attribute you want to retrieve
+    @param aClass The themed class in which to look for the attribute
+    @return       An instance of _CPThemeAttribute or nil
+*/
+- (_CPThemeAttribute)attributeWithName:(CPString)aName forClass:(id)aClass
+{
+    var attributes = [self attributesForClass:aClass];
 
     if (!attributes)
         return nil;
@@ -83,14 +209,55 @@ var CPThemesByName      = { },
     return [attributes objectForKey:aName];
 }
 
+/*!
+    Returns the value for a theme attribute in its normal state, as defined for the given class
+    in the theme's ThemeDescriptors.j file.
+
+    \c aName should be the attribute name as you would pass to the method
+    CPView::valueForThemeAttribute:.
+
+    For a description of valid values for \c aClass, see \ref attributeNamesForClass:.
+
+    @param aName  The name of the attribute whose value you want to retrieve
+    @param aClass The themed class in which to look for the attribute
+    @return       A value or nil
+*/
+- (id)valueForAttributeWithName:(CPString)aName forClass:(id)aClass
+{
+    return [self valueForAttributeWithName:aName inState:CPThemeStateNormal forClass:aClass];
+}
+
+/*!
+    Returns the value for a theme attribute in a given state, as defined for the given class
+    in the theme's ThemeDescriptors.j file. This is the equivalent of the method
+    CPView::valueForThemeAttribute:inState:, but retrieves the value from the theme definition as
+    opposed to a single view's current theme state.
+
+    For a description of valid values for \c aClass, see \ref attributeNamesForClass:.
+
+    @param aName  The name of the attribute whose value you want to retrieve
+    @param aState The state qualifier for the attribute
+    @param aClass The themed class in which to look for the attribute
+    @return       A value or nil
+*/
+- (id)valueForAttributeWithName:(CPString)aName inState:(CPThemeState)aState forClass:(id)aClass
+{
+    var attribute = [self attributeWithName:aName forClass:aClass];
+
+    if (!attribute)
+        return nil;
+
+    return [attribute valueForState:aState];
+}
+
 - (void)takeThemeFromObject:(id)anObject
 {
     var attributes = [anObject _themeAttributeDictionary],
         attributeName = nil,
         attributeNames = [attributes keyEnumerator],
-        objectThemeClass = [[anObject class] themeClass];
+        objectThemeClass = [anObject themeClass];
 
-    while (attributeName = [attributeNames nextObject])
+    while ((attributeName = [attributeNames nextObject]) !== nil)
         [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
 }
 
@@ -103,7 +270,7 @@ var CPThemesByName      = { },
 
     if (!attributes)
     {
-        attributes = [CPDictionary dictionary];
+        attributes = @{};
 
         [_attributes setObject:attributes forKey:aClass];
     }
@@ -240,8 +407,12 @@ function CPThemeStateName(aState)
 CPThemeStateNames[0]        = "normal";
 CPThemeStateNormal          = CPThemeStates["normal"] = 0;
 CPThemeStateDisabled        = CPThemeState("disabled");
+CPThemeStateHovered         = CPThemeState("hovered");
 CPThemeStateHighlighted     = CPThemeState("highlighted");
 CPThemeStateSelected        = CPThemeState("selected");
+CPThemeStateTableDataView   = CPThemeState("tableDataView");
+CPThemeStateSelectedDataView = CPThemeStateSelectedTableDataView = CPThemeState("selectedTableDataView");
+CPThemeStateGroupRow        = CPThemeState("CPThemeStateGroupRow");
 CPThemeStateBezeled         = CPThemeState("bezeled");
 CPThemeStateBordered        = CPThemeState("bordered");
 CPThemeStateEditable        = CPThemeState("editable");
@@ -249,15 +420,18 @@ CPThemeStateEditing         = CPThemeState("editing");
 CPThemeStateVertical        = CPThemeState("vertical");
 CPThemeStateDefault         = CPThemeState("default");
 CPThemeStateCircular        = CPThemeState("circular");
+CPThemeStateAutocompleting  = CPThemeState("autocompleting");
+CPThemeStateMainWindow      = CPThemeState("mainWindow");
+CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 
 @implementation _CPThemeAttribute : CPObject
 {
     CPString            _name;
     id                  _defaultValue;
-    CPDictionary        _values;
+    CPDictionary        _values @accessors(readonly, getter=values);
 
     JSObject            _cache;
-    CPThemeAttribute    _parentAttribute;
+    _CPThemeAttribute   _parentAttribute;
 }
 
 - (id)initWithName:(CPString)aName defaultValue:(id)aDefaultValue
@@ -269,7 +443,7 @@ CPThemeStateCircular        = CPThemeState("circular");
         _cache = { };
         _name = aName;
         _defaultValue = aDefaultValue;
-        _values = [CPDictionary dictionary];
+        _values = @{};
     }
 
     return self;
@@ -300,9 +474,9 @@ CPThemeStateCircular        = CPThemeState("circular");
     _cache = {};
 
     if (aValue === undefined || aValue === nil)
-        _values = [CPDictionary dictionary];
+        _values = @{};
     else
-        _values = [CPDictionary dictionaryWithObject:aValue forKey:String(CPThemeStateNormal)];
+        _values = @{ String(CPThemeStateNormal): aValue };
 }
 
 - (void)setValue:(id)aValue forState:(CPThemeState)aState
@@ -378,7 +552,7 @@ CPThemeStateCircular        = CPThemeState("circular");
     return value;
 }
 
-- (void)setParentAttribute:(CPThemeAttribute)anAttribute
+- (void)setParentAttribute:(_CPThemeAttribute)anAttribute
 {
     if (_parentAttribute === anAttribute)
         return;
@@ -387,7 +561,7 @@ CPThemeStateCircular        = CPThemeState("circular");
     _parentAttribute = anAttribute;
 }
 
-- (CPThemeAttribute)attributeMergedWithAttribute:(_CPThemeAttribute)anAttribute
+- (_CPThemeAttribute)attributeMergedWithAttribute:(_CPThemeAttribute)anAttribute
 {
     var mergedAttribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue];
 
@@ -410,7 +584,8 @@ CPThemeStateCircular        = CPThemeState("circular");
         _cache = {};
 
         _name = [aCoder decodeObjectForKey:@"name"];
-        _values = [CPDictionary dictionary];
+        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
+        _values = @{};
 
         if ([aCoder containsValueForKey:@"value"])
         {
@@ -442,6 +617,7 @@ CPThemeStateCircular        = CPThemeState("circular");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_name forKey:@"name"];
+    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];
 
     var keys = [_values allKeys],
         count = keys.length;
@@ -457,7 +633,7 @@ CPThemeStateCircular        = CPThemeState("circular");
     }
     else
     {
-        var encodedValues = [CPDictionary dictionary];
+        var encodedValues = @{};
 
         while (count--)
         {
@@ -472,15 +648,15 @@ CPThemeStateCircular        = CPThemeState("circular");
 
 @end
 
-var cachedNumberOfOnes = [  0 /*000000*/, 1 /*000001*/, 1 /*000010*/, 2 /*000011*/, 1 /*000100*/, 2 /*000101*/, 2 /*000110*/, 
-                            3 /*000111*/, 1 /*001000*/, 2 /*001001*/, 2 /*001010*/, 3 /*001011*/, 2 /*001100*/, 3 /*001101*/, 
-                            3 /*001110*/, 4 /*001111*/, 1 /*010000*/, 2 /*010001*/, 2 /*010010*/, 3 /*010011*/, 2 /*010100*/, 
-                            3 /*010101*/, 3 /*010110*/, 4 /*010111*/, 2 /*011000*/, 3 /*011001*/, 3 /*011010*/, 4 /*011011*/, 
-                            3 /*011100*/, 4 /*011101*/, 4 /*011110*/, 5 /*011111*/, 1 /*100000*/, 2 /*100001*/, 2 /*100010*/, 
-                            3 /*100011*/, 2 /*100100*/, 3 /*100101*/, 3 /*100110*/, 4 /*100111*/, 2 /*101000*/, 3 /*101001*/, 
-                            3 /*101010*/, 4 /*101011*/, 3 /*101100*/, 4 /*101101*/, 4 /*101110*/, 5 /*101111*/, 2 /*110000*/, 
-                            3 /*110001*/, 3 /*110010*/, 4 /*110011*/, 3 /*110100*/, 4 /*110101*/, 4 /*110110*/, 5 /*110111*/, 
-                            3 /*111000*/, 4 /*111001*/, 4 /*111010*/, 5 /*111011*/, 4 /*111100*/, 5 /*111101*/, 5 /*111110*/, 
+var cachedNumberOfOnes = [  0 /*000000*/, 1 /*000001*/, 1 /*000010*/, 2 /*000011*/, 1 /*000100*/, 2 /*000101*/, 2 /*000110*/,
+                            3 /*000111*/, 1 /*001000*/, 2 /*001001*/, 2 /*001010*/, 3 /*001011*/, 2 /*001100*/, 3 /*001101*/,
+                            3 /*001110*/, 4 /*001111*/, 1 /*010000*/, 2 /*010001*/, 2 /*010010*/, 3 /*010011*/, 2 /*010100*/,
+                            3 /*010101*/, 3 /*010110*/, 4 /*010111*/, 2 /*011000*/, 3 /*011001*/, 3 /*011010*/, 4 /*011011*/,
+                            3 /*011100*/, 4 /*011101*/, 4 /*011110*/, 5 /*011111*/, 1 /*100000*/, 2 /*100001*/, 2 /*100010*/,
+                            3 /*100011*/, 2 /*100100*/, 3 /*100101*/, 3 /*100110*/, 4 /*100111*/, 2 /*101000*/, 3 /*101001*/,
+                            3 /*101010*/, 4 /*101011*/, 3 /*101100*/, 4 /*101101*/, 4 /*101110*/, 5 /*101111*/, 2 /*110000*/,
+                            3 /*110001*/, 3 /*110010*/, 4 /*110011*/, 3 /*110100*/, 4 /*110101*/, 4 /*110110*/, 5 /*110111*/,
+                            3 /*111000*/, 4 /*111001*/, 4 /*111010*/, 5 /*111011*/, 4 /*111100*/, 5 /*111101*/, 5 /*111110*/,
                             6 /*111111*/ ];
 
 var numberOfOnes = function(aNumber)
@@ -497,7 +673,7 @@ var numberOfOnes = function(aNumber)
     cachedNumberOfOnes[slot] = count;
 
     return count;
-}
+};
 
 numberOfOnes.displayName = "numberOfOnes";
 
@@ -551,7 +727,7 @@ function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme,
     }
 
     if (aTheme && aClass)
-        [attribute setParentAttribute:[aTheme _attributeWithName:anAttributeName forClass:aClass]];
+        [attribute setParentAttribute:[aTheme attributeWithName:anAttributeName forClass:aClass]];
 
     return attribute;
 }
@@ -585,4 +761,4 @@ for (i = 0;i < Math.pow(2,6);++i)
 }
 print(str+']');
 
-*/
+*/

AppKit/CPThemeBlend.j

@@ -22,9 +22,10 @@
 
 @import <Foundation/CPObject.j>
 
-@import <AppKit/CPTheme.j>
-@import <AppKit/_CPCibCustomResource.j>
-@import <AppKit/_CPCibKeyedUnarchiver.j>
+@import "CPTheme.j"
+@import "_CPCibCustomResource.j"
+@import "_CPCibKeyedUnarchiver.j"
+
 
 /*!
     @ingroup appkit
@@ -32,38 +33,61 @@
 
 @implementation CPThemeBlend : CPObject
 {
-    CPBundle    _bundle;
-    CPArray     _themes @accessors(readonly, getter=themes);
+    CPBundle    _bundle @accessors(getter=bundle);
+    CPArray     _themes;
     id          _loadDelegate;
 }
 
 - (id)initWithContentsOfURL:(CPURL)aURL
 {
     self = [super init];
-    
+
     if (self)
     {
         _bundle = [[CPBundle alloc] initWithPath:aURL];
     }
-    
+
     return self;
 }
 
+/*!
+    Returns an array of names of the keyed theme archives that make up this blend.
+    Each item in the array will have the extension ".keyedtheme".
+*/
+- (CPArray)themes
+{
+    return _themes;
+}
+
+/*!
+    Returns an array of names of the themes that make up this blend.
+*/
+- (CPArray)themeNames
+{
+    var names = [];
+
+    for (var i = 0; i < _themes.length; ++i)
+        names.push(_themes[i].substring(0, _themes[i].indexOf(".keyedtheme")));
+
+    return names;
+}
+
 - (void)loadWithDelegate:(id)aDelegate
 {
     _loadDelegate = aDelegate;
-    
+
     [_bundle loadWithDelegate:self];
 }
 
 - (void)bundleDidFinishLoading:(CPBundle)aBundle
 {
-    var themes = [_bundle objectForInfoDictionaryKey:@"CPKeyedThemes"],
-        count = themes.length;
+    _themes = [_bundle objectForInfoDictionaryKey:@"CPKeyedThemes"];
+
+    var count = _themes.length;
 
     while (count--)
     {
-        var path = [aBundle pathForResource:themes[count]],
+        var path = [aBundle pathForResource:_themes[count]],
             unarchiver = [[_CPThemeKeyedUnarchiver alloc]
                             initForReadingWithData:[[CPURL URLWithString:path] staticResourceData]
                             bundle:_bundle];