Merge branch 'master' into @each

Conflicts:
	Foundation/CPArray.j

.gitignore

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

.travis.yml

@@ -1,8 +0,0 @@
-language: node_js
-node_js:
-    - 0.8
-before_install:
-    - jdk_switcher use openjdk6
-install: ./bootstrap.sh --quiet --noprompt --directory ./narwhal
-script: jake test
-env: PATH=$HOME/build/$TRAVIS_REPO_SLUG/narwhal/bin:$PATH CAPP_BUILD=$HOME/build/$TRAVIS_REPO_SLUG/Build NARWHAL_ENGINE=rhino

AppKit/AppKit.j

@@ -20,14 +20,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "_CPToolTip.j"
 @import "CALayer.j"
-@import "CGGeometry.j"
-@import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
 @import "CPApplication.j"
-@import "CPArrayController.j"
 @import "CPBezierPath.j"
 @import "CPBox.j"
 @import "CPBrowser.j"
@@ -35,24 +31,18 @@
 @import "CPButtonBar.j"
 @import "CPCheckBox.j"
 @import "CPCib.j"
-@import "CPCibBindingConnector.j"
 @import "CPCibConnector.j"
 @import "CPCibControlConnector.j"
-@import "CPCibHelpConnector.j"
 @import "CPCibLoading.j"
 @import "CPCibOutletConnector.j"
-@import "CPCibRuntimeAttributesConnector.j"
 @import "CPClipView.j"
 @import "CPCollectionView.j"
 @import "CPCollectionViewItem.j"
 @import "CPColor.j"
 @import "CPColorPanel.j"
-@import "CPColorSpace.j"
 @import "CPColorWell.j"
-@import "CPComboBox.j"
 @import "CPCompatibility.j"
 @import "CPControl.j"
-@import "CPController.j"
 @import "CPCookie.j"
 @import "CPCursor.j"
 @import "CPDocument.j"
@@ -62,26 +52,21 @@
 @import "CPFlashView.j"
 @import "CPFont.j"
 @import "CPFontManager.j"
-@import "CPGradient.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 "CPPopover.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"
@@ -89,23 +74,20 @@
 @import "CPSegmentedControl.j"
 @import "CPShadow.j"
 @import "CPSlider.j"
-@import "CPSound.j"
 @import "CPSplitView.j"
-@import "CPStepper.j"
 @import "CPTableColumn.j"
 @import "CPTableView.j"
 @import "CPTabView.j"
 @import "CPText.j"
 @import "CPTextField.j"
-@import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
+@import "CPTokenField.j"
 @import "CPTreeNode.j"
-@import "CPUserDefaultsController.j"
 @import "CPView.j"
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
 @import "CPWebView.j"
 @import "CPWindow.j"
 @import "CPWindowController.j"
-@import "CPWorkspace.j"
+@import "CPArrayController.j"

AppKit/CPAccordionView.j

@@ -69,7 +69,7 @@
   @class CPAccordionView
 
   <p>CPAccordionView provides a container for CPAccordionViewItem objects and manages layout state
-  for all sub-layout items.</p>
+  for all sublayout items.</p>
 
   <strong>Example</strong><br />
   <pre>
@@ -227,7 +227,7 @@ var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection
 {
     var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
 
-    [indexSet removeIndexes:_expandedItemIndexes];
+    [indexSet removeIndexes:_expandedIndexes];
 
     return indexSet;
 }

AppKit/CPAnimation.j

@@ -21,7 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPTimer.j>
 
 @import "CAMediaTimingFunction.j"
 
@@ -122,30 +121,23 @@ ACTUAL_FRAME_RATE = 0;
 */
 - (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
 {
-    var timingFunctionName;
-
     switch (anAnimationCurve)
     {
-        case CPAnimationEaseInOut:
-            timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
-            break;
+        case CPAnimationEaseInOut:  timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
+                                    break;
 
-        case CPAnimationEaseIn:
-            timingFunctionName = kCAMediaTimingFunctionEaseIn;
-            break;
+        case CPAnimationEaseIn:     timingFunctionName = kCAMediaTimingFunctionEaseIn;
+                                    break;
 
-        case CPAnimationEaseOut:
-            timingFunctionName = kCAMediaTimingFunctionEaseOut;
-            break;
+        case CPAnimationEaseOut:    timingFunctionName = kCAMediaTimingFunctionEaseOut;
+                                    break;
 
-        case CPAnimationLinear:
-            timingFunctionName = kCAMediaTimingFunctionLinear;
-            break;
+        case CPAnimationLinear:     timingFunctionName = kCAMediaTimingFunctionLinear;
+                                    break;
 
-        default:
-            [CPException raise:CPInvalidArgumentException
-                        reason:@"Invalid value provided for animation curve"];
-            break;
+        default:                    [CPException raise:CPInvalidArgumentException
+                                                reason:"Invalid value provided for animation curve"];
+                                    break;
     }
 
     _animationCurve = anAnimationCurve;
@@ -314,16 +306,13 @@ ACTUAL_FRAME_RATE = 0;
     if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
         return [_delegate animation:self valueForProgress:t];
 
-    if (_animationCurve == CPAnimationLinear)
-        return t;
-
     var c1 = [],
         c2 = [];
 
     [_timingFunction getControlPointAtIndex:1 values:c1];
     [_timingFunction getControlPointAtIndex:2 values:c2];
 
-    return CubicBezierAtTime(t, c1[0], c1[1], c2[0], c2[1], _duration);
+    return CubicBezierAtTime(t,c1[0],c1[1],c2[0],c2[1],_duration);
 }
 
 @end
@@ -331,104 +320,28 @@ ACTUAL_FRAME_RATE = 0;
 // currently used function to determine time
 // 1:1 conversion to js from webkit source files
 // UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function(t, p1x, p1y, p2x, p2y, duration)
+var CubicBezierAtTime = function CubicBezierAtTime(t,p1x,p1y,p2x,p2y,duration)
 {
-    var ax = 0,
-        bx = 0,
-        cx = 0,
-        ay = 0,
-        by = 0,
-        cy = 0;
+    var ax=0,bx=0,cx=0,ay=0,by=0,cy=0;
     // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
-    function sampleCurveX(t)
-    {
-        return ((ax * t + bx) * t + cx) * t;
-    }
-
-    function sampleCurveY(t)
-    {
-        return ((ay * t + by) * t + cy) * t;
-    }
-
-    function sampleCurveDerivativeX(t)
-    {
-        return (3.0 * ax * t + 2.0 * bx) * t + cx;
-    }
-
+    function sampleCurveX(t) {return ((ax*t+bx)*t+cx)*t;};
+    function sampleCurveY(t) {return ((ay*t+by)*t+cy)*t;};
+    function sampleCurveDerivativeX(t) {return (3.0*ax*t+2.0*bx)*t+cx;};
     // The epsilon value to pass given that the animation is going to run over |duration| seconds. The longer the animation, the more precision is needed in the timing function result to avoid ugly discontinuities.
-    function solveEpsilon(duration)
-    {
-        return 1.0 / (200.0 * duration);
-    }
-
-    function solve(x, epsilon)
-    {
-        return sampleCurveY(solveCurveX(x, epsilon));
-    }
-
+    function solveEpsilon(duration) {return 1.0/(200.0*duration);};
+    function solve(x,epsilon) {return sampleCurveY(solveCurveX(x,epsilon));};
     // Given an x value, find a parametric value it came from.
-    function solveCurveX(x, epsilon)
-    {
-        var t0,
-            t1,
-            t2 = x,
-            x2,
-            d2,
-            i = 0;
-
+    function solveCurveX(x,epsilon) {var t0,t1,t2,x2,d2,i;
+        function fabs(n) {if(n>=0) {return n;}else {return 0-n;}};
         // 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;
-        }
-
+        for(t2=x, i=0; i<8; i++) {x2=sampleCurveX(t2)-x; if(fabs(x2)<epsilon) {return t2;} d2=sampleCurveDerivativeX(t2); if(fabs(d2)<1e-6) {break;} t2=t2-x2/d2;}
         // 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;
-        }
-
+        t0=0.0; t1=1.0; t2=x; if(t2<t0) {return t0;} if(t2>t1) {return t1;}
+        while(t0<t1) {x2=sampleCurveX(t2); if(fabs(x2-x)<epsilon) {return t2;} if(x>x2) {t0=t2;}else {t1=t2;} t2=(t1-t0)*.5+t0;}
         return t2; // Failure.
     };
     // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
-    cx = 3.0 * p1x;
-    bx = 3.0 * (p2x - p1x) - cx;
-    ax = 1.0 - cx - bx;
-    cy = 3.0 * p1y;
-    by = 3.0 * (p2y - p1y) - cy;
-    ay = 1.0 - cy - by;
-
+    cx=3.0*p1x; bx=3.0*(p2x-p1x)-cx; ax=1.0-cx-bx; cy=3.0*p1y; by=3.0*(p2y-p1y)-cy; ay=1.0-cy-by;
     // Convert from input time to parametric value in curve, then from that to output time.
     return solve(t, solveEpsilon(duration));
 };

AppKit/CPApplication.j

@@ -20,26 +20,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/CPRange.h"
-
 @import <Foundation/CPBundle.j>
 
 @import "CPCompatibility.j"
-@import "CPColorPanel.j"
-@import "CPCursor.j"
-@import "CPDocumentController.j"
 @import "CPEvent.j"
 @import "CPMenu.j"
 @import "CPResponder.j"
+@import "CPDocumentController.j"
 @import "CPThemeBlend.j"
 @import "CPCibLoading.j"
-@import "CPPanel.j"
 @import "CPPlatform.j"
-@import "CPWindowController.j"
+
 
 var CPMainCibFile               = @"CPMainCibFile",
-    CPMainCibFileHumanFriendly  = @"Main cib file base name",
-    CPEventModifierFlags = 0;
+    CPMainCibFileHumanFriendly  = @"Main cib file base name";
 
 CPApp = nil;
 
@@ -63,7 +57,7 @@ CPRunContinuesResponse  = -1002;
     @ingroup appkit
     @class CPApplication
 
-    CPApplication is THE way to start up the Cappuccino framework for your application to use.
+    CPApplication is THE way to start up the Cappucino framework for your application to use.
     Every GUI application has exactly one instance of CPApplication (or of a custom subclass of
     CPApplication). Your program's main() function can create that instance by calling the
     \c CPApplicationMain function. A simple example looks like this:
@@ -89,7 +83,6 @@ CPRunContinuesResponse  = -1002;
     CPArray                 _eventListeners;
 
     CPEvent                 _currentEvent;
-    CPWindow                _lastMouseMoveWindow;
 
     CPArray                 _windows;
     CPWindow                _keyWindow;
@@ -97,6 +90,7 @@ CPRunContinuesResponse  = -1002;
     CPWindow                _previousKeyWindow;
     CPWindow                _previousMainWindow;
 
+    CPMenu                  _mainMenu;
     CPDocumentController    _documentController;
 
     CPModalSession          _currentSession;
@@ -145,7 +139,9 @@ CPRunContinuesResponse  = -1002;
     {
         _eventListeners = [];
 
-        _windows = [[CPNull null]];
+        _windows = [];
+
+        [_windows addObject:nil];
     }
 
     return self;
@@ -224,22 +220,28 @@ CPRunContinuesResponse  = -1002;
     // At this point we clear the window.status to eliminate Safari's "Cancelled" error message
     // The message shouldn't be displayed, because only an XHR is cancelled, but it is a usability issue.
     // We do it here so that applications can change it in willFinish or didFinishLaunching
-#if PLATFORM(DOM)
     window.status = " ";
-#endif
 
     // We also want to set the default cursor on the body, so that buttons and things don't have an iBeam
     [[CPCursor arrowCursor] set];
 
     var bundle = [CPBundle mainBundle],
-        delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
+        types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
+
+    if ([types count] > 0)
+        _documentController = [CPDocumentController sharedDocumentController];
+
+    var delegateClassName = [bundle objectForInfoDictionaryKey:@"CPApplicationDelegateClass"];
 
     if (delegateClassName)
     {
         var delegateClass = objj_getClass(delegateClassName);
 
         if (delegateClass)
-            [self setDelegate:[[delegateClass alloc] init]];
+            if ([_documentController class] == delegateClass)
+                [self setDelegate:_documentController];
+            else
+                [self setDelegate:[[delegateClass alloc] init]];
     }
 
     var defaultCenter = [CPNotificationCenter defaultCenter];
@@ -248,23 +250,13 @@ CPRunContinuesResponse  = -1002;
         postNotificationName:CPApplicationWillFinishLaunchingNotification
         object:self];
 
-    var types = [bundle objectForInfoDictionaryKey:@"CPBundleDocumentTypes"];
-
-    if ([types count] > 0)
-        _documentController = [CPDocumentController sharedDocumentController];
-
     var needsUntitled = !!_documentController,
-        URLStrings = nil;
-
-#if PLATFORM(DOM)
-    URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings();
-#endif
-
-    var index = 0,
+        URLStrings = window.cpOpeningURLStrings && window.cpOpeningURLStrings(),
+        index = 0,
         count = [URLStrings count];
 
     for (; index < count; ++index)
-        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] && needsUntitled;
+        needsUntitled = ![self _openURL:[CPURL URLWithString:URLStrings[index]]] || needsUntitled;
 
     if (needsUntitled && [_delegate respondsToSelector:@selector(applicationShouldOpenUntitledFile:)])
         needsUntitled = [_delegate applicationShouldOpenUntitledFile:self];
@@ -301,21 +293,11 @@ CPRunContinuesResponse  = -1002;
     }
 }
 
-/*!
-    Sets the applications icon image. This image is used in the default "About" window.
-    By default this value is pulled from the CPApplicationIcon key in your info.plist file.
-
-    @param anImage - The image to set.
-*/
 - (void)setApplicationIconImage:(CPImage)anImage
 {
     _applicationIconImage = anImage;
 }
 
-/*!
-    Returns the application icon image. By default this is pulled from the CPApplicationIcon key of info.plist.
-    @return CPImage - Your application icon image.
-*/
 - (CPImage)applicationIconImage
 {
     if (_applicationIconImage)
@@ -328,38 +310,11 @@ CPRunContinuesResponse  = -1002;
     return _applicationIconImage;
 }
 
-/*!
-    Opens the standard about panel with no options.
-*/
 - (void)orderFrontStandardAboutPanel:(id)sender
 {
     [self orderFrontStandardAboutPanelWithOptions:nil];
 }
 
-/*!
-    Opens the standard about panel. This method takes a single argument \c options.
-    Options is a dictionary that can contain any of the following keys:
-    <pre>
-    ApplicationName - The name of your application.
-    ApplicationIcon - Application icon image.
-    Version - The full version of your application
-    ApplicationVersion - The shorter version number of your application.
-    Copyright - Human readable copyright information.
-    </pre>
-
-    If you choose not the include any of the above keys, they will default
-    to the following respective keys in your info.plist file.
-
-    <pre>
-    CPBundleName
-    CPApplicationIcon (through a call to -applicationIconImage, see documentation for that method for more details)
-    CPBundleVersion
-    CPBundleShortVersionString
-    CPHumanReadableCopyright
-    </pre>
-
-    @param options - A dictionary with the aboe listed keys. You can pass nil to default to your plist values.
-*/
 - (void)orderFrontStandardAboutPanelWithOptions:(CPDictionary)options
 {
     if (!_aboutPanel)
@@ -383,7 +338,7 @@ CPRunContinuesResponse  = -1002;
             standardPath = [[CPBundle bundleForClass:[self class]] pathForResource:@"standardApplicationIcon.png"];
 
         // FIXME move this into the CIB eventually
-        [applicationLabel setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 2]];
+        [applicationLabel setFont:[CPFont boldSystemFontOfSize:14.0]];
         [applicationLabel setAlignment:CPCenterTextAlignment];
         [versionLabel setAlignment:CPCenterTextAlignment];
         [copyrightLabel setAlignment:CPCenterTextAlignment];
@@ -410,7 +365,7 @@ CPRunContinuesResponse  = -1002;
 }
 
 
-- (void)_documentController:(CPDocumentController)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
+- (void)_documentController:(NSDocumentController *)docController didCloseAll:(BOOL)didCloseAll context:(Object)info
 {
     // callback method for terminate:
     if (didCloseAll)
@@ -575,7 +530,7 @@ CPRunContinuesResponse  = -1002;
 - (BOOL)_handleKeyEquivalent:(CPEvent)anEvent
 {
     return  [[self keyWindow] performKeyEquivalent:anEvent] ||
-            [[self mainMenu] performKeyEquivalent:anEvent];
+            [_mainMenu performKeyEquivalent:anEvent];
 }
 
 /*!
@@ -585,66 +540,40 @@ CPRunContinuesResponse  = -1002;
 - (void)sendEvent:(CPEvent)anEvent
 {
     _currentEvent = anEvent;
-    CPEventModifierFlags = [anEvent modifierFlags];
 
-    var theWindow = [anEvent window];
-
-#if PLATFORM(DOM)
-    var willPropagate = [[theWindow platformWindow] _willPropagateCurrentDOMEvent];
+    var willPropagate = [[[anEvent window] platformWindow] _willPropagateCurrentDOMEvent];
 
     // temporarily pretend we won't propagate the event. we'll restore the saved value later
     // we do this outside the if so that changes user code might make in _handleKeyEquiv. are preserved
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:NO];
-#endif
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
 
     // Check if this is a candidate for key equivalent...
     if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
     {
-#if PLATFORM(DOM)
         var characters = [anEvent characters],
             modifierFlags = [anEvent modifierFlags];
 
         // Unconditionally propagate on these keys to solve browser copy paste bugs
         if ((characters == "c" || characters == "x" || characters == "v") && (modifierFlags & CPPlatformActionKeyMask))
-            [[theWindow platformWindow] _propagateCurrentDOMEvent:YES];
-#endif
+            [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:YES];
 
         return;
     }
 
-#if PLATFORM(DOM)
     // if we make it this far, then restore the original willPropagate value
-    [[theWindow platformWindow] _propagateCurrentDOMEvent:willPropagate];
-#endif
+    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:willPropagate];
 
     if (_eventListeners.length)
     {
         if (_eventListeners[_eventListeners.length - 1]._mask & (1 << [anEvent type]))
-        {
-            var listener = _eventListeners.pop();
-            listener._callback(anEvent);
+            _eventListeners.pop()._callback(anEvent);
 
-            if (listener._dequeue)
-                return;
-        }
+        return;
     }
 
-    if ([anEvent type] == CPMouseMoved)
-    {
-        if (theWindow !== _lastMouseMoveWindow)
-            [_lastMouseMoveWindow _mouseExitedResizeRect];
-
-        _lastMouseMoveWindow = theWindow;
-    }
-
-    if (theWindow)
-        [theWindow sendEvent:anEvent];
+    [[anEvent window] sendEvent:anEvent];
 }
 
-/*!
-    If the delegate responds to the given selector it will call the method on the delegate,
-    otherwise the method will be passed to CPResponder.
-*/
 - (void)doCommandBySelector:(SEL)aSelector
 {
     if ([_delegate respondsToSelector:aSelector])
@@ -674,10 +603,6 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPWindow)windowWithWindowNumber:(int)aWindowNumber
 {
-    // Never allow _windows[0] to be returned - it's an internal CPNull placeholder.
-    if (!aWindowNumber)
-        return nil;
-
     return _windows[aWindowNumber];
 }
 
@@ -686,8 +611,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPArray)windows
 {
-    // Return all windows, but not the CPNull placeholder in _windows[0].
-    return [_windows subarrayWithRange:_CPMakeRange(1, [_windows count] - 1)];
+    return _windows;
 }
 
 /*!
@@ -713,7 +637,7 @@ CPRunContinuesResponse  = -1002;
 */
 - (CPMenu)mainMenu
 {
-    return [self menu];
+    return _mainMenu;
 }
 
 /*!
@@ -721,30 +645,21 @@ CPRunContinuesResponse  = -1002;
     @param aMenu the menu to set for the application
 */
 - (void)setMainMenu:(CPMenu)aMenu
-{
-    [self setMenu:aMenu];
-}
-
-- (void)setMenu:(CPMenu)aMenu
 {
     if ([aMenu _menuName] === "CPMainMenu")
     {
-        if ([self menu] === aMenu)
+        if (_mainMenu === aMenu)
             return;
 
-        [super setMenu:aMenu];
+        _mainMenu = aMenu;
 
         if ([CPPlatform supportsNativeMainMenu])
-            window.cpSetMainMenu([self menu]);
+            window.cpSetMainMenu(_mainMenu);
     }
     else
         [aMenu _setMenuName:@"CPMainMenu"];
 }
 
-/*!
-    Opens the shared color panel.
-    @param aSender
-*/
 - (void)orderFrontColorPanel:(id)aSender
 {
     [[CPColorPanel sharedColorPanel] orderFront:self];
@@ -913,40 +828,16 @@ CPRunContinuesResponse  = -1002;
     return nil;
 }
 
-/*!
-    Fires a callback function when an event matching a given mask occurs.
-    @param aCallback A js function to be fired.
-    @prarm aMask An event mask for the next event.
-    @param anExpiration The date for which this callback expires (not implemented).
-    @param inMode (not implemented).
-    @param shouldDequeue YES to remove the event from the queue after calling the callback,
-    NO to deliver it normally.
-*/
 - (void)setCallback:(Function)aCallback forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.push(_CPEventListenerMake(aMask, aCallback, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, aCallback));
 }
 
-/*!
-    Assigns a target and action for the next event matching a given event mask.
-    The callback method called will be passed the CPEvent when it fires.
-
-    @param aTarget The target object for the callback.
-    @param aSelector The selector which should be called on the target object.
-    @param aMask The mask for a given event which should trigger the callback.
-    @param anExpiration The date for which the callback expires (not implemented).
-    @param aMode (not implemented).
-    @param shouldDequeue YES to remove the event from the queue after calling the callback,
-    NO to deliver it normally.
-*/
-- (void)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
+- (CPEvent)setTarget:(id)aTarget selector:(SEL)aSelector forNextEventMatchingMask:(unsigned int)aMask untilDate:(CPDate)anExpiration inMode:(CPString)aMode dequeue:(BOOL)shouldDequeue
 {
-    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }, shouldDequeue));
+    _eventListeners.push(_CPEventListenerMake(aMask, function (anEvent) { objj_msgSend(aTarget, aSelector, anEvent); }));
 }
 
-/*!
-    Returns the last event recieved by your application.
-*/
 - (CPEvent)currentEvent
 {
     return _currentEvent;
@@ -964,38 +855,18 @@ CPRunContinuesResponse  = -1002;
 */
 - (void)beginSheet:(CPWindow)aSheet modalForWindow:(CPWindow)aWindow modalDelegate:(id)aModalDelegate didEndSelector:(SEL)aDidEndSelector contextInfo:(id)aContextInfo
 {
-    if ([aWindow isSheet])
+    var styleMask = [aSheet styleMask];
+    if (!(styleMask & CPDocModalWindowMask))
     {
-        [CPException raise:CPInternalInconsistencyException reason:@"The target window of beginSheet: cannot be a sheet"];
+        [CPException raise:CPInternalInconsistencyException reason:@"Currently only CPDocModalWindowMask style mask is supported for attached sheets"];
         return;
     }
 
-    [aSheet._windowView _enableSheet:YES];
-
-    // -dw- if a sheet is already visible, we skip this since it serves no purpose and causes
-    // orderOut: to be called on the sheet, which is not what we want.
-    if (![aWindow isVisible])
-    {
-        [aWindow orderFront:self];
-        [aSheet setPlatformWindow:[aWindow platformWindow]];
-    }
-
+    [aWindow orderFront:self];
+    [aSheet setPlatformWindow:[aWindow platformWindow]];
     [aWindow _attachSheet:aSheet modalDelegate:aModalDelegate didEndSelector:aDidEndSelector contextInfo:aContextInfo];
 }
 
-/*!
-    Ends a sheet modal.
-    The following are predefined return codes:
-
-    <pre>
-    CPRunStoppedResponse
-    CPRunAbortedResponse
-    CPRunContinuesResponse
-    </pre>
-
-    @param sheet - The window object (sheet) to dismiss.
-    @param returnCode - The return code to send to the delegate. You can use one of the return codes above or a custom value that you define.
-*/
 - (void)endSheet:(CPWindow)sheet returnCode:(int)returnCode
 {
     var count = [_windows count];
@@ -1008,74 +879,36 @@ CPRunContinuesResponse  = -1002;
         if (context != nil && context["sheet"] === sheet)
         {
             context["returnCode"] = returnCode;
-            [aWindow _endSheet];
+            [aWindow _detachSheetWindow];
             return;
         }
     }
 }
 
-/*!
-    Ends a sheet and sends the return code "0".
-    @param sheet - The CPWindow object (sheet) that should be dismissed.
-*/
 - (void)endSheet:(CPWindow)sheet
 {
-    // FIX ME: this is wrong: by Cocoa this should be: CPRunStoppedResponse.
    [self endSheet:sheet returnCode:0];
 }
 
-/*!
-    Returns and array of slash seperated arugments to your application.
-    These values are pulled from your window location hash.
-
-    For exampled if your application loaded:
-    <pre>
-    index.html#280north/cappuccino/issues
-    </pre>
-    The follow array would be returned:
-    <pre>
-    ["280north", "cappuccino", "issues"]
-    </pre>
-
-    @return CPArray - The array of arguments.
-*/
 - (CPArray)arguments
 {
-    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
-    if (window && window.location && _fullArgsString !== window.location.hash)
+    if (_fullArgsString !== window.location.hash)
         [self _reloadArguments];
 
     return _args;
 }
 
-/*!
-    Sets the arguments of your application.
-    That is, set the slash seperated values of an array as the window location hash.
-
-    For example if you pass an array:
-    <pre>
-    ["280north", "cappuccino", "issues"]
-    </pre>
-
-    The new window location would be
-    <pre>
-    index.html#280north/cappuccino/issues
-    </pre>
-
-    @param args - An array of arguments.
-*/
 - (void)setArguments:(CPArray)args
 {
     if (!args || args.length == 0)
     {
         _args = [];
-        // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-        if (window && window.location)
-            window.location.hash = @"#";
+        window.location.hash = @"#";
+
         return;
     }
 
-    if (![args isKindOfClass:CPArray])
+    if ([args class] != CPArray)
         args = [CPArray arrayWithObject:args];
 
     _args = args;
@@ -1086,15 +919,12 @@ CPRunContinuesResponse  = -1002;
 
     var hash = [toEncode componentsJoinedByString:@"/"];
 
-    // Don't use if PLATFORM(DOM) here - the unit test fakes window.location so we should play along.
-    if (window && window.location)
-        window.location.hash = @"#" + hash;
+    window.location.hash = @"#" + hash;
 }
 
 - (void)_reloadArguments
 {
-    // FIXME This should probably not access the window object #if !PLATFORM(DOM), but the unit tests rely on it.
-    _fullArgsString = (window && window.location) ? window.location.hash : "";
+    _fullArgsString = window.location.hash;
 
     if (_fullArgsString.length)
     {
@@ -1109,23 +939,6 @@ CPRunContinuesResponse  = -1002;
         _args = [];
 }
 
-/*!
-    Returns a dictionary of the window location named arguments.
-    For example if your location was:
-    <pre>
-    index.html?owner=280north&repo=cappuccino&type=issues
-    </pre>
-
-    a CPDictionary with the keys:
-    <pre>
-    owner, repo, type
-    </pre>
-    and respective values:
-    <pre>
-    280north, cappuccino, issues
-    </pre>
-    Will be returned.
-*/
 - (CPDictionary)namedArguments
 {
     return _namedArgs;
@@ -1208,7 +1021,7 @@ CPRunContinuesResponse  = -1002;
 
 + (CPString)defaultThemeName
 {
-    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo2");
+    return ([[CPBundle mainBundle] objectForInfoDictionaryKey:"CPDefaultTheme"] || @"Aristo");
 }
 
 @end
@@ -1216,32 +1029,24 @@ CPRunContinuesResponse  = -1002;
 var _CPModalSessionMake = function(aWindow, aStopCode)
 {
     return { _window:aWindow, _state:CPRunContinuesResponse , _previous:nil };
-};
+}
 
-var _CPEventListenerMake = function(anEventMask, aCallback, shouldDequeue)
+var _CPEventListenerMake = function(anEventMask, aCallback)
 {
-    return { _mask:anEventMask, _callback:aCallback, _dequeue:shouldDequeue };
-};
+    return { _mask:anEventMask, _callback:aCallback };
+}
 
 // Make this a global for use in CPPlatformWindow+DOM.j.
 _CPRunModalLoop = function(anEvent)
 {
-    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:YES];
+    [CPApp setCallback:_CPRunModalLoop forNextEventMatchingMask:CPAnyEventMask untilDate:nil inMode:0 dequeue:NO];
 
     var theWindow = [anEvent window],
         modalSession = CPApp._currentSession;
 
-    /*
-        The special case for popovers here is not clear. In Cocoa the popover window does not respond YES to worksWhenModal, yet it works when there is a modal window. Maybe it starts its own modal session, but interaction with the original modal window seems to continue working as well. Regardless of correctness, this solution beats popovers not working at all from sheets.
-    */
-    if (theWindow == modalSession._window ||
-        [theWindow worksWhenModal] ||
-        [theWindow attachedSheet] == modalSession._window || // -dw- allow modal parent of sheet to be repositioned
-        ([theWindow isKindOfClass:_CPPopoverWindow] && [[theWindow targetView] window] === modalSession._window))
-    {
+    if (theWindow == modalSession._window || [theWindow worksWhenModal])
         [theWindow sendEvent:anEvent];
-    }
-};
+}
 
 /*!
     Starts the GUI and Cappuccino frameworks. This function should be
@@ -1256,17 +1061,7 @@ function CPApplicationMain(args, namedArgs)
 #if PLATFORM(DOM)
     // hook to allow recorder, etc to manipulate things before starting AppKit
     if (window.parent !== window && typeof window.parent._childAppIsStarting === "function")
-    {
-        try
-        {
-            window.parent._childAppIsStarting(window);
-        }
-        catch(err)
-        {
-            // This could happen if we're in an iframe without access to the parent frame.
-            CPLog.warn("Failed to call parent frame's _childAppIsStarting().");
-        }
-    }
+        window.parent._childAppIsStarting(window);
 #endif
 
     var mainBundle = [CPBundle mainBundle],
@@ -1323,7 +1118,7 @@ var _CPAppBootstrapperActions = nil;
     var defaultThemeName = [CPApplication defaultThemeName],
         themeURL = nil;
 
-    if (defaultThemeName === @"Aristo" || defaultThemeName === @"Aristo2")
+    if (defaultThemeName === @"Aristo")
         themeURL = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:defaultThemeName + @".blend"];
     else
         themeURL = [[CPBundle mainBundle] pathForResource:defaultThemeName + @".blend"];
@@ -1368,25 +1163,26 @@ var _CPAppBootstrapperActions = nil;
     // FIXME: We should implement autoenabling.
     [mainMenu setAutoenablesItems:NO];
 
-    var newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
+    var bundle = [CPBundle bundleForClass:[CPApplication class]],
+        newMenuItem = [[CPMenuItem alloc] initWithTitle:@"New" action:@selector(newDocument:) keyEquivalent:@"n"];
 
-    [newMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" forClass:_CPMenuView]];
-    [newMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-new" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [newMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/New.png"] size:CGSizeMake(16.0, 16.0)]];
+    [newMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/NewHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [mainMenu addItem:newMenuItem];
 
     var openMenuItem = [[CPMenuItem alloc] initWithTitle:@"Open" action:@selector(openDocument:) keyEquivalent:@"o"];
 
-    [openMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" forClass:_CPMenuView]];
-    [openMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-open" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [openMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Open.png"] size:CGSizeMake(16.0, 16.0)]];
+    [openMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/OpenHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [mainMenu addItem:openMenuItem];
 
     var saveMenu = [[CPMenu alloc] initWithTitle:@"Save"],
         saveMenuItem = [[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:nil];
 
-    [saveMenuItem setImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" forClass:_CPMenuView]];
-    [saveMenuItem setAlternateImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-general-icon-save" inState:CPThemeStateHighlighted forClass:_CPMenuView]];
+    [saveMenuItem setImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/Save.png"] size:CGSizeMake(16.0, 16.0)]];
+    [saveMenuItem setAlternateImage:[[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPApplication/SaveHighlighted.png"] size:CGSizeMake(16.0, 16.0)]];
 
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save" action:@selector(saveDocument:) keyEquivalent:@"s"]];
     [saveMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Save As" action:@selector(saveDocumentAs:) keyEquivalent:nil]];
@@ -1407,8 +1203,8 @@ var _CPAppBootstrapperActions = nil;
     [editMenu addItem:undoMenuItem];
     [editMenu addItem:redoMenuItem];
 
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]];
-    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]];
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"]],
+    [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"]],
     [editMenu addItem:[[CPMenuItem alloc] initWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"]];
 
     [editMenuItem setSubmenu:editMenu];
@@ -1437,16 +1233,3 @@ var _CPAppBootstrapperActions = nil;
 }
 
 @end
-
-
-@implementation CPEvent (CPApplicationModifierFlags)
-
-/*!
-    Returns the currently pressed modifier flags.
-*/
-+ (unsigned)modifierFlags
-{
-    return CPEventModifierFlags;
-}
-
-@end

AppKit/CPBezierPath.j

@@ -20,6 +20,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  * Copyright 2009 280 North, Inc.
+
  */
 
 @import <Foundation/CPObject.j>
@@ -37,7 +38,7 @@ var DefaultLineWidth = 1.0;
     @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
+    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
@@ -165,19 +166,6 @@ var DefaultLineWidth = 1.0;
     CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
 }
 
-- (CGRect)bounds
-{
-    // TODO: this should return this. The controlPointBounds is not a tight fit.
-    // return CGPathGetPathBoundingBox(_path);
-
-    return [self controlPointBounds];
-}
-
-- (CGRect)controlPointBounds
-{
-    return CGPathGetBoundingBox(_path);
-}
-
 /*!
     Create a line segment between the first and last points in the subpath, closing it.
 */
@@ -196,6 +184,7 @@ var DefaultLineWidth = 1.0;
     CGContextBeginPath(ctx);
     CGContextAddPath(ctx, _path);
     CGContextSetLineWidth(ctx, [self lineWidth]);
+    CGContextClosePath(ctx);
     CGContextStrokePath(ctx);
 }
 
@@ -285,19 +274,13 @@ var DefaultLineWidth = 1.0;
     CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
 }
 
-- (void)appendBezierPathWithArcFromPoint:(CGPoint)fromPoint toPoint:(CGPoint)toPoint radius:(float)radius
-{
-    CGPathAddArcToPoint(_path, null, fromPoint.x, fromPoint.y, toPoint.x, toPoint.y, radius);
-}
-
 /*!
     Append the contents of a CPBezierPath object.
 */
-- (void)appendBezierPath:(CPBezierPath)other
+- (void)appendBezierPath:(NSBezierPath *)other
 {
     CGPathAddPath(_path, nil, other._path);
 }
-
 /*!
     Remove all path elements; clears path.
 */
@@ -306,21 +289,4 @@ var DefaultLineWidth = 1.0;
     _path = CGPathCreateMutable();
 }
 
-- (void)addClip
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextAddPath(ctx, _path);
-    CGContextClip(ctx);
-}
-
-- (void)setClip
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, _path);
-    CGContextClip(ctx);
-}
-
 @end

AppKit/CPBox.j

@@ -20,13 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPTextField.j"
 @import "CPView.j"
 
 // CPBoxType
 CPBoxPrimary    = 0;
 CPBoxSecondary  = 1;
-CPBoxSeparator  = 2;
+CPBoxSeperator  = 2;
 CPBoxOldStyle   = 3;
 CPBoxCustom     = 4;
 
@@ -36,31 +35,19 @@ CPLineBorder    = 1;
 CPBezelBorder   = 2;
 CPGrooveBorder  = 3;
 
-// CPTitlePosition
-CPNoTitle     = 0;
-CPAboveTop    = 1;
-CPAtTop       = 2;
-CPBelowTop    = 3;
-CPAboveBottom = 4;
-CPAtBottom    = 5;
-CPBelowBottom = 6;
-
-
-/*!
-    @ingroup appkit
-    @class CPBox
-
-    A CPBox is a simple view which can display a border.
-*/
 @implementation CPBox : CPView
 {
     CPBoxType       _boxType;
     CPBorderType    _borderType;
-    CPView          _contentView;
 
-    CPString        _title @accessors(getter=title);
-    int             _titlePosition @accessors(getter=titlePosition);
-    CPTextField     _titleView;
+    CPColor         _borderColor;
+    CPColor         _fillColor;
+
+    float           _cornerRadius;
+    float           _borderWidth;
+
+    CPSize          _contentMargin;
+    CPView          _contentView;
 }
 
 + (id)boxEnclosingView:(CPView)aView
@@ -68,7 +55,6 @@ CPBelowBottom = 6;
     var box = [[self alloc] initWithFrame:CGRectMakeZero()],
         enclosingView = [aView superview];
 
-    [box setAutoresizingMask:[aView autoresizingMask]];
     [box setFrameFromContentFrame:[aView frame]];
 
     [enclosingView replaceSubview:aView with:box];
@@ -78,34 +64,18 @@ CPBelowBottom = 6;
     return box;
 }
 
-+ (CPString)defaultThemeClass
-{
-    return @"box";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 1.0, 3.0, CGSizeMakeZero(), 6.0, [CPNull null], CGSizeMakeZero()]
-                                       forKeys:[   @"background-color",
-                                                   @"border-color",
-                                                   @"border-width",
-                                                   @"corner-radius",
-                                                   @"inner-shadow-offset",
-                                                   @"inner-shadow-size",
-                                                   @"inner-shadow-color",
-                                                   @"content-margin"]];
-}
-
-- (id)initWithFrame:(CGRect)frameRect
+- (id)initWithFrame:(CPRect)frameRect
 {
     self = [super initWithFrame:frameRect];
 
     if (self)
     {
         _borderType = CPBezelBorder;
+        _fillColor = [CPColor clearColor];
+        _borderColor = [CPColor blackColor];
 
-        _titlePosition = CPNoTitle;
-        _titleView = [CPTextField labelWithTitle:@""];
+        _borderWidth = 1.0;
+        _contentMargin = CGSizeMake(0.0, 0.0);
 
         _contentView = [[CPView alloc] initWithFrame:[self bounds]];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
@@ -119,46 +89,16 @@ CPBelowBottom = 6;
 
 // Configuring Boxes
 
-/*!
-    Returns the receiver's border rectangle.
-
-    @return the border rectangle of the box
-*/
-- (CGRect)borderRect
+- (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)
@@ -168,41 +108,11 @@ CPBelowBottom = 6;
     [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)
@@ -214,54 +124,58 @@ CPBelowBottom = 6;
 
 - (CPColor)borderColor
 {
-    return [self valueForThemeAttribute:@"border-color"];
+    return _borderColor;
 }
 
 - (void)setBorderColor:(CPColor)color
 {
-    if ([color isEqual:[self borderColor]])
+    if ([color isEqual:_borderColor])
         return;
 
-    [self setValue:color forThemeAttribute:@"border-color"];
+    _borderColor = color;
+    [self setNeedsDisplay:YES];
 }
 
 - (float)borderWidth
 {
-    return [self valueForThemeAttribute:@"border-width"];
+    return _borderWidth;
 }
 
 - (void)setBorderWidth:(float)width
 {
-    if (width === [self borderWidth])
+    if (width === _borderWidth)
         return;
 
-    [self setValue:width forThemeAttribute:@"border-width"];
+    _borderWidth = width;
+    [self setNeedsDisplay:YES];
 }
 
 - (float)cornerRadius
 {
-    return [self valueForThemeAttribute:@"corner-radius"];
+    return _cornerRadius;
 }
 
 - (void)setCornerRadius:(float)radius
 {
-    if (radius === [self cornerRadius])
+    if (radius === _cornerRadius)
         return;
 
-    [self setValue:radius forThemeAttribute:@"corner-radius"];
+    _cornerRadius = radius;
+    [self setNeedsDisplay:YES];
 }
 
 - (CPColor)fillColor
 {
-    return [self valueForThemeAttribute:@"background-color"];
+    return _fillColor;
 }
 
 - (void)setFillColor:(CPColor)color
 {
-    if ([color isEqual:[self fillColor]])
+    if ([color isEqual:_fillColor])
         return;
 
-    [self setValue:color forThemeAttribute:@"background-color"];
+    _fillColor = color;
+    [self setNeedsDisplay:YES];
 }
 
 - (CPView)contentView
@@ -274,152 +188,55 @@ CPBelowBottom = 6;
     if (aView === _contentView)
         return;
 
-    var borderWidth = [self borderWidth],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
-
-    [aView setFrame:CGRectInset([self bounds], contentMargin.width + borderWidth, contentMargin.height + borderWidth)];
+    [aView setFrame:CGRectInset([self bounds], _contentMargin.width + _borderWidth, _contentMargin.height + _borderWidth)];
     [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
     [self replaceSubview:_contentView with:aView];
 
     _contentView = aView;
 }
 
-- (CGSize)contentViewMargins
+- (CPSize)contentViewMargins
 {
-    return [self valueForThemeAttribute:@"content-margin"];
+    return _contentMargin;
 }
 
-- (void)setContentViewMargins:(CGSize)size
+- (void)setContentViewMargins:(CPSize)size
 {
      if (size.width < 0 || size.height < 0)
          [CPException raise:CPGenericException reason:@"Margins must be positive"];
 
-    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
+    _contentMargin = CGSizeMakeCopy(size);
+    [self setNeedsDisplay:YES];
 }
 
-- (void)setFrameFromContentFrame:(CGRect)aRect
+- (void)setFrameFromContentFrame:(CPRect)aRect
 {
-    var offset = [self _titleHeightOffset],
-        borderWidth = [self borderWidth],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
-
-    [self setFrame:CGRectInset(aRect, -(contentMargin.width + borderWidth), -(contentMargin.height + offset[0] + borderWidth))];
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-    if (aTitle == _title)
-        return;
-
-    _title = aTitle;
-
-    [self _manageTitlePositioning];
-}
-
-- (void)setTitlePosition:(int)aTitlePotisition
-{
-    if (aTitlePotisition == _titlePosition)
-        return;
-
-    _titlePosition = aTitlePotisition;
-
-    [self _manageTitlePositioning];
-}
-
-- (CPFont)titleFont
-{
-    return [_titleView font];
-}
-
-- (void)setTitleFont:(CPFont)aFont
-{
-    [_titleView setFont:aFont];
-}
-
-/*!
-    Return the text field used to display the receiver's title.
-
-    This is the Cappuccino equivalent to the `titleCell` method.
-*/
-- (CPTextField)titleView
-{
-    return _titleView;
-}
-
-- (void)_manageTitlePositioning
-{
-    if (_titlePosition == CPNoTitle)
-    {
-        [_titleView removeFromSuperview];
-        [self setNeedsDisplay:YES];
-        return;
-    }
-
-    [_titleView setStringValue:_title];
-    [_titleView sizeToFit];
-    [self addSubview:_titleView];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-        case CPAboveTop:
-        case CPBelowTop:
-            [_titleView setFrameOrigin:CGPointMake(5.0, 0.0)];
-            [_titleView setAutoresizingMask:CPViewNotSizable];
-            break;
-
-        case CPAboveBottom:
-        case CPAtBottom:
-        case CPBelowBottom:
-            var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CGPointMake(5.0, [self frameSize].height - h)];
-            [_titleView setAutoresizingMask:CPViewMinYMargin];
-            break;
-    }
-
-    [self sizeToFit];
+    [self setFrame:CGRectInset(aRect, -(_contentMargin.width + _borderWidth), -(_contentMargin.height + _borderWidth))];
     [self setNeedsDisplay:YES];
 }
 
 - (void)sizeToFit
 {
-    var contentFrame = [_contentView frame],
-        offset = [self _titleHeightOffset],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"];
+    var contentFrame = [_contentView frame];
 
-    if (!contentFrame)
+    [self setFrameSize:CGSizeMake(contentFrame.size.width + _contentMargin.width * 2,
+                                  contentFrame.size.height + _contentMargin.height * 2)];
+
+    [_contentView setFrameOrigin:CGPointMake(_contentMargin.width, _contentMargin.height)];
+}
+
+- (void)drawRect:(CPRect)rect
+{
+    if (_borderType === CPNoBorder)
         return;
 
-    [_contentView setFrameOrigin:CGPointMake(contentMargin.width, contentMargin.height + offset[1])];
-}
-
-- (float)_titleHeightOffset
-{
-    if (_titlePosition == CPNoTitle)
-        return [0.0, 0.0];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-            return [[_titleView frameSize].height, [_titleView frameSize].height];
-
-        case CPAtBottom:
-            return [[_titleView frameSize].height, 0.0];
-
-        default:
-            return [0.0, 0.0];
-    }
-}
-
-- (void)drawRect:(CGRect)rect
-{
-    var bounds = CGRectMakeCopy([self bounds]);
+    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.
+        case CPBoxSeperator:
+            // NSBox does not include a horitontal flag for the seperator type. We have to determine
+            // the type of seperator 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)
@@ -428,30 +245,16 @@ CPBelowBottom = 6;
             break;
     }
 
-    if (_titlePosition == CPAtTop)
-    {
-        bounds.origin.y += [_titleView frameSize].height;
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-    if (_titlePosition == CPAtBottom)
-    {
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-
     switch (_borderType)
     {
         case CPBezelBorder:
             [self _drawBezelBorderInRect:bounds];
             break;
 
-        case CPGrooveBorder:
+        default:
         case CPLineBorder:
             [self _drawLineBorderInRect:bounds];
             break;
-
-        case CPNoBorder:
-            [self _drawNoBorderInRect:bounds];
-            break;
     }
 }
 
@@ -462,8 +265,8 @@ CPBelowBottom = 6;
     CGContextSetStrokeColor(context, [self borderColor]);
     CGContextSetLineWidth(context, 1.0);
 
-    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMidY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMidY(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMinY(aRect));
     CGContextStrokePath(context);
 }
 
@@ -474,71 +277,49 @@ CPBelowBottom = 6;
     CGContextSetStrokeColor(context, [self borderColor]);
     CGContextSetLineWidth(context, 1.0);
 
-    CGContextMoveToPoint(context, CGRectGetMidX(aRect), CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetMidX(aRect), CGRectGetHeight(aRect));
+    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMinY(aRect));
+    CGContextAddLineToPoint(context, CGRectGetMinX(aRect), CGRectGetHeight(aRect));
     CGContextStrokePath(context);
 }
 
-- (void)_drawLineBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth];
-
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-}
-
 - (void)_drawBezelBorderInRect:(CGRect)aRect
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];
+        sides = [CPMinYEdge, CPMaxXEdge, CPMaxYEdge, CPMinXEdge],
+        sideGray = 190.0 / 255.0,
+        grays = [142.0 / 255.0, sideGray, sideGray, sideGray],
+        borderWidth = _borderWidth;
 
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    // clip the canvas to the actual content view in order to only display inner shadow
-    CGContextBeginPath(context);
-    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(aRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
-    CGContextClip(context);
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-}
-
-
-- (void)_drawNoBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
+    while (borderWidth--)
+        aRect = CPDrawTiledRects(aRect, aRect, sides, grays);
 
     CGContextSetFillColor(context, [self fillColor]);
     CGContextFillRect(context, aRect);
 }
 
+- (void)_drawLineBorderInRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort];
 
+    aRect = CGRectInset(aRect, _borderWidth / 2.0, _borderWidth / 2.0);
 
+    CGContextSetFillColor(context, [self fillColor]);
+    CGContextSetStrokeColor(context, [self borderColor]);
+
+    CGContextSetLineWidth(context, _borderWidth);
+    CGContextFillRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
+    CGContextStrokeRoundedRectangleInRect(context, aRect, _cornerRadius, YES, YES, YES, YES);
+}
 
 @end
 
 var CPBoxTypeKey          = @"CPBoxTypeKey",
     CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
-    CPBoxTitle            = @"CPBoxTitle",
-    CPBoxTitlePosition    = @"CPBoxTitlePosition",
-    CPBoxTitleView        = @"CPBoxTitleView";
+    CPBoxBorderColorKey   = @"CPBoxBorderColorKey",
+    CPBoxFillColorKey     = @"CPBoxFillColorKey",
+    CPBoxCornerRadiusKey  = @"CPBoxCornerRadiusKey",
+    CPBoxBorderWidthKey   = @"CPBoxBorderWidthKey",
+    CPBoxContentMarginKey = @"CPBoxContentMarginKey";
 
 @implementation CPBox (CPCoding)
 
@@ -551,16 +332,18 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
         _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
         _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];
 
-        _title         = [aCoder decodeObjectForKey:CPBoxTitle];
-        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePosition];
-        _titleView     = [aCoder decodeObjectForKey:CPBoxTitleView] || [CPTextField labelWithTitle:_title];
+        _borderColor   = [aCoder decodeObjectForKey:CPBoxBorderColorKey];
+        _fillColor     = [aCoder decodeObjectForKey:CPBoxFillColorKey];
+
+        _cornerRadius  = [aCoder decodeFloatForKey:CPBoxCornerRadiusKey];
+        _borderWidth   = [aCoder decodeFloatForKey:CPBoxBorderWidthKey];
+
+        _contentMargin = [aCoder decodeSizeForKey:CPBoxContentMarginKey];
 
         _contentView   = [self subviews][0];
 
         [self setAutoresizesSubviews:YES];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self _manageTitlePositioning];
     }
 
     return self;
@@ -572,9 +355,14 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
 
     [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
     [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
-    [aCoder encodeObject:_title forKey:CPBoxTitle];
-    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePosition];
-    [aCoder encodeObject:_titleView forKey:CPBoxTitleView];
+
+    [aCoder encodeObject:_borderColor forKey:CPBoxBorderColorKey];
+    [aCoder encodeObject:_fillColor forKey:CPBoxFillColorKey];
+
+    [aCoder encodeFloat:_cornerRadius forKey:CPBoxCornerRadiusKey];
+    [aCoder encodeFloat:_borderWidth forKey:CPBoxBorderWidthKey];
+
+    [aCoder encodeSize:_contentMargin forKey:CPBoxContentMarginKey];
 }
 
 @end

AppKit/CPBrowser.j

@@ -24,16 +24,15 @@
 
 @import "CPControl.j"
 @import "CPImage.j"
-@import "CPScrollView.j"
 @import "CPTableView.j"
 @import "CPTextField.j"
-
-@global CPApp
+@import "CPScrollView.j"
 
 /*!
     @ingroup appkit
     @class CPBrowser
 */
+
 @implementation CPBrowser : CPControl
 {
     id              _delegate;
@@ -66,65 +65,60 @@
     CPArray         _columnWidths;
 }
 
-+ (CPString)defaultThemeClass
++ (CPImage)branchImage
 {
-    return "browser";
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
-+ (id)themeAttributes
++ (CPImage)highlightedBranchImage
 {
-    return [CPDictionary dictionaryWithJSObject:{
-        @"image-control-resize": [CPNull null],
-        @"image-control-leaf": [CPNull null],
-        @"image-control-leaf-pressed": [CPNull null]
-    }];
+    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPBrowser class]]
+                                                    pathForResource:"browser-leaf-highlighted.png"]
+                                              size:CGSizeMake(9,9)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
     {
-        [self _init];
+        _rowHeight = 23.0;
+        _defaultColumnWidth = 140.0;
+        _minColumnWidth = 80.0;
+        _imageWidth = 23.0;
+        _leafWidth = 13.0;
+        _columnWidths = [];
+
+        _pathSeparator = "/";
+        _tableViews = [];
+        _tableDelegates = [];
+        _allowsMultipleSelection = YES;
+        _allowsEmptySelection = YES;
+        _tableViewClass = [_CPBrowserTableView class];
+
+        _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
+        [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
+        [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelectedDataView];
+        [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
+
+        _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
+
+        [_horizontalScrollView setHasVerticalScroller:NO];
+        [_horizontalScrollView setAutohidesScrollers:YES];
+        [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
+        [_contentView setAutoresizingMask:CPViewHeightSizable];
+
+        [_horizontalScrollView setDocumentView:_contentView];
+
+        [self addSubview:_horizontalScrollView];
     }
 
     return self;
 }
 
-- (void)_init
-{
-    _rowHeight = 23.0;
-    _defaultColumnWidth = 140.0;
-    _minColumnWidth = 80.0;
-    _imageWidth = 23.0;
-    _leafWidth = 13.0;
-    _columnWidths = [];
-
-    _pathSeparator = "/";
-    _tableViews = [];
-    _tableDelegates = [];
-    _allowsMultipleSelection = YES;
-    _allowsEmptySelection = YES;
-    _tableViewClass = [_CPBrowserTableView class];
-
-    _prototypeView = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-    [_prototypeView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_prototypeView setValue:[CPColor whiteColor] forThemeAttribute:"text-color" inState:CPThemeStateSelectedDataView];
-    [_prototypeView setLineBreakMode:CPLineBreakByTruncatingTail];
-
-    _horizontalScrollView = [[CPScrollView alloc] initWithFrame:[self bounds]];
-
-    [_horizontalScrollView setHasVerticalScroller:NO];
-    [_horizontalScrollView setAutohidesScrollers:YES];
-    [_horizontalScrollView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    _contentView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, 0, CGRectGetHeight([self bounds]))];
-    [_contentView setAutoresizingMask:CPViewHeightSizable];
-
-    [_horizontalScrollView setDocumentView:_contentView];
-
-    [self addSubview:_horizontalScrollView];
-}
-
 - (void)setPrototypeView:(CPView)aPrototypeView
 {
     _prototypeView = [CPKeyedUnarchiver unarchiveObjectWithData:
@@ -259,7 +253,7 @@
         var column = [[CPTableColumn alloc] initWithIdentifier:@"Image"],
             view = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
 
-        [view setImageScaling:CPImageScaleProportionallyDown];
+        [view setImageScaling:CPScaleProportionally];
 
         [column setDataView:view];
         [column setResizingMask:CPTableColumnNoResizing];
@@ -277,8 +271,8 @@
     var column = [[CPTableColumn alloc] initWithIdentifier:@"Leaf"],
         view = [[_CPBrowserLeafView alloc] initWithFrame:CGRectMakeZero()];
 
-    [view setBranchImage:[self valueForThemeAttribute:@"image-control-leaf"]];
-    [view setHighlightedBranchImage:[self valueForThemeAttribute:@"image-control-leaf-pressed"]];
+    [view setBranchImage:[[self class] branchImage]];
+    [view setHighlightedBranchImage:[[self class] highlightedBranchImage]];
 
     [column setDataView:view];
     [column setResizingMask:CPTableColumnNoResizing];
@@ -305,7 +299,7 @@
             tableHeight = CGRectGetHeight([tableView bounds]);
 
         [[tableView tableColumnWithIdentifier:"Image"] setWidth:_imageWidth];
-        [[tableView tableColumnWithIdentifier:"Content"] setWidth:[self columnContentWidthForColumnWidth:width]];
+        [[tableView tableColumnWithIdentifier:"Content"] setWidth:width - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - scrollerWidth - scrollerWidth];
         [[tableView tableColumnWithIdentifier:"Leaf"] setWidth:_leafWidth];
 
         [tableView setRowHeight:_rowHeight];
@@ -437,14 +431,12 @@
 
 - (float)columnContentWidthForColumnWidth:(float)aWidth
 {
-    var columnSpacing = [_tableViews[0] intercellSpacing].width;
-    return aWidth - (_leafWidth + columnSpacing + (_delegateSupportsImages ? _imageWidth + columnSpacing : 0)) - columnSpacing - [CPScroller scrollerWidth];
+    return aWidth - (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) - [CPScroller scrollerWidth];
 }
 
 - (float)columnWidthForColumnContentWidth:(float)aWidth
 {
-    var columnSpacing = [_tableViews[0] intercellSpacing].width;
-    return aWidth + (_leafWidth + columnSpacing + (_delegateSupportsImages ? _imageWidth + columnSpacing: 0)) + columnSpacing + [CPScroller scrollerWidth];
+    return aWidth + (_leafWidth + _delegateSupportsImages ? _imageWidth : 0) + [CPScroller scrollerWidth];
 }
 
 - (void)setImageWidth:(float)aWidth
@@ -658,52 +650,7 @@
 
 @end
 
-@implementation CPBrowser (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        [self _init];
-
-        _allowsEmptySelection = [aCoder decodeBoolForKey:@"CPBrowserAllowsEmptySelectionKey"];
-        _allowsMultipleSelection = [aCoder decodeBoolForKey:@"CPBrowserAllowsMultipleSelectionKey"];
-        _prototypeView = [aCoder decodeObjectForKey:@"CPBrowserPrototypeViewKey"];
-        _rowHeight = [aCoder decodeFloatForKey:@"CPBrowserRowHeightKey"];
-        _imageWidth = [aCoder decodeFloatForKey:@"CPBrowserImageWidthKey"];
-        _minColumnWidth = [aCoder decodeFloatForKey:@"CPBrowserMinColumnWidthKey"];
-        _columnWidths = [aCoder decodeObjectForKey:@"CPBrowserColumnWidthsKey"];
-
-        [self setDelegate:[aCoder decodeObjectForKey:@"CPBrowserDelegateKey"]];
-        [self setAutohidesScroller:[aCoder decodeBoolForKey:@"CPBrowserAutohidesScrollerKey"]];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // Don't encode the subviews, they're transient and will be recreated from data.
-    var actualSubviews = _subviews;
-    _subviews = [];
-    [super encodeWithCoder:aCoder];
-    _subviews = actualSubviews;
-
-    [aCoder encodeBool:[self autohidesScroller] forKey:@"CPBrowserAutohidesScrollerKey"];
-    [aCoder encodeBool:_allowsEmptySelection forKey:@"CPBrowserAllowsEmptySelectionKey"];
-    [aCoder encodeBool:_allowsMultipleSelection forKey:@"CPBrowserAllowsMultipleSelectionKey"];
-    [aCoder encodeObject:_delegate forKey:@"CPBrowserDelegateKey"];
-    [aCoder encodeObject:_prototypeView forKey:@"CPBrowserPrototypeViewKey"];
-    [aCoder encodeFloat:_rowHeight forKey:@"CPBrowserRowHeightKey"];
-    [aCoder encodeFloat:_imageWidth forKey:@"CPBrowserImageWidthKey"];
-    [aCoder encodeFloat:_minColumnWidth forKey:@"CPBrowserMinColumnWidthKey"];
-    [aCoder encodeObject:_columnWidths forKey:@"CPBrowserColumnWidthsKey"];
-}
-
-@end
-
+var _CPBrowserResizeControlBackgroundImage = nil;
 
 @implementation _CPBrowserResizeControl : CPView
 {
@@ -713,14 +660,22 @@
     unsigned    _width;
 }
 
++ (CPImage)backgroundImage
+{
+    if (!_CPBrowserResizeControlBackgroundImage)
+    {
+        var path = [[CPBundle bundleForClass:[self class]] pathForResource:"browser-resize-control.png"];
+        _CPBrowserResizeControlBackgroundImage = [[CPImage alloc] initWithContentsOfFile:path
+                                                                                    size:CGSizeMake(15, 14)];
+    }
+
+    return _CPBrowserResizeControlBackgroundImage;
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
     if (self = [super initWithFrame:aFrame])
-    {
-        var browser = [[CPBrowser alloc] init];
-        [self setBackgroundColor:[CPColor colorWithPatternImage:[browser valueForThemeAttribute:@"image-control-resize"]]];
-    }
-
+        [self setBackgroundColor:[CPColor colorWithPatternImage:[[self class] backgroundImage]]];
 
     return self;
 }
@@ -810,13 +765,13 @@
     return [_browser canDragRowsWithIndexes:rowIndexes inColumn:[_browser columnOfTableView:self] withEvent:[CPApp currentEvent]];
 }
 
-- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragImageOffset
+- (CPImage)dragImageForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPointPointer)dragImageOffset
 {
     return [_browser draggingImageForRowsWithIndexes:dragRows inColumn:[_browser columnOfTableView:self] withEvent:dragEvent offset:dragImageOffset] ||
            [super dragImageForRowsWithIndexes:dragRows tableColumns:theTableColumns event:dragEvent offset:dragImageOffset];
 }
 
-- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CGPoint)dragViewOffset
+- (CPView)dragViewForRowsWithIndexes:(CPIndexSet)dragRows tableColumns:(CPArray)theTableColumns event:(CPEvent)dragEvent offset:(CPPoint)dragViewOffset
 {
     var count = theTableColumns.length;
     while (count--)
@@ -892,12 +847,6 @@
     [_browser _column:_index clickedRow:[selectedIndexes count] === 1 ? [selectedIndexes firstIndex] : -1];
 }
 
-- (void)tableViewSelectionDidChange:(CPNotification)aNotification
-{
-    var selectedIndexes = [[aNotification object] selectedRowIndexes];
-    [_browser selectRowIndexes:selectedIndexes inColumn:_index];
-}
-
 - (id)childAtIndex:(unsigned)index
 {
     return [_delegate browser:_browser child:index ofItem:_item];
@@ -979,7 +928,7 @@
         isHighlighted = [self themeState] & CPThemeStateSelectedDataView;
 
     [imageView setImage: _isLeaf ? (isHighlighted ? _highlightedBranchImage : _branchImage) : nil];
-    [imageView setImageScaling:CPImageScaleNone];
+    [imageView setImageScaling:CPScaleNone];
 }
 
 - (void)encodeWithCoder:(CPCoder)aCoder

AppKit/CPButton.j

@@ -25,26 +25,24 @@
 
 @import "CPControl.j"
 @import "CPStringDrawing.j"
-@import "CPText.j"
-@import "CPWindow_Constants.j"
+
 
 /* @group CPBezelStyle */
 
-                                       // IB style
-CPRoundedBezelStyle             = 1;   // Push
-CPRegularSquareBezelStyle       = 2;   // Bevel
+CPRoundedBezelStyle             = 1;
+CPRegularSquareBezelStyle       = 2;
 CPThickSquareBezelStyle         = 3;
 CPThickerSquareBezelStyle       = 4;
-CPDisclosureBezelStyle          = 5;   // Disclosure triangle
-CPShadowlessSquareBezelStyle    = 6;   // Square
-CPCircularBezelStyle            = 7;   // Round
-CPTexturedSquareBezelStyle      = 8;   // Textured
-CPHelpButtonBezelStyle          = 9;   // Help
-CPSmallSquareBezelStyle         = 10;  // Gradient
-CPTexturedRoundedBezelStyle     = 11;  // Round Textured
-CPRoundRectBezelStyle           = 12;  // Round Rect
-CPRecessedBezelStyle            = 13;  // Recessed
-CPRoundedDisclosureBezelStyle   = 14;  // Disclosure
+CPDisclosureBezelStyle          = 5;
+CPShadowlessSquareBezelStyle    = 6;
+CPCircularBezelStyle            = 7;
+CPTexturedSquareBezelStyle      = 8;
+CPHelpButtonBezelStyle          = 9;
+CPSmallSquareBezelStyle         = 10;
+CPTexturedRoundedBezelStyle     = 11;
+CPRoundRectBezelStyle           = 12;
+CPRecessedBezelStyle            = 13;
+CPRoundedDisclosureBezelStyle   = 14;
 CPHUDBezelStyle                 = -1;
 
 
@@ -72,15 +70,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 = 25.0;
+CPButtonDefaultHeight = 24.0;
 CPButtonImageOffset   = 3.0;
 
 /*!
@@ -108,13 +100,6 @@ CPButtonImageOffset   = 3.0;
 
     CPString            _keyEquivalent;
     unsigned            _keyEquivalentModifierMask;
-
-    CPTimer             _continuousDelayTimer;
-    CPTimer             _continuousTimer;
-    float               _periodicDelay;
-    float               _periodicInterval;
-
-    BOOL                _isTracking;
 }
 
 + (id)buttonWithTitle:(CPString)aTitle
@@ -144,11 +129,6 @@ CPButtonImageOffset   = 3.0;
                                        forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]];
 }
 
-/*!
-    Initializes and returns a newly allocated CPButton object with a specified frame rectangle.
-    @param aFrame The frame rectangle for the created button object.
-    @return An initialized CPView object or nil if the object couldn't be created.
-*/
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -159,35 +139,23 @@ CPButtonImageOffset   = 3.0;
         [self setValue:CPCenterTextAlignment forThemeAttribute:@"alignment"];
         [self setValue:CPCenterVerticalTextAlignment forThemeAttribute:@"vertical-alignment"];
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
-        [self setValue:CPImageScaleNone forThemeAttribute:@"image-scaling"];
+        [self setValue:CPScaleNone forThemeAttribute:@"image-scaling"];
 
-        [self setBezelStyle:CPRoundRectBezelStyle];
+        _controlSize = CPRegularControlSize;
+
+        _keyEquivalent = @"";
+        _keyEquivalentModifierMask = 0;
+
+//        [self setBezelStyle:CPRoundRectBezelStyle];
         [self setBordered:YES];
-
-        [self _init];
     }
 
     return self;
 }
 
-- (void)_init
-{
-    _controlSize = CPRegularControlSize;
-
-    _keyEquivalent = @"";
-    _keyEquivalentModifierMask = 0;
-
-    // Continuous button defaults.
-    _periodicInterval   = 0.05;
-    _periodicDelay      = 0.5;
-
-    [self setButtonType:CPMomentaryPushInButton];
-}
-
 // Setting the state
 /*!
-    Returns 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 \c YES if the button has a 'mixed' state in addition to on and off.
 */
 - (BOOL)allowsMixedState
 {
@@ -211,21 +179,21 @@ CPButtonImageOffset   = 3.0;
         [self setState:CPOnState];
 }
 
-/*!
-    Sets the value of the button using an Objective-J object.
-    @param anObjectValue The value of the button interpreted as an Objective-J object.
-*/
 - (void)setObjectValue:(id)anObjectValue
 {
     if (!anObjectValue || anObjectValue === @"" || ([anObjectValue intValue] === 0))
         anObjectValue = CPOffState;
+
     else if (![anObjectValue isKindOfClass:[CPNumber class]])
         anObjectValue = CPOnState;
-    else if (anObjectValue >= CPOnState)
+
+    else if (anObjectValue > CPOnState)
         anObjectValue = CPOnState
+
     else if (anObjectValue < CPOffState)
         if ([self allowsMixedState])
             anObjectValue = CPMixedState;
+
         else
             anObjectValue = CPOnState;
 
@@ -233,36 +201,18 @@ CPButtonImageOffset   = 3.0;
 
     switch ([self objectValue])
     {
-        case CPMixedState:
-            [self unsetThemeState:CPThemeStateSelected];
-            [self setThemeState:CPButtonStateMixed];
-            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-                [self setThemeState:CPThemeStateHighlighted];
-            else
-                [self unsetThemeState:CPThemeStateHighlighted];
-            break;
+        case CPMixedState:  [self unsetThemeState:CPThemeStateSelected];
+                            [self setThemeState:CPButtonStateMixed];
+                            break;
 
-        case CPOnState:
-            [self unsetThemeState:CPButtonStateMixed];
-            [self setThemeState:CPThemeStateSelected];
-            if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-                [self setThemeState:CPThemeStateHighlighted];
-            else
-                [self unsetThemeState:CPThemeStateHighlighted];
-            break;
+        case CPOnState:     [self unsetThemeState:CPButtonStateMixed];
+                            [self setThemeState:CPThemeStateSelected];
+                            break;
 
-        case CPOffState:
-            [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed | CPThemeStateHighlighted];
+        case CPOffState:    [self unsetThemeState:CPThemeStateSelected | CPButtonStateMixed];
     }
 }
 
-/*!
-    Returns the button's next state.
-    @return The button's state. A button can have two or three states.
-    If it has two, this value is either \c CPOffState (the normal or unpressed state)
-    or \c CPOnState (the alternate or pressed state).
-    If it has three, this value can be \c CPOnState (the feature is in effect everywhere), \c CPOffState (the feature is in effect nowhere), or \c CPMixedState (the feature is in effect somewhere).
-*/
 - (CPInteger)nextState
 {
    if ([self allowsMixedState])
@@ -275,16 +225,8 @@ 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]];
 }
 
@@ -306,11 +248,6 @@ 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)
@@ -322,11 +259,6 @@ CPButtonImageOffset   = 3.0;
     [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;
@@ -387,19 +319,11 @@ CPButtonImageOffset   = 3.0;
 
 - (void)setShowsStateBy:(CPInteger)aMask
 {
-    // CPPushInCellMask cannot be set for showsStateBy.
-    aMask &= ~CPPushInCellMask;
-
     if (_showsStateBy === aMask)
         return;
 
     _showsStateBy = aMask;
 
-    if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask) && [self state] != CPOffState)
-        [self setThemeState:CPThemeStateHighlighted];
-    else
-        [self unsetThemeState:CPThemeStateHighlighted];
-
     [self setNeedsDisplay:YES];
     [self setNeedsLayout];
 }
@@ -423,20 +347,15 @@ CPButtonImageOffset   = 3.0;
     }
 }
 
-- (CPInteger)highlightsBy
-{
-    return _highlightsBy;
-}
-
 - (void)setButtonType:(CPButtonType)aButtonType
 {
     switch (aButtonType)
     {
-        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPMomentaryLightButton:    [self setHighlightsBy:CPChangeBackgroundCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPMomentaryPushInButton:   [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
@@ -444,12 +363,12 @@ CPButtonImageOffset   = 3.0;
                                         [self setShowsStateBy:CPNoCellMask];
                                         break;
 
-        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeBackgroundCellMask | CPChangeGrayCellMask];
+        case CPPushOnPushOffButton:     [self setHighlightsBy:CPPushInCellMask | CPChangeGrayCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
-        case CPOnOffButton:             [self setHighlightsBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
-                                        [self setShowsStateBy:CPChangeGrayCellMask | CPChangeBackgroundCellMask];
+        case CPOnOffButton:             [self setHighlightsBy:CPChangeBackgroundCellMask];
+                                        [self setShowsStateBy:CPChangeBackgroundCellMask];
                                         break;
 
         case CPToggleButton:            [self setHighlightsBy:CPPushInCellMask | CPContentsCellMask];
@@ -490,111 +409,66 @@ 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
 {
-    _isTracking = YES;
+    [self highlight:YES];
 
-    var startedTracking = [super startTrackingAt:aPoint];
-    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            [self highlight:[self state] == CPOffState];
-        else
-            [self highlight:YES];
-    }
-    else
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            [self highlight:[self state] != CPOffState];
-        else
-            [self highlight:NO];
-    }
-    return startedTracking;
+    return [super startTrackingAt:aPoint];
 }
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    _isTracking = NO;
+    [self highlight:NO];
+
+    [super stopTracking:lastPoint at:aPoint mouseIsUp:mouseIsUp];
 
     if (mouseIsUp && CGRectContainsPoint([self bounds], aPoint))
         [self setNextState];
-    else
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            [self highlight:[self state] != CPOffState];
-        else
-            [self highlight:NO];
-    }
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-    [self invalidateTimers];
-}
-
-- (void)invalidateTimers
-{
-    if (_continuousTimer)
-    {
-        [_continuousTimer invalidate];
-        _continuousTimer = nil;
-    }
-
-    if (_continuousDelayTimer)
-    {
-        [_continuousDelayTimer invalidate];
-        _continuousDelayTimer = nil;
-    }
 }
 
 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
     var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
 
-    return _CGRectInsetByInset(bounds, contentInset);
+    if (_CGInsetIsEmpty(contentInset))
+        return bounds;
+
+    bounds = _CGRectMakeCopy(bounds);
+    bounds.origin.x += contentInset.left;
+    bounds.origin.y += contentInset.top;
+    bounds.size.width -= contentInset.left + contentInset.right;
+    bounds.size.height -= contentInset.top + contentInset.bottom;
+
+    return bounds;
 }
 
 - (CGRect)bezelRectForBounds:(CGRect)bounds
 {
-    // Is this necessary? The theme itself can just change its inset to a zero inset when !CPThemeStateBordered.
     if (![self isBordered])
-        return bounds;
+        return _CGRectMakeZero();
 
     var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
 
-    return _CGRectInsetByInset(bounds, bezelInset);
+    if (_CGInsetIsEmpty(bezelInset))
+        return bounds;
+
+    bounds = _CGRectMakeCopy(bounds);
+    bounds.origin.x += bezelInset.left;
+    bounds.origin.y += bezelInset.top;
+    bounds.size.width -= bezelInset.left + bezelInset.right;
+    bounds.size.height -= bezelInset.top + bezelInset.bottom;
+
+    return bounds;
 }
 
-- (CGSize)_minimumFrameSize
+/*!
+    Adjust the size of the button to fit the title and surrounding button image.
+*/
+- (void)sizeToFit
 {
-    var size = CGSizeMakeZero(),
+    [self layoutSubviews];
+
+    var size,
         contentView = [self ephemeralSubviewNamed:@"content-view"];
 
     if (contentView)
@@ -618,20 +492,7 @@ 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
@@ -673,51 +534,8 @@ CPButtonImageOffset   = 3.0;
 
     if (contentView)
     {
-        var title = nil,
-            image = nil;
-
-        if (_isTracking)
-        {
-            if (_highlightsBy & CPContentsCellMask)
-            {
-                if (_showsStateBy & CPContentsCellMask)
-                {
-                    title = ([self state] == CPOffState && _alternateTitle) ? _alternateTitle : _title;
-                    image = ([self state] == CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
-                }
-                else
-                {
-                    title = [self alternateTitle];
-                    image = [self alternateImage];
-                }
-            }
-            else if (_showsStateBy & CPContentsCellMask)
-            {
-                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
-                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
-            }
-            else
-            {
-                title = _title;
-                image = [self image];
-            }
-        }
-        else
-        {
-            if (_showsStateBy & CPContentsCellMask)
-            {
-                title = ([self state] != CPOffState && _alternateTitle) ? _alternateTitle : _title;
-                image = ([self state] != CPOffState && [self alternateImage]) ? [self alternateImage] : [self image];
-            }
-            else
-            {
-                title = _title;
-                image = [self image];
-            }
-        }
-
-        [contentView setText:title];
-        [contentView setImage:image];
+        [contentView setText:([self hasThemeState:CPThemeStateHighlighted] && _alternateTitle) ? _alternateTitle : _title];
+        [contentView setImage:[self currentValueForThemeAttribute:@"image"]];
         [contentView setImageOffset:[self currentValueForThemeAttribute:@"image-offset"]];
 
         [contentView setFont:[self currentValueForThemeAttribute:@"font"]];
@@ -816,75 +634,19 @@ CPButtonImageOffset   = 3.0;
         return NO;
 
     [self performClick:nil];
-
     return YES;
 }
 
-/*!
-    Perform a click on the receiver.
-
-    @param sender - The sender object
-*/
-- (void)performClick:(id)sender
-{
-    // This is slightly different from [super performClick:] in that the highlight behaviour is dependent on
-    // highlightsBy and showsStateBy.
-    if (![self isEnabled])
-        return;
-
-    [self setState:[self nextState]];
-
-    var shouldHighlight = NO;
-
-    if (_highlightsBy & (CPPushInCellMask | CPChangeGrayCellMask))
-    {
-        if (_showsStateBy & (CPChangeGrayCellMask | CPChangeBackgroundCellMask))
-            shouldHighlight = [self state] == CPOffState;
-        else
-            shouldHighlight = YES;
-    }
-
-    [self highlight:shouldHighlight];
-
-    try
-    {
-        [self sendAction:[self action] to:[self target]];
-    }
-    catch (e)
-    {
-        throw e;
-    }
-    finally
-    {
-        if (shouldHighlight)
-            [CPTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unhighlightButtonTimerDidFinish:) userInfo:nil repeats:NO];
-    }
-}
-
 @end
 
 @implementation CPButton (NS)
 
 - (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
@@ -899,11 +661,7 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
     CPButtonImageDimsWhenDisabledKey    = @"CPButtonImageDimsWhenDisabledKey",
     CPButtonImagePositionKey            = @"CPButtonImagePositionKey",
     CPButtonKeyEquivalentKey            = @"CPButtonKeyEquivalentKey",
-    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey",
-    CPButtonPeriodicDelayKey            = @"CPButtonPeriodicDelayKey",
-    CPButtonPeriodicIntervalKey         = @"CPButtonPeriodicIntervalKey",
-    CPButtonHighlightsByKey             = @"CPButtonHighlightsByKey",
-    CPButtonShowsStateByKey             = @"CPButtonShowsStateByKey";
+    CPButtonKeyEquivalentMaskKey        = @"CPButtonKeyEquivalentMaskKey";
 
 @implementation CPButton (CPCoding)
 
@@ -917,24 +675,13 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 
     if (self)
     {
-        [self _init];
+        _controlSize = CPRegularControlSize;
 
         _title = [aCoder decodeObjectForKey:CPButtonTitleKey];
         _alternateTitle = [aCoder decodeObjectForKey:CPButtonAlternateTitleKey];
-        _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
 
-        if ([aCoder containsValueForKey:CPButtonHighlightsByKey])
-        {
-            // If one exists, assume both do.
-            _highlightsBy = [aCoder decodeIntForKey:CPButtonHighlightsByKey];
-            _showsStateBy = [aCoder decodeIntForKey:CPButtonShowsStateByKey];
-        }
-        else
-        {
-            // Backwards compatibility: if this CPButton was encoded before coding of
-            // highlightsBy and showsStateBy were added, we should just use the
-            // default values from _init rather than overwriting with 0, 0.
-        }
+        if ([aCoder containsValueForKey:CPButtonAllowsMixedStateKey])
+            _allowsMixedState = [aCoder decodeBoolForKey:CPButtonAllowsMixedStateKey];
 
         [self setImageDimsWhenDisabled:[aCoder decodeObjectForKey:CPButtonImageDimsWhenDisabledKey]];
 
@@ -944,12 +691,6 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
         if ([aCoder containsValueForKey:CPButtonKeyEquivalentKey])
             [self setKeyEquivalent:CFData.decodeBase64ToUtf16String([aCoder decodeObjectForKey:CPButtonKeyEquivalentKey])];
 
-        if ([aCoder containsValueForKey:CPButtonPeriodicDelayKey])
-            _periodicDelay = [aCoder decodeObjectForKey:CPButtonPeriodicDelayKey];
-
-        if ([aCoder containsValueForKey:CPButtonPeriodicIntervalKey])
-            _periodicInterval = [aCoder decodeObjectForKey:CPButtonPeriodicIntervalKey];
-
         _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPButtonKeyEquivalentMaskKey];
 
         [self setNeedsLayout];
@@ -966,16 +707,12 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [super encodeWithCoder:aCoder];
-    [self invalidateTimers];
 
     [aCoder encodeObject:_title forKey:CPButtonTitleKey];
     [aCoder encodeObject:_alternateTitle forKey:CPButtonAlternateTitleKey];
 
     [aCoder encodeBool:_allowsMixedState forKey:CPButtonAllowsMixedStateKey];
 
-    [aCoder encodeInt:_highlightsBy forKey:CPButtonHighlightsByKey];
-    [aCoder encodeInt:_showsStateBy forKey:CPButtonShowsStateByKey];
-
     [aCoder encodeBool:[self imageDimsWhenDisabled] forKey:CPButtonImageDimsWhenDisabledKey];
     [aCoder encodeInt:[self imagePosition] forKey:CPButtonImagePositionKey];
 
@@ -983,12 +720,9 @@ var CPButtonImageKey                    = @"CPButtonImageKey",
         [aCoder encodeObject:CFData.encodeBase64Utf16String(_keyEquivalent) forKey:CPButtonKeyEquivalentKey];
 
     [aCoder encodeInt:_keyEquivalentModifierMask forKey:CPButtonKeyEquivalentMaskKey];
-
-    [aCoder encodeObject:_periodicDelay forKey:CPButtonPeriodicDelayKey];
-    [aCoder encodeObject:_periodicInterval forKey:CPButtonPeriodicIntervalKey];
 }
 
 @end
 
-//@import "CPCheckBox.j"
-//@import "CPRadio.j"
+@import "CPCheckBox.j"
+@import "CPRadio.j"

AppKit/CPButtonBar.j

@@ -1,31 +1,5 @@
-/*
- * CPButtonBar.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
 
 @import "CPView.j"
-@import "CPWindow_Constants.j"
-
-@class CPSplitView
-
-@global CPPopUpButtonStatePullsDown
 
 
 @implementation CPButtonBar : CPView
@@ -38,7 +12,7 @@
 + (id)plusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"plus_button.png"] size:CGSizeMake(11, 12)];
 
     [button setBordered:NO];
     [button setImage:image];
@@ -50,7 +24,7 @@
 + (id)minusButton
 {
     var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"minus_button.png"] size:CGSizeMake(11, 4)];
 
     [button setBordered:NO];
     [button setImage:image];
@@ -62,7 +36,7 @@
 + (id)actionPopupButton
 {
     var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];
+        image = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPButtonBar class]] pathForResource:@"action_button.png"] size:CGSizeMake(22, 14)];
 
     [button addItemWithTitle:nil];
     [[button lastItem] setImage:image];
@@ -81,24 +55,8 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[   CGInsetMake(0.0, 0.0, 0.0, 0.0),
-                                                   CGSizeMakeZero(),
-                                                   [CPNull null],
-                                                   [CPNull null],
-                                                   [CPNull null],
-                                                   [CPNull null],
-                                                   [CPNull null],
-                                                   [CPNull null],
-                                                   [CPNull null]]
-                                       forKeys:[   @"resize-control-inset",
-                                                   @"resize-control-size",
-                                                   @"resize-control-color",
-                                                   @"bezel-color",
-                                                   @"button-bezel-color",
-                                                   @"button-text-color",
-                                                   @"button-image-plus",
-                                                   @"button-image-minus",
-                                                   @"button-image-action"]];
+    return [CPDictionary dictionaryWithObjects:[CGInsetMake(0.0, 0.0, 0.0, 0.0), CGSizeMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
+                                       forKeys:[@"resize-control-inset", @"resize-control-size", @"resize-control-color", @"bezel-color", @"button-bezel-color", @"button-text-color"]];
 }
 
 - (id)initWithFrame:(CGRect)aFrame

AppKit/CPCheckBox.j

@@ -44,14 +44,6 @@ CPCheckBoxImageOffset = 4.0;
     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];
@@ -94,48 +86,4 @@ CPCheckBoxImageOffset = 4.0;
     [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
 }
 
-- (CPImage)image
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (CPImage)alternateImage
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (BOOL)startTrackingAt:(CGPoint)aPoint
-{
-    var startedTracking = [super startTrackingAt:aPoint];
-    [self highlight:YES];
-    return startedTracking;
-}
-
-@end
-
-@implementation _CPCheckBoxValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setAllowsMixedState:(aValue === CPMixedState)];
-    [_source setState:aValue];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setState:aValue];
-}
-
 @end

AppKit/CPClipView.j

@@ -22,7 +22,6 @@
 
 @import "CPView.j"
 
-@class CPScrollView
 
 /*!
     @ingroup appkit

AppKit/CPCollectionView.j

@@ -26,12 +26,8 @@
 @import <Foundation/CPKeyedArchiver.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-@import "CPCollectionViewItem.j"
-@import "CPCompatibility.j"
-@import "CPPasteboard.j"
 @import "CPView.j"
-
-@class CPClipView
+@import "CPCollectionViewItem.j"
 
 
 /*!
@@ -44,23 +40,23 @@
 
     @par Delegate Methods
 
-    @delegate - (void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
+    @delegate -(void)collectionViewDidChangeSelection:(CPCollectionView)collectionView;
     Called when the selection in the collection view has changed.
     @param collectionView the collection view who's selection changed
 
-    @delegate - (void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
+    @delegate -(void)collectionView:(CPCollectionView)collectionView didDoubleClickOnItemAtIndex:(int)index;
     Called when the user double-clicks on an item in the collection view.
     @param collectionView the collection view that received the double-click
     @param index the index of the item that received the double-click
 
-    @delegate - (CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
+    @delegate -(CPData)collectionView:(CPCollectionView)collectionView dataForItemsAtIndexes:(CPIndexSet)indices forType:(CPString)aType;
     Invoked to obtain data for a set of indices.
     @param collectionView the collection view to obtain data for
     @param indices the indices to return data for
     @param aType the data type
     @return a data object containing the index items
 
-    @delegate - (CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
+    @delegate -(CPArray)collectionView:(CPCollectionView)collectionView dragTypesForItemsAtIndexes:(CPIndexSet)indices;
     Invoked to obtain the data types supported by the specified indices for placement on the pasteboard.
     @param collectionView the collection view the items reside in
     @param indices the indices to obtain drag types
@@ -135,49 +131,6 @@
 
 /*!
     Sets the item prototype to \c anItem
-
-    The item prototype should implement the CPCoding protocol
-    because the item is copied by archiving and unarchiving the
-    prototypal view.
-
-    Example:
-
-    <pre>
-      @implement MyCustomView : CPCollectionViewItem
-      {
-          CPArray   items   @accessors;
-      }
-
-      - (id)initWithFrame:(CGRect)aFrame
-      {
-        self = [super initWithFrame:aFrame];
-        if (self)
-        {
-          items = [];
-        }
-        return self;
-      }
-
-      - (id)initWithCoder:(CPCoder)aCoder
-      {
-        self = [super initWithCoder:aCoder];
-        items = [aCoder decodeObjectForKey:@"KEY"];
-        return self;
-      }
-
-      - (void)encodeWithCoder:(CPCoder)aCoder
-      {
-        [aCoder encodeObject:items forKey:@"KEY"];
-        [super encodeWithCoder:aCoder];
-      }
-
-      @end
-    </pre>
-
-    This will allow the collection view to create multiple 'clean' copies
-    of the item prototype which will maintain the original values for item
-    and all of the properties archived by the super class.
-
     @param anItem the new item prototype
 */
 - (void)setItemPrototype:(CPCollectionViewItem)anItem
@@ -246,15 +199,13 @@
     Sets the content of the collection view to the content in \c anArray.
     This array can be of any type, and each element will be passed to the \c -setRepresentedObject: method.
     It's the responsibility of your custom collection view item to interpret the object.
-
-    If the new content array is smaller than the previous one, note that [receiver selectionIndexes] may
-    refer to out of range indices. \c selectionIndexes is not changed as a result of calling the
-    \c setContent: method.
-
-    @param anArray a content array
+    @param anArray the content array
 */
 - (void)setContent:(CPArray)anArray
 {
+    if (_content == anArray)
+        return;
+
     _content = anArray;
 
     [self reloadContent];
@@ -290,11 +241,9 @@
 
     if (!_isSelectable)
     {
-        var index = CPNotFound,
-            itemCount = [_items count];
+        var index = CPNotFound;
 
-        // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < itemCount)
+        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
             [_items[index] setSelected:NO];
     }
 }
@@ -348,27 +297,22 @@
 */
 - (void)setSelectionIndexes:(CPIndexSet)anIndexSet
 {
-    if (!anIndexSet)
-        anIndexSet = [CPIndexSet indexSet];
-    if (!_isSelectable || [_selectionIndexes isEqual:anIndexSet])
+    if ([_selectionIndexes isEqual:anIndexSet] || !_isSelectable)
         return;
 
-    var index = CPNotFound,
-        itemCount = [_items count];
+    var index = CPNotFound;
 
-    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound && index < itemCount)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:NO];
 
     _selectionIndexes = anIndexSet;
 
     var index = CPNotFound;
 
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:YES];
 
-    var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
-    [[binderClass getBinding:@"selectionIndexes" forObject:self] reverseSetValueFor:@"selectionIndexes"];
+    [[CPKeyValueBinding getBinding:@"selectionIndexes" forObject:self] reverseSetValueFor:@"selectionIndexes"];
 
     if ([_delegate respondsToSelector:@selector(collectionViewDidChangeSelection:)])
         [_delegate collectionViewDidChangeSelection:self];
@@ -398,7 +342,7 @@
 
     _items = [];
 
-    if (!_itemPrototype)
+    if (!_itemPrototype || !_content)
         return;
 
     var index = 0;
@@ -413,8 +357,7 @@
     }
 
     index = CPNotFound;
-    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < count)
+    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound)
         [_items[index] setSelected:YES];
 
     [self tile];
@@ -425,7 +368,7 @@
 {
     var width = CGRectGetWidth([self bounds]);
 
-    if (width == _tileWidth)
+    if (![_content count] || width == _tileWidth)
         return;
 
     // We try to fit as many views per row as possible.  Any remaining space is then
@@ -486,7 +429,7 @@
     }
 
     var superview = [self superview],
-        proposedHeight = y + itemSize.height + _verticalMargin;
+        proposedHeight =  y + itemSize.height + _verticalMargin;
 
     if ([superview isKindOfClass:[CPClipView class]])
     {
@@ -572,8 +515,6 @@
 */
 - (void)setMinItemSize:(CGSize)aSize
 {
-    if (aSize === nil || aSize === undefined)
-        [CPException raise:CPInvalidArgumentException reason:"Invalid value provided for minimum size"];
     if (CGSizeEqualToSize(_minItemSize, aSize))
         return;
 
@@ -647,13 +588,15 @@
     _mouseDownEvent = anEvent;
 
     var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        index = [self _indexAtPoint:location];
+        row = FLOOR(location.y / (_itemSize.height + _verticalMargin)),
+        column = FLOOR(location.x / (_itemSize.width + _horizontalMargin)),
+        index = row * _numberOfColumns + column;
 
     if (index >= 0 && index < _items.length)
     {
-        if (_allowsMultipleSelection && ([anEvent modifierFlags] & CPPlatformActionKeyMask || [anEvent modifierFlags] & CPShiftKeyMask))
+        if (_allowsMultipleSelection && ([anEvent modifierFlags] & CPCommandKeyMask || [anEvent modifierFlags] & CPShiftKeyMask))
         {
-            if ([anEvent modifierFlags] & CPPlatformActionKeyMask)
+            if ([anEvent modifierFlags] & CPCommandKeyMask)
             {
                 var indexes = [_selectionIndexes copy];
 
@@ -680,13 +623,6 @@
             indexes = [CPIndexSet indexSetWithIndex:index];
 
         [self setSelectionIndexes:indexes];
-
-        // TODO Is it allowable for collection view items to become the first responder? In that case they
-        // may have become that at this point by virtue of CPWindow's sendEvent: mouse down handling, and
-        // the following line will rudely snatch it away from them. For most cases though, clicking on an
-        // item should naturally make the collection view the first responder so that keyboard navigation
-        // is enabled.
-        [[self window] makeFirstResponder:self];
     }
     else if (_allowsEmptySelection)
         [self setSelectionIndexes:[CPIndexSet indexSet]];
@@ -694,10 +630,6 @@
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
-    // Don't crash if we never registered the intial click.
-    if (!_mouseDownEvent)
-        return;
-
     var locationInWindow = [anEvent locationInWindow],
         mouseDownLocationInWindow = [_mouseDownEvent locationInWindow];
 
@@ -794,28 +726,6 @@
     return _delegate;
 }
 
-/*!
-    @ignore
-*/
-- (CPMenu)menuForEvent:(CPEvent)theEvent
-{
-    if (![[self delegate] respondsToSelector:@selector(collectionView:menuForItemAtIndex:)])
-        return [super menuForEvent:theEvent];
-
-    var location = [self convertPoint:[theEvent locationInWindow] fromView:nil],
-        index = [self _indexAtPoint:location];
-
-    return [_delegate collectionView:self menuForItemAtIndex:index];
-}
-
-- (int)_indexAtPoint:(CGPoint)thePoint
-{
-    var row = FLOOR(thePoint.y / (_itemSize.height + _verticalMargin)),
-        column = FLOOR(thePoint.x / (_itemSize.width + _horizontalMargin));
-
-    return row * _numberOfColumns + column;
-}
-
 - (CPCollectionViewItem)itemAtIndex:(unsigned)anIndex
 {
     return [_items objectAtIndex:anIndex];
@@ -987,22 +897,6 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 
 @implementation CPCollectionView (CPCoding)
 
-- (void)awakeFromCib
-{
-    [super awakeFromCib];
-
-    var prototypeView = [_itemPrototype view];
-    if (prototypeView && (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()) || CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero())))
-    {
-        var item = _itemPrototype;
-
-        if (CGSizeEqualToSize(_minItemSize, CGSizeMakeZero()))
-            _minItemSize = [prototypeView frameSize];
-        else if (CGSizeEqualToSize(_maxItemSize, CGSizeMakeZero()))
-            _maxItemSize = [prototypeView frameSize];
-    }
-}
-
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super initWithCoder:aCoder];
@@ -1016,11 +910,11 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 
         _itemSize = CGSizeMakeZero();
 
-        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey];
-        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey];
+        _minItemSize = [aCoder decodeSizeForKey:CPCollectionViewMinItemSizeKey] || CGSizeMakeZero();
+        _maxItemSize = [aCoder decodeSizeForKey:CPCollectionViewMaxItemSizeKey] || CGSizeMakeZero();
 
-        _maxNumberOfRows = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfRowsKey];
-        _maxNumberOfColumns = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfColumnsKey];
+        _maxNumberOfRows = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfRowsKey] || 0;
+        _maxNumberOfColumns = [aCoder decodeIntForKey:CPCollectionViewMaxNumberOfColumnsKey] || 0;
 
         _verticalMargin = [aCoder decodeFloatForKey:CPCollectionViewVerticalMarginKey];
 

AppKit/CPColor.j

@@ -21,7 +21,6 @@
  */
 
 @import <Foundation/CPObject.j>
-@import "CPGraphicsContext.j"
 
 @import "CGColor.j"
 
@@ -29,18 +28,6 @@
 @import "CPImage.j"
 
 
-/*!
-    Orientation to use with \c CPColorPattern for vertical patterns.
-*/
-CPColorPatternIsVertical = YES;
-
-/*!
-    Orientation to use with \c CPColorPattern for horizontal patterns.
-*/
-CPColorPatternIsHorizontal = NO;
-
-/// @cond IGNORE
-
 var _redComponent        = 0,
     _greenComponent      = 1,
     _blueComponent       = 2,
@@ -67,8 +54,6 @@ var cachedBlackColor,
     cachedShadowColor,
     cachedClearColor;
 
-/// @endcond
-
 /*!
     @ingroup appkit
 
@@ -87,7 +72,7 @@ var cachedBlackColor,
 }
 
 /*!
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
@@ -101,13 +86,13 @@ var cachedBlackColor,
 */
 + (CPColor)colorWithRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
 {
-    return [[CPColor alloc] _initWithRGBA:[MAX(0.0, MIN(1.0, red)), MAX(0.0, MIN(1.0, green)), MAX(0.0, MIN(1.0, blue)), MAX(0.0, MIN(1.0, alpha))]];
+    return [[CPColor alloc] _initWithRGBA:[red, green, blue, alpha]];
 }
 
 /*!
     @deprecated in favor of colorWithRed:green:blue:alpha:
 
-    Creates a color in the RGB colorspace, with an alpha value.
+    Creates a color in the RGB color space, with an alpha value.
     Each component should be between the range of 0.0 to 1.0. For
     the alpha component, a value of 1.0 is opaque, and 0.0 means
     completely transparent.
@@ -140,7 +125,7 @@ var cachedBlackColor,
 }
 
 /*!
-    @deprecated in favor of colorWithWhite:alpha:
+    @deprecated in favor of colorWithWhite:apha:
 
     Creates a new color object with \c white for the RGB components.
     For the alpha component, a value of 1.0 is opaque, and 0.0 means completely transparent.
@@ -182,12 +167,12 @@ var cachedBlackColor,
 
     switch (FLOOR(hue / 60))
     {
-        case 0: return [CPColor colorWithCalibratedRed:b green:t blue:p alpha:alpha];
-        case 1: return [CPColor colorWithCalibratedRed:q green:b blue:p alpha:alpha];
-        case 2: return [CPColor colorWithCalibratedRed:p green:b blue:t alpha:alpha];
-        case 3: return [CPColor colorWithCalibratedRed:p green:q blue:b alpha:alpha];
-        case 4: return [CPColor colorWithCalibratedRed:t green:p blue:b alpha:alpha];
-        case 5: return [CPColor colorWithCalibratedRed:b green:p blue:q alpha:alpha];
+        case 0: return [CPColor colorWithCalibratedRed: b green: t blue: p alpha: alpha];
+        case 1: return [CPColor colorWithCalibratedRed: q green: b blue: p alpha: alpha];
+        case 2: return [CPColor colorWithCalibratedRed: p green: b blue: t alpha: alpha];
+        case 3: return [CPColor colorWithCalibratedRed: p green: q blue: b alpha: alpha];
+        case 4: return [CPColor colorWithCalibratedRed: t green: p blue: b alpha: alpha];
+        case 5: return [CPColor colorWithCalibratedRed: b green: p blue: q alpha: alpha];
     }
 }
 
@@ -207,17 +192,6 @@ var cachedBlackColor,
     return rgba ? [[CPColor alloc] _initWithRGBA: rgba] : null;
 }
 
-/*!
-    Creates a color in the sRGB colorspace with the given components and alpha values.
-    Values below 0.0 are treated as 0.0 and values above 1.0 are treated as 1.0.
-*/
-+ (CPColor)colorWithSRGBRed:(float)red green:(float)green blue:(float)blue alpha:(float)alpha
-{
-    // TODO If Cappuccino is ported to a colorspace aware platform, this color should be in
-    // sRGBColorSpace.
-    return [self colorWithRed:red green:green blue:blue alpha:alpha];
-}
-
 /*!
     Returns a black color object. (RGBA=[0.0, 0.0, 0.0, 1.0])
 */
@@ -442,12 +416,10 @@ var cachedBlackColor,
         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
     ];
 
-    // We can't reuse aString as _cssString because the browser might not support the `rgba` syntax, and aString might
-    // use it (issue #1413.)
-    [self _initCSSStringFromComponents];
+    _cssString = aString;
 
     return self;
 }
@@ -461,23 +433,18 @@ var cachedBlackColor,
     {
         _components = components;
 
-        [self _initCSSStringFromComponents];
+        var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
+
+        _cssString = (hasAlpha ? "rgba(" : "rgb(") +
+            parseInt(_components[0] * 255.0) + ", " +
+            parseInt(_components[1] * 255.0) + ", " +
+            parseInt(_components[2] * 255.0) +
+            (hasAlpha ?  (", " + _components[3]) : "") + ")";
     }
 
     return self;
 }
 
-- (void)_initCSSStringFromComponents
-{
-    var hasAlpha = CPFeatureIsCompatible(CPCSSRGBAFeature) && _components[3] != 1.0;
-
-    _cssString = (hasAlpha ? "rgba(" : "rgb(") +
-        parseInt(_components[0] * 255.0) + ", " +
-        parseInt(_components[1] * 255.0) + ", " +
-        parseInt(_components[2] * 255.0) +
-        (hasAlpha ?  (", " + _components[3]) : "") + ")";
-}
-
 /* @ignore */
 - (id)_initWithPatternImage:(CPImage)anImage
 {
@@ -565,14 +532,6 @@ var cachedBlackColor,
     return [[[self class] alloc] _initWithRGBA:components];
 }
 
-/*!
-    Returns the receiver. This method is a placeholder that does nothing but may be implemented in the future.
-*/
-- (CPColor)colorUsingColorSpaceName:(id)aColorSpaceName
-{
-    return self;
-}
-
 /*!
     Returns an array with the HSB values for this color.
     The index values are ordered as:
@@ -646,7 +605,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
@@ -657,53 +616,12 @@ 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
 {
-    var description = [super description],
-        patternImage = [self patternImage];
-
-    if (!patternImage)
-        return description + " " + [self cssString];
-
-    description += " {\n";
-
-    if ([patternImage isThreePartImage] || [patternImage isNinePartImage])
-    {
-        var slices = [patternImage imageSlices];
-
-        if ([patternImage isThreePartImage])
-            description += "    orientation: " + ([patternImage isVertical] ? "vertical" : "horizontal") + ",\n";
-
-        description += "    patternImage (" + slices.length + " part): [\n";
-
-        for (var i = 0; i < slices.length; ++i)
-        {
-            var imgDescription = [slices[i] description] || "nil";
-
-            description += imgDescription.replace(/^/mg, "        ") + ",\n";
-        }
-
-        description = description.substr(0, description.length - 2) + "\n    ]\n}";
-    }
-    else
-        description += ([patternImage description] || "nil").replace(/^/mg, "    ") + "\n}";
-
-    return description;
+    return [super description]+" "+[self cssString];
 }
 
 @end
@@ -748,10 +666,8 @@ url("data:image/png;base64,BASE64ENCODEDDATA")  // if there is a pattern image
 
 @end
 
-/// @cond IGNORE
 var CPColorComponentsKey    = @"CPColorComponentsKey",
     CPColorPatternImageKey  = @"CPColorPatternImageKey";
-/// @endcond
 
 @implementation CPColor (CPCoding)
 
@@ -782,12 +698,13 @@ var CPColorComponentsKey    = @"CPColorComponentsKey",
 @end
 
 
-/// @cond IGNORE
 var hexCharacters = "0123456789ABCDEF";
 
-/*
-    Used for the CPColor +colorWithHexString: implementation.
-    Returns an array of rgb components.
+/*!
+    Used for the CPColor \c +colorWithHexString: implementation
+    @ignore
+    @class CPColor
+    @return an array of rgb components
 */
 var hexToRGB = function(hex)
 {
@@ -825,551 +742,3 @@ var byteToHex = function(n)
     return hexCharacters.charAt((n - n % 16) / 16) +
            hexCharacters.charAt(n % 16);
 };
-
-/*!
-    To create a simple color with a pattern image:
-        CPColorWithImages(name, width, height{, bundle})
-
-    To create a color with a three-part/nine-part image using a pattern string:
-        CPColorWithImages(pattern, attributes{, bundle})
-
-    <pattern> must have one or more placeholders. There are there possible
-    placeholders available that together can be used to build a filename:
-
-    style     A top-level style, for example normal (empty) and "default".
-    state     The state of a view, for example "highlighted" and "disabled".
-    position  The position of an image within a 3-part or 9-part image.
-              This must be provided.
-
-    Each placeholder is filled with the values you pass in a the attributes object.
-    Neither style nor state are necessary, if you omit them the next level of the
-    hierarchy is the top level.
-
-    Attributes
-    ----------
-    styles: [...]
-    An array of style names. For example, if you want to generate the filenames
-    "button-bezel" and "default-button-bezel", you would use ["", "default"]
-    for the styles.
-
-    states: [...]
-    An array of state names.
-
-    positions: <spec>
-    Specifies the naming convention for the slices of the image. For 3-part images,
-    <spec> may be one of:
-
-        "@"     Equivalent to ["left", "center", "right"] for horizontal
-                images, ["top", "center", "bottom"] for vertical images
-        "#"     Equivalent to ["0", "1", "2"]
-        [...]   An array of any three literal strings
-
-    For 9-part images, <spec> may be one of:
-
-        "@" | "abbrev"  Equivalent to ["top-left", "top", "top-right",
-                                       "left", "center", "right",
-                                       "bottom-left", "bottom", "bottom-right"]
-        "full"          Equivalent to ["top-left", "top-center", "top-right",
-                                       "center-left", "center-center", "center-right",
-                                       "bottom-left", "bottom-center", "bottom-right"]
-        "#"              Equivalent to ["0", "1", "2", "3", "4", "5", "6", "7", "8"]
-        [...]           An array of any nine literal strings
-
-    width: <number>
-    The width of the left image for horizontal 3-part images, the top image for
-    vertical 3-part images, or the top left corner for 9-part images.
-
-    height: <number>
-    The height of the left image for horizontal 3-part images, the top image for
-    vertical 3-part images, or the top left corner for 9-part images.
-
-    centerWidth: <number>
-    For a horizontal 3-part image that has a center slice width that is not 1.0,
-    set this for the width of the center slice. If omitted, it defaults
-    to 1.0. Not used for 9-part images.
-
-    rightWidth: <number>
-    For a horizontal 3-part image that has different left/right slice widths,
-    or a 9-part image that has different left/right corner slice widths,
-    set this for the width of the right slice. If omitted, the "width"
-    value is used for left and right widths.
-
-    centerHeight: <number>
-    For a vertical 3-part image that has a center slice height that is not 1.0,
-    set this for the height of the center slice. If omitted, it defaults
-    to 1.0. Not used for 9-part images.
-
-    bottomHeight: <number>
-    For a vertical image that has different top/bottom slice heights,
-    or a 9-part image that has different top/bottom corner slice heights,
-    set this for the height of the bottom slice. If omitted, the "height"
-    value is used for top and bottom heights.
-
-    centerIsNil: <BOOL>
-    For 9-part images, if the center image is nil, set this to YES.
-    If omitted or set to NO, a center image must be provided.
-
-    separator: <string>
-    The separator to use between components of the pattern.
-    If it is omitted, it defaults to "-".
-
-    orientation: PatternIsHorizontal | PatternIsVertical
-    The orientation of the image. This must be specified for 3-part images,
-    it should NOT be specified for 9-part images.
-
-    Using a pattern, all of this:
-
-    bezelColor = PatternColor(
-        [
-            ["button-bezel-left.png", 4.0, 24.0],
-            ["button-bezel-center.png", 1.0, 24.0],
-            ["button-bezel-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    highlightedBezelColor = PatternColor(
-        [
-            ["button-bezel-highlighted-left.png", 4.0, 24.0],
-            ["button-bezel-highlighted-center.png", 1.0, 24.0],
-            ["button-bezel-highlighted-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    disabledBezelColor = PatternColor(
-        [
-            ["button-bezel-disabled-left.png", 4.0, 24.0],
-            ["button-bezel-disabled-center.png", 1.0, 24.0],
-            ["button-bezel-disabled-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    defaultBezelColor = PatternColor(
-        [
-            ["default-button-bezel-left.png", 4.0, 24.0],
-            ["default-button-bezel-center.png", 1.0, 24.0],
-            ["default-button-bezel-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    defaultHighlightedBezelColor = PatternColor(
-        [
-            ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
-            ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
-            ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal),
-
-    defaultDisabledBezelColor = PatternColor(
-        [
-            ["default-button-bezel-disabled-left.png", 4.0, 24.0],
-            ["default-button-bezel-disabled-center.png", 1.0, 24.0],
-            ["default-button-bezel-disabled-right.png", 4.0, 24.0]
-        ],
-        PatternIsHorizontal)
-
-    can be replaced with this:
-
-    bezelColors = PatternColor(
-        "{style}button-bezel{state}{position}.png",
-        {
-            styles: ["", "default"],
-            states: ["", "highlighted", "disabled"],
-            positions: "@",
-            width: 4.0,
-            height: 24.0,
-            orientation: PatternIsHorizontal
-        })
-
-    Which would effectively create the following object:
-
-    {
-        "@":
-        {
-            "@": <ThreePartImage>:
-            [
-                ["button-bezel-left.png", 4.0, 24.0],
-                ["button-bezel-center.png", 1.0, 24.0],
-                ["button-bezel-right.png", 4.0, 24.0]
-            ],
-            "highlighted": <ThreePartImage>:
-            [
-                ["button-bezel-highlighted-left.png", 4.0, 24.0],
-                ["button-bezel-highlighted-center.png", 1.0, 24.0],
-                ["button-bezel-highlighted-right.png", 4.0, 24.0]
-            ],
-            "disabled": <ThreePartImage>:
-            [
-                ["button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
-                ["button-bezel-disabled-right.png", 4.0, 24.0]
-            ]
-        },
-
-        "default":
-        {
-            "@": <ThreePartImage>:
-            [
-                ["default-button-bezel-left.png", 4.0, 24.0],
-                ["default-button-bezel-center.png", 1.0, 24.0],
-                ["default-button-bezel-right.png", 4.0, 24.0]
-            ],
-            "highlighted": <ThreePartImage>:
-            [
-                ["default-button-bezel-highlighted-left.png", 4.0, 24.0],
-                ["default-button-bezel-highlighted-center.png", 1.0, 24.0],
-                ["default-button-bezel-highlighted-right.png", 4.0, 24.0]
-            ],
-            "disabled": <ThreePartImage>:
-            [
-                ["default-button-bezel-disabled-left.png", 4.0, 24.0],
-                ["button-bezel-disabled-center.png", 1.0, 24.0],
-                ["default-button-bezel-disabled-right.png", 4.0, 24.0]
-            ]
-        }
-    }
-
-    To reference empty names in the pattern color, use the key "@".
-    So, for example, to reference the "default" style, "disabled" state,
-    you would use the following expression:
-
-    bezelColors["@"]["disabled"]
-
-    To create a color with a three-part pattern image explicitly:
-        CPColorWithImages(slices, orientation)
-
-    where slices is an array of three [name, width, height{, bundle}] arrays,
-    and orientation is CPColorPatternIsVertical or CPColorPatternIsHorizontal.
-
-    To create a color with a nine-part pattern image explicitly:
-        CPColorWithImages(slices);
-
-    where slices is an array of nine [name, width, height{, bundle}] arrays.
-*/
-function CPColorWithImages()
-{
-    var slices = nil,
-        numParts = 0,
-        isVertical = false,
-        imageFactory = CPImageInBundle,
-        args = Array.prototype.slice.apply(arguments);
-
-    if (typeof(args[args.length - 1]) === "function")
-        imageFactory = args.pop();
-
-    switch (args.length)
-    {
-        case 1:
-            return imageFromSlices(args[0], isVertical, imageFactory);
-
-        case 2:
-            // New-style 3-part and 9-part images
-            if (typeof(args[0]) === "string")
-                return patternColorsFromPattern.call(this, args[0], args[1], imageFactory);
-
-            return imageFromSlices(args[0], args[1], imageFactory);
-
-        case 3:
-            return [CPColor colorWithPatternImage:imageFactory(args[0], args[1], args[2])];
-
-        default:
-            throw("ERROR: Invalid argument count: " + args.length);
-    }
-}
-
-var imageFromSlices = function(slices, isVertical, imageFactory)
-{
-    var imageSlices = [];
-
-    for (var i = 0; i < slices.length; ++i)
-    {
-        var slice = slices[i];
-
-        imageSlices.push(slice ? imageFactory(slice[0], slice[1], slice[2]) : nil);
-    }
-
-    switch (slices.length)
-    {
-        case 3:
-            return [CPColor colorWithPatternImage:[[CPThreePartImage alloc] initWithImageSlices:imageSlices isVertical:isVertical]];
-
-        case 9:
-            return [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:imageSlices]];
-
-        default:
-            throw("ERROR: Invalid number of image slices: " + slices.length);
-    }
-};
-
-var patternColorsFromPattern = function(pattern, attributes, imageFactory)
-{
-    if (pattern.match(/^.*\{[^}]+\}/))
-    {
-        var width = attributes["width"],
-            height = attributes["height"],
-            separator = attributes["separator"] || "-",
-            orientation = attributes["orientation"],
-            rightWidth,
-            bottomHeight,
-            centerWidthHeight,
-            centerIsNil,
-            numParts;
-
-        // positions are mandatory
-        if (pattern.indexOf("{position}") < 0)
-            throw("ERROR: Pattern strings must have a {position} placeholder (\"" + pattern + "\")");
-
-        if (orientation === undefined)
-        {
-            numParts = 9;
-
-            if (attributes["centerIsNil"] !== undefined)
-                centerIsNil = attributes["centerIsNil"];
-        }
-        else
-        {
-            numParts = 3;
-            isVertical = orientation === PatternIsVertical;
-
-            if (isVertical)
-            {
-                if (attributes["centerHeight"])
-                    centerWidthHeight = attributes["centerHeight"];
-            }
-            else
-            {
-                if (attributes["centerWidth"])
-                    centerWidthHeight = attributes["centerWidth"];
-            }
-        }
-
-        if (attributes["rightWidth"])
-            rightWidth = attributes["rightWidth"];
-
-        if (attributes["bottomHeight"])
-            bottomHeight = attributes["bottomHeight"];
-
-        var positions = attributes["positions"] || "@",
-            states = nil,
-            styles = nil;
-
-        if (numParts === 3)
-        {
-            if (positions === "@")
-            {
-                if (isVertical)
-                    positions = ["top", "center", "bottom"];
-                else
-                    positions = ["left", "center", "right"];
-            }
-            else if (positions === "#")
-                positions = ["0", "1", "2"];
-            else
-                throw("ERROR: Invalid positions: " + positions)
-        }
-        else // numParts === 9
-        {
-            if (positions === "@" || positions === "abbrev")
-                positions = ["top-left", "top", "top-right", "left", "center", "right", "bottom-left", "bottom", "bottom-right"];
-            else if (positions === "full")
-                positions = ["top-left", "top-center", "top-right", "center-left", "center-center", "center-right", "bottom-left", "bottom-center", "bottom-right"];
-            else if (positions === "#")
-                positions = ["0", "1", "2", "3", "4", "5", "6", "7", "8"];
-            else
-                throw("ERROR: Invalid positions: " + positions)
-        }
-
-        // states
-        if (pattern.indexOf("{state}") >= 0)
-        {
-            states = attributes["states"];
-
-            if (!states)
-                throw("ERROR: {state} placeholder in the pattern (\"" + pattern + "\") but no states item in the attributes");
-        }
-
-        // styles
-        if (pattern.indexOf("{style}") >= 0)
-        {
-            styles = attributes["styles"];
-
-            if (!styles)
-                throw("ERROR: {style} placeholder in the pattern (\"" + pattern + "\") but no styles item in the attributes");
-        }
-
-        // Now assemble the hierarchy
-        var placeholder = "{position}",
-            pos = pattern.indexOf(placeholder),
-            i;
-
-        for (i = 0; i < positions.length; ++i)
-            positions[i] = pattern.replace(placeholder, pos === 0 ? positions[i] + separator : separator + positions[i]);
-
-        var slices = positions,
-            object = slices,
-            key,
-            sep;
-
-        if (states)
-        {
-            placeholder = "{state}";
-            pos = pattern.indexOf(placeholder);
-            object = {};
-
-            for (i = 0; i < states.length; ++i)
-            {
-                var state = states[i];
-                key = state || "@";
-                sep = state ? separator : "";
-
-                object[key] = slices.slice(0);
-                replacePlaceholderInArray(object[key], placeholder, pos === 0 ? state + sep : sep + state);
-            }
-        }
-
-        if (styles)
-        {
-            placeholder = "{style}";
-            pos = pattern.indexOf(placeholder);
-
-            var styleObject = {};
-
-            for (i = 0; i < styles.length; ++i)
-            {
-                var style = styles[i];
-                key = style || "@";
-                sep = style ? separator : "";
-
-                if (states)
-                {
-                    styleObject[key] = cloneObject(object);
-                    replacePlaceholderInObject(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
-                }
-                else
-                {
-                    styleObject[key] = slices.slice(0);
-                    replacePlaceholderInArray(styleObject[key], placeholder, pos === 0 ? style + sep : sep + style);
-                }
-            }
-
-            object = styleObject;
-        }
-
-        if (styles || states)
-        {
-            if (numParts === 3)
-                makeThreePartSlicesFromObject(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else
-                makeNinePartSlicesFromObject(object, width, height, rightWidth, bottomHeight, centerIsNil);
-
-            makeImagesFromObject(object, isVertical, imageFactory);
-            return object;
-        }
-        else
-        {
-            if (numParts === 3)
-                makeThreePartSlicesFromArray(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else
-                makeNinePartSlicesFromArray(object, width, height, rightWidth, bottomHeight, centerIsNil);
-
-            return imageFromSlices(object, isVertical, imageFactory);
-        }
-    }
-    else
-        throw("ERROR: No placeholders in slice pattern (\"" + pattern + "\")");
-};
-
-var replacePlaceholderInArray = function(array, find, replacement)
-{
-    for (var i = 0; i < array.length; ++i)
-        array[i] = array[i].replace(find, replacement);
-};
-
-var replacePlaceholderInObject = function(object, find, replacement)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                replacePlaceholderInArray(object[key], find, replacement);
-            else
-                replacePlaceholderInObject(object[key], find, replacement);
-};
-
-var cloneObject = function(object)
-{
-    var clone = {};
-
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                clone[key] = object[key].slice(0);
-            else if (typeof(object) === "object")
-                clone[key] = cloneObject(object[key]);
-            else
-                clone[key] = object[key];
-
-    return clone;
-};
-
-var makeThreePartSlicesFromObject = function(object, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                makeThreePartSlicesFromArray(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-            else // object
-                makeThreePartSlicesFromObject(object[key], width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical);
-};
-
-var makeThreePartSlicesFromArray = function(array, width, height, centerWidthHeight, rightWidth, bottomHeight, isVertical)
-{
-    array[0] = [array[0], width, height];
-
-    if (isVertical)
-    {
-        array[1] = [array[1], width, centerWidthHeight ? centerWidthHeight : 1.0];
-        array[2] = [array[2], width, bottomHeight ? bottomHeight : height];
-    }
-    else
-    {
-        array[1] = [array[1], centerWidthHeight ? centerWidthHeight : 1.0, height];
-        array[2] = [array[2], rightWidth ? rightWidth : width, height];
-    }
-};
-
-var makeNinePartSlicesFromObject = function(object, width, height, rightWidth, bottomHeight, centerIsNil)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                makeNinePartSlicesFromArray(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
-            else // object
-                makeNinePartSlicesFromObject(object[key], width, height, rightWidth, bottomHeight, centerIsNil);
-};
-
-var makeNinePartSlicesFromArray = function(array, width, height, rightWidth, bottomHeight, centerIsNil)
-{
-    rightWidth = rightWidth ? rightWidth : width;
-    bottomHeight = bottomHeight ? bottomHeight : height;
-
-    array[0] = [array[0], width, height];                // top-left
-    array[1] = [array[1], 1.0, height];                  // top
-    array[2] = [array[2], rightWidth, height];           // top-right
-    array[3] = [array[3], width, 1.0];                   // left
-    array[4] = centerIsNil ? nil : [array[4], 1.0, 1.0]; // center
-    array[5] = [array[5], rightWidth, 1.0];              // right
-    array[6] = [array[6], width, bottomHeight];          // bottom-left
-    array[7] = [array[7], 1.0, bottomHeight];            // bottom
-    array[8] = [array[8], rightWidth, bottomHeight];     // bottom-right
-};
-
-var makeImagesFromObject = function(object, isVertical, imageFactory)
-{
-    for (var key in object)
-        if (object.hasOwnProperty(key))
-            if (object[key].constructor === Array)
-                object[key] = imageFromSlices(object[key], isVertical, imageFactory);
-            else // object
-                makeImagesFromObject(object[key], isVertical, imageFactory);
-};
-
-/// @endcond

AppKit/CPColorPanel.j

@@ -20,31 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import "CPApplication.j"
 @import "CPButton.j"
 @import "CPCookie.j"
 @import "CPPanel.j"
 @import "CPView.j"
 
-@class CPSlider
-
-@global CPApp
-
-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
 
 CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
 
@@ -57,6 +38,22 @@ var PREVIEW_HEIGHT = 20.0,
 var SharedColorPanel = nil,
     ColorPickerClasses = [];
 
+/*
+    A color wheel
+    @global
+    @group CPColorPanelMode
+*/
+CPWheelColorPickerMode = 1;
+/*
+    Slider based picker
+    @global
+    @group CPColorPanelMode
+*/
+CPSliderColorPickerMode = 2;
+
+CPColorPickerViewWidth  = 265,
+CPColorPickerViewHeight = 370;
+
 /*!
     @ingroup appkit
     @class CPColorPanel
@@ -126,7 +123,7 @@ var SharedColorPanel = nil,
 
     if (self)
     {
-        //[[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+        [[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
 
         [self setTitle:@"Color Panel"];
         [self setLevel:CPFloatingWindowLevel];
@@ -134,7 +131,7 @@ var SharedColorPanel = nil,
         [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)];
     }
 
@@ -147,7 +144,7 @@ var SharedColorPanel = nil,
 - (void)setColor:(CPColor)aColor
 {
     _color = aColor;
-    [_previewView setBackgroundColor:_color];
+    [_previewView setBackgroundColor: _color];
 
     [CPApp sendAction:@selector(changeColor:) to:nil from:self];
 
@@ -251,8 +248,8 @@ var SharedColorPanel = nil,
         var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
             bounds = [[self contentView] bounds];
 
-        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin:CGPointMake(5, height)];
+        [view setFrameSize:CPSizeMake(bounds.size.width - 10, bounds.size.height - height)];
+        [view setFrameOrigin:CPPointMake(5, height)];
     }
 
     [_currentView removeFromSuperview];
@@ -302,7 +299,7 @@ var SharedColorPanel = nil,
         bounds = [contentView bounds];
 
     _toolbar = [[CPView alloc] initWithFrame:CGRectMake(0, 6, CGRectGetWidth(bounds), TOOLBAR_HEIGHT)];
-    [_toolbar setAutoresizingMask:CPViewWidthSizable];
+    [_toolbar setAutoresizingMask: CPViewWidthSizable];
 
     var totalToolbarWidth = count * ICON_WIDTH + (count - 1) * ICON_PADDING,
         leftOffset = (CGRectGetWidth(bounds) - totalToolbarWidth) / 2.0,
@@ -342,7 +339,7 @@ var SharedColorPanel = nil,
 
     [previewBox addSubview:_previewView];
 
-    var _previewLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
+    var _previewLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
     [_previewLabel setStringValue:"Preview:"];
     [_previewLabel setTextColor:[CPColor blackColor]];
     [_previewLabel setAlignment:CPRightTextAlignment];
@@ -360,14 +357,14 @@ var SharedColorPanel = nil,
 
     [swatchBox addSubview:_swatchView];
 
-    var _swatchLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
-    [_swatchLabel setStringValue:"Swatches:"];
+    var _swatchLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
+    [_swatchLabel setStringValue: "Swatches:"];
     [_swatchLabel setTextColor:[CPColor blackColor]];
     [_swatchLabel setAlignment:CPRightTextAlignment];
 
 
-    var opacityLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
-    [opacityLabel setStringValue:"Opacity:"];
+    var opacityLabel = [[CPTextField alloc] initWithFrame: CPRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
+    [opacityLabel setStringValue: "Opacity:"];
     [opacityLabel setTextColor:[CPColor blackColor]];
     [opacityLabel setAlignment:CPRightTextAlignment];
 
@@ -375,7 +372,6 @@ var SharedColorPanel = nil,
 
     [_opacitySlider setMinValue:0.0];
     [_opacitySlider setMaxValue:1.0];
-    [_opacitySlider setAutoresizingMask:CPViewWidthSizable];
 
     [_opacitySlider setTarget:self];
     [_opacitySlider setAction:@selector(setOpacity:)];
@@ -392,7 +388,7 @@ var SharedColorPanel = nil,
     _action = nil;
     _activePicker = nil;
 
-    [_previewView setBackgroundColor:_color];
+    [_previewView setBackgroundColor: _color];
 
     if (buttonForLater)
         [self _setPicker:buttonForLater];
@@ -410,29 +406,28 @@ var SharedColorPanel = nil,
 
 
 CPColorDragType = "CPColorDragType";
-
 var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
 /* @ignore */
 @implementation _CPColorPanelSwatches : CPView
 {
-    CPArray         _swatches;
+    CPView[]        _swatches;
     CPColor         _dragColor;
     CPColorPanel    _colorPanel;
     CPCookie        _swatchCookie;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
-    [self setBackgroundColor:[CPColor grayColor]];
+    [self setBackgroundColor: [CPColor grayColor]];
 
     [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
 
     var whiteColor = [CPColor whiteColor];
 
-    _swatchCookie = [[CPCookie alloc] initWithName:CPColorPanelSwatchesCookie];
+    _swatchCookie = [[CPCookie alloc] initWithName: CPColorPanelSwatchesCookie];
     var colorList = [self startingColorList];
 
     _swatches = [];
@@ -440,15 +435,15 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     for (var i = 0; i < 50; i++)
     {
         // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-        var view = [[CPView alloc] initWithFrame:CGRectMake(13 * i + 1, 1, 12, 12)],
+        var view = [[CPView alloc] initWithFrame: CPRectMake(13 * i + 1, 1, 12, 12)],
             fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
 
         [view setBackgroundColor:whiteColor];
-        [fillView setBackgroundColor:(i < colorList.length) ? colorList[i] : whiteColor];
+        [fillView setBackgroundColor: (i < colorList.length) ? colorList[i] : whiteColor];
 
         [view addSubview:fillView];
 
-        [self addSubview:view];
+        [self addSubview: view];
 
         _swatches.push(view);
     }
@@ -465,7 +460,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 {
     var cookieValue = [_swatchCookie value];
 
-    if (!cookieValue)
+    if (cookieValue == "")
     {
         return [
             [CPColor blackColor],
@@ -484,7 +479,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
         result = [];
 
     for (var i = 0; i < cookieValue.length; i++)
-        result.push([CPColor colorWithHexString:cookieValue[i]]);
+        result.push([CPColor colorWithHexString: cookieValue[i]]);
 
     return result;
 }
@@ -499,7 +494,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     var future = new Date();
     future.setYear(2019);
 
-    [_swatchCookie setValue:JSON.stringify(result) expires:future domain:nil];
+    [_swatchCookie setValue: JSON.stringify(result) expires:future domain: nil];
 }
 
 - (void)setColorPanel:(CPColorPanel)panel
@@ -532,14 +527,14 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     if (!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
         return NO;
 
-    [_colorPanel setColor:[self colorAtIndex:FLOOR(point.x / 13)] updatePicker:YES];
+    [_colorPanel setColor: [self colorAtIndex:FLOOR(point.x / 13)] updatePicker: YES];
 }
 
 - (void)mouseDragged:(CPEvent)anEvent
 {
     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];
@@ -549,10 +544,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
     _dragColor = [[swatch subviews][0] backgroundColor];
 
-    var bounds = CGRectMakeCopy([swatch bounds]);
+    var bounds = CPRectCreateCopy([swatch bounds]);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame:bounds],
+    var dragView = [[CPView alloc] initWithFrame: bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
 
     [dragView setBackgroundColor:[CPColor blackColor]];
@@ -560,13 +555,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [dragView addSubview:dragFillView];
 
-    [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:nil
-            source:self
-         slideBack:YES];
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
@@ -584,7 +579,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     if (![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
         return NO;
 
-    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex:FLOOR(location.x / 13)];
+    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex: FLOOR(location.x / 13)];
 }
 
 @end
@@ -595,7 +590,7 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
     CPColorPanel    _colorPanel;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
     self = [super initWithFrame:aFrame];
 
@@ -636,10 +631,10 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [[CPPasteboard pasteboardWithName:CPDragPboard] declareTypes:[CPColorDragType] owner:self];
 
-    var bounds = CGRectMake(0, 0, 15, 15);
+    var bounds = CPRectMake(0, 0, 15, 15);
 
     // FIXME: http://280north.lighthouseapp.com/projects/13294-cappuccino/tickets/25-implement-cpbox
-    var dragView = [[CPView alloc] initWithFrame:bounds],
+    var dragView = [[CPView alloc] initWithFrame: bounds],
         dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
 
     [dragView setBackgroundColor:[CPColor blackColor]];
@@ -647,13 +642,13 @@ var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
 
     [dragView addSubview:dragFillView];
 
-    [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:nil
-            source:self
-         slideBack:YES];
+    [self dragView: dragView
+                at: CPPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
+            offset: CPPointMake(0.0, 0.0)
+             event: anEvent
+        pasteboard: nil
+            source: self
+         slideBack: YES];
 }
 
 - (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType

AppKit/CPColorPicker.j

@@ -24,12 +24,6 @@
 
 @import "CPView.j"
 
-@class CPSlider
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPWheelColorPickerMode
-
 
 /*!
     @ingroup appkit
@@ -50,11 +44,10 @@
 */
 - (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
 {
-    if (self = [super init])
-    {
-        _panel = aPanel;
-        _mask  = aMask;
-    }
+    self = [super init];
+
+    _panel = aPanel;
+    _mask  = aMask;
 
     return self;
 }
@@ -83,6 +76,7 @@
 */
 - (void)setMode:(CPColorPanelMode)mode
 {
+    return;
 }
 
 /*!
@@ -91,6 +85,7 @@
 */
 - (void)setColor:(CPColor)aColor
 {
+    return;
 }
 
 @end
@@ -115,12 +110,12 @@
 
 - (id)initView
 {
-    var aFrame = _CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
+    aFrame = CPRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
 
     _pickerView = [[CPView alloc] initWithFrame:aFrame];
     [_pickerView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 
-    _brightnessSlider = [[CPSlider alloc] initWithFrame:_CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
+    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
 
     [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
     [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
@@ -133,9 +128,9 @@
     [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
     [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
 
-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:_CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
-    [_hueSaturationView setDelegate:self];
-    [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];
+    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame: CPRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
+    [_hueSaturationView setDelegate: self];
+    [_hueSaturationView setAutoresizingMask: (CPViewWidthSizable | CPViewHeightSizable)];
 
     [_pickerView addSubview:_hueSaturationView];
     [_pickerView addSubview:_brightnessSlider];
@@ -228,64 +223,60 @@
     float       _radius;
 }
 
-- (id)initWithFrame:(CGRect)aFrame
+- (id)initWithFrame:(CPRect)aFrame
 {
-    if (self = [super initWithFrame:aFrame])
-    {
+    self = [super initWithFrame:aFrame];
+
+    var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
+
+    _wheelImage = new Image();
+    _wheelImage.src = path;
+    _wheelImage.style.position = "absolute";
+
+    path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
+
+    _blackWheelImage = new Image();
+    _blackWheelImage.src = path;
+    _blackWheelImage.style.opacity = "0";
+    _blackWheelImage.style.filter = "alpha(opacity=0)"
+    _blackWheelImage.style.position = "absolute";
+
 #if PLATFORM(DOM)
-        var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
-
-        _wheelImage = new Image();
-        _wheelImage.src = path;
-        _wheelImage.style.position = "absolute";
-
-        path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
-
-        _blackWheelImage = new Image();
-        _blackWheelImage.src = path;
-        _blackWheelImage.style.opacity = "0";
-        _blackWheelImage.style.filter = "alpha(opacity=0)"
-        _blackWheelImage.style.position = "absolute";
-
-        _DOMElement.appendChild(_wheelImage);
-        _DOMElement.appendChild(_blackWheelImage);
+    _DOMElement.appendChild(_wheelImage);
+    _DOMElement.appendChild(_blackWheelImage);
 #endif
 
-        [self setWheelSize:aFrame.size];
+    [self setWheelSize:aFrame.size];
 
-        _crosshair = [[CPView alloc] initWithFrame:CGRectMake(_radius - 2, _radius - 2, 4, 4)];
-        [_crosshair setBackgroundColor:[CPColor blackColor]];
+    _crosshair = [[CPView alloc] initWithFrame:CPRectMake(_radius - 2, _radius - 2, 4, 4)];
+    [_crosshair setBackgroundColor:[CPColor blackColor]];
 
-        var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
-        [view setBackgroundColor:[CPColor whiteColor]];
+    var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
+    [view setBackgroundColor:[CPColor whiteColor]];
 
-        [_crosshair addSubview:view];
+    [_crosshair addSubview:view];
 
-        [self addSubview:_crosshair];
-    }
+    [self addSubview:_crosshair];
 
     return self;
 }
 
 - (void)setWheelBrightness:(float)brightness
 {
-#if PLATFORM(DOM)
     _blackWheelImage.style.opacity = 1.0 - brightness;
     _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness) * 100 + ")"
-#endif
 }
 
-- (void)setFrameSize:(CGSize)aSize
+- (void)setFrameSize:(CPSize)aSize
 {
     [super setFrameSize:aSize];
     [self setWheelSize:aSize];
 }
 
-- (void)setWheelSize:(CGSize)aSize
+- (void)setWheelSize:(CPSize)aSize
 {
     var min = MIN(aSize.width, aSize.height);
 
-#if PLATFORM(DOM)
     _blackWheelImage.style.width = min;
     _blackWheelImage.style.height = min;
     _blackWheelImage.width = min;
@@ -299,7 +290,6 @@
     _wheelImage.height = min;
     _wheelImage.style.top = (aSize.height - min) / 2.0 + "px";
     _wheelImage.style.left = (aSize.width - min) / 2.0 + "px";
-#endif
 
     _radius = min / 2.0;
 
@@ -359,7 +349,7 @@
     _angle     = [self radiansToDegrees:angle];
     _distance  = (distance / _radius) * 100.0;
 
-    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
+    [_crosshair setFrameOrigin:CPPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
 }
 
 - (void)setPositionToColor:(CPColor)aColor

AppKit/CPColorSpace.j

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

AppKit/CPColorWell.j

@@ -43,33 +43,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     BOOL    _bordered;
 
     CPColor _color;
-}
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding)
-        return [CPColorWellValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"colorwell";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), [CPNull null], _CGInsetMake(3.0, 3.0, 3.0, 3.0), _CGInsetMakeZero(), [CPNull null]]
-                                       forKeys:[@"bezel-inset", @"bezel-color", @"content-inset", @"content-border-inset", @"content-border-color"]];
-}
-
-- (void)_reverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    [theBinding reverseSetValueFor:@"color"];
+    CPView  _wellView;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -79,8 +53,11 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     if (self)
     {
         _active = NO;
+        _bordered = YES;
         _color = [CPColor whiteColor];
-        [self setBordered:YES];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 
         [self _registerForNotifications];
     }
@@ -105,23 +82,25 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
              object:[CPColorPanel sharedColorPanel]];
 }
 
-/*!
-    Sets whether the color well is bordered.
-*/
-- (void)setBordered:(BOOL)shouldBeBordered
-{
-    if (shouldBeBordered)
-        [self setThemeState:CPThemeStateBordered];
-    else
-        [self unsetThemeState:CPThemeStateBordered];
-}
-
 /*!
     Returns whether the color well is bordered
 */
 - (BOOL)isBordered
 {
-    return [self hasThemeState:CPThemeStateBordered];
+    return _bordered;
+}
+
+/*!
+    Sets the color well's current color.
+*/
+- (void)setBordered:(BOOL)bordered
+{
+    if (_bordered == bordered)
+        return;
+
+    _bordered = bordered;
+
+    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 }
 
 // Managing Color From Color Wells
@@ -144,7 +123,7 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     _color = aColor;
 
-    [self setNeedsLayout];
+    [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 }
 
 /*!
@@ -207,6 +186,31 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     return _active;
 }
 
+// Drawing a Color Well
+
+- (void)drawBezelWithHighlight:(BOOL)shouldHighlight
+{
+}
+
+/*!
+    Draws the colored area inside the color well without borders.
+    @param aRect the location at which to draw
+*/
+- (void)drawWellInside:(CGRect)aRect
+{
+    if (!_wellView)
+    {
+        _wellView = [[CPView alloc] initWithFrame:aRect];
+        [_wellView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+
+        [self addSubview:_wellView];
+    }
+    else
+        [_wellView setFrame:aRect];
+
+    [_wellView setBackgroundColor:_color];
+}
+
 - (void)colorPanelDidChangeColor:(CPNotification)aNotification
 {
     [self takeColorFrom:[aNotification object]];
@@ -225,11 +229,27 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [self deactivate];
 }
 
-- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
+- (void)mouseDown:(CPEvent)anEvent
 {
-    [self highlight:NO];
+    if (![self isEnabled])
+        return;
 
-    if (!mouseIsUp || !CGRectContainsPoint([self bounds], aPoint) || ![self isEnabled])
+    [self drawBezelWithHighlight:YES];
+}
+
+- (void)mouseDragged:(CPEvent)anEvent
+{
+    if (![self isEnabled])
+        return;
+
+    [self drawBezelWithHighlight:CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil])];
+}
+
+- (void)mouseUp:(CPEvent)anEvent
+{
+    [self drawBezelWithHighlight:NO];
+
+    if (!CGRectContainsPoint([self bounds], [self convertPoint:[anEvent locationInWindow] fromView:nil]) || ![self isEnabled])
         return;
 
     [self activate:YES];
@@ -240,115 +260,6 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
     [colorPanel orderFront:self];
 }
 
-- (CGRect)contentRectForBounds:(CGRect)bounds
-{
-    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
-
-    return _CGRectInsetByInset(bounds, contentInset);
-}
-
-- (CGRect)bezelRectForBounds:(CGRect)bounds
-{
-    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
-
-    return _CGRectInsetByInset(bounds, bezelInset);
-}
-
-- (CGRect)contentBorderRectForBounds:(CGRect)bounds
-{
-    var contentBorderInset = [self currentValueForThemeAttribute:@"content-border-inset"];
-
-    return _CGRectInsetByInset(bounds, contentBorderInset);
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    switch (aName)
-    {
-        case "bezel-view":
-            return [self bezelRectForBounds:[self bounds]];
-        case "content-view":
-            return [self contentRectForBounds:[self bounds]];
-        case "content-border-view":
-            return [self contentBorderRectForBounds:[self bounds]];
-    }
-
-    return [super rectForEphemeralSubviewNamed:aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    var view = [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-
-    [view setHitTests:NO];
-
-    return view;
-}
-
-- (void)layoutSubviews
-{
-    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
-                                           positioned:CPWindowBelow
-                      relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-
-    var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
-                                             positioned:CPWindowAbove
-                        relativeToEphemeralSubviewNamed:@"bezel-view"];
-
-
-    [contentView setBackgroundColor:_color];
-
-    var contentBorderView = [self layoutEphemeralSubviewNamed:@"content-border-view"
-                                                   positioned:CPWindowAbove
-                              relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [contentBorderView setBackgroundColor:[self currentValueForThemeAttribute:@"content-border-color"]];
-}
-
-@end
-
-@implementation CPColorWellValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var placeholderColor = [CPColor blueColor];
-
-    [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath],
-        isPlaceholder = CPIsControllerMarker(newValue);
-
-    if (isPlaceholder)
-    {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-        {
-           [CPException raise:CPGenericException
-                       reason:@"can't transform non applicable key on: " + _source + " value: " + newValue];
-        }
-
-        newValue = [self _placeholderForMarker:newValue];
-    }
-    else
-    {
-        newValue = [self transformValue:newValue withOptions:options];
-    }
-
-    [_source setColor:newValue];
-}
-
 @end
 
 var CPColorWellColorKey     = "CPColorWellColorKey",
@@ -367,8 +278,11 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
     if (self)
     {
         _active = NO;
+        _bordered = [aCoder decodeBoolForKey:CPColorWellBorderedKey];
         _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
-        [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
+
+        [self drawBezelWithHighlight:NO];
+        [self drawWellInside:CGRectInset([self bounds], 3.0, 3.0)];
 
         [self _registerForNotifications];
     }
@@ -382,10 +296,19 @@ var CPColorWellColorKey     = "CPColorWellColorKey",
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
+    // We do this in order to avoid encoding the _wellView, which
+    // should just automatically be created programmatically as needed.
+    var actualSubviews = _subviews;
+
+    _subviews = [_subviews copy];
+    [_subviews removeObjectIdenticalTo:_wellView];
+
     [super encodeWithCoder:aCoder];
 
+    _subviews = actualSubviews;
+
     [aCoder encodeObject:_color forKey:CPColorWellColorKey];
-    [aCoder encodeObject:[self isBordered] forKey:CPColorWellBorderedKey];
+    [aCoder encodeObject:_bordered forKey:CPColorWellBorderedKey];
 }
 
 @end

AppKit/CPCompatibility.j

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPEvent_Constants.j"
+@import "CPEvent.j"
 @import "CPPlatform.j"
 
 
@@ -44,20 +44,20 @@ CPHTMLCanvasFeature                     = 1 << 6;
 CPHTMLContentEditableFeature            = 1 << 7;
 CPHTMLDragAndDropFeature                = 1 << 8;
 
-CPJavaScriptInnerTextFeature            = 1 << 9;
-CPJavaScriptTextContentFeature          = 1 << 10;
-CPJavaScriptClipboardEventsFeature      = 1 << 11;
-CPJavaScriptClipboardAccessFeature      = 1 << 12;
+CPJavascriptInnerTextFeature            = 1 << 9;
+CPJavascriptTextContentFeature          = 1 << 10;
+CPJavascriptClipboardEventsFeature      = 1 << 11;
+CPJavascriptClipboardAccessFeature      = 1 << 12;
 CPJavaScriptCanvasDrawFeature           = 1 << 13;
 CPJavaScriptCanvasTransformFeature      = 1 << 14;
 
 CPVMLFeature                            = 1 << 15;
 
-CPJavaScriptRemedialKeySupport          = 1 << 16;
+CPJavascriptRemedialKeySupport          = 1 << 16;
 CPJavaScriptShadowFeature               = 1 << 20;
 
 CPJavaScriptNegativeMouseWheelValues    = 1 << 22;
-CPJavaScriptMouseWheelValues_8_15       = 1 << 23;
+CPJavaScriptMouseWheelValues_8_15       = 1 << 23
 
 CPOpacityRequiresFilterFeature          = 1 << 24;
 
@@ -65,31 +65,14 @@ CPOpacityRequiresFilterFeature          = 1 << 24;
 CPInputTypeCanBeChangedFeature          = 1 << 25;
 CPHTML5DragAndDropSourceYOffBy1         = 1 << 26;
 
-CPSOPDisabledFromFileURLs               = 1 << 27;
-
-// element.style.font can be set for an element not in the DOM.
-CPInputSetFontOutsideOfDOM              = 1 << 28;
-
-// Input elements have 1 px of extra padding on the left regardless of padding setting.
-CPInput1PxLeftPadding                   = 1 << 29;
-CPInputOnInputEventFeature              = 1 << 30;
-
-// When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas
-// (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might
-// not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen.
-// This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
-CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
 
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = 0,
-    PLATFORM_BUGS                       = 0,
-    PLATFORM_STYLE_JS_PROPERTIES        = {};
+    PLATFORM_FEATURES                   = 0;
 
 // default these features to true
 
 PLATFORM_FEATURES |= CPInputTypeCanBeChangedFeature;
-PLATFORM_FEATURES |= CPInputSetFontOutsideOfDOM;
 
 if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
     USER_AGENT = window.navigator.userAgent;
@@ -109,15 +92,12 @@ else if (typeof window !== "undefined" && window.attachEvent) // Must follow Ope
 
     // 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;
-
-    // Tested in Internet Explore 8 and 9.
-    PLATFORM_FEATURES &= ~CPInputSetFontOutsideOfDOM;
 }
 
 // WebKit
@@ -132,8 +112,8 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
     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,
@@ -144,26 +124,15 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
         minorVersion = parseInt(versionString.substr(versionDivision + 1));
 
     if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
-        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
+        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
 
     // FIXME this is a terrible hack to get around this bug:
     // https://bugs.webkit.org/show_bug.cgi?id=21548
     if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES |= CPJavaScriptRemedialKeySupport;
+        PLATFORM_FEATURES |= CPJavascriptRemedialKeySupport;
 
     if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
         PLATFORM_FEATURES |= CPHTML5DragAndDropSourceYOffBy1;
-
-    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
-    if (majorVersion < 537)
-        PLATFORM_FEATURES |= CPInput1PxLeftPadding;
-
-    if (USER_AGENT.indexOf("Chrome") === CPNotFound)
-        PLATFORM_FEATURES |= CPSOPDisabledFromFileURLs;
-
-    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
-    if (majorVersion > 533)
-        PLATFORM_BUGS |= CPCanvasParentDrawErrorsOnMovementBug;
 }
 
 // KHTML
@@ -187,9 +156,6 @@ else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 
     if (version < 3.0)
         PLATFORM_FEATURES |= CPJavaScriptMouseWheelValues_8_15;
-
-    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
-    PLATFORM_FEATURES |= CPInput1PxLeftPadding;
 }
 
 // Feature Specific Checks
@@ -212,19 +178,9 @@ if (typeof document != "undefined")
 
     // 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;
-
-    var DOMInputElement = document.createElement("input");
-    if ("oninput" in DOMInputElement)
-        PLATFORM_FEATURES |= CPInputOnInputEventFeature;
-    else if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("oninput", "return;");
-        if (typeof DOMInputElement.oninput === "function")
-            PLATFORM_FEATURES |= CPInputOnInputEventFeature;
-    }
+        PLATFORM_FEATURES |= CPJavascriptTextContentFeature;
 }
 
 function CPFeatureIsCompatible(aFeature)
@@ -232,11 +188,6 @@ function CPFeatureIsCompatible(aFeature)
     return PLATFORM_FEATURES & aFeature;
 }
 
-function CPPlatformHasBug(aBug)
-{
-    return PLATFORM_BUGS & aBug;
-}
-
 function CPBrowserIsEngine(anEngine)
 {
     return PLATFORM_ENGINE === anEngine;
@@ -274,106 +225,3 @@ else
     CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
-
-/*!
-    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
-    CPBrowserStyleProperty('transition') -> WebkitTransition
-
-    While technically not a style property, style related event handler names are also supported.
-    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
-
-    CSS is only available in platform(dom), so don't rely too heavily on it.
-*/
-function CPBrowserStyleProperty(aProperty)
-{
-    var lowerProperty = aProperty.toLowerCase();
-
-    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
-    {
-        var r = nil;
-
-#if PLATFORM(DOM)
-        var testElement = document.createElement('div');
-
-        switch (lowerProperty)
-        {
-            case 'transitionend':
-                var candidates = {
-                        'WebkitTransition' : 'webkitTransitionEnd',
-                        'MozTransition'    : 'transitionend',
-                        'OTransition'      : 'oTransitionEnd',
-                        'msTransition'     : 'MSTransitionEnd',
-                        'transition'       : 'transitionend'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
-                break;
-            default:
-                var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    strippedProperty = aProperty.split('-').join(' '),
-                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
-
-                for (var i = 0; i < prefixes.length; i++)
-                {
-                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
-                    if (prefixes[i] + aProperty in testElement.style)
-                    {
-                        r = prefixes[i] + aProperty;
-                        break;
-                    }
-                    else if (prefixes[i] + capProperty in testElement.style)
-                    {
-                        r = prefixes[i] + capProperty;
-                        break;
-                    }
-                }
-
-                if (!r && lowerProperty in testElement.style)
-                    r = lowerProperty;
-
-                break;
-        }
-#endif
-
-        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
-    }
-
-    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
-}
-
-function CPBrowserCSSProperty(aProperty)
-{
-    var browserProperty = CPBrowserStyleProperty(aProperty);
-
-    if (!browserProperty)
-        return nil;
-
-    var prefixes = {
-            'Webkit': '-webkit-',
-            'Moz': '-moz-',
-            'O': '-o-',
-            'ms': '-ms-'
-        };
-
-    for (var prefix in prefixes)
-    {
-        if (browserProperty.substring(0, prefix.length) == prefix)
-        {
-            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
-                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
-
-            // If there were any capitalized words in the browserProperty, insert a "-" between each one
-            if (parts && parts.length > 0)
-                browserPropertyWithoutPrefix = parts.join("-");
-
-            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
-        }
-    }
-
-    var parts = browserProperty.match(/[A-Z][a-z]+/g);
-
-    if (parts && parts.length > 0)
-        browserProperty = parts.join("-");
-
-    return browserProperty.toLowerCase();
-}

AppKit/CPControl.j

@@ -20,48 +20,36 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#import "../Foundation/Ref.h"
-
-@import <Foundation/CPFormatter.j>
-@import <Foundation/CPTimer.j>
-
 @import "CPFont.j"
 @import "CPShadow.j"
 @import "CPView.j"
 @import "CPKeyValueBinding.j"
 
-@global CPApp
 
-CPLeftTextAlignment      = 0;
-CPRightTextAlignment     = 1;
-CPCenterTextAlignment    = 2;
-CPJustifiedTextAlignment = 3;
-CPNaturalTextAlignment   = 4;
+CPLeftTextAlignment             = 0;
+CPRightTextAlignment            = 1;
+CPCenterTextAlignment           = 2;
+CPJustifiedTextAlignment        = 3;
+CPNaturalTextAlignment          = 4;
 
-CPRegularControlSize = 0;
-CPSmallControlSize   = 1;
-CPMiniControlSize    = 2;
+CPRegularControlSize            = 0;
+CPSmallControlSize              = 1;
+CPMiniControlSize               = 2;
 
-CPLineBreakByWordWrapping     = 0;
-CPLineBreakByCharWrapping     = 1;
-CPLineBreakByClipping         = 2;
-CPLineBreakByTruncatingHead   = 3;
-CPLineBreakByTruncatingTail   = 4;
-CPLineBreakByTruncatingMiddle = 5;
+CPLineBreakByWordWrapping       = 0;
+CPLineBreakByCharWrapping       = 1;
+CPLineBreakByClipping           = 2;
+CPLineBreakByTruncatingHead     = 3;
+CPLineBreakByTruncatingTail     = 4;
+CPLineBreakByTruncatingMiddle   = 5;
 
-CPTopVerticalTextAlignment    = 1;
-CPCenterVerticalTextAlignment = 2;
-CPBottomVerticalTextAlignment = 3;
+CPTopVerticalTextAlignment      = 1,
+CPCenterVerticalTextAlignment   = 2,
+CPBottomVerticalTextAlignment   = 3;
 
-// Deprecated for use with images, use the CPImageScale constants
-CPScaleProportionally = 0;
-CPScaleToFit          = 1;
-CPScaleNone           = 2;
-
-CPImageScaleProportionallyDown     = 0;
-CPImageScaleAxesIndependently      = 1;
-CPImageScaleNone                   = 2;
-CPImageScaleProportionallyUpOrDown = 3;
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
 
 CPNoImage       = 0;
 CPImageOnly     = 1;
@@ -71,9 +59,9 @@ CPImageBelow    = 4;
 CPImageAbove    = 5;
 CPImageOverlaps = 6;
 
-CPOnState    = 1;
-CPOffState   = 0;
-CPMixedState = -1;
+CPOnState                       = 1;
+CPOffState                      = 0;
+CPMixedState                    = -1;
 
 CPControlNormalBackgroundColor      = "CPControlNormalBackgroundColor";
 CPControlSelectedBackgroundColor    = "CPControlSelectedBackgroundColor";
@@ -84,7 +72,7 @@ CPControlTextDidBeginEditingNotification    = "CPControlTextDidBeginEditingNotif
 CPControlTextDidChangeNotification          = "CPControlTextDidChangeNotification";
 CPControlTextDidEndEditingNotification      = "CPControlTextDidEndEditingNotification";
 
-var CPControlBlackColor = [CPColor blackColor];
+var CPControlBlackColor     = [CPColor blackColor];
 
 /*!
     @ingroup appkit
@@ -95,7 +83,6 @@ var CPControlBlackColor = [CPColor blackColor];
 @implementation CPControl : CPView
 {
     id                  _value;
-    CPFormatter         _formatter @accessors(property=formatter);
 
     // Target-Action Support
     id                  _target;
@@ -108,6 +95,8 @@ var CPControlBlackColor = [CPColor blackColor];
     BOOL                _trackingWasWithinFrame;
     unsigned            _trackingMouseDownFlags;
     CGPoint             _previousTrackingLocation;
+
+    CPString            _toolTip;
 }
 
 + (CPDictionary)themeAttributes
@@ -116,7 +105,7 @@ var CPControlBlackColor = [CPColor blackColor];
                                                 CPTopVerticalTextAlignment,
                                                 CPLineBreakByClipping,
                                                 [CPColor blackColor],
-                                                [CPFont systemFontOfSize:CPFontCurrentSystemSize],
+                                                [CPFont systemFontOfSize:12.0],
                                                 [CPNull null],
                                                 _CGSizeMakeZero(),
                                                 CPImageLeft,
@@ -138,48 +127,34 @@ var CPControlBlackColor = [CPColor blackColor];
 
 + (void)initialize
 {
-    if (self !== [CPControl class])
-        return;
+    if (self === [CPControl class])
+    {
+        [self exposeBinding:@"value"];
+        [self exposeBinding:@"objectValue"];
+        [self exposeBinding:@"stringValue"];
+        [self exposeBinding:@"integerValue"];
+        [self exposeBinding:@"intValue"];
+        [self exposeBinding:@"doubleValue"];
+        [self exposeBinding:@"floatValue"];
 
-    [self exposeBinding:@"value"];
-    [self exposeBinding:@"objectValue"];
-    [self exposeBinding:@"stringValue"];
-    [self exposeBinding:@"integerValue"];
-    [self exposeBinding:@"intValue"];
-    [self exposeBinding:@"doubleValue"];
-    [self exposeBinding:@"floatValue"];
-
-    [self exposeBinding:@"enabled"];
-}
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding === CPValueBinding)
-        return [_CPValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-/*!
-    Reverse set the binding iff the CPContinuouslyUpdatesValueBindingOption is set.
-*/
-- (void)_continuouslyReverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    if ([theBinding continuouslyUpdatesValue])
-        [theBinding reverseSetValueFor:@"objectValue"];
+        [self exposeBinding:@"enabled"];
+    }
 }
 
 - (void)_reverseSetBinding
 {
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
+    var theBinding = [CPKeyValueBinding getBinding:CPValueBinding forObject:self];
     [theBinding reverseSetValueFor:@"objectValue"];
 }
 
+- (void)_replacementKeyPathForBinding:(CPString)aBinding
+{
+    if (aBinding === @"value")
+        return @"objectValue";
+
+    return [super _replacementKeyPathForBinding:aBinding];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -194,8 +169,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Sets the receiver's target action.
-
+    Sets the receiver's target action
     @param anAction Sets the action message that gets sent to the target.
 */
 - (void)setAction:(SEL)anAction
@@ -204,7 +178,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Returns the receiver's target action.
+    Returns the receiver's target action
 */
 - (SEL)action
 {
@@ -213,7 +187,6 @@ var CPControlBlackColor = [CPColor blackColor];
 
 /*!
     Sets the receiver's target. The target receives action messages from the receiver.
-
     @param aTarget the object that will receive the message specified by action
 */
 - (void)setTarget:(id)aTarget
@@ -231,15 +204,13 @@ var CPControlBlackColor = [CPColor blackColor];
 
 /*!
     Causes \c anAction to be sent to \c anObject.
-
     @param anAction the action to send
     @param anObject the object to which the action will be sent
 */
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
+- (void)sendAction:(SEL)anAction to:(id)anObject
 {
     [self _reverseSetBinding];
-
-    return [CPApp sendAction:anAction to:anObject from:self];
+    [CPApp sendAction:anAction to:anObject from:self];
 }
 
 - (int)sendActionOn:(int)mask
@@ -251,6 +222,33 @@ var CPControlBlackColor = [CPColor blackColor];
     return previousMask;
 }
 
+/*!
+    Sets the tooltip for the receiver.
+    @param aToolTip the tooltip
+*/
+/*
+-(void)setToolTip:(CPString)aToolTip
+{
+    if (_toolTip == aToolTip)
+        return;
+
+    _toolTip = aToolTip;
+
+#if PLATFORM(DOM)
+    _DOMElement.title = aToolTip;
+#endif
+}
+*/
+/*!
+    Returns the receiver's tooltip
+*/
+/*
+-(CPString)toolTip
+{
+    return _toolTip;
+}
+*/
+
 /*!
     Returns whether the control can continuously send its action messages.
 */
@@ -262,7 +260,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
 /*!
     Sets whether the cell can continuously send its action messages.
-*/
+ */
 - (void)setContinuous:(BOOL)flag
 {
     // Some subclasses should redefine this with CPLeftMouseDraggedMask
@@ -272,9 +270,6 @@ var CPControlBlackColor = [CPColor blackColor];
         _sendActionOn &= ~CPPeriodicMask;
 }
 
-/*!
-    Returns YES if the receiver tracks the mouse outside the frame, otherwise NO.
-*/
 - (BOOL)tracksMouseOutsideOfFrame
 {
     return NO;
@@ -291,14 +286,9 @@ var CPControlBlackColor = [CPColor blackColor];
         [self stopTracking:_previousTrackingLocation at:currentLocation mouseIsUp:YES];
 
         _trackingMouseDownFlags = 0;
-
-        if (isWithinFrame)
-            [self setThemeState:CPThemeStateHovered];
     }
     else
     {
-        [self unsetThemeState:CPThemeStateHovered];
-
         if (type === CPLeftMouseDown)
         {
             _trackingMouseDownFlags = [anEvent modifierFlags];
@@ -337,11 +327,6 @@ var CPControlBlackColor = [CPColor blackColor];
     return 0;
 }
 
-/*!
-    Perform a click on the receiver.
-
-    @param sender - The sender object
-*/
 - (void)performClick:(id)sender
 {
     if (![self isEnabled])
@@ -364,18 +349,11 @@ var CPControlBlackColor = [CPColor blackColor];
     }
 }
 
-/*!
-    @ignore
-    Fired when the button timer finished, usually after the user hits enter.
-*/
 - (void)unhighlightButtonTimerDidFinish:(id)sender
 {
     [self highlight:NO];
 }
 
-/*!
-    Returns the mask of modifier keys held down when the user clicked.
-*/
 - (unsigned)mouseDownFlags
 {
     return _trackingMouseDownFlags;
@@ -395,18 +373,7 @@ var CPControlBlackColor = [CPColor blackColor];
 
 - (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
 {
-    if (mouseIsUp)
-        [self highlight:NO];
-    else
-        [self highlight:YES];
-}
-
-/*!
-    Enabled controls accept first mouse by default.
-*/
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return [self isEnabled];
+    [self highlight:NO];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -417,27 +384,8 @@ var CPControlBlackColor = [CPColor blackColor];
     [self trackMouse:anEvent];
 }
 
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    [self setThemeState:CPThemeStateHovered];
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    var currentLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        isWithinFrame = [self tracksMouseOutsideOfFrame] || CGRectContainsPoint([self bounds], currentLocation);
-
-    // Make sure we're not still in the frame because Cappuccino will sent mouseExited events
-    // for all of the (ephemeral) subviews of a view as well.
-    if (!isWithinFrame)
-        [self unsetThemeState:CPThemeStateHovered];
-}
-
 /*!
-    Returns the receiver's object value.
+    Returns the receiver's object value
 */
 - (id)objectValue
 {
@@ -445,7 +393,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Sets the receiver's object value.
+    Set's the receiver's object value
 */
 - (void)setObjectValue:(id)anObject
 {
@@ -456,7 +404,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Returns the receiver's float value.
+    Returns the receiver's float value
 */
 - (float)floatValue
 {
@@ -465,7 +413,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Sets the receiver's float value.
+    Sets the receiver's float value
 */
 - (void)setFloatValue:(float)aValue
 {
@@ -473,7 +421,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Returns the receiver's double value.
+    Returns the receiver's double value
 */
 - (double)doubleValue
 {
@@ -482,7 +430,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Sets the receiver's double value.
+    Set's the receiver's double value
 */
 - (void)setDoubleValue:(double)anObject
 {
@@ -490,7 +438,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Returns the receiver's int value.
+    Returns the receiver's int value
 */
 - (int)intValue
 {
@@ -499,7 +447,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Sets the receiver's int value.
+    Set's the receiver's int value
 */
 - (void)setIntValue:(int)anObject
 {
@@ -507,7 +455,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Returns the receiver's int value.
+    Returns the receiver's int value
 */
 - (int)integerValue
 {
@@ -516,7 +464,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Sets the receiver's int value.
+    Set's the receiver's int value
 */
 - (void)setIntegerValue:(int)anObject
 {
@@ -524,50 +472,19 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Returns the receiver's string value.
+    Returns the receiver's string value
 */
 - (CPString)stringValue
 {
-    if (_formatter && _value !== undefined)
-    {
-        var formattedValue = [self hasThemeState:CPThemeStateEditing] ? [_formatter editingStringForObjectValue:_value] : [_formatter stringForObjectValue:_value];
-
-        if (formattedValue !== nil && formattedValue !== undefined)
-            return formattedValue;
-    }
-
     return (_value === undefined || _value === nil) ? "" : String(_value);
 }
 
 /*!
-    Sets the receiver's string value.
+    Set's the receiver's string value
 */
-- (void)setStringValue:(CPString)aString
+- (void)setStringValue:(CPString)anObject
 {
-    // Cocoa raises an invalid parameter assertion and returns if you pass nil.
-    if (aString === nil || aString === undefined)
-    {
-        CPLog.warn("nil or undefined sent to CPControl -setStringValue");
-        return;
-    }
-
-    var value;
-
-    if (_formatter)
-    {
-        value = nil;
-
-        if ([_formatter getObjectValue:AT_REF(value) forString:aString errorDescription:nil] === NO)
-        {
-            // If the given string is non-empty and doesn't work, Cocoa tries an empty string.
-            if (!aString || [_formatter getObjectValue:AT_REF(value) forString:@"" errorDescription:nil] === NO)
-                value = undefined;  // Means the value is invalid
-        }
-    }
-    else
-        value = aString;
-
-    [self setObjectValue:value];
+    [self setObjectValue:anObject];
 }
 
 - (void)takeDoubleValueFrom:(id)sender
@@ -583,18 +500,21 @@ var CPControlBlackColor = [CPColor blackColor];
         [self setFloatValue:[sender floatValue]];
 }
 
+
 - (void)takeIntegerValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(integerValue)])
         [self setIntegerValue:[sender integerValue]];
 }
 
+
 - (void)takeIntValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(intValue)])
         [self setIntValue:[sender intValue]];
 }
 
+
 - (void)takeObjectValueFrom:(id)sender
 {
     if ([sender respondsToSelector:@selector(objectValue)])
@@ -636,200 +556,96 @@ var CPControlBlackColor = [CPColor blackColor];
     [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]];
 }
 
-/*!
-    Sets the text alignment of the control.
-
-    <pre>
-    CPLeftTextAlignment
-    CPCenterTextAlignment
-    CPRightTextAlignment
-    CPJustifiedTextAlignment
-    CPNaturalTextAlignment
-    </pre>
-*/
 - (void)setAlignment:(CPTextAlignment)alignment
 {
     [self setValue:alignment forThemeAttribute:@"alignment"];
 }
 
-/*!
-    Returns the text alignment of the control.
-*/
 - (CPTextAlignment)alignment
 {
     return [self valueForThemeAttribute:@"alignment"];
 }
 
-/*!
-    Set the vertical text alignment of the control.
-
-    <pre>
-    CPTopVerticalTextAlignment
-    CPCenterVerticalTextAlignment
-    CPBottomVerticalTextAlignment
-    </pre>
-*/
 - (void)setVerticalAlignment:(CPTextVerticalAlignment)alignment
 {
     [self setValue:alignment forThemeAttribute:@"vertical-alignment"];
 }
 
-/*!
-    Returns the vertical text alignment of the receiver.
-*/
 - (CPTextVerticalAlignment)verticalAlignment
 {
     return [self valueForThemeAttribute:@"vertical-alignment"];
 }
 
-/*!
-    Sets the line break mode of the receiver.
-
-    <pre>
-    CPLineBreakByWordWrapping
-    CPLineBreakByCharWrapping
-    CPLineBreakByClipping
-    CPLineBreakByTruncatingHead
-    CPLineBreakByTruncatingTail
-    CPLineBreakByTruncatingMiddle
-    </pre>
-*/
 - (void)setLineBreakMode:(CPLineBreakMode)mode
 {
     [self setValue:mode forThemeAttribute:@"line-break-mode"];
 }
 
-/*!
-    Returns the line break mode of the control.
-*/
 - (CPLineBreakMode)lineBreakMode
 {
     return [self valueForThemeAttribute:@"line-break-mode"];
 }
 
-/*!
-    Sets the text color of the receiver.
-
-    @param aColor - A CPColor object.
-*/
 - (void)setTextColor:(CPColor)aColor
 {
     [self setValue:aColor forThemeAttribute:@"text-color"];
 }
 
-/*!
-    Returns the text color of the receiver.
-*/
 - (CPColor)textColor
 {
     return [self valueForThemeAttribute:@"text-color"];
 }
 
-/*!
-    Sets the shadow color of the text for the receiver.
-*/
 - (void)setTextShadowColor:(CPColor)aColor
 {
     [self setValue:aColor forThemeAttribute:@"text-shadow-color"];
 }
 
-/*!
-    Returns the shadow color of the text for the control.
-*/
 - (CPColor)textShadowColor
 {
     return [self valueForThemeAttribute:@"text-shadow-color"];
 }
 
-/*!
-    Sets the shadow offset for the text.
-
-    @param offset - a CGSize with the x and y offsets.
-*/
-- (void)setTextShadowOffset:(CGSize)offset
+- (void)setTextShadowOffset:(float)offset
 {
     [self setValue:offset forThemeAttribute:@"text-shadow-offset"];
 }
 
-/*!
-    Returns the text shadow offset of the receiver.
-*/
-- (CGSize)textShadowOffset
+- (float)textShadowOffset
 {
     return [self valueForThemeAttribute:@"text-shadow-offset"];
 }
 
-/*!
-    Sets the font of the control.
-*/
 - (void)setFont:(CPFont)aFont
 {
     [self setValue:aFont forThemeAttribute:@"font"];
 }
 
-/*!
-    Returns the font of the control.
-*/
 - (CPFont)font
 {
     return [self valueForThemeAttribute:@"font"];
 }
 
-/*!
-    Sets the image position of the control.
-
-    <pre>
-    CPNoImage
-    CPImageOnly
-    CPImageLeft
-    CPImageRight
-    CPImageBelow
-    CPImageAbove
-    CPImageOverlaps
-    </pre>
-*/
 - (void)setImagePosition:(CPCellImagePosition)position
 {
     [self setValue:position forThemeAttribute:@"image-position"];
 }
 
-/*!
-    Returns the image position of the receiver.
-*/
 - (CPCellImagePosition)imagePosition
 {
     return [self valueForThemeAttribute:@"image-position"];
 }
 
-/*!
-    Sets the image scaling of the control.
-
-    <pre>
-    CPImageScaleProportionallyDown
-    CPImageScaleAxesIndependently
-    CPImageScaleNone
-    CPImageScaleProportionallyUpOrDown
-    </pre>
-*/
 - (void)setImageScaling:(CPImageScaling)scaling
 {
     [self setValue:scaling forThemeAttribute:@"image-scaling"];
 }
 
-/*!
-    Returns the image scaling of the control.
-*/
 - (CPImageScaling)imageScaling
 {
     return [self valueForThemeAttribute:@"image-scaling"];
 }
 
-/*!
-    Sets the enabled status of the control.
-    Controls that are not enabled can not be used by the user and obtain the CPThemeStateDisabled theme state.
-
-    @param BOOL - YES if the control should be enabled, otherwise NO.
-*/
 - (void)setEnabled:(BOOL)isEnabled
 {
     if (isEnabled)
@@ -838,29 +654,16 @@ var CPControlBlackColor = [CPColor blackColor];
         [self setThemeState:CPThemeStateDisabled];
 }
 
-/*!
-    Returns YES if the receiver is enabled, otherwise NO.
-*/
 - (BOOL)isEnabled
 {
     return ![self hasThemeState:CPThemeStateDisabled];
 }
 
-/*!
-    Highlights the receiver.
-
-    @param BOOL - YES if the receiver should be highlighted, otherwise NO.
-*/
 - (void)highlight:(BOOL)shouldHighlight
 {
     [self setHighlighted:shouldHighlight];
 }
 
-/*!
-    Highlights the receiver.
-
-    @param BOOL - YES if the receiver should be highlighted, otherwise NO.
-*/
 - (void)setHighlighted:(BOOL)isHighlighted
 {
     if (isHighlighted)
@@ -869,9 +672,6 @@ var CPControlBlackColor = [CPColor blackColor];
         [self unsetThemeState:CPThemeStateHighlighted];
 }
 
-/*!
-    Returns YES if the control is highlighted, otherwise NO.
-*/
 - (BOOL)isHighlighted
 {
     return [self hasThemeState:CPThemeStateHighlighted];
@@ -879,22 +679,22 @@ var CPControlBlackColor = [CPColor blackColor];
 
 @end
 
-var CPControlValueKey                   = @"CPControlValueKey",
-    CPControlControlStateKey            = @"CPControlControlStateKey",
-    CPControlIsEnabledKey               = @"CPControlIsEnabledKey",
-    CPControlTargetKey                  = @"CPControlTargetKey",
-    CPControlActionKey                  = @"CPControlActionKey",
-    CPControlSendActionOnKey            = @"CPControlSendActionOnKey",
-    CPControlFormatterKey               = @"CPControlFormatterKey",
-    CPControlSendsActionOnEndEditingKey = @"CPControlSendsActionOnEndEditingKey",
+var CPControlValueKey           = "CPControlValueKey",
+    CPControlControlStateKey    = @"CPControlControlStateKey",
+    CPControlIsEnabledKey       = "CPControlIsEnabledKey",
 
-    __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
+    CPControlTargetKey          = "CPControlTargetKey",
+    CPControlActionKey          = "CPControlActionKey",
+    CPControlSendActionOnKey    = "CPControlSendActionOnKey",
+
+    CPControlSendsActionOnEndEditingKey = "CPControlSendsActionOnEndEditingKey";
+
+var __Deprecated__CPImageViewImageKey   = @"CPImageViewImageKey";
 
 @implementation CPControl (CPCoding)
 
 /*
     Initializes the control by unarchiving it from a coder.
-
     @param aCoder the coder from which to unarchive the control
     @return the initialized control
 */
@@ -911,8 +711,6 @@ var CPControlValueKey                   = @"CPControlValueKey",
 
         [self sendActionOn:[aCoder decodeIntForKey:CPControlSendActionOnKey]];
         [self setSendsActionOnEndEditing:[aCoder decodeBoolForKey:CPControlSendsActionOnEndEditingKey]];
-
-        [self setFormatter:[aCoder decodeObjectForKey:CPControlFormatterKey]];
     }
 
     return self;
@@ -920,7 +718,6 @@ var CPControlValueKey                   = @"CPControlValueKey",
 
 /*
     Archives the control to the provided coder.
-
     @param aCoder the coder to which the control will be archived.
 */
 - (void)encodeWithCoder:(CPCoder)aCoder
@@ -930,21 +727,16 @@ var CPControlValueKey                   = @"CPControlValueKey",
     if (_sendsActionOnEndEditing)
         [aCoder encodeBool:_sendsActionOnEndEditing forKey:CPControlSendsActionOnEndEditingKey];
 
-    var objectValue = [self objectValue];
-
-    if (objectValue !== nil)
-        [aCoder encodeObject:objectValue forKey:CPControlValueKey];
+    if (_value !== nil)
+        [aCoder encodeObject:_value forKey:CPControlValueKey];
 
     if (_target !== nil)
         [aCoder encodeConditionalObject:_target forKey:CPControlTargetKey];
 
-    if (_action !== nil)
+    if (_action !== NULL)
         [aCoder encodeObject:_action forKey:CPControlActionKey];
 
     [aCoder encodeInt:_sendActionOn forKey:CPControlSendActionOnKey];
-
-    if (_formatter !== nil)
-        [aCoder encodeObject:_formatter forKey:CPControlFormatterKey];
 }
 
 @end

AppKit/CPController.j

@@ -50,7 +50,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
         _declaredKeys = [aDecoder decodeObjectForKey:CPControllerDeclaredKeysKey] || [];
     }
 
-    return self;
+    return nil;
 }
 
 - (BOOL)isEditing
@@ -64,7 +64,7 @@ var CPControllerDeclaredKeysKey = @"CPControllerDeclaredKeysKey";
         count = _editors.length;
 
     for (; index < count; ++index)
-        if (![[_editors objectAtIndex:index] commitEditing])
+        if (![[_editors objectAtIndex:i] commitEditing])
             return NO;
 
     return YES;

AppKit/CPCookie.j

@@ -94,7 +94,7 @@
         domain = "";
 
 #if PLATFORM(DOM)
-    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
+    document.cookie = _cookieName+"="+value+expires+"; path=/"+domain;
 #else
     _cookieValue = value;
     _expires = expires;
@@ -111,12 +111,8 @@
     for (var i = 0; i < ca.length; i++)
     {
         var c = ca[i];
-
-        while (c.charAt(0) == ' ')
-            c = c.substring(1, c.length);
-
-        if (c.indexOf(nameEQ) == 0)
-            return c.substring(nameEQ.length, c.length);
+        while (c.charAt(0) == ' ') c = c.substring(1, c.length);
+        if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length);
     }
 #endif
     return "";

AppKit/CPCursor.j

@@ -1,56 +1,34 @@
 /*
-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
+Testing browsers:
+    WebKit r50235 (Safari 4.0.3+)
+    FireFox 3.5
+    Opera 10.0.0
+
+Implemented class methods:
+    Webkit : All
+    IE     : All
+    FireFox Win : All
+    FireFox Mac : All except closedHandCursor disappearingItemCursor // Firefox mac does not support url cursors
+    Opera       : All except resizeLeftRightCursor resizeUpDownCursor operationNotAllowedCursor dragCopyCursor dragLinkCursor contextualMenuCursor openHandCursor closedHandCursor disappearingItemCursor // Opera does not support url cursors so these won't work with images
 */
 
 @import <Foundation/CPObject.j>
 
-@global CPApp
-
 var currentCursor = nil,
     cursorStack = [],
     cursors = {},
-    ieCursorMap = {};
+    cursorURLFormat = nil;
 
 @implementation CPCursor : CPObject
 {
-    CPString _cssString @accessors(readonly);
-    CPString _hotSpot @accessors(readonly, getter=hotSpot);
-    CPImage  _image @accessors(readonly, getter=image);
+    CPString _cssString;
     BOOL     _isSetOnMouseEntered @accessors(readwrite, getter=isSetOnMouseEntered, setter=setOnMouseEntered:);
     BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
 }
 
-+ (void)initialize
++ (CPCursor)currentCursor
 {
-    if (self !== CPCursor)
-        return;
-
-    // IE < 9 does not support some CSS cursors, we map them to supported ones
-    ieCursorMap = {
-        "ew-resize":   "e-resize",
-        "ns-resize":   "n-resize",
-        "nesw-resize": "ne-resize",
-        "nwse-resize": "nw-resize"
-    };
+    return currentCursor;
 }
 
 - (id)initWithCSSString:(CPString)aString
@@ -61,30 +39,160 @@ var currentCursor = nil,
     return self;
 }
 
-/*!
-    Init a cursor with the given image and hotspot.
-    hotspot is supported in CSS3 (but not IE).
-*/
-- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
++ (CPCursor)cursorWithCSSString:(CPString)cssString
 {
-    _hotSpot = hotSpot;
-    _image = image;
-    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
+    var cursor = cursors[cssString];
+
+    if (typeof cursor == 'undefined')
+    {
+        cursor = [[CPCursor alloc] initWithCSSString:cssString];
+        cursors[cssString] = cursor;
+    }
+
+    return cursor;
 }
 
-/*!
-    Init a cursor with the given image and hotspot. This is provided
-    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
-    (as they are in Cocoa). See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
-*/
-- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
++ (CPCursor)cursorWithImageNamed:(CPString)imageName
 {
-    return [self initWithImage:image hotSpot:aHotSpot];
+    if (!cursorURLFormat)
+    {
+        cursorURLFormat = @"url(" + [[CPBundle bundleForClass:self] resourcePath] + @"/CPCursor/%@.cur)";
+
+        if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+            cursorURLFormat += ", default";
+    }
+
+    var url = [CPString stringWithFormat:cursorURLFormat, imageName];
+
+    return [[CPCursor alloc] initWithCSSString:url];
+}
+
+- (CPString)_cssString
+{
+    return _cssString;
+}
+
++ (CPCursor)arrowCursor
+{
+    return [CPCursor cursorWithCSSString:@"default"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)crosshairCursor
+{
+    return [CPCursor cursorWithCSSString:@"crosshair"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)IBeamCursor
+{
+    return [CPCursor cursorWithCSSString:@"text"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)pointingHandCursor
+{
+    return [CPCursor cursorWithCSSString:@"pointer"]; // WebKit | FF | opera | IE
+}
+
++ (CPCursor)resizeDownCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:"s-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeUpCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"n-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeLeftCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"w-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeRightCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"e-resize"]; // WebKit | FF | opera
+}
+
++ (CPCursor)resizeLeftRightCursor
+{
+    return [CPCursor cursorWithCSSString:@"col-resize"]; // WebKit | FF | IE
+}
+
++ (CPCursor)resizeUpDownCursor
+{
+    return [CPCursor cursorWithCSSString:@"row-resize"]; // WebKit | FF | IE
+}
+
++ (CPCursor)operationNotAllowedCursor
+{
+    return [CPCursor cursorWithCSSString:@"not-allowed"]; // WebKit | FF | IE
+}
+
++ (CPCursor)dragCopyCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"copy"]; // WebKit | FF
+}
+
++ (CPCursor)dragLinkCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"alias"]; // WebKit | FF
+}
+
++ (CPCursor)contextualMenuCursor
+{
+    if (CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
+        return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)];
+
+    return [CPCursor cursorWithCSSString:@"context-menu"]; // WebKit | FF Mac . Not impl FF Win.
+}
+
++ (CPCursor)openHandCursor
+{
+    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"-webkit-grab"];
+    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"-moz-grab"];
+    else if (CPBrowserIsEngine(CPOperaBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"move"];
+
+    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit only. move in FFMac|Opera
+}
+
++ (CPCursor)closedHandCursor
+{
+    if (CPBrowserIsEngine(CPWebKitBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"-webkit-grabbing"];
+    else if (CPBrowserIsEngine(CPGeckoBrowserEngine))
+        return [CPCursor cursorWithCSSString:@"-moz-grabbing"];
+
+    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // WebKit || FF
+}
+
++ (CPCursor)disappearingItemCursor
+{
+    return [CPCursor cursorWithImageNamed:CPStringFromSelector(_cmd)]; // None
 }
 
 + (void)hide
 {
-    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
+    [self _setCursorCSS:"none"]; // Not supported in IE
 }
 
 + (void)unhide
@@ -100,6 +208,44 @@ var currentCursor = nil,
         [CPCursor unhide];
 }
 
+- (id)initWithImage:(CPImage)image hotSpot:(CPPoint)hotSpot
+{
+    return [self initWithCSSString:"url(" + [image filename] + "), auto"];
+}
+
+
+- (void)mouseEntered:(CPEvent)event
+{
+}
+
+- (void)mouseExited:(CPEvent)event
+{
+}
+
+- (void)set
+{
+    currentCursor = self;
+
+#if PLATFORM(DOM)
+    [[self class] _setCursorCSS:_cssString];
+#endif
+
+}
+
++ (void)_setCursorCSS:(CPString)aString
+{
+#if PLATFORM(DOM)
+    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
+    for (var i = 0, count = [platformWindows count]; i < count; i++)
+        platformWindows[i]._DOMBodyElement.style.cursor = aString;
+#endif
+}
+
+- (void)push
+{
+    currentCursor = cursorStack.push(self);
+}
+
 - (void)pop
 {
     [CPCursor pop];
@@ -114,205 +260,6 @@ var currentCursor = nil,
     }
 }
 
-- (void)push
-{
-    currentCursor = cursorStack.push(self);
-}
-
-- (void)set
-{
-    currentCursor = self;
-
-#if PLATFORM(DOM)
-    [[self class] _setCursorCSS:_cssString];
-#endif
-}
-
-- (void)mouseEntered:(CPEvent)event
-{
-}
-
-- (void)mouseExited:(CPEvent)event
-{
-}
-
-+ (CPCursor)currentCursor
-{
-    return currentCursor;
-}
-
-+ (void)_setCursorCSS:(CPString)aString
-{
-#if PLATFORM(DOM)
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-
-    for (var i = 0, count = [platformWindows count]; i < count; i++)
-        platformWindows[i]._DOMBodyElement.style.cursor = aString;
-#endif
-}
-
-// Internal method that is used to return the system cursors.  Caches the system cursors for performance.
-+ (CPCursor)_systemCursorWithName:(CPString)cursorName cssString:(CPString)aString hasImage:(BOOL)doesHaveImage
-{
-    var cursor = cursors[cursorName];
-
-    if (typeof cursor === "undefined")
-    {
-        var cssString;
-
-        if (doesHaveImage)
-        {
-            var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath];
-            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.cur), %@", themeResourcePath, cursorName, aString];
-        }
-
-        else
-        {
-            // IE <= 8 does not support some cursors, map them to supported cursors
-            var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
-
-            if (ieLessThan9)
-                cssString = ieCursorMap[aString] || aString;
-            else
-                cssString = aString;
-        }
-
-        cursor = [[CPCursor alloc] initWithCSSString:cssString];
-        cursors[cursorName] = cursor;
-    }
-
-    return cursor;
-}
-
-+ (CPCursor)arrowCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default" hasImage:NO];
-}
-
-+ (CPCursor)crosshairCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"crosshair" hasImage:NO];
-}
-
-+ (CPCursor)IBeamCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"text" hasImage:NO];
-}
-
-+ (CPCursor)pointingHandCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer" hasImage:NO];
-}
-
-+ (CPCursor)resizeNorthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNorthwestSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNortheastSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSouthwestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeSoutheastCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeDownCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeUpCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"n-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeLeftCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"w-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeRightCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"e-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeLeftRightCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeEastWestCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeUpDownCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize" hasImage:NO];
-}
-
-+ (CPCursor)resizeNorthSouthCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize" hasImage:NO];
-}
-
-+ (CPCursor)operationNotAllowedCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed" hasImage:NO];
-}
-
-+ (CPCursor)dragCopyCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"copy" hasImage:YES];
-}
-
-+ (CPCursor)dragLinkCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"alias" hasImage:YES];
-}
-
-+ (CPCursor)contextualMenuCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"context-menu" hasImage:YES];
-}
-
-+ (CPCursor)openHandCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"move" hasImage:YES];
-}
-
-+ (CPCursor)closedHandCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"-moz-grabbing" hasImage:YES];
-}
-
-+ (CPCursor)disappearingItemCursor
-{
-    return [CPCursor _systemCursorWithName:CPStringFromSelector(_cmd) cssString:@"auto" hasImage:YES];
-}
-
-@end
-
-@implementation CPCursor(CPCoding)
-
 - (id)initWithCoder:(CPCoder)coder
 {
     if (self = [super init])
@@ -327,3 +274,4 @@ var currentCursor = nil,
 }
 
 @end
+

AppKit/CPDocument.j

@@ -23,16 +23,12 @@
 @import <Foundation/CPString.j>
 @import <Foundation/CPArray.j>
 
-@import "CPAlert.j"
+@import "CPApplication.j"
 @import "CPResponder.j"
 @import "CPSavePanel.j"
 @import "CPViewController.j"
 @import "CPWindowController.j"
 
-@class CPDocumentController
-
-@global CPApp
-
 
 /*
     @global
@@ -92,7 +88,7 @@ var CPDocumentUntitledCount = 0;
     @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.
 */
@@ -146,7 +142,7 @@ var CPDocumentUntitledCount = 0;
     @param anError not used
     @return the initialized document
 */
-- (id)initWithType:(CPString)aType error:(/*{*/CPError/*}*/)anError
+- (id)initWithType:(CPString)aType error:({CPError})anError
 {
     self = [self init];
 
@@ -212,10 +208,10 @@ 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
+- (CPData)dataOfType:(CPString)aType error:({CPError})anError
 {
     [CPException raise:CPUnsupportedMethodException
                 reason:"dataOfType:error: must be overridden by the document subclass."];
@@ -926,9 +922,9 @@ var CPDocumentUntitledCount = 0;
 var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
 {
     return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-};
+}
 
 var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
 {
     return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-};
+}

AppKit/CPDocumentController.j

@@ -24,11 +24,7 @@
 @import <Foundation/CPBundle.j>
 
 @import "CPDocument.j"
-@import "CPOpenPanel.j"
-@import "CPMenuItem.j"
-@import "CPWindowController.j"
-
-@global CPApp
+@import "CPOpenPanel.j";
 
 
 var CPSharedDocumentController = nil;
@@ -128,7 +124,7 @@ var CPSharedDocumentController = nil;
     @param anError not used
     @return the created document
 */
-- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
+- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:({CPError})anError
 {
     return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
 }
@@ -181,7 +177,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
 {
@@ -343,10 +339,10 @@ var CPSharedDocumentController = nil;
 - (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
 {
     var context = {
-            delegate: aDelegate,
-            selector: didCloseSelector,
-            context: info
-        };
+        delegate: aDelegate,
+        selector: didCloseSelector,
+        context: info
+    };
 
     [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
 }
@@ -394,14 +390,13 @@ var CPSharedDocumentController = nil;
 
 - (void)noteNewRecentDocument:(CPDocument)aDocument
 {
-    [self noteNewRecentDocumentURL:[aDocument fileURL]];
+    [self noteNewRecentDocumentURL:[[aDocument fileURL] absoluteString]];
 }
 
-- (void)noteNewRecentDocumentURL:(CPURL)aURL
+- (void)noteNewRecentDocumentURL:(CPString)aURL
 {
-    var urlAsString = [aURL isKindOfClass:CPString] ? aURL : [aURL absoluteString];
     if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
-        window.cpNoteNewRecentDocumentPath(urlAsString);
+        window.cpNoteNewRecentDocumentPath(aURL);
 
    [self _updateRecentDocumentsMenu];
 }

AppKit/CPDragServer.j

@@ -20,16 +20,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPDragServer_Constants.j"
+@import "CPApplication.j"
 @import "CPEvent.j"
 @import "CPImageView.j"
 @import "CPPasteboard.j"
 @import "CPView.j"
 @import "CPWindow.j"
 
-@class _CPDOMDataTransferPasteboard
 
-@global CPApp
+CPDragOperationNone     = 0,
+CPDragOperationCopy     = 1 << 1,
+CPDragOperationLink     = 1 << 1,
+CPDragOperationGeneric  = 1 << 2,
+CPDragOperationPrivate  = 1 << 3,
+CPDragOperationMove     = 1 << 4,
+CPDragOperationDelete   = 1 << 5,
+CPDragOperationEvery    = -1;
 
 #define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
 
@@ -38,8 +44,8 @@ var CPDragServerPreviousEvent = nil,
 
 var CPSharedDragServer = nil;
 
-var CPDragServerSource             = nil,
-    CPDragServerDraggingInfo       = nil;
+var CPDragServerSource             = nil;
+var CPDragServerDraggingInfo       = nil;
 
 /*
     CPDraggingInfo is a container of information about a specific dragging session.
@@ -66,7 +72,7 @@ var CPDragServerSource             = nil,
 - (unsigned)draggingSourceOperationMask
 */
 
-- (CGPoint)draggingLocation
+- (CPPoint)draggingLocation
 {
     return [[CPDragServer sharedDragServer] draggingLocation];
 }
@@ -214,14 +220,14 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     [_draggingUpdateTimer invalidate];
     _draggingUpdateTimer = nil;
 
-    var dragOperation = CPDragOperationCopy,
+    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]];
+    var draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
 
     if (draggingDestination)
         _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];
 
-    if (draggingDestination !== _draggingDestination)
+    if(draggingDestination !== _draggingDestination)
     {
         if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
             [_draggingDestination draggingExited:CPDragServerDraggingInfo];
@@ -255,7 +261,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
         {
             var contentView = [scrollView contentView],
                 bounds = [contentView bounds],
-                insetBounds = CGRectInset(bounds, 30, 30),
+                insetBounds = CGRectInset(bounds, 10, 10),
                 eventLocation = [contentView convertPoint:_draggingLocation fromView:nil],
                 deltaX = 0,
                 deltaY = 0;
@@ -264,10 +270,10 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
             {
                 if ([scrollView hasVerticalScroller])
                 {
-                    if (eventLocation.y < _CGRectGetMinY(insetBounds))
-                        deltaY = _CGRectGetMinY(insetBounds) - eventLocation.y;
-                    else if (eventLocation.y > _CGRectGetMaxY(insetBounds))
-                        deltaY = _CGRectGetMaxY(insetBounds) - eventLocation.y;
+                    if (eventLocation.y < CGRectGetMinY(insetBounds))
+                        deltaY = CGRectGetMinY(insetBounds) - eventLocation.y;
+                    else if (eventLocation.y > CGRectGetMaxY(insetBounds))
+                        deltaY = CGRectGetMaxY(insetBounds) - eventLocation.y;
                     if (deltaY < -insetBounds.size.height)
                         deltaY = -insetBounds.size.height;
                     if (deltaY > insetBounds.size.height)
@@ -276,21 +282,17 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
 
                 if ([scrollView hasHorizontalScroller])
                 {
-                    if (eventLocation.x < _CGRectGetMinX(insetBounds))
-                        deltaX = _CGRectGetMinX(insetBounds) - eventLocation.x;
-                    else if (eventLocation.x > _CGRectGetMaxX(insetBounds))
-                        deltaX = _CGRectGetMaxX(insetBounds) - eventLocation.x;
+                    if (eventLocation.x < CGRectGetMinX(insetBounds))
+                        deltaX = CGRectGetMinX(insetBounds) - eventLocation.x;
+                    else if (eventLocation.x > CGRectGetMaxX(insetBounds))
+                        deltaX = CGRectGetMaxX(insetBounds) - eventLocation.x;
                     if (deltaX < -insetBounds.size.width)
                         deltaX = -insetBounds.size.width;
                     if (deltaX > insetBounds.size.width)
                         deltaX = insetBounds.size.width;
                 }
 
-                var scrollPoint = _CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY);
-
-                [contentView scrollToPoint:scrollPoint];
-                [[scrollView _headerView] scrollPoint:scrollPoint];
-
+                [contentView scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
             }
         }
     }
@@ -454,9 +456,8 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     }
     else if (type === CPKeyDown)
     {
-        var characters = [anEvent characters];
-
-        if (characters === CPEscapeFunctionKey)
+        var keyCode = [anEvent keyCode];
+        if (keyCode === CPEscapeKeyCode)
         {
             _dragOperation = CPDragOperationNone;
             [self draggingEndedInPlatformWindow:platformWindow globalLocation:CGPointMakeZero() operation:_dragOperation];
@@ -472,7 +473,7 @@ var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
     // If we're not a mouse up, then we're going to want to grab the next event.
     [CPApp setTarget:self selector:@selector(trackDragging:)
         forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
-        untilDate:nil inMode:0 dequeue:YES];
+        untilDate:nil inMode:0 dequeue:NO];
 }
 
 @end

AppKit/CPDragServer_Constants.j

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

AppKit/CPEvent.j

@@ -20,24 +20,165 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPEvent_Constants.j"
-
 @import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
-@import <Foundation/CPString.j>
-
-@import "CPCompatibility.j"
-@import "CGGeometry.j"
 @import "CPText.j"
 
-@class CPTextField
 
-@global CPApp
+CPLeftMouseDown                         = 1;
+CPLeftMouseUp                           = 2;
+CPRightMouseDown                        = 3;
+CPRightMouseUp                          = 4;
+CPMouseMoved                            = 5;
+CPLeftMouseDragged                      = 6;
+CPRightMouseDragged                     = 7;
+CPMouseEntered                          = 8;
+CPMouseExited                           = 9;
+CPKeyDown                               = 10;
+CPKeyUp                                 = 11;
+CPFlagsChanged                          = 12;
+CPAppKitDefined                         = 13;
+CPSystemDefined                         = 14;
+CPApplicationDefined                    = 15;
+CPPeriodic                              = 16;
+CPCursorUpdate                          = 17;
+CPScrollWheel                           = 22;
+CPOtherMouseDown                        = 25;
+CPOtherMouseUp                          = 26;
+CPOtherMouseDragged                     = 27;
+
+// iPhone Event Types
+CPTouchStart                            = 28;
+CPTouchMove                             = 29;
+CPTouchEnd                              = 30;
+CPTouchCancel                           = 31;
+
+CPAlphaShiftKeyMask                     = 1 << 16;
+CPShiftKeyMask                          = 1 << 17;
+CPControlKeyMask                        = 1 << 18;
+CPAlternateKeyMask                      = 1 << 19;
+CPCommandKeyMask                        = 1 << 20;
+CPNumericPadKeyMask                     = 1 << 21;
+CPHelpKeyMask                           = 1 << 22;
+CPFunctionKeyMask                       = 1 << 23;
+CPDeviceIndependentModifierFlagsMask    = 0xffff0000;
+
+CPLeftMouseDownMask                     = 1 << CPLeftMouseDown;
+CPLeftMouseUpMask                       = 1 << CPLeftMouseUp;
+CPRightMouseDownMask                    = 1 << CPRightMouseDown;
+CPRightMouseUpMask                      = 1 << CPRightMouseUp;
+CPOtherMouseDownMask                    = 1 << CPOtherMouseDown;
+CPOtherMouseUpMask                      = 1 << CPOtherMouseUp;
+CPMouseMovedMask                        = 1 << CPMouseMoved;
+CPLeftMouseDraggedMask                  = 1 << CPLeftMouseDragged;
+CPRightMouseDraggedMask                 = 1 << CPRightMouseDragged;
+CPOtherMouseDragged                     = 1 << CPOtherMouseDragged;
+CPMouseEnteredMask                      = 1 << CPMouseEntered;
+CPMouseExitedMask                       = 1 << CPMouseExited;
+CPCursorUpdateMask                      = 1 << CPCursorUpdate;
+CPKeyDownMask                           = 1 << CPKeyDown;
+CPKeyUpMask                             = 1 << CPKeyUp;
+CPFlagsChangedMask                      = 1 << CPFlagsChanged;
+CPAppKitDefinedMask                     = 1 << CPAppKitDefined;
+CPSystemDefinedMask                     = 1 << CPSystemDefined;
+CPApplicationDefinedMask                = 1 << CPApplicationDefined;
+CPPeriodicMask                          = 1 << CPPeriodic;
+CPScrollWheelMask                       = 1 << CPScrollWheel;
+CPAnyEventMask                          = 0xffffffff;
+
+CPUpArrowFunctionKey                    = "\uF700";
+CPDownArrowFunctionKey                  = "\uF701";
+CPLeftArrowFunctionKey                  = "\uF702";
+CPRightArrowFunctionKey                 = "\uF703";
+CPF1FunctionKey                         = "\uF704";
+CPF2FunctionKey                         = "\uF705";
+CPF3FunctionKey                         = "\uF706";
+CPF4FunctionKey                         = "\uF707";
+CPF5FunctionKey                         = "\uF708";
+CPF6FunctionKey                         = "\uF709";
+CPF7FunctionKey                         = "\uF70A";
+CPF8FunctionKey                         = "\uF70B";
+CPF9FunctionKey                         = "\uF70C";
+CPF10FunctionKey                        = "\uF70D";
+CPF11FunctionKey                        = "\uF70E";
+CPF12FunctionKey                        = "\uF70F";
+CPF13FunctionKey                        = "\uF710";
+CPF14FunctionKey                        = "\uF711";
+CPF15FunctionKey                        = "\uF712";
+CPF16FunctionKey                        = "\uF713";
+CPF17FunctionKey                        = "\uF714";
+CPF18FunctionKey                        = "\uF715";
+CPF19FunctionKey                        = "\uF716";
+CPF20FunctionKey                        = "\uF717";
+CPF21FunctionKey                        = "\uF718";
+CPF22FunctionKey                        = "\uF719";
+CPF23FunctionKey                        = "\uF71A";
+CPF24FunctionKey                        = "\uF71B";
+CPF25FunctionKey                        = "\uF71C";
+CPF26FunctionKey                        = "\uF71D";
+CPF27FunctionKey                        = "\uF71E";
+CPF28FunctionKey                        = "\uF71F";
+CPF29FunctionKey                        = "\uF720";
+CPF30FunctionKey                        = "\uF721";
+CPF31FunctionKey                        = "\uF722";
+CPF32FunctionKey                        = "\uF723";
+CPF33FunctionKey                        = "\uF724";
+CPF34FunctionKey                        = "\uF725";
+CPF35FunctionKey                        = "\uF726";
+CPInsertFunctionKey                     = "\uF727";
+CPDeleteFunctionKey                     = "\uF728";
+CPHomeFunctionKey                       = "\uF729";
+CPBeginFunctionKey                      = "\uF72A";
+CPEndFunctionKey                        = "\uF72B";
+CPPageUpFunctionKey                     = "\uF72C";
+CPPageDownFunctionKey                   = "\uF72D";
+CPPrintScreenFunctionKey                = "\uF72E";
+CPScrollLockFunctionKey                 = "\uF72F";
+CPPauseFunctionKey                      = "\uF730";
+CPSysReqFunctionKey                     = "\uF731";
+CPBreakFunctionKey                      = "\uF732";
+CPResetFunctionKey                      = "\uF733";
+CPStopFunctionKey                       = "\uF734";
+CPMenuFunctionKey                       = "\uF735";
+CPUserFunctionKey                       = "\uF736";
+CPSystemFunctionKey                     = "\uF737";
+CPPrintFunctionKey                      = "\uF738";
+CPClearLineFunctionKey                  = "\uF739";
+CPClearDisplayFunctionKey               = "\uF73A";
+CPInsertLineFunctionKey                 = "\uF73B";
+CPDeleteLineFunctionKey                 = "\uF73C";
+CPInsertCharFunctionKey                 = "\uF73D";
+CPDeleteCharFunctionKey                 = "\uF73E";
+CPPrevFunctionKey                       = "\uF73F";
+CPNextFunctionKey                       = "\uF740";
+CPSelectFunctionKey                     = "\uF741";
+CPExecuteFunctionKey                    = "\uF742";
+CPUndoFunctionKey                       = "\uF743";
+CPRedoFunctionKey                       = "\uF744";
+CPFindFunctionKey                       = "\uF745";
+CPHelpFunctionKey                       = "\uF746";
+CPModeSwitchFunctionKey                 = "\uF747";
+CPEscapeFunctionKey                     = "\u001B";
+
+
+CPDOMEventDoubleClick                                = "dblclick",
+CPDOMEventMouseDown                                  = "mousedown",
+CPDOMEventMouseUp                                    = "mouseup",
+CPDOMEventMouseMoved                                 = "mousemove",
+CPDOMEventMouseDragged                               = "mousedrag",
+CPDOMEventKeyUp                                      = "keyup",
+CPDOMEventKeyDown                                    = "keydown",
+CPDOMEventKeyPress                                   = "keypress";
+CPDOMEventCopy                                       = "copy";
+CPDOMEventPaste                                      = "paste";
+CPDOMEventScrollWheel                                = "mousewheel";
+CPDOMEventTouchStart                                 = "touchstart";
+CPDOMEventTouchMove                                  = "touchmove";
+CPDOMEventTouchEnd                                   = "touchend";
+CPDOMEventTouchCancel                                = "touchcancel";
 
 var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer          = nil,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
-    _CPEventStartupMilliseconds         = new Date().getTime();
+    _CPEventUpperCaseRegex              = new RegExp("[A-Z]");
 
 /*!
     @ingroup appkit
@@ -47,7 +188,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 @implementation CPEvent : CPObject
 {
     CPEventType         _type;
-    CGPoint             _location;
+    CPPoint             _location;
     unsigned            _modifierFlags;
     CPTimeInterval      _timestamp;
     CPGraphicsContext   _context;
@@ -61,26 +202,14 @@ var _CPEventPeriodicEventPeriod         = 0,
     BOOL                _isARepeat;
     unsigned            _keyCode;
     DOMEvent            _DOMEvent;
-    int                 _data1;
-    int                 _data2;
-    short               _subtype;
 
     float               _deltaX;
     float               _deltaY;
     float               _deltaZ;
 }
 
-/*!
-    Returns the current time in fractional seconds since startup.
-*/
-+ (CPTimeInterval)currentTimestamp
-{
-    return (new Date().getTime() - _CPEventStartupMilliseconds) / 1000;
-}
-
 /*!
     Creates a new keyboard event.
-
     @param anEventType the event type. Must be one of CPKeyDown, CPKeyUp or CPFlagsChanged
     @param aPoint the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -105,8 +234,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Creates a new mouse event.
-
+    Creates a new mouse event
     @param anEventType the event type
     @param aPoint the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -128,8 +256,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Creates a new custom event.
-
+    Creates a new custom event
     @param anEventType the event type. Must be one of CPAppKitDefined, CPSystemDefined, CPApplicationDefined or CPPeriodic
     @param aLocation the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -150,29 +277,17 @@ 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:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
+- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
 {
-    if (self = [self _initWithType:anEventType])
+    self = [super init];
+
+    if (self)
     {
-        _location = CGPointCreateCopy(aPoint);
+        _type = anEventType;
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -186,13 +301,16 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /* @ignore */
-- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
+- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CPPoint)aPoint modifierFlags:(unsigned int)modifierFlags
     timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
     characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code
 {
-    if (self = [self _initWithType:anEventType])
+    self = [super init];
+
+    if (self)
     {
-        _location = CGPointCreateCopy(aPoint);
+        _type = anEventType;
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -211,9 +329,12 @@ 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)
     {
-        _location = CGPointCreateCopy(aPoint);
+        _type = anEventType;
+        _location = CPPointCreateCopy(aPoint);
         _modifierFlags = modifierFlags;
         _timestamp = aTimestamp;
         _context = aGraphicsContext;
@@ -227,10 +348,10 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     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 \c nil.
+    If \c window returns \c nil, then
+    the mouse coordinates will be based on the screen coordinates.
     Otherwise, the coordinates are relative to the window's coordinates.
-
     @return the location of the mouse, or \c nil for non-mouse events.
 */
 - (CGPoint)locationInWindow
@@ -250,7 +371,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns event information as a bit mask.
+    Returns event information as a bit mask
 */
 - (unsigned)modifierFlags
 {
@@ -258,7 +379,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the time the event occurred in seconds since startup.
+    Returns the time the event occurred
 */
 - (CPTimeInterval)timestamp
 {
@@ -274,7 +395,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the event's associated window.
+    Returns the event's associated window
 */
 - (CPWindow)window
 {
@@ -305,7 +426,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Returns the number of clicks that caused this event (mouse only).
+    Returns the number of clicks that caused this event. (mouse only)
 */
 - (int)clickCount
 {
@@ -313,8 +434,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
@@ -324,7 +444,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
@@ -334,7 +453,6 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Returns \c YES if the keyboard event was caused by the key being held down.
-
     @throws CPInternalInconsistencyException if this method is called on a non-key event
 */
 - (BOOL)isARepeat
@@ -344,7 +462,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
@@ -377,17 +494,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _DOMEvent;
 }
 
-- (int)data1
-{
-    return _data1;
-}
-
-- (int)data2
-{
-    return _data2;
-}
-
-// Getting Scroll Wheel Event Information
+// Getting Scroll Wheel Event Infomration
 /*!
     Returns the change in the x-axis for a mouse event.
 */
@@ -420,8 +527,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     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))
+    if (CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) && (aKeyEquivalentModifierMask & CPCommandKeyMask))
     {
         aKeyEquivalentModifierMask |= CPControlKeyMask;
         aKeyEquivalentModifierMask &= ~CPCommandKeyMask;
@@ -450,32 +556,32 @@ var _CPEventPeriodicEventPeriod         = 0,
     if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
         return YES;
 
-    // Cocoa allows almost any key as a key equivalent unless the first responder is a
-    // text field (presumably a subclass of NSText.)
-    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
-
-    // Some keys are accepted as key equivalents even if the first responder is a text
-    // field.
-    for (var i = 0; i < characterCount; i++)
+    for(var i=0; i<characterCount; i++)
     {
-        var c = _characters.charAt(i);
-
-        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-            c === CPEnterCharacter ||
-            c === CPNewlineCharacter ||
-            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey)
+        switch(_characters.charAt(i))
         {
-            return YES;
+            case CPBackspaceCharacter:
+            case CPDeleteCharacter:
+            case CPDeleteFunctionKey:
+            case CPTabCharacter:
+            case CPCarriageReturnCharacter:
+            case CPNewlineCharacter:
+            case CPEscapeFunctionKey:
+            case CPPageUpFunctionKey:
+            case CPPageDownFunctionKey:
+            case CPLeftArrowFunctionKey:
+            case CPUpArrowFunctionKey:
+            case CPRightArrowFunctionKey:
+            case CPDownArrowFunctionKey:
+                return YES;
         }
     }
-
-    return !firstResponderIsText;
+    // FIXME: More cases? Space?
+    return NO;
 }
 
 /*!
-    Generates periodic events every \c aPeriod seconds.
-
+    Gene                            rates periodic events every \c aPeriod seconds.
     @param aDelay the number of seconds before the first event
     @param aPeriod the length of time in seconds between successive events
 */
@@ -488,7 +594,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 }
 
 /*!
-    Stops the periodic events from being generated.
+    Stops the periodic events from being generated
 */
 + (void)stopPeriodicEvents
 {
@@ -500,34 +606,11 @@ var _CPEventPeriodicEventPeriod         = 0,
     _CPEventPeriodicEventTimer = nil;
 }
 
-- (CPString)description
-{
-    switch (_type)
-    {
-        case CPKeyDown:
-        case CPKeyUp:
-        case CPFlagsChanged:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
-        case CPLeftMouseDown:
-        case CPLeftMouseUp:
-        case CPRightMouseDown:
-        case CPRightMouseUp:
-        case CPMouseMoved:
-        case CPLeftMouseDragged:
-        case CPRightMouseDragged:
-        case CPMouseEntered:
-        case CPMouseExited:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
-        default:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
-    }
-}
-
 @end
 
 function _CPEventFirePeriodEvent()
 {
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
+    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:_CGPointMakeZero() modifierFlags:0 timestamp:0 windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
 }
 
 var CPEventClass = [CPEvent class];
@@ -549,3 +632,4 @@ function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifie
 
     return aNativeEvent;
 }
+

AppKit/CPEvent_Constants.j

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

AppKit/CPFlashMovie.j

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

AppKit/CPFlashView.j

@@ -32,10 +32,10 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 @implementation CPFlashView : CPView
 {
     CPFlashMovie    _flashMovie;
-
+    
     CPDictionary    _params;
     CPDictionary    _paramElements;
-#if PLATFORM(DOM)
+#if PLATFORM(DOM)    
     DOMElement      _DOMParamElement;
     DOMElement      _DOMObjectElement;
     DOMElement      _DOMInnerObjectElement;
@@ -45,7 +45,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
 #if PLATFORM(DOM)
@@ -58,24 +58,24 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
             _DOMObjectElement.style.left = @"0px";
             _DOMObjectElement.type = @"application/x-shockwave-flash";
             _DOMObjectElement.setAttribute(@"classid", IEFlashCLSID);
-
+            
             _DOMParamElement = document.createElement(@"param");
             _DOMParamElement.name = @"movie";
-
+            
             _DOMInnerObjectElement = document.createElement(@"object");
             _DOMInnerObjectElement.width = @"100%";
             _DOMInnerObjectElement.height = @"100%";
-
+            
             _DOMObjectElement.appendChild(_DOMParamElement);
             _DOMObjectElement.appendChild(_DOMInnerObjectElement);
-
+            
             _DOMElement.appendChild(_DOMObjectElement);
         }
         else
             [self _rebuildIEObjects];
 #endif
     }
-
+    
     return self;
 }
 
@@ -83,7 +83,7 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 {
     if (_flashMovie == aFlashMovie)
         return;
-
+        
     _flashMovie = aFlashMovie;
 #if PLATFORM(DOM)
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
@@ -104,15 +104,15 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
 - (void)setFlashVars:(CPDictionary)aDictionary
 {
     var varString = @"",
-        enumerator = [aDictionary keyEnumerator],
-        key;
-
-    while ((key = [enumerator nextObject]) !== nil)
+        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];
 }
@@ -129,31 +129,28 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     {
         var elements = [_paramElements allValues],
             count = [elements count];
-
+        
         for (var i = 0; i < count; i++)
             _DOMObjectElement.removeChild([elements objectAtIndex:i]);
     }
 #endif
-    if (!_params)
-        _params = aDictionary;
-    else
-        [_params addEntriesFromDictionary:aDictionary];
+    _params = aDictionary;
 #if PLATFORM(DOM)
     if (!CPBrowserIsEngine(CPInternetExplorerBrowserEngine))
     {
         _paramElements = [CPDictionary dictionary];
-
+        
         var enumerator = [_params keyEnumerator],
             key;
-
-        while (_DOMObjectElement && (key = [enumerator nextObject]) !== nil)
+        
+        while (key = [enumerator nextObject] && _DOMObjectElement)
         {
             var param = document.createElement(@"param");
             param.name = key;
             param.value = [_params objectForKey:key];
-
+            
             _DOMObjectElement.appendChild(param);
-
+            
             [_paramElements setObject:param forKey:key];
         }
     }
@@ -173,17 +170,17 @@ var IEFlashCLSID = "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000";
     _DOMElement.innerHTML = @"";
     if (![_flashMovie filename])
         return;
-
+    
     var paramString = [CPString stringWithFormat:@"<param name='movie' value='%@' />", [_flashMovie filename]],
         paramEnumerator = [_params keyEnumerator],
         key;
-
-    while ((key = [paramEnumerator nextObject]) !== nil)
+    
+    while (key = [paramEnumerator nextObject])
         paramString = [paramString stringByAppendingFormat:@"<param name='%@' value='%@' />", key, [_params objectForKey:key]];
-
+    
     _DOMObjectElement = document.createElement(@"object");
     _DOMElement.appendChild(_DOMObjectElement);
-
+    
     _DOMObjectElement.outerHTML = [CPString stringWithFormat:@"<object classid=%@ width=%@ height=%@>%@</object>", IEFlashCLSID, CGRectGetWidth([self bounds]), CGRectGetHeight([self bounds]), paramString];
 }
 #endif

AppKit/CPFont.j

@@ -25,88 +25,20 @@
 
 @import "CPView.j"
 
-CPFontDefaultSystemFontFace = @"Arial, sans-serif";
-CPFontDefaultSystemFontSize = 12;
+
+var _CPFonts                = {},
+    _CPFontSystemFontFace   = @"Arial, sans-serif",
+    _CPWrapRegExp           = new RegExp("\\s*,\\s*", "g");
+
+
+#define _CPCreateCSSString(aName, aSize, isBold) (isBold ? @"bold " : @"") + ROUND(aSize) + @"px " + ((aName === _CPFontSystemFontFace) ? aName : (@"\"" + aName.replace(_CPWrapRegExp, '", "') + @"\", " + _CPFontSystemFontFace))
+#define _CPCachedFont(aName, aSize, isBold) _CPFonts[_CPCreateCSSString(aName, aSize, isBold)]
 
 /*!
-    To create a font of a size that will dynamically reflect the current
-    system font size, use this for the size argument.
-*/
-CPFontCurrentSystemSize = -1;
+    @ingroup appkit
+    @class CPFont
 
-// For internal use only by this class and subclasses
-_CPFontSystemFacePlaceholder = "_CPFontSystemFacePlaceholder";
-
-var _CPFontCache                     = {},
-    _CPSystemFontCache               = {},
-    _CPFontSystemFontFace            = CPFontDefaultSystemFontFace,
-    _CPFontSystemFontSize            = 12,
-    _CPFontFallbackFaces             = CPFontDefaultSystemFontFace.split(", "),
-    _CPFontStripRegExp               = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g");
-
-
-#define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
-#define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
-#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFontCache[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
-#define _CPUserFont(aName, aSize, isBold, isItalic)  _CPCachedFont(aName, aSize, isBold, isItalic) || [[CPFont alloc] _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO]
-
-#define _CPSystemFontCacheKey(aSize, isBold)  (String(aSize) + (isBold ? "b" : ""))
-#define _CPCachedSystemFont(aSize, isBold)  _CPSystemFontCache[_CPSystemFontCacheKey(aSize, isBold)]
-#define _CPSystemFont(aSize, isBold)  (_CPCachedSystemFont(aSize, isBold) || [[CPFont alloc] _initWithName:_CPFontSystemFacePlaceholder size:aSize bold:isBold italic:NO system:YES])
-
-/*!
-@ingroup appkit
-@class CPFont
-
-The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
-The primary method for getting a particular font is through one of the class methods that take
-a name and/or size as arguments, and return the appropriate CPFont.
-
-### System fonts
-When you create a font using \c -systemFontOfSize: or \c -boldSystemFontOfSize:, a proxy font is
-created that always refers to the current system font face and size. By default the system
-font face/size is Arial 12px, with a fallback to sans-serif 12px. You may configure this at
-runtime in two ways:
-
-- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
-  Note that if you change the system font face or size during runtime, the next time
-  any view using a system font is redrawn, it will show the new font.
-- By configuring Info.plist for your application or for AppKit. You can set the font face
-  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
-  by adding a CPSystemFontSize integer item to the Info.plist.
-
-Note that in either case, you can specify a comma-delimited list of fonts as the font face.
-Do not quote enclose font faces that contain spaces, that is done automatically when a CSS
-representation of a font is requested.
-
-The browser will use the first available font in the list you supply. CPFont always ensures
-that Arial and sans-serif are in the CSS representation of a font as a fallback, so there is
-no need to add them to the end of your font list.
-
-### nib2cib conversion
-Fonts are converted by nib2cib according to the following algorithm:
-
-- If the font family is Lucida Grande, then a system font will be created.
-- If the font is Lucida Grande 13 (plain), the "default" font will be used at runtime.
-  The default font is taken from the "font" theme attribute if one exists,
-  otherwise from the current system font face and size.
-- Lucida Grande of any size other than 13 will retain its size.
-- Fonts using any family other than Lucida Grande will be used as is, including the size.
-
-### Using custom web fonts
-The configurability of CPFont makes it easy to use a custom web font as the system font.
-For example, if you want to use the google font Asap as the system font, you would do the
-following:
-
-- Add a <link> to the <head> of index-debug.html and index.html:
-@code
-<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
-@endcode
-- Specify Asap as the system font in Info.plist by adding the following item:
-@code
-<key>CPSystemFontFace</key>
-<string>Asap</string>
-@endcode
+    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
 {
@@ -115,215 +47,80 @@ following:
     float       _ascender;
     float       _descender;
     float       _lineHeight;
-    BOOL        _isBold         @accessors(readonly, getter=isBold);
-    BOOL        _isItalic       @accessors(readonly, getter=isItalic);
-    BOOL        _isSystem       @accessors(readonly, getter=isSystem);
+    BOOL        _isBold;
 
     CPString    _cssString;
 }
 
 + (void)initialize
 {
-    if (self !== [CPFont class])
-        return;
+    var systemFont = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:"CPSystemFontFace"];
 
-    var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];
-
-    if (!systemFontFace)
-        systemFontFace = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontFace"];
-
-    if (systemFontFace)
-        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);
-
-    var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];
-
-    if (!systemFontSize)
-        systemFontSize = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontSize"];
-
-    if (systemFontSize)
-        _CPFontSystemFontSize = systemFontSize;
-}
-
-/*!
-    Returns the default system font face, which may consist of several comma-separated family names.
-*/
-+ (CPString)systemFontFace
-{
-    return _CPFontSystemFontFace;
-}
-
-/*!
-    Sets the default system font face, which may consist of several comma-separated family names.
-*/
-+ (CPString)setSystemFontFace:(CPString)aFace
-{
-    var normalizedFaces = _CPFontNormalizedNames(aFace);
-
-    if (normalizedFaces === _CPFontSystemFontFace)
-        return;
-
-    [self _invalidateSystemFontCache]
-    _CPFontSystemFontFace = aFace;
-}
-
-/*!
-    Returns the default system font size.
-*/
-+ (float)systemFontSize
-{
-    return _CPFontSystemFontSize;
-}
-
-+ (float)systemFontSizeForControlSize:(CPControlSize)aSize
-{
-    // TODO These sizes should be themable or made less arbitrary in some other way.
-    switch (aSize)
-    {
-        case CPSmallControlSize:
-            return _CPFontSystemFontSize - 1;
-        case CPMiniControlSize:
-            return _CPFontSystemFontSize - 2;
-        case CPRegularControlSize:
-        default:
-            return _CPFontSystemFontSize;
-    }
-}
-
-/*!
-    Sets the default system font size.
-*/
-+ (float)setSystemFontSize:(float)size
-{
-    if (size > 0 && size !== _CPFontSystemFontSize)
-    {
-        [self _invalidateSystemFontCache];
-        _CPFontSystemFontSize = size;
-    }
-}
-
-+ (void)_invalidateSystemFontCache
-{
-    var systemSize = String(_CPFontSystemFontSize),
-        currentSize = String(CPFontCurrentSystemSize);
-
-    for (key in _CPSystemFontCache)
-    {
-        if (_CPSystemFontCache.hasOwnProperty(key) &&
-            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
-        {
-            delete _CPSystemFontCache[key];
-        }
-    }
+    if (systemFont)
+        _CPFontSystemFontFace = systemFont;
 }
 
 /*!
     Returns a font with the specified name and size.
     @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in points)
     @return the requested font
 */
 + (CPFont)fontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, NO);
-}
-
-/*!
-    Returns a font with the specified name, size and style.
-    @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
-    @param italic whether the font should be italicized
-    @return the requested font
-*/
-+ (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, italic);
+    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). 0 or negative will create a font
-           in the current system font size.
+    @param aSize the size of the font (in points)
     @return the requested bold font
 */
 + (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
 {
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, NO);
-}
-
-/*!
-    Returns a bold font with the specified name, size and style.
-    @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
-    @param italic whether the font should be italicized
-    @return the requested font
-*/
-+ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, italic);
-}
-
-/*!
-    Internal font getter like fontWithName:size:italic: with a bold selector.
-*/
-+ (CPFont)_fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, bold, italic);
+    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). 0 creates a static font
-           in the current system font size. Negative creates a font
-           that dynamically tracks the current system font size.
+    @param aSize the size of the font (in points)
     @return the requested system font
 */
-+ (CPFont)systemFontOfSize:(CGSize)aSize
++ (CPFont)systemFontOfSize:(CPSize)aSize
 {
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, NO) || [[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). 0 creates a static font
-           in the current system font size. Negative creates a font
-           that dynamically tracks the current system font size.
+    @param aSize the size of the font (in points)
     @return the requested bold system font
 */
-+ (CPFont)boldSystemFontOfSize:(CGSize)aSize
++ (CPFont)boldSystemFontOfSize:(CPSize)aSize
 {
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
+    return _CPCachedFont(_CPFontSystemFontFace, aSize, YES) || [[CPFont alloc] _initWithName:_CPFontSystemFontFace size:aSize bold:YES];
 }
 
-- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic system:(BOOL)isSystem
+/*  FIXME Font Descriptor
+    @ignore
+*/
+- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold
 {
     self = [super init];
 
     if (self)
     {
+        _name = aName;
         _size = aSize;
         _ascender = 0;
         _descender = 0;
         _lineHeight = 0;
         _isBold = isBold;
-        _isItalic = isItalic;
-        _isSystem = isSystem;
 
-        if (isSystem)
-        {
-            _name = aName;
-            _cssString = _CPFontCreateCSSString(_CPFontSystemFontFace, _size, _isBold, _isItalic);
-            _CPSystemFontCache[_CPSystemFontCacheKey(_size, _isBold)] = self;
-        }
-        else
-        {
-            _name = _CPFontNormalizedNames(aName);
-            _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
-            _CPFontCache[_cssString] = self;
-        }
+        _cssString = _CPCreateCSSString(_name, _size, _isBold);
+
+        _CPFonts[_cssString] = self;
     }
 
     return self;
@@ -334,26 +131,22 @@ following:
 */
 - (float)ascender
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_ascender)
+        [self _getMetrics];
 
-    if (!font._ascender)
-        [font _getMetrics];
-
-    return font._ascender;
+    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.
+    Thus, if the longest descender extends 2 points below the baseline, descender will return –2.
 */
 - (float)descender
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_descender)
+        [self _getMetrics];
 
-    if (!font._descender)
-        [font _getMetrics];
-
-    return font._descender;
+    return _descender;
 }
 
 /*!
@@ -363,12 +156,10 @@ following:
 */
 - (float)defaultLineHeightForFont
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
+    if (!_lineHeight)
+        [self _getMetrics];
 
-    if (!font._lineHeight)
-        [font _getMetrics];
-
-    return font._lineHeight;
+    return _lineHeight;
 }
 
 /*!
@@ -376,7 +167,7 @@ following:
 */
 - (float)size
 {
-    return _CPRealFontSize(_size);
+    return _size;
 }
 
 /*!
@@ -384,9 +175,7 @@ following:
 */
 - (CPString)cssString
 {
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    return font._cssString;
+    return _cssString;
 }
 
 /*!
@@ -394,30 +183,17 @@ following:
 */
 - (CPString)familyName
 {
-    if (_isSystem)
-        return _CPFontSystemFontFace;
-
     return _name;
 }
 
-- (BOOL)isSystemSize
-{
-    return _size <= 0;
-}
-
 - (BOOL)isEqual:(id)anObject
 {
-    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
+    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === [self cssString];
 }
 
 - (CPString)description
 {
-    return [CPString stringWithFormat:@"%@ %@", [super description], [self cssString]];
-}
-
-- (id)copy
-{
-    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
+    return [CPString stringWithFormat:@"%@ %@ %f pt.", [super description], [self familyName], [self size]];
 }
 
 - (void)_getMetrics
@@ -431,11 +207,9 @@ following:
 
 @end
 
-var CPFontNameKey     = @"CPFontNameKey",
-    CPFontSizeKey     = @"CPFontSizeKey",
-    CPFontIsBoldKey   = @"CPFontIsBoldKey",
-    CPFontIsItalicKey = @"CPFontIsItalicKey",
-    CPFontIsSystemKey = @"CPFontIsSystemKey";
+var CPFontNameKey   = @"CPFontNameKey",
+    CPFontSizeKey   = @"CPFontSizeKey",
+    CPFontIsBoldKey = @"CPFontIsBoldKey";
 
 @implementation CPFont (CPCoding)
 
@@ -446,13 +220,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],
-        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];
-
-    return [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
+    return [self _initWithName:[aCoder decodeObjectForKey:CPFontNameKey]
+        size:[aCoder decodeFloatForKey:CPFontSizeKey]
+        bold:[aCoder decodeBoolForKey:CPFontIsBoldKey]];
 }
 
 /*!
@@ -464,51 +234,6 @@ var CPFontNameKey     = @"CPFontNameKey",
     [aCoder encodeObject:_name forKey:CPFontNameKey];
     [aCoder encodeFloat:_size forKey:CPFontSizeKey];
     [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
-    [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
-    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
 }
 
 @end
-
-
-// aName must be normalized
-var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
-{
-    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";
-
-    return properties + _CPFontConcatNameWithFallback(aName);
-};
-
-var _CPFontConcatNameWithFallback = function(aName)
-{
-    var names = _CPFontNormalizedNameArray(aName),
-        fallbackFaces = _CPFontFallbackFaces.slice(0);
-
-    // Remove the fallback names used in the names passed in
-    for (var i = 0; i < names.length; ++i)
-    {
-        for (var j = 0; j < fallbackFaces.length; ++j)
-        {
-            if (names[i].toLowerCase() === fallbackFaces[j].toLowerCase())
-            {
-                fallbackFaces.splice(j, 1);
-                break;
-            }
-        }
-
-        if (names[i].indexOf(" ") > 0)
-            names[i] = '"' + names[i] + '"';
-    }
-
-    return names.concat(fallbackFaces).join(", ");
-};
-
-var _CPFontNormalizedNameArray = function(aName)
-{
-    var names = aName.split(",");
-
-    for (var i = 0; i < names.length; ++i)
-        names[i] = names[i].replace(_CPFontStripRegExp, "");
-
-    return names;
-};

AppKit/CPFontManager.j

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

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

AppKit/CPGradient.j

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

AppKit/CPGraphics.j

@@ -23,16 +23,6 @@
 @import "CPColor.j"
 @import "CPGraphicsContext.j"
 
-CPCalibratedWhiteColorSpace = @"CalibratedWhiteColorSpace";
-CPCalibratedBlackColorSpace = @"CalibratedBlackColorSpace";
-CPCalibratedRGBColorSpace   = @"CalibratedRGBColorSpace";
-CPDeviceWhiteColorSpace     = @"DeviceWhiteColorSpace";
-CPDeviceBlackColorSpace     = @"DeviceBlackColorSpace";
-CPDeviceRGBColorSpace       = @"DeviceRGBColorSpace";
-CPDeviceCMYKColorSpace      = @"DeviceCMYKColorSpace";
-CPNamedColorSpace           = @"NamedColorSpace";
-CPPatternColorSpace         = @"PatternColorSpace";
-CPCustomColorSpace          = @"CustomColorSpace";
 
 function CPDrawTiledRects(
    /* CGRect */ boundsRect,
@@ -80,10 +70,7 @@ function CPDrawColorTiledRects(
         if (_CGRectIsEmpty(slice))
             continue;
 
-        var minX,
-            maxX,
-            minY,
-            maxY;
+        var minX, maxX, minY, maxY;
 
         if (side == CPMinXEdge || side == CPMaxXEdge)
         {
@@ -118,4 +105,4 @@ function CPDrawColorTiledRects(
     CGContextRestoreGState(context);
 
     return resultRect;
-}
+}

AppKit/CPGraphicsContext.j

@@ -25,8 +25,7 @@
 @import "CGContext.j"
 
 
-var CPGraphicsContextCurrent = nil,
-    CPGraphicsContextThreadStack = nil;
+var CPGraphicsContextCurrent    = nil;
 
 /*!
     @ingroup appkit
@@ -34,7 +33,7 @@ var CPGraphicsContextCurrent = nil,
 */
 @implementation CPGraphicsContext : CPObject
 {
-    CGContext   _graphicsPort;
+    CPContext   _graphicsPort;
 }
 
 /*!
@@ -53,28 +52,6 @@ var CPGraphicsContextCurrent = nil,
     CPGraphicsContextCurrent = aGraphicsContext;
 }
 
-+ (void)saveGraphicsState
-{
-    if (!CPGraphicsContextCurrent)
-        return;
-
-    if (!CPGraphicsContextThreadStack)
-        CPGraphicsContextThreadStack = [CPMutableArray array];
-
-    [CPGraphicsContextThreadStack addObject:CPGraphicsContextCurrent];
-    [CPGraphicsContextCurrent saveGraphicsState];
-}
-
-+ (void)restoreGraphicsState
-{
-    var lastContext = [CPGraphicsContextThreadStack lastObject];
-    if (lastContext)
-    {
-        [lastContext restoreGraphicsState];
-        [CPGraphicsContextThreadStack removeLastObject];
-    }
-}
-
 /*!
     Creates a graphics context with a provided port.
     @param aContext the context to initialize with
@@ -94,10 +71,10 @@ var CPGraphicsContextCurrent = nil,
 - (id)initWithGraphicsPort:(CPContext)aGraphicsPort
 {
     self = [super init];
-
+    
     if (self)
         _graphicsPort = aGraphicsPort;
-
+    
     return self;
 }
 
@@ -109,27 +86,4 @@ var CPGraphicsContextCurrent = nil,
     return _graphicsPort;
 }
 
-/*!
-    (Not implemented. Always returns Cappuccino's default, `YES`.)
-
-    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
-    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
-
-    Note: Cappuccino is flipped by default.
-*/
-- (BOOL)isFlipped
-{
-    return YES;
-}
-
-- (void)saveGraphicsState
-{
-    CGContextSaveGState(_graphicsPort);
-}
-
-- (void)restoreGraphicsState
-{
-    CGContextRestoreGState(_graphicsPort);
-}
-
 @end

AppKit/CPImage.j

@@ -25,10 +25,9 @@
 @import <Foundation/CPObject.j>
 @import <Foundation/CPRunLoop.j>
 @import <Foundation/CPString.j>
-@import <Foundation/CPData.j>
 
-@import "CGGeometry.j"
-@import "CPCompatibility.j"
+@import "CPGeometry.j"
+
 
 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -45,50 +44,20 @@ CPImageNameColorPanel               = @"CPImageNameColorPanel";
 CPImageNameColorPanelHighlighted    = @"CPImageNameColorPanelHighlighted";
 
 var imagesForNames = { },
-    AppKitImageForNames = { },
-    ImageDescriptionFormat = "%s {\n   filename: \"%s\",\n   size: { width:%f, height:%f }\n}";
+    AppKitImageForNames = { };
 
 AppKitImageForNames[CPImageNameColorPanel]              = CGSizeMake(26.0, 29.0);
 AppKitImageForNames[CPImageNameColorPanelHighlighted]   = CGSizeMake(26.0, 29.0);
 
-/*!
-    Returns a resource image with a relative path and size
-    in a bundle.
-
-    @param filename A filename or relative path to a resource image.
-    @param width    Width of the image. May be omitted.
-    @param height   Height of the image. May be omitted if width is omitted.
-    @param size     Instead of passing width/height, a CGSize may be passed.
-    @param bundle   Bundle in which the image resource can be found.
-                    If omitted, defaults to the main bundle.
-    @return CPImage
-*/
-function CPImageInBundle()
+function CPImageInBundle(aFilename, aSize, aBundle)
 {
-    var filename = arguments[0],
-        size = nil,
-        bundle = nil;
+    if (!aBundle)
+        aBundle = [CPBundle mainBundle];
 
-    if (typeof(arguments[1]) === "number")
-    {
-        if (arguments[1] !== nil && arguments[1] === undefined)
-            size = CGSizeMake(arguments[1], arguments[2]);
+    if (aSize)
+        return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename] size:aSize];
 
-        bundle = arguments[3];
-    }
-    else if (typeof(arguments[1]) === "object")
-    {
-        size = arguments[1];
-        bundle = arguments[2];
-    }
-
-    if (!bundle)
-        bundle = [CPBundle mainBundle];
-
-    if (size)
-        return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename] size:size];
-
-    return [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:filename]];
+    return [[CPImage alloc] initWithContentsOfFile:[aBundle pathForResource:aFilename]];
 }
 
 function CPAppKitImage(aFilename, aSize)
@@ -96,7 +65,7 @@ function CPAppKitImage(aFilename, aSize)
     return CPImageInBundle(aFilename, aSize, [CPBundle bundleForClass:[CPView class]]);
 }
 
-/*!
+/*! 
     @ingroup appkit
     @class CPImage
 
@@ -104,7 +73,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
@@ -148,7 +117,7 @@ function CPAppKitImage(aFilename, aSize)
 
     if (self)
     {
-        _size = CGSizeCreateCopy(aSize);
+        _size = CPSizeCreateCopy(aSize);
         _filename = aFilename;
         _loadStatus = CPImageLoadStatusInitialized;
     }
@@ -188,20 +157,6 @@ function CPAppKitImage(aFilename, aSize)
     return self;
 }
 
-/*!
-    Initializes the receiver with the specified data. The method loads the data into memory.
-    @param someData the CPData object representing the image
-    @return the initialized image
-*/
-- (id)initWithData:(CPData)someData
-{
-    var base64 = [someData base64],
-        type = [base64 hasPrefix:@"/9j/4AAQSkZJRgABAQEASABIAAD/"] ? @"jpg" : @"png",
-        dataURL = "data:image/" + type + ";base64," + base64;
-
-    return [self initWithContentsOfFile:dataURL];
-}
-
 /*!
     Returns the path of the file associated with this image.
 */
@@ -210,37 +165,6 @@ function CPAppKitImage(aFilename, aSize)
     return _filename;
 }
 
-/*!
-    Returns the data associated with this image.
-    @discussion Returns nil if the reciever was not initialized with -initWithData: and the browser does not support the canvas feature;
-*/
-- (CPData)data
-{
-#if PLATFORM(DOM)
-    var dataURL;
-
-    if ([_filename hasPrefix:@"data:image"])
-        dataURL = _filename;
-    else if (CPFeatureIsCompatible(CPHTMLCanvasFeature))
-    {
-        var canvas = document.createElement("canvas"),
-            ctx = canvas.getContext("2d");
-
-        canvas.width = _image.width,
-        canvas.height = _image.height;
-
-        ctx.drawImage(_image, 0, 0);
-
-        dataURL = canvas.toDataURL("image/png");
-    }
-    else
-        return nil;
-
-    var base64 = dataURL.replace(/^data:image\/png;base64,/, "");
-    return [CPData dataWithBase64:base64];
-#endif
-}
-
 /*!
     Sets the size of the image.
     @param the size of the image
@@ -356,7 +280,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onerror = function ()
         {
@@ -368,7 +292,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.onabort = function ()
         {
@@ -380,7 +304,7 @@ function CPAppKitImage(aFilename, aSize)
                 [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
             }
             [self _derefFromImage];
-        };
+        }
 
     _image.src = _filename;
 
@@ -400,24 +324,6 @@ function CPAppKitImage(aFilename, aSize)
     return NO;
 }
 
-- (CPString)description
-{
-    var filename = [self filename],
-        size = [self size];
-
-    if (filename.indexOf("data:") === 0)
-    {
-        var index = filename.indexOf(",");
-
-        if (index > 0)
-            filename = [CPString stringWithFormat:@"%s,%s...%s", filename.substr(0, index), filename.substr(index + 1, 10), filename.substr(filename.length - 10)];
-        else
-            filename = "data:<unknown type>";
-    }
-
-    return [CPString stringWithFormat:ImageDescriptionFormat, [super description], filename, size.width, size.height];
-}
-
 /* @ignore */
 - (void)_derefFromImage
 {

AppKit/CPImageView.j

@@ -26,8 +26,10 @@
 @import "CPImage.j"
 @import "CPShadowView.j"
 
-@global CPImagesPboardType
-@global appkit_tag_dom_elements
+
+CPScaleProportionally   = 0;
+CPScaleToFit            = 1;
+CPScaleNone             = 2;
 
 CPImageAlignCenter      = 0;
 CPImageAlignTop         = 1;
@@ -39,9 +41,17 @@ CPImageAlignBottomLeft  = 6;
 CPImageAlignBottomRight = 7;
 CPImageAlignRight       = 8;
 
-var CPImageViewEmptyPlaceholderImage = nil;
+var CPImageViewShadowBackgroundColor = nil,
+    CPImageViewEmptyPlaceholderImage = nil;
+    
+var LEFT_SHADOW_INSET       = 3.0,
+    RIGHT_SHADOW_INSET      = 3.0,
+    TOP_SHADOW_INSET        = 3.0,
+    BOTTOM_SHADOW_INSET     = 5.0,
+    VERTICAL_SHADOW_INSET   = TOP_SHADOW_INSET + BOTTOM_SHADOW_INSET,
+    HORIZONTAL_SHADOW_INSET = LEFT_SHADOW_INSET + RIGHT_SHADOW_INSET;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPImageView
 
@@ -50,7 +60,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
 @implementation CPImageView : CPControl
 {
     DOMElement          _DOMImageElement;
-
+    
     BOOL                _hasShadow;
     CPView              _shadowView;
 
@@ -62,26 +72,15 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 + (void)initialize
 {
-    if (self !== [CPImageView class])
-        return;
-
     var bundle = [CPBundle bundleForClass:[CPView class]];
-
+    
     CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
 }
 
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding === CPValueBinding || theBinding === CPValueURLBinding || theBinding === CPValuePathBinding || theBinding === CPDataBinding)
-        return [CPImageViewValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
-
+    
     if (self)
     {
 #if PLATFORM(DOM)
@@ -97,11 +96,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
         }
 
         CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-
+        
         _DOMImageElement.style.visibility = "hidden";
 #endif
     }
-
+    
     return self;
 }
 
@@ -122,29 +121,29 @@ var CPImageViewEmptyPlaceholderImage = nil;
 - (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];
 #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;
@@ -163,7 +162,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
 - (void)imageDidLoad:(CPNotification)aNotification
 {
     [self hideOrDisplayContents];
-
+    
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
@@ -185,25 +184,25 @@ var CPImageViewEmptyPlaceholderImage = nil;
 {
     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];
 }
 
@@ -216,12 +215,12 @@ var CPImageViewEmptyPlaceholderImage = nil;
 {
     if (_imageAlignment == anImageAlignment)
         return;
-
+        
     _imageAlignment = anImageAlignment;
-
+    
     if (![self image])
         return;
-
+        
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
@@ -239,14 +238,14 @@ var CPImageViewEmptyPlaceholderImage = nil;
 - (void)setImageScaling:(CPImageScaling)anImageScaling
 {
     [super setImageScaling:anImageScaling];
-
+    
 #if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
+    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPScaleToFit)
     {
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
     }
 #endif
-
+    
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
 }
@@ -298,64 +297,68 @@ var CPImageViewEmptyPlaceholderImage = nil;
         imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
         x = 0.0,
         y = 0.0,
-        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
-        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
+        insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0),
+        insetHeight = (_hasShadow ? VERTICAL_SHADOW_INSET : 0.0),
         boundsWidth = _CGRectGetWidth(bounds),
         boundsHeight = _CGRectGetHeight(bounds),
         width = boundsWidth - insetWidth,
         height = boundsHeight - insetHeight;
 
-    if (imageScaling === CPImageScaleAxesIndependently)
+    if (imageScaling === CPScaleToFit)
     {
-        #if PLATFORM(DOM)
-            _DOMImageElement.width = ROUND(width);
-            _DOMImageElement.height = ROUND(height);
-        #endif
+#if PLATFORM(DOM)
+        _DOMImageElement.width = ROUND(width);
+        _DOMImageElement.height = ROUND(height);
+#endif
     }
     else
     {
         var size = [image size];
-
+        
         if (size.width == -1 && size.height == -1)
             return;
 
-        switch (imageScaling)
+        if (imageScaling === CPScaleProportionally)
         {
-            case CPImageScaleProportionallyDown:
-                if (width >= size.width && height >= size.height)
-                {
-                    width = size.width;
-                    height = size.height;
-                    break;
-                }
-
-                // intentionally fall through to the next case
-
-            case CPImageScaleProportionallyUpOrDown:
+            // The max size it can be is size.width x size.height, so only
+            // only proportion otherwise.
+            if (width >= size.width && height >= size.height)
+            {
+                width = size.width;
+                height = size.height;
+            }
+            else
+            {
                 var imageRatio = size.width / size.height,
                     viewRatio = width / height;
-
+                    
                 if (viewRatio > imageRatio)
                     width = height * imageRatio;
                 else
                     height = width / imageRatio;
-                break;
+            }
 
-            case CPImageScaleAxesIndependently:
-            case CPImageScaleNone:
-                width = size.width;
-                height = size.height;
-                break;
-        }
-
-        #if PLATFORM(DOM)
+#if PLATFORM(DOM)
             _DOMImageElement.width = ROUND(width);
             _DOMImageElement.height = ROUND(height);
-        #endif
-
-        var x,
-            y;
+#endif
+        }
+        else
+        {
+            width = size.width;
+            height = size.height;
+        }
+    
+        if (imageScaling == CPScaleNone)
+        {
+#if PLATFORM(DOM)
+            _DOMImageElement.width = ROUND(size.width);
+            _DOMImageElement.height = ROUND(size.height);
+#endif
+        }
 
+        var x, y;
+            
         switch (_imageAlignment)
         {
             case CPImageAlignLeft:
@@ -363,7 +366,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
             case CPImageAlignBottomLeft:
                 x = 0.0;
                 break;
-
+                
             case CPImageAlignRight:
             case CPImageAlignTopRight:
             case CPImageAlignBottomRight:
@@ -374,7 +377,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
                 x = (boundsWidth - width) / 2.0;
                 break;
         }
-
+                
         switch (_imageAlignment)
         {
             case CPImageAlignTop:
@@ -382,7 +385,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
             case CPImageAlignTopRight:
                 y = 0.0;
                 break;
-
+                
             case CPImageAlignBottom:
             case CPImageAlignBottomLeft:
             case CPImageAlignBottomRight:
@@ -392,7 +395,7 @@ var CPImageViewEmptyPlaceholderImage = nil;
             default:
                 y = (boundsHeight - height) / 2.0;
                 break;
-        }
+        }  
 
 #if PLATFORM(DOM)
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
@@ -400,9 +403,9 @@ var CPImageViewEmptyPlaceholderImage = nil;
     }
 
     _imageRect = _CGRectMake(x, y, width, height);
-
+    
     if (_hasShadow)
-        [_shadowView setFrame:_CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
+        [_shadowView setFrame:_CGRectMake(x - LEFT_SHADOW_INSET, y - TOP_SHADOW_INSET, width + insetWidth, height + insetHeight)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -447,45 +450,12 @@ var CPImageViewEmptyPlaceholderImage = nil;
         [self setImage:images[0]];
         [self sendAction:[self action] to:[self target]];
     }
-
+    
     return YES;
 }
 
 @end
 
-@implementation CPImageViewValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [self _setPlaceholder:nil forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setImage:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    var image;
-
-    if (aBinding === CPDataBinding)
-        image = [[CPImage alloc] initWithData:aValue];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        image = [[CPImage alloc] initWithContentsOfFile:aValue];
-    else if (aBinding === CPValueBinding)
-        image = aValue;
-
-    [_source setImage:image];
-}
-
-@end
-
 var CPImageViewImageKey          = @"CPImageViewImageKey",
     CPImageViewImageScalingKey   = @"CPImageViewImageScalingKey",
     CPImageViewImageAlignmentKey = @"CPImageViewImageAlignmentKey",
@@ -512,13 +482,10 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
         _DOMImageElement.setAttribute("draggable", "true");
         _DOMImageElement.style["-khtml-user-drag"] = "element";
     }
-
-    if (typeof(appkit_tag_dom_elements) !== "undefined" && !!appkit_tag_dom_elements)
-        _DOMImageElement.setAttribute("data-cappuccino-view", [self className]);
 #endif
 
     self = [super initWithCoder:aCoder];
-
+    
     if (self)
     {
 #if PLATFORM(DOM)
@@ -527,14 +494,14 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
         [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
-
-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
+        
+        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO)
             [self setEditable:YES];
 
         [self setNeedsLayout];
         [self setNeedsDisplay:YES];
     }
-
+    
     return self;
 }
 
@@ -545,21 +512,21 @@ 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];
 

AppKit/CPKeyBinding.j

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

AppKit/CPKeyValueBinding.j

@@ -27,7 +27,6 @@
 @import <Foundation/CPArray.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPValueTransformer.j>
-@import <Foundation/CPKeyValueObserving.j>
 
 
 var exposedBindingsMap = [CPDictionary new],
@@ -36,23 +35,20 @@ var exposedBindingsMap = [CPDictionary new],
 var CPBindingOperationAnd = 0,
     CPBindingOperationOr  = 1;
 
-@implementation CPBinder : CPObject
+@implementation CPKeyValueBinding : CPObject
 {
     CPDictionary    _info;
     id              _source;
-
-    JSObject        _suppressedNotifications;
-    JSObject        _placeholderForMarker;
 }
 
 + (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
 {
-    var bindings = [exposedBindingsMap objectForKey:[aClass UID]];
+    var bindings = [exposedBindingsMap objectForKey:[aClass hash]];
 
     if (!bindings)
     {
         bindings = [];
-        [exposedBindingsMap setObject:bindings forKey:[aClass UID]];
+        [exposedBindingsMap setObject:bindings forKey:[aClass hash]];
     }
 
     bindings.push(aBinding);
@@ -60,12 +56,12 @@ var CPBindingOperationAnd = 0,
 
 + (CPArray)exposedBindingsForClass:(Class)aClass
 {
-    return [[exposedBindingsMap objectForKey:[aClass UID]] copy];
+    return [[exposedBindingsMap objectForKey:[aClass hash]] copy];
 }
 
-+ (CPBinder)getBinding:(CPString)aBinding forObject:(id)anObject
++ (CPKeyValueBinding)getBinding:(CPString)aBinding forObject:(id)anObject
 {
-    return [[bindingsMap objectForKey:[anObject UID]] objectForKey:aBinding];
+    return [[bindingsMap objectForKey:[anObject hash]] objectForKey:aBinding];
 }
 
 + (CPDictionary)infoForBinding:(CPString)aBinding forObject:(id)anObject
@@ -80,12 +76,12 @@ var CPBindingOperationAnd = 0,
 
 + (CPDictionary)allBindingsForObject:(id)anObject
 {
-    return [bindingsMap objectForKey:[anObject UID]];
+    return [bindingsMap objectForKey:[anObject hash]];
 }
 
 + (void)unbind:(CPString)aBinding forObject:(id)anObject
 {
-    var bindings = [bindingsMap objectForKey:[anObject UID]];
+    var bindings = [bindingsMap objectForKey:[anObject hash]];
 
     if (!bindings)
         return;
@@ -105,7 +101,7 @@ var CPBindingOperationAnd = 0,
 
 + (void)unbindAllForObject:(id)anObject
 {
-    var bindings = [bindingsMap objectForKey:[anObject UID]];
+    var bindings = [bindingsMap objectForKey:[anObject hash]];
     if (!bindings)
         return;
 
@@ -115,7 +111,7 @@ var CPBindingOperationAnd = 0,
     while (count--)
         [anObject unbind:[bindings objectForKey:allKeys[count]]];
 
-    [bindingsMap removeObjectForKey:[anObject UID]];
+    [bindingsMap removeObjectForKey:[anObject hash]];
 }
 
 - (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
@@ -126,21 +122,17 @@ var CPBindingOperationAnd = 0,
     {
         _source = aSource;
         _info   = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]];
-        _suppressedNotifications = {};
-        _placeholderForMarker = {};
 
         if (options)
             [_info setObject:options forKey:CPOptionsKey];
 
-        [self _updatePlaceholdersWithOptions:options forBinding:aName];
-
         [aDestination addObserver:self forKeyPath:aKeyPath options:CPKeyValueObservingOptionNew context:aBinding];
 
-        var bindings = [bindingsMap objectForKey:[_source UID]];
+        var bindings = [bindingsMap objectForKey:[_source hash]];
         if (!bindings)
         {
             bindings = [CPDictionary new];
-            [bindingsMap setObject:bindings forKey:[_source UID]];
+            [bindingsMap setObject:bindings forKey:[_source hash]];
         }
 
         [bindings setObject:self forKey:aName];
@@ -150,7 +142,7 @@ var CPBindingOperationAnd = 0,
     return self;
 }
 
-- (void)setValueFor:(CPString)theBinding
+- (void)setValueFor:(CPString)aBinding
 {
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
@@ -160,30 +152,34 @@ var CPBindingOperationAnd = 0,
 
     if (isPlaceholder)
     {
-        if (newValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+        switch (newValue)
         {
-           [CPException raise:CPGenericException
-                       reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + newValue];
-        }
+            case CPMultipleValuesMarker:
+                newValue = [options objectForKey:CPMultipleValuesPlaceholderBindingOption] || @"Multiple Values";
+                break;
 
-        var value = [self _placeholderForMarker:newValue];
-        [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
+            case CPNoSelectionMarker:
+                newValue = [options objectForKey:CPNoSelectionPlaceholderBindingOption] || @"No Selection";
+                break;
+
+            case CPNotApplicableMarker:
+                if ([options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
+                    [CPException raise:CPGenericException reason:@"can't transform non applicable key on: "+_source+" value: "+newValue];
+
+                newValue = [options objectForKey:CPNotApplicablePlaceholderBindingOption] || @"Not Applicable";
+                break;
+        }
     }
     else
     {
-        var value = [self transformValue:newValue withOptions:options];
-        [self setValue:value forBinding:theBinding];
+        // Only transform the value if the current value is not a placeholder
+        newValue = [self transformValue:newValue withOptions:options];
     }
-}
 
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setValue:aValue forKey:aBinding];
-}
+    [_source setValue:newValue forKey:aBinding];
 
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setValue:aValue forKey:aBinding];
+    if ([_source respondsToSelector:@selector(_setCurrentValueIsPlaceholder:)])
+        [_source _setCurrentValueIsPlaceholder:isPlaceholder];
 }
 
 - (void)reverseSetValueFor:(CPString)aBinding
@@ -191,18 +187,10 @@ var CPBindingOperationAnd = 0,
     var destination = [_info objectForKey:CPObservedObjectKey],
         keyPath = [_info objectForKey:CPObservedKeyPathKey],
         options = [_info objectForKey:CPOptionsKey],
-        newValue = [self valueForBinding:aBinding];
+        newValue = [_source valueForKeyPath:aBinding];
 
     newValue = [self reverseTransformValue:newValue withOptions:options];
-
-    [self suppressSpecificNotificationFromObject:destination keyPath:keyPath];
     [destination setValue:newValue forKeyPath:keyPath];
-    [self unsuppressSpecificNotificationFromObject:destination keyPath:keyPath];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source valueForKeyPath:aBinding];
 }
 
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
@@ -210,15 +198,15 @@ var CPBindingOperationAnd = 0,
     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,
+        valueTransformer,
+        placeholder;
+
     var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
         valueTransformer;
 
@@ -242,13 +230,14 @@ var CPBindingOperationAnd = 0,
     if (valueTransformer)
         aValue = [valueTransformer transformedValue:aValue];
 
-    if (aValue === undefined || aValue === nil || aValue === [CPNull null])
+
+    if (aValue === undefined || aValue === nil)
         aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;
 
     return aValue;
 }
 
-- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
+- (id)reverseTransformValue:(id)aValue withOptions: (CPDictionary)options
 {
     var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
         valueTransformer;
@@ -264,103 +253,13 @@ var CPBindingOperationAnd = 0,
     return aValue;
 }
 
-- (BOOL)continuouslyUpdatesValue
-{
-    var options = [_info objectForKey:CPOptionsKey];
-    return [[options objectForKey:CPContinuouslyUpdatesValueBindingOption] boolValue];
-}
-
-- (BOOL)handlesContentAsCompoundValue
-{
-    var options = [_info objectForKey:CPOptionsKey];
-    return [[options objectForKey:CPHandlesContentAsCompoundValueBindingOption] boolValue];
-}
-
-/*!
-    Use this to avoid reacting to the notifications coming out of a reverseTransformedValue:.
-*/
-- (void)suppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
-{
-    if (!anObject)
-        return;
-
-    var uid = [anObject UID],
-        objectSuppressions = _suppressedNotifications[uid];
-    if (!objectSuppressions)
-        _suppressedNotifications[uid] = objectSuppressions = {};
-
-    objectSuppressions[aKeyPath] = YES;
-}
-
-/*!
-    Use this to cancel suppressSpecificNotificationFromObject:keyPath:.
-*/
-- (void)unsuppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
-{
-    if (!anObject)
-        return;
-
-    var uid = [anObject UID],
-        objectSuppressions = _suppressedNotifications[uid];
-    if (!objectSuppressions)
-        return;
-
-    delete objectSuppressions[aKeyPath];
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var count = [CPBinderPlaceholderMarkers count];
-
-    while (count--)
-    {
-        var marker = CPBinderPlaceholderMarkers[count],
-            optionName = CPBinderPlaceholderOptions[count],
-            isExplicit = [options containsKey:optionName],
-            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
-        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
-    }
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    [self _updatePlaceholdersWithOptions:options];
-}
-
-- (void)_placeholderForMarker:aMarker
-{
-    var placeholder = _placeholderForMarker[aMarker];
-    if (placeholder)
-        return placeholder['value'];
-    return nil;
-}
-
-- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
-{
-    if (isDefault)
-    {
-        var existingPlaceholder = _placeholderForMarker[aMarker];
-
-        // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder['isDefault'])
-            return;
-    }
-
-    _placeholderForMarker[aMarker] = { 'isDefault': isDefault, 'value': aPlaceholder };
-}
-
 @end
 
 @implementation CPObject (KeyValueBindingCreation)
 
 + (void)exposeBinding:(CPString)aBinding
 {
-    [CPBinder exposeBinding:aBinding forClass:[self class]];
-}
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    return [CPBinder class];
+    [CPKeyValueBinding exposeBinding:aBinding forClass:[self class]];
 }
 
 - (CPArray)exposedBindings
@@ -370,7 +269,7 @@ var CPBindingOperationAnd = 0,
 
     while (theClass)
     {
-        var temp = [CPBinder exposedBindingsForClass:theClass];
+        var temp = [CPKeyValueBinding exposedBindingsForClass:theClass];
 
         if (temp)
             [exposedBindings addObjectsFromArray:temp];
@@ -389,26 +288,23 @@ var CPBindingOperationAnd = 0,
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
     if (!anObject || !aKeyPath)
-        return CPLog.error("Invalid object or path on " + self + " for " + aBinding);
+        return CPLog.error("Invalid object or path on "+self+" for "+aBinding);
 
     //if (![[self exposedBindings] containsObject:aBinding])
-    //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
-
-    var binderClass = [[self class] _binderClassForBinding:aBinding];
+    //    CPLog.warn("No binding exposed on "+self+" for "+aBinding);
 
     [self unbind:aBinding];
-    [[binderClass alloc] initWithBinding:[self _replacementKeyPathForBinding:aBinding] name:aBinding to:anObject keyPath:aKeyPath options:options from:self];
+    [[CPKeyValueBinding 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];
+    return [CPKeyValueBinding infoForBinding:aBinding forObject:self];
 }
 
 - (void)unbind:(CPString)aBinding
 {
-    var binderClass = [[self class] _binderClassForBinding:aBinding];
-    [binderClass unbind:aBinding forObject:self];
+    [CPKeyValueBinding unbind:aBinding forObject:self];
 }
 
 - (id)_replacementKeyPathForBinding:(CPString)binding
@@ -418,35 +314,13 @@ var CPBindingOperationAnd = 0,
 
 @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
+@implementation _CPKeyValueOrBinding : CPKeyValueBinding
 {
 }
 
 - (void)setValueFor:(CPString)aBinding
 {
-    var bindings = [bindingsMap valueForKey:[_source UID]];
+    var bindings = [bindingsMap valueForKey:[_source hash]];
 
     if (!bindings)
         return;
@@ -461,13 +335,13 @@ var CPBindingOperationAnd = 0,
 
 @end
 
-@implementation _CPKeyValueAndBinding : CPBinder
+@implementation _CPKeyValueAndBinding : CPKeyValueBinding
 {
 }
 
 - (void)setValueFor:(CPString)aBinding
 {
-    var bindings = [bindingsMap objectForKey:[_source UID]];
+    var bindings = [bindingsMap objectForKey:[_source hash]];
 
     if (!bindings)
         return;
@@ -482,7 +356,7 @@ var CPBindingOperationAnd = 0,
 
 @end
 
-var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
+var resolveMultipleValues = function resolveMultipleValues(/*CPString*/key, /*CPDictionary*/bindings, /*GSBindingOperationKind*/operation)
 {
     var bindingName = key,
         theBinding,
@@ -504,9 +378,9 @@ var resolveMultipleValues = function(/*CPString*/key, /*CPDictionary*/bindings,
     }
 
     return !operation;
-};
+}
 
-var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
+var invokeAction = function invokeAction(/*CPString*/targetKey, /*CPString*/argumentKey, /*CPDictionary*/bindings)
 {
     var theBinding = [bindings objectForKey:targetKey],
         infoDictionary = theBinding._info,
@@ -541,7 +415,7 @@ var invokeAction = function(/*CPString*/targetKey, /*CPString*/argumentKey, /*CP
     }
 
     [invocation invoke];
-};
+}
 
 // Keys in options dictionary
 
@@ -554,72 +428,45 @@ CPOptionsKey            = @"CPOptionsKey";
 CPMultipleValuesMarker  = @"CPMultipleValuesMarker";
 CPNoSelectionMarker     = @"CPNoSelectionMarker";
 CPNotApplicableMarker   = @"CPNotApplicableMarker";
-CPNullMarker            = @"CPNullMarker";
 
 // Binding name constants
-CPAlignmentBinding                        = @"alignment";
-CPContentArrayBinding                     = @"contentArray";
-CPContentBinding                          = @"content";
-CPContentObjectBinding                    = @"contentObject";
-CPContentObjectsBinding                   = @"contentObjects";
-CPContentValuesBinding                    = @"contentValues";
-CPEditableBinding                         = @"editable";
-CPEnabledBinding                          = @"enabled";
-CPFontBinding                             = @"font";
-CPFontNameBinding                         = @"fontName";
-CPFontBoldBinding                         = @"fontBold";
-CPHiddenBinding                           = @"hidden";
-CPFilterPredicateBinding                  = @"filterPredicate";
-CPMaxValueBinding                         = @"maxValue";
-CPMinValueBinding                         = @"minValue";
-CPPredicateBinding                        = @"predicate";
-CPSelectedIndexBinding                    = @"selectedIndex";
-CPSelectedLabelBinding                    = @"selectedLabel";
-CPSelectedObjectBinding                   = @"selectedObject";
-CPSelectedObjectsBinding                  = @"selectedObjects";
-CPSelectedTagBinding                      = @"selectedTag";
-CPSelectedValueBinding                    = @"selectedValue";
-CPSelectedValuesBinding                   = @"selectedValues";
-CPSelectionIndexesBinding                 = @"selectionIndexes";
-CPTextColorBinding                        = @"textColor";
-CPTitleBinding                            = @"title";
-CPToolTipBinding                          = @"toolTip";
-CPValueBinding                            = @"value";
-CPValueURLBinding                         = @"valueURL";
-CPValuePathBinding                        = @"valuePath";
-CPDataBinding                             = @"data";
+CPAlignmentBinding      = @"CPAlignmentBinding";
+CPEditableBinding       = @"CPEditableBinding";
+CPEnabledBinding        = @"CPEnabledBinding";
+CPFontBinding           = @"CPFontBinding";
+CPHiddenBinding         = @"CPHiddenBinding";
+CPSelectedIndexBinding  = @"CPSelectedIndexBinding";
+CPTextColorBinding      = @"CPTextColorBinding";
+CPToolTipBinding        = @"CPToolTipBinding";
+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";
+CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelectionBindingOption";
+CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgumentBindingOption";
+CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditableBindingOption";
+CPConditionallySetsEnabledBindingOption             = @"CPConditionallySetsEnabledBindingOption";
+CPConditionallySetsHiddenBindingOption              = @"CPConditionallySetsHiddenBindingOption";
+CPContinuouslyUpdatesValueBindingOption             = @"CPContinuouslyUpdatesValueBindingOption";
+CPCreatesSortDescriptorBindingOption                = @"CPCreatesSortDescriptorBindingOption";
+CPDeletesObjectsOnRemoveBindingsOption              = @"CPDeletesObjectsOnRemoveBindingsOption";
+CPDisplayNameBindingOption                          = @"CPDisplayNameBindingOption";
+CPDisplayPatternBindingOption                       = @"CPDisplayPatternBindingOption";
+CPHandlesContentAsCompoundValueBindingOption        = @"CPHandlesContentAsCompoundValueBindingOption";
+CPInsertsNullPlaceholderBindingOption               = @"CPInsertsNullPlaceholderBindingOption";
+CPInvokesSeparatelyWithArrayObjectsBindingOption    = @"CPInvokesSeparatelyWithArrayObjectsBindingOption";
+CPMultipleValuesPlaceholderBindingOption            = @"CPMultipleValuesPlaceholderBindingOption";
+CPNoSelectionPlaceholderBindingOption               = @"CPNoSelectionPlaceholderBindingOption";
+CPNotApplicablePlaceholderBindingOption             = @"CPNotApplicablePlaceholderBindingOption";
+CPNullPlaceholderBindingOption                      = @"CPNullPlaceholderBindingOption";
+CPPredicateFormatBindingOption                      = @"CPPredicateFormatBindingOption";
+CPRaisesForNotApplicableKeysBindingOption           = @"CPRaisesForNotApplicableKeysBindingOption";
+CPSelectorNameBindingOption                         = @"CPSelectorNameBindingOption";
+CPSelectsAllWhenSettingContentBindingOption         = @"CPSelectsAllWhenSettingContentBindingOption";
+CPValidatesImmediatelyBindingOption                 = @"CPValidatesImmediatelyBindingOption";
+CPValueTransformerNameBindingOption                 = @"CPValueTransformerNameBindingOption";
+CPValueTransformerBindingOption                     = @"CPValueTransformerBindingOption";
 
 CPIsControllerMarker = function(/*id*/anObject)
 {
-    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
-};
-
-var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
-    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
-
+    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker;
+}

AppKit/CPLevelIndicator.j

@@ -1,375 +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"
-@import "CPWindow_Constants.j"
-
-@global CPApp
-
-CPTickMarkBelow                             = 0;
-CPTickMarkAbove                             = 1;
-CPTickMarkLeft                              = CPTickMarkAbove;
-CPTickMarkRight                             = CPTickMarkBelow;
-
-CPRelevancyLevelIndicatorStyle              = 0;
-CPContinuousCapacityLevelIndicatorStyle     = 1;
-CPDiscreteCapacityLevelIndicatorStyle       = 2;
-CPRatingLevelIndicatorStyle                 = 3;
-
-/*!
-    @ingroup appkit
-    @class CPLevelIndicator
-
-    CPLevelIndicator is a control which indicates a value visually on a scale.
-*/
-@implementation CPLevelIndicator : CPControl
-{
-    CPLevelIndicator    _levelIndicatorStyle    @accessors(property=levelIndicatorStyle);
-    double              _minValue               @accessors(property=minValue);
-    double              _maxValue               @accessors(property=maxValue);
-    double              _warningValue           @accessors(property=warningValue);
-    double              _criticalValue          @accessors(property=criticalValue);
-    CPTickMarkPosition  _tickMarkPosition       @accessors(property=tickMarkPosition);
-    int                 _numberOfTickMarks      @accessors(property=numberOfTickMarks);
-    int                 _numberOfMajorTickMarks @accessors(property=numberOfMajorTickMarks);
-
-    BOOL                _isEditable;
-
-    BOOL                _isTracking;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "level-indicator";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjectsAndKeys:[CPNull null], @"bezel-color",
-                                                      [CPNull null], @"color-empty",
-                                                      [CPNull null], @"color-normal",
-                                                      [CPNull null], @"color-warning",
-                                                      [CPNull null], @"color-critical",
-                                                      1.0,           @"spacing"];
-}
-
-
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    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:[self valueForThemeAttribute:@"bezel-color"]];
-
-    var segmentCount = _maxValue - _minValue;
-
-    if (segmentCount <= 0)
-        return;
-
-    var filledColor = [self valueForThemeAttribute:@"color-normal"],
-        value = [self doubleValue];
-
-    if (value <= _criticalValue)
-        filledColor = [self valueForThemeAttribute:@"color-critical"];
-    else if (value <= _warningValue)
-        filledColor = [self valueForThemeAttribute:@"color-warning"];
-
-    for (var i = 0; i < segmentCount; i++)
-    {
-        var segmentView = [self layoutEphemeralSubviewNamed:"segment-bezel-" + i
-                                               positioned:CPWindowAbove
-                          relativeToEphemeralSubviewNamed:bezelView];
-
-        [segmentView setBackgroundColor:(_minValue + i) < value ? filledColor : [self valueForThemeAttribute:@"color-empty"]];
-    }
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
-{
-    // TODO Put into theme attributes.
-    var bezelHeight = 18,
-        segmentHeight = 17,
-        bounds = _CGRectCreateCopy([self bounds]);
-
-    if (aViewName == "bezel")
-    {
-        bounds.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
-        bounds.size.height = bezelHeight;
-        return bounds;
-    }
-    else if (aViewName.indexOf("segment-bezel") === 0)
-    {
-        var segment = parseInt(aViewName.substring("segment-bezel-".length), 10),
-            segmentCount = _maxValue - _minValue;
-
-        if (segment >= segmentCount)
-            return _CGRectMakeZero();
-
-        var basicSegmentWidth = bounds.size.width / segmentCount,
-            segmentFrame = CGRectCreateCopy([self bounds]),
-            spacing = [self valueForThemeAttribute:@"spacing"];
-
-        segmentFrame.origin.y = (_CGRectGetHeight(bounds) - bezelHeight) / 2.0;
-        segmentFrame.origin.x =  FLOOR(segment * basicSegmentWidth);
-        segmentFrame.size.width = (segment == segmentCount - 1) ? bounds.size.width - segmentFrame.origin.x : FLOOR(((segment + 1) * basicSegmentWidth)) - FLOOR((segment * basicSegmentWidth)) - spacing;
-        segmentFrame.size.height = segmentHeight;
-
-        return segmentFrame;
-    }
-
-    return _CGRectMakeZero();
-}
-
-/*!
-    Sets whether or not the receiver level indicator can be edited.
-*/
-- (void)setEditable:(BOOL)shouldBeEditable
-{
-    if (_isEditable === shouldBeEditable)
-        return;
-
-    _isEditable = shouldBeEditable;
-}
-
-/*!
-    Returns \c YES if the textfield is currently editable by the user.
-*/
-- (BOOL)isEditable
-{
-    return _isEditable;
-}
-
-- (CPView)hitTest:(CGPoint)aPoint
-{
-    // Don't swallow clicks when displayed in a table.
-    if (![self isEditable])
-        return nil;
-
-    return [super hitTest:aPoint];
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if (![self isEditable] || ![self isEnabled])
-        return;
-
-    [self _trackMouse:anEvent];
-}
-
-- (void)_trackMouse:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type == CPLeftMouseDown || type == CPLeftMouseDragged)
-    {
-        var segmentCount = _maxValue - _minValue;
-
-        if (segmentCount <= 0)
-            return;
-
-        var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-            bounds = [self bounds],
-            oldValue = [self doubleValue],
-            newValue = oldValue;
-
-        // Moving the mouse outside of the widget to the left sets it
-        // to its minimum, and moving outside on the right sets it to
-        // its maximum.
-        if (type == CPLeftMouseDragged && location.x < 0)
-        {
-            newValue = _minValue;
-        }
-        else if (type == CPLeftMouseDragged && location.x > bounds.size.width)
-        {
-            newValue = _maxValue;
-        }
-        else
-        {
-            for (var i = 0; i < segmentCount; i++)
-            {
-                var rect = [self rectForEphemeralSubviewNamed:"segment-bezel-" + i];
-
-                // Once we're tracking the mouse, we only care about horizontal mouse movement.
-                if (location.x >= CGRectGetMinX(rect) && location.x < CGRectGetMaxX(rect))
-                {
-                    newValue = (_minValue + i + 1);
-                    break;
-                }
-            }
-        }
-
-        if (newValue != oldValue)
-            [self setDoubleValue:newValue];
-
-        // Track the mouse to support click and slide value editing.
-        _isTracking = YES;
-        [CPApp setTarget:self selector:@selector(_trackMouse:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-
-        if ([self isContinuous])
-            [self sendAction:[self action] to:[self target]];
-    }
-    else if (_isTracking)
-    {
-        _isTracking = NO;
-        [self sendAction:[self action] to:[self target]];
-    }
-}
-
-/*
-- (CPLevelIndicatorStyle)style;
-- (void)setLevelIndicatorStyle:(CPLevelIndicatorStyle)style;
-*/
-
-- (void)setMinValue:(double)minValue
-{
-    if (_minValue === minValue)
-        return;
-    _minValue = minValue;
-
-    [self setNeedsLayout];
-}
-
-- (void)setMaxValue:(double)maxValue
-{
-    if (_maxValue === maxValue)
-        return;
-    _maxValue = maxValue;
-
-    [self setNeedsLayout];
-}
-
-- (void)setWarningValue:(double)warningValue;
-{
-    if (_warningValue === warningValue)
-        return;
-    _warningValue = warningValue;
-
-    [self setNeedsLayout];
-}
-
-- (void)setCriticalValue:(double)criticalValue;
-{
-    if (_criticalValue === criticalValue)
-        return;
-    _criticalValue = criticalValue;
-
-    [self setNeedsLayout];
-}
-
-/*
-- (CPTickMarkPosition)tickMarkPosition;
-- (void)setTickMarkPosition:(CPTickMarkPosition)position;
-
-- (int)numberOfTickMarks;
-- (void)setNumberOfTickMarks:(int)count;
-
-- (int)numberOfMajorTickMarks;
-- (void)setNumberOfMajorTickMarks:(int)count;
-
-- (double)tickMarkValueAtIndex:(int)index;
-- (CGRect)rectOfTickMarkAtIndex:(int)index;
-*/
-
-@end
-
-var CPLevelIndicatorStyleKey                    = "CPLevelIndicatorStyleKey",
-    CPLevelIndicatorMinValueKey                 = "CPLevelIndicatorMinValueKey",
-    CPLevelIndicatorMaxValueKey                 = "CPLevelIndicatorMaxValueKey",
-    CPLevelIndicatorWarningValueKey             = "CPLevelIndicatorWarningValueKey",
-    CPLevelIndicatorCriticalValueKey            = "CPLevelIndicatorCriticalValueKey",
-    CPLevelIndicatorTickMarkPositionKey         = "CPLevelIndicatorTickMarkPositionKey",
-    CPLevelIndicatorNumberOfTickMarksKey        = "CPLevelIndicatorNumberOfTickMarksKey",
-    CPLevelIndicatorNumberOfMajorTickMarksKey   = "CPLevelIndicatorNumberOfMajorTickMarksKey",
-    CPLevelIndicatorIsEditableKey               = "CPLevelIndicatorIsEditableKey";
-
-@implementation CPLevelIndicator (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _levelIndicatorStyle = [aCoder decodeIntForKey:CPLevelIndicatorStyleKey];
-        _minValue = [aCoder decodeDoubleForKey:CPLevelIndicatorMinValueKey];
-        _maxValue = [aCoder decodeDoubleForKey:CPLevelIndicatorMaxValueKey];
-        _warningValue = [aCoder decodeDoubleForKey:CPLevelIndicatorWarningValueKey];
-        _criticalValue = [aCoder decodeDoubleForKey:CPLevelIndicatorCriticalValueKey];
-        _tickMarkPosition = [aCoder decodeIntForKey:CPLevelIndicatorTickMarkPositionKey];
-        _numberOfTickMarks = [aCoder decodeIntForKey:CPLevelIndicatorNumberOfTickMarksKey];
-        _numberOfMajorTickMarks = [aCoder decodeIntForKey:CPLevelIndicatorNumberOfMajorTickMarksKey];
-
-        _isEditable = [aCoder decodeBoolForKey:CPLevelIndicatorIsEditableKey];
-
-        [self _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/CPMenu.j

@@ -25,9 +25,12 @@
 @import <Foundation/CPNotificationCenter.j>
 @import <Foundation/CPString.j>
 
+@import "_CPMenuManager.j"
+@import "CPApplication.j"
+@import "CPClipView.j"
 @import "CPMenuItem.j"
+@import "CPPanel.j"
 
-@global CPApp
 
 CPMenuDidAddItemNotification        = @"CPMenuDidAddItemNotification";
 CPMenuDidChangeItemNotification     = @"CPMenuDidChangeItemNotification";
@@ -35,8 +38,12 @@ CPMenuDidRemoveItemNotification     = @"CPMenuDidRemoveItemNotification";
 
 CPMenuDidEndTrackingNotification    = @"CPMenuDidEndTrackingNotification";
 
+var MENUBAR_HEIGHT = 28.0;
+
 var _CPMenuBarVisible               = NO,
     _CPMenuBarTitle                 = @"",
+    _CPMenuBarIconImage             = nil,
+    _CPMenuBarIconImageAlphaValue   = 1.0,
     _CPMenuBarAttributes            = nil,
     _CPMenuBarSharedWindow          = nil;
 
@@ -45,7 +52,7 @@ var _CPMenuBarVisible               = NO,
     @class CPMenu
 
     Menus provide the user with a list of actions and/or submenus. Submenus themselves are full fledged menus
-    and so a hierarchical structure appears.
+    and so a heirarchical structure appears.
 */
 @implementation CPMenu : CPObject
 {
@@ -73,9 +80,6 @@ var _CPMenuBarVisible               = NO,
 
 + (void)initialize
 {
-    if (self !== [CPMenu class])
-        return;
-
     [[self class] setMenuBarAttributes:[CPDictionary dictionary]];
 }
 
@@ -102,8 +106,8 @@ var _CPMenuBarVisible               = NO,
         [_CPMenuBarSharedWindow setMenu:[CPApp mainMenu]];
 
         [_CPMenuBarSharedWindow setTitle:_CPMenuBarTitle];
-        [_CPMenuBarSharedWindow setIconImage:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image" forClass:_CPMenuView]];
-        [_CPMenuBarSharedWindow setIconImageAlphaValue:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-icon-image-alpha-value" forClass:_CPMenuView]];
+        [_CPMenuBarSharedWindow setIconImage:_CPMenuBarIconImage];
+        [_CPMenuBarSharedWindow setIconImageAlphaValue:_CPMenuBarIconImageAlphaValue];
 
         [_CPMenuBarSharedWindow setColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarBackgroundColor"]];
         [_CPMenuBarSharedWindow setTextColor:[_CPMenuBarAttributes objectForKey:@"CPMenuBarTextColor"]];
@@ -171,8 +175,8 @@ var _CPMenuBarVisible               = NO,
 
     else if (!textColor && !titleColor)
     {
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextColor"];
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTextColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithRed:0.051 green:0.2 blue:0.275 alpha:1.0] forKey:@"CPMenuBarTitleColor"];
     }
 
     if (!textShadowColor && titleShadowColor)
@@ -183,18 +187,18 @@ var _CPMenuBarVisible               = NO,
 
     else if (!textShadowColor && !titleShadowColor)
     {
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTextShadowColor"];
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-title-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarTitleShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarTitleShadowColor"];
     }
 
     if (!highlightColor)
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightColor"];
+        [_CPMenuBarAttributes setObject:[CPColor colorWithCalibratedRed:94.0/255.0 green:130.0/255.0 blue:186.0/255.0 alpha:1.0] forKey:@"CPMenuBarHighlightColor"];
 
     if (!highlightTextColor)
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextColor"];
+        [_CPMenuBarAttributes setObject:[CPColor whiteColor] forKey:@"CPMenuBarHighlightTextColor"];
 
     if (!highlightTextShadowColor)
-        [_CPMenuBarAttributes setObject:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView] forKey:@"CPMenuBarHighlightTextShadowColor"];
+        [_CPMenuBarAttributes setObject:[CPColor blackColor] forKey:@"CPMenuBarHighlightTextShadowColor"];
 
     if (_CPMenuBarSharedWindow)
     {
@@ -223,14 +227,14 @@ var _CPMenuBarVisible               = NO,
 - (float)menuBarHeight
 {
     if (self === [CPApp mainMenu])
-        return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
+        return MENUBAR_HEIGHT;
 
     return 0.0;
 }
 
 + (float)menuBarHeight
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-height" forClass:_CPMenuView];
+    return MENUBAR_HEIGHT;
 }
 
 // Creating a CPMenu Object
@@ -270,7 +274,22 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)insertItem:(CPMenuItem)aMenuItem atIndex:(unsigned)anIndex
 {
-    [self insertObject:aMenuItem inItemsAtIndex:anIndex];
+    var menu = [aMenuItem menu];
+
+    if (menu)
+        if (menu !== self)
+            [CPException raise:CPInternalInconsistencyException reason:@"Attempted to insert item into menu that was already in another menu."];
+        else
+            return;
+
+    [aMenuItem setMenu:self];
+    [_items insertObject:aMenuItem atIndex:anIndex];
+
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidAddItemNotification
+                      object:self
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
+
 }
 
 /*!
@@ -327,30 +346,16 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)removeItemAtIndex:(unsigned)anIndex
 {
-    [self removeObjectFromItemsAtIndex:anIndex];
-}
+    if (anIndex < 0 || anIndex >= _items.length)
+        return;
 
-/*!
-    Removes all the menu items in the receiver.
-    This method is more efficient than removing menu items individually.
+    [_items[anIndex] setMenu:nil];
+    [_items removeObjectAtIndex:anIndex];
 
-    Unlike the other remove methods, this method does not post CPMenuDidChangeItemNotification notifications.
-*/
-- (void)removeAllItems
-{
-    var count = [_items count];
-
-    // Remove the connection to this menu in case
-    // someone else has a reference to the menu item.
-    while (count--)
-        [_items[count] setMenu:nil];
-
-    _highlightedIndex = CPNotFound;
-
-    // Because we are changing _items directly, be sure to notify KVO
-    [self willChangeValueForKey:@"items"];
-    _items = [CPMutableArray array];
-    [self didChangeValueForKey:@"items"];
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidRemoveItemNotification
+                      object:self
+                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
 }
 
 /*!
@@ -359,11 +364,9 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)itemChanged:(CPMenuItem)aMenuItem
 {
-    if ([aMenuItem menu] !== self)
+    if ([aMenuItem menu] != self)
         return;
 
-    [aMenuItem setValue:[aMenuItem valueForKey:@"changeCount"] + 1 forKey:@"changeCount"];
-
     [[CPNotificationCenter defaultCenter]
         postNotificationName:CPMenuDidChangeItemNotification
                       object:self
@@ -552,6 +555,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (void)submenuAction:(id)aSender
 {
+
 }
 
 /*!
@@ -599,34 +603,11 @@ var _CPMenuBarVisible               = NO,
 }
 
 /*!
-    Enables or disables the receiver’s menu items.
-    If the target does not implement the menu item's action method the item is disabled.
-    If the target responsds to selector validateMenuItem: or validateUserInterfaceItem: (in that order) the return value is used.
+    Not implemented.
 */
 - (void)update
 {
-    if (![self autoenablesItems])
-        return;
 
-    var items = [self itemArray];
-    for (var i = 0; i < [items count]; i++)
-    {
-        var item = [items objectAtIndex:i];
-
-        if ([item hasSubmenu])
-            continue;
-
-        var validator = [CPApp targetForAction:[item action] to:[item target] from:item];
-
-        if (!validator || ![validator respondsToSelector:[item action]])
-            [item setEnabled:NO];
-        else if ([validator respondsToSelector:@selector(validateMenuItem:)])
-            [item setEnabled:[validator validateMenuItem:item]];
-        else if ([validator respondsToSelector:@selector(validateUserInterfaceItem:)])
-            [item setEnabled:[validator validateUserInterfaceItem:item]];
-    }
-
-    [[_menuWindow _menuView] tile];
 }
 
 // Managing the Title
@@ -708,7 +689,10 @@ var _CPMenuBarVisible               = NO,
     if (aView && !theWindow)
         throw "In call to popUpMenuPositioningItem:atLocation:inView:callback:, view is not in any window.";
 
-    [self _menuWillOpen];
+    var delegate = [self delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:aMenu];
 
     // Convert location to global coordinates if not already in them.
     if (aView)
@@ -796,10 +780,13 @@ var _CPMenuBarVisible               = NO,
 
 + (void)popUpContextMenu:(CPMenu)aMenu withEvent:(CPEvent)anEvent forView:(CPView)aView withFont:(CPFont)aFont
 {
-    [aMenu _menuWillOpen];
+    var delegate = [aMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
+        [delegate menuWillOpen:aMenu];
 
     if (!aFont)
-        aFont = [CPFont systemFontOfSize:[CPFont systemFontSize]];
+        aFont = [CPFont systemFontOfSize:12.0];
 
     var theWindow = [aView window],
         menuWindow = [_CPMenuWindow menuWindowWithMenu:aMenu font:aFont];
@@ -866,15 +853,7 @@ var _CPMenuBarVisible               = NO,
 */
 - (CPMenuItem)highlightedItem
 {
-    if (_highlightedIndex < 0)
-        return nil;
-
-    var highlightedItem = _items[_highlightedIndex];
-
-    if ([highlightedItem isSeparatorItem])
-        return nil;
-
-    return highlightedItem;
+    return _highlightedIndex >= 0 ? _items[_highlightedIndex] : nil;
 }
 
 // Managing the Delegate
@@ -889,25 +868,9 @@ var _CPMenuBarVisible               = NO,
     return _delegate;
 }
 
-- (void)_menuWillOpen
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuWillOpen:)])
-        [delegate menuWillOpen:self];
-}
-
-- (void)_menuDidClose
-{
-    var delegate = [self delegate];
-
-    if ([delegate respondsToSelector:@selector(menuDidClose:)])
-        [delegate menuDidClose:self];
-}
-
 // Handling Tracking
 /*!
-    Cancels tracking.
+	Cancels tracking.
 */
 - (void)cancelTracking
 {
@@ -967,9 +930,10 @@ var _CPMenuBarVisible               = NO,
         characters = [anEvent charactersIgnoringModifiers],
         modifierFlags = [anEvent modifierFlags];
 
-    for (; index < count; ++index)
+    for(; index < count; ++index)
     {
-        var item = _items[index];
+        var item = _items[index],
+            modifierMask = [item keyEquivalentModifierMask];
 
         if ([anEvent _triggersKeyEquivalent:[item keyEquivalent] withModifierMask:[item keyEquivalentModifierMask]])
         {
@@ -1003,6 +967,14 @@ var _CPMenuBarVisible               = NO,
 }
 
 //
+/*
+    @ignore
+*/
+- (BOOL)_itemIsHighlighted:(CPMenuItem)aMenuItem
+{
+    return _items[_highlightedIndex] == aMenuItem;
+}
+
 /*
     @ignore
 */
@@ -1018,9 +990,6 @@ var _CPMenuBarVisible               = NO,
 
     if (_highlightedIndex !== CPNotFound)
         [[_items[_highlightedIndex] _menuItemView] highlight:YES];
-
-    if (_highlightedIndex !== CPNotFound && _menuWindow)
-        [_menuWindow._menuView scrollRectToVisible:[[_items[_highlightedIndex] _menuItemView] frame]];
 }
 
 - (void)_setMenuName:(CPString)aName
@@ -1066,61 +1035,6 @@ var _CPMenuBarVisible               = NO,
 
 @end
 
-@implementation CPMenu (CPKeyValueCoding)
-
-- (CPUInteger)countOfItems
-{
-    return [_items count];
-}
-
-- (CPMenuItem)objectInItemsAtIndex:(CPUInteger)anIndex
-{
-    return [_items objectAtIndex:anIndex];
-}
-
-- (CPArray)itemsAtIndexes:(CPIndexSet)indexes
-{
-    return [_items objectsAtIndexes:indexes];
-}
-
-@end
-
-@implementation CPMenu (CPKeyValueObserving)
-
-- (void)insertObject:(CPMenuItem)aMenuItem inItemsAtIndex:(CPUInteger)anIndex
-{
-    var menu = [aMenuItem menu];
-
-    if (menu)
-        if (menu !== self)
-            [CPException raise:CPInternalInconsistencyException reason:@"Attempted to insert item into menu that was already in another menu."];
-        else
-            return;
-
-    [aMenuItem setMenu:self];
-    [_items insertObject:aMenuItem atIndex:anIndex];
-
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidAddItemNotification
-                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
-}
-
-- (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex
-{
-    if (anIndex < 0 || anIndex >= [_items count])
-        return;
-
-    [[_items objectAtIndex:anIndex] setMenu:nil];
-    [_items removeObjectAtIndex:anIndex];
-
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPMenuDidRemoveItemNotification
-                      object:self
-                    userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]];
-}
-
-@end
 
 var CPMenuTitleKey              = @"CPMenuTitleKey",
     CPMenuNameKey               = @"CPMenuNameKey",
@@ -1147,8 +1061,6 @@ var CPMenuTitleKey              = @"CPMenuTitleKey",
 
         _showsStateColumn = ![aCoder containsValueForKey:CPMenuShowsStateColumnKey] || [aCoder decodeBoolForKey:CPMenuShowsStateColumnKey];
 
-        _autoenablesItems = YES;
-
         [self setMinimumWidth:0];
     }
 

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,59 +1,50 @@
-/*
- * _CPMenuBarWindow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import "CPPanel.j"
-@import "_CPMenuManager.j"
+@import "_CPMenuWindow.j"
 
-@class _CPMenuView
 
-@global CPMenuDidAddItemNotification
-@global CPMenuDidChangeItemNotification
-@global CPMenuDidRemoveItemNotification
+var MENUBAR_HEIGHT          = 28.0,
+    MENUBAR_MARGIN          = 10.0,
+    MENUBAR_LEFT_MARGIN     = 10.0,
+    MENUBAR_RIGHT_MARGIN    = 10.0;
+
+var _CPMenuBarWindowBackgroundColor = nil,
+    _CPMenuBarWindowFont            = nil;
 
 @implementation _CPMenuBarWindow : CPPanel
 {
     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 [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
+    return _CPMenuBarWindowFont;
 }
 
 - (id)init
@@ -61,7 +52,7 @@
     // This only shows up in browser land, so don't bother calculating metrics in desktop.
     var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
 
-    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];
+    contentRect.size.height = MENUBAR_HEIGHT;
 
     self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
 
@@ -69,27 +60,27 @@
     {
         [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:[CPFont systemFontSize] + 1]];
+        [_titleField setFont:[CPFont boldSystemFontOfSize:13.0]];
         [_titleField setAlignment:CPCenterTextAlignment];
         [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
-
+        
         [contentView addSubview:_titleField];
     }
-
+    
     return self;
 }
 
@@ -108,7 +99,7 @@
 
     [_titleField setStringValue:aTitle];
     [_titleField sizeToFit];
-
+    
     [self tile];
 }
 
@@ -128,7 +119,12 @@
 - (void)setColor:(CPColor)aColor
 {
     if (!aColor)
-        [[self contentView] setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
+    {
+        if (!_CPMenuBarWindowBackgroundColor)
+            _CPMenuBarWindowBackgroundColor = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[_CPMenuBarWindow class]] pathForResource:@"_CPMenuBarWindow/_CPMenuBarWindowBackground.png"] size:CGSizeMake(1.0, 28.0)]];
+            
+        [[self contentView] setBackgroundColor:_CPMenuBarWindowBackgroundColor];
+    }
     else
         [[self contentView] setBackgroundColor:aColor];
 }
@@ -137,9 +133,9 @@
 {
     if (_textColor == aColor)
         return;
-
+    
     _textColor = aColor;
-
+    
     [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
 }
 
@@ -147,9 +143,9 @@
 {
     if (_titleColor == aColor)
         return;
-
+    
     _titleColor = aColor;
-
+    
     [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
 }
 
@@ -157,9 +153,9 @@
 {
     if (_textShadowColor == aColor)
         return;
-
+    
     _textShadowColor = aColor;
-
+    
     [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
 }
 
@@ -167,9 +163,9 @@
 {
     if (_titleShadowColor == aColor)
         return;
-
+    
     _titleShadowColor = aColor;
-
+    
     [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
 }
 
@@ -177,7 +173,7 @@
 {
     if (_highlightColor == aColor)
         return;
-
+    
     _highlightColor = aColor;
 }
 
@@ -185,7 +181,7 @@
 {
     if (_highlightTextColor == aColor)
         return;
-
+    
     _highlightTextColor = aColor;
 
 //    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateColor:) withObject:_highlightTextColor];
@@ -195,9 +191,9 @@
 {
     if (_highlightTextShadowColor == aColor)
         return;
-
+    
     _highlightTextShadowColor = aColor;
-
+    
 //    [_menuItemViews makeObjectsPerformSelector:@selector(setActivateShadowColor:) withObject:_highlightTextShadowColor];
 }
 
@@ -205,9 +201,9 @@
 {
     if (_menu == aMenu)
         return;
-
+    
     var defaultCenter = [CPNotificationCenter defaultCenter];
-
+    
     if (_menu)
     {
         [defaultCenter
@@ -224,16 +220,16 @@
             removeObserver:self
                       name:CPMenuDidRemoveItemNotification
                     object:_menu];
-
+                    
         var items = [_menu itemArray],
             count = items.length;
-
+        
         while (count--)
             [[items[count] _menuItemView] removeFromSuperview];
     }
 
     _menu = aMenu;
-
+    
     if (_menu)
     {
         [defaultCenter
@@ -241,41 +237,41 @@
               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 (var index = 0; index < count; ++index)
+    
+    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];
 }
 
@@ -286,7 +282,7 @@
 
     [menuItemView setHidden:[menuItem isHidden]];
     [menuItemView synchronizeWithMenuItem];
-
+    
     [self tile];
 }
 
@@ -302,9 +298,9 @@
     [menuItemView setHidden:[menuItem isHidden]];
 
     [menuItemView synchronizeWithMenuItem];
-
+    
     [[self contentView] addSubview:menuItemView];
-
+    
     [self tile];
 }
 
@@ -316,15 +312,10 @@
     [_menuItemViews removeObjectAtIndex:index];
 
     [menuItemView removeFromSuperview];
-
+        
     [self tile];
 }
 
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return YES;
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
@@ -344,7 +335,7 @@
 
 - (CPFont)font
 {
-    [CPFont systemFontOfSize:[CPFont systemFontSize]];
+    [CPFont systemFontOfSize:12.0];
 }
 
 - (void)tile
@@ -352,46 +343,46 @@
     var items = [_menu itemArray],
         index = 0,
         count = items.length,
-
-        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView],
+        
+        x = MENUBAR_LEFT_MARGIN,
         y = 0.0,
         isLeftAligned = YES;
-
+    
     for (; index < count; ++index)
     {
         var item = items[index];
-
+        
         if ([item isSeparatorItem])
         {
-            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
             isLeftAligned = NO;
-
+            
             continue;
         }
-
+        
          if ([item isHidden])
             continue;
 
         var menuItemView = [item _menuItemView],
             frame = [menuItemView frame];
-
+        
         if (isLeftAligned)
         {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
+            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
 
             x += CGRectGetWidth([menuItemView frame]);
         }
         else
         {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
-
+            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), MENUBAR_HEIGHT)];
+     
             x = CGRectGetMinX([menuItemView frame]);
         }
     }
-
+    
     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
@@ -399,7 +390,7 @@
         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)];
     }
@@ -461,3 +452,102 @@
 }
 
 @end
+
+@implementation _CPMenuBarView : _CPMenuView
+{
+}
+
+- (CGRect)rectForItemAtIndex:(int)anIndex
+{
+    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
+}
+
+- (int)itemIndexAtPoint:(CGPoint)aPoint
+{
+    var bounds = [self bounds];
+
+    if (!CGRectContainsPoint(bounds, aPoint))
+        return CPNotFound;
+
+    var x = aPoint.x,
+        low = 0,
+        high = _visibleMenuItemInfos.length - 1;
+
+    while (low <= high)
+    {
+        var middle = FLOOR(low + (high - low) / 2),
+            info = _visibleMenuItemInfos[middle],
+            frame = [info.view frame];
+
+        if (x < CGRectGetMinX(frame))
+            high = middle - 1;
+
+        else if (x > CGRectGetMaxX(frame))
+            low = middle + 1;
+
+        else
+            return info.index;
+   }
+
+   return CPNotFound;
+}
+
+- (void)tile
+{
+    var items = [_menu itemArray],
+        index = 0,
+        count = items.length,
+
+        x = MENUBAR_LEFT_MARGIN,
+        y = 0.0,
+        isLeftAligned = YES;
+
+    for (; index < count; ++index)
+    {
+        var item = items[index];
+        
+        if ([item isSeparatorItem])
+        {
+            x = CGRectGetWidth([self frame]) - MENUBAR_RIGHT_MARGIN;
+            isLeftAligned = NO;
+            
+            continue;
+        }
+        
+         if ([item isHidden])
+            continue;
+
+        var menuItemView = [item _menuItemView],
+            frame = [menuItemView frame];
+        
+        if (isLeftAligned)
+        {
+            [menuItemView setFrameOrigin:CGPointMake(x, (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
+     
+            x += CGRectGetWidth([menuItemView frame]) + MENUBAR_MARGIN;
+        }
+        else
+        {
+            [menuItemView setFrameOrigin:CGPointMake(x - CGRectGetWidth(frame), (MENUBAR_HEIGHT - 1.0 - CGRectGetHeight(frame)) / 2.0)];
+     
+            x = CGRectGetMinX([menuItemView frame]) - MENUBAR_MARGIN;
+        }
+    }
+    
+    var bounds = [[self contentView] bounds],
+        titleFrame = [_titleField frame];
+    
+    if ([_iconImageView isHidden])
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(titleFrame)) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    else
+    {
+        var iconFrame = [_iconImageView frame],
+            iconWidth = CGRectGetWidth(iconFrame),
+            totalWidth = iconWidth + CGRectGetWidth(titleFrame);
+        
+        [_iconImageView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0, (CGRectGetHeight(bounds) - CGRectGetHeight(iconFrame)) / 2.0)];
+        [_titleField setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - totalWidth) / 2.0 + iconWidth, (CGRectGetHeight(bounds) - CGRectGetHeight(titleFrame)) / 2.0)];
+    }
+}
+
+@end

AppKit/CPMenu/_CPMenuManager.j

@@ -1,51 +1,17 @@
-/*
- * _CPMenuManager.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import <Foundation/CPObject.j>
-@import <Foundation/CPNotificationCenter.j>
-
-@import "CPEvent.j"
-@import "CPKeyBinding.j"
-
-@class CPWindow
-@class _CPMenuWindow
 
 
-@global CPApp
-@global CPMenuDidEndTrackingNotification
-@global _CPMenuWindowMenuBarBackgroundStyle
-@global _CPMenuWindowPopUpBackgroundStyle
-
-_CPMenuManagerScrollingStateUp      = -1;
-_CPMenuManagerScrollingStateDown    = 1;
+_CPMenuManagerScrollingStateUp      = -1,
+_CPMenuManagerScrollingStateDown    = 1,
 _CPMenuManagerScrollingStateNone    = 0;
 
-var STICKY_TIME_INTERVAL            = 0.5,
-    SharedMenuManager               = nil;
+var STICKY_TIME_INTERVAL        = 500;
+
+var SharedMenuManager = nil;
 
 @implementation _CPMenuManager: CPObject
 {
     CPTimeInterval      _startTime;
-    BOOL                _mouseWasDragged;
     int                 _scrollingState;
     CGPoint             _lastGlobalLocation;
 
@@ -55,13 +21,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
     CPMutableArray      _menuContainerStack;
 
     Function            _trackingCallback;
-
-    CPString            _keyBuffer;
-
-    CPMenuItem          _previousActiveItem;
-    int                 _showTimerID;
-
-    int                 _menuBarButtonItemIndex;
 }
 
 + (_CPMenuManager)sharedMenuManager
@@ -77,7 +36,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
     if (SharedMenuManager)
         return SharedMenuManager;
 
-    return [super init];
+    return [super init];    
 }
 
 - (id)trackingMenuContainer
@@ -97,12 +56,9 @@ var STICKY_TIME_INTERVAL            = 0.5,
 {
     var menu = [aMenuContainer menu];
 
-    if ([menu numberOfItems] <= 0)
-        return;
-
     CPApp._activeMenu = menu;
 
-    _startTime = [anEvent timestamp];
+    _startTime = [anEvent timestamp];//new Date();
     _scrollingState = _CPMenuManagerScrollingStateNone;
 
     _constraintRect = aRect;
@@ -111,24 +67,22 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
     if (menu === [CPApp mainMenu])
     {
-        var globalLocation = [anEvent globalLocation],
+        var globalLocation = [anEvent globalLocation];
 
-            // Find which menu window the mouse is currently on top of
-            menuLocation = [aMenuContainer convertGlobalToBase:globalLocation],
+        // Find which menu window the mouse is currently on top of
+        var menuLocation = [aMenuContainer convertGlobalToBase:globalLocation];
 
-            // Find out the item the mouse is currently on top of
-            activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
+        // Find out the item the mouse is currently on top of
+        var activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
             activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
 
         _menuBarButtonItemIndex = activeItemIndex;
-//        _menuBarButtonMenuContainer = aMenuContainer;
+        _menuBarButtonMenuContainer = aMenuContainer;
 
         if ([activeItem _isMenuBarButton])
             return [self trackMenuBarButtonEvent:anEvent];
     }
 
-    _mouseWasDragged = NO;
-
     [self trackEvent:anEvent];
 }
 
@@ -141,58 +95,23 @@ var STICKY_TIME_INTERVAL            = 0.5,
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
-
-    if (type === CPKeyDown)
-    {
-        var menu = trackingMenu,
-            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;
-    }
+    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
 
     // Periodic events don't have a valid location.
     var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
 
-    if (!globalLocation)
-        return;
+    // Remember this for the next periodic event.
+    _lastGlobalLocation = globalLocation;
 
     // Find which menu window the mouse is currently on top of
     var activeMenuContainer = [self menuContainerForPoint:globalLocation],
         activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
+        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation];
 
-        // Find out the item the mouse is currently on top of
-        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
+    // Find out the item the mouse is currently on top of
+    var activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
         activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
 
-    if (_keyBuffer)
-    {
-        if (([anEvent timestamp] - _startTime) > (STICKY_TIME_INTERVAL + [activeMenu numberOfItems] / 2))
-            [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:YES];
-
-        if (type === CPPeriodic)
-            return;
-    }
-
-    // unhighlight when mouse is moved off the menu
-    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
-                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
-        [activeMenu _highlightItemAtIndex:CPNotFound];
-
-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
-
     // If the item isn't enabled its as if we clicked on nothing.
     if (![activeItem isEnabled] || [activeItem _isMenuBarButton])
     {
@@ -202,13 +121,11 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
     var mouseOverMenuView = [activeItem view];
 
-    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
-        [activeMenuContainer scrollByDelta:[anEvent deltaY]];
-
     if (type === CPPeriodic)
     {
         if (_scrollingState === _CPMenuManagerScrollingStateUp)
             [activeMenuContainer scrollUp];
+
         else if (_scrollingState === _CPMenuManagerScrollingStateDown)
             [activeMenuContainer scrollDown];
     }
@@ -218,31 +135,29 @@ var STICKY_TIME_INTERVAL            = 0.5,
     {
         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])
+        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]]];
+            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
     {
@@ -251,15 +166,11 @@ var STICKY_TIME_INTERVAL            = 0.5,
             [_lastMouseOverMenuView mouseExited:anEvent];
             _lastMouseOverMenuView = nil;
         }
-
-        if (activeItemIndex != CPNotFound)
-            [activeMenu _highlightItemAtIndex:activeItemIndex];
-
-        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
+        
+        [activeMenu _highlightItemAtIndex:activeItemIndex];
+        
+        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown)
         {
-            if (type === CPLeftMouseDragged)
-                _mouseWasDragged = YES;
-
             var oldScrollingState = _scrollingState;
 
             _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
@@ -268,89 +179,34 @@ var STICKY_TIME_INTERVAL            = 0.5,
             {
                 if (_scrollingState === _CPMenuManagerScrollingStateNone)
                     [CPEvent stopPeriodicEvents];
+            
                 else if (oldScrollingState === _CPMenuManagerScrollingStateNone)
                     [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
             }
         }
-        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
-        {
-            /*
-                There are a few possibilites:
-
-                1. The user clicks and releases without dragging within the sticky time.
-                   This is considered a regular mouse click and not a drag. In this case
-                   we allow the user to track the menu by moving the mouse. The next
-                   mouse up will end tracking.
-
-                2. The user clicks and releases without dragging after the sticky time.
-                   This is considered a drag and release and tracking ends.
-
-                3. The user clicks, drags and then releases. Tracking ends.
-            */
-            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            {
-                /*
-                    Close the menu if:
-
-                    1. The mouse was dragged.
-                    2. The mouse is released in the menubar.
-                    3. The current item has a submenu with a custom action.
-                */
-                if (_mouseWasDragged ||
-                    [activeMenuContainer isMenuBar] ||
-                    [activeItem action] !== @selector(submenuAction:))
-                {
-                    [trackingMenu cancelTracking];
-                }
-            }
-        }
-    }
-
-    // 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;
+        else if (type === CPLeftMouseUp && ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
+            [trackingMenu cancelTracking];
     }
 
     // If the item has a submenu, show it.
-    if ([activeItem hasSubmenu]) // && [activeItem action] === @selector(submenuAction:))
+    if ([activeItem hasSubmenu])// && [activeItem action] === @selector(submenuAction:))
     {
-        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
-            newMenuOrigin;
+        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex];
 
         if ([activeMenuContainer isMenuBar])
-            newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
+            var newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
         else
-            newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
+            var 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];
-        }
+        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
     }
 
-    // This handles both the case where we've moved away from the menu, and where
+    // This handles both the case where we've moved away from the menu, and where 
     // we've moved to an item without a submenu.
     else
         [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
-
-    _previousActiveItem = activeItem;
 }
 
 - (void)trackMenuBarButtonEvent:(CPEvent)anEvent
@@ -360,15 +216,16 @@ var STICKY_TIME_INTERVAL            = 0.5,
     if (type === CPAppKitDefined)
         return [self completeTracking];
 
-    var globalLocation = [anEvent globalLocation],
+    var globalLocation = [anEvent globalLocation];
 
-        // Find which menu window the mouse is currently on top of
-        menu = [self trackingMenu],
+    // Find which menu window the mouse is currently on top of
+    var menu = [self trackingMenu],
         trackingMenuContainer = [self trackingMenuContainer],
         menuLocation = [trackingMenuContainer convertGlobalToBase:globalLocation];
 
     if ([trackingMenuContainer itemIndexAtPoint:menuLocation] === _menuBarButtonItemIndex)
         [menu _highlightItemAtIndex:_menuBarButtonItemIndex];
+
     else
         [menu _highlightItemAtIndex:CPNotFound];
 
@@ -385,15 +242,23 @@ var STICKY_TIME_INTERVAL            = 0.5,
     // Stop all periodic events at this point.
     [CPEvent stopPeriodicEvents];
 
+    // Get the highlighted item from the original menu.
+    var highlightedItem = [trackingMenu highlightedItem];
+
     // Hide all submenus.
     [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-    [trackingMenu _menuDidClose];
+
+    var delegate = [trackingMenu delegate];
+
+    if ([delegate respondsToSelector:@selector(menuDidClose:)])
+        [delegate menuDidClose:trackingMenu];
 
     if (_trackingCallback)
         _trackingCallback([self trackingMenuContainer], trackingMenu);
 
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidEndTrackingNotification
-                                                        object:trackingMenu];
+    [[CPNotificationCenter defaultCenter]
+        postNotificationName:CPMenuDidEndTrackingNotification
+                      object:trackingMenu];
 
     CPApp._activeMenu = nil;
 }
@@ -456,8 +321,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
     var count = _menuContainerStack.length,
         index = count;
 
-    [newMenu _menuWillOpen];
-
     // Hide all menus up to the base menu...
     while (index--)
     {
@@ -469,7 +332,7 @@ var STICKY_TIME_INTERVAL            = 0.5,
             break;
 
         // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu) //&& [menu supermenu] === baseMenu)
+        if (menu === newMenu)//&& [menu supermenu] === baseMenu)
             return [newMenu _highlightItemAtIndex:CPNotFound];
 
         [menuContainer orderOut:self];
@@ -477,8 +340,6 @@ var STICKY_TIME_INTERVAL            = 0.5,
 
         [_CPMenuWindow poolMenuWindow:menuContainer];
         [_menuContainerStack removeObjectAtIndex:index];
-
-        [menu _menuDidClose];
     }
 
     if (!newMenu)
@@ -497,243 +358,10 @@ var STICKY_TIME_INTERVAL            = 0.5,
     if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
         [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
     else
-        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
-
+        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];        
+    
     [menuWindow setFrameOrigin:aGlobalLocation];
     [menuWindow orderFront:self];
 }
 
-/// handle keyboard navigation
-- (void)interpretKeyEvent:(CPEvent)anEvent forMenu:(CPMenu)menu
-{
-    var modifierFlags = [anEvent modifierFlags],
-        character = [anEvent charactersIgnoringModifiers],
-        selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
-
-    if (selectorNames)
-    {
-        var iter = [selectorNames objectEnumerator],
-            obj;
-
-        while ((obj = [iter nextObject]) !== nil)
-        {
-            var aSelector = CPSelectorFromString(obj);
-
-            if ([self respondsToSelector:aSelector])
-                [self performSelector:aSelector withObject:menu];
-        }
-    }
-    else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
-    {
-        if (!_keyBuffer)
-        {
-            _startTime = [anEvent timestamp];
-            _keyBuffer = character;
-
-            [CPEvent stopPeriodicEvents];
-            [CPEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
-        }
-        else
-            _keyBuffer += character;
-
-        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu clearBuffer:NO];
-        _lastGlobalLocation = Nil;
-    }
-}
-
-- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu clearBuffer:(BOOL)shouldClear
-{
-    var iter = [[menu itemArray] objectEnumerator],
-        obj;
-
-    while ((obj = [iter nextObject]) !== nil)
-    {
-        if ([obj isHidden] || ![obj isEnabled])
-            continue;
-
-        if ([[[obj title] commonPrefixWithString:characters options:CPCaseInsensitiveSearch] length] == [characters length])
-        {
-            [menu _highlightItemAtIndex:iter._index];
-            break;
-        }
-    }
-
-    if (shouldClear)
-    {
-        [CPEvent stopPeriodicEvents];
-        _keyBuffer = Nil;
-    }
-    else
-        _startTime = [CPEvent currentTimestamp];
-}
-
-- (void)scrollToBeginningOfDocument:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:0];
-}
-
-- (void)scrollToEndOfDocument:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-}
-
-- (void)scrollPageDown:(CPMenu)menu
-{
-    var menuWindow = menu._menuWindow,
-        menuClipView = menuWindow._menuClipView,
-        bottom = [menuClipView bounds].size.height,
-        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
-        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
-        current = [menu indexOfItem:[menu highlightedItem]];
-
-    if (current == CPNotFound)
-    {
-        [menu _highlightItemAtIndex:0];
-        return;
-    }
-
-    var next = current + (last - first);
-
-    if (next < [menu numberOfItems])
-        [menu _highlightItemAtIndex:next];
-    else
-        [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveDown:menu];
-}
-
-- (void)scrollPageUp:(CPMenu)menu
-{
-    var menuWindow = menu._menuWindow,
-        menuClipView = menuWindow._menuClipView,
-        bottom = [menuClipView bounds].size.height,
-        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
-        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
-        current = [menu indexOfItem:[menu highlightedItem]];
-
-    if (current == CPNotFound)
-    {
-        [menu _highlightItemAtIndex:0];
-        return;
-    }
-
-    var next = current - (last - first);
-
-    if (next < 0)
-        [menu _highlightItemAtIndex:0];
-    else
-        [menu _highlightItemAtIndex:next];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveUp:menu];
-}
-
-- (void)moveLeft:(CPMenu)menu
-{
-    if ([menu supermenu])
-    {
-        if ([menu supermenu] == [CPApp mainMenu])
-        {
-            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
-            [self moveUp:[CPApp mainMenu]];
-
-            var activeItem = [[CPApp mainMenu] highlightedItem],
-                menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
-
-            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
-        }
-        else
-            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
-    }
-}
-
-- (void)moveRight:(CPMenu)menu
-{
-    var activeItem = [menu highlightedItem];
-
-    if ([activeItem hasSubmenu])
-    {
-        if ([[activeItem submenu] numberOfItems])
-        {
-            var activeItemIndex = [menu indexOfItem:activeItem],
-                activeMenuContainer = menu._menuWindow,
-                activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
-                newMenuOrigin;
-
-            if ([activeMenuContainer isMenuBar])
-                newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
-            else
-                newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
-
-            newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
-
-            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
-            [self moveDown:[activeItem submenu]];
-        }
-    }
-    else if ([self trackingMenu] == [CPApp mainMenu])
-    {
-        [self showMenu:nil fromMenu:menu atPoint:CGPointMakeZero()];
-        [self moveDown:[CPApp mainMenu]];
-
-        var activeItem = [[CPApp mainMenu] highlightedItem],
-            menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
-
-        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
-    }
-}
-
-- (void)moveDown:(CPMenu)menu
-{
-    var index = menu._highlightedIndex + 1;
-
-    if (index < [menu numberOfItems])
-    {
-        [menu _highlightItemAtIndex:index];
-
-        var item = [menu highlightedItem];
-
-        if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-            [self moveDown:menu];
-    }
-}
-
-- (void)moveUp:(CPMenu)menu
-{
-    var index = menu._highlightedIndex - 1;
-
-    if (index < 0)
-    {
-        if (index != CPNotFound)
-            [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-        return;
-    }
-    [menu _highlightItemAtIndex:index];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveUp:menu];
-}
-
-- (void)insertNewline:(CPMenu)menu
-{
-    if ([[menu highlightedItem] hasSubmenu])
-        [self moveRight:menu];
-    else
-        [menu cancelTracking]
-}
-
-- (void)cancelOperation:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:CPNotFound];
-    [CPEvent stopPeriodicEvents];
-    [[self trackingMenu] cancelTracking];
-}
-
 @end

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,40 +1,23 @@
-/*
- * _CPMenuWindow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPClipView.j"
-@import "CPImageView.j"
 @import "CPWindow.j"
-@import "_CPMenuManager.j"
+
 
 var _CPMenuWindowPool                       = [],
     _CPMenuWindowPoolCapacity               = 5,
-
+    
     _CPMenuWindowBackgroundColors           = [];
-
+    
 _CPMenuWindowMenuBarBackgroundStyle         = 0;
 _CPMenuWindowPopUpBackgroundStyle           = 1;
 _CPMenuWindowAttachedMenuBackgroundStyle    = 2;
 
-var STICKY_TIME_INTERVAL        = 500;
+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
@@ -43,10 +26,10 @@ var STICKY_TIME_INTERVAL        = 500;
 {
     _CPMenuView         _menuView;
     CPClipView          _menuClipView;
-
+    
     CPImageView         _moreAboveView;
     CPImageView         _moreBelowView;
-
+    
     CGRect              _unconstrainedFrame;
     CGRect              _constraintRect;
 }
@@ -80,6 +63,17 @@ var STICKY_TIME_INTERVAL        = 500;
     _CPMenuWindowPool.push(aMenuWindow);
 }
 
++ (void)initialize
+{
+    if (self != [_CPMenuWindow class])
+        return;
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    _CPMenuWindowMoreAboveImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreAbove.png"] size:CGSizeMake(38.0, 18.0)];
+    _CPMenuWindowMoreBelowImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowMoreBelow.png"] size:CGSizeMake(38.0, 18.0)];
+}
+
 - (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
 {
     _constraintRect = _CGRectMakeZero();
@@ -95,35 +89,37 @@ var STICKY_TIME_INTERVAL        = 500;
         [self setAcceptsMouseMovedEvents:YES];
 
         var contentView = [self contentView];
-
+        
         _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
-
-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake([_menuView valueForThemeAttribute:@"menu-window-margin-inset"].left, [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top, 0.0, 0.0)];
+        
+        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, 0.0, 0.0)];
         [_menuClipView setDocumentView:_menuView];
-
+        
         [contentView addSubview:_menuClipView];
-
+        
         _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-        [_moreAboveView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-above-image"]];
-        [_moreAboveView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-above-image"] size]];
-
+        
+        [_moreAboveView setImage:_CPMenuWindowMoreAboveImage];
+        [_moreAboveView setFrameSize:[_CPMenuWindowMoreAboveImage size]];
+        
         [contentView addSubview:_moreAboveView];
-
+        
         _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-        [_moreBelowView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-below-image"]];
-        [_moreBelowView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-below-image"] size]];
-
+    
+        [_moreBelowView setImage:_CPMenuWindowMoreBelowImage];
+        [_moreBelowView setFrameSize:[_CPMenuWindowMoreBelowImage size]];
+        
         [contentView addSubview:_moreBelowView];
-    }
 
+        [self setShadowStyle:CPWindowShadowStyleMenu];
+    }
+    
     return self;
 }
 
 + (float)_standardLeftMargin
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
+    return LEFT_MARGIN;
 }
 
 - (void)setFont:(CPFont)aFont
@@ -139,17 +135,43 @@ var STICKY_TIME_INTERVAL        = 500;
 + (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
 {
     var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
-
+    
     if (!color)
     {
         var bundle = [CPBundle bundleForClass:[self class]];
 
         if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];
-
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded0.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow1.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded2.png"] size:CGSizeMake(4.0, 4.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
+        
         else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];
-
+            color = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+                [
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 0.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 0.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow3.png"] size:CGSizeMake(4.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow4.png"] size:CGSizeMake(1.0, 1.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow5.png"] size:CGSizeMake(4.0, 1.0)],
+                    
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded6.png"] size:CGSizeMake(4.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindow7.png"] size:CGSizeMake(1.0, 4.0)],
+                    [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"_CPMenuWindow/_CPMenuWindowRounded8.png"] size:CGSizeMake(4.0, 4.0)]
+                ]]];
+                
         _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
     }
 
@@ -165,14 +187,13 @@ var STICKY_TIME_INTERVAL        = 500;
 {
     [aMenu _setMenuWindow:self];
     [_menuView setMenu:aMenu];
-
-    var menuViewSize = [_menuView frame].size,
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];
-
-    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];
-
+    
+    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(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
+    [_menuClipView setFrame:CGRectMake(LEFT_MARGIN, TOP_MARGIN, menuViewSize.width, menuViewSize.height)];
 }
 
 - (void)setMinWidth:(float)aWidth
@@ -187,16 +208,10 @@ var STICKY_TIME_INTERVAL        = 500;
     return [_menuView menu];
 }
 
-- (_CPMenuView)_menuView
-{
-    return _menuView;
-}
-
 - (void)orderFront:(id)aSender
 {
-    [[self menu] update];
     [self setFrame:_unconstrainedFrame];
-
+    
     [super orderFront:aSender];
 }
 
@@ -230,9 +245,7 @@ var STICKY_TIME_INTERVAL        = 500;
     // FIXME: This gets called far too often.
     _unconstrainedFrame = _CGRectMakeCopy(aFrame);
 
-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
-        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];
+    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect);
 
     // We don't want to simply intersect the visible frame and the unconstrained frame.
     // We should be allowing as much of the width to fit as possible (pushing back and forward).
@@ -251,42 +264,37 @@ var STICKY_TIME_INTERVAL        = 500;
     [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
 
     // This needs to happen before changing the frame.
-    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + marginInset.left, CGRectGetMinY(aFrame) + marginInset.top),
-        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + marginInset.top,
-        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - marginInset.bottom,
-
-        topMargin = marginInset.top,
-        bottomMargin = marginInset.bottom,
+    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 += scrollIndicatorHeight;
-
+        topMargin += SCROLL_INDICATOR_HEIGHT;
+    
         var frame = [_moreAboveView frame];
-
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
+        
+        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (TOP_MARGIN + SCROLL_INDICATOR_HEIGHT - CGRectGetHeight(frame)) / 2.0)];
     }
 
     [_moreAboveView setHidden:!moreAbove];
 
     if (moreBelow)
     {
-        bottomMargin += scrollIndicatorHeight;
-
-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
+        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 = marginInset.left;
-    clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
-    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;
+    var clipFrame = CGRectMake(LEFT_MARGIN, topMargin, CGRectGetWidth(constrainedFrame) - LEFT_MARGIN - RIGHT_MARGIN, CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin)
 
     [_menuClipView setFrame:clipFrame];
     [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
@@ -339,29 +347,24 @@ var STICKY_TIME_INTERVAL        = 500;
     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];
+    if (CGRectGetMinY(_unconstrainedFrame) >= CGRectGetMinY(_constraintRect))
+        return;
+
+    _unconstrainedFrame.origin.y += 10;
+
+    [self setFrame:_unconstrainedFrame];
 }
 
 - (void)scrollDown
 {
-    [self scrollByDelta:10.0];
+    if (CGRectGetMaxY(_unconstrainedFrame) <= CGRectGetHeight(_constraintRect))
+        return;
+
+    _unconstrainedFrame.origin.y -= 10;
+
+    [self setFrame:_unconstrainedFrame];
 }
 
 @end
@@ -381,15 +384,16 @@ var STICKY_TIME_INTERVAL        = 500;
 - (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
 {
     var frame = [self frame];
-    if (!CGRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
+
+    if (![self canScroll])
         return _CPMenuManagerScrollingStateNone;
 
     // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreAboveView isHidden])
+    if (aGlobalLocation.y < CGRectGetMinY(frame) + TOP_MARGIN + SCROLL_INDICATOR_HEIGHT)
         return _CPMenuManagerScrollingStateUp;
 
     // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
+    if (aGlobalLocation.y > CGRectGetMaxY(frame) - BOTTOM_MARGIN - SCROLL_INDICATOR_HEIGHT)
         return _CPMenuManagerScrollingStateDown;
 
     return _CPMenuManagerScrollingStateNone;
@@ -397,7 +401,7 @@ var STICKY_TIME_INTERVAL        = 500;
 
 - (float)deltaYForItemAtIndex:(int)anIndex
 {
-    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
+    return TOP_MARGIN + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
 }
 
 - (CGPoint)rectForItemAtIndex:(int)anIndex
@@ -424,53 +428,10 @@ var STICKY_TIME_INTERVAL        = 500;
 {
     CPArray _menuItemViews;
     CPArray _visibleMenuItemInfos;
-
+    
     CPFont  _font @accessors(property=font);
 }
 
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-view";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[    [CPNull null], [CPNull null], [CPNull null], [CPNull null], CGInsetMake(5.0, 1.0, 1.0, 5.0), 16.0,
-                                                    [CPNull null], [CPNull null], [CPNull null], 30.0, 10.0, 10.0, 10.0,
-                                                    [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 28.0, [CPNull null], 1.0,
-                                                    [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[    @"menu-window-more-above-image",
-                                                    @"menu-window-more-below-image",
-                                                    @"menu-window-pop-up-background-style-color",
-                                                    @"menu-window-menu-bar-background-style-color",
-                                                    @"menu-window-margin-inset",
-                                                    @"menu-window-scroll-indicator-height",
-
-                                                    @"menu-bar-window-background-color",
-                                                    @"menu-bar-window-background-selected-color",
-                                                    @"menu-bar-window-font",
-                                                    @"menu-bar-window-height",
-                                                    @"menu-bar-window-margin",
-                                                    @"menu-bar-window-left-margin",
-                                                    @"menu-bar-window-right-margin",
-
-                                                    @"menu-bar-text-color",
-                                                    @"menu-bar-title-color",
-                                                    @"menu-bar-text-shadow-color",
-                                                    @"menu-bar-title-shadow-color",
-                                                    @"menu-bar-highlight-color",
-                                                    @"menu-bar-highlight-text-color",
-                                                    @"menu-bar-highlight-text-shadow-color",
-                                                    @"menu-bar-height",
-                                                    @"menu-bar-icon-image",
-                                                    @"menu-bar-icon-image-alpha-value",
-
-                                                    @"menu-general-icon-new",
-                                                    @"menu-general-icon-save",
-                                                    @"menu-general-icon-open"]];
-}
-
 - (unsigned)numberOfUnhiddenItems
 {
     return _visibleMenuItemInfos.length;
@@ -501,7 +462,7 @@ var STICKY_TIME_INTERVAL        = 500;
     while (low <= high)
     {
         var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle],
+            info = _visibleMenuItemInfos[middle]
             frame = [info.view frame];
 
         if (y < CGRectGetMinY(frame))
@@ -519,7 +480,7 @@ var STICKY_TIME_INTERVAL        = 500;
 
 - (void)tile
 {
-    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];   
 
     _menuItemViews = [];
     _visibleMenuItemInfos = [];
@@ -539,15 +500,15 @@ var STICKY_TIME_INTERVAL        = 500;
     for (; index < count; ++index)
     {
         var item = items[index],
-            view = [item _menuItemView];
-
+            view = [item _menuItemView];        
+        
         _menuItemViews.push(view);
-
+        
         if ([item isHidden])
             continue;
 
         _visibleMenuItemInfos.push({ view:view, index:index });
-
+        
         [view setFont:_font];
         [view setShowsStateColumn:showsStateColumn];
         [view synchronizeWithMenuItem];

AppKit/CPMenuItem/CPMenuItem.j

@@ -25,33 +25,10 @@
 @import <Foundation/CPString.j>
 
 @import "CPImage.j"
-@import "CPText.j"
+@import "CPMenu.j"
 @import "CPView.j"
 @import "_CPMenuItemView.j"
 
-@class CPMenu
-
-@global CPApp
-
-var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjectsAndKeys:
-        "\u238B", CPEscapeFunctionKey,
-        "\u21E5", CPTabCharacter,
-        "\u21E4", CPBackTabCharacter,
-        "\u2423", CPSpaceFunctionKey,
-        "\u23CE", CPCarriageReturnCharacter,
-        "\u232B", CPBackspaceCharacter,
-        "\u232B", CPDeleteFunctionKey,
-        "\u2326", CPDeleteCharacter,
-        "\u21F1", CPHomeFunctionKey,
-        "\u21F2", CPEndFunctionKey,
-        "\u21DE", CPPageUpFunctionKey,
-        "\u21DF", CPPageDownFunctionKey,
-        "\u2191", CPUpArrowFunctionKey,
-        "\u2193", CPDownArrowFunctionKey,
-        "\u2190", CPLeftArrowFunctionKey,
-        "\u2192", CPRightArrowFunctionKey,
-        "\u2327", CPClearDisplayFunctionKey
-    ];
 
 /*!
     @ingroup appkit
@@ -100,8 +77,6 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjec
     id              _representedObject;
     CPView          _view;
 
-    int             _changeCount;
-
     _CPMenuItemView _menuItemView;
 }
 
@@ -123,14 +98,12 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjec
 
     if (self)
     {
-        _changeCount = 0;
         _isSeparator = NO;
 
         _title = aTitle;
         _action = anAction;
 
         _isEnabled = YES;
-        _isHidden = NO;
 
         _tag = 0;
         _state = CPOffState;
@@ -153,12 +126,13 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjec
 */
 - (void)setEnabled:(BOOL)isEnabled
 {
-    if (_isEnabled === isEnabled)
+    if ([_menu autoenablesItems])
         return;
 
-    _isEnabled = !!isEnabled;
+    _isEnabled = isEnabled;
 
     [_menuItemView setDirty];
+
     [_menu itemChanged:self];
 }
 
@@ -285,7 +259,7 @@ var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjec
 */
 - (void)setFont:(CPFont)aFont
 {
-    if ([_font isEqual:aFont])
+    if (_font == aFont)
         return;
 
     _font = aFont;
@@ -471,7 +445,7 @@ CPOffState
     return _mixedStateImage;
 }
 
-// Managing Submenus
+// Managing Subemenus
 /*!
     Sets the submenu for this item
     @param aMenu the submenu
@@ -485,14 +459,13 @@ CPOffState
 
     if (supermenu)
         [CPException raise:CPInvalidArgumentException
-           reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
+		   reason: @"Can't add submenu \"" + [aMenu title] + "\" to item \"" + [self title] + "\", because it is already submenu of \"" + [[aMenu supermenu] title] + "\""];
 
     _submenu = aMenu;
 
     if (_submenu)
     {
         [_submenu setSupermenu:_menu];
-        [_submenu setTitle:[self title]]
 
         [self setTarget:_menu];
         [self setAction:@selector(submenuAction:)];
@@ -619,25 +592,22 @@ CPControlKeyMask
         return @"";
 
     var string = _keyEquivalent.toUpperCase(),
-        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask ||
+        needsShift = _keyEquivalentModifierMask & CPShiftKeyMask || 
                     (string === _keyEquivalent && _keyEquivalent.toLowerCase() !== _keyEquivalent.toUpperCase());
 
-    if ([CPMenuItemStringRepresentationDictionary objectForKey:string])
-        string = [CPMenuItemStringRepresentationDictionary objectForKey:string];
-
     if (CPBrowserIsOperatingSystem(CPMacOperatingSystem))
     {
         if (_keyEquivalentModifierMask & CPCommandKeyMask)
-            string = "\u2318" + string;
+            string = "⌘" + string;
 
         if (needsShift)
-            string = "\u21E7" + string;
+            string = "⇧" + string;
 
         if (_keyEquivalentModifierMask & CPAlternateKeyMask)
-            string = "\u2325" + string;
+            string = "⌥" + string;
 
         if (_keyEquivalentModifierMask & CPControlKeyMask)
-            string = "\u2303" + string;
+            string = "^" + string;
     }
     else
     {
@@ -674,7 +644,7 @@ CPControlKeyMask
 }
 
 /*!
-    Sets the title of the menu item and the mnemonic character. The mnemonic character should be preceded by an '&'.
+    Sets the title of the menu item and the mnemonic character. The mnemonic chracter should be preceded by an '&'.
     @param aTitle the title string with a denoted mnemonic
 */
 - (void)setTitleWithMnemonicLocation:(CPString)aTitle
@@ -821,12 +791,12 @@ CPControlKeyMask
 - (id)copy
 {
     var item = [[CPMenuItem alloc] init];
-
+    
     // No point in going through accessors and doing lots of unnecessary state checking/updating
     item._isSeparator = _isSeparator;
-
+    
     [item setTitle:_title];
-    [item setFont:_font];
+    [item setFont:_font];        
     [item setTarget:_target];
     [item setAction:_action];
     [item setEnabled:_isEnabled];
@@ -845,7 +815,7 @@ CPControlKeyMask
     [item setIndentationLevel:_indentationLevel];
     [item setToolTip:_toolTip];
     [item setRepresentedObject:_representedObject];
-
+    
     return item;
 }
 
@@ -877,11 +847,6 @@ CPControlKeyMask
     return ![self submenu] && [self menu] === [CPApp mainMenu];
 }
 
-- (CPString)description
-{
-    return [super description] + @" target: " + [self target] + @" action: " + CPStringFromSelector([self action]);
-}
-
 @end
 
 var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
@@ -925,7 +890,6 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
 
     if (self)
     {
-        _changeCount = 0;
         _isSeparator = [aCoder containsValueForKey:CPMenuItemIsSeparatorKey] && [aCoder decodeBoolForKey:CPMenuItemIsSeparatorKey];
 
         _title = [aCoder decodeObjectForKey:CPMenuItemTitleKey];
@@ -936,33 +900,34 @@ var CPMenuItemIsSeparatorKey                = @"CPMenuItemIsSeparatorKey",
         _action = [aCoder decodeObjectForKey:CPMenuItemActionKey];
 
         _isEnabled = DEFAULT_VALUE(CPMenuItemIsEnabledKey, YES);
-        _isHidden = [aCoder decodeBoolForKey:CPMenuItemIsHiddenKey];
-        _tag = [aCoder decodeIntForKey:CPMenuItemTagKey];
-        _state = [aCoder decodeIntForKey:CPMenuItemStateKey];
+        _isHidden = DEFAULT_VALUE(CPMenuItemIsHiddenKey, NO);
+        _tag = DEFAULT_VALUE(CPMenuItemTagKey, 0);
+        _state = DEFAULT_VALUE(CPMenuItemStateKey, CPOffState);
 
-        _image = [aCoder decodeObjectForKey:CPMenuItemImageKey];
-        _alternateImage = [aCoder decodeObjectForKey:CPMenuItemAlternateImageKey];
+        _image = DEFAULT_VALUE(CPMenuItemImageKey, nil);
+        _alternateImage = DEFAULT_VALUE(CPMenuItemAlternateImageKey, nil);
 //    CPImage         _onStateImage;
 //    CPImage         _offStateImage;
 //    CPImage         _mixedStateImage;
 
         // This order matters because setSubmenu: needs _menu to be around.
-        _menu = [aCoder decodeObjectForKey:CPMenuItemMenuKey];
-        [self setSubmenu:[aCoder decodeObjectForKey:CPMenuItemSubmenuKey]];
+        _menu = DEFAULT_VALUE(CPMenuItemMenuKey, nil);
+        [self setSubmenu:DEFAULT_VALUE(CPMenuItemSubmenuKey, nil)];
 
         _keyEquivalent = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentKey] || @"";
-        _keyEquivalentModifierMask = [aCoder decodeIntForKey:CPMenuItemKeyEquivalentModifierMaskKey];
+        _keyEquivalentModifierMask = [aCoder decodeObjectForKey:CPMenuItemKeyEquivalentModifierMaskKey] || 0;
 
 //    int             _mnemonicLocation;
 
 //    BOOL            _isAlternate;
 
-        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey]];
+        // Default is 0.
+        [self setIndentationLevel:[aCoder decodeIntForKey:CPMenuItemIndentationLevelKey] || 0];
 
 //    CPString        _toolTip;
 
-        _representedObject = [aCoder decodeObjectForKey:CPMenuItemRepresentedObjectKey];
-        _view = [aCoder decodeObjectForKey:CPMenuItemViewKey];
+        _representedObject = DEFAULT_VALUE(CPMenuItemRepresentedObjectKey, nil);
+        _view = DEFAULT_VALUE(CPMenuItemViewKey, nil);
     }
 
     return self;

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,30 +1,17 @@
-/*
- * _CPMenuItemMenuBarView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
+@import "CPView.j"
 
-@import "CPControl.j"
-@import "_CPImageAndTextView.j"
 
-@class _CPMenuBarWindow
-@class _CPMenuView
+var HORIZONTAL_MARGIN           = 8.0,
+    SUBMENU_INDICATOR_MARGIN    = 3.0,
+    VERTICAL_MARGIN             = 4.0;
+
+var SelectionColor                              = nil,
+    SUBMENU_INDICATOR_COLOR                     = nil,
+    _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+    
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
 
 @implementation _CPMenuItemMenuBarView : CPView
 {
@@ -40,20 +27,28 @@
     CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-bar-view";
-}
+    if (self !== [_CPMenuItemMenuBarView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], 8.0, 3.0, 4.0]
-                                       forKeys:[    @"submenu-indicator-color",
-                                                    @"menu-item-selection-color",
-                                                    @"menu-item-text-shadow-color",
-                                                    @"horizontal-margin",
-                                                    @"submenu-indicator-margin",
-                                                    @"vertical-margin"]];
+    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
@@ -67,7 +62,7 @@
 
     if (self)
     {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];
+        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(HORIZONTAL_MARGIN, 0.0, 0.0, 0.0)];
 
         [_imageAndTextView setImagePosition:CPImageLeft];
         [_imageAndTextView setImageOffset:3.0];
@@ -106,7 +101,7 @@
 
 - (void)update
 {
-    var x = [self valueForThemeAttribute:@"horizontal-margin"],
+    var x = HORIZONTAL_MARGIN,
         height = 0.0;
 
     [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
@@ -134,7 +129,7 @@
 
         var submenuViewFrame = [_submenuIndicatorView frame];
 
-        submenuViewFrame.origin.x = x + [self valueForThemeAttribute:@"submenu-indicator-margin"];
+        submenuViewFrame.origin.x = x + SUBMENU_INDICATOR_MARGIN;
 
         x = CGRectGetMaxX(submenuViewFrame);
         height = MAX(height, CGRectGetHeight(submenuViewFrame));
@@ -142,19 +137,21 @@
     else
         [_submenuIndicatorView setHidden:YES];
 
-    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
+    height += 2.0 * VERTICAL_MARGIN;
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
-
+    
     if (hasSubmenuIndicator)
     {
         submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0) + 1.0;
         [_submenuIndicatorView setFrame:submenuViewFrame];
     }
 
+    _minSize = CGSizeMake(x + HORIZONTAL_MARGIN, height);
+    
     [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
+    [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
 }
 
@@ -167,11 +164,11 @@
     if (shouldHighlight)
     {
         if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView]];
+            [self setBackgroundColor:SelectionColor];
 
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
-        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
 
         [_submenuIndicatorView setColor:[CPColor whiteColor]];
         [_submenuIndicatorView setShadowColor:[CPColor colorWithWhite:0.1 alpha:0.7]];
@@ -221,19 +218,19 @@
 {
     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);

AppKit/CPMenuItem/_CPMenuItemSeparatorView.j

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

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,28 +1,21 @@
-/*
- * _CPMenuItemStandardView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import "CPControl.j"
-@import "CPImageView.j"
-@import "_CPImageAndTextView.j"
+
+
+var LEFT_MARGIN                 = 3.0,
+    RIGHT_MARGIN                = 14.0 + 3.0,
+    STATE_COLUMN_WIDTH          = 14.0,
+    INDENTATION_WIDTH           = 17.0,
+    VERTICAL_MARGIN             = 4.0,
+    
+    RIGHT_COLUMNS_MARGIN        = 30.0,
+    KEY_EQUIVALENT_MARGIN       = 10.0;
+
+var SUBMENU_INDICATOR_COLOR                     = nil,
+    _CPMenuItemSelectionColor                   = nil,
+    _CPMenuItemTextShadowColor                  = nil,
+    
+    _CPMenuItemDefaultStateImages               = [],
+    _CPMenuItemDefaultStateHighlightedImages    = [];
 
 @implementation _CPMenuItemStandardView : CPView
 {
@@ -41,29 +34,26 @@
     CPView                  _submenuIndicatorView;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "menu-item-standard-view";
-}
+    if (self !== [_CPMenuItemStandardView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 3.0, 17.0, 14.0, 17.0, 4.0, 30.0]
-                                       forKeys:[    @"submenu-indicator-color",
-                                                    @"menu-item-selection-color",
-                                                    @"menu-item-text-shadow-color",
-                                                    @"menu-item-default-off-state-image",
-                                                    @"menu-item-default-off-state-highlighted-image",
-                                                    @"menu-item-default-on-state-image",
-                                                    @"menu-item-default-on-state-highlighted-image",
-                                                    @"menu-item-default-mixed-state-image",
-                                                    @"menu-item-default-mixed-state-highlighted-image",
-                                                    @"left-margin",
-                                                    @"right-margin",
-                                                    @"state-column-width",
-                                                    @"indentation-width",
-                                                    @"vertical-margin",
-                                                    @"right-columns-margin"]];
+    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
@@ -73,7 +63,7 @@
 
 + (float)_standardLeftMargin
 {
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
+    return LEFT_MARGIN + STATE_COLUMN_WIDTH;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -84,7 +74,7 @@
     {
         _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
 
-        [_stateView setImageScaling:CPImageScaleNone];
+        [_stateView setImageScaling:CPScaleNone];
 
         [self addSubview:_stateView];
 
@@ -105,7 +95,7 @@
 
         _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
 
-        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
         [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
 
         [self addSubview:_submenuIndicatorView];
@@ -139,34 +129,16 @@
 
 - (void)update
 {
-    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
+    var x = LEFT_MARGIN + [_menuItem indentationLevel] * INDENTATION_WIDTH,
         height = 0.0,
         hasStateColumn = [[_menuItem menu] showsStateColumn];
 
     if (hasStateColumn)
     {
         [_stateView setHidden:NO];
-        //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
+        [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
 
-        switch ([_menuItem state])
-        {
-            case CPOnState:
-                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
-                break;
-
-            case CPOffState:
-                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
-                break;
-
-            case CPMixedState:
-                [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
-                break;
-
-            default:
-                break;
-        }
-
-        x += [self valueForThemeAttribute:@"state-column-width"];
+        x += STATE_COLUMN_WIDTH;
     }
     else
         [_stateView setHidden:YES];
@@ -190,7 +162,7 @@
         hasSubmenu = [_menuItem hasSubmenu];
 
     if (hasKeyEquivalent || hasSubmenu)
-        x += [self valueForThemeAttribute:@"right-columns-margin"];
+        x += RIGHT_COLUMNS_MARGIN;
 
     if (hasKeyEquivalent)
     {
@@ -201,9 +173,9 @@
         [_keyEquivalentView setTextColor:[self textColor]];
         [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
         [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, [self valueForThemeAttribute:@"vertical-margin"])];
+        [_keyEquivalentView setFrameOrigin:CGPointMake(x, VERTICAL_MARGIN)];
         [_keyEquivalentView sizeToFit];
-
+        
         var keyEquivalentViewFrame = [_keyEquivalentView frame];
 
         keyEquivalentViewFrame.origin.x = x;
@@ -211,7 +183,7 @@
         height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
 
         if (hasSubmenu)
-            x += [self valueForThemeAttribute:@"right-columns-margin"];
+            x += RIGHT_COLUMNS_MARGIN;
     }
     else
         [_keyEquivalentView setHidden:YES];
@@ -230,28 +202,28 @@
     else
         [_submenuIndicatorView setHidden:YES];
 
-    height += 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
+    height += 2.0 * VERTICAL_MARGIN;
 
     imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
     [_imageAndTextView setFrame:imageAndTextViewFrame];
 
     if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];
+        [_stateView setFrameSize:CGSizeMake(STATE_COLUMN_WIDTH, height)];
 
     if (hasKeyEquivalent)
     {
         keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0);
         [_keyEquivalentView setFrame:keyEquivalentViewFrame];
     }
-
+    
     if (hasSubmenu)
     {
         submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
         [_submenuIndicatorView setFrame:submenuViewFrame];
     }
 
-    _minSize = CGSizeMake(x + [self valueForThemeAttribute:@"right-margin"], height);
-
+    _minSize = CGSizeMake(x + RIGHT_MARGIN, height);
+    
     [self setAutoresizesSubviews:NO];
     [self setFrameSize:_minSize];
     [self setAutoresizesSubviews:YES];
@@ -261,19 +233,19 @@
 {
     // FIXME: This should probably be even throw.
     if (![_menuItem isEnabled])
-        return;
+        return; 
 
     if (shouldHighlight)
     {
-        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];
+        [self setBackgroundColor:_CPMenuItemSelectionColor];
 
         [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
         [_imageAndTextView setTextColor:[CPColor whiteColor]];
         [_keyEquivalentView setTextColor:[CPColor whiteColor]];
         [_submenuIndicatorView setColor:[CPColor whiteColor]];
 
-        [_imageAndTextView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
-        [_keyEquivalentView setTextShadowColor:[self valueForThemeAttribute:@"menu-item-text-shadow-color"]];
+        [_imageAndTextView setTextShadowColor:_CPMenuItemTextShadowColor];
+        [_keyEquivalentView setTextShadowColor:_CPMenuItemTextShadowColor];
     }
     else
     {
@@ -282,54 +254,18 @@
         [_imageAndTextView setImage:[_menuItem image]];
         [_imageAndTextView setTextColor:[self textColor]];
         [_keyEquivalentView setTextColor:[self textColor]];
-        [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
+        [_submenuIndicatorView setColor:SUBMENU_INDICATOR_COLOR];
 
         [_imageAndTextView setTextShadowColor:[self textShadowColor]];
         [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
     }
-
+    
     if ([[_menuItem menu] showsStateColumn])
     {
         if (shouldHighlight)
-        {
-            switch ([_menuItem state])
-            {
-                case CPOnState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image"]];
-                    break;
-
-                case CPOffState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-highlighted-image"]];
-                    break;
-
-                case CPMixedState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-highlighted-image"]];
-                    break;
-
-                default:
-                    break;
-            }
-        }
+            [_stateView setImage:_CPMenuItemDefaultStateHighlightedImages[[_menuItem state]] || nil];
         else
-        {
-            switch ([_menuItem state])
-            {
-                case CPOnState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-on-state-image"]];
-                    break;
-
-                case CPOffState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-off-state-image"]];
-                    break;
-
-                case CPMixedState:
-                    [_stateView setImage:[self valueForThemeAttribute:@"menu-item-default-mixed-state-image"]];
-                    break;
-
-                default:
-                    break;
-            }
-        }
+            [_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
     }
 }
 
@@ -354,15 +290,15 @@
 {
     var context = [[CPGraphicsContext currentContext] graphicsPort],
         bounds = [self bounds];
-
+    
     CGContextBeginPath(context);
-
+    
     CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
     CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
     CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-
+    
     CGContextClosePath(context);
-
+    
     CGContextSetFillColor(context, _color);
     CGContextFillPath(context);
 }

AppKit/CPMenuItem/_CPMenuItemView.j

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

AppKit/CPObjectController.j

@@ -1,48 +1,16 @@
-/*
- * 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"
-@import "CPKeyValueBinding.j"
 
-/*!
-    @class
 
-    CPObjectController is a bindings-compatible controller class.
-    Properties of the content object of an object of this class can be bound to user interface elements to change and access their values.
-
-    The content of an CPObjectController instance is an CPMutableDictionary object by default.
-    This allows a single CPObjectController instance to be used to manage several properties accessed by key value paths.
-    The default content object class can be changed by calling setObjectClass:, which a subclass must override.
-*/
 @implementation CPObjectController : CPController
 {
     id              _contentObject;
     id              _selection;
 
     Class           _objectClass;
-    CPString        _objectClassName;
 
     BOOL            _isEditable;
     BOOL            _automaticallyPreparesContent;
@@ -52,9 +20,6 @@
 
 + (id)initialize
 {
-    if (self !== [CPObjectController class])
-        return;
-
     [self exposeBinding:@"editable"];
     [self exposeBinding:@"contentObject"];
 }
@@ -87,20 +52,11 @@
     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])
@@ -115,19 +71,11 @@
     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"];
@@ -135,197 +83,113 @@
 
     _contentObject = aContent;
 
-    [self _selectionDidChange];
     [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
+- (id)newObject
 {
     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"];
+    [[CPKeyValueBinding 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"];
+    [[CPKeyValueBinding 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]];
+    return [[_CPObservableArray alloc] initWithObjects:[_contentObject] count:1];
 }
 
-/*!
-    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)
@@ -335,9 +199,6 @@
     [self didChangeValueForKey:@"selection"];
 }
 
-/*!
-    @return id - Returns the keys which are being observed.
-*/
 - (id)observedKeys
 {
     return _observedKeys;
@@ -357,8 +218,7 @@
 
 @end
 
-var CPObjectControllerContentKey                        = @"CPObjectControllerContentKey",
-    CPObjectControllerObjectClassNameKey                = @"CPObjectControllerObjectClassNameKey",
+var CPObjectControllerObjectClassNameKey                = @"CPObjectControllerObjectClassNameKey",
     CPObjectControllerIsEditableKey                     = @"CPObjectControllerIsEditableKey",
     CPObjectControllerAutomaticallyPreparesContentKey   = @"CPObjectControllerAutomaticallyPreparesContentKey";
 
@@ -373,10 +233,11 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         var objectClassName = [aCoder decodeObjectForKey:CPObjectControllerObjectClassNameKey],
             objectClass = CPClassFromString(objectClassName);
 
-        [self setObjectClass:objectClass || [CPMutableDictionary class]];
+        // FIXME: Error if objectClass === nil
+
+        [self setObjectClass:objectClass];
         [self setEditable:[aCoder decodeBoolForKey:CPObjectControllerIsEditableKey]];
-        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey]];
-        [self setContent:[aCoder decodeObjectForKey:CPObjectControllerContentKey]];
+        [self setAutomaticallyPreparesContent:[aCoder decodeBoolForKey:CPObjectControllerAutomaticallyPreparesContentKey] || NO];
 
         _observedKeys = [[CPCountedSet alloc] init];
     }
@@ -386,21 +247,11 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
-    [aCoder encodeObject:[self content] forKey:CPObjectControllerContentKey];
+    [aCoder encodeObject:CPStringFromClass(objectClass) forKey:CPObjectControllerObjectClassNameKey];
+    [aCoder encodeObject:[self isEditable] forKey:CPObjectControllerIsEditableKey];
 
-    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];
+    if (![self automaticallyPreparesContent])
+        [aCoder encodeBOOL:YES forKey:CPObjectControllerAutomaticallyPreparesContentKey];
 }
 
 @end
@@ -419,7 +270,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (id)initWithKeyPath:(id)aKeyPath observer:(id)anObserver object:(id)anObject
 {
-    if (self = [super init])
+    if (self=[super init])
     {
         _keyPath  = aKeyPath;
         _observer = anObserver;
@@ -468,9 +319,9 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 - (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)change context:(id)context
 {
     if (_notifyObject)
-        [_object observeValueForKeyPath:aKeyPath ofObject:_object change:change context:context];
+        [_object observeValueForKeyPath:_keyPath ofObject:_object change:change context:context];
 
-    [_observer observeValueForKeyPath:aKeyPath ofObject:_object change:change context:context];
+    [_observer observeValueForKeyPath:_keyPath ofObject:_object change:change context:context];
 }
 
 - (CPString)description
@@ -480,8 +331,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 @end
 
-// FIXME: This should subclass CPMutableArray not _CPJavaScriptArray
-@implementation _CPObservableArray : _CPJavaScriptArray
+@implementation _CPObservableArray : CPMutableArray
 {
     CPArray     _observationProxies;
 }
@@ -502,20 +352,30 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (CPString)description
 {
-    return "<_CPObservableArray: " + [super description] + " >";
+    return "<_CPObservableArray: "+[super description]+" >";
 }
 
 - (id)initWithArray:(CPArray)anArray
 {
-    self = [super initWithArray:anArray];
-
-    self.isa = [_CPObservableArray class];
-    self._observationProxies = [];
+    if (self = [super initWithArray:anArray])
+    {
+        _observationProxies = [];
+    }
 
     return self;
 }
 
-- (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
+- (id)initWithObjects:(CPArray)objects count:(unsigned)count
+{
+    if (self = [super initWithObjects:objects count:count])
+    {
+        _observationProxies = [];
+    }
+
+    return self;
+}
+
+-(void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)options context:(id)context
 {
     if (aKeyPath.indexOf("@") === 0)
     {
@@ -527,7 +387,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         [_observationProxies addObject:proxy];
 
         var dotIndex = aKeyPath.indexOf("."),
-            remaining = aKeyPath.substring(dotIndex + 1),
+            remaining = aKeyPath.substring(dotIndex+1),
             indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];
 
         [self addObserver:proxy toObjectsAtIndexes:indexes forKeyPath:remaining options:options context:context];
@@ -549,7 +409,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         proxy = [_observationProxies objectAtIndex:index];
 
         var dotIndex = aKeyPath.indexOf("."),
-            remaining = aKeyPath.substring(dotIndex + 1),
+            remaining = aKeyPath.substring(dotIndex+1),
             indexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [self count])];
 
         [self removeObserver:proxy fromObjectsAtIndexes:indexes forKeyPath:remaining];
@@ -563,7 +423,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)insertObject:(id)anObject atIndex:(unsigned)anIndex
 {
-    for (var i = 0, count = [_observationProxies count]; i < count; i++)
+    for (var i=0, count=[_observationProxies count]; i<count; i++)
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
@@ -583,9 +443,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 - (void)removeObjectAtIndex:(unsigned)anIndex
 {
-    var currentObject = [self objectAtIndex:anIndex];
-
-    for (var i = 0, count = [_observationProxies count]; i < count; i++)
+    for (var i=0, count=[_observationProxies count]; i<count; i++)
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
@@ -594,7 +452,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         if (operator)
             [self willChangeValueForKey:keyPath];
 
-        [currentObject removeObserver:proxy forKeyPath:keyPath];
+        [anObject removeObserver:proxy forKeyPath:keyPath];
 
         if (operator)
             [self didChangeValueForKey:keyPath];
@@ -622,7 +480,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 {
     var currentObject = [self objectAtIndex:anIndex];
 
-    for (var i = 0, count = [_observationProxies count]; i < count; i++)
+    for (var i=0, count=[_observationProxies count]; i<count; i++)
     {
         var proxy = [_observationProxies objectAtIndex:i],
             keyPath = [proxy keyPath],
@@ -645,13 +503,11 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
 
 @implementation CPControllerSelectionProxy : CPObject
 {
-    id                  _controller;
-    id                  _keys;
+    id              _controller;
+    id              _keys;
 
-    CPDictionary        _cachedValues;
-    CPArray             _observationProxies;
-
-    Object              _observedObjectsByKeyPath;
+    CPDictionary    _cachedValues;
+    CPArray         _observationProxies;
 }
 
 - (id)initWithController:(id)aController
@@ -661,80 +517,46 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
         _cachedValues = [CPDictionary dictionary];
         _observationProxies = [CPArray array];
         _controller = aController;
-        _observedObjectsByKeyPath = {};
     }
 
     return self;
 }
 
-- (id)_controllerMarkerForValues:(CPArray)theValues
+- (id)valueForKey:(CPString)aKey
 {
-    var count = [theValues count],
-        value;
+    var value = [_cachedValues objectForKey:aKey];
+
+    if (value !== undefined && value !== nil)
+        return value;
+
+    var allValues = [[_controller selectedObjects] valueForKeyPath:aKey],
+        count = [allValues count];
 
     if (!count)
         value = CPNoSelectionMarker;
     else if (count === 1)
-        value = [theValues objectAtIndex:0];
+        value = [allValues objectAtIndex:0];
     else
     {
         if ([_controller alwaysUsesMultipleValuesMarker])
             value = CPMultipleValuesMarker;
         else
         {
-            value = [theValues objectAtIndex:0];
+            value = [allValues objectAtIndex:0];
 
-            for (var i = 0, count = [theValues count]; i < count && value != CPMultipleValuesMarker; i++)
+            for (var i=0, count=[allValues count]; i<count && value!=CPMultipleValuesMarker; i++)
             {
-                if (![value isEqual:[theValues objectAtIndex:i]])
+                if (![value isEqual:[allValues objectAtIndex:i]])
                     value = CPMultipleValuesMarker;
             }
         }
     }
 
-    if (value === nil || value.isa && [value isEqual:[CPNull null]])
-        value = CPNullMarker;
+    [_cachedValues setValue:value forKey:aKey];
 
     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];
@@ -745,27 +567,32 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     return [_cachedValues keyEnumerator];
 }
 
-- (void)controllerWillChange
+- (void)setValue:(id)aValue forKey:(CPString)aKey
+{
+    [[_controller selectedObjects] setValue:aValue forKey:aKey];
+}
+
+-(void)controllerWillChange
 {
     _keys = [_cachedValues allKeys];
 
     if (!_keys)
         return;
 
-    for (var i = 0, count = _keys.length; i < count; i++)
+    for (var i=0, count=_keys.length; i<count; i++)
         [self willChangeValueForKey:_keys[i]];
 
     [_cachedValues removeAllObjects];
 }
 
-- (void)controllerDidChange
+-(void)controllerDidChange
 {
     [_cachedValues removeAllObjects];
 
     if (!_keys)
         return;
 
-    for (var i = 0, count = _keys.length; i < count; i++)
+    for (var i=0, count=_keys.length; i<count; i++)
         [self didChangeValueForKey:_keys[i]];
 
    _keys = nil;
@@ -783,10 +610,7 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     [proxy setNotifyObject:YES];
     [_observationProxies addObject:proxy];
 
-    // We keep a reference to the observed objects because removeObserver: will be called after the selection changes.
-    var observedObjects = [_controller selectedObjects];
-    _observedObjectsByKeyPath[aKeyPath] = observedObjects;
-    [observedObjects addObserver:proxy forKeyPath:aKeyPath options:options context:context];
+    [[_controller selectedObjects] addObserver:proxy forKeyPath:aKeyPath options:options context:context];
 }
 
 - (void)removeObserver:(id)anObject forKeyPath:(CPString)aKeyPath
@@ -794,12 +618,8 @@ var CPObjectControllerContentKey                        = @"CPObjectControllerCo
     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];
-
+    [[_controller selectedObjects] removeObserver:[_observationProxies objectAtIndex:index] forKeyPath:aKeyPath];
     [_observationProxies removeObjectAtIndex:index];
-
-    _observedObjectsByKeyPath[aKeyPath] = nil;
 }
 
 @end

AppKit/CPOpenPanel.j

@@ -1,24 +1,3 @@
-/*
- * 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"
 
@@ -47,9 +26,9 @@
         var options = { directoryURL: [self directoryURL],
                         canChooseFiles: [self canChooseFiles],
                         canChooseDirectories: [self canChooseDirectories],
-                        allowsMultipleSelection: [self allowsMultipleSelection] },
+                        allowsMultipleSelection: [self allowsMultipleSelection] };
 
-            result = window.cpOpenPanel(options);
+        var result = window.cpOpenPanel(options);
 
         _URLs = result.URLs;
 

AppKit/CPPanel.j

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

AppKit/CPPasteboard.j

@@ -22,7 +22,6 @@
 
 @import <Foundation/CPObject.j>
 @import <Foundation/CPArray.j>
-@import <Foundation/CPData.j>
 @import <Foundation/CPDictionary.j>
 @import <Foundation/CPPropertyListSerialization.j>
 
@@ -51,18 +50,18 @@ CPImagePboardType       = @"CPImagePboardType";
 var CPPasteboards = nil,
     supportsNativePasteboard = NO;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPPasteboard
 
-    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations.
+    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations. 
 */
 @implementation CPPasteboard : CPObject
 {
     CPArray         _types;
     CPDictionary    _owners;
     CPDictionary    _provided;
-
+    
     unsigned        _changeCount;
     CPString        _stateUID;
 
@@ -74,11 +73,11 @@ var CPPasteboards = nil,
 */
 + (void)initialize
 {
-    if (self !== [CPPasteboard class])
+    if (self != [CPPasteboard class])
         return;
 
     [self setVersion:1.0];
-
+    
     CPPasteboards = [CPDictionary dictionary];
 
     if (typeof window.cpPasteboardWithName !== "undefined")
@@ -104,10 +103,10 @@ var CPPasteboards = nil,
 
     if (pasteboard)
         return pasteboard;
-
+    
     pasteboard = [[CPPasteboard alloc] _initWithName:aName];
     [CPPasteboards setObject:pasteboard forKey:aName];
-
+    
     return pasteboard;
 }
 
@@ -115,15 +114,15 @@ var CPPasteboards = nil,
 - (id)_initWithName:(CPString)aName
 {
     self = [super init];
-
+    
     if (self)
     {
-//        _name = aName;
+        _name = aName;
         _types = [];
-
+        
         _owners = [CPDictionary dictionary];
         _provided = [CPDictionary dictionary];
-
+        
         _changeCount = 0;
 
         if (supportsNativePasteboard)
@@ -132,7 +131,7 @@ var CPPasteboards = nil,
             [self _synchronizePasteboard];
         }
     }
-
+    
     return self;
 }
 
@@ -146,17 +145,17 @@ var CPPasteboards = nil,
 {
     var i = 0,
         count = types.length;
-
+    
     for (; i < count; ++i)
     {
         var type = types[i];
-
-        if (![_owners objectForKey:type])
+        
+        if(![_owners objectForKey:type])
         {
             [_types addObject:type];
             [_provided removeObjectForKey:type];
         }
-
+        
         [_owners setObject:anOwner forKey:type];
     }
 
@@ -192,7 +191,7 @@ var CPPasteboards = nil,
     _provided = [CPDictionary dictionary];
 
     var count = _types.length;
-
+    
     while (count--)
         [_owners setObject:anOwner forKey:_types[count]];
 
@@ -284,18 +283,18 @@ var CPPasteboards = nil,
 - (CPData)dataForType:(CPString)aType
 {
     var data = [_provided objectForKey:aType];
-
+    
     if (data)
         return data;
-
+        
     var owner = [_owners objectForKey:aType];
-
+    
     if (owner)
     {
-        [owner pasteboard:self provideDataForType:aType];
+        [owner pasteboard:self provideDataForType:aType];        
         return [_provided objectForKey:aType];
     }
-
+    
     if (aType === CPStringPboardType)
         return [self dataForType:UTF8PboardType];
 
@@ -340,10 +339,10 @@ var CPPasteboards = nil,
 - (id)propertyListForType:(CPString)aType
 {
     var data = [self dataForType:aType];
-
+    
     if (data)
         return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
-
+        
     return nil;
 }
 
@@ -361,9 +360,9 @@ var CPPasteboards = nil,
 - (CPString)_generateStateUID
 {
     var bits = 32;
-
+        
     _stateUID = @"";
-
+    
     while (bits--)
         _stateUID += FLOOR(RAND() * 16.0).toString(16).toUpperCase();
 

AppKit/CPPopUpButton.j

@@ -20,13 +20,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CGGeometry.j"
 @import "CPButton.j"
-@import "CPKeyValueBinding.j"
+@import "CPGeometry.j"
 @import "CPMenu.j"
 @import "CPMenuItem.j"
 
-var VISIBLE_MARGIN = 7.0;
+
+var VISIBLE_MARGIN  = 7.0;
 
 CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
@@ -38,8 +38,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 @implementation CPPopUpButton : CPButton
 {
-    CPUInteger  _selectedIndex;
+    int         _selectedIndex;
     CPRectEdge  _preferredEdge;
+
+    CPMenu      _menu;
 }
 
 + (CPString)defaultThemeClass
@@ -47,21 +49,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     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
@@ -74,8 +61,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
     if (self)
     {
-        [self selectItemAtIndex:CPNotFound];
-
+        _selectedIndex = CPNotFound;
         _preferredEdge = CPMaxYEdge;
 
         [self setValue:CPImageLeft forThemeAttribute:@"image-position"];
@@ -85,11 +71,6 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
         [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,9 +85,6 @@ 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.
 */
@@ -120,7 +98,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     if (!changed)
         return;
 
-    var items = [[self menu] itemArray];
+    var items = [_menu itemArray];
 
     if ([items count] <= 0)
         return;
@@ -145,21 +123,21 @@ 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
 {
@@ -172,7 +150,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 /*!
     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
@@ -184,7 +162,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
         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,8 +170,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)removeAllItems
 {
-    [[self menu] removeAllItems];
-    [self synchronizeTitleAndSelectedItem];
+    var count = [_menu numberOfItems];
+
+    while (count--)
+        [_menu removeItemAtIndex:0];
 }
 
 /*!
@@ -212,7 +192,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (void)removeItemAtIndex:(int)anIndex
 {
-    [[self menu] removeItemAtIndex:anIndex];
+    [_menu removeItemAtIndex:anIndex];
     [self synchronizeTitleAndSelectedItem];
 }
 
@@ -222,12 +202,10 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)selectedItem
 {
-    var indexOfSelectedItem = [self indexOfSelectedItem];
-
-    if (indexOfSelectedItem < 0 || indexOfSelectedItem > [self numberOfItems] - 1)
+    if (_selectedIndex < 0 || _selectedIndex > [self numberOfItems] - 1)
         return nil;
 
-    return [[self menu] itemAtIndex:indexOfSelectedItem];
+    return [_menu itemAtIndex:_selectedIndex];
 }
 
 /*!
@@ -246,6 +224,15 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     return _selectedIndex;
 }
 
+// For us, CPNumber is toll-free bridged to Number, so just return the selected index.
+/*!
+    Returns the selected item's index. If no item is selected, it returns CPNotFound.
+*/
+- (id)objectValue
+{
+    return _selectedIndex;
+}
+
 // Setting the Current Selection
 /*!
     Selects the specified menu item.
@@ -260,50 +247,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
@@ -322,14 +281,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];
 }
 
 /*!
@@ -337,7 +366,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPArray)itemArray
 {
-    return [[self menu] itemArray];
+    return [_menu itemArray];
 }
 
 /*!
@@ -346,7 +375,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)itemAtIndex:(unsigned)anIndex
 {
-    return [[self menu] itemAtIndex:anIndex];
+    return [_menu itemAtIndex:anIndex];
 }
 
 /*!
@@ -355,7 +384,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPString)itemTitleAtIndex:(unsigned)anIndex
 {
-    return [[[self menu] itemAtIndex:anIndex] title];
+    return [[_menu itemAtIndex:anIndex] title];
 }
 
 /*!
@@ -380,13 +409,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]];
 }
 
 /*!
@@ -394,7 +417,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (CPMenuItem)lastItem
 {
-    return [[[self menu] itemArray] lastObject];
+    return [[_menu itemArray] lastObject];
 }
 
 // Getting the Indices of Menu Items
@@ -404,7 +427,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItem:(CPMenuItem)aMenuItem
 {
-    return [[self menu] indexOfItem:aMenuItem];
+    return [_menu indexOfItem:aMenuItem];
 }
 
 /*!
@@ -413,16 +436,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];
 }
 
 /*!
@@ -433,7 +456,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 */
 - (int)indexOfItemWithRepresentedObject:(id)anObject
 {
-    return [[self menu] indexOfItemWithRepresentedObject:anObject];
+    return [_menu indexOfItemWithRepresentedObject:anObject];
 }
 
 /*!
@@ -445,7 +468,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
@@ -460,7 +483,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.
 */
@@ -481,7 +504,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
     if ([self pullsDown])
     {
-        var items = [[self menu] itemArray];
+        var items = [_menu itemArray];
 
         if ([items count] <= 0)
             [self addItemWithTitle:aTitle];
@@ -529,7 +552,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
     if ([self pullsDown])
     {
-        var items = [[self menu] itemArray];
+        var items = [_menu itemArray];
 
         if ([items count] > 0)
             item = items[0];
@@ -541,125 +564,73 @@ 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];
+    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"];
 
-    if (!pullsDown && aKeyPath === @"selectedItem.changeCount" ||
-        pullsDown && (aKeyPath === @"_firstItem" || aKeyPath === @"_firstItem.changeCount"))
+    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")
-    {
-        aKeyPath = @"menu.items";
+    else if (index < _selectedIndex)
+        ++_selectedIndex;
 
-        [changes setObject:CPKeyValueChangeSetting forKey:CPKeyValueChangeKindKey];
-        [changes setObject:[[self menu] itemArray] forKey:CPKeyValueChangeNewKey];
+    if (index == 0 && [self pullsDown])
+    {
+        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];
-
-            if (![self pullsDown] && [indexes containsIndex:indexOfSelectedItem])
-            {
-                // If the selected item is removed the first item becomes selected.
-                indexOfSelectedItem = 0;
-            }
-            else
-            {
-                // See whether the index has changed, despite the actual item not changing.
-                while ((index = [indexes indexGreaterThanIndex:index]) !== CPNotFound &&
-                        index <= indexOfSelectedItem)
-                    --indexOfSelectedItem;
-            }
-
-            [self selectItemAtIndex:indexOfSelectedItem];
-        }
-
-        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 && numberOfItems > 0)
+        [self selectItemAtIndex:numberOfItems - 1];
+    else
+        [self synchronizeTitleAndSelectedItem];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -731,7 +702,7 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
 - (void)rightMouseDown:(CPEvent)anEvent
 {
-    // Disable standard CPView behavior which incorrectly displays the menu as a 'context menu'.
+    // Disable standard CPView behaviour which incorrectly displays the menu as a 'context menu'.
 }
 
 - (void)_popUpItemAction:(id)aSender
@@ -739,22 +710,6 @@ 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,
@@ -764,294 +719,19 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
     [self setEnabled:YES];
 
     while (count-- > 1)
+    {
         if (value !== [objects[count] valueForKeyPath:aKeyPath])
+        {
             [[self selectedItem] setState:CPOffState];
-}
-
-- (void)_reverseSetBinding
-{
-    [_CPPopUpButtonSelectionBinder reverseSetValueForObject:self];
-
-    [super _reverseSetBinding];
-}
-
-@end
-
-@implementation CPPopUpButton (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPSelectedIndexBinding ||
-        aBinding == CPSelectedObjectBinding ||
-        aBinding == CPSelectedTagBinding ||
-        aBinding == CPSelectedValueBinding ||
-        aBinding == CPContentBinding ||
-        aBinding == CPContentObjectsBinding ||
-        aBinding == CPContentValuesBinding)
-    {
-        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
-
-        return [CPClassFromString(@"_CPPopUpButton" + capitalizedBinding + "Binder") class];
-    }
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-@end
-
-@implementation _CPPopUpButtonContentBinder : CPBinder
-{
-}
-
-- (CPInteger)_getInsertNullOffset
-{
-    var options = [_info objectForKey:CPOptionsKey];
-
-    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
-}
-
-- (CPString)_getNullPlaceholder
-{
-    var options = [_info objectForKey:CPOptionsKey],
-        placeholder = [options objectForKey:CPNullPlaceholderBindingOption] || @"";
-
-    if (placeholder === [CPNull null])
-        placeholder = @"";
-
-    return placeholder;
-}
-
-- (id)transformValue:(CPArray)contentArray withOptions:(CPDictionary)options
-{
-    // Desactivate the full array transformation forced by super because we don't want this. We want individual transformations (see below).
-    return contentArray;
-}
-
-- (void)setValue:(CPArray)contentArray forBinding:(CPString)aBinding
-{
-    [self _setContent:contentArray];
-    [self _setContentValuesIfNeeded:contentArray];
-}
-
-- (void)valueForBinding:(CPString)aBinding
-{
-    return [self _content];
-}
-
-- (void)_setContent:(CPArray)aValue
-{
-    var count = [aValue count],
-        options = [_info objectForKey:CPOptionsKey],
-        offset = [self _getInsertNullOffset];
-
-    if (count + offset != [_source numberOfItems])
-    {
-        [_source removeAllItems];
-
-        if (offset)
-            [_source addItemWithTitle:[self _getNullPlaceholder]];
-
-        for (var i = 0; i < count; i++)
-        {
-            var item = [[CPMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:nil];
-            [self _setValue:[aValue objectAtIndex:i] forItem:item withOptions:options];
-            [_source addItem:item];
-        }
-    }
-    else
-    {
-        for (var i = 0; i < count; i++)
-        {
-            [self _setValue:[aValue objectAtIndex:i] forItem:[_source itemAtIndex:i + offset] withOptions:options];
         }
     }
 }
 
-- (void)_setContentValuesIfNeeded:(CPArray)values
-{
-    var offset = [self _getInsertNullOffset];
-
-    if (![_source infoForBinding:CPContentValuesBinding])
-    {
-        if (offset)
-            [[_source itemAtIndex:0] setTitle:[self _getNullPlaceholder]];
-
-        var count = [values count];
-
-        for (var i = 0; i < count; i++)
-            [[_source itemAtIndex:i + offset] setTitle:[[values objectAtIndex:i] description]];
-    }
-}
-
-- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
-{
-    var value = [self _transformValue:aValue withOptions:options];
-    [aMenuItem setRepresentedObject:value];
-}
-
-- (id)_transformValue:(id)aValue withOptions:(CPDictionary)options
-{
-    return [super transformValue:aValue withOptions:options];
-}
-
-- (CPArray)_content
-{
-    return [_source valueForKeyPath:@"itemArray.representedObject"];
-}
-
 @end
 
-@implementation _CPPopUpButtonContentValuesBinder : _CPPopUpButtonContentBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [super _setContent:aValue];
-}
-
-- (void)_setValue:(id)aValue forItem:(CPMenuItem)aMenuItem withOptions:(CPDictionary)options
-{
-    if (aValue === [CPNull null])
-        aValue = nil;
-
-    var value = [self _transformValue:aValue withOptions:options];
-    [aMenuItem setTitle:value];
-}
-
-- (CPArray)_content
-{
-    return [_source valueForKeyPath:@"itemArray.title"];
-}
-
-@end
-
-var binderForObject = {};
-
-@implementation _CPPopUpButtonSelectionBinder : CPBinder
-{
-    CPString _selectionBinding @accessors;
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    self = [super initWithBinding:aBinding name:aName to:aDestination keyPath:aKeyPath options:options from:aSource];
-
-    if (self)
-    {
-        binderForObject[[aSource UID]] = self;
-        _selectionBinding = aName;
-    }
-
-    return self;
-}
-
-+ (void)reverseSetValueForObject:(id)aSource
-{
-    var binder = binderForObject[[aSource UID]];
-    [binder reverseSetValueFor:[binder _selectionBinding]];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [self setValue:aValue forBinding:aBinding];
-}
-
-- (CPInteger)_getInsertNullOffset
-{
-    var options = [[CPBinder infoForBinding:CPContentBinding forObject:_source] objectForKey:CPOptionsKey];
-
-    return [options objectForKey:CPInsertsNullPlaceholderBindingOption] ? 1 : 0;
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedIndexBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectItemAtIndex:aValue + [self _getInsertNullOffset]];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source indexOfSelectedItem] - [self _getInsertNullOffset];
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedObjectBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    var index = [_source indexOfItemWithRepresentedObject:aValue],
-        offset = [self _getInsertNullOffset];
-
-    // If the content binding has the option CPNullPlaceholderBindingOption and the object to select is nil, select the first item (i.e., the placeholder).
-    // Other cases to consider:
-    // 1. no binding:
-    // 1.1 there's no item with a represented object matching the object to select.
-    // 1.2 the object to select is nil/CPNull
-    // 2. there's a binding:
-    // 2.1 there's a CPNullPlaceholderBindingOption:
-    // 2.1.1 there's no item with a represented object matching the object to select?
-    // 2.1.2 the object to select is nil/CPNull
-    // 2.2 there's no CPNullPlaceholderBindingOption:
-    // 2.2.1 there's no item with a represented object matching the object to select?
-    // 2.2.2 the object to select is nil/CPNull
-    // More cases? Behaviour that depends on array controller settings?
-
-    if (offset === 1 && index === CPNotFound)
-        index = 0;
-
-    [_source selectItemAtIndex:index];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedItem] representedObject];
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedTagBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectItemWithTag:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedItem] tag];
-}
-
-@end
-
-@implementation _CPPopUpButtonSelectedValueBinder : _CPPopUpButtonSelectionBinder
-{
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectItemWithTitle:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source titleOfSelectedItem];
-}
-
-@end
-
-var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",
-    DEPRECATED_CPPopUpButtonSelectedIndexKey    = @"CPPopUpButtonSelectedIndexKey";
+var CPPopUpButtonMenuKey            = @"CPPopUpButtonMenuKey",
+    CPPopUpButtonSelectedIndexKey   = @"CPPopUpButtonSelectedIndexKey",
+    CPPopUpButtonPullsDownKey       = @"CPPopUpButtonPullsDownKey";
 
 @implementation CPPopUpButton (CPCoding)
 /*!
@@ -1067,27 +747,27 @@ var DEPRECATED_CPPopUpButtonMenuKey             = @"CPPopUpButtonMenuKey",
 
     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/CPPopover.j

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

AppKit/CPProgressIndicator.j

@@ -23,7 +23,6 @@
 @import "CGGeometry.j"
 @import "CPImageView.j"
 @import "CPView.j"
-@import "CPWindow_Constants.j"
 
 
 /*
@@ -42,9 +41,13 @@ CPProgressIndicatorSpinningStyle    = 1;
 */
 CPProgressIndicatorHUDBarStyle      = 2;
 
-var CPProgressIndicatorSpinningStyleColors  = nil;
+var CPProgressIndicatorSpinningStyleColors  = nil,
 
-/*!
+    CPProgressIndicatorClassName            = nil,
+    CPProgressIndicatorStyleIdentifiers     = nil,
+    CPProgressIndicatorStyleSizes           = nil;
+
+/*! 
     @ingroup appkit
     @class CPProgressIndicator
 
@@ -56,50 +59,104 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 {
     double                      _minValue;
     double                      _maxValue;
-
+    
     double                      _doubleValue;
-
+    
     CPControlSize               _controlSize;
-
+    
     BOOL                        _isIndeterminate;
     CPProgressIndicatorStyle    _style;
-
+    
     BOOL                        _isAnimating;
-
+    
     BOOL                        _isDisplayedWhenStoppedSet;
     BOOL                        _isDisplayedWhenStopped;
+    
+    CPView                      _barView;
 }
 
-+ (CPString)defaultThemeClass
+/*
+    @ignore
+*/
++ (void)initialize
 {
-    return @"progress-indicator";
-}
+    if (self != [CPProgressIndicator class])
+        return;
+    
+    var bundle = [CPBundle bundleForClass:self];
+    
+    CPProgressIndicatorSpinningStyleColors = [];
+    
+    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize]       = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize]      = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
+    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize]    = [CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:
+        [bundle pathForResource:@"CPProgressIndicator/CPProgressIndicatorSpinningStyleRegular.gif"] size:CGSizeMake(64.0, 64.0)]];
 
-+ (CPDictionary)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 25, [CPNull null], [CPNull null], [CPNull null], [CPNull null]]
-                                       forKeys:[@"indeterminate-bar-color", @"bar-color", @"default-height", @"bezel-color", @"spinning-mini-gif", @"spinning-small-gif", @"spinning-regular-gif"]];
+    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 Sttyle
+    var prefixes = [
+        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle],
+        CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle],
+        CPProgressIndicatorClassName + @"Bar" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorHUDBarStyle]
+    ];
+
+    for (var i = 0, count = prefixes.length; i<count; i++)
+    {
+        var prefix = prefixes[i];
+        CPProgressIndicatorStyleSizes[prefix + regularIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+        CPProgressIndicatorStyleSizes[prefix + smallIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+        CPProgressIndicatorStyleSizes[prefix + miniIdentifier] = [_CGSizeMake(3.0, 16.0), _CGSizeMake(1.0, 16.0), _CGSizeMake(3.0, 16.0)];
+    }
 }
 
 - (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 setNeedsLayout];
+        
+        [self updateBackgroundColor];
+        [self drawBar];
     }
-
+    
     return self;
 }
 
@@ -117,7 +174,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 - (void)startAnimation:(id)aSender
 {
     _isAnimating = YES;
-
+    
     [self _hideOrDisplay];
 }
 
@@ -156,7 +213,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 - (void)setDoubleValue:(double)aValue
 {
     _doubleValue = MIN(MAX(aValue, _minValue), _maxValue);
-
+    
     [self drawBar];
 }
 
@@ -211,7 +268,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 {
     if (_controlSize == aControlSize)
         return;
-
+    
     _controlSize = aControlSize;
 
     [self updateBackgroundColor];
@@ -233,7 +290,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 }
 
 /*
-    Not yet implemented.
+    Not yet impemented.
 */
 - (CPControlTint)controlTint
 {
@@ -263,7 +320,7 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 {
     if (_isIndeterminate == isIndeterminate)
         return;
-
+    
     _isIndeterminate = isIndeterminate;
 
     [self updateBackgroundColor];
@@ -285,11 +342,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 {
     if (_style == aStyle)
         return;
-
+    
     _style = aStyle;
-
-    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-
+    
     [self updateBackgroundColor];
 }
 
@@ -301,7 +356,9 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
     if (_style == CPProgressIndicatorSpinningStyle)
         [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
     else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
+        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), CPProgressIndicatorStyleSizes[
+            CPProgressIndicatorClassName + @"BezelBorder" + CPProgressIndicatorStyleIdentifiers[CPProgressIndicatorBarStyle] + 
+            _CPControlIdentifierForControlSize(_controlSize)][0].height)];
 }
 
 /*!
@@ -313,11 +370,11 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 {
     if (_isDisplayedWhenStoppedSet && _isDisplayedWhenStopped == isDisplayedWhenStopped)
         return;
-
+        
     _isDisplayedWhenStoppedSet = YES;
-
+    
     _isDisplayedWhenStopped = isDisplayedWhenStopped;
-
+    
     [self _hideOrDisplay];
 }
 
@@ -328,10 +385,10 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 {
     if (_isDisplayedWhenStoppedSet)
         return _isDisplayedWhenStopped;
-
+    
     if (_style == CPProgressIndicatorBarStyle || _style == CPProgressIndicatorHUDBarStyle)
         return YES;
-
+    
     return NO;
 }
 
@@ -344,78 +401,63 @@ var CPProgressIndicatorSpinningStyleColors  = nil;
 - (void)setFrameSize:(CGSize)aSize
 {
     [super setFrameSize:aSize];
-
+    
     [self drawBar];
 }
 
 /* @ignore */
 - (void)drawBar
 {
-    [self setNeedsLayout];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    return [[CPView alloc] initWithFrame:_CGRectMakeZero()];
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
-{
-    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
+    if (_style == CPProgressIndicatorSpinningStyle)
+        return;
+    
+    if (!_barView)
     {
-        var width = CGRectGetWidth([self bounds]),
-            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
-
-        if (barWidth > 0.0 && barWidth < 4.0)
-            barWidth = 4.0;
-
-        if (_isIndeterminate)
-            barWidth = width;
-
-        return _CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
+        _barView = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 16.0)];        
+        [self addSubview:_barView];
     }
+    
+    [_barView setBackgroundColor:_CPControlThreePartImagePattern(
+        NO,
+        CPProgressIndicatorStyleSizes,
+        CPProgressIndicatorClassName,
+        @"Bar",
+        CPProgressIndicatorStyleIdentifiers[_style],
+        _CPControlIdentifierForControlSize(_controlSize))];
 
-    return nil;
+    var width = CGRectGetWidth([self bounds]),
+        barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
+
+    if (barWidth > 0.0 && barWidth < 4.0)
+        barWidth = 4.0;
+
+    [_barView setFrameSize:CGSizeMake(barWidth, 16.0)];
 }
 
 /* @ignore */
 - (void)updateBackgroundColor
 {
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
-{
-    CPProgressIndicatorSpinningStyleColors = [];
-
-    CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
-    CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
-    CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
-
     if (YES)//_isBezeled)
     {
         if (_style == CPProgressIndicatorSpinningStyle)
         {
-            // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
-            [self layoutEphemeralSubviewNamed:"bar-view"
-                                   positioned:CPWindowBelow
-              relativeToEphemeralSubviewNamed:nil];
-
+            [_barView removeFromSuperview];
+            
+            _barView = nil;
+            
             [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
         }
         else
         {
-           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-
-           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                                 positioned:CPWindowBelow
-                            relativeToEphemeralSubviewNamed:nil];
-
-           if (_isIndeterminate)
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
-           else
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
-
+            [self setBackgroundColor:_CPControlThreePartImagePattern(
+                NO,
+                CPProgressIndicatorStyleSizes,
+                CPProgressIndicatorClassName,
+                @"BezelBorder",
+                CPProgressIndicatorStyleIdentifiers[_style],
+                _CPControlIdentifierForControlSize(_controlSize))];
+                
+            [self drawBar];
         }
     }
     else
@@ -423,48 +465,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 decodeIntForKey:@"_style"];
-        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
-        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
-        _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
-
-        [self updateBackgroundColor];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // Don't encode the background colour. It can be recreated based on the flags and if encoded causes hardcoded
-    // image paths in the cib while just wasting space.
-    var backgroundColor = [self backgroundColor];
-    [self setBackgroundColor:nil];
-    [super encodeWithCoder:aCoder];
-    [self setBackgroundColor:backgroundColor];
-
-    [aCoder encodeObject:_minValue forKey:@"_minValue"];
-    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
-    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
-    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
-    [aCoder encodeObject:_isIndeterminate forKey:@"_isIndeterminate"];
-    [aCoder encodeInt:_style forKey:@"_style"];
-    [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
-    [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
-    [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
-}
-
-@end

AppKit/CPRadio.j

@@ -25,8 +25,6 @@
 
 @import "CPButton.j"
 
-@global CPApp
-
 
 /*!
     @ingroup appkit
@@ -152,14 +150,6 @@ CPRadioImageOffset = 4.0;
         [_radioGroup _setSelectedRadio:self];
 }
 
-- (void)sendAction:(SEL)anAction to:(id)anObject
-{
-    [super sendAction:anAction to:anObject];
-
-    if (_radioGroup)
-        [CPApp sendAction:[_radioGroup action] to:[_radioGroup target] from:_radioGroup];
-}
-
 @end
 
 var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
@@ -183,23 +173,6 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
     [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
 }
 
-- (CPImage)image
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (CPImage)alternateImage
-{
-    return [self currentValueForThemeAttribute:@"image"];
-}
-
-- (BOOL)startTrackingAt:(CGPoint)aPoint
-{
-    var startedTracking = [super startTrackingAt:aPoint];
-    [self highlight:YES];
-    return startedTracking;
-}
-
 @end
 
 @implementation CPRadioGroup : CPObject
@@ -247,6 +220,8 @@ var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
 
     [_selectedRadio setState:CPOffState];
     _selectedRadio = aRadio;
+
+    [CPApp sendAction:_action to:_target from:self];
 }
 
 - (CPRadio)selectedRadio

AppKit/CPResponder.j

@@ -21,11 +21,7 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
 
-@import "CPEvent.j"
-
-@class CPKeyBinding
 
 CPDeleteKeyCode         = 8;
 CPTabKeyCode            = 9;
@@ -235,18 +231,11 @@ CPDeleteForwardKeyCode  = 46;
     [_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 \c anEvent, the receiver should simulate the event.
+    @param anEvent the event to simulate
+    @return \c YES if the event receiver simulated the  event
 */
 - (BOOL)performKeyEquivalent:(CPEvent)anEvent
 {
@@ -369,8 +358,8 @@ var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
 
     if (self)
     {
-        [self setNextResponder:[aCoder decodeObjectForKey:CPResponderNextResponderKey]];
-        [self setMenu:[aCoder decodeObjectForKey:CPResponderMenuKey]];
+        _nextResponder = [aCoder decodeObjectForKey:CPResponderNextResponderKey];
+        _menu = [aCoder decodeObjectForKey:CPResponderMenuKey];
     }
 
     return self;

AppKit/CPRuleEditor/CPPredicateEditor.j

@@ -1,553 +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 */
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding)
-        return [CPPredicateEditorValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (id)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"predicate";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
-- (void)_initRuleEditorShared
-{
-    [super _initRuleEditorShared];
-
-    _rootTrees = [CPArray array];
-    _rootHeaderTrees = [CPArray array];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-    if (self != nil)
-    {
-        var initialTemplate = [[CPPredicateEditorRowTemplate alloc] initWithCompoundTypes:[CPAndPredicateType, CPOrPredicateType]];
-        _allTemplates = [CPArray arrayWithObject:initialTemplate];
-    }
-
-    return self;
-}
-
-- (id)objectValue
-{
-    return [super predicate];
-}
-
-- (void)_updateItemsBySimpleTemplates
-{
-    var templates = [CPMutableArray array],
-        count = [_allTemplates count],
-        t;
-
-    while (count--)
-    {
-        var t = _allTemplates[count];
-        if ([t _rowType] == CPRuleEditorRowTypeSimple)
-            [templates insertObject:t atIndex:0];
-    }
-
-    var trees = [self _constructTreesForTemplates:templates];
-    if ([trees count] > 0)
-        _rootTrees = [self _mergeTree:trees];
-}
-
-- (void)_updateItemsByCompoundTemplates
-{
-    var templates = [CPMutableArray array],
-        count = [_allTemplates count],
-        t;
-
-    while (count--)
-    {
-        var t = _allTemplates[count];
-        if ([t _rowType] == CPRuleEditorRowTypeCompound)
-            [templates insertObject:t atIndex:0];
-    }
-
-    var trees = [self _constructTreesForTemplates:templates];
-    if ([trees count] > 0)
-        _rootHeaderTrees = [self _mergeTree:trees];
-}
-
-- (CPArray)_constructTreesForTemplates:(id)templates
-{
-    var trees = [CPMutableArray array],
-        count = [templates count];
-
-    for (var i = 0; i < count; i++)
-    {
-        var tree = [self _constructTreeForTemplate:templates[i]];
-        [trees addObjectsFromArray:tree];
-    }
-
-    return trees;
-}
-
-- (CPMutableArray)_mergeTree:(CPArray)aTree
-{
-    var mergedTree = [CPMutableArray array];
-    if (aTree == nil)
-        return mergedTree;
-
-    var icount = [aTree count];
-    for (var i = 0; i < icount; i++)
-    {
-        var anode = [aTree objectAtIndex:i],
-            jcount = [mergedTree count],
-            merged = NO;
-
-        for (var j = 0; j < jcount; j++)
-        {
-            var mergednode = [mergedTree objectAtIndex:j];
-
-            if ([[mergednode title] isEqualToString:[anode title]])
-            {
-                var children1 = [mergednode children],
-                    children2 = [anode children],
-                    children12 = [children1 arrayByAddingObjectsFromArray:children2],
-                    mergedChildren = [self _mergeTree:children12];
-
-                [mergednode setChildren:mergedChildren];
-                merged = YES;
-            }
-        }
-
-        if (!merged)
-            [mergedTree addObject:anode];
-    }
-
-    return mergedTree;
-}
-
-- (id)_constructTreeForTemplate:(CPPredicateEditorRowTemplate)aTemplate
-{
-    var tree = [CPArray array],
-        templateViews = [aTemplate templateViews],
-        count = [templateViews count];
-
-    while (count--)
-    {
-        var children = [CPArray array],
-            itemsCount = 0,
-            menuIndex = -1,
-            itemArray,
-
-            templateView = [templateViews objectAtIndex:count],
-            isPopup = [templateView isKindOfClass:[CPPopUpButton class]];
-
-        if (isPopup)
-        {
-            itemArray = [[templateView itemArray] valueForKey:@"title"];
-            itemsCount = [itemArray count];
-            menuIndex = 0;
-        }
-
-        for (; menuIndex < itemsCount; menuIndex++)
-        {
-            var item = [_CPPredicateEditorTree new];
-            [item setIndexIntoTemplate:count];
-            [item setTemplate:aTemplate];
-            [item setMenuItemIndex:menuIndex];
-            if (isPopup)
-                [item setTitle:[itemArray objectAtIndex:menuIndex]];
-
-            [children addObject:item];
-        }
-
-        [children makeObjectsPerformSelector:@selector(setChildren:) withObject:tree];
-        tree = children;
-    }
-
-    return tree;
-}
-
-#pragma mark Set the Predicate
-
-- (void)setObjectValue:(id)objectValue
-{
-    var ov = [self objectValue];
-    if ((ov == nil) != (objectValue == nil) || ![ov isEqual:objectValue])
-    {
-        [self _setPredicate:objectValue];
-        [self _reflectPredicate:objectValue];
-    }
-}
-
-- (void)_reflectPredicate:(id)predicate
-{
-    var animation = _currentAnimation;
-    _currentAnimation = nil;
-    _sendAction = NO;
-
-    if (predicate != nil)
-    {
-        if ((_nestingMode == CPRuleEditorNestingModeSimple || _nestingMode == CPRuleEditorNestingModeCompound)
-            && [predicate isKindOfClass:[CPComparisonPredicate class]])
-            predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:[CPArray arrayWithObject:predicate]];
-
-        var row = [self _rowObjectFromPredicate:predicate];
-        if (row != nil)
-            [_boundArrayOwner setValue:[CPArray arrayWithObject:row] forKey:_boundArrayKeyPath];
-    }
-
-    [self setAnimation:animation];
-}
-
-- (id)_rowObjectFromPredicate:(CPPredicate)predicate
-{
-    var quality, // TODO: We should use this ref somewhere !
-        type,
-        matchedTemplate = [CPPredicateEditorRowTemplate _bestMatchForPredicate:predicate inTemplates:[self rowTemplates] quality:quality];
-
-    if (matchedTemplate == nil)
-        return nil;
-
-    var copyTemplate = [matchedTemplate copy],
-        subpredicates = [matchedTemplate displayableSubpredicatesOfPredicate:predicate];
-
-    if (subpredicates == nil)
-    {
-        [copyTemplate _setComparisonPredicate:predicate];
-        type = CPRuleEditorRowTypeSimple;
-    }
-    else
-    {
-        [copyTemplate _setCompoundPredicate:predicate];
-        type = CPRuleEditorRowTypeCompound;
-    }
-
-    var row = [self _rowFromTemplate:copyTemplate originalTemplate:matchedTemplate withRowType:type];
-
-    if (subpredicates == nil)
-        return row;
-
-    var count = [subpredicates count],
-        subrows = [CPMutableArray array];
-
-    for (var i = 0; i < count; i++)
-    {
-        var subrow = [self _rowObjectFromPredicate:subpredicates[i]];
-        if (subrow != nil)
-            [subrows addObject:subrow];
-    }
-
-    [row setValue:subrows forKey:[super subrowsKeyPath]];
-
-    return row;
-}
-
-- (id)_rowFromTemplate:(CPPredicateEditorRowTemplate)aTemplate originalTemplate:(CPPredicateEditorRowTemplate)originalTemplate withRowType:(CPRuleEditorRowType)rowType
-{
-    var criteria = [CPArray array],
-        values = [CPArray array],
-        templateViews = [aTemplate templateViews],
-        rootItems,
-        count;
-
-    rootItems = (rowType == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
-
-    while ((count = [rootItems count]) > 0)
-    {
-        var treeChild;
-        for (var i = 0; i < count; i++)
-        {
-            treeChild = [rootItems objectAtIndex:i];
-
-            var currentView = [templateViews objectAtIndex:[treeChild indexIntoTemplate]],
-                title = [treeChild title];
-
-            if (title == nil || [title isEqual:[currentView titleOfSelectedItem]])
-            {
-                var node = [_CPPredicateEditorRowNode rowNodeFromTree:treeChild];
-                [node applyTemplate:aTemplate withViews:templateViews forOriginalTemplate:originalTemplate];
-
-                [criteria addObject:node];
-                [values addObject:[node displayValue]];
-                break;
-            }
-        }
-
-        rootItems = [treeChild children];
-    }
-
-    var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"];
-
-    return row;
-}
-
-#pragma mark Get the predicate
-
-- (void)_updatePredicate
-{
-    [self _updatePredicateFromRows];
-}
-
-- (void)_updatePredicateFromRows
-{
-    var rootRowsArray = [super _rootRowsArray],
-        subpredicates = [CPMutableArray array],
-        count,
-        count2 = count = [rootRowsArray count],
-        predicate;
-
-    while (count--)
-    {
-        var item = [rootRowsArray objectAtIndex:count],
-            subpredicate = [self _predicateFromRowItem:item];
-
-        if (subpredicate != nil)
-            [subpredicates insertObject:subpredicate atIndex:0];
-    }
-
-    if (_nestingMode != CPRuleEditorNestingModeList && count2 == 1)
-        predicate = [subpredicates lastObject];
-    else
-        predicate = [[CPCompoundPredicate alloc] initWithType:[self _compoundPredicateTypeForRootRows] subpredicates:subpredicates];
-
-    [self _setPredicate:predicate];
-}
-
-- (id)_predicateFromRowItem:(id)rowItem
-{
-    var subpredicates = [CPArray array],
-        rowType = [rowItem valueForKey:_typeKeyPath];
-
-    if (rowType == CPRuleEditorRowTypeCompound)
-    {
-        var subrows = [rowItem valueForKey:_subrowsArrayKeyPath],
-            count = [subrows count];
-
-        for (var i = 0; i < count; i++)
-        {
-            var subrow = [subrows objectAtIndex:i],
-                predicate = [self _predicateFromRowItem:subrow];
-
-            [subpredicates addObject:predicate];
-        }
-    }
-
-    var criteria = [rowItem valueForKey:_itemsKeyPath],
-        displayValues = [rowItem valueForKey:_valuesKeyPath],
-        count = [criteria count],
-        lastItem = [criteria lastObject],
-        template = [lastItem templateForRow],
-        templateViews = [template templateViews];
-
-    for (var j = 0; j < count; j++)
-    {
-        var view = [templateViews objectAtIndex:j],
-            value = [displayValues objectAtIndex:j];
-        [[criteria objectAtIndex:j] setTemplateViews:templateViews];
-
-        if ([view isKindOfClass:[CPPopUpButton class]])
-            [view selectItemWithTitle:value];
-        else if ([view respondsToSelector:@selector(setObjectValue:)])
-            [view setObjectValue:[value objectValue]];
-    }
-
-    return [template predicateWithSubpredicates:subpredicates];
-}
-
-- (CPCompoundPredicateType)_compoundPredicateTypeForRootRows
-{
-    return CPAndPredicateType;
-}
-
-#pragma mark Control delegate
-
-- (void)_sendRuleAction
-{
-    [super _sendRuleAction];
-}
-
-- (BOOL)_sendsActionOnIncompleteTextChange
-{
-    return NO;
-}
-
-/*
-- (void)_setDefaultTargetAndActionOnView:(CPView)view
-{
-    if ([view isKindOfClass:[CPControl class]])
-    {
-        [view setTarget:self];
-        [view setAction:@selector(_templateControlValueDidChange:)];
-    }
-}
-- (void)_templateControlValueDidChange:(id)sender
-{
-}
-- (void)controlTextDidBeginEditing:(CPNotification)notification
-{
-}
-- (void)controlTextDidEndEditing:(CPNotification)notification
-{
-}
-- (void)controlTextDidChange:(CPNotification)notification
-{
-}
-*/
-
-#pragma mark RuleEditor delegate methods
-
-- (int)_queryNumberOfChildrenOfItem:(id)rowItem withRowType:(int)type
-{
-    if (rowItem == nil)
-    {
-        var trees = (type == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
-        return [trees count];
-    }
-    return [[rowItem children] count];
-}
-
-- (id)_queryChild:(int)childIndex ofItem:(id)rowItem withRowType:(int)type
-{
-    if (rowItem == nil)
-    {
-        var trees = (type == CPRuleEditorRowTypeSimple) ? _rootTrees : _rootHeaderTrees;
-        return [_CPPredicateEditorRowNode rowNodeFromTree:trees[childIndex]];
-    }
-
-    return [[rowItem children] objectAtIndex:childIndex];
-}
-
-- (id)_queryValueForItem:(id)rowItem inRow:(int)rowIndex
-{
-    return [rowItem displayValue];
-}
-
-@end
-
-var CPPredicateTemplatesKey = @"CPPredicateTemplates";
-
-@implementation CPPredicateEditor (CPCoding)
-
-- (id)initWithCoder:(id)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self != nil)
-    {
-        var nibTemplates = [aCoder decodeObjectForKey:CPPredicateTemplatesKey];
-
-        if (nibTemplates != nil)
-            [self setRowTemplates:nibTemplates];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(id)aCoder
-{
-    [super encodeWithCoder:aCoder];
-    [aCoder encodeObject:_allTemplates forKey:CPPredicateTemplatesKey];
-}
-
-@end
-
-@implementation CPPredicateEditorValueBinder : CPBinder
-{
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source _reflectPredicate:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source _reflectPredicate:aValue];
-}
-
-@end
-/*! @endcond */

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

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

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

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

AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j

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

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

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

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

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

AppKit/CPRuleEditor/_CPRuleEditorPopUpButton.j

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

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

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

AppKit/CPSavePanel.j

@@ -1,24 +1,3 @@
-/*
- * 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"
 

AppKit/CPScreen.j

@@ -1,45 +1,11 @@
-/*
- * 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)
@@ -49,4 +15,4 @@
 #endif
 }
 
-@end
+@end

AppKit/CPScroller.j

@@ -5,9 +5,6 @@
  * Created by Francisco Tolmasky.
  * Copyright 2008, 280 North, Inc.
  *
- * Modified to match Lion style by Antoine Mercadal 2011
- * <antoine.mercadal@archipelproject.org>
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -23,14 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "../Foundation/Foundation.h"
-
-@import "CPAnimation.j"
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "CPViewAnimation.j"
 
-@global CPApp
 
 // CPScroller Constants
 CPScrollerNoPart            = 0;
@@ -63,17 +54,6 @@ NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
 NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
 
 
-CPScrollerStyleLegacy           = 0;
-CPScrollerStyleOverlay          = 1;
-
-CPScrollerKnobStyleDefault      = 0;
-CPScrollerKnobStyleDark         = 1;
-CPScrollerKnobStyleLight        = 2;
-
-CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
-CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
-CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
-
 @implementation CPScroller : CPControl
 {
     CPControlSize           _controlSize;
@@ -88,19 +68,8 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     CPScrollerPart          _trackingPart;
     float                   _trackingFloatValue;
     CGPoint                 _trackingStartPoint;
-
-    CPViewAnimation         _animationScroller;
-
-    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
-    int                     _style;
-    CPTimer                 _timerFadeOut;
-    BOOL                    _isMouseOver;
 }
 
-
-#pragma mark -
-#pragma mark Class methods
-
 + (CPString)defaultThemeClass
 {
     return "scroller";
@@ -109,43 +78,49 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 + (id)themeAttributes
 {
     return [CPDictionary dictionaryWithJSObject:{
-        @"scroller-width": 7.0,
-        @"knob-slot-color": [CPNull null],
+        @"scroller-width": 15.0,
+        @"knob-slot-color": [CPColor lightGrayColor],
         @"decrement-line-color": [CPNull null],
         @"increment-line-color": [CPNull null],
-        @"knob-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,
-        @"track-border-overlay": 9.0
-    }];
+        @"minimum-knob-length":21.0
+    }]
 }
 
-+ (float)scrollerWidth
+
+// Calculating Layout
+
+- (id)initWithFrame:(CGRect)aFrame
 {
-    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
+    self = [super initWithFrame:aFrame];
+
+    if (self)
+    {
+        _controlSize = CPRegularControlSize;
+        _partRects = [];
+
+        [self setFloatValue:0.0];
+        [self setKnobProportion:1.0];
+
+        _hitPart = CPScrollerNoPart;
+
+        [self _calculateIsVertical];
+    }
+
+    return self;
 }
 
+// Determining CPScroller Size
 /*!
     Returns the CPScroller's width for a CPRegularControlSize.
 */
-+ (float)scrollerWidthInStyle:(int)aStyle
++ (float)scrollerWidth
 {
-    var scroller = [[self alloc] init];
-
-    if (aStyle == CPScrollerStyleLegacy)
-        return [scroller valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-    return [scroller currentValueForThemeAttribute:@"scroller-width"];
-}
-
-/*!
-    Returns the CPScroller's overlay value.
-*/
-+ (float)scrollerOverlay
-{
-    return [[[self alloc] init] currentValueForThemeAttribute:@"track-border-overlay"];
+    return [[[CPScroller alloc] init] currentValueForThemeAttribute:@"scroller-width"];
 }
 
 /*!
@@ -157,87 +132,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return [self scrollerWidth];
 }
 
-
-#pragma mark -
-#pragma mark Initialization
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _controlSize = CPRegularControlSize;
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
-        _hitPart = CPScrollerNoPart;
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-        _style = CPScrollerStyleOverlay;
-        var paramAnimFadeOut   = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                          forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-        [self _calculateIsVertical];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Getters / Setters
-
-/*!
-    Returns the scroller's style
-*/
-- (void)style
-{
-    return _style;
-}
-
-/*!
-    Set the scroller's control size
-    @param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
-*/
-- (void)setStyle:(id)aStyle
-{
-    if (_style != nil && _style === aStyle)
-        return;
-
-    _style = aStyle;
-
-    if (_style === CPScrollerStyleLegacy)
-    {
-        [self fadeIn];
-        [self setThemeState:CPThemeStateScrollViewLegacy];
-    }
-    else
-    {
-        _allowFadingOut = YES;
-        [self unsetThemeState:CPThemeStateScrollViewLegacy];
-    }
-
-    //[self _adjustScrollerSize];
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
-/*!
-    Returns the scroller's control size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
 /*!
     Sets the scroller's size.
     @param aControlSize the scroller's size
@@ -253,6 +147,27 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self setNeedsDisplay:YES];
 }
 
+/*!
+    Returns the scroller's control size
+*/
+- (CPControlSize)controlSize
+{
+    return _controlSize;
+}
+
+- (void)setObjectValue:(id)aValue
+{
+    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
+}
+
+- (void)setKnobProportion:(float)aProportion
+{
+    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+
+    [self setNeedsDisplay:YES];
+    [self setNeedsLayout];
+}
+
 /*!
     Return's the knob's proportion
 */
@@ -261,50 +176,17 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _knobProportion;
 }
 
-/*!
-    Set the knob's proportion
-    @param aProportion the desired proportion
-*/
-- (void)setKnobProportion:(float)aProportion
+- (id)currentValueForThemeAttribute:(CPString)anAttributeName
 {
-    if (!_IS_NUMERIC(aProportion))
-        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric"];
+    var themeState = _themeState;
 
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
+    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
+        themeState &= ~CPThemeStateHighlighted;
 
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
+    return [self valueForThemeAttribute:anAttributeName inState:themeState];
 }
 
-
-#pragma mark -
-#pragma mark Privates
-
-/*! @ignore */
-- (void)_adjustScrollerSize
-{
-    var frame = [self frame],
-        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
-
-    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-        frame.size.width = scrollerWidth;
-
-    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-        frame.size.height = scrollerWidth;
-
-    [self setFrame:frame];
-}
-
-/*! @ignore */
-- (void)_performFadeOut:(CPTimer)aTimer
-{
-    [self fadeOut];
-    _timerFadeOut = nil;
-}
-
-
-#pragma mark -
-#pragma mark Utilities
+// Calculating Layout
 
 - (CGRect)rectForPart:(CPScrollerPart)aPart
 {
@@ -326,9 +208,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     // The ordering of these tests is important.  We check the knob and
     // page rects first since they may overlap with the arrows.
 
-    if (![self hasThemeState:CPThemeStateSelected])
-        return CPScrollerNoPart;
-
     if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
         return CPScrollerKnob;
 
@@ -388,16 +267,16 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
             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);
 
@@ -417,16 +296,16 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
             incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
             effectiveDecrementLineWidth = decrementLineSize.width + trackInset.left,
             effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right,
-            slotSize = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
+            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);
 
@@ -437,7 +316,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
         {
             _partRects[CPScrollerIncrementLine] = _CGRectMakeZero();
             _partRects[CPScrollerDecrementLine] = _CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotSize);
+            _partRects[CPScrollerKnobSlot]      = _CGRectMake(0.0, 0.0,  width, slotHeight);
         }
     }
 }
@@ -451,35 +330,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     return _usableParts;
 }
 
-/*!
-    Display the scroller
-*/
-- (void)fadeIn
-{
-    if (_isMouseOver && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    [self setAlphaValue:1.0];
-}
-
-/*!
-    Start the fade out anination
-*/
-- (void)fadeOut
-{
-    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
-        return;
-
-    [_animationScroller startAnimation];
-}
-
-
-#pragma mark -
-#pragma mark  Drawing
-
+// Drawing the Parts
 /*!
     Draws the specified arrow and sets the highlight.
     @param anArrow the arrow to draw
@@ -528,12 +379,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
 - (void)layoutSubviews
 {
-    [self _adjustScrollerSize];
     [self checkSpaceForParts];
 
     var index = 0,
-        count = PARTS_ARRANGEMENT.length,
-        view;
+        count = PARTS_ARRANGEMENT.length;
 
     for (; index < count; ++index)
     {
@@ -609,8 +458,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
 
     [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
 
-    if (type === CPLeftMouseDragged)
-        [self sendAction:[self action] to:[self target]];
+    [self sendAction:[self action] to:[self target]];
 }
 
 /*!
@@ -716,20 +564,6 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     [self setNeedsLayout];
 }
 
-
-#pragma mark -
-#pragma mark Overrides
-
-- (id)currentValueForThemeAttribute:(CPString)anAttributeName
-{
-    var themeState = _themeState;
-
-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState &= ~CPThemeStateHighlighted;
-
-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
     if (![self isEnabled])
@@ -748,53 +582,10 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     }
 }
 
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    [super mouseEntered:anEvent];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    if (![self isEnabled])
-        return;
-
-    _allowFadingOut = NO;
-    _isMouseOver = YES;
-
-    if ([self alphaValue] > 0 && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    [super mouseExited:anEvent];
-
-    if ([self isHidden] || ![self isEnabled] || !_isMouseOver)
-        return;
-
-    _allowFadingOut = YES;
-    _isMouseOver = NO;
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    _timerFadeOut = [CPTimer scheduledTimerWithTimeInterval:1.2 target:self selector:@selector(_performFadeOut:) userInfo:nil repeats:NO];
-}
-
-
-#pragma mark -
-#pragma mark Delegates
-
-- (void)animationDidEnd:(CPAnimation)animation
-{
-    [self unsetThemeState:CPThemeStateSelected];
-}
-
 @end
 
-var CPScrollerControlSizeKey = @"CPScrollerControlSize",
-    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey = @"CPScrollerStyleKey";
+var CPScrollerControlSizeKey = "CPScrollerControlSize",
+    CPScrollerKnobProportionKey = "CPScrollerKnobProportion";
 
 @implementation CPScroller (CPCoding)
 
@@ -803,12 +594,10 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
     if (self = [super initWithCoder:aCoder])
     {
         _controlSize = CPRegularControlSize;
-
         if ([aCoder containsValueForKey:CPScrollerControlSizeKey])
             _controlSize = [aCoder decodeIntForKey:CPScrollerControlSizeKey];
 
         _knobProportion = 1.0;
-
         if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
             _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
 
@@ -816,20 +605,20 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
 
         _hitPart = CPScrollerNoPart;
 
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-
-        var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect]
-                                                           forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]];
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-
         [self _calculateIsVertical];
 
-        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
+        // 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];
     }
 
     return self;
@@ -841,7 +630,6 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize",
 
     [aCoder encodeInt:_controlSize forKey:CPScrollerControlSizeKey];
     [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
-    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
 }
 
 @end

AppKit/CPSearchField.j

@@ -21,29 +21,33 @@
  */
 
 @import "CPButton.j"
-@import "CPMenu.j"
-@import "CPMenuItem.j"
 @import "CPTextField.j"
 
-@class CPUserDefaults
-
-@global CPApp
 
 CPSearchFieldRecentsTitleMenuItemTag    = 1000;
 CPSearchFieldRecentsMenuItemTag         = 1001;
 CPSearchFieldClearRecentsMenuItemTag    = 1002;
 CPSearchFieldNoRecentsMenuItemTag       = 1003;
+CPSearchFieldSeparatorMenuItemTag       = 1004;
 
-var CPAutosavedRecentsChangedNotification = @"CPAutosavedRecentsChangedNotification";
+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 RECENT_SEARCH_PREFIX = @"   ";
 
-/*!
+
+/*! 
     @ingroup appkit
     @class CPSearchField
     The CPSearchField class defines the programmatic interface for text fields that are optimized for text-based searches. A CPSearchField object directly inherits from the CPTextField class. The search field implemented by these classes presents a standard user interface for searches, including a search button, a cancel button, and a pop-up icon menu for listing recent search strings and custom search categories.
 
-    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.
+    When the user types and then pauses, the text field's action message is sent to its target. You can query the text field's string value for the current text to search for. Do not rely on the sender of the action to be an CPMenu object because the menu may change. If you need to change the menu, modify the search menu template and call the setSearchMenuTemplate: method to update.    
 */
 @implementation CPSearchField : CPTextField
 {
@@ -54,7 +58,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
     CPString    _recentsAutosaveName;
     CPArray     _recentSearches;
-
+    
     int         _maximumRecents;
     BOOL        _sendsWholeSearchString;
     BOOL        _sendsSearchStringImmediately;
@@ -67,15 +71,16 @@ var RECENT_SEARCH_PREFIX = @"   ";
     return @"searchfield"
 }
 
-+ (CPDictionary)themeAttributes
++ (void)initialize
 {
-    return [CPDictionary dictionaryWithJSObject:
-        {
-            @"image-search": [CPNull null],
-            @"image-find": [CPNull null],
-            @"image-cancel": [CPNull null],
-            @"image-cancel-pressed": [CPNull null]
-        }];
+    if (self != [CPSearchField class])
+        return;
+
+    var bundle = [CPBundle bundleForClass:self];
+    CPSearchFieldSearchImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldSearch.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    CPSearchFieldFindImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldFind.png"] size:_CGSizeMake(SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    CPSearchFieldCancelImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancel.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
+    CPSearchFieldCancelPressedImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPSearchField/CPSearchFieldCancelPressed.png"] size:_CGSizeMake(CANCEL_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT)];
 }
 
 - (id)initWithFrame:(CGRect)frame
@@ -91,9 +96,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 #if PLATFORM(DOM)
         _cancelButton._DOMElement.style.cursor = "default";
         _searchButton._DOMElement.style.cursor = "default";
-#endif
+#endif          
     }
-
+    
     return self;
 }
 
@@ -105,45 +110,34 @@ var RECENT_SEARCH_PREFIX = @"   ";
     [self setBezelStyle:CPTextFieldRoundedBezel];
     [self setBordered:YES];
     [self setEditable:YES];
+    [self setDelegate:self];
     [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];
@@ -166,10 +160,10 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)resetSearchButton
 {
     var button = [self searchButton],
-        searchButtonImage = (_searchMenuTemplate === nil) ? [self valueForThemeAttribute:@"image-search"] : [self valueForThemeAttribute:@"image-find"];
-
+        searchButtonImage = (_searchMenuTemplate === nil) ? CPSearchFieldSearchImage : CPSearchFieldFindImage;
+    
     [button setBordered:NO];
-    [button setImageScaling:CPImageScaleAxesIndependently];
+    [button setImageScaling:CPScaleToFit];
     [button setImage:searchButtonImage];
     [button setAutoresizingMask:CPViewMaxXMargin];
 }
@@ -184,12 +178,11 @@ var RECENT_SEARCH_PREFIX = @"   ";
     {
         [_cancelButton removeFromSuperview];
         _cancelButton = button;
-
+        
         [_cancelButton setFrame:[self cancelButtonRectForBounds:[self bounds]]];
         [_cancelButton setAutoresizingMask:CPViewMinXMargin];
         [_cancelButton setTarget:self];
-        [_cancelButton setAction:@selector(cancelOperation:)];
-        [_cancelButton setButtonType:CPMomentaryChangeButton];
+        [_cancelButton setAction:@selector(_searchFieldCancel:)];   
         [self _updateCancelButtonVisibility];
         [self addSubview:_cancelButton];
     }
@@ -206,18 +199,18 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
 /*!
     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.
+    This method resets the target, action, regular image, and pressed image. By default, when users click the cancel button, the delete: action message is sent up the responder chain. This method gives you a way to customize the cancel button for specific situations and then reset the button defaults without having to undo changes individually.
 */
 - (void)resetCancelButton
 {
     var button = [self cancelButton];
     [button setBordered:NO];
-    [button setImageScaling:CPImageScaleAxesIndependently];
-    [button setImage:[self valueForThemeAttribute:@"image-cancel"]];
-    [button setAlternateImage:[self valueForThemeAttribute:@"image-cancel-pressed"]];
+    [button setImageScaling:CPScaleToFit];
+    [button setImage:CPSearchFieldCancelImage];
+    [button setAlternateImage:CPSearchFieldCancelPressedImage];
     [button setAutoresizingMask:CPViewMinXMargin];
     [button setTarget:self];
-    [button setAction:@selector(cancelOperation:)];
+    [button setAction:@selector(_searchFieldCancel:)];
 }
 
 // Custom Layout
@@ -229,22 +222,22 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchTextRectForBounds:(CGRect)rect
 {
-    var leftOffset = 0,
+    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));
 }
 
@@ -255,9 +248,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CGRect)searchButtonRectForBounds:(CGRect)rect
 {
-    var size = [[self valueForThemeAttribute:@"image-search"] size] || CGSizeMakeZero();
-
-    return _CGRectMake(5, (_CGRectGetHeight(rect) - size.height) / 2, size.width, size.height);
+    return _CGRectMake(5, (_CGRectGetHeight(rect) - BUTTON_DEFAULT_HEIGHT) / 2, SEARCH_BUTTON_DEFAULT_WIDTH, BUTTON_DEFAULT_HEIGHT);
 }
 
 /*!
@@ -266,10 +257,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
     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
-{
-    var size = [[self valueForThemeAttribute:@"image-cancel"] size] || CGSizeMakeZero();
-
-    return _CGRectMake(_CGRectGetWidth(rect) - size.width - 5, (_CGRectGetHeight(rect) - size.width) / 2, size.height, size.height);
+{    
+    return _CGRectMake(_CGRectGetWidth(rect) - CANCEL_BUTTON_DEFAULT_WIDTH - 5, (_CGRectGetHeight(rect) - CANCEL_BUTTON_DEFAULT_WIDTH) / 2, BUTTON_DEFAULT_HEIGHT, BUTTON_DEFAULT_HEIGHT);
 }
 
 // Managing Menu Templates
@@ -290,7 +279,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)setSearchMenuTemplate:(CPMenu)aMenu
 {
     _searchMenuTemplate = aMenu;
-
+    
     [self resetSearchButton];
     [self _loadRecentSearchList];
     [self _updateSearchMenu];
@@ -302,8 +291,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
     @return \c YES if the action message is sent all at once when the user clicks the search button or presses return; otherwise, NO if the search string is sent after each keystroke. The default value is NO.
 */
 - (BOOL)sendsWholeSearchString
-{
-    return _sendsWholeSearchString;
+{ 
+    return _sendsWholeSearchString; 
 }
 
 /*!
@@ -320,8 +309,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
     @return \c YES if the text field sends its action immediately upon notification of any changes to the search field; otherwise, NO.
 */
 - (BOOL)sendsSearchStringImmediately
-{
-    return _sendsSearchStringImmediately;
+{ 
+    return _sendsSearchStringImmediately; 
 }
 
 /*!
@@ -339,7 +328,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
     @return The maximum number of search strings that can appear in the menu. This value is between 0 and 254.
 */
 - (int)maximumRecents
-{
+{ 
     return _maximumRecents;
 }
 
@@ -353,13 +342,13 @@ var RECENT_SEARCH_PREFIX = @"   ";
         max = 254;
     else if (max < 0)
         max = 10;
-
+    
     _maximumRecents = max;
 }
 
 /*!
     Returns the list of recent search strings for the control.
-    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty.
+    @return An array of \c CPString objects, each of which contains a search string either displayed in the search menu or from a recent autosave archive. If there have been no recent searches and no prior searches saved under an autosave name, this array may be empty. 
  */
 - (CPArray)recentSearches
 {
@@ -375,8 +364,8 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     var max = MIN([self maximumRecents], [searches count]),
         searches = [searches subarrayWithRange:CPMakeRange(0, max)];
-
-    _recentSearches = searches;
+    
+    _recentSearches = searches;    
     [self _autosaveRecentSearchList];
 }
 
@@ -386,7 +375,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 */
 - (CPString)recentsAutosaveName
 {
-    return _recentsAutosaveName;
+    return _recentsAutosaveName; 
 }
 
 /*!
@@ -397,9 +386,9 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     if (_recentsAutosaveName != nil)
         [self _deregisterForAutosaveNotification];
-
+        
     _recentsAutosaveName = name;
-
+    
     if (_recentsAutosaveName != nil)
       [self _registerForAutosaveNotification];
 }
@@ -408,13 +397,13 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
 - (CGRect)contentRectForBounds:(CGRect)bounds
 {
-    var superbounds = [super contentRectForBounds:bounds];
+    var superbounds = [super contentRectForBounds:bounds];    
     return [self searchTextRectForBounds:superbounds];
 }
 
 + (double)_keyboardDelayForPartialSearchString:(CPString)string
 {
-    return (6 - MIN([string length], 4)) / 10;
+    return (6 - MIN([string length],4))/10;
 }
 
 - (CPMenu)menu
@@ -432,7 +421,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
     [_cancelButton setHidden:([[self stringValue] length] === 0)];
 }
 
-- (void)_searchFieldTextDidChange:(CPNotification)aNotification
+- (void)controlTextDidChange:(CPNotification)aNotification
 {
     if (![self sendsWholeSearchString])
     {
@@ -442,15 +431,15 @@ var RECENT_SEARCH_PREFIX = @"   ";
         {
             [_partialStringTimer invalidate];
             var timeInterval = [CPSearchField _keyboardDelayForPartialSearchString:[self stringValue]];
-
-            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval
-                                                                   target:self
-                                                                 selector:@selector(_sendPartialString)
-                                                                 userInfo:nil
-                                                                  repeats:NO];
+    
+            _partialStringTimer = [CPTimer scheduledTimerWithTimeInterval:timeInterval 
+                                                                   target:self 
+                                                                 selector:@selector(_sendPartialString) 
+                                                                 userInfo:nil 
+                                                                  repeats:NO];         
         }
     }
-
+    
     [self _updateCancelButtonVisibility];
 }
 
@@ -473,7 +462,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     if (string === nil || string === @"" || [_recentSearches containsObject:string])
         return;
-
+        
     var searches = [CPMutableArray arrayWithArray:_recentSearches];
     [searches addObject:string];
     [self setRecentSearches:searches];
@@ -482,7 +471,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
 - (CPView)hitTest:(CGPoint)aPoint
 {
-    // Make sure a hit anywhere within the search field returns the search field itself
+    // Make sure a hit anywhere within the search field returns the search field itself    
     if (_CGRectContainsPoint([self frame], aPoint))
         return self;
     else
@@ -502,15 +491,10 @@ var RECENT_SEARCH_PREFIX = @"   ";
     if (_CGRectContainsPoint([self searchButtonRectForBounds:[self bounds]], point))
     {
         if (_searchMenuTemplate == nil)
-        {
-            if ([_searchButton target] && [_searchButton action])
-                [_searchButton mouseDown:anEvent];
-            else
-                [self _sendAction:self];
-        }
+            [self _sendAction:self];
         else
-           [self _showMenu];
-    }
+           [self _showMenu];  
+    }        
     else if (_CGRectContainsPoint([self cancelButtonRectForBounds:[self bounds]], point))
         [_cancelButton mouseDown:anEvent];
     else
@@ -520,69 +504,69 @@ var RECENT_SEARCH_PREFIX = @"   ";
 /*!
     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:)
+    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.
+        
+    Be sure that your custom items do not use tags in the range 1000-1004 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],
+    var template = [[CPMenu alloc] init], 
         item;
-
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent Searches"
-                                      action:nil
+        
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent Searches" 
+                                      action:nil 
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldRecentsTitleMenuItemTag];
     [item setEnabled:NO];
     [template addItem:item];
-
-    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item"
-                                      action:@selector(_searchFieldSearch:)
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"Recent search item" 
+                                      action:@selector(_searchFieldSearch:) 
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldRecentsMenuItemTag];
     [item setTarget:self];
     [template addItem:item];
-
-    item = [[CPMenuItem alloc] initWithTitle:@"Clear Recent Searches"
-                                      action:@selector(_searchFieldClearRecents:)
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"Clear Recent Searches" 
+                                      action:@selector(_searchFieldClearRecents:) 
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldClearRecentsMenuItemTag];
     [item setTarget:self];
     [template addItem:item];
-
-    item = [[CPMenuItem alloc] initWithTitle:@"No Recent Searches"
-                                      action:nil
+    
+    item = [[CPMenuItem alloc] initWithTitle:@"No Recent Searches" 
+                                      action:nil 
                                keyEquivalent:@""];
     [item setTag:CPSearchFieldNoRecentsMenuItemTag];
     [item setEnabled:NO];
     [template addItem:item];
-
+    
     return template;
 }
 
@@ -590,66 +574,72 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     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
+                    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;
-            }
-
+                
+            case CPSearchFieldSeparatorMenuItemTag:
+                item = [CPMenuItem separatorItem];
+                [item setEnabled:NO];
+                [menu addItem:item];
+                continue;
+        }
+        
         [item setEnabled:([item isEnabled] && [item action] != nil && [item target] != nil)];
         [menu addItem:item];
     }
-
+    
     [menu setDelegate:self];
 
     _searchMenu = menu;
@@ -670,7 +660,7 @@ var RECENT_SEARCH_PREFIX = @"   ";
 - (void)menuDidClose:(CPMenu)menu
 {
     _canResignFirstResponder = YES;
-
+    
     [self becomeFirstResponder];
 }
 
@@ -678,12 +668,12 @@ var RECENT_SEARCH_PREFIX = @"   ";
 {
     if (_searchMenu === nil || [_searchMenu numberOfItems] === 0 || ![self isEnabled])
         return;
-
+        
     var aFrame = [[self superview] convertRect:[self frame] toView:nil],
-        location = CGPointMake(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
-
+        location = CPMakePoint(aFrame.origin.x + 10, aFrame.origin.y + aFrame.size.height - 4);
+    
     var anEvent = [CPEvent mouseEventWithType:CPRightMouseDown location:location modifierFlags:0 timestamp:[[CPApp currentEvent] timestamp] windowNumber:[[self window] windowNumber] context:nil eventNumber:1 clickCount:1 pressure:0];
-
+    
     [self selectAll:nil];
     [CPMenu popUpContextMenu:_searchMenu withEvent:anEvent forView:self];
 }
@@ -694,25 +684,24 @@ var RECENT_SEARCH_PREFIX = @"   ";
     [_partialStringTimer invalidate];
 }
 
-- (void)cancelOperation:(id)sender
-{
+- (void)_searchFieldCancel:(id)sender
+{   
     [self setObjectValue:@""];
-    [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
-
+    [self _sendPartialString];
     [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];
 }
 
@@ -726,36 +715,54 @@ var RECENT_SEARCH_PREFIX = @"   ";
 
 - (void)_registerForAutosaveNotification
 {
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
+    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_updateAutosavedRecents:) name:@"CPAutosavedRecentsChangedNotification" object:nil];
 }
 
 - (void)_deregisterForAutosaveNotification
 {
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
+    [[CPNotificationCenter defaultCenter] removeObserver:self name:@"CPAutosavedRecentsChangedNotification" object:nil];
 }
 
 - (void)_autosaveRecentSearchList
-{
-    if (_recentsAutosaveName != nil)
-        [[CPNotificationCenter defaultCenter] postNotificationName:CPAutosavedRecentsChangedNotification object:_recentsAutosaveName];
+{  
+    if (_recentsAutosaveName != nil) 
+        [[CPNotificationCenter defaultCenter] postNotificationName:@"CPAutosavedRecentsChangedNotification" object:_recentsAutosaveName];
 }
 
 - (void)_updateAutosavedRecents:(id)notification
 {
-    var name = [notification object];
-    [[CPUserDefaults standardUserDefaults] setObject:_recentSearches forKey:name];
+    var list = [self recentSearches],
+        name = [notification object],
+        bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
+        cookie_name = [bundle_name lowercaseString] + "." + [notification object],
+
+        cookie = [[CPCookie alloc] initWithName:cookie_name],
+        cookie_value = [list componentsJoinedByString:@","];
+    
+    [cookie setValue:cookie_value 
+             expires:[[CPDate alloc] initWithTimeIntervalSinceNow:3600*24*365] 
+              domain:(window.location.href.hostname)];
 }
 
 - (void)_loadRecentSearchList
 {
-    var name = [self recentsAutosaveName];
+    var list,
+        name = [self recentsAutosaveName];
+    
     if (name === nil)
         return;
 
-    var list = [[CPUserDefaults standardUserDefaults] objectForKey:name];
+    var bundle_name = [[[CPBundle mainBundle] infoDictionary] objectForKey:"CPBundleName"],
+        cookie_name = [bundle_name lowercaseString] + "." + name,     
 
-    if (list !== nil)
+        cookie = [[CPCookie alloc] initWithName:cookie_name];
+
+    if (cookie != nil)
+    {
+        var cookie_value = [cookie value];
+        list = (cookie_value != @"") ? [cookie_value componentsSeparatedByString:@","] : [CPArray array];
         _recentSearches = list;
+    }
 }
 
 @end
@@ -773,7 +780,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
     [_searchButton removeFromSuperview];
     [_cancelButton removeFromSuperview];
 
-    [super encodeWithCoder:coder];
+    [super encodeWithCoder:coder];    
 
     if (_searchButton)
         [self addSubview:_searchButton];
@@ -786,7 +793,7 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
 
     if (_recentsAutosaveName)
         [coder encodeObject:_recentsAutosaveName forKey:CPRecentsAutosaveNameKey];
-
+        
     if (_searchMenuTemplate)
         [coder encodeObject:_searchMenuTemplate forKey:CPSearchMenuTemplateKey];
 }
@@ -795,16 +802,16 @@ var CPRecentsAutosaveNameKey            = @"CPRecentsAutosaveNameKey",
 {
     if (self = [super initWithCoder:coder])
     {
-        [self setRecentsAutosaveName:[coder decodeObjectForKey:CPRecentsAutosaveNameKey]];
+        _recentsAutosaveName      = [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];
     }
 

AppKit/CPSecureTextField.j

@@ -1,24 +1,3 @@
-/*
- * 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"
 

AppKit/CPSegmentedControl.j

@@ -23,10 +23,7 @@
 @import <Foundation/CPArray.j>
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "_CPImageAndTextView.j"
 
-@global CPApp
 
 CPSegmentSwitchTrackingSelectOne = 0;
 CPSegmentSwitchTrackingSelectAny = 1;
@@ -58,7 +55,7 @@ CPSegmentSwitchTrackingMomentary = 2;
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPImageScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
+    return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0]
                                        forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]];
 }
 
@@ -97,9 +94,7 @@ 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)
     {
@@ -118,16 +113,6 @@ CPSegmentSwitchTrackingMomentary = 2;
     if (_selectedSegment >= _segments.length)
         _selectedSegment = -1;
 
-    var thickness = [self currentValueForThemeAttribute:@"divider-thickness"],
-        frame = [self frame],
-        widthOfAllSegments = 0,
-        dividerExtraSpace = ([_segments count] - 1) * thickness;
-
-    for (var i = 0; i < [_segments count]; i++)
-        widthOfAllSegments += [_segments[i] width];
-
-    [self setFrameSize:CGSizeMake(widthOfAllSegments + dividerExtraSpace, frame.size.height)];
-
     [self tileWithChangedSegment:0];
 }
 
@@ -366,19 +351,16 @@ CPSegmentSwitchTrackingMomentary = 2;
 }
 
 /*!
-    Enables/disables the specified segment.
+    Enables/diables the specified segment.
     @param isEnabled \c YES enables the segment
-    @param aSegment the segment to enable/disable
+    @param aSegment the segment to enable/disble
     @throws CPRangeException if \c aSegment is out of bounds
 */
-- (void)setEnabled:(BOOL)shouldBeEnabled forSegment:(unsigned)aSegment
+- (void)setEnabled:(BOOL)isEnabled forSegment:(unsigned)aSegment
 {
-    if ([_segments[aSegment] enabled] === shouldBeEnabled)
-        return;
+    [_segments[aSegment] setEnabled:isEnabled];
 
-    [_segments[aSegment] setEnabled:shouldBeEnabled];
-
-    if (shouldBeEnabled)
+    if (isEnabled)
         _themeStates[aSegment] &= ~CPThemeStateDisabled;
     else
         _themeStates[aSegment] |= CPThemeStateDisabled;
@@ -468,7 +450,7 @@ CPSegmentSwitchTrackingMomentary = 2;
     }
     else if (aName === "right-segment-bezel")
     {
-        return CGRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
+        return CPRectMake(CGRectGetWidth([self bounds]) - contentInset.right,
                             bezelInset.top,
                             contentInset.right,
                             height);
@@ -625,7 +607,7 @@ CPSegmentSwitchTrackingMomentary = 2;
         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)
     {
@@ -804,7 +786,6 @@ CPSegmentSwitchTrackingMomentary = 2;
             return;
 
         var highlighted = [self testSegment:location] === _trackingSegment;
-
         if (highlighted != _trackingHighlighted)
         {
             _trackingHighlighted = highlighted;

AppKit/CPShadow.j

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

AppKit/CPShadowView.j

@@ -24,44 +24,71 @@
 
 @import "CGGeometry.j"
 @import "CPImage.j"
+@import "CPImageView.j"
 @import "CPView.j"
 
 
 CPLightShadow   = 0;
 CPHeavyShadow   = 1;
 
-CPThemeStateShadowViewLight = CPThemeState("shadowview-style-light");
-CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
+var CPShadowViewLightBackgroundColor    = nil,
+    CPShadowViewHeavyBackgroundColor    = nil;
 
+var LIGHT_LEFT_INSET    = 3.0,
+    LIGHT_RIGHT_INSET   = 3.0,
+    LIGHT_TOP_INSET     = 3.0,
+    LIGHT_BOTTOM_INSET  = 5.0,
+
+    HEAVY_LEFT_INSET    = 7.0,
+    HEAVY_RIGHT_INSET   = 7.0,
+    HEAVY_TOP_INSET     = 5.0,
+    HEAVY_BOTTOM_INSET  = 5.0;
 
 /*!
     @ingroup appkit
 */
+
 @implementation CPShadowView : CPView
 {
     CPShadowWeight  _weight;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return "shadow-view";
-}
+    if (self != [CPShadowView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithJSObject:
-        {
-            @"bezel-color": [CPNull null],
-            @"content-inset": CGInsetMakeZero()
-        }];
-}
+    var bundle = [CPBundle bundleForClass:[self class]];
 
-+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
-{
-    var shadowView = [CPShadowView new],
-        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];
+    CPShadowViewLightBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTop.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightTopRight.png"] size:CGSizeMake(9.0, 9.0)],
 
-    return CGRectMake(_CGRectGetMinX(aFrame) - inset.left, _CGRectGetMinY(aFrame) - inset.top, _CGRectGetWidth(aFrame) + inset.left + inset.right, _CGRectGetHeight(aFrame) + inset.top + inset.bottom);
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightLeft.png"] size:CGSizeMake(9.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightRight.png"] size:CGSizeMake(9.0, 1.0)],
+
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomLeft.png"] size:CGSizeMake(9.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottom.png"] size:CGSizeMake(1.0, 9.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewLightBottomRight.png"] size:CGSizeMake(9.0, 9.0)]
+        ]]];
+
+    CPShadowViewHeavyBackgroundColor = [CPColor colorWithPatternImage:[[CPNinePartImage alloc] initWithImageSlices:
+        [
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTop.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyTopRight.png"] size:CGSizeMake(17.0, 17.0)],
+
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyLeft.png"] size:CGSizeMake(17.0, 1.0)],
+            nil,
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyRight.png"] size:CGSizeMake(17.0, 1.0)],
+
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomLeft.png"] size:CGSizeMake(17.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottom.png"] size:CGSizeMake(1.0, 17.0)],
+            [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"CPShadowView/CPShadowViewHeavyBottomRight.png"] size:CGSizeMake(17.0, 17.0)]
+        ]]];
 }
 
 + (id)shadowViewEnclosingView:(CPView)aView
@@ -71,25 +98,20 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
 
 + (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
 {
-    var shadowView = [[self alloc] initWithFrame:[aView frame]];
+    var shadowView = [[CPShadowView alloc] initWithFrame:[aView frame]];
+    [shadowView setWeight:aWeight];
 
-    if (shadowView)
-    {
-        [shadowView setWeight:aWeight];
+    var size = [shadowView frame].size,
+        width = size.width - [shadowView leftInset] - [shadowView rightInset],
+        height = size.height - [shadowView topInset] - [shadowView bottomInset],
+        enclosingView = [aView superview];
 
-        var size = [shadowView frame].size,
-            inset = [shadowView currentValueForThemeAttribute:@"content-inset"],
-            width = size.width - inset.left - inset.right,
-            height = size.height - inset.top - inset.bottom,
-            enclosingView = [aView superview];
-
-        [shadowView setHitTests:[aView hitTests]];
-        [shadowView setAutoresizingMask:[aView autoresizingMask]];
-        [aView removeFromSuperview];
-        [shadowView addSubview:aView];
-        [aView setFrame:CGRectMake(inset.left, inset.top, width, height)];
-        [enclosingView addSubview:shadowView];
-    }
+    [shadowView setHitTests:[aView hitTests]];
+    [shadowView setAutoresizingMask:[aView autoresizingMask]];
+    [aView removeFromSuperview];
+    [shadowView addSubview:aView];
+    [aView setFrame:CGRectMake([shadowView leftInset], [shadowView topInset], width, height)]
+    [enclosingView addSubview:shadowView];
 
     return shadowView;
 }
@@ -100,7 +122,9 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
 
     if (self)
     {
-        [self setWeight:CPLightShadow];
+        _weight = CPLightShadow;
+
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
         [self setHitTests:NO];
     }
@@ -116,45 +140,54 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     _weight = aWeight;
 
     if (_weight == CPLightShadow)
-        [self setThemeState:CPThemeStateShadowViewLight];
-    else
-        [self setThemeState:CPThemeStateShadowViewHeavy];
+        [self setBackgroundColor:CPShadowViewLightBackgroundColor];
 
-    [self setNeedsLayout];
+    else
+        [self setBackgroundColor:CPShadowViewHeavyBackgroundColor];
 }
 
 - (float)leftInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].left;
+    return _weight == CPLightShadow ? LIGHT_LEFT_INSET : HEAVY_LEFT_INSET;
 }
 
 - (float)rightInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].right;
+    return _weight == CPLightShadow ? LIGHT_RIGHT_INSET : HEAVY_RIGHT_INSET;
 }
 
 - (float)topInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].top;
+    return _weight == CPLightShadow ? LIGHT_TOP_INSET : HEAVY_TOP_INSET;
 }
 
 - (float)bottomInset
 {
-    return [self currentValueForThemeAttribute:@"content-inset"].bottom;
+    return _weight == CPLightShadow ? LIGHT_BOTTOM_INSET : HEAVY_BOTTOM_INSET;
 }
 
 - (float)horizontalInset
 {
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
+    if (_weight == CPLightShadow)
+        return LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET;
 
-    return currentContentInset.left + currentContentInset.right;
+    return HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET;
 }
 
 - (float)verticalInset
 {
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
+    if (_weight == CPLightShadow)
+        return LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET;
 
-    return currentContentInset.top + currentContentInset.bottom;
+    return HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET;
+}
+
++ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
+{
+    if (aWeight == CPLightShadow)
+        return CGRectMake(_CGRectGetMinX(aFrame) - LIGHT_LEFT_INSET, _CGRectGetMinY(aFrame) - LIGHT_TOP_INSET, _CGRectGetWidth(aFrame) + LIGHT_LEFT_INSET + LIGHT_RIGHT_INSET, _CGRectGetHeight(aFrame) + LIGHT_TOP_INSET + LIGHT_BOTTOM_INSET);
+    else
+        return CGRectMake(_CGRectGetMinX(aFrame) - HEAVY_LEFT_INSET, _CGRectGetMinY(aFrame) - HEAVY_TOP_INSET, _CGRectGetWidth(aFrame) + HEAVY_LEFT_INSET + HEAVY_RIGHT_INSET, _CGRectGetHeight(aFrame) + HEAVY_TOP_INSET + HEAVY_BOTTOM_INSET);
 }
 
 - (CGRect)frameForContentFrame:(CGRect)aFrame
@@ -167,11 +200,4 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
     [self setFrame:[self frameForContentFrame:aFrame]];
 }
 
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-}
-
 @end

AppKit/CPSlider.j

@@ -21,7 +21,6 @@
  */
 
 @import "CPControl.j"
-@import "CPWindow_Constants.j"
 
 
 /*! SLIDER STATES */
@@ -40,8 +39,6 @@ CPCircularSlider    = 1;
     double          _altIncrementValue;
 
     BOOL            _isVertical;
-
-    CGSize          _dragOffset;
 }
 
 + (CPString)defaultThemeClass
@@ -385,14 +382,9 @@ CPCircularSlider    = 1;
     [self setNeedsDisplay:YES];
 }
 
-- (BOOL)isContinuous
-{
-    return (_sendActionOn & CPLeftMouseDraggedMask) !== 0;
-}
-
 /*!
     @ignore
-    should we have _continuous?
+    shoudl we have _continuous?
 */
 - (void)setContinuous:(BOOL)flag
 {
@@ -433,6 +425,8 @@ var CPSliderMinValueKey             = "CPSliderMinValueKey",
     {
         _altIncrementValue = [aCoder decodeDoubleForKey:CPSliderAltIncrValueKey];
 
+        [self setContinuous:YES];
+
         [self _recalculateIsVertical];
 
         [self setNeedsLayout];

AppKit/CPSliderColorPicker.j

@@ -20,30 +20,24 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-@import "CPColorPicker.j"
-@import "CPSlider.j"
-@import "CPTextField.j"
 @import "CPView.j"
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPSliderColorPickerMode
+@import "CPColorPicker.j"
 
 
 /*
     @ignore
 */
 @implementation CPSliderColorPicker : CPColorPicker
-{
+{    
     CPView      _contentView;
-
+    
     CPSlider    _redSlider;
     CPSlider    _greenSlider;
     CPSlider    _blueSlider;
     CPSlider    _hueSlider;
     CPSlider    _saturationSlider;
     CPSlider    _brightnessSlider;
-
+    
     CPTextField _rgbLabel;
     CPTextField _hsbLabel;
     CPTextField _redLabel;
@@ -64,234 +58,234 @@
     CPTextField _brightnessValue;
 }
 
-- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
+- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel 
 {
-    return [super initWithPickerMask:mask colorPanel:owningColorPanel];
+    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
 }
-
-- (id)initView
+  
+-(id)initView
 {
-    var 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)];
-    [_rgbLabel setStringValue:"Red, Green, Blue"];
+    [_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 setStringValue:"R"];
+    _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 setMaxValue:1.0];
-    [_redSlider setMinValue:0.0];
-    [_redSlider setTarget:self];
-    [_redSlider setAction:@selector(sliderChanged:)];
-    [_redSlider setAutoresizingMask:CPViewWidthSizable];
+    
+    _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];
 
     // red value input box
-    _redValue = [[CPTextField alloc] initWithFrame:CGRectMake(aFrame.size.width - 45, 30, 45, 28)];
-    [_redValue setAutoresizingMask:CPViewMinXMargin];
-    [_redValue setEditable:YES];
-    [_redValue setBezeled:YES];
-    [_redValue setDelegate:self];
-    [_contentView addSubview:_redValue];
+    _redValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 30, 45, 29)];
+    [_redValue setAutoresizingMask: CPViewMinXMargin];
+    [_redValue setEditable: YES];
+    [_redValue setBezeled: YES];
+    [_redValue setDelegate: self];
+    [_contentView addSubview: _redValue];
 
-    _greenLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 63, 15, 20)];
-    [_greenLabel setStringValue:"G"];
+    _greenLabel = [[CPTextField alloc] initWithFrame: 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 setMaxValue:1.0];
-    [_greenSlider setMinValue:0.0];
-    [_greenSlider setTarget:self];
-    [_greenSlider setAction:@selector(sliderChanged:)];
-    [_greenSlider setAutoresizingMask:CPViewWidthSizable];
+    _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];
+    _greenValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 53, 45, 29)];
+    [_greenValue setAutoresizingMask: CPViewMinXMargin];
+    [_greenValue setEditable: YES];
+    [_greenValue setBezeled: YES];
+    [_greenValue setDelegate: self];
+    [_contentView addSubview: _greenValue];
 
-    _blueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 90, 15, 20)];
-    [_blueLabel setStringValue:"B"];
+    _blueLabel = [[CPTextField alloc] initWithFrame: 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 setMaxValue:1.0];
-    [_blueSlider setMinValue:0.0];
-    [_blueSlider setTarget:self];
-    [_blueSlider setAction:@selector(sliderChanged:)];
-    [_blueSlider setAutoresizingMask:CPViewWidthSizable];
+    _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];
+    _blueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 76, 45, 29)];
+    [_blueValue setAutoresizingMask: CPViewMinXMargin];
+    [_blueValue setEditable: YES];
+    [_blueValue setBezeled: YES];
+    [_blueValue setDelegate: self];
+    [_contentView addSubview: _blueValue];
 
-    _hsbLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 120, 190, 20)];
-    [_hsbLabel setStringValue:"Hue, Saturation, Brightness"];
+    _hsbLabel = [[CPTextField alloc] initWithFrame: CPRectMake(0, 120, 190, 20)];
+    [_hsbLabel setStringValue: "Hue, Saturation, Brightness"];
     [_hsbLabel setTextColor:[CPColor blackColor]];
 
-    _hueLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 145, 15, 20)];
-    [_hueLabel setStringValue:"H"];
+    _hueLabel = [[CPTextField alloc] initWithFrame: 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 setMaxValue:359.0];
-    [_hueSlider setMinValue:0.0];
-    [_hueSlider setTarget:self];
-    [_hueSlider setAction:@selector(sliderChanged:)];
-    [_hueSlider setAutoresizingMask:CPViewWidthSizable];
+    
+    _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];
+    _hueValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 140, 45, 29)];
+    [_hueValue setAutoresizingMask: CPViewMinXMargin];
+    [_hueValue setEditable: YES];
+    [_hueValue setBezeled: YES];
+    [_hueValue setDelegate: self];
+    [_contentView addSubview: _hueValue];
 
-    _saturationLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 170, 15, 20)];
-    [_saturationLabel setStringValue:"S"];
+    _saturationLabel = [[CPTextField alloc] initWithFrame: 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 setMaxValue:100.0];
-    [_saturationSlider setMinValue:0.0];
-    [_saturationSlider setTarget:self];
-    [_saturationSlider setAction:@selector(sliderChanged:)];
-    [_saturationSlider setAutoresizingMask:CPViewWidthSizable];
+    _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];
+    _saturationValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 163, 45, 29)];
+    [_saturationValue setAutoresizingMask: CPViewMinXMargin];
+    [_saturationValue setEditable: YES];
+    [_saturationValue setBezeled: YES];
+    [_saturationValue setDelegate: self];
+    [_contentView addSubview: _saturationValue];
 
-    _brightnessLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 196, 15, 20)];
-    [_brightnessLabel setStringValue:"B"];
+    _brightnessLabel = [[CPTextField alloc] initWithFrame: 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 setMaxValue:100.0];
-    [_brightnessSlider setMinValue:0.0];
-    [_brightnessSlider setTarget:self];
-    [_brightnessSlider setAction:@selector(sliderChanged:)];
-    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable];
+    _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];
+    _brightnessValue = [[CPTextField alloc] initWithFrame: CGRectMake(aFrame.size.width - 45, 186, 45, 29)];
+    [_brightnessValue setAutoresizingMask: CPViewMinXMargin];
+    [_brightnessValue setEditable: YES];
+    [_brightnessValue setBezeled: YES];
+    [_brightnessValue setDelegate: self];
+    [_contentView addSubview: _brightnessValue];
 
-    _hexLabel = [[CPTextField alloc] initWithFrame:CGRectMake(0, 230, 30, 20)];
-    [_hexLabel setStringValue:"Hex"];
+    _hexLabel = [[CPTextField alloc] initWithFrame: 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 = [[CPTextField alloc] initWithFrame: CGRectMake(32, 225, 80, 29)];
+    [_hexValue setEditable: YES];
+    [_hexValue setBezeled: YES];
+    [_hexValue setDelegate: self];
+    [_contentView addSubview: _hexValue];
 
-    [_contentView addSubview:_rgbLabel];
-    [_contentView addSubview:_redLabel];
-    [_contentView addSubview:_greenLabel];
-    [_contentView addSubview:_blueLabel];
-    [_contentView addSubview:_redSlider];
-    [_contentView addSubview:_greenSlider];
-    [_contentView addSubview:_blueSlider];
-
-    [_contentView addSubview:_hsbLabel];
-    [_contentView addSubview:_hueLabel];
-    [_contentView addSubview:_saturationLabel];
-    [_contentView addSubview:_brightnessLabel];
-    [_contentView addSubview:_hueSlider];
-    [_contentView addSubview:_saturationSlider];
-    [_contentView addSubview:_brightnessSlider];
-
-    [_contentView addSubview:_hexLabel];
+    [_contentView addSubview: _rgbLabel];
+    [_contentView addSubview: _redLabel];
+    [_contentView addSubview: _greenLabel];
+    [_contentView addSubview: _blueLabel];
+    [_contentView addSubview: _redSlider];
+    [_contentView addSubview: _greenSlider];
+    [_contentView addSubview: _blueSlider];
+    
+    [_contentView addSubview: _hsbLabel];
+    [_contentView addSubview: _hueLabel];
+    [_contentView addSubview: _saturationLabel];
+    [_contentView addSubview: _brightnessLabel];
+    [_contentView addSubview: _hueSlider];
+    [_contentView addSubview: _saturationSlider];
+    [_contentView addSubview: _brightnessSlider];
+    
+    [_contentView addSubview: _hexLabel];
 }
 
-- (CPView)provideNewView:(BOOL)initialRequest
+- (CPView)provideNewView:(BOOL)initialRequest 
 {
-    if (initialRequest)
+    if (initialRequest) 
         [self initView];
-
+    
     return _contentView;
 }
 
-- (int)currentMode
+- (int)currentMode 
 {
     return CPSliderColorPickerMode;
 }
 
-- (BOOL)supportsMode:(int)mode
+- (BOOL)supportsMode:(int)mode 
 {
     return (mode == CPSliderColorPickerMode) ? YES : NO;
 }
 
-- (void)sliderChanged:(id)sender
+-(void)sliderChanged:(id)sender
 {
     var newColor,
         colorPanel = [self colorPanel],
         alpha = [colorPanel opacity];
 
-    switch (sender)
+    switch(sender)
     {
         case    _hueSlider:
         case    _saturationSlider:
-        case    _brightnessSlider:      newColor = [CPColor colorWithHue:[_hueSlider floatValue]
-                                                              saturation:[_saturationSlider floatValue]
-                                                              brightness:[_brightnessSlider floatValue]
-                                                                   alpha:alpha];
-
-                                        [self updateRGBSliders:newColor];
+        case    _brightnessSlider:      newColor = [CPColor colorWithHue: [_hueSlider floatValue]
+                                                              saturation: [_saturationSlider floatValue]
+                                                              brightness: [_brightnessSlider floatValue]
+                                                                   alpha: alpha];
+                                                              
+                                        [self updateRGBSliders: newColor];
                                         break;
-
+                                        
         case    _redSlider:
         case    _greenSlider:
-        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed:[_redSlider floatValue]
-                                                                             green:[_greenSlider floatValue]
-                                                                              blue:[_blueSlider floatValue]
-                                                                             alpha:alpha];
-
-                                        [self updateHSBSliders:newColor];
+        case    _blueSlider:            newColor = [CPColor colorWithCalibratedRed: [_redSlider floatValue]
+                                                                             green: [_greenSlider floatValue]
+                                                                              blue: [_blueSlider floatValue]
+                                                                             alpha: alpha];
+                                                              
+                                        [self updateHSBSliders: newColor];
                                         break;
     }
-
+        
     [self updateLabels];
-    [self updateHex:newColor];
-    [colorPanel setColor:newColor];
+    [self updateHex: newColor];
+    [colorPanel setColor: newColor];
 }
 
-- (void)setColor:(CPColor)aColor
+-(void)setColor:(CPColor)aColor
 {
-    [self updateRGBSliders:aColor];
-    [self updateHSBSliders:aColor];
-    [self updateHex:aColor];
+    [self updateRGBSliders: aColor];
+    [self updateHSBSliders: aColor];
+    [self updateHex: aColor];
     [self updateLabels];
 }
 
-- (void)updateHSBSliders:(CPColor)aColor
+-(void)updateHSBSliders:(CPColor)aColor
 {
     var hsb = [aColor hsbComponents];
-
+        
     [_hueSlider setFloatValue:hsb[0]];
     [_saturationSlider setFloatValue:hsb[1]];
     [_brightnessSlider setFloatValue:hsb[2]];
@@ -313,13 +307,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 setStringValue: ROUND([_hueSlider floatValue])];
+    [_saturationValue setStringValue: ROUND([_saturationSlider floatValue])];
+    [_brightnessValue setStringValue: ROUND([_brightnessSlider floatValue])];
+    
+    [_redValue setStringValue: ROUND([_redSlider floatValue] * 255)];
+    [_greenValue setStringValue: ROUND([_greenSlider floatValue] * 255)];
+    [_blueValue setStringValue: ROUND([_blueSlider floatValue] * 255)];
 }
 
 - (CPImage)provideNewButtonImage
@@ -336,43 +330,36 @@
 {
     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];
+    if (field === _hexValue) {
+        var newColor = [CPColor colorWithHexString: value];
+        if (newColor) {
+            [self setColor: newColor];
+            [[self colorPanel] setColor: newColor];
         }
-    }
-    else
-    {
-        switch (field)
-        {
+    } else {
+        switch(field) {
             case _redValue:        [_redSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged:_redSlider];
+                                   [self sliderChanged: _redSlider];
                                    break;
 
             case _greenValue:      [_greenSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged:_greenSlider];
+                                   [self sliderChanged: _greenSlider];
                                    break;
 
             case _blueValue:       [_blueSlider setFloatValue:MAX(MIN(ROUND(value), 255) / 255.0, 0)];
-                                   [self sliderChanged:_blueSlider];
+                                   [self sliderChanged: _blueSlider];
                                    break;
 
             case _hueValue:        [_hueSlider setFloatValue:MAX(MIN(ROUND(value), 360), 0)];
-                                   [self sliderChanged:_hueSlider];
+                                   [self sliderChanged: _hueSlider];
                                    break;
 
             case _saturationValue: [_saturationSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged:_saturationSlider];
+                                   [self sliderChanged: _saturationSlider];
                                    break;
 
             case _brightnessValue: [_brightnessSlider setFloatValue:MAX(MIN(ROUND(value), 100), 0)];
-                                   [self sliderChanged:_brightnessSlider];
+                                   [self sliderChanged: _brightnessSlider];
                                    break;
         }
     }

AppKit/CPSound.j

@@ -1,318 +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>
-@import <Foundation/CPRunLoop.j>
-
-CPSoundLoadStateEmpty       = 0;
-CPSoundLoadStateLoading     = 1;
-CPSoundLoadStateCanBePlayed = 2;
-CPSoundLoadStateError       = 3;
-
-CPSoundPlayBackStatePlay    = 0;
-CPSoundPlayBackStateStop    = 1;
-CPSoundPlayBackStatePause   = 2;
-
-
-/*!
-    CPSound provides a way to load and play sounds. In the browser it relies on the
-    HTML5 audio tag being available.
-
-    CPSound delegate:
-        - sound:didFinishPlaying: called when sound has finished to played
-
-*/
-@implementation CPSound : CPObject
-{
-    CPString            _name       @accessors(property=name);
-    id                  _delegate   @accessors(property=delegate);
-
-    BOOL                _playRequestBeforeLoad;
-    HTMLAudioElement    _audioTag;
-    int                 _loadStatus;
-    int                 _playBackStatus;
-}
-
-#pragma mark -
-#pragma mark Initialization
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _loadStatus = CPSoundLoadStateEmpty;
-//        _loops = NO;
-        _audioTag = document.createElement("audio");
-        _audioTag.preload = YES;
-        _playRequestBeforeLoad = NO;
-
-        _audioTag.addEventListener("canplay", function()
-        {
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-            [self _soundDidload];
-        }, true);
-
-        _audioTag.addEventListener("ended", function()
-        {
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-            [self _soundDidEnd];
-        }, true);
-
-        _audioTag.addEventListener("error", function()
-        {
-            [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-            [self _soundError];
-        }, true);
-    }
-
-    return self;
-}
-
-/*!
-    Initialize with the sound contents of the URL represented by aFile.
-
-    @param aFile CPString the path of the sound
-    @param byRef ignored (Cocoa compatibility)
-*/
-- (id)initWithContentsOfFile:(CPString)aFile byReference:(BOOL)byRef
-{
-    if (self = [self init])
-    {
-        _loadStatus = CPSoundLoadStateLoading;
-        _audioTag.src = aFile;
-    }
-
-    return self;
-}
-
-/*!
-    Initialize with the sound contents of the file located at aURL.
-
-    @param aURL CPURL containing the URL of the sound
-    @param byRef ignored (Cocoa compatibility)
-*/
-- (id)initWithContentsOfURL:(CPURL)aURL byReference:(BOOL)byRef
-{
-    return [self initWithContentsOfFile:[aURL absoluteString] byReference:NO];
-}
-
-/*!
-    Initialize with the sound contents of someData.
-
-    @param someData CPData containing the sound
-    @param byRef ignored (Cocoa compatibility)
-*/
-- (id)initWithData:(CPData)someData
-{
-    if (self = [self init])
-    {
-        _loadStatus = CPSoundLoadStateLoading;
-        _audioTag.src = [someData rawString];
-    }
-
-    return self;
-}
-
-
-#pragma mark -
-#pragma mark Events listener
-
-/*! @ignore
-*/
-- (void)_soundDidload
-{
-    _loadStatus = CPSoundLoadStateCanBePlayed;
-
-    if (_playRequestBeforeLoad)
-    {
-        _playRequestBeforeLoad = NO;
-        [self play];
-    }
-}
-
-/*! @ignore
-*/
-- (void)_soundDidEnd
-{
-    if (![self loops])
-        [self stop];
-}
-
-/*! @ignore
-*/
-- (void)_soundError
-{
-    _loadStatus = CPSoundLoadStateError;
-    CPLog.error("Cannot load sound. Maybe the format of your sound is not compatible with your browser.");
-}
-
-
-#pragma mark -
-#pragma mark Media controls
-
-/*!
-    Play the sound.
-
-    @return YES when the receiver is playing its audio data, NO otherwise.
-*/
-- (BOOL)play
-{
-    if (_loadStatus === CPSoundLoadStateLoading)
-    {
-        _playRequestBeforeLoad = YES;
-        return YES;
-    }
-
-    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
-        || (_playBackStatus === CPSoundPlayBackStatePlay))
-        return NO;
-
-    _audioTag.play();
-    _playBackStatus = CPSoundPlayBackStatePlay;
-
-    return YES;
-}
-
-/*!
-    Stop the sound.
-
-    @return YES when the receiver is playing its audio data, NO otherwise.
-*/
-- (BOOL)stop
-{
-    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
-        || (_playBackStatus === CPSoundPlayBackStateStop))
-        return NO;
-
-    _audioTag.pause();
-    _audioTag.currentTime = 0.0;
-    _playBackStatus = CPSoundPlayBackStateStop;
-
-    if (_delegate && [_delegate respondsToSelector:@selector(sound:didFinishPlaying:)])
-        [_delegate sound:self didFinishPlaying:YES];
-
-    return YES;
-}
-
-/*!
-    Pause the sound.
-
-    @return YES when the receiver is playing its audio data, NO otherwise.
-*/
-- (BOOL)pause
-{
-    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
-        || (_playBackStatus === CPSoundPlayBackStatePause))
-        return NO;
-
-    _audioTag.pause();
-    _playBackStatus = CPSoundPlayBackStatePause;
-
-    return YES;
-}
-
-/*!
-    Resume playback of a paused sound.
-
-    @return YES when the receiver is playing its audio data, NO otherwise.
-*/
-- (BOOL)resume
-{
-    if ((_loadStatus !== CPSoundLoadStateCanBePlayed)
-        || (_playBackStatus !== CPSoundPlayBackStatePause))
-        return NO;
-
-    _audioTag.play();
-    _playBackStatus = CPSoundPlayBackStatePlay;
-
-    return YES;
-}
-
-/*!
-    Return YES if the sound is in loop mode.
-
-    @return BOOL YES if in loop mode, NO otherwise
-*/
-- (BOOL)loops
-{
-    return _audioTag.loop;
-}
-
-/*!
-    Specifies whether the sound should repeat.
-
-    @param BOOL YES for loop mode, NO otherwise
-*/
-- (void)setLoops:(BOOL)shouldLoop
-{
-    _audioTag.loop = shouldLoop;
-}
-
-/*!
-    Returns the volume of the receiver.
-
-    @return double from 0.0 to 1.0
-*/
-- (double)volume
-{
-    return _audioTag.volume;
-}
-
-/*!
-    Set the volume the sound should be played at.
-
-    @param double a volume value between 0.0 and 1.0
-*/
-- (void)setVolume:(double)aVolume
-{
-    if (aVolume > 1.0)
-        aVolume = 1.0;
-    else if (aVolume < 0.0)
-        aVolume = 0.0;
-
-    _audioTag.volume = aVolume;
-}
-
-#pragma mark -
-#pragma mark Accessors
-
-/*!
-    Returns the duration in seconds of the sound.
-
-    @return double the duration
-*/
-- (double)duration
-{
-    return _audioTag.duration;
-}
-
-/*!
-    Returns if the sound is playing or not.
-
-    @return BOOL YES if the sound is playing, NO otherwise
-*/
-- (BOOL)isPlaying
-{
-    return (_playBackStatus === CPSoundPlayBackStatePlay);
-}
-
-@end

AppKit/CPStepper.j

@@ -1,336 +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 "CPControl.j"
-@import "CPButton.j"
-@import "CPTextField.j"
-
-
-
-/*!
-    CPStepper is an implementation of Cocoa NSStepper.
-
-    This control displays a two part button that can be used to increase or decrease a value with a given interval.
-*/
-@implementation CPStepper: CPControl
-{
-    BOOL        _valueWraps     @accessors(property=valueWraps);
-    BOOL        _autorepeat     @accessors(getter=autorepeat);
-    int         _increment      @accessors(property=increment);
-    int         _maxValue       @accessors(property=maxValue);
-    int         _minValue       @accessors(property=minValue);
-
-    CPButton    _buttonDown;
-    CPButton    _buttonUp;
-}
-
-#pragma mark -
-#pragma mark Initialization
-
-/*!
-    Initializes a CPStepper with given values.
-    @param aValue the initial value of the CPStepper
-    @param minValue the minimal acceptable value of the stepper
-    @param maxValue the maximal acceptable value of the stepper
-    @return Initialized CPStepper
-*/
-+ (CPStepper)stepperWithInitialValue:(float)aValue minValue:(float)aMinValue maxValue:(float)aMaxValue
-{
-    var stepper = [[CPStepper alloc] initWithFrame:_CGRectMakeZero()];
-
-    [stepper setDoubleValue:aValue];
-    [stepper setMinValue:aMinValue];
-    [stepper setMaxValue:aMaxValue];
-
-    // _sizeToFit will put the good size for the stepper depending of the current theme
-    [stepper _sizeToFit];
-
-    return stepper;
-}
-
-/*!
-    Initializes a CPStepper with default values:
-        - minValue = 0.0
-        - maxValue = 59.0
-        - value = 0.0
-
-    @return Initialized CPStepper
-*/
-+ (CPStepper)stepper
-{
-    return [CPStepper stepperWithInitialValue:0.0 minValue:0.0 maxValue:59.0];
-}
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
-        return [_CPStepperValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (id)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"doubleValue";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
-/*!
-    Initializes a CPStepper.
-    @param aFrame the frame of the control
-    @return initialized CPStepper
-*/
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _maxValue       = 59.0;
-        _minValue       = 0.0;
-        _increment      = 1.0;
-        _valueWraps     = YES;
-        _autorepeat     = YES;
-
-        [self setDoubleValue:0.0];
-        [self _init];
-    }
-
-    return self;
-}
-
-/*! @ignore */
-
-- (void)_init
-{
-    _buttonUp = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
-    [_buttonUp setContinuous:_autorepeat];
-    [_buttonUp setTarget:self];
-    [_buttonUp setAction:@selector(_buttonDidClick:)];
-    [_buttonUp setAutoresizingMask:CPViewNotSizable];
-    [self addSubview:_buttonUp];
-
-    _buttonDown = [[CPButton alloc] initWithFrame:_CGRectMakeZero()];
-    [_buttonDown setContinuous:_autorepeat];
-    [_buttonDown setTarget:self];
-    [_buttonDown setAction:@selector(_buttonDidClick:)];
-    [_buttonDown setAutoresizingMask:CPViewNotSizable];
-
-    [self setContinuous:_autorepeat];
-    [self addSubview:_buttonDown];
-
-    [self setNeedsLayout];
-}
-
-#pragma mark -
-#pragma mark Superclass overrides
-
-/*!
-    Set if the CPStepper is enabled or not.
-    @param shouldEnabled BOOL that define if stepper is enabled or not.
-*/
-- (void)setEnabled:(BOOL)shouldEnabled
-{
-    [super setEnabled:shouldEnabled];
-
-    [_buttonUp setEnabled:shouldEnabled];
-    [_buttonDown setEnabled:shouldEnabled];
-}
-
-
-- (void)setFrame:(CGRect)aFrame
-{
-    var upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        minSize = _CGSizeMake(upSize.width, upSize.height + downSize.height),
-        frame = _CGRectMakeCopy(aFrame);
-
-    frame.size.width = MAX(minSize.width, frame.size.width);
-    frame.size.height = MAX(minSize.height, frame.size.height);
-    [super setFrame:frame];
-}
-
-/*! @ignore */
-- (void)layoutSubviews
-{
-    var aFrame = [self frame],
-        upSize = [self valueForThemeAttribute:@"up-button-size"],
-        downSize = [self valueForThemeAttribute:@"down-button-size"],
-        upFrame = _CGRectMake(aFrame.size.width - upSize.width, 0, upSize.width, upSize.height),
-        downFrame = _CGRectMake(aFrame.size.width - downSize.width, upSize.height, downSize.width, downSize.height);
-
-    [_buttonUp setFrame:upFrame];
-    [_buttonDown setFrame:downFrame];
-
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [_buttonUp setValue:[self valueForThemeAttribute:@"bezel-color-up-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateDisabled] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateDisabled];
-    [_buttonDown setValue:[self valueForThemeAttribute:@"bezel-color-down-button" inState:CPThemeStateBordered | CPThemeStateHighlighted] forThemeAttribute:@"bezel-color" inState:CPThemeStateBordered | CPThemeStateHighlighted];
-}
-
-- (void)_sizeToFit
-{
-    [self setFrame:CGRectMake([self frameOrigin].x, [self frameOrigin].y, 0, 0)];
-}
-
-/*!
-    Set if CPStepper should autorepeat.
-    @param shouldAutoRepeat if YES, the first mouse down does one increment (decrement) and, after each delay of 0.5 seconds
-*/
-- (void)setAutorepeat:(BOOL)shouldAutoRepeat
-{
-    if (shouldAutoRepeat !== _autorepeat)
-    {
-        [_buttonUp setContinuous:shouldAutoRepeat];
-        [_buttonDown setContinuous:shouldAutoRepeat];
-    }
-
-    [self setContinuous:shouldAutoRepeat];
-}
-
-/*!
-    Set the current value of the stepper.
-    @param aValue a float containing the value
-*/
-- (void)setDoubleValue:(float)aValue
-{
-    if (aValue > _maxValue)
-        [super setDoubleValue:_valueWraps ? _minValue : _maxValue];
-    else if (aValue < _minValue)
-        [super setDoubleValue:_valueWraps ? _maxValue : _minValue];
-    else
-        [super setDoubleValue:aValue];
-}
-
-#pragma mark -
-#pragma mark Actions
-
-/*! @ignore */
-- (IBAction)_buttonDidClick:(id)aSender
-{
-    if (![self isEnabled])
-        return;
-
-    if (aSender == _buttonUp)
-        [self setDoubleValue:([self doubleValue] + _increment)];
-    else
-        [self setDoubleValue:([self doubleValue] - _increment)];
-
-    [self sendAction:[self action] to:[self target]];
-}
-
-/*!
-    Perform a programatic click on up button.
-    @param aSender sender of the action
-*/
-- (IBAction)performClickUp:(id)aSender
-{
-    [_buttonUp performClick:aSender];
-}
-
-/*!
-    Perform a programatic click on down button.
-    @param aSender sender of the action
-*/
-- (IBAction)performClickDown:(id)aSender
-{
-    [_buttonDown performClick:aSender];
-}
-
-
-#pragma mark -
-#pragma mark Theming
-
-+ (CPString)defaultThemeClass
-{
-    return @"stepper";
-}
-
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()]
-                                       forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]];
-}
-
-@end
-
-@implementation _CPStepperValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var placeholder = (aBinding == CPMaxValueBinding) ? [_source maxValue] : [_source minValue];
-
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:placeholder forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholder forMarker:CPNullMarker isDefault:YES];
-}
-
-@end
-
-var CPStepperMinValue   = @"CPStepperMinValue",
-    CPStepperMaxValue   = @"CPStepperMaxValue",
-    CPStepperValueWraps = @"CPStepperValueWraps",
-    CPStepperAutorepeat = @"CPStepperAutorepeat",
-    CPStepperIncrement  = @"CPStepperIncrement";
-
-@implementation CPStepper (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _increment  = [aCoder decodeIntForKey:CPStepperIncrement];
-        _minValue   = [aCoder decodeIntForKey:CPStepperMinValue];
-        _maxValue   = [aCoder decodeIntForKey:CPStepperMaxValue];
-        _valueWraps = [aCoder decodeBoolForKey:CPStepperValueWraps];
-        _autorepeat = [aCoder decodeBoolForKey:CPStepperAutorepeat];
-
-        [self _init];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_increment forKey:CPStepperIncrement];
-
-    if (_minValue)
-        [aCoder encodeInt:_minValue forKey:CPStepperMinValue];
-    if (_maxValue)
-        [aCoder encodeInt:_maxValue forKey:CPStepperMaxValue];
-    if (_valueWraps)
-        [aCoder encodeBool:_valueWraps forKey:CPStepperValueWraps];
-    if (_autorepeat)
-        [aCoder encodeBool:_autorepeat forKey:CPStepperAutorepeat];
-}
-
-@end

AppKit/CPStringDrawing.j

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

AppKit/CPTabView.j

@@ -1,97 +1,85 @@
-/*
- * CPTabView.j
- * AppKit
- *
- * Created by Derek Hammer.
- * Copyright 2010, Derek Hammer.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
 @import "CPBox.j"
 @import "CPSegmentedControl.j"
 @import "CPTabViewItem.j"
 @import "CPView.j"
 
+/*
+    Places tabs on top with a bezeled border.
+    @global
+    @group CPTabViewType
+*/
 CPTopTabsBezelBorder     = 0;
-//CPLeftTabsBezelBorder  = 1;
+//CPLeftTabsBezelBorder    = 1;
 CPBottomTabsBezelBorder  = 2;
-//CPRightTabsBezelBorder = 3;
-CPNoTabsBezelBorder      = 4; //Displays no tabs and has a bezeled border.
-CPNoTabsLineBorder       = 5; //Has no tabs and displays a line border.
-CPNoTabsNoBorder         = 6; //Displays no tabs and no border.
+//CPRightTabsBezelBorder   = 3;
+/*
+    Displays no tabs and has a bezeled border.
+    @global
+    @group CPTabViewType
+*/
+CPNoTabsBezelBorder      = 4;
+/*
+    Has no tabs and displays a line border.
+    @global
+    @group CPTabViewType
+*/
+CPNoTabsLineBorder       = 5;
+/*
+    Displays no tabs and no border.
+    @global
+    @group CPTabViewType
+*/
+CPNoTabsNoBorder         = 6;
 
 var CPTabViewDidSelectTabViewItemSelector           = 1,
     CPTabViewShouldSelectTabViewItemSelector        = 2,
     CPTabViewWillSelectTabViewItemSelector          = 4,
     CPTabViewDidChangeNumberOfTabViewItemsSelector  = 8;
 
-/*!
-    @ingroup appkit
-    @class CPTabView
+var HEIGHT_OF_SEGMENTED_CONTROL = 24;
 
-    A CPTabView object presents a tabbed interface where each page is one a
-    complete view hiearchy of its own. The user can navigate between various
-    pages by clicking on the tab headers.
-*/
 @implementation CPTabView : CPView
 {
-    CPArray             _items;
+    CPArray             items;
 
-    CPSegmentedControl  _tabs;
-    CPBox               _box;
+    CPSegmentedControl  tabs;
+    CPBox               box;
 
-    CPNumber            _selectedIndex;
+    CPNumber            selectedIndex;
 
-    CPTabViewType       _type;
-    CPFont              _font;
+    CPTabViewType       type;
 
-    id                  _delegate;
-    unsigned            _delegateSelectors;
+    id                  delegate;
+    unsigned            delegateSelectors;
 }
 
 - (id)initWithFrame:(CGRect)aFrame
 {
-    if (self = [super initWithFrame:aFrame])
+    self = [super initWithFrame:aFrame];
+    if (self)
     {
-        _items = [CPArray array];
+        items = [CPArray array];
+
+        tabs = [[CPSegmentedControl alloc] initWithFrame:CGRectMake(0, 0, 0, HEIGHT_OF_SEGMENTED_CONTROL)];
+        [tabs setHitTests:NO];
+
+        box = [[CPBox alloc] initWithFrame:CGRectMake(0, HEIGHT_OF_SEGMENTED_CONTROL / 2, CGRectGetWidth(aFrame),
+                                                            CGRectGetHeight(aFrame) - HEIGHT_OF_SEGMENTED_CONTROL)];
+
+        selectedIndex = CPNotFound;
 
-        [self _init];
         [self setTabViewType:CPTopTabsBezelBorder];
+        [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
+
+        [self addSubview:box];
+        [self addSubview:tabs];
+
+        [box setAutoresizingMask:CPViewWidthSizable];
+        [tabs setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
     }
-
     return self;
 }
 
-- (void)_init
-{
-    _selectedIndex = CPNotFound;
-
-    _tabs = [[CPSegmentedControl alloc] initWithFrame:_CGRectMake(0, 0, 0, 0)];
-    [_tabs setHitTests:NO];
-
-    var height = [_tabs valueForThemeAttribute:@"default-height"];
-    [_tabs setFrameSize:_CGSizeMake(0, height)];
-
-    _box = [[CPBox alloc] initWithFrame:[self  bounds]];
-    [self setBackgroundColor:[CPColor colorWithCalibratedWhite:0.95 alpha:1.0]];
-
-    [self addSubview:_box];
-    [self addSubview:_tabs];
-}
-
 // Adding and Removing Tabs
 /*!
     Adds a CPTabViewItem to the tab view.
@@ -99,25 +87,24 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)addTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    [self insertTabViewItem:aTabViewItem atIndex:[_items count]];
+    [self insertTabViewItem:aTabViewItem atIndex:[items count]];
 }
 
 /*!
-    Inserts a CPTabViewItem into the tab view at the specified index.
+    Inserts a CPTabViewItem into the tab view
+    at the specified index.
     @param aTabViewItem the item to insert
     @param anIndex the index for the item
 */
 - (void)insertTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(unsigned)anIndex
 {
-    [_items insertObject:aTabViewItem atIndex:anIndex];
+    [items insertObject:aTabViewItem atIndex:anIndex];
 
     [self _updateItems];
     [self _repositionTabs];
 
-    [aTabViewItem _setTabView:self];
-
-    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+    if (delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [delegate tabViewDidChangeNumberOfTabViewItems:self];
 }
 
 /*!
@@ -126,45 +113,39 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)removeTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    var count = [_items count];
-    for (var i = 0; i < count; i++)
+    for (var i = 0; i < [items count]; i++)
     {
-        if ([_items objectAtIndex:i] === aTabViewItem)
+        if ([items objectAtIndex:i] === aTabViewItem)
         {
-            [_items removeObjectAtIndex:i];
-            break;
+            [items removeObjectAtIndex:i];
         }
     }
 
     [self _updateItems];
     [self _repositionTabs];
 
-    [aTabViewItem _setTabView:nil];
-
-    if (_delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
-        [_delegate tabViewDidChangeNumberOfTabViewItems:self];
+    if (delegateSelectors & CPTabViewDidChangeNumberOfTabViewItemsSelector)
+        [delegate tabViewDidChangeNumberOfTabViewItems:self];
 }
 
 // Accessing Tabs
 /*!
     Returns the index of the specified item
     @param aTabViewItem the item to find the index for
-    @return the index of aTabViewItem or CPNotFound
 */
 - (int)indexOfTabViewItem:(CPTabViewItem)aTabViewItem
 {
-    return [_items indexOfObjectIdenticalTo:aTabViewItem];
+    return [items indexOfObjectIdenticalTo:aTabViewItem];
 }
 
 /*!
     Returns the index of the CPTabViewItem with the specified identifier.
     @param anIdentifier the identifier of the item
-    @return the index of the tab view item identified by anIdentifier, or CPNotFound
 */
 - (int)indexOfTabViewItemWithIdentifier:(CPString)anIdentifier
 {
-    for (var index = [_items count]; index >= 0; index--)
-        if ([[_items[index] identifier] isEqual:anIdentifier])
+    for (var index = [items count]; index >= 0; index--)
+        if ([[items[index] identifier] isEqual:anIdentifier])
             return index;
 
     return CPNotFound;
@@ -172,29 +153,26 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 
 /*!
     Returns the number of items in the tab view.
-    @return the number of tab view items in the receiver
 */
 - (unsigned)numberOfTabViewItems
 {
-    return [_items count];
+    return [items count];
 }
 
 /*!
     Returns the CPTabViewItem at the specified index.
-    @return a tab view item, or nil
 */
 - (CPTabViewItem)tabViewItemAtIndex:(unsigned)anIndex
 {
-    return [_items objectAtIndex:anIndex];
+    return [items objectAtIndex:anIndex];
 }
 
 /*!
     Returns the array of items that backs this tab view.
-    @return a copy of the array of items in the receiver
 */
 - (CPArray)tabViewItems
 {
-    return [_items copy]; // Copy?
+    return [items copy]; // Copy?
 }
 
 // Selecting a Tab
@@ -204,7 +182,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)selectFirstTabViewItem:(id)aSender
 {
-    if ([_items count] === 0)
+    if ([items count] === 0)
         return; // throw?
 
     [self selectTabViewItemAtIndex:0];
@@ -216,10 +194,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)selectLastTabViewItem:(id)aSender
 {
-    if ([_items count] === 0)
+    if ([items count] === 0)
         return; // throw?
 
-    [self selectTabViewItemAtIndex:[_items count] - 1];
+    [self selectTabViewItemAtIndex:[items count] - 1];
 }
 
 /*!
@@ -228,12 +206,12 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)selectNextTabViewItem:(id)aSender
 {
-    if (_selectedIndex === CPNotFound)
+    if (selectedIndex === CPNotFound)
         return;
 
-    var nextIndex = _selectedIndex + 1;
+    var nextIndex = selectedIndex + 1;
 
-    if (nextIndex === [_items count])
+    if (nextIndex === [items count])
         // does nothing. According to spec at (http://developer.apple.com/mac/library/DOCUMENTATION/Cocoa/Reference/ApplicationKit/Classes/NSTabView_Class/Reference/Reference.html#//apple_ref/occ/instm/NSTabView/selectNextTabViewItem:)
         return;
 
@@ -246,10 +224,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)selectPreviousTabViewItem:(id)aSender
 {
-    if (_selectedIndex === CPNotFound)
+    if (selectedIndex === CPNotFound)
         return;
 
-    var previousIndex = _selectedIndex - 1;
+    var previousIndex = selectedIndex - 1;
 
     if (previousIndex < 0)
         return; // does nothing. See above.
@@ -270,61 +248,34 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
     Selects the item at the specified index.
     @param anIndex the index of the item to display.
 */
-- (BOOL)selectTabViewItemAtIndex:(unsigned)anIndex
+- (void)selectTabViewItemAtIndex:(unsigned)anIndex
 {
-    if (anIndex === _selectedIndex)
+    var aTabViewItem = [items objectAtIndex:anIndex];
+
+    if (anIndex === selectedIndex)
         return;
 
     var aTabViewItem = [self tabViewItemAtIndex:anIndex];
 
-    if ((_delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![_delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
-        return NO;
+    if ((delegateSelectors & CPTabViewShouldSelectTabViewItemSelector) && ![delegate tabView:self shouldSelectTabViewItem:aTabViewItem])
+        return;
 
-    if (_delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
-        [_delegate tabView:self willSelectTabViewItem:aTabViewItem];
+    if (delegateSelectors & CPTabViewWillSelectTabViewItemSelector)
+        [delegate tabView:self willSelectTabViewItem:aTabViewItem];
 
-    [_tabs selectSegmentWithTag:anIndex];
+    [tabs selectSegmentWithTag:anIndex];
     [self _setSelectedIndex:anIndex];
 
-    if (_delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
-        [_delegate tabView:self didSelectTabViewItem:aTabViewItem];
-
-    return YES;
+    if (delegateSelectors & CPTabViewDidSelectTabViewItemSelector)
+        [delegate tabView:self didSelectTabViewItem:aTabViewItem];
 }
 
 /*!
     Returns the current item being displayed.
-    @return the tab view item currenly being displayed by the receiver
 */
 - (CPTabViewItem)selectedTabViewItem
 {
-    if (_selectedIndex != CPNotFound)
-        return [_items objectAtIndex:_selectedIndex];
-
-    return nil;
-}
-
-// Modifying the font
-/*!
-    Returns the font for tab label text.
-    @return the font for tab label text
-*/
-- (CPFont)font
-{
-    return _font;
-}
-
-/*!
-    Sets the font for tab label text to font.
-    @param font the font the receiver should use for tab label text
-*/
-- (void)setFont:(CPFont)font
-{
-    if ([_font isEqual:font])
-        return;
-
-    _font = font;
-    [_tabs setFont:_font];
+    return [items objectAtIndex:selectedIndex];
 }
 
 //
@@ -334,71 +285,49 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)setTabViewType:(CPTabViewType)aTabViewType
 {
-    if (_type === aTabViewType)
+    if (type === aTabViewType)
         return;
 
-    _type = aTabViewType;
+    if ((type === CPTopTabsBezelBorder || type === CPBottomTabsBezelBorder)
+            && (aTabViewType !== CPTopTabsBezelBorder && aTabViewType !== CPBottomTabsBezelBorder))
+        [tabs removeFromSuperview];
 
-    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
-        [_tabs removeFromSuperview];
-    else
-        [self addSubview:_tabs];
+    if ((type === CPNoTabsBezelBorder || type === CPNoTabsLineBorder || type === CPNoTabsNoBorder)
+            && (aTabViewType !== CPNoTabsBezelBorder && aTabViewType !== CPNoTabsBezelBorder && aTabViewType !== CPNoTabsNoBorder))
+        [self addSubview:tabs];
 
-    switch (_type)
+    type = aTabViewType;
+
+    switch (type)
     {
         case CPTopTabsBezelBorder:
         case CPBottomTabsBezelBorder:
         case CPNoTabsBezelBorder:
-            [_box setBorderType:CPBezelBorder];
+            [box setBorderType:CPBezelBorder];
             break;
         case CPNoTabsLineBorder:
-            [_box setBorderType:CPLineBorder];
+            [box setBorderType:CPLineBorder];
             break;
         case CPNoTabsNoBorder:
-            [_box setBorderType:CPNoBorder];
+            [box setBorderType:CPNoBorder];
             break;
     }
-
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
-{
-    // Even if CPTabView's autoresizesSubviews is NO, _tabs and _box has to be laid out.
-    // This means we can't rely on autoresize masks.
-    if (_type !== CPTopTabsBezelBorder && _type !== CPBottomTabsBezelBorder)
-    {
-        [_box setFrame:[self bounds]];
-    }
-    else
-    {
-        var aFrame = [self frame],
-            segmentedHeight = _CGRectGetHeight([_tabs frame]),
-            origin = _type === CPTopTabsBezelBorder ? segmentedHeight / 2 : 0;
-
-        [_box setFrame:_CGRectMake(0, origin, _CGRectGetWidth(aFrame),
-                                   _CGRectGetHeight(aFrame) - segmentedHeight / 2)];
-
-        [self _repositionTabs];
-    }
 }
 
 /*!
     Returns the tab view type.
-    @return the tab view type of the receiver
 */
 - (CPTabViewType)tabViewType
 {
-    return _type;
+    return type;
 }
 
 /*!
     Returns the receiver's delegate.
-    @return the receiver's delegate
 */
 - (id)delegate
 {
-    return _delegate;
+    return delegate;
 }
 
 /*!
@@ -407,79 +336,74 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 */
 - (void)setDelegate:(id)aDelegate
 {
-    if (_delegate == aDelegate)
+    if (delegate == aDelegate)
         return;
 
-    _delegate = aDelegate;
+    delegate = aDelegate;
 
-    _delegateSelectors = 0;
+    delegateSelectors = 0;
 
-    if ([_delegate respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)])
-        _delegateSelectors |= CPTabViewShouldSelectTabViewItemSelector;
+    if ([delegate respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)])
+        delegateSelectors |= CPTabViewShouldSelectTabViewItemSelector;
 
-    if ([_delegate respondsToSelector:@selector(tabView:willSelectTabViewItem:)])
-        _delegateSelectors |= CPTabViewWillSelectTabViewItemSelector;
+    if ([delegate respondsToSelector:@selector(tabView:willSelectTabViewItem:)])
+        delegateSelectors |= CPTabViewWillSelectTabViewItemSelector;
 
-    if ([_delegate respondsToSelector:@selector(tabView:didSelectTabViewItem:)])
-        _delegateSelectors |= CPTabViewDidSelectTabViewItemSelector;
+    if ([delegate respondsToSelector:@selector(tabView:didSelectTabViewItem:)])
+        delegateSelectors |= CPTabViewDidSelectTabViewItemSelector;
 
-    if ([_delegate respondsToSelector:@selector(tabViewDidChangeNumberOfTabViewItems:)])
-        _delegateSelectors |= CPTabViewDidChangeNumberOfTabViewItemsSelector;
+    if ([delegate respondsToSelector:@selector(tabViewDidChangeNumberOfTabViewItems:)])
+        delegateSelectors |= CPTabViewDidChangeNumberOfTabViewItemsSelector;
 }
 
 - (void)setBackgroundColor:(CPColor)aColor
 {
-    [_box setBackgroundColor:aColor];
-}
-
-- (CPColor)backgroundColor
-{
-    return [_box backgroundColor];
+    [box setBackgroundColor:aColor];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
 {
-    var segmentIndex = [_tabs testSegment:[_tabs convertPoint:[anEvent locationInWindow] fromView:nil]];
+    var segmentIndex = [tabs testSegment:[tabs convertPoint:[anEvent locationInWindow] fromView:nil]];
 
-    if (segmentIndex != CPNotFound && [self selectTabViewItemAtIndex:segmentIndex])
-        [_tabs trackSegment:anEvent];
+    if (segmentIndex != CPNotFound)
+    {
+        [self selectTabViewItemAtIndex:segmentIndex];
+        [tabs trackSegment:anEvent];
+    }
 }
 
 - (void)_repositionTabs
 {
-    var horizontalCenterOfSelf = _CGRectGetWidth([self bounds]) / 2,
-        verticalCenterOfTabs = _CGRectGetHeight([_tabs bounds]) / 2;
+    var horizontalCenterOfSelf = CGRectGetWidth([self bounds]) / 2,
+        verticalCenterOfTabs = CGRectGetHeight([tabs bounds]) / 2;
 
-    if (_type === CPBottomTabsBezelBorder)
-        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, _CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
+    if (type === CPBottomTabsBezelBorder)
+        [tabs setCenter:CGPointMake(horizontalCenterOfSelf, CGRectGetHeight([self bounds]) - verticalCenterOfTabs)];
     else
-        [_tabs setCenter:_CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
+        [tabs setCenter:CGPointMake(horizontalCenterOfSelf, verticalCenterOfTabs)];
 }
 
 - (void)_setSelectedIndex:(CPNumber)index
 {
-    _selectedIndex = index;
-    [self _setContentViewFromItem:[_items objectAtIndex:_selectedIndex]];
-}
+    selectedIndex = index;
 
-- (void)_setContentViewFromItem:(CPTabViewItem)anItem
-{
-    [_box setContentView:[anItem view]];
+    [box setContentView:[[items objectAtIndex:selectedIndex] view]];
 }
 
 - (void)_updateItems
 {
-    var count = [_items count];
-    [_tabs setSegmentCount:count];
+    [tabs setSegmentCount:[items count]];
 
-    for (var i = 0; i < count; i++)
+    for (var i = 0; i < [items count]; i++)
     {
-        [_tabs setLabel:[[_items objectAtIndex:i] label] forSegment:i];
-        [_tabs setTag:i forSegment:i];
+        [tabs setLabel:[[items objectAtIndex:i] label] forSegment:i];
+        [tabs setTag:i forSegment:i];
     }
 
-    if (_selectedIndex === CPNotFound)
+    if (selectedIndex === CPNotFound)
+    {
         [self selectFirstTabViewItem:self];
+    }
 }
 
 @end
@@ -487,7 +411,6 @@ var CPTabViewDidSelectTabViewItemSelector           = 1,
 var CPTabViewItemsKey               = "CPTabViewItemsKey",
     CPTabViewSelectedItemKey        = "CPTabViewSelectedItemKey",
     CPTabViewTypeKey                = "CPTabViewTypeKey",
-    CPTabViewFontKey                = "CPTabViewFontKey",
     CPTabViewDelegateKey            = "CPTabViewDelegateKey";
 
 @implementation CPTabView (CPCoding)
@@ -496,25 +419,18 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 {
     if (self = [super initWithCoder:aCoder])
     {
-        [self _init];
+        type    = [aCoder decodeIntForKey:CPTabViewTypeKey];
+        items   = [];
 
-        _font = [aCoder decodeObjectForKey:CPTabViewFontKey];
-        [_tabs setFont:_font];
-
-        _items = [aCoder decodeObjectForKey:CPTabViewItemsKey];
-        [_items makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
-
-        [self _updateItems];
-
-        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
+        var encodedItems = [aCoder decodeObjectForKey:CPTabViewItemsKey];
+        for (var i = 0; encodedItems && i < encodedItems.length; i++)
+            [self insertTabViewItem:encodedItems[i] atIndex:i];
 
         var selected = [aCoder decodeObjectForKey:CPTabViewSelectedItemKey];
         if (selected)
             [self selectTabViewItem:selected];
 
-        [self setTabViewType:[aCoder decodeIntForKey:CPTabViewTypeKey]];
-
-        [self setNeedsLayout];
+        [self setDelegate:[aCoder decodeObjectForKey:CPTabViewDelegateKey]];
     }
 
     return self;
@@ -524,16 +440,12 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
 {
     [super encodeWithCoder:aCoder];
 
-    [aCoder encodeObject:_items forKey:CPTabViewItemsKey];
+    [aCoder encodeObject:items forKey:CPTabViewItemsKey];;
+    [aCoder encodeObject:[self selectedTabViewItem] forKey:CPTabViewSelectedItemKey];
 
-    var selected = [self selectedTabViewItem];
-    if (selected)
-        [aCoder encodeObject:selected forKey:CPTabViewSelectedItemKey];
+    [aCoder encodeInt:type forKey:CPTabViewTypeKey];
 
-    [aCoder encodeInt:_type forKey:CPTabViewTypeKey];
-    [aCoder encodeObject:_font forKey:CPTabViewFontKey];
-
-    [aCoder encodeConditionalObject:_delegate forKey:CPTabViewDelegateKey];
+    [aCoder encodeConditionalObject:delegate forKey:CPTabViewDelegateKey];
 }
 
 @end

AppKit/CPTabViewItem.j

@@ -44,7 +44,7 @@ CPBackgroundTab = 1;
 */
 CPPressedTab    = 2;
 
-/*!
+/*! 
     @ingroup appkit
     @class CPTabViewItem
 
@@ -55,12 +55,11 @@ CPPressedTab    = 2;
 {
     id          _identifier;
     CPString    _label;
-
+    
     CPView      _view;
     CPView      _auxiliaryView;
-
+    
     CPTabView   _tabView;
-    unsigned    _tabState;      // Looks like it is not yet implemented
 }
 
 - (id)init
@@ -75,10 +74,10 @@ CPPressedTab    = 2;
 - (id)initWithIdentifier:(id)anIdentifier
 {
     self = [super init];
-
+    
     if (self)
         _identifier = anIdentifier;
-
+        
     return self;
 }
 
@@ -133,13 +132,7 @@ CPPressedTab    = 2;
 */
 - (void)setView:(CPView)aView
 {
-    if (_view == aView)
-        return;
-
     _view = aView;
-
-    if ([_tabView selectedTabViewItem] == self)
-        [_tabView _setContentViewFromItem:self];
 }
 
 /*!
@@ -152,8 +145,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
 {
@@ -161,7 +154,7 @@ CPPressedTab    = 2;
 }
 
 /*!
-    Returns the tab's auxiliary view
+    Returns the tab's auxillary view
 */
 - (CPView)auxiliaryView
 {
@@ -198,16 +191,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;
 }
 
@@ -215,7 +208,7 @@ var CPTabViewItemIdentifierKey  = "CPTabViewItemIdentifierKey",
 {
     [aCoder encodeObject:_identifier    forKey:CPTabViewItemIdentifierKey];
     [aCoder encodeObject:_label         forKey:CPTabViewItemLabelKey];
-
+    
     [aCoder encodeObject:_view          forKey:CPTabViewItemViewKey];
     [aCoder encodeObject:_auxiliaryView forKey:CPTabViewItemAuxViewKey];
 }

AppKit/CPTableColumn.j

@@ -26,27 +26,13 @@
 @import <Foundation/CPSortDescriptor.j>
 @import <Foundation/CPString.j>
 
-@import "CPTextField.j"
+@import "CPTableHeaderView.j"
 
-@global CPTableViewColumnDidResizeNotification
-
-@class _CPTableColumnHeaderView
 
 CPTableColumnNoResizing         = 0;
 CPTableColumnAutoresizingMask   = 1 << 0;
 CPTableColumnUserResizingMask   = 1 << 1;
 
-/*!
-    @class CPTableColumn
-
-    A CPTableColumn contains a dataview to display for its column of the CPTableView.
-    A CPTableColumn determines its own size constrains and resizing behavior.
-
-    The default dataview is a CPTextField but you can set it to any view you'd like. See -setDataView: for documentation including theme states.
-
-    To customize the text of the column header you can simply call setStringValue: on the headerview of a table column.
-    For example: [[myTableColumn headerView] setStringValue:"My Title"];
-*/
 @implementation CPTableColumn : CPObject
 {
     CPTableView         _tableView;
@@ -68,18 +54,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
     BOOL _disableResizingPosting @accessors(property=disableResizingPosting);
 }
 
-/*!
-    @ignore
-*/
 - (id)init
 {
     return [self initWithIdentifier:@""];
 }
 
-/*!
-    Initializes a newly created CPTableColumn with a given identifier.
-
-*/
 - (id)initWithIdentifier:(id)anIdentifier
 {
     self = [super init];
@@ -105,50 +84,17 @@ CPTableColumnUserResizingMask   = 1 << 1;
     return self;
 }
 
-/*!
-    Set the columns's parent tableview
-*/
+
 - (void)setTableView:(CPTableView)aTableView
 {
     _tableView = aTableView;
 }
 
-/*!
-    Return the column's parent tableview
-*/
 - (CPTableView)tableView
 {
     return _tableView;
 }
 
-/*!
-    @ignore
-    this method tries to resize a column called via the tableview via autoresizing
-    it returns the delta from the actual resize and the proposed resize
-
-    for example if the column should have been resized 50px but the maxWidth was hit only
-    after 25px then the return value would be 25px;
-
-    if no edge has been hit zero will be returned
-*/
-- (int)_tryToResizeToWidth:(int)width
-{
-    var min = [self minWidth],
-        max = [self maxWidth],
-        newWidth = ROUND(MIN(MAX(width, min), max));
-
-    [self setWidth:newWidth];
-
-    return newWidth - width;
-}
-
-/*!
-    Set the width of the column
-    Default value is: 100
-
-    If the value is greater than the maxWidth the maxWidth will be reset with the supplied width here
-    If the value is less than the minWidth the minWidth will be reset with the supplied width.
-*/
 - (void)setWidth:(float)aWidth
 {
     aWidth = +aWidth;
@@ -189,18 +135,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
     }
 }
 
-/*!
-    Returns the column's width
-*/
 - (float)width
 {
     return _width;
 }
 
-/*!
-    Sets the minimum width of the column.
-    Default value is 10.
-*/
 - (void)setMinWidth:(float)aMinWidth
 {
     aMinWidth = +aMinWidth;
@@ -217,18 +156,11 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [self setWidth:newWidth];
 }
 
-/*!
-    Returns the minimum width of the column.
-*/
 - (float)minWidth
 {
     return _minWidth;
 }
 
-/*!
-    Sets the maximum width of the table column.
-    Default value is: 1000000
-*/
 - (void)setMaxWidth:(float)aMaxWidth
 {
     aMaxWidth = +aMaxWidth;
@@ -245,42 +177,21 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [self setWidth:newWidth];
 }
 
-/*!
-    Returns the maximum width of the column
-*/
 - (float)maxWidth
 {
     return _maxWidth;
 }
 
-/*!
-<pre>
-    Set the resizing mask of the column.
-    By default the column can be resized automatically with the tableview and manually by the user
-
-    Possible masking values are:
-    CPTableColumnNoResizing
-    CPTableColumnAutoresizingMask
-    CPTableColumnUserResizingMask
-</pre>
-*/
 - (void)setResizingMask:(unsigned)aResizingMask
 {
     _resizingMask = aResizingMask;
 }
 
-
-/*!
-    Returns the resizing mask of the column
-*/
 - (unsigned)resizingMask
 {
     return _resizingMask;
 }
 
-/*!
-    Sizes the column to fix the column header text.
-*/
 - (void)sizeToFit
 {
     var width = _CGRectGetWidth([_headerView frame]);
@@ -294,16 +205,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
         [self setWidth:width];
 }
 
-
-/*!
-    Sets the header view for the column.
-    The headerview handles the display of sort indicators, text, etc.
-
-    If you do not want a headerview for you table you should call setHeaderView: on your CPTableView instance.
-    Passing nil here will throw an exception.
-
-    In order to customize the text of the column header see - (CPView)headerView;
-*/
+//Setting Component Cells
 - (void)setHeaderView:(CPView)aView
 {
     if (!aView)
@@ -317,80 +219,26 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [tableHeaderView setNeedsDisplay:YES];
 }
 
-/*!
-    Returns the headerview for the column.
-
-    In order to change the text of the headerview for a column you should call setStringValue: on the headerview.
-    For example: [[myTableColumn headerView] setStringValue:"My Column"];
-*/
 - (CPView)headerView
 {
     return _headerView;
 }
 
 /*!
-    This method sets the "prototype" view which will be used to create all table cells in this column.
+    This method set's the "prototype" view which will be used to create all table cells in this column.
 
     It creates a snapshot of aView, using keyed archiving, which is then copied over and over for each
     individual cell that is shown. As a result, changes made after calling this method won't be reflected.
 
     Example:
-        @code
+
         [tableColumn setDataView:someView]; // snapshot taken
         [[tableColumn dataView] setSomething:x]; //won't work
-        @endcode
 
     This doesn't work because the snapshot is taken before the new property is applied. Instead, do:
-        @code
+
         [someView setSomething:x];
         [tableColumn setDataView:someView];
-        @endcode
-
-    @note you should implement CPKeyedArchiving otherwise you might see unexpected results.
-    This is done by adding the following methods to your class:
-    @endnote
-
-    @code
-    - (id)initWithCoder(CPCoder)aCoder;
-    - (void)encodeWithCoder:(CPCoder)aCoder;
-    @endcode
-
-    Example:
-    Say you have two instance variables in your object that need to be set up each time an object is create.
-    We will call these instance variables "image" and "text".
-    Your CPCoding methods will look like the following:
-
-    @code
-    - (id)initWithCoder:(CPCoder)aCoder
-    {
-        self = [super initWithCoder:aCoder];
-
-        if (self)
-        {
-            image = [aCoder decodeObjectForKey:"MyDataViewImage"];
-            text = [aCoder decodeObjectForKey:"MyDataViewText"];
-        }
-
-        return self;
-    }
-
-    - (void)encodeWithCoder:(CPCoder)aCoder
-    {
-        [super encodeWithCoder:aCoder];
-
-        [aCoder encodeObject:image forKey:"MyDataViewImage"];
-        [aCoder encodeObject:text forKey:"MyDataViewText"];
-    }
-    @endcode
-
-    @section Themeing
-
-    When you set a dataview and it is added to the tableview the theme state will be set to \c CPThemeStateTableDataView
-    When the dataview becomes selected the theme state will be set to \c CPThemeStateSelectedDataView.
-
-    If the dataview shows up in a group row of the tableview the theme state will be set to \c CPThemeStateGroupRow.
-
-    You should overide \c setThemeState: and \c unsetThemeState: to handle these theme state changes in your dataview.
 */
 - (void)setDataView:(CPView)aView
 {
@@ -412,7 +260,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     Returns the CPView object used by the CPTableView to draw values for the receiver.
 
     By default, this method just calls dataView. Subclassers can override if they need to
-    potentially use different "cells" or dataViews for different rows. Subclasses should expect this method
+    potentially use different cells for different rows. Subclasses should expect this method
     to be invoked with row equal to -1 in cases where no actual row is involved but the table
     view needs to get some generic cell info.
 */
@@ -421,9 +269,6 @@ CPTableColumnUserResizingMask   = 1 << 1;
     return [self dataView];
 }
 
-/*!
-    @ignore
-*/
 - (id)_newDataViewForRow:(int)aRowIndex
 {
     var dataView = [self dataViewForRow:aRowIndex],
@@ -431,7 +276,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
     var x = [self tableView]._cachedDataViews[dataViewUID];
     if (x && x.length)
-        return x.pop();
+    return x.pop();
 
     // if we haven't cached an archive of the data view, do it now
     if (!_dataViewData[dataViewUID])
@@ -449,7 +294,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 //Setting the Identifier
 
-/*!
+/*
     Sets the receiver identifier to anIdentifier.
 */
 - (void)setIdentifier:(id)anIdentifier
@@ -457,7 +302,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
     _identifier = anIdentifier;
 }
 
-/*!
+/*
     Returns the object used by the data source to identify the attribute corresponding to the receiver.
 */
 - (id)identifier
@@ -467,7 +312,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 //Controlling Editability
 
-/*!
+/*
     Controls whether the user can edit cells in the receiver by double-clicking them.
 */
 - (void)setEditable:(BOOL)shouldBeEditable
@@ -475,45 +320,31 @@ CPTableColumnUserResizingMask   = 1 << 1;
     _isEditable = shouldBeEditable;
 }
 
-/*!
+/*
     Returns YES if the user can edit cells associated with the receiver by double-clicking the
-    column in the CPTableView, NO otherwise.
+    column in the NSTableView, NO otherwise.
 */
 - (BOOL)isEditable
 {
     return _isEditable;
 }
 
-/*!
-    Sets the sort descriptor prototype for the column.
-*/
+//Sorting
 - (void)setSortDescriptorPrototype:(CPSortDescriptor)aSortDescriptor
 {
     _sortDescriptorPrototype = aSortDescriptor;
 }
 
-/*!
-    Returns the sort descriptor prototype for the column.
-*/
 - (CPSortDescriptor)sortDescriptorPrototype
 {
-    if (_sortDescriptorPrototype)
-        return _sortDescriptorPrototype;
-
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        binding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    return [binding _defaultSortDescriptorPrototype];
+    return _sortDescriptorPrototype;
 }
 
-/*!
-    If YES the tablecolumn will no longer be visible in the tableview.
-    If NO the tablecolumn will be visible in the tableview.
-*/
+//Setting Column Visibility
+
 - (void)setHidden:(BOOL)shouldBeHidden
 {
     shouldBeHidden = !!shouldBeHidden
-
     if (_isHidden === shouldBeHidden)
         return;
 
@@ -523,9 +354,6 @@ CPTableColumnUserResizingMask   = 1 << 1;
     [[self tableView] _tableColumnVisibilityDidChange:self];
 }
 
-/*!
-    Returns the visibility status of the column.
-*/
 - (BOOL)isHidden
 {
     return _isHidden;
@@ -533,7 +361,7 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 //Setting Tool Tips
 
-/*!
+/*
     Sets the tooltip string that is displayed when the cursor pauses over the
     header cell of the receiver.
 */
@@ -542,21 +370,13 @@ CPTableColumnUserResizingMask   = 1 << 1;
     _headerToolTip = aToolTip;
 }
 
-/*!
-    Returns the tooltip for the column header
-*/
 - (CPString)headerToolTip
 {
     return _headerToolTip;
 }
 
-/*!
-    @ignore
-*/
 - (void)_postDidResizeNotificationWithOldWidth:(float)oldWidth
 {
-    [[self tableView] _didResizeTableColumn:self];
-
     [[CPNotificationCenter defaultCenter]
     postNotificationName:CPTableViewColumnDidResizeNotification
                   object:[self tableView]
@@ -565,93 +385,19 @@ CPTableColumnUserResizingMask   = 1 << 1;
 
 @end
 
-@implementation CPTableColumnValueBinder : CPBinder
-{
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var tableView = [_source tableView],
-        column = [[tableView tableColumns] indexOfObjectIdenticalTo:_source],
-        rowIndexes = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, [tableView numberOfRows])],
-        columnIndexes = [CPIndexSet indexSetWithIndex:column];
-
-    [tableView reloadDataForRowIndexes:rowIndexes columnIndexes:columnIndexes];
-}
-
-- (CPSortDescriptor)_defaultSortDescriptorPrototype
-{
-    if (![self createsSortDescriptor])
-        return nil;
-
-    var keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        dotIndex = keyPath.indexOf(".");
-
-    if (dotIndex === CPNotFound)
-        return nil;
-
-    var firstPart = keyPath.substring(0, dotIndex),
-        key = keyPath.substring(dotIndex + 1);
-
-    return [CPSortDescriptor sortDescriptorWithKey:key ascending:YES];
-}
-
-- (BOOL)createsSortDescriptor
-{
-    var options = [_info objectForKey:CPOptionsKey],
-        optionValue = [options objectForKey:CPCreatesSortDescriptorBindingOption];
-    return optionValue === nil ? YES : [optionValue boolValue];
-}
-
-@end
-
 @implementation CPTableColumn (Bindings)
 
-+ (id)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return [CPTableColumnValueBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-/*!
-    Binds the receiver to an object.
-
-    @param CPString aBinding - The binding you wish to make. Typically CPValueBinding.
-    @param id anObject - The object to bind the receiver to.
-    @param CPString aKeyPath - The key path you wish to bind the receiver to.
-    @param CPDictionary options - A dictionary of options for the binding. This parameter is optional, pass nil if you do not wish to use it.
-*/
 - (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
 {
     [super bind:aBinding toObject:anObject withKeyPath:aKeyPath options:options];
 
     if (![aBinding isEqual:@"someListOfExceptedBindings(notAcceptedBindings)"])
-    {
-        // Bind the table to the array controller this column is bound to.
-        // Note that anObject might not be the array controller. E.g. the keypath could be something like
-        // somePathTo.anArrayController.arrangedObjects.aKey. Cocoa doesn't support this but it is consistent
-        // and it makes sense.
-        var acIndex = aKeyPath.lastIndexOf("arrangedObjects."),
-            arrayController = anObject;
-
-        if (acIndex > 1)
-        {
-            var firstPart = aKeyPath.substring(0, acIndex - 1);
-            arrayController = [anObject valueForKeyPath:firstPart];
-        }
-
-        [[self tableView] _establishBindingsIfUnbound:arrayController];
-    }
+        [[self tableView] _establishBindingsIfUnbound:anObject];
 }
 
-/*!
-    @ignore
-*/
-- (void)_prepareDataView:(CPView)aDataView forRow:(unsigned)aRow
+- (void)prepareDataView:(CPView)aDataView forRow:(unsigned)aRow
 {
-    var bindingsDictionary = [CPBinder allBindingsForObject:self],
+    var bindingsDictionary = [CPKeyValueBinding allBindingsForObject:self],
         keys = [bindingsDictionary allKeys];
 
     for (var i = 0, count = [keys count]; i < count; i++)
@@ -691,46 +437,20 @@ CPTableColumnUserResizingMask   = 1 << 1;
         }
 
         value = [binding transformValue:value withOptions:[bindingInfo objectForKey:CPOptionsKey]];
-        [aDataView setValue:value forKey:@"objectValue"];
+
+        // console.log(bindingName+" : "+keyPath+" : "+aRow+" : "+[[destination valueForKeyPath:keyPath] objectAtIndex:aRow]);
+        [aDataView setValue:value forKey:bindingPath];
     }
 }
 
-/*!
-    @ignore
-*/
-- (void)_reverseSetDataView:(CPView)aDataView forRow:(unsigned)aRow
+//- (void)objectValue
+//{
+//    return nil;
+//}
+
+- (void)setValue:(CPArray)content
 {
-    var bindingsDictionary = [CPBinder allBindingsForObject:self],
-        keys = [bindingsDictionary allKeys],
-        newValue = [aDataView valueForKey:@"objectValue"];
-
-    for (var i = 0, count = [keys count]; i < count; i++)
-    {
-        var bindingName = keys[i],
-            bindingPath = [aDataView _replacementKeyPathForBinding:bindingName],
-            binding = [bindingsDictionary objectForKey:bindingName],
-            bindingInfo = binding._info,
-            destination = [bindingInfo objectForKey:CPObservedObjectKey],
-            keyPath = [bindingInfo objectForKey:CPObservedKeyPathKey],
-            options = [bindingInfo objectForKey:CPOptionsKey],
-            dotIndex = keyPath.lastIndexOf(".");
-
-        newValue = [binding reverseTransformValue:newValue withOptions:options];
-
-        if (dotIndex === CPNotFound)
-            [[destination valueForKeyPath:keyPath] replaceObjectAtIndex:aRow withObject:newValue];
-        else
-        {
-            var firstPart = keyPath.substring(0, dotIndex),
-                secondPart = keyPath.substring(dotIndex + 1),
-                firstValue = [destination valueForKeyPath:firstPart];
-
-            if ([firstValue isKindOfClass:CPArray])
-                 [[firstValue objectAtIndex:aRow] setValue:newValue forKeyPath:secondPart];
-            else
-                 [[firstValue valueForKeyPath:secondPart] replaceObjectAtIndex:aRow withObject:newValue];
-        }
-    }
+    [[self tableView] reloadData];
 }
 
 @end
@@ -748,9 +468,6 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 
 @implementation CPTableColumn (CPCoding)
 
-/*!
-    @ignore
-*/
 - (id)initWithCoder:(CPCoder)aCoder
 {
     self = [super init];
@@ -766,6 +483,7 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
         [self setIdentifier:[aCoder decodeObjectForKey:CPTableColumnIdentifierKey]];
         [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
         [self setDataView:[aCoder decodeObjectForKey:CPTableColumnDataViewKey]];
+        [self setHeaderView:[aCoder decodeObjectForKey:CPTableColumnHeaderViewKey]];
 
         _resizingMask  = [aCoder decodeIntForKey:CPTableColumnResizingMaskKey];
         _isHidden = [aCoder decodeBoolForKey:CPTableColumnIsHiddenKey];
@@ -777,16 +495,13 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
     return self;
 }
 
-/*!
-    @ignore
-*/
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_identifier forKey:CPTableColumnIdentifierKey];
 
-    [aCoder encodeFloat:_width forKey:CPTableColumnWidthKey];
-    [aCoder encodeFloat:_minWidth forKey:CPTableColumnMinWidthKey];
-    [aCoder encodeFloat:_maxWidth forKey:CPTableColumnMaxWidthKey];
+    [aCoder encodeObject:_width forKey:CPTableColumnWidthKey];
+    [aCoder encodeObject:_minWidth forKey:CPTableColumnMinWidthKey];
+    [aCoder encodeObject:_maxWidth forKey:CPTableColumnMaxWidthKey];
 
     [aCoder encodeObject:_headerView forKey:CPTableColumnHeaderViewKey];
     [aCoder encodeObject:_dataView forKey:CPTableColumnDataViewKey];
@@ -801,45 +516,31 @@ var CPTableColumnIdentifierKey   = @"CPTableColumnIdentifierKey",
 @end
 
 @implementation CPTableColumn (NSInCompatibility)
-/*!
-    @ignore
-*/
+
 - (void)setHeaderCell:(CPView)aView
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"setHeaderCell: is not supported. Use -setHeaderView:aView instead."];
+                reason:@"setHeaderCell: is not supported. -setHeaderCell:aView instead."];
 }
 
-/*!
-    @ignore
-*/
 - (CPView)headerCell
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"headCell is not supported. Use -headerView instead."];
+                reason:@"headCell is not supported. -headerView instead."];
 }
 
-/*!
-    @ignore
-*/
 - (void)setDataCell:(CPView)aView
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"setDataCell: is not supported. Use -setDataView:aView instead."];
+                reason:@"setDataCell: is not supported. Use -setHeaderCell:aView instead."];
 }
 
-/*!
-    @ignore
-*/
 - (CPView)dataCell
 {
     [CPException raise:CPUnsupportedMethodException
-                reason:@"dataCell is not supported. Use -dataView instead."];
+                reason:@"dataCell is not supported. Use -dataCell instead."];
 }
 
-/*!
-    @ignore
-*/
 - (id)dataCellForRow:(int)row
 {
     [CPException raise:CPUnsupportedMethodException

AppKit/CPTableHeaderView.j

@@ -22,15 +22,9 @@
 
 @import <Foundation/CPIndexSet.j>
 
-@import "CPCursor.j"
-@import "CPPasteboard.j"
 @import "CPTableColumn.j"
+@import "CPTableView.j"
 @import "CPView.j"
-@import "_CPImageAndTextView.j"
-
-@class CPTableView
-
-@global CPApp
 
 
 @implementation _CPTableColumnHeaderView : CPView
@@ -45,14 +39,13 @@
 
 + (id)themeAttributes
 {
-    return [CPDictionary dictionaryWithObjects:[[CPNull null], CPLeftTextAlignment, CPLineBreakByTruncatingTail, CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()]
-                                       forKeys:[@"background-color", @"text-alignment", @"line-break-mode", @"text-inset", @"text-color", @"font", @"text-shadow-color", @"text-shadow-offset"]];
+    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];
 
@@ -63,7 +56,7 @@
 {
     _textField = [[_CPImageAndTextView alloc] initWithFrame:_CGRectMakeZero()];
 
-    [_textField setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
+    [_textField setAutoresizingMask:CPViewWidthSizable|CPViewHeightSizable];
 
     [_textField setLineBreakMode:CPLineBreakByTruncatingTail];
     [_textField setAlignment:CPLeftTextAlignment];
@@ -81,11 +74,10 @@
 
     [_textField setFrame:_CGRectMake(inset.right, inset.top, bounds.size.width - inset.right - inset.left, bounds.size.height - inset.top - inset.bottom)];
     [_textField setTextColor:[self currentValueForThemeAttribute:@"text-color"]];
-    [_textField setFont:[self currentValueForThemeAttribute:@"font"]];
+    [_textField setFont:[self currentValueForThemeAttribute:@"text-font"]];
     [_textField setTextShadowColor:[self currentValueForThemeAttribute:@"text-shadow-color"]];
     [_textField setTextShadowOffset:[self currentValueForThemeAttribute:@"text-shadow-offset"]];
     [_textField setAlignment:[self currentValueForThemeAttribute:@"text-alignment"]];
-    [_textField setLineBreakMode:[self currentValueForThemeAttribute:@"line-break-mode"]];
 }
 
 - (void)setStringValue:(CPString)string
@@ -110,75 +102,26 @@
 
 - (void)setFont:(CPFont)aFont
 {
-    [self setValue:aFont forThemeAttribute:@"font"];
-}
-
-- (CPFont)font
-{
-    return [self currentValueForThemeAttribute:@"font"]
-}
-
-- (void)setAlignment:(CPTextAlignment)alignment
-{
-    [self setValue:alignment forThemeAttribute:@"text-alignment"];
-}
-
-- (CPTextAlignment)alignment
-{
-    return [self currentValueForThemeAttribute:@"text-alignment"]
-}
-
-- (void)setLineBreakMode:(CPLineBreakMode)mode
-{
-    [self setValue:mode forThemeAttribute:@"line-break-mode"];
-}
-
-- (CPLineBreakMode)lineBreakMode
-{
-    return [self currentValueForThemeAttribute:@"line-break-mode"]
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    [self setValue:aColor forThemeAttribute:@"text-color"];
-}
-
-- (CPColor)textColor
-{
-    return [self currentValueForThemeAttribute:@"text-color"]
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    [self setValue:aColor forThemeAttribute:@"text-shadow-color"];
-}
-
-- (CPColor)textShadowColor
-{
-    return [self currentValueForThemeAttribute:@"text-shadow-color"]
+    [_textField setFont:aFont];
 }
 
 - (void)_setIndicatorImage:(CPImage)anImage
 {
-    if (anImage)
-    {
-        [_textField setImage:anImage];
-        [_textField setImagePosition:CPImageRight];
-    }
-    else
-    {
-        [_textField setImagePosition:CPNoImage];
-    }
+	if (anImage)
+	{
+		[_textField setImage:anImage];
+		[_textField setImagePosition:CPImageRight];
+	}
+	else
+	{
+		[_textField setImagePosition:CPNoImage];
+	}
 }
 
 @end
 
 var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringValueKey",
     _CPTableColumnHeaderViewFontKey = @"_CPTableColumnHeaderViewFontKey",
-    _CPTableColumnHeaderViewTextColorKey = @"_CPTableColumnHeaderViewTextColorKey",
-    _CPTableColumnHeaderViewTextShadowColorKey = @"_CPTableColumnHeaderViewTextShadowColorKey",
-    _CPTableColumnHeaderViewAlignmentKey = @"_CPTableColumnHeaderViewAlignmentKey",
-    _CPTableColumnHeaderViewLineBreakModeKey = @"_CPTableColumnHeaderViewLineBreakModeKey",
     _CPTableColumnHeaderViewImageKey = @"_CPTableColumnHeaderViewImageKey";
 
 @implementation _CPTableColumnHeaderView (CPCoding)
@@ -191,10 +134,6 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         [self _setIndicatorImage:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewImageKey]];
         [self setStringValue:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewStringValueKey]];
         [self setFont:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewFontKey]];
-        [self setTextColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextColorKey]];
-        [self setTextShadowColor:[aCoder decodeObjectForKey:_CPTableColumnHeaderViewTextShadowColorKey]];
-        [self setAlignment:[aCoder decodeIntForKey:_CPTableColumnHeaderViewAlignmentKey]];
-        [self setLineBreakMode:[aCoder decodeIntForKey:_CPTableColumnHeaderViewLineBreakModeKey]];
     }
 
     return self;
@@ -206,11 +145,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
     [aCoder encodeObject:[_textField text] forKey:_CPTableColumnHeaderViewStringValueKey];
     [aCoder encodeObject:[_textField image] forKey:_CPTableColumnHeaderViewImageKey];
-    [aCoder encodeObject:[self font] forKey:_CPTableColumnHeaderViewFontKey];
-    [aCoder encodeObject:[self textColor] forKey:_CPTableColumnHeaderViewTextColorKey];
-    [aCoder encodeObject:[self textShadowColor] forKey:_CPTableColumnHeaderViewTextShadowColorKey];
-    [aCoder encodeInt:[self alignment] forKey:_CPTableColumnHeaderViewAlignmentKey];
-    [aCoder encodeInt:[self lineBreakMode] forKey:_CPTableColumnHeaderViewLineBreakModeKey];
+    [aCoder encodeObject:[_textField font] forKey:_CPTableColumnHeaderViewFontKey];
 }
 
 @end
@@ -277,7 +212,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
 - (CGRect)headerRectOfColumn:(int)aColumnIndex
 {
-    var headerRect = CGRectMakeCopy([self bounds]),
+    var headerRect = [self bounds],
         columnRect = [_tableView rectOfColumn:aColumnIndex];
 
     headerRect.origin.x = _CGRectGetMinX(columnRect);
@@ -657,19 +592,19 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
     for (var i = 0; i < count; i++)
     {
         var column = [tableColumns objectAtIndex:i],
-            headerView = [column headerView],
-            frame = [self headerRectOfColumn:i];
+            headerView = [column headerView];
 
-        // Make space for the gridline on the right.
-        frame.origin.x -= 0.5;
-        frame.size.width -= 1.0;
+        var frame = [self headerRectOfColumn:i];
         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.
+        if (i > 0)
+        {
+            frame.origin.x += 0.5;
+            frame.size.width -= 1;
+        }
 
         [headerView setFrame:frame];
 
-        if ([headerView superview] != self)
+        if([headerView superview] != self)
             [self addSubview:headerView];
     }
 
@@ -699,7 +634,7 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
         columnMaxX;
 
     CGContextBeginPath(context);
-    for (; columnArrayIndex < columnArrayCount; columnArrayIndex++)
+    for(; columnArrayIndex < columnArrayCount; columnArrayIndex++)
     {
         // grab each column rect and add vertical lines
         var columnIndex = columnsArray[columnArrayIndex],
@@ -707,9 +642,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal
 
         columnMaxX = _CGRectGetMaxX(columnToStroke);
 
-        CGContextMoveToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
-        CGContextAddLineToPoint(context, FLOOR(columnMaxX) - 0.5, ROUND(_CGRectGetMaxY(columnToStroke)) - 1.0);
+        CGContextMoveToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(_CGRectGetMinY(columnToStroke)));
+        CGContextAddLineToPoint(context, ROUND(columnMaxX) + 0.5, ROUND(_CGRectGetMaxY(columnToStroke)));
     }
+
     CGContextClosePath(context);
     CGContextStrokePath(context);
 
@@ -733,15 +669,7 @@ var CPTableHeaderViewTableViewKey = @"CPTableHeaderViewTableViewKey",
     {
         [self _init];
         _tableView = [aCoder decodeObjectForKey:CPTableHeaderViewTableViewKey];
-
-        // FIX ME: Take this out before 1.0
-        if ([aCoder containsValueForKey:CPTableHeaderViewDrawsColumnLines])
-            _drawsColumnLines = [aCoder decodeBoolForKey:CPTableHeaderViewDrawsColumnLines];
-        else
-        {
-            _drawsColumnLines = YES;
-            CPLog.warn("The tableview header being decoded is using an old cib. Please run Nib2Cib.");
-        }
+        _drawsColumnLines = [aCoder decodeBoolForKey:CPTableHeaderViewDrawsColumnLines];
     }
 
     return self;

AppKit/CPTheme.j

@@ -21,11 +21,9 @@
  */
 
 @import <Foundation/CPObject.j>
-@import <Foundation/CPMutableArray.j>
 @import <Foundation/CPString.j>
 @import <Foundation/CPKeyedUnarchiver.j>
 
-@class CPView
 
 var CPThemesByName          = { },
     CPThemeDefaultTheme     = nil,
@@ -147,7 +145,7 @@ var CPThemesByName          = { },
                 className = [aClass defaultThemeClass];
             else if ([aClass respondsToSelector:@selector(themeClass)])
             {
-                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass", CPStringFromClass(aClass));
+                CPLog.warn(@"%@ themeClass is deprecated in favor of defaultThemeClass",CPStringFromClass([anObject class]));
                 className = [aClass themeClass];
             }
             else
@@ -257,7 +255,7 @@ var CPThemesByName          = { },
         attributeNames = [attributes keyEnumerator],
         objectThemeClass = [anObject themeClass];
 
-    while ((attributeName = [attributeNames nextObject]) !== nil)
+    while (attributeName = [attributeNames nextObject])
         [self _recordAttribute:[attributes objectForKey:attributeName] forClass:objectThemeClass];
 }
 
@@ -407,7 +405,6 @@ 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");
@@ -420,9 +417,6 @@ CPThemeStateEditing         = CPThemeState("editing");
 CPThemeStateVertical        = CPThemeState("vertical");
 CPThemeStateDefault         = CPThemeState("default");
 CPThemeStateCircular        = CPThemeState("circular");
-CPThemeStateAutocompleting  = CPThemeState("autocompleting");
-CPThemeStateMainWindow      = CPThemeState("mainWindow");
-CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 
 @implementation _CPThemeAttribute : CPObject
 {
@@ -584,7 +578,6 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
         _cache = {};
 
         _name = [aCoder decodeObjectForKey:@"name"];
-        _defaultValue = [aCoder decodeObjectForKey:@"defaultValue"];
         _values = [CPDictionary dictionary];
 
         if ([aCoder containsValueForKey:@"value"])
@@ -617,7 +610,6 @@ CPThemeStateKeyWindow       = CPThemeState("keyWindow");
 - (void)encodeWithCoder:(CPCoder)aCoder
 {
     [aCoder encodeObject:_name forKey:@"name"];
-    [aCoder encodeObject:_defaultValue forKey:@"defaultValue"];
 
     var keys = [_values allKeys],
         count = keys.length;
@@ -673,7 +665,7 @@ var numberOfOnes = function(aNumber)
     cachedNumberOfOnes[slot] = count;
 
     return count;
-};
+}
 
 numberOfOnes.displayName = "numberOfOnes";
 

AppKit/CPThemeBlend.j

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

AppKit/CPToolbar.j

@@ -28,7 +28,6 @@
 @import "CPPopUpButton.j"
 @import "CPToolbarItem.j"
 
-@global CPApp
 
 /*
     @global
@@ -51,13 +50,8 @@ CPToolbarDisplayModeIconOnly            = 2;
 */
 CPToolbarDisplayModeLabelOnly           = 3;
 
-
-CPToolbarSizeModeDefault                = 0;
-CPToolbarSizeModeRegular                = 1;
-CPToolbarSizeModeSmall                  = 2;
-
-var CPToolbarsByIdentifier              = nil,
-    CPToolbarConfigurationsByIdentifier = nil;
+var CPToolbarsByIdentifier              = nil;
+var CPToolbarConfigurationsByIdentifier = nil;
 
 /*!
     @ingroup appkit
@@ -89,12 +83,10 @@ var CPToolbarsByIdentifier              = nil,
 @implementation CPToolbar : CPObject
 {
     CPString                _identifier;
-    CPToolbarDisplayMode    _displayMode @accessors(property=displayMode);
+    CPToolbarDisplayMode    _displayMode;
     BOOL                    _showsBaselineSeparator;
     BOOL                    _allowsUserCustomization;
     BOOL                    _isVisible;
-    int                     _sizeMode @accessors(property=sizeMode);
-    int                     _desiredHeight;
 
     id                      _delegate;
 
@@ -115,7 +107,7 @@ var CPToolbarsByIdentifier              = nil,
 /* @ignore */
 + (void)initialize
 {
-    if (self !== [CPToolbar class])
+    if (self != [CPToolbar class])
         return;
 
     CPToolbarsByIdentifier = [CPDictionary dictionary];
@@ -156,8 +148,6 @@ var CPToolbarsByIdentifier              = nil,
 
         _identifier = anIdentifier;
         _isVisible = YES;
-        _sizeMode = CPToolbarSizeModeDefault;
-        _desiredHeight = 0;
 
         [CPToolbar _addToolbar:self forIdentifier:_identifier];
     }
@@ -212,16 +202,6 @@ var CPToolbarsByIdentifier              = nil,
     [_window _noteToolbarChanged];
 }
 
-- (void)setSizeMode:(CPToolbarSizeMode)aSize
-{
-    if (aSize === _sizeMode)
-        return;
-    _sizeMode = aSize;
-
-    [[self _toolbarView] setFrame:[self _toolbarViewFrame]];
-    [_window _noteToolbarChanged];
-}
-
 - (CPWindow)_window
 {
     return _window;
@@ -229,13 +209,7 @@ var CPToolbarsByIdentifier              = nil,
 
 - (void)_setWindow:(CPWindow)aWindow
 {
-    if (_window)
-        [[CPNotificationCenter defaultCenter] removeObserver:self object:_window];
-
     _window = aWindow;
-
-    if (_window)
-        [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_autoValidateVisibleItems) name:_CPWindowDidChangeFirstResponderNotification object:aWindow];
 }
 
 /*!
@@ -252,33 +226,18 @@ var CPToolbarsByIdentifier              = nil,
     [self _reloadToolbarItems];
 }
 
-- (void)setDisplayMode:(CPToolbarDisplayMode)aDisplayMode
-{
-    if (_displayMode === aDisplayMode)
-        return;
-    _displayMode = aDisplayMode;
-
-    [self _reloadToolbarItems];
-}
-
 /* @ignore */
 - (void)_loadConfiguration
 {
 
 }
 
-- (CGRect)_toolbarViewFrame
-{
-    var height = _desiredHeight || (_sizeMode != CPToolbarSizeModeSmall ? [_toolbarView valueForThemeAttribute:@"regular-size-height"] : [_toolbarView valueForThemeAttribute:@"small-size-height"]);
-    return CGRectMake(0.0, 0.0, 1200.0, height);
-}
-
 /* @ignore */
 - (CPView)_toolbarView
 {
     if (!_toolbarView)
     {
-        _toolbarView = [[_CPToolbarView alloc] initWithFrame:[self _toolbarViewFrame]];
+        _toolbarView = [[_CPToolbarView alloc] initWithFrame:CPRectMake(0.0, 0.0, 1200.0, 59.0)];
 
         [_toolbarView setToolbar:self];
         [_toolbarView setAutoresizingMask:CPViewWidthSizable];
@@ -298,17 +257,13 @@ var CPToolbarsByIdentifier              = nil,
     // _defaultItems may have been loaded from Cib
     _itemIdentifiers = [_defaultItems valueForKey:@"itemIdentifier"] || [];
 
-    if ([_delegate respondsToSelector:@selector(toolbarDefaultItemIdentifiers:)])
+    if (_delegate)
     {
-        var itemIdentifiersFromDelegate = [_delegate toolbarDefaultItemIdentifiers:self];
+        var itemIdentifiersFromDelegate = [[_delegate toolbarDefaultItemIdentifiers:self] mutableCopy];
 
-        // If we get items both from the Cib and from the delegate method, put the delegate items before the
-        // Cib ones.
         if (itemIdentifiersFromDelegate)
-            _itemIdentifiers = [itemIdentifiersFromDelegate arrayByAddingObjectsFromArray:_itemIdentifiers];
+            _itemIdentifiers = [_itemIdentifiers arrayByAddingObjectsFromArray:itemIdentifiersFromDelegate];
     }
-    // If we didn't load from a cib and the delegate hasn't been set yet, we'll just work with an empty list
-    // at this point.
 
     var index = 0,
         count = [_itemIdentifiers count];
@@ -377,26 +332,12 @@ var CPToolbarsByIdentifier              = nil,
     each visible toolbar item.
 */
 - (void)validateVisibleItems
-{
-    [self _validateVisibleItems:NO]
-}
-
-- (void)_autoValidateVisibleItems
-{
-    [self _validateVisibleItems:YES]
-}
-
-- (void)_validateVisibleItems:(BOOL)isAutovalidation
 {
     var toolbarItems = [self visibleItems],
         count = [toolbarItems count];
 
     while (count--)
-    {
-        var item = [toolbarItems objectAtIndex:count];
-        if (!isAutovalidation || [item autovalidates])
-            [item validate];
-    }
+        [toolbarItems[count] validate];
 }
 
 /* @ignore */
@@ -486,8 +427,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     CPToolbarIdentifiedItemsKey         = @"CPToolbarIdentifiedItemsKey",
     CPToolbarDefaultItemsKey            = @"CPToolbarDefaultItemsKey",
     CPToolbarAllowedItemsKey            = @"CPToolbarAllowedItemsKey",
-    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey",
-    CPToolbarSizeModeKey                = @"CPToolbarSizeModeKey";
+    CPToolbarSelectableItemsKey         = @"CPToolbarSelectableItemsKey";
 
 @implementation CPToolbar (CPCoding)
 
@@ -506,7 +446,6 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
         _showsBaselineSeparator = [aCoder decodeBoolForKey:CPToolbarShowsBaselineSeparatorKey];
         _allowsUserCustomization = [aCoder decodeBoolForKey:CPToolbarAllowsUserCustomizationKey];
         _isVisible = [aCoder decodeBoolForKey:CPToolbarIsVisibleKey];
-        _sizeMode = [aCoder decodeIntForKey:CPToolbarSizeModeKey];
 
         _identifiedItems = [aCoder decodeObjectForKey:CPToolbarIdentifiedItemsKey];
         _defaultItems = [aCoder decodeObjectForKey:CPToolbarDefaultItemsKey];
@@ -525,7 +464,7 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
         // Because we don't know if a delegate will be set later (it is optional
         // as of OS X 10.5), we need to call -_reloadToolbarItems here.
         // In order to load any toolbar items that may have been configured in the
-        // Cib. Unfortunately this means that if there is a delegate
+        // Cib. Unfortunatelly this means that if there is a delegate
         // specified, it will be read later and the resulting call to -setDelegate:
         // will cause -_reloadToolbarItems] to run again :-(
         // FIXME: Can we make this better?
@@ -553,7 +492,6 @@ var CPToolbarIdentifierKey              = @"CPToolbarIdentifierKey",
     [aCoder encodeBool:_showsBaselineSeparator forKey:CPToolbarShowsBaselineSeparatorKey];
     [aCoder encodeBool:_allowsUserCustomization forKey:CPToolbarAllowsUserCustomizationKey];
     [aCoder encodeBool:_isVisible forKey:CPToolbarIsVisibleKey];
-    [aCoder encodeInt:_sizeMode forKey:CPToolbarSizeModeKey]
 
     [aCoder encodeObject:_identifiedItems forKey:CPToolbarIdentifiedItemsKey];
     [aCoder encodeObject:_defaultItems forKey:CPToolbarDefaultItemsKey];
@@ -570,10 +508,14 @@ var _CPToolbarViewBackgroundColor = nil,
     _CPToolbarViewExtraItemsImage = nil,
     _CPToolbarViewExtraItemsAlternateImage = nil;
 
+var TOOLBAR_TOP_MARGIN          = 5.0,
+    TOOLBAR_ITEM_MARGIN         = 10.0,
+    TOOLBAR_EXTRA_ITEMS_WIDTH   = 20.0;
+
 var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
     return { index:anIndex, view:aView, label:aLabel, minWidth:aMinWidth };
-};
+}
 
 /* @ignore */
 @implementation _CPToolbarView : CPView
@@ -598,32 +540,16 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     BOOL                _FIXME_isHUD;
 }
 
-+ (CPString)defaultThemeClass
++ (void)initialize
 {
-    return @"toolbar-view";
-}
+    if (self !== [_CPToolbarView class])
+        return;
 
-+ (id)themeAttributes
-{
-    return [CPDictionary dictionaryWithObjects:[10.0,
-                                                20.0,
-                                                [CPNull null],
-                                                [CPNull null],
-                                                _CGInsetMake(4.0, 4.0, 4.0, 10),
-                                                59.0,
-                                                46.0,
-                                                [CPNull null],
-                                                CGRectMake(0.0, 0.0, 2.0, 32.0)]
-                                       forKeys:[
-                                               @"item-margin",
-                                               @"extra-item-width",
-                                               @"extra-item-extra-image",
-                                               @"extra-item-extra-alternate-image",
-                                               @"content-inset",
-                                               @"regular-size-height",
-                                               @"small-size-height",
-                                               @"image-item-separator-color",
-                                               @"image-item-separator-size"]];
+    var bundle = [CPBundle bundleForClass:self];
+
+    _CPToolbarViewExtraItemsImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsImage.png"] size: CPSizeMake(10.0, 15.0)];
+
+    _CPToolbarViewExtraItemsAlternateImage = [[CPImage alloc] initWithContentsOfFile: [bundle pathForResource:"_CPToolbarView/_CPToolbarViewExtraItemsAlternateImage.png"] size:CGSizeMake(10.0, 15.0)];
 }
 
 - (id)initWithFrame:(CGRect)aFrame
@@ -637,12 +563,14 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         _labelColor = [CPColor blackColor];
         _labelShadowColor = [CPColor colorWithWhite:1.0 alpha:0.75];
 
-        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:_CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
+        _additionalItemsButton = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 10.0, 15.0) pullsDown:YES];
         [_additionalItemsButton setBordered:NO];
 
         [_additionalItemsButton setImagePosition:CPImageOnly];
         [[_additionalItemsButton menu] setShowsStateColumn:NO];
         [[_additionalItemsButton menu] setAutoenablesItems:NO];
+
+        [_additionalItemsButton setAlternateImage:_CPToolbarViewExtraItemsAlternateImage];
     }
 
     return self;
@@ -687,7 +615,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 {
     // We begin by recalculating the visible items.
     var items = [_toolbar items],
-        itemsWidth = _CGRectGetWidth([self bounds]),
+        itemsWidth = CGRectGetWidth([self bounds]),
         minWidth = _minWidth,
         // FIXME: This should be a CPSet.
         invisibleItemsSortedByPriority = [];
@@ -698,7 +626,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
     // minimum width for hiding items.
     if (itemsWidth < minWidth)
     {
-        itemsWidth -= [self valueForThemeAttribute:@"extra-item-width"];
+        itemsWidth -= TOOLBAR_EXTRA_ITEMS_WIDTH;
 
         _visibleItems = [_visibleItems copy];
 
@@ -714,7 +642,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             var item = itemsSortedByVisibilityPriority[--count],
                 view = [self viewForItem:item];
 
-            minWidth -= [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
+            minWidth -= [view minSize].width + TOOLBAR_ITEM_MARGIN;
 
             [_visibleItems removeObjectIdenticalTo:item];
             [invisibleItemsSortedByPriority addObject:item];
@@ -737,27 +665,9 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             height = minSize.height;
     }
 
-    // We'll figure out the proper height for the toolbar depending on its items.
-    // If nothing has a minimum size we'll use the standard toolbar size for the
-    // sizeMode, indicated by a 0 _desiredHeight.
-    var contentInset = [self valueForThemeAttribute:@"content-inset"],
-        newDesiredHeight = height ? height + contentInset.top + contentInset.bottom : 0;
-
-    if (newDesiredHeight != _toolbar._desiredHeight)
-    {
-        // FIXME Probably the toolbar view shouldn't be telling the toolbar which height it should be. Maybe refactor
-        // to just have the toolbar scan the toolbar items whenever the items change.
-        _toolbar._desiredHeight = newDesiredHeight;
-
-        [self setFrame:[_toolbar _toolbarViewFrame]];
-        [_toolbar._window _noteToolbarChanged];
-        // The above will cause tile to be called again.
-        return;
-    }
-
     // Determine all the items that have flexible width.
     // Also determine the height of the toolbar.
-    var count = _visibleItems.length,
+    var count = _visibleItems.length
         flexibleItemIndexes = [CPIndexSet indexSet];
 
     while (count--)
@@ -774,7 +684,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         // static width (min==max). This handles the case where the user did setView:
         // with a view of a different size than minSize/maxSize
         else
-            [view setFrameSize:_CGSizeMake(minSize.width, height)];
+            [view setFrameSize:CGSizeMake(minSize.width, height)];
 
         [view setHidden:NO];
     }
@@ -809,25 +719,23 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
                 remainingSpace += proposedWidth - constrainedWidth;
             }
 
-            [view setFrameSize:_CGSizeMake(constrainedWidth, height)];
+            [view setFrameSize:CGSizeMake(constrainedWidth, height)];
         }
     }
 
     // Now that all the visible items are the correct width, give them their final frames.
     var index = 0,
         count = _visibleItems.length,
-        x = contentInset.left,
-        contentInset = [self valueForThemeAttribute:@"content-inset"],
-        y = contentInset.top;
+        x = TOOLBAR_ITEM_MARGIN;
 
     for (; index < count; ++index)
     {
         var view = [self viewForItem:_visibleItems[index]],
-            viewWidth = _CGRectGetWidth([view frame]);
+            viewWidth = CGRectGetWidth([view frame]);
 
-        [view setFrame:_CGRectMake(x, y, viewWidth, height)];
+        [view setFrame:CGRectMake(x, 0.0, viewWidth, height)];
 
-        x += viewWidth + [self valueForThemeAttribute:@"item-margin"];
+        x += viewWidth + TOOLBAR_ITEM_MARGIN;
     }
 
     var needsAdditionalItemsButton = NO;
@@ -859,14 +767,14 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     if (needsAdditionalItemsButton)
     {
-        [_additionalItemsButton setFrameOrigin:_CGPointMake(itemsWidth + 5.0, (_CGRectGetHeight([self bounds]) - _CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];
+        [_additionalItemsButton setFrameOrigin:CGPointMake(itemsWidth + 5.0, (CGRectGetHeight([self bounds]) - CGRectGetHeight([_additionalItemsButton frame])) / 2.0)];
 
         [self addSubview:_additionalItemsButton];
 
         [_additionalItemsButton removeAllItems];
 
         [_additionalItemsButton addItemWithTitle:@"Additional Items"];
-        [[_additionalItemsButton itemArray][0] setImage:[self valueForThemeAttribute:@"extra-item-extra-image"]];
+        [[_additionalItemsButton itemArray][0] setImage:_CPToolbarViewExtraItemsImage];
 
         var index = 0,
             count = [_invisibleItems count],
@@ -891,11 +799,10 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
             hasNonSeparatorItem = YES;
 
-            var menuItem = [[CPMenuItem alloc] initWithTitle:[item label] action:@selector(didSelectMenuItem:) keyEquivalent:nil];
+            var menuItem = [[CPMenuItem alloc] initWithTitle:[item label] action:[item action] keyEquivalent:nil];
 
-            [menuItem setRepresentedObject:item];
             [menuItem setImage:[item image]];
-            [menuItem setTarget:self];
+            [menuItem setTarget:[item target]];
             [menuItem setEnabled:[item isEnabled]];
 
             [_additionalItemsButton addItem:menuItem];
@@ -905,18 +812,6 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
         [_additionalItemsButton removeFromSuperview];
 }
 
-/*
-    Used privately.
-    @ignore
-*/
-
-- (void)didSelectMenuItem:(id)aSender
-{
-    var toolbarItem = [aSender representedObject];
-
-    [CPApp sendAction:[toolbarItem action] to:[toolbarItem target] from:toolbarItem];
-}
-
 - (void)reloadToolbarItems
 {
     // Get rid of all our current subviews.
@@ -932,7 +827,7 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
 
     count = items.length;
 
-    _minWidth = [self valueForThemeAttribute:@"item-margin"];
+    _minWidth = TOOLBAR_ITEM_MARGIN;
     _viewsForToolbarItems = { };
 
     for (; index < count; ++index)
@@ -941,23 +836,14 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth)
             view = [[_CPToolbarItemView alloc] initWithToolbarItem:item toolbar:self];
 
         _viewsForToolbarItems[[item UID]] = view;
-
-        if ([item toolTip] && [view respondsToSelector:@selector(setToolTip:)])
-            [view setToolTip:[item toolTip]];
-
         [self addSubview:view];
 
-        _minWidth += [view minSize].width + [self valueForThemeAttribute:@"item-margin"];
+        _minWidth += [view minSize].width + TOOLBAR_ITEM_MARGIN;
     }
 
     [self tile];
 }
 
-- (void)layoutSubviews
-{
-    [_additionalItemsButton setAlternateImage:[self valueForThemeAttribute:@"extra-item-extra-alternate-image"]];
-}
-
 @end
 
 /* @ignore */
@@ -973,9 +859,10 @@ var _CPToolbarItemVisibilityPriorityCompare = function(lhs, rhs)
         return CPOrderedAscending;
 
     return CPOrderedDescending;
-};
+}
 
-var LABEL_MARGIN    = 2.0;
+var TOP_MARGIN      = 5.0,
+    LABEL_MARGIN    = 2.0;
 
 @implementation _CPToolbarItemView : CPControl
 {
@@ -1002,12 +889,12 @@ var LABEL_MARGIN    = 2.0;
     {
         _toolbarItem = aToolbarItem;
 
-        _labelField = [[CPTextField alloc] initWithFrame:_CGRectMakeZero()];
+        _labelField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
         [_labelField setFont:[CPFont systemFontOfSize:11.0]];
         [_labelField setTextColor:[self FIXME_labelColor]];
         [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];
-        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
         [_labelField setAutoresizingMask:CPViewWidthSizable | CPViewMinXMargin];
 
         [self addSubview:_labelField];
@@ -1054,7 +941,13 @@ var LABEL_MARGIN    = 2.0;
 
         if (identifier === CPToolbarSeparatorItemIdentifier)
         {
-            _view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+            _view = [[CPView alloc] initWithFrame:CGRectMake(0.0, 0.0, 2.0, 32.0)];
+
+            // FIXME: Get rid of this old API!!!
+            sizes = {};
+            sizes[@"CPToolbarItemSeparator"] = [CGSizeMake(2.0, 26.0), CGSizeMake(2.0, 1.0), CGSizeMake(2.0, 26.0)];
+            [_view setBackgroundColor:_CPControlThreePartImagePattern(YES, sizes, @"CPToolbarItem", @"Separator")];
+
             [self addSubview:_view];
         }
 
@@ -1086,7 +979,7 @@ var LABEL_MARGIN    = 2.0;
         {
             _imageView = [[CPImageView alloc] initWithFrame:[self bounds]];
 
-            [_imageView setImageScaling:CPImageScaleProportionallyDown];
+            [_imageView setImageScaling:CPScaleProportionally];
 
             [self addSubview:_imageView];
         }
@@ -1104,13 +997,8 @@ var LABEL_MARGIN    = 2.0;
 
     _labelSize = [_labelField frame].size;
 
-    var iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
-        labelOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeLabelOnly;
-    [_labelField setHidden:iconOnly];
-    [_view setHidden:labelOnly];
-
-    _minSize = _CGSizeMake(MAX(_labelSize.width, minSize.width), (labelOnly ? 0 : minSize.height) + (iconOnly ? 0 : _labelSize.height + LABEL_MARGIN));
-    _maxSize = _CGSizeMake(MAX(_labelSize.width, maxSize.width), 100000000.0);
+    _minSize = CGSizeMake(MAX(_labelSize.width, minSize.width), _labelSize.height + minSize.height + LABEL_MARGIN + TOP_MARGIN);
+    _maxSize = CGSizeMake(MAX(_labelSize.width, minSize.width), 100000000.0);
 
     [_toolbar tile];
 }
@@ -1127,31 +1015,20 @@ var LABEL_MARGIN    = 2.0;
         width = _CGRectGetWidth(bounds);
 
     if (identifier === CPToolbarSeparatorItemIdentifier)
-    {
-        var itemSeparatorColor = [_toolbar valueForThemeAttribute:@"image-item-separator-color"],
-            itemSeparatorSize = [_toolbar valueForThemeAttribute:@"image-item-separator-size"];
+        return [_view setFrame:CGRectMake(ROUND((width - 2.0) / 2.0), 0.0, 2.0, _CGRectGetHeight(bounds))];
 
-        [_view setFrame:_CGRectMake(ROUND((width - itemSeparatorSize.size.width) / 2.0), 0.0, itemSeparatorSize.size.width, _CGRectGetHeight(bounds))];
-        [_view setBackgroundColor:itemSeparatorColor];
-
-        return;
-    }
-
-    // The view is centred in the available space above the label.
     var view = _view || _imageView,
         itemMaxSize = [_toolbarItem maxSize],
-        iconOnly = [[_toolbarItem toolbar] displayMode] === CPToolbarDisplayModeIconOnly,
-        height = _CGRectGetHeight(bounds) - (iconOnly ? 0 : _labelSize.height),
+        height = _CGRectGetHeight(bounds) - _labelSize.height - LABEL_MARGIN - TOP_MARGIN,
         viewWidth = MIN(itemMaxSize.width, width),
         viewHeight =  MIN(itemMaxSize.height, height);
 
-    [view setFrame:_CGRectMake(ROUND((width - viewWidth) / 2.0),
-                               ROUND((height - viewHeight) / 2.0),
-                               viewWidth,
-                               viewHeight)];
+    [view setFrame:CGRectMake(  ROUND((width - viewWidth) / 2.0),
+                                TOP_MARGIN + ROUND((height - viewHeight) / 2.0),
+                                viewWidth,
+                                viewHeight)];
 
-    // Label is always drawn at the bottom of the view. So if the view is really tall but the icon is tiny, the icon is centred above the label while the label remains on the bottom.
-    [_labelField setFrameOrigin:_CGPointMake(ROUND((width - _labelSize.width) / 2.0), _CGRectGetHeight(bounds) - _labelSize.height)];
+    [_labelField setFrameOrigin:CGPointMake(ROUND((width - _labelSize.width) / 2.0), TOP_MARGIN + height + LABEL_MARGIN)];
 }
 
 - (void)mouseDown:(CPEvent)anEvent
@@ -1171,10 +1048,6 @@ var LABEL_MARGIN    = 2.0;
 
 - (void)setEnabled:(BOOL)shouldBeEnabled
 {
-    // Tiling is very expensive so try to avoid it. The CPToolbarItem should already be careful to not notifying about its enabled state needlessly.
-    if ([self isEnabled] === shouldBeEnabled)
-        return;
-
     [super setEnabled:shouldBeEnabled];
 
     if (shouldBeEnabled)
@@ -1218,7 +1091,7 @@ var LABEL_MARGIN    = 2.0;
         if (alternateImage)
             [_imageView setImage:alternateImage];
 
-        [_labelField setTextShadowOffset:_CGSizeMakeZero()];
+        [_labelField setTextShadowOffset:CGSizeMakeZero()];
     }
     else
     {
@@ -1227,7 +1100,7 @@ var LABEL_MARGIN    = 2.0;
         if (image)
             [_imageView setImage:image];
 
-        [_labelField setTextShadowOffset:_CGSizeMake(0.0, 1.0)];
+        [_labelField setTextShadowOffset:CGSizeMake(0.0, 1.0)];
     }
 
     [_labelField setTextShadowColor:[self FIXME_labelShadowColor]];