Merge remote-tracking branch 'upstream/master' into CPTableViewLion

2026-11-15 11:13:50 +00:00 · 2012-07-14 09:35:26 +02:00
commit 0b1d67116d
@@ -20,7 +20,9 @@
 * 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"
@@ -36,10 +38,10 @@
@import "CPCibBindingConnector.j"
@import "CPCibConnector.j"
@import "CPCibControlConnector.j"
+@import "CPCibHelpConnector.j"
@import "CPCibLoading.j"
@import "CPCibOutletConnector.j"
@import "CPCibRuntimeAttributesConnector.j"
-@import "CPCibHelpConnector.j"
@import "CPClipView.j"
@import "CPCollectionView.j"
@import "CPCollectionViewItem.j"
@@ -60,7 +62,6 @@
@import "CPFlashView.j"
@import "CPFont.j"
@import "CPFontManager.j"
-@import "CPGeometry.j"
@import "CPGradient.j"
@import "CPGraphics.j"
@import "CPImage.j"
@@ -99,13 +100,12 @@
@import "CPTokenField.j"
@import "CPToolbar.j"
@import "CPToolbarItem.j"
-@import "_CPToolTip.j"
@import "CPTreeNode.j"
@import "CPUserDefaultsController.j"
@import "CPView.j"
@import "CPViewAnimation.j"
@import "CPViewController.j"
@import "CPWebView.j"
-@import "CPWorkspace.j"
@import "CPWindow.j"
@import "CPWindowController.j"
+@import "CPWorkspace.j"
@@ -576,27 +576,33 @@ CPRunContinuesResponse  = -1002;
 {
    _currentEvent = anEvent;

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

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

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

        return;
    }

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

    if (_eventListeners.length)
    {
@@ -29,20 +29,21 @@

 /* @group CPBezelStyle */

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


@@ -21,13 +21,12 @@
 */

@import <Foundation/CPBundle.j>
+@import <Foundation/CPGeometry.j>
@import <Foundation/CPNotificationCenter.j>
@import <Foundation/CPObject.j>
@import <Foundation/CPRunLoop.j>
@import <Foundation/CPString.j>

-@import "CPGeometry.j"
-

 CPImageLoadStatusInitialized    = 0;
 CPImageLoadStatusLoading        = 1;
@@ -20,8 +20,9 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+@import <Foundation/CPGeometry.j>
+
@import "CPButton.j"
-@import "CPGeometry.j"
@import "CPMenu.j"
@import "CPMenuItem.j"

@@ -686,6 +686,7 @@ CPTransformableAttributeType = 1800;
    [textField setBordered:YES];
    [textField setEditable:YES];
    [textField setFont:[CPFont systemFontOfSize:10]];
+    [textField setSendsActionOnEndEditing:YES];

    return textField;
 }
@@ -3501,7 +3501,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
        If the dataview resigning triggers the action (as CPTextField does), we come right
        back here and start an infinite loop. So we have to check this flag first.
    */
-    if (_editingCellIndex === nil)
+    if ([sender respondsToSelector:@selector(sendsActionOnEndEditing)] && [sender sendsActionOnEndEditing] && _editingCellIndex === nil)
        return;

    _editingCellIndex = nil;
@@ -21,14 +21,14 @@
 */

@import <Foundation/CPArray.j>
+@import <Foundation/CPGeometry.j>
@import <Foundation/CPObjJRuntime.j>
@import <Foundation/CPSet.j>

@import "CGAffineTransform.j"
-@import "CGGeometry.j"
+

@import "CPColor.j"
-@import "CPGeometry.j"
@import "CPGraphicsContext.j"
@import "CPResponder.j"
@import "CPTheme.j"
@@ -20,7 +20,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#include "CGGeometry.h"
+#include "../../Foundation/_CGGeometry.h"

 #define _CGAffineTransformMake(a_, b_, c_, d_, tx_, ty_) { a:a_, b:b_, c:c_, d:d_, tx:tx_, ty:ty_ }
 #define _CGAffineTransformMakeIdentity() _CGAffineTransformMake(1.0, 0.0, 0.0, 1.0, 0.0, 0.0)
@@ -2,8 +2,8 @@
 * CGGeometry.j
 * AppKit
 *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
+ * 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
@@ -20,301 +20,4 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#define _function(inline) function inline { return _##inline; }
-
-_function(CGPointMake(x, y))
-_function(CGPointMakeZero())
-_function(CGPointMakeCopy(aPoint))
-_function(CGPointCreateCopy(aPoint))
-
-_function(CGPointEqualToPoint(lhsPoint, rhsPoint))
-_function(CGStringFromPoint(aPoint))
-
-_function(CGSizeMake(width, height))
-_function(CGSizeMakeZero())
-_function(CGSizeMakeCopy(aSize))
-_function(CGSizeCreateCopy(aSize))
-
-_function(CGSizeEqualToSize(lhsSize, rhsSize))
-_function(CGStringFromSize(aSize))
-
-_function(CGRectMake(x, y, width, height))
-_function(CGRectMakeZero())
-_function(CGRectMakeCopy(aRect))
-_function(CGRectCreateCopy(aRect))
-
-_function(CGRectEqualToRect(lhsRect, rhsRect))
-_function(CGStringFromRect(aRect))
-
-_function(CGRectOffset(aRect, dX, dY))
-_function(CGRectInset(aRect, dX, dY))
-
-_function(CGRectGetHeight(aRect))
-_function(CGRectGetMaxX(aRect))
-_function(CGRectGetMaxY(aRect))
-_function(CGRectGetMidX(aRect))
-_function(CGRectGetMidY(aRect))
-_function(CGRectGetMinX(aRect))
-_function(CGRectGetMinY(aRect))
-_function(CGRectGetWidth(aRect))
-
-_function(CGRectIsEmpty(aRect))
-_function(CGRectIsNull(aRect))
-
-_function(CGRectContainsPoint(aRect, aPoint))
-
-_function(CGInsetMake(top, right, bottom, left))
-_function(CGInsetMakeZero())
-_function(CGInsetMakeCopy(anInset))
-_function(CGInsetIsEmpty(anInset))
-_function(CGInsetEqualToInset(lhsInset, rhsInset))
-
-CGMinXEdge = 0;
-CGMinYEdge = 1;
-CGMaxXEdge = 2;
-CGMaxYEdge = 3;
-
-CGRectNull = _CGRectMake(Infinity, Infinity, 0.0, 0.0);
-
-/*!
-    @addtogroup appkit
-    @{
-*/
-
-/*!
-    Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
-    with a line that's parallel to the side of inRect specified by edge.
-    The size of slice is determined by amount, which specifies the distance from edge.
-
-    slice and rem must not be NULL, must not be the same object, and must not be the
-    same object as inRect.
-
-    @group CGRect
-*/
-function CGRectDivide(inRect, slice, rem, amount, edge)
-{
-    slice.origin = _CGPointMakeCopy(inRect.origin);
-    slice.size = _CGSizeMakeCopy(inRect.size);
-    rem.origin = _CGPointMakeCopy(inRect.origin);
-    rem.size = _CGSizeMakeCopy(inRect.size);
-
-    switch (edge)
-    {
-        case CGMinXEdge:
-            slice.size.width = amount;
-            rem.origin.x += amount;
-            rem.size.width -= amount;
-            break;
-
-        case CGMaxXEdge:
-            slice.origin.x = _CGRectGetMaxX(slice) - amount;
-            slice.size.width = amount;
-            rem.size.width -= amount;
-            break;
-
-        case CGMinYEdge:
-            slice.size.height = amount;
-            rem.origin.y += amount;
-            rem.size.height -= amount;
-            break;
-
-        case CGMaxYEdge:
-            slice.origin.y = _CGRectGetMaxY(slice) - amount;
-            slice.size.height = amount;
-            rem.size.height -= amount;
-    }
-}
-
-/*!
-    Returns a \c BOOL indicating whether CGRect \c lhsRect
-    contains CGRect \c rhsRect.
-    @group CGRect
-    @param lhsRect the CGRect to test if \c rhsRect is inside of
-    @param rhsRect the CGRect to test if it fits inside \c lhsRect.
-    @return BOOL \c YES if \c rhsRect fits inside \c lhsRect.
-*/
-function CGRectContainsRect(lhsRect, rhsRect)
-{
-    var union = CGRectUnion(lhsRect, rhsRect);
-
-    return _CGRectEqualToRect(union, lhsRect);
-}
-
-/*!
-    Returns \c YES if the two rectangles intersect
-    @group CGRect
-    @param lhsRect the first CGRect
-    @param rhsRect the second CGRect
-    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
-*/
-function CGRectIntersectsRect(lhsRect, rhsRect)
-{
-    var intersection = CGRectIntersection(lhsRect, rhsRect);
-
-    return !_CGRectIsEmpty(intersection);
-}
-
-/*!
-    Makes the origin and size of a CGRect all integers. Specifically, by making
-    the southwest corner the origin (rounded down), and the northeast corner a CGSize (rounded up).
-    @param aRect the rectangle to operate on
-    @return CGRect the modified rectangle (same as the input)
-    @group CGRect
-*/
-function CGRectIntegral(aRect)
-{
-    aRect = CGRectStandardize(aRect);
-
-    // Store these out separately, if not the GetMaxes will return incorrect values.
-    var x = FLOOR(_CGRectGetMinX(aRect)),
-        y = FLOOR(_CGRectGetMinY(aRect));
-
-    aRect.size.width = CEIL(_CGRectGetMaxX(aRect)) - x;
-    aRect.size.height = CEIL(_CGRectGetMaxY(aRect)) - y;
-
-    aRect.origin.x = x;
-    aRect.origin.y = y;
-
-    return aRect;
-}
-
-/*!
-    Returns the intersection of the two provided rectangles as a new rectangle.
-    @param lhsRect the first rectangle used for calculation
-    @param rhsRect the second rectangle used for calculation
-    @return CGRect the intersection of the two rectangles
-    @group CGRect
-*/
-function CGRectIntersection(lhsRect, rhsRect)
-{
-    var intersection = _CGRectMake(
-        MAX(_CGRectGetMinX(lhsRect), _CGRectGetMinX(rhsRect)),
-        MAX(_CGRectGetMinY(lhsRect), _CGRectGetMinY(rhsRect)),
-        0, 0);
-
-    intersection.size.width = MIN(_CGRectGetMaxX(lhsRect), _CGRectGetMaxX(rhsRect)) - _CGRectGetMinX(intersection);
-    intersection.size.height = MIN(_CGRectGetMaxY(lhsRect), _CGRectGetMaxY(rhsRect)) - _CGRectGetMinY(intersection);
-
-    return _CGRectIsEmpty(intersection) ? _CGRectMakeZero() : intersection;
-}
-
-/*
-
-*/
-function CGRectStandardize(aRect)
-{
-    var width = _CGRectGetWidth(aRect),
-        height = _CGRectGetHeight(aRect),
-        standardized = _CGRectMakeCopy(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;
-}
-
-function CGRectUnion(lhsRect, rhsRect)
-{
-    var lhsRectIsNull = !lhsRect || lhsRect === CGRectNull,
-        rhsRectIsNull = !rhsRect || rhsRect === CGRectNull;
-
-    if (lhsRectIsNull)
-        return rhsRectIsNull ? CGRectNull : rhsRect;
-
-    if (rhsRectIsNull)
-        return lhsRectIsNull ? CGRectNull : lhsRect;
-
-    var minX = MIN(_CGRectGetMinX(lhsRect), _CGRectGetMinX(rhsRect)),
-        minY = MIN(_CGRectGetMinY(lhsRect), _CGRectGetMinY(rhsRect)),
-        maxX = MAX(_CGRectGetMaxX(lhsRect), _CGRectGetMaxX(rhsRect)),
-        maxY = MAX(_CGRectGetMaxY(lhsRect), _CGRectGetMaxY(rhsRect));
-
-    return _CGRectMake(minX, minY, maxX - minX, maxY - minY);
-}
-
-/*!
-    Returns the specified rectangle inset by the given CGInset as a new rectangle.
-    @param aRect the rect to inset
-    @param anInset a CGInset to inset by
-    @return CGRect aRect inset by anInset
-*/
-_function(CGRectInsetByInset(aRect, anInset));
-
-function CGPointFromString(aString)
-{
-    var comma = aString.indexOf(',');
-
-    return { x:parseFloat(aString.substr(1, comma - 1)), y:parseFloat(aString.substring(comma + 1, aString.length)) };
-}
-
-function CGSizeFromString(aString)
-{
-    var comma = aString.indexOf(',');
-
-    return { width:parseFloat(aString.substr(1, comma - 1)), height:parseFloat(aString.substring(comma + 1, aString.length)) };
-}
-
-function CGRectFromString(aString)
-{
-    var comma = aString.indexOf(',', aString.indexOf(',') + 1);
-
-    return { origin:CGPointFromString(aString.substr(1, comma - 1)), size:CGSizeFromString(aString.substring(comma + 2, aString.length)) };
-}
-
-function CGPointFromEvent(anEvent)
-{
-    return _CGPointMake(anEvent.clientX, anEvent.clientY);
-}
-
-/*!
-    Combines two insets by adding their individual elements and returns the result.
-
-    @group CGInset
-*/
-function CGInsetUnion(lhsInset, rhsInset)
-{
-    return _CGInsetMake(lhsInset.top + rhsInset.top,
-                        lhsInset.right + rhsInset.right,
-                        lhsInset.bottom + rhsInset.bottom,
-                        lhsInset.left + rhsInset.left);
-}
-
-/*!
-    Subtract one inset from another by subtracting their individual elements and returns the result.
-
-    @group CGInset
-*/
-function CGInsetDifference(lhsInset, rhsInset)
-{
-    return _CGInsetMake(lhsInset.top - rhsInset.top,
-                        lhsInset.right - rhsInset.right,
-                        lhsInset.bottom - rhsInset.bottom,
-                        lhsInset.left - rhsInset.left);
-}
-
-function CGInsetFromString(aString)
-{
-    var numbers = aString.substr(1, aString.length - 2).split(',');
-
-    return _CGInsetMake(parseFloat(numbers[0]), parseFloat(numbers[1]), parseFloat(numbers[2]), parseFloat(numbers[3]));
-}
-
-CGInsetFromCPString = CGInsetFromString;
-
-function CPStringFromCGInset(anInset)
-{
-    return '{' + anInset.top + ", " + anInset.left + ", " + anInset.bottom + ", " + anInset.right + '}';
-}
-
-/*!
-    @}
-*/
+@import <Foundation/_CGGeometry.j>
@@ -467,7 +467,6 @@ var themedButtonValues = nil,

            [@"text-color",         [CPColor colorWithCalibratedWhite:0.6 alpha:1.0],   CPThemeStateDisabled],

-
            [@"text-color",         defaultTextColor,               CPThemeStateDefault],
            [@"text-color",         defaultDisabledTextColor,       CPThemeStateDefault | CPThemeStateDisabled],

@@ -744,7 +744,13 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
    if ((_imagePosition !== CPImageOnly) && [_text length] > 0)
    {
        if (!_textSize)
-            _textSize = [_text sizeWithFont:_font || [CPFont systemFontOfSize:CPFontCurrentSystemSize]];
+        {
+            _textSize = [_text sizeWithFont:_font || [CPFont systemFontOfSize:0]];
+
+            // Account for fractional pixels
+            _textSize.width += 1;
+            _textSize.height += 1;
+        }

        if (!_image || _imagePosition === CPImageOverlaps)
        {
@@ -1,6 +1,6 @@
 /*
 * CPGeometry.j
- * AppKit
+ * Foundation
 *
 * Created by Francisco Tolmasky.
 * Copyright 2008, 280 North, Inc.
@@ -20,102 +20,30 @@
 * 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;

-// FIXME: the rest!
+/*!
+    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
+*/
 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;
-CPMakeRect = CGRectMake;
-
-/*!
-    @addtogroup appkit
-    @{
-*/
-
-/*!
-  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 { x: aPoint.x, y: aPoint.y };
-}
-
-/*!
-  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
-  */
-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.
-    @param dX the size of the inset in the x-axis
-    @param dY the size of the inset in the y-axis
-    @group CGRect
-    @return CGRect a rectangle like \c aRect with an inset
-*/
-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
-    @ignore
-    @return void
-    @deprecated
-*/
-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(
-        MAX(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
-        MAX(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
-        0, 0);
-
-    intersection.size.width = MIN(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)) - CPRectGetMinX(intersection);
-    intersection.size.height = MIN(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect)) - CPRectGetMinY(intersection);
-
-    return CPRectIsEmpty(intersection) ? CPRectMakeZero() : intersection;
-}
-
-/*!
-    Creates a copy of the provided rectangle
-    @group CGRect
-    @param aRect the CGRect that will be copied
-    @return CGRect the rectangle copy
-*/
-function CPRectCreateCopy(aRect)
-{
-    return { origin: CPPointCreateCopy(aRect.origin), size: CPSizeCreateCopy(aRect.size) };
-}

 /*!
    Returns a CGRect made of the specified arguments
@@ -126,118 +54,15 @@ function CPRectCreateCopy(aRect)
    @param height the height of the new rectangle
    @return CGRect the new rectangle
 */
-function CPRectMake(x, y, width, height)
-{
-    return { origin: CPPointMake(x, y), size: CPSizeMake(width, height) };
-}
+CPMakeRect = CGRectMake;

 /*!
-    Creates a new rectangle with its origin offset by \c dX and \c dY.
-    @group CGRect
-    @param aRect the rectangle to copy the origin and size from
-    @param dX the amount added to the x-size of the new rectangle
-    @param dY the amount added to the y-size of the new rectangle
-    @return CGRect the new rectangle with modified size
+    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 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
-*/
-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.
-    @group CGRect
-    @param lhsRect the first CGRect to use for the union calculation
-    @param rhsRect the second CGRect to use for the union calculation
-    @return CGRect the union rectangle
-*/
-function CPRectUnion(lhsRect, rhsRect)
-{
-    var minX = MIN(CPRectGetMinX(lhsRect), CPRectGetMinX(rhsRect)),
-        minY = MIN(CPRectGetMinY(lhsRect), CPRectGetMinY(rhsRect)),
-        maxX = MAX(CPRectGetMaxX(lhsRect), CPRectGetMaxX(rhsRect)),
-        maxY = MAX(CPRectGetMaxY(lhsRect), CPRectGetMaxY(rhsRect));
-
-    return CPRectMake(minX, minY, maxX - minX, maxY - minY);
-}
-
-/*!
-    Creates and returns a copy of the provided CGSize
-    @group CGSize
-    @param aSize the CGSize to copy
-    @return CGSize the copy of the CGSize
-*/
-function CPSizeCreateCopy(aSize)
-{
-    return { width: aSize.width, height: aSize.height };
-}
-
-/*!
-    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
-*/
-function CPSizeMake(width, height)
-{
-    return { width: width, height: height };
-}
-
-/*!
-    Returns \c YES if the CGRect, \c aRect, contains
-    the CGPoint, \c aPoint.
-    @param aRect the rectangle to test with
-    @param aPoint the point to test with
-    @group CGRect
-    @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
-*/
-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);
-}
+CPPointCreateCopy = CGPointMakeCopy;

 /*!
    Tests whether the two CGPoints are equal to each other by comparing their
@@ -247,10 +72,7 @@ function CPRectContainsRect(possibleOuter, possibleInner)
    @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;
-}
+CPPointEqualToPoint = CGPointEqualToPoint;

 /*!
    Test whether the two CGRects have the same origin and size
@@ -259,103 +81,7 @@ function CPPointEqualToPoint(lhsPoint, rhsPoint)
    @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
-*/
-function CPRectGetHeight(aRect)
-{
-    return aRect.size.height;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return int
-*/
-function CPRectGetMaxX(aRect)
-{
-    return aRect.origin.x + aRect.size.width;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return int
-*/
-function CPRectGetMaxY(aRect)
-{
-    return aRect.origin.y + aRect.size.height;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return float
-*/
-function CPRectGetMidX(aRect)
-{
-    return aRect.origin.x + (aRect.size.width) / 2.0;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return float
-*/
-function CPRectGetMidY(aRect)
-{
-    return aRect.origin.y + (aRect.size.height) / 2.0;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return int
-*/
-function CPRectGetMinX(aRect)
-{
-    return aRect.origin.x;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return int
-*/
-function CPRectGetMinY(aRect)
-{
-    return aRect.origin.y;
-}
-
-/*!
-    @group CGRect
-    @param aRect a CGRect
-    @return int
-*/
-function CPRectGetWidth(aRect)
-{
-    return aRect.size.width;
-}
-
-/*!
-    Returns \c YES if the two rectangles intersect
-    @group CGRect
-    @param lhsRect the first CGRect
-    @param rhsRect the second CGRect
-    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
-*/
-function CPRectIntersectsRect(lhsRect, rhsRect)
-{
-    return !CPRectIsEmpty(CPRectIntersection(lhsRect, rhsRect));
-}
+CPRectEqualToRect = CGRectEqualToRect;

 /*!
    Returns \c YES if the CGRect has no area.
@@ -364,10 +90,189 @@ function CPRectIntersectsRect(lhsRect, rhsRect)
    @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;
-}
+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;
+
+/*!
+  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
+*/
+CPPointMake = CGPointMake;
+
+/*!
+    Makes a CGRect with an origin and size equal to \c aRect less the \c dX/dY insets specified.
+    @param dX the size of the inset in the x-axis
+    @param dY the size of the inset in the y-axis
+    @group CGRect
+    @return CGRect a rectangle like \c aRect with an inset
+*/
+CPRectInset = CGRectInset;
+
+/*!
+    @group CGRect
+    @ignore
+    @return void
+    @deprecated
+*/
+CPRectIntegral = CGRectIntegral;
+
+/*!
+    Creates a copy of the provided rectangle
+    @group CGRect
+    @param aRect the CGRect that will be copied
+    @return CGRect the rectangle copy
+*/
+CPRectCreateCopy = CGRectCreateCopy;
+
+/*!
+    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
+*/
+CPRectMake = CGRectMake;
+
+/*!
+    Creates a new rectangle with its origin offset by \c dX and \c dY.
+    @group CGRect
+    @param aRect the rectangle to copy the origin and size from
+    @param dX the amount added to the x-size of the new rectangle
+    @param dY the amount added to the y-size of the new rectangle
+    @return CGRect the new rectangle with modified size
+*/
+CPRectOffset = CGRectOffset;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return CGRect
+*/
+CPRectStandardize = CGRectStandardize;
+
+/*!
+    Returns the smallest rectangle that can contain the two argument \c CGRects.
+    @group CGRect
+    @param lhsRect the first CGRect to use for the union calculation
+    @param rhsRect the second CGRect to use for the union calculation
+    @return CGRect the union rectangle
+*/
+CPRectUnion = CGRectUnion;
+
+/*!
+    Creates and returns a copy of the provided CGSize
+    @group CGSize
+    @param aSize the CGSize to copy
+    @return CGSize the copy of the CGSize
+*/
+CPSizeCreateCopy = CGSizeCreateCopy;
+
+/*!
+    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
+*/
+CPSizeMake = CGSizeMake;
+
+/*!
+    Returns \c YES if the CGRect, \c aRect, contains
+    the CGPoint, \c aPoint.
+    @param aRect the rectangle to test with
+    @param aPoint the point to test with
+    @group CGRect
+    @return BOOL \c YES if the rectangle contains the point, \c NO otherwise.
+*/
+CPRectContainsPoint = CGRectContainsPoint;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+CPRectGetHeight = CGRectGetHeight;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+CPRectGetMaxX = CGRectGetMaxX;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+CPRectGetMaxY = CGRectGetMaxY;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return float
+*/
+CPRectGetMidX = CGRectGetMidX;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return float
+*/
+CPRectGetMidY = CGRectGetMidY;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+CPRectGetMinX = CGRectGetMinX;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+CPRectGetMinY = CGRectGetMinY;
+
+/*!
+    @group CGRect
+    @param aRect a CGRect
+    @return int
+*/
+CPRectGetWidth = CGRectGetWidth;
+
+/*!
+    Returns \c YES if the two rectangles intersect
+    @group CGRect
+    @param lhsRect the first CGRect
+    @param rhsRect the second CGRect
+    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
+*/
+CPRectIntersectsRect = CGRectIntersectsRect;

 /*!
    Returns \c YES if the CGRect has no area.
@@ -375,10 +280,7 @@ function CPRectIsEmpty(aRect)
    @group CGRect
    @return BOOL \c YES if the CGRect has no area, and \c NO, otherwise.
 */
-function CPRectIsNull(aRect)
-{
-    return aRect.size.width <= 0.0 || aRect.size.height <= 0.0;
-}
+CPRectIsNull = CGRectIsNull;

 /*!
    Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
@@ -389,10 +291,7 @@ function CPRectIsNull(aRect)

    @group CGRect
 */
-function CPDivideRect(inRect, slice, rem, amount, edge)
-{
-    CGRectDivide(inRect, slice, rem, amount, edge);
-}
+CPDivideRect = CGRectDivide;

 /*!
    Returns \c YES if the two CGSizes are identical.
@@ -401,10 +300,7 @@ function CPDivideRect(inRect, slice, rem, amount, edge)
    @param rhsSize the second CGSize to compare
    @return BOOL \c YES if the two sizes are identical. \c NO, otherwise.
 */
-function CPSizeEqualToSize(lhsSize, rhsSize)
-{
-    return lhsSize.width == rhsSize.width && lhsSize.height == rhsSize.height;
-}
+CPSizeEqualToSize = CGSizeEqualToSize;

 /*!
    Returns a human readable string of the provided CGPoint.
@@ -412,10 +308,7 @@ function CPSizeEqualToSize(lhsSize, rhsSize)
    @param aPoint the point to represent
    @return CGPoint a string representation of the CGPoint
 */
-function CPStringFromPoint(aPoint)
-{
-    return "{" + aPoint.x + ", " + aPoint.y + "}";
-}
+CPStringFromPoint = CGStringFromPoint;

 /*!
    Returns a human readable string of the provided CGSize.
@@ -423,10 +316,7 @@ function CPStringFromPoint(aPoint)
    @param aSize the size to represent
    @return CGSize a string representation of the CGSize
 */
-function CPStringFromSize(aSize)
-{
-    return "{" + aSize.width + ", " + aSize.height + "}";
-}
+CPStringFromSize = CGStringFromSize;

 /*!
    Returns a human readable string of the provided CGRect.
@@ -434,10 +324,7 @@ function CPStringFromSize(aSize)
    @param aRect the rectangle to represent
    @return CGString the string representation of the rectangle
 */
-function CPStringFromRect(aRect)
-{
-    return "{" + CPStringFromPoint(aRect.origin) + ", " + CPStringFromSize(aRect.size) + "}";
-}
+CPStringFromRect = CGStringFromRect;

 /*!
    Returns a CGPoint from a string with a comma separated pair of integers.
@@ -445,12 +332,7 @@ function CPStringFromRect(aRect)
    @param aString a string containing two comma separated integers
    @return CGPoint the point object created from the string
 */
-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) };
-}
+CPPointFromString = CGPointFromString;

 /*!
    Returns a CGSize from a string containing a pair of comma separated integers.
@@ -458,12 +340,7 @@ function CPPointFromString(aString)
    @param aString a string containing two comma separated integers
    @return CGSize the size object created from the string
 */
-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) };
-}
+CPSizeFromString = CGSizeFromString;

 /*!
    Returns a CGRect created from a string.
@@ -471,53 +348,32 @@ function CPSizeFromString(aString)
    @param aString a string in the form generated by \c CPStringFromRect
    @return CGRect the rectangle created from the string
 */
-function CPRectFromString(aString)
-{
-    var comma = aString.indexOf(',', aString.indexOf(',') + 1);
-
-    return { origin:CPPointFromString(aString.substr(1, comma - 1)), size:CPSizeFromString(aString.substring(comma + 2, aString.length)) };
-}
+CPRectFromString = CGRectFromString;

 /*!
    @group CGPoint
    @param anEvent
    @return CGPoint
 */
-function CPPointFromEvent(anEvent)
-{
-    return CPPointMake(anEvent.clientX, anEvent.clientY, 0);
-}
+CPPointFromEvent = CGPointFromEvent;

 /*!
    Returns a zero sized CGSize.
    @group CGSize
    @return CGSize a size object with zeros for \c width and \c height
 */
-function CPSizeMakeZero()
-{
-    return CPSizeMake(0, 0);
-}
+CPSizeMakeZero = CGSizeMakeZero;

 /*!
    Returns a rectangle at origin \c (0,0) and size of \c (0,0).
    @group CGRect
    @return CGRect a zeroed out CGRect
 */
-function CPRectMakeZero()
-{
-    return CPRectMake(0, 0, 0, 0);
-}
+CPRectMakeZero = CGRectMakeZero;

 /*!
    Returns a point located at \c (0, 0).
    @group CGPoint
    @return CGPoint a point located at \c (0, 0)
 */
-function CPPointMakeZero()
-{
-    return CPPointMake(0, 0, 0);
-}
-
-/*!
-    @}
-*/
+CPPointMakeZero = CGPointMakeZero;
@@ -36,6 +36,7 @@
@import "CPException.j"
@import "CPExpression.j"
@import "CPFormatter.j"
+@import "CPGeometry.j"
@import "CPIndexSet.j"
@import "CPIndexPath.j"
@import "CPInvocation.j"
@@ -42,7 +42,13 @@ foundationTask = framework ("Foundation", function(foundationTask)
    foundationTask.setInfoPlistPath("Info.plist");
    foundationTask.setEnvironments(require("objective-j/jake/environment").ObjJ);

-    var INCLUDES = "--include \"../AppKit/Platform/Platform.h\" --include \"Ref.h\"";
+    // Grab all the .h's and just include them in each file.
+    var INCLUDES = new FileList("**/*.h").map(function(aFilename)
+    {
+        return "--include \"" + aFilename + "\"";
+    }).join(" ");
+
+    INCLUDES = "--include \"../AppKit/Platform/Platform.h\" " + INCLUDES;

    if ($CONFIGURATION === "Release")
        foundationTask.setCompilerFlags("-O " + INCLUDES);
@@ -1,6 +1,6 @@
 /*
 * CGGeometry.h
- * AppKit
+ * Foundation
 *
 * Created by Francisco Tolmasky.
 * Copyright 2008, 280 North, Inc.
@@ -20,6 +20,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 */

+/*
+
+CGGeometry is not a part of Foundation. The reason _CGGeometry.h exists, and is in Foundation, is that CPGeometry and CGGeometry both use the same code so the shared basis needs to be in the lowest layer. If for some reason Cappuccino was ever reimplemented such that CPRect !== CGRect etc, this class could be removed and CPGeometry.j and CGGeometry.j updated with relevant functions without breaking any client code.
+
+*/
+
 #define _CGPointMake(x_, y_) { x:x_, y:y_ }
 #define _CGPointMakeCopy(aPoint) _CGPointMake(aPoint.x, aPoint.y)
 #define _CGPointMakeZero() _CGPointMake(0.0, 0.0)
@@ -0,0 +1,326 @@
+/*
+ * _CGGeometry.j
+ * Foundation
+ *
+ * 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
+ */
+
+/*
+
+CGGeometry is not a part of Foundation. The reason _CGGeometry.j exists, and is in Foundation, is that CPGeometry and CGGeometry both use the same code so the shared basis needs to be in the lowest layer. If for some reason Cappuccino was ever reimplemented such that CPRect !== CGRect etc, this class could be removed and CPGeometry.j and CGGeometry.j updated with relevant functions without breaking any client code.
+
+*/
+
+#define _function(inline) function inline { return _##inline; }
+
+_function(CGPointMake(x, y))
+_function(CGPointMakeZero())
+_function(CGPointMakeCopy(aPoint))
+_function(CGPointCreateCopy(aPoint))
+
+_function(CGPointEqualToPoint(lhsPoint, rhsPoint))
+_function(CGStringFromPoint(aPoint))
+
+_function(CGSizeMake(width, height))
+_function(CGSizeMakeZero())
+_function(CGSizeMakeCopy(aSize))
+_function(CGSizeCreateCopy(aSize))
+
+_function(CGSizeEqualToSize(lhsSize, rhsSize))
+_function(CGStringFromSize(aSize))
+
+_function(CGRectMake(x, y, width, height))
+_function(CGRectMakeZero())
+_function(CGRectMakeCopy(aRect))
+_function(CGRectCreateCopy(aRect))
+
+_function(CGRectEqualToRect(lhsRect, rhsRect))
+_function(CGStringFromRect(aRect))
+
+_function(CGRectOffset(aRect, dX, dY))
+_function(CGRectInset(aRect, dX, dY))
+
+_function(CGRectGetHeight(aRect))
+_function(CGRectGetMaxX(aRect))
+_function(CGRectGetMaxY(aRect))
+_function(CGRectGetMidX(aRect))
+_function(CGRectGetMidY(aRect))
+_function(CGRectGetMinX(aRect))
+_function(CGRectGetMinY(aRect))
+_function(CGRectGetWidth(aRect))
+
+_function(CGRectIsEmpty(aRect))
+_function(CGRectIsNull(aRect))
+
+_function(CGRectContainsPoint(aRect, aPoint))
+
+_function(CGInsetMake(top, right, bottom, left))
+_function(CGInsetMakeZero())
+_function(CGInsetMakeCopy(anInset))
+_function(CGInsetIsEmpty(anInset))
+_function(CGInsetEqualToInset(lhsInset, rhsInset))
+
+CGMinXEdge = 0;
+CGMinYEdge = 1;
+CGMaxXEdge = 2;
+CGMaxYEdge = 3;
+
+CGRectNull = _CGRectMake(Infinity, Infinity, 0.0, 0.0);
+
+/*!
+    @addtogroup appkit
+    @{
+*/
+
+/*!
+    Creates two rectangles -- slice and rem -- from inRect, by dividing inRect
+    with a line that's parallel to the side of inRect specified by edge.
+    The size of slice is determined by amount, which specifies the distance from edge.
+
+    slice and rem must not be NULL, must not be the same object, and must not be the
+    same object as inRect.
+
+    @group CGRect
+*/
+function CGRectDivide(inRect, slice, rem, amount, edge)
+{
+    slice.origin = _CGPointMakeCopy(inRect.origin);
+    slice.size = _CGSizeMakeCopy(inRect.size);
+    rem.origin = _CGPointMakeCopy(inRect.origin);
+    rem.size = _CGSizeMakeCopy(inRect.size);
+
+    switch (edge)
+    {
+        case CGMinXEdge:
+            slice.size.width = amount;
+            rem.origin.x += amount;
+            rem.size.width -= amount;
+            break;
+
+        case CGMaxXEdge:
+            slice.origin.x = _CGRectGetMaxX(slice) - amount;
+            slice.size.width = amount;
+            rem.size.width -= amount;
+            break;
+
+        case CGMinYEdge:
+            slice.size.height = amount;
+            rem.origin.y += amount;
+            rem.size.height -= amount;
+            break;
+
+        case CGMaxYEdge:
+            slice.origin.y = _CGRectGetMaxY(slice) - amount;
+            slice.size.height = amount;
+            rem.size.height -= amount;
+    }
+}
+
+/*!
+    Returns a \c BOOL indicating whether CGRect \c lhsRect
+    contains CGRect \c rhsRect.
+    @group CGRect
+    @param lhsRect the CGRect to test if \c rhsRect is inside of
+    @param rhsRect the CGRect to test if it fits inside \c lhsRect.
+    @return BOOL \c YES if \c rhsRect fits inside \c lhsRect.
+*/
+function CGRectContainsRect(lhsRect, rhsRect)
+{
+    var union = CGRectUnion(lhsRect, rhsRect);
+
+    return _CGRectEqualToRect(union, lhsRect);
+}
+
+/*!
+    Returns \c YES if the two rectangles intersect
+    @group CGRect
+    @param lhsRect the first CGRect
+    @param rhsRect the second CGRect
+    @return BOOL \c YES if the two rectangles have any common spaces, and \c NO, otherwise.
+*/
+function CGRectIntersectsRect(lhsRect, rhsRect)
+{
+    var intersection = CGRectIntersection(lhsRect, rhsRect);
+
+    return !_CGRectIsEmpty(intersection);
+}
+
+/*!
+    Makes the origin and size of a CGRect all integers. Specifically, by making
+    the southwest corner the origin (rounded down), and the northeast corner a CGSize (rounded up).
+    @param aRect the rectangle to operate on
+    @return CGRect the modified rectangle (same as the input)
+    @group CGRect
+*/
+function CGRectIntegral(aRect)
+{
+    aRect = CGRectStandardize(aRect);
+
+    // Store these out separately, if not the GetMaxes will return incorrect values.
+    var x = FLOOR(_CGRectGetMinX(aRect)),
+        y = FLOOR(_CGRectGetMinY(aRect));
+
+    aRect.size.width = CEIL(_CGRectGetMaxX(aRect)) - x;
+    aRect.size.height = CEIL(_CGRectGetMaxY(aRect)) - y;
+
+    aRect.origin.x = x;
+    aRect.origin.y = y;
+
+    return aRect;
+}
+
+/*!
+    Returns the intersection of the two provided rectangles as a new rectangle.
+    @param lhsRect the first rectangle used for calculation
+    @param rhsRect the second rectangle used for calculation
+    @return CGRect the intersection of the two rectangles
+    @group CGRect
+*/
+function CGRectIntersection(lhsRect, rhsRect)
+{
+    var intersection = _CGRectMake(
+        MAX(_CGRectGetMinX(lhsRect), _CGRectGetMinX(rhsRect)),
+        MAX(_CGRectGetMinY(lhsRect), _CGRectGetMinY(rhsRect)),
+        0, 0);
+
+    intersection.size.width = MIN(_CGRectGetMaxX(lhsRect), _CGRectGetMaxX(rhsRect)) - _CGRectGetMinX(intersection);
+    intersection.size.height = MIN(_CGRectGetMaxY(lhsRect), _CGRectGetMaxY(rhsRect)) - _CGRectGetMinY(intersection);
+
+    return _CGRectIsEmpty(intersection) ? _CGRectMakeZero() : intersection;
+}
+
+/*
+
+*/
+function CGRectStandardize(aRect)
+{
+    var width = _CGRectGetWidth(aRect),
+        height = _CGRectGetHeight(aRect),
+        standardized = _CGRectMakeCopy(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;
+}
+
+function CGRectUnion(lhsRect, rhsRect)
+{
+    var lhsRectIsNull = !lhsRect || lhsRect === CGRectNull,
+        rhsRectIsNull = !rhsRect || rhsRect === CGRectNull;
+
+    if (lhsRectIsNull)
+        return rhsRectIsNull ? CGRectNull : rhsRect;
+
+    if (rhsRectIsNull)
+        return lhsRectIsNull ? CGRectNull : lhsRect;
+
+    var minX = MIN(_CGRectGetMinX(lhsRect), _CGRectGetMinX(rhsRect)),
+        minY = MIN(_CGRectGetMinY(lhsRect), _CGRectGetMinY(rhsRect)),
+        maxX = MAX(_CGRectGetMaxX(lhsRect), _CGRectGetMaxX(rhsRect)),
+        maxY = MAX(_CGRectGetMaxY(lhsRect), _CGRectGetMaxY(rhsRect));
+
+    return _CGRectMake(minX, minY, maxX - minX, maxY - minY);
+}
+
+/*!
+    Returns the specified rectangle inset by the given CGInset as a new rectangle.
+    @param aRect the rect to inset
+    @param anInset a CGInset to inset by
+    @return CGRect aRect inset by anInset
+*/
+_function(CGRectInsetByInset(aRect, anInset));
+
+function CGPointFromString(aString)
+{
+    var comma = aString.indexOf(',');
+
+    return { x:parseFloat(aString.substr(1, comma - 1)), y:parseFloat(aString.substring(comma + 1, aString.length)) };
+}
+
+function CGSizeFromString(aString)
+{
+    var comma = aString.indexOf(',');
+
+    return { width:parseFloat(aString.substr(1, comma - 1)), height:parseFloat(aString.substring(comma + 1, aString.length)) };
+}
+
+function CGRectFromString(aString)
+{
+    var comma = aString.indexOf(',', aString.indexOf(',') + 1);
+
+    return { origin:CGPointFromString(aString.substr(1, comma - 1)), size:CGSizeFromString(aString.substring(comma + 2, aString.length)) };
+}
+
+function CGPointFromEvent(anEvent)
+{
+    return _CGPointMake(anEvent.clientX, anEvent.clientY);
+}
+
+/*!
+    Combines two insets by adding their individual elements and returns the result.
+
+    @group CGInset
+*/
+function CGInsetUnion(lhsInset, rhsInset)
+{
+    return _CGInsetMake(lhsInset.top + rhsInset.top,
+                        lhsInset.right + rhsInset.right,
+                        lhsInset.bottom + rhsInset.bottom,
+                        lhsInset.left + rhsInset.left);
+}
+
+/*!
+    Subtract one inset from another by subtracting their individual elements and returns the result.
+
+    @group CGInset
+*/
+function CGInsetDifference(lhsInset, rhsInset)
+{
+    return _CGInsetMake(lhsInset.top - rhsInset.top,
+                        lhsInset.right - rhsInset.right,
+                        lhsInset.bottom - rhsInset.bottom,
+                        lhsInset.left - rhsInset.left);
+}
+
+function CGInsetFromString(aString)
+{
+    var numbers = aString.substr(1, aString.length - 2).split(',');
+
+    return _CGInsetMake(parseFloat(numbers[0]), parseFloat(numbers[1]), parseFloat(numbers[2]), parseFloat(numbers[3]));
+}
+
+CGInsetFromCPString = CGInsetFromString;
+
+function CPStringFromCGInset(anInset)
+{
+    return '{' + anInset.top + ", " + anInset.left + ", " + anInset.bottom + ", " + anInset.right + '}';
+}
+
+/*!
+    @}
+*/
@@ -1,17 +0,0 @@
-@import <AppKit/CPGeometry.j>
-
-@implementation CPGeometryTest : OJTestCase
-{
-}
-
- (void)testCPRectContainsRect
-{
-    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(0, 0, 50, 50))];
-    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(50, 50, 50, 50))];
-    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(450, 450, 50, 50))];
-    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(500, 500, 0, 0))];
-    [self assertFalse:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(50, 50, 500, 500))];
-    [self assertFalse:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(500, 500, 1, 1))];
-}
-
-@end
@@ -1,5 +1,7 @@
@import <AppKit/AppKit.j>

+[CPApplication sharedApplication];
+
@implementation CPTableViewTest : OJTestCase
 {
    CPTableView     tableView;
@@ -22,15 +24,24 @@
 {
    doubleActionReceived = NO;

+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0)
+                                                styleMask:CPWindowNotSizable];
+    [[theWindow contentView] addSubview:tableView];
+
    [tableView setTarget:self];
    [tableView setDoubleAction:@selector(doubleAction:)];

    // CPEvent with 2 clickCount
-    var dblClk = [CPEvent mouseEventWithType:CPLeftMouseUp location:CGPointMake(50, 50) modifierFlags:0
-                          timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:2 pressure:0];
+    var dblClkDown = [CPEvent mouseEventWithType:CPLeftMouseDown location:CGPointMake(50, 50) modifierFlags:0
+                          timestamp:0 windowNumber:[theWindow windowNumber] context:nil eventNumber:0 clickCount:2 pressure:0],
+        dblClkUp = [CPEvent mouseEventWithType:CPLeftMouseUp location:CGPointMake(50, 50) modifierFlags:0
+                          timestamp:0 windowNumber:[theWindow windowNumber] context:nil eventNumber:0 clickCount:2 pressure:0];

-    [[CPApplication sharedApplication] sendEvent:dblClk];
-    [tableView trackMouse:dblClk];
+    [[CPApplication sharedApplication] sendEvent:dblClkDown];
+    [tableView trackMouse:dblClkDown];
+
+    [[CPApplication sharedApplication] sendEvent:dblClkUp];
+    [tableView trackMouse:dblClkUp];

    [self assertTrue:doubleActionReceived];
 }
@@ -224,12 +235,12 @@
        contentBindingTable = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)],
        tableColumn = [[CPTableColumn alloc] initWithIdentifier:@"A"],
        delegate = [ContentBindingTableDelegate new];
-        
+
    [contentBindingTable addTableColumn:tableColumn];
-    [delegate setTester:self];                                          
+    [delegate setTester:self];
    [contentBindingTable setDelegate:delegate];

-    [delegate setTableEntries:[[@"A1", @"B1"], [@"A2", @"B2"], [@"A3", @"B3"]]];    
+    [delegate setTableEntries:[[@"A1", @"B1"], [@"A2", @"B2"], [@"A3", @"B3"]]];
    [contentBindingTable bind:@"content" toObject:delegate withKeyPath:@"tableEntries" options:nil];

    // The following should also work:
@@ -238,9 +249,9 @@

    [[theWindow contentView] addSubview:contentBindingTable];
    [theWindow makeFirstResponder:contentBindingTable];
-    
+
    [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
-    
+
    // Set the model again with different values
    [delegate setTableEntries:[[@"C1", @"D1"], [@"C2", @"D2"], [@"C3", @"D3"]]];
    [contentBindingTable reloadData];
@@ -1,7 +1,7 @@

@import <AppKit/CPWindow.j>

-[CPApplication sharedApplication]
+[CPApplication sharedApplication];

@implementation CPWindowTest : OJTestCase
 {
@@ -109,4 +109,4 @@
         message:@"nextTextField should be the previous valid key view of contentView"];
 }

-@end
+@end
@@ -0,0 +1,324 @@
+@import <Foundation/CPGeometry.j>
+
+@implementation CPGeometryTest : OJTestCase
+{
+}
+
+- (void)testCPRectContainsRect
+{
+    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(0, 0, 50, 50))];
+    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(50, 50, 50, 50))];
+    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(450, 450, 50, 50))];
+    [self assertTrue:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(500, 500, 0, 0))];
+    [self assertFalse:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(50, 50, 500, 500))];
+    [self assertFalse:CPRectContainsRect(CGRectMake(0, 0, 500, 500), CGRectMake(500, 500, 1, 1))];
+}
+
+- (void)testCPPointEqualToPoint
+{
+    [self assertTrue:CPPointEqualToPoint(CGPointMake(10, 10), CGPointMake(10, 10))];
+    [self assertFalse:CPPointEqualToPoint(CGPointMake(0, 10), CGPointMake(10, 10))];
+    [self assertFalse:CPPointEqualToPoint(CGPointMake(10, 10), CGPointMake(0, 10))];
+    [self assertFalse:CPPointEqualToPoint(CGPointMake(10, 0), CGPointMake(10, 10))];
+    [self assertFalse:CPPointEqualToPoint(CGPointMake(10, 10), CGPointMake(10, 0))];
+}
+
+- (void)testCPRectEqualToRect
+{
+    [self assertTrue:CPRectEqualToRect(CGRectMake(0, 0, 100, 100), CGRectMake(0, 0, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(50, 0, 100, 100), CGRectMake(0, 0, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 0, 100, 100), CGRectMake(50, 0, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 50, 100, 100), CGRectMake(0, 0, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 0, 100, 100), CGRectMake(0, 50, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 0, 50, 100), CGRectMake(0, 0, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 0, 100, 100), CGRectMake(0, 0, 50, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 0, 100, 50), CGRectMake(0, 0, 100, 100))];
+    [self assertFalse:CPRectEqualToRect(CGRectMake(0, 0, 100, 100), CGRectMake(0, 0, 100, 50))];
+}
+
+- (void)textCPRectIsEmpty
+{
+    [self assertTrue:CPRectIsEmpty(CGRectMake(0, 0, 0, 10))];
+    [self assertTrue:CPRectIsEmpty(CGRectMake(0, 0, 10, 0))];
+    [self assertTrue:CPRectIsEmpty(CGRectMake(0, 0, -10, 10))];
+    [self assertTrue:CPRectIsEmpty(CGRectMake(0, 0, 10, -10))];
+    [self assertFalse:CPRectIsEmpty(CGRectMake(0, 0, 10, 10))];
+}
+
+- (void)testCPRectIntersection
+{
+    var lhsRect = CGRectMake(0, 0, 20, 20),
+        rhsRect = CGRectMake(10, 10, 20, 20),
+        intersectionResultRect = CGRectMake(10, 10, 10, 10);
+
+    [self assertTrue:CPRectEqualToRect(CPRectIntersection(lhsRect, rhsRect), intersectionResultRect)];
+    intersectionResultRect.origin.x = 30;
+    intersectionResultRect.origin.y = 30;
+    [self assertFalse:CPRectEqualToRect(CPRectIntersection(lhsRect, rhsRect), intersectionResultRect)];
+}
+
+- (void)testCPPointCreateCopy
+{
+    var point = CGPointMake(1, 1),
+        copiedPoint = CPPointCreateCopy(point);
+    [self assertTrue:CPPointEqualToPoint(point, copiedPoint)];
+    point.x = 10;
+    [self assertFalse:CPPointEqualToPoint(point, copiedPoint)];
+}
+
+- (void)testCPPointMake
+{
+    var testPoint = CPPointMake(1, 2);
+    [self assert:1 equals:testPoint.x message:"point x coordinate failed"];
+    [self assert:2 equals:testPoint.y message:"point y coordinate failed"];
+}
+
+- (void)testCPRectInset
+{
+    var testRect = CGRectMake(0, 0, 100, 100);
+    [self assertTrue:CGRectEqualToRect(CGRectMake(10, 10, 80, 80), CPRectInset(testRect, 10, 10))];
+}
+
+- (void)testCPRectIntegral
+{
+    var rect = CGRectMake(0.1, 0.2, 10.3, 10.4);
+    [self assertTrue:CGRectEqualToRect(CGRectMake(0, 0, 11, 11), CPRectIntegral(rect))];
+}
+
+- (void)testCPRectCreateCopy
+{
+    var rect = CGRectMake(0, 0, 100, 100),
+        copiedRect = CPRectCreateCopy(rect);
+    [self assertTrue:CGRectEqualToRect(rect, copiedRect)];
+    rect.origin.x = 10;
+    [self assertFalse:CGRectEqualToRect(rect, copiedRect)];
+}
+
+- (void)testCPRectMake
+{
+    var rect = CPRectMake(10, 20, 30, 40);
+    [self assert:10 equals:rect.origin.x message:"Rect x coordinate failed"];
+    [self assert:20 equals:rect.origin.y message:"Rect x coordinate failed"];
+    [self assert:30 equals:rect.size.width message:"Rect width failed"];
+    [self assert:40 equals:rect.size.height message:"Rect height failed"];
+}
+
+- (void)testCPRectOffset
+{
+    var initialRect = CGRectMake(10, 10, 100, 100),
+        offsetRect = CGRectMake(20, 20, 100, 100);
+    [self assertTrue:CGRectEqualToRect(offsetRect, CPRectOffset(initialRect, 10, 10))];
+    [self assertFalse:CGRectEqualToRect(initialRect, CPRectOffset(initialRect, 10, 10))];
+}
+
+- (void)testCPRectStandardize
+{
+    var initialRect = CGRectMake(10, 10, -10, -10),
+        standardizedRect = CGRectMake(0, 0, 10, 10);
+    [self assertTrue:CGRectEqualToRect(standardizedRect,CPRectStandardize(initialRect))];
+    [self assertFalse:CGRectEqualToRect(initialRect,CPRectStandardize(initialRect))];
+}
+
+- (void)testCPRectUnion
+{
+    var firstRect = CGRectMake(0, 0, 10, 10),
+        secondRect = CGRectMake(20, 20, 10, 10),
+        unitedRect = CGRectMake(0, 0, 30, 30);
+    [self assertTrue:CGRectEqualToRect(unitedRect, CPRectUnion(firstRect, secondRect))];
+    [self assertFalse:CGRectEqualToRect(firstRect, CPRectUnion(firstRect, secondRect))];
+}
+
+- (void)testCPSizeCreateCopy
+{
+    var initialSize = CGSizeMake(100, 200),
+        copiedSize = CPSizeCreateCopy(initialSize);
+    [self assertTrue:CGSizeEqualToSize(initialSize, copiedSize)];
+    initialSize.width = 10;
+    [self assertFalse:CGSizeEqualToSize(initialSize, copiedSize)];
+}
+
+- (void)testCPSizeMake
+{
+    var size = CPSizeMake(10, 20);
+    [self assert:10 equals:size.width message:"Size width failed"];
+    [self assert:20 equals:size.height message:"Size height failed"];
+}
+
+- (void)testCPRectContainsPoint
+{
+    var rect = CGRectMake(10, 10, 10, 10);
+    [self assertTrue:CPRectContainsPoint(rect, CGPointMake(15, 15))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(5, 5))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(15, 5))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(25, 5))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(5, 15))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(5, 25))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(15, 25))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(25, 15))];
+    [self assertFalse:CPRectContainsPoint(rect, CGPointMake(25, 25))];
+}
+
+- (void)testCPRectGetHeight
+{
+    var rect = CGRectMake(10, 20, 30, 40);
+    [self assert:40 equals:CPRectGetHeight(rect)];
+}
+
+- (void)testCPRectGetMaxX
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:50 equals:CPRectGetMaxX(rect)];
+}
+
+- (void)testCPRectGetMaxY
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:100 equals:CPRectGetMaxY(rect)];
+}
+
+- (void)testCPRectGetMidX
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:30 equals:CPRectGetMidX(rect)];
+}
+
+- (void)testCPRectGetMidY
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:60 equals:CPRectGetMidY(rect)];
+}
+
+- (void)testCPRectGetMinX
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:10 equals:CPRectGetMinX(rect)];
+}
+
+- (void)testCPRectGetMinY
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:20 equals:CPRectGetMinY(rect)];
+}
+
+- (void)testCPRectGetWidth
+{
+    var rect = CGRectMake(10, 20, 40, 80);
+    [self assert:40 equals:CPRectGetWidth(rect)];
+}
+
+- (void)testCPRectIntersectsRect
+{
+    var firstRect = CGRectMake(10, 10, 10, 10),
+        secondRect = CGRectMake(15, 15, 10, 10);
+    [self assertTrue:CPRectIntersectsRect(firstRect, secondRect)];
+    secondRect.origin = CGPointMake(25, 25);
+    [self assertFalse:CPRectIntersectsRect(firstRect, secondRect)];
+}
+
+- (void)testCPRectIsNull
+{
+    [self assertTrue:CPRectIsNull(CGRectMake(0, 0, 0, 10))];
+    [self assertTrue:CPRectIsNull(CGRectMake(0, 0, 10, 0))];
+    [self assertTrue:CPRectIsNull(CGRectMake(0, 0, -10, 10))];
+    [self assertTrue:CPRectIsNull(CGRectMake(0, 0, 10, -10))];
+    [self assertFalse:CPRectIsNull(CGRectMake(0, 0, 10, 10))];
+}
+
+- (void)testCPDivideRect
+{
+    var initialRect = CGRectMake(0, 0, 10, 10),
+        slice = CGRectMake(0, 0, 0, 0),
+        rem = CGRectMake(0, 0, 0, 0);
+
+    CPDivideRect(initialRect, slice, rem, 3, CGMinXEdge);
+    [self assertTrue:CGRectEqualToRect(slice, CGRectMake(0, 0, 3, 10))];
+    [self assertTrue:CGRectEqualToRect(rem, CGRectMake(3, 0, 7, 10))];
+
+    CPDivideRect(initialRect, slice, rem, 3, CGMinYEdge);
+    [self assertTrue:CGRectEqualToRect(slice, CGRectMake(0, 0, 10, 3))];
+    [self assertTrue:CGRectEqualToRect(rem, CGRectMake(0, 3, 10, 7))];
+
+    CPDivideRect(initialRect, slice, rem, 3, CGMaxXEdge);
+    [self assertTrue:CGRectEqualToRect(slice, CGRectMake(7, 0, 3, 10))];
+    [self assertTrue:CGRectEqualToRect(rem, CGRectMake(0, 0, 7, 10))];
+
+    CPDivideRect(initialRect, slice, rem, 3, CGMaxYEdge);
+    [self assertTrue:CGRectEqualToRect(slice, CGRectMake(0, 7, 10, 3))];
+    [self assertTrue:CGRectEqualToRect(rem, CGRectMake(0, 0, 10, 7))];
+}
+
+- (void)testCPSizeEqualToSize
+{
+    [self assertTrue:CPSizeEqualToSize(CGSizeMake(10, 10), CGSizeMake(10, 10))];
+    [self assertFalse:CPSizeEqualToSize(CGSizeMake(0, 10), CGSizeMake(10, 10))];
+    [self assertFalse:CPSizeEqualToSize(CGSizeMake(10, 10), CGSizeMake(0, 10))];
+    [self assertFalse:CPSizeEqualToSize(CGSizeMake(10, 0), CGSizeMake(10, 10))];
+    [self assertFalse:CPSizeEqualToSize(CGSizeMake(10, 10), CGSizeMake(10, 0))];
+}
+
+- (void)testCPStringFromPoint
+{
+    var point = CGPointMake(0, 1);
+    [self assert:"{0, 1}" equals: CPStringFromPoint(point)];
+}
+
+- (void)testCPStringFromSize
+{
+    var size = CGSizeMake(10, 20);
+    [self assert:"{10, 20}" equals: CPStringFromSize(size)];
+}
+
+- (void)testCPStringFromRect
+{
+    var rect = CGRectMake(10, 20, 30, 40);
+    [self assert:"{{10, 20}, {30, 40}}" equals:CPStringFromRect(rect)];
+}
+
+- (void)testCPPointFromString
+{
+    var point = CGPointMake(0,1);
+    [self assertTrue:CGPointEqualToPoint(point , CPPointFromString("{0, 1}"))];
+}
+
+- (void)testCPSizeFromString
+{
+    var size = CGSizeMake(10, 20);
+    [self assertTrue:CGSizeEqualToSize(size, CPSizeFromString("{10, 20}"))];
+}
+
+- (void)testCPRectFromString
+{
+    var rect = CGRectMake(10, 20, 30, 40);
+    [self assertTrue:CGRectEqualToRect(rect, CPRectFromString("{{10, 20}, {30, 40}}"))];
+}
+
+- (void)testCPSizeMakeZero
+{
+    var size = CGSizeMake(10, 20);
+    [self assertTrue:CGSizeEqualToSize(CGSizeMake(0, 0), CPSizeMakeZero(size))];
+}
+
+- (void)testCPRectMakeZero
+{
+    var rect = CGRectMake(10, 20, 30, 40);
+    [self assertTrue:CGRectEqualToRect(CGRectMake(0, 0, 0, 0), CPRectMakeZero(rect))];
+}
+
+- (void)testCPPointMakeZero
+{
+    var point = CGPointMake(10, 20);
+    [self assertTrue:CGPointEqualToPoint(CGPointMake(0, 0), CPPointMakeZero(0, 0))];
+}
+
+- (void)testCPPointFromEvent
+{
+    var anEvent = [CPEvent mouseEventWithType:CPLeftMouseDownMask location:CGPointMake(5.0, 5.0) modifierFlags:0
+        timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:1 pressure:1];
+    anEvent.clientX = 1.0;
+    anEvent.clientY = 2.0;
+    var point = CPPointFromEvent(anEvent);
+    [self assert:1.0 equals:point.x message:"Point x coordinate failed"];
+    [self assert:2.0 equals:point.y message:"Point y coordinate failed"];
+}
+
+@end
@@ -1 +1 @@
-280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;80E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;82E;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;84E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;86E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;D;K;6;CP$UIDd;3;157E;D;K;6;CP$UIDd;3;158E;D;K;6;CP$UIDd;3;159E;D;K;6;CP$UIDd;3;160E;D;K;6;CP$UIDd;3;161E;D;K;6;CP$UIDd;3;162E;D;K;6;CP$UIDd;3;163E;D;K;6;CP$UIDd;3;164E;D;K;6;CP$UIDd;3;165E;D;K;6;CP$UIDd;3;166E;D;K;6;CP$UIDd;3;167E;D;K;6;CP$UIDd;3;168E;D;K;6;CP$UIDd;3;169E;D;K;6;CP$UIDd;3;170E;D;K;6;CP$UIDd;3;171E;D;K;6;CP$UIDd;3;172E;D;K;6;CP$UIDd;3;173E;D;K;6;CP$UIDd;3;174E;D;K;6;CP$UIDd;3;175E;D;K;6;CP$UIDd;3;176E;D;K;6;CP$UIDd;3;177E;D;K;6;CP$UIDd;3;178E;D;K;6;CP$UIDd;3;179E;D;K;6;CP$UIDd;3;180E;D;K;6;CP$UIDd;3;181E;D;K;6;CP$UIDd;3;182E;D;K;6;CP$UIDd;3;183E;D;K;6;CP$UIDd;3;184E;D;K;6;CP$UIDd;3;185E;D;K;6;CP$UIDd;3;186E;D;K;6;CP$UIDd;3;187E;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;D;K;6;CP$UIDd;3;190E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;192E;D;K;6;CP$UIDd;3;193E;D;K;6;CP$UIDd;3;194E;D;K;6;CP$UIDd;3;195E;D;K;6;CP$UIDd;3;196E;D;K;6;CP$UIDd;3;197E;D;K;6;CP$UIDd;3;198E;D;K;6;CP$UIDd;3;199E;D;K;6;CP$UIDd;3;200E;D;K;6;CP$UIDd;3;201E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;203E;D;K;6;CP$UIDd;3;204E;D;K;6;CP$UIDd;3;205E;D;K;6;CP$UIDd;3;206E;D;K;Line truncated
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;80E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;82E;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;84E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;86E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;D;K;6;CP$UIDd;3;157E;D;K;6;CP$UIDd;3;158E;D;K;6;CP$UIDd;3;159E;D;K;6;CP$UIDd;3;160E;D;K;6;CP$UIDd;3;161E;D;K;6;CP$UIDd;3;162E;D;K;6;CP$UIDd;3;163E;D;K;6;CP$UIDd;3;164E;D;K;6;CP$UIDd;3;165E;D;K;6;CP$UIDd;3;166E;D;K;6;CP$UIDd;3;167E;D;K;6;CP$UIDd;3;168E;D;K;6;CP$UIDd;3;169E;D;K;6;CP$UIDd;3;170E;D;K;6;CP$UIDd;3;171E;D;K;6;CP$UIDd;3;172E;D;K;6;CP$UIDd;3;173E;D;K;6;CP$UIDd;3;174E;D;K;6;CP$UIDd;3;175E;D;K;6;CP$UIDd;3;176E;D;K;6;CP$UIDd;3;177E;D;K;6;CP$UIDd;3;178E;D;K;6;CP$UIDd;3;179E;D;K;6;CP$UIDd;3;180E;D;K;6;CP$UIDd;3;181E;D;K;6;CP$UIDd;3;182E;D;K;6;CP$UIDd;3;183E;D;K;6;CP$UIDd;3;184E;D;K;6;CP$UIDd;3;185E;D;K;6;CP$UIDd;3;186E;D;K;6;CP$UIDd;3;187E;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;D;K;6;CP$UIDd;3;190E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;192E;D;K;6;CP$UIDd;3;193E;D;K;6;CP$UIDd;3;194E;D;K;6;CP$UIDd;3;195E;D;K;6;CP$UIDd;3;196E;D;K;6;CP$UIDd;3;197E;D;K;6;CP$UIDd;3;198E;D;K;6;CP$UIDd;3;199E;D;K;6;CP$UIDd;3;200E;D;K;6;CP$UIDd;3;201E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;203E;D;K;6;CP$UIDd;3;204E;D;K;6;CP$UIDd;3;205E;D;K;6;CP$UIDd;3;206E;D;K;Line truncated
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>nib2cibAlignment</string>
+</dict>
+</plist>
@@ -1,6 +1,6 @@
 /*
 * Jakefile
- * test2
+ * nib2cibAlignment
 *
 * Created by You on May 17, 2011.
 * Copyright 2011, Your Company All rights reserved.
@@ -15,17 +15,17 @@ var ENV = require("system").env,
    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
    OS = require("os");

-app ("test2", function(task)
+app ("nib2cibAlignment", function(task)
 {
-    task.setBuildIntermediatesPath(FILE.join("Build", "test2.build", configuration));
+    task.setBuildIntermediatesPath(FILE.join("Build", "nib2cibAlignment.build", configuration));
    task.setBuildPath(FILE.join("Build", configuration));

-    task.setProductName("test2");
-    task.setIdentifier("com.yourcompany.test2");
+    task.setProductName("nib2cibAlignment");
+    task.setIdentifier("com.yourcompany.nib2cibAlignment");
    task.setVersion("1.0");
    task.setAuthor("Your Company");
    task.setEmail("feedback @nospam@ yourcompany.com");
-    task.setSummary("test2");
+    task.setSummary("nib2cibAlignment");
    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
    task.setResources(new FileList("Resources/**"));
    task.setIndexFilePath("index.html");
@@ -38,7 +38,7 @@ app ("test2", function(task)
        task.setCompilerFlags("-O");
 });

-task ("default", ["test2"], function()
+task ("default", ["nib2cibAlignment"], function()
 {
    printResults(configuration);
 });
@@ -59,36 +59,36 @@ task ("release", function()

 task ("run", ["debug"], function()
 {
-    OS.system(["open", FILE.join("Build", "Debug", "test2", "index.html")]);
+    OS.system(["open", FILE.join("Build", "Debug", "nib2cibAlignment", "index.html")]);
 });

 task ("run-release", ["release"], function()
 {
-    OS.system(["open", FILE.join("Build", "Release", "test2", "index.html")]);
+    OS.system(["open", FILE.join("Build", "Release", "nib2cibAlignment", "index.html")]);
 });

 task ("deploy", ["release"], function()
 {
-    FILE.mkdirs(FILE.join("Build", "Deployment", "test2"));
-    OS.system(["press", "-f", FILE.join("Build", "Release", "test2"), FILE.join("Build", "Deployment", "test2")]);
+    FILE.mkdirs(FILE.join("Build", "Deployment", "nib2cibAlignment"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "nib2cibAlignment"), FILE.join("Build", "Deployment", "nib2cibAlignment")]);
    printResults("Deployment")
 });

 task ("desktop", ["release"], function()
 {
-    FILE.mkdirs(FILE.join("Build", "Desktop", "test2"));
-    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "test2"), FILE.join("Build", "Desktop", "test2", "test2.app"));
+    FILE.mkdirs(FILE.join("Build", "Desktop", "nib2cibAlignment"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "nib2cibAlignment"), FILE.join("Build", "Desktop", "nib2cibAlignment", "nib2cibAlignment.app"));
    printResults("Desktop")
 });

 task ("run-desktop", ["desktop"], function()
 {
-    OS.system([FILE.join("Build", "Desktop", "test2", "test2.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+    OS.system([FILE.join("Build", "Desktop", "nib2cibAlignment", "nib2cibAlignment.app", "Contents", "MacOS", "NativeHost"), "-i"]);
 });

 function printResults(configuration)
 {
    print("----------------------------");
-    print(configuration+" app built at path: "+FILE.join("Build", configuration, "test2"));
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "nib2cibAlignment"));
    print("----------------------------");
 }
@@ -1 +1 @@
-280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;84E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;86E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;103E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;107E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;109E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;D;K;6;CP$UIDd;3;157E;D;K;6;CP$UIDd;3;158E;D;K;6;CP$UIDd;3;159E;D;K;6;CP$UIDd;3;160E;D;K;6;CP$UIDd;3;161E;D;K;6;CP$UIDd;3;162E;D;K;6;CP$UIDd;3;163E;D;K;6;CP$UIDd;3;164E;D;K;6;CP$UIDd;3;165E;D;K;6;CP$UIDd;3;166E;D;K;6;CP$UIDd;3;167E;D;K;6;CP$UIDd;3;168E;D;K;6;CP$UIDd;3;169E;D;K;6;CP$UIDd;3;170E;D;K;6;CP$UIDd;3;171E;D;K;6;CP$UIDd;3;172E;D;K;6;CP$UIDd;3;173E;D;K;6;CP$UIDd;3;174E;D;K;6;CP$UIDd;3;175E;D;K;6;CP$UIDd;3;176E;D;K;6;CP$UIDd;3;177E;D;K;6;CP$UIDd;3;178E;D;K;6;CP$UIDd;3;179E;D;K;6;CP$UIDd;3;180E;D;K;6;CP$UIDd;3;181E;D;K;6;CP$UIDd;3;182E;D;K;6;CP$UIDd;3;183E;D;K;6;CP$UIDd;3;184E;D;K;6;CP$UIDd;3;185E;D;K;6;CP$UIDd;3;186E;D;K;6;CP$UIDd;3;187E;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;D;K;6;CP$UIDd;3;190E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;192E;D;K;6;CP$UIDd;3;193E;D;K;6;CP$UIDd;3;194E;D;K;6;CP$UIDd;3;195E;D;K;6;CP$UIDd;3;196E;D;K;6;CP$UIDd;3;197E;D;K;6;CP$UIDd;3;198E;D;K;6;CP$UIDd;3;199E;D;K;6;CP$UIDd;3;200E;D;K;6;CP$UIDd;3;201E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;204E;D;K;6;CP$UIDd;3;206E;D;K;6;CP$UIDd;3;208E;D;Line truncated
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;19E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;22E;D;K;6;CP$UIDd;2;23E;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;25E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;27E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;29E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;31E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;33E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;37E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;39E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;42E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;44E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;46E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;49E;D;K;6;CP$UIDd;2;50E;D;K;6;CP$UIDd;2;51E;D;K;6;CP$UIDd;2;52E;D;K;6;CP$UIDd;2;53E;D;K;6;CP$UIDd;2;54E;D;K;6;CP$UIDd;2;55E;D;K;6;CP$UIDd;2;56E;D;K;6;CP$UIDd;2;57E;D;K;6;CP$UIDd;2;58E;D;K;6;CP$UIDd;2;59E;D;K;6;CP$UIDd;2;60E;D;K;6;CP$UIDd;2;61E;D;K;6;CP$UIDd;2;62E;D;K;6;CP$UIDd;2;63E;D;K;6;CP$UIDd;2;64E;D;K;6;CP$UIDd;2;65E;D;K;6;CP$UIDd;2;66E;D;K;6;CP$UIDd;2;67E;D;K;6;CP$UIDd;2;68E;D;K;6;CP$UIDd;2;69E;D;K;6;CP$UIDd;2;70E;D;K;6;CP$UIDd;2;71E;D;K;6;CP$UIDd;2;72E;D;K;6;CP$UIDd;2;73E;D;K;6;CP$UIDd;2;74E;D;K;6;CP$UIDd;2;75E;D;K;6;CP$UIDd;2;76E;D;K;6;CP$UIDd;2;77E;D;K;6;CP$UIDd;2;78E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;79E;D;K;6;CP$UIDd;2;81E;D;K;6;CP$UIDd;2;83E;D;K;6;CP$UIDd;2;84E;D;K;6;CP$UIDd;2;85E;D;K;6;CP$UIDd;2;86E;D;K;6;CP$UIDd;2;87E;D;K;6;CP$UIDd;2;88E;D;K;6;CP$UIDd;2;89E;D;K;6;CP$UIDd;2;90E;D;K;6;CP$UIDd;2;91E;D;K;6;CP$UIDd;2;92E;D;K;6;CP$UIDd;2;93E;D;K;6;CP$UIDd;2;94E;D;K;6;CP$UIDd;2;95E;D;K;6;CP$UIDd;2;96E;D;K;6;CP$UIDd;2;97E;D;K;6;CP$UIDd;2;98E;D;K;6;CP$UIDd;2;99E;D;K;6;CP$UIDd;3;100E;D;K;6;CP$UIDd;3;101E;D;K;6;CP$UIDd;3;102E;D;K;6;CP$UIDd;3;103E;D;K;6;CP$UIDd;3;104E;D;K;6;CP$UIDd;3;105E;D;K;6;CP$UIDd;3;106E;D;K;6;CP$UIDd;3;107E;D;K;6;CP$UIDd;3;108E;D;K;6;CP$UIDd;3;109E;D;K;6;CP$UIDd;3;110E;D;K;6;CP$UIDd;3;111E;D;K;6;CP$UIDd;3;112E;D;K;6;CP$UIDd;3;113E;D;K;6;CP$UIDd;3;114E;D;K;6;CP$UIDd;3;115E;D;K;6;CP$UIDd;3;116E;D;K;6;CP$UIDd;3;117E;D;K;6;CP$UIDd;3;118E;D;K;6;CP$UIDd;3;119E;D;K;6;CP$UIDd;3;120E;D;K;6;CP$UIDd;3;121E;D;K;6;CP$UIDd;3;122E;D;K;6;CP$UIDd;3;123E;D;K;6;CP$UIDd;3;124E;D;K;6;CP$UIDd;3;125E;D;K;6;CP$UIDd;3;126E;D;K;6;CP$UIDd;3;127E;D;K;6;CP$UIDd;3;128E;D;K;6;CP$UIDd;3;129E;D;K;6;CP$UIDd;3;130E;D;K;6;CP$UIDd;3;131E;D;K;6;CP$UIDd;3;132E;D;K;6;CP$UIDd;3;133E;D;K;6;CP$UIDd;3;134E;D;K;6;CP$UIDd;3;135E;D;K;6;CP$UIDd;3;136E;D;K;6;CP$UIDd;3;137E;D;K;6;CP$UIDd;3;138E;D;K;6;CP$UIDd;3;139E;D;K;6;CP$UIDd;3;140E;D;K;6;CP$UIDd;3;141E;D;K;6;CP$UIDd;3;142E;D;K;6;CP$UIDd;3;143E;D;K;6;CP$UIDd;3;144E;D;K;6;CP$UIDd;3;145E;D;K;6;CP$UIDd;3;146E;D;K;6;CP$UIDd;3;147E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;149E;D;K;6;CP$UIDd;3;150E;D;K;6;CP$UIDd;3;151E;D;K;6;CP$UIDd;3;152E;D;K;6;CP$UIDd;3;153E;D;K;6;CP$UIDd;3;154E;D;K;6;CP$UIDd;3;155E;D;K;6;CP$UIDd;3;156E;D;K;6;CP$UIDd;3;157E;D;K;6;CP$UIDd;3;158E;D;K;6;CP$UIDd;3;159E;D;K;6;CP$UIDd;3;160E;D;K;6;CP$UIDd;3;161E;D;K;6;CP$UIDd;3;162E;D;K;6;CP$UIDd;3;163E;D;K;6;CP$UIDd;3;164E;D;K;6;CP$UIDd;3;165E;D;K;6;CP$UIDd;3;166E;D;K;6;CP$UIDd;3;167E;D;K;6;CP$UIDd;3;168E;D;K;6;CP$UIDd;3;169E;D;K;6;CP$UIDd;3;170E;D;K;6;CP$UIDd;3;171E;D;K;6;CP$UIDd;3;172E;D;K;6;CP$UIDd;3;173E;D;K;6;CP$UIDd;3;174E;D;K;6;CP$UIDd;3;175E;D;K;6;CP$UIDd;3;176E;D;K;6;CP$UIDd;3;177E;D;K;6;CP$UIDd;3;178E;D;K;6;CP$UIDd;3;179E;D;K;6;CP$UIDd;3;180E;D;K;6;CP$UIDd;3;181E;D;K;6;CP$UIDd;3;182E;D;K;6;CP$UIDd;3;183E;D;K;6;CP$UIDd;3;184E;D;K;6;CP$UIDd;3;185E;D;K;6;CP$UIDd;3;186E;D;K;6;CP$UIDd;3;187E;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;D;K;6;CP$UIDd;3;190E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;192E;D;K;6;CP$UIDd;3;193E;D;K;6;CP$UIDd;3;194E;D;K;6;CP$UIDd;3;195E;D;K;6;CP$UIDd;3;196E;D;K;6;CP$UIDd;3;197E;D;K;6;CP$UIDd;3;198E;D;K;6;CP$UIDd;3;199E;D;K;6;CP$UIDd;3;200E;D;K;6;CP$UIDd;3;201E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;204E;D;K;6;CP$UIDd;3;206E;D;K;6;CP$UIDd;3;208E;D;Line truncated
@@ -20,7 +20,7 @@
        <link rel="apple-touch-icon" href="Resources/icon.png" />
        <link rel="apple-touch-startup-image" href="Resources/default.png" />

-        <title>test2</title>
+        <title>nib2cib alignment</title>

        <script type="text/javascript">
            OBJJ_MAIN_FILE = "main.j";
@@ -20,7 +20,7 @@
        <link rel="apple-touch-icon" href="Resources/icon.png" />
        <link rel="apple-touch-startup-image" href="Resources/default.png" />

-        <title>test2</title>
+        <title>nib2cib alignment</title>

        <script type="text/javascript">
            OBJJ_MAIN_FILE = "main.j";
@@ -0,0 +1,83 @@
+/*
+ * AppController.j
+ * issue1593
+ *
+ * Created by You on July 9, 2012.
+ * Copyright 2012, Your Company All rights reserved.
+ */
+
+@import <Foundation/CPObject.j>
+
+@implementation AppController : CPObject
+{
+    @outlet CPWindow    theWindow; //this "outlet" is connected automatically by the Cib
+    @outlet CPTableView tableView;
+    @outlet CPArrayController arrayController;
+
+    CPArray content @accessors;
+}
+
+- (void)awakeFromCib
+{
+    var keys = [[tableView tableColumns] valueForKey:@"identifier"];
+    [self setContent:[
+                        [CPDictionary dictionaryWithObjects:[YES, NO, @"NO"] forKeys:keys],
+                        [CPDictionary dictionaryWithObjects:[NO, YES, @"YES"] forKeys:keys]
+                     ]];
+                      
+    [self _selectSegment:0];
+    [theWindow setFullPlatformWindow:YES];
+}
+
+- (IBAction)selectSegment:(id)sender
+{
+    [self _selectSegment:[sender selectedSegment]];
+}
+
+- (void)_selectSegment:(CPInteger)anIndex
+{
+    var EnumerateColumns;
+    
+    if (anIndex == 0)
+    {
+        EnumerateColumns = function(column, idx)
+        {
+            [column bind:CPValueBinding toObject:arrayController withKeyPath:(@"arrangedObjects." + [column identifier]) options:nil];
+        };
+        
+        [tableView setDataSource:nil];
+    }
+    else
+    {
+        EnumerateColumns = function(column, idx)
+        {
+            [column unbind:CPValueBinding];
+        };
+        
+        [tableView setDataSource:self];
+    }
+    
+    [[tableView tableColumns] enumerateObjectsUsingBlock:EnumerateColumns];
+}
+
+- (IBAction)logContent:(id)sender
+{
+    CPLogConsole([content description]);
+}
+
+- (int)numberOfRowsInTableView:(id)aTableView
+{
+    return [content count];
+}
+
+- (id)tableView:(id)aTableView objectValueForTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
+{
+    return [[content objectAtIndex:aRow] objectForKey:[aTableColumn identifier]];
+}
+
+- (void)tableView:(CPTableView)aTableView setObjectValue:(id)aValue forTableColumn:(CPTableColumn)aTableColumn row:(int)aRow
+{
+    [[content objectAtIndex:aRow] setObject:aValue forKey:[aTableColumn identifier]];
+}
+
+@end
@@ -5,6 +5,6 @@
 	<key>Main cib file base name</key>
 	<string>MainMenu.cib</string>
 	<key>CPBundleName</key>
-	<string>test2</string>
+	<string>issue1593</string>
 </dict>
 </plist>
@@ -0,0 +1,94 @@
+/*
+ * Jakefile
+ * issue1593
+ *
+ * Created by You on July 9, 2012.
+ * Copyright 2012, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("issue1593", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "issue1593.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("issue1593");
+    task.setIdentifier("com.yourcompany.issue1593");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("issue1593");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+    task.setNib2CibFlags("-R Resources/");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["issue1593"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "issue1593", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "issue1593", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "issue1593"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "issue1593"), FILE.join("Build", "Deployment", "issue1593")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "issue1593"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "issue1593"), FILE.join("Build", "Desktop", "issue1593", "issue1593.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "issue1593", "issue1593.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "issue1593"));
+    print("----------------------------");
+}
@@ -0,0 +1,4 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;17E;D;K;6;CP$UIDd;2;18E;D;K;6;CP$UIDd;2;20E;D;K;6;CP$UIDd;2;21E;D;K;6;CP$UIDd;2;23E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;24E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;38E;D;K;6;CP$UIDd;2;40E;D;K;6;CP$UIDd;2;41E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;1;0E;D;K;6;CP$UIDd;2;48E;D;K;6;CP$UIDd;2;50E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;26E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;34E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;35E;D;K;6;CP$UIDd;2;32E;D;K;6;CP$UIDd;2;36E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;30E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;43E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;45E;D;K;6;CP$UIDd;2;28E;D;K;6;CP$UIDd;2;47E;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;51E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;52E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;48E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;53E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;48E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;50E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;54E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;48E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;32E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;55E;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;48E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;26E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;56E;E;D;K;10;$classnameS;21;CPCibControlConnectorK;8;$classesA;S;21;CPCibControlConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;45E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;48E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;57E;E;D;K;6;$classD;K;6;CP$UIDd;2;19E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;47E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;48E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;58E;E;D;K;10;$classnameS;21;CPCibBindingConnectorK;8;$classesA;S;21;CPCibBindingConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;22E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;50E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;48E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;59E;K;31;CPCibBindingConnectorBindingKeyD;K;6;CP$UIDd;2;60E;K;31;CPCibBindingConnectorKeyPathKeyD;K;6;CP$UIDd;2;61E;K;31;CPCibBindingConnectorOptionsKeyD;K;6;CP$UIDd;2;63E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;51E;E;D;K;10;$classnameS;20;_CPCibWindowTemplateK;8;$classesA;S;20;_CPCibWindowTemplateS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;25E;K;30;_CPCibWindowTemplateMaxSizeKeyD;K;6;CP$UIDd;2;64E;K;32;_CPCibWindowTemplateViewClassKeyD;K;6;CP$UIDd;1;0E;K;34;_CPCibWindowTemplateWindowClassKeyD;K;6;CP$UIDd;2;65E;K;33;_CPCibWindowTemplateWindowRectKeyD;K;6;CP$UIDd;2;66E;K;30;_CPCibWindowTempatStyleMaskKeyD;K;6;CP$UIDd;2;67E;K;34;_CPCibWindowTemplateWindowTitleKeyD;K;6;CP$UIDd;2;68E;K;33Line truncated
+          Log Model and see the result in the console.
+
+Expected: The model should reflect UI changes.d;4;3072D;K;6;$classD;K;6;CP$UIDd;2;86E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;186E;E;S;22;{{295, 79}, {166, 24}}S;19;{{0, 0}, {166, 24}}S;8;borderedD;K;6;$classD;K;6;CP$UIDd;3;132E;K;13;CPFontNameKeyD;K;6;CP$UIDd;3;185E;K;13;CPFontSizeKeyD;K;6;CP$UIDd;3;184E;K;15;CPFontIsBoldKeyD;K;6;CP$UIDd;2;82E;K;17;CPFontIsItalicKeyD;K;6;CP$UIDd;2;93E;E;S;9;Log ModelS;0;d;2;14S;22;{{272, 19}, {177, 24}}S;19;{{0, 0}, {177, 24}}S;17;segmented-controlD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;188E;D;K;6;CP$UIDd;3;189E;E;E;d;1;1S;13;AppControllerS;19;CPMutableDictionaryS;20;{{1, 1}, {237, 228}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;32E;E;E;D;K;6;$classD;K;6;CP$UIDd;2;86E;K;20;CPColorComponentsKeyD;K;6;CP$UIDd;3;190E;E;S;21;{{1, 229}, {237, 17}}S;19;{{0, 0}, {237, 17}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;40E;E;E;S;16;{{0, 0}, {0, 0}}D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;148E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;191E;D;K;6;CP$UIDd;3;148E;E;E;S;22;{{224, 223}, {16, 23}}S;18;{{0, 0}, {16, 23}}S;10;cornerviewD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;193E;E;E;S;12;columnHeaderS;9;Check BoxS;9;check-boxS;5;Checkf;3;0.5f;4;0.05D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;194E;E;E;S;10;Text FieldS;11;placeholderD;K;10;$classnameS;17;_CPThemeAttributeK;8;$classesA;S;17;_CPThemeAttributeS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;173E;K;4;nameD;K;6;CP$UIDd;3;195E;K;12;defaultValueD;K;6;CP$UIDd;3;133E;K;6;valuesD;K;6;CP$UIDd;3;196E;E;D;K;10;$classnameS;21;_CPKeyedArchiverValueK;8;$classesA;S;21;_CPKeyedArchiverValueS;7;CPValueS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;175E;K;15;CPValueValueKeyD;K;6;CP$UIDd;3;197E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;198E;E;E;S;6;ButtonS;19;{{4, 6}, {-12, 24}}S;19;{{0, 0}, {-12, 24}}D;K;6;$classD;K;6;CP$UIDd;3;173E;K;4;nameD;K;6;CP$UIDd;3;199E;K;12;defaultValueD;K;6;CP$UIDd;1;0E;K;5;stateD;K;6;CP$UIDd;3;200E;K;5;valueD;K;6;CP$UIDd;3;201E;E;S;2;OnS;3;Offd;2;12S;17;Arial, sans-serifD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;202E;D;K;6;CP$UIDd;3;148E;E;E;D;K;10;$classnameS;14;_CPSegmentItemK;8;$classesA;S;14;_CPSegmentItemS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;187E;K;21;CPSegmentItemImageKeyD;K;6;CP$UIDd;1;0E;K;21;CPSegmentItemLabelKeyD;K;6;CP$UIDd;3;203E;K;20;CPSegmentItemMenuKeyD;K;6;CP$UIDd;1;0E;K;24;CPSegmentItemSelectedKeyD;K;6;CP$UIDd;2;82E;K;23;CPSegmentItemEnabledKeyD;K;6;CP$UIDd;2;82E;K;19;CPSegmentItemTagKeyD;K;6;CP$UIDd;2;69E;K;21;CPSegmentItemWidthKeyD;K;6;CP$UIDd;2;69E;E;D;K;6;$classD;K;6;CP$UIDd;3;187E;K;21;CPSegmentItemImageKeyD;K;6;CP$UIDd;1;0E;K;21;CPSegmentItemLabelKeyD;K;6;CP$UIDd;3;204E;K;20;CPSegmentItemMenuKeyD;K;6;CP$UIDd;1;0E;K;24;CPSegmentItemSelectedKeyD;K;6;CP$UIDd;2;93E;K;23;CPSegmentItemEnabledKeyD;K;6;CP$UIDd;2;82E;K;19;CPSegmentItemTagKeyD;K;6;CP$UIDd;3;148E;K;21;CPSegmentItemWidthKeyD;K;6;CP$UIDd;2;69E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;148E;D;K;6;CP$UIDd;3;148E;E;E;f;3;0.8D;K;10;$classnameS;19;_CPImageAndTextViewK;8;$classesA;S;19;_CPImageAndTextViewS;6;CPViewS;11;CPResponderS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;3;192E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;102E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;157E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;157E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;102E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;205E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;72E;E;D;K;6;$classD;K;6;CP$UIDd;3;192E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;109E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;157E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;157E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;109E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;205E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;72E;E;S;4;fontD;K;6;$classD;K;6;CP$UIDd;2;62E;K;10;CP.objectsD;K;21;selectedTableDataViewD;K;6;CP$UIDd;3;140E;K;6;normalD;K;6;CP$UIDd;3;133E;E;E;S;39;{"top":0,"right":5,"bottom":0,"left":5}D;K;6;$classD;K;6;CP$UIDd;3;192E;K;27;CPResponderNextResponderKeyD;K;6;CP$UIDd;3;113E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;3;157E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;3;157E;K;18;CPViewSuperviewKeyD;K;6;CP$UIDd;3;113E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;3;205E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;72E;E;S;5;imageS;11;highlightedD;K;6;$classD;K;6;CP$UIDd;3;132E;K;13;CPFontNameKeyD;K;6;CP$UIDd;3;206E;K;13;CPFontSizeKeyD;K;6;CP$UIDd;3;207E;K;15;CPFontIsBoldKeyD;K;6;CP$UIDd;2;Line truncated
@@ -0,0 +1,759 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1070</int>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2809</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2809</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSArrayController</string>
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
+			<string>NSSegmentedCell</string>
+			<string>NSSegmentedControl</string>
+			<string>NSTableColumn</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="972006081">
+				<int key="NSWindowStyleMask">7</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{547, 354}, {728, 366}}</string>
+				<int key="NSWTFlags">1954021376</int>
+				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="439893737">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSScrollView" id="199174026">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="707743700">
+									<reference key="NSNextResponder" ref="199174026"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="886713545">
+											<reference key="NSNextResponder" ref="707743700"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{237, 228}</string>
+											<reference key="NSSuperview" ref="707743700"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="322058333"/>
+											<string key="NSReuseIdentifierKey">_NS:13</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="285325064">
+												<reference key="NSNextResponder" ref="931675323"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{237, 17}</string>
+												<reference key="NSSuperview" ref="931675323"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="419505309"/>
+												<string key="NSReuseIdentifierKey">_NS:16</string>
+												<reference key="NSTableView" ref="886713545"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="419505309">
+												<reference key="NSNextResponder" ref="199174026"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="199174026"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="707743700"/>
+												<string key="NSReuseIdentifierKey">_NS:19</string>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="168557545">
+													<string key="NSIdentifier">button</string>
+													<double key="NSWidth">60</double>
+													<double key="NSMinWidth">10</double>
+													<double key="NSMaxWidth">3.4028234663852886e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Button</string>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">11</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor" id="422484284">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<object class="NSColor" key="NSColor" id="690087723">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MQA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="377135254">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<object class="NSColor" key="NSColor" id="779435294">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
+														</object>
+													</object>
+													<object class="NSButtonCell" key="NSDataCell" id="1048566881">
+														<int key="NSCellFlags">67108864</int>
+														<int key="NSCellFlags2">134217728</int>
+														<string key="NSContents">On</string>
+														<object class="NSFont" key="NSSupport" id="350214907">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">13</double>
+															<int key="NSfFlags">1044</int>
+														</object>
+														<string key="NSCellIdentifier">_NS:9</string>
+														<reference key="NSControlView" ref="886713545"/>
+														<int key="NSButtonFlags">-1229570048</int>
+														<int key="NSButtonFlags2">1</int>
+														<reference key="NSAlternateImage" ref="350214907"/>
+														<string key="NSAlternateContents">Off</string>
+														<string key="NSKeyEquivalent"/>
+														<int key="NSPeriodicDelay">200</int>
+														<int key="NSPeriodicInterval">25</int>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="886713545"/>
+												</object>
+												<object class="NSTableColumn" id="75353417">
+													<string key="NSIdentifier">checkbox</string>
+													<double key="NSWidth">85</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75497536</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Check Box</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="377135254"/>
+													</object>
+													<object class="NSButtonCell" key="NSDataCell" id="58056957">
+														<int key="NSCellFlags">67108864</int>
+														<int key="NSCellFlags2">268435456</int>
+														<string key="NSContents">Check</string>
+														<reference key="NSSupport" ref="350214907"/>
+														<string key="NSCellIdentifier">_NS:9</string>
+														<reference key="NSControlView" ref="886713545"/>
+														<int key="NSButtonFlags">1211912448</int>
+														<int key="NSButtonFlags2">2</int>
+														<object class="NSCustomResource" key="NSNormalImage">
+															<string key="NSClassName">NSImage</string>
+															<string key="NSResourceName">NSSwitch</string>
+														</object>
+														<object class="NSButtonImageSource" key="NSAlternateImage">
+															<string key="NSImageName">NSSwitch</string>
+														</object>
+														<string key="NSAlternateContents"/>
+														<string key="NSKeyEquivalent"/>
+														<int key="NSPeriodicDelay">200</int>
+														<int key="NSPeriodicInterval">25</int>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="886713545"/>
+												</object>
+												<object class="NSTableColumn" id="998807868">
+													<string key="NSIdentifier">text</string>
+													<double key="NSWidth">80</double>
+													<double key="NSMinWidth">10</double>
+													<double key="NSMaxWidth">3.4028234663852886e+38</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Field</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="422484284"/>
+														<reference key="NSTextColor" ref="377135254"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="198596108">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Text Cell</string>
+														<reference key="NSSupport" ref="350214907"/>
+														<reference key="NSControlView" ref="886713545"/>
+														<object class="NSColor" key="NSBackgroundColor" id="794969063">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor" id="78610251">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="711996343">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="779435294"/>
+														</object>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="886713545"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="690087723"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">-700448768</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {237, 228}}</string>
+									<reference key="NSSuperview" ref="199174026"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="886713545"/>
+									<string key="NSReuseIdentifierKey">_NS:11</string>
+									<reference key="NSDocView" ref="886713545"/>
+									<reference key="NSBGColor" ref="794969063"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="322058333">
+									<reference key="NSNextResponder" ref="199174026"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="199174026"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="46407468"/>
+									<string key="NSReuseIdentifierKey">_NS:58</string>
+									<reference key="NSTarget" ref="199174026"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.93421052631578949</double>
+								</object>
+								<object class="NSScroller" id="46407468">
+									<reference key="NSNextResponder" ref="199174026"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 230}, {280, 15}}</string>
+									<reference key="NSSuperview" ref="199174026"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="73222517"/>
+									<string key="NSReuseIdentifierKey">_NS:60</string>
+									<bool key="NSEnabled">YES</bool>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="199174026"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99163179916317989</double>
+								</object>
+								<object class="NSClipView" id="931675323">
+									<reference key="NSNextResponder" ref="199174026"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="285325064"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {237, 17}}</string>
+									<reference key="NSSuperview" ref="199174026"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="285325064"/>
+									<string key="NSReuseIdentifierKey">_NS:15</string>
+									<reference key="NSDocView" ref="285325064"/>
+									<reference key="NSBGColor" ref="794969063"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="419505309"/>
+							</array>
+							<string key="NSFrame">{{20, 39}, {239, 246}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="931675323"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<int key="NSsFlags">133810</int>
+							<reference key="NSVScroller" ref="322058333"/>
+							<reference key="NSHScroller" ref="46407468"/>
+							<reference key="NSContentView" ref="707743700"/>
+							<reference key="NSHeaderClipView" ref="931675323"/>
+							<reference key="NSCornerView" ref="419505309"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSTextField" id="155434954">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{294, 138}, {371, 99}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:1549</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="1029952308">
+								<int key="NSCellFlags">68157504</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string type="base64-UTF8" key="NSContents">U3RlcHM6IEluIHRoZSB0YWJsZSwgRWRpdCBhIENQVGV4dEZpZWxkIG9yIGNsaWNrIGEgQ1BCdXR0b24g
+LgogICAgICAgICAgTG9nIE1vZGVsIGFuZCBzZWUgdGhlIHJlc3VsdCBpbiB0aGUgY29uc29sZS4KCkV4
+cGVjdGVkOiBUaGUgbW9kZWwgc2hvdWxkIHJlZmxlY3QgVUkgY2hhbmdlcy4</string>
+								<reference key="NSSupport" ref="350214907"/>
+								<string key="NSCellIdentifier">_NS:1549</string>
+								<reference key="NSControlView" ref="155434954"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<reference key="NSColor" ref="78610251"/>
+								</object>
+								<reference key="NSTextColor" ref="711996343"/>
+							</object>
+						</object>
+						<object class="NSButton" id="73222517">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{291, 257}, {178, 32}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="155434954"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="129805655">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Log Model</string>
+								<reference key="NSSupport" ref="350214907"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="73222517"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSSegmentedControl" id="496741303">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{276, 323}, {177, 24}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="199174026"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSSegmentedCell" key="NSCell" id="636459936">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">0</int>
+								<reference key="NSSupport" ref="350214907"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="496741303"/>
+								<array class="NSMutableArray" key="NSSegmentImages">
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">Bindings</string>
+										<bool key="NSSegmentItemSelected">YES</bool>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+									<object class="NSSegmentItem">
+										<string key="NSSegmentItemLabel">Data Source</string>
+										<int key="NSSegmentItemTag">1</int>
+										<int key="NSSegmentItemImageScaling">0</int>
+									</object>
+								</array>
+								<int key="NSSegmentStyle">1</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{728, 366}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="496741303"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSCustomObject" id="635946545">
+				<string key="NSClassName">AppController</string>
+			</object>
+			<object class="NSArrayController" id="15999859">
+				<bool key="NSEditable">YES</bool>
+				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
+				<bool key="NSAvoidsEmptySelection">YES</bool>
+				<bool key="NSPreservesSelection">YES</bool>
+				<bool key="NSSelectsInsertedObjects">YES</bool>
+				<bool key="NSFilterRestrictsInsertion">YES</bool>
+				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="635946545"/>
+					</object>
+					<int key="connectionID">451</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">theWindow</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="972006081"/>
+					</object>
+					<int key="connectionID">459</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">logContent:</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="73222517"/>
+					</object>
+					<int key="connectionID">478</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">arrayController</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="15999859"/>
+					</object>
+					<int key="connectionID">493</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">tableView</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="886713545"/>
+					</object>
+					<int key="connectionID">494</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectSegment:</string>
+						<reference key="source" ref="635946545"/>
+						<reference key="destination" ref="496741303"/>
+					</object>
+					<int key="connectionID">495</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">contentArray: content</string>
+						<reference key="source" ref="15999859"/>
+						<reference key="destination" ref="635946545"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="15999859"/>
+							<reference key="NSDestination" ref="635946545"/>
+							<string key="NSLabel">contentArray: content</string>
+							<string key="NSBinding">contentArray</string>
+							<string key="NSKeyPath">content</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">473</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="972006081"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="439893737"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="439893737"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="199174026"/>
+							<reference ref="155434954"/>
+							<reference ref="73222517"/>
+							<reference ref="496741303"/>
+						</array>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">450</int>
+						<reference key="object" ref="635946545"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">460</int>
+						<reference key="object" ref="199174026"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="886713545"/>
+							<reference ref="46407468"/>
+							<reference ref="285325064"/>
+							<reference ref="322058333"/>
+						</array>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">461</int>
+						<reference key="object" ref="886713545"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="75353417"/>
+							<reference ref="998807868"/>
+							<reference ref="168557545"/>
+						</array>
+						<reference key="parent" ref="199174026"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">462</int>
+						<reference key="object" ref="46407468"/>
+						<reference key="parent" ref="199174026"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">463</int>
+						<reference key="object" ref="285325064"/>
+						<reference key="parent" ref="199174026"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">464</int>
+						<reference key="object" ref="322058333"/>
+						<reference key="parent" ref="199174026"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">465</int>
+						<reference key="object" ref="75353417"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="58056957"/>
+						</array>
+						<reference key="parent" ref="886713545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">469</int>
+						<reference key="object" ref="155434954"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1029952308"/>
+						</array>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">470</int>
+						<reference key="object" ref="1029952308"/>
+						<reference key="parent" ref="155434954"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">471</int>
+						<reference key="object" ref="58056957"/>
+						<reference key="parent" ref="75353417"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">472</int>
+						<reference key="object" ref="15999859"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">476</int>
+						<reference key="object" ref="73222517"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="129805655"/>
+						</array>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">477</int>
+						<reference key="object" ref="129805655"/>
+						<reference key="parent" ref="73222517"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">479</int>
+						<reference key="object" ref="998807868"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="198596108"/>
+						</array>
+						<reference key="parent" ref="886713545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">480</int>
+						<reference key="object" ref="198596108"/>
+						<reference key="parent" ref="998807868"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="496741303"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="636459936"/>
+						</array>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="636459936"/>
+						<reference key="parent" ref="496741303"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">505</int>
+						<reference key="object" ref="168557545"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1048566881"/>
+						</array>
+						<reference key="parent" ref="886713545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">507</int>
+						<reference key="object" ref="1048566881"/>
+						<reference key="parent" ref="168557545"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="371.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="NO" key="371.IBNSWindowAutoPositionCentersVertical"/>
+				<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="371.IBWindowTemplateEditedContentRect">{{303, 221}, {480, 360}}</string>
+				<integer value="1" key="371.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="450.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="460.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="461.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="463.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="464.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="465.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="469.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="470.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="471.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="472.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="476.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="477.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="479.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="480.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<integer value="0" key="492.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="505.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="507.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">507</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">AppController</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="logContent:">id</string>
+						<string key="selectSegment:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="logContent:">
+							<string key="name">logContent:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectSegment:">
+							<string key="name">selectSegment:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="arrayController">NSArrayController</string>
+						<string key="tableView">NSTableView</string>
+						<string key="theWindow">NSWindow</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="arrayController">
+							<string key="name">arrayController</string>
+							<string key="candidateClassName">NSArrayController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="tableView">
+							<string key="name">tableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="theWindow">
+							<string key="name">theWindow</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/AppController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSSwitch</string>
+			<string key="NS.object.0">{15, 15}</string>
+		</object>
+	</data>
+</archive>
@@ -0,0 +1,107 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index-debug.html
+ issue1593
+
+ Created by You on July 9, 2012.
+ Copyright 2012, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>issue1593</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading issue1593...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
@@ -0,0 +1,77 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index.html
+ issue1593
+
+ Created by You on July 9, 2012.
+ Copyright 2012, Your Company All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>issue1593</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading issue1593...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>
@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * issue1593
+ *
+ * Created by You on July 9, 2012.
+ * Copyright 2012, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}
@@ -79,7 +79,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef,
                      flags & kFSEventStreamEventFlagItemXattrMod      ||
                      flags & kFSEventStreamEventFlagItemChangeOwner))
            {
-                DLog(@"event type: %@ for path %@", flags, path);
+                DLog(@"event type: %u for path %@", flags, path);
                [xcc handleFileModification:path notify:YES];
            }

@@ -122,14 +122,14 @@
 /* Begin PBXShellScriptBuildPhase section */
 		E180EE7A15AB561300757AC7 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
+			buildActionMask = 12;
 			files = (
 			);
 			inputPaths = (
 			);
 			outputPaths = (
 			);
-			runOnlyForDeploymentPostprocessing = 1;
+			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
 			shellScript = "if [[ -d \"$CAPP_BUILD\"/Debug/CommonJS/cappuccino/bin ]]; then\n\tcp \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME\" \"$CAPP_BUILD\"/Debug/CommonJS/cappuccino/bin\nfi\n\nif [[ -d \"$CAPP_BUILD\"/Release/CommonJS/cappuccino/bin ]]; then\n\tcp \"$SYMROOT/$CONFIGURATION/$PRODUCT_NAME\" \"$CAPP_BUILD\"/Release/CommonJS/cappuccino/bin\nfi\n";
 			showEnvVarsInLog = 0;
@@ -31,12 +31,6 @@
@import "NSControl.j"


-var _CPButtonBezelStyleHeights = {};
-
-_CPButtonBezelStyleHeights[CPRoundedBezelStyle] = 18;
-_CPButtonBezelStyleHeights[CPTexturedRoundedBezelStyle] = 20;
-_CPButtonBezelStyleHeights[CPHUDBezelStyle] = 20;
-
 var NSButtonIsBorderedMask = 0x00800000,
    NSButtonAllowsMixedStateMask = 0x1000000,

@@ -124,67 +118,78 @@ var NSButtonIsBorderedMask = 0x00800000,
    [self setBordered:[cell isBordered]];
    _bezelStyle = [cell bezelStyle];

+    var fixedHeight;
+
    // Map Cocoa bezel styles to Cappuccino bezel styles and adjust frame
    switch (_bezelStyle)
    {
        // implemented:
-        case CPRoundedBezelStyle:
+        case CPRoundedBezelStyle:  // Push IB style
            positionOffsetOriginY = 6;
            positionOffsetOriginX = 4;
            positionOffsetSizeWidth = -12;
+            fixedHeight = YES;
            break;

-        case CPTexturedRoundedBezelStyle:
+        case CPTexturedRoundedBezelStyle:  // Round Textured IB style
            positionOffsetOriginY = 2;
            positionOffsetOriginX = -2;
            positionOffsetSizeWidth = 0;
+            fixedHeight = YES;
            break;

        case CPHUDBezelStyle:
+            fixedHeight = YES;
            break;

        // approximations:
-        case CPRoundRectBezelStyle:
+        case CPRoundRectBezelStyle:  // Round Rect IB style
            positionOffsetOriginY = -3;
            positionOffsetOriginX = -2;
            positionOffsetSizeWidth = 0;
            _bezelStyle = CPRoundedBezelStyle;
+            fixedHeight = YES;
            break;

-        case CPSmallSquareBezelStyle:
+        case CPSmallSquareBezelStyle:  // Gradient IB style
            positionOffsetOriginX = -2;
            positionOffsetSizeWidth = 0;
            _bezelStyle = CPTexturedRoundedBezelStyle;
+            fixedHeight = NO;
            break;

-        case CPThickSquareBezelStyle:
+        case CPThickSquareBezelStyle:  // Bevel IB style
        case CPThickerSquareBezelStyle:
        case CPRegularSquareBezelStyle:
            positionOffsetOriginY = 3;
            positionOffsetOriginX = 0;
            positionOffsetSizeWidth = -4;
            _bezelStyle = CPTexturedRoundedBezelStyle;
+            fixedHeight = NO;
            break;

-        case CPTexturedSquareBezelStyle:
+        case CPTexturedSquareBezelStyle:  // Textured IB style
            positionOffsetOriginY = 4;
            positionOffsetOriginX = -1;
            positionOffsetSizeWidth = -2;
            _bezelStyle = CPTexturedRoundedBezelStyle;
+            fixedHeight = NO;
            break;

-        case CPShadowlessSquareBezelStyle:
+        case CPShadowlessSquareBezelStyle:  // Square IB style
            positionOffsetOriginY = 5;
            positionOffsetOriginX = -2;
            positionOffsetSizeWidth = 0;
            _bezelStyle = CPTexturedRoundedBezelStyle;
+            fixedHeight = NO;
            break;

-        case CPRecessedBezelStyle:
+        case CPRecessedBezelStyle:  // Recessed IB style
            positionOffsetOriginY = -3;
            positionOffsetOriginX = -2;
            positionOffsetSizeWidth = 0;
            _bezelStyle = CPHUDBezelStyle;
+            fixedHeight = YES;
            break;

        // unsupported
@@ -194,26 +199,60 @@ var NSButtonIsBorderedMask = 0x00800000,
        case CPDisclosureBezelStyle:
            CPLog.warn("NSButton [%s]: unsupported bezel style: %d", _title == null ? "<no title>" : '"' + _title + '"', _bezelStyle);
            _bezelStyle = CPHUDBezelStyle;
+            fixedHeight = YES;
            break;

        // error:
        default:
            CPLog.warn("NSButton [%s]: unknown bezel style: %d", _title == null ? "<no title>" : '"' + _title + '"', _bezelStyle);
            _bezelStyle = CPHUDBezelStyle;
+            fixedHeight = YES;
    }

    if ([cell isBordered])
    {
-        CPLog.debug("NSButton [%s]: adjusting height from %d to %d", _title == null ? "<no title>" : '"' + _title + '"', _frame.size.height, CPButtonDefaultHeight);
-        _frame.size.height = CPButtonDefaultHeight;
+        /*
+            Try to figure out the intention of the theme in regards to fixed height buttons.
+
+            - If there is a min height and a max height and they are the same, the theme must
+              not support variable button heights. In that case all buttons are considered fixed height.
+            - If there is just a max height, use that for only for fixed height buttons.
+            - If there is no max height either, don't do any height adjustments.
+        */
+        var theme = [[Converter sharedConverter] themes][0],
+            minSize = [theme valueForAttributeWithName:@"min-size" forClass:[CPButton class]],
+            maxSize = [theme valueForAttributeWithName:@"max-size" forClass:[CPButton class]],
+            adjustHeight = NO;
+
+        if (minSize.height > 0 && maxSize.height > 0 && minSize.height === maxSize.height)
+        {
+            adjustHeight = YES;
+            fixedHeight = minSize.height === maxSize.height;
+        }
+        else if (minSize.height < 0 && maxSize.height > 0)
+            adjustHeight = fixedHeight;
+        else
+            adjustHeight = minSize.height > 0 || maxSize.height > 0;
+
+        if (adjustHeight)
+        {
+            var oldHeight = _frame.size.height;
+
+            if (minSize.height > 0)
+                _frame.size.height = _bounds.size.height = MAX(_frame.size.height, minSize.height);
+
+            if (maxSize.height > 0)
+                _frame.size.height = _bounds.size.height = MIN(_frame.size.height, maxSize.height);
+
+            if (_frame.size.height !== oldHeight)
+                CPLog.debug("NSButton [%s]: adjusted height from %d to %d", _title == null ? "<no title>" : '"' + _title + '"', oldHeight, _frame.size.height);
+        }

        // Reposition the buttons according to its particular offsets
        _frame.origin.x += positionOffsetOriginX;
        _frame.origin.y += positionOffsetOriginY;
        _frame.size.width += positionOffsetSizeWidth;
        _bounds.size.width += positionOffsetSizeWidth;
-
-        _bounds.size.height = CPButtonDefaultHeight;
    }

    _keyEquivalent = [cell keyEquivalent];