Updating version strings to 0.7.1.

Reviewed by me.

.gitignore

@@ -2,10 +2,5 @@
 Frameworks
 Build
 Demos
-./Aristo
+Aristo
 WebSite
-.push-package
-*.xcodeproj/*.pbxuser
-*.xcodeproj/*.perspectivev3
-xcuserdata/
-!*.xcodeproj/project.pbxproj

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "External/narwhal"]
+	path = External/narwhal
+	url = git://github.com/tlrobinson/narwhal.git
+[submodule "External/jack"]
+	path = External/jack
+	url = git://github.com/tlrobinson/jack.git
+[submodule "External/browserjs"]
+	path = External/browserjs
+	url = git://github.com/tlrobinson/browserjs.git
+[submodule "External/ojunit"]
+	path = External/ojunit
+	url = git://github.com/280north/ojunit.git

AppKit/AppKit.j

@@ -24,30 +24,20 @@
 @import "CPAlert.j"
 @import "CPAnimation.j"
 @import "CPApplication.j"
-@import "CPArrayController.j"
-@import "CPAttributedString+Additions.j"
 @import "CPBezierPath.j"
-@import "CPBox.j"
-@import "CPBrowser.j"
 @import "CPButton.j"
 @import "CPButtonBar.j"
 @import "CPCheckBox.j"
 @import "CPCib.j"
-@import "CPCibBindingConnector.j"
-@import "CPCibConnector.j"
-@import "CPCibControlConnector.j"
 @import "CPCibLoading.j"
-@import "CPCibOutletConnector.j"
 @import "CPClipView.j"
 @import "CPCollectionView.j"
-@import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
 @import "CPColorWell.j"
 @import "CPCompatibility.j"
 @import "CPControl.j"
 @import "CPCookie.j"
-@import "CPCursor.j"
 @import "CPDocument.j"
 @import "CPDocumentController.j"
 @import "CPEvent.j"
@@ -56,49 +46,30 @@
 @import "CPFont.j"
 @import "CPFontManager.j"
 @import "CPGeometry.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 "CPPopUpButton.j"
-@import "CPPredicateEditor.j"
-@import "CPPredicateEditorRowTemplate.j"
 @import "CPProgressIndicator.j"
 @import "CPRadio.j"
 @import "CPResponder.j"
-@import "CPRuleEditor.j"
-@import "CPScroller.j"
 @import "CPScrollView.j"
-@import "CPSearchField.j"
+@import "CPScroller.j"
 @import "CPSecureTextField.j"
 @import "CPSegmentedControl.j"
 @import "CPShadow.j"
 @import "CPSlider.j"
-@import "CPSound.j"
 @import "CPSplitView.j"
-@import "CPStepper.j"
-@import "CPString+Additions.j"
+@import "CPTabView.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 "_CPToolTip.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"

AppKit/CPAccordionView.j

@@ -1,416 +0,0 @@
-/*
- * CPAccordionView.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/CPArray.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPKeyValueObserving.j>
-@import <Foundation/CPIndexSet.j>
-@import <Foundation/CPString.j>
-
-@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);
-    CPView      _view @accessors(property=view);
-    CPString    _label @accessors(property=label);
-}
-
-- (id)init
-{
-    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];
-
-    if (self)
-        [self setIdentifier:anIdentifier];
-
-    return self;
-}
-
-@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;
-    CPView          _itemHeaderPrototype;
-
-    CPMutableArray  _items;
-    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];
-
-    if (self)
-    {
-        _items = [];
-        _itemViews = [];
-        _expandedItemIndexes = [CPIndexSet indexSet];
-
-        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 100.0, 24.0)]];
-    }
-
-    return self;
-}
-
-- (void)setItemHeaderPrototype:(CPView)aView
-{
-    _itemHeaderPrototype = aView;
-}
-
-- (CPView)itemHeaderPrototype
-{
-    return _itemHeaderPrototype;
-}
-
-- (CPArray)items
-{
-    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];
-}
-
-- (void)insertItem:(CPAccordionViewItem)anItem atIndex:(CPInteger)anIndex
-{
-    // FIXME: SHIFT ITEMS RIGHT
-    [_expandedItemIndexes addIndex:anIndex];
-
-    var itemView = [[_CPAccordionItemView alloc] initWithAccordionView:self];
-
-    [itemView setIndex:anIndex];
-    [itemView setLabel:[anItem label]];
-    [itemView setContentView:[anItem view]];
-
-    [self addSubview:itemView];
-
-    [_items insertObject:anItem atIndex:anIndex];
-    [_itemViews insertObject:itemView atIndex:anIndex];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-
-    [self setNeedsLayout];
-}
-
-- (void)removeItem:(CPAccordionViewItem)anItem
-{
-    [self removeItemAtIndex:[_items indexOfObjectIdenticalTo:anItem]];
-}
-
-- (void)removeItemAtIndex:(CPInteger)anIndex
-{
-    // SHIFT ITEMS LEFT
-    [_expandedItemIndexes removeIndex:anIndex];
-
-    [_itemViews[anIndex] removeFromSuperview];
-
-    [_items removeObjectAtIndex:anIndex];
-    [_itemViews removeObjectAtIndex:anIndex];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-
-    [self setNeedsLayout];
-}
-
-- (void)removeAllItems
-{
-    var count = _items.length;
-
-    while (count--)
-        [self removeItemAtIndex:count];
-}
-
-- (void)expandItemAtIndex:(CPInteger)anIndex
-{
-    if (![_itemViews[anIndex] isCollapsed])
-        return;
-
-    [_expandedItemIndexes addIndex:anIndex];
-    [_itemViews[anIndex] setCollapsed:NO];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-}
-
-- (void)collapseItemAtIndex:(CPInteger)anIndex
-{
-    if ([_itemViews[anIndex] isCollapsed])
-        return;
-
-    [_expandedItemIndexes removeIndex:anIndex];
-    [_itemViews[anIndex] setCollapsed:YES];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-}
-
-- (void)toggleItemAtIndex:(CPInteger)anIndex
-{
-    var itemView = _itemViews[anIndex];
-
-    if ([itemView isCollapsed])
-        [self expandItemAtIndex:anIndex];
-
-    else
-        [self collapseItemAtIndex:anIndex];
-}
-
-- (CPIndexSet)expandedItemIndexes
-{
-    return _expandedItemIndexes;
-}
-
-- (CPIndexSet)collapsedItemIndexes
-{
-    var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
-
-    [indexSet removeIndexes:_expandedIndexes];
-
-    return indexSet;
-}
-
-- (void)setEnabled:(BOOL)isEnabled forItemAtIndex:(CPInteger)anIndex
-{
-    var itemView = _itemViews[anIndex];
-    if (!itemView)
-        return;
-
-    if (!isEnabled)
-        [self collapseItemAtIndex:anIndex];
-    else
-        [self expandItemAtIndex:anIndex];
-
-    [itemView setEnabled:isEnabled];
-}
-
-- (void)_invalidateItemsStartingAtIndex:(CPInteger)anIndex
-{
-    if (_dirtyItemIndex === CPNotFound)
-        _dirtyItemIndex = anIndex;
-
-    _dirtyItemIndex = MIN(_dirtyItemIndex, anIndex);
-
-    [self setNeedsLayout];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    var width = _CGRectGetWidth([self frame]);
-
-    [super setFrameSize:aSize];
-
-    if (width !== _CGRectGetWidth([self frame]))
-        [self _invalidateItemsStartingAtIndex:0];
-}
-
-- (void)layoutSubviews
-{
-    if (_items.length <= 0)
-        return [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), 0.0)];
-
-    if (_dirtyItemIndex === CPNotFound)
-        return;
-
-    _dirtyItemIndex = MIN(_dirtyItemIndex, _items.length - 1);
-
-    var index = _dirtyItemIndex,
-        count = _itemViews.length,
-        width = _CGRectGetWidth([self bounds]),
-        y = index > 0 ? CGRectGetMaxY([_itemViews[index - 1] frame]) : 0.0;
-
-    // Do this now (instead of after looping), so that if we are made dirty again in the middle we don't blow this value away.
-    _dirtyItemIndex = CPNotFound;
-
-    for (; index < count; ++index)
-    {
-        var itemView = _itemViews[index];
-
-        [itemView setFrameY:y width:width];
-
-        y = CGRectGetMaxY([itemView frame]);
-    }
-
-    [self setFrameSize:_CGSizeMake(_CGRectGetWidth([self frame]), y)];
-}
-
-@end
-
-@implementation _CPAccordionItemView : CPView
-{
-    CPAccordionView _accordionView;
-
-    BOOL            _isCollapsed @accessors(getter=isCollapsed, setter=setCollapsed:);
-    CPInteger       _index @accessors(property=index);
-    CPView          _headerView;
-    CPView          _contentView;
-}
-
-- (id)initWithAccordionView:(CPAccordionView)anAccordionView
-{
-    self = [super initWithFrame:_CGRectMakeZero()];
-
-    if (self)
-    {
-        _accordionView = anAccordionView;
-        _isCollapsed = NO;
-
-        var bounds = [self bounds];
-
-        _headerView = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:[_accordionView itemHeaderPrototype]]];
-
-        if ([_headerView respondsToSelector:@selector(setTarget:)] && [_headerView respondsToSelector:@selector(setAction:)])
-        {
-            [_headerView setTarget:self];
-            [_headerView setAction:@selector(toggle:)];
-        }
-
-        [self addSubview:_headerView];
-    }
-
-    return self;
-}
-
-- (void)toggle:(id)aSender
-{
-    [_accordionView toggleItemAtIndex:[self index]];
-}
-
-- (void)setLabel:(CPString)aLabel
-{
-    if ([_headerView respondsToSelector:@selector(setTitle:)])
-        [_headerView setTitle:aLabel];
-
-    else if ([_headerView respondsToSelector:@selector(setLabel:)])
-        [_headerView setLabel:aLabel];
-
-    else if ([_headerView respondsToSelector:@selector(setStringValue:)])
-        [_headerView setStringValue:aLabel];
-}
-
-- (void)setEnabled:(BOOL)isEnabled
-{
-    if ([_headerView respondsToSelector:@selector(setEnabled:)])
-        [_headerView setEnabled:isEnabled];
-}
-
-- (void)setContentView:(CPView)aView
-{
-    if (_contentView === aView)
-        return;
-
-    [_contentView removeObserver:self forKeyPath:@"frame"];
-
-    [_contentView removeFromSuperview];
-
-    _contentView = aView;
-
-    [_contentView addObserver:self forKeyPath:@"frame" options:CPKeyValueObservingOptionOld | CPKeyValueObservingOptionNew context:NULL];
-
-    [self addSubview:_contentView];
-
-    [_accordionView _invalidateItemsStartingAtIndex:[self index]];
-}
-
-- (void)setFrameY:(float)aY width:(float)aWidth
-{
-    var headerHeight = _CGRectGetHeight([_headerView frame]);
-
-    // Size to fit or something?
-    [_headerView setFrameSize:_CGSizeMake(aWidth, headerHeight)];
-    [_contentView setFrameOrigin:_CGPointMake(0.0, headerHeight)];
-
-    if ([self isCollapsed])
-        [self setFrame:_CGRectMake(0.0, aY, aWidth, headerHeight)];
-
-    else
-    {
-        var contentHeight = _CGRectGetHeight([_contentView frame]);
-
-        [_contentView setFrameSize:_CGSizeMake(aWidth, contentHeight)];
-        [self setFrame:_CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
-    }
-}
-
-- (void)resizeSubviewsWithOldSize:(CGSize)aSize
-{
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath
-                      ofObject:(id)anObject
-                        change:(CPDictionary)aChange
-                       context:(id)aContext
-{
-    if (aKeyPath === "frame" && !CGRectEqualToRect([aChange objectForKey:CPKeyValueChangeOldKey], [aChange objectForKey:CPKeyValueChangeNewKey]))
-        [_accordionView _invalidateItemsStartingAtIndex:[self index]];
-/*
-    else if (aKeyPath === "itemHeaderPrototype")
-    {
-
-    }
-*/
-}
-
-@end

AppKit/CPAlert.j

@@ -6,9 +6,7 @@
  * Copyright 2008, Jake MacMullin.
  *
  * 11/10/2008 Ross Boucher
- *     - Make it conform to style guidelines, general cleanup and enhancements
- * 11/10/2010 Antoine Mercadal
- *     - Enhancements, better compliance with Cocoa API
+ *     - Make it conform to style guidelines, general cleanup and ehancements
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -28,679 +26,283 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
-@import "CPApplication.j"
-@import "CPButton.j"
-@import "CPColor.j"
-@import "CPFont.j"
-@import "CPImage.j"
-@import "CPImageView.j"
-@import "CPPanel.j"
-@import "CPTextField.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>
 
 /*
     @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;
 
 /*!
     @ingroup appkit
-
+    
     CPAlert is an alert panel that can be displayed modally to present the
     user with a message and one or more options.
 
-    It can be used to display an information message \c CPInformationalAlertStyle,
-    a warning message \c CPWarningAlertStyle (the default), or a critical
-    alert \c CPCriticalAlertStyle. In each case the user can be presented with one
-    or more options by adding buttons using the \c -addButtonWithTitle: method.
+    It can be used to display an information message (<pre>CPInformationalAlertStyle</pre>),
+    a warning message (<pre>CPWarningAlertStyle</pre> - which is the default), or a critical
+    alert (<pre>CPCriticalAlertStyle</pre>). In each case the user can be presented with one
+    or more options by adding buttons using the <pre>addButtonWithTitle:</pre> method.
 
-    The panel is displayed modally by calling \c -runModal and once the user has
+    The panel is displayed modally by calling <pre>runModal</pre> and once the user has
     dismissed the panel, a message will be sent to the panel's delegate (if set), informing
     it which button was clicked (see delegate methods).
 
     @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 : CPView
+@implementation CPAlert : CPObject
 {
-    BOOL            _showHelp               @accessors(property=showsHelp);
-    BOOL            _showSuppressionButton  @accessors(property=showsSuppressionButton);
+    CPPanel         _alertPanel;
 
-    CPAlertStyle    _alertStyle             @accessors(property=alertStyle);
-    CPString        _title                  @accessors(property=title);
-    CPView          _accessoryView          @accessors(property=accessoryView);
-    CPImage         _icon                   @accessors(property=icon);
-
-    CPArray         _buttons                @accessors(property=buttons,readonly);
-    CPCheckBox      _suppressionButton      @accessors(property=suppressionButton,readonly);
-
-    id              _delegate               @accessors(property=delegate);
-    id              _modalDelegate;
-    SEL             _didEndSelector;
-
-    CPWindow        _window                 @accessors(property=window,readonly);
-    int             _defaultWindowStyle;
-
-    CPImageView     _alertImageView;
-    CPTextField     _informativeLabel;
     CPTextField     _messageLabel;
-    CPButton        _alertHelpButton;
+    CPImageView     _alertImageView;
 
-    BOOL            _needsLayout;
+    CPAlertStyle    _alertStyle;
+    CPString        _windowTitle;
+    int             _windowStyle;
+    int             _buttonCount;
+    CPArray         _buttons;
+
+    id              _delegate;
 }
 
-#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
++ (void)initialize
 {
-    var alert = [[CPAlert alloc] init];
+    if (self != CPAlert)
+        return;
 
-    [alert setMessageText:aMessage];
-    [alert addButtonWithTitle:defaultButtonTitle];
+    var bundle = [CPBundle bundleForClass:[self class]];   
 
-    if (alternateButtonTitle)
-        [alert addButtonWithTitle:alternateButtonTitle];
-
-    if (otherButtonTitle)
-        [alert addButtonWithTitle:otherButtonTitle];
-
-    if (informativeText)
-        [alert setInformativeText:informativeText];
-
-    return alert;
+    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)];
 }
 
 /*!
-    Return an CPAlert with type error
-
-    @param anErrorMessage the message of the alert
-    @return fully initialized CPAlert
-*/
-+ (CPAlert)alertWithError:(CPString)anErrorMessage
-{
-    var alert = [[CPAlert alloc] init];
-
-    [alert setMessageText:anErrorMessage];
-    [alert setAlertStyle:CPCriticalAlertStyle];
-
-    return alert;
-}
-
-/*!
-    Initializes a \c CPAlert panel with the default alert style \c CPWarningAlertStyle.
+    Initializes a <pre>CPAlert</pre> panel with the default alert style (<pre>CPWarningAlertStyle</pre>).
 */
 - (id)init
 {
     self = [super init];
-
+    
     if (self)
     {
-        _buttons            = [];
-        _alertStyle         = CPWarningAlertStyle;
-        _showHelp           = NO;
-        _needsLayout        = YES;
-        _defaultWindowStyle = CPTitledWindowMask;
-
-        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
-        _alertImageView     = [[CPImageView alloc] init];
-        _informativeLabel   = [[CPTextField alloc] init];
-        _suppressionButton  = [CPCheckBox checkBoxWithTitle:@"Do not show this message again"];
-
-        _alertHelpButton    = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
-        [_alertHelpButton setTarget:self];
-        [_alertHelpButton setAction:@selector(_showHelp:)];
+        _buttonCount = 0;
+        _buttons = [CPArray array];
+        _alertStyle = CPWarningAlertStyle;
+        
+        _messageLabel = [[CPTextField alloc] initWithFrame:CGRectMake(57.0, 10.0, 220.0, 80.0)];
+        [_messageLabel setFont:[CPFont systemFontOfSize:12.0]];
+        [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
+        [_messageLabel setAlignment:CPJustifiedTextAlignment];
+        
+        _alertImageView = [[CPImageView alloc] initWithFrame:CGRectMake(15.0, 12.0, 32.0, 32.0)];
+        
+        [self setWindowStyle:nil];
     }
-
+    
     return self;
 }
 
-#pragma mark Accessors
+/*!
+    Sets the window appearance.
+    @param styleMask - Either CPHUDBackgroundWindowMask or nil for standard.
+*/
+- (void)setWindowStyle:(int)styleMask
+{
+    _windowStyle = styleMask;
+    
+    _alertPanel = [[CPPanel alloc] initWithContentRect:CGRectMake(0.0, 0.0, 300.0, 130.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 setBezelStyle:(styleMask == CPHUDBackgroundWindowMask) ? CPHUDBezelStyle : CPRoundedBezelStyle];
+        
+        [[_alertPanel contentView] addSubview:button];
+    }
+    
+    [[_alertPanel contentView] addSubview:_messageLabel];
+    [[_alertPanel contentView] addSubview:_alertImageView];
+}
 
 /*!
-    set the theme to use
-
-    @param the theme to use
+    Sets the window's title. If this is not defined, a default title based on your warning level will be used.
+    @param aTitle the title to use in place of the default. Set to nil to use default.
 */
-- (void)setTheme:(CPTheme)aTheme
+- (void)setTitle:(CPString)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;
-    [super setTheme:aTheme];
+    _windowTitle = aTitle;
 }
 
-/*! @deprecated
+/*!
+    Gets the window's title.
 */
-- (void)setWindowStyle:(int)aStyle
+- (CPString)title
 {
-    CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
-    [self setTheme:(aStyle === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
+    return _windowTitle;
 }
 
-/*! @deprecated
+/*!
+    Gets the window's style.
 */
 - (int)windowStyle
 {
-    CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
-    return _defaultWindowStyle;
+    return _windowStyle;
 }
 
-
 /*!
-    set the text of the alert's message
-
-    @param aText CPString containing the text
+    Sets the receiver’s delegate.
+    @param delegate - Delegate for the alert. nil removes the delegate.
 */
-- (void)setMessageText:(CPString)aText
+- (void)setDelegate:(id)delegate
 {
-    [_messageLabel setStringValue:aText];
-    _needsLayout = YES;
+    _delegate = delegate;
 }
 
 /*!
-    return the content of the message text
-    @return CPString containing the message text
+    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.
 */
 - (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.
+    Buttons will be added starting from the right hand side of the <pre>CPAlert</pre> panel.
     The first button will have the index 0, the second button 1 and so on.
 
-    The first button will automatically be given a key equivalent of Return,
-    and any button titled "Cancel" will be given a key equivalent of Escape.
-
     You really shouldn't need more than 3 buttons.
-
-    @param title the title of the button
 */
-- (void)addButtonWithTitle:(CPString)aTitle
+- (void)addButtonWithTitle:(CPString)title
 {
-    var bounds = [[_window contentView] bounds],
-        count = [_buttons count],
-
-        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
-
-    [button setTitle:aTitle];
-    [button setTag:count];
+    var button = [[CPButton alloc] initWithFrame:CGRectMake(200.0 - (_buttonCount * 90.0), 98.0, 80.0, (_windowStyle == CPHUDBackgroundWindowMask) ? 20.0 : 24.0)];
+    
+    [button setTitle:title];
     [button setTarget:self];
-    [button setAction:@selector(_takeReturnCodeFrom:)];
+    [button setTag:_buttonCount];
+    [button setAction:@selector(_notifyDelegate:)];
+    
+    [button setBezelStyle:(_windowStyle == CPHUDBackgroundWindowMask) ? CPHUDBezelStyle : CPRoundRectBezelStyle];
+    [[_alertPanel contentView] addSubview:button];
+    
+    if (_buttonCount == 0)
+        [_alertPanel setDefaultButton:button];
 
-    [[_window contentView] addSubview:button];
-
-    if (count == 0)
-        [button setKeyEquivalent:CPCarriageReturnCharacter];
-    else if ([aTitle lowercaseString] === @"cancel")
-        [button setKeyEquivalent:CPEscapeFunctionKey];
-
-    [_buttons insertObject:button atIndex:0];
-}
-
-#pragma mark Layout
-
-/*!
-    @ignore
-*/
-- (void)_layoutMessageView
-{
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        sizeWithFontCorrection = 6.0,
-        messageLabelWidth,
-        messageLabelTextSize;
-
-    [_messageLabel setTextColor:[self currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[self currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[self currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[self currentValueForThemeAttribute:@"message-text-alignment"]];
-    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
-    messageLabelTextSize = [[_messageLabel stringValue] sizeWithFont:[_messageLabel font] inWidth:messageLabelWidth];
-
-    [_messageLabel setFrame:CGRectMake(inset.left, inset.top, messageLabelTextSize.width, messageLabelTextSize.height + sizeWithFontCorrection)];
+    _buttonCount++;
+    [_buttons addObject:button];
 }
 
 /*!
-    @ignore
-*/
-- (void)_layoutInformativeView
-{
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
-        sizeWithFontCorrection = 6.0,
-        informativeLabelWidth,
-        informativeLabelOriginY,
-        informativeLabelTextSize;
-
-    [_informativeLabel setTextColor:[self currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[self currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[self currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[self currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setAlignment:[self currentValueForThemeAttribute:@"informative-text-alignment"]];
-    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
-    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin,
-    informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];
-
-    [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];
-}
-
-/*!
-    @ignore
-*/
-- (void)_layoutAccessoryView
-{
-    if (!_accessoryView)
-        return;
-
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
-        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
-        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
-
-    [_accessoryView setFrameOrigin:CGPointMake(inset.left, accessoryViewOriginY)];
-    [[_window contentView] addSubview:_accessoryView];
-}
-
-/*!
-    @ignore
-*/
-- (void)_layoutSuppressionButton
-{
-    if (!_showSuppressionButton)
-        return;
-
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        suppressionViewXOffset = [self currentValueForThemeAttribute:@"suppression-button-x-offset"],
-        suppressionViewYOffset = [self currentValueForThemeAttribute:@"suppression-button-y-offset"],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
-        suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
-
-    [_suppressionButton setTextColor:[self currentValueForThemeAttribute:@"suppression-button-text-color"]];
-    [_suppressionButton setFont:[self currentValueForThemeAttribute:@"suppression-button-text-font"]];
-    [_suppressionButton setTextShadowColor:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
-    [_suppressionButton setTextShadowOffset:[self currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
-    [_suppressionButton sizeToFit];
-
-    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
-    [[_window contentView] addSubview:_suppressionButton];
-}
-
-/*!
-    @ignore
-*/
-- (CGSize)_layoutButtonsFromView:(CPView)lastView
-{
-    var inset = [self currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [self currentValueForThemeAttribute:@"size"],
-        buttonOffset = [self currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [self currentValueForThemeAttribute:@"help-image-left-offset"],
-        aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [self currentValueForThemeAttribute:@"default-elements-margin"],
-        panelSize = [[_window contentView] frame].size,
-        buttonsOriginY,
-        offsetX;
-
-    [aRepresentativeButton setTheme:[self theme]];
-    [aRepresentativeButton sizeToFit];
-
-    panelSize.height = CGRectGetMaxY([lastView frame]) + defaultElementsMargin + [aRepresentativeButton frameSize].height;
-    if (panelSize.height < minimumSize.height)
-        panelSize.height = minimumSize.height;
-
-    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
-    offsetX = panelSize.width - inset.right;
-
-    for (var i = [_buttons count] - 1; i >= 0 ; i--)
-    {
-        var button = _buttons[i];
-        [button setTheme:[self theme]];
-        [button sizeToFit];
-
-        var buttonFrame = [button frame],
-            width = MAX(80.0, CGRectGetWidth(buttonFrame)),
-            height = CGRectGetHeight(buttonFrame);
-
-        offsetX -= width;
-        [button setFrame:CGRectMake(offsetX, buttonsOriginY, width, height)];
-        offsetX -= 10;
-    }
-
-    if (_showHelp)
-    {
-        var helpImage = [self currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [self currentValueForThemeAttribute:@"help-image-pressed"],
-            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
-            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
-
-        [_alertHelpButton setImage:helpImage];
-        [_alertHelpButton setAlternateImage:helpImagePressed];
-        [_alertHelpButton setBordered:NO];
-        [_alertHelpButton setFrame:helpFrame];
-    }
-
-    panelSize.height += [aRepresentativeButton frameSize].height + inset.bottom + buttonOffset;
-    return panelSize;
-}
-
-/*!
-    @ignore
-*/
-- (void)layout
-{
-    if (!_needsLayout)
-        return;
-
-    if (!_window)
-        [self _createWindowWithStyle:nil];
-
-    var iconOffset = [self currentValueForThemeAttribute:@"image-offset"],
-        theImage = _icon,
-        finalSize;
-
-    if (!theImage)
-        switch (_alertStyle)
-        {
-            case CPWarningAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"warning-image"];
-                break;
-            case CPInformationalAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"information-image"];
-                break;
-            case CPCriticalAlertStyle:
-                theImage = [self currentValueForThemeAttribute:@"error-image"];
-                break;
-        }
-
-    [_alertImageView setImage:theImage];
-
-    var imageSize = theImage ? [theImage size] : CGSizeMakeZero();
-    [_alertImageView setFrame:CGRectMake(iconOffset.x, iconOffset.y, imageSize.width, imageSize.height)];
-
-    [self _layoutMessageView];
-    [self _layoutInformativeView];
-    [self _layoutAccessoryView];
-    [self _layoutSuppressionButton];
-
-    var lastView = _informativeLabel;
-    if (_showSuppressionButton)
-        lastView = _suppressionButton;
-    else if (_accessoryView)
-        lastView = _accessoryView
-
-    finalSize = [self _layoutButtonsFromView:lastView];
-    if ([_window styleMask] & CPDocModalWindowMask)
-        finalSize.height -= 26; // adjust the absence of title bar
-
-    [_window setFrameSize:finalSize];
-    [_window center];
-
-    _needsLayout = NO;
-}
-
-#pragma mark Displaying Alerts
-
-/*!
-    Displays the \c CPAlert panel as a modal dialog. The user will not be
+    Displays the <pre>CPAlert</pre> panel as a modal dialog. The user will not be
     able to interact with any other controls until s/he has dismissed the alert
     by clicking on one of the buttons.
 */
 - (void)runModal
 {
-    if (!([_window styleMask] & _defaultWindowStyle))
+    var theTitle;
+    
+    switch (_alertStyle)
     {
-        _needsLayout = YES;
-        [self _createWindowWithStyle:_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;
     }
-
-    [self layout];
-    [CPApp runModalForWindow:_window];
+    
+    [_alertPanel setTitle:_windowTitle ? _windowTitle : theTitle];
+    
+    [CPApp runModalForWindow:_alertPanel];
 }
 
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-
-    @param window The parent window for the sheet.
-    @param modalDelegate The delegate for the modal-dialog session.
-    @param alertDidEndSelector Message the alert sends to modalDelegate after the sheet is dismissed.
-    @param contextInfo Contextual data passed to modalDelegate in didEndSelector message.
-*/
-- (void)beginSheetModalForWindow:(CPWindow)aWindow modalDelegate:(id)modalDelegate didEndSelector:(SEL)alertDidEndSelector contextInfo:(id)contextInfo
+/* @ignore */
+- (void)_notifyDelegate:(id)button
 {
-    if (!([_window styleMask] & CPDocModalWindowMask))
-    {
-        _needsLayout = YES;
-        [self _createWindowWithStyle:CPDocModalWindowMask];
-    }
+    if (_delegate && [_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
+        [_delegate alertDidEnd:self returnCode:[button tag]];
 
-    [self layout];
-
-    _modalDelegate = modalDelegate;
-    _didEndSelector = alertDidEndSelector;
-
-    [CPApp beginSheet:_window modalForWindow:aWindow modalDelegate:self didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:contextInfo];
-}
-
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-
-    @param window The parent window for the sheet.
-*/
-- (void)beginSheetModalForWindow:(CPWindow)aWindow
-{
-    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
-}
-
-#pragma mark Private
-
-/*!
-    @ignore
-*/
-- (void)_createWindowWithStyle:(int)forceStyle
-{
-    var frame = CGRectMakeZero();
-    frame.size = [self currentValueForThemeAttribute:@"size"];
-
-    _window = [[CPWindow alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
-
-    if (_title)
-        [_window setTitle:_title];
-
-    var contentView = [_window contentView],
-        count = [_buttons count];
-
-    if (count)
-        while (count--)
-            [contentView addSubview:_buttons[count]];
-    else
-        [self addButtonWithTitle:@"OK"];
-
-    [contentView addSubview:_messageLabel];
-    [contentView addSubview:_alertImageView];
-    [contentView addSubview:_informativeLabel];
-
-    if (_showHelp)
-        [contentView addSubview:_alertHelpButton];
-}
-
-/*!
-    @ignore
-*/
-- (@action)_showHelp:(id)aSender
-{
-    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
-        [_delegate alertShowHelp:self];
-}
-
-/*
-    @ignore
-*/
-- (@action)_takeReturnCodeFrom:(id)aSender
-{
-    if ([_window isSheet])
-        [CPApp endSheet:_window returnCode:[aSender tag]];
-    else
-    {
-        [CPApp abortModal];
-        [_window close];
-
-        [self _alertDidEnd:_window returnCode:[aSender tag] contextInfo:nil];
-    }
-}
-
-/*!
-    @ignore
-*/
-- (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
-{
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-            [_delegate alertDidEnd:self returnCode:returnCode];
-
-    if (_didEndSelector)
-        objj_msgSend(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
-
-    _modalDelegate = nil;
-    _didEndSelector = nil;
-}
-
-#pragma mark Theme Attributes
-
-+ (CPString)defaultThemeClass
-{
-    return @"alert";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[CGSizeMake(400.0, 110.0), CGInsetMake(15, 15, 15, 50), 6, 10,
-                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont boldSystemFontOfSize:13.0], [CPNull null], CGSizeMakeZero(),
-                                                CPJustifiedTextAlignment, [CPColor blackColor], [CPFont systemFontOfSize:12.0], [CPNull null], CGSizeMakeZero(),
-                                                CGPointMake(15, 12),
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                [CPNull null],
-                                                0.0,
-                                                0.0,
-                                                3.0,
-                                                [CPColor blackColor],
-                                                [CPFont systemFontOfSize:12.0],
-                                                [CPNull null],
-                                                0.0
-                                                ]
-                                       forKeys:[@"size", @"content-inset", @"informative-offset", @"button-offset",
-                                                @"message-text-alignment", @"message-text-color", @"message-text-font", @"message-text-shadow-color", @"message-text-shadow-offset",
-                                                @"informative-text-alignment", @"informative-text-color", @"informative-text-font", @"informative-text-shadow-color", @"informative-text-shadow-offset",
-                                                @"image-offset",
-                                                @"information-image",
-                                                @"warning-image",
-                                                @"error-image",
-                                                @"help-image",
-                                                @"help-image-left-offset",
-                                                @"help-image-pressed",
-                                                @"suppression-button-y-offset",
-                                                @"suppression-button-x-offset",
-                                                @"default-elements-margin",
-                                                @"suppression-button-text-color",
-                                                @"suppression-button-text-font",
-                                                @"suppression-button-text-shadow-color",
-                                                @"suppression-button-text-shadow-offset"
-                                                ]];
+    [CPApp abortModal];
+    [_alertPanel close];
 }
 
 @end

AppKit/CPAnimation.j

@@ -21,7 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPTimer.j>
 
 @import "CAMediaTimingFunction.j"
 
@@ -49,19 +48,19 @@ 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.
+    Called at the beginning of <code>startAnimation</code>.
     @param animation the animation that will start
-    @return \c YES allows the animation to start.
-    \c NO stops the animation.
+    @return <code>YES</code> allows the animation to start.
+    <code>NO</code> stops the animation.
 
     @delegate -(void)animationDidEnd:(CPAnimation)animation;
     Called when an animation has completed.
@@ -73,7 +72,7 @@ ACTUAL_FRAME_RATE = 0;
 
     @delegate - (float)animation:(CPAnimation)animation valueForProgress:(float)progress;
     The value from this method will be returned when CPAnimation's
-    \c currentValue method is called.
+    <code>currentValue</code> method is called.
     @param animation the animation to obtain the curve value for
     @param progress the current animation progress
     @return the curve value
@@ -82,13 +81,13 @@ ACTUAL_FRAME_RATE = 0;
 {
     CPTimeInterval          _lastTime;
     CPTimeInterval          _duration;
-
+    
     CPAnimationCurve        _animationCurve;
     CAMediaTimingFunction   _timingFunction;
-
+    
     float                   _frameRate;
     float                   _progress;
-
+    
     id                      _delegate;
     CPTimer                 _timer;
 }
@@ -102,37 +101,36 @@ ACTUAL_FRAME_RATE = 0;
 - (id)initWithDuration:(float)aDuration animationCurve:(CPAnimationCurve)anAnimationCurve
 {
     self = [super init];
-
+    
     if (self)
     {
         _progress = 0.0;
         _duration = MAX(0.0, aDuration);
+        _animationCurve = anAnimationCurve;
         _frameRate = 60.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
 {
-    switch (anAnimationCurve)
+    switch (_animationCurve)
     {
         case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
                                     break;
-
+                                    
         case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
                                     break;
-
+                                    
         case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
                                     break;
-
+                                    
         case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
                                     break;
 
@@ -140,7 +138,7 @@ ACTUAL_FRAME_RATE = 0;
                                                 reason:"Invalid value provided for animation curve"];
                                     break;
     }
-
+    
     _animationCurve = anAnimationCurve;
     _timingFunction = [CAMediaTimingFunction functionWithName:timingFunctionName];
 }
@@ -156,13 +154,13 @@ ACTUAL_FRAME_RATE = 0;
 /*!
     Sets the animation's length.
     @param aDuration the new animation length
-    @throws CPInvalidArgumentException if \c aDuration is negative
+    @throws CPInvalidArgumentException if <code>aDuration</code> is negative
 */
 - (void)setDuration:(CPTimeInterval)aDuration
 {
     if (aDuration < 0)
         [CPException raise:CPInvalidArgumentException reason:"aDuration can't be negative"];
-
+        
     _duration = aDuration;
 }
 
@@ -177,13 +175,13 @@ ACTUAL_FRAME_RATE = 0;
 /*!
     Sets the animation frame rate. This is not a guaranteed frame rate. 0 means to go as fast as possible.
     @param frameRate the new desired frame rate
-    @throws CPInvalidArgumentException if \c frameRate is negative
+    @throws CPInvalidArgumentException if <code>frameRate</code> is negative
 */
 - (void)setFrameRate:(float)frameRate
 {
     if (frameRate < 0)
         [CPException raise:CPInvalidArgumentException reason:"frameRate can't be negative"];
-
+        
     _frameRate = frameRate;
 }
 
@@ -213,22 +211,22 @@ ACTUAL_FRAME_RATE = 0;
 }
 
 /*!
-    Starts the animation. The method calls \c -animationShouldStart:
+    Starts the animation. The method calls <code>animationShouldStart:</code>
     on the delegate (if it implements it) to see if the animation
     should begin.
 */
 - (void)startAnimation
 {
     // If we're already animating, or our delegate stops us, animate.
-    if (_timer || _delegate && [_delegate respondsToSelector:@selector(animationShouldStart:)] && ![_delegate animationShouldStart:self])
+    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];
 }
 
@@ -243,14 +241,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];
     }
@@ -263,16 +261,16 @@ ACTUAL_FRAME_RATE = 0;
 {
     if (!_timer)
         return;
-
+    
     [_timer invalidate];
     _timer = nil;
-
+    
     if ([_delegate respondsToSelector:@selector(animationDidStop:)])
         [_delegate animationDidStop:self];
 }
 
 /*!
-    Returns \c YES if the animation
+    Returns <code>YES</code> if the animation
     is running.
 */
 - (BOOL)isAnimating
@@ -302,123 +300,13 @@ ACTUAL_FRAME_RATE = 0;
 */
 - (float)currentValue
 {
-    var t = [self currentProgress];
-
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
-        return [_delegate animation:self valueForProgress: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 [_delegate animation:self valueForProgress:_progress];
+    
+    if (_animationCurve == CPAnimationLinear)
+        return _progress;
+    
+    alert("IMPLEMENT ANIMATION CURVES!!!");
 }
 
 @end
-
-// 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 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;
-    }
-
-    // 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));
-    }
-
-    // Given an x value, find a parametric value it came from.
-    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 (; 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 (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;
-
-    // Convert from input time to parametric value in curve, then from that to output time.
-    return solve(t, solveEpsilon(duration));
-};

AppKit/CPAttributedString+Additions.j

@@ -1,62 +0,0 @@
-/*
- * CPAttributedString+Additions.j
- * AppKit
- *
- * Created by Randy Luecke
- * Copyright 2011, RCLConcepts, LLC.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-/*
-    AppKit adds two methods to the CPAttributedString class to support drawing string directly in an CPView.
-
-    AppKit also adds similar methods to CPString.
-*/
-@implementation CPAttributedString (AppKitAdditions)
-/*!
-    Draws a string in the current graphics context.
-    This method and draws the reciver on a single "infinately long" line.
-
-    @param aPoint - The starting point to draw the string
-*/
-- (void)drawAtPoint:(CGPoint)aPoint
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        line = CTLineCreateWithAttributedString([self copy]);
-
-    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
-    CTLineDraw(line, context);
-}
-
-/*!
-    Draws a string in the current graphics context.
-
-    @param aRect - The rect for which the string should be drawn into
-*/
-- (void)drawInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        frameSetter = CTFramesetterCreateWithAttributedString([self copy]),
-        path = CGPathCreateMutable();
-
-    CGPathAddRect(path, nil, aRect);
-    
-    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [self length]), path, nil);
-
-    CTFrameDraw(frame, context);
-}
-@end

AppKit/CPBezierPath.j

@@ -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,27 +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 polygons like squares and triangles; circles, arcs; or complex
-    line segments.
-
+    Paths can form any shape, including regular polgyons 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).
 */
@@ -51,76 +50,52 @@ var DefaultLineWidth = 1.0;
     float   _lineWidth;
 }
 
-/*!
-    Create a new CPBezierPath object.
-*/
 + (CPBezierPath)bezierPath
 {
-    return [[self alloc] init];
+    return [[[self class] alloc] init];
 }
 
-/*!
-    Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
-*/
 + (CPBezierPath)bezierPathWithOvalInRect:(CGRect)rect
 {
-    var path = [self bezierPath];
-
+    var path = [[self class] bezierPath];
+    
     [path appendBezierPathWithOvalInRect:rect];
-
+    
     return path;
 }
 
-/*!
-    Create a new CPBezierPath object initialized with a rectangular path.
-*/
 + (CPBezierPath)bezierPathWithRect:(CGRect)rect
 {
-    var path = [self bezierPath];
-
+    var path = [[self class] bezierPath];
+    
     [path appendBezierPathWithRect:rect];
-
+    
     return path;
 }
 
-/*!
-    Get default line width.
-*/
 + (float)defaultLineWidth
 {
     return DefaultLineWidth;
 }
 
-/*!
-    Set default line width.
-*/
 + (void)setDefaultLineWidth:(float)width
 {
     DefaultLineWidth = width;
 }
 
-/*!
-    Fill rectangular path with current fill color.
-*/
-+ (void)fillRect:(CGRect)aRect
++ (void)fillRect:(CGRect)rect
 {
-    [[self bezierPathWithRect:aRect] fill];
+    [[[self class] bezierPathWithRect:rect] fill];
 }
 
-/*!
-    Using the current stroke color and default drawing attributes, strokes a counterclockwise path beginning at the rectangle's origin.
-*/
-+ (void)strokeRect:(CGRect)aRect
++ (void)strokeRect:(CGRect)rect
 {
-    [[self bezierPathWithRect:aRect] stroke];
+    [[[self class] bezierPathWithRect:rect] stroke];
 }
 
-/*!
-    Using the current stroke color and default drawing attributes, strokes a line between two points.
-*/
 + (void)strokeLineFromPoint:(CGPoint)point1 toPoint:(CGPoint)point2
 {
-    var path = [self bezierPath];
+    var path = [[self class] bezierPath];
 
     [path moveToPoint:point1];
     [path lineToPoint:point2];
@@ -128,9 +103,6 @@ var DefaultLineWidth = 1.0;
     [path stroke];
 }
 
-/*!
-    Create a new CPBezierPath object using the default line width.
-*/
 - (id)init
 {
     if (self = [super init])
@@ -142,41 +114,26 @@ var DefaultLineWidth = 1.0;
     return self;
 }
 
-/*!
-    Moves the current point to another location.
-*/
 - (void)moveToPoint:(CGPoint)point
 {
     CGPathMoveToPoint(_path, nil, point.x, point.y);
 }
 
-/*!
-    Append a straight line to the path.
-*/
 - (void)lineToPoint:(CGPoint)point
 {
     CGPathAddLineToPoint(_path, nil, point.x, point.y);
 }
 
-/*!
-    Add a cubic Bezier curve to the path.
-*/
 - (void)curveToPoint:(CGPoint)endPoint controlPoint1:(CGPoint)controlPoint1 controlPoint2:(CGPoint)controlPoint2
 {
     CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }
 
-/*!
-    Create a line segment between the first and last points in the subpath, closing it.
-*/
 - (void)closePath
 {
     CGPathCloseSubpath(_path);
 }
 
-/*!
-    Draw a line along the path with the current stroke color and default drawing attributes.
-*/
 - (void)stroke
 {
     var ctx = [[CPGraphicsContext currentContext] graphicsPort];
@@ -184,12 +141,10 @@ var DefaultLineWidth = 1.0;
     CGContextBeginPath(ctx);
     CGContextAddPath(ctx, _path);
     CGContextSetLineWidth(ctx, [self lineWidth]);
+    CGContextClosePath(ctx);
     CGContextStrokePath(ctx);
 }
 
-/*!
-    Fill the path with the current fill color.
-*/
 - (void)fill
 {
     var ctx = [[CPGraphicsContext currentContext] graphicsPort];
@@ -201,89 +156,56 @@ var DefaultLineWidth = 1.0;
     CGContextFillPath(ctx);
 }
 
-/*!
-    Get the line width.
-*/
 - (float)lineWidth
 {
     return _lineWidth;
 }
 
-/*!
-    Set the line width.
-*/
 - (void)setLineWidth:(float)lineWidth
 {
     _lineWidth = lineWidth;
 }
 
-/*!
-    Get the total number of elements.
-*/
 - (unsigned)elementCount
 {
     return _path.count;
 }
 
-/*!
-    Check if receiver is empty, returns appropriate Boolean value.
-*/
 - (BOOL)isEmpty
 {
     return CGPathIsEmpty(_path);
 }
 
-/*!
-    Get the current point.
-*/
 - (CGPoint)currentPoint
 {
     return CGPathGetCurrentPoint(_path);
 }
 
-/*!
-    Append a series of line segments.
-*/
 - (void)appendBezierPathWithPoints:(CPArray)points count:(unsigned)count
 {
     CGPathAddLines(_path, nil, points, count);
 }
 
-/*!
-    Append a rectangular path.
-*/
 - (void)appendBezierPathWithRect:(CGRect)rect
 {
     CGPathAddRect(_path, nil, rect);
 }
 
-/*!
-    Append an oval path; oval is drawn within the rectangular path.
-*/
 - (void)appendBezierPathWithOvalInRect:(CGRect)rect
 {
     CGPathAddPath(_path, nil, CGPathWithEllipseInRect(rect));
 }
 
-/*!
-    Append a rounded rectangular path.
-*/
 - (void)appendBezierPathWithRoundedRect:(CGRect)rect xRadius:(float)xRadius yRadius:(float)yRadius
 {
     CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
 }
 
-/*!
-    Append the contents of a CPBezierPath object.
-*/
 - (void)appendBezierPath:(NSBezierPath *)other
 {
     CGPathAddPath(_path, nil, other._path);
 }
 
-/*!
-    Remove all path elements; clears path.
-*/
 - (void)removeAllPoints
 {
     _path = CGPathCreateMutable();

AppKit/CPBox.j

@@ -1,434 +0,0 @@
-/*
- * CPBox.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 "CPView.j"
-
-// CPBoxType
-CPBoxPrimary    = 0;
-CPBoxSecondary  = 1;
-CPBoxSeparator  = 2;
-CPBoxOldStyle   = 3;
-CPBoxCustom     = 4;
-
-// CPBorderType
-CPNoBorder      = 0;
-CPLineBorder    = 1;
-CPBezelBorder   = 2;
-CPGrooveBorder  = 3;
-
-/*!
-    @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;
-}
-
-+ (id)boxEnclosingView:(CPView)aView
-{
-    var box = [[self alloc] initWithFrame:CGRectMakeZero()],
-        enclosingView = [aView superview];
-
-    [box setFrameFromContentFrame:[aView frame]];
-
-    [enclosingView replaceSubview:aView with:box];
-
-    [box setContentView:aView];
-
-    return box;
-}
-
-- (id)initWithFrame:(CPRect)frameRect
-{
-    self = [super initWithFrame:frameRect];
-
-    if (self)
-    {
-        _borderType = CPBezelBorder;
-        _fillColor = [CPColor clearColor];
-        _borderColor = [CPColor blackColor];
-
-        _borderWidth = 1.0;
-        _contentMargin = CGSizeMake(0.0, 0.0);
-
-        _contentView = [[CPView alloc] initWithFrame:[self bounds]];
-        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self setAutoresizesSubviews:YES];
-        [self addSubview:_contentView];
-    }
-
-    return self;
-}
-
-// Configuring Boxes
-
-/*!
-    Returns the receiver's border rectangle.
-
-    @return the border rectangle of the box
-*/
-- (CPRect)borderRect
-{
-    return [self bounds];
-}
-
-/*!
-    Returns the receiver's border type. Possible values are:
-
-    <pre>
-    CPNoBorder
-    CPLineBorder
-    CPBezelBorder
-    CPGrooveBorder
-    </pre>
-
-    @return the border type of the box
-*/
-- (CPBorderType)borderType
-{
-    return _borderType;
-}
-
-
-/*!
-    Sets the receiver's border type. Valid values are:
-
-    <pre>
-    CPNoBorder
-    CPLineBorder
-    CPBezelBorder
-    CPGrooveBorder
-    </pre>
-
-    @param borderType the border type to use
-*/
-- (void)setBorderType:(CPBorderType)aBorderType
-{
-    if (_borderType === aBorderType)
-        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;
-}
-
-- (void)setBorderColor:(CPColor)color
-{
-    if ([color isEqual:_borderColor])
-        return;
-
-    _borderColor = color;
-    [self setNeedsDisplay:YES];
-}
-
-- (float)borderWidth
-{
-    return _borderWidth;
-}
-
-- (void)setBorderWidth:(float)width
-{
-    if (width === _borderWidth)
-        return;
-
-    _borderWidth = width;
-    [self setNeedsDisplay:YES];
-}
-
-- (float)cornerRadius
-{
-    return _cornerRadius;
-}
-
-- (void)setCornerRadius:(float)radius
-{
-    if (radius === _cornerRadius)
-        return;
-
-    _cornerRadius = radius;
-    [self setNeedsDisplay:YES];
-}
-
-- (CPColor)fillColor
-{
-    return _fillColor;
-}
-
-- (void)setFillColor:(CPColor)color
-{
-    if ([color isEqual:_fillColor])
-        return;
-
-    _fillColor = color;
-    [self setNeedsDisplay:YES];
-}
-
-- (CPView)contentView
-{
-    return _contentView;
-}
-
-- (void)setContentView:(CPView)aView
-{
-    if (aView === _contentView)
-        return;
-
-    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
-    [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-    [self replaceSubview:_contentView with:aView];
-
-    _contentView = aView;
-}
-
-- (CPSize)contentViewMargins
-{
-    return _contentMargin;
-}
-
-- (void)setContentViewMargins:(CPSize)size
-{
-     if (size.width < 0 || size.height < 0)
-         [CPException raise:CPGenericException reason:@"Margins must be positive"];
-
-    _contentMargin = CGSizeMakeCopy(size);
-    [self setNeedsDisplay:YES];
-}
-
-- (void)setFrameFromContentFrame:(CPRect)aRect
-{
-    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
-    [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)];
-}
-
-- (void)drawRect:(CPRect)rect
-{
-    if (_borderType === CPNoBorder)
-        return;
-
-    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 _drawVerticalSeperatorInRect:bounds];
-            else if (CGRectGetHeight(bounds) === 5.0)
-                return [self _drawHorizontalSeperatorInRect:bounds];
-
-            break;
-    }
-
-    switch (_borderType)
-    {
-        case CPBezelBorder:
-            [self _drawBezelBorderInRect:bounds];
-            break;
-
-        default:
-        case CPLineBorder:
-            [self _drawLineBorderInRect:bounds];
-            break;
-    }
-}
-
-- (void)_drawHorizontalSeperatorInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, 1.0);
-
-    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect) + 0.5);
-    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect) + 0.5);
-    CGContextStrokePath(context);
-}
-
-- (void)_drawVerticalSeperatorInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, 1.0);
-
-    CGContextMoveToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetMinX(aRect) + 0.5, CGRectGetHeight(aRect));
-    CGContextStrokePath(context);
-}
-
-- (void)_drawBezelBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        sides = [CPMinYEdge, CPMaxXEdge, CPMaxYEdge, CPMinXEdge],
-        sideGray = 190.0 / 255.0,
-        grays = [142.0 / 255.0, sideGray, sideGray, sideGray],
-        borderWidth = _borderWidth;
-
-    while (borderWidth--)
-        aRect = CPDrawTiledRects(aRect, aRect, sides, grays);
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRect(context, aRect);
-}
-
-- (void)_drawLineBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    aRect = CGRectInset(aRect, _borderWidth / 2.0, _borderWidth / 2.0);
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetLineWidth(context, _borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
-}
-
-@end
-
-var CPBoxTypeKey          = @"CPBoxTypeKey",
-    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
-    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
-    CPBoxFillColorKey     = @"CPBoxFillColorKey",
-    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
-    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
-    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
-
-@implementation CPBox (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
-        _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];
-
-        _borderColor   = [aCoder decodeObjectForKey:CPBoxBorderColorKey];
-        _fillColor     = [aCoder decodeObjectForKey:CPBoxFillColorKey];
-
-        _cornerRadius  = [aCoder decodeFloatForKey:CPBoxCornerRadiusKey];
-        _borderWidth   = [aCoder decodeFloatForKey:CPBoxBorderWidthKey];
-
-        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
-
-        _contentView   = [self subviews][0];
-
-        [self setAutoresizesSubviews:YES];
-        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
-    [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
-
-    [aCoder encodeObject:_borderColor forKey:CPBoxBorderColorKey];
-    [aCoder encodeObject:_fillColor forKey:CPBoxFillColorKey];
-
-    [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
-    [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];
-
-    [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
-}
-
-@end

AppKit/CPButton.j

@@ -24,8 +24,31 @@
 @import "CGGeometry.j"
 
 @import "CPControl.j"
-@import "CPStringDrawing.j"
 
+#include "CoreGraphics/CGGeometry.h"
+
+
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
+
+
+/* @group CPCellImagePosition */
+
+CPNoImage       = 0;
+CPImageOnly     = 1;
+CPImageLeft     = 2;
+CPImageRight    = 3;
+CPImageBelow    = 4;
+CPImageAbove    = 5;
+CPImageOverlaps = 6;
+
+
+/*  @group CPButtonState */
+
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
 
 /* @group CPBezelStyle */
 
@@ -70,18 +93,9 @@ CPPushInCellMask            = CPPushInButtonMask;
 CPChangeGrayCellMask        = CPGrayButtonMask;
 CPChangeBackgroundCellMask  = CPBackgroundButtonMask;
 
-CPButtonStateMixed                  = CPThemeState("mixed");
-CPButtonStateBezelStyleRounded      = CPThemeState("rounded");
+CPButtonStateMixed  = CPThemeState("mixed");
 
-// add all future correspondance between bezel styles and theme state here.
-var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjects:[CPButtonStateBezelStyleRounded, nil]
-                                                             forKeys:[CPRoundedBezelStyle, CPRoundRectBezelStyle]];
-
-
-CPButtonDefaultHeight = 24.0;
-CPButtonImageOffset   = 3.0;
-
-/*!
+/*! 
     @ingroup appkit
     @class CPButton
 
@@ -92,9 +106,12 @@ CPButtonImageOffset   = 3.0;
 @implementation CPButton : CPControl
 {
     BOOL                _allowsMixedState;
-
+    
     CPString            _title;
     CPString            _alternateTitle;
+    
+    CPImage             _image;
+    CPImage             _alternateImage;
 
     CPInteger           _showsStateBy;
     CPInteger           _highlightsBy;
@@ -103,14 +120,6 @@ CPButtonImageOffset   = 3.0;
     // NS-style Display Properties
     CPBezelStyle        _bezelStyle;
     CPControlSize       _controlSize;
-
-    CPString            _keyEquivalent;
-    unsigned            _keyEquivalentModifierMask;
-
-    CPTimer             _continuousDelayTimer;
-    CPTimer             _continuousTimer;
-    float               _periodicDelay;
-    float               _periodicInterval;
 }
 
 + (id)buttonWithTitle:(CPString)aTitle
@@ -129,26 +138,21 @@ CPButtonImageOffset   = 3.0;
     return button;
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     return @"button";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
-                                       forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]];
+    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), nil]
+                                       forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
-/*!
-	Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
-	@param aFrame The frame rectangle for the created button object.
-	@return An initialized CPView object or nil if the object couldn't be created.
-*/
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
         // Should we instead override the defaults?
@@ -156,32 +160,19 @@ CPButtonImageOffset   = 3.0;
         [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
         [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
-
-        [self setBezelStyle:CPRoundRectBezelStyle];
+        
+        _controlSize = CPRegularControlSize;
+        
+//        [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;
-}
-
 // Setting the state
 /*!
-	Returns a Boolean value indicating whether the button allows a mixed state.
-    @return \c YES if the button has a 'mixed' state in addition to on and off.
+    Returns <code>YES</code> if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
 {
@@ -201,14 +192,10 @@ CPButtonImageOffset   = 3.0;
 
     _allowsMixedState = aFlag;
 
-    if (!_allowsMixedState && [self state] === CPMixedState)
-        [self setState:CPOnState];
+    if (!_allowsMixedState)
+        [self unsetThemeState:CPButtonStateMixed];
 }
 
-/*!
-	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))
@@ -217,7 +204,7 @@ CPButtonImageOffset   = 3.0;
     else if (![anObjectValue isKindOfClass:[CPNumber class]])
         anObjectValue = CPOnState;
 
-    else if (anObjectValue >= CPOnState)
+    else if (anObjectValue > CPOnState)
         anObjectValue = CPOnState
 
     else if (anObjectValue < CPOffState)
@@ -243,13 +230,6 @@ CPButtonImageOffset   = 3.0;
     }
 }
 
-/*!
-	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])
@@ -262,23 +242,15 @@ CPButtonImageOffset   = 3.0;
     return 1 - [self state];
 }
 
-/*!
-    Sets the button's next state to \c aState.
-    @param aState Possible states are any of the CPButton globals:
-    \c CPOffState, \c CPOnState, \c CPMixedState
-*/
 - (void)setNextState
 {
-    if ([self infoForBinding:CPValueBinding])
-        [self setAllowsMixedState:NO];
-
     [self setState:[self nextState]];
 }
 
 /*!
-    Sets the button's state to \c aState.
+    Sets the button's state to <code>aState</code>.
     @param aState Possible states are any of the CPButton globals:
-    \c CPOffState, \c CPOnState, \c CPMixedState
+    <code>CPOffState, CPOnState, CPMixedState</code>
 */
 - (void)setState:(CPInteger)aState
 {
@@ -293,27 +265,17 @@ CPButtonImageOffset   = 3.0;
     return [self intValue];
 }
 
-/*!
-	Sets the title displayed by the button when in its normal state.
-	@param aTitle The string to set as the button's title. This title is always shown on buttons
-	that don’t use their alternate contents when highlighting or displaying their alternate state.
-*/
 - (void)setTitle:(CPString)aTitle
 {
     if (_title === aTitle)
         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;
@@ -323,7 +285,7 @@ CPButtonImageOffset   = 3.0;
 {
     if (_alternateTitle === aTitle)
         return;
-
+    
     _alternateTitle = aTitle;
 
     [self setNeedsLayout];
@@ -337,12 +299,18 @@ CPButtonImageOffset   = 3.0;
 
 - (void)setImage:(CPImage)anImage
 {
-    [self setValue:anImage forThemeAttribute:@"image"];
+    if (_image === anImage)
+        return;
+    
+    _image = anImage;
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
 }
 
 - (CPImage)image
 {
-    return [self valueForThemeAttribute:@"image" inState:CPThemeStateNormal];
+    return _image;
 }
 
 /*!
@@ -351,7 +319,13 @@ CPButtonImageOffset   = 3.0;
 */
 - (void)setAlternateImage:(CPImage)anImage
 {
-    [self setValue:anImage forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
+    if (_alternateImage === anImage)
+        return;
+    
+    _alternateImage = anImage;
+    
+    [self setNeedsLayout];
+    [self setNeedsDisplay:YES];
 }
 
 /*!
@@ -359,17 +333,7 @@ CPButtonImageOffset   = 3.0;
 */
 - (CPImage)alternateImage
 {
-    return [self valueForThemeAttribute:@"image" inState:CPThemeStateHighlighted];
-}
-
-- (void)setImageOffset:(float)theImageOffset
-{
-    [self setValue:theImageOffset forThemeAttribute:@"image-offset"];
-}
-
-- (float)imageOffset
-{
-    return [self valueForThemeAttribute:@"image-offset"];
+    return _alternateImage;
 }
 
 - (void)setShowsStateBy:(CPInteger)aMask
@@ -430,13 +394,13 @@ CPButtonImageOffset   = 3.0;
                                         [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."];
     }
 
@@ -452,7 +416,7 @@ CPButtonImageOffset   = 3.0;
 
     _imageDimsWhenDisabled = imageShouldDimWhenDisabled;
 
-    if ([self hasThemeState:CPThemeStateDisabled])
+    if (_imageDimsWhenDisabled)
     {
         [self setNeedsDisplay:YES];
         [self setNeedsLayout];
@@ -464,45 +428,16 @@ CPButtonImageOffset   = 3.0;
     return _imageDimsWhenDisabled;
 }
 
-- (void)setPeriodicDelay:(float)aDelay interval:(float)anInterval
-{
-    _periodicDelay      = aDelay;
-    _periodicInterval   = anInterval;
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if ([self isContinuous])
-    {
-        _continuousDelayTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicDelay callback: function()
-        {
-            if (!_continuousTimer)
-                _continuousTimer = [CPTimer scheduledTimerWithTimeInterval:_periodicInterval target:self selector:@selector(onContinousEvent:) userInfo:anEvent repeats:YES];
-        }
-
-        repeats:NO];
-    }
-
-    [super mouseDown:anEvent];
-}
-
-- (void)onContinousEvent:(CPTimer)aTimer
-{
-    if (_target && _action && [_target respondsToSelector:_action])
-        [_target performSelector:_action withObject:self];
-}
-
 - (BOOL)startTrackingAt:(CGPoint)aPoint
 {
     [self highlight:YES];
-
+    
     return [super startTrackingAt:aPoint];
 }
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
     [self highlight:NO];
-    [self invalidateTimers];
 
     [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
 
@@ -510,21 +445,6 @@ CPButtonImageOffset   = 3.0;
         [self setNextState];
 }
 
-- (void)invalidateTimers
-{
-    if (_continuousTimer)
-    {
-        [_continuousTimer invalidate];
-        _continuousTimer = nil;
-    }
-
-    if (_continuousDelayTimer)
-    {
-        [_continuousDelayTimer invalidate];
-        _continuousDelayTimer = nil;
-    }
-}
-
 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
@@ -532,16 +452,15 @@ CPButtonImageOffset   = 3.0;
     if (_CGInsetIsEmpty(contentInset))
         return bounds;
 
-    bounds = _CGRectMakeCopy(bounds);
     bounds.origin.x += contentInset.left;
     bounds.origin.y += contentInset.top;
     bounds.size.width -= contentInset.left + contentInset.right;
     bounds.size.height -= contentInset.top + contentInset.bottom;
-
+    
     return bounds;
 }
 
-- (CGRect)bezelRectForBounds:(CGRect)bounds
+- (CGRect)bezelRectForBounds:(CFRect)bounds
 {
     if (![self isBordered])
         return _CGRectMakeZero();
@@ -551,7 +470,6 @@ CPButtonImageOffset   = 3.0;
     if (_CGInsetIsEmpty(bezelInset))
         return bounds;
 
-    bounds = _CGRectMakeCopy(bounds);
     bounds.origin.x += bezelInset.left;
     bounds.origin.y += bezelInset.top;
     bounds.size.width -= bezelInset.left + bezelInset.right;
@@ -560,20 +478,13 @@ CPButtonImageOffset   = 3.0;
     return bounds;
 }
 
-- (CGSize)_minimumFrameSize
+/*!
+    Adjust the size of the button to fit the title and surrounding button image.
+*/
+- (void)sizeToFit
 {
-    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"],
+    var size = [([self title] || " ") sizeWithFont:[self currentValueForThemeAttribute:@"font"]],
+        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
         minSize = [self currentValueForThemeAttribute:@"min-size"],
         maxSize = [self currentValueForThemeAttribute:@"max-size"];
 
@@ -586,30 +497,17 @@ CPButtonImageOffset   = 3.0;
     if (maxSize.height >= 0.0)
         size.height = MIN(size.height, maxSize.height);
 
-    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];
+    [self setFrameSize:size];
 }
 
 - (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];
 }
 
@@ -620,11 +518,13 @@ CPButtonImageOffset   = 3.0;
         var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
         [view setHitTests:NO];
-
+        
         return view;
     }
     else
         return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
+
+    return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
@@ -632,8 +532,9 @@ CPButtonImageOffset   = 3.0;
     var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
                                            positioned:CPWindowBelow
                       relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
+      
+    if (bezelView)
+        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 
     var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
                                              positioned:CPWindowAbove
@@ -642,8 +543,7 @@ CPButtonImageOffset   = 3.0;
     if (contentView)
     {
         [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
-        [contentView setImage:[self currentValueForThemeAttribute:@"image"]];
-        [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];
+        [contentView setImage:([self hasThemeState:CPThemeStateHighlighted] && _alternateImage) ? _alternateImage : _image];
 
         [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
         [contentView setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
@@ -654,10 +554,17 @@ CPButtonImageOffset   = 3.0;
         [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)
@@ -671,161 +578,51 @@ CPButtonImageOffset   = 3.0;
     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;
-}
-
 @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",
-    CPButtonAllowsMixedStateKey         = @"CPButtonAllowsMixedStateKey",
-    CPButtonImageDimsWhenDisabledKey    = @"CPButtonImageDimsWhenDisabledKey",
-    CPButtonImagePositionKey            = @"CPButtonImagePositionKey",
-    CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
-    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
-    CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
-    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey";
+var CPButtonImageKey                = @"CPButtonImageKey",
+    CPButtonAlternateImageKey       = @"CPButtonAlternateImageKey",
+    CPButtonTitleKey                = @"CPButtonTitleKey",
+    CPButtonAlternateTitleKey       = @"CPButtonAlternateTitleKey",
+    CPButtonIsBorderedKey           = @"CPButtonIsBorderedKey";
 
 @implementation CPButton (CPCoding)
 
 /*!
-    Initializes the button by unarchiving data from \c aCoder.
+    Initializes the button by unarchiving data from <code>aCoder</code>.
     @param aCoder the coder containing the archived CPButton.
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
-        [self _init];
-
-        _title = [aCoder decodeObjectForKey:CPButtonTitleKey];
-        _alternateTitle = [aCoder decodeObjectForKey:CPButtonAlternateTitleKey];
-
-        if ([aCoder containsValueForKey:CPButtonAllowsMixedStateKey])
-            _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
-
-        [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];
+        _controlSize = CPRegularControlSize;
 
+        [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;
 }
 
@@ -836,23 +633,12 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-    [self invalidateTimers];
+
+    [aCoder encodeObject:_image forKey:CPButtonImageKey];
+    [aCoder encodeObject:_alternateImage forKey:CPButtonAlternateImageKey];
 
     [aCoder encodeObject:_title forKey:CPButtonTitleKey];
     [aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];
-
-    [aCoder encodeBool:_allowsMixedState forKey:CPButtonAllowsMixedStateKey];
-
-    [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

AppKit/CPButtonBar.j

@@ -1,277 +1,61 @@
 
-@import "CPView.j"
+@import <AppKit/CPView.j>
+
+#include "CoreGraphics/CGGeometry.h"
 
 
-@implementation CPButtonBar : CPView
+@implementation CPButtonBar : CPControl
 {
-    BOOL    _hasResizeControl;
-    BOOL    _resizeControlIsLeftAligned;
-    CPArray _buttons;
 }
 
-+ (id)plusButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
-
-    [button setBordered:NO];
-    [button setImage:image];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
-+ (id)minusButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
-
-    [button setBordered:NO];
-    [button setImage:image];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
-+ (id)actionPopupButton
-{
-    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
-
-    [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
++ (CPString)themeClass
 {
     return @"button-bar";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _buttons = [];
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-- (void)awakeFromCib
-{
-    var view = [self superview],
-        subview = self;
-
-    while (view)
-    {
-        if ([view isKindOfClass:[CPSplitView class]])
-        {
-            var viewIndex = [[view subviews] indexOfObject:subview];
-            [view setButtonBar:self forDividerAtIndex:viewIndex];
-
-            break;
-        }
-
-        subview = view;
-        view = [view superview];
-    }
-}
-
-- (void)setButtons:(CPArray)buttons
-{
-    _buttons = [CPArray arrayWithArray:buttons];
-
-    for (var i = 0, count = [_buttons count]; i < count; i++)
-        [_buttons[i] setBordered:YES];
-
-    [self setNeedsLayout];
-}
-
-- (CPArray)buttons
-{
-    return [CPArray arrayWithArray:_buttons];
-}
-
-- (void)setHasResizeControl:(BOOL)shouldHaveResizeControl
-{
-    if (_hasResizeControl === shouldHaveResizeControl)
-        return;
-
-    _hasResizeControl = !!shouldHaveResizeControl;
-    [self setNeedsLayout];
-}
-
-- (BOOL)hasResizeControl
-{
-    return _hasResizeControl;
-}
-
-- (void)setResizeControlIsLeftAligned:(BOOL)shouldBeLeftAligned
-{
-    if (_resizeControlIsLeftAligned === shouldBeLeftAligned)
-        return;
-
-    _resizeControlIsLeftAligned = !!shouldBeLeftAligned;
-    [self setNeedsLayout];
-}
-
-- (BOOL)resizeControlIsLeftAligned
-{
-    return _resizeControlIsLeftAligned;
-}
-
-- (CGRect)resizeControlFrame
-{
-    var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
-        size = [self currentValueForThemeAttribute:@"resize-control-size"],
-        currentSize = [self bounds],
-        leftOrigin = _resizeControlIsLeftAligned ? 0 : currentSize.size.width - size.width - inset.right - inset.left;
-
-    return CGRectMake(leftOrigin, 0, size.width + inset.left + inset.right, size.height + inset.top + inset.bottom);
+    return [CPDictionary dictionaryWithObjects:[nil]
+                                       forKeys:[@"bezel-color"]];
 }
 
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName === "resize-control-view")
-    {
-        var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
-            size = [self currentValueForThemeAttribute:@"resize-control-size"],
-            currentSize = [self bounds];
-
-        if (_resizeControlIsLeftAligned)
-            return CGRectMake(inset.left, inset.top, size.width, size.height);
-        else
-            return CGRectMake(currentSize.size.width - size.width - inset.right, inset.top, size.width, size.height);
-    }
-
+    if (aName === "bezel-view")
+        return [self bounds];
+    
     return [super rectForEphemeralSubviewNamed:aName];
 }
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    if (aName === "resize-control-view")
-        return [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    if (aName === "bezel-view")
+    {
+        var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
+        [view setHitTests:NO];
+        
+        return view;
+    }
+    
     return [super createEphemeralSubviewNamed:aName];
 }
 
 - (void)layoutSubviews
 {
-    [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];
-
-    while (count--)
-        if ([buttonsNotHidden[count] isHidden])
-            [buttonsNotHidden removeObject:buttonsNotHidden[count]];
-
-    var currentButtonOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX([self bounds]) + 1 : -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)];
-            currentButtonOffset -= width - 1;
-        }
-        else
-        {
-            [button setFrame:CGRectMake(currentButtonOffset, 1, width, height)];
-            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];
-    }
-
-    if (_hasResizeControl)
-    {
-        var resizeControlView = [self layoutEphemeralSubviewNamed:@"resize-control-view"
-                                                       positioned:CPWindowAbove
-                                  relativeToEphemeralSubviewNamed:nil];
-
-        [resizeControlView setAutoresizingMask: _resizeControlIsLeftAligned ? CPViewMaxXMargin : CPViewMinXMargin];
-        [resizeControlView setBackgroundColor:[self currentValueForThemeAttribute:@"resize-control-color"]];
-    }
+    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
+                                           positioned:CPWindowBelow
+                      relativeToEphemeralSubviewNamed:@""];
+      
+    if (bezelView)
+        [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
 }
 
-- (void)setFrameSize:(CGSize)aSize
+- (void)addSubview:(CPView)aSubview
 {
-    [super setFrameSize:aSize];
-    [self setNeedsLayout];
-}
-
-@end
-
-var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
-    CPButtonBarResizeControlIsLeftAlignedKey = @"CPButtonBarResizeControlIsLeftAlignedKey",
-    CPButtonBarButtonsKey = @"CPButtonBarButtonsKey";
-
-@implementation CPButtonBar (CPCoding)
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeBool:_hasResizeControl forKey:CPButtonBarHasResizeControlKey];
-    [aCoder encodeBool:_resizeControlIsLeftAligned forKey:CPButtonBarResizeControlIsLeftAlignedKey];
-    [aCoder encodeObject:_buttons forKey:CPButtonBarButtonsKey];
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _buttons = [aCoder decodeObjectForKey:CPButtonBarButtonsKey] || [];
-        _hasResizeControl = [aCoder decodeBoolForKey:CPButtonBarHasResizeControlKey];
-        _resizeControlIsLeftAligned = [aCoder decodeBoolForKey:CPButtonBarResizeControlIsLeftAlignedKey];
-    }
-
-    return self;
+    [super addSubview:aSubview];
+
+    [aSubview setAutoresizingMask:CPViewMinXMargin];
 }
 
 @end

AppKit/CPCheckBox.j

@@ -23,8 +23,6 @@
 @import "CPButton.j"
 
 
-CPCheckBoxImageOffset = 4.0;
-
 @implementation CPCheckBox : CPButton
 {
 }
@@ -39,19 +37,11 @@ CPCheckBoxImageOffset = 4.0;
     return [self buttonWithTitle:aTitle];
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     return @"check-box";
 }
 
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding === CPValueBinding)
-        return [_CPCheckBoxValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -65,83 +55,10 @@ CPCheckBoxImageOffset = 4.0;
         [self setImagePosition:CPImageLeft];
         [self setAlignment:CPLeftTextAlignment];
 
-        [self setBordered:NO];
+        [self setBordered:YES];
     }
 
     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];
-}
-
-@end
-
-@implementation _CPCheckBoxValueBinder : CPBinder
-{
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
-
-    if (isPlaceholder)
-    {
-        switch (newValue)
-        {
-            case CPMultipleValuesMarker:
-                newValue = CPMixedState;
-                break;
-
-            case CPNoSelectionMarker:
-                newValue = CPOffState;
-                break;
-
-            case CPNotApplicableMarker:
-                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-                    [CPException raise:CPGenericException reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
-
-                newValue = CPOffState;
-                break;
-        }
-
-        if (newValue === CPMixedState)
-        {
-            [_source setAllowsMixedState:YES];
-        }
-        else
-        {
-            // Cocoa will always set allowsMixedState to NO
-            // This behavior will be fine for Cappuccino as well if we (like Cocoa)
-            // default the CPConditionallySetsEnabledBindingOption to YES
-            [_source setAllowsMixedState:NO];
-        }
-    }
-
-    [_source setState:newValue];
-}
-
 @end

AppKit/CPClipView.j

@@ -22,12 +22,14 @@
 
 @import "CPView.j"
 
+#include "CoreGraphics/CGGeometry.h"
 
-/*!
+
+/*! 
     @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
@@ -36,8 +38,8 @@
 }
 
 /*!
-    Sets the document view to be \c aView.
-    @param aView the new document view. It's frame origin will be changed to \c (0,0) after calling this method.
+    Sets the document view to be <code>aView</code>.
+    @param aView the new document view. It's frame origin will be changed to <code>(0,0)</code> after calling this method.
 */
 - (void)setDocumentView:(CPView)aView
 {
@@ -45,7 +47,7 @@
         return;
 
     var defaultCenter = [CPNotificationCenter defaultCenter];
-
+    
     if (_documentView)
     {
         [defaultCenter
@@ -57,29 +59,29 @@
             removeObserver:self
                       name:CPViewBoundsDidChangeNotification
                     object:_documentView];
-
+        
         [_documentView removeFromSuperview];
     }
-
+    
     _documentView = aView;
-
+    
     if (_documentView)
     {
         [self addSubview:_documentView];
+        
+		[_documentView setPostsFrameChangedNotifications:YES];
+		[_documentView setPostsBoundsChangedNotifications:YES];
 
-        [_documentView setPostsFrameChangedNotifications:YES];
-        [_documentView setPostsBoundsChangedNotifications:YES];
-
-        [defaultCenter
+		[defaultCenter
             addObserver:self
                selector:@selector(viewFrameChanged:)
-                   name:CPViewFrameDidChangeNotification
+                   name:CPViewFrameDidChangeNotification 
                  object:_documentView];
 
-        [defaultCenter
+		[defaultCenter
             addObserver:self
                selector:@selector(viewBoundsChanged:)
-                   name:CPViewBoundsDidChangeNotification
+                   name:CPViewBoundsDidChangeNotification 
                  object:_documentView];
     }
 }
@@ -93,7 +95,7 @@
 }
 
 /*!
-    Returns a new point that may be adjusted from \c aPoint
+    Returns a new point that may be adjusted from <code>aPoint</code>
     to make sure it lies within the document view.
     @param aPoint
     @return the adjusted point
@@ -104,7 +106,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)));
 
@@ -115,22 +117,18 @@
 {
     if (_CGPointEqualToPoint(_bounds.origin, aPoint))
         return;
-
+        
     [super setBoundsOrigin:aPoint];
 
-    var superview = [self superview],
-
-        // This is hack to avoid having to import CPScrollView.
-        // FIXME: Should CPScrollView be finding out about this on its own somehow?
-        scrollViewClass = objj_getClass("CPScrollView");
-
-    if ([superview isKindOfClass:scrollViewClass])
+    var superview = [self superview];
+    
+    if([superview isKindOfClass:[CPScrollView class]])
         [superview reflectScrolledClipView:self];
 }
 
 /*!
     Scrolls the clip view to the specified point. The method
-    sets its bounds origin to \c aPoint.
+    sets its bounds origin to <code>aPoint</code>.
 */
 - (void)scrollToPoint:(CGPoint)aPoint
 {
@@ -164,63 +162,37 @@
 - (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;
 
     // ... and we're in a scroll view of course.
-    var superview = [self superview],
-
-        // This is hack to avoid having to import CPScrollView.
-        // FIXME: Should CPScrollView be finding out about this on its own somehow?
-        scrollViewClass = objj_getClass("CPScrollView");
-
-    if ([superview isKindOfClass:scrollViewClass])
+    var superview = [self superview];
+        
+    if ([superview isKindOfClass:[CPScrollView class]])
         [superview reflectScrolledClipView:self];
 }
 
-- (BOOL)autoscroll:(CPEvent)anEvent
+- (BOOL)autoscroll:(CPEvent)anEvent 
 {
     var bounds = [self bounds],
-        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        superview = [self superview],
-        deltaX = 0,
-        deltaY = 0;
+        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-    if (CGRectContainsPoint(bounds, eventLocation))
+    if (CPRectContainsPoint(bounds, eventLocation))
         return NO;
 
-    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;
-    }
+    var newRect = CGRectMakeZero();
 
-    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;
-    }
+    newRect.origin = eventLocation;
+    newRect.size = CPSizeMake(10, 10);
 
-    return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
+	return [_documentView scrollRectToVisible:newRect];
 }
 
 @end
@@ -234,14 +206,14 @@ var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
 {
     if (self = [super initWithCoder:aCoder])
         [self setDocumentView:[aCoder decodeObjectForKey:CPClipViewDocumentViewKey]];
-
+    
     return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
+    
     [aCoder encodeObject:_documentView forKey:CPClipViewDocumentViewKey];
 }
 

AppKit/CPCollectionViewItem.j

@@ -1,86 +0,0 @@
-/*
- * CPCollectionViewItem.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 "CPViewController.j"
-
-
-/*!
-    Represents an object inside a CPCollectionView.
-*/
-@implementation CPCollectionViewItem : CPViewController
-{
-    BOOL    _isSelected;
-}
-
-// Setting the Represented Object
-/*!
-    Sets the object to be represented by this item.
-    @param anObject the object to be represented
-*/
-- (void)setRepresentedObject:(id)anObject
-{
-    [super setRepresentedObject:anObject];
-
-    var view = [self view];
-
-    if ([view respondsToSelector:@selector(setRepresentedObject:)])
-        [view setRepresentedObject:[self representedObject]];
-}
-
-// Modifying the Selection
-/*!
-    Sets whether this view item should be selected.
-    @param shouldBeSelected \c YES makes the item selected. \c NO deselects it.
-*/
-- (void)setSelected:(BOOL)shouldBeSelected
-{
-    shouldBeSelected = !!shouldBeSelected;
-
-    if (_isSelected === shouldBeSelected)
-        return;
-
-    _isSelected = shouldBeSelected;
-
-    var view = [self view];
-
-    if ([view respondsToSelector:@selector(setSelected:)])
-        [view setSelected:[self isSelected]];
-}
-
-/*!
-    Returns \c YES if the item is currently selected. \c NO if the item is not selected.
-*/
-- (BOOL)isSelected
-{
-    return _isSelected;
-}
-
-// Parent Collection View
-/*!
-    Returns the collection view of which this item is a part.
-*/
-- (CPCollectionView)collectionView
-{
-    return [_view superview];
-}
-
-@end

AppKit/CPColor.j

@@ -32,7 +32,7 @@ var _redComponent        = 0,
     _greenComponent      = 1,
     _blueComponent       = 2,
     _alphaCompnent       = 3;
-
+    
 var _hueComponent        = 0,
     _saturationComponent = 1,
     _brightnessComponent = 2;
@@ -46,29 +46,30 @@ var cachedBlackColor,
     cachedLightGrayColor,
     cachedDarkGrayColor,
     cachedWhiteColor,
-    cachedBrownColor,
-    cachedCyanColor,
-    cachedMagentaColor,
-    cachedOrangeColor,
-    cachedPurpleColor,
     cachedShadowColor,
     cachedClearColor;
 
-/*!
+/*! 
     @ingroup appkit
+    @code CPColor
 
-    \c CPColor can be used to represent color
+    <code>CPColor</code> can be used to represent color
     in an RGB or HSB model with an optional transparency value.</p>
 
     <p>It also provides some class helper methods that
     returns instances of commonly used colors.</p>
+
+    <p>The class does not have a <code>set:</code> method
+    like NextStep based frameworks to change the color of
+    the current context. To change the color of the current
+    context, use CGContextSetFillColor().
 */
 @implementation CPColor : CPObject
 {
     CPArray     _components;
 
     CPImage     _patternImage;
-    CPString    _cssString;
+    CPString    _cssString;    
 }
 
 /*!
@@ -76,12 +77,12 @@ var cachedBlackColor,
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
-
+    
     @param red the red component of the color
     @param green the green component of the color
     @param blue the blue component of the color
     @param alpha the alpha component
-
+    
     @return a color initialized to the values specified
 */
 + (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
@@ -91,17 +92,17 @@ var cachedBlackColor,
 
 /*!
     @deprecated in favor of colorWithRed:green:blue:alpha:
-
+    
     Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
-
+    
     @param red the red component of the color
     @param green the green component of the color
     @param blue the blue component of the color
     @param alpha the alpha component
-
+    
     @return a color initialized to the values specified
 */
 + (CPColor)colorWithCalibratedRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
@@ -111,12 +112,12 @@ var cachedBlackColor,
 
 
 /*!
-    Creates a new color object with \c white for the RGB components.
+    Creates a new color object with <code>white</code> for the RGB components.
     For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
-
+    
     @param white a float between 0.0 and 1.0
     @param alpha the alpha component between 0.0 and 1.0
-
+    
     @return a color initialized to the values specified
 */
 + (CPColor)colorWithWhite:(float)white alpha:(float)alpha
@@ -125,14 +126,14 @@ var cachedBlackColor,
 }
 
 /*!
-    @deprecated in favor of colorWithWhite:alpha:
-
-    Creates a new color object with \c white for the RGB components.
+    @deprecated in favor of colorWithWhite:apha:
+    
+    Creates a new color object with <code>white</code> for the RGB components.
     For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
-
+    
     @param white a float between 0.0 and 1.0
     @param alpha the alpha component between 0.0 and 1.0
-
+    
     @return a color initialized to the values specified
 */
 + (CPColor)colorWithCalibratedWhite:(float)white alpha:(float)alpha
@@ -142,11 +143,11 @@ var cachedBlackColor,
 
 /*!
     Creates a new color in HSB space.
-
+    
     @param hue the hue value
     @param saturation the saturation value
     @param brightness the brightness value
-
+    
     @return the initialized color
 */
 + (CPColor)colorWithHue:(float)hue saturation:(float)saturation brightness:(float)brightness
@@ -156,16 +157,16 @@ var cachedBlackColor,
 
 + (CPColor)colorWithHue:(float)hue saturation:(float)saturation brightness:(float)brightness alpha:(float)alpha
 {
-    if (saturation === 0.0)
+    if(saturation === 0.0)
         return [CPColor colorWithCalibratedWhite:brightness / 100.0 alpha:alpha];
-
+    
     var f = hue % 60,
         p = (brightness * (100 - saturation)) / 10000,
         q = (brightness * (6000 - saturation * f)) / 600000,
         t = (brightness * (6000 - saturation * (60 -f))) / 600000,
         b =  brightness / 100.0;
-
-    switch (FLOOR(hue / 60))
+        
+    switch(FLOOR(hue / 60))
     {
         case 0: return [CPColor colorWithCalibratedRed: b green: t blue: p alpha: alpha];
         case 1: return [CPColor colorWithCalibratedRed: q green: b blue: p alpha: alpha];
@@ -180,7 +181,7 @@ var cachedBlackColor,
     Creates an RGB color from a hexadecimal string. For example,
     the a string of "FFFFFF" would return a white CPColor.
     "FF0000" would return a pure red, "00FF00" would return a
-    pure blue, and "0000FF" would return a pure green.
+    pure blue, and "0000FF" would return a pure green. 
 
     @param hex a 6 character long string of hex
 
@@ -188,8 +189,7 @@ var cachedBlackColor,
 */
 + (CPColor)colorWithHexString:(string)hex
 {
-    var rgba = hexToRGB(hex);
-    return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null;
+    return [[CPColor alloc] _initWithRGBA: hexToRGB(hex)];
 }
 
 /*!
@@ -291,61 +291,6 @@ var cachedBlackColor,
     return cachedYellowColor;
 }
 
-/*!
-    Returns a brown color object (RGBA=[0.6, 0.4, 0.2, 1.0])
-*/
-+ (CPColor)brownColor
-{
-    if (!cachedBrownColor)
-        cachedBrownColor = [[CPColor alloc] _initWithRGBA:[0.6, 0.4, 0.2, 1.0]];
-
-    return cachedBrownColor;
-}
-
-/*!
-    Returns a cyan color object (RGBA=[0.0, 1.0, 1.0, 1.0])
-*/
-+ (CPColor)cyanColor
-{
-    if (!cachedCyanColor)
-        cachedCyanColor = [[CPColor alloc] _initWithRGBA:[0.0, 1.0, 1.0, 1.0]];
-
-    return cachedCyanColor;
-}
-
-/*!
-    Returns a magenta color object (RGBA=[1.0, 0.0, 1.0, 1.0])
-*/
-+ (CPColor)magentaColor
-{
-    if (!cachedMagentaColor)
-        cachedMagentaColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.0, 1.0, 1.0]];
-
-    return cachedMagentaColor;
-}
-
-/*!
-    Returns a orange color object (RGBA=[1.0, 0.5, 0.0, 1.0])
-*/
-+ (CPColor)orangeColor
-{
-    if (!cachedOrangeColor)
-        cachedOrangeColor = [[CPColor alloc] _initWithRGBA:[1.0, 0.5, 0.0, 1.0]];
-
-    return cachedOrangeColor;
-}
-
-/*!
-    Returns a purple color object (RGBA=[0.5, 0.0, 0.5, 1.0])
-*/
-+ (CPColor)purpleColor
-{
-    if (!cachedPurpleColor)
-        cachedPurpleColor = [[CPColor alloc] _initWithRGBA:[0.5, 0.0, 0.5, 1.0]];
-
-    return cachedPurpleColor;
-}
-
 /*!
     Returns a shadow looking color (RGBA=[0.0, 0.0, 0.0, 0.33])
 */
@@ -370,18 +315,8 @@ var cachedBlackColor,
     return cachedClearColor;
 }
 
-+ (CPColor)alternateSelectedControlColor
-{
-    return [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]];
-}
-
-+ (CPColor)secondarySelectedControlColor
-{
-    return [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]];
-}
-
 /*!
-    Creates a color using a tile pattern with \c anImage
+    Creates a color using a tile pattern with <code>anImage</code>
     @param the image to tile
     @return a tiled image color object
 */
@@ -392,7 +327,7 @@ var cachedBlackColor,
 
 /*!
     Creates a CPColor from a valid CSS RGB string. Example, "rgb(32,64,129)".
-
+    
     @param aString a CSS color string
     @return a color initialized to the value in the css string
 */
@@ -404,23 +339,23 @@ var cachedBlackColor,
 /* @ignore */
 - (id)_initWithCSSString:(CPString)aString
 {
-    if (aString.indexOf("rgb") == CPNotFound)
+    if(aString.indexOf("rgb") == CPNotFound)
         return nil;
-
+        
     self = [super init];
-
-    var startingIndex = aString.indexOf("("),
-        parts = aString.substring(startingIndex + 1).split(',');
-
+    
+    var startingIndex = aString.indexOf("(");
+    var parts = aString.substring(startingIndex+1).split(',');
+    
     _components = [
         parseInt(parts[0], 10) / 255.0,
         parseInt(parts[1], 10) / 255.0,
         parseInt(parts[2], 10) / 255.0,
-        parts[3] ? parseFloat(parts[3], 10) : 1.0
-    ];
-
+        parts[3] ? parseInt(parts[3], 10) / 255.0 : 1.0        
+    ]
+    
     _cssString = aString;
-
+    
     return self;
 }
 
@@ -428,20 +363,55 @@ var cachedBlackColor,
 - (id)_initWithRGBA:(CPArray)components
 {
     self = [super init];
-
+    
     if (self)
     {
         _components = components;
-
-        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-            parseInt(_components[0] * 255.0) + ", " +
-            parseInt(_components[1] * 255.0) + ", " +
-            parseInt(_components[2] * 255.0) +
-            (hasAlpha ?  (", " + _components[3]) : "") + ")";
+        
+		if (!CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0 && window.Base64 && window.CRC32)
+		{
+			var bytes = [0x89,0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,0x8,0x3,0x0,0x0,0x0,0x28,0xcb,0x34,0xbb,0x0,0x0,0x3,0x0,0x50,0x4c,0x54,0x45,0xff,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x17,0x89,0x99,0x55,0x0,0x0,0x0,0x1,0x74,0x52,0x4e,0x53,0x0,0x40,0xe6,0xd8,0x66,0x0,0x0,0x0,0x10,0x49,0x44,0x41,0x54,0x78,0xda,0x62,0x60,0x0,0x0,0x0,0x0,0xff,0xff,0x3,0x0,0x0,0x2,0x0,0x1,0x24,0x7f,0x24,0xf1,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,0xff];
+			var r_off = 41;
+			var g_off = 42;
+			var b_off = 43;
+			var a_off = 821;
+			var plte_crc_off = 809;
+			var trns_crc_off = 822;
+			var plte_type_off = 37;
+			var trns_type_off = 817;
+			
+			bytes[r_off] = Math.round(_components[0]*255);
+			bytes[g_off] = Math.round(_components[1]*255);
+			bytes[b_off] = Math.round(_components[2]*255);
+			bytes[a_off] = Math.round(_components[3]*255);
+            
+			// calculate new CRCs
+			var new_plte_crc = integerToBytes(CRC32.getCRC(bytes, plte_type_off, 4+768), 4);
+			var new_trns_crc = integerToBytes(CRC32.getCRC(bytes, trns_type_off, 4+1), 4);
+            
+			// overwrite old CRCs with new ones
+			for (var i = 0; i < 4; i++)
+			{
+				bytes[plte_crc_off+i] = new_plte_crc[i];
+				bytes[trns_crc_off+i] = new_trns_crc[i];
+			}
+            
+			// Base64 encode, strip whitespace and build data URL
+			var base64image = Base64.encode(bytes); //.replace(/[\s]/g, "");
+			
+			_cssString = "url(\"data:image/png;base64," + base64image + "\")";
+		}
+		else
+		{
+        	var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+        		
+        	_cssString = (hasAlpha ? "rgba(" : "rgb(") + 
+        	    parseInt(_components[0] * 255.0) + ", " + 
+        	    parseInt(_components[1] * 255.0) + ", " + 
+        	    parseInt(_components[2] * 255.0) + 
+        	    (hasAlpha ?  (", " + _components[3]) : "") + ")";
+		}
     }
-
     return self;
 }
 
@@ -449,14 +419,13 @@ var cachedBlackColor,
 - (id)_initWithPatternImage:(CPImage)anImage
 {
     self = [super init];
-
+    
     if (self)
     {
         _patternImage = anImage;
         _cssString = "url(\"" + [_patternImage filename] + "\")";
-        _components = [0.0, 0.0, 0.0, 1.0];
     }
-
+       
     return self;
 }
 
@@ -518,17 +487,17 @@ var cachedBlackColor,
 
 /*!
     Returns a new color with the same RGB as the receiver but a new alpha component.
-
+    
     @param anAlphaComponent the alpha component for the new color
-
+    
     @return a new color object
 */
 - (CPColor)colorWithAlphaComponent:(float)anAlphaComponent
 {
     var components = _components.slice();
-
+    
     components[components.length - 1] = anAlphaComponent;
-
+    
     return [[[self class] alloc] _initWithRGBA:components];
 }
 
@@ -547,40 +516,37 @@ var cachedBlackColor,
     var red   = ROUND(_components[_redComponent] * 255.0),
         green = ROUND(_components[_greenComponent] * 255.0),
         blue  = ROUND(_components[_blueComponent] * 255.0);
-
+        
     var max   = MAX(red, green, blue),
         min   = MIN(red, green, blue),
         delta = max - min;
-
+        
     var brightness = max / 255.0,
         saturation = (max != 0) ? delta / max : 0;
-
+        
     var hue;
-
-    if (saturation == 0)
-    {
+    if(saturation == 0)
         hue = 0;
-    }
     else
     {
-        var rr = (max - red) / delta,
-            gr = (max - green) / delta,
-            br = (max - blue) / delta;
-
-        if (red == max)
+        var rr = (max - red) / delta;
+        var gr = (max - green) / delta;
+        var br = (max - blue) / delta;
+        
+        if (red == max) 
             hue = br - gr;
-        else if (green == max)
+        else if (green == max) 
             hue = 2 + rr - br;
-        else
+        else 
             hue = 4 + gr - rr;
-
+            
         hue /= 6;
-        if (hue < 0)
+        if (hue < 0) 
             hue++;
     }
-
+    
     return [
-        ROUND(hue * 360.0),
+        ROUND(hue * 360.0), 
         ROUND(saturation * 100.0),
         ROUND(brightness * 100.0)
     ];
@@ -605,7 +571,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 */
 - (CPString)hexString
 {
-    return rgbToHex([self redComponent], [self greenComponent], [self blueComponent]);
+    return rgbToHex([self redComponent], [self greenComponent], [self blueComponent])
 }
 
 - (BOOL)isEqual:(CPColor)aColor
@@ -616,19 +582,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
     if (aColor === self)
         return YES;
 
-    if (![aColor isKindOfClass:CPColor])
-        return NO;
-
-    if (_patternImage || [aColor patternImage])
-        return [_patternImage isEqual:[aColor patternImage]];
-
-    // We don't require the components to be equal beyond 8 bits since otherwise
-    // simple rounding errors will make two colours which are exactly the same on
-    // screen compare unequal.
-    return ROUND([self redComponent] * 255.0) == ROUND([aColor redComponent] * 255.0) &&
-           ROUND([self greenComponent] * 255.0) == ROUND([aColor greenComponent] * 255.0) &&
-           ROUND([self blueComponent] * 255.0) == ROUND([aColor blueComponent] * 255.0) &&
-           [self alphaComponent] == [aColor alphaComponent];
+    return [aColor isKindOfClass:CPColor] && [aColor cssString] === [self cssString];
 }
 
 - (CPString)description
@@ -640,7 +594,7 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @implementation CPColor (CoreGraphicsExtensions)
 
-/*!
+/*! 
     Set's the receiver to be the fill and stroke color in the current graphics context
 */
 - (void)set
@@ -649,16 +603,16 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
     [self setStroke];
 }
 
-/*!
+/*! 
     Set's the receiver to be the fill color in the current graphics context
 */
 - (void)setFill
 {
     var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-    CGContextSetFillColor(ctx, self);
+    CGContextSetFillColor(ctx, self);   
 }
 
-/*!
+/*! 
     Set's the receiver to be the stroke color in the current graphics context
 */
 - (void)setStroke
@@ -669,15 +623,6 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-@implementation CPColor (Debugging)
-
-+ (CPColor)randomColor
-{
-    return [CPColor colorWithRed:RAND() green:RAND() blue:RAND() alpha:1.0];
-}
-
-@end
-
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
 
@@ -691,7 +636,7 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 {
     if ([aCoder containsValueForKey:CPColorPatternImageKey])
         return [self _initWithPatternImage:[aCoder decodeObjectForKey:CPColorPatternImageKey]];
-
+    
     return [self _initWithRGBA:[aCoder decodeObjectForKey:CPColorComponentsKey]];
 }
 
@@ -709,48 +654,59 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 
 @end
 
-
 var hexCharacters = "0123456789ABCDEF";
 
 /*!
-    Used for the CPColor \c +colorWithHexString: implementation
+    Used for the CPColor <code>colorWithHexString:</code> implementation
     @ignore
     @class CPColor
     @return an array of rgb components
 */
-var hexToRGB = function(hex)
+function hexToRGB(hex) 
 {
-    if (hex.length == 3)
+    if ( hex.length == 3 )
         hex = hex.charAt(0) + hex.charAt(0) + hex.charAt(1) + hex.charAt(1) + hex.charAt(2) + hex.charAt(2);
-
-    if (hex.length != 6)
+    if(hex.length != 6)
         return null;
 
     hex = hex.toUpperCase();
 
-    for (var i = 0; i < hex.length; i++)
-        if (hexCharacters.indexOf(hex.charAt(i)) == -1)
+    for(var i=0; i<hex.length; i++)
+        if(hexCharacters.indexOf(hex.charAt(i)) == -1)
             return null;
-
-    var red   = (hexCharacters.indexOf(hex.charAt(0)) * 16 + hexCharacters.indexOf(hex.charAt(1))) / 255.0,
-        green = (hexCharacters.indexOf(hex.charAt(2)) * 16 + hexCharacters.indexOf(hex.charAt(3))) / 255.0,
-        blue  = (hexCharacters.indexOf(hex.charAt(4)) * 16 + hexCharacters.indexOf(hex.charAt(5))) / 255.0;
-
+            
+    var red   = (hexCharacters.indexOf(hex.charAt(0)) * 16 + hexCharacters.indexOf(hex.charAt(1))) / 255.0;
+    var green = (hexCharacters.indexOf(hex.charAt(2)) * 16 + hexCharacters.indexOf(hex.charAt(3))) / 255.0;
+    var blue  = (hexCharacters.indexOf(hex.charAt(4)) * 16 + hexCharacters.indexOf(hex.charAt(5))) / 255.0;
+    
     return [red, green, blue, 1.0];
-};
+}
 
-var rgbToHex = function(r,g,b)
-{
+function integerToBytes(integer, length) {
+	if (!length)
+		length = (integer == 0) ? 1 : Math.round((Math.log(integer)/Math.log(2))/8+0.5);
+		
+	var bytes = new Array(length);
+	for (var i = length-1; i >= 0; i--) {
+		bytes[i] = integer & 255;
+		integer = integer >> 8
+	}
+	return bytes;
+}
+
+function rgbToHex(r,g,b) {
     return byteToHex(r) + byteToHex(g) + byteToHex(b);
-};
+}
 
-var byteToHex = function(n)
-{
-    if (!n || isNaN(n))
-        return "00";
+function byteToHex(n) {
+    if (!n || isNaN(n)) return "00";
+    n = ROUND(MIN(255,MAX(0,256*n)));
+    return  hexCharacters.charAt((n - n % 16) / 16) +
+            hexCharacters.charAt(n % 16);
+}
 
-    n = FLOOR(MIN(255, MAX(0, 256 * n)));
+// Toll-Free bridge CPColor to CGColor.
+//CGColor.prototype.isa = CPColor;
+//[CPColor initialize];
 
-    return hexCharacters.charAt((n - n % 16) / 16) +
-           hexCharacters.charAt(n % 16);
-};
+//http://dev.mootools.net/browser/trunk/Source/Utilities/Color.js?rev=1184

AppKit/CPColorPanel.j

@@ -20,13 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPApplication.j"
 @import "CPButton.j"
 @import "CPCookie.j"
 @import "CPPanel.j"
 @import "CPView.j"
 
-
 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
 
 var PREVIEW_HEIGHT = 20.0,
@@ -37,7 +35,7 @@ var PREVIEW_HEIGHT = 20.0,
 
 var SharedColorPanel = nil,
     ColorPickerClasses = [];
-
+    
 /*
     A color wheel
     @global
@@ -54,16 +52,16 @@ CPSliderColorPickerMode = 2;
 CPColorPickerViewWidth  = 265,
 CPColorPickerViewHeight = 370;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPColorPanel
 
     CPColorPanel provides a reusable panel that can be used
     displayed on screen to prompt the user for a color selection. To
-    obtain the panel, call the \c +sharedColorPanel method.
+    obtain the panel, call the <code>sharedColorPanel</code> method.
 */
 @implementation CPColorPanel : CPPanel
-{
+{    
     _CPColorPanelToolbar    _toolbar;
     _CPColorPanelSwatches   _swatchView;
     _CPColorPanelPreview    _previewView;
@@ -82,8 +80,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
@@ -98,7 +96,7 @@ CPColorPickerViewHeight = 370;
 {
     if (!SharedColorPanel)
         SharedColorPanel = [[CPColorPanel alloc] init];
-
+    
     return SharedColorPanel;
 }
 
@@ -109,16 +107,16 @@ CPColorPickerViewHeight = 370;
 + (void)setPickerMode:(CPColorPanelMode)mode
 {
     var panel = [CPColorPanel sharedColorPanel];
-    [panel setMode:mode];
+    [panel setMode: mode];
 }
 
 /*
-    To obtain the color panel, use \c +sharedColorPanel.
+    To obtain the color panel, use <code>sharedColorPanel</code>.
     @ignore
 */
 - (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)
@@ -127,30 +125,30 @@ CPColorPickerViewHeight = 370;
 
         [self setTitle:@"Color Panel"];
         [self setLevel:CPFloatingWindowLevel];
-
+        
         [self setFloatingPanel:YES];
         [self setBecomesKeyOnlyIfNeeded:YES];
-
-        [self setMinSize:CGSizeMake(219.0, 363.0)];
+        
+        [self setMinSize:CGSizeMake(219.0, 342.0)];
         [self setMaxSize:CGSizeMake(323.0, 537.0)];
     }
-
+    
     return self;
 }
 
 /*!
-    Sets the color of the panel, and updates the picker. Also posts a \c CPColorPanelDidChangeNotification.
+    Sets the color of the panel, and updates the picker. Also posts a <code>CPColorPanelDidChangeNotification</code>.
 */
 - (void)setColor:(CPColor)aColor
-{
+{    
     _color = aColor;
     [_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];
@@ -167,7 +165,7 @@ CPColorPickerViewHeight = 370;
 - (void)setColor:(CPColor)aColor updatePicker:(BOOL)bool
 {
     [self setColor:aColor];
-
+    
     if (bool)
         [_activePicker setColor:_color];
 }
@@ -234,30 +232,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: CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin: CPPointMake(5, height)];
     }
-
+    
     [_currentView removeFromSuperview];
     [[self contentView] addSubview:view];
-
+    
     _currentView = view;
     _activePicker = picker;
-
+    
     [picker setColor:[self color]];
 }
 
@@ -287,7 +285,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];
@@ -299,29 +297,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;
     }
@@ -332,7 +330,7 @@ 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];
@@ -340,7 +338,7 @@ CPColorPickerViewHeight = 370;
     [previewBox addSubview:_previewView];
 
     var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
-    [_previewLabel setStringValue:"Preview:"];
+    [_previewLabel setStringValue: "Preview:"];
     [_previewLabel setTextColor:[CPColor blackColor]];
     [_previewLabel setAlignment:CPRightTextAlignment];
 
@@ -352,8 +350,8 @@ 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];
 
@@ -369,10 +367,9 @@ CPColorPickerViewHeight = 370;
     [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:)];
@@ -418,37 +415,37 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPCookie        _swatchCookie;
 }
 
-- (id)initWithFrame:(CPRect)aFrame
+-(id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     [self setBackgroundColor: [CPColor grayColor]];
-
+    
     [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
 
     var whiteColor = [CPColor whiteColor];
 
     _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: CPRectMake(13*i+1, 1, 12, 12)],
             fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
-
+        
         [view setBackgroundColor:whiteColor];
         [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
 
         [view addSubview:fillView];
 
         [self addSubview: view];
-
+        
         _swatches.push(view);
     }
-
+        
     return self;
 }
 
@@ -460,8 +457,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 - (CPArray)startingColorList
 {
     var cookieValue = [_swatchCookie value];
-
-    if (cookieValue == "")
+    if(cookieValue == "")
     {
         return [
             [CPColor blackColor],
@@ -475,11 +471,11 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
             [CPColor yellowColor]
         ];
     }
-
-    var cookieValue = eval(cookieValue),
-        result = [];
-
-    for (var i = 0; i < cookieValue.length; i++)
+    
+    var cookieValue = eval(cookieValue);
+    var result = [];
+    
+    for(var i=0; i<cookieValue.length; i++)
         result.push([CPColor colorWithHexString: cookieValue[i]]);
 
     return result;
@@ -489,12 +485,12 @@ 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];
 }
 
@@ -522,10 +518,9 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 - (void)mouseUp:(CPEvent)anEvent
 {
-    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)
+    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
+    
+    if(point.x > [self bounds].size.width - 1 || point.x < 1)
         return NO;
 
     [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
@@ -535,25 +530,25 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     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]);
 
     // 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
@@ -567,20 +562,20 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
-    if (aType == CPColorDragType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
+    if(aType == CPColorDragType)
+        [aPasteboard setData:_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:[pasteboard dataForType:CPColorDragType] atIndex: FLOOR(location.x / 13)];
 }
 
 @end
@@ -594,9 +589,9 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 - (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
-
+    
     return self;
 }
 
@@ -614,11 +609,11 @@ 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];
+        
+    var color = [pasteboard dataForType:CPColorDragType];
+    [_colorPanel setColor: color updatePicker: YES];
 }
 
 - (BOOL)isOpaque
@@ -630,19 +625,19 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
 
-    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];
-
+    [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];    
+    
     var bounds = CPRectMake(0, 0, 15, 15);
-
+    
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame: bounds],
+    var dragView = [[CPView alloc] initWithFrame: bounds];
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
-
+    
     [dragView setBackgroundColor:[CPColor blackColor]];
     [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)
@@ -654,8 +649,8 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
 {
-    if (aType == CPColorDragType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:[self backgroundColor]] forType:aType];
+    if(aType == CPColorDragType)
+        [aPasteboard setData:[self backgroundColor] forType:aType];
 }
 
 @end

AppKit/CPColorPicker.j

@@ -21,15 +21,13 @@
  */
 
 @import <Foundation/CPObject.j>
+@import "CPColorPanel.j"
 
-@import "CPView.j"
-
-
-/*!
+/*! 
     @ingroup appkit
     @class CPColorPicker
 
-    CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's \c +setPickerMode: method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
+    CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's <code>setPickerMode:</code> method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
 */
 @implementation CPColorPicker : CPObject
 {
@@ -62,7 +60,7 @@
 
 /*
     FIXME Not implemented.
-    @return \c nil
+    @return <code>nil</code>
     @ignore
 */
 - (CPImage)provideNewButtonImage
@@ -102,18 +100,18 @@
 
     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);
 
     _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)];
 
@@ -136,17 +134,17 @@
     [_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,7 +221,7 @@
     float       _radius;
 }
 
-- (id)initWithFrame:(CPRect)aFrame
+-(id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -241,10 +239,8 @@
     _blackWheelImage.style.filter = "alpha(opacity=0)"
     _blackWheelImage.style.position = "absolute";
 
-#if PLATFORM(DOM)
     _DOMElement.appendChild(_wheelImage);
     _DOMElement.appendChild(_blackWheelImage);
-#endif
 
     [self setWheelSize:aFrame.size];
 
@@ -261,19 +257,19 @@
     return self;
 }
 
-- (void)setWheelBrightness:(float)brightness
+-(void)setWheelBrightness:(float)brightness
 {
     _blackWheelImage.style.opacity = 1.0 - brightness;
-    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness) * 100 + ")"
+    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness)*100 + ")"
 }
 
-- (void)setFrameSize:(CPSize)aSize
+-(void)setFrameSize:(CPSize)aSize
 {
     [super setFrameSize:aSize];
     [self setWheelSize:aSize];
 }
 
-- (void)setWheelSize:(CPSize)aSize
+-(void)setWheelSize:(CPSize)aSize
 {
     var min = MIN(aSize.width, aSize.height);
 
@@ -296,55 +292,57 @@
     [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],
-        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);
+        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);
 
     [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],
-        midX   = CGRectGetMidX(bounds),
-        midY   = CGRectGetMidY(bounds);
+    var bounds = [self bounds];
+    var midX   = CGRectGetMidX(bounds);
+    var midY   = CGRectGetMidY(bounds);
 
     _angle     = [self radiansToDegrees:angle];
     _distance  = (distance / _radius) * 100.0;
@@ -352,22 +350,23 @@
     [_crosshair setFrameOrigin:CPPointMake(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],
-        angle    = [self degreesToRadians:hsb[0]],
+        bounds = [self bounds];
+
+    var 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/CPColorWell.j

@@ -29,19 +29,19 @@
 
 var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiveNotification";
 
-/*!
+/*! 
     @ingroup appkit
     @class CPColorWell
 
     CPColorWell is a CPControl for selecting and displaying a single color value. An example of a CPColorWell object (or simply color well) is found in CPColorPanel, which uses a color well to display the current color selection.</p>
 
-    <p>An application can have one or more active CPColorWells. You can activate multiple CPColorWells by invoking the \c -activate: method with \c NO as its argument. When a mouse-down event occurs on an CPColorWell's border, it becomes the only active color well. When a color well becomes active, it brings up the color panel also.
+    <p>An application can have one or more active CPColorWells. You can activate multiple CPColorWells by invoking the <code>activate:</code> method with <code>NO</code> as its argument. When a mouse-down event occurs on an CPColorWell's border, it becomes the only active color well. When a color well becomes active, it brings up the color panel also.
 */
 @implementation CPColorWell : CPControl
 {
     BOOL    _active;
     BOOL    _bordered;
-
+    
     CPColor _color;
     CPView  _wellView;
 }
@@ -49,19 +49,19 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 - (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 _registerForNotifications];
     }
-
+    
     return self;
 }
 
@@ -97,9 +97,9 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     if (_bordered == bordered)
         return;
-
+        
     _bordered = bordered;
-
+    
     [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 }
 
@@ -120,14 +120,14 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     if (_color == aColor)
         return;
-
+    
     _color = aColor;
-
+    
     [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 }
 
 /*!
-    Changes the color of the well to that of \c aSender.
+    Changes the color of the well to that of <code>aSender</code>.
     @param aSender the object from which to retrieve the color
 */
 - (void)takeColorFrom:(id)aSender
@@ -137,8 +137,8 @@ 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.
-    If exclusive is \c YES, deactivates any other CPColorWells. \c NO, keeps them active.
+    Activates the color well, displays the color panel, and makes the panel's current color the same as its own. 
+    If exclusive is <code>YES</code>, deactivates any other CPColorWells. <code>NO</code>, keeps them active.
     @param shouldBeExclusive whether other color wells should be deactivated.
 */
 - (void)activate:(BOOL)shouldBeExclusive
@@ -152,9 +152,9 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     if ([self isActive])
         return;
-
+        
     _active = YES;
-
+    
     [[CPNotificationCenter defaultCenter]
         addObserver:self
            selector:@selector(colorPanelDidChangeColor:)
@@ -169,9 +169,9 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 {
     if (![self isActive])
         return;
-
+    
     _active = NO;
-
+    
     [[CPNotificationCenter defaultCenter]
         removeObserver:self
                   name:CPColorPanelColorDidChangeNotification
@@ -179,7 +179,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 }
 
 /*!
-    Returns \c YES if the color well is active.
+    Returns <code>YES</code> if the color well is active.
 */
 - (BOOL)isActive
 {
@@ -202,19 +202,19 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     {
         _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]];
 }
 
@@ -231,31 +231,25 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    if (![self isEnabled])
-        return;
-
     [self drawBezelWithHighlight:YES];
 }
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    if (![self isEnabled])
-        return;
-
     [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
 }
 
-- (void)mouseUp:(CPEvent)anEvent
+-(void)mouseUp:(CPEvent)anEvent
 {
     [self drawBezelWithHighlight:NO];
 
-    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]) || ![self isEnabled])
+    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]))
         return;
-
+        
     [self activate:YES];
 
     var colorPanel = [CPColorPanel sharedColorPanel];
-
+    
     [colorPanel setColor:_color];
     [colorPanel orderFront:self];
 }
@@ -268,17 +262,17 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 @implementation CPColorWell (CPCoding)
 
 /*!
-    Initializes the color well by unarchiving data from \c aCoder.
+    Initializes the color well by unarchiving data from <code>aCoder</code>.
     @param aCoder the coder containing the archived CPColorWell.
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
         _active = NO;
-        _bordered = [aCoder decodeBoolForKey:CPColorWellBorderedKey];
+        _bordered = [aCoder decodeObjectForKey:CPColorWellBorderedKey];
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
 
         [self drawBezelWithHighlight:NO];
@@ -286,7 +280,7 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 
         [self _registerForNotifications];
     }
-
+    
     return self;
 }
 
@@ -296,17 +290,17 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    // We do this in order to avoid encoding the _wellView, which
+    // 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];
 }

AppKit/CPCompatibility.j

@@ -21,8 +21,6 @@
  */
 
 @import "CPEvent.j"
-@import "CPPlatform.j"
-
 
 // Browser Engines
 CPUnknownBrowserEngine                  = 0;
@@ -32,40 +30,33 @@ CPKHTMLBrowserEngine                    = 3;
 CPOperaBrowserEngine                    = 4;
 CPWebKitBrowserEngine                   = 5;
 
-// Operating Systems
-CPMacOperatingSystem                    = 0;
-CPWindowsOperatingSystem                = 1;
-CPOtherOperatingSystem                  = 2;
-
 // Features
 CPCSSRGBAFeature                        = 1 << 5;
 
 CPHTMLCanvasFeature                     = 1 << 6;
 CPHTMLContentEditableFeature            = 1 << 7;
-CPHTMLDragAndDropFeature                = 1 << 8;
 
-CPJavaScriptInnerTextFeature            = 1 << 9;
-CPJavaScriptTextContentFeature          = 1 << 10;
-CPJavaScriptClipboardEventsFeature      = 1 << 11;
-CPJavaScriptClipboardAccessFeature      = 1 << 12;
-CPJavaScriptCanvasDrawFeature           = 1 << 13;
-CPJavaScriptCanvasTransformFeature      = 1 << 14;
+CPJavascriptInnerTextFeature            = 1 << 8;
+CPJavascriptTextContentFeature          = 1 << 9;
+CPJavascriptClipboardEventsFeature      = 1 << 10;
+CPJavascriptClipboardAccessFeature      = 1 << 11;
+CPJavaScriptCanvasDrawFeature           = 1 << 12;
+CPJavaScriptCanvasTransformFeature      = 1 << 13;
 
-CPVMLFeature                            = 1 << 15;
+CPVMLFeature                            = 1 << 14;
 
-CPJavaScriptRemedialKeySupport          = 1 << 16;
+CPJavascriptRemedialKeySupport          = 1 << 15;
 CPJavaScriptShadowFeature               = 1 << 20;
 
 CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
-CPJavaScriptMouseWheelValues_8_15       = 1 << 23;
+CPJavaScriptMouseWheelValues_8_15       = 1 << 23
 
 CPOpacityRequiresFilterFeature          = 1 << 24;
 
 //Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 1 << 25;
-CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
+CPInputTypeCanBeChangedFeature          = 1 << 25;  
+
 
-CPSOPDisabledFromFileURLs               = 1 << 27;
 
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
@@ -75,27 +66,27 @@ var USER_AGENT                          = "",
 
 PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
 
-if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
+if (typeof window != "undfined" && typeof window.navigator != "undefined")
     USER_AGENT = window.navigator.userAgent;
 
 // Opera
-if (typeof window !== "undefined" && window.opera)
+if (window.opera)
 {
     PLATFORM_ENGINE = CPOperaBrowserEngine;
-
+    
     PLATFORM_FEATURES |= CPJavaScriptCanvasDrawFeature;
 }
 
 // Internet Explorer
-else if (typeof window !== "undefined" && window.attachEvent) // Must follow Opera check.
+else if (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 |= CPJavascriptRemedialKeySupport;
     PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
-
+    
     PLATFORM_FEATURES |= CPOpacityRequiresFilterFeature;
 
     PLATFORM_FEATURES &= ~CPInputTypeCanBeChangedFeature;
@@ -105,38 +96,20 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
 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;
-
-    if (USER_AGENT.indexOf("Chrome") === -1)
-        PLATFORM_FEATURES |= CPHTMLDragAndDropFeature;
-
-    PLATFORM_FEATURES |= CPJavaScriptClipboardEventsFeature;
-    PLATFORM_FEATURES |= CPJavaScriptClipboardAccessFeature;
+    PLATFORM_FEATURES |= CPJavascriptClipboardEventsFeature;
+    PLATFORM_FEATURES |= CPJavascriptClipboardAccessFeature;
     PLATFORM_FEATURES |= CPJavaScriptShadowFeature;
-
+    
     var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
         versionEnd = USER_AGENT.indexOf(" ", versionStart),
-        versionString = USER_AGENT.substring(versionStart, versionEnd),
-        versionDivision = versionString.indexOf('.'),
-        majorVersion = parseInt(versionString.substring(0, versionDivision)),
-        minorVersion = parseInt(versionString.substr(versionDivision + 1));
+        version = parseFloat(USER_AGENT.substring(versionStart, versionEnd), 10);
 
-    if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
-        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
-
-    // FIXME this is a terrible hack to get around this bug:
-    // https://bugs.webkit.org/show_bug.cgi?id=21548
-    if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
-
-    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
-
-    if (USER_AGENT.indexOf("Chrome") === CPNotFound)
-        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
+    if(USER_AGENT.indexOf("Plainview") == -1 && version >= 525.14 || USER_AGENT.indexOf("Chrome") != -1)
+        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
 }
 
 // KHTML
@@ -149,12 +122,12 @@ 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;
-
+    
     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;
 
@@ -170,21 +143,21 @@ if (typeof document != "undefined")
     if (canvasElement && canvasElement.getContext)
     {
         PLATFORM_FEATURES |= CPHTMLCanvasFeature;
-
+    
         // Detect Canvas setTransform/transform support
         var context = document.createElement("canvas").getContext("2d");
-
+        
         if (context && context.setTransform && context.transform)
             PLATFORM_FEATURES |= CPJavaScriptCanvasTransformFeature;
     }
-
+    
     var DOMElement = document.createElement("div");
-
+    
     // Detect whether we have innerText or textContent (or neither)
     if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES |= CPJavaScriptInnerTextFeature;
+        PLATFORM_FEATURES |= CPJavascriptInnerTextFeature;
     else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES |= CPJavaScriptTextContentFeature;
+        PLATFORM_FEATURES |= CPJavascriptTextContentFeature;
 }
 
 function CPFeatureIsCompatible(aFeature)
@@ -194,38 +167,26 @@ function CPFeatureIsCompatible(aFeature)
 
 function CPBrowserIsEngine(anEngine)
 {
-    return PLATFORM_ENGINE === anEngine;
+    return PLATFORM_ENGINE == anEngine;
 }
 
-function CPBrowserIsOperatingSystem(anOperatingSystem)
+if (USER_AGENT.indexOf("Mac") != -1)
 {
-    return OPERATING_SYSTEM === anOperatingSystem;
-}
-
-OPERATING_SYSTEM = CPOtherOperatingSystem;
-
-if (USER_AGENT.indexOf("Mac") !== -1)
-{
-    OPERATING_SYSTEM = CPMacOperatingSystem;
-
     CPPlatformActionKeyMask = CPCommandKeyMask;
-
-    CPUndoKeyEquivalent = @"z";
+    
+    CPUndoKeyEquivalent = @"Z";
     CPRedoKeyEquivalent = @"Z";
 
     CPUndoKeyEquivalentModifierMask = CPCommandKeyMask;
-    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask;
+    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask | CPShiftKeyMask;
 }
 else
 {
-    if (USER_AGENT.indexOf("Windows") !== -1)
-        OPERATING_SYSTEM = CPWindowsOperatingSystem;
-
     CPPlatformActionKeyMask = CPControlKeyMask;
-
-    CPUndoKeyEquivalent = @"z";
-    CPRedoKeyEquivalent = @"y";
-
+    
+    CPUndoKeyEquivalent = @"Z";
+    CPRedoKeyEquivalent = @"Y";
+    
     CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }

AppKit/CPController.j

@@ -1,88 +0,0 @@
-//
-// 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:i] 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,18 +33,18 @@
 {
     CPString    _cookieName;
     CPString    _cookieValue;
-
+    
     CPString    _expires;
 }
 
 /*!
-    Initializes a cookie with a given name \c aName.
+    Initializes a cookie with a given name <code>aName</code>.
     @param the name for the cookie
 */
 - (id)initWithName:(CPString)aName
 {
     self = [super init];
-
+    
     _cookieName  = aName;
     _cookieValue = [self _readCookieValue];
 
@@ -83,39 +83,30 @@
 */
 - (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 = "";
-
-#if PLATFORM(DOM)
-    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
-#else
-    _cookieValue = value;
-    _expires = expires;
-#endif
+        
+	document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;        
 }
 
 /* @ignore */
 - (CPString)_readCookieValue
 {
-#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 "";
+	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 "";
 }
 
 @end

AppKit/CPCursor.j

@@ -1,248 +0,0 @@
-/*
-Cursor support by browser:
-    OS X 10.6/Chrome 8       : All
-    OS X 10.6/Safari 5       : All
-    OS X 10.6/Firefox 3      : All except disappearingItemCursor (no url() support)
-    OS X 10.6/Firefox 3.5    : All except disappearingItemCursor (no url() support)
-    OS X 10.6/Firefox 3.6    : All except disappearingItemCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
-    OS X 10.6/Firefox 4.0b10 : All
-    OS X/Opera 9             : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor  (no url() support)
-    OS X/Opera 10            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
-    OS X/Opera 11            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
-    Win XP/Chrome 8          : All
-    Win XP/Safari 5          : All
-    Win XP/Firefox 3         : All
-    Win XP/Firefox 3.5       : All
-    Win XP/Firefox 3.6       : All
-    Win XP/Firefox 4.0b10    : All
-    Win XP/Opera 10          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
-    Win XP/Opera 11          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
-    Win XP/IE 7              : All
-    Win XP/IE 8              : All
-*/
-
-@import <Foundation/CPObject.j>
-
-var currentCursor = nil,
-    cursorStack = [],
-    cursors = {};
-
-@implementation CPCursor : CPObject
-{
-    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:);
-}
-
-- (id)initWithCSSString:(CPString)aString
-{
-    if (self = [super init])
-        _cssString = aString;
-
-    return self;
-}
-
-// hotspot is supported in CSS3 (but not IE).
-- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
-{
-    _hotSpot = hotSpot;
-    _image = image;
-    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
-}
-
-// foregroundColor and backgroundColor are ignored in Cocoa as well.  See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
-- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CPPoint)aHotSpot
-{
-    return [self initWithImage:image hotSpot:hotSpot];
-}
-
-+ (void)hide
-{
-    [self _setCursorCSS:"none"]; // Not supported in IE
-}
-
-+ (void)unhide
-{
-    [self _setCursorCSS:[currentCursor _cssString]];
-}
-
-+ (void)setHiddenUntilMouseMoves:(BOOL)flag
-{
-    if (flag)
-        [CPCursor hide];
-    else
-        [CPCursor unhide];
-}
-
-- (void)pop
-{
-    [CPCursor pop];
-}
-
-+ (void)pop
-{
-    if (cursorStack.length > 1)
-    {
-        cursorStack.pop();
-        currentCursor = cursorStack[cursorStack.length - 1];
-    }
-}
-
-- (void)push
-{
-    currentCursor = cursorStack.push(self);
-}
-
-- (void)set
-{
-    currentCursor = self;
-
-#if PLATFORM(DOM)
-    [[self class] _setCursorCSS:_cssString];
-#endif
-}
-
-- (void)mouseEntered:(CPEvent)event
-{
-}
-
-- (void)mouseExited:(CPEvent)event
-{
-}
-
-+ (CPCursor)currentCursor
-{
-    return currentCursor;
-}
-
-+ (void)_setCursorCSS:(CPString)aString
-{
-#if PLATFORM(DOM)
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-    for (var i = 0, count = [platformWindows count]; i < count; i++)
-        platformWindows[i]._DOMBodyElement.style.cursor = aString;
-#endif
-}
-
-// Internal method that is used to return the system cursors.  Caches the system cursors for performance.
-+ (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
-{
-    var cursor = cursors[cursorName];
-    if (typeof cursor === 'undefined')
-    {
-        var cssString;
-        if (doesHaveImage)
-            cssString = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/" + cursorName + ".cur), " + aString;
-        else
-            cssString = aString
-        cursor = [[CPCursor alloc] initWithCSSString:cssString];
-        cursors[cursorName] = cursor;
-    }
-    return cursor;
-}
-
-+ (CPCursor)arrowCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:"default" hasImage:NO];
-}
-
-+ (CPCursor)crosshairCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"crosshair" hasImage:NO];
-}
-
-+ (CPCursor)IBeamCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"text" hasImage:NO];
-}
-
-+ (CPCursor)pointingHandCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
-}
-
-+ (CPCursor)resizeDownCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeUpCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"n-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeLeftCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"w-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeRightCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"e-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeLeftRightCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeUpDownCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
-}
-
-+ (CPCursor)operationNotAllowedCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];
-}
-
-+ (CPCursor)dragCopyCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"copy" hasImage:YES];
-}
-
-+ (CPCursor)dragLinkCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"alias" hasImage:YES];
-}
-
-+ (CPCursor)contextualMenuCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"context-menu" hasImage:YES];
-}
-
-+ (CPCursor)openHandCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"move" hasImage:YES];
-}
-
-+ (CPCursor)closedHandCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"-moz-grabbing" hasImage:YES];
-}
-
-+ (CPCursor)disappearingItemCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"auto" hasImage:YES];
-}
-
-@end
-
-@implementation CPCursor(CPCoding)
-
-- (id)initWithCoder:(CPCoder)coder
-{
-    if (self = [super init])
-        _cssString = [coder decodeObjectForKey:@"CPCursorNameKey"];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)coder
-{
-    [coder encodeObject:_cssString forKey:@"CPCursorNameKey"];
-}
-
-@end

AppKit/CPDocument.j

@@ -23,10 +23,7 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPArray.j>
 
-@import "CPApplication.j"
 @import "CPResponder.j"
-@import "CPSavePanel.j"
-@import "CPViewController.j"
 @import "CPWindowController.j"
 
 
@@ -83,35 +80,29 @@ 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 simultaneously
+    In a document-based application, generally multiple documents are open simutaneously
     (multiple text documents, slide presentations, spreadsheets, etc.), and multiple
     CPDocuments should be used to represent this.
 */
 @implementation CPDocument : CPResponder
-{
-    CPWindow            _window; // For outlet purposes.
-    CPView              _view; // For outlet purposes
-    CPDictionary        _viewControllersForWindowControllers;
+{    
+    CPURL           _fileURL;
+    CPString        _fileType;
+    CPArray         _windowControllers;
+    unsigned        _untitledDocumentIndex;
 
-    CPURL               _fileURL;
-    CPString            _fileType;
-    CPArray             _windowControllers;
-    unsigned            _untitledDocumentIndex;
-
-    BOOL                _hasUndoManager;
-    CPUndoManager       _undoManager;
-
-    int                 _changeCount;
-
-    CPURLConnection     _readConnection;
-    CPURLRequest        _writeRequest;
-
-    CPAlert             _canCloseAlert;
+    BOOL            _hasUndoManager;
+    CPUndoManager   _undoManager;
+    
+    int             _changeCount;
+    
+    CPURLConnection _readConnection;
+    CPURLRequest    _writeRequest;
 }
 
 /*!
@@ -121,18 +112,17 @@ var CPDocumentUntitledCount = 0;
 - (id)init
 {
     self = [super init];
-
+    
     if (self)
     {
         _windowControllers = [];
-        _viewControllersForWindowControllers = [CPDictionary dictionary];
-
+        
         _hasUndoManager = YES;
         _changeCount = 0;
-
+        
         [self setNextResponder:CPApp];
     }
-
+    
     return self;
 }
 
@@ -145,10 +135,10 @@ var CPDocumentUntitledCount = 0;
 - (id)initWithType:(CPString)aType error:({CPError})anError
 {
     self = [self init];
-
+    
     if (self)
         [self setFileType:aType];
-
+    
     return self;
 }
 
@@ -166,15 +156,15 @@ 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 readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
+        
         [self setFileURL:anAbsoluteURL];
         [self setFileType:aType];
-
-        [self readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
     }
-
+    
     return self;
 }
 
@@ -184,22 +174,22 @@ var CPDocumentUntitledCount = 0;
     @param absoluteContentsURL the location of the document's contents
     @param aType the type of the contents
     @param aDelegate this object will receive a callback after the document's contents are loaded
-    @param aDidReadSelector the message selector that will be sent to \c aDelegate
-    @param aContextInfo passed as the argument to the message sent to the \c aDelegate
+    @param aDidReadSelector the message selector that will be sent to <code>aDelegate</code>
+    @param aContextInfo passed as the argument to the message sent to the <code>aDelegate</code>
     @return the initialized document
 */
 - (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 readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
+        
         [self setFileURL:anAbsoluteURL];
         [self setFileType:aType];
-
-        [self readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
     }
-
+    
     return self;
 }
 
@@ -208,7 +198,7 @@ var CPDocumentUntitledCount = 0;
     throws an exception.
     @param aType the format of the data
     @param anError not used
-    @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
+    @throws CPUnsupportedMethodException if this method hasn't been overriden by the subclass
     @return the document data
 */
 - (CPData)dataOfType:(CPString)aType error:({CPError})anError
@@ -232,73 +222,15 @@ var CPDocumentUntitledCount = 0;
                 reason:"readFromData:ofType: must be overridden by the document subclass."];
 }
 
-- (void)viewControllerWillLoadCib:(CPViewController)aViewController
-{
-}
-
-- (void)viewControllerDidLoadCib:(CPViewController)aViewController
-{
-}
-
-- (CPWindowController)firstEligibleExistingWindowController
-{
-    return nil;
-}
-
 // Creating and managing window controllers
 /*!
     Creates the window controller for this document.
 */
 - (void)makeWindowControllers
 {
-    [self makeViewAndWindowControllers];
-}
-
-- (void)makeViewAndWindowControllers
-{
-    var viewCibName = [self viewCibName],
-        viewController = nil,
-        windowController = nil;
-
-    // Create our view controller if we have a cib for it.
-    if ([viewCibName length])
-        viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];
-
-    // If we have a view controller, check if we have a free window for it.
-    if (viewController)
-        windowController = [self firstEligibleExistingWindowController];
-
-    // If not, create one.
-    if (!windowController)
-    {
-        var windowCibName = [self windowCibName];
-
-        // From a cib if we have one.
-        if ([windowCibName length])
-            windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
-
-        // If not you get a standard window capable of displaying multiple documents and view
-        else if (viewController)
-        {
-            var view = [viewController view],
-                viewFrame = [view frame];
-
-            viewFrame.origin = CGPointMake(50, 50);
-
-            var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
-
-            windowController = [[CPWindowController alloc] initWithWindow:theWindow];
-        }
-    }
-
-    if (windowController && viewController)
-        [windowController setSupportsMultipleDocuments:YES];
-
-    if (windowController)
-        [self addWindowController:windowController];
-
-    if (viewController)
-        [self addViewController:viewController forWindowController:windowController];
+    var controller = [[CPWindowController alloc] initWithWindowCibName:nil];
+    
+    [self addWindowController:controller];
 }
 
 /*!
@@ -317,52 +249,12 @@ var CPDocumentUntitledCount = 0;
 - (void)addWindowController:(CPWindowController)aWindowController
 {
     [_windowControllers addObject:aWindowController];
-
-    if ([aWindowController document] !== self)
+    
+    if ([aWindowController document] != self)
+    {
+        [aWindowController setNextResponder:self];
         [aWindowController setDocument:self];
-}
-
-/*!
-    Remove a controller to the document's list of controllers. This should
-    be called after closing the controller's window.
-    @param aWindowController the controller to remove
-*/
-- (void)removeWindowController:(CPWindowController)aWindowController
-{
-    if (aWindowController)
-        [_windowControllers removeObject:aWindowController];
-
-    if ([aWindowController document] === self)
-        [aWindowController setDocument:nil];
-}
-
-- (CPView)view
-{
-    return _view;
-}
-
-- (CPArray)viewControllers
-{
-    return [_viewControllersForWindowControllers allValues];
-}
-
-- (void)addViewController:(CPViewController)aViewController forWindowController:(CPWindowController)aWindowController
-{
-    // FIXME: exception if we don't own the window controller?
-    [_viewControllersForWindowControllers setObject:aViewController forKey:[aWindowController UID]];
-
-    if ([aWindowController document] === self)
-        [aWindowController setViewController:aViewController];
-}
-
-- (void)removeViewController:(CPViewController)aViewController
-{
-    [_viewControllersForWindowControllers removeObject:aViewController];
-}
-
-- (CPViewController)viewControllerForWindowController:(CPWindowController)aWindowController
-{
-    return [_viewControllersForWindowControllers objectForKey:[aWindowController UID]];
+    }
 }
 
 // Managing Document Windows
@@ -371,7 +263,6 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)showWindows
 {
-    [_windowControllers makeObjectsPerformSelector:@selector(setDocument:) withObject:self];
     [_windowControllers makeObjectsPerformSelector:@selector(showWindow:) withObject:self];
 }
 
@@ -382,19 +273,14 @@ var CPDocumentUntitledCount = 0;
 {
     if (_fileURL)
         return [_fileURL lastPathComponent];
-
+    
     if (!_untitledDocumentIndex)
         _untitledDocumentIndex = ++CPDocumentUntitledCount;
+	
+	if (_untitledDocumentIndex == 1)
+	   return @"Untitled";
 
-    if (_untitledDocumentIndex == 1)
-       return @"Untitled";
-
-    return @"Untitled " + _untitledDocumentIndex;
-}
-
-- (CPString)viewCibName
-{
-    return nil;
+	return @"Untitled " + _untitledDocumentIndex;
 }
 
 /*!
@@ -406,18 +292,18 @@ var CPDocumentUntitledCount = 0;
 }
 
 /*!
-    Called after \c aWindowController loads the document's Nib file.
+    Called after <code>aWindowController<code> loads the document's Nib file.
     @param aWindowController the controller that loaded the Nib file
 */
-- (void)windowControllerDidLoadCib:(CPWindowController)aWindowController
+- (void)windowControllerDidLoadNib:(CPWindowController)aWindowController
 {
 }
 
 /*!
-    Called before \c aWindowController will load the document's Nib file.
+    Called before <code>aWindowController</code> will load the document's Nib file.
     @param aWindowController the controller that will load the Nib file
 */
-- (void)windowControllerWillLoadCib:(CPWindowController)aWindowController
+- (void)windowControllerWillLoadNib:(CPWindowController)aWindowController
 {
 }
 
@@ -436,7 +322,7 @@ var CPDocumentUntitledCount = 0;
 
     // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
     _readConnection = [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:anAbsoluteURL] delegate:self];
-
+    
     _readConnection.session = _CPReadSessionMake(aType, aDelegate, aDidReadSelector, aContextInfo);
 }
 
@@ -454,11 +340,11 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)setFileURL:(CPURL)aFileURL
 {
-    if (_fileURL === aFileURL)
+    if (_fileURL == aFileURL)
         return;
 
     _fileURL = aFileURL;
-
+    
     [_windowControllers makeObjectsPerformSelector:@selector(synchronizeWindowTitleWithDocumentName)];
 }
 
@@ -479,22 +365,17 @@ var CPDocumentUntitledCount = 0;
 
     _writeRequest = [CPURLRequest requestWithURL:anAbsoluteURL];
 
-    // FIXME: THIS IS WRONG! We need a way to decide
-    if ([CPPlatform isBrowser])
-        [_writeRequest setHTTPMethod:@"POST"];
-    else
-        [_writeRequest setHTTPMethod:@"PUT"];
-
-    [_writeRequest setHTTPBody:[data rawString]];
-
+    [_writeRequest setHTTPMethod:@"POST"];
+    [_writeRequest setHTTPBody:[data string]];
+    
     [_writeRequest setValue:@"close" forHTTPHeaderField:@"Connection"];
 
-    if (aSaveOperation === CPSaveOperation)
+    if (aSaveOperation == CPSaveOperation)
         [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
-
-    if (aSaveOperation !== CPSaveToOperation)
+    
+    if (aSaveOperation != CPSaveToOperation)
         [self updateChangeCount:CPChangeCleared];
-
+    
     // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
     var connection = [CPURLConnection connectionWithRequest:_writeRequest delegate:self];
 
@@ -510,21 +391,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
@@ -533,25 +414,24 @@ 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];
             }
         }
     }
@@ -564,11 +444,11 @@ var CPDocumentUntitledCount = 0;
 - (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)aData
 {
     var session = aConnection.session;
-
+        
     // READ
     if (aConnection == _readConnection)
     {
-        [self readFromData:[CPData dataWithRawString:aData] ofType:session.fileType error:nil];
+        [self readFromData:[CPData dataWithString:aData] ofType:session.fileType error:nil];
 
         objj_msgSend(session.delegate, session.didReadSelector, self, YES, session.contextInfo);
     }
@@ -576,11 +456,10 @@ 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];
     }
 }
 
@@ -591,24 +470,23 @@ 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;
 
         alert("There was an error saving the document.");
 
         objj_msgSend(session.delegate, session.didSaveSelector, self, NO, session.contextInfo);
-        [self _sendDocumentSavedNotification:NO];
     }
 }
 
@@ -624,7 +502,7 @@ var CPDocumentUntitledCount = 0;
 
 // Managing Document Status
 /*!
-    Returns \c YES if there are any unsaved changes.
+    Returns <code>YES</code> if there are any unsaved changes.
 */
 - (BOOL)isDocumentEdited
 {
@@ -644,9 +522,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]];
 }
 
@@ -670,7 +548,7 @@ var CPDocumentUntitledCount = 0;
 
 // Working with Undo Manager
 /*!
-    Returns \c YES if the document has a
+    Returns <code>YES</code> if the document has a
     CPUndoManager.
 */
 - (BOOL)hasUndoManager
@@ -680,15 +558,15 @@ var CPDocumentUntitledCount = 0;
 
 /*!
     Sets whether the document should have a CPUndoManager.
-    @param aFlag \c YES makes the document have an undo manager
+    @param aFlag <code>YES</code> makes the document have an undo manager
 */
 - (void)setHasUndoManager:(BOOL)aFlag
 {
     if (_hasUndoManager == aFlag)
         return;
-
+    
     _hasUndoManager = aFlag;
-
+    
     if (!_hasUndoManager)
         [self setUndoManager:nil];
 }
@@ -697,7 +575,7 @@ var CPDocumentUntitledCount = 0;
 - (void)_undoManagerWillCloseGroup:(CPNotification)aNotification
 {
     var undoManager = [aNotification object];
-
+    
     if ([undoManager isUndoing] || [undoManager isRedoing])
         return;
 
@@ -724,13 +602,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];
@@ -739,17 +617,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
@@ -764,7 +642,7 @@ var CPDocumentUntitledCount = 0;
 
 /*!
     Returns the document's undo manager. If the document
-    should have one, but the manager is \c nil, it
+    should have one, but the manager is <code>nil</code>, it
     will be created and then returned.
     @return the document's undo manager
 */
@@ -775,7 +653,7 @@ var CPDocumentUntitledCount = 0;
 
     return _undoManager;
 }
-
+ 
 /*
     Implemented as a delegate of a CPWindow
     @ignore
@@ -788,27 +666,22 @@ var CPDocumentUntitledCount = 0;
 // Handling User Actions
 /*!
     Saves the document. If the document does not
-    have a file path to save to (\c fileURL)
-    then \c -saveDocumentAs: will be called.
+    have a file path to save to (<code>fileURL</code>)
+    then <code>saveDocumentAs:</code> will be called.
     @param aSender the object requesting the save
 */
 - (void)saveDocument:(id)aSender
-{
-    [self saveDocumentWithDelegate:nil didSaveSelector:nil contextInfo:nil];
-}
-
-- (void)saveDocumentWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
 {
     if (_fileURL)
     {
         [[CPNotificationCenter defaultCenter]
             postNotificationName:CPDocumentWillSaveNotification
                           object:self];
-
-        [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+        
+        [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:self didSaveSelector:@selector(document:didSave:contextInfo:) contextInfo:NULL];
     }
     else
-        [self _saveDocumentAsWithDelegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+        [self saveDocumentAs:self];
 }
 
 /*!
@@ -817,30 +690,22 @@ var CPDocumentUntitledCount = 0;
 */
 - (void)saveDocumentAs:(id)aSender
 {
-    [self _saveDocumentAsWithDelegate:nil didSaveSelector:nil contextInfo:nil];
-}
+    _documentName = window.prompt("Document Name:");
 
-- (void)_saveDocumentAsWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
-{
-    var savePanel = [CPSavePanel savePanel],
-        response = [savePanel runModal];
-
-    if (!response)
+    if (!_documentName)
         return;
-
-    var saveURL = [savePanel URL];
-
+        
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPDocumentWillSaveNotification
                       object:self];
-
-    [self saveToURL:saveURL ofType:[self fileType] forSaveOperation:CPSaveAsOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
+    
+    [self saveToURL:[self proposedFileURL] ofType:[self fileType] forSaveOperation:CPSaveAsOperation delegate:self didSaveSelector:@selector(document:didSave:contextInfo:) contextInfo:NULL];
 }
 
 /*
     @ignore
 */
-- (void)_sendDocumentSavedNotification:(BOOL)didSave
+- (void)document:(id)aDocument didSave:(BOOL)didSave contextInfo:(id)aContextInfo
 {
     if (didSave)
         [[CPNotificationCenter defaultCenter]
@@ -854,71 +719,6 @@ var CPDocumentUntitledCount = 0;
 
 @end
 
-@implementation CPDocument (ClosingDocuments)
-
-- (void)close
-{
-    [_windowControllers makeObjectsPerformSelector:@selector(removeDocumentAndCloseIfNecessary:) withObject:self];
-    [[CPDocumentController sharedDocumentController] removeDocument:self];
-}
-
-- (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}];
-
-    else if ([delegate respondsToSelector:selector])
-        objj_msgSend(delegate, selector, self, YES, info);
-}
-
-- (void)_document:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
-{
-    if (aDocument === self && shouldClose)
-        [self close];
-
-    objj_msgSend(context.delegate, context.selector, aDocument, shouldClose, context.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);
-
-    _canCloseAlert = [[CPAlert alloc] init];
-
-    [_canCloseAlert setDelegate:self];
-    [_canCloseAlert setAlertStyle:CPWarningAlertStyle];
-    [_canCloseAlert setTitle:@"Unsaved Document"];
-    [_canCloseAlert setMessageText:@"Do you want to save the changes you've made to the document \"" + ([self displayName] || [self fileName]) + "\"?"];
-
-    [_canCloseAlert addButtonWithTitle:@"Save"];
-    [_canCloseAlert addButtonWithTitle:@"Cancel"];
-    [_canCloseAlert addButtonWithTitle:@"Don't Save"];
-
-    _canCloseAlert._context = {delegate:aDelegate, selector:aSelector, context:context};
-
-    [_canCloseAlert runModal];
-}
-
-- (void)alertDidEnd:(CPAlert)alert returnCode:(int)returnCode
-{
-    if (alert !== _canCloseAlert)
-        return;
-
-    var delegate = alert._context.delegate,
-        selector = alert._context.selector,
-        context = alert._context.context;
-
-    if (returnCode === 0)
-        [self saveDocumentWithDelegate:delegate didSaveSelector:selector contextInfo:context];
-    else
-        objj_msgSend(delegate, selector, self, returnCode === 2, context);
-
-    _canCloseAlert = nil;
-}
-
-@end
-
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };

AppKit/CPDocumentController.j

@@ -24,12 +24,11 @@
 @import <Foundation/CPBundle.j>
 
 @import "CPDocument.j"
-@import "CPOpenPanel.j"
 
 
 var CPSharedDocumentController = nil;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPDocumentController
     This class is responsible for managing an application's open documents.
@@ -41,7 +40,7 @@ var CPSharedDocumentController = nil;
 }
 
 /*!
-    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
 */
@@ -49,7 +48,7 @@ var CPSharedDocumentController = nil;
 {
     if (!CPSharedDocumentController)
         [[self alloc] init];
-
+    
     return CPSharedDocumentController;
 }
 
@@ -59,11 +58,11 @@ var CPSharedDocumentController = nil;
 - (id)init
 {
     self = [super init];
-
+    
     if (self)
     {
         _documents = [[CPArray alloc] init];
-
+        
         if (!CPSharedDocumentController)
             CPSharedDocumentController = self;
 
@@ -79,22 +78,22 @@ var CPSharedDocumentController = nil;
     method searches documents already open. It does not
     open the document at the URL if it is not already open.
     @param aURL the url of the document
-    @return the document, or \c nil if such a document is not open
+    @return the document, or <code>nil</code> if such a document is not open
 */
 - (CPDocument)documentForURL:(CPURL)aURL
 {
     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;
 }
 
 /*!
@@ -105,16 +104,16 @@ 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];
         [theDocument showWindows];
     }
-
+        
     return theDocument;
 }
 
@@ -139,21 +138,16 @@ var CPSharedDocumentController = nil;
 - (CPDocument)openDocumentWithContentsOfURL:(CPURL)anAbsoluteURL display:(BOOL)shouldDisplay error:(CPError)anError
 {
     var result = [self documentForURL:anAbsoluteURL];
-
+    
     if (!result)
     {
         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"]];
-
-        [self addDocument:result];
-
-        if (result)
-            [self noteNewRecentDocument:result];
     }
     else if (shouldDisplay)
         [result showWindows];
-
+    
     return result;
 }
 
@@ -163,7 +157,7 @@ var CPSharedDocumentController = nil;
     @param anAbsoluteURL the document URL
     @param absoluteContentsURL the location of the document's contents
     @param anError not used
-    @return the loaded document or \c nil if there was an error
+    @return the loaded document or <code>nil</code> if there was an error
 */
 - (CPDocument)reopenDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL error:(CPError)anError
 {
@@ -177,7 +171,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 information passed to the delegate
+    @param aContextInfo the context infomration passed to the delegate
 */
 - (CPDocument)makeDocumentWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
 {
@@ -193,7 +187,7 @@ var CPSharedDocumentController = nil;
     @param aDelegate receives a callback after the load has completed
     @param aSelector the selector to invoke for the callback
     @param aContextInfo an object passed as an argument for the callback
-    @return a new document or \c nil if there was an error
+    @return a new document or <code>nil</code> if there was an error
 */
 - (CPDocument)makeDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
 {
@@ -209,8 +203,9 @@ var CPSharedDocumentController = nil;
     if (!didRead)
         return;
 
+    [self addDocument:aDocument];
     [aDocument makeWindowControllers];
-
+    
     if ([aContextInfo objectForKey:@"shouldDisplay"])
         [aDocument showWindows];
 }
@@ -224,20 +219,6 @@ var CPSharedDocumentController = nil;
     [self openUntitledDocumentOfType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] display:YES];
 }
 
-- (void)openDocument:(id)aSender
-{
-    var openPanel = [CPOpenPanel openPanel];
-
-    [openPanel runModal];
-
-    var URLs = [openPanel URLs],
-        index = 0,
-        count = [URLs count];
-
-    for (; index < count; ++index)
-        [self openDocumentWithContentsOfURL:[CPURL URLWithString:URLs[index]] display:YES error:nil];
-}
-
 // Managing Documents
 
 /*!
@@ -250,7 +231,7 @@ var CPSharedDocumentController = nil;
 }
 
 /*!
-    Adds \c aDocument under the control of the receiver.
+    Adds <code>aDocument</code> under the control of the receiver.
     @param aDocument the document to add
 */
 - (void)addDocument:(CPDocument)aDocument
@@ -259,7 +240,7 @@ var CPSharedDocumentController = nil;
 }
 
 /*!
-    Removes \c aDocument from the control of the receiver.
+    Removes <code>aDocument</code> from the control of the receiver.
     @param aDocument the document to remove
 */
 - (void)removeDocument:(CPDocument)aDocument
@@ -276,29 +257,23 @@ var CPSharedDocumentController = nil;
 {
     var index = 0,
         count = _documentTypes.length,
-
-        extension = [[anAbsoluteURL pathExtension] lowercaseString],
-        starType = nil;
-
+        
+        extension = [[anAbsoluteURL pathExtension] lowercaseString];
+    
     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];
-            if (thisExtension === extension)
+            if ([extensions[extensionIndex] lowercaseString] == extension)
                 return [documentType objectForKey:@"CPBundleTypeName"];
-
-            if (thisExtension === "****")
-                starType = [documentType objectForKey:@"CPBundleTypeName"];
-        }
     }
 
-    return starType || [self defaultType];
+    // FIXME?
+    return [self defaultType];//nil;
 }
 
 // Managing Document Types
@@ -312,18 +287,18 @@ var CPSharedDocumentController = nil;
     for (;i < count; ++i)
     {
         var documentType = _documentTypes[i];
-
+        
         if ([documentType objectForKey:@"CPBundleTypeName"] == aType)
             return documentType;
     }
-
+    
     return nil;
 }
 
 /*!
-    Returns the CPDocument subclass associated with \c aType.
+    Returns the CPDocument subclass associated with <code>aType</code>.
     @param aType the type of document
-    @return a Cappuccino Class object, or \c nil if no match was found
+    @return a Cappuccino Class object, or <code>nil</code> if no match was found
 */
 - (Class)documentClassForType:(CPString)aType
 {
@@ -333,126 +308,3 @@ var CPSharedDocumentController = nil;
 }
 
 @end
-
-@implementation CPDocumentController (Closing)
-
-- (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
-{
-    var context = {
-        delegate: aDelegate,
-        selector: didCloseSelector,
-        context: info
-    };
-
-    [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
-}
-
-// Recursive callback method. Start it by passing in a document of nil.
-- (void)_closeDocumentsStartingWith:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
-{
-    if (shouldClose)
-    {
-        [aDocument close];
-
-        if ([[self documents] count] > 0)
-        {
-            [[[self documents] lastObject] canCloseDocumentWithDelegate:self
-                                                    shouldCloseSelector:@selector(_closeDocumentsStartingWith:shouldClose:context:)
-                                                            contextInfo:context];
-            return;
-        }
-    }
-
-    if ([context.delegate respondsToSelector:context.selector])
-        objj_msgSend(context.delegate, context.selector, self, [[self documents] count] === 0, context.context);
-}
-
-@end
-
-@implementation CPDocumentController (Recents)
-
-- (CPArray)recentDocumentURLs
-{
-    // FIXME move this to CP land
-    if (typeof window["cpRecentDocumentURLs"] === 'function')
-        return window.cpRecentDocumentURLs();
-
-    return [];
-}
-
-- (void)clearRecentDocuments:(id)sender
-{
-    if (typeof window["cpClearRecentDocuments"] === 'function')
-        window.cpClearRecentDocuments();
-
-   [self _updateRecentDocumentsMenu];
-}
-
-- (void)noteNewRecentDocument:(CPDocument)aDocument
-{
-    [self noteNewRecentDocumentURL:[aDocument fileURL]];
-}
-
-- (void)noteNewRecentDocumentURL:(CPURL)aURL
-{
-    var urlAsString = [aURL isKindOfClass:CPString] ? aURL : [aURL absoluteString];
-    if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
-        window.cpNoteNewRecentDocumentPath(urlAsString);
-
-   [self _updateRecentDocumentsMenu];
-}
-
-- (void)_removeAllRecentDocumentsFromMenu:(CPMenu)aMenu
-{
-    var items = [aMenu itemArray],
-        count = [items count];
-
-    while (count--)
-    {
-        var item = items[count];
-
-        if ([item action] === @selector(_openRecentDocument:))
-            [aMenu removeItemAtIndex:count];
-    }
-}
-
-- (void)_updateRecentDocumentsMenu
-{
-    var menu = [[CPApp mainMenu] _menuWithName:@"_CPRecentDocumentsMenu"],
-        recentDocuments = [self recentDocumentURLs],
-        menuItems = [menu itemArray],
-        documentCount = [recentDocuments count],
-        menuItemCount = [menuItems count];
-
-    [self _removeAllRecentDocumentsFromMenu:menu];
-
-    if (menuItemCount)
-    {
-        if (!documentCount)
-        {
-            if ([menuItems[0] isSeparatorItem])
-                [menu removeItemAtIndex:0];
-        }
-        else
-        {
-            if (![menuItems[0] isSeparatorItem])
-                [menu insertItem:[CPMenuItem separatorItem] atIndex:0];
-        }
-    }
-
-    while (documentCount--)
-    {
-        var path = recentDocuments[documentCount],
-            item = [[CPMenuItem alloc] initWithTitle:[path lastPathComponent] action:@selector(_openRecentDocument:) keyEquivalent:nil];
-
-        [item setTag:path];
-        [menu insertItem:item atIndex:0];
-    }
-}
-
-- (void)_openRecentDocument:(id)sender
-{
-    [self openDocumentWithContentsOfURL:[sender tag] display:YES error:nil];
-}
-
-@end

AppKit/CPDragServer.j

@@ -20,32 +20,124 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPApplication.j"
-@import "CPEvent.j"
-@import "CPImageView.j"
-@import "CPPasteboard.j"
-@import "CPView.j"
-@import "CPWindow.j"
+@import <AppKit/CPView.j>
+@import <AppKit/CPEvent.j>
+@import <AppKit/CPPasteboard.j>
+@import <AppKit/CPImageView.j>
 
+#import "CoreGraphics/CGGeometry.h"
 
-CPDragOperationNone     = 0;
-CPDragOperationCopy     = 1 << 1;
-CPDragOperationLink     = 1 << 1;
-CPDragOperationGeneric  = 1 << 2;
-CPDragOperationPrivate  = 1 << 3;
-CPDragOperationMove     = 1 << 4;
-CPDragOperationDelete   = 1 << 5;
-CPDragOperationEvery    = -1;
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
-var CPDragServerPreviousEvent = nil,
-    CPDragServerPeriodicUpdateInterval = 0.05;
+var CPSharedDragServer     = nil;
+    
+var CPDragServerView               = nil,
+    CPDragServerSource             = nil,
+    CPDragServerWindow             = nil,
+    CPDragServerOffset             = nil,
+    CPDragServerLocation           = nil,
+    CPDragServerPasteboard         = nil,
+    CPDragServerDestination        = nil,
+    CPDragServerDraggingInfo       = nil,
+    CPDragServerPreviousEvent      = nil,
+    CPDragServerAutoscrollInterval = nil;
 
-var CPSharedDragServer = nil;
+var CPDragServerIsDraggingImage                           = NO,
 
-var CPDragServerSource             = nil,
-    CPDragServerDraggingInfo       = nil;
+    CPDragServerShouldSendDraggedViewMovedTo              = NO,
+    CPDragServerShouldSendDraggedImageMovedTo             = NO,
+    
+    CPDragServerShouldSendDraggedViewEndedAtOperation     = NO,
+    CPDragServerShouldSendDraggedImageEndedAtOperation    = NO;
+
+var CPDragServerAutoscroll = function()
+{
+    [CPDragServerSource autoscroll:CPDragServerPreviousEvent];
+}
+
+var CPDragServerStartDragging = function(anEvent)
+{
+    CPDragServerUpdateDragging(anEvent);
+}
+
+var CPDragServerUpdateDragging = function(anEvent)
+{
+    // If this is a mouse up, then complete the drag.
+    if([anEvent type] == CPLeftMouseUp)
+    {
+        if (CPDragServerAutoscrollInterval !== nil)
+            clearInterval(CPDragServerAutoscrollInterval);
+
+        CPDragServerAutoscrollInterval = nil;
+
+        CPDragServerLocation = [DRAGGING_WINDOW(CPDragServerDestination) convertBridgeToBase:[[anEvent window] convertBaseToBridge:[anEvent locationInWindow]]];
+        
+        [CPDragServerView removeFromSuperview];
+        [CPSharedDragServer._dragWindow orderOut:nil];
+
+        if (CPDragServerDestination && 
+            (![CPDragServerDestination respondsToSelector:@selector(prepareForDragOperation:)] || [CPDragServerDestination prepareForDragOperation:CPDragServerDraggingInfo]) && 
+            (![CPDragServerDestination respondsToSelector:@selector(performDragOperation:)] || [CPDragServerDestination performDragOperation:CPDragServerDraggingInfo]) &&
+            [CPDragServerDestination respondsToSelector:@selector(concludeDragOperation:)])
+            [CPDragServerDestination concludeDragOperation:CPDragServerDraggingInfo];
+ 
+        if (CPDragServerShouldSendDraggedImageEndedAtOperation)
+            [CPDragServerSource draggedImage:[CPDragServerView image] endedAt:CPDragServerLocation operation:NO];
+        else if (CPDragServerShouldSendDraggedViewEndedAtOperation)
+            [CPDragServerSource draggedView:CPDragServerView endedAt:CPDragServerLocation operation:NO];
+        
+        CPDragServerIsDraggingImage = NO;
+        CPDragServerDestination = nil;
+
+        return;
+    }
+
+    if (CPDragServerAutoscrollInterval === nil)
+    {
+        if ([CPDragServerSource respondsToSelector:@selector(autoscroll:)])
+            CPDragServerAutoscrollInterval = setInterval(CPDragServerAutoscroll, 100);
+    }
+
+    CPDragServerPreviousEvent = anEvent;
+
+    // If we're not a mouse up, then we're going to want to grab the next event.
+    [CPApp setCallback:CPDragServerUpdateDragging 
+        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask
+        untilDate:nil inMode:0 dequeue:NO];
+
+    var location = [anEvent locationInWindow],
+        operation = 
+        bridgeLocation = [[anEvent window] convertBaseToBridge:location];
+
+    // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
+    var draggingDestination = [[CPDOMWindowBridge sharedDOMWindowBridge] _dragHitTest:bridgeLocation pasteboard:CPDragServerPasteboard];
+    
+    CPDragServerLocation = [DRAGGING_WINDOW(draggingDestination) convertBridgeToBase:bridgeLocation];
+    
+    if(draggingDestination != CPDragServerDestination) 
+    {
+        if (CPDragServerDestination && [CPDragServerDestination respondsToSelector:@selector(draggingExited:)])
+            [CPDragServerDestination draggingExited:CPDragServerDraggingInfo];
+        
+        CPDragServerDestination = draggingDestination;
+        
+        if (CPDragServerDestination && [CPDragServerDestination respondsToSelector:@selector(draggingEntered:)])
+            [CPDragServerDestination draggingEntered:CPDragServerDraggingInfo];
+    }
+    else if (CPDragServerDestination && [CPDragServerDestination respondsToSelector:@selector(draggingUpdated:)])
+        [CPDragServerDestination draggingUpdated:CPDragServerDraggingInfo];
+    
+    location.x -= CPDragServerOffset.x;
+    location.y -= CPDragServerOffset.y;
+    
+    [CPDragServerView setFrameOrigin:location];
+    
+    if (CPDragServerShouldSendDraggedImageMovedTo)
+        [CPDragServerSource draggedImage:[CPDragServerView image] movedTo:location];
+    else if (CPDragServerShouldSendDraggedViewMovedTo)
+        [CPDragServerSource draggedView:CPDragServerView movedTo:location];
+}
 
 /*
     CPDraggingInfo is a container of information about a specific dragging session.
@@ -55,36 +147,24 @@ var CPDragServerSource             = nil,
 {
 }
 
-- (CPPasteboard)draggingPasteboard
-{
-    if ([CPPlatform supportsDragAndDrop])
-        return [_CPDOMDataTransferPasteboard DOMDataTransferPasteboard];
-
-    return [[CPDragServer sharedDragServer] draggingPasteboard];
-}
-
 - (id)draggingSource
 {
-    return [[CPDragServer sharedDragServer] draggingSource];
+    return CPDragServerSource;
 }
 
-/*
-- (unsigned)draggingSourceOperationMask
-*/
-
 - (CPPoint)draggingLocation
 {
-    return [[CPDragServer sharedDragServer] draggingLocation];
+    return CPDragServerLocation;
 }
 
-- (CPWindow)draggingDestinationWindow
+- (CPPasteboard)draggingPasteboard
 {
-    return DRAGGING_WINDOW([[CPDragServer sharedDragServer] draggingDestination]);
+    return CPDragServerPasteboard;
 }
 
 - (CPImage)draggedImage
 {
-    return [[self draggedView] image];
+    return [CPDragServerView image];
 }
 
 - (CGPoint)draggedImageLocation
@@ -92,51 +172,22 @@ var CPDragServerSource             = nil,
     return [self draggedViewLocation];
 }
 
-- (CPView)draggedView
-{
-    return [[CPDragServer sharedDragServer] draggedView];
-}
-
 - (CGPoint)draggedViewLocation
 {
-    var dragServer = [CPDragServer sharedDragServer];
+    return [DRAGGING_WINDOW(CPDragServerDestination) convertBridgeToBase:[CPDragServerView frame].origin];
+}
 
-    return [DRAGGING_WINDOW([dragServer draggingDestination]) convertPlatformWindowToBase:[[dragServer draggedView] frame].origin];
+- (CPView)draggedView
+{
+    return CPDragServerView;
 }
 
 @end
 
-var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
-    CPDraggingSource_draggedImage_endedAt_operation_  = 1 << 1,
-    CPDraggingSource_draggedView_movedTo_           = 1 << 2,
-    CPDraggingSource_draggedView_endedAt_operation_ = 1 << 3;
-
 @implementation CPDragServer : CPObject
 {
-    BOOL            _isDragging @accessors(readonly, getter=isDragging);
-
-    CPWindow        _draggedWindow @accessors(readonly, getter=draggedWindow);
-    CPView          _draggedView @accessors(readonly, getter=draggedView);
-    CPImageView     _imageView;
-
-    BOOL            _isDraggingImage;
-
-    CGSize          _draggingOffset @accessors(readonly, getter=draggingOffset);
-
-    CPPasteboard    _draggingPasteboard @accessors(readonly, getter=draggingPasteboard);
-
-    id              _draggingSource @accessors(readonly, getter=draggingSource);
-    unsigned        _implementedDraggingSourceMethods;
-
-    CGPoint         _draggingLocation;
-    id              _draggingDestination;
-    BOOL            _draggingDestinationWantsPeriodicUpdates;
-
-    CGPoint         _startDragLocation;
-    BOOL            _shouldSlideBack;
-    unsigned        _dragOperation;
-
-    CPTimer         _draggingUpdateTimer;
+    CPWindow    _dragWindow;
+    CPImageView _imageView;
 }
 
 /*
@@ -145,9 +196,9 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 */
 + (void)initialize
 {
-    if (self !== [CPDragServer class])
+    if (self != [CPDragServer class])
         return;
-
+    
     CPDragServerDraggingInfo = [[CPDraggingInfo alloc] init];
 }
 
@@ -155,7 +206,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 {
     if (!CPSharedDragServer)
         CPSharedDragServer = [[CPDragServer alloc] init];
-
+        
     return CPSharedDragServer;
 }
 
@@ -165,179 +216,16 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 - (id)init
 {
     self = [super init];
-
+    
     if (self)
     {
-        _draggedWindow = [[CPWindow alloc] initWithContentRect:_CGRectMakeZero() styleMask:CPBorderlessWindowMask];
-
-        [_draggedWindow setLevel:CPDraggingWindowLevel];
+        _dragWindow = [[CPWindow alloc] initWithContentRect:CPRectMakeZero() styleMask:CPBorderlessWindowMask];
+        [_dragWindow setLevel:CPDraggingWindowLevel];
     }
-
+    
     return self;
 }
 
-- (id)draggingDestination
-{
-    return _draggingDestination;
-}
-
-- (CGPoint)draggingLocation
-{
-    return _draggingLocation
-}
-
-- (void)draggingStartedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation
-{
-    if (_isDraggingImage)
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:beganAt:)])
-            [_draggingSource draggedImage:[_draggedView image] beganAt:aLocation];
-    }
-    else
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedView:beganAt:)])
-            [_draggingSource draggedView:_draggedView beganAt:aLocation];
-    }
-
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow orderFront:self];
-}
-
-- (void)draggingSourceUpdatedWithGlobalLocation:(CGPoint)aGlobalLocation
-{
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow setFrameOrigin:_CGPointMake(aGlobalLocation.x - _draggingOffset.width, aGlobalLocation.y - _draggingOffset.height)];
-
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_movedTo_)
-        [_draggingSource draggedImage:[_draggedView image] movedTo:aGlobalLocation];
-
-    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_movedTo_)
-        [_draggingSource draggedView:_draggedView movedTo:aGlobalLocation];
-}
-
-- (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
-{
-    [_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.
-        draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
-
-    if (draggingDestination)
-        _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];
-
-    if (draggingDestination !== _draggingDestination)
-    {
-        if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
-            [_draggingDestination draggingExited:CPDragServerDraggingInfo];
-
-        _draggingDestination = draggingDestination;
-
-        if ([_draggingDestination respondsToSelector:@selector(wantsPeriodicDraggingUpdates)])
-            _draggingDestinationWantsPeriodicUpdates = [_draggingDestination wantsPeriodicDraggingUpdates];
-        else
-            _draggingDestinationWantsPeriodicUpdates = YES;
-
-        if ([_draggingDestination respondsToSelector:@selector(draggingEntered:)])
-            dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
-    }
-    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:[CPDictionary dictionaryWithJSObject:{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])
-        [_draggedWindow orderOut:self];
-
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_endedAt_operation_)
-        [_draggingSource draggedImage:[_draggedView image] endedAt:aLocation operation:anOperation];
-    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_endedAt_operation_)
-        [_draggingSource draggedView:_draggedView endedAt:aLocation operation:anOperation];
-
-    _isDragging = NO;
-}
-
-- (void)performDragOperationInPlatformWindow:(CPPlatformWindow)aPlatformWindow
-{
-    if (_draggingDestination &&
-        (![_draggingDestination respondsToSelector:@selector(prepareForDragOperation:)] || [_draggingDestination prepareForDragOperation:CPDragServerDraggingInfo]) &&
-        (![_draggingDestination respondsToSelector:@selector(performDragOperation:)] || [_draggingDestination performDragOperation:CPDragServerDraggingInfo]) &&
-        [_draggingDestination respondsToSelector:@selector(concludeDragOperation:)])
-        [_draggingDestination concludeDragOperation:CPDragServerDraggingInfo];
-}
-
 /*!
     Initiates a drag session.
     @param aView the view being dragged
@@ -347,72 +235,50 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     @param anEvent
     @param aPasteboard the pasteboard that contains the drag data
     @param aSourceObject the object where the drag started
-    @param slideBack if \c YES, \c aView slides back to
+    @param slideBack if <code>YES</code>, <code>aView</code> slides back to
     its origin on a failed drop
 */
-- (void)dragView:(CPView)aView fromWindow:(CPWindow)aWindow at:(CGPoint)viewLocation offset:(CGSize)mouseOffset event:(CPEvent)mouseDownEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
+- (void)dragView:(CPView)aView fromWindow:(CPWindow)aWindow at:(CGPoint)viewLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
-    _isDragging = YES;
+    var eventLocation = [anEvent locationInWindow];
+    
+    CPDragServerView = aView;
+    CPDragServerSource = aSourceObject;
+    CPDragServerWindow = aWindow;
+    CPDragServerOffset = CPPointMake(eventLocation.x - viewLocation.x, eventLocation.y - viewLocation.y);
+    CPDragServerPasteboard = [CPPasteboard pasteboardWithName:CPDragPboard];//aPasteboard;
 
-    _draggedView = aView;
-    _draggingPasteboard = aPasteboard || [CPPasteboard pasteboardWithName:CPDragPboard];
-    _draggingSource = aSourceObject;
-    _draggingDestination = nil;
-    _shouldSlideBack = slideBack;
+    [_dragWindow setFrameSize:CGSizeMakeCopy([[CPDOMWindowBridge sharedDOMWindowBridge] frame].size)];
+    [_dragWindow orderFront:self];
 
-    // The offset is based on the distance from where we want the view to be initially from where the mouse is initially
-    // Hence the use of mouseDownEvent's location and view's location in global coordinates.
-    var mouseDownWindow = [mouseDownEvent window],
-        mouseDownEventLocation = [mouseDownEvent locationInWindow];
+    [aView setFrameOrigin:viewLocation];
+    [[_dragWindow contentView] addSubview:aView];
 
-    if (mouseDownEventLocation)
+    if (CPDragServerIsDraggingImage)
     {
-        if (mouseDownWindow)
-            mouseDownEventLocation = [mouseDownWindow convertBaseToGlobal:mouseDownEventLocation];
-
-        _draggingOffset = _CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
-    }
-    else
-        _draggingOffset = _CGSizeMakeZero();
-
-    if ([CPPlatform isBrowser])
-        [_draggedWindow setPlatformWindow:[aWindow platformWindow]];
-
-    [aView setFrameOrigin:_CGPointMakeZero()];
-
-    var mouseLocation = [CPEvent mouseLocation];
-
-    // Place it where the mouse pointer is.
-    _startDragLocation = _CGPointMake(mouseLocation.x - _draggingOffset.width, mouseLocation.y - _draggingOffset.height);
-    [_draggedWindow setFrameOrigin:_startDragLocation];
-    [_draggedWindow setFrameSize:[aView frame].size];
-
-    [[_draggedWindow contentView] addSubview:aView];
-
-    _implementedDraggingSourceMethods = 0;
-
-    if (_draggedView === _imageView)
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:movedTo:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_movedTo_;
-
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:endedAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_endedAt_operation_;
+        if ([CPDragServerSource respondsToSelector:@selector(draggedImage:beganAt:)])
+            [CPDragServerSource draggedImage:[aView image] beganAt:viewLocation];
+        
+        CPDragServerShouldSendDraggedImageMovedTo = [CPDragServerSource respondsToSelector:@selector(draggedImage:movedTo:)];
+        CPDragServerShouldSendDraggedImageEndedAtOperation = [CPDragServerSource respondsToSelector:@selector(draggedImage:endAt:operation:)];
+        
+        CPDragServerShouldSendDraggedViewMovedTo = NO;
+        CPDragServerShouldSendDraggedViewEndedAtOperation = NO;
     }
     else
     {
-        if ([_draggingSource respondsToSelector:@selector(draggedView:movedTo:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_movedTo_;
+        if ([CPDragServerSource respondsToSelector:@selector(draggedView:beganAt:)])
+            [CPDragServerSource draggedView:aView beganAt:viewLocation];
+     
+        CPDragServerShouldSendDraggedViewMovedTo = [CPDragServerSource respondsToSelector:@selector(draggedView:movedTo:)];
+        CPDragServerShouldSendDraggedViewEndedAtOperation = [CPDragServerSource respondsToSelector:@selector(draggedView:endedAt:operation:)];
+        
 
-        if ([_draggingSource respondsToSelector:@selector(draggedView:endedAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_endedAt_operation_;
+        CPDragServerShouldSendDraggedImageMovedTo = NO;
+        CPDragServerShouldSendDraggedImageEndedAtOperation = NO;
     }
 
-    if (![CPPlatform supportsDragAndDrop])
-    {
-        [self draggingStartedInPlatformWindow:[aWindow platformWindow] globalLocation:mouseLocation];
-        [self trackDragging:mouseDownEvent];
-    }
+    CPDragServerStartDragging(anEvent);
 }
 
 /*!
@@ -424,62 +290,22 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     @param anEvent
     @param aPasteboard the pasteboard where the drag data is located
     @param aSourceObject the object where the drag started
-    @param slideBack if \c YES, \c aView slides back to
+    @param slideBack if <code>YES</code>, <code>aView</code> slides back to
     its origin on a failed drop
 */
 - (void)dragImage:(CPImage)anImage fromWindow:(CPWindow)aWindow at:(CGPoint)imageLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
 {
-    _isDraggingImage = YES;
-
-    var imageSize = [anImage size];
-
+    CPDragServerIsDraggingImage = YES;
+    
     if (!_imageView)
-        _imageView = [[CPImageView alloc] initWithFrame:_CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
-
+        _imageView = [[CPImageView alloc] initWithFrame:CPRectMakeZero()];
+    
     [_imageView setImage:anImage];
-
+    [_imageView setFrameSize:CGSizeMakeCopy([anImage size])];
+    
     [self dragView:_imageView fromWindow:aWindow at:imageLocation offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
 }
 
-- (void)trackDragging:(CPEvent)anEvent
-{
-    var type = [anEvent type],
-        platformWindow = [_draggedWindow platformWindow],
-        platformWindowLocation = [[anEvent window] convertBaseToPlatformWindow:[anEvent locationInWindow]];
-
-    if (type === CPLeftMouseUp)
-    {
-        // Make sure we do not finalize (cancel) the drag if the last drag update was disallowed
-        if (_dragOperation !== CPDragOperationNone)
-            [self performDragOperationInPlatformWindow:platformWindow];
-
-        [self draggingEndedInPlatformWindow:platformWindow globalLocation:platformWindowLocation operation:_dragOperation];
-
-        // Stop tracking events.
-        return;
-    }
-    else if (type === CPKeyDown)
-    {
-        var characters = [anEvent characters];
-        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 | CPKeyDownMask
-        untilDate:nil inMode:0 dequeue:NO];
-}
-
 @end
 
 @implementation CPWindow (CPDraggingAdditions)
@@ -492,23 +318,23 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         return nil;
 
 // We don't need to do this because the only place this gets called
-// -_dragHitTest: in CPPlatformWindow does this already. Perhaps to
+// -_dragHitTest: in CPDOMWindowBridge does this already. Perhaps to
 // be safe?
 //    if (![self containsPoint:aPoint])
 //        return nil;
 
-    var adjustedPoint = [self convertPlatformWindowToBase:aPoint],
+    var adjustedPoint = _CGPointMake(aPoint.x - _CGRectGetMinX(_frame), aPoint.y - _CGRectGetMinY(_frame)),
         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;
 }
 

AppKit/CPEvent.j

@@ -21,29 +21,114 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPText.j"
+
+#include "CoreGraphics/CGGeometry.h"
 
 
+/*
+    @global
+    @group CPEventType
+*/
 CPLeftMouseDown                         = 1;
+/*
+    @global
+    @group CPEventType
+*/
 CPLeftMouseUp                           = 2;
+/*
+    @global
+    @group CPEventType
+*/
 CPRightMouseDown                        = 3;
+/*
+    @global
+    @group CPEventType
+*/
 CPRightMouseUp                          = 4;
+/*
+    @global
+    @group CPEventType
+*/
 CPMouseMoved                            = 5;
+/*
+    @global
+    @group CPEventType
+*/
 CPLeftMouseDragged                      = 6;
+/*
+    @global
+    @group CPEventType
+*/
 CPRightMouseDragged                     = 7;
+/*
+    @global
+    @group CPEventType
+*/
 CPMouseEntered                          = 8;
+/*
+    @global
+    @group CPEventType
+*/
 CPMouseExited                           = 9;
+/*
+    @global
+    @group CPEventType
+*/
 CPKeyDown                               = 10;
+/*
+    @global
+    @group CPEventType
+*/
 CPKeyUp                                 = 11;
+/*
+    @global
+    @group CPEventType
+*/
 CPFlagsChanged                          = 12;
+/*
+    @global
+    @group CPEventType
+*/
 CPAppKitDefined                         = 13;
+/*
+    @global
+    @group CPEventType
+*/
 CPSystemDefined                         = 14;
+/*
+    @global
+    @group CPEventType
+*/
 CPApplicationDefined                    = 15;
+/*
+    @global
+    @group CPEventType
+*/
 CPPeriodic                              = 16;
-CPCursorUpdate                          = 17;
+/*
+    @global
+    @group CPEventType
+*/
+CPCursorUpdate                          = 17; 
+/*
+    @global
+    @group CPEventType
+*/
 CPScrollWheel                           = 22;
+/*
+    @global
+    @group CPEventType
+*/
 CPOtherMouseDown                        = 25;
+/*
+    @global
+    @group CPEventType
+*/
 CPOtherMouseUp                          = 26;
+/*
+    @global
+    @group CPEventType
+*/
 CPOtherMouseDragged                     = 27;
 
 // iPhone Event Types
@@ -51,7 +136,8 @@ CPTouchStart                            = 28;
 CPTouchMove                             = 29;
 CPTouchEnd                              = 30;
 CPTouchCancel                           = 31;
-
+                                        
+                                        
 CPAlphaShiftKeyMask                     = 1 << 16;
 CPShiftKeyMask                          = 1 << 17;
 CPControlKeyMask                        = 1 << 18;
@@ -85,89 +171,13 @@ 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";
+CPDOMEventDoubleClick                   = "dblclick",
+CPDOMEventMouseDown                     = "mousedown",
+CPDOMEventMouseUp                       = "mouseup",
+CPDOMEventMouseMoved                    = "mousemove",
+CPDOMEventMouseDragged                  = "mousedrag",
+CPDOMEventKeyUp                         = "keyup",
+CPDOMEventKeyDown                       = "keydown",
 CPDOMEventKeyPress                      = "keypress";
 CPDOMEventCopy                          = "copy";
 CPDOMEventPaste                         = "paste";
@@ -178,10 +188,9 @@ CPDOMEventTouchEnd                      = "touchend";
 CPDOMEventTouchCancel                   = "touchcancel";
 
 var _CPEventPeriodicEventPeriod         = 0,
-    _CPEventPeriodicEventTimer          = nil,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]");
+    _CPEventPeriodicEventTimer          = nil;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPEvent
     CPEvent encapsulates the details of a Cappuccino keyboard or mouse event.
@@ -203,7 +212,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     BOOL                _isARepeat;
     unsigned            _keyCode;
     DOMEvent            _DOMEvent;
-
+    
     float               _deltaX;
     float               _deltaY;
     float               _deltaZ;
@@ -211,18 +220,17 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     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 aPoint the location of the cursor in the window specified by <code>aWindowNumber</code>
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
     @param aTimestamp the time the event occurred
     @param aWindowNumber the number of the CPWindow where the event occurred
     @param aGraphicsContext the graphics context where the event occurred
     @param characters the characters associated with the event
     @param unmodCharacters the string of keys pressed without the presence of any modifiers other than Shift
-    @param repeatKey \c YES if this is caused by the system repeat as opposed to the user pressing the key again
+    @param repeatKey <code>YES</code> if this is caused by the system repeat as opposed to the user pressing the key again
     @param code a number associated with the keyboard key of this event
-    @throws CPInternalInconsistencyException if \c anEventType is not a CPKeyDown,
+    @throws CPInternalInconsistencyException if <code>anEventType</code> is not a CPKeyDown,
     CPKeyUp or CPFlagsChanged
     @return the keyboard event
 */
@@ -231,15 +239,14 @@ 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 aPoint the location of the cursor in the window specified by <code>aWindowNumber</code>
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
     @param aTimestamp the time the event occurred
     @param aWindowNumber the number of the CPWindow where the event occurred
@@ -250,7 +257,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
 {
@@ -259,10 +266,9 @@ 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 aLocation the location of the cursor in the window specified by <code>aWindowNumber</code>
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
     @param aTimestamp the time the event occurred
     @param aWindowNumber the number of the CPWindow where the event occurred
@@ -281,28 +287,16 @@ 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:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags 
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
-    if (self = [self _initWithType:anEventType])
+    self = [super init];
+    
+    if (self)
     {
+        _type = anEventType;
         _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
@@ -312,7 +306,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         _pressure = aPressure;
         _window = [CPApp windowWithWindowNumber:aWindowNumber];
     }
-
+    
     return self;
 }
 
@@ -321,8 +315,11 @@ var _CPEventPeriodicEventPeriod         = 0,
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
-    if (self = [self _initWithType:anEventType])
+    self = [super init];
+    
+    if (self)
     {
+        _type = anEventType;
         _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
@@ -333,7 +330,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         _keyCode = code;
         _windowNumber = aWindowNumber;
     }
-
+    
     return self;
 }
 
@@ -342,8 +339,11 @@ var _CPEventPeriodicEventPeriod         = 0,
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
 {
-    if (self = [self _initWithType:anEventType])
+    self = [super init];
+    
+    if (self)
     {
+        _type = anEventType;
         _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
@@ -351,37 +351,26 @@ var _CPEventPeriodicEventPeriod         = 0,
         _subtype = aSubtype;
         _data1 = aData1;
         _data2 = aData2;
-    }
+    }   
 
     return self;
 }
 
 /*!
     Returns the location of the mouse (for mouse events).
-    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.
+    If this is not a mouse event, it returns <code>nil</code>.
+    If <code>window</code> returns <code>nil</code>, 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.
+    @return the location of the mouse, or <code>nil</code> for non-mouse events.
 */
 - (CGPoint)locationInWindow
 {
-    return _CGPointMakeCopy(_location);
-}
-
-- (CGPoint)globalLocation
-{
-    var theWindow = [self window],
-        location = [self locationInWindow];
-
-    if (theWindow)
-        return [theWindow convertBaseToGlobal:location];
-
-    return location;
+    return _location;
 }
 
 /*!
-    Returns event information as a bit mask.
+    Returns event information as a bit mask
 */
 - (unsigned)modifierFlags
 {
@@ -389,7 +378,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the time the event occurred.
+    Returns the time the event occurred
 */
 - (CPTimeInterval)timestamp
 {
@@ -405,7 +394,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the event's associated window.
+    Returns the event's associated window
 */
 - (CPWindow)window
 {
@@ -429,14 +418,11 @@ var _CPEventPeriodicEventPeriod         = 0,
 */
 - (int)buttonNumber
 {
-    if (_type === CPRightMouseDown || _type === CPRightMouseUp || _type === CPRightMouseDragged)
-        return 1;
-
-    return 0;
+    return _buttonNumber;
 }
 
 /*!
-    Returns the number of clicks that caused this event (mouse only).
+    Returns the number of clicks that caused this event. (mouse only)
 */
 - (int)clickCount
 {
@@ -444,8 +430,7 @@ 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
@@ -455,7 +440,6 @@ 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
@@ -464,8 +448,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns \c YES if the keyboard event was caused by the key being held down.
-
+    Returns <code>YES</code> 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
@@ -475,7 +458,6 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Returns the key's key code.
-
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (unsigned short)keyCode
@@ -483,18 +465,6 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _keyCode;
 }
 
-+ (CGPoint)mouseLocation
-{
-    // FIXME: this is incorrect, we shouldn't depend on the current event.
-    var event = [CPApp currentEvent],
-        eventWindow = [event window];
-
-    if (eventWindow)
-        return [eventWindow convertBaseToGlobal:[event locationInWindow]];
-
-    return [event locationInWindow];
-}
-
 - (float)pressure
 {
     return _pressure;
@@ -508,7 +478,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _DOMEvent;
 }
 
-// Getting Scroll Wheel Event Information
+// Getting Scroll Wheel Event Infomration
 /*!
     Returns the change in the x-axis for a mouse event.
 */
@@ -533,95 +503,29 @@ 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
-{
-    if (_type !== CPKeyDown)
-        return NO;
-
-    var characterCount = _characters.length;
-
-    if (!characterCount)
-        return NO;
-
-    if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
-        return YES;
-
-    for (var i = 0; i < characterCount; i++)
-    {
-        switch (_characters.charAt(i))
-        {
-            case CPBackspaceCharacter:
-            case CPDeleteCharacter:
-            case CPDeleteFunctionKey:
-            case CPTabCharacter:
-            case CPCarriageReturnCharacter:
-            case CPNewlineCharacter:
-            case CPSpaceFunctionKey:
-            case CPEscapeFunctionKey:
-            case CPPageUpFunctionKey:
-            case CPPageDownFunctionKey:
-            case CPLeftArrowFunctionKey:
-            case CPUpArrowFunctionKey:
-            case CPRightArrowFunctionKey:
-            case CPDownArrowFunctionKey:
-            case CPEndFunctionKey:
-            case CPHomeFunctionKey:
-                return YES;
-        }
-    }
-    // FIXME: More cases?
-    return NO;
-}
-
 /*!
-    Generates periodic events every \c aPeriod seconds.
-
+    Generates periodic events every <code>aPeriod</code> 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;
 }
 

AppKit/CPFlashMovie.j

@@ -22,8 +22,7 @@
 
 @import <Foundation/CPObject.j>
 
-
-/*!
+/*! 
     @ingroup appkit
     @class CPFlashMovie
 
@@ -31,17 +30,17 @@
 */
 @implementation CPFlashMovie : CPObject
 {
-    CPString        _filename;
+    CPString _fileName;
 }
 
 /*!
-    Creates a new Flash movie with the swf at \c aFileName.
+    Creates a new Flash movie with the swf at <code>aFileName</code>.
     @param aFilename the swf to load
     @return the initialized CPFlashMovie
 */
-+ (id)flashMovieWithFile:(CPString)aFilename
++ (id)flashMovieWithFile:(CPString)aFileName
 {
-    return [[self alloc] initWithFile:aFilename];
+    return [[self alloc] initWithFile:aFileName];
 }
 
 /*!
@@ -49,37 +48,14 @@
     @param aFilename the swf to load
     @return the initialized CPFlashMovie
 */
-- (id)initWithFile:(CPString)aFilename
+- (id)initWithFile:(CPString)aFileName
 {
     self = [super init];
-
+    
     if (self)
-        _filename = aFilename;
-
+        _fileName = aFileName;
+    
     return self;
 }
 
-- (CPString)filename
-{
-    return _filename;
-}
-
-@end
-
-var CPFlashMovieFilenameKey = "CPFlashMovieFilenameKey";
-
-@implementation CPFlashMovie (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    _filename = [aCoder decodeObjectForKey:CPFlashMovieFilenameKey];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_filename forKey:CPFlashMovieFilenameKey];
-}
-
 @end

AppKit/CPFlashView.j

@@ -20,62 +20,59 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPDOMWindowBridge.j"
 @import "CPFlashMovie.j"
 @import "CPView.j"
 
-
-var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
-
 /*!
     @ingroup appkit
 */
 @implementation CPFlashView : CPView
 {
     CPFlashMovie    _flashMovie;
-
-    CPDictionary    _params;
-    CPDictionary    _paramElements;
-#if PLATFORM(DOM)
-    DOMElement      _DOMParamElement;
+    
+    DOMElement      _DOMEmbedElement;
+    DOMElement      _DOMMParamElement;
     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.width = @"100%";
-            _DOMObjectElement.height = @"100%";
-            _DOMObjectElement.style.top = @"0px";
-            _DOMObjectElement.style.left = @"0px";
-            _DOMObjectElement.type = @"application/x-shockwave-flash";
-            _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID);
+        _DOMObjectElement = document.createElement("object");
+        _DOMObjectElement.width = "100%";
+        _DOMObjectElement.height = "100%";
+        _DOMObjectElement.style.top = "0px";
+        _DOMObjectElement.style.left = "0px";
+        
+        _DOMParamElement = document.createElement("param");
+        _DOMParamElement.name = "movie";
+        
+        _DOMObjectElement.appendChild(_DOMParamElement);
+        
+        var param = document.createElement("param");
+        
+        param.name = "wmode";
+        param.value = "transparent";
+        
+        _DOMObjectElement.appendChild(param);
+        
+        _DOMEmbedElement = document.createElement("embed");
 
-            _DOMParamElement = document.createElement(@"param");
-            _DOMParamElement.name = @"movie";
+        _DOMEmbedElement.type = "application/x-shockwave-flash";
+        _DOMEmbedElement.setAttribute("wmode", "transparent");
+        _DOMEmbedElement.width = "100%";
+        _DOMEmbedElement.height = "100%";
 
-            _DOMInnerObjectElement = document.createElement(@"object");
-            _DOMInnerObjectElement.width = @"100%";
-            _DOMInnerObjectElement.height = @"100%";
-
-            _DOMObjectElement.appendChild(_DOMParamElement);
-            _DOMObjectElement.appendChild(_DOMInnerObjectElement);
-
-            _DOMElement.appendChild(_DOMObjectElement);
-        }
-        else
-            [self _rebuildIEObjects];
-#endif
+        // IE requires this thing to be in the _DOMElement and not the _DOMObjectElement.
+        _DOMElement.appendChild(_DOMEmbedElement);
+                
+        _DOMElement.appendChild(_DOMObjectElement);
     }
-
+    
     return self;
 }
 
@@ -83,17 +80,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];
-    }
-    else
-        [self _rebuildIEObjects];
-#endif
+    
+    _DOMParamElement.value = aFlashMovie._fileName;
+    
+    if (_DOMEmbedElement)
+       _DOMEmbedElement.src = aFlashMovie._fileName;
 }
 
 - (CPFlashMovie)flashMovie
@@ -101,106 +94,19 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     return _flashMovie;
 }
 
-- (void)setFlashVars:(CPDictionary)aDictionary
-{
-    var varString = @"",
-        enumerator = [aDictionary keyEnumerator];
-
-    var key;
-    while (key = [enumerator nextObject])
-        varString = [varString stringByAppendingFormat:@"&%@=%@", key, [aDictionary objectForKey:key]];
-
-    if (!_params)
-        _params = [CPDictionary dictionary];
-
-    [_params setObject:varString forKey:@"flashvars"];
-    [self setParameters:_params];
-}
-
-- (CPDictionary)flashVars
-{
-    return [_params objectForKey:@"flashvars"];
-}
-
-- (void)setParameters:(CPDictionary)aDictionary
-{
-#if PLATFORM(DOM)
-    if (_paramElements && !CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-    {
-        var elements = [_paramElements allValues],
-            count = [elements count];
-
-        for (var i = 0; i < count; i++)
-            _DOMObjectElement.removeChild([elements objectAtIndex:i]);
-    }
-#endif
-    if (!_params)
-        _params = aDictionary;
-    else
-        [_params addEntriesFromDictionary:aDictionary];
-#if PLATFORM(DOM)
-    if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
-    {
-        _paramElements = [CPDictionary dictionary];
-
-        var enumerator = [_params keyEnumerator],
-            key;
-
-        while (_DOMObjectElement && (key = [enumerator nextObject]))
-        {
-            var param = document.createElement(@"param");
-            param.name = key;
-            param.value = [_params objectForKey:key];
-
-            _DOMObjectElement.appendChild(param);
-
-            [_paramElements setObject:param forKey:key];
-        }
-    }
-    else
-        [self _rebuildIEObjects];
-#endif
-}
-
-- (CPDictionary)parameters
-{
-    return _params;
-}
-
-#if PLATFORM(DOM)
-- (void)_rebuildIEObjects
-{
-    _DOMElement.innerHTML = @"";
-    if (![_flashMovie filename])
-        return;
-
-    var paramString = [CPString stringWithFormat:@"<param name='movie' value='%@' />", [_flashMovie filename]],
-        paramEnumerator = [_params keyEnumerator],
-        key;
-
-    while (key = [paramEnumerator nextObject])
-        paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
-
-    _DOMObjectElement = document.createElement(@"object");
-    _DOMElement.appendChild(_DOMObjectElement);
-
-    _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
-}
-#endif
-
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
 }
 
 - (void)mouseUp:(CPEvent)anEvent
 {
-    [[[self window] platformWindow] _propagateCurrentDOMEvent:YES];
+    [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
 }
 
 @end

AppKit/CPFont.j

@@ -20,254 +20,91 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPObject.j>
-@import <Foundation/CPBundle.j>
+var _CPFonts                = {};
+    _CPFontSystemFontFace   = @"Arial";
 
-@import "CPView.j"
+#define _CPCachedFont(aName, aSize, isBold) _CPFonts[(isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'"]
 
-CPFontDefaultSystemFontFace = @"Arial, sans-serif";
-CPFontDefaultSystemFontSize = 12;
-
-var _CPFonts                        = {},
-    _CPFontSystemFontFace           = CPFontDefaultSystemFontFace,
-    _CPFontSystemFontSize           = 12,
-    _CPFontFallbackFaces            = CPFontDefaultSystemFontFace.split(", "),
-    _CPFontStripRegExp              = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
-
-
-#define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
-#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFonts[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
-
-/*!
+/*! 
     @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.
-
-    By default the system font face/size is Arial 12px, with a fallback to sans-serif. You may
-    configure this at runtime in two ways:
-
-    - By sending [CPFont @link CPFont::setSystemFontFace: setSystemFontFace:@endlink] and/or [CPFont @link CPFont::setSystemFontSize: setSystemFontSize:@endlink].
-    - By configuring Info.plist for your application or for AppKit. You can set the font face
-      by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
-      by adding a CPSystemFontSize integer item to the Info.plist.
-
-    Note that in either case, you can specify a comma-delimited list of fonts as the font face.
-    The browser will use the first available font in the list. CPFont always ensures that Arial
-    and sans-serif are in the generated CSS string, so there is no need to add them to the end
-    of your font list.
-
-    If you are using nib2cib, you should use the second method (using Info.plist),
-    and be sure to run nib2cib again any time you modify the CPSystemFontFace or CPSystemFontSize items.
-    For example, you might add this to your application's Info.plist to set the system font to Lucida Grande,
-    with an automatic fallback to Arial or sans-serif:
-
-    @code
-<key>CPSystemFontFace</key>
-<string>Lucida Grande</string>
-	@endcode
+    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.
 */
 @implementation CPFont : CPObject
 {
     CPString    _name;
     float       _size;
-    float       _ascender;
-    float       _descender;
-    float       _lineHeight;
-    BOOL        _isBold         @accessors(readonly, getter=isBold);
-    BOOL        _isItalic       @accessors(readonly, getter=isItalic);
-
+    BOOL        _isBold;
+    
     CPString    _cssString;
 }
 
-+ (void)initialize
-{
-    var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];
-
-    if (!systemFontFace)
-        systemFontFace = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontFace"];
-
-    if (systemFontFace)
-        [self setSystemFontFace: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
-{
-    _CPFontSystemFontFace = _CPFontNormalizedNames(aFace);
-}
-
-/*!
-    Returns the default system font size.
-*/
-+ (float)systemFontSize
-{
-    return _CPFontSystemFontSize;
-}
-
-/*!
-    Sets the default system font size.
-*/
-+ (float)setSystemFontSize:(float)size
-{
-    if (size > 0)
-        _CPFontSystemFontSize = size;
-}
-
 /*!
     Returns a font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in px)
+    @param aSize the size of the font (in points)
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:NO];
-}
-
-/*!
-    Returns a font with the specified name, size and style.
-    @param aName the name of the font
-    @param aSize the size of the font (in px)
-    @param italic whether the font should be italicized
-    @return the requested font
-*/
-+ (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
-{
-    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO italic:italic];
+    return _CPCachedFont(aName, aSize, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:NO];
 }
 
 /*!
     Returns a bold font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in px)
+    @param aSize the size of the font (in points)
     @return the requested bold font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPCachedFont(aName, aSize, YES, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:NO];
-}
-
-/*!
-    Returns a bold font with the specified name, size and style.
-    @param aName the name of the font
-    @param aSize the size of the font (in px)
-    @param italic whether the font should be italicized
-    @return the requested font
-*/
-+ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
-{
-    return _CPCachedFont(aName, aSize, NO, NO) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES italic:italic];
+    return _CPCachedFont(aName, aSize, YES) || [[CPFont alloc] _initWithName:aName size:aSize bold:YES];
 }
 
 /*!
     Returns the system font scaled to the specified size
-    @param aSize the size of the font (in px)
+    @param aSize the size of the font (in points)
     @return the requested system font
 */
 + (CPFont)systemFontOfSize:(CPSize)aSize
 {
-    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO italic:NO];
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:NO];
 }
 
 /*!
     Returns the bold system font scaled to the specified size
-    @param aSize the size of the font (in px)
+    @param aSize the size of the font (in points)
     @return the requested bold system font
 */
 + (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
-    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES, NO) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES italic:NO];
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES];
 }
 
 /*  FIXME Font Descriptor
     @ignore
 */
 - (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
-{
-    return [self _initWithName:aName size:aSize bold:isBold italic:NO];
-}
-
-- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic
-{
+{   
     self = [super init];
-
+    
     if (self)
     {
-        _name = _CPFontNormalizedNames(aName);
+        _name = aName;
         _size = aSize;
-        _ascender = 0;
-        _descender = 0;
-        _lineHeight = 0;
         _isBold = isBold;
-        _isItalic = isItalic;
-
-        _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
-
+        
+        _cssString = (_isBold ? @"bold " : @"") + ROUND(aSize) + @"px '" + aName + @"'";
+        
         _CPFonts[_cssString] = self;
     }
-
+    
     return self;
 }
 
 /*!
-    Returns the distance of the longest ascender's top y-coordinate from the baseline (in CSS px)
-*/
-- (float)ascender
-{
-    if (!_ascender)
-        [self _getMetrics];
-
-    return _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
-{
-    if (!_descender)
-        [self _getMetrics];
-
-    return _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
-{
-    if (!_lineHeight)
-        [self _getMetrics];
-
-    return _lineHeight;
-}
-
-/*!
-    Returns the font size (in CSS px)
+    Returns the font size (in points)
 */
 - (float)size
 {
@@ -290,36 +127,11 @@ var _CPFonts                        = {},
     return _name;
 }
 
-- (BOOL)isEqual:(id)anObject
-{
-    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
-}
-
-- (CPString)description
-{
-    return [CPString stringWithFormat:@"%@ %@", [super description], [self cssString]];
-}
-
-- (id)copy
-{
-    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic];
-}
-
-- (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",
-    CPFontIsItalicKey = @"CPFontIsItalicKey";
+var CPFontNameKey   = @"CPFontNameKey",
+    CPFontSizeKey   = @"CPFontSizeKey",
+    CPFontIsBoldKey = @"CPFontIsBoldKey";
 
 @implementation CPFont (CPCoding)
 
@@ -330,12 +142,9 @@ var CPFontNameKey     = @"CPFontNameKey",
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
-    var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
-        size = [aCoder decodeFloatForKey:CPFontSizeKey],
-        isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
-        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey];
-
-    return [self _initWithName:fontName size:size bold:isBold italic:isItalic];
+    return [self _initWithName:[aCoder decodeObjectForKey:CPFontNameKey]
+        size:[aCoder decodeFloatForKey:CPFontSizeKey]
+        bold:[aCoder decodeBoolForKey:CPFontIsBoldKey]];
 }
 
 /*!
@@ -347,50 +156,6 @@ var CPFontNameKey     = @"CPFontNameKey",
     [aCoder encodeObject:_name forKey:CPFontNameKey];
     [aCoder encodeFloat:_size forKey:CPFontSizeKey];
     [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
-    [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
 }
 
 @end
-
-
-// aName must be normalized
-var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
-{
-    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + 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,7 @@
 
 @import <Foundation/CPObject.j>
 
-@import "CPFont.j"
+@import <AppKit/CPFont.j>
 
 
 var CPSharedFontManager     = nil,
@@ -45,13 +45,13 @@ var CPSharedFontManager     = nil,
 {
     if (!CPSharedFontManager)
         CPSharedFontManager = [[CPFontManagerFactory alloc] init];
-
+    
     return CPSharedFontManager;
 }
 
 // Changing the Default Font Conversion Classes
 /*!
-    Sets the class that will be used to create the application's
+    Sets the class that will be used to create the applcation's
     font manager.
 */
 + (void)setFontManagerFactory:(Class)aClass
@@ -65,7 +65,7 @@ var CPSharedFontManager     = nil,
 - (CPArray)availableFonts
 {
     if (!_availableFonts)
-    {
+    {   
         _CPFontDetectSpan = document.createElement("span");
         _CPFontDetectSpan.fontSize = "24px";
         _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
@@ -74,14 +74,13 @@ var CPSharedFontManager     = nil,
         div.style.top = "-1000px";
         div.appendChild(_CPFontDetectSpan);
         document.getElementsByTagName("body")[0].appendChild(div);
-
-        _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
-
+    
+	   _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
+    
         _availableFonts = [];
-        for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
-        {
+        for (var i = 0; i < _CPFontDetectAllFonts.length; i++) {
             var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
-            if (available)
+		    if (available)
                 _availableFonts.push(_CPFontDetectAllFonts[i]);
         }
     }
@@ -102,8 +101,8 @@ var CPSharedFontManager     = nil,
 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",
+        /* "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",*/
@@ -123,8 +122,8 @@ var _CPFontDetectSpan,
         /* "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", */
+        "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",
@@ -137,44 +136,39 @@ var _CPFontDetectSpan,
         "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,
-        bHeight = _CPFontDetectSpan.offsetHeight;
-
-    return (a.w != bWidth || a.h != bHeight);
+	
+	_CPFontDetectSpan.style.fontFamily= '"' + fontB + '", "' + fontA + '"';
+	var bWidth = _CPFontDetectSpan.offsetWidth;
+	var 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/CPGeometry.j

@@ -62,16 +62,16 @@ function CPPointMake(x, y)
 }
 
 /*!
-    Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
+    Makes a CGRect with an origin and size equal to <code>aRect</code> less the <code>dX/dY</code> insets specified.
     @param dX the size of the inset in the x-axis
     @param dY the size of the inset in the y-axis
     @group CGRect
-    @return CGRect a rectangle like \c aRect with an inset
+    @return CGRect a rectangle like <code>aRect</code> with an inset
 */
 function CPRectInset(aRect, dX, dY)
 {
-    return CPRectMake(  aRect.origin.x + dX, aRect.origin.y + dY,
-                        aRect.size.width - 2 * dX, aRect.size.height - 2 * dY);
+    return CPRectMake(  aRect.origin.x + dX, aRect.origin.y + dY, 
+                        aRect.size.width - 2 * dX, aRect.size.height - 2*dY);
 }
 
 /*!
@@ -96,13 +96,13 @@ function CPRectIntegral(aRect)
 function CPRectIntersection(lhsRect, rhsRect)
 {
     var intersection = CPRectMake(
-        Math.max(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
-        Math.max(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
+        Math.max(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)), 
+        Math.max(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)), 
         0, 0);
-
+    
     intersection.size.width = Math.min(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)) - CPRectGetMinX(intersection);
     intersection.size.height = Math.min(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect)) - CPRectGetMinY(intersection);
-
+    
     return CPRectIsEmpty(intersection) ? CPRectMakeZero() : intersection;
 }
 
@@ -132,7 +132,7 @@ function CPRectMake(x, y, width, height)
 }
 
 /*!
-    Creates a new rectangle with its origin offset by \c dX and \c dY.
+    Creates a new rectangle with its origin offset by <code>dX</code> and <code>dY</code>.
     @group CGRect
     @param aRect the rectangle to copy the origin and size from
     @param dX the amount added to the x-size of the new rectangle
@@ -160,18 +160,18 @@ function CPRectStandardize(aRect)
         standardized.origin.x += width;
         standardized.size.width = -width;
     }
-
+    
     if (height < 0.0)
     {
         standardized.origin.y += height;
         standardized.size.height = -height;
     }
-
+    
     return standardized;
 }
 
 /*!
-    Returns the smallest rectangle that can contain the two argument \c CGRects.
+    Returns the smallest rectangle that can contain the two argument <code>CGRect</code>s.
     @group CGRect
     @param lhsRect the first CGRect to use for the union calculation
     @param rhsRect the second CGRect to use for the union calculation
@@ -183,7 +183,7 @@ function CPRectUnion(lhsRect, rhsRect)
         minY = Math.min(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
         maxX = Math.max(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)),
         maxY = Math.max(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect));
-
+    
     return CPRectMake(minX, minY, maxX - minX, maxY - minY);
 }
 
@@ -211,41 +211,41 @@ function CPSizeMake(width, height)
 }
 
 /*!
-    Returns \c YES if the CGRect, \c aRect, contains
-    the CGPoint, \c aPoint.
+    Returns <code>YES</code> if the CGRect, <code>aRect</code>, contains
+    the CGPoint, <code>aPoint</code>.
     @param aRect the rectangle to test with
     @param aPoint the point to test with
     @group CGRect
-    @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
+    @return BOOL <code>YES</code> if the rectangle contains the point, <code>NO</code> otherwise.
 */
 function CPRectContainsPoint(aRect, aPoint)
 {
     return  aPoint.x >= CPRectGetMinX(aRect) &&
             aPoint.y >= CPRectGetMinY(aRect) &&
-            aPoint.x < CPRectGetMaxX(aRect) &&
-            aPoint.y < CPRectGetMaxY(aRect);
+   			aPoint.x < CPRectGetMaxX(aRect) &&
+   			aPoint.y < CPRectGetMaxY(aRect);
 }
 
 /*!
-    Returns a \c BOOL indicating whether CGRect \c possibleOuter
-    contains CGRect \c possibleInner.
+    Returns a <code>BOOL</code> indicating whether CGRect <code>possibleOuter</code>
+    contains CGRect <code>possibleInner</code>.
     @group CGRect
-    @param possibleOuter the CGRect to test if \c possibleInner is inside of
-    @param possibleInner the CGRect to test if it fits inside \c possibleOuter.
-    @return BOOL \c YES if \c possibleInner fits inside \c possibleOuter.
+    @param possibleOuter the CGRect to test if <code>possibleInner</code> is inside of
+    @param possibleInner the CGRect to test if it fits inside <code>possibleOuter</code>.
+    @return BOOL <code>YES</code> if <code>possibleInner</code> fits inside <code>possibleOuter</code>.
 */
-function CPRectContainsRect(possibleOuter, possibleInner)
+function CPRectContainsRect(lhsRect, rhsRect)
 {
-    return CGRectContainsRect(possibleOuter, possibleInner);
+    return CPRectEqualToRect(CPUnionRect(lhsRect, rhsRect), rhsRect);
 }
 
 /*!
     Tests whether the two CGPoints are equal to each other by comparing their
-    \c x and \c y members.
+    <code>x</code> and <code>y</code> members.
     @group @CGPoint
     @param lhsPoint the first CGPoint to check
     @param rhsPoint the second CGPoint to check
-    @return BOOL \c YES if the two points have the same x's, and the same y's.
+    @return BOOL <code>YES</code> if the two points have the same x's, and the same y's.
 */
 function CPPointEqualToPoint(lhsPoint, rhsPoint)
 {
@@ -257,11 +257,11 @@ function CPPointEqualToPoint(lhsPoint, rhsPoint)
     @group CGRect
     @param lhsRect the first CGRect to compare
     @param rhsRect the second CGRect to compare
-    @return BOOL \c YES if the two rectangles have the same origin and size. \c NO, otherwise.
+    @return BOOL <code>YES</code> if the two rectangles have the same origin and size. <code>NO</code>, otherwise.
 */
 function CPRectEqualToRect(lhsRect, rhsRect)
 {
-    return  CPPointEqualToPoint(lhsRect.origin, rhsRect.origin) &&
+    return  CPPointEqualToPoint(lhsRect.origin, rhsRect.origin) && 
             CPSizeEqualToSize(lhsRect.size, rhsRect.size);
 }
 
@@ -346,11 +346,11 @@ function CPRectGetWidth(aRect)
 }
 
 /*!
-    Returns \c YES if the two rectangles intersect
+    Returns <code>YES</code> if the two rectangles intersect
     @group CGRect
     @param lhsRect the first CGRect
     @param rhsRect the second CGRect
-    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
+    @return BOOL <code>YES</code> if the two rectangles have any common spaces, and <code>NO</code>, otherwise.
 */
 function CPRectIntersectsRect(lhsRect, rhsRect)
 {
@@ -358,11 +358,11 @@ function CPRectIntersectsRect(lhsRect, rhsRect)
 }
 
 /*!
-    Returns \c YES if the CGRect has no area.
+    Returns <code>YES</code> if the CGRect has no area.
     The test is performed by checking if the width and height are both zero.
     @group CGRect
     @param aRect the CGRect to test
-    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+    @return BOOL <code>YES</code> if the CGRect has no area, and <code>NO</code>, otherwise.
 */
 function CPRectIsEmpty(aRect)
 {
@@ -370,10 +370,10 @@ function CPRectIsEmpty(aRect)
 }
 
 /*!
-    Returns \c YES if the CGRect has no area.
+    Returns <code>YES</code> if the CGRect has no area.
     The test is performed by checking if the width and height are both zero.
     @group CGRect
-    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
+    @return BOOL <code>YES</code> if the CGRect has no area, and <code>NO</code>, otherwise.
 */
 function CPRectIsNull(aRect)
 {
@@ -381,25 +381,11 @@ function CPRectIsNull(aRect)
 }
 
 /*!
-    Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
-    with a line that's parallel to the side of inRect specified by edge.
-    The size of slice is determined by amount, which specifies the distance from edge.
-
-    slice and rem must not be NULL.
-
-    @group CGRect
-*/
-function CPDivideRect(inRect, slice, rem, amount, edge)
-{
-    CGRectDivide(inRect, slice, rem, amount, edge);
-}
-
-/*!
-    Returns \c YES if the two CGSizes are identical.
+    Returns <code>YES</code> if the two CGSizes are identical.
     @group CGSize
     @param lhsSize the first CGSize to compare
     @param rhsSize the second CGSize to compare
-    @return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
+    @return BOOL <code>YES</code> if the two sizes are identical. <code>NO</code>, otherwise.
 */
 function CPSizeEqualToSize(lhsSize, rhsSize)
 {
@@ -448,7 +434,7 @@ function CPStringFromRect(aRect)
 function CPPointFromString(aString)
 {
     var comma = aString.indexOf(',');
-
+    
     return { x:parseFloat(aString.substr(1, comma - 1), 10), y:parseFloat(aString.substring(comma + 1, aString.length), 10) };
 }
 
@@ -461,20 +447,20 @@ function CPPointFromString(aString)
 function CPSizeFromString(aString)
 {
     var comma = aString.indexOf(',');
-
+    
     return { width:parseFloat(aString.substr(1, comma - 1), 10), height:parseFloat(aString.substring(comma + 1, aString.length), 10) };
 }
 
 /*!
     Returns a CGRect created from a string.
     @group CGRect
-    @param aString a string in the form generated by \c CPStringFromRect
+    @param aString a string in the form generated by <code>CPStringFromRect</code>
     @return CGRect the rectangle created from the string
 */
 function CPRectFromString(aString)
 {
     var comma = aString.indexOf(',', aString.indexOf(',') + 1);
-
+    
     return { origin:CPPointFromString(aString.substr(1, comma - 1)), size:CPSizeFromString(aString.substring(comma + 2, aString.length)) };
 }
 
@@ -491,7 +477,7 @@ function CPPointFromEvent(anEvent)
 /*!
     Returns a zero sized CGSize.
     @group CGSize
-    @return CGSize a size object with zeros for \c width and \c height
+    @return CGSize a size object with zeros for <code>width</code> and <code>height</code>
 */
 function CPSizeMakeZero()
 {
@@ -499,7 +485,7 @@ function CPSizeMakeZero()
 }
 
 /*!
-    Returns a rectangle at origin \c (0,0) and size of \c (0,0).
+    Returns a rectangle at origin <code>(0,0)</code> and size of <code>(0,0)</code>.
     @group CGRect
     @return CGRect a zeroed out CGRect
 */
@@ -509,15 +495,15 @@ function CPRectMakeZero()
 }
 
 /*!
-    Returns a point located at \c (0, 0).
+    Returns a point located at <code>(0, 0)</code>.
     @group CGPoint
-    @return CGPoint a point located at \c (0, 0)
+    @return CGPoint a point located at <code>(0, 0)</code>
 */
 function CPPointMakeZero()
 {
     return CPPointMake(0, 0, 0);
 }
 
-/*!
+/*! 
     @}
 */

AppKit/CPGraphics.j

@@ -1,108 +0,0 @@
-/*
- * 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"
-
-
-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,12 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import <Foundation/CPObject.j>
-
-@import "CGContext.j"
-
-
-var CPGraphicsContextCurrent = nil;
+var CPGraphicsContextCurrent    = nil;
 
 /*!
     @ingroup appkit
@@ -33,7 +28,7 @@ var CPGraphicsContextCurrent = nil;
 */
 @implementation CPGraphicsContext : CPObject
 {
-    CGContext   _graphicsPort;
+    CPContext   _graphicsPort;
 }
 
 /*!
@@ -71,10 +66,10 @@ var CPGraphicsContextCurrent = nil;
 - (id)initWithGraphicsPort:(CPContext)aGraphicsPort
 {
     self = [super init];
-
+    
     if (self)
         _graphicsPort = aGraphicsPort;
-
+    
     return self;
 }
 

AppKit/CPImage.j

@@ -19,7 +19,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-
+ 
 @import <Foundation/CPBundle.j>
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPObject.j>
@@ -28,7 +28,6 @@
 
 @import "CPGeometry.j"
 
-
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
 CPImageLoadStatusCompleted      = 2;
@@ -39,33 +38,27 @@ CPImageLoadStatusReadError      = 6;
 
 CPImageDidLoadNotification      = @"CPImageDidLoadNotification";
 
-// Image Names
-CPImageNameColorPanel               = @"CPImageNameColorPanel";
-CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
-
-var imagesForNames = { },
-    AppKitImageForNames = { };
-
-AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
-AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
-
 function CPImageInBundle(aFilename, aSize, aBundle)
 {
     if (!aBundle)
         aBundle = [CPBundle mainBundle];
-
+    
     if (aSize)
         return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
-
+    
     return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
 }
 
-function CPAppKitImage(aFilename, aSize)
+@implementation CPBundle (CPImageAdditions)
+
+- (CPString)pathForResource:(CPString)aFilename
 {
-    return CPImageInBundle(aFilename, aSize, [CPBundle bundleForClass:[CPView class]]);
+    return [self resourcePath] + '/' + aFilename;
 }
 
-/*!
+@end
+
+/*! 
     @ingroup appkit
     @class CPImage
 
@@ -73,7 +66,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
@@ -90,38 +83,32 @@ function CPAppKitImage(aFilename, aSize)
 {
     CGSize      _size;
     CPString    _filename;
-    CPString    _name;
-
+    
     id          _delegate;
     unsigned    _loadStatus;
-
+    
     Image       _image;
 }
 
-- (id)init
-{
-    return [self initByReferencingFile:@"" size:CGSizeMake(-1, -1)];
-}
-
 /*!
     Initializes the image, by associating it with a filename. The image
-    denoted in \c aFilename is not actually loaded. It will
+    denoted in <code>aFilename</code> is not actually loaded. It will
     be loaded once needed.
     @param aFilename the file containing the image
     @param aSize the image's size
     @return the initialized image
 */
-- (id)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
+- (CPImage)initByReferencingFile:(CPString)aFilename size:(CGSize)aSize
 {
     self = [super init];
-
+    
     if (self)
     {
         _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
-
+    
     return self;
 }
 
@@ -131,13 +118,13 @@ function CPAppKitImage(aFilename, aSize)
     @param aSize the size of the image
     @return the initialized image.
 */
-- (id)initWithContentsOfFile:(CPString)aFilename size:(CGSize)aSize
+- (CPImage)initWithContentsOfFile:(CPString)aFilename size:(CGSize)aSize
 {
     self = [self initByReferencingFile:aFilename size:aSize];
-
+    
     if (self)
         [self load];
-
+    
     return self;
 }
 
@@ -147,13 +134,13 @@ function CPAppKitImage(aFilename, aSize)
     @param aFilename the file name of the image
     @return the initialized image
 */
-- (id)initWithContentsOfFile:(CPString)aFilename
+- (CPImage)initWithContentsOfFile:(CPString)aFilename
 {
-    self = [self initByReferencingFile:aFilename size:CGSizeMake(-1, -1)];
-
+    self = [self initByReferencingFile:aFilename size: CGSizeMake(-1, -1)];
+    
     if (self)
         [self load];
-
+    
     return self;
 }
 
@@ -182,50 +169,6 @@ function CPAppKitImage(aFilename, aSize)
     return _size;
 }
 
-+ (id)imageNamed:(CPString)aName
-{
-    var image = imagesForNames[aName];
-
-    if (image)
-        return image;
-
-    var imageOrSize = AppKitImageForNames[aName];
-
-    if (!imageOrSize)
-        return nil;
-
-    if (!imageOrSize.isa)
-    {
-        imageOrSize = CPAppKitImage("CPImage/" + aName + ".png", imageOrSize);
-
-        [imageOrSize setName:aName];
-
-        AppKitImageForNames[aName] = imageOrSize;
-    }
-
-    return imageOrSize;
-}
-
-- (BOOL)setName:(CPString)aName
-{
-    if (_name === aName)
-        return YES;
-
-    if (imagesForNames[aName])
-        return NO;
-
-    _name = aName;
-
-    imagesForNames[aName] = self;
-
-    return YES;
-}
-
-- (CPString)name
-{
-    return _name;
-}
-
 /*!
     Sets the receiver's delegate.
     @param the delegate
@@ -244,9 +187,9 @@ function CPAppKitImage(aFilename, aSize)
 }
 
 /*!
-    Returns the load status, which will be CPImageLoadStatusCompleted if the image data has already been loaded.
+    Returns <code>YES</code> if the image data has already been loaded.
 */
-- (unsigned)loadStatus
+- (BOOL)loadStatus
 {
     return _loadStatus;
 }
@@ -261,10 +204,9 @@ function CPAppKitImage(aFilename, aSize)
 {
     if (_loadStatus == CPImageLoadStatusLoading || _loadStatus == CPImageLoadStatusCompleted)
         return;
-
+        
     _loadStatus = CPImageLoadStatusLoading;
 
-#if PLATFORM(DOM)
     _image = new Image();
 
     var isSynchronous = YES;
@@ -281,7 +223,7 @@ function CPAppKitImage(aFilename, aSize)
             }
             [self _derefFromImage];
         }
-
+    
     _image.onerror = function ()
         {
             if (isSynchronous)
@@ -293,7 +235,7 @@ function CPAppKitImage(aFilename, aSize)
             }
             [self _derefFromImage];
         }
-
+    
     _image.onabort = function ()
         {
             if (isSynchronous)
@@ -305,13 +247,10 @@ function CPAppKitImage(aFilename, aSize)
             }
             [self _derefFromImage];
         }
-
+        
     _image.src = _filename;
-
-    // onload and friends may fire after this point but BEFORE the end of the run loop,
-    // crazy, I know. So don't set isSynchronous here, rather wait a bit longer.
-    window.setTimeout(function() { isSynchronous = NO; }, 0);
-#endif
+    
+    isSynchronous = NO;
 }
 
 - (BOOL)isThreePartImage
@@ -344,7 +283,7 @@ function CPAppKitImage(aFilename, aSize)
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPImageDidLoadNotification
         object:self];
-
+        
     if ([_delegate respondsToSelector:@selector(imageDidLoad:)])
         [_delegate imageDidLoad:self];
 }
@@ -353,7 +292,7 @@ function CPAppKitImage(aFilename, aSize)
 - (void)_imageDidError
 {
     _loadStatus = CPImageLoadStatusReadError;
-
+    
     if ([_delegate respondsToSelector:@selector(imageDidError:)])
         [_delegate imageDidError:self];
 }
@@ -362,7 +301,7 @@ function CPAppKitImage(aFilename, aSize)
 - (void)_imageDidAbort
 {
     _loadStatus = CPImageLoadStatusCancelled;
-
+    
     if ([_delegate respondsToSelector:@selector(imageDidAbort:)])
         [_delegate imageDidAbort:self];
 }
@@ -402,7 +341,7 @@ function CPAppKitImage(aFilename, aSize)
 - (id)initWithImageSlices:(CPArray)imageSlices isVertical:(BOOL)isVertical
 {
     self = [super init];
-
+    
     if (self)
     {
         _imageSlices = imageSlices;
@@ -447,13 +386,13 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-
+    
     if (self)
     {
         _imageSlices = [aCoder decodeObjectForKey:CPThreePartImageImageSlicesKey];
         _isVertical = [aCoder decodeBoolForKey:CPThreePartImageIsVerticalKey];
     }
-
+    
     return self;
 }
 
@@ -474,10 +413,10 @@ var CPThreePartImageImageSlicesKey  = @"CPThreePartImageImageSlicesKey",
 - (id)initWithImageSlices:(CPArray)imageSlices
 {
     self = [super init];
-
+    
     if (self)
         _imageSlices = imageSlices;
-
+    
     return self;
 }
 
@@ -510,10 +449,10 @@ var CPNinePartImageImageSlicesKey   = @"CPNinePartImageImageSlicesKey";
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-
+    
     if (self)
         _imageSlices = [aCoder decodeObjectForKey:CPNinePartImageImageSlicesKey];
-
+    
     return self;
 }
 

AppKit/CPImageView.j

@@ -26,24 +26,31 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
+#include "Platform/Platform.h"
+#include "Platform/DOM/CPDOMDisplayServer.h"
 
+#include "CoreGraphics/CGGeometry.h"
+
+
+/*
+    @global
+    @group CPImageScaling
+*/
 CPScaleProportionally   = 0;
+/*
+    @global
+    @group CPImageScaling
+*/
 CPScaleToFit            = 1;
+/*
+    @global
+    @group CPImageScaling
+*/
 CPScaleNone             = 2;
 
-CPImageAlignCenter      = 0;
-CPImageAlignTop         = 1;
-CPImageAlignTopLeft     = 2;
-CPImageAlignTopRight    = 3;
-CPImageAlignLeft        = 4;
-CPImageAlignBottom      = 5;
-CPImageAlignBottomLeft  = 6;
-CPImageAlignBottomRight = 7;
-CPImageAlignRight       = 8;
-
-var CPImageViewShadowBackgroundColor = nil,
-    CPImageViewEmptyPlaceholderImage = nil;
 
+var CPImageViewShadowBackgroundColor = nil;
+    
 var LEFT_SHADOW_INSET       = 3.0,
     RIGHT_SHADOW_INSET      = 3.0,
     TOP_SHADOW_INSET        = 3.0,
@@ -51,7 +58,7 @@ var LEFT_SHADOW_INSET       = 3.0,
     VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
     HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPImageView
 
@@ -59,28 +66,20 @@ var LEFT_SHADOW_INSET       = 3.0,
 */
 @implementation CPImageView : CPControl
 {
-    DOMElement          _DOMImageElement;
+    DOMElement      _DOMImageElement;
+    
+    BOOL            _hasShadow;
+    CPView          _shadowView;
 
-    BOOL                _hasShadow;
-    CPView              _shadowView;
+    BOOL            _isEditable;
 
-    BOOL                _isEditable;
-
-    CGRect              _imageRect;
-    CPImageAlignment    _imageAlignment;
-}
-
-+ (void)initialize
-{
-    var bundle = [CPBundle bundleForClass:[CPView class]];
-
-    CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
+    CGRect          _imageRect;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
 #if PLATFORM(DOM)
@@ -88,19 +87,13 @@ var LEFT_SHADOW_INSET       = 3.0,
         _DOMImageElement.style.position = "absolute";
         _DOMImageElement.style.left = "0px";
         _DOMImageElement.style.top = "0px";
-
-        if ([CPPlatform supportsDragAndDrop])
-        {
-            _DOMImageElement.setAttribute("draggable", "true");
-            _DOMImageElement.style["-khtml-user-drag"] = "element";
-        }
-
+    
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-
+        
         _DOMImageElement.style.visibility = "hidden";
 #endif
     }
-
+    
     return self;
 }
 
@@ -121,29 +114,29 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)setObjectValue:(CPImage)anImage
 {
     var oldImage = [self objectValue];
-
+    
     if (oldImage === anImage)
         return;
-
+        
     [super setObjectValue:anImage];
-
+    
     var defaultCenter = [CPNotificationCenter defaultCenter];
-
+    
     if (oldImage)
         [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage];
 
     var newImage = [self objectValue];
-
+    
 #if PLATFORM(DOM)
-    _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
+    _DOMImageElement.src = newImage ? [newImage filename] : "";
 #endif
 
     var size = [newImage size];
-
+    
     if (size && size.width === -1 && size.height === -1)
     {
         [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage];
-
+        
 #if PLATFORM(DOM)
         _DOMImageElement.width = 0;
         _DOMImageElement.height = 0;
@@ -162,14 +155,14 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)imageDidLoad:(CPNotification)aNotification
 {
     [self hideOrDisplayContents];
-
+    
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
 
 /*!
-    Returns \c YES if the image view draws with
-    a drop shadow. The default is \c NO.
+    Returns <code>YES</code> if the image view draws with
+    a drop shadow. The default is <code>NO</code>.
 */
 - (BOOL)hasShadow
 {
@@ -184,52 +177,28 @@ 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.
@@ -238,23 +207,18 @@ var LEFT_SHADOW_INSET       = 3.0,
 - (void)setImageScaling:(CPImageScaling)anImageScaling
 {
     [super setImageScaling:anImageScaling];
-
+    
 #if PLATFORM(DOM)
     if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
     {
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
     }
 #endif
-
+    
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
 
-- (unsigned)imageScaling
-{
-    return [self currentValueForThemeAttribute:@"image-scaling"];
-}
-
 /*!
     Toggles the display of the image view.
 */
@@ -314,7 +278,7 @@ var LEFT_SHADOW_INSET       = 3.0,
     else
     {
         var size = [image size];
-
+        
         if (size.width == -1 && size.height == -1)
             return;
 
@@ -331,7 +295,7 @@ var LEFT_SHADOW_INSET       = 3.0,
             {
                 var imageRatio = size.width / size.height,
                     viewRatio = width / height;
-
+                    
                 if (viewRatio > imageRatio)
                     width = height * imageRatio;
                 else
@@ -348,7 +312,7 @@ var LEFT_SHADOW_INSET       = 3.0,
             width = size.width;
             height = size.height;
         }
-
+    
         if (imageScaling == CPScaleNone)
         {
 #if PLATFORM(DOM)
@@ -357,46 +321,8 @@ var LEFT_SHADOW_INSET       = 3.0,
 #endif
         }
 
-        var x,
-            y;
-
-        switch (_imageAlignment)
-        {
-            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;
-        }
-
-        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;
-        }
+        var x = (boundsWidth - width) / 2.0,
+            y = (boundsHeight - height) / 2.0;
 
 #if PLATFORM(DOM)
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
@@ -404,7 +330,7 @@ var LEFT_SHADOW_INSET       = 3.0,
     }
 
     _imageRect = _CGRectMake(x, y, width, height);
-
+    
     if (_hasShadow)
         [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
 }
@@ -442,26 +368,20 @@ var LEFT_SHADOW_INSET       = 3.0,
     return _isEditable;
 }
 
-- (BOOL)performDragOperation:(CPDraggingInfo)aSender
+- (void)performDragOperation:(CPDraggingInfo)aSender
 {
     var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
 
     if ([images count])
-    {
         [self setImage:images[0]];
-        [self sendAction:[self action] to:[self target]];
-    }
-
-    return YES;
 }
 
 @end
 
-var CPImageViewImageKey          = @"CPImageViewImageKey",
-    CPImageViewImageScalingKey   = @"CPImageViewImageScalingKey",
-    CPImageViewImageAlignmentKey = @"CPImageViewImageAlignmentKey",
-    CPImageViewHasShadowKey      = @"CPImageViewHasShadowKey",
-    CPImageViewIsEditableKey     = @"CPImageViewIsEditableKey";
+var CPImageViewImageKey         = @"CPImageViewImageKey",
+    CPImageViewImageScalingKey  = @"CPImageViewImageScalingKey",
+    CPImageViewHasShadowKey     = @"CPImageViewHasShadowKey",
+    CPImageViewIsEditableKey    = @"CPImageViewIsEditableKey";
 
 @implementation CPImageView (CPCoding)
 
@@ -478,15 +398,10 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
     _DOMImageElement.style.left = "0px";
     _DOMImageElement.style.top = "0px";
     _DOMImageElement.style.visibility = "hidden";
-    if ([CPPlatform supportsDragAndDrop])
-    {
-        _DOMImageElement.setAttribute("draggable", "true");
-        _DOMImageElement.style["-khtml-user-drag"] = "element";
-    }
 #endif
 
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
 #if PLATFORM(DOM)
@@ -494,15 +409,14 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 #endif
 
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
-        [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
-
+        
         if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
             [self setEditable:YES];
 
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }
-
+    
     return self;
 }
 
@@ -513,23 +427,22 @@ 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];

AppKit/CPKeyBinding.j

@@ -1,263 +0,0 @@
-/*
- * 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 "CPEvent.j"
-
-
-CPStandardKeyBindings = {
-    @"@.": @"cancelOperation:",
-
-    @"^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 class] !== CPKeyBinding)
-        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

@@ -1,521 +0,0 @@
-/*
- * 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/CPValueTransformer.j>
-
-
-var exposedBindingsMap = [CPDictionary new],
-    bindingsMap = [CPDictionary new];
-
-var CPBindingOperationAnd = 0,
-    CPBindingOperationOr  = 1;
-
-@implementation CPBinder : CPObject
-{
-    CPDictionary    _info;
-    id              _source;
-
-    JSObject        _suppressedNotifications;
-}
-
-+ (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 infoDictionary = theBinding._info,
-        observedObject = [infoDictionary objectForKey:CPObservedObjectKey],
-        keyPath = [infoDictionary 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
-{
-    self = [super init];
-
-    if (self)
-    {
-        _source = aSource;
-        _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
-        _suppressedNotifications = {};
-
-        if (options)
-            [_info setObject:options forKey:CPOptionsKey];
-
-        [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];
-
-        var bindings = [bindingsMap objectForKey:[_source UID]];
-        if (!bindings)
-        {
-            bindings = [CPDictionary new];
-            [bindingsMap setObject:bindings forKey:[_source UID]];
-        }
-
-        [bindings setObject:self forKey:aName];
-        [self setValueFor:aBinding];
-    }
-
-    return self;
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath];
-
-    newValue = [self transformValue:newValue withOptions:options];
-    [_source setValue:newValue forKey:aBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)aBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [_source valueForKeyPath:aBinding];
-
-    newValue = [self reverseTransformValue:newValue withOptions:options];
-    [destination setValue:newValue forKeyPath:keyPath];
-}
-
-- (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];
-}
-
-@end
-
-@implementation CPObject (KeyValueBindingCreation)
-
-+ (void)exposeBinding:(CPString)aBinding
-{
-    [CPBinder exposeBinding:aBinding forClass:[self class]];
-}
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    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];
-}
-
-- (id)_replacementKeyPathForBinding:(CPString)binding
-{
-    return binding;
-}
-
-@end
-
-/*!
-    @ignore
-    Provides stub implementations that simply call super for the "objectValue" binding
-    This class should not be necessary but assures backwards compliance with our old way of doing bindings
-    Every class with a value binding should implement a subclass to handle it's specific value binding logic
-*/
-@implementation _CPValueBinder : CPBinder
-{
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    [super setValueFor:@"objectValue"];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    [super reverseSetValueFor:@"objectValue"];
-}
-
-@end
-
-@implementation _CPKeyValueOrBinding : CPBinder
-{
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationOr) forKey:aBinding];
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-@end
-
-@implementation _CPKeyValueAndBinding : CPBinder
-{
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap objectForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    [_source setValue:resolveMultipleValues(aBinding, bindings, CPBindingOperationAnd) forKey:aBinding];
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObejct change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-@end
-
-var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
-{
-    var bindingName = key,
-        theBinding,
-        count = 1;
-
-    while (theBinding = [bindings objectForKey:bindingName])
-    {
-        var infoDictionary = theBinding._info,
-            object  = [infoDictionary objectForKey:CPObservedObjectKey],
-            keyPath = [infoDictionary objectForKey:CPObservedKeyPathKey],
-            options = [infoDictionary objectForKey:CPOptionsKey];
-
-        var value = [theBinding transformValue:[object valueForKeyPath:keyPath] withOptions:options];
-
-        if (value == operation)
-            return operation;
-
-        bindingName = [CPString stringWithFormat:@"%@%i", key, ++count];
-    }
-
-    return !operation;
-}
-
-var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
-{
-    var theBinding = [bindings objectForKey:targetKey],
-        infoDictionary = theBinding._info,
-
-        object   = [infoDictionary objectForKey:CPObservedObjectKey],
-        keyPath  = [infoDictionary objectForKey:CPObservedKeyPathKey],
-        options  = [infoDictionary objectForKey:CPOptionsKey],
-
-        target   = [object valueForKeyPath:keyPath],
-        selector = [options objectForKey:CPSelectorNameBindingOption];
-
-    if (!target || !selector)
-        return;
-
-    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]];
-    [invocation setSelector:selector];
-
-    var bindingName = argumentKey,
-        count = 1;
-
-    while (theBinding = [bindings objectForKey:bindingName])
-    {
-        infoDictionary = theBinding._info;
-
-        keyPath = [infoDictionary objectForKey:CPObserverKeyPathKey];
-        object  = [[infoDictionary objectForKey:CPObservedObjectKey] valueForKeyPath:keyPath];
-
-        if (object)
-            [invocation setArgument:object atIndex:++count];
-
-        bindingName = [CPString stringWithFormat:@"%@%i", argumentKey, count];
-    }
-
-    [invocation invoke];
-}
-
-// Keys in options dictionary
-
-// Keys in dictionary returned by infoForBinding
-CPObservedObjectKey     = @"CPObservedObjectKey";
-CPObservedKeyPathKey    = @"CPObservedKeyPathKey";
-CPOptionsKey            = @"CPOptionsKey";
-
-// special markers
-CPMultipleValuesMarker  = @"CPMultipleValuesMarker";
-CPNoSelectionMarker     = @"CPNoSelectionMarker";
-CPNotApplicableMarker   = @"CPNotApplicableMarker";
-CPNullMarker            = @"CPNullMarker";
-
-// Binding name constants
-CPAlignmentBinding      = @"alignment";
-CPEditableBinding       = @"editable";
-CPEnabledBinding        = @"enabled";
-CPFontBinding           = @"font";
-CPHiddenBinding         = @"hidden";
-CPSelectedIndexBinding  = @"selectedIndex";
-CPTextColorBinding      = @"textColor";
-CPToolTipBinding        = @"toolTip";
-CPValueBinding          = @"value";
-
-//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;
-}

AppKit/CPLevelIndicator.j

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

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,553 +0,0 @@
-@import "CPPanel.j"
-@import "_CPMenuWindow.j"
-
-
-var MENUBAR_HEIGHT          = 28.0,
-    MENUBAR_MARGIN          = 10.0,
-    MENUBAR_LEFT_MARGIN     = 10.0,
-    MENUBAR_RIGHT_MARGIN    = 10.0;
-
-var _CPMenuBarWindowBackgroundColor = nil,
-    _CPMenuBarWindowFont            = nil;
-
-@implementation _CPMenuBarWindow : CPPanel
-{
-    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;
-}
-
-- (id)init
-{
-    // 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;
-
-    self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
-
-    if (self)
-    {
-        [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 setAlignment:CPCenterTextAlignment];
-        [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
-
-        [contentView addSubview:_titleField];
-    }
-
-    return self;
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-#if PLATFORM(DOM)
-    var bundleName = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPBundleName"];
-
-    if (![bundleName length])
-        document.title = aTitle;
-    else if ([aTitle length])
-        document.title = aTitle + @" - " + bundleName;
-    else
-        document.title = bundleName;
-#endif
-
-    [_titleField setStringValue:aTitle];
-    [_titleField sizeToFit];
-
-    [self tile];
-}
-
-- (void)setIconImage:(CPImage)anImage
-{
-    [_iconImageView setImage:anImage];
-    [_iconImageView setHidden:anImage == nil];
-
-    [self tile];
-}
-
-- (void)setIconImageAlphaValue:(float)anAlphaValue
-{
-    [_iconImageView setAlphaValue:anAlphaValue];
-}
-
-- (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];
-    }
-    else
-        [[self contentView] setBackgroundColor:aColor];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    if (_textColor == aColor)
-        return;
-
-    _textColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
-}
-
-- (void)setTitleColor:(CPColor)aColor
-{
-    if (_titleColor == aColor)
-        return;
-
-    _titleColor = aColor;
-
-    [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    if (_textShadowColor == aColor)
-        return;
-
-    _textShadowColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
-}
-
-- (void)setTitleShadowColor:(CPColor)aColor
-{
-    if (_titleShadowColor == aColor)
-        return;
-
-    _titleShadowColor = aColor;
-
-    [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
-}
-
-- (void)setHighlightColor:(CPColor)aColor
-{
-    if (_highlightColor == aColor)
-        return;
-
-    _highlightColor = aColor;
-}
-
-- (void)setHighlightTextColor:(CPColor)aColor
-{
-    if (_highlightTextColor == aColor)
-        return;
-
-    _highlightTextColor = aColor;
-
-//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
-}
-
-- (void)setHighlightTextShadowColor:(CPColor)aColor
-{
-    if (_highlightTextShadowColor == aColor)
-        return;
-
-    _highlightTextShadowColor = aColor;
-
-//    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    if (_menu == aMenu)
-        return;
-
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (_menu)
-    {
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidAddItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidChangeItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidRemoveItemNotification
-                    object:_menu];
-
-        var items = [_menu itemArray],
-            count = items.length;
-
-        while (count--)
-            [[items[count] _menuItemView] removeFromSuperview];
-    }
-
-    _menu = aMenu;
-
-    if (_menu)
-    {
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidAddItem:)
-                  name:CPMenuDidAddItemNotification
-                object:_menu];
-
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidChangeItem:)
-                  name:CPMenuDidChangeItemNotification
-                object:_menu];
-
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidRemoveItem:)
-                  name:CPMenuDidRemoveItemNotification
-                object:_menu];
-    }
-
-    _menuItemViews = [];
-
-    var contentView = [self contentView],
-        items = [_menu itemArray],
-        count = items.length;
-
-    for (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];
-}
-
-- (void)menuDidChangeItem:(CPNotification)aNotification
-{
-    var menuItem = [_menu itemAtIndex:[[aNotification userInfo] objectForKey:@"CPMenuItemIndex"]],
-        menuItemView = [menuItem _menuItemView];
-
-    [menuItemView setHidden:[menuItem isHidden]];
-    [menuItemView synchronizeWithMenuItem];
-
-    [self tile];
-}
-
-- (void)menuDidAddItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
-        menuItem = [_menu itemAtIndex:index],
-        menuItemView = [menuItem _menuItemView];
-
-    [_menuItemViews insertObject:menuItemView atIndex:index];
-
-    [menuItemView setTextColor:_textColor];
-    [menuItemView setHidden:[menuItem isHidden]];
-
-    [menuItemView synchronizeWithMenuItem];
-
-    [[self contentView] addSubview:menuItemView];
-
-    [self tile];
-}
-
-- (void)menuDidRemoveItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
-        menuItemView = [_menuItemViews objectAtIndex:index];
-
-    [_menuItemViews removeObjectAtIndex:index];
-
-    [menuItemView removeFromSuperview];
-
-    [self tile];
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
-
-    constraintRect.size.height -= 5.0;
-
-    [[_CPMenuManager sharedMenuManager]
-        beginTracking:anEvent
-        menuContainer:self
-       constraintRect:constraintRect
-             callback:function(aMenuContainer, aMenu)
-             {
-                [aMenu _performActionOfHighlightedItemChain];
-                [aMenu _highlightItemAtIndex:CPNotFound];
-             }];
-}
-
-- (CPFont)font
-{
-    [CPFont systemFontOfSize:12.0];
-}
-
-- (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 setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
-
-            x += CGRectGetWidth([menuItemView frame]);
-        }
-        else
-        {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
-
-            x = CGRectGetMinX([menuItemView frame]);
-        }
-    }
-
-    var bounds = [[self contentView] bounds],
-        titleFrame = [_titleField frame];
-
-    if ([_iconImageView isHidden])
-        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
-    else
-    {
-        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)];
-    }
-}
-
-- (void)setFrame:(CGRect)aRect display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
-{
-    var size = [self frame].size;
-
-    [super setFrame:aRect display:shouldDisplay animate:shouldAnimate];
-
-    if (!_CGSizeEqualToSize(size, aRect.size))
-        [self tile];
-}
-
-@end
-
-@implementation _CPMenuBarWindow (CPMenuContainer)
-
-- (BOOL)isMenuBar
-{
-    return YES;
-}
-
-- (CGRect)globalFrame
-{
-    return [self frame];
-}
-
-- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
-{
-    return _CPMenuManagerScrollingStateNone;
-}
-
-- (CPInteger)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var items = [_menu itemArray],
-        index = items.length;
-
-    while (index--)
-    {
-        var item = items[index];
-
-        if ([item isHidden] || [item isSeparatorItem])
-            continue;
-
-        if (CGRectContainsPoint([self rectForItemAtIndex:index], aPoint))
-            return index;
-    }
-
-    return CPNotFound;
-}
-
-- (CGRect)rectForItemAtIndex:(CPInteger)anIndex
-{
-    var menuItem = [_menu itemAtIndex:anIndex === CPNotFound ? 0 : anIndex];
-
-    return [[menuItem _menuItemView] frame];
-}
-
-@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,655 +0,0 @@
-@import <Foundation/CPObject.j>
-
-
-_CPMenuManagerScrollingStateUp      = -1,
-_CPMenuManagerScrollingStateDown    = 1,
-_CPMenuManagerScrollingStateNone    = 0;
-
-var STICKY_TIME_INTERVAL            = 500,
-    SharedMenuManager               = nil;
-
-@implementation _CPMenuManager: CPObject
-{
-    CPTimeInterval      _startTime;
-    int                 _scrollingState;
-    CGPoint             _lastGlobalLocation;
-
-    CPView              _lastMouseOverMenuView;
-
-    CGRect              _constraintRect;
-    CPMutableArray      _menuContainerStack;
-
-    Function            _trackingCallback;
-
-    CPString            _keyBuffer;
-
-    CPMenuItem          _previousActiveItem;
-    int                 _showTimerID;
-}
-
-+ (_CPMenuManager)sharedMenuManager
-{
-    if (!SharedMenuManager)
-        SharedMenuManager = [[_CPMenuManager alloc] init];
-
-    return SharedMenuManager;
-}
-
-- (id)init
-{
-    if (SharedMenuManager)
-        return SharedMenuManager;
-
-    return [super init];
-}
-
-- (id)trackingMenuContainer
-{
-    return _menuContainerStack[0];
-}
-
-- (CPMenu)trackingMenu
-{
-    return [[self trackingMenuContainer] menu];
-}
-
-- (void)beginTracking:(CPEvent)anEvent
-        menuContainer:(id)aMenuContainer
-       constraintRect:(CGRect)aRect
-             callback:(Function)aCallback
-{
-    var menu = [aMenuContainer menu];
-
-    CPApp._activeMenu = menu;
-
-    _startTime = [anEvent timestamp];//new Date();
-    _scrollingState = _CPMenuManagerScrollingStateNone;
-
-    _constraintRect = aRect;
-    _menuContainerStack = [aMenuContainer];
-    _trackingCallback = aCallback;
-
-    if (menu === [CPApp mainMenu])
-    {
-        var globalLocation = [anEvent 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
-            activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
-            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
-
-        _menuBarButtonItemIndex = activeItemIndex;
-        _menuBarButtonMenuContainer = aMenuContainer;
-
-        if ([activeItem _isMenuBarButton])
-            return [self trackMenuBarButtonEvent:anEvent];
-    }
-
-    [self trackEvent:anEvent];
-}
-
-- (void)trackEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type],
-        trackingMenu = [self trackingMenu];
-
-    // Close Menu Event.
-    if (type === CPAppKitDefined)
-        return [self completeTracking];
-
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
-
-    if (type === CPKeyDown)
-    {
-        var menu = trackingMenu,
-            submenu = [[menu  highlightedItem] submenu];
-
-        // get the current active menu
-        while (submenu && [submenu._menuWindow isVisible])
-        {
-            menu = submenu;
-            submenu = [[menu  highlightedItem] submenu];
-        }
-
-        if ([menu numberOfItems])
-            [self interpretKeyEvent:anEvent forMenu:menu];
-
-        return;
-    }
-
-    if (_keyBuffer)
-    {
-        if (([CPDate date] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
-            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
-
-        if (type === CPPeriodic)
-            return;
-    }
-
-    // Periodic events don't have a valid location.
-    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
-
-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
-
-    if (!_lastGlobalLocation)
-        return;
-
-    // Find which menu window the mouse is currently on top of
-    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
-        activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
-
-        // Find out the item the mouse is currently on top of
-        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
-        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
-
-    // If the item isn't enabled its as if we clicked on nothing.
-    if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
-    {
-        activeItemIndex = CPNotFound;
-        activeItem = nil;
-    }
-
-    var mouseOverMenuView = [activeItem view];
-
-    if (type === CPScrollWheel)
-        [activeMenuContainer scrollByDelta:[anEvent deltaY]];
-
-    if (type === CPPeriodic)
-    {
-        if (_scrollingState === _CPMenuManagerScrollingStateUp)
-            [activeMenuContainer scrollUp];
-        else if (_scrollingState === _CPMenuManagerScrollingStateDown)
-            [activeMenuContainer scrollDown];
-    }
-
-    // If we're over a custom menu view...
-    if (mouseOverMenuView)
-    {
-        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]])
-            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]]];
-    }
-    else
-    {
-        if (_lastMouseOverMenuView)
-        {
-            [_lastMouseOverMenuView mouseExited:anEvent];
-            _lastMouseOverMenuView = nil;
-        }
-
-        [activeMenu _highlightItemAtIndex:activeItemIndex];
-
-        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
-        {
-            var oldScrollingState = _scrollingState;
-
-            _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
-
-            if (_scrollingState !== oldScrollingState)
-            {
-                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 + [activeMenu numberOfItems] * 5)))
-            [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:))
-    {
-        var 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];
-
-        // 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
-    // we've moved to an item without a submenu.
-    else
-        [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
-
-    _previousActiveItem = activeItem;
-}
-
-- (void)trackMenuBarButtonEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type === CPAppKitDefined)
-        return [self completeTracking];
-
-    var globalLocation = [anEvent globalLocation],
-
-        // 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];
-
-    [CPApp setTarget:self selector:@selector(trackMenuBarButtonEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
-
-    if (type === CPLeftMouseUp)
-        [menu cancelTracking];
-}
-
-- (void)completeTracking
-{
-    var trackingMenu = [self trackingMenu];
-
-    // Stop all periodic events at this point.
-    [CPEvent stopPeriodicEvents];
-
-    // Hide all submenus.
-    [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-
-    var delegate = [trackingMenu delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:trackingMenu];
-
-    if (_trackingCallback)
-        _trackingCallback([self trackingMenuContainer], trackingMenu);
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidEndTrackingNotification
-                                                        object:trackingMenu];
-
-    CPApp._activeMenu = nil;
-}
-
-- (id)menuContainerForPoint:(float)aGlobalLocation
-{
-    var count = [_menuContainerStack count],
-        firstMenuContainer = _menuContainerStack[0];
-
-    // Trivial case.
-    if (count === 1)
-        return firstMenuContainer;
-
-    var firstMenuWindowIndex = 0,
-        lastMenuWindowIndex = count - 1;
-
-    // If the first menu container is a bar, then it has to fall strictly within its bounds.
-    if ([firstMenuContainer isMenuBar])
-    {
-        if (CGRectContainsPoint([firstMenuContainer globalFrame], aGlobalLocation))
-            return firstMenuContainer;
-
-        firstMenuWindowIndex = 1;
-    }
-
-    var index = count,
-        x = aGlobalLocation.x,
-        closerDeltaX = Infinity,
-        closerMenuContainer = nil;
-
-    while (index-- > firstMenuWindowIndex)
-    {
-        var menuContainer = _menuContainerStack[index],
-            menuContainerFrame = [menuContainer globalFrame],
-            menuContainerMinX = _CGRectGetMinX(menuContainerFrame),
-            menuContainerMaxX = _CGRectGetMaxX(menuContainerFrame);
-
-        // If within the x bounds of this menu container, return it.
-        if (x < menuContainerMaxX && x >= menuContainerMinX)
-            return menuContainer;
-
-        // If this is either the first or last menu *window*, check to see how close we are to it.
-        if (index === firstMenuWindowIndex || index === lastMenuWindowIndex)
-        {
-            var deltaX = ABS(x < menuContainerMinX ? menuContainerMinX - x : menuContainerMaxX - x);
-
-            if (deltaX < closerDeltaX)
-            {
-                closerMenuContainer = menuContainer;
-                closerDeltaX = deltaX;
-            }
-        }
-    }
-
-    return closerMenuContainer;
-}
-
-- (void)showMenu:(CPMenu)newMenu fromMenu:(CPMenu)baseMenu atPoint:(CGPoint)aGlobalLocation
-{
-    var count = _menuContainerStack.length,
-        index = count;
-
-    // Hide all menus up to the base menu...
-    while (index--)
-    {
-        var menuContainer = _menuContainerStack[index],
-            menu = [menuContainer menu];
-
-        // If we reach the base menu, or this menu is already being shown, break.
-        if (menu === baseMenu)
-            break;
-
-        // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
-            return [newMenu _highlightItemAtIndex:CPNotFound];
-
-        [menuContainer orderOut:self];
-        [menuContainer setMenu:nil];
-
-        [_CPMenuWindow poolMenuWindow:menuContainer];
-        [_menuContainerStack removeObjectAtIndex:index];
-    }
-
-    if (!newMenu)
-        return;
-
-    // Unhighlight any previously highlighted item.
-    [newMenu _highlightItemAtIndex:CPNotFound];
-
-    var menuWindow = [_CPMenuWindow menuWindowWithMenu:newMenu font:[_menuContainerStack[0] font]];
-
-    [_menuContainerStack addObject:menuWindow];
-
-    [menuWindow setConstraintRect:_constraintRect];
-
-    // If our parent menu is a menu bar...
-    if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
-        [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
-    else
-        [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])
-        {
-            var aSelector = CPSelectorFromString(obj);
-
-            if ([self respondsToSelector:aSelector])
-                [self performSelector:aSelector withObject:menu];
-        }
-    }
-    else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
-    {
-        if (!_keyBuffer)
-        {
-            _startTime = [CPDate date];
-            _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])
-    {
-        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 = [CPDate date];
-}
-
-- (void)scrollToBeginningOfDocument:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:0];
-}
-
-- (void)scrollToEndOfDocument:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-}
-
-- (void)scrollPageDown:(CPMenu)menu
-{
-    var menuWindow = menu._menuWindow,
-        menuClipView = menuWindow._menuClipView,
-        bottom = [menuClipView bounds].size.height,
-        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
-        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
-        current = [menu indexOfItem:[menu highlightedItem]];
-
-    if (current == CPNotFound)
-    {
-        [menu _highlightItemAtIndex:0];
-        return;
-    }
-
-    next = current + (last - first);
-
-    if (next < [menu numberOfItems])
-        [menu _highlightItemAtIndex:next];
-    else
-        [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveDown:menu];
-}
-
-- (void)scrollPageUp:(CPMenu)menu
-{
-    var menuWindow = menu._menuWindow,
-        menuClipView = menuWindow._menuClipView,
-        bottom = [menuClipView bounds].size.height,
-        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
-        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
-        current = [menu indexOfItem:[menu highlightedItem]];
-
-    if (current == CPNotFound)
-    {
-        [menu _highlightItemAtIndex:0];
-        return;
-    }
-
-    next = current - (last - first);
-
-    if (next < 0)
-        [menu _highlightItemAtIndex:0];
-    else
-        [menu _highlightItemAtIndex:next];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveUp:menu];
-}
-
-- (void)moveLeft:(CPMenu)menu
-{
-    if ([menu supermenu])
-    {
-        if ([menu supermenu] == [CPApp mainMenu])
-        {
-            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
-            [self moveUp:[CPApp mainMenu]];
-
-            var activeItem = [[CPApp mainMenu] highlightedItem],
-                menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
-
-            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
-        }
-        else
-            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
-    }
-}
-
-- (void)moveRight:(CPMenu)menu
-{
-    var activeItem = [menu highlightedItem];
-
-    if ([activeItem hasSubmenu])
-    {
-        if ([[activeItem submenu] numberOfItems])
-        {
-            var activeItemIndex = [menu indexOfItem:activeItem],
-                activeMenuContainer = menu._menuWindow,
-                activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
-                newMenuOrigin;
-
-            if ([activeMenuContainer isMenuBar])
-                newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
-            else
-                newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
-
-            newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
-
-            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
-            [self moveDown:[activeItem submenu]];
-        }
-    }
-    else if ([self trackingMenu] == [CPApp mainMenu])
-    {
-        [self showMenu:nil fromMenu:menu atPoint:CGPointMakeZero()];
-        [self moveDown:[CPApp mainMenu]];
-
-        var activeItem = [[CPApp mainMenu] highlightedItem],
-            menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
-
-        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
-    }
-}
-
-- (void)moveDown:(CPMenu)menu
-{
-    var index = menu._highlightedIndex + 1;
-
-    if (index < [menu numberOfItems])
-    {
-        [menu _highlightItemAtIndex:index];
-
-        var item = [menu highlightedItem];
-
-        if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-            [self moveDown:menu];
-    }
-}
-
-- (void)moveUp:(CPMenu)menu
-{
-    var index = menu._highlightedIndex - 1;
-
-    if (index < 0)
-        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,562 +0,0 @@
-@import "CPWindow.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
-*/
-@implementation _CPMenuWindow : CPWindow
-{
-    _CPMenuView         _menuView;
-    CPClipView          _menuClipView;
-
-    CPImageView         _moreAboveView;
-    CPImageView         _moreBelowView;
-
-    CGRect              _unconstrainedFrame;
-    CGRect              _constraintRect;
-}
-
-+ (id)menuWindowWithMenu:(CPMenu)aMenu font:(CPFont)aFont
-{
-    var menuWindow = nil;
-
-    if (_CPMenuWindowPool.length)
-    {
-        menuWindow = _CPMenuWindowPool.pop();
-
-        // Do this so that coordinates will be accurate.
-        [menuWindow setFrameOrigin:CGPointMakeZero()];
-    }
-    else
-        menuWindow = [[_CPMenuWindow alloc] init];
-
-    [menuWindow setFont:aFont];
-    [menuWindow setMenu:aMenu];
-    [menuWindow setMinWidth:[aMenu minimumWidth]];
-
-    return menuWindow;
-}
-
-+ (void)poolMenuWindow:(_CPMenuWindow)aMenuWindow
-{
-    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity)
-        return;
-
-    _CPMenuWindowPool.push(aMenuWindow);
-}
-
-+ (void)initialize
-{
-    if (self != [_CPMenuWindow class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
-    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
-}
-
-- (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
-{
-    _constraintRect = _CGRectMakeZero();
-    _unconstrainedFrame = _CGRectMakeZero();
-
-    self = [super initWithContentRect:aRect styleMask:CPBorderlessWindowMask];
-
-    if (self)
-    {
-        [self setLevel:CPPopUpMenuWindowLevel];
-        [self setHasShadow:YES];
-        [self setShadowStyle:CPMenuWindowShadowStyle];
-        [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];
-    }
-
-    return self;
-}
-
-+ (float)_standardLeftMargin
-{
-    return LEFT_MARGIN;
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    [_menuView setFont:aFont];
-}
-
-- (CPFont)font
-{
-    return [_menuView font];
-}
-
-+ (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)]
-                ]]];
-
-        else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
-                [
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
-
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
-
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
-                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
-                ]]];
-
-        _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
-    }
-
-    return color;
-}
-
-- (void)setBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
-{
-    [self setBackgroundColor:[[self class] backgroundColorForBackgroundStyle:aBackgroundStyle]];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    [aMenu _setMenuWindow:self];
-    [_menuView setMenu:aMenu];
-
-    var menuViewSize = [_menuView frame].size;
-
-    [self setFrameSize:CGSizeMake(LEFT_MARGIN + menuViewSize.width + RIGHT_MARGIN, TOP_MARGIN + menuViewSize.height + BOTTOM_MARGIN)];
-
-    [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
-}
-
-- (void)setMinWidth:(float)aWidth
-{
-    var size = [self unconstrainedFrame].size;
-
-    [self setFrameSize:CGSizeMake(MAX(size.width, aWidth), size.height)];
-}
-
-- (CPMenu)menu
-{
-    return [_menuView menu];
-}
-
-- (_CPMenuView)_menuView
-{
-    return _menuView;
-}
-
-- (void)orderFront:(id)aSender
-{
-    [[self menu] update];
-    [self setFrame:_unconstrainedFrame];
-
-    [super orderFront:aSender];
-}
-
-- (void)setConstraintRect:(CGRect)aRect
-{
-    _constraintRect = aRect;
-
-    [self setFrame:_unconstrainedFrame];
-}
-
-- (CGRect)unconstrainedFrame
-{
-    return _CGRectMakeCopy(_unconstrainedFrame);
-}
-
-// We need this because if not this will call setFrame: with -frame instead of -unconstrainedFrame, turning
-// the constrained frame into the unconstrained frame.
-- (void)setFrameOrigin:(CGPoint)aPoint
-{
-    [super setFrame:_CGRectMake(aPoint.x, aPoint.y, _CGRectGetWidth(_unconstrainedFrame), _CGRectGetHeight(_unconstrainedFrame))];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrame:_CGRectMake(_CGRectGetMinX(_unconstrainedFrame), _CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
-}
-
-- (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
-{
-    // FIXME: There are integral window issues with platform windows.
-    // FIXME: This gets called far too often.
-    _unconstrainedFrame = _CGRectMakeCopy(aFrame);
-
-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
-
-    // We don't want to simply intersect the visible frame and the unconstrained frame.
-    // We should be allowing as much of the width to fit as possible (pushing back and forward).
-    constrainedFrame.origin.x = CGRectGetMinX(_unconstrainedFrame);
-    constrainedFrame.size.width = CGRectGetWidth(_unconstrainedFrame);
-
-    if (CGRectGetWidth(constrainedFrame) > CGRectGetWidth(_constraintRect))
-        constrainedFrame.size.width = CGRectGetWidth(_constraintRect);
-
-    if (CGRectGetMaxX(constrainedFrame) > CGRectGetMaxX(_constraintRect))
-        constrainedFrame.origin.x -= CGRectGetMaxX(constrainedFrame) - CGRectGetMaxX(_constraintRect);
-
-    if (CGRectGetMinX(constrainedFrame) < CGRectGetMinX(_constraintRect))
-        constrainedFrame.origin.x = CGRectGetMinX(_constraintRect);
-
-    [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,
-
-        topMargin = TOP_MARGIN,
-        bottomMargin = BOTTOM_MARGIN,
-
-        contentView = [self contentView],
-        bounds = [contentView bounds];
-
-    if (moreAbove)
-    {
-        topMargin += SCROLL_INDICATOR_HEIGHT;
-
-        var frame = [_moreAboveView frame];
-
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
-    }
-
-    [_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)];
-    }
-
-    [_moreBelowView setHidden:!moreBelow];
-
-    var clipFrame = CGRectMakeZero();
-
-    clipFrame.origin.x = LEFT_MARGIN;
-    clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN;
-    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;
-
-    [_menuClipView setFrame:clipFrame];
-    [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
-
-    [_menuView scrollPoint:CGPointMake(0.0, [self convertBaseToGlobal:clipFrame.origin].y - menuViewOrigin.y)];
-}
-
-- (BOOL)hasMinimumNumberOfVisibleItems
-{
-    var visibleRect = [_menuView visibleRect];
-
-    // Clearly if the entire view isn't visible the minimum won't be visible.
-    if (CGRectIsEmpty(visibleRect))
-        return NO;
-
-    var numberOfUnhiddenItems = [_menuView numberOfUnhiddenItems],
-        minimumNumberOfVisibleItems = MIN(numberOfUnhiddenItems, 3),
-        count = 0,
-        index = [_menuView itemIndexAtPoint:[_menuView convertPoint:[_menuClipView frame].origin fromView:nil]];
-
-    for (; index < numberOfUnhiddenItems && count < minimumNumberOfVisibleItems; ++index)
-    {
-        var itemRect = [_menuView rectForUnhiddenItemAtIndex:index],
-            visibleItemRect = CGRectIntersection(visibleRect, itemRect);
-
-        // As soon as we get to the first unhidden item that is no longer visible, stop.
-        if (CGRectIsEmpty(visibleItemRect))
-            break;
-
-        // If the item is *completely* visible, count it.
-        if (CGRectEqualToRect(visibleItemRect, itemRect))
-            ++count;
-    }
-
-    return count >= minimumNumberOfVisibleItems;
-}
-
-- (BOOL)canScrollUp
-{
-    return ![_moreAboveView isHidden];
-}
-
-- (BOOL)canScrollDown
-{
-    return ![_moreBelowView isHidden];
-}
-
-- (BOOL)canScroll
-{
-    return [self canScrollUp] || [self canScrollDown];
-}
-
-- (void)scrollByDelta:(float)theDelta
-{
-    if (theDelta === 0.0)
-        return;
-
-    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
-{
-    [self scrollByDelta:10.0];
-}
-
-@end
-
-@implementation _CPMenuWindow (CPMenuContainer)
-
-- (CGRect)globalFrame
-{
-    return [self frame];
-}
-
-- (BOOL)isMenuBar
-{
-    return NO;
-}
-
-- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
-{
-    var frame = [self frame];
-    if (!CPRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
-        return _CPMenuManagerScrollingStateNone;
-
-    // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT &&  ![_moreAboveView isHidden])
-        return _CPMenuManagerScrollingStateUp;
-
-    // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT &&  ![_moreBelowView isHidden])
-        return _CPMenuManagerScrollingStateDown;
-
-    return _CPMenuManagerScrollingStateNone;
-}
-
-- (float)deltaYForItemAtIndex:(int)anIndex
-{
-    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
-}
-
-- (CGPoint)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuView convertRect:[_menuView rectForItemAtIndex:anIndex] toView:nil];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    // Don't return indexes of items that aren't visible.
-    if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
-        return NO;
-
-    return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
-}
-
-@end
-
-/*
-    @ignore
-*/
-
-@implementation _CPMenuView : CPView
-{
-    CPArray _menuItemViews;
-    CPArray _visibleMenuItemInfos;
-
-    CPFont  _font @accessors(property=font);
-}
-
-- (unsigned)numberOfUnhiddenItems
-{
-    return _visibleMenuItemInfos.length;
-}
-
-- (CGRect)rectForUnhiddenItemAtIndex:(int)anIndex
-{
-    return [self rectForItemAtIndex:_visibleMenuItemInfos[anIndex].index];
-}
-
-- (CGRect)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var x = aPoint.x,
-        bounds = [self bounds];
-
-    if (x < CGRectGetMinX(bounds) || x > CGRectGetMaxX(bounds))
-        return CPNotFound;
-
-    var y = aPoint.y,
-        low = 0,
-        high = _visibleMenuItemInfos.length - 1;
-
-    while (low <= high)
-    {
-        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle],
-            frame = [info.view frame];
-
-        if (y < CGRectGetMinY(frame))
-            high = middle - 1;
-
-        else if (y > CGRectGetMaxY(frame))
-            low = middle + 1;
-
-        else
-            return info.index;
-   }
-
-   return CPNotFound;
-}
-
-- (void)tile
-{
-    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-
-    _menuItemViews = [];
-    _visibleMenuItemInfos = [];
-
-    var menu = [self menu];
-
-    if (!menu)
-        return;
-
-    var items = [menu itemArray],
-        index = 0,
-        count = [items count],
-        maxWidth = 0,
-        y = 0,
-        showsStateColumn = [menu showsStateColumn];
-
-    for (; index < count; ++index)
-    {
-        var item = items[index],
-            view = [item _menuItemView];
-
-        _menuItemViews.push(view);
-
-        if ([item isHidden])
-            continue;
-
-        _visibleMenuItemInfos.push({ view:view, index:index });
-
-        [view setFont:_font];
-        [view setShowsStateColumn:showsStateColumn];
-        [view synchronizeWithMenuItem];
-
-        [view setFrameOrigin:CGPointMake(0.0, y)];
-
-        [self addSubview:view];
-
-        var size = [view minSize],
-            width = size.width;
-
-        if (maxWidth < width)
-            maxWidth = width;
-
-        y += size.height;
-    }
-
-    for (index = 0; index < count; ++index)
-    {
-        var view = _menuItemViews[index];
-
-        [view setFrameSize:CGSizeMake(maxWidth, CGRectGetHeight([view frame]))];
-    }
-
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(maxWidth, y)];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    [super setMenu:aMenu];
-    [self tile];
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,239 +0,0 @@
-@import "CPView.j"
-
-
-var HORIZONTAL_MARGIN           = 8.0,
-    SUBMENU_INDICATOR_MARGIN    = 3.0,
-    VERTICAL_MARGIN             = 4.0;
-
-var SelectionColor                              = nil,
-    SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
-
-@implementation _CPMenuItemMenuBarView : CPView
-{
-    CPMenuItem              _menuItem @accessors(property=menuItem);
-
-    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
-
-    BOOL                    _isDirty;
-
-    _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuIndicatorView;
-}
-
-+ (void)initialize
-{
-    if (self !== [_CPMenuItemMenuBarView class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-
-    SelectionColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackgroundSelected.png"] size:CGSizeMake(1.0, 28.0)]];
-
-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
-}
-
-+ (id)view
-{
-    return [[self alloc] init];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(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];
-    }
-
-    return self;
-}
-
-- (CPColor)textColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
-}
-
-- (CPColor)textShadowColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor colorWithWhite:0.8 alpha:0.8];
-
-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
-}
-
-- (void)update
-{
-    var x = HORIZONTAL_MARGIN,
-        height = 0.0;
-
-    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
-    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_imageAndTextView setImage:[_menuItem image]];
-    [_imageAndTextView setText:[_menuItem title]];
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-    [_imageAndTextView sizeToFit];
-
-    var imageAndTextViewFrame = [_imageAndTextView frame];
-
-    imageAndTextViewFrame.origin.x = x;
-    x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
-
-    var hasSubmenuIndicator = [_menuItem hasSubmenu] && [_menuItem action];
-
-    if (hasSubmenuIndicator)
-    {
-        [_submenuIndicatorView setHidden:NO];
-        [_submenuIndicatorView setColor:[self textColor]];
-        [_submenuIndicatorView setShadowColor:[self textShadowColor]];
-
-        var submenuViewFrame = [_submenuIndicatorView frame];
-
-        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
-
-        x = CGRectGetMaxX(submenuViewFrame);
-        height = MAX(height, CGRectGetHeight(submenuViewFrame));
-    }
-    else
-        [_submenuIndicatorView setHidden:YES];
-
-    height += 2.0 * VERTICAL_MARGIN;
-
-    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 setAutoresizesSubviews:YES];
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    // FIXME: This should probably be even throw.
-    if (![_menuItem isEnabled])
-        shouldHighlight = NO;
-
-    if (shouldHighlight)
-    {
-        if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:SelectionColor];
-
-        [_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]];
-    }
-    else
-    {
-        [self setBackgroundColor: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,38 +0,0 @@
-
-@import "CPView.j"
-
-
-@implementation _CPMenuItemSeparatorView : CPView
-{
-}
-
-+ (id)view
-{
-    return [[self alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 10.0)];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-        [self setAutoresizingMask:CPViewWidthSizable];
-
-    return self;
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds];
-
-    CGContextBeginPath(context);
-
-    CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-
-    CGContextSetStrokeColor(context, [CPColor lightGrayColor]);
-    CGContextStrokePath(context);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,306 +0,0 @@
-@import "CPControl.j"
-
-
-var LEFT_MARGIN                 = 3.0,
-    RIGHT_MARGIN                = 14.0 + 3.0,
-    STATE_COLUMN_WIDTH          = 14.0,
-    INDENTATION_WIDTH           = 17.0,
-    VERTICAL_MARGIN             = 4.0,
-    
-    RIGHT_COLUMNS_MARGIN        = 30.0,
-    KEY_EQUIVALENT_MARGIN       = 10.0;
-
-var SUBMENU_INDICATOR_COLOR                     = nil,
-    _CPMenuItemSelectionColor                   = nil,
-    _CPMenuItemTextShadowColor                  = nil,
-    
-    _CPMenuItemDefaultStateImages               = [],
-    _CPMenuItemDefaultStateHighlightedImages    = [];
-
-@implementation _CPMenuItemStandardView : CPView
-{
-    CPMenuItem              _menuItem @accessors(property=menuItem);
-
-    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
-
-    CGSize                  _minSize @accessors(readonly, property=minSize);
-    BOOL                    _isDirty;
-
-    CPImageView             _stateView;
-    _CPImageAndTextView     _imageAndTextView;
-    _CPImageAndTextView     _keyEquivalentView;
-    CPView                  _submenuIndicatorView;
-}
-
-+ (void)initialize
-{
-    if (self !== [_CPMenuItemStandardView class])
-        return;
-
-    SUBMENU_INDICATOR_COLOR = [CPColor grayColor];
-
-    _CPMenuItemSelectionColor =  [CPColor colorWithCalibratedRed:95.0 / 255.0 green:131.0 / 255.0 blue:185.0 / 255.0 alpha:1.0];
-    _CPMenuItemTextShadowColor = [CPColor colorWithCalibratedRed:26.0 / 255.0 green: 73.0 / 255.0 blue:109.0 / 255.0 alpha:1.0];
-    
-    var bundle = [CPBundle bundleForClass:self];
-    
-    _CPMenuItemDefaultStateImages[CPOffState]               = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPOffState]    = nil;
-
-    _CPMenuItemDefaultStateImages[CPOnState]               = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnState.png"] size:CGSizeMake(14.0, 14.0)];
-    _CPMenuItemDefaultStateHighlightedImages[CPOnState]    = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPMenuItem/CPMenuItemOnStateHighlighted.png"] size:CGSizeMake(14.0, 14.0)];
-
-    _CPMenuItemDefaultStateImages[CPMixedState]             = nil;
-    _CPMenuItemDefaultStateHighlightedImages[CPMixedState]  = nil;
-}
-
-+ (id)view
-{
-    return [[self alloc] init];
-}
-
-+ (float)_standardLeftMargin
-{
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_stateView setImageScaling:CPScaleNone];
-
-        [self addSubview:_stateView];
-
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_imageAndTextView setImagePosition:CPImageLeft];
-        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-
-        [self addSubview:_imageAndTextView];
-
-        _keyEquivalentView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_keyEquivalentView setImagePosition:CPNoImage];
-        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-        [_keyEquivalentView setAutoresizingMask:CPViewMinXMargin];
-
-        [self addSubview:_keyEquivalentView];
-
-        _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
-
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
-        [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
-
-        [self addSubview:_submenuIndicatorView];
-
-        [self setAutoresizingMask:CPViewWidthSizable];
-    }
-
-    return self;
-}
-
-- (CPColor)textColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    return _textColor || [CPColor colorWithCalibratedRed:70.0 / 255.0 green:69.0 / 255.0 blue:69.0 / 255.0 alpha:1.0];
-}
-
-- (CPColor)textShadowColor
-{
-    if (![_menuItem isEnabled])
-        return nil;
-
-    return _textShadowColor || [CPColor colorWithWhite:1.0 alpha:0.8];
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    _font = aFont;
-}
-
-- (void)update
-{
-    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
-        height = 0.0,
-        hasStateColumn = [[_menuItem menu] showsStateColumn];
-
-    if (hasStateColumn)
-    {
-        [_stateView setHidden:NO];
-        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
-
-        x += STATE_COLUMN_WIDTH;
-    }
-    else
-        [_stateView setHidden:YES];
-
-    [_imageAndTextView setFont:[_menuItem font] || _font];
-    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_imageAndTextView setImage:[_menuItem image]];
-    [_imageAndTextView setText:[_menuItem title]];
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-    [_imageAndTextView sizeToFit];
-
-    var imageAndTextViewFrame = [_imageAndTextView frame];
-
-    imageAndTextViewFrame.origin.x = x;
-    x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame));
-
-    var hasKeyEquivalent = !![_menuItem keyEquivalent],
-        hasSubmenu = [_menuItem hasSubmenu];
-
-    if (hasKeyEquivalent || hasSubmenu)
-        x += RIGHT_COLUMNS_MARGIN;
-
-    if (hasKeyEquivalent)
-    {
-        [_keyEquivalentView setFont:[_menuItem font] || _font];
-        [_keyEquivalentView setVerticalAlignment:CPCenterVerticalTextAlignment];
-        [_keyEquivalentView setImage:[_menuItem image]];
-        [_keyEquivalentView setText:[_menuItem keyEquivalentStringRepresentation]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
-        [_keyEquivalentView sizeToFit];
-        
-        var keyEquivalentViewFrame = [_keyEquivalentView frame];
-
-        keyEquivalentViewFrame.origin.x = x;
-        x += CGRectGetWidth(keyEquivalentViewFrame);
-        height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
-
-        if (hasSubmenu)
-            x += RIGHT_COLUMNS_MARGIN;
-    }
-    else
-        [_keyEquivalentView setHidden:YES];
-
-    if (hasSubmenu)
-    {
-        [_submenuIndicatorView setHidden:NO];
-
-        var submenuViewFrame = [_submenuIndicatorView frame];
-
-        submenuViewFrame.origin.x = x;
-
-        x += CGRectGetWidth(submenuViewFrame);
-        height = MAX(height, CGRectGetHeight(submenuViewFrame));
-    }
-    else
-        [_submenuIndicatorView setHidden:YES];
-
-    height += 2.0 * VERTICAL_MARGIN;
-
-    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
-    [_imageAndTextView setFrame:imageAndTextViewFrame];
-
-    if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
-
-    if (hasKeyEquivalent)
-    {
-        keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
-        [_keyEquivalentView setFrame:keyEquivalentViewFrame];
-    }
-    
-    if (hasSubmenu)
-    {
-        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
-        [_submenuIndicatorView setFrame:submenuViewFrame];
-    }
-
-    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
-    
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    // FIXME: This should probably be even throw.
-    if (![_menuItem isEnabled])
-        return; 
-
-    if (shouldHighlight)
-    {
-        [self setBackgroundColor:_CPMenuItemSelectionColor];
-
-        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_keyEquivalentView setTextColor:[CPColor whiteColor]];
-        [_submenuIndicatorView setColor:[CPColor whiteColor]];
-
-        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
-        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
-    }
-    else
-    {
-        [self setBackgroundColor:nil];
-
-        [_imageAndTextView setImage:[_menuItem image]];
-        [_imageAndTextView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
-
-        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-    }
-    
-    if ([[_menuItem menu] showsStateColumn])
-    {
-        if (shouldHighlight)
-            [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
-        else
-            [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
-    }
-}
-
-@end
-
-@implementation _CPMenuItemSubmenuIndicatorView : CPView
-{
-    CPColor _color;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color === aColor)
-        return;
-
-    _color = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    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);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,256 +0,0 @@
-
-@import <AppKit/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    = [];
-
-/*
-    @ignore
-*/
-@implementation _CPMenuItemView : CPView
-{
-    CPMenuItem              _menuItem;
-    CPView                  _view;
-
-    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
-
-    CGSize                  _minSize;
-    BOOL                    _isDirty;
-    BOOL                    _showsStateColumn;
-
-    _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuView;
-}
-
-+ (void)initialize
-{
-    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;
-}
-
-+ (float)leftMargin
-{
-    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-}
-
-- (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _menuItem = aMenuItem;
-        _showsStateColumn = YES;
-        _isDirty = YES;
-
-        [self setAutoresizingMask:CPViewWidthSizable];
-
-        [self synchronizeWithMenuItem];
-    }
-
-    return self;
-}
-
-- (CGSize)minSize
-{
-    return _minSize;
-}
-
-- (void)setDirty
-{
-    _isDirty = YES;
-}
-
-- (void)synchronizeWithMenuItem
-{
-    var menuItemView = [_menuItem view];
-
-    if ([_menuItem isSeparatorItem])
-    {
-        if (![_view isKindOfClass:[_CPMenuItemSeparatorView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemSeparatorView view];
-        }
-    }
-    else if (menuItemView)
-    {
-        if (_view !== menuItemView)
-        {
-            [_view removeFromSuperview];
-            _view = menuItemView;
-        }
-    }
-
-    else if ([_menuItem menu] == [CPApp mainMenu])
-    {
-        if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemMenuBarView view];
-        }
-
-        [_view setMenuItem:_menuItem];
-    }
-    else
-    {
-        if (![_view isKindOfClass:[_CPMenuItemStandardView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemStandardView view];
-        }
-
-        [_view setMenuItem:_menuItem];
-    }
-
-    if ([_view superview] !== self)
-        [self addSubview:_view];
-
-    if ([_view respondsToSelector:@selector(update)])
-        [_view update];
-
-    _minSize = [_view frame].size;
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)setShowsStateColumn:(BOOL)shouldShowStateColumn
-{
-    _showsStateColumn = shouldShowStateColumn;
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    if ([_view respondsToSelector:@selector(highlight:)])
-        [_view highlight:shouldHighlight];
-}
-
-- (BOOL)eventOnSubmenu:(CPEvent)anEvent
-{
-    if (![_menuItem hasSubmenu])
-        return NO;
-
-    return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
-}
-
-- (BOOL)isHidden
-{
-    return [_menuItem isHidden];
-}
-
-- (CPMenuItem)menuItem
-{
-    return _menuItem;
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    if (_font === aFont)
-        return;
-
-    _font = aFont;
-
-    if ([_view respondsToSelector:@selector(setFont:)])
-        [_view setFont:aFont];
-
-    [self setDirty];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    if (_textColor == aColor)
-        return;
-
-    _textColor = aColor;
-
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_submenuView setColor:[self textColor]];
-}
-
-- (CPColor)textColor
-{
-    return nil;
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    if (_textShadowColor == aColor)
-        return;
-
-    _textShadowColor = aColor;
-
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    //[_submenuView setColor:[self textColor]];
-}
-
-- (CPColor)textShadowColor
-{
-    return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
-}
-
-@end
-
-@implementation _CPMenuItemArrowView : CPView
-{
-    CPColor _color;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color == aColor)
-        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

AppKit/CPObjectController.j

@@ -1,799 +0,0 @@
-/*
- * CPObjectController.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPCountedSet.j>
-
-@import "CPController.j"
-
-/*!
-    @class
-
-    CPObjectController is a bindings-compatible controller class.
-    Properties of the content object of an object of this class can be bound to user interface elements to change and access their values.
-
-    The content of an CPObjectController instance is an CPMutableDictionary object by default.
-    This allows a single CPObjectController instance to be used to manage several properties accessed by key value paths.
-    The default content object class can be changed by calling setObjectClass:, which a subclass must override.
-*/
-@implementation CPObjectController : CPController
-{
-    id              _contentObject;
-    id              _selection;
-
-    Class           _objectClass;
-    CPString        _objectClassName;
-
-    BOOL            _isEditable;
-    BOOL            _automaticallyPreparesContent;
-
-    CPCountedSet    _observedKeys;
-}
-
-+ (id)initialize
-{
-    [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 setContent:aContent];
-        [self setEditable:YES];
-        [self setObjectClass:[CPMutableDictionary class]];
-
-        _observedKeys = [[CPCountedSet alloc] init];
-    }
-
-    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 didChangeValueForKey:@"contentObject"];
-    [self _selectionDidChange];
-}
-
-/*!
-    @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] || NO];
-        [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.indexOf("@") === 0)
-    {
-        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.indexOf("@") === 0)
-    {
-        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.indexOf(".") === 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
-{
-    for (var i = 0, count = [_observationProxies count]; i < count; i++)
-    {
-        var proxy = [_observationProxies objectAtIndex:i],
-            keyPath = [proxy keyPath],
-            operator = keyPath.indexOf(".") === 0;
-
-        if (operator)
-            [self willChangeValueForKey:keyPath];
-
-        [anObject 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.indexOf(".") === 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 = [CPDictionary dictionary];
-        _observationProxies = [CPArray array];
-        _controller = aController;
-        _observedObjectsByKeyPath = {};
-    }
-
-    return self;
-}
-
-- (id)_controllerMarkerForValues:(CPArray)theValues
-{
-    var count = [theValues count];
-
-    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];
-    value = [self _controllerMarkerForValues:values];
-
-    [_cachedValues setObject:value forKey:theKeyPath];
-
-    return value;
-}
-
-- (id)valueForKey:(CPString)theKeyPath
-{
-    return [self valueForKeyPath:theKeyPath];
-}
-
-- (void)setValue:(id)theValue forKeyPath:(CPString)theKeyPath
-{
-    [[_controller selectedObjects] setValue:theValue forKeyPath:theKeyPath];
-    [_cachedValues removeObjectForKey:theKeyPath];
-
-    // Allow handlesContentAsCompoundValue to work, based on observation of Cocoa's
-    // NSArrayController - when handlesContentAsCompoundValue and setValue:forKey:@"selection.X"
-    // is called, the array controller causes the compound value to be rewritten if
-    // handlesContentAsCompoundValue == YES. Note that
-    // A) this doesn't use observation (observe: X is not visible in backtraces)
-    // B) it only happens through the selection proxy and not on arrangedObject.X, content.X
-    // or even selectedObjects.X.
-    // FIXME The main code for this should somehow be in CPArrayController and also work
-    // for table based row edits.
-    [[CPBinder getBinding:@"contentArray" forObject:_controller] _contentArrayDidChange];
-}
-
-- (void)setValue:(id)theValue forKey:(CPString)theKeyPath
-{
-    [self setValue:theKeyPath forKeyPath:theKeyPath];
-}
-
-- (unsigned)count
-{
-    return [_cachedValues count];
-}
-
-- (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 are reference to the observed objects
-    // because the removeObserver: will be called after the selection changes
-    var observedObjects = [_controller selectedObjects];
-    _observedObjectsByKeyPath[aKeyPath] = observedObjects;
-    [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
-}
-
-- (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];
-
-    _observedObjects = nil;
-}
-
-@end

AppKit/CPOpenPanel.j

@@ -1,67 +0,0 @@
-/*
- * CPOpenPanel.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPPanel.j"
-
-
-@implementation CPOpenPanel : CPPanel
-{
-    BOOL    _canChooseFiles             @accessors(property=canChooseFiles);
-    BOOL    _canChooseDirectories       @accessors(property=canChooseDirectories);
-    BOOL    _allowsMultipleSelection    @accessors(property=allowsMultipleSelection);
-    CPURL   _directoryURL               @accessors(property=directoryURL);
-    CPArray _URLs;
-}
-
-+ (id)openPanel
-{
-    return [[CPOpenPanel alloc] init];
-}
-
-- (CPInteger)runModal
-{
-    if (typeof window["cpOpenPanel"] === "function")
-    {
-        // FIXME: Is this correct???
-        [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-
-        var options = { directoryURL: [self directoryURL],
-                        canChooseFiles: [self canChooseFiles],
-                        canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] };
-
-        var result = window.cpOpenPanel(options);
-
-        _URLs = result.URLs;
-
-        return result.button;
-    }
-
-    throw "-runModal is unimplemented.";
-}
-
-- (CPArray)URLs
-{
-    return _URLs;
-}
-
-@end

AppKit/CPPanel.j

@@ -26,7 +26,7 @@
 CPOKButton      = 1;
 CPCancelButton  = 0;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPPanel
 
@@ -46,13 +46,6 @@ CPCancelButton  = 0;
     <li>A panel can be made to work even when there's an attention panel on-screen. This permits actions within the panel to affect the attention panel.</li>
 </ul>
 */
-
-/*
-    @global
-    @class CPWindow
-*/
-CPDocModalWindowMask    = 1 << 6;
-
 @implementation CPPanel : CPWindow
 {
     BOOL    _becomesKeyOnlyIfNeeded;
@@ -60,7 +53,7 @@ CPDocModalWindowMask    = 1 << 6;
 }
 
 /*!
-    Returns \c YES if the receiver is a floating panel (like a palette).
+    Returns <code>YES</code> if the receiver is a floating panel (like a palette).
 */
 - (BOOL)isFloatingPanel
 {
@@ -68,8 +61,8 @@ CPDocModalWindowMask    = 1 << 6;
 }
 
 /*!
-    Sets the receiver to be a floating panel. \c YES
-    makes the window a floating panel. \c NO makes it a normal window.
+    Sets the receiver to be a floating panel. <code>YES</code>
+    makes the window a floating panel. <code>NO</code> makes it a normal window.
     @param isFloatingPanel specifies whether to make it floating
 */
 - (void)setFloatingPanel:(BOOL)isFloatingPanel
@@ -78,8 +71,8 @@ CPDocModalWindowMask    = 1 << 6;
 }
 
 /*!
-    Returns \c YES if the window only becomes key
-    if needed. \c NO means it behaves just like other windows.
+    Returns <code>YES</code> if the window only becomes key
+    if needed. <code>NO</code> means it behaves just like other windows.
 */
 - (BOOL)becomesKeyOnlyIfNeeded
 {
@@ -88,7 +81,7 @@ CPDocModalWindowMask    = 1 << 6;
 
 /*!
     Sets whether the the window becomes key only if needed.
-    @param shouldBecomeKeyOnlyIfNeeded \c YES makes the window become key only if needed
+    @param shouldBecomeKeyOnlyIfNeeded <code>YES</code> makes the window become key only if needed
 */
 - (void)setBecomesKeyOnlyIfNeeded:(BOOL)shouldBecomeKeyOnlyIfNeeded
 {

AppKit/CPPasteboard.j

@@ -41,31 +41,25 @@ CPURLPboardType         = @"CPURLPboardType";
 CPImagesPboardType      = @"CPImagesPboardType";
 CPVideosPboardType      = @"CPVideosPboardType";
 
-UTF8PboardType          = @"public.utf8-plain-text";
-
 // Deprecated
 CPImagePboardType       = @"CPImagePboardType";
 
+var CPPasteboards = nil;
 
-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;
-
-    WebScriptObject _nativePasteboard;
 }
 
 /*
@@ -77,11 +71,8 @@ var CPPasteboards = nil,
         return;
 
     [self setVersion:1.0];
-
+    
     CPPasteboards = [CPDictionary dictionary];
-
-    if (typeof window.cpPasteboardWithName !== "undefined")
-        supportsNativePasteboard = YES;
 }
 
 /*!
@@ -100,13 +91,13 @@ var CPPasteboards = nil,
 + (id)pasteboardWithName:(CPString)aName
 {
     var pasteboard = [CPPasteboards objectForKey:aName];
-
+    
     if (pasteboard)
         return pasteboard;
-
+    
     pasteboard = [[CPPasteboard alloc] _initWithName:aName];
     [CPPasteboards setObject:pasteboard forKey:aName];
-
+    
     return pasteboard;
 }
 
@@ -114,24 +105,18 @@ var CPPasteboards = nil,
 - (id)_initWithName:(CPString)aName
 {
     self = [super init];
-
+    
     if (self)
     {
         _name = aName;
         _types = [];
-
+        
         _owners = [CPDictionary dictionary];
         _provided = [CPDictionary dictionary];
-
+        
         _changeCount = 0;
-
-        if (supportsNativePasteboard)
-        {
-            _nativePasteboard = window.cpPasteboardWithName(aName);
-            [self _synchronizePasteboard];
-        }
     }
-
+    
     return self;
 }
 
@@ -145,29 +130,20 @@ 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];
     }
-
-    if (_nativePasteboard)
-    {
-        var nativeTypes = [types copy];
-        if ([types containsObject:CPStringPboardType])
-            nativeTypes.push(UTF8PboardType);
-
-        _nativePasteboard.addTypes_(nativeTypes);
-    }
-
+    
     return ++_changeCount;
 }
 
@@ -178,12 +154,6 @@ var CPPasteboards = nil,
     @return the pasteboard's change count
 */
 - (unsigned)declareTypes:(CPArray)types owner:(id)anOwner
-{
-    [self _declareTypes:types owner:anOwner updateNativePasteboard:YES];
-}
-
-/*! @ignore */
-- (unsigned)_declareTypes:(CPArray)types owner:(id)anOwner updateNativePasteboard:(BOOL)shouldUpdate
 {
     [_types setArray:types];
 
@@ -191,19 +161,10 @@ var CPPasteboards = nil,
     _provided = [CPDictionary dictionary];
 
     var count = _types.length;
-
+    
     while (count--)
         [_owners setObject:anOwner forKey:_types[count]];
-
-    if (_nativePasteboard && shouldUpdate)
-    {
-        var nativeTypes = [types copy];
-        if ([types containsObject:CPStringPboardType])
-            nativeTypes.push(UTF8PboardType);
-
-        _nativePasteboard.declareTypes_(nativeTypes);
-        _changeCount = _nativePasteboard.changeCount();
-    }
+        
     return ++_changeCount;
 }
 
@@ -211,15 +172,12 @@ var CPPasteboards = nil,
     Sets the pasteboard data for the specified type
     @param aData the data
     @param aType the data type being set
-    @return \c YES if the data was successfully written to the pasteboard
+    @return <code>YES</code> if the data was successfully written to the pasteboard
 */
 - (BOOL)setData:(CPData)aData forType:(CPString)aType
 {
     [_provided setObject:aData forKey:aType];
-
-    if (aType === CPStringPboardType)
-        [self setData:aData forType:UTF8PboardType];
-
+    
     return YES;
 }
 
@@ -227,22 +185,22 @@ var CPPasteboards = nil,
     Writes the specified property list as data for the specified type
     @param aPropertyList the property list to write
     @param aType the data type
-    @return \c YES if the property list was successfully written to the pasteboard
+    @return <code>YES</code> if the property list was successfully written to the pasteboard
 */
 - (BOOL)setPropertyList:(id)aPropertyList forType:(CPString)aType
 {
-    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyList280NorthFormat_v1_0] forType:aType];
+    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyListXMLFormat_v1_0 errorDescription:nil] forType:aType];
 }
 
 /*!
     Sets the specified string as data for the specified type
     @param aString the string to write
     @param aType the data type
-    @return \c YES if the string was successfully written to the pasteboard
+    @return <code>YES</code> if the string was successfully written to the pasteboard
 */
 - (void)setString:(CPString)aString forType:(CPString)aType
 {
-    [self setPropertyList:aString forType:aType];
+    return [self setPropertyList:aString forType:aType];
 }
 
 // Determining Types
@@ -250,11 +208,11 @@ var CPPasteboards = nil,
     Checks the pasteboard's types for a match with the types listen in the specified array. The array should
     be ordered by the requestor's most preferred data type first.
     @param anArray an array of requested types ordered by preference
-    @return the highest match with the pasteboard's supported types or \c nil if no match was found
+    @return the highest match with the pasteboard's supported types or <code>nil</code> if no match was found
 */
 - (CPString)availableTypeFromArray:(CPArray)anArray
 {
-    return [[self types] firstObjectCommonWithArray:anArray];
+    return [_types firstObjectCommonWithArray:anArray];
 }
 
 /*!
@@ -262,7 +220,6 @@ var CPPasteboards = nil,
 */
 - (CPArray)types
 {
-    [self _synchronizePasteboard];
     return _types;
 }
 
@@ -278,78 +235,48 @@ var CPPasteboards = nil,
 /*!
     Returns the pasteboard data for the specified data type
     @param aType the requested data type
-    @return the requested data or \c nil if the data doesn't exist
+    @return the requested data or <code>nil</code> if the data doesn't exist
 */
 - (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];
+        
+        ++_changeCount;
+        
         return [_provided objectForKey:aType];
     }
-
-    if (aType === CPStringPboardType)
-        return [self dataForType:UTF8PboardType];
-
+    
     return nil;
 }
 
-- (void)_synchronizePasteboard
-{
-    if (_nativePasteboard && _nativePasteboard.changeCount() > _changeCount)
-    {
-        var nativeTypes = [_nativePasteboard.types() copy];
-        if ([nativeTypes containsObject:UTF8PboardType])
-            nativeTypes.push(CPStringPboardType);
-
-        [self _declareTypes:nativeTypes owner:self updateNativePasteboard:NO];
-
-        _changeCount = _nativePasteboard.changeCount();
-    }
-}
-
-/*! @ignore
-    method provided for integration with native pasteboard
-*/
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    if (aType === CPStringPboardType)
-    {
-        var string = _nativePasteboard.stringForType_(UTF8PboardType);
-
-        [self setString:string forType:CPStringPboardType];
-        [self setString:string forType:UTF8PboardType];
-    }
-    else
-        [self setString:_nativePasteboard.stringForType_(aType) forType:aType];
-}
-
 /*!
     Returns the property list for the specified data type
     @param aType the requested data type
-    @return the property list or \c nil if the list was not found
+    @return the property list or <code>nil</code> if the list was not found
 */
 - (id)propertyListForType:(CPString)aType
 {
     var data = [self dataForType:aType];
-
+    
     if (data)
-        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
-
+        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyListXMLFormat_v1_0 errorDescription:nil];
+        
     return nil;
 }
 
 /*!
     Returns the string for the specified data type
     @param aType the requested data type
-    @return the string or \c nil if the string was not found
+    @return the string or <code>nil</code> if the string was not found
 */
 - (CPString)stringForType:(CPString)aType
 {
@@ -360,9 +287,9 @@ var CPPasteboards = nil,
 - (CPString)_generateStateUID
 {
     var bits = 32;
-
+        
     _stateUID = @"";
-
+    
     while (bits--)
         _stateUID += FLOOR(RAND() * 16.0).toString(16).toUpperCase();
 
@@ -376,70 +303,3 @@ var CPPasteboards = nil,
 }
 
 @end
-
-#if PLATFORM(DOM)
-
-var DOMDataTransferPasteboard = nil;
-
-@implementation _CPDOMDataTransferPasteboard : CPPasteboard
-{
-    DataTransfer    _dataTransfer;
-}
-
-+ (_CPDOMDataTransferPasteboard)DOMDataTransferPasteboard
-{
-    if (!DOMDataTransferPasteboard)
-        DOMDataTransferPasteboard = [[_CPDOMDataTransferPasteboard alloc] init];
-
-    return DOMDataTransferPasteboard;
-}
-
-- (void)_setDataTransfer:(DataTransfer)aDataTransfer
-{
-    _dataTransfer = aDataTransfer;
-}
-
-- (void)_setPasteboard:(CPPasteboard)aPasteboard
-{
-    _dataTransfer.clearData();
-
-    var types = [aPasteboard types],
-        count = types.length;
-
-    while (count--)
-    {
-        var type = types[count];
-
-        if (type === CPStringPboardType)
-            _dataTransfer.setData(type, [aPasteboard stringForType:type]);
-        else
-            _dataTransfer.setData(type, [[aPasteboard dataForType:type] rawString]);
-    }
-}
-
-- (CPArray)types
-{
-    return Array.prototype.slice.apply(_dataTransfer.types);
-}
-
-- (CPData)dataForType:(CPString)aType
-{
-    var dataString = _dataTransfer.getData(aType);
-
-    if (aType === CPStringPboardType)
-        return [CPData dataFromPropertyList:dataString format:kCFPropertyList280NorthFormat_v1_0];
-
-    return [CPData dataWithRawString:dataString];
-}
-
-- (id)propertyListForType:(CPString)aType
-{
-    if (aType === CPStringPboardType)
-        return _dataTransfer.getData(aType);
-
-    return [CPPropertyListSerialization propertyListFromData:[self dataForType:aType] format:CPPropertyListUnknownFormat];
-}
-
-@end
-
-#endif

AppKit/CPPopUpButton.j

@@ -25,12 +25,14 @@
 @import "CPMenu.j"
 @import "CPMenuItem.j"
 
+#include "CoreGraphics/CGGeometry.h"
 
-var VISIBLE_MARGIN = 7.0;
+
+var VISIBLE_MARGIN  = 7.0;
 
 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
-/*!
+/*! 
     @ingroup appkit
     @class CPPopUpButton
 
@@ -38,60 +40,41 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 @implementation CPPopUpButton : CPButton
 {
-    CPUInteger  _selectedIndex;
+    int         _selectedIndex;
     CPRectEdge  _preferredEdge;
+    
+    CPMenu      _menu;
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     return "popup-button";
 }
 
-+ (CPSet)keyPathsForValuesAffectingSelectedIndex
-{
-    return [CPSet setWithObject:@"objectValue"];
-}
-
-+ (CPSet)keyPathsForValuesAffectingSelectedTag
-{
-    return [CPSet setWithObject:@"objectValue"];
-}
-
-+ (CPSet)keyPathsForValuesAffectingSelectedItem
-{
-    return [CPSet setWithObject:@"objectValue"];
-}
-
 /*!
     Initializes the pop-up button to the specified size.
     @param aFrame the size for the button
-    @param shouldPullDown \c YES makes this a pull-down menu, \c NO makes it a pop-up menu.
+    @param shouldPullDown <code>YES</code> makes this a pull-down menu, <code>NO</code> makes it a pop-up menu.
     @return the initialized pop-up button
 */
 - (id)initWithFrame:(CGRect)aFrame pullsDown:(BOOL)shouldPullDown
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
-        [self selectItemAtIndex:CPNotFound];
-
+        _selectedIndex = CPNotFound;
         _preferredEdge = CPMaxYEdge;
-
+        
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
         [self setValue:CPLeftTextAlignment forThemeAttribute:@"alignment"];
         [self setValue:CPLineBreakByTruncatingTail forThemeAttribute:@"line-break-mode"];
-
+        
         [self setMenu:[[CPMenu alloc] initWithTitle:@""]];
 
         [self setPullsDown:shouldPullDown];
-
-        var options = CPKeyValueObservingOptionNew |CPKeyValueObservingOptionOld;/* |CPKeyValueObservingOptionInitial;*/
-        [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
-        [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
-        [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
     }
-
+    
     return self;
 }
 
@@ -104,11 +87,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 /*!
     Specifies whether the object is a pull-down or a pop-up menu.
-    If the button pulls down the menu items represent actions, not states.
-    So the text in the button will NOT change when the user selects something different.
-
-    @param shouldPullDown \c YES makes the pop-up button
-    a pull-down menu. \c NO makes it a pop-up menu.
+    @param shouldPullDown <code>YES</code> makes the pop-up button
+    a pull-down menu. <code>NO</code> makes it a pop-up menu.
 */
 - (void)setPullsDown:(BOOL)shouldPullDown
 {
@@ -120,7 +100,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     if (!changed)
         return;
 
-    var items = [[self menu] itemArray];
+    var items = [_menu itemArray];
 
     if ([items count] <= 0)
         return;
@@ -131,7 +111,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 }
 
 /*!
-    Returns \c YES if the button is a pull-down menu. \c NO if the button is a pop-up menu.
+    Returns <code>YES</code> if the button is a pull-down menu. <code>NO</code> if the button is a pop-up menu.
 */
 - (BOOL)pullsDown
 {
@@ -145,46 +125,46 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)addItem:(CPMenuItem)anItem
 {
-    [[self menu] addItem:anItem];
+    [_menu addItem:anItem];
 }
 
 /*!
     Adds a new menu item with the specified title.
-    @param the new menu item's title
+    @param the new menu item's tite
 */
 - (void)addItemWithTitle:(CPString)aTitle
 {
-    [[self menu] addItemWithTitle:aTitle action:NULL keyEquivalent:nil];
+    [_menu addItemWithTitle:aTitle action:NULL keyEquivalent:nil];
 }
 
 /*!
     Adds multiple new menu items with the titles specified in the provided array.
-    @param titles an array of names for the new items
+    @param titles an arry of names for the new items
 */
 - (void)addItemsWithTitles:(CPArray)titles
 {
     var index = 0,
         count = [titles count];
-
+    
     for (; index < count; ++index)
         [self addItemWithTitle:titles[index]];
 }
 
 /*!
     Inserts a new item with the specified title and index location.
-    @param aTitle the new item's title
+    @param aTitle the new itme's title
     @param anIndex the item's index in the menu
 */
 - (void)insertItemWithTitle:(CPString)aTitle atIndex:(int)anIndex
 {
     var items = [self itemArray],
         count = [items count];
-
+    
     while (count--)
         if ([items[count] title] == aTitle)
             [self removeItemAtIndex:count];
-
-    [[self menu] insertItemWithTitle:aTitle action:NULL keyEquivalent:nil atIndex:anIndex];
+        
+    [_menu insertItemWithTitle:aTitle action:NULL keyEquivalent:nil atIndex:anIndex];
 }
 
 /*!
@@ -192,7 +172,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)removeAllItems
 {
-    [[self menu] removeAllItems];
+    var count = [_menu numberOfItems];
+    
+    while (count--)
+        [_menu removeItemAtIndex:0];
 }
 
 /*!
@@ -211,26 +194,24 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)removeItemAtIndex:(int)anIndex
 {
-    [[self menu] removeItemAtIndex:anIndex];
+    [_menu removeItemAtIndex:anIndex];
     [self synchronizeTitleAndSelectedItem];
 }
 
 // Getting the User's Selection
 /*!
-    Returns the selected item or \c nil if no item is selected.
+    Returns the selected item or <code>nil</code> if no item is selected.
 */
 - (CPMenuItem)selectedItem
 {
-    var indexOfSelectedItem = [self indexOfSelectedItem];
-
-    if (indexOfSelectedItem < 0 || indexOfSelectedItem > [self numberOfItems] - 1)
+    if (_selectedIndex < 0)
         return nil;
-
-    return [[self menu] itemAtIndex:indexOfSelectedItem];
+    
+    return [_menu itemAtIndex:_selectedIndex];
 }
 
 /*!
-    Returns the title of the selected item or \c nil if no item is selected.
+    Returns the title of the selected item or <code>nil</code> if no item is selected.
 */
 - (CPString)titleOfSelectedItem
 {
@@ -245,20 +226,13 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     return _selectedIndex;
 }
 
+// For us, CPNumber is toll-free bridged to Number, so just return the selected index.
 /*!
-    @ignore
+    Returns the selected item's index. If no item is selected, it returns CPNotFound.
 */
-- (int)selectedTag
+- (id)objectValue
 {
-    return [[self selectedItem] tag];
-}
-
-/*!
-    @ignore
-*/
-- (void)_setSelectedTag:(int)aTag
-{
-    [self selectItemWithTag:aTag];
+    return _selectedIndex;
 }
 
 // Setting the Current Selection
@@ -275,50 +249,22 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     Selects the item at the specified index
     @param anIndex the index of the item to select
 */
-- (void)selectItemAtIndex:(CPUInteger)anIndex
+- (void)selectItemAtIndex:(int)anIndex
 {
-    [self setObjectValue:anIndex];
-}
-
-- (void)setSelectedIndex:(CPUInteger)anIndex
-{
-    [self setObjectValue:anIndex];
-}
-
-- (CPUInteger)selectedIndex
-{
-    return [self objectValue];
-}
-
-/*!
-    Selects the item at the specified index
-    @param anIndex the index of the item to select
-*/
-- (void)setObjectValue:(int)anIndex
-{
-    var indexOfSelectedItem = [self objectValue];
-
-    anIndex = parseInt(+anIndex, 10);
-
-    if (indexOfSelectedItem === anIndex)
+    if (_selectedIndex == anIndex)
         return;
-
-    if (indexOfSelectedItem >= 0 && ![self pullsDown])
+    
+    if (_selectedIndex >= 0 && ![self pullsDown])
         [[self selectedItem] setState:CPOffState];
-
+    
     _selectedIndex = anIndex;
 
-    if (indexOfSelectedItem >= 0 && ![self pullsDown])
+    if (_selectedIndex >= 0 && ![self pullsDown])
         [[self selectedItem] setState:CPOnState];
-
+    
     [self synchronizeTitleAndSelectedItem];
 }
 
-- (id)objectValue
-{
-    return _selectedIndex;
-}
-
 /*!
     Selects the menu item with the specified tag
     @param the tag of the item to select
@@ -337,14 +283,84 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self selectItemAtIndex:[self indexOfItemWithTitle:aTitle]];
 }
 
+/*!
+    Sets the object for the selected item. If no item is selected, then this method has no effect.
+    @param the object set for the selected item
+*/
+- (void)setObjectValue:(id)aValue
+{
+    [self selectItemAtIndex:[aValue intValue]];
+}
+
 // Getting Menu Items
+/*!
+    Returns the button's menu of items.
+*/
+- (CPMenu)menu
+{
+    return _menu;
+}
+
+/*!
+    Sets the menu for the button
+*/
+- (void)setMenu:(CPMenu)aMenu
+{
+    if (_menu === aMenu)
+        return;
+
+    var defaultCenter = [CPNotificationCenter defaultCenter];
+    
+    if (_menu)
+    {
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidAddItemNotification
+                    object:_menu];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidChangeItemNotification
+                    object:_menu];
+
+        [defaultCenter
+            removeObserver:self
+                      name:CPMenuDidRemoveItemNotification
+                    object:_menu];
+    }
+
+    _menu = aMenu;
+    
+    if (_menu)
+    {
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidAddItem:)
+                  name:CPMenuDidAddItemNotification
+                object:_menu];
+    
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidChangeItem:)
+                  name:CPMenuDidChangeItemNotification
+                object:_menu];
+                
+        [defaultCenter
+            addObserver:self
+              selector:@selector(menuDidRemoveItem:)
+                  name:CPMenuDidRemoveItemNotification
+                object:_menu];
+    }
+    
+    [self synchronizeTitleAndSelectedItem];
+}
 
 /*!
     Returns a count of the number of items in the button's menu.
 */
 - (int)numberOfItems
 {
-    return [[self menu] numberOfItems];
+    return [_menu numberOfItems];
 }
 
 /*!
@@ -352,25 +368,25 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPArray)itemArray
 {
-    return [[self menu] itemArray];
+    return [_menu itemArray];
 }
 
 /*!
-    Returns the item at the specified index or \c nil if the item does not exist.
+    Returns the item at the specified index or <code>nil</code> if the item does not exist.
     @param anIndex the index of the item to obtain
 */
 - (CPMenuItem)itemAtIndex:(unsigned)anIndex
 {
-    return [[self menu] itemAtIndex:anIndex];
+    return [_menu itemAtIndex:anIndex];
 }
 
 /*!
-    Returns the title of the item at the specified index or \c nil if no item exists.
+    Returns the title of the item at the specified index or <code>nil</code> if no item exists.
     @param anIndex the index of the item
 */
 - (CPString)itemTitleAtIndex:(unsigned)anIndex
 {
-    return [[[self menu] itemAtIndex:anIndex] title];
+    return [[_menu itemAtIndex:anIndex] title];
 }
 
 /*!
@@ -380,13 +396,12 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
     var titles = [],
         items = [self itemArray],
+        
         index = 0,
         count = [items count];
-
+    
     for (; index < count; ++index)
-        titles.push([items[index] title]);
-
-    return titles;
+        items.push([items[index] title]);
 }
 
 /*!
@@ -395,13 +410,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)itemWithTitle:(CPString)aTitle
 {
-    var menu = [self menu],
-        itemIndex = [menu indexOfItemWithTitle:aTitle];
-
-    if (itemIndex === CPNotFound)
-        return nil;
-
-    return [menu itemAtIndex:itemIndex];
+    return [_menu itemAtIndex:[_menu indexOfItemWithTitle:aTitle]];
 }
 
 /*!
@@ -409,7 +418,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)lastItem
 {
-    return [[[self menu] itemArray] lastObject];
+    return [[_menu itemArray] lastObject];
 }
 
 // Getting the Indices of Menu Items
@@ -419,7 +428,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItem:(CPMenuItem)aMenuItem
 {
-    return [[self menu] indexOfItem:aMenuItem];
+    return [_menu indexOfItem:aMenuItem];
 }
 
 /*!
@@ -428,16 +437,16 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithTag:(int)aTag
 {
-    return [[self menu] indexOfItemWithTag:aTag];
+    return [_menu indexOfItemWithTag:aTag];
 }
 
 /*!
     Returns the index of the item with the specified title or CPNotFound.
-    @param aTitle the item's title
+    @param aTitle the item's titel
 */
 - (int)indexOfItemWithTitle:(CPString)aTitle
 {
-    return [[self menu] indexOfItemWithTitle:aTitle];
+    return [_menu indexOfItemWithTitle:aTitle];
 }
 
 /*!
@@ -448,7 +457,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithRepresentedObject:(id)anObject
 {
-    return [[self menu] indexOfItemWithRepresentedObject:anObject];
+    return [_menu indexOfItemWithRepresentedObject:anObject];
 }
 
 /*!
@@ -460,7 +469,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithTarget:(id)aTarget action:(SEL)anAction
 {
-    return [[self menu] indexOfItemWithTarget:aTarget action:anAction];
+    return [_menu indexOfItemWithTarget:aTarget action:anAction];
 }
 
 // Setting the Cell Edge to Pop out in Restricted Situations
@@ -475,7 +484,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 }
 
 /*!
-    Sets the preferred edge of the button to display the
+    Sets the preffered edge of the button to display the
     pop-up when there is a limited amount of screen space.
     By default, the pop-up should draw on top of the button.
 */
@@ -496,7 +505,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
     if ([self pullsDown])
     {
-        var items = [[self menu] itemArray];
+        var items = [_menu itemArray];
 
         if ([items count] <= 0)
             [self addItemWithTitle:aTitle];
@@ -510,14 +519,14 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     else
     {
         var index = [self indexOfItemWithTitle:aTitle];
-
+        
         if (index < 0)
         {
             [self addItemWithTitle:aTitle];
-
+            
             index = [self numberOfItems] - 1;
         }
-
+        
         [self selectItemAtIndex:index];
     }
 }
@@ -544,8 +553,8 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
     if ([self pullsDown])
     {
-        var items = [[self menu] itemArray];
-
+        var items = [_menu itemArray];
+        
         if ([items count] > 0)
             item = items[0];
     }
@@ -556,169 +565,92 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [super setTitle:[item title]];
 }
 
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)aContext
+//
+/*!
+    Called when the menu has a new item added to it.
+    @param aNotification information about the event
+*/
+- (void)menuDidAddItem:(CPNotification)aNotification
 {
-    var pullsDown = [self pullsDown];
-
-    if (!pullsDown && aKeyPath === @"selectedItem.changeCount" ||
-        pullsDown && (aKeyPath === @"_firstItem" || aKeyPath === @"_firstItem.changeCount"))
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
+    
+    if (_selectedIndex < 0)
+        [self selectItemAtIndex:0];
+    
+    else if (index == _selectedIndex)
         [self synchronizeTitleAndSelectedItem];
-
-    // FIXME: This is due to a bug in KVO, we should never get it for "menu".
-    if (aKeyPath === @"menu")
+        
+    else if (index < _selectedIndex)
+        ++_selectedIndex;
+        
+    if (index == 0 && [self pullsDown])
     {
-        aKeyPath = @"menu.items";
-
-        [changes setObject:CPKeyValueChangeSetting forKey:CPKeyValueChangeKindKey];
-        [changes setObject:[[self menu] itemArray] forKey:CPKeyValueChangeNewKey];
+        var items = [_menu itemArray];
+        
+        [items[0] setHidden:YES];
+        
+        if (items.length > 0)
+            [items[1] setHidden:NO];
     }
 
-    if (aKeyPath === @"menu.items")
+    var item = [_menu itemArray][index],
+        action = [item action];
+
+    if (!action || (action === @selector(_popUpItemAction:)))
     {
-        var changeKind = [changes objectForKey:CPKeyValueChangeKindKey],
-            indexOfSelectedItem = [self indexOfSelectedItem];
-
-        if (changeKind === CPKeyValueChangeRemoval)
-        {
-            var index = CPNotFound,
-                indexes = [changes objectForKey:CPKeyValueChangeIndexesKey];
-
-            if ([indexes containsIndex:0] && [self pullsDown])
-                [self _firstItemDidChange];
-
-            // See whether the index has changed, despite the actual item not changing.
-            while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                    index <= indexOfSelectedItem)
-                --indexOfSelectedItem;
-
-            [self selectItemAtIndex:indexOfSelectedItem];
-        }
-
-        else if (changeKind === CPKeyValueChangeReplacement)
-        {
-            var indexes = [changes objectForKey:CPKeyValueChangeIndexesKey];
-
-            if (pullsDown && [indexes containsIndex:0] ||
-                !pullsDown && [indexes containsIndex:indexOfSelectedItem])
-                [self synchronizeTitleAndSelectedItem];
-        }
-
-        else
-        {
-            // No matter what, we want to prepare the new items.
-            var newItems = [changes objectForKey:CPKeyValueChangeNewKey];
-
-            [newItems enumerateObjectsUsingBlock:function(aMenuItem)
-            {
-                var action = [aMenuItem action];
-
-                if (!action)
-                    [aMenuItem setAction:action = @selector(_popUpItemAction:)];
-
-                if (action === @selector(_popUpItemAction:))
-                    [aMenuItem setTarget:self];
-            }];
-
-            if (changeKind === CPKeyValueChangeSetting)
-            {
-                [self _firstItemDidChange];
-
-                [self selectItemAtIndex:CPNotFound];
-                [self selectItemAtIndex:MIN([newItems count] - 1, indexOfSelectedItem)];
-            }
-
-            else //if (changeKind === CPKeyValueChangeInsertion)
-            {
-                var indexes = [changes objectForKey:CPKeyValueChangeIndexesKey];
-
-                if ([self pullsDown] && [indexes containsIndex:0])
-                {
-                    [self _firstItemDidChange];
-
-                    if ([self numberOfItems] > 1)
-                    {
-                        var index = CPNotFound,
-                            originalIndex = 0;
-
-                        while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                                index <= originalIndex)
-                            ++originalIndex;
-
-                        [[self itemAtIndex:originalIndex] setHidden:NO];
-                    }
-                }
-
-                if (indexOfSelectedItem < 0)
-                    [self selectItemAtIndex:0];
-
-                else
-                {
-                    var index = CPNotFound;
-
-                    // See whether the index has changed, despite the actual item not changing.
-                    while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                            index <= indexOfSelectedItem)
-                        ++indexOfSelectedItem;
-
-                    [self selectItemAtIndex:indexOfSelectedItem];
-                }
-            }
-        }
+        [item setTarget:self];
+        [item setAction:@selector(_popUpItemAction:)];
     }
+}
 
-//    [super observeValueForKeyPath:aKeyPath ofObject:anObject change:changes context:aContext];
+/*!
+    Called when a menu item has changed.
+    @param aNotification information about the event
+*/
+- (void)menuDidChangeItem:(CPNotification)aNotification
+{
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
+
+    if ([self pullsDown] && index != 0)
+        return;
+    
+    if (![self pullsDown] && index != _selectedIndex)
+        return;
+    
+    [self synchronizeTitleAndSelectedItem];
+}
+
+/*!
+    Called when an item was removed from the menu.
+    @param aNotification information about the event
+*/
+- (void)menuDidRemoveItem:(CPNotification)aNotification
+{
+    var numberOfItems = [self numberOfItems];
+    
+    if (numberOfItems <= _selectedIndex)
+        [self selectItemAtIndex:numberOfItems - 1];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    if (![self isEnabled] || ![self numberOfItems])
+    if (![self isEnabled])
         return;
-
+        
     [self highlight:YES];
 
     var menu = [self menu],
-        bounds = [self bounds],
-        minimumWidth = CGRectGetWidth(bounds);
-
-    // FIXME: setFont: should set the font on the menu.
-    [menu setFont:[self font]];
-
+        theWindow = [self window],
+        menuWindow = [_CPMenuWindow menuWindowWithMenu:menu font:[self font]];
+    
+    [menuWindow setDelegate:self];
+    [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
+    
+    // Pull Down Menus show up directly below their buttons.
     if ([self pullsDown])
-    {
-        var positionedItem = nil,
-            location = CGPointMake(0.0, CGRectGetMaxY(bounds));
-    }
-    else
-    {
-        var contentRect = [self contentRectForBounds:bounds],
-            positionedItem = [self selectedItem],
-            standardLeftMargin = [_CPMenuWindow _standardLeftMargin] + [_CPMenuItemStandardView _standardLeftMargin],
-            location = CGPointMake(CGRectGetMinX(contentRect) - standardLeftMargin, 0.0);
-
-        minimumWidth += standardLeftMargin;
-
-        // To ensure the selected item is highlighted correctly, unset the highlighted item
-        [menu _highlightItemAtIndex:CPNotFound];
-    }
-
-    [menu setMinimumWidth:minimumWidth];
-
-    [menu
-        _popUpMenuPositioningItem:positionedItem
-                       atLocation:location
-                             topY:CGRectGetMinY(bounds)
-                          bottomY:CGRectGetMaxY(bounds)
-                           inView:self
-                         callback:function(aMenu)
-        {
-            [self highlight:NO];
-
-            var highlightedItem = [aMenu highlightedItem];
-
-            if ([highlightedItem _isSelectable])
-                [self selectItem:highlightedItem];
-        }];
-/*
+        var menuOrigin = [theWindow convertBaseToBridge:[self convertPoint:CGPointMake(0.0, CGRectGetMaxY([self bounds])) toView:nil]];
+    
+    // Pop Up Menus attempt to show up "on top" of the selected item.
     else
     {
         // This is confusing, I KNOW, so let me explain it to you.
@@ -726,19 +658,43 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
         // 1. So calculate where our content is, then calculate where the menu item is.
         // 2. Move LEFT by whatever indentation we have (offsetWidths, aka, window margin, item margin, etc).
         // 3. MOVE UP by the difference in sizes of the content and menu item, this will only work if the content is vertically centered.
-        var contentRect = [self convertRect:[self contentRectForBounds:bounds] toView:nil],
-            menuOrigin = [theWindow convertBaseToGlobal:contentRect.origin],
+        var contentRect = [self convertRect:[self contentRectForBounds:[self bounds]] toView:nil],
+            menuOrigin = [theWindow convertBaseToBridge:contentRect.origin],
             menuItemRect = [menuWindow rectForItemAtIndex:_selectedIndex];
-
+        
         menuOrigin.x -= CGRectGetMinX(menuItemRect) + [menuWindow overlapOffsetWidth] + [[[menu itemAtIndex:_selectedIndex] _menuItemView] overlapOffsetWidth];
         menuOrigin.y -= CGRectGetMinY(menuItemRect) + (CGRectGetHeight(menuItemRect) - CGRectGetHeight(contentRect)) / 2.0;
     }
-*/
+    
+    [menuWindow setFrameOrigin:menuOrigin];
+    
+    var menuMaxX = CGRectGetMaxX([menuWindow frame]),
+        buttonMaxX = [theWindow convertBaseToBridge:CGPointMake(CGRectGetMaxX([self convertRect:[self bounds] toView:nil]), 0.0)].x;
+        
+    if (menuMaxX < buttonMaxX)
+        [menuWindow setMinWidth:CGRectGetWidth([menuWindow frame]) + buttonMaxX - menuMaxX - ([self pullsDown] ? 0.0 : VISIBLE_MARGIN)];
+    
+    [menuWindow orderFront:self];
+    [menuWindow beginTrackingWithEvent:anEvent sessionDelegate:self didEndSelector:@selector(menuWindowDidFinishTracking:highlightedItem:)];
 }
 
-- (void)rightMouseDown:(CPEvent)anEvent
+/*
+    @ignore
+*/
+- (void)menuWindowDidFinishTracking:(_CPMenuWindow)aMenuWindow highlightedItem:(CPMenuItem)aMenuItem
 {
-    // Disable standard CPView behavior which incorrectly displays the menu as a 'context menu'.
+    [_CPMenuWindow poolMenuWindow:aMenuWindow];
+
+    [self highlight:NO];
+    
+    var index = [_menu indexOfItem:aMenuItem];
+    
+    if (index == CPNotFound)
+        return;
+    
+    [self selectItemAtIndex:index];
+    
+    [CPApp sendAction:[aMenuItem action] to:[aMenuItem target] from:aMenuItem];
 }
 
 - (void)_popUpItemAction:(id)aSender
@@ -746,39 +702,11 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self sendAction:[self action] to:[self target]];
 }
 
-- (void)_firstItemDidChange
-{
-    [self willChangeValueForKey:@"_firstItem"];
-    [self didChangeValueForKey:@"_firstItem"];
-
-    [[self _firstItem] setHidden:YES];
-}
-
-- (CPMenuItem)_firstItem
-{
-    if ([self numberOfItems] <= 0)
-        return nil;
-
-    return [[self menu] itemAtIndex:0];
-}
-
-- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    var count = objects.length,
-        value = [objects[0] valueForKeyPath:aKeyPath];
-
-    [self selectItemWithTag:value];
-    [self setEnabled:YES];
-
-    while (count-- > 1)
-        if (value !== [objects[count] valueForKeyPath:aKeyPath])
-            [[self selectedItem] setState:CPOffState];
-}
-
 @end
 
-var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",
-    DEPRECATED_CPPopUpButtonSelectedIndexKey    = @"CPPopUpButtonSelectedIndexKey";
+var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",
+    CPPopUpButtonSelectedIndexKey   = @"CPPopUpButtonSelectedIndexKey",
+    CPPopUpButtonPullsDownKey       = @"CPPopUpButtonPullsDownKey";
 
 @implementation CPPopUpButton (CPCoding)
 /*!
@@ -791,30 +719,30 @@ var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
-        // FIXME: (or not?) _title is nulled in - [CPButton initWithCoder:],
-        // so we need to do this again.
-        [self synchronizeTitleAndSelectedItem];
+        // Nothing is currently selected
+        _selectedIndex = -1;
 
-        // FIXME: Remove deprecation leniency for 1.0
-        if ([aCoder containsValueForKey:DEPRECATED_CPPopUpButtonMenuKey])
-        {
-            CPLog.warn(self + " was encoded with an older version of Cappuccino. Please nib2cib the original nib again or open and re-save in Atlas.");
-
-            [self setMenu:[aCoder decodeObjectForKey:DEPRECATED_CPPopUpButtonMenuKey]];
-            [self setObjectValue:[aCoder decodeObjectForKey:DEPRECATED_CPPopUpButtonSelectedIndexKey]];
-        }
-
-        var options = CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld;/* | CPKeyValueObservingOptionInitial */
-
-        [self addObserver:self forKeyPath:@"menu.items" options:options context:nil];
-        [self addObserver:self forKeyPath:@"_firstItem.changeCount" options:options context:nil];
-        [self addObserver:self forKeyPath:@"selectedItem.changeCount" options:options context:nil];
+        [self setMenu:[aCoder decodeObjectForKey:CPPopUpButtonMenuKey]];
+        [self selectItemAtIndex:[aCoder decodeObjectForKey:CPPopUpButtonSelectedIndexKey]];
     }
-
+    
     return self;
 }
 
+/*!
+    Encodes the data of the pop-up button into a coder
+    @param aCoder the coder to which the data
+    will be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    
+    [aCoder encodeObject:_menu forKey:CPPopUpButtonMenuKey];
+    [aCoder encodeInt:_selectedIndex forKey:CPPopUpButtonSelectedIndexKey];
+}
+
 @end

AppKit/CPProgressIndicator.j

@@ -20,9 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CGGeometry.j"
-@import "CPImageView.j"
-@import "CPView.j"
+@import <AppKit/CGGeometry.j>
+@import <AppKit/CPImageView.j>
+@import <AppKit/CPView.j>
+
+#include "CoreGraphics/CGGeometry.h"
 
 
 /*
@@ -47,7 +49,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
     CPProgressIndicatorStyleIdentifiers     = nil,
     CPProgressIndicatorStyleSizes           = nil;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPProgressIndicator
 
@@ -59,19 +61,19 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     double                      _minValue;
     double                      _maxValue;
-
+    
     double                      _doubleValue;
-
+    
     CPControlSize               _controlSize;
-
+    
     BOOL                        _isIndeterminate;
     CPProgressIndicatorStyle    _style;
-
+    
     BOOL                        _isAnimating;
-
+    
     BOOL                        _isDisplayedWhenStoppedSet;
     BOOL                        _isDisplayedWhenStopped;
-
+    
     CPView                      _barView;
 }
 
@@ -82,11 +84,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     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:
@@ -95,68 +97,81 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
         [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
 
     CPProgressIndicatorBezelBorderViewPool = [];
-
+    
     var start = CPProgressIndicatorBarStyle,
         end = CPProgressIndicatorHUDBarStyle;
-
+    
     for (; start <= end; ++start)
     {
         CPProgressIndicatorBezelBorderViewPool[start] = [];
+    
         CPProgressIndicatorBezelBorderViewPool[start][CPMiniControlSize]    = [];
         CPProgressIndicatorBezelBorderViewPool[start][CPSmallControlSize]   = [];
         CPProgressIndicatorBezelBorderViewPool[start][CPRegularControlSize]  = [];
     }
-
+    
     CPProgressIndicatorClassName = [self className];
+    
+    
     CPProgressIndicatorStyleIdentifiers = [];
-
+    
     CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle]        = @"Bar";
     CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorSpinningStyle]   = @"Spinny";
     CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]     = @"HUDBar";
-
+    
     var regularIdentifier = _CPControlIdentifierForControlSize(CPRegularControlSize),
         smallIdentifier = _CPControlIdentifierForControlSize(CPSmallControlSize),
         miniIdentifier = _CPControlIdentifierForControlSize(CPMiniControlSize);
 
     CPProgressIndicatorStyleSizes = [];
 
-    // Bar Style
-    var prefixes = [
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
-        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
-        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
-    ];
+    // Bar Sttyle
+    var prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
 
-    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)];
-    }
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+
+    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
+
+    // HUD Bar Style
+    prefix = CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 15.0), _CGSizeMake(1.0, 15.0), _CGSizeMake(3.0, 15.0)];
+
+    prefix = CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle];
+
+    CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = _CGSizeMake(1.0, 9.0);
+    CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = _CGSizeMake(1.0, 9.0);
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
         _minValue = 0.0;
         _maxValue = 100.0;
-
+        
         _doubleValue = 0.0;
-
+        
         _style = CPProgressIndicatorBarStyle;
         _isDisplayedWhenStoppedSet = NO;
-
+        
         _controlSize = CPRegularControlSize;
-
+        
         [self updateBackgroundColor];
         [self drawBar];
     }
-
+    
     return self;
 }
 
@@ -174,7 +189,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)startAnimation:(id)aSender
 {
     _isAnimating = YES;
-
+    
     [self _hideOrDisplay];
 }
 
@@ -190,7 +205,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*!
-    Always returns \c NO. Cappuccino does not have multiple threads.
+    Always returns <code>NO</code>. Cappuccino does not have multiple threads.
 */
 - (BOOL)usesThreadedAnimation
 {
@@ -213,7 +228,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)setDoubleValue:(double)aValue
 {
     _doubleValue = MIN(MAX(aValue, _minValue), _maxValue);
-
+    
     [self drawBar];
 }
 
@@ -268,7 +283,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_controlSize == aControlSize)
         return;
-
+    
     _controlSize = aControlSize;
 
     [self updateBackgroundColor];
@@ -290,7 +305,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 /*
-    Not yet implemented.
+    Not yet impemented.
 */
 - (CPControlTint)controlTint
 {
@@ -314,20 +329,20 @@ 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
+    @param isDeterminate <code>YES</code> makes the indicator indeterminate
 */
 - (void)setIndeterminate:(BOOL)isIndeterminate
 {
     if (_isIndeterminate == isIndeterminate)
         return;
-
+    
     _isIndeterminate = isIndeterminate;
 
     [self updateBackgroundColor];
 }
 
 /*!
-    Returns \c YES if the progress bar is indeterminate.
+    Returns <code>YES</code> if the progress bar is indeterminate.
 */
 - (BOOL)isIndeterminate
 {
@@ -342,9 +357,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_style == aStyle)
         return;
-
+    
     _style = aStyle;
-
+    
     [self updateBackgroundColor];
 }
 
@@ -357,37 +372,38 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
         [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
     else
         [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
-            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + _CPControlIdentifierForControlSize(_controlSize)][0].height)];
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + 
+            _CPControlIdentifierForControlSize(_controlSize)][0].height)];
 }
 
 /*!
-    Sets whether the indicator should be displayed when it isn't animating. By default this is \c YES if the style
-    is CPProgressIndicatorBarStyle, and \c NO if it's CPProgressIndicatorSpinningStyle.
-    @param isDisplayedWhenStopped \c YES means the indicator will be displayed when it's not animating.
+    Sets whether the indicator should be displayed when it isn't animating. By default this is <code>YES</code> if the style
+    is CPProgressIndicatorBarStyle, and <code>NO</code> if it's CPProgressIndicatorSpinningStyle.
+    @param isDisplayedWhenStopped <code>YES</code> means the indicator will be displayed when it's not animating.
 */
 - (void)setDisplayedWhenStopped:(BOOL)isDisplayedWhenStopped
 {
     if (_isDisplayedWhenStoppedSet && _isDisplayedWhenStopped == isDisplayedWhenStopped)
         return;
-
+        
     _isDisplayedWhenStoppedSet = YES;
-
+    
     _isDisplayedWhenStopped = isDisplayedWhenStopped;
-
+    
     [self _hideOrDisplay];
 }
 
 /*!
-    Returns \c YES if the progress bar is displayed when not animating.
+    Returns <code>YES</code> if the progress bar is displayed when not animating.
 */
 - (BOOL)isDisplayedWhenStopped
 {
     if (_isDisplayedWhenStoppedSet)
         return _isDisplayedWhenStopped;
-
+    
     if (_style == CPProgressIndicatorBarStyle || _style == CPProgressIndicatorHUDBarStyle)
         return YES;
-
+    
     return NO;
 }
 
@@ -400,7 +416,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 - (void)setFrameSize:(CGSize)aSize
 {
     [super setFrameSize:aSize];
-
+    
     [self drawBar];
 }
 
@@ -409,28 +425,24 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 {
     if (_style == CPProgressIndicatorSpinningStyle)
         return;
-
+    
     if (!_barView)
     {
-        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(2.0, 2.0, 0.0, 9.0)];
+        
+        [_barView setBackgroundColor:[CPColor redColor]];
+        
         [self addSubview:_barView];
     }
-
-    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
-        NO,
+    
+    [_barView setBackgroundColor:_CPControlColorWithPatternImage(
         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)];
+                    
+    [_barView setFrameSize:CGSizeMake(CGRectGetWidth([self bounds]) * (_doubleValue - _minValue) / (_maxValue - _minValue) - 4.0, 9.0)];
 }
 
 /* @ignore */
@@ -441,9 +453,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
         if (_style == CPProgressIndicatorSpinningStyle)
         {
             [_barView removeFromSuperview];
-
+            
             _barView = nil;
-
+            
             [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
         }
         else
@@ -455,7 +467,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
                 @"BezelBorder",
                 CPProgressIndicatorStyleIdentifiers[_style],
                 _CPControlIdentifierForControlSize(_controlSize))];
-
+                
             [self drawBar];
         }
     }
@@ -464,41 +476,3 @@ var CPProgressIndicatorSpinningStyleColors  = nil,
 }
 
 @end
-
-
-@implementation CPProgressIndicator (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _minValue                   = [aCoder decodeObjectForKey:@"_minValue"];
-        _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
-        _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
-        _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
-        _isIndeterminate            = [aCoder decodeObjectForKey:@"_isIndeterminate"];
-        _style                      = [aCoder decodeObjectForKey:@"_style"];
-        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
-        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
-        _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_minValue forKey:@"_minValue"];
-    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
-    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
-    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
-    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
-    [aCoder encodeObject:_style forKey:@"_style"];
-    [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
-    [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
-    [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
-}
-
-@end

AppKit/CPRadio.j

@@ -25,29 +25,28 @@
 
 @import "CPButton.j"
 
-
 /*!
     @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
@@ -56,16 +55,13 @@
     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;
@@ -90,7 +86,7 @@ CPRadioImageOffset = 4.0;
     return button;
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     return @"radio";
 }
@@ -99,10 +95,10 @@ CPRadioImageOffset = 4.0;
 - (id)initWithFrame:(CGRect)aFrame radioGroup:(CPRadioGroup)aRadioGroup
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
-        [self setRadioGroup:aRadioGroup];
+        [self setRadioGroup:aRadioGroup || [CPRadioGroup new]];
 
         [self setHighlightsBy:CPContentsCellMask];
         [self setShowsStateBy:CPContentsCellMask];
@@ -113,13 +109,13 @@ CPRadioImageOffset = 4.0;
 
         [self setBordered:YES];
     }
-
-    return self;
+    
+    return self; 
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
-    return [self initWithFrame:aFrame radioGroup:[CPRadioGroup new]];
+    return [self initWithFrame:aFrame radioGroup:nil];
 }
 
 - (CPInteger)nextState
@@ -145,7 +141,7 @@ CPRadioImageOffset = 4.0;
 - (void)setObjectValue:(id)aValue
 {
     [super setObjectValue:aValue];
-
+    
     if ([self state] === CPOnState)
         [_radioGroup _setSelectedRadio:self];
 }
@@ -179,9 +175,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 {
     CPSet   _radios;
     CPRadio _selectedRadio;
-
-    id      _target @accessors(property=target);
-    SEL     _action @accessors(property=action);
 }
 
 - (id)init
@@ -220,8 +213,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 
     [_selectedRadio setState:CPOffState];
     _selectedRadio = aRadio;
-
-    [CPApp sendAction:_action to:_target from:self];
 }
 
 - (CPRadio)selectedRadio

AppKit/CPResponder.j

@@ -23,23 +23,19 @@
 @import <Foundation/CPObject.j>
 
 
-CPDeleteKeyCode         = 8;
-CPTabKeyCode            = 9;
-CPReturnKeyCode         = 13;
-CPEscapeKeyCode         = 27;
-CPSpaceKeyCode          = 32;
-CPPageUpKeyCode         = 33;
-CPPageDownKeyCode       = 34;
-CPLeftArrowKeyCode      = 37;
-CPUpArrowKeyCode        = 38;
-CPRightArrowKeyCode     = 39;
-CPDownArrowKeyCode      = 40;
-CPDeleteForwardKeyCode  = 46;
+CPDeleteKeyCode     = 8;
+CPTabKeyCode        = 9;
+CPReturnKeyCode     = 13;
+CPEscapeKeyCode     = 27;
+CPLeftArrowKeyCode  = 37;
+CPUpArrowKeyCode    = 38;
+CPRightArrowKeyCode = 39;
+CPDownArrowKeyCode  = 40;
 
 /*!
     @ingroup appkit
     @class CPResponder
-
+    
     Subclasses of CPResonder can be part of the responder chain.
 */
 @implementation CPResponder : CPObject
@@ -50,7 +46,7 @@ CPDeleteForwardKeyCode  = 46;
 
 // Changing the first responder
 /*!
-    Returns \c YES if the receiver is able to become the first responder. \c NO otherwise.
+    Returns <code>YES</code> if the receiver is able to become the first responder. <code>NO</code> otherwise.
 */
 - (BOOL)acceptsFirstResponder
 {
@@ -59,8 +55,8 @@ CPDeleteForwardKeyCode  = 46;
 
 /*!
     Notifies the receiver that it will become the first responder. The receiver can reject first
-    responder if it returns \c NO. The default implementation always returns \c YES.
-    @return \c YES if the receiver accepts first responder status.
+    responder if it returns <code>NO</code>. The default implementation always returns <code>YES</code>.
+    @return <code>YES</code> if the receiver accepts first responder status.
 */
 - (BOOL)becomeFirstResponder
 {
@@ -69,7 +65,7 @@ CPDeleteForwardKeyCode  = 46;
 
 /*!
     Notifies the receiver that it has been asked to give up first responder status.
-    @return \c YES if the receiver is willing to give up first responder status.
+    @return <code>YES</code> if the receiver is willing to give up first responder status.
 */
 - (BOOL)resignFirstResponder
 {
@@ -100,29 +96,41 @@ CPDeleteForwardKeyCode  = 46;
 */
 - (void)interpretKeyEvents:(CPArray)events
 {
-    var index = 0,
-        count = [events count];
-
-    for (; index < count; ++index)
+    var event,
+        index = 0;
+    
+    while(event = events[index++])
     {
-        var event = events[index],
-            modifierFlags = [event modifierFlags],
-            character = [event charactersIgnoringModifiers],
-            selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
-
-        if (selectorNames)
+        switch([event keyCode])
         {
-            for (var s = 0, scount = selectorNames.length; s < scount; s++)
-            {
-                var selector = selectorNames[s];
-                if (!selector)
-                    continue;
+            case CPLeftArrowKeyCode:    [self moveBackward:self];
+                                        break;
+            case CPRightArrowKeyCode:   [self moveForward:self];
+                                        break;
+            case CPUpArrowKeyCode:      [self moveUp:self];
+                                        break;
+            case CPDownArrowKeyCode:    [self moveDown:self];
+                                        break;
+            case CPDeleteKeyCode:       [self deleteBackward:self];
+                                        break;
+            case CPReturnKeyCode:
+            case 3:                     [self insertLineBreak:self];
+                                        break;
+            
+            case CPEscapeKeyCode:       [self cancel:self];
+                                        break;
 
-                [self doCommandBySelector:CPSelectorFromString(selector)];
-            }
+            case CPTabKeyCode:          var shift = [event modifierFlags] & CPShiftKeyMask;
+
+                                        if (!shift)
+                                            [self insertTab:self];
+                                        else
+                                            [self insertBackTab:self];
+
+                                        break;
+
+            default:                    [self insertText:[event characters]];
         }
-        else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)) && [self respondsToSelector:@selector(insertText:)])
-            [self insertText:[event characters]];
     }
 }
 
@@ -135,15 +143,6 @@ CPDeleteForwardKeyCode  = 46;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*!
-    Notifies the receiver that the user has clicked the right mouse down in its area.
-    @param anEvent contains information about the right click
-*/
-- (void)rightMouseDown:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
 /*!
     Notifies the receiver that the user has initiated a drag
     over it. A drag is a mouse movement while the left button is down.
@@ -163,15 +162,6 @@ CPDeleteForwardKeyCode  = 46;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*!
-    Notifies the receiver that the user has released the right mouse button.
-    @param anEvent contains information about the release
-*/
-- (void)rightMouseUp:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
 /*!
     Notifies the receiver that the user has moved the mouse (with no buttons down).
     @param anEvent contains information about the movement
@@ -222,27 +212,11 @@ CPDeleteForwardKeyCode  = 46;
     [_nextResponder performSelector:_cmd withObject:anEvent];
 }
 
-/*!
-    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.
+/*
+    FIXME This description is bad.
+    Based on <code>anEvent</code>, the receiver should simulate the event.
+    @param anEvent the event to simulate
+    @return <code>YES</code> if the event receiver simulated the  event
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
@@ -250,6 +224,14 @@ CPDeleteForwardKeyCode  = 46;
 }
 
 // Action Methods
+/*!
+    Deletes one character backward, or the selection if anything is selected.
+    @param aSender the object requesting this
+*/
+- (void)deleteBackward:(id)aSender
+{
+}
+
 /*!
     Insert a line break at the caret position or selection.
     @param aSender the object requesting this
@@ -265,7 +247,11 @@ CPDeleteForwardKeyCode  = 46;
 */
 - (void)insertNewline:(id)aSender
 {
-    [[self nextResponder] insertNewline:aSender];
+    [self insertNewline:aSender];
+}
+
+- (void)cancel:(id)sender
+{
 }
 
 - (void)insertTab:(id)sender
@@ -287,12 +273,12 @@ CPDeleteForwardKeyCode  = 46;
 // Dispatch methods
 /*!
     The receiver will attempt to perform the command,
-    if it responds to it. If not, the \c -nextResponder will be called to do it.
+    if it responds to it. If not, the <code>nextResponder</code> will be called to do it.
     @param aSelector the command to attempt
 */
 - (void)doCommandBySelector:(SEL)aSelector
 {
-    if ([self respondsToSelector:aSelector])
+    if([self respondsToSelector:aSelector])
         [self performSelector:aSelector];
     else
         [_nextResponder doCommandBySelector:aSelector];
@@ -302,15 +288,15 @@ CPDeleteForwardKeyCode  = 46;
     The receiver will attempt to perform the command, or pass it on to the next responder if it doesn't respond to it.
     @param aSelector the command to perform
     @param anObject the argument to the method
-    @return \c YES if the receiver was able to perform the command, or a responder down the chain was
+    @return <code>YES</code> if the receiver was able to perform the command, or a responder down the chain was
     able to perform the command.
 */
 - (BOOL)tryToPerform:(SEL)aSelector with:(id)anObject
 {
-    if ([self respondsToSelector:aSelector])
+    if([self respondsToSelector:aSelector])
     {
         [self performSelector:aSelector withObject:anObject];
-
+        
         return YES;
     }
 
@@ -349,8 +335,7 @@ CPDeleteForwardKeyCode  = 46;
 
 @end
 
-var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
-    CPResponderMenuKey = @"CPResponderMenuKey";
+var CPResponderNextResponderKey = @"CPResponderNextResponderKey";
 
 @implementation CPResponder (CPCoding)
 
@@ -362,13 +347,10 @@ var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-
+    
     if (self)
-    {
-        [self setNextResponder:[aCoder decodeObjectForKey:CPResponderNextResponderKey]];
-        [self setMenu:[aCoder decodeObjectForKey:CPResponderMenuKey]];
-    }
-
+        _nextResponder = [aCoder decodeObjectForKey:CPResponderNextResponderKey];
+    
     return self;
 }
 
@@ -381,8 +363,6 @@ 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

@@ -1,504 +0,0 @@
-/*
- * 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 */
-- (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;
-}
-
-- (id)_mergeTree:(id)tree
-{
-    var merged = [CPMutableArray array],
-        titles = [CPMutableArray array],
-        count = [tree count];
-
-    for (var i = 0; i < count; i++)
-    {
-        var t = tree[i],
-            title = [CPString stringWithString:[t title]];
-
-        if ([titles containsObject:title])
-        {
-            CPLogConsole("CPPredicateEditor does not support templates merging yet. Ignoring duplicate template: " + [t description]);
-            continue;
-        }
-
-        [merged addObject:t];
-        [titles addObject:title];
-    }
-
-    return merged;
-}
-
-- (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
-{
-    var tree = [CPArray array],
-        templateViews = [aTemplate templateViews],
-        count = [templateViews count];
-
-    while (count--)
-    {
-        var children = [CPArray array],
-            itemsCount = 0,
-            menuIndex = -1,
-            itemsArray,
-
-            templateView = [templateViews objectAtIndex:count],
-            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
-
-        if (isPopup)
-        {
-            itemArray = [[templateView itemArray] valueForKey:@"title"];
-            itemsCount = [itemArray count],
-            menuIndex = 0;
-        }
-
-        for (; menuIndex < itemsCount; menuIndex++)
-        {
-            var item = [_CPPredicateEditorTree new];
-            [item setIndexIntoTemplate:count];
-            [item setTemplate:aTemplate];
-            [item setMenuItemIndex:menuIndex];
-            if (isPopup)
-                [item setTitle:[itemArray objectAtIndex:menuIndex]];
-
-            [children addObject:item];
-        }
-
-        [children makeObjectsPerformSelector:@selector(setChildren:) withObject:tree];
-        tree = children;
-    }
-
-    return tree;
-}
-
-#pragma mark Set the Predicate
-
-- (void)setObjectValue:(id)objectValue
-{
-    if (![[objectValue predicateFormat] isEqualToString:[[super predicate] predicateFormat]]) // ??
-        [self _reflectPredicate:objectValue];
-}
-
-- (void)_reflectPredicate:(id)predicate
-{
-    var animation = _currentAnimation;
-    _currentAnimation = nil;
-
-    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]],
-                menuItemIndex = [treeChild menuItemIndex];
-
-            if (menuItemIndex == -1 || [[treeChild title] isEqual:[currentView titleOfSelectedItem]])
-            {
-                var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
-                [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
-
-                [criteria addObject:node];
-                [values addObject:[node displayValue]];
-                break;
-            }
-        }
-
-        rootItems = [treeChild children];
-    }
-
-    var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"];
-
-    return row;
-}
-
-#pragma mark Get the predicate
-
-- (void)_updatePredicate
-{
-    [self willChangeValueForKey:@"objectValue"];
-    [self _updatePredicateFromRows];
-    [self didChangeValueForKey:@"objectValue"];
-}
-
-- (void)_updatePredicateFromRows
-{
-    var rootRowsArray = [super _rootRowsArray],
-        subpredicates = [CPMutableArray array],
-        count = count2 = [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];
-
-    [super _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];
-            var 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
-{
-    [self _updatePredicate];
-    [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
-
-/*! @endcond */

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

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

@@ -1,132 +0,0 @@
-/*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
- */
-
-@class _CPPredicateEditorTree;
-@implementation _CPPredicateEditorRowNode : CPObject
-{
-    _CPPredicateEditorTree                   tree @accessors;
-    CPMutableArray                  templateViews @accessors;
-    CPMutableArray        copiedTemplateContainer @accessors;
-    CPArray                              children @accessors(copy);
-}
-
-+ (id)rowNodeFromTree:(id)aTree
-{
-    var mapTable = {};
-    return [_CPPredicateEditorRowNode _rowNodeFromTree:aTree withTemplateTable:mapTable];
-}
-
-+ (id)_rowNodeFromTree:(id)aTree withTemplateTable:(id)templateTable
-{
-    var node,
-        views,
-        copiedContainer;
-
-    node = [[_CPPredicateEditorRowNode alloc] init];
-    node.tree = aTree;
-
-    var template = [aTree template],
-        uuid = [template UID];
-
-    var cachedNode = templateTable[uuid];
-
-    if (cachedNode == nil)
-    {
-        views = [CPMutableArray array];
-        copiedContainer = [CPMutableArray array];
-        templateTable[uuid] = node;
-    }
-    else
-    {
-        views = [cachedNode templateViews];
-        copiedContainer = [cachedNode copiedTemplateContainer];
-    }
-
-    node.templateViews = views;
-    node.copiedTemplateContainer = 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];
-    if (t !== template)
-    {
-        [templateViews setArray:views];
-        [copiedTemplateContainer removeAllObjects];
-        [copiedTemplateContainer addObject:template];
-    }
-
-    var count = [children count];
-    for (var i; 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)
-    {
-        CPLogConsole("COPYING TEMPLATE");
-        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

@@ -1,33 +0,0 @@
-/*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
- */
-
-@implementation _CPPredicateEditorTree : CPObject
-{
-    CPPredicateEditorRowTemplate         template @accessors;
-    CPString                                title @accessors(copy);
-    CPArray                              children @accessors(copy);
-    CPInteger                   indexIntoTemplate @accessors;
-    CPInteger                       menuItemIndex @accessors;
-}
-
-- (id)copy
-{
-    var tree = [[_CPPredicateEditorTree alloc] init];
-    [tree setTemplate:template];
-    [tree setTitle:title];
-    [tree setMenuItemIndex:menuItemIndex];
-    [tree setIndexIntoTemplate:indexIntoTemplate];
-    [tree setChildren:children];
-
-    return tree;
-}
-
-- (CPString)description
-{
-    return [CPString stringWithFormat:@"<%@: %p (%@) [%d-%d] T:%p at:%d> [\r%@\r]", [self className], self, title, indexIntoTemplate, menuItemIndex, template, [template rightExpressionAttributeType], children];
-}
-
-@end
-

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -1,75 +0,0 @@
-/*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPString.j>
-
-var regex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
-
-@implementation _CPRuleEditorLocalizer : CPObject
-{
-    CPDictionary    _dictionary @accessors(property=dictionary);
-    CPURLConnection connection;
-    CPURLRequest    resquest;
-}
-
-- (void)loadContentOfURL:(CPURL)aURL
-{
-    request = [CPURLRequest requestWithURL:aURL];
-    connection = [CPURLConnection connectionWithRequest:request delegate:self];
-}
-
-- (void)reloadIfNeeded
-{
-    if (connection != nil) // Connection waiting
-    {
-        connection = nil;
-        var data = [CPURLConnection sendSynchronousRequest:request returningResponse:NULL];
-        [self loadContent:[data rawString]];
-    }
-}
-
-- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)rawString
-{
-    if (connection != nil && rawString != nil)
-        [self loadContent:rawString];
-
-    connection = nil;
-}
-
-- (void)loadContent:(CPString)aContent
-{
-    var dict = [CPDictionary dictionary],
-        lines = [aContent componentsSeparatedByString:"\n"],
-        count = [lines count];
-
-    for (var i = 0 ; i < count ; i++)
-    {
-        var line = [lines objectAtIndex:i];
-        if (line.length > 1)
-        {
-            var match = regex.exec(line);
-            if (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;
-}

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

@@ -1,157 +0,0 @@
-/*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
- */
-
-var GRADIENT_NORMAL,
-    GRADIENT_HIGHLIGHTED,
-    IE_FILTER = "progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfcfc', endColorstr='#dfdfdf')";
-
-@implementation _CPRuleEditorPopUpButton : CPPopUpButton
-{
-    CPInteger radius;
-}
-
-+ (void)initialize
-{
-    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
-    {
-        GRADIENT_NORMAL = "-webkit-gradient(linear, left top, left bottom, from(rgb(252, 252, 252)), to(rgb(223, 223, 223)))",
-        GRADIENT_HIGHLIGHTED = "-webkit-gradient(linear, left top, left bottom, from(rgb(223, 223, 223)), to(rgb(252, 252, 252)))";
-    }
-    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
-    {
-        GRADIENT_NORMAL = "-moz-linear-gradient(top,  rgb(252, 252, 252),  rgb(223, 223, 223))",
-        GRADIENT_HIGHLIGHTED = "-moz-linear-gradient(top,  rgb(223, 223, 223),  rgb(252, 252, 252))";
-    }
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        var style = _DOMElement.style;
-        style.backgroundImage = GRADIENT_NORMAL;
-        style.border = "1px solid rgb(189, 189, 189)";
-        style.filter = IE_FILTER;
-
-        [self setTextColor:[CPColor colorWithWhite:101/255 alpha:1]];
-        [self setBordered:NO];
-     }
-
-    return self;
-}
-
-- (id)hitTest:(CPPoint)point
-{
-    var slice = [self superview];
-    if (!CPRectContainsPoint([self frame], point) || ![self sliceIsEditable])
-        return nil;
-
-    return self;
-}
-
-- (void)setHighlighted:(BOOL)shouldHighlight
-{
-    _DOMElement.style.backgroundImage = (shouldHighlight) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
-}
-
-- (BOOL)sliceIsEditable
-{
-    return [[self superview] isEditable];
-}
-
-- (BOOL)trackMouse:(CPEvent)theEvent
-{
-    if (![self sliceIsEditable])
-        return NO;
-
-    return [super trackMouse:theEvent];
-}
-
-- (CGRect)contentRectForBounds:(CGRect)bounds
-{
-    var contentRect = [super contentRectForBounds:bounds];
-    contentRect.origin.x += radius;
-    contentRect.size.width -= 2 * radius;
-
-    return contentRect;
-}
-
-- (void)layoutSubviews
-{
-    radius = FLOOR(CGRectGetHeight([self bounds])/2);
-
-    var style = _DOMElement.style,
-        radiusCSS = radius + "px";
-
-    //style.webkitBorderRadius = radiusCSS;
-    //style.mozBorderRadius = radiusCSS;
-    style.borderRadius = radiusCSS;
-
-    [super layoutSubviews];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var bounds = [self bounds],
-        context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    var arrow_width = FLOOR(CGRectGetHeight(bounds)/3.5);
-
-    CGContextTranslateCTM(context, CGRectGetWidth(bounds) - radius - arrow_width, CGRectGetHeight(bounds) / 2);
-
-    var arrowsPath = [CPBezierPath bezierPath];
-    [arrowsPath moveToPoint:CGPointMake(0, 1)];
-    [arrowsPath lineToPoint:CGPointMake(arrow_width, 1)];
-    [arrowsPath lineToPoint:CGPointMake(arrow_width/2, arrow_width + 1)];
-    [arrowsPath closePath];
-
-    CGContextSetFillColor(context, [CPColor colorWithWhite:101/255 alpha:1]);
-    [arrowsPath fill];
-
-    CGContextScaleCTM(context, 1 , -1);
-    [arrowsPath fill];
-}
-
-@end
-
-@implementation _CPRuleEditorButton : CPButton
-{
-    CPInteger radius;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-    if (self)
-    {
-        [self setFont:[CPFont boldFontWithName:@"Apple Symbol" size:12.0]];
-        [self setTextColor:[CPColor colorWithWhite:150/255 alpha:1]];
-        [self setAlignment:CPCenterTextAlignment];
-        [self setAutoresizingMask:CPViewMinXMargin];
-        [self setImagePosition:CPImageOnly];
-        [self setBordered:NO];
-        var style = _DOMElement.style;
-        style.border = "1px solid rgb(189, 189, 189)";
-        style.filter = IE_FILTER;
-    }
-
-    return self;
-}
-
-- (void)layoutSubviews
-{
-    radius = FLOOR(CGRectGetHeight([self bounds])/2);
-
-    var style = _DOMElement.style,
-        radiusCSS = radius + "px";
-
-    style.borderRadius = radiusCSS;
-    style.backgroundImage = ([self isHighlighted]) ? GRADIENT_HIGHLIGHTED : GRADIENT_NORMAL;
-
-    [super layoutSubviews];
-}
-
-@end
-

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

@@ -1,109 +0,0 @@
-/*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
- */
-
-@implementation _CPRuleEditorViewSlice : CPView
-{
-    CPRuleEditor _ruleEditor;
-    int          _indentation           @accessors(property=indentation);
-    int          _rowIndex              @accessors(property=rowIndex);
-    CPRect       _animationTargetRect   @accessors(property=_animationTargetRect);
-    BOOL         _selected              @accessors(getter=_isSelected, setter=_setSelected:);
-    BOOL         _lastSelected          @accessors(getter=_isLastSelected, setter=_setLastSelected:);
-    CPColor      _backgroundColor       @accessors(property=backgroundColor);
-}
-
-- (void)removeFromSuperview
-{
-    [super removeFromSuperview];
-}
-
-- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
-{
-    if (self = [super initWithFrame:frame])
-    {
-        _ruleEditor = editor;
-        _selected = NO;
-        _lastSelected = NO;
-    }
-
-    return self;
-}
-
-- (void)_setSelected:(BOOL)select
-{
-    if (select == _selected)
-        return;
-
-    var selector = select ? @"setThemeState:" : @"unsetThemeState:";
-    [[self subviews] makeObjectsPerformSelector:CPSelectorFromString(selector)  withObject:CPThemeStateSelectedDataView];
-    _selected = select;
-}
-
-- (void)drawRect:(CPRect)rect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds],
-        maxX = CGRectGetWidth(bounds) - 2,
-        maxY = CGRectGetHeight(bounds);
-
-// Draw background
-    if ([self _isSelected])
-        _backgroundColor = [_ruleEditor _selectedRowColor];
-    else
-    {
-        var colors = [_ruleEditor _backgroundColors],
-            count = [colors count];
-        _backgroundColor = [colors objectAtIndex:(_rowIndex % count)];
-    }
-
-    CGContextSetFillColor(context, _backgroundColor);
-    CGContextFillRect(context, rect);
-
-// Draw Top Border
-    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 1, 0);
-    CGContextAddLineToPoint(context, maxX, 0);
-    CGContextClosePath(context);
-    CGContextSetStrokeColor(context, [_ruleEditor _sliceTopBorderColor]);
-    CGContextStrokePath(context);
-
-// Draw Bottom Border
-    CGContextBeginPath(context);
-    CGContextMoveToPoint(context, 1, maxY - 0.5);
-    CGContextAddLineToPoint(context, maxX, maxY - 0.5);
-    CGContextClosePath(context);
-    var bottomColor = (_rowIndex == [_ruleEditor _lastRow]) ? [_ruleEditor _sliceLastBottomBorderColor] : [_ruleEditor _sliceBottomBorderColor];
-    CGContextSetStrokeColor(context, bottomColor);
-    CGContextStrokePath(context);
-}
-
-- (void)mouseDown:(CPEvent)theEvent
-{
-    if (editable)
-        [_ruleEditor _mouseDownOnSlice:self withEvent:theEvent];
-}
-
-- (void)mouseUp:(CPEvent)theEvent
-{
-    if (editable)
-        [_ruleEditor _mouseUpOnSlice:self withEvent:theEvent];
-}
-
-/*
-- (void)rightMouseDown:(CPEvent)theEvent
-{
-    [_ruleEditor _rightMouseDownOnSlice:self withEvent:theEvent];
-}
-*/
-
-// =========
-// ! DEBUG
-// =========
-- (CPString)description
-{
-    return [CPString stringWithFormat:@"<%@ %p index:%d indentation:%d>",[self className],self,[self rowIndex],[self indentation]];
-}
-
-@end

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -1,512 +0,0 @@
-/*
- *     Created by cacaodev@gmail.com.
- *     Copyright (c) 2011 Pear, Inc. All rights reserved.
- */
-
-@import "_CPRuleEditorViewSlice.j"
-@import "_CPRuleEditorPopUpButton.j"
-@import "CPRuleEditor.j"
-
-var CONTROL_HEIGHT = 16.,
-    BUTTON_HEIGHT = 16.;
-
-@implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
-{
-    CPMutableArray  _ruleOptionViews;
-    CPMutableArray  _ruleOptionFrames;
-    CPMutableArray  _correspondingRuleItems;
-    CPMutableArray  _ruleOptionInitialViewFrames;
-    CPButton        _addButton;
-    CPButton        _subtractButton;
-    BOOL            editable;
-    CPRuleEditorRowType _rowType @accessors;
-    CPRuleEditorRowType _plusButtonRowType;
-}
-
-- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
-{
-    if (self = [super initWithFrame:frame ruleEditorView:editor])
-        [self _initShared];
-
-    return self;
-}
-
-- (void)_initShared
-{
-    _correspondingRuleItems = [[CPMutableArray alloc] init];
-    _ruleOptionFrames = [[CPMutableArray alloc] init];
-    _ruleOptionInitialViewFrames = [[CPMutableArray alloc] init];
-    _ruleOptionViews = [[CPMutableArray alloc] init];
-     editable = [_ruleEditor isEditable];
-
-    _addButton = [self _createAddRowButton];
-    _subtractButton = [self _createDeleteRowButton];
-    //[_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
-    //[_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [_addButton setHidden:!editable];
-    [_subtractButton setHidden:!editable];
-    [self addSubview:_addButton];
-    [self addSubview:_subtractButton];
-
-    [self setAutoresizingMask:CPViewWidthSizable];
-
-    var center = [CPNotificationCenter defaultCenter];
-    [center addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
-}
-
-- (CPButton)_createAddRowButton
-{
-    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setImage:[_ruleEditor _addImage]];
-
-    [button setAction:@selector(_addOption:)];
-    [button setTarget:self];
-    [button setAutoresizingMask:CPViewMinXMargin];
-
-    return button;
-}
-
-- (CPButton)_createDeleteRowButton
-{
-    var button = [[_CPRuleEditorButton alloc] initWithFrame:CGRectMakeZero()];
-    [button setImage:[_ruleEditor _removeImage]];
-
-    [button setAction:@selector(_deleteOption:)];
-    [button setTarget:self];
-    [button setAutoresizingMask:CPViewMinXMargin];
-
-    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];
-    var font = [_ruleEditor font],
-        width = [title sizeWithFont:font].width + 20,
-        rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT);
-
-    var popup = [[_CPRuleEditorPopUpButton alloc] initWithFrame:rect];
-    [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
-{
-    text = [[_ruleEditor standardLocalizer] localizedStringForString:text];
-
-    var textField = [[_CPRuleEditorTextField alloc] initWithFrame:CPMakeRect(0, 0, 200, CONTROL_HEIGHT)];
-    var font = [_ruleEditor font];
-    font = [CPFont fontWithName:font._name size:font._size + 2];
-    [textField setValue:font forThemeAttribute:@"font"];
-    [textField setStringValue:text];
-    [textField sizeToFit];
-
-    return textField;
-}
-
-- (void)_addOption:(id)sender
-{
-    if (_rowIndex == [_ruleEditor numberOfRows] - 1)
-        [self setNeedsDisplay:YES];
-
-    var type = _plusButtonRowType;
-    if ([_ruleEditor nestingMode] == CPRuleEditorNestingModeCompound && ([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask))
-        type = CPRuleEditorRowTypeCompound;
-
-    [_ruleEditor _addOptionFromSlice:self ofRowType:type];
-}
-
-- (void)_deleteOption:(id)sender
-{
-    [_ruleEditor _deleteSlice:self];
-}
-
-- (void)_ruleOptionPopupChangedAction:(CPMenuItem )sender
-{
-    var layoutdict = [sender representedObject],
-        newItem = [layoutdict objectForKey:@"item"],
-        indexInCriteria = [layoutdict objectForKey:@"indexInCriteria"],
-        oldItem = [_correspondingRuleItems objectAtIndex:indexInCriteria];
-
-    if (![newItem isEqual:oldItem])
-    {
-        [_correspondingRuleItems replaceObjectAtIndex:indexInCriteria withObject:newItem];
-        [_ruleEditor _changedItem:oldItem toItem:newItem inRow:_rowIndex atCriteriaIndex:indexInCriteria];
-    }
-}
-
-- (BOOL)validateMenuItem:(CPMenuItem )menuItem
-{
-    return [_ruleEditor _validateItem:menuItem value:[[menuItem representedObject] valueForKey:@"item"] inRow:_rowIndex];
-}
-
-- (void)_emptyRulePartSubviews
-{
-    var count = [_ruleOptionViews count];
-
-    while (count--)
-        [_ruleOptionViews[count] removeFromSuperview];
-
-    [_ruleOptionViews removeAllObjects];
-    [_ruleOptionFrames removeAllObjects];
-    [_ruleOptionInitialViewFrames removeAllObjects];
-}
-
-- (void)_reconfigureSubviews
-{
-    var ruleItems,
-        criteria,
-        repObject,
-        menuItem,
-        ruleView,
-        criterion,
-        parent,
-        numberOfCriteria,
-        numberOfChildren,
-        firstResponderIndex;
-
-    var ruleItems = [CPMutableArray array];
-
-    [self _emptyRulePartSubviews];
-
-    criteria = [_ruleEditor criteriaForRow:_rowIndex];
-    numberOfCriteria = [criteria count];
-
-    firstResponderIndex = numberOfCriteria - 1;
-    var responder = [[self window] firstResponder];
-    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];
-
-            var selectedIndex = [childItems indexOfObject:criterion];
-            if (selectedIndex == CPNotFound)
-                break;
-
-            for (var j = 0; j < numberOfChildren; ++j)
-            {
-                var childItem = [childItems objectAtIndex:j];
-                var childValue = [childValues objectAtIndex:j];
-
-                if ([childValue isKindOfClass:[CPMenuItem class]])
-                {
-                    [[childValue menu] removeItem:childValue];
-                    menuItem = childValue;
-                }
-                else
-                {
-                    if ([childValue isEqualToString:@""])
-                        menuItem = [self _createMenuSeparatorItem];
-                    else
-                    {
-                        menuItem = [self _createMenuItemWithTitle:childValue];
-                        [menuItem setTarget:self];
-                        [menuItem setAction:@selector(_ruleOptionPopupChangedAction:)];
-                    }
-                }
-
-                repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"];
-                [menuItem setRepresentedObject:repObject];
-                [menuItems addObject:menuItem];
-            }
-
-            ruleView = [self _createPopUpButtonWithItems:menuItems selectedItemIndex:selectedIndex];
-        }
-        else
-        {
-            var value = [childValues objectAtIndex:0];
-            var 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
-{
-    // CPLogConsole(_cmd);
-    [self _relayoutSubviewsWidthChanged:YES];
-}
-
-- (void)_relayoutSubviewsWidthChanged:(BOOL)widthChanged
-{
-    var optionViewOriginX,
-        leftHorizontalPadding,
-        leftButtonMinX,
-        rowHeight = [_ruleEditor rowHeight],
-        count = [_ruleOptionViews count],
-        sliceFrame = [self frame];
-
-    var buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - BUTTON_HEIGHT - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - BUTTON_HEIGHT)/2 - 2, BUTTON_HEIGHT, BUTTON_HEIGHT);
-    [_addButton setFrame:buttonFrame];
-
-    buttonFrame.origin.x -= BUTTON_HEIGHT + [self _rowButtonsInterviewHorizontalPadding];
-    [_subtractButton setFrame:buttonFrame];
-
-    if (widthChanged)
-    {
-        optionViewOriginX = [self _leftmostViewFixedHorizontalPadding] + [self _indentationHorizontalPadding] * _indentation;
-        leftHorizontalPadding = [self _rowButtonsLeftHorizontalPadding];
-        leftButtonMinX = CGRectGetMinX(buttonFrame);
-    }
-
-    for (var i = 0; i < count; i++)
-    {
-        var ruleOptionView = _ruleOptionViews[i],
-            optionFrame = _ruleOptionFrames[i];
-
-        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame))/2 - 2;
-        if (widthChanged)
-        {
-            optionFrame.origin.x = optionViewOriginX;
-            if (i == count - 1 && ![self _isRulePopup:ruleOptionView])
-            {
-                var initialFrame = _ruleOptionInitialViewFrames[i];
-                optionFrame.size.width = MIN(CGRectGetWidth(initialFrame), leftButtonMinX - leftHorizontalPadding - optionViewOriginX);
-            }
-        }
-
-        [ruleOptionView setFrame:optionFrame];
-        [self addSubview:ruleOptionView];
-
-        if (widthChanged)
-            optionViewOriginX += CGRectGetWidth(optionFrame) + [self _interviewHorizontalPadding];
-    }
-}
-
-- (void)_updateButtonVisibilities
-{
-    [_addButton setHidden:[_ruleEditor _shouldHideAddButtonForSlice:self]];
-    [_subtractButton setHidden:[_ruleEditor _shouldHideSubtractButtonForSlice:self]];
-}
-
-- (void)_configurePlusButtonByRowType:(CPRuleEditorRowType)type
-{
-    [self _setRowTypeToAddFromPlusButton:type];
-}
-
-- (BOOL)isEditable
-{
-    return editable;
-}
-
-- (void)setEditable:(BOOL)value
-{
-    editable = value;
-//  [self _updateEnabledStateForSubviews];
-    [self _updateButtonVisibilities];
-}
-
-- (float)_alignmentGridWidth
-{
-    return [_ruleEditor _alignmentGridWidth];
-}
-
-- (float)_indentationHorizontalPadding
-{
-    return 30.;
-}
-
-- (float)_interviewHorizontalPadding
-{
-    return 6.;
-}
-
-- (float)_leftmostViewFixedHorizontalPadding
-{
-    return 7.;
-}
-
-- (float)_minimumVerticalPopupPadding
-{
-    return 2.;
-}
-
-- (float)_rowButtonsInterviewHorizontalPadding
-{
-    return 6.;
-}
-
-- (float)_rowButtonsLeftHorizontalPadding
-{
-    return 10.;
-}
-
-- (float)_rowButtonsRightHorizontalPadding
-{
-    return 10.;
-}
-
-- (void)_setRowTypeToAddFromPlusButton:(int)type
-{
-    _plusButtonRowType = type;
-}
-
-- (void)setNeedsDisplay:(BOOL)flag
-{
-    [super setNeedsDisplay:flag];
-}
-
-- (BOOL)_nestingModeShouldHideAddButton
-{
-    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
-}
-
-- (BOOL)_nestingModeShouldHideSubtractButton
-{
-    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
-}
-
-- (BOOL)containsDisplayValue:(id)value
-{
-    return [[_ruleEditor displayValuesForRow:_rowIndex] containsObject:value];
-    // Ou alors avec _correspondingRuleItems
-}
-
-- (void)viewDidMoveToWindow
-{
-    [self layoutSubviews];
-}
-
-- (void)drawRect:(CPRect)rect
-{
-    [super drawRect:rect];
-}
-
-- (BOOL)_isRulePopup:(CPView)view
-{
-    if ([view isKindOfClass:[_CPRuleEditorPopUpButton class]])
-        return YES;
-    return NO;
-}
-
-- (BOOL)_isRuleStaticTextField:(CPView)view
-{
-    if ([view isKindOfClass:[_CPRuleEditorTextField class]])
-        return YES;
-    return NO;
-}
-
-- (void)_sendRuleAction:(id)sender
-{
-    [_ruleEditor _sendRuleAction];
-}
-
-- (void)_textDidChange:(CPNotification)aNotif
-{
-    if ([[aNotif object] superview] == self && [_ruleEditor _sendsActionOnIncompleteTextChange])
-        [_ruleEditor _sendRuleAction];
-}
-
-@end
-
-@implementation _CPRuleEditorTextField : CPTextField
-{
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self != nil)
-    {
-        [self setBordered:NO];
-        [self setEditable:NO];
-        [self setDrawsBackground:NO];
-    }
-
-    return self;
-}
-
-- (id)hitTest:(CPPoint)point
-{
-    if (!CPRectContainsPoint([self frame], point))
-        return nil;
-
-    return [self superview];
-}
-
-@end

AppKit/CPSavePanel.j

@@ -1,88 +0,0 @@
-/*
- * CPSavePanel.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPPanel.j"
-
-
-@implementation CPSavePanel : CPPanel
-{
-    CPURL   _URL;
-
-    BOOL    _isExtensionHidden @accessors(getter=isExtensionHidden, setter=setExtensionHidden:);
-    BOOL    _canSelectHiddenExtension @accessors(property=canSelectHiddenExtension);
-    BOOL    _allowsOtherFileTypes @accessors(property=allowsOtherFileTypes);
-    BOOL    _canCreateDirectories @accessors(property=canCreateDirectories);
-
-    CPArray _allowedFileTypes @accessors(property=allowedFileTypes);
-}
-
-+ (id)savePanel
-{
-    return [[CPSavePanel alloc] init];
-}
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _canCreateDirectories = YES;
-    }
-
-    return self;
-}
-
-- (CPInteger)runModal
-{
-    // FIXME: Is this correct???
-    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-
-    if (typeof window["cpSavePanel"] === "function")
-    {
-        var resultObject = window.cpSavePanel({
-                isExtensionHidden: _isExtensionHidden,
-                canSelectHiddenExtension: _canSelectHiddenExtension,
-                allowsOtherFileTypes: _allowsOtherFileTypes,
-                canCreateDirectories: _canCreateDirectories,
-                allowedFileTypes: _allowedFileTypes
-            }),
-            result = resultObject.button;
-
-        _URL = result ? [CPURL URLWithString:resultObject.URL] : nil;
-    }
-    else
-    {
-        // FIXME: This is not the best way to do this.
-        var documentName = window.prompt("Document Name:"),
-            result = documentName !== null;
-
-        _URL = result ? [[self class] proposedFileURLWithDocumentName:documentName] : nil;
-    }
-
-    return result;
-}
-
-- (CPURL)URL
-{
-    return _URL;
-}
-
-@end

AppKit/CPScreen.j

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

AppKit/CPScroller.j

@@ -22,6 +22,8 @@
 
 @import "CPControl.j"
 
+#include "CoreGraphics/CGGeometry.h"
+
 
 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -39,9 +41,9 @@ CPNoScrollerParts           = 0;
 CPOnlyScrollerArrows        = 1;
 CPAllScrollerParts          = 2;
 
-/*!
+/*! 
     @ingroup appkit
-    @class CPScroller
+    @class CPScroller    
 */
 
 var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
@@ -62,33 +64,32 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
     BOOL                    _isVertical @accessors(readonly, getter=isVertical);
     float                   _knobProportion;
-
+    
     CPScrollerPart          _hitPart;
-
+    
     CPScrollerPart          _trackingPart;
     float                   _trackingFloatValue;
     CGPoint                 _trackingStartPoint;
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     return "scroller";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 15.0,
-        @"knob-slot-color": [CPColor lightGrayColor],
-        @"decrement-line-color": [CPNull null],
-        @"increment-line-color": [CPNull null],
-        @"knob-color": [CPColor grayColor],
-        @"decrement-line-size":_CGSizeMakeZero(),
-        @"increment-line-size":_CGSizeMakeZero(),
-        @"track-inset":_CGInsetMakeZero(),
-        @"knob-inset": _CGInsetMakeZero(),
-        @"minimum-knob-length":21.0
-    }]
+    return [CPDictionary dictionaryWithObjects:[    nil, nil, nil, nil,
+                                                    _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"]];
 }
 
 
@@ -97,18 +98,17 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
         _controlSize = CPRegularControlSize;
         _partRects = [];
 
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
+        [self setFloatValue:0.0 knobProportion:1.0];
+        
         _hitPart = CPScrollerNoPart;
 
-        [self _calculateIsVertical];
+        [self _recalculateIsVertical];
     }
 
     return self;
@@ -120,7 +120,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 */
 + (float)scrollerWidth
 {
-    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
+    return 17.0;//[self scrollerWidthForControlSize:CPRegularControlSize];
 }
 
 /*!
@@ -129,7 +129,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 */
 + (float)scrollerWidthForControlSize:(CPControlSize)aControlSize
 {
-    return [self scrollerWidth];
+    return 17.0;//_CPScrollerWidths[aControlSize];
 }
 
 /*!
@@ -155,17 +155,28 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     return _controlSize;
 }
 
-- (void)setObjectValue:(id)aValue
+// Setting the Knob Position
+/*!
+    Sets the scroller's knob position (ranges from 0.0 to 1.0).
+    @param aValue the knob position (ranges from 0.0 to 1.0)
+*/
+- (void)setFloatValue:(float)aValue
 {
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+    [super setFloatValue:MIN(1.0, MAX(0.0, aValue))];
+    
+    [self setNeedsLayout];
 }
 
-- (void)setKnobProportion:(float)aProportion
+/*!
+    Sets the position and proportion of the knob.
+    @param aValue the knob position (ranges from 0.0 to 1.0)
+    @param aProportion the knob's proportion (ranges from 0.0 to 1.0)
+*/
+- (void)setFloatValue:(float)aValue knobProportion:(float)aProportion
 {
     _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
 
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
+    [self setFloatValue:aValue];
 }
 
 /*!
@@ -179,10 +190,10 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 - (id)currentValueForThemeAttribute:(CPString)anAttributeName
 {
     var themeState = _themeState;
-
+    
     if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
         themeState &= ~CPThemeStateHighlighted;
-
+    
     return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
 
@@ -197,32 +208,32 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 }
 
 /*!
-    Returns the part of the scroller that would be hit by \c aPoint.
+    Returns the part of the scroller that would be hit by <code>aPoint</code>.
     @param aPoint the simulated point hit
     @return the part of the scroller that intersects the point
 */
 - (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 (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;
 
@@ -240,16 +251,16 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     if (_knobProportion === 1.0)
     {
         _usableParts = CPNoScrollerParts;
-
-        _partRects[CPScrollerDecrementPage] = CGRectMakeZero();
-        _partRects[CPScrollerKnob]          = CGRectMakeZero();
-        _partRects[CPScrollerIncrementPage] = CGRectMakeZero();
-        _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-        _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
+    
+        _partRects[CPScrollerDecrementPage] = _CGRectMakeZero();
+        _partRects[CPScrollerKnob]          = _CGRectMakeZero();
+        _partRects[CPScrollerIncrementPage] = _CGRectMakeZero();
+        _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
+        _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
 
         // In this case, the slot is the entirety of the scroller.
-        _partRects[CPScrollerKnobSlot] = CGRectMakeCopy(bounds);
-
+        _partRects[CPScrollerKnobSlot] = _CGRectMakeCopy(bounds);
+        
         return;
     }
 
@@ -259,65 +270,46 @@ 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,
-            slotSize = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
+            slotHeight = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
             minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
             knobWidth = width - knobInset.left - knobInset.right,
-            knobHeight = MAX(minimumKnobLength, (slotSize * _knobProportion)),
-            knobLocation = effectiveDecrementLineHeight + (slotSize - knobHeight) * [self floatValue];
+            knobHeight = MAX(minimumKnobLength, (slotHeight * _knobProportion)),
+            knobLocation = effectiveDecrementLineHeight + (slotHeight - knobHeight) * [self floatValue];
 
         _partRects[CPScrollerDecrementPage] = _CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
         _partRects[CPScrollerKnob]          = _CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
         _partRects[CPScrollerIncrementPage] = _CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
-        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotSize);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotHeight);
         _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
-
-        if (height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
-            _partRects[CPScrollerKnob] = _CGRectMakeZero();
-
-        if (height < decrementLineSize.height + incrementLineSize.height - 2)
-        {
-            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
-        }
+        _partRects[CPScrollerIncrementLine] = _CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);  
     }
+
     else
     {
         var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
             incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
             effectiveDecrementLineWidth = decrementLineSize.width + trackInset.left,
-            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right,
-            slotSize = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
+            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right;
+            slotWidth = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
             minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
-            knobWidth = MAX(minimumKnobLength, (slotSize * _knobProportion)),
+            knobWidth = MAX(minimumKnobLength, (slotWidth * _knobProportion)),
             knobHeight = height - knobInset.top - knobInset.bottom,
-            knobLocation = effectiveDecrementLineWidth + (slotSize - knobWidth) * [self floatValue];
+            knobLocation = effectiveDecrementLineWidth + (slotWidth - knobWidth) * [self floatValue];
 
         _partRects[CPScrollerDecrementPage] = _CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
         _partRects[CPScrollerKnob]          = _CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
         _partRects[CPScrollerIncrementPage] = _CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
-        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotSize, height - trackInset.top - trackInset.bottom);
+        _partRects[CPScrollerKnobSlot]      = _CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotWidth, height - trackInset.top - trackInset.bottom);
         _partRects[CPScrollerDecrementLine] = _CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
         _partRects[CPScrollerIncrementLine] = _CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
-
-        if (width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
-            _partRects[CPScrollerKnob] = _CGRectMakeZero();
-
-        if (width < decrementLineSize.width + incrementLineSize.width - 2)
-        {
-            _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotSize);
-        }
     }
 }
 
@@ -357,9 +349,9 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 - (CPView)createViewForPart:(CPScrollerPart)aPart
 {
     var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-
+    
     [view setHitTests:NO];
-
+    
     return view;
 }
 
@@ -373,7 +365,7 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
 
     [view setHitTests:NO];
-
+        
     return view;
 }
 
@@ -387,12 +379,12 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
     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"]];
     }
@@ -402,7 +394,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];
@@ -425,37 +417,37 @@ 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]];
@@ -473,26 +465,26 @@ 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)
                 _hitPart = CPScrollerDecrementPage;
-
+            
             else if (_trackingPart == CPScrollerIncrementLine)
                 _hitPart = CPScrollerIncrementPage;
-
+            
             else if (_trackingPart == CPScrollerDecrementPage || _trackingPart == CPScrollerIncrementPage)
             {
                 var knobRect = [self rectForPart:CPScrollerKnob],
@@ -501,55 +493,55 @@ 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)
         {
             var hitPart = [self testPart:[anEvent locationInWindow]];
-
+            
             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)_recalculateIsVertical
 {
     // Recalculate isVertical.
     var bounds = [self bounds],
         width = _CGRectGetWidth(bounds),
         height = _CGRectGetHeight(bounds);
-
+    
     _isVertical = width < height ? 1 : (width > height ? 0 : -1);
-
+    
     if (_isVertical === 1)
         [self setThemeState:CPThemeStateVertical];
     else if (_isVertical === 0)
@@ -560,6 +552,8 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 {
     [super setFrameSize:aSize];
 
+    [self _recalculateIsVertical];
+
     [self checkSpaceForParts];
     [self setNeedsLayout];
 }
@@ -568,15 +562,15 @@ NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 {
     if (![self isEnabled])
         return;
-
+    
     _hitPart = [self testPart:[anEvent locationInWindow]];
-
+    
     switch (_hitPart)
     {
         case CPScrollerKnob:            return [self trackKnob:anEvent];
-
-        case CPScrollerDecrementLine:
-        case CPScrollerIncrementLine:
+        
+        case CPScrollerDecrementLine:   
+        case CPScrollerIncrementLine:   
         case CPScrollerDecrementPage:
         case CPScrollerIncrementPage:   return [self trackScrollButtons:anEvent];
     }
@@ -596,55 +590,29 @@ var CPScrollerControlSizeKey = "CPScrollerControlSize",
         _controlSize = CPRegularControlSize;
         if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
-
+            
         _knobProportion = 1.0;
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
             _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
-
+            
         _partRects = [];
-
+        
         _hitPart = CPScrollerNoPart;
 
-        [self _calculateIsVertical];
-
-        // Adjust the size of the scroller if the size from cib
-        // isn't equal to the scrollerWidth
-        var frame = [self frame],
-            scrollerWidth = [CPScroller scrollerWidth];
-
-        if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-            frame.size.width = scrollerWidth;
-
-        if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-            frame.size.height = scrollerWidth;
-
-        [self setFrame:frame];
+        [self _recalculateIsVertical];
+//        [self checkSpaceForParts];
+//        [self setNeedsLayout];
     }
-
+    
     return self;
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
+    
     [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
 }
 
 @end
-
-@implementation CPScroller (Deprecated)
-
-/*!
-    Sets the position and proportion of the knob.
-    @param aValue the knob position (ranges from 0.0 to 1.0)
-    @param aProportion the knob's proportion (ranges from 0.0 to 1.0)
-*/
-- (void)setFloatValue:(float)aValue knobProportion:(float)aProportion
-{
-    [self setFloatValue:aValue];
-    [self setKnobProportion:aProportion];
-}
-
-@end

AppKit/CPSearchField.j

@@ -1,808 +0,0 @@
-/*
- * CPSearchField.j
- * AppKit
- *
- * Created by cacaodev.
- * Copyright 2009.
- *
- * 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 "CPButton.j"
-@import "CPTextField.j"
-
-CPSearchFieldRecentsTitleMenuItemTag    = 1000;
-CPSearchFieldRecentsMenuItemTag         = 1001;
-CPSearchFieldClearRecentsMenuItemTag    = 1002;
-CPSearchFieldNoRecentsMenuItemTag       = 1003;
-
-var CPSearchFieldSearchImage = nil,
-    CPSearchFieldFindImage = nil,
-    CPSearchFieldCancelImage = nil,
-    CPSearchFieldCancelPressedImage = nil;
-
-var SEARCH_BUTTON_DEFAULT_WIDTH = 25.0,
-    CANCEL_BUTTON_DEFAULT_WIDTH = 22.0,
-    BUTTON_DEFAULT_HEIGHT = 22.0;
-
-var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
-
-var RECENT_SEARCH_PREFIX = @"   ";
-
-/*!
-    @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.
-*/
-@implementation CPSearchField : CPTextField
-{
-    CPButton    _searchButton;
-    CPButton    _cancelButton;
-    CPMenu      _searchMenuTemplate;
-    CPMenu      _searchMenu;
-
-    CPString    _recentsAutosaveName;
-    CPArray     _recentSearches;
-
-    int         _maximumRecents;
-    BOOL        _sendsWholeSearchString;
-    BOOL        _sendsSearchStringImmediately;
-    BOOL        _canResignFirstResponder;
-    CPTimer     _partialStringTimer;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"searchfield"
-}
-
-+ (void)initialize
-{
-    if (self != [CPSearchField class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:self];
-    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
-}
-
-- (id)initWithFrame:(CGRect)frame
-{
-    if (self = [super initWithFrame:frame])
-    {
-        _maximumRecents = 10;
-        _sendsWholeSearchString = NO;
-        _sendsSearchStringImmediately = NO;
-        _recentsAutosaveName = nil;
-
-        [self _init];
-#if PLATFORM(DOM)
-        _cancelButton._DOMElement.style.cursor = "default";
-        _searchButton._DOMElement.style.cursor = "default";
-#endif
-    }
-
-    return self;
-}
-
-- (void)_init
-{
-    _recentSearches = [CPArray array];
-
-    [self setBezeled:YES];
-    [self setBezelStyle:CPTextFieldRoundedBezel];
-    [self setBordered:YES];
-    [self setEditable:YES];
-    [self setContinuous:YES];
-
-    var bounds = [self bounds],
-        cancelButton = [[CPButton alloc] initWithFrame:[self cancelButtonRectForBounds:bounds]],
-        searchButton = [[CPButton alloc] initWithFrame:[self searchButtonRectForBounds:bounds]];
-
-    [self setCancelButton:cancelButton];
-    [self resetCancelButton];
-
-    [self setSearchButton:searchButton];
-    [self resetSearchButton];
-
-    _canResignFirstResponder = YES;
-}
-
-- (void)viewWillMoveToSuperview:(CPView)aView
-{
-    [super viewWillMoveToSuperview:aView];
-
-    // First we remove any observer that may have been in place to avoid memory leakage.
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:self];
-
-    // Register the observe here if we need to.
-    if (aView)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_searchFieldTextDidChange:) name:CPControlTextDidChangeNotification object:self];
-}
-
-// Managing Buttons
-/*!
-    Sets the button used to display the search-button image
-    @param button The search button.
-*/
-- (void)setSearchButton:(CPButton)button
-{
-    if (button != _searchButton)
-    {
-        [_searchButton removeFromSuperview];
-        _searchButton = button;
-
-        [_searchButton setFrame:[self searchButtonRectForBounds:[self bounds]]];
-        [_searchButton setAutoresizingMask:CPViewMaxXMargin];
-        [self addSubview:_searchButton];
-    }
-}
-
-/*!
-    Returns the button used to display the search-button image.
-    @return The search button.
-*/
-- (CPButton)searchButton
-{
-    return _searchButton;
-}
-
-/*!
-    Resets the search button to its default attributes.
-    This method resets the target, action, regular image, and pressed image. By default, when users click the search button or press the Return key, the action defined for the receiver is sent to its designated target. This method gives you a way to customize the search button for specific situations and then reset the button defaults without having to undo changes individually.
-*/
-- (void)resetSearchButton
-{
-    var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
-
-    [button setBordered:NO];
-    [button setImageScaling:CPScaleToFit];
-    [button setImage:searchButtonImage];
-    [button setAutoresizingMask:CPViewMaxXMargin];
-}
-
-/*!
-    Sets the button object used to display the cancel-button image.
-    @param button The cancel button.
-*/
-- (void)setCancelButton:(CPButton)button
-{
-    if (button != _cancelButton)
-    {
-        [_cancelButton removeFromSuperview];
-        _cancelButton = button;
-
-        [_cancelButton setFrame:[self cancelButtonRectForBounds:[self bounds]]];
-        [_cancelButton setAutoresizingMask:CPViewMinXMargin];
-        [_cancelButton setTarget:self];
-        [_cancelButton setAction:@selector(cancelOperation:)];
-        [self _updateCancelButtonVisibility];
-        [self addSubview:_cancelButton];
-    }
-}
-
-/*!
-    Returns the button object used to display the cancel-button image.
-    @return The cancel button.
-*/
-- (CPButton)cancelButton
-{
-    return _cancelButton;
-}
-
-/*!
-    Resets the cancel button to its default attributes.
-    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 setAutoresizingMask:CPViewMinXMargin];
-    [button setTarget:self];
-    [button setAction:@selector(cancelOperation:)];
-}
-
-// Custom Layout
-/*!
-    Modifies the bounding rectangle for the search-text field.
-    @param rect The current bounding rectangle for the search text field.
-    @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.
-*/
-- (CGRect)searchTextRectForBounds:(CGRect)rect
-{
-    var leftOffset = 0,
-        width = _CGRectGetWidth(rect),
-        bounds = [self bounds];
-
-    if (_searchButton)
-    {
-        var searchBounds = [self searchButtonRectForBounds:bounds];
-        leftOffset = _CGRectGetMaxX(searchBounds) + 2;
-    }
-
-    if (_cancelButton)
-    {
-        var cancelRect = [self cancelButtonRectForBounds:bounds];
-        width = _CGRectGetMinX(cancelRect) - leftOffset;
-    }
-
-    return _CGRectMake(leftOffset, _CGRectGetMinY(rect), width, _CGRectGetHeight(rect));
-}
-
-/*!
-    Modifies the bounding rectangle for the search button.
-    @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.
-*/
-- (CGRect)searchButtonRectForBounds:(CGRect)rect
-{
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
-}
-
-/*!
-    Modifies the bounding rectangle for the cancel button.
-    @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.
-*/
-- (CGRect)cancelButtonRectForBounds:(CGRect)rect
-{
-    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
-}
-
-// Managing Menu Templates
-/*!
-    Returns the menu template object used to dynamically construct the search pop-up icon menu.
-    @return The current menu template.
-*/
-- (CPMenu)searchMenuTemplate
-{
-    return _searchMenuTemplate;
-}
-
-/*!
-    Sets the menu template object used to dynamically construct the receiver's pop-up icon menu.
-    @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)aMenu
-{
-    _searchMenuTemplate = aMenu;
-
-    [self resetSearchButton];
-    [self _loadRecentSearchList];
-    [self _updateSearchMenu];
-}
-
-// Managing Search Modes
-/*!
-    Returns a Boolean value indicating whether the receiver sends the search action message when the user clicks the search button (or presses return) or after each keystroke.
-    @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;
-}
-
-/*!
-    Sets whether the receiver sends the search action message when the user clicks the search button (or presses return) or after each keystroke.
-    @param flag \c YES to send the action message all at once when the user clicks the search button or presses return; otherwise, NO to send the search string after each keystroke.
-*/
-- (void)setSendsWholeSearchString:(BOOL)flag
-{
-    _sendsWholeSearchString = flag;
-}
-
-/*!
-    Returns a Boolean value indicating whether the receiver sends its action immediately upon being notified of changes to the search field text or after a brief pause.
-    @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;
-}
-
-/*!
-    Sets whether the text field sends its action message to the target immediately upon notification of any changes to the search field text or after a brief pause.
-    @param flag \c YES to send the text field's action immediately upon notification of any changes to the search field; otherwise, NO if you want the text field to pause briefly before sending its action message. Pausing gives the user the opportunity to type more text into the search field before initiating the search.
-*/
-- (void)setSendsSearchStringImmediately:(BOOL)flag
-{
-    _sendsSearchStringImmediately = flag;
-}
-
-// Managing Recent Search Strings
-/*!
-    Returns the maximum number of recent search strings to display in the custom search menu.
-    @return The maximum number of search strings that can appear in the menu. This value is between 0 and 254.
-*/
-- (int)maximumRecents
-{
-    return _maximumRecents;
-}
-
-/*!
-    Sets the maximum number of search strings that can appear in the search menu.
-    @param maxRecents The maximum number of search strings that can appear in the menu. This value can be between 0 and 254. Specifying a value less than 0 sets the value to the default, which is 10. Specifying a value greater than 254 sets the maximum to 254.
-*/
-- (void)setMaximumRecents:(int)max
-{
-    if (max > 254)
-        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.
- */
-- (CPArray)recentSearches
-{
-    return _recentSearches;
-}
-
-/*!
-    Sets the list of recent search strings to list in the pop-up icon menu of the receiver.
-    @param searches An array of CPString objects containing the search strings.
-    You might use this method to set the recent list of searches from an archived copy.
-*/
-- (void)setRecentSearches:(CPArray)searches
-{
-    var max = MIN([self maximumRecents], [searches count]),
-        searches = [searches subarrayWithRange:CPMakeRange(0, max)];
-
-    _recentSearches = searches;
-    [self _autosaveRecentSearchList];
-}
-
-/*!
-    Returns the key under which the prior list of recent search strings has been archived.
-    @return The autosave name, which is used as a key in the standard user defaults to save the recent searches. The default value is nil, which causes searches not to be autosaved.
-*/
-- (CPString)recentsAutosaveName
-{
-    return _recentsAutosaveName;
-}
-
-/*!
-    Sets the autosave name under which the receiver automatically archives the list of recent search strings.
-    @param name The autosave name, which is used as a key in the standard user defaults to save the recent searches. If you specify nil or an empty string for this parameter, no autosave name is set and searches are not autosaved.
-*/
-- (void)setRecentsAutosaveName:(CPString)name
-{
-    if (_recentsAutosaveName != nil)
-        [self _deregisterForAutosaveNotification];
-
-    _recentsAutosaveName = name;
-
-    if (_recentsAutosaveName != nil)
-      [self _registerForAutosaveNotification];
-}
-
-// Private methods and subclassing
-
-- (CGRect)contentRectForBounds:(CGRect)bounds
-{
-    var superbounds = [super contentRectForBounds:bounds];
-    return [self searchTextRectForBounds:superbounds];
-}
-
-+ (double)_keyboardDelayForPartialSearchString:(CPString)string
-{
-    return (6 - MIN([string length], 4)) / 10;
-}
-
-- (CPMenu)menu
-{
-    return _searchMenu;
-}
-
-- (BOOL)isOpaque
-{
-  return [super isOpaque] && [_cancelButton isOpaque] && [_searchButton isOpaque];
-}
-
-- (void)_updateCancelButtonVisibility
-{
-    [_cancelButton setHidden:([[self stringValue] length] === 0)];
-}
-
-- (void)_searchFieldTextDidChange:(CPNotification)aNotification
-{
-    if (![self sendsWholeSearchString])
-    {
-        if ([self sendsSearchStringImmediately])
-            [self _sendPartialString];
-        else
-        {
-            [_partialStringTimer invalidate];
-            var timeInterval = [CPSearchField _keyboardDelayForPartialSearchString:[self stringValue]];
-
-            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval
-                                                                   target:self
-                                                                 selector:@selector(_sendPartialString)
-                                                                 userInfo:nil
-                                                                  repeats:NO];
-        }
-    }
-
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_sendAction:(id)sender
-{
-    [self sendAction:[self action] to:[self target]];
-}
-
-- (void)sendAction:(SEL)anAction to:(id)anObject
-{
-    [super sendAction:anAction to:anObject];
-
-    [_partialStringTimer invalidate];
-
-    [self _addStringToRecentSearches:[self stringValue]];
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_addStringToRecentSearches:(CPString)string
-{
-    if (string === nil || string === @"" || [_recentSearches containsObject:string])
-        return;
-
-    var searches = [CPMutableArray arrayWithArray:_recentSearches];
-    [searches addObject:string];
-    [self setRecentSearches:searches];
-    [self _updateSearchMenu];
-}
-
-- (CPView)hitTest:(CGPoint)aPoint
-{
-    // Make sure a hit anywhere within the search field returns the search field itself
-    if (_CGRectContainsPoint([self frame], aPoint))
-        return self;
-    else
-        return nil;
-}
-
-- (BOOL)resignFirstResponder
-{
-    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)
-            [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:)
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldRecentsMenuItemTag];
-    [item setTarget:self];
-    [template addItem:item];
-
-    item = [[CPMenuItem alloc] initWithTitle:@"Clear Recent Searches"
-                                      action:@selector(_searchFieldClearRecents:)
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldClearRecentsMenuItemTag];
-    [item setTarget:self];
-    [template addItem:item];
-
-    item = [[CPMenuItem alloc] initWithTitle:@"No Recent Searches"
-                                      action:nil
-                               keyEquivalent:@""];
-    [item setTag:CPSearchFieldNoRecentsMenuItemTag];
-    [item setEnabled:NO];
-    [template addItem:item];
-
-    return template;
-}
-
-- (void)_updateSearchMenu
-{
-    if (_searchMenuTemplate === nil)
-        return;
-
-    var menu = [[CPMenu alloc] init],
-        countOfRecents = [_recentSearches count],
-        numberOfItems = [_searchMenuTemplate numberOfItems];
-
-    for (var i = 0; i < numberOfItems; i++)
-    {
-        var item = [[_searchMenuTemplate itemAtIndex:i] copy];
-
-        switch ([item tag])
-        {
-            case CPSearchFieldRecentsTitleMenuItemTag:
-                if (countOfRecents === 0)
-                    continue;
-
-                if ([menu numberOfItems] > 0)
-                    [self _addSeparatorToMenu:menu];
-                break;
-
-            case CPSearchFieldRecentsMenuItemTag:
-            {
-                var itemAction = @selector(_searchFieldSearch:);
-
-                for (var recentIndex = 0; recentIndex < countOfRecents; ++recentIndex)
-                {
-                    // RECENT_SEARCH_PREFIX is a hack until CPMenuItem -setIndentationLevel works
-                    var recentItem = [[CPMenuItem alloc] initWithTitle:RECENT_SEARCH_PREFIX + [_recentSearches objectAtIndex:recentIndex]
-                                                                 action:itemAction
-                                                          keyEquivalent:[item keyEquivalent]];
-                    [item setTarget:self];
-                    [menu addItem:recentItem];
-                }
-
-                continue;
-            }
-
-            case CPSearchFieldClearRecentsMenuItemTag:
-                if (countOfRecents === 0)
-                    continue;
-
-                if ([menu numberOfItems] > 0)
-                    [self _addSeparatorToMenu:menu];
-
-                [item setAction:@selector(_searchFieldClearRecents:)];
-                [item setTarget:self];
-                break;
-
-            case CPSearchFieldNoRecentsMenuItemTag:
-                if (countOfRecents !== 0)
-                    continue;
-
-                if ([menu numberOfItems] > 0)
-                    [self _addSeparatorToMenu:menu];
-                break;
-            }
-
-        [item setEnabled:([item isEnabled] && [item action] != nil && [item target] != nil)];
-        [menu addItem:item];
-    }
-
-    [menu setDelegate:self];
-
-    _searchMenu = menu;
-}
-
-- (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);
-
-    var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
-
-    [self selectAll:nil];
-    [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:self];
-}
-
-- (void)_sendPartialString
-{
-    [super sendAction:[self action] to:[self target]];
-    [_partialStringTimer invalidate];
-}
-
-- (void)cancelOperation:(id)sender
-{
-    [self setObjectValue:@""];
-    [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
-
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_searchFieldSearch:(id)sender
-{
-    var searchString = [[sender title] substringFromIndex:[RECENT_SEARCH_PREFIX length]];
-
-    if ([sender tag] != CPSearchFieldRecentsMenuItemTag)
-        [self _addStringToRecentSearches:searchString];
-
-    [self setObjectValue:searchString];
-    [self _sendPartialString];
-    [self selectAll:nil];
-
-    [self _updateCancelButtonVisibility];
-}
-
-- (void)_searchFieldClearRecents:(id)sender
-{
-    [self setRecentSearches:[CPArray array]];
-    [self _updateSearchMenu];
-    [self setStringValue:@""];
-    [self _updateCancelButtonVisibility];
- }
-
-- (void)_registerForAutosaveNotification
-{
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
-}
-
-- (void)_deregisterForAutosaveNotification
-{
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
-}
-
-- (void)_autosaveRecentSearchList
-{
-    if (_recentsAutosaveName != nil)
-        [[CPNotificationCenter defaultCenter] postNotificationName:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
-}
-
-- (void)_updateAutosavedRecents:(id)notification
-{
-    var name = [notification object];
-    [[CPUserDefaults standardUserDefaults] setObject:_recentSearches forKey:name];
-}
-
-- (void)_loadRecentSearchList
-{
-    var name = [self recentsAutosaveName];
-    if (name === nil)
-        return;
-
-    var list = [[CPUserDefaults standardUserDefaults] objectForKey:name];
-
-    if (list !== nil)
-        _recentSearches = list;
-}
-
-@end
-
-var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
-    CPSendsWholeSearchStringKey         = @"CPSendsWholeSearchStringKey",
-    CPSendsSearchStringImmediatelyKey   = @"CPSendsSearchStringImmediatelyKey",
-    CPMaximumRecentsKey                 = @"CPMaximumRecentsKey",
-    CPSearchMenuTemplateKey             = @"CPSearchMenuTemplateKey";
-
-@implementation CPSearchField (CPCoding)
-
-- (void)encodeWithCoder:(CPCoder)coder
-{
-    [_searchButton removeFromSuperview];
-    [_cancelButton removeFromSuperview];
-
-    [super encodeWithCoder:coder];
-
-    if (_searchButton)
-        [self addSubview:_searchButton];
-    if (_cancelButton)
-        [self addSubview:_cancelButton];
-
-    [coder encodeBool:_sendsWholeSearchString forKey:CPSendsWholeSearchStringKey];
-    [coder encodeBool:_sendsSearchStringImmediately forKey:CPSendsSearchStringImmediatelyKey];
-    [coder encodeInt:_maximumRecents forKey:CPMaximumRecentsKey];
-
-    if (_recentsAutosaveName)
-        [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
-
-    if (_searchMenuTemplate)
-        [coder encodeObject:_searchMenuTemplate forKey:CPSearchMenuTemplateKey];
-}
-
-- (id)initWithCoder:(CPCoder)coder
-{
-    if (self = [super initWithCoder:coder])
-    {
-        [self setRecentsAutosaveName:[coder decodeObjectForKey:CPRecentsAutosaveNameKey]];
-        _sendsWholeSearchString   = [coder decodeBoolForKey:CPSendsWholeSearchStringKey];
-        _sendsSearchStringImmediately = [coder decodeBoolForKey:CPSendsSearchStringImmediatelyKey];
-        _maximumRecents           = [coder decodeIntForKey:CPMaximumRecentsKey];
-
-        var template              = [coder decodeObjectForKey:CPSearchMenuTemplateKey];
-
-        if (template)
-            [self setSearchMenuTemplate:template];
-
-        [self _init];
-    }
-
-    return self;
-}
-
-@end

AppKit/CPSecureTextField.j

@@ -1,28 +1,6 @@
-/*
- * 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

@@ -24,12 +24,25 @@
 
 @import "CPControl.j"
 
+#include "CoreGraphics/CGGeometry.h"
 
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
 CPSegmentSwitchTrackingSelectOne = 0;
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
 CPSegmentSwitchTrackingSelectAny = 1;
+/*
+    @global
+    @group CPSegmentSwitchTracking
+*/
 CPSegmentSwitchTrackingMomentary = 2;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPSegmentedControl
 
@@ -48,14 +61,14 @@ CPSegmentSwitchTrackingMomentary = 2;
     BOOL                    _trackingHighlighted;
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     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]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), nil, nil, nil, nil, 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"]];
 }
 
@@ -63,16 +76,16 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     _segments = [];
     _themeStates = [];
-
+    
     self = [super initWithFrame:aRect];
-
+    
     if (self)
     {
         _selectedSegment = -1;
-
+        
         _trackingMode = CPSegmentSwitchTrackingSelectOne;
     }
-
+    
     return self;
 }
 
@@ -81,7 +94,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (int)selectedTag
 {
-    return [_segments[_selectedSegment] tag];
+    return _segments[_selectedSegment].tag;
 }
 
 // Specifying the number of segments
@@ -93,13 +106,11 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     if (_segments.length == aCount)
         return;
-
-    var height = CGRectGetHeight([self bounds]),
-        dividersBefore = MAX(0, _segments.length - 1),
-        dividersAfter = MAX(0, aCount - 1);
-
+        
+    var height = CGRectGetHeight([self bounds]);
+    
     if (_segments.length < aCount)
-    {
+    {        
         for (var index = _segments.length; index < aCount; ++index)
         {
             _segments[index] = [[_CPSegmentItem alloc] init];
@@ -108,21 +119,13 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aCount < _segments.length)
     {
-        _segments.length = aCount;
-        _themeStates.length = aCount;
+        for (var index = aCount; index < _segments.length; ++index)
+            _segments[index] = nil;
     }
-
-    if (_selectedSegment >= _segments.length)
+    
+    if (_selectedSegment < _segments.length)
         _selectedSegment = -1;
-
-    // Make space for/remove space used by dividers.
-    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        delta = thickness * (dividersAfter - dividersBefore),
-        frame = [self frame];
-
-    if (delta)
-        [self setFrameSize:CGSizeMake(frame.size.width + delta, frame.size.height)];
-
+    
     [self tileWithChangedSegment:0];
 }
 
@@ -138,7 +141,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Selects a segment.
     @param aSegment the segment to select
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setSelectedSegment:(unsigned)aSegment
 {
@@ -160,15 +163,15 @@ 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;
 }
 
@@ -183,28 +186,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];
     }
 }
@@ -222,34 +225,36 @@ CPSegmentSwitchTrackingMomentary = 2;
     Sets the width of the specified segment.
     @param aWidth the new width for the segment
     @param aSegment the segment to set the width for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setWidth:(float)aWidth forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setWidth:aWidth];
-
+    _segments[aSegment].width = aWidth;
+    
     [self tileWithChangedSegment:aSegment];
 }
 
 /*!
     Returns the width for the specified segment.
     @param aSegment the segment to get the width for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (float)widthForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] width];
+    return _segments[aSegment].width;
 }
 
 /*!
     Sets the image for the specified segment.
     @param anImage the image for the segment
     @param aSegment the segment to set the image on
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setImage:(CPImage)anImage forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setImage:anImage];
+    var segment = _segments[aSegment];
+    
+    segment.image = anImage;
 
     [self tileWithChangedSegment:aSegment];
 }
@@ -257,73 +262,75 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Returns the image for the specified segment
     @param aSegment the segment to obtain the image for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (CPImage)imageForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] image];
+    return _segments[aSegment].image;
 }
 
 /*!
     Sets the label for the specified segment
     @param aLabel the label for the segment
     @param aSegment the segment to label
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setLabel:(CPString)aLabel forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setLabel:aLabel];
-
+    var segment = _segments[aSegment];
+        
+    _segments[aSegment].label = aLabel;
+    
     [self tileWithChangedSegment:aSegment];
 }
 
 /*!
     Returns the label for the specified segment
     @param the segment to obtain the label for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (CPString)labelForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] label];
+    return _segments[aSegment].label;
 }
 
 /*!
     Sets the menu for the specified segment
     @param aMenu the menu to set
     @param aSegment the segment to set the menu on
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setMenu:(CPMenu)aMenu forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setMenu:aMenu];
+    _segments[aSegment].menu = aMenu;
 }
 
 /*!
     Returns the menu for the specified segment.
     @param aSegment the segment to obtain the menu for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (CPMenu)menuForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] menu];
+    return _segments[aSegment].menu;
 }
 
 /*!
     Sets the selection for the specified segment. If only one segment
     can be selected at a time, any other segment will be deselected.
-    @param isSelected \c YES selects the segment. \c NO deselects it.
+    @param isSelected <code>YES</code> selects the segment. <code>NO</code> deselects it.
     @param aSegment the segment to set the selection for
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (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 setSelected:isSelected];
+    
+    segment.selected = isSelected;
 
     _themeStates[aSegment] = isSelected ? CPThemeStateSelected : CPThemeStateNormal;
 
@@ -331,18 +338,18 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (isSelected)
     {
         var oldSelectedSegment = _selectedSegment;
-
+        
         _selectedSegment = aSegment;
-
+        
         if (_trackingMode == CPSegmentSwitchTrackingSelectOne && oldSelectedSegment != aSegment && oldSelectedSegment != -1)
         {
-            [_segments[oldSelectedSegment] setSelected:NO];
+            _segments[oldSelectedSegment].selected = NO;
             _themeStates[oldSelectedSegment] = CPThemeStateNormal;
 
             [self drawSegmentBezel:oldSelectedSegment highlight:NO];
         }
     }
-
+    
     if (_trackingMode != CPSegmentSwitchTrackingMomentary)
         [self drawSegmentBezel:aSegment highlight:NO];
 
@@ -351,42 +358,37 @@ CPSegmentSwitchTrackingMomentary = 2;
 }
 
 /*!
-    Returns \c YES if the specified segment is selected.
+    Returns <code>YES</code> if the specified segment is selected.
     @param aSegment the segment to check for selection
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (BOOL)isSelectedForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] selected];
+    return _segments[aSegment].selected;
 }
 
 /*!
-    Enables/disables the specified segment.
-    @param isEnabled \c YES enables the segment
-    @param aSegment the segment to enable/disable
-    @throws CPRangeException if \c aSegment is out of bounds
+    Enables/diables the specified segment.
+    @param isEnabled <code>YES</code> enables the segment
+    @param aSegment the segment to enable/disble
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setEnabled:isEnabled];
-
-    if (isEnabled)
-        _themeStates[aSegment] &= ~CPThemeStateDisabled;
-    else
-        _themeStates[aSegment] |= CPThemeStateDisabled;
+    _segments[aSegment].enabled = isEnabled;
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
 
 /*!
-    Returns \c YES if the specified segment is enabled.
+    Returns <code>YES</code> if the specified segment is enabled.
     @param aSegment the segment to check
-    @throws CPRangeException if \c aSegment is out of bounds
+    @throws CPRangeException if <code>aSegment</code> is out of bounds
 */
 - (BOOL)isEnabledForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] enabled];
+    return _segments[aSegment].enabled;
 }
 
 /*!
@@ -396,7 +398,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (void)setTag:(int)aTag forSegment:(unsigned)aSegment
 {
-    [_segments[aSegment] setTag:aTag];
+    _segments[aSegment].tag = aTag;
 }
 
 /*!
@@ -405,14 +407,14 @@ CPSegmentSwitchTrackingMomentary = 2;
 */
 - (int)tagForSegment:(unsigned)aSegment
 {
-    return [_segments[aSegment] tag];
+    return _segments[aSegment].tag;
 }
 
 // Drawings
 /*!
     Draws the specified segment bezel
     @param aSegment the segment to draw the bezel for
-    @param shouldHighlight \c YES highlights the bezel
+    @param shouldHighlight <code>YES</code> highlights the bezel
 */
 - (void)drawSegmentBezel:(int)aSegment highlight:(BOOL)shouldHighlight
 {
@@ -437,16 +439,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     return [self _leftOffsetForSegment:segment - 1] + [self widthForSegment:segment - 1] + thickness;
 }
 
-- (unsigned)_indexOfLastSegment
-{
-    var lastSegmentIndex = [_segments count] - 1;
-
-    if (lastSegmentIndex < 0)
-        lastSegmentIndex = 0;
-
-    return lastSegmentIndex;
-}
-
 - (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
 {
     var height = [self currentValueForThemeAttribute:@"default-height"],
@@ -460,28 +452,25 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
-                            bezelInset.top,
-                            contentInset.right,
-                            height);
+        return CGRectMake(CGRectGetMaxX(bounds) - contentInset.right - bezelInset.right, bezelInset.top, contentInset.right, height);
     }
-    else if (aName.indexOf("segment-bezel") === 0)
+    else if (aName.substring(0, "segment-bezel".length) == "segment-bezel")
     {
         var segment = parseInt(aName.substring("segment-bezel-".length), 10),
-            frame = CGRectCreateCopy([_segments[segment] frame]);
+            frame = CGRectCreateCopy(_segments[segment].frame);
 
-        if (segment === 0)
+        if (segment == 0)
         {
             frame.origin.x += contentInset.left;
             frame.size.width -= contentInset.left;
         }
 
-        if (segment === _segments.length - 1)
-            frame.size.width = CGRectGetWidth([self bounds]) - contentInset.right - frame.origin.x;
+        if (segment == _segments.length - 1)
+            frame.size.width -= contentInset.right;
 
         return frame;
     }
-    else if (aName.indexOf("divider-bezel") === 0)
+    else if (aName.substring(0, "divider-bezel".length) == "divider-bezel")
     {
         var segment = parseInt(aName.substring("divider-bezel-".length), 10),
             width = [self widthForSegment:segment],
@@ -490,7 +479,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
         return CGRectMake(left + width, bezelInset.top, thickness, height);
     }
-    else if (aName.indexOf("segment-content") === 0)
+    else if (aName.substring(0, "segment-content".length) == "segment-content")
     {
         var segment = parseInt(aName.substring("segment-content-".length), 10);
 
@@ -502,7 +491,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
-    if ([aName hasPrefix:@"segment-content"])
+    if (aName.substring(0, "segment-content".length) == "segment-content")
         return [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
 
     return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
@@ -510,59 +499,50 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 - (void)layoutSubviews
 {
-    if (_segments.length <= 0)
-        return;
+    var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color" 
+                                            inState:_themeStates[0]];
 
-    var themeState = _themeStates[0];
-
-    themeState |= _themeState & CPThemeStateDisabled;
-
-    var leftCapColor = [self valueForThemeAttribute:@"left-segment-bezel-color"
-                                            inState:themeState],
-
-        leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
+    var leftBezelView = [self layoutEphemeralSubviewNamed:@"left-segment-bezel"
                                                positioned:CPWindowBelow
                           relativeToEphemeralSubviewNamed:nil];
 
     [leftBezelView setBackgroundColor:leftCapColor];
 
-    var themeState = _themeStates[_themeStates.length - 1];
+    var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color" 
+                                             inState:_themeStates[_themeStates.length - 1]];
 
-    themeState |= _themeState & CPThemeStateDisabled;
-
-    var rightCapColor = [self valueForThemeAttribute:@"right-segment-bezel-color"
-                                             inState:themeState],
-
-        rightBezelView = [self layoutEphemeralSubviewNamed:@"right-segment-bezel"
+    var 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];
 
-            bezelView = [self layoutEphemeralSubviewNamed:"segment-bezel-" + i
-                                               positioned:CPWindowBelow
+        var bezelView = [self layoutEphemeralSubviewNamed:"segment-bezel-"+i 
+                                               positioned:CPWindowBelow 
                           relativeToEphemeralSubviewNamed:nil];
 
         [bezelView setBackgroundColor:bezelColor];
 
 
-        // layout image/title views
-        var segment = _segments[i],
-            contentView = [self layoutEphemeralSubviewNamed:@"segment-content-" + i
-                                                 positioned:CPWindowAbove
-                            relativeToEphemeralSubviewNamed:@"segment-bezel-" + i];
+        //layout image/title views
+        var segment = _segments[i];
 
-        [contentView setText:[segment label]];
-        [contentView setImage:[segment image]];
+
+        var contentView = [self layoutEphemeralSubviewNamed:@"segment-content-"+i
+                                                 positioned:CPWindowAbove
+                            relativeToEphemeralSubviewNamed:@"segment-bezel-"+i];
+
+        [contentView setText:segment.label];
+        [contentView setImage:segment.image];
 
         [contentView setFont:[self valueForThemeAttribute:@"font" inState:themeState]];
         [contentView setTextColor:[self valueForThemeAttribute:@"text-color" inState:themeState]];
@@ -571,27 +551,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];
 
-            borderView = [self layoutEphemeralSubviewNamed:"divider-bezel-" + i
-                                                positioned:CPWindowBelow
+        var borderView = [self layoutEphemeralSubviewNamed:"divider-bezel-"+i 
+                                                positioned:CPWindowBelow 
                            relativeToEphemeralSubviewNamed:nil];
 
         [borderView setBackgroundColor:borderColor];
@@ -602,7 +582,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 /*!
     Draws the specified segment
     @param aSegment the segment to draw
-    @param shouldHighlight \c YES highlights the bezel
+    @param shouldHighlight <code>YES</code> highlights the bezel
 */
 - (void)drawSegment:(int)aSegment highlight:(BOOL)shouldHighlight
 {
@@ -614,53 +594,48 @@ 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 font];
+        font = [self valueForThemeAttribute:@"font" inState:themeState];
 
     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)
-    {
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-
         return;
-    }
 
-    // Update control size
+    // Update Contorl Size
     var frame = [self frame];
-
+    
     [self setFrameSize:CGSizeMake(CGRectGetWidth(frame) + delta, CGRectGetHeight(frame))];
 
-    // Update segment width
-    [segment setWidth:segmentWidth];
-    [segment setFrame:[self frameForSegment:aSegment]];
+    // Update Segment Width
+    segment.width = segmentWidth;
+    segment.frame = [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];
 
@@ -706,20 +681,11 @@ 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]);
-        adjustedLastFrame.size.width = CGRectGetWidth([self bounds]) - adjustedLastFrame.origin.x;
-
-        if (CGRectContainsPoint(adjustedLastFrame, aPoint))
-            return _segments.length - 1;
-    }
-
+    
     return -1;
 }
 
@@ -727,7 +693,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 {
     if (![self isEnabled])
         return;
-
+    
     [self trackSegment:anEvent];
 }
 
@@ -741,76 +707,74 @@ 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)
             return;
 
-        if (_trackingSegment === [self testSegment:location])
+        if (CGRectContainsPoint(_segments[_trackingSegment].frame, location))
         {
             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];
-        if (trackingSegment > -1 && [self isEnabledForSegment:trackingSegment])
-        {
-            _trackingHighlighted = YES;
-            _trackingSegment = trackingSegment;
-            [self drawSegmentBezel:_trackingSegment highlight:YES];
-        }
+        _trackingHighlighted = YES;
+        _trackingSegment = [self testSegment:location];
+        
+        [self drawSegmentBezel:_trackingSegment highlight:YES];
     }
-
+    
     else if (type == CPLeftMouseDragged)
     {
         if (_trackingSegment == -1)
             return;
 
-        var highlighted = [self testSegment:location] === _trackingSegment;
+        var highlighted = CGRectContainsPoint(_segments[_trackingSegment].frame, location);
+        
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;
-
+            
             [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];
 }
 
@@ -826,12 +790,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];
@@ -842,38 +806,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];
@@ -885,15 +849,15 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
 
 @implementation _CPSegmentItem : CPObject
 {
-    CPImage     image       @accessors;
-    CPString    label       @accessors;
-    CPMenu      menu        @accessors;
-    BOOL        selected    @accessors;
-    BOOL        enabled     @accessors;
-    int         tag         @accessors;
-    int         width       @accessors;
+    CPImage     image;
+    CPString    label;
+    CPMenu      menu;
+    BOOL        selected;
+    BOOL        enabled;
+    int         tag;
+    int         width;
 
-    CGRect      frame       @accessors;
+    CGRect      frame;
 }
 
 - (id)init
@@ -904,8 +868,8 @@ var CPSegmentedControlSegmentsKey       = "CPSegmentedControlSegmentsKey",
         label        = @"";
         menu         = nil;
         selected     = NO;
-        enabled      = YES;
-        tag          = -1;
+        enabled      = NO;
+        tag          = 0;
         width        = 0;
 
         frame        = CGRectMakeZero();
@@ -928,7 +892,7 @@ var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
-
+    
     if (self)
     {
         image        = [aCoder decodeObjectForKey:CPSegmentItemImageKey];
@@ -941,7 +905,7 @@ var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
 
         frame        = CGRectMakeZero();
     }
-
+    
     return self;
 }
 
@@ -957,3 +921,4 @@ var CPSegmentItemImageKey       = "CPSegmentItemImageKey",
 }
 
 @end
+

AppKit/CPShadow.j

@@ -23,8 +23,8 @@
 @import <Foundation/CPObject.j>
 
 
-/*!
-    @deprecated
+/*! 
+    @deprecated 
     @class CPShadow
 
     Instances of this class contain the attributes of a drop shadow used in Cappuccino.
@@ -34,7 +34,7 @@
     CPSize      _offset;
     float       _blurRadius;
     CPColor     _color;
-
+    
     CPString    _cssString;
 }
 
@@ -54,16 +54,16 @@
 - (id)_initWithOffset:(CPSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
 {
     self = [super init];
-
+    
     if (self)
     {
         _offset = anOffset;
         _blurRadius = aBlurRadius;
         _color = aColor;
-
+        
         _cssString = [_color cssString] + " " + Math.round(anOffset.width) + @"px " + Math.round(anOffset.height) + @"px " + Math.round(_blurRadius) + @"px";
     }
-
+    
     return self;
 }
 

AppKit/CPShadowView.j

@@ -28,17 +28,19 @@
 @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,
@@ -59,76 +61,51 @@ var LIGHT_LEFT_INSET    = 3.0,
         return;
 
     var bundle = [CPBundle bundleForClass:[self class]];
-
+    
     CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
         [
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
-
+            
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
             nil,
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
-
+            
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
         ]]];
-
+        
     CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
         [
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
-
+            
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
             nil,
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
-
+            
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
             [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
         ]]];
 }
 
-+ (id)shadowViewEnclosingView:(CPView)aView
-{
-    return [self shadowViewEnclosingView:aView withWeight:CPLightShadow];
-}
-
-+ (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
-{
-    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
-    [shadowView setWeight:aWeight];
-
-    var size = [shadowView frame].size,
-        width = size.width - [shadowView leftInset] - [shadowView rightInset],
-        height = size.height - [shadowView topInset] - [shadowView bottomInset],
-        enclosingView = [aView superview];
-
-    [shadowView setHitTests:[aView hitTests]];
-    [shadowView setAutoresizingMask:[aView autoresizingMask]];
-    [aView removeFromSuperview];
-    [shadowView addSubview:aView];
-    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
-    [enclosingView addSubview:shadowView];
-
-    return shadowView;
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
         _weight = CPLightShadow;
-
+        
         [self setBackgroundColor:CPShadowViewLightBackgroundColor];
-
+        
         [self setHitTests:NO];
     }
-
+    
     return self;
 }
 
@@ -136,9 +113,9 @@ var LIGHT_LEFT_INSET    = 3.0,
 {
     if (_weight == aWeight)
         return;
-
+    
     _weight = aWeight;
-
+    
     if (_weight == CPLightShadow)
         [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
@@ -170,7 +147,7 @@ var LIGHT_LEFT_INSET    = 3.0,
 {
     if (_weight == CPLightShadow)
         return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
-
+    
     return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
 }
 
@@ -178,7 +155,7 @@ var LIGHT_LEFT_INSET    = 3.0,
 {
     if (_weight == CPLightShadow)
         return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
-
+    
     return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
 }
 

AppKit/CPSlider.j

@@ -22,6 +22,7 @@
 
 @import "CPControl.j"
 
+#include "CoreGraphics/CGGeometry.h"
 
 /*! SLIDER STATES */
 
@@ -41,14 +42,14 @@ CPCircularSlider    = 1;
     BOOL            _isVertical;
 }
 
-+ (CPString)defaultThemeClass
++ (CPString)themeClass
 {
     return "slider";
 }
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]]
+    return [CPDictionary dictionaryWithObjects:[nil, _CGSizeMakeZero(), 0.0, nil]
                                        forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]];
 }
 
@@ -60,14 +61,14 @@ CPCircularSlider    = 1;
     {
         _minValue = 0.0;
         _maxValue = 100.0;
-
+        
         [self setObjectValue:50.0];
-
+        
         [self setContinuous:YES];
 
         [self _recalculateIsVertical];
     }
-
+    
     return self;
 }
 
@@ -75,17 +76,13 @@ CPCircularSlider    = 1;
 {
     if (_minValue === aMinimumValue)
         return;
-
+    
     _minValue = aMinimumValue;
 
     var doubleValue = [self doubleValue];
-
+    
     if (doubleValue < _minValue)
         [self setDoubleValue:_minValue];
-
-    // The relative position may have (did) change.
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
 }
 
 - (float)minValue
@@ -97,17 +94,13 @@ CPCircularSlider    = 1;
 {
     if (_maxValue === aMaximumValue)
         return;
-
+    
     _maxValue = aMaximumValue;
-
+    
     var doubleValue = [self doubleValue];
-
+    
     if (doubleValue > _maxValue)
         [self setDoubleValue:_maxValue];
-
-    // The relative position may have (did) change.
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
 }
 
 - (float)maxValue
@@ -168,27 +161,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;
@@ -197,7 +190,7 @@ CPCircularSlider    = 1;
     else if ([self isVertical])
     {
         knobRect.origin.x = _CGRectGetMidX(trackRect) - knobSize.width / 2.0;
-        knobRect.origin.y = ((_maxValue - [self doubleValue]) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
+        knobRect.origin.y = (([self doubleValue] - _minValue) / (_maxValue - _minValue)) * (_CGRectGetHeight(trackRect) - knobSize.height);
     }
     else
     {
@@ -212,10 +205,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];
 }
 
@@ -224,12 +217,12 @@ CPCircularSlider    = 1;
     if (aName === "track-view" || aName === "knob-view")
     {
         var view = [[CPView alloc] init];
-
+        
         [view setHitTests:NO];
-
+        
         return view;
     }
-
+    
     return [super createEphemeralSubviewNamed:aName];
 }
 
@@ -255,7 +248,7 @@ CPCircularSlider    = 1;
     var bounds = [self bounds],
         width = _CGRectGetWidth(bounds),
         height = _CGRectGetHeight(bounds);
-
+    
     _isVertical = width < height ? 1 : (width > height ? 0 : -1);
 
     if (_isVertical === 1)
@@ -281,7 +274,7 @@ CPCircularSlider    = 1;
     var knobView = [self layoutEphemeralSubviewNamed:@"knob-view"
                                           positioned:CPWindowAbove
                      relativeToEphemeralSubviewNamed:@"track-view"];
-
+      
     if (knobView)
         [knobView setBackgroundColor:[self currentValueForThemeAttribute:"knob-color"]];
 }
@@ -319,7 +312,7 @@ CPCircularSlider    = 1;
 
         var minValue = [self minValue];
 
-        return MAX(0.0, MIN(1.0, (_CGRectGetMaxY(trackRect) - aPoint.y) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
+        return MAX(0.0, MIN(1.0, (aPoint.y - _CGRectGetMinY(trackRect)) / _CGRectGetHeight(trackRect))) * ([self maxValue] - minValue) + minValue;
     }
     else
     {
@@ -338,43 +331,44 @@ 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];
 
@@ -382,35 +376,18 @@ CPCircularSlider    = 1;
     [self setNeedsDisplay:YES];
 }
 
-- (BOOL)isContinuous
-{
-    return (_sendActionOn & CPLeftMouseDraggedMask) !== 0;
-}
-
 /*!
     @ignore
-    should we have _continuous?
+    shoudl 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",
@@ -430,6 +407,8 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
     {
         _altIncrementValue = [aCoder decodeDoubleForKey:CPSliderAltIncrValueKey];
 
+        [self setContinuous:YES];
+
         [self _recalculateIsVertical];
 
         [self setNeedsLayout];
@@ -455,14 +434,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

@@ -20,24 +20,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPView.j"
 @import "CPColorPicker.j"
 
-
 /*
     @ignore
 */
 @implementation CPSliderColorPicker : CPColorPicker
-{
+{    
     CPView      _contentView;
-
+    
     CPSlider    _redSlider;
     CPSlider    _greenSlider;
     CPSlider    _blueSlider;
     CPSlider    _hueSlider;
     CPSlider    _saturationSlider;
     CPSlider    _brightnessSlider;
-
+    
     CPTextField _rgbLabel;
     CPTextField _hsbLabel;
     CPTextField _redLabel;
@@ -47,162 +45,251 @@
     CPTextField _saturationLabel;
     CPTextField _brightnessLabel;
     CPTextField _hexLabel;
-    CPTextField _hexValue;
-
-    CPTextField _hexValue;
-    CPTextField _redValue;
-    CPTextField _greenValue;
-    CPTextField _blueValue;
-    CPTextField _hueValue;
-    CPTextField _saturationValue;
-    CPTextField _brightnessValue;
+    
+    DOMElement  _redValue;
+    DOMElement  _greenValue;
+    DOMElement  _blueValue;
+    DOMElement  _hueValue;
+    DOMElement  _saturationValue;
+    DOMElement  _brightnessValue;
+    DOMElement  _hexValue;    
 }
 
-- (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 = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
-
+    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);    
+    
     _contentView = [[CPView alloc] initWithFrame:aFrame];
-    [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    _rgbLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 10, 100, 20)];
+    [_contentView setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
+    
+    _rgbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 10, 100, 20)];
     [_rgbLabel setStringValue: "Red, Green, Blue"];
     [_rgbLabel setTextColor:[CPColor blackColor]];
 
-    _redLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 37, 15, 20)];
+    _redLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 35, 15, 20)];
     [_redLabel setStringValue: "R"];
     [_redLabel setTextColor:[CPColor blackColor]];
-
-    _redSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 35, aFrame.size.width - 70, 20)];
+    
+    _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];
+    
+    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;
 
-    // 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 _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;
 
-    _greenLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 63, 15, 20)];
+            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];
+
+    _greenLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 58, 15, 20)];
     [_greenLabel setStringValue: "G"];
     [_greenLabel setTextColor:[CPColor blackColor]];
 
-    _greenSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 61, aFrame.size.width - 70, 20)];
+    _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];
 
-    // 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];
+    //green value input box
+    var greenValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 58, 45, 20)];
+    [greenValue setAutoresizingMask: CPViewMinXMargin];
 
-    _blueLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 90, 15, 20)];
+    _greenValue = _redValue.cloneNode(false);
+    _greenValue.onchange = updateFunction;
+    
+    greenValue._DOMElement.appendChild(_greenValue);
+    [_contentView addSubview: greenValue];
+
+    _blueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 81, 15, 20)];
     [_blueLabel setStringValue: "B"];
     [_blueLabel setTextColor:[CPColor blackColor]];
 
-    _blueSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 87, aFrame.size.width - 70, 20)];
+    _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];
 
-    // 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];
+    //blue value input box
+    var blueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 81, 45, 20)];
+    [blueValue setAutoresizingMask: CPViewMinXMargin];
 
-    _hsbLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 120, 190, 20)];
+    _blueValue = _redValue.cloneNode(false);
+    _blueValue.onchange = updateFunction;
+
+    blueValue._DOMElement.appendChild(_blueValue);
+    [_contentView addSubview: blueValue];
+
+    _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
     [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
     [_hsbLabel setTextColor:[CPColor blackColor]];
 
-    _hueLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 145, 15, 20)];
+    _hueLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 145, 15, 20)];
     [_hueLabel setStringValue: "H"];
     [_hueLabel setTextColor:[CPColor blackColor]];
-
-    _hueSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 143, aFrame.size.width - 70, 20)];
+    
+    _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];
 
-    // 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];
+    //red value input box
+    var hueValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 145, 45, 20)];
+    [hueValue setAutoresizingMask: CPViewMinXMargin];
 
-    _saturationLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 170, 15, 20)];
+    _hueValue = _redValue.cloneNode(false);
+    _hueValue.onchange = updateFunction;
+
+    hueValue._DOMElement.appendChild(_hueValue);
+    [_contentView addSubview: hueValue];
+    
+    _saturationLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 168, 15, 20)];
     [_saturationLabel setStringValue: "S"];
     [_saturationLabel setTextColor:[CPColor blackColor]];
 
-    _saturationSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 168, aFrame.size.width - 70, 20)];
+    _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];
 
-    // 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];
+    //green value input box
+    var saturationValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 168, 45, 20)];
+    [saturationValue setAutoresizingMask: CPViewMinXMargin];
 
-    _brightnessLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 196, 15, 20)];
+    _saturationValue = _redValue.cloneNode(false);
+    _saturationValue.onchange = updateFunction;
+
+    saturationValue._DOMElement.appendChild(_saturationValue);
+    [_contentView addSubview: saturationValue];
+
+    _brightnessLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 191, 15, 20)];
     [_brightnessLabel setStringValue: "B"];
     [_brightnessLabel setTextColor:[CPColor blackColor]];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame: CGRectMake(15, 194, aFrame.size.width - 70, 20)];
+    _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];
 
-    // 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];
+    //blue value input box
+    var brightnessValue = [[CPView alloc] initWithFrame: CPRectMake(aFrame.size.width - 45, 191, 45, 20)];
+    [brightnessValue setAutoresizingMask: CPViewMinXMargin];
 
-    _hexLabel = [[CPTextField alloc] initWithFrame: CGRectMake(0, 230, 30, 20)];
+    _brightnessValue = _redValue.cloneNode(false);
+    _brightnessValue.onchange = updateFunction;
+
+    brightnessValue._DOMElement.appendChild(_brightnessValue);
+    [_contentView addSubview: brightnessValue];
+
+    _hexLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 230, 30, 20)];
     [_hexLabel setStringValue: "Hex"];
     [_hexLabel setTextColor:[CPColor blackColor]];
-
+    
     //hex input box
-    _hexValue = [[CPTextField alloc] initWithFrame: CGRectMake(32, 225, 80, 28)];
-    [_hexValue setEditable: YES];
-    [_hexValue setBezeled: YES];
-    [_hexValue setDelegate: self];
-    [_contentView addSubview: _hexValue];
+    _hexValue = _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();
+        } 
+    };
 
+    _contentView._DOMElement.appendChild(_hexValue);
+    
     [_contentView addSubview: _rgbLabel];
     [_contentView addSubview: _redLabel];
     [_contentView addSubview: _greenLabel];
@@ -210,7 +297,7 @@
     [_contentView addSubview: _redSlider];
     [_contentView addSubview: _greenSlider];
     [_contentView addSubview: _blueSlider];
-
+    
     [_contentView addSubview: _hsbLabel];
     [_contentView addSubview: _hueLabel];
     [_contentView addSubview: _saturationLabel];
@@ -218,35 +305,35 @@
     [_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:
@@ -254,27 +341,27 @@
                                                               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];
                                         break;
     }
-
+        
     [self updateLabels];
     [self updateHex: newColor];
     [colorPanel setColor: newColor];
 }
 
-- (void)setColor:(CPColor)aColor
+-(void)setColor:(CPColor)aColor
 {
     [self updateRGBSliders: aColor];
     [self updateHSBSliders: aColor];
@@ -282,10 +369,10 @@
     [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]];
@@ -293,7 +380,7 @@
 
 - (void)updateHex:(CPColor)aColor
 {
-    [_hexValue setStringValue:[aColor hexString]];
+    _hexValue.value = [aColor hexString];
 }
 
 - (void)updateRGBSliders:(CPColor)aColor
@@ -307,13 +394,13 @@
 
 - (void)updateLabels
 {
-    [_hueValue setStringValue: ROUND([_hueSlider floatValue])];
-    [_saturationValue setStringValue: ROUND([_saturationSlider floatValue])];
-    [_brightnessValue setStringValue: ROUND([_brightnessSlider floatValue])];
-
-    [_redValue setStringValue: ROUND([_redSlider floatValue] * 255)];
-    [_greenValue setStringValue: ROUND([_greenSlider floatValue] * 255)];
-    [_blueValue setStringValue: ROUND([_blueSlider floatValue] * 255)];
+    _hueValue.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);
 }
 
 - (CPImage)provideNewButtonImage
@@ -326,50 +413,4 @@
     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

@@ -1,303 +0,0 @@
-/*
- * CPSound.j
- * AppKit
- *
- * Created by Antoine Mercadal
- * Copyright 2010, Antoine Mercadal
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-CPSoundLoadStateEmpty       = 0;
-CPSoundLoadStateLoading     = 1;
-CPSoundLoadStateCanBePlayed = 2;
-CPSoundLoadStateError       = 3;
-
-CPSoundPlayBackStatePlay    = 0;
-CPSoundPlayBackStateStop    = 1;
-CPSoundPlayBackStatePause   = 2;
-
-
-/*!
-    CPSound provides a way to load and play sounds. In the browser it relies on the
-    HTML5 audio tag being available.
-
-    CPSound delegate:
-        - sound:didFinishPlaying: called when sound has finished to played
-
-*/
-@implementation CPSound : CPObject
-{
-    CPString            _name       @accessors(property=name);
-    id                  _delegate   @accessors(property=delegate);
-
-    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;
-
-        _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;
-}
-
-/*! @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 !== 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/CPSplitView.j

@@ -20,10 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPButtonBar.j"
 @import "CPImage.j"
 @import "CPView.j"
 
+#include "CoreGraphics/CGGeometry.h"
+#include "Platform/Platform.h"
+#include "Platform/DOM/CPDOMDisplayServer.h"
+
 
 CPSplitViewDidResizeSubviewsNotification = @"CPSplitViewDidResizeSubviewsNotification";
 CPSplitViewWillResizeSubviewsNotification = @"CPSplitViewWillResizeSubviewsNotification";
@@ -33,14 +36,6 @@ var CPSplitViewHorizontalImage = nil,
 
 /*!
     @ingroup appkit
-    @class CPSplitView
-
-    CPSplitView is a view that allows you to stack several subviews vertically or horizontally. The user is given divider to resize the subviews.
-    The divider indices are zero-based. So the divider on the top (or left for vertical dividers) will be index 0.
-
-    CPSplitView can be supplied a delegate to provide control over the resizing of the splitview and subviews. Those methods are documented in setDelegate:
-
-    CPSplitView will add dividers for each subview you add. So just like adding subviews to a CPView you should call addSubview: to add new resizable subviews in your splitview.
 */
 
 @implementation CPSplitView : CPView
@@ -48,32 +43,18 @@ var CPSplitViewHorizontalImage = nil,
     id          _delegate;
     BOOL        _isVertical;
     BOOL        _isPaneSplitter;
-
+    
     int         _currentDivider;
     float       _initialOffset;
-    float       _preCollapsePosition;
-
+    
     CPString    _originComponent;
     CPString    _sizeComponent;
-
+    
     CPArray     _DOMDividerElements;
     CPString    _dividerImagePath;
     int         _drawingDivider;
-
+    
     BOOL        _needsResizeSubviews;
-
-    CPArray     _buttonBars;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"splitview";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[1.0, 10.0, [CPColor grayColor]]
-                                       forKeys:[@"divider-thickness", @"pane-divider-thickness", @"pane-divider-color"]];
 }
 
 /*
@@ -94,49 +75,36 @@ var CPSplitViewHorizontalImage = nil,
     if (self = [super initWithFrame:aFrame])
     {
         _currentDivider = CPNotFound;
-
+        
         _DOMDividerElements = [];
-        _buttonBars = [];
-
+        
         [self _setVertical:YES];
     }
-
+    
     return self;
 }
 
-/*!
-    Returns the thickness of the divider.
-    @return float - the thickness of the divider.
-*/
 - (float)dividerThickness
 {
-    return [self currentValueForThemeAttribute:[self isPaneSplitter] ? @"pane-divider-thickness" : @"divider-thickness"];
+    return _isPaneSplitter ? 1.0 : 10.0;
 }
 
-/*!
-    Returns YES if the dividers are vertical, otherwise NO.
-    @return YES if vertical, otherwise NO.
-*/
 - (BOOL)isVertical
 {
     return _isVertical;
 }
 
-/*!
-    Sets if the splitview dividers are vertical.
-    @param shouldBeVertical - YES if the splitview dividers should be vertical, otherwise NO.
-*/
 - (void)setVertical:(BOOL)shouldBeVertical
 {
     if (![self _setVertical:shouldBeVertical])
         return;
-
+    
     // Just re-adjust evenly.
     var frame = [self frame],
         dividerThickness = [self dividerThickness];
-
+    
     [self _postNotificationWillResize];
-
+    
     var eachSize = ROUND((frame.size[_sizeComponent] - dividerThickness * (_subviews.length - 1)) / _subviews.length),
         index = 0,
         count = _subviews.length;
@@ -147,9 +115,9 @@ var CPSplitViewHorizontalImage = nil,
     else
         for (; index < count; ++index)
             [_subviews[index] setFrame:CGRectMake(0, ROUND((eachSize + dividerThickness) * index), frame.size.width, eachSize)];
-
+    
     [self setNeedsDisplay:YES];
-
+    
     [self _postNotificationDidResize];
 
 }
@@ -157,102 +125,75 @@ var CPSplitViewHorizontalImage = nil,
 - (BOOL)_setVertical:(BOOL)shouldBeVertical
 {
     var changed = (_isVertical != shouldBeVertical);
-
+    
     _isVertical = shouldBeVertical;
-
+    
     _originComponent = [self isVertical] ? "x" : "y";
     _sizeComponent = [self isVertical] ? "width" : "height";
     _dividerImagePath = [self isVertical] ? [CPSplitViewVerticalImage filename] : [CPSplitViewHorizontalImage filename];
-
+    
     return changed;
 }
 
-/*!
-    Use to find if the divider is a larger pane splitter.
-
-    @return BOOL - YES if the dividers are the larger pane splitters. Otherwise NO.
-*/
 - (BOOL)isPaneSplitter
 {
     return _isPaneSplitter;
 }
 
-/*!
-    Used to set if the split view dividers should be the larger pane splitter.
-
-    @param shouldBePaneSplitter - YES if the dividers should be the thicker pane splitter, otherwise NO.
-*/
 - (void)setIsPaneSplitter:(BOOL)shouldBePaneSplitter
 {
     if (_isPaneSplitter == shouldBePaneSplitter)
         return;
-
+    
     _isPaneSplitter = shouldBePaneSplitter;
 
-    if (_DOMDividerElements[_drawingDivider])
-        [self _setupDOMDivider];
+#if PLATFORM(DOM)
+    _DOMDividerElements = [];
+#endif
 
-    // The divider changes size when pane splitter mode is toggled, so the
-    // subviews need to change size too.
-    _needsResizeSubviews = YES;
     [self setNeedsDisplay:YES];
 }
 
 - (void)didAddSubview:(CPView)aSubview
 {
     _needsResizeSubviews = YES;
+//    [self adjustSubviews];
 }
 
-/*!
-    Returns YES if the supplied subview is collapsed, otherwise NO.
-    @param aSubview - the subview you are interested in.
-    @return BOOL - YES if the subview is collapsed, otherwise NO.
-*/
 - (BOOL)isSubviewCollapsed:(CPView)subview
 {
     return [subview frame].size[_sizeComponent] < 1 ? YES : NO;
 }
 
-/*!
-    Returns the CGRect of the divider at a given index.
-
-    @param int - The index of a divider.
-    @return CGRect - The rect of a divider.
-*/
 - (CGRect)rectOfDividerAtIndex:(int)aDivider
 {
     var frame = [_subviews[aDivider] frame],
         rect = CGRectMakeZero();
-
+    
     rect.size = [self frame].size;
-
+    
     rect.size[_sizeComponent] = [self dividerThickness];
     rect.origin[_originComponent] = frame.origin[_originComponent] + frame.size[_sizeComponent];
 
     return rect;
 }
 
-/*!
-    Returns the rect of the divider which the user is able to drag to resize.
-
-    @param int - The index of the divider.
-    @return CGRect - The rect the user can drag.
-*/
 - (CGRect)effectiveRectOfDividerAtIndex:(int)aDivider
 {
-    var realRect = [self rectOfDividerAtIndex:aDivider],
-        padding = 2;
-
+    var realRect = [self rectOfDividerAtIndex:aDivider];
+    
+    var padding = 2;
+    
     realRect.size[_sizeComponent] += padding * 2;
     realRect.origin[_originComponent] -= padding;
-
+    
     return realRect;
 }
 
 - (void)drawRect:(CGRect)rect
 {
     var count = [_subviews count] - 1;
-
+    
     while ((count--) > 0)
     {
         _drawingDivider = count;
@@ -260,68 +201,35 @@ var CPSplitViewHorizontalImage = nil,
     }
 }
 
-/*!
-    @ignore
-    Because we're use drawRect: to draw the dividers, but use DOM elements instead of CoreGraphics
-    We must remove those DOM elements (the splitters) when the subview is removed.
-*/
-- (void)willRemoveSubview:(CPView)aView
-{
-#if PLATFORM(DOM)
-    var dividerToRemove = _DOMDividerElements.pop();
-
-    // The divider may not exist if we never rendered out the DOM.
-    if (dividerToRemove)
-        CPDOMDisplayServerRemoveChild(_DOMElement, dividerToRemove);
-#endif
-
-    _needsResizeSubviews = YES;
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-- (void)layoutSubviews
-{
-    [self _adjustSubviewsWithCalculatedSize]
-}
-
-/*!
-    Draws the divider at a given rect.
-    @param aRect - the rect of the divider to draw.
-*/
 - (void)drawDividerInRect:(CGRect)aRect
 {
 #if PLATFORM(DOM)
     if (!_DOMDividerElements[_drawingDivider])
     {
         _DOMDividerElements[_drawingDivider] = document.createElement("div");
-
+        _DOMDividerElements[_drawingDivider].style.cursor = "move";
         _DOMDividerElements[_drawingDivider].style.position = "absolute";
         _DOMDividerElements[_drawingDivider].style.backgroundRepeat = "repeat";
-
+        
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMDividerElements[_drawingDivider]);
-    }
 
-    [self _setupDOMDivider];
+        if (_isPaneSplitter)
+        {
+            _DOMDividerElements[_drawingDivider].style.backgroundColor = "#A5A5A5";
+            _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
+        }
+        else
+        {
+            _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
+            _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
+        }
+    }    
+        
     CPDOMDisplayServerSetStyleLeftTop(_DOMDividerElements[_drawingDivider], NULL, _CGRectGetMinX(aRect), _CGRectGetMinY(aRect));
     CPDOMDisplayServerSetStyleSize(_DOMDividerElements[_drawingDivider], _CGRectGetWidth(aRect), _CGRectGetHeight(aRect));
 #endif
 }
 
-- (void)_setupDOMDivider
-{
-    if (_isPaneSplitter)
-    {
-        _DOMDividerElements[_drawingDivider].style.backgroundColor = "";
-        _DOMDividerElements[_drawingDivider].style.backgroundImage = "url('"+_dividerImagePath+"')";
-    }
-    else
-    {
-        _DOMDividerElements[_drawingDivider].style.backgroundColor = [[self currentValueForThemeAttribute:@"pane-divider-color"] cssString];
-        _DOMDividerElements[_drawingDivider].style.backgroundImage = "";
-    }
-}
-
 - (void)viewWillDraw
 {
     [self _adjustSubviewsWithCalculatedSize];
@@ -331,13 +239,13 @@ var CPSplitViewHorizontalImage = nil,
 {
     if (!_needsResizeSubviews)
         return;
-
+    
     _needsResizeSubviews = NO;
-
+        
     var subviews = [self subviews],
         count = subviews.length,
         oldSize = CGSizeMakeZero();
-
+    
     if ([self isVertical])
     {
         oldSize.width += [self dividerThickness] * (count - 1);
@@ -348,10 +256,10 @@ var CPSplitViewHorizontalImage = nil,
         oldSize.width = CGRectGetWidth([self frame]);
         oldSize.height += [self dividerThickness] * (count - 1);
     }
-
+        
     while (count--)
         oldSize[_sizeComponent] += [subviews[count] frame].size[_sizeComponent];
-
+    
     [self resizeSubviewsWithOldSize:oldSize];
 }
 
@@ -360,41 +268,31 @@ var CPSplitViewHorizontalImage = nil,
     var frame = [_subviews[anIndex] frame],
         startPosition = frame.origin[_originComponent] + frame.size[_sizeComponent],
         effectiveRect = [self effectiveRectOfDividerAtIndex:anIndex],
-        buttonBar = _buttonBars[anIndex],
-        buttonBarRect = null,
         additionalRect = null;
-
-    if (buttonBar != null)
-    {
-        buttonBarRect = [buttonBar resizeControlFrame];
-        buttonBarRect.origin = [self convertPoint:buttonBarRect.origin fromView:buttonBar];
-    }
-
+    
     if ([_delegate respondsToSelector:@selector(splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:)])
         effectiveRect = [_delegate splitView:self effectiveRect:effectiveRect forDrawnRect:effectiveRect ofDividerAtIndex:anIndex];
-
+    
     if ([_delegate respondsToSelector:@selector(splitView:additionalEffectiveRectOfDividerAtIndex:)])
         additionalRect = [_delegate splitView:self additionalEffectiveRectOfDividerAtIndex:anIndex];
 
-    return CGRectContainsPoint(effectiveRect, aPoint) ||
-           (additionalRect && CGRectContainsPoint(additionalRect, aPoint)) ||
-           (buttonBarRect && CGRectContainsPoint(buttonBarRect, aPoint));
+    return CGRectContainsPoint(effectiveRect, aPoint) || (additionalRect && CGRectContainsPoint(additionalRect, aPoint));
 }
 
 - (CPView)hitTest:(CGPoint)aPoint
 {
     if ([self isHidden] || ![self hitTests] || !CGRectContainsPoint([self frame], aPoint))
         return nil;
-
-    var point = [self convertPoint:aPoint fromView:[self superview]],
-        count = [_subviews count] - 1;
-
+    
+    var point = [self convertPoint:aPoint fromView:[self superview]];
+    
+    var count = [_subviews count] - 1;
     for (var i = 0; i < count; i++)
     {
         if ([self cursorAtPoint:point hitDividerAtIndex:i])
             return self;
     }
-
+    
     return [super hitTest:aPoint];
 }
 
@@ -405,19 +303,18 @@ var CPSplitViewHorizontalImage = nil,
 - (void)trackDivider:(CPEvent)anEvent
 {
     var type = [anEvent type];
-
+    
     if (type == CPLeftMouseUp)
     {
         if (_currentDivider != CPNotFound)
         {
             _currentDivider = CPNotFound;
-            [self _updateResizeCursor:anEvent];
             [self _postNotificationDidResize];
         }
-
+        
         return;
     }
-
+    
     if (type == CPLeftMouseDown)
     {
         var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
@@ -434,21 +331,21 @@ var CPSplitViewHorizontalImage = nil,
                 if ([anEvent clickCount] == 2 &&
                     [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
                     [_delegate respondsToSelector:@selector(splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:)])
-                {
+                {    
                     var minPosition = [self minPossiblePositionOfDividerAtIndex:i],
                         maxPosition = [self maxPossiblePositionOfDividerAtIndex:i];
 
                     if ([_delegate splitView:self canCollapseSubview:_subviews[i]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i] forDoubleClickOnDividerAtIndex:i])
                     {
                         if ([self isSubviewCollapsed:_subviews[i]])
-                            [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                            [self setPosition:(minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                         else
                             [self setPosition:minPosition ofDividerAtIndex:i];
                     }
-                    else if ([_delegate splitView:self canCollapseSubview:_subviews[i + 1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i + 1] forDoubleClickOnDividerAtIndex:i])
+                    else if ([_delegate splitView:self canCollapseSubview:_subviews[i+1]] && [_delegate splitView:self shouldCollapseSubview:_subviews[i+1] forDoubleClickOnDividerAtIndex:i])
                     {
-                        if ([self isSubviewCollapsed:_subviews[i + 1]])
-                            [self setPosition:_preCollapsePosition ? _preCollapsePosition : (minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
+                        if ([self isSubviewCollapsed:_subviews[i+1]])
+                            [self setPosition:(minPosition + (maxPosition - minPosition) / 2) ofDividerAtIndex:i];
                         else
                             [self setPosition:maxPosition ofDividerAtIndex:i];
                     }
@@ -462,20 +359,15 @@ var CPSplitViewHorizontalImage = nil,
                 }
             }
         }
-
-        if (_currentDivider === CPNotFound)
-            return;
     }
-
+    
     else if (type == CPLeftMouseDragged && _currentDivider != CPNotFound)
     {
         var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
+        
         [self setPosition:(point[_originComponent] + _initialOffset) ofDividerAtIndex:_currentDivider];
-        // Cursor might change if we reach a resize limit.
-        [self _updateResizeCursor:anEvent];
     }
-
+    
     [CPApp setTarget:self selector:@selector(trackDivider:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 }
 
@@ -485,116 +377,32 @@ var CPSplitViewHorizontalImage = nil,
     [self trackDivider:anEvent];
 }
 
-- (void)viewDidMoveToWindow
-{
-    // Enable split view resize cursors. Commented out pending CPTrackingArea implementation.
-    //[[self window] setAcceptsMouseMovedEvents:YES];
-}
-
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    // Tracking code handles cursor by itself.
-    if (_currentDivider == CPNotFound)
-        [self _updateResizeCursor:anEvent];
-}
-
-- (void)mouseMoved:(CPEvent)anEvent
-{
-    if (_currentDivider == CPNotFound)
-        [self _updateResizeCursor:anEvent];
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    if (_currentDivider == CPNotFound)
-        // FIXME: we should use CPCursor push/pop (if previous currentCursor != arrow).
-        [[CPCursor arrowCursor] set];
-}
-
-- (void)_updateResizeCursor:(CPEvent)anEvent
-{
-    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
-    if ([anEvent type] === CPLeftMouseUp && ![[self window] acceptsMouseMovedEvents])
-    {
-        [[CPCursor arrowCursor] set];
-        return;
-    }
-
-    for (var i = 0, count = [_subviews count] - 1; i < count; i++)
-    {
-        // If we are currently tracking, keep the resize cursor active even outside of hit areas.
-        if (_currentDivider === i || (_currentDivider == CPNotFound && [self cursorAtPoint:point hitDividerAtIndex:i]))
-        {
-            var frame = [_subviews[i] frame],
-                size = frame.size[_sizeComponent],
-                startPosition = frame.origin[_originComponent] + size,
-                canShrink = [self _realPositionForPosition:startPosition - 1 ofDividerAtIndex:i] < startPosition,
-                canGrow = [self _realPositionForPosition:startPosition + 1 ofDividerAtIndex:i] > startPosition,
-                cursor = [CPCursor arrowCursor];
-
-            if (size === 0)
-                canGrow = YES; // Subview is collapsed.
-            else if (!canShrink &&
-                [_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)] &&
-                [_delegate splitView:self canCollapseSubview:_subviews[i]])
-                canShrink = YES; // Subview is collapsible.
-
-            if (_isVertical && canShrink && canGrow)
-                cursor = [CPCursor resizeLeftRightCursor];
-            else if (_isVertical && canShrink)
-                cursor = [CPCursor resizeLeftCursor];
-            else if (_isVertical && canGrow)
-                cursor = [CPCursor resizeRightCursor];
-            else if (canShrink && canGrow)
-                cursor = [CPCursor resizeUpDownCursor];
-            else if (canShrink)
-                cursor = [CPCursor resizeUpCursor];
-            else if (canGrow)
-                cursor = [CPCursor resizeDownCursor];
-
-            [cursor set];
-            return;
-        }
-    }
-
-    [[CPCursor arrowCursor] set];
-}
-
-/*!
-    Returns the maximum possible position of a divider at a given index.
-    @param the index of the divider.
-    @return float - the max possible position.
-*/
 - (float)maxPossiblePositionOfDividerAtIndex:(int)dividerIndex
 {
     var frame = [_subviews[dividerIndex + 1] frame];
-
+    
     if (dividerIndex + 1 < [_subviews count] - 1)
         return frame.origin[_originComponent] + frame.size[_sizeComponent] - [self dividerThickness];
-    else
+    else    
         return [self frame].size[_sizeComponent] - [self dividerThickness];
 }
 
-/*!
-    Returns the minimum possible position of a divider at a given index.
-    @param the index of the divider.
-    @return float - the min possible position.
-*/
 - (float)minPossiblePositionOfDividerAtIndex:(int)dividerIndex
 {
     if (dividerIndex > 0)
     {
         var frame = [_subviews[dividerIndex - 1] frame];
-
+        
         return frame.origin[_originComponent] + frame.size[_sizeComponent] + [self dividerThickness];
     }
-    else
+    else    
         return 0;
 }
 
-- (int)_realPositionForPosition:(float)position ofDividerAtIndex:(int)dividerIndex
+- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
 {
+    [self _adjustSubviewsWithCalculatedSize];
+        
     // not sure where this should override other positions?
     if ([_delegate respondsToSelector:@selector(splitView:constrainSplitPosition:ofSubviewAt:)])
         position = [_delegate splitView:self constrainSplitPosition:position ofSubviewAt:dividerIndex];
@@ -603,69 +411,47 @@ var CPSplitViewHorizontalImage = nil,
         proposedMin = [self minPossiblePositionOfDividerAtIndex:dividerIndex],
         actualMax = proposedMax,
         actualMin = proposedMin;
-
-    if ([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
+        
+    if([_delegate respondsToSelector:@selector(splitView:constrainMinCoordinate:ofSubviewAt:)])
         actualMin = [_delegate splitView:self constrainMinCoordinate:proposedMin ofSubviewAt:dividerIndex];
-
-    if ([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
+        
+    if([_delegate respondsToSelector:@selector(splitView:constrainMaxCoordinate:ofSubviewAt:)])
         actualMax = [_delegate splitView:self constrainMaxCoordinate:proposedMax ofSubviewAt:dividerIndex];
 
-    var viewA = _subviews[dividerIndex],
-        realPosition = MAX(MIN(position, actualMax), actualMin);
-
+    var frame = [self frame],
+        viewA = _subviews[dividerIndex],
+        frameA = [viewA frame],
+        viewB = _subviews[dividerIndex + 1],
+        frameB = [viewB frame];
+    
+    var realPosition = MAX(MIN(position, actualMax), actualMin);
+    
     if (position <  proposedMin + (actualMin - proposedMin) / 2)
         if ([_delegate respondsToSelector:@selector(splitView:canCollapseSubview:)])
             if ([_delegate splitView:self canCollapseSubview:viewA])
                 realPosition = proposedMin;
-
-    return realPosition;
-}
-
-/*!
-    Sets the position of a divider at a given index.
-    @param position - The float value of the position to place the divider.
-    @param dividerIndex - The index of the divider to position.
-*/
-- (void)setPosition:(float)position ofDividerAtIndex:(int)dividerIndex
-{
-    [self _adjustSubviewsWithCalculatedSize];
-
-    var realPosition = [self _realPositionForPosition:position ofDividerAtIndex:dividerIndex];
-
-    var viewA = _subviews[dividerIndex],
-        frameA = [viewA frame],
-        viewB = _subviews[dividerIndex + 1],
-        frameB = [viewB frame];
-
-    _preCollapsePosition = 0;
-
-    var preSize = frameA.size[_sizeComponent];
+    
     frameA.size[_sizeComponent] = realPosition - frameA.origin[_originComponent];
-    if (preSize !== 0 && frameA.size[_sizeComponent] === 0)
-        _preCollapsePosition = preSize;
     [_subviews[dividerIndex] setFrame:frameA];
-
-    preSize = frameB.size[_sizeComponent];
+    
     frameB.size[_sizeComponent] = frameB.origin[_originComponent] + frameB.size[_sizeComponent] - realPosition - [self dividerThickness];
-    if (preSize !== 0 && frameB.size[_sizeComponent] === 0)
-        _preCollapsePosition = preSize;
     frameB.origin[_originComponent] = realPosition + [self dividerThickness];
     [_subviews[dividerIndex + 1] setFrame:frameB];
-
+    
     [self setNeedsDisplay:YES];
 }
 
 - (void)setFrameSize:(CGSize)aSize
 {
     [self _adjustSubviewsWithCalculatedSize];
-
+        
     [super setFrameSize:aSize];
-
+    
     [self setNeedsDisplay:YES];
 }
 
 - (void)resizeSubviewsWithOldSize:(CPSize)oldSize
-{
+{   
     if ([_delegate respondsToSelector:@selector(splitView:resizeSubviewsWithOldSize:)])
     {
         [_delegate splitView:self resizeSubviewsWithOldSize:oldSize];
@@ -673,7 +459,7 @@ var CPSplitViewHorizontalImage = nil,
     }
 
     [self _postNotificationWillResize];
-
+    
     var index = 0,
         count = [_subviews count],
         bounds = [self bounds],
@@ -702,9 +488,8 @@ var CPSplitViewHorizontalImage = nil,
         totalSizableSpace = 0;
 
     var nonSizableSpace = totalSizableSpace ? bounds.size[_sizeComponent] - totalSizableSpace : 0,
-        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent],
-        oldDimension = (oldSize[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace),
-        ratio = oldDimension <= 0 ? 0 : (bounds.size[_sizeComponent] - totalDividers * dividerThickness - nonSizableSpace) / oldDimension;
+        ratio = (bounds.size[_sizeComponent] - totalDividers*dividerThickness - nonSizableSpace) / (oldSize[_sizeComponent]- totalDividers*dividerThickness - nonSizableSpace),
+        remainingFlexibleSpace = bounds.size[_sizeComponent] - oldSize[_sizeComponent];
 
     for (index = 0; index < count; ++index)
     {
@@ -712,22 +497,21 @@ var CPSplitViewHorizontalImage = nil,
             viewFrame = CGRectMakeCopy(bounds),
             isSizable = isVertical ? [view autoresizingMask] & CPViewWidthSizable : [view autoresizingMask] & CPViewHeightSizable;
 
-        if (index + 1 === count)
-            viewFrame.size[_sizeComponent] = bounds.size[_sizeComponent] - viewFrame.origin[_originComponent];
-
-        else if (totalSizableSpace && isSizable && lastSizableIndex === index)
-            viewFrame.size[_sizeComponent] = MAX(0, ROUND([view frame].size[_sizeComponent] + remainingFlexibleSpace))
-
-        else if (isSizable || !totalSizableSpace)
-        {
-            viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
-            remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
-        }
-
-        else if (totalSizableSpace && !isSizable)
-            viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
-
-        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;
+            if (index + 1 == count)
+                viewFrame.size[_sizeComponent] = bounds.size[_sizeComponent] - viewFrame.origin[_originComponent];
+            else if (totalSizableSpace && isSizable && lastSizableIndex === index)
+                viewFrame.size[_sizeComponent] = MAX(0, ROUND([view frame].size[_sizeComponent] + remainingFlexibleSpace))
+            else if (isSizable || !totalSizableSpace)
+            {
+                viewFrame.size[_sizeComponent] = MAX(0, ROUND(ratio * [view frame].size[_sizeComponent]));
+                remainingFlexibleSpace -= (viewFrame.size[_sizeComponent] - [view frame].size[_sizeComponent]);
+            }
+            else if (totalSizableSpace && !isSizable)
+                viewFrame.size[_sizeComponent] = [view frame].size[_sizeComponent];
+            else
+                alert("SHOULD NEVER GET HERE");
+                
+        bounds.origin[_originComponent] += viewFrame.size[_sizeComponent] + dividerThickness;        
 
         [view setFrame:viewFrame];
     }
@@ -735,73 +519,13 @@ var CPSplitViewHorizontalImage = nil,
     [self _postNotificationDidResize];
 }
 
-/*!
-    Sets the delegate of the receiver.
-    Possible delegate methods to implement are listed below.
-
-Notifies the delegate when the subviews have resized.
-@code
-- (void)splitViewDidResizeSubviews:(CPNotification)aNotification;
-@endcode
-
-Notifies the delegate when the subviews will be resized.
-@code
-- (void)splitViewWillResizeSubviews:(CPNotification)aNotification;
-@endcode
-
-Lets the delegate specify a different rect for which the user can drag the splitView divider.
-@code
-- (CGRect)splitView:(CPSplitView)aSplitView effectiveRect:(CGRect)aRect forDrawnRect:(CGRect)aDrawnRect ofDividerAtIndex:(int)aDividerIndex;
-@endcode
-
-Lets the delegate specify an additional rect for which the user can drag the splitview divider.
-@code
-- (CGRect)splitView:(CPSplitView)aSplitView additionalEffectiveRectOfDividerAtIndex:(int)indexOfDivider;
-@endcode
-
-Notifies the delegate that the splitview is about to be collapsed. This usually happens when the user
-Double clicks on the divider. Return YES if the subview can be collapsed, otherwise NO.
-@code
-- (BOOL)splitView:(CPSplitView)aSplitView canCollapseSubview:(CPView)aSubview;
-@endcode
-
-Notifies the delegate that the subview at indexOfDivider is about to be collapsed. This usually happens when the user
-Double clicks on the divider. Return YES if the subview should be collapsed, otherwise NO.
-@code
- - (BOOL)splitView:(CPSplitView)aSplitView shouldCollapseSubview:(CPView)aSubview forDoubleClickOnDividerAtIndex:(int)indexOfDivider;
-@endcode
-
-Allows the delegate to constrain the subview beings resized. This method is called continuously as the user resizes the divider.
-For example if the subview needs to have a width which is a multiple of a certain number you could return that multiple with this method.
-@code
-- (float)splitView:(CPSplitView)aSpiltView constrainSplitPosition:(float)proposedPosition ofSubviewAt:(int)subviewIndex;
-@endcode
-
-Allows the delegate to constrain the minimum position of a subview.
-@code
-- (float)splitView:(CPSplitView)aSplitView constrainMinCoordinate:(float)proposedMin ofSubviewAt:(int)subviewIndex;
-@endcode
-
-Allows the delegate to constrain the maximum position of a subview.
-@code
-- (float)splitView:(CPSplitView)aSplitView constrainMaxCoordinate:(float)proposedMax ofSubviewAt:(int)subviewIndex;
-@endcode
-
-Allows the splitview to specify a custom resizing behavior. This is called when the splitview is resized.
-The sum of the views and the sum of the dividers should be equal to the size of the splitview.
-@code
-- (void)splitView:(CPSplitView)aSplitView resizeSubviewsWithOldSize:(CGSize)oldSize;
-@endcode
-
-    @param delegate - The delegate of the splitview.
-*/
 - (void)setDelegate:(id)delegate
 {
     if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewDidResizeSubviewsNotification object:self];
     if ([_delegate respondsToSelector:@selector(splitViewWillResizeSubviews:)])
         [[CPNotificationCenter defaultCenter] removeObserver:_delegate name:CPSplitViewWillResizeSubviewsNotification object:self];
-
+    
    _delegate = delegate;
 
    if ([_delegate respondsToSelector:@selector(splitViewDidResizeSubviews:)])
@@ -816,50 +540,6 @@ The sum of the views and the sum of the dividers should be equal to the size of
                                                   object:self];
 }
 
-/*!
-    Set the button bar who's resize control should act as a control for this splitview.
-    Each divider can have at most one button bar assigned to it, and that button bar must be
-    a subview of one of the split view's subviews.
-
-    Calling this method with nil as the button bar will remove any currently assigned button bar
-    for the divider at that index. Indexes will not be adjusted as new subviews are added, so you
-    should usually call this method after adding all the desired subviews to the split view.
-
-    This method will automatically configure the hasResizeControl and resizeControlIsLeftAligned
-    parameters of the button bar, and will override any currently set values.
-
-    @param CPButtonBar - The supplied button bar.
-    @param unsigned int - The divider index the button bar will be assigned to.
-*/
-- (void)setButtonBar:(CPButtonBar)aButtonBar forDividerAtIndex:(unsigned)dividerIndex
-{
-    if (!aButtonBar)
-    {
-        _buttonBars[dividerIndex] = nil;
-        return;
-    }
-
-    var view = [aButtonBar superview],
-        subview = aButtonBar;
-
-    while (view && view !== self)
-    {
-        subview = view;
-        view = [view superview];
-    }
-
-    if (view !== self)
-        [CPException raise:CPInvalidArgumentException
-                    reason:@"CPSplitView button bar must be a subview of the split view."];
-
-    var viewIndex = [[self subviews] indexOfObject:subview];
-
-    [aButtonBar setHasResizeControl:YES];
-    [aButtonBar setResizeControlIsLeftAligned:dividerIndex < viewIndex];
-
-    _buttonBars[dividerIndex] = aButtonBar;
-}
-
 - (void)_postNotificationWillResize
 {
     [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self];
@@ -874,33 +554,30 @@ The sum of the views and the sum of the dividers should be equal to the size of
 
 var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
     CPSplitViewIsVerticalKey        = "CPSplitViewIsVerticalKey",
-    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey",
-    CPSplitViewButtonBarsKey        = "CPSplitViewButtonBarsKey";
+    CPSplitViewIsPaneSplitterKey    = "CPSplitViewIsPaneSplitterKey";
 
 @implementation CPSplitView (CPCoding)
 
 /*
-    Initializes the split view by unarchiving data from \c aCoder.
+    Initializes the split view by unarchiving data from <code>aCoder</code>.
     @param aCoder the coder containing the archived CPSplitView.
 */
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
         _currentDivider = CPNotFound;
-
+        
         _DOMDividerElements = [];
-
-        _buttonBars = [aCoder decodeObjectForKey:CPSplitViewButtonBarsKey] || [];
-
-        [self setDelegate:[aCoder decodeObjectForKey:CPSplitViewDelegateKey]];
-
+        
+        _delegate = [aCoder decodeObjectForKey:CPSplitViewDelegateKey];;
+        
         _isPaneSplitter = [aCoder decodeBoolForKey:CPSplitViewIsPaneSplitterKey];
         [self _setVertical:[aCoder decodeBoolForKey:CPSplitViewIsVerticalKey]];
     }
-
+    
     return self;
 }
 
@@ -911,12 +588,9 @@ var CPSplitViewDelegateKey          = "CPSplitViewDelegateKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-
-    //FIXME how should we handle this?
-    //[aCoder encodeObject:_buttonBars forKey:CPSplitViewButtonBarsKey];
-
+    
     [aCoder encodeConditionalObject:_delegate forKey:CPSplitViewDelegateKey];
-
+    
     [aCoder encodeBool:_isVertical forKey:CPSplitViewIsVerticalKey];
     [aCoder encodeBool:_isPaneSplitter forKey:CPSplitViewIsPaneSplitterKey];
 }

AppKit/CPStepper.j

@@ -1,246 +0,0 @@
-/*
- * CPStepper.j
- * AppKit
- *
- * Created by Antoine Mercadal
- * Copyright 2009, Antoine Mercadal
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <AppKit/CPControl.j>
-@import <AppKit/CPButton.j>
-@import <AppKit/CPTextField.j>
-
-
-var CPStepperButtonsSize = CPSizeMake(19, 13);
-
-/*! CPStepper is an  implementation of Cocoa NSStepper.
-
-    This control display a two part button that can be used to increase or decrease a value with a given interval.
-*/
-@implementation CPStepper: CPControl
-{
-    BOOL        _valueWraps     @accessors(property=valueWraps);
-    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:CPRectMake(0, 0, 19, 25)];
-    [stepper setDoubleValue:aValue];
-    [stepper setMinValue:aMinValue];
-    [stepper setMaxValue:aMaxValue];
-
-    return stepper;
-}
-
-/*! Initializes a CPStepper with default values:
-        - minValue = 0.0
-        - maxValue = 59.0
-        - value = 0.0
-    @return Initialized CPStepper
-*/
-+ (CPStepper)stepper
-{
-    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
-}
-
-/*! Initializes the 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;
-
-        [self setDoubleValue:0.0];
-
-        _buttonUp = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, 0, CPStepperButtonsSize.width, CPStepperButtonsSize.height)];
-        [_buttonUp setContinuous:YES];
-        [_buttonUp setTarget:self];
-        [_buttonUp setAction:@selector(_buttonDidClick:)];
-        [_buttonUp setAutoresizingMask:CPViewNotSizable];
-        [self addSubview:_buttonUp];
-
-        _buttonDown = [[CPButton alloc] initWithFrame:CPRectMake(aFrame.size.width - CPStepperButtonsSize.width, CPStepperButtonsSize.height, CPStepperButtonsSize.width, CPStepperButtonsSize.height - 1)];
-        [_buttonDown setContinuous:YES];
-        [_buttonDown setTarget:self];
-        [_buttonDown setAction:@selector(_buttonDidClick:)];
-        [_buttonDown setAutoresizingMask:CPViewNotSizable];
-        [self addSubview:_buttonDown];
-
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-#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];
-}
-
-/*! set the frame of the CPStepper and check if width is not smaller than theme min-size
-    @param aFrame the frame
-*/
-- (void)setFrame:(CGRect)aFrame
-{
-    if (aFrame.size.width >= CGRectGetWidth(aFrame))
-        [super setFrame:aFrame];
-}
-
-/*! @ignore
-*/
-- (void)layoutSubviews
-{
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-}
-
-/*! set if CPStepper should autorepeat
-    @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
-*/
-- (void)setAutorepeat:(BOOL)shouldAutoRepeat
-{
-    [_buttonUp setContinuous:shouldAutoRepeat];
-    [_buttonDown setContinuous:shouldAutoRepeat];
-}
-
-/*! set the current value of the stepper
-    @param aValue a float containing the value
-*/
-- (void)setDoubleValue:(float)aValue
-{
-    if (aValue > _maxValue)
-        [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
-    else if (aValue < _minValue)
-        [super setDoubleValue:_valueWraps ? _maxValue : _minValue];
-    else
-        [super setDoubleValue:aValue];
-}
-
-#pragma mark -
-#pragma mark Actions
-
-/*! @ignore
-*/
-- (IBAction)_buttonDidClick:(id)aSender
-{
-    if (![self isEnabled])
-        return;
-
-    if (aSender == _buttonUp)
-        [self setDoubleValue:([self doubleValue] + _increment)];
-    else
-        [self setDoubleValue:([self doubleValue] - _increment)];
-
-    if (_target && _action && [_target respondsToSelector:_action])
-        [self sendAction:_action to:_target];
-}
-
-/*! @perform a programatic click on up button
-    @param aSender sender of the action
-*/
-- (IBAction)performClickUp:(id)aSender
-{
-    [_buttonUp performClick:aSender];
-}
-
-/*! @perform a programatic click on down button
-    @param aSender sender of the action
-*/
-- (IBAction)performClickDown:(id)aSender
-{
-    [_buttonDown performClick:aSender];
-}
-
-
-#pragma mark -
-#pragma mark Theming
-
-+ (CPString)defaultThemeClass
-{
-    return @"stepper";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null]]
-                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button"]];
-}
-
-@end
-
-
-@implementation CPStepper (CPCodingCompliance)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _maxValue   = [aCoder decodeObjectForKey:@"_maxValue"];
-        _minValue   = [aCoder decodeObjectForKey:@"_minValue"];
-        _increment  = [aCoder decodeObjectForKey:@"_increment"];
-        _buttonUp   = [aCoder decodeObjectForKey:@"_buttonUp"];
-        _buttonDown = [aCoder decodeObjectForKey:@"_buttonDown"];
-    }
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
-    [aCoder encodeObject:_minValue forKey:@"_minValue"];
-    [aCoder encodeObject:_increment forKey:@"_increment"];
-    [aCoder encodeObject:_buttonUp forKey:@"_buttonUp"];
-    [aCoder encodeObject:_buttonDown forKey:@"_buttonDown"];
-}
-
-@end

AppKit/CPString+Additions.j

@@ -1,72 +0,0 @@
-/*
- * CPString+Additions.j
- * AppKit
- *
- * Created by Randy Luecke
- * Copyright 2011, RCLConcepts, LLC.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-/*
-    AppKit adds two methods to the CPString class to support drawing string directly in an CPView.
-
-    AppKit also adds similar methods to CPAttributedString.
-    The two drawing methods draw a string object with a single set of attributes that apply to the entire string.
-    To draw a string with multiple attributes, such as multiple text fonts, you must use an attributed string.
-*/
-@implementation CPString (AppKitAdditions)
-
-/*!
-    Draws a string in the current graphics context.
-    This method applies the attributes to the entier string
-    and displays it on a single "infinately long" line.
-
-    @param aPoint - The starting point to draw the string
-    @param attributes - the dictionary of attributes to apply to the string
-*/
-- (void)drawAtPoint:(CGPoint)aPoint withAttributes:(CPDictionary)attributes
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        run = _CTRunCreate([self copy], attributes);
-
-    CGContextSetTextPosition(context, aPoint.x, aPoint.y);
-    CTRunDraw(run, context, nil);
-}
-
-/*!
-    Draws a string in the current graphics context.
-    This method applies the attributes to the entier string
-    and displays it within the given rect.
-
-    @param aRect - The rect for which the string should be drawn into
-    @param attributes - the dictionary of attributes to apply to the string
-*/
-- (void)drawInRect:(CGRect)aRect withAttributes:(CPDictionary)attributes
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        string = [[CPAttributedString alloc] initWithString:self attributes:attributes];
-        frameSetter = CTFramesetterCreateWithAttributedString(string),
-        path = CGPathCreateMutable();
-
-    CGPathAddRect(path, nil, aRect);
-    
-    var frame = CTFramesetterCreateFrame(frameSetter, CPMakeRange(0, [string length]), path, nil);
-
-    CTFrameDraw(frame, context);
-}
-
-@end

AppKit/CPStringDrawing.j

@@ -22,23 +22,15 @@
 
 @import <Foundation/CPString.j>
 
-@import "CPPlatformString.j"
+#include "CoreGraphics/CGGeometry.h"
+#include "Platform/Platform.h"
 
 
-var CPStringSizeWithFontInWidthCache = {};
-
-CPStringSizeCachingEnabled = YES;
+var CPStringReferenceElement    = nil,
+    CPStringDefaultFont         = nil;
 
 @implementation CPString (CPStringDrawing)
 
-/*!
-    Returns a dictionary with the items "ascender", "descender", "lineHeight"
-*/
-+ (CPDictionary)metricsOfFont:(CPFont)aFont
-{
-    return [CPPlatformString metricsOfFont:aFont];
-}
-
 /*!
     Returns the string
 */
@@ -54,19 +46,75 @@ CPStringSizeCachingEnabled = YES;
 
 - (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
 {
-    if (!CPStringSizeCachingEnabled)
-        return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
-
-    var cacheKey = self + [aFont cssString] + aWidth,
-        size = CPStringSizeWithFontInWidthCache[cacheKey];
-
-    if (size === undefined)
+#if PLATFORM(DOM)
+    if (!CPStringReferenceElement)
     {
-        size = [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
-        CPStringSizeWithFontInWidthCache[cacheKey] = size;
+        CPStringReferenceElement = document.createElement("span");
+        
+        var style = CPStringReferenceElement.style;
+        
+        style.position = "absolute";
+        style.whiteSpace = "pre";
+        style.visibility = "visible";
+        style.padding = "0px";
+        style.margin = "0px";
+        
+        style.left = "-100000px";
+        style.top = "-100000px";
+        style.zIndex = "10000";
+        style.background = "red";
+        
+        document.getElementsByTagName("body")[0].appendChild(CPStringReferenceElement);
     }
 
-    return CGSizeMakeCopy(size);
+    if (!aFont)
+    {
+        if (!CPStringDefaultFont)
+            CPStringDefaultFont = [CPFont systemFontOfSize:12.0];
+        
+        aFont = CPStringDefaultFont;
+    }
+
+    var style = CPStringReferenceElement.style;
+    
+    if (aWidth === NULL)
+    {
+        style.width = "";
+        style.whiteSpace = "pre";
+    }
+    
+    else
+    {
+        style.width = ROUND(aWidth) + "px";
+        
+        if (document.attachEvent)
+            style.wordWrap = "break-word";
+        
+        else
+        {
+            style.whiteSpace = "-o-pre-wrap";
+            style.whiteSpace = "-pre-wrap";
+            style.whiteSpace = "-moz-pre-wrap";
+            style.whiteSpace = "pre-wrap";
+        }
+    }
+
+    style.font = [aFont cssString];
+
+    if (CPFeatureIsCompatible(CPJavascriptInnerTextFeature))
+        CPStringReferenceElement.innerText = self;
+    
+    else if (CPFeatureIsCompatible(CPJavascriptTextContentFeature))
+        CPStringReferenceElement.textContent = self;
+
+    return _CGSizeMake(CPStringReferenceElement.clientWidth, CPStringReferenceElement.clientHeight);
+#endif
+    return _CGSizeMakeZero();
+}
+
++ (void)_resetSize
+{
+    CPStringReferenceElement = nil;
 }
 
 @end

AppKit/CPTabViewItem.j

@@ -22,7 +22,7 @@
 
 @import <Foundation/CPObject.j>
 
-@import "CPView.j"
+@import <AppKit/CPView.j>
 
 
 /*
@@ -44,7 +44,7 @@ CPBackgroundTab = 1;
 */
 CPPressedTab    = 2;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPTabViewItem
 
@@ -55,16 +55,9 @@ CPPressedTab    = 2;
 {
     id          _identifier;
     CPString    _label;
-
+    
     CPView      _view;
     CPView      _auxiliaryView;
-
-    CPTabView   _tabView;
-}
-
-- (id)init
-{
-    return [self initWithIdentifier:@""];
 }
 
 /*!
@@ -74,10 +67,10 @@ CPPressedTab    = 2;
 - (id)initWithIdentifier:(id)anIdentifier
 {
     self = [super init];
-
+    
     if (self)
         _identifier = anIdentifier;
-
+        
     return self;
 }
 
@@ -145,8 +138,8 @@ CPPressedTab    = 2;
 
 // Assigning an Auxiliary View
 /*!
-    Sets the tab's auxiliary view.
-    @param anAuxiliaryView the new auxiliary view
+    Sets the tab's auxillary view.
+    @param anAuxillaryView the new auxillary view
 */
 - (void)setAuxiliaryView:(CPView)anAuxiliaryView
 {
@@ -154,7 +147,7 @@ CPPressedTab    = 2;
 }
 
 /*!
-    Returns the tab's auxiliary view
+    Returns the tab's auxillary view
 */
 - (CPView)auxiliaryView
 {
@@ -170,14 +163,6 @@ CPPressedTab    = 2;
     return _tabView;
 }
 
-/*!
-    @ignore
-*/
-- (void)_setTabView:(CPTabView)aView
-{
-    _tabView = aView;
-}
-
 @end
 
 var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
@@ -191,16 +176,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 +193,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/CPTableHeaderView.j

@@ -1,692 +0,0 @@
-/*
- * CPTableHeaderView.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/CPIndexSet.j>
-
-@import "CPTableColumn.j"
-@import "CPTableView.j"
-@import "CPView.j"
-
-
-@implementation _CPTableColumnHeaderView : CPView
-{
-    _CPImageAndTextView     _textField;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"columnHeader";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
-                                       forKeys:[@"background-color", @"text-alignment", @"text-inset", @"text-color", @"text-font", @"text-shadow-color", @"text-shadow-offset"]];
-}
-
-- (void)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self)
-        [self _init];
-
-    return self;
-}
-
-- (void)_init
-{
-    _textField = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
-
-    [_textField setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    [_textField setLineBreakMode:CPLineBreakByTruncatingTail];
-    [_textField setAlignment:CPLeftTextAlignment];
-    [_textField setVerticalAlignment:CPCenterVerticalTextAlignment];
-
-    [self addSubview:_textField];
-}
-
-- (void)layoutSubviews
-{
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color"]];
-
-    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:@"text-font"]];
-    [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
-    [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
-    [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
-}
-
-- (void)setStringValue:(CPString)string
-{
-    [_textField setText:string];
-}
-
-- (CPString)stringValue
-{
-    return [_textField text];
-}
-
-- (void)textField
-{
-    return _textField;
-}
-
-- (void)sizeToFit
-{
-    [_textField sizeToFit];
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    [self setValue:aFont forThemeAttribute:"text-font"];
-}
-
-- (void)_setIndicatorImage:(CPImage)anImage
-{
-    if (anImage)
-    {
-        [_textField setImage:anImage];
-        [_textField setImagePosition:CPImageRight];
-    }
-    else
-    {
-        [_textField setImagePosition:CPNoImage];
-    }
-}
-
-@end
-
-var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
-    _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
-    _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
-
-@implementation _CPTableColumnHeaderView (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        [self _init];
-        [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
-        [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
-        [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
-    }
-
-    return self;
-}
-
-- (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];
-}
-
-@end
-
-@implementation CPTableHeaderView : CPView
-{
-    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 [CPDictionary dictionaryWithObjects:[[CPNull null], [CPColor grayColor]]
-                                       forKeys:[@"background-color", @"divider-color"]];
-}
-
-- (void)_init
-{
-    _mouseDownLocation = _CGPointMakeZero();
-    _previousTrackingLocation = _CGPointMakeZero();
-    _activeColumn = -1;
-    _pressedColumn = -1;
-
-    _isResizing = NO;
-    _isDragging = NO;
-    _isTrackingColumn = NO;
-    _drawsColumnLines = YES;
-
-    _columnOldWidth = 0.0;
-
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color"]];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-        [self _init];
-
-    return self;
-}
-
-- (int)columnAtPoint:(CGPoint)aPoint
-{
-    return [_tableView columnAtPoint:CGPointMake(aPoint.x, aPoint.y)];
-}
-
-- (CGRect)headerRectOfColumn:(int)aColumnIndex
-{
-    var headerRect = CGRectMakeCopy([self bounds]),
-        columnRect = [_tableView rectOfColumn:aColumnIndex];
-
-    headerRect.origin.x = _CGRectGetMinX(columnRect);
-    headerRect.size.width = _CGRectGetWidth(columnRect);
-
-    return headerRect;
-}
-
-- (void)setDrawsColumnLines:(BOOL)aFlag
-{
-    _drawsColumnLines = aFlag;
-}
-
-- (BOOL)drawsColumnLines
-{
-    return _drawsColumnLines;
-}
-
-- (CGRect)_cursorRectForColumn:(int)column
-{
-    if (column == -1 || !([_tableView._tableColumns[column] resizingMask] & CPTableColumnUserResizingMask))
-        return _CGRectMakeZero();
-
-    var rect = [self headerRectOfColumn:column];
-
-    rect.origin.x = _CGRectGetMaxX(rect) - 5;
-    rect.size.width = 20;
-
-    return rect;
-}
-
-- (void)_setPressedColumn:(CPInteger)column
-{
-    if (_pressedColumn != -1)
-    {
-        var headerView = [_tableView._tableColumns[_pressedColumn] headerView];
-        [headerView unsetThemeState:CPThemeStateHighlighted];
-    }
-
-    if (column != -1)
-    {
-        var headerView = [_tableView._tableColumns[column] headerView];
-        [headerView setThemeState:CPThemeStateHighlighted];
-    }
-
-    _pressedColumn = column;
-}
-
-- (void)mouseDown:(CPEvent)theEvent
-{
-    [self trackMouse:theEvent];
-}
-
-- (void)trackMouse:(CPEvent)theEvent
-{
-    var type = [theEvent type],
-        currentLocation = [self convertPoint:[theEvent locationInWindow] fromView:nil];
-
-    // Take the right columns resize tracking area into account
-    currentLocation.x -= 5.0;
-
-    var columnIndex = [self columnAtPoint:currentLocation],
-        shouldResize = [self shouldResizeTableColumn:columnIndex at:_CGPointMake(currentLocation.x + 5.0, currentLocation.y)];
-
-    if (type === CPLeftMouseUp)
-    {
-        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
-        {
-            [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];
-
-            } else if (_isTrackingColumn && _pressedColumn !== -1)
-                [self stopTrackingTableColumn:_activeColumn at:currentLocation];
-        }
-    }
-
-    _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];
-}
-
-- (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
-{
-    // never get stuck in resize cursor mode (FIXME take out when we turn on tracking rects)
-    if (![_tableView allowsColumnResizing] || ([theEvent type] === CPLeftMouseUp && ![[self window] acceptsMouseMovedEvents]))
-    {
-        [[CPCursor arrowCursor] set];
-        return;
-    }
-
-    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))
-    {
-        var tableColumn = [[_tableView tableColumns] objectAtIndex:overColumn],
-            width = [tableColumn width];
-
-        if (width == [tableColumn minWidth])
-            [[CPCursor resizeRightCursor] set];
-        else if (width == [tableColumn maxWidth])
-            [[CPCursor resizeLeftCursor] set];
-        else
-            [[CPCursor resizeLeftRightCursor] set];
-    }
-    else
-        [[CPCursor arrowCursor] set];
-}
-
-- (void)mouseEntered:(CPEvent)theEvent
-{
-    [self _updateResizeCursor:theEvent];
-}
-
-- (void)mouseMoved:(CPEvent)theEvent
-{
-    [self _updateResizeCursor:theEvent];
-}
-
-- (void)mouseExited:(CPEvent)theEvent
-{
-    // FIXME: we should use CPCursor push/pop (if previous currentCursor != arrow).
-    [[CPCursor arrowCursor] set];
-}
-
-- (void)layoutSubviews
-{
-    var tableColumns = [_tableView tableColumns],
-        count = [tableColumns count];
-
-    for (var i = 0; i < count; i++)
-    {
-        var column = [tableColumns objectAtIndex: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;
-        // 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)
-            [self addSubview:headerView];
-    }
-
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"background-color"]];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    if (!_tableView || ![self drawsColumnLines])
-        return;
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        exposedColumnIndexes = [_tableView columnIndexesInRect:aRect],
-        columnsArray = [],
-        tableColumns = [_tableView tableColumns],
-        exposedTableColumns = _tableView._exposedColumns,
-        firstIndex = [exposedTableColumns firstIndex],
-        exposedRange = CPMakeRange(firstIndex, [exposedTableColumns lastIndex] - firstIndex + 1);
-
-    CGContextSetLineWidth(context, 1);
-    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++)
-    {
-        // grab each column rect and add vertical lines
-        var columnIndex = columnsArray[columnArrayIndex],
-            columnToStroke = [self headerRectOfColumn:columnIndex];
-
-        columnMaxX = _CGRectGetMaxX(columnToStroke);
-
-        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
-    }
-    CGContextClosePath(context);
-    CGContextStrokePath(context);
-
-    /*if (_isDragging)
-    {
-        CGContextSetFillColor(context, [CPColor grayColor]);
-        CGContextFillRect(context, [self headerRectOfColumn:_activeColumn])
-    }*/
-}
-
-@end
-
-var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey",
-    CPTableHeaderViewDrawsColumnLines = @"CPTableHeaderViewDrawsColumnLines";
-
-@implementation CPTableHeaderView (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        [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;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    [aCoder encodeObject:_tableView forKey:CPTableHeaderViewTableViewKey];
-    [aCoder encodeBool:_drawsColumnLines forKey:CPTableHeaderViewDrawsColumnLines];
-}
-
-@end

AppKit/CPText.j

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

@@ -22,12 +22,10 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPKeyedUnarchiver.j>
 
 
-var CPThemesByName          = { },
-    CPThemeDefaultTheme     = nil,
-    CPThemeDefaultHudTheme  = nil;
+var CPThemesByName      = { },
+    CPThemeDefaultTheme = nil;
 
 
 /*!
@@ -50,27 +48,6 @@ 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];
@@ -96,110 +73,9 @@ var CPThemesByName          = { },
     return _name;
 }
 
-/*!
-    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
+- (_CPThemeAttribute)_attributeWithName:(CPString)aName forClass:(CPString)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([anObject class]));
-                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];
+    var attributes = [_attributes objectForKey:aClass];
 
     if (!attributes)
         return nil;
@@ -207,53 +83,12 @@ 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 themeClass];
+        objectThemeClass = [[anObject class] themeClass];
 
     while (attributeName = [attributeNames nextObject])
         [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
@@ -405,12 +240,8 @@ 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");
@@ -423,10 +254,10 @@ CPThemeStateCircular        = CPThemeState("circular");
 {
     CPString            _name;
     id                  _defaultValue;
-    CPDictionary        _values @accessors(readonly, getter=values);
+    CPDictionary        _values;
 
     JSObject            _cache;
-    _CPThemeAttribute   _parentAttribute;
+    CPThemeAttribute    _parentAttribute;
 }
 
 - (id)initWithName:(CPString)aName defaultValue:(id)aDefaultValue
@@ -547,7 +378,7 @@ CPThemeStateCircular        = CPThemeState("circular");
     return value;
 }
 
-- (void)setParentAttribute:(_CPThemeAttribute)anAttribute
+- (void)setParentAttribute:(CPThemeAttribute)anAttribute
 {
     if (_parentAttribute === anAttribute)
         return;
@@ -556,7 +387,7 @@ CPThemeStateCircular        = CPThemeState("circular");
     _parentAttribute = anAttribute;
 }
 
-- (_CPThemeAttribute)attributeMergedWithAttribute:(_CPThemeAttribute)anAttribute
+- (CPThemeAttribute)attributeMergedWithAttribute:(_CPThemeAttribute)anAttribute
 {
     var mergedAttribute = [[_CPThemeAttribute alloc] initWithName:_name defaultValue:_defaultValue];
 
@@ -641,15 +472,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)
@@ -700,7 +531,7 @@ function CPThemeAttributeEncode(aCoder, aThemeAttribute)
 
 function CPThemeAttributeDecode(aCoder, anAttributeName, aDefaultValue, aTheme, aClass)
 {
-    var key = "$a" + anAttributeName;
+    var key =  "$a" + anAttributeName;
 
     if (![aCoder containsValueForKey:key])
         var attribute = [[_CPThemeAttribute alloc] initWithName:anAttributeName defaultValue:aDefaultValue];
@@ -720,38 +551,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;
 }
-
-/* TO AUTO CREATE THESE:
-function bit_count(bits)
-    {
-        var count = 0;
-
-        while (bits)
-        {
-            ++count;
-            bits &= (bits - 1);
-        }
-
-        return count ;
-    }
-
-zeros = "000000000";
-
-function pad(string, digits)
-{
-    return zeros.substr(0, digits - string.length) + string;
-}
-
-var str = ""
-str += '[';
-for (i = 0;i < Math.pow(2,6);++i)
-{
-    str += bit_count(i) + " /*" + pad(i.toString(2),6) + "*" + "/, ";
-}
-print(str+']');
-
-*/

AppKit/CPThemeBlend.j

@@ -22,10 +22,9 @@
 
 @import <Foundation/CPObject.j>
 
-@import "CPTheme.j"
-@import "_CPCibCustomResource.j"
-@import "_CPCibKeyedUnarchiver.j"
-
+@import <AppKit/CPTheme.j>
+@import <AppKit/_CPCibCustomResource.j>
+@import <AppKit/_CPCibKeyedUnarchiver.j>
 
 /*!
     @ingroup appkit
@@ -34,69 +33,52 @@
 @implementation CPThemeBlend : CPObject
 {
     CPBundle    _bundle;
-    CPArray     _themes;
+    CPArray     _themes @accessors(readonly, getter=themes);
     id          _loadDelegate;
 }
 
 - (id)initWithContentsOfURL:(CPURL)aURL
 {
     self = [super init];
-
+    
     if (self)
     {
-        _bundle = [[CPBundle alloc] initWithPath:aURL];
+        _bundle = [[CPBundle alloc] initWithPath:aURL + "/Info.plist"];
     }
-
+    
     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
 {
-    _themes = [_bundle objectForInfoDictionaryKey:@"CPKeyedThemes"];
-
-    var count = _themes.length;
-
+    var paths = [_bundle objectForInfoDictionaryKey:@"CPBundleReplacedFiles"],
+        index = 0,
+        count = paths.length,
+        bundlePath = [_bundle bundlePath];
+    
     while (count--)
     {
-        var path = [aBundle pathForResource:_themes[count]],
-            unarchiver = [[_CPThemeKeyedUnarchiver alloc]
-                            initForReadingWithData:[[CPURL URLWithString:path] staticResourceData]
-                            bundle:_bundle];
+        var path = paths[count];
+        
+        if ([path pathExtension] === "keyedtheme")
+        {
+            var unarchiver = [[_CPThemeKeyedUnarchiver alloc]
+                initForReadingWithData:[CPData dataWithString:objj_files[bundlePath + '/' + path].contents]
+                                bundle:_bundle];
 
-        [unarchiver decodeObjectForKey:@"root"];
+            [unarchiver decodeObjectForKey:@"root"];
 
-        [unarchiver finishDecoding];
+            [unarchiver finishDecoding];
+        }
     }
-
+    
     [_loadDelegate blendDidFinishLoading:self];
 }
 

AppKit/CPToolbarItem.j

@@ -23,24 +23,40 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPString.j>
 
-@import "CPImage.j"
-@import "CPView.j"
+@import <AppKit/CPImage.j>
+@import <AppKit/CPView.j>
 
 
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityStandard = 0;
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityLow      = -1000;
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityHigh     = 1000;
+/*
+    @global
+    @class CPToolbarItem
+*/
 CPToolbarItemVisibilityPriorityUser     = 2000;
 
-CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItem";
-CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItem";
-CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItem";
-CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItem";
-CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItem";
-CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItem";
-CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
+CPToolbarSeparatorItemIdentifier        = @"CPToolbarSeparatorItemIdentifier";
+CPToolbarSpaceItemIdentifier            = @"CPToolbarSpaceItemIdentifier";
+CPToolbarFlexibleSpaceItemIdentifier    = @"CPToolbarFlexibleSpaceItemIdentifier";
+CPToolbarShowColorsItemIdentifier       = @"CPToolbarShowColorsItemIdentifier";
+CPToolbarShowFontsItemIdentifier        = @"CPToolbarShowFontsItemIdentifier";
+CPToolbarCustomizeToolbarItemIdentifier = @"CPToolbarCustomizeToolbarItemIdentifier";
+CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItemIdentifier";
 
-/*!
+/*! 
     @ingroup appkit
     @class CPToolbarItem
 
@@ -49,9 +65,9 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 @implementation CPToolbarItem : CPObject
 {
     CPString    _itemIdentifier;
-
+    
     CPToolbar   _toolbar;
-
+    
     CPString    _label;
     CPString    _paletteLabel;
     CPString    _toolTip;
@@ -61,20 +77,13 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
     BOOL        _isEnabled;
     CPImage     _image;
     CPImage     _alternateImage;
-
+    
     CPView      _view;
-
+    
     CGSize      _minSize;
-    CGSize      _maxSize;
-
+    CGSize      _maxSize;    
+    
     int         _visibilityPriority;
-
-    BOOL        _autovalidates;
-}
-
-- (id)init
-{
-    return [self initWithItemIdentifier:@""];
 }
 
 // Creating a Toolbar Item
@@ -86,21 +95,20 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 - (id)initWithItemIdentifier:(CPString)anItemIdentifier
 {
     self = [super init];
-
+    
     if (self)
     {
         _itemIdentifier = anItemIdentifier;
-
+     
         _tag = 0;
         _isEnabled = YES;
-
+     
         _minSize = CGSizeMakeZero();
         _maxSize = CGSizeMakeZero();
-
+     
         _visibilityPriority = CPToolbarItemVisibilityPriorityStandard;
-        _autovalidates = YES;
     }
-
+    
     return self;
 }
 
@@ -121,12 +129,6 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
     return _toolbar;
 }
 
-/* @ignore */
-- (void)_setToolbar:(CPToolbar)aToolbar
-{
-    _toolbar = aToolbar;
-}
-
 /*!
     Returns the item's label
 */
@@ -170,7 +172,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if ([_view respondsToSelector:@selector(toolTip)])
         return [_view toolTip];
-
+    
     return _toolTip;
 }
 
@@ -181,8 +183,8 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 - (void)setToolTip:(CPString)aToolTip
 {
     if ([_view respondsToSelector:@selector(setToolTip:)])
-        [_view setToolTip:aToolTip];
-
+        [view setToolTip:aToolTip];
+    
     _toolTip = aToolTip;
 }
 
@@ -193,7 +195,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if ([_view respondsToSelector:@selector(tag)])
         return [_view tag];
-
+    
     return _tag;
 }
 
@@ -205,7 +207,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if ([_view respondsToSelector:@selector(setTag:)])
         [_view setTag:aTag];
-
+    
     _tag = aTag;
 }
 
@@ -216,12 +218,12 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if (_view)
         return [_view respondsToSelector:@selector(target)] ? [_view target] : nil;
-
+    
     return _target;
 }
 
 /*!
-    Sets the target of the action that is triggered when the user clicks this item. \c nil will cause
+    Sets the target of the action that is triggered when the user clicks this item. <code>nil</code> will cause 
     the action to be passed on to the first responder.
     @param aTarget the new target
 */
@@ -229,7 +231,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if (!_view)
         _target = aTarget;
-
+    
     else if ([_view respondsToSelector:@selector(setTarget:)])
         [_view setTarget:aTarget];
 }
@@ -241,7 +243,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if (_view)
         return [_view respondsToSelector:@selector(action)] ? [_view action] : nil;
-
+    
     return _action;
 }
 
@@ -259,25 +261,25 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 }
 
 /*!
-    Returns \c YES if the item is enabled.
+    Returns <code>YES</code> if the item is enabled.
 */
 - (BOOL)isEnabled
 {
     if ([_view respondsToSelector:@selector(isEnabled)])
         return [_view isEnabled];
-
+    
     return _isEnabled;
 }
 
 /*!
     Sets whether the item is enabled.
-    @param aFlag \c YES enables the item
+    @param aFlag <code>YES</code> enables the item
 */
 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
     if ([_view respondsToSelector:@selector(setEnabled:)])
         [_view setEnabled:shouldBeEnabled];
-
+    
     _isEnabled = shouldBeEnabled;
 }
 
@@ -288,7 +290,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if ([_view respondsToSelector:@selector(image)])
         return [_view image];
-
+        
     return _image;
 }
 
@@ -302,12 +304,12 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
         [_view setImage:anImage];
 
     _image = anImage;
-
+    
     if (!_image)
         return;
-
-    if (_minSize.width === 0 && _minSize.height === 0 &&
-        _maxSize.width === 0 && _maxSize.height === 0)
+    
+    if (_minSize.width == 0 && _minSize.height == 0 && 
+        _maxSize.width == 0 && _maxSize.height == 0)
     {
         var imageSize = [_image size];
 
@@ -327,7 +329,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if ([_view respondsToSelector:@selector(setAlternateImage:)])
         [_view setAlternateImage:anImage];
-
+    
     _alternateImage = anImage;
 }
 
@@ -338,7 +340,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if ([_view respondsToSelector:@selector(alternateIamge)])
         return [_view alternateImage];
-
+    
     return _alternateImage;
 }
 
@@ -358,7 +360,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 {
     if (_view == aView)
         return;
-
+    
     _view = aView;
 
     if (_view)
@@ -366,7 +368,7 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
         // Tags get forwarded.
         if (_tag !== 0 && [_view respondsToSelector:@selector(setTag:)])
             [_view setTag:_tag];
-
+        
         _target = nil;
         _action = nil;
     }
@@ -386,11 +388,8 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setMinSize:(CGSize)aMinSize
 {
-    if (!aMinSize.height || !aMinSize.width)
-        return;
-
     _minSize = CGSizeMakeCopy(aMinSize);
-
+    
     // Try to provide some sanity: Make maxSize >= minSize
     _maxSize = CGSizeMake(MAX(_minSize.width, _maxSize.width), MAX(_minSize.height, _maxSize.height));
 }
@@ -409,11 +408,8 @@ CPToolbarPrintItemIdentifier            = @"CPToolbarPrintItem";
 */
 - (void)setMaxSize:(CGSize)aMaxSize
 {
-    if (!aMaxSize.height || !aMaxSize.width)
-        return;
-
     _maxSize = CGSizeMakeCopy(aMaxSize);
-
+    
     // Try to provide some sanity: Make minSize <= maxSize
     _minSize = CGSizeMake(MIN(_minSize.width, _maxSize.width), MIN(_minSize.height, _maxSize.height));
 }
@@ -448,127 +444,6 @@ CPToolbarItemVisibilityPriorityUser
     _visibilityPriority = aVisibilityPriority;
 }
 
-- (void)validate
-{
-    var action = [self action],
-        target = [self target];
-
-    // View items do not do any target-action analysis.
-    if (_view)
-    {
-        if ([target respondsToSelector:@selector(validateToolbarItem:)])
-            [self setEnabled:[target validateToolbarItem:self]];
-
-        return;
-    }
-
-    if (!action)
-        return [self setEnabled:NO];
-
-    if (target && ![target respondsToSelector:action])
-        return [self setEnabled:NO];
-
-    target = [CPApp targetForAction:action to:target from:self];
-
-    if (!target)
-        return [self setEnabled:NO];
-
-    if ([target respondsToSelector:@selector(validateToolbarItem:)])
-        [self setEnabled:[target validateToolbarItem:self]];
-    else
-        [self setEnabled:YES];
-}
-
-- (BOOL)autovalidates
-{
-    return _autovalidates;
-}
-
-- (void)setAutovalidates:(BOOL)shouldAutovalidate
-{
-    _autovalidates = !!shouldAutovalidate;
-}
-
-@end
-
-var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
-    CPToolbarItemLabelKey               = @"CPToolbarItemLabelKey",
-    CPToolbarItemPaletteLabelKey        = @"CPToolbarItemPaletteLabelKey",
-    CPToolbarItemToolTipKey             = @"CPToolbarItemToolTipKey",
-    CPToolbarItemTagKey                 = @"CPToolbarItemTagKey",
-    CPToolbarItemTargetKey              = @"CPToolbarItemTargetKey",
-    CPToolbarItemActionKey              = @"CPToolbarItemActionKey",
-    CPToolbarItemEnabledKey             = @"CPToolbarItemEnabledKey",
-    CPToolbarItemImageKey               = @"CPToolbarItemImageKey",
-    CPToolbarItemAlternateImageKey      = @"CPToolbarItemAlternateImageKey",
-    CPToolbarItemViewKey                = @"CPToolbarItemViewKey",
-    CPToolbarItemMinSizeKey             = @"CPToolbarItemMinSizeKey",
-    CPToolbarItemMaxSizeKey             = @"CPToolbarItemMaxSizeKey",
-    CPToolbarItemVisibilityPriorityKey  = @"CPToolbarItemVisibilityPriorityKey",
-    CPToolbarItemAutovalidatesKey       = @"CPToolbarItemAutovalidatesKey";
-
-@implementation CPToolbarItem (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _itemIdentifier = [aCoder decodeObjectForKey:CPToolbarItemItemIdentifierKey];
-
-        _minSize = [aCoder decodeSizeForKey:CPToolbarItemMinSizeKey];
-        _maxSize = [aCoder decodeSizeForKey:CPToolbarItemMaxSizeKey];
-
-        [self setLabel:[aCoder decodeObjectForKey:CPToolbarItemLabelKey]];
-        [self setPaletteLabel:[aCoder decodeObjectForKey:CPToolbarItemPaletteLabelKey]];
-        [self setToolTip:[aCoder decodeObjectForKey:CPToolbarItemToolTipKey]];
-
-        [self setTag:[aCoder decodeObjectForKey:CPToolbarItemTagKey]];
-        [self setTarget:[aCoder decodeObjectForKey:CPToolbarItemTargetKey]];
-        [self setAction:CPSelectorFromString([aCoder decodeObjectForKey:CPToolbarItemActionKey])];
-
-        [self setEnabled:[aCoder decodeBoolForKey:CPToolbarItemEnabledKey]];
-
-        [self setImage:[aCoder decodeObjectForKey:CPToolbarItemImageKey]];
-        [self setAlternateImage:[aCoder decodeObjectForKey:CPToolbarItemAlternateImageKey]];
-
-        [self setView:[aCoder decodeObjectForKey:CPToolbarItemViewKey]];
-
-        [self setVisibilityPriority:[aCoder decodeIntForKey:CPToolbarItemVisibilityPriorityKey]];
-        [self setAutovalidates:[aCoder decodeBoolForKey:CPToolbarItemAutovalidatesKey]];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_itemIdentifier forKey:CPToolbarItemItemIdentifierKey];
-
-    [aCoder encodeObject:[self label] forKey:CPToolbarItemLabelKey];
-    [aCoder encodeObject:[self paletteLabel] forKey:CPToolbarItemPaletteLabelKey];
-
-    [aCoder encodeObject:[self toolTip] forKey:CPToolbarItemToolTipKey];
-
-    [aCoder encodeObject:[self tag] forKey:CPToolbarItemTagKey];
-    [aCoder encodeObject:[self target] forKey:CPToolbarItemTargetKey];
-    [aCoder encodeObject:[self action] forKey:CPToolbarItemActionKey];
-
-    [aCoder encodeObject:[self isEnabled] forKey:CPToolbarItemEnabledKey];
-
-    [aCoder encodeObject:[self image] forKey:CPToolbarItemImageKey];
-    [aCoder encodeObject:[self alternateImage] forKey:CPToolbarItemAlternateImageKey];
-
-    [aCoder encodeObject:[self view] forKey:CPToolbarItemViewKey];
-
-    [aCoder encodeSize:[self minSize] forKey:CPToolbarItemMinSizeKey];
-    [aCoder encodeSize:[self maxSize] forKey:CPToolbarItemMaxSizeKey];
-
-    [aCoder encodeObject:[self visibilityPriority] forKey:CPToolbarItemVisibilityPriorityKey];
-    [aCoder encodeBool:[self autovalidates] forKey:CPToolbarItemAutovalidatesKey];
-}
-
 @end
 
 @implementation CPToolbarItem (CPCopying)
@@ -576,12 +451,10 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 - (id)copy
 {
     var copy = [[[self class] alloc] initWithItemIdentifier:_itemIdentifier];
-
+    
     if (_view)
         [copy setView:[CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:_view]]];
-
-    [copy _setToolbar:_toolbar];
-
+    
     [copy setLabel:_label];
     [copy setPaletteLabel:_paletteLabel];
     [copy setToolTip:[self toolTip]];
@@ -589,7 +462,7 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
     [copy setTag:[self tag]];
     [copy setTarget:[self target]];
     [copy setAction:[self action]];
-
+    
     [copy setEnabled:[self isEnabled]];
 
     [copy setImage:[self image]];
@@ -597,10 +470,9 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 
     [copy setMinSize:_minSize];
     [copy setMaxSize:_maxSize];
-
-    [copy setVisibilityPriority:[self visibilityPriority]];
-    [copy setAutovalidates:[self autovalidates]];
-
+    
+    [copy setVisibilityPriority:_visibilityPriority];
+    
     return copy;
 }
 
@@ -608,29 +480,68 @@ var CPToolbarItemItemIdentifierKey      = @"CPToolbarItemItemIdentifierKey",
 
 // Standard toolbar identifiers
 
+var _CPToolbarSeparatorItemView = nil,
+    _CPToolbarSpaceItemView     = nil;
+
 @implementation CPToolbarItem (Standard)
 
++ (CPView)_separatorItemView
+{
+    if (!_CPToolbarSeparatorItemView)
+    {
+        _CPToolbarSeparatorItemView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 2.0, 32.0)];
+        
+        sizes = {};
+        sizes[@"CPToolbarItemSeparator"] = [CGSizeMake(2.0, 26.0), CGSizeMake(2.0, 1.0), CGSizeMake(2.0, 26.0)];
+        [_CPToolbarSeparatorItemView setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
+    }
+
+    return _CPToolbarSeparatorItemView;
+}
+
++ (CPView)_spaceItemView
+{
+    if (!_CPToolbarSpaceItemView)
+        _CPToolbarSpaceItemView = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    
+    return _CPToolbarSpaceItemView;
+}
+
 /* @ignore */
 + (CPToolbarItem)_standardItemWithItemIdentifier:(CPString)anItemIdentifier
 {
+    var item = [[CPToolbarItem alloc] initWithItemIdentifier:anItemIdentifier];                                                        
+
     switch (anItemIdentifier)
     {
-        case CPToolbarSeparatorItemIdentifier:          return [_CPToolbarSeparatorItem new];
-        case CPToolbarSpaceItemIdentifier:              return [_CPToolbarSpaceItem new];
-        case CPToolbarFlexibleSpaceItemIdentifier:      return [_CPToolbarFlexibleSpaceItem new];
-        case CPToolbarShowColorsItemIdentifier:         return [_CPToolbarShowColorsItem new];
+        case CPToolbarSeparatorItemIdentifier:          [item setView:[self _separatorItemView]];
+                                                        
+                                                        [item setMinSize:CGSizeMake(2.0, 0.0)];
+                                                        [item setMaxSize:CGSizeMake(2.0, 100000.0)];
+                                                        
+                                                        return item;
+
+        case CPToolbarSpaceItemIdentifier:              [item setView:[self _spaceItemView]];
+                                                        
+                                                        [item setMinSize:CGSizeMake(32.0, 32.0)];
+                                                        [item setMaxSize:CGSizeMake(32.0, 32.0)];
+                                                        
+                                                        return item;
+                                                        
+        case CPToolbarFlexibleSpaceItemIdentifier:      [item setView:[self _spaceItemView]];
+        
+                                                        [item setMinSize:CGSizeMake(32.0, 32.0)];
+                                                        [item setMaxSize:CGSizeMake(10000.0, 32.0)];
+                                                        
+                                                        return item;
+                                                        
+        case CPToolbarShowColorsItemIdentifier:         return nil;
         case CPToolbarShowFontsItemIdentifier:          return nil;
         case CPToolbarCustomizeToolbarItemIdentifier:   return nil;
         case CPToolbarPrintItemIdentifier:              return nil;
     }
-
+    
     return nil;
 }
 
 @end
-
-@import "_CPToolbarFlexibleSpaceItem.j"
-@import "_CPToolbarShowColorsItem.j"
-@import "_CPToolbarSeparatorItem.j"
-@import "_CPToolbarSpaceItem.j"
-

AppKit/CPTreeNode.j

@@ -1,132 +0,0 @@
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPIndexPath.j>
-
-
-@implementation CPTreeNode : CPObject
-{
-    id              _representedObject @accessors(readonly, property=representedObject);
-
-    CPTreeNode      _parentNode @accessors(readonly, property=parentNode);
-    CPMutableArray  _childNodes;
-}
-
-+ (id)treeNodeWithRepresentedObject:(id)anObject
-{
-    return [[self alloc] initWithRepresentedObject:anObject];
-}
-
-- (id)initWithRepresentedObject:(id)anObject
-{
-    self = [super init];
-
-    if (self)
-    {
-        _representedObject = anObject;
-        _childNodes = [];
-    }
-
-    return self;
-}
-
-- (BOOL)isLeaf
-{
-    return [_childNodes count] <= 0;
-}
-
-- (CPArray)childNodes
-{
-    return [_childNodes copy];
-}
-
-- (CPMutableArray)mutableChildNodes
-{
-    return [self mutableArrayValueForKey:@"childNodes"];
-}
-
-- (void)insertObject:(id)aTreeNode inChildNodesAtIndex:(CPInteger)anIndex
-{
-    [[aTreeNode._parentNode mutableChildNodes] removeObjectIdenticalTo:aTreeNode];
-
-    aTreeNode._parentNode = self;
-
-    [_childNodes insertObject:aTreeNode atIndex:anIndex];
-}
-
-- (void)removeObjectFromChildNodesAtIndex:(CPInteger)anIndex
-{
-    [_childNodes objectAtIndex:anIndex]._parentNode = nil;
-
-    [_childNodes removeObjectAtIndex:anIndex];
-}
-
-- (void)replaceObjectFromChildNodesAtIndex:(CPInteger)anIndex withObject:(id)aTreeNode
-{
-    var oldTreeNode = [_childNodes objectAtIndex:anIndex];
-
-    oldTreeNode._parentNode = nil;
-    aTreeNode._parentNode = self;
-
-    [_childNodes replaceObjectAtIndex:anIndex withObject:aTreeNode];
-}
-
-- (id)objectInChildNodesAtIndex:(CPInteger)anIndex
-{
-    return _childNodes[anIndex];
-}
-
-- (void)sortWithSortDescriptors:(CPArray)sortDescriptors recursively:(BOOL)shouldSortRecursively
-{
-    [_childNodes sortUsingDescriptors:sortDescriptors];
-
-    if (!shouldSortRecursively)
-        return;
-
-    var count = [_childNodes count];
-
-    while (count--)
-        [_childNodes[count] sortWithSortDescriptors:sortDescriptors recursively:YES];
-}
-
-- (CPTreeNode)descendantNodeAtIndexPath:(CPIndexPath)indexPath
-{
-    var index = 0,
-        count = [indexPath length],
-        node = self;
-
-    for (; index < count; ++index)
-        node = [node objectInChildNodesAtIndex:[indexPath indexAtPosition:index]];
-
-    return node;
-}
-
-@end
-
-var CPTreeNodeRepresentedObjectKey  = @"CPTreeNodeRepresentedObjectKey",
-    CPTreeNodeParentNodeKey         = @"CPTreeNodeParentNodeKey",
-    CPTreeNodeChildNodesKey         = @"CPTreeNodeChildNodesKey";
-
-@implementation CPTreeNode (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _representedObject = [aCoder decodeObjectForKey:CPTreeNodeRepresentedObjectKey];
-        _parentNode = [aCoder decodeObjectForKey:CPTreeNodeParentNodeKey];
-        _childNodes = [aCoder decodeObjectForKey:CPTreeNodeChildNodesKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_representedObject forKey:CPTreeNodeRepresentedObjectKey];
-    [aCoder encodeConditionalObject:_parentNode forKey:CPTreeNodeParentNodeKey];
-    [aCoder encodeObject:_childNodes forKey:CPTreeNodeChildNodesKey];
-}
-
-@end