Deploying to gh-pages from @ cappuccino/cappuccino@f56855010f 🚀

.editorconfig

@@ -1,12 +0,0 @@
-# EditorConfig reference: https://editorconfig.org
-# https://editorconfig.org/#file-format-details
-
-root = true
-
-[*]
-charset                   =  utf-8
-end_of_line               =  lf
-indent_size               =  4
-indent_style              =  space
-insert_final_newline      =  true
-trim_trailing_whitespace  =  true

.github/workflows/BuildAndTest.yml

@@ -1,34 +0,0 @@
-# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: Node build
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [20.x, 21.x, 22.x, 23.x, 24.x]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: echo "${PWD}/dist/cappuccino/bin" >> $GITHUB_PATH
-    - run: echo "${PWD}/dist/objective-j/bin" >> $GITHUB_PATH
-    - run: npm install
-    - run: npm update
-    - run: jake dist
-    - run: jake test-only

.github/workflows/main-branch-publish-manual-tests.yaml

@@ -1,178 +0,0 @@
-name: Main branch - Build Testbook with fresh frameworks and manual tests & deploy to GitHub Pages
-
-on:
-  push:
-    branches: [ main ]
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pages: write       # required by deploy-pages
-  id-token: write    # required by deploy-pages
-  pull-requests: write
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout cappuccino (this repo)
-        uses: actions/checkout@v5
-
-      - name: Checkout Cappuccino-Testbook into ./testbook
-        uses: actions/checkout@v5
-        with:
-          repository: ArgosOz/Cappuccino-Testbook
-          path: testbook
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4
-
-      - run: echo "${PWD}/dist/cappuccino/bin" >> $GITHUB_PATH
-      - run: echo "${PWD}/dist/objective-j/bin" >> $GITHUB_PATH
-      - run: npm install
-      - run: npm update
-      - run: jake dist
-      - run: jake test-only
-        
-      # Refresh Frameworks from dist → testbook/Frameworks
-      - name: Refresh Frameworks
-        run: |
-          set -euo pipefail
-          if [ ! -d dist ]; then
-            echo "❌ dist/ not found at repo root" >&2
-            exit 1
-          fi
-          mkdir -p testbook/Frameworks
-          rm -rf testbook/Frameworks/*
-          cp -a dist/cappuccino/Frameworks/{Foundation,AppKit} testbook/Frameworks/
-          cp -a dist/objective-j/Frameworks/Objective-J testbook/Frameworks/
-          echo "Frameworks populated:" && ls -la testbook/Frameworks || true
-
-      - name: Generate manifest of manual test directories
-        if: ${{ hashFiles('Tests/Manual/**') != '' }}
-        run: |
-          set -euo pipefail
-          mkdir -p artifacts
-          OUT="testbook/Resources/recipes.txt"
-          : > "$OUT"
-
-          if [ ! -d "Tests/Manual" ]; then
-            echo "❌ Tests/Manual not found at repo root" >&2
-            exit 1
-          fi
-
-          # Iterate over immediate subdirectories of Tests/Manual (null-safe for spaces)
-          while IFS= read -r -d '' d; do
-            name=$(basename "$d")
-            ts=$(date +%s%3N)  # milliseconds since epoch
-            printf '%s|%s|\n' "$ts" "$name" >> "$OUT"
-            # Optional tiny sleep to help keep timestamps distinct:
-            sleep 0.01
-          done < <(find "Tests/Manual" -mindepth 1 -maxdepth 1 -type d -print0 | sort -z)
-
-          echo "Wrote $OUT:"
-          cat "$OUT"        
-        
-      # Replace subdirectories inside testbook/Resources with Tests/Manual subdirectories
-      - name: Sync Resources from Tests/Manual
-        run: |
-          set -euo pipefail
-          if [ ! -d "Tests/Manual" ]; then
-            echo "❌ Tests/Manual not found at repo root" >&2
-            exit 1
-          fi
-          mkdir -p testbook/Resources
-          # Remove only immediate subdirectories (keep stray files if any)
-          find testbook/Resources -mindepth 1 -maxdepth 1 -type d -print0 | xargs -0 -r rm -rf
-          # Copy each immediate subdirectory from Tests/Manual → testbook/Resources
-          while IFS= read -r -d '' d; do
-            cp -a "$d" testbook/Resources/
-          done < <(find Tests/Manual -mindepth 1 -maxdepth 1 -type d -print0)
-          echo "Resources now contains:" && ls -la testbook/Resources || true
-
-      # Ensure each test Index.html includes the include path line before OBJJ_MAIN_FILE
-      - name: Inject OBJJ_INCLUDE_PATHS into Index.html files
-        run: |
-          set -euo pipefail
-          found=0
-          while IFS= read -r -d '' f; do
-            found=1
-            if grep -q 'OBJJ_INCLUDE_PATHS' "$f"; then
-              echo "Already updated: $f"
-              continue
-            fi
-            perl -0777 -i -pe 's/OBJJ_MAIN_FILE\s*=\s*"main\.j";/OBJJ_INCLUDE_PATHS = ["..\/..\/Frameworks"];\nOBJJ_MAIN_FILE = "main.j";/i' "$f"
-            perl -0777 -i -pe 's/Frameworks\/Objective-J\/Objective-J.js/\.\.\/\.\.\/Frameworks\/Objective-J\/Objective-J.js/' "$f"
-            echo "Updated: $f"
-          done < <(find testbook/Resources -mindepth 2 -maxdepth 2 -type f -iname "index.html" -print0)
-
-          if [ "$found" -eq 0 ]; then
-            echo "⚠️ No index.html files found under testbook/Resources/*/" >&2
-          fi
-
-      # Optional: prune VCS/CI metadata from the served content
-      - name: Clean testbook for Pages (optional)
-        run: |
-          set -euo pipefail
-          test -f testbook/index.html
-          test -d testbook/Resources
-          test -d testbook/Frameworks
-          rm -rf testbook/.git testbook/.github || true
-          find testbook -maxdepth 1 -type f -name ".git*" -delete || true
-
-      - name: Publish to gh-pages (preserve PR previews)
-        uses: JamesIves/github-pages-deploy-action@v4
-        with:
-          branch: gh-pages
-          folder: testbook
-          clean-exclude: pr-preview/   # keep PR preview folders
-          force: false                 # avoid force-push so previews survive
-
-      - name: Checkout gh-pages ./gh-pages
-        uses: actions/checkout@v5
-        with:
-          path: gh-pages
-          ref: gh-pages
-
-      - name: Clean gh-pages for Pages
-        run: |
-          set -euo pipefail
-          test -d gh-pages
-          rm -rf gh-pages/.git gh-pages/.github || true
-          find gh-pages -maxdepth 1 -type f -name ".git*" -delete || true
-          find gh-pages -type f -name "*.xib" -delete || true
-          find gh-pages -type f -name "*xcode*" -delete || true
-          find gh-pages -name "Jakefile" -delete || true
-
-      - name: Upload Pages artifact (testbook/)
-        uses: actions/upload-pages-artifact@v4
-        with:
-          path: gh-pages
-
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    concurrency:
-      group: pages
-      cancel-in-progress: true
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
-
-      - name: Comment Pages URL on PR
-        if: ${{ github.event_name == 'pull_request' }}
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const url = `${{ toJSON(steps.deployment.outputs.page_url) }}`;
-            const body = `📄 GitHub Pages preview for this PR:\n\n${url}`;
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body
-            });

.gitignore

@@ -1,28 +0,0 @@
-.DS_Store
-Frameworks
-Build
-Demos
-./Aristo
-WebSite
-.push-package
-*.xcodeproj*
-*.xcodeproj/*.pbxuser
-*.xcodeproj/*.perspectivev3
-xcuserdata/
-!*.xcodeproj/project.pbxproj
-*.xCodeSupport/
-*.XcodeSupport/
-*XcodeSupport/
-Tests/Manual/**/*.xcodeproj
-*.sublime-project
-*.sublime-workspace
-*.tm_properties
-*.idea
-node_modules
-*.vscode
-/dist/objective-j/objj-executable
-/dist/objective-j/package.json
-/dist/objective-j/lib
-/dist/cappuccino/package.json
-/dist/cappuccino/lib
-/dist/cappuccino/bin

.npmignore

@@ -1,28 +0,0 @@
-.DS_Store
-Frameworks
-!/dist/objective-j/Frameworks
-!/dist/cappuccino-j/Frameworks
-Build
-Demos
-./Aristo
-WebSite
-.push-package
-*.xcodeproj*
-*.xcodeproj/*.pbxuser
-*.xcodeproj/*.perspectivev3
-xcuserdata/
-!*.xcodeproj/project.pbxproj
-*.xCodeSupport/
-*.XcodeSupport/
-*XcodeSupport/
-Tests/Manual/**/*.xcodeproj
-*.sublime-project
-*.sublime-workspace
-*.tm_properties
-*.idea
-node_modules
-*.vscode
-/dist/objective-j/objj-executable
-/dist/objective-j/package.json
-/dist/cappuccino/package.json
-

.travis.yml

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

AppKit/AppKit.j

@@ -1,119 +0,0 @@
-/*
- * AppKit.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "_CPObject+Theme.j"
-@import "_CPToolTip.j"
-@import "CALayer.j"
-@import "CGGeometry.j"
-@import "CPAccordionView.j"
-@import "CPAlert.j"
-@import "CPAnimation.j"
-@import "CPAnimationContext.j"
-@import "CPAppearance.j"
-@import "CPApplication.j"
-@import "CPArrayController.j"
-@import "CPBezierPath.j"
-@import "CPBox.j"
-@import "CPBrowser.j"
-@import "CPButton.j"
-@import "CPButtonBar.j"
-@import "CPCheckBox.j"
-@import "CPCib.j"
-@import "CPCibBindingConnector.j"
-@import "CPCibConnector.j"
-@import "CPCibControlConnector.j"
-@import "CPCibHelpConnector.j"
-@import "CPCibLoading.j"
-@import "CPCibOutletConnector.j"
-@import "CPCibRuntimeAttributesConnector.j"
-@import "CPClipView.j"
-@import "CPCollectionView.j"
-@import "CPCollectionViewItem.j"
-@import "CPColor.j"
-@import "CPColorPanel.j"
-@import "CPColorSpace.j"
-@import "CPColorWell.j"
-@import "CPComboBox.j"
-@import "CPCompatibility.j"
-@import "CPControl.j"
-@import "CPController.j"
-@import "CPCookie.j"
-@import "CPCursor.j"
-@import "CPDatePicker.j"
-@import "CPDocument.j"
-@import "CPDocumentController.j"
-@import "CPEvent.j"
-@import "CPFont.j"
-@import "CPFontManager.j"
-@import "CPGradient.j"
-@import "CPGraphics.j"
-@import "CPImage.j"
-@import "CPImageView.j"
-@import "CPKeyBinding.j"
-@import "CPLevelIndicator.j"
-@import "CPMenu.j"
-@import "CPMenuItem.j"
-@import "CPOpenPanel.j"
-@import "CPOutlineView.j"
-@import "CPPanel.j"
-@import "CPPasteboard.j"
-@import "CPPopover.j"
-@import "CPPopUpButton.j"
-@import "CPPredicateEditor.j"
-@import "CPPredicateEditorRowTemplate.j"
-@import "CPProgressIndicator.j"
-@import "CPRadio.j"
-@import "CPResponder.j"
-@import "CPRuleEditor.j"
-@import "CPScroller.j"
-@import "CPScrollView.j"
-@import "CPSearchField.j"
-@import "CPSecureTextField.j"
-@import "CPSegmentedControl.j"
-@import "CPShadow.j"
-@import "CPSlider.j"
-@import "CPSound.j"
-@import "CPSplitView.j"
-@import "CPStepper.j"
-@import "CPTableColumn.j"
-@import "CPTableView.j"
-@import "CPTabView.j"
-@import "CPText.j"
-@import "CPTextField.j"
-@import "CPTextView.j"
-@import "CPTokenField.j"
-@import "CPToolbar.j"
-@import "CPToolbarItem.j"
-@import "CPTrackingArea.j"
-@import "CPTreeNode.j"
-@import "CPUserDefaultsController.j"
-@import "CPView.j"
-@import "CPViewAnimator.j"
-@import "CPViewAnimation.j"
-@import "CPViewController.j"
-@import "CPVisualEffectView.j"
-@import "CPWebView.j"
-@import "CPWindow.j"
-@import "CPWindowController.j"
-@import "CPWorkspace.j"
-@import "CPFontPanel.j"
-@import "CPTreeController.j"

AppKit/CPAccordionView.j

@@ -1,416 +0,0 @@
-/*
- * CPAccordionView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPArray.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPKeyValueObserving.j>
-@import <Foundation/CPIndexSet.j>
-@import <Foundation/CPString.j>
-
-@import "CPView.j"
-@import "CPButton.j"
-
-
-/*!
-  @ingroup appkit
-  @class CPAccordionViewItem
-
-  <p>A CPAccordionViewItem represents a single section of a CPAccordionView.</p>
-*/
-@implementation CPAccordionViewItem : CPObject
-{
-    CPString    _identifier @accessors(property=identifier);
-    CPView      _view @accessors(property=view);
-    CPString    _label @accessors(property=label);
-}
-
-- (id)init
-{
-    return [self initWithIdentifier:@""];
-}
-
-/*!
-  Initializes a new CPAccordionViewItem with the specified identifier. This identifier may
-  then be used in subsequent methods to provide abstract introspection of the CPAccordionView.
-*/
-- (id)initWithIdentifier:(CPString)anIdentifier
-{
-    self = [super init];
-
-    if (self)
-        [self setIdentifier:anIdentifier];
-
-    return self;
-}
-
-@end
-
-/*!
-  @ingroup appkit
-  @class CPAccordionView
-
-  <p>CPAccordionView provides a container for CPAccordionViewItem objects and manages layout state
-  for all sub-layout items.</p>
-
-  <strong>Example</strong><br />
-  <pre>
-var myAccordionView = [[CPAccordionView alloc] initWithFrame:CGRectMakeZero()];
-var firstItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"firstSection"]];
-[firstItem setView:[[CPView alloc] initWithFrame:CGRectMakeZero()]];
-var secondItem = [[CPAccordionViewItem alloc] initWithIdentifier:@"secondSection"]];
-[secondItem setView:[[CPView alloc] initWithFrame:CGRectMakeZero()]];
-[myAccordionView addItem:firstItem];
-[myAccordionView addItem:secondItem];
-[myAccordionView setAutoresizingMask: CPViewWidthSizable | CPViewHeightSizable];
-  </pre>
-*/
-@implementation CPAccordionView : CPView
-{
-    CPInteger       _dirtyItemIndex;
-    CPView          _itemHeaderPrototype;
-
-    CPMutableArray  _items;
-    CPMutableArray  _itemViews;
-    CPIndexSet      _expandedItemIndexes;
-}
-/*!
-    Initializes the receiver for usage with the specified bounding rectangle
-    @return the initialized view
-*/
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _items = [];
-        _itemViews = [];
-        _expandedItemIndexes = [CPIndexSet indexSet];
-
-        [self setItemHeaderPrototype:[[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 100.0, 24.0)]];
-    }
-
-    return self;
-}
-
-- (void)setItemHeaderPrototype:(CPView)aView
-{
-    _itemHeaderPrototype = aView;
-}
-
-- (CPView)itemHeaderPrototype
-{
-    return _itemHeaderPrototype;
-}
-
-- (CPArray)items
-{
-    return _items;
-}
-/*!
-  Append a CPAccordionViewItem to the receiver. Note that the CPAccordionViewItem must contain
-  a valid CPView derived component or a TypeError will be generated when the contents of the
-  ViewItem are disclosed.
-*/
-- (void)addItem:(CPAccordionViewItem)anItem
-{
-    [self insertItem:anItem atIndex:_items.length];
-}
-
-- (void)insertItem:(CPAccordionViewItem)anItem atIndex:(CPInteger)anIndex
-{
-    // FIXME: SHIFT ITEMS RIGHT
-    [_expandedItemIndexes addIndex:anIndex];
-
-    var itemView = [[_CPAccordionItemView alloc] initWithAccordionView:self];
-
-    [itemView setIndex:anIndex];
-    [itemView setLabel:[anItem label]];
-    [itemView setContentView:[anItem view]];
-
-    [self addSubview:itemView];
-
-    [_items insertObject:anItem atIndex:anIndex];
-    [_itemViews insertObject:itemView atIndex:anIndex];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-
-    [self setNeedsLayout];
-}
-
-- (void)removeItem:(CPAccordionViewItem)anItem
-{
-    [self removeItemAtIndex:[_items indexOfObjectIdenticalTo:anItem]];
-}
-
-- (void)removeItemAtIndex:(CPInteger)anIndex
-{
-    // SHIFT ITEMS LEFT
-    [_expandedItemIndexes removeIndex:anIndex];
-
-    [_itemViews[anIndex] removeFromSuperview];
-
-    [_items removeObjectAtIndex:anIndex];
-    [_itemViews removeObjectAtIndex:anIndex];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-
-    [self setNeedsLayout];
-}
-
-- (void)removeAllItems
-{
-    var count = _items.length;
-
-    while (count--)
-        [self removeItemAtIndex:count];
-}
-
-- (void)expandItemAtIndex:(CPInteger)anIndex
-{
-    if (![_itemViews[anIndex] isCollapsed])
-        return;
-
-    [_expandedItemIndexes addIndex:anIndex];
-    [_itemViews[anIndex] setCollapsed:NO];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-}
-
-- (void)collapseItemAtIndex:(CPInteger)anIndex
-{
-    if ([_itemViews[anIndex] isCollapsed])
-        return;
-
-    [_expandedItemIndexes removeIndex:anIndex];
-    [_itemViews[anIndex] setCollapsed:YES];
-
-    [self _invalidateItemsStartingAtIndex:anIndex];
-}
-
-- (void)toggleItemAtIndex:(CPInteger)anIndex
-{
-    var itemView = _itemViews[anIndex];
-
-    if ([itemView isCollapsed])
-        [self expandItemAtIndex:anIndex];
-
-    else
-        [self collapseItemAtIndex:anIndex];
-}
-
-- (CPIndexSet)expandedItemIndexes
-{
-    return _expandedItemIndexes;
-}
-
-- (CPIndexSet)collapsedItemIndexes
-{
-    var indexSet = [CPIndexSet indexSetWithIndexesInRange:CPMakeRange(0, _items.length)];
-
-    [indexSet removeIndexes:_expandedItemIndexes];
-
-    return indexSet;
-}
-
-- (void)setEnabled:(BOOL)isEnabled forItemAtIndex:(CPInteger)anIndex
-{
-    var itemView = _itemViews[anIndex];
-    if (!itemView)
-        return;
-
-    if (!isEnabled)
-        [self collapseItemAtIndex:anIndex];
-    else
-        [self expandItemAtIndex:anIndex];
-
-    [itemView setEnabled:isEnabled];
-}
-
-- (void)_invalidateItemsStartingAtIndex:(CPInteger)anIndex
-{
-    if (_dirtyItemIndex === CPNotFound)
-        _dirtyItemIndex = anIndex;
-
-    _dirtyItemIndex = MIN(_dirtyItemIndex, anIndex);
-
-    [self setNeedsLayout];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    var width = CGRectGetWidth([self frame]);
-
-    [super setFrameSize:aSize];
-
-    if (width !== CGRectGetWidth([self frame]))
-        [self _invalidateItemsStartingAtIndex:0];
-}
-
-- (void)layoutSubviews
-{
-    if (_items.length <= 0)
-        return [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), 0.0)];
-
-    if (_dirtyItemIndex === CPNotFound)
-        return;
-
-    _dirtyItemIndex = MIN(_dirtyItemIndex, _items.length - 1);
-
-    var index = _dirtyItemIndex,
-        count = _itemViews.length,
-        width = CGRectGetWidth([self bounds]),
-        y = index > 0 ? CGRectGetMaxY([_itemViews[index - 1] frame]) : 0.0;
-
-    // Do this now (instead of after looping), so that if we are made dirty again in the middle we don't blow this value away.
-    _dirtyItemIndex = CPNotFound;
-
-    for (; index < count; ++index)
-    {
-        var itemView = _itemViews[index];
-
-        [itemView setFrameY:y width:width];
-
-        y = CGRectGetMaxY([itemView frame]);
-    }
-
-    [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), y)];
-}
-
-@end
-
-@implementation _CPAccordionItemView : CPView
-{
-    CPAccordionView _accordionView;
-
-    BOOL            _isCollapsed @accessors(getter=isCollapsed, setter=setCollapsed:);
-    CPInteger       _index @accessors(property=index);
-    CPView          _headerView;
-    CPView          _contentView;
-}
-
-- (id)initWithAccordionView:(CPAccordionView)anAccordionView
-{
-    self = [super initWithFrame:CGRectMakeZero()];
-
-    if (self)
-    {
-        _accordionView = anAccordionView;
-        _isCollapsed = NO;
-
-        var bounds = [self bounds];
-
-        _headerView = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:[_accordionView itemHeaderPrototype]]];
-
-        if ([_headerView respondsToSelector:@selector(setTarget:)] && [_headerView respondsToSelector:@selector(setAction:)])
-        {
-            [_headerView setTarget:self];
-            [_headerView setAction:@selector(toggle:)];
-        }
-
-        [self addSubview:_headerView];
-    }
-
-    return self;
-}
-
-- (void)toggle:(id)aSender
-{
-    [_accordionView toggleItemAtIndex:[self index]];
-}
-
-- (void)setLabel:(CPString)aLabel
-{
-    if ([_headerView respondsToSelector:@selector(setTitle:)])
-        [_headerView setTitle:aLabel];
-
-    else if ([_headerView respondsToSelector:@selector(setLabel:)])
-        [_headerView setLabel:aLabel];
-
-    else if ([_headerView respondsToSelector:@selector(setStringValue:)])
-        [_headerView setStringValue:aLabel];
-}
-
-- (void)setEnabled:(BOOL)isEnabled
-{
-    if ([_headerView respondsToSelector:@selector(setEnabled:)])
-        [_headerView setEnabled:isEnabled];
-}
-
-- (void)setContentView:(CPView)aView
-{
-    if (_contentView === aView)
-        return;
-
-    [_contentView removeObserver:self forKeyPath:@"frame"];
-
-    [_contentView removeFromSuperview];
-
-    _contentView = aView;
-
-    [_contentView addObserver:self forKeyPath:@"frame" options:CPKeyValueObservingOptionOld | CPKeyValueObservingOptionNew context:NULL];
-
-    [self addSubview:_contentView];
-
-    [_accordionView _invalidateItemsStartingAtIndex:[self index]];
-}
-
-- (void)setFrameY:(float)aY width:(float)aWidth
-{
-    var headerHeight = CGRectGetHeight([_headerView frame]);
-
-    // Size to fit or something?
-    [_headerView setFrameSize:CGSizeMake(aWidth, headerHeight)];
-    [_contentView setFrameOrigin:CGPointMake(0.0, headerHeight)];
-
-    if ([self isCollapsed])
-        [self setFrame:CGRectMake(0.0, aY, aWidth, headerHeight)];
-
-    else
-    {
-        var contentHeight = CGRectGetHeight([_contentView frame]);
-
-        [_contentView setFrameSize:CGSizeMake(aWidth, contentHeight)];
-        [self setFrame:CGRectMake(0.0, aY, aWidth, contentHeight + headerHeight)];
-    }
-}
-
-- (void)resizeSubviewsWithOldSize:(CGSize)aSize
-{
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath
-                      ofObject:(id)anObject
-                        change:(CPDictionary)aChange
-                       context:(id)aContext
-{
-    if (aKeyPath === "frame" && !CGRectEqualToRect([aChange objectForKey:CPKeyValueChangeOldKey], [aChange objectForKey:CPKeyValueChangeNewKey]))
-        [_accordionView _invalidateItemsStartingAtIndex:[self index]];
-/*
-    else if (aKeyPath === "itemHeaderPrototype")
-    {
-
-    }
-*/
-}
-
-@end

AppKit/CPAlert.j

@@ -1,864 +0,0 @@
-/*
- * CPAlert.j
- * AppKit
- *
- * Created by Jake MacMullin.
- * Copyright 2008, Jake MacMullin.
- *
- * 11/10/2008 Ross Boucher
- *     - Make it conform to style guidelines, general cleanup and enhancements
- * 11/10/2010 Antoine Mercadal
- *     - Enhancements, better compliance with Cocoa API
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
-@import "CPButton.j"
-@import "CPColor.j"
-@import "CPFont.j"
-@import "CPImage.j"
-@import "CPImageView.j"
-@import "CPPanel.j"
-@import "CPText.j"
-@import "CPTextField.j"
-
-@class CPCheckBox
-
-@global CPApp
-
-var CPAlertDelegate_alertShowHelp_              = 1 << 0,
-    CPAlertDelegate_alertDidEnd_returnCode_     = 1 << 1;
-
-@typedef CPAlertStyle
-/*
-    @global
-    @group CPAlertStyle
-*/
-CPWarningAlertStyle         = 0;
-/*
-    @global
-    @group CPAlertStyle
-*/
-CPInformationalAlertStyle   = 1;
-/*
-    @global
-    @group CPAlertStyle
-*/
-CPCriticalAlertStyle        = 2;
-
-var bottomHeight = 71;
-
-@protocol CPAlertDelegate <CPObject>
-
-@optional
-- (BOOL)alertShowHelp:(CPAlert)alert;
-- (void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
-
-@end
-
-
-@implementation _CPAlertThemeView : CPView
-
-+ (CPString)defaultThemeClass
-{
-    return @"alert";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"size": CGSizeMake(400.0, 110.0),
-            @"content-inset": CGInsetMake(15, 15, 15, 50),
-            @"informative-offset": 6,
-            @"button-offset": 10,
-            @"message-text-alignment": CPJustifiedTextAlignment,
-            @"message-text-color": [CPColor blackColor],
-            @"message-text-font": [CPFont boldSystemFontOfSize:13.0],
-            @"message-text-shadow-color": [CPNull null],
-            @"message-text-shadow-offset": CGSizeMakeZero(),
-            @"informative-text-alignment": CPJustifiedTextAlignment,
-            @"informative-text-color": [CPColor blackColor],
-            @"informative-text-font": [CPFont systemFontOfSize:12.0],
-            @"informative-text-shadow-color": [CPNull null],
-            @"informative-text-shadow-offset": CGSizeMakeZero(),
-            @"image-offset": CGPointMake(15, 12),
-            @"information-image": [CPNull null],
-            @"warning-image": [CPNull null],
-            @"error-image": [CPNull null],
-            @"help-image": [CPNull null],
-            @"help-image-left-offset": 15,
-            @"help-image-pressed": [CPNull null],
-            @"suppression-button-y-offset": 0.0,
-            @"suppression-button-x-offset": 0.0,
-            @"default-elements-margin": 3.0,
-            @"suppression-button-text-color": [CPColor blackColor],
-            @"suppression-button-text-font": [CPFont systemFontOfSize:12.0],
-            @"suppression-button-text-shadow-color": [CPNull null],
-            @"suppression-button-text-shadow-offset": 0.0,
-            @"modal-window-button-margin-y": 0.0,
-            @"modal-window-button-margin-x": 0.0,
-            @"standard-window-button-margin-y": 0.0,
-            @"standard-window-button-margin-x": 0.0,
-        };
-}
-
-@end
-
-/*!
-    @ingroup appkit
-
-    CPAlert is an alert panel that can be displayed modally to present the
-    user with a message and one or more options.
-
-    It can be used to display an information message \c CPInformationalAlertStyle,
-    a warning message \c CPWarningAlertStyle (the default), or a critical
-    alert \c CPCriticalAlertStyle. In each case the user can be presented with one
-    or more options by adding buttons using the \c -addButtonWithTitle: method.
-
-    The panel is displayed modally by calling \c -runModal and once the user has
-    dismissed the panel, a message will be sent to the panel's delegate (if set), informing
-    it which button was clicked (see delegate methods).
-
-    @delegate -(void)alertDidEnd:(CPAlert)theAlert returnCode:(int)returnCode;
-    Called when the user dismisses the alert by clicking one of the buttons.
-    @param theAlert the alert panel that the user dismissed
-    @param returnCode the index of the button that the user clicked (starting from 0,
-           representing the first button added to the alert which appears on the
-           right, 1 representing the next button to the left and so on)
-*/
-@implementation CPAlert : CPObject
-{
-    BOOL                    _showHelp                   @accessors(property=showsHelp);
-    BOOL                    _showSuppressionButton      @accessors(property=showsSuppressionButton);
-
-    CPAlertStyle            _alertStyle                 @accessors(property=alertStyle);
-    CPString                _title                      @accessors(property=title);
-    CPView                  _accessoryView              @accessors(property=accessoryView);
-    CPImage                 _icon                       @accessors(property=icon);
-
-    CPArray                 _buttons                    @accessors(property=buttons, readonly);
-    CPCheckBox              _suppressionButton          @accessors(property=suppressionButton, readonly);
-
-    id <CPAlertDelegate>    _delegate                   @accessors(property=delegate);
-    id                      _modalDelegate;
-    SEL                     _didEndSelector             @accessors(property=didEndSelector);
-    Function                _didEndBlock;
-    unsigned                _implementedDelegateMethods;
-
-    _CPAlertThemeView       _themeView                  @accessors(property=themeView, readonly);
-    CPWindow                _window                     @accessors(property=window, readonly);
-    int                     _defaultWindowStyle;
-
-    CPImageView             _alertImageView;
-    CPTextField             _informativeLabel;
-    CPTextField             _messageLabel;
-    CPButton                _alertHelpButton;
-
-    BOOL                    _needsLayout;
-}
-
-// MARK: Creating Alerts
-
-/*!
-    Returns a CPAlert object with the provided info
-
-    @param aMessage the main body text of the alert
-    @param defaultButton the title of the default button
-    @param alternateButton if not nil, the title of a second button
-    @param otherButton if not nil, the title of the third button
-    @param informativeText if not nil the informative text of the alert
-    @return fully initialized CPAlert
-*/
-+ (CPAlert)alertWithMessageText:(CPString)aMessage defaultButton:(CPString)defaultButtonTitle alternateButton:(CPString)alternateButtonTitle otherButton:(CPString)otherButtonTitle informativeTextWithFormat:(CPString)informativeText
-{
-    var newAlert = [[self alloc] init];
-
-    [newAlert setMessageText:aMessage];
-    [newAlert addButtonWithTitle:defaultButtonTitle];
-
-    if (alternateButtonTitle)
-        [newAlert addButtonWithTitle:alternateButtonTitle];
-
-    if (otherButtonTitle)
-        [newAlert addButtonWithTitle:otherButtonTitle];
-
-    if (informativeText)
-        [newAlert setInformativeText:informativeText];
-
-    return newAlert;
-}
-
-/*!
-    Return an CPAlert with type error
-
-    @param anErrorMessage the message of the alert
-    @return fully initialized CPAlert
-*/
-+ (CPAlert)alertWithError:(CPString)anErrorMessage
-{
-    var newAlert = [[self alloc] init];
-
-    [newAlert setMessageText:anErrorMessage];
-    [newAlert setAlertStyle:CPCriticalAlertStyle];
-
-    return newAlert;
-}
-
-/*!
-    Initializes a \c CPAlert panel with the default alert style \c CPWarningAlertStyle.
-*/
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _buttons            = [];
-        _alertStyle         = CPWarningAlertStyle;
-        _showHelp           = NO;
-        _needsLayout        = YES;
-        _defaultWindowStyle = _CPModalWindowMask;
-        _themeView          = [_CPAlertThemeView new];
-
-        _messageLabel       = [CPTextField labelWithTitle:@"Alert"];
-        _alertImageView     = [[CPImageView alloc] init];
-        _informativeLabel   = [[CPTextField alloc] init];
-        _suppressionButton  = [CPCheckBox checkBoxWithTitle:@"Do not show this message again"];
-
-        _alertHelpButton    = [[CPButton alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
-        [_alertHelpButton setTarget:self];
-        [_alertHelpButton setAction:@selector(_showHelp:)];
-    }
-
-    return self;
-}
-
-
-// MARK: -
-// MARK: Delegate
-
-/*!
-    Set the delegate of the receiver
-    @param aDelegate the delegate object for the alert.
-*/
-- (void)setDelegate:(id <CPAlertDelegate>)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(alertShowHelp:)])
-        _implementedDelegateMethods |= CPAlertDelegate_alertShowHelp_;
-
-    if ([_delegate respondsToSelector:@selector(alertDidEnd:returnCode:)])
-        _implementedDelegateMethods |= CPAlertDelegate_alertDidEnd_returnCode_;
-}
-
-
-// MARK: Accessors
-
-- (CPTheme)theme
-{
-    return [_themeView theme];
-}
-
-/*!
-    set the theme to use
-
-    @param the theme to use
-*/
-- (void)setTheme:(CPTheme)aTheme
-{
-    if (aTheme === [self theme])
-        return;
-
-    if (aTheme === [CPTheme defaultHudTheme])
-        _defaultWindowStyle = CPTitledWindowMask | CPHUDBackgroundWindowMask;
-    else
-        _defaultWindowStyle = CPTitledWindowMask;
-
-    _window = nil; // will be regenerated at next layout
-    _needsLayout = YES;
-    [_themeView setTheme:aTheme];
-}
-
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
-{
-    [_themeView setValue:aValue forThemeAttribute:aName];
-}
-
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName inState:(ThemeState)aState
-{
-    [_themeView setValue:aValue forThemeAttribute:aName inState:aState];
-}
-
-
-/*! @deprecated */
-- (void)setWindowStyle:(int)style
-{
-    CPLog.warn("DEPRECATED: setWindowStyle: is deprecated. use setTheme: instead");
-
-    [self setTheme:(style === CPHUDBackgroundWindowMask) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-}
-
-/*! @deprecated */
-- (int)windowStyle
-{
-    CPLog.warn("DEPRECATED: windowStyle: is deprecated. use theme instead");
-    return _defaultWindowStyle;
-}
-
-
-/*!
-    Set the text of the alert's message.
-
-    @param aText CPString containing the text
-*/
-- (void)setMessageText:(CPString)text
-{
-    [_messageLabel setStringValue:text];
-    _needsLayout = YES;
-}
-
-/*!
-    Return the content of the message text.
-
-    @return CPString containing the message text
-*/
-- (CPString)messageText
-{
-    return [_messageLabel stringValue];
-}
-
-/*!
-    Set the text of the alert's informative text.
-
-    @param aText CPString containing the informative text
-*/
-- (void)setInformativeText:(CPString)text
-{
-    [_informativeLabel setStringValue:text];
-    _needsLayout = YES;
-}
-
-/*!
-    return the content of the message text
-
-    @return CPString containing the message text
-*/
-- (CPString)informativeText
-{
-    return [_informativeLabel stringValue];
-}
-
-/*!
-    Sets the title of the alert window.
-    This API is not present in Cocoa.
-
-    @param aTitle CPString containing the window title
-*/
-- (void)setTitle:(CPString)aTitle
-{
-    _title = aTitle;
-    [_window setTitle:aTitle];
-}
-
-/*!
-    Set the accessory view.
-
-    @param aView the accessory view
-*/
-- (void)setAccessoryView:(CPView)aView
-{
-    _accessoryView = aView;
-    _needsLayout = YES;
-}
-
-/*!
-    Set if the alert shows the suppression button.
-
-    @param shouldShowSuppressionButton YES or NO
-*/
-- (void)setShowsSuppressionButton:(BOOL)shouldShowSuppressionButton
-{
-    _showSuppressionButton = shouldShowSuppressionButton;
-    _needsLayout = YES;
-}
-
-// MARK: Accessing Buttons
-
-/*!
-    Adds a button with a given title to the receiver.
-    Buttons will be added starting from the right hand side of the \c CPAlert panel.
-    The first button will have the index 0, the second button 1 and so on.
-
-    The first button will automatically be given a key equivalent of Return,
-    and any button titled "Cancel" will be given a key equivalent of Escape.
-
-    You really shouldn't need more than 3 buttons.
-
-    @param title the title of the button
-*/
-- (void)addButtonWithTitle:(CPString)aTitle
-{
-    var bounds = [[_window contentView] bounds],
-        count = [_buttons count],
-
-        button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
-
-    [button setTitle:aTitle];
-    [button setTag:count];
-    [button setTarget:self];
-    [button setAction:@selector(_takeReturnCodeFrom:)];
-
-    [[_window contentView] addSubview:button];
-
-    if (count == 0)
-        [button setKeyEquivalent:CPCarriageReturnCharacter];
-    else if ([aTitle lowercaseString] === @"cancel")
-        [button setKeyEquivalent:CPEscapeFunctionKey];
-
-    [_buttons insertObject:button atIndex:0];
-}
-
-// MARK: Layout
-
-/*!
-    @ignore
-*/
-- (void)_layoutMessageView
-{
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        sizeWithFontCorrection = 6.0,
-        messageLabelWidth,
-        messageLabelTextSize;
-
-    [_messageLabel setTextColor:[_themeView currentValueForThemeAttribute:@"message-text-color"]];
-    [_messageLabel setFont:[_themeView currentValueForThemeAttribute:@"message-text-font"]];
-    [_messageLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"message-text-shadow-color"]];
-    [_messageLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"message-text-shadow-offset"]];
-    [_messageLabel setAlignment:[_themeView currentValueForThemeAttribute:@"message-text-alignment"]];
-    [_messageLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-    messageLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
-    messageLabelTextSize = [[_messageLabel stringValue] sizeWithFont:[_messageLabel font] inWidth:messageLabelWidth];
-
-    [_messageLabel setFrame:CGRectMake(inset.left, inset.top, messageLabelTextSize.width, messageLabelTextSize.height + sizeWithFontCorrection)];
-}
-
-/*!
-    @ignore
-*/
-- (void)_layoutInformativeView
-{
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
-        sizeWithFontCorrection = 6.0,
-        informativeLabelWidth,
-        informativeLabelOriginY,
-        informativeLabelTextSize;
-
-    [_informativeLabel setTextColor:[_themeView currentValueForThemeAttribute:@"informative-text-color"]];
-    [_informativeLabel setFont:[_themeView currentValueForThemeAttribute:@"informative-text-font"]];
-    [_informativeLabel setTextShadowColor:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-color"]];
-    [_informativeLabel setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"informative-text-shadow-offset"]];
-    [_informativeLabel setAlignment:[_themeView currentValueForThemeAttribute:@"informative-text-alignment"]];
-    [_informativeLabel setLineBreakMode:CPLineBreakByWordWrapping];
-
-    informativeLabelWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right;
-    informativeLabelOriginY = [_messageLabel frameOrigin].y + [_messageLabel frameSize].height + defaultElementsMargin;
-    informativeLabelTextSize = [[_informativeLabel stringValue] sizeWithFont:[_informativeLabel font] inWidth:informativeLabelWidth];
-
-    [_informativeLabel setFrame:CGRectMake(inset.left, informativeLabelOriginY, informativeLabelTextSize.width, informativeLabelTextSize.height + sizeWithFontCorrection)];
-}
-
-/*!
-    @ignore
-*/
-- (void)_layoutAccessoryView
-{
-    if (!_accessoryView)
-        return;
-
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
-        accessoryViewWidth = CGRectGetWidth([[_window contentView] frame]) - inset.left - inset.right,
-        accessoryViewOriginY = CGRectGetMaxY([_informativeLabel frame]) + defaultElementsMargin;
-
-    [_accessoryView setFrameOrigin:CGPointMake(inset.left, accessoryViewOriginY)];
-    [[_window contentView] addSubview:_accessoryView];
-}
-
-/*!
-    @ignore
-*/
-- (void)_layoutSuppressionButton
-{
-    if (!_showSuppressionButton)
-        return;
-
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        suppressionViewXOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-x-offset"],
-        suppressionViewYOffset = [_themeView currentValueForThemeAttribute:@"suppression-button-y-offset"],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
-        suppressionButtonViewOriginY = CGRectGetMaxY([(_accessoryView || _informativeLabel) frame]) + defaultElementsMargin + suppressionViewYOffset;
-
-    [_suppressionButton setTextColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-color"]];
-    [_suppressionButton setFont:[_themeView currentValueForThemeAttribute:@"suppression-button-text-font"]];
-    [_suppressionButton setTextShadowColor:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-color"]];
-    [_suppressionButton setTextShadowOffset:[_themeView currentValueForThemeAttribute:@"suppression-button-text-shadow-offset"]];
-    [_suppressionButton sizeToFit];
-
-    [_suppressionButton setFrameOrigin:CGPointMake(inset.left + suppressionViewXOffset, suppressionButtonViewOriginY)];
-    [[_window contentView] addSubview:_suppressionButton];
-}
-
-/*!
-    @ignore
-*/
-- (CGSize)_layoutButtonsFromView:(CPView)lastView
-{
-    var inset = [_themeView currentValueForThemeAttribute:@"content-inset"],
-        minimumSize = [_themeView currentValueForThemeAttribute:@"size"],
-        buttonOffset = [_themeView currentValueForThemeAttribute:@"button-offset"],
-        helpLeftOffset = [_themeView currentValueForThemeAttribute:@"help-image-left-offset"],
-        aRepresentativeButton = [_buttons objectAtIndex:0],
-        defaultElementsMargin = [_themeView currentValueForThemeAttribute:@"default-elements-margin"],
-        panelSize = [[_window contentView] frame].size,
-        buttonsOriginY,
-        buttonMarginY,
-        buttonMarginX,
-        theme = [self theme],
-        offsetX;
-
-    [aRepresentativeButton setTheme:[self theme]];
-    [aRepresentativeButton sizeToFit];
-
-    panelSize.height = CGRectGetMaxY([lastView frame]) + defaultElementsMargin + [aRepresentativeButton frameSize].height;
-    if (panelSize.height < minimumSize.height)
-        panelSize.height = minimumSize.height;
-
-    buttonsOriginY = panelSize.height - [aRepresentativeButton frameSize].height + buttonOffset;
-    offsetX = panelSize.width - inset.right;
-
-    switch ([_window styleMask])
-    {
-        case _CPModalWindowMask:
-            buttonMarginY = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-y"];
-            buttonMarginX = [_themeView currentValueForThemeAttribute:@"modal-window-button-margin-x"];
-            break;
-
-        default:
-            buttonMarginY = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-y"];
-            buttonMarginX = [_themeView currentValueForThemeAttribute:@"standard-window-button-margin-x"];
-            break;
-    }
-
-    for (var i = [_buttons count] - 1; i >= 0 ; i--)
-    {
-        var button = _buttons[i];
-        [button setTheme:[self theme]];
-        [button sizeToFit];
-
-        var buttonFrame = [button frame],
-            width = MAX(80.0, CGRectGetWidth(buttonFrame)),
-            height = CGRectGetHeight(buttonFrame);
-
-        offsetX -= width;
-        [button setFrame:CGRectMake(offsetX + buttonMarginX, buttonsOriginY + buttonMarginY, width, height)];
-        offsetX -= 10;
-    }
-
-    if (_showHelp)
-    {
-        var helpImage = [_themeView currentValueForThemeAttribute:@"help-image"],
-            helpImagePressed = [_themeView currentValueForThemeAttribute:@"help-image-pressed"],
-            helpImageSize = helpImage ? [helpImage size] : CGSizeMakeZero(),
-            helpFrame = CGRectMake(helpLeftOffset, buttonsOriginY, helpImageSize.width, helpImageSize.height);
-
-        [_alertHelpButton setImage:helpImage];
-        [_alertHelpButton setAlternateImage:helpImagePressed];
-        [_alertHelpButton setBordered:NO];
-        [_alertHelpButton setFrame:helpFrame];
-    }
-
-    panelSize.height += [aRepresentativeButton frameSize].height + inset.bottom + buttonOffset;
-    return panelSize;
-}
-
-/*!
-    @ignore
-*/
-- (void)layout
-{
-    if (!_needsLayout)
-        return;
-
-    if (!_window)
-        [self _createWindowWithStyle:nil];
-
-    var iconOffset = [_themeView currentValueForThemeAttribute:@"image-offset"],
-        theImage = _icon,
-        finalSize;
-
-    if (!theImage)
-        switch (_alertStyle)
-        {
-            case CPWarningAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"warning-image"];
-                break;
-            case CPInformationalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"information-image"];
-                break;
-            case CPCriticalAlertStyle:
-                theImage = [_themeView currentValueForThemeAttribute:@"error-image"];
-                break;
-        }
-
-    [_alertImageView setImage:theImage];
-
-    var imageSize = theImage ? [theImage size] : CGSizeMakeZero();
-    [_alertImageView setFrame:CGRectMake(iconOffset.x, iconOffset.y, imageSize.width, imageSize.height)];
-
-    [self _layoutMessageView];
-    [self _layoutInformativeView];
-    [self _layoutAccessoryView];
-    [self _layoutSuppressionButton];
-
-    var lastView = _informativeLabel;
-    if (_showSuppressionButton)
-        lastView = _suppressionButton;
-    else if (_accessoryView)
-        lastView = _accessoryView;
-
-    finalSize = [self _layoutButtonsFromView:lastView];
-    if ([_window styleMask] & CPDocModalWindowMask)
-        finalSize.height -= 26; // adjust the absence of title bar
-
-    [_window setFrameSize:finalSize];
-    [_window center];
-
-    if ([_window styleMask] & _CPModalWindowMask || [_window styleMask] & CPHUDBackgroundWindowMask)
-    {
-        [_window setMovable:YES];
-        [_window setMovableByWindowBackground:YES];
-    }
-
-    _needsLayout = NO;
-}
-
-// MARK: Displaying Alerts
-
-/*!
-    Displays the \c CPAlert panel as a modal dialog. The user will not be
-    able to interact with any other controls until s/he has dismissed the alert
-    by clicking on one of the buttons.
-*/
-- (void)runModal
-{
-    if (!([_window styleMask] & _defaultWindowStyle))
-    {
-        _needsLayout = YES;
-        [self _createWindowWithStyle:_defaultWindowStyle];
-    }
-
-    [self layout];
-    [CPApp runModalForWindow:_window];
-}
-
-/*!
-    The same as \c runModal, but executes the code in \c block when the
-    alert is dismissed.
-*/
-- (void)runModalWithDidEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
-{
-    _didEndBlock = block;
-
-    [self runModal];
-}
-
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-
-    @param window The parent window for the sheet.
-    @param modalDelegate The delegate for the modal-dialog session.
-    @param alertDidEndSelector Message the alert sends to modalDelegate after the sheet is dismissed.
-    @param contextInfo Contextual data passed to modalDelegate in didEndSelector message.
-*/
-- (void)beginSheetModalForWindow:(CPWindow)aWindow modalDelegate:(id)modalDelegate didEndSelector:(SEL)alertDidEndSelector contextInfo:(id)contextInfo
-{
-    if (!([_window styleMask] & CPDocModalWindowMask))
-    {
-        _needsLayout = YES;
-        [self _createWindowWithStyle:CPDocModalWindowMask];
-    }
-
-    [self layout];
-
-    _modalDelegate = modalDelegate;
-    _didEndSelector = alertDidEndSelector;
-
-    [CPApp beginSheet:_window modalForWindow:aWindow modalDelegate:self didEndSelector:@selector(_alertDidEnd:returnCode:contextInfo:) contextInfo:contextInfo];
-}
-
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-
-    @param window The parent window for the sheet.
-*/
-- (void)beginSheetModalForWindow:(CPWindow)aWindow
-{
-    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
-}
-
-/*!
-    Runs the receiver modally as an alert sheet attached to a specified window.
-    Executes the code in \c block when the alert is dismissed.
-
-    @param window The parent window for the sheet.
-    @param block  Code block to execute on dismissal
-*/
-- (void)beginSheetModalForWindow:(CPWindow)aWindow didEndBlock:(Function /*(CPAlert alert, int returnCode)*/)block
-{
-    _didEndBlock = block;
-
-    [self beginSheetModalForWindow:aWindow modalDelegate:nil didEndSelector:nil contextInfo:nil];
-}
-
-// MARK: Private
-
-/*!
-    @ignore
-*/
-- (void)_createWindowWithStyle:(int)forceStyle
-{
-    var frame = CGRectMakeZero();
-    frame.size = [_themeView currentValueForThemeAttribute:@"size"];
-
-    _window = [[CPPanel alloc] initWithContentRect:frame styleMask:forceStyle || _defaultWindowStyle];
-    [_window setLevel:CPStatusWindowLevel];
-    [_window setPlatformWindow:[[CPApp keyWindow] platformWindow]];
-
-    if (_title)
-        [_window setTitle:_title];
-
-    var contentView = [_window contentView],
-        count = [_buttons count];
-
-    if (count)
-        while (count--)
-            [contentView addSubview:_buttons[count]];
-    else
-        [self addButtonWithTitle:@"OK"];
-
-    [contentView addSubview:_messageLabel];
-    [contentView addSubview:_alertImageView];
-    [contentView addSubview:_informativeLabel];
-
-    if (_showHelp)
-        [contentView addSubview:_alertHelpButton];
-}
-
-/*!
-    @ignore
-*/
-- (@action)_showHelp:(id)aSender
-{
-    [self _sendDelegateAlertShowHelp];
-}
-
-/*
-    @ignore
-*/
-- (@action)_takeReturnCodeFrom:(id)aSender
-{
-    if ([_window isSheet])
-    {
-        [_window orderOut:nil];
-        [CPApp endSheet:_window returnCode:[aSender tag]];
-    }
-    else
-    {
-        [CPApp abortModal];
-        [_window close];
-
-        [self _alertDidEnd:_window returnCode:[aSender tag] contextInfo:nil];
-    }
-}
-
-/*!
-    @ignore
-*/
-- (void)_alertDidEnd:(CPWindow)aWindow returnCode:(int)returnCode contextInfo:(id)contextInfo
-{
-    if (_didEndBlock)
-    {
-        if (typeof(_didEndBlock) === "function")
-            _didEndBlock(self, returnCode);
-        else
-            CPLog.warn("%s: didEnd block is not a function", [self description]);
-
-        // didEnd blocks are transient
-        _didEndBlock = nil;
-    }
-    else if (_modalDelegate)
-    {
-        if (_didEndSelector)
-            _modalDelegate.isa.objj_msgSend3(_modalDelegate, _didEndSelector, self, returnCode, contextInfo);
-    }
-    else if (_delegate)
-    {
-        if (_didEndSelector)
-            _delegate.isa.objj_msgSend2(_delegate, _didEndSelector, self, returnCode);
-        else
-            [self _sendDelegateAlertDidEndReturnCode:returnCode];
-    }
-}
-
-@end
-
-
-@implementation CPAlert (CPAlertDelegate)
-
-/*!
-    @ignore
-    Call the delegate alertDidEnd:returnCode
-*/
-- (void)_sendDelegateAlertDidEndReturnCode:(int)returnCode
-{
-    if (!(_implementedDelegateMethods & CPAlertDelegate_alertDidEnd_returnCode_))
-        return;
-
-    [_delegate alertDidEnd:self returnCode:returnCode];
-}
-
-/*!
-    @ignore
-    Call the delegate alertShowHelp:
-*/
-- (BOOL)_sendDelegateAlertShowHelp
-{
-    if (!(_implementedDelegateMethods & CPAlertDelegate_alertShowHelp_))
-        return YES;
-
-    return [_delegate alertShowHelp:self];
-}
-
-@end

AppKit/CPAnimation.j

@@ -1,514 +0,0 @@
-/*
- * CPAnimation.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPTimer.j>
-
-@import "CAMediaTimingFunction.j"
-
-
-@protocol CPAnimationDelegate <CPObject>
-
-@optional
-- (BOOL)animationShouldStart:(CPAnimation)animation;
-- (float)animation:(CPAnimation)animation valueForProgress:(float)progress;
-- (void)animationDidEnd:(CPAnimation)animation;
-- (void)animationDidStop:(CPAnimation)animation;
-
-@end
-
-
-var CPAnimationDelegate_animationShouldStart_       = 1 << 1,
-    CPAnimationDelegate_animation_valueForProgress_ = 1 << 2,
-    CPAnimationDelegate_animationDidEnd_            = 1 << 3,
-    CPAnimationDelegate_animationDidStop_           = 1 << 4;
-
-@typedef CPAnimationCurve
-CPAnimationEaseInOut    = 0;
-CPAnimationEaseIn       = 1;
-CPAnimationEaseOut      = 2;
-CPAnimationLinear       = 3;
-
-ACTUAL_FRAME_RATE = 0;
-
-/*!
-    @ingroup appkit
-    @class CPAnimation
-
-    Manages an animation. Contains timing and progress information.
-
-    @par Delegate Methods
-
-    @delegate -(BOOL)animationShouldStart:(CPAnimation)animation;
-    Called at the beginning of \c -startAnimation.
-    @param animation the animation that will start
-    @return \c YES allows the animation to start.
-    \c NO stops the animation.
-
-    @delegate -(void)animationDidEnd:(CPAnimation)animation;
-    Called when an animation has completed.
-    @param animation the animation that completed
-
-    @delegate -(void)animationDidStop:(CPAnimation)animation;
-    Called when the animation was stopped (before completing).
-    @param animation the animation that was stopped
-
-    @delegate - (float)animation:(CPAnimation)animation valueForProgress:(float)progress;
-    The value from this method will be returned when CPAnimation's
-    \c currentValue method is called.
-    @param animation the animation to obtain the curve value for
-    @param progress the current animation progress
-    @return the curve value
-*/
-@implementation CPAnimation : CPObject
-{
-    CPTimeInterval              _lastTime;
-    CPTimeInterval              _duration;
-
-    CPAnimationCurve            _animationCurve;
-    CAMediaTimingFunction       _timingFunction;
-
-    float                       _frameRate;
-    float                       _progress;
-
-    id <CPAnimationDelegate>    _delegate;
-    CPTimer                     _timer;
-    unsigned                    _implementedDelegateMethods;
-}
-
-/*!
-    Initializes the animation with a duration and animation curve.
-    @param aDuration the length of the animation
-    @param anAnimationCurve defines the animation's pace
-    @throws CPInvalidArgumentException if an invalid animation curve is specified
-*/
-- (id)initWithDuration:(float)aDuration animationCurve:(CPAnimationCurve)anAnimationCurve
-{
-    self = [super init];
-
-    if (self)
-    {
-        _progress = 0.0;
-        _duration = MAX(0.0, aDuration);
-        _frameRate = 60.0;
-
-        [self setAnimationCurve:anAnimationCurve];
-    }
-
-    return self;
-}
-
-/*!
-    Sets the animation's pace.
-    @param anAnimationCurve the animation's pace
-    @throws CPInvalidArgumentException if an invalid animation curve is specified
-*/
-- (void)setAnimationCurve:(CPAnimationCurve)anAnimationCurve
-{
-    var timingFunctionName;
-
-    switch (anAnimationCurve)
-    {
-        case CPAnimationEaseInOut:
-            timingFunctionName = kCAMediaTimingFunctionEaseInEaseOut;
-            break;
-
-        case CPAnimationEaseIn:
-            timingFunctionName = kCAMediaTimingFunctionEaseIn;
-            break;
-
-        case CPAnimationEaseOut:
-            timingFunctionName = kCAMediaTimingFunctionEaseOut;
-            break;
-
-        case CPAnimationLinear:
-            timingFunctionName = kCAMediaTimingFunctionLinear;
-            break;
-
-        default:
-            [CPException raise:CPInvalidArgumentException
-                        reason:@"Invalid value provided for animation curve"];
-            break;
-    }
-
-    _animationCurve = anAnimationCurve;
-    _timingFunction = [CAMediaTimingFunction functionWithName:timingFunctionName];
-}
-
-/*!
-    Returns the animation's pace
-*/
-- (CPAnimationCurve)animationCurve
-{
-    return _animationCurve;
-}
-
-/*!
-    Sets the animation's length.
-    @param aDuration the new animation length
-    @throws CPInvalidArgumentException if \c aDuration is negative
-*/
-- (void)setDuration:(CPTimeInterval)aDuration
-{
-    if (aDuration < 0)
-        [CPException raise:CPInvalidArgumentException reason:"aDuration can't be negative"];
-
-    _duration = aDuration;
-}
-
-/*!
-    Returns the length of the animation.
-*/
-- (CPTimeInterval)duration
-{
-    return _duration;
-}
-
-/*!
-    Sets the animation frame rate. This is not a guaranteed frame rate. 0 means to go as fast as possible.
-    @param frameRate the new desired frame rate
-    @throws CPInvalidArgumentException if \c frameRate is negative
-*/
-- (void)setFrameRate:(float)frameRate
-{
-    if (frameRate < 0)
-        [CPException raise:CPInvalidArgumentException reason:"frameRate can't be negative"];
-
-    _frameRate = frameRate;
-}
-
-/*!
-    Returns the desired frame rate.
-*/
-- (float)frameRate
-{
-    return _frameRate;
-}
-
-/*!
-    Returns the animation's delegate
-*/
-- (id)delegate
-{
-    return _delegate;
-}
-
-/*!
-    Sets the animation's delegate.
-    @param aDelegate the new delegate
-*/
-- (void)setDelegate:(id <CPAnimationDelegate>)aDelegate
-{
-    if (_delegate === aDelegate)
-        return;
-
-    _delegate = aDelegate;
-    _implementedDelegateMethods = 0;
-
-    if ([_delegate respondsToSelector:@selector(animationShouldStart:)])
-        _implementedDelegateMethods |= CPAnimationDelegate_animationShouldStart_;
-
-    if ([_delegate respondsToSelector:@selector(animationDidEnd:)])
-        _implementedDelegateMethods |= CPAnimationDelegate_animationDidEnd_;
-
-    if ([_delegate respondsToSelector:@selector(animationDidStop:)])
-        _implementedDelegateMethods |= CPAnimationDelegate_animationDidStop_;
-
-    if ([_delegate respondsToSelector:@selector(animation:valueForProgress:)])
-        _implementedDelegateMethods |= CPAnimationDelegate_animation_valueForProgress_;
-}
-
-/*!
-    Starts the animation. The method calls \c -animationShouldStart:
-    on the delegate (if it implements it) to see if the animation
-    should begin.
-*/
-- (void)startAnimation
-{
-    // If we're already animating, or our delegate stops us, animate.
-    if (_timer || ![self _sendDelegateAnimationShouldStart])
-        return;
-
-    if (_progress === 1.0)
-        _progress = 0.0;
-
-    ACTUAL_FRAME_RATE = 0;
-    _lastTime = new Date();
-
-    var timerInterval = _frameRate <= 0.0 ? 0.0001 : 1.0 / _frameRate;
-
-    _timer = [CPTimer scheduledTimerWithTimeInterval:timerInterval target:self selector:@selector(animationTimerDidFire:) userInfo:nil repeats:YES];
-}
-
-/*
-    @ignore
-*/
-- (void)animationTimerDidFire:(CPTimer)aTimer
-{
-    var currentTime = new Date(),
-        progress = MIN(1.0, [self currentProgress] + (currentTime - _lastTime) / (_duration * 1000.0));
-
-    _lastTime = currentTime;
-
-    ++ACTUAL_FRAME_RATE;
-
-    [self setCurrentProgress:progress];
-
-    if (progress === 1.0)
-    {
-        [_timer invalidate];
-        _timer = nil;
-
-        [self _sendDelegateAnimationDidEnd];
-    }
-}
-
-/*!
-    Stops the animation before it has completed.
-*/
-- (void)stopAnimation
-{
-    if (!_timer)
-        return;
-
-    [_timer invalidate];
-    _timer = nil;
-
-    [self _sendDelegateAnimationDidStop];
-}
-
-/*!
-    Returns \c YES if the animation
-    is running.
-*/
-- (BOOL)isAnimating
-{
-    return _timer;
-}
-
-/*!
-    Sets the animation's progress.
-    @param aProgress the animation's progress
-*/
-- (void)setCurrentProgress:(float)aProgress
-{
-    _progress = aProgress;
-}
-
-/*!
-    Returns the animation's progress
-*/
-- (float)currentProgress
-{
-    return _progress;
-}
-
-/*!
-    Returns the animation's timing progress.
-*/
-- (float)currentValue
-{
-    var t = [self currentProgress];
-
-    if ([self _delegateRespondsToAnimationValueForProgress])
-        return [self _sendDelegateAnimationValueForProgress:t];
-
-    if (_animationCurve == CPAnimationLinear)
-        return t;
-
-    var c1 = [],
-        c2 = [];
-
-    [_timingFunction getControlPointAtIndex:1 values:c1];
-    [_timingFunction getControlPointAtIndex:2 values:c2];
-
-    return CubicBezierAtTime(t, c1[0], c1[1], c2[0], c2[1], _duration);
-}
-
-@end
-
-
-@implementation CPAnimation (CPAnimationDelegate)
-
-/*!
-    @ignore
-    Check if the delegate responds to animation:valueForProgress:
-*/
-- (BOOL)_delegateRespondsToAnimationValueForProgress
-{
-    return _implementedDelegateMethods & CPAnimationDelegate_animation_valueForProgress_;
-}
-
-/*!
-    @ignore
-    Call delegate animationShouldStart:
-*/
-- (BOOL)_sendDelegateAnimationShouldStart
-{
-    if (!(_implementedDelegateMethods & CPAnimationDelegate_animationShouldStart_))
-        return YES;
-
-    return [_delegate animationShouldStart:self];
-}
-
-/*!
-    @ignore
-    Call delegate animation:valueForProgress:
-*/
-- (float)_sendDelegateAnimationValueForProgress:(float)aProgress
-{
-    if (!(_implementedDelegateMethods & CPAnimationDelegate_animation_valueForProgress_))
-        return aProgress;
-
-    return [_delegate animation:self valueForProgress:aProgress];
-}
-
-/*!
-    @ignore
-    Call delegate animationDidEnd:
-*/
-- (void)_sendDelegateAnimationDidEnd
-{
-    if (!(_implementedDelegateMethods & CPAnimationDelegate_animationDidEnd_))
-        return;
-
-    [_delegate animationDidEnd:self];
-}
-
-/*!
-    @ignore
-    Call delegate animationDidStop:
-*/
-- (void)_sendDelegateAnimationDidStop
-{
-    if (!(_implementedDelegateMethods & CPAnimationDelegate_animationDidStop_))
-        return;
-
-    [_delegate animationDidStop:self];
-}
-
-@end
-
-// currently used function to determine time
-// 1:1 conversion to js from webkit source files
-// UnitBezier.h, WebCore_animation_AnimationBase.cpp
-var CubicBezierAtTime = function(t, p1x, p1y, p2x, p2y, duration)
-{
-    var ax = 0,
-        bx = 0,
-        cx = 0,
-        ay = 0,
-        by = 0,
-        cy = 0;
-    // `ax t^3 + bx t^2 + cx t' expanded using Horner's rule.
-    function sampleCurveX(t)
-    {
-        return ((ax * t + bx) * t + cx) * t;
-    }
-
-    function sampleCurveY(t)
-    {
-        return ((ay * t + by) * t + cy) * t;
-    }
-
-    function sampleCurveDerivativeX(t)
-    {
-        return (3.0 * ax * t + 2.0 * bx) * t + cx;
-    }
-
-    // The epsilon value to pass given that the animation is going to run over |duration| seconds. The longer the animation, the more precision is needed in the timing function result to avoid ugly discontinuities.
-    function solveEpsilon(duration)
-    {
-        return 1.0 / (200.0 * duration);
-    }
-
-    function solve(x, epsilon)
-    {
-        return sampleCurveY(solveCurveX(x, epsilon));
-    }
-
-    // Given an x value, find a parametric value it came from.
-    function solveCurveX(x, epsilon)
-    {
-        var t0,
-            t1,
-            t2 = x,
-            x2,
-            d2,
-            i = 0;
-
-        // First try a few iterations of Newton's method -- normally very fast.
-        for (; i < 8; i++)
-        {
-            x2 = sampleCurveX(t2) - x;
-
-            if (ABS(x2) < epsilon)
-                return t2;
-
-            d2 = sampleCurveDerivativeX(t2);
-
-            if (ABS(d2) < 1e-6)
-                break;
-
-            t2 = t2 - x2 / d2;
-        }
-
-        // Fall back to the bisection method for reliability.
-        t0 = 0.0;
-        t1 = 1.0;
-        t2 = x;
-
-        if (t2 < t0)
-            return t0;
-
-        if (t2 > t1)
-            return t1;
-
-        while (t0 < t1)
-        {
-            x2 = sampleCurveX(t2);
-
-            if (ABS(x2 - x) < epsilon)
-                return t2;
-
-            if (x > x2)
-                t0 = t2;
-
-            else
-                t1 = t2;
-
-            t2 = (t1 - t0) * 0.5 + t0;
-        }
-
-        return t2; // Failure.
-    };
-    // Calculate the polynomial coefficients, implicit first and last control points are (0,0) and (1,1).
-    cx = 3.0 * p1x;
-    bx = 3.0 * (p2x - p1x) - cx;
-    ax = 1.0 - cx - bx;
-    cy = 3.0 * p1y;
-    by = 3.0 * (p2y - p1y) - cy;
-    ay = 1.0 - cy - by;
-
-    // Convert from input time to parametric value in curve, then from that to output time.
-    return solve(t, solveEpsilon(duration));
-};

AppKit/CPAppearance.j

@@ -1,162 +0,0 @@
-/*
- * CPAppearance.j
- * AppKit
- *
- * Created by Antoine Mercadal.
- * Copyright 2015, Cappuccino Project.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/Foundation.j>
-@import "CPTheme.j"
-
-CPAppearanceNameAqua         = @"CPAppearanceNameAqua";
-CPAppearanceNameLightContent = @"CPAppearanceNameLightContent";
-CPAppearanceNameVibrantDark  = @"CPAppearanceNameVibrantDark";
-CPAppearanceNameVibrantLight = @"CPAppearanceNameVibrantLight";
-
-var _CPAppearanceCurrent = nil,
-    _CPAppearancesRegistry = @{};
-
-
-@protocol CPAppearanceCustomization <CPObject>
-
-@required
-- (CPAppearance)appearance;
-- (void)setAppearance:(CPAppearance)appearance;
-- (CPAppearance)effectiveAppearance;
-- (void)setEffectiveAppearance:(CPAppearance)appearance;
-
-@end
-
-CPThemeStateAppearanceAqua             = CPThemeState("appearance-aqua");
-CPThemeStateAppearanceLightContent     = CPThemeState("appearance-light-content");
-CPThemeStateAppearanceVibrantLight     = CPThemeState("appearance-vibrant-light");
-CPThemeStateAppearanceVibrantDark      = CPThemeState("appearance-vibrant-dark");
-
-
-/*!
-    @ingroup appkit
-
-    A CPAppareance represents the appearance of an to a subset of UI elements.
-    This is a very lightweight implementation of the NSAppearance system, but
-    We are using it for compliance, and especially for the CPVisualEffectView
-*/
-@implementation CPAppearance : CPObject
-{
-    BOOL            _allowsVibrancy     @accessors(property=allowsVibrancy);
-
-    CPString        _name;
-}
-
-
-// MARK: -
-// MARK: Class Methods
-
-/*! Returns the current default CPAppearance
-*/
-+ (CPAppearance)currentAppearance
-{
-    if (!_CPAppearanceCurrent)
-        _CPAppearanceCurrent = [CPAppearance appearanceNamed:CPAppearanceNameAqua];
-
-    return _CPAppearanceCurrent;
-}
-
-/*! Sets the current default CPAppearance
-    @param appearance the new current appearance
-*/
-+ (void)setCurrentAppearance:(CPAppearance)anAppearance
-{
-    _CPAppearanceCurrent = anAppearance;
-}
-
-/*! Returns the CPAppearance object with the given name
-    @param name the name of the appearance
-*/
-+ (CPAppearance)appearanceNamed:(CPString)aName
-{
-    if (![_CPAppearancesRegistry containsKey:aName])
-    {
-        [_CPAppearancesRegistry setObject:[[CPAppearance alloc] initWithAppearanceNamed:aName bundle:nil]
-                                   forKey:aName];
-    }
-
-    return [_CPAppearancesRegistry objectForKey:aName];
-}
-
-
-// MARK: -
-// MARK: Initialization
-
-/*! Creates a CPAppearance object initialized to the specified appearance file in the specified bundle
-    This method does actually nothing special. It just creates a default appearance object
-*/
-- (id)initWithAppearanceNamed:(CPString)aName bundle:(CPBundle)bundle
-{
-    if (self = [super init])
-    {
-        _name = aName;
-        _allowsVibrancy = YES;
-
-        if ([_CPAppearancesRegistry containsKey:aName])
-            [CPException raise:CPInternalInconsistencyException reason:"Appearance with name '" + aName + "' is already declared."];
-
-        [_CPAppearancesRegistry setObject:self forKey:aName];
-    }
-
-    return self;
-}
-
-
-// MARK: -
-// MARK: Implementation
-
-- (BOOL)isEqual:(id)anObject
-{
-    if (![anObject isKindOfClass:CPAppearance])
-        return NO;
-
-    return self._name == anObject._name;
-}
-
-- (CPString)description
-{
-    return @"<CPAppearance @" + [self UID] + @" name: " + _name + ">";
-}
-
-
-// MARK: -
-// MARK: CPCoding
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super init])
-    {
-        _name           = [aCoder decodeObjectForKey:@"_name"];
-        _allowsVibrancy = [aCoder decodeBoolForKey:@"_allowsVibrancy"];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_name forKey:@"_name"];
-    [aCoder encodeBool:_allowsVibrancy forKey:@"_allowsVibrancy"];
-}
-
-@end

AppKit/CPApplication_Constants.j

@@ -1,41 +0,0 @@
-/*
- * CPApplication_Constants.j
- * AppKit
- *
- * Created by Aparajita Fishman.
- * Copyright 2013 The Cappuccino Project
- *
- * 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
- */
-
-CPApp = nil;
-
-CPApplicationWillFinishLaunchingNotification        = @"CPApplicationWillFinishLaunchingNotification";
-CPApplicationDidFinishLaunchingNotification         = @"CPApplicationDidFinishLaunchingNotification";
-CPApplicationWillTerminateNotification              = @"CPApplicationWillTerminateNotification";
-CPApplicationWillBecomeActiveNotification           = @"CPApplicationWillBecomeActiveNotification";
-CPApplicationDidBecomeActiveNotification            = @"CPApplicationDidBecomeActiveNotification";
-CPApplicationWillResignActiveNotification           = @"CPApplicationWillResignActiveNotification";
-CPApplicationDidResignActiveNotification            = @"CPApplicationDidResignActiveNotification";
-CPApplicationDidChangeScreenParametersNotification  = @"CPApplicationDidChangeScreenParametersNotification";
-
-@typedef CPApplicationTerminateReply
-CPTerminateNow      = YES;
-CPTerminateCancel   = NO;
-CPTerminateLater    = -1; // not currently supported
-
-CPRunStoppedResponse    = -1000;
-CPRunAbortedResponse    = -1001;
-CPRunContinuesResponse  = -1002;

AppKit/CPBezierPath.j

@@ -1,424 +0,0 @@
-/*
- * CPBezierPath.j
- *
- * Created by Ross Boucher.
- * Copyright 2009, 280 North, Inc.
- *
- * Adapted from Kevin Wojniak, portions Copyright 2009 Kevin Wojniak.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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
- * Copyright 2009 280 North, Inc.
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CPGraphicsContext.j"
-
-
-// Class defaults
-
-var DefaultLineWidth = 1.0;
-
-
-/*!
-    @ingroup appkit
-    @class CPBezierPath
-
-    A CPBezierPath allows you to create paths for drawing to the screen using a simpler API than CoreGraphics.
-    Paths can form any shape, including regular polygons like squares and triangles; circles, arcs; or complex
-    line segments.
-
-    A path can be stroked and filled using the relevant method. The currently active fill and stroke color will
-    be used, which can be set by calling setFill: and setStroke: on any CPColor object (or set: for both).
-*/
-
-@implementation CPBezierPath : CPObject
-{
-    CGPath  _path;
-    float   _lineWidth;
-    CPArray _lineDashes;
-    float   _lineDashesPhase;
-}
-
-/*!
-    Create a new CPBezierPath object.
-*/
-+ (CPBezierPath)bezierPath
-{
-    return [[self alloc] init];
-}
-
-/*!
-    Create a new CPBezierPath object initialized with an oval path drawn within a rectangular path.
-*/
-+ (CPBezierPath)bezierPathWithOvalInRect:(CGRect)aRect
-{
-    var path = [self bezierPath];
-
-    [path appendBezierPathWithOvalInRect:aRect];
-
-    return path;
-}
-
-/*!
-    Create a new CPBezierPath object initialized with a rectangular path.
-*/
-+ (CPBezierPath)bezierPathWithRect:(CGRect)aRect
-{
-    var path = [self bezierPath];
-
-    [path appendBezierPathWithRect:aRect];
-
-    return path;
-}
-
-+ (CPBezierPath)bezierPathWithRoundedRect:(CGRect)aRect xRadius:(float)xRadius yRadius:(float)yRadius
-{
-    var path = [self bezierPath];
-
-    [path appendBezierPathWithRoundedRect:aRect xRadius:xRadius yRadius:yRadius];
-
-    return path;
-}
-
-/*!
-    Get default line width.
-*/
-+ (float)defaultLineWidth
-{
-    return DefaultLineWidth;
-}
-
-/*!
-    Set default line width.
-*/
-+ (void)setDefaultLineWidth:(float)width
-{
-    DefaultLineWidth = width;
-}
-
-/*!
-    Fill rectangular path with current fill color.
-*/
-+ (void)fillRect:(CGRect)aRect
-{
-    [[self bezierPathWithRect:aRect] fill];
-}
-
-/*!
-    Using the current stroke color and default drawing attributes, strokes a counterclockwise path beginning at the rectangle's origin.
-*/
-+ (void)strokeRect:(CGRect)aRect
-{
-    [[self bezierPathWithRect:aRect] stroke];
-}
-
-/*!
-    Using the current stroke color and default drawing attributes, strokes a line between two points.
-*/
-+ (void)strokeLineFromPoint:(CGPoint)point1 toPoint:(CGPoint)point2
-{
-    var path = [self bezierPath];
-
-    [path moveToPoint:point1];
-    [path lineToPoint:point2];
-
-    [path stroke];
-}
-
-/*!
-    Create a new CPBezierPath object using the default line width.
-*/
-- (id)init
-{
-    if (self = [super init])
-    {
-        _path = CGPathCreateMutable();
-        _lineWidth = [[self class] defaultLineWidth];
-        _lineDashesPhase = 0;
-        _lineDashes = [];
-    }
-
-    return self;
-}
-
-/*!
-    Moves the current point to another location.
-*/
-- (void)moveToPoint:(CGPoint)point
-{
-    CGPathMoveToPoint(_path, nil, point.x, point.y);
-}
-
-/*!
-    Append a straight line to the path.
-*/
-- (void)lineToPoint:(CGPoint)point
-{
-    CGPathAddLineToPoint(_path, nil, point.x, point.y);
-}
-
-/*!
-    Add a cubic Bezier curve to the path.
-*/
-- (void)curveToPoint:(CGPoint)endPoint controlPoint1:(CGPoint)controlPoint1 controlPoint2:(CGPoint)controlPoint2
-{
-    CGPathAddCurveToPoint(_path, nil, controlPoint1.x, controlPoint1.y, controlPoint2.x, controlPoint2.y, endPoint.x, endPoint.y);
-}
-
-- (CGRect)bounds
-{
-    // TODO: this should return this. The controlPointBounds is not a tight fit.
-    // return CGPathGetBoundingBox(_path);
-
-    return [self controlPointBounds];
-}
-
-- (CGRect)controlPointBounds
-{
-    return CGPathGetBoundingBox(_path);
-}
-
-/*!
-    Create a line segment between the first and last points in the subpath, closing it.
-*/
-- (void)closePath
-{
-    CGPathCloseSubpath(_path);
-}
-
-/*!
-    Draw a line along the path with the current stroke color and default drawing attributes.
-*/
-- (void)stroke
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, _path);
-    CGContextSetLineWidth(ctx, [self lineWidth]);
-    CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
-    CGContextStrokePath(ctx);
-}
-
-/*!
-    Fill the path with the current fill color.
-*/
-- (void)fill
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, _path);
-    CGContextSetLineWidth(ctx, [self lineWidth]);
-    CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
-    CGContextClosePath(ctx);
-    CGContextFillPath(ctx);
-}
-
-/*!
-    Cocoa compatibility.
-*/
-- (void)getLineDash:(CPArrayRef)patternRef count:(CPInteger)count phase:(CGFloatRef)phaseRef
-{
-    return [self getLineDash:patternRef phase:phaseRef];
-}
-
-/*!
-    Retrieve the line dash pattern and phase and write them into the provided references.
-*/
-- (void)getLineDash:(CPArrayRef)patternRef phase:(CGFloatRef)phaseRef
-{
-    if (patternRef)
-        @deref(patternRef) = [_lineDashes copy];
-    if (phaseRef)
-        @deref(phaseRef) = _lineDashesPhase;
-}
-
-/*!
-    Cocoa compatibility.
-*/
-- (void)setLineDash:(CPArray)aPattern count:(CPInteger)count phase:(CGFloat)aPhase
-{
-    [self setLineDash:aPattern phase:aPhase];
-}
-
-/*!
-    Set stroke line dash pattern.
-
-    @param aPattern an array of stroke-skip lengths such as [2, 2, 4, 4]
-    @param aPhase amount of shift for the starting position of the first stroke
-*/
-- (void)setLineDash:(CPArray)aPattern phase:(CGFloat)aPhase
-{
-    _lineDashes = aPattern;
-    _lineDashesPhase = aPhase;
-}
-
-/*!
-    Get the line width.
-*/
-- (float)lineWidth
-{
-    return _lineWidth;
-}
-
-/*!
-    Set the line width.
-*/
-- (void)setLineWidth:(float)lineWidth
-{
-    _lineWidth = lineWidth;
-}
-
-/*!
-    Get the total number of elements.
-*/
-- (unsigned)elementCount
-{
-    return _path.count;
-}
-
-/*!
-    Check if receiver is empty, returns appropriate Boolean value.
-*/
-- (BOOL)isEmpty
-{
-    return CGPathIsEmpty(_path);
-}
-
-/*!
-    Get the current point.
-*/
-- (CGPoint)currentPoint
-{
-    return CGPathGetCurrentPoint(_path);
-}
-
-/*!
-    Append a series of line segments.
-*/
-- (void)appendBezierPathWithPoints:(CPArray)points count:(unsigned)count
-{
-    CGPathAddLines(_path, nil, points, count);
-}
-
-/*!
-    Append a rectangular path.
-*/
-- (void)appendBezierPathWithRect:(CGRect)rect
-{
-    CGPathAddRect(_path, nil, rect);
-}
-
-/*!
-    Append an oval path; oval is drawn within the rectangular path.
-*/
-- (void)appendBezierPathWithOvalInRect:(CGRect)rect
-{
-    CGPathAddPath(_path, nil, CGPathWithEllipseInRect(rect));
-}
-
-/*!
-    Append a rounded rectangular path.
-*/
-- (void)appendBezierPathWithRoundedRect:(CGRect)rect xRadius:(float)xRadius yRadius:(float)yRadius
-{
-    CGPathAddPath(_path, nil, CGPathWithRoundedRectangleInRect(rect, xRadius, yRadius, YES, YES, YES, YES));
-}
-
-- (void)appendBezierPathWithArcFromPoint:(CGPoint)fromPoint toPoint:(CGPoint)toPoint radius:(float)radius
-{
-    CGPathAddArcToPoint(_path, null, fromPoint.x, fromPoint.y, toPoint.x, toPoint.y, radius);
-}
-
-/*!
-    Append the contents of a CPBezierPath object.
-*/
-- (void)appendBezierPath:(CPBezierPath)other
-{
-    CGPathAddPath(_path, nil, other._path);
-}
-
-/*!
-    Remove all path elements; clears path.
-*/
-- (void)removeAllPoints
-{
-    _path = CGPathCreateMutable();
-}
-
-- (void)addClip
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextAddPath(ctx, _path);
-    CGContextClip(ctx);
-}
-
-- (void)setClip
-{
-    var ctx = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextBeginPath(ctx);
-    CGContextAddPath(ctx, _path);
-    CGContextClip(ctx);
-}
-
-@end
-
-
-@implementation CPBezierPath (AnimationAdditions)
-
-- (CPString)SVGString
-{
-    var pathString = "";
-    var elements = _path.elements;
-    var count = _path.count;
-
-    for (var i = 0; i < count; i++)
-    {
-        var element = elements[i];
-
-        // Use the kCGPathElement* constants defined in CGPath.j
-        switch (element.type)
-        {
-            case kCGPathElementMoveToPoint:
-                pathString += "M " + element.x + " " + element.y + " ";
-                break;
-
-            case kCGPathElementAddLineToPoint:
-                pathString += "L " + element.x + " " + element.y + " ";
-                break;
-
-            case kCGPathElementAddQuadCurveToPoint:
-                pathString += "Q " + element.cpx + " " + element.cpy + " " + element.x + " " + element.y + " ";
-                break;
-
-            case kCGPathElementAddCurveToPoint:
-                pathString += "C " + element.cp1x + " " + element.cp1y + " " + element.cp2x + " " + element.cp2y + " " + element.x + " " + element.y + " ";
-                break;
-
-            case kCGPathElementCloseSubpath:
-                pathString += "Z ";
-                break;
-        }
-    }
-
-    return pathString.trim();
-}
-
-@end
-

AppKit/CPBox.j

@@ -1,953 +0,0 @@
-/*
- * CPBox.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPTextField.j"
-@import "CPView.j"
-@import <Foundation/CPGeometry.j>
-
-// CPBoxType
-@typedef CPBoxType
-CPBoxPrimary    = 0;
-CPBoxSecondary  = 1; // Deprecated
-CPBoxSeparator  = 2;
-CPBoxOldStyle   = 3; // Deprecated
-CPBoxCustom     = 4;
-
-// CPBorderType
-@typedef CPBorderType
-CPNoBorder      = 0;
-CPLineBorder    = 1;
-CPBezelBorder   = 2;
-CPGrooveBorder  = 3;
-
-// CPTitlePosition
-@typedef CPTitlePosition
-CPNoTitle     = 0;
-CPAboveTop    = 1;
-CPAtTop       = 2;
-CPBelowTop    = 3;
-CPAboveBottom = 4;
-CPAtBottom    = 5;
-CPBelowBottom = 6;
-
-
-/*!
-    @ingroup appkit
-    @class CPBox
-
-    A CPBox is a simple view which can display a border.
-*/
-@implementation CPBox : CPView
-{
-    CPBoxType       _boxType;
-    CPBorderType    _borderType;    // deprecated
-    CPView          _contentView;
-    CPView          _boxView;       // needed for CSS theming, will be transparent for non CSS themes
-    BOOL            _transparent    @accessors(getter=isTransparent);
-
-    CPString        _title          @accessors(getter=title);
-    int             _titlePosition  @accessors(getter=titlePosition);
-    CPTextField     _titleView;
-
-    BOOL            _cachedAutoresizesSubviews;
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if ([aBinding hasPrefix:CPDisplayPatternTitleBinding])
-        return [CPTitleWithPatternBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"box";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"background-color": [CPNull null],
-            @"border-color": [CPNull null],
-            @"border-width": 1.0,
-            @"corner-radius": 3.0,
-            @"inner-shadow-offset": CGSizeMakeZero(),
-            @"inner-shadow-size": 6.0,
-            @"inner-shadow-color": [CPNull null],
-            @"content-margin": CGSizeMakeZero(),
-            @"title-font": [CPNull null],
-            @"title-left-offset": 5.0,
-            @"title-top-offset": 0.0,
-            @"title-color": [CPNull null],
-            @"nib2cib-adjustment-primary-frame": CGRectMake(4, -4, -8, -6),
-            @"content-adjustment": CGRectMakeZero(),
-            @"min-y-correction-no-title": 0,
-            @"min-y-correction-title": 0
-        };
-}
-
-+ (id)boxEnclosingView:(CPView)aView
-{
-    var box = [[self alloc] initWithFrame:CGRectMakeZero()],
-        enclosingView = [aView superview];
-
-    [box setAutoresizingMask:[aView autoresizingMask]];
-    [box setFrameFromContentFrame:[aView frame]];
-
-    [enclosingView replaceSubview:aView with:box];
-
-    [box setContentView:aView];
-
-    return box;
-}
-
-- (id)initWithFrame:(CGRect)frameRect
-{
-    self = [super initWithFrame:frameRect];
-
-    if (self)
-    {
-        _borderType = CPGrooveBorder; // Was CPBezelBorder but Cocoa default is CPGrooveBorder
-        _boxType    = CPBoxPrimary;
-
-        _titlePosition = CPNoTitle;
-        _titleView = [CPTextField labelWithTitle:@""];
-        [_titleView setFont:[self titleFont]];
-        [_titleView setTextColor:[self titleColor]];
-
-        _boxView = [[CPView alloc] initWithFrame:[self bounds]];
-        [_boxView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        _contentView = [[CPView alloc] initWithFrame:[self bounds]];
-        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-        [self setAutoresizesSubviews:YES];
-        [self addSubview:_boxView];
-        [_boxView setAutoresizesSubviews:YES];
-        [_boxView addSubview:_contentView];
-
-        [self sizeToFit];
-    }
-
-    return self;
-}
-
-// Configuring Boxes
-
-/*!
-    Returns the receiver's border rectangle.
-
-    @return the border rectangle of the box
-*/
-- (CGRect)borderRect
-{
-    return [self bounds];
-}
-
-/*!
-    Returns the receiver's border type. Possible values are:
-
-    <pre>
-    CPNoBorder
-    CPLineBorder
-    CPBezelBorder
-    CPGrooveBorder
-    </pre>
-
-    @return the border type of the box
-*/
-- (CPBorderType)borderType
-{
-    CPLog.warn("CPBox borderType is deprecated.");
-
-    return _borderType;
-}
-
-
-/*!
-    Sets the receiver's border type. Valid values are:
-
-    <pre>
-    CPNoBorder
-    CPLineBorder
-    CPBezelBorder
-    CPGrooveBorder
-    </pre>
-
-    @param borderType the border type to use
-*/
-- (void)setBorderType:(CPBorderType)aBorderType
-{
-    if (_borderType === aBorderType)
-        return;
-
-    _borderType = aBorderType;
-
-    [self refreshDisplay];
-}
-
-/*!
-    Returns the receiver's box type. Possible values are:
-
-    <pre>
-    CPBoxPrimary
-    CPBoxSecondary
-    CPBoxSeparator
-    CPBoxOldStyle
-    CPBoxCustom
-    </pre>
-
-    (In the current implementation, all values act the same except CPBoxSeparator.)
-
-    @return the box type of the box.
-*/
-- (CPBoxType)boxType
-{
-    return _boxType;
-}
-
-/*!
-    Sets the receiver's box type. Valid values are:
-
-    <pre>
-    CPBoxPrimary
-    CPBoxSecondary
-    CPBoxSeparator
-    CPBoxOldStyle
-    CPBoxCustom
-    </pre>
-
-    (In the current implementation, all values act the same except CPBoxSeparator.)
-
-    @param aBoxType the box type of the box.
-*/
-- (void)setBoxType:(CPBoxType)aBoxType
-{
-    if ((aBoxType == CPBoxSecondary) || (aBoxType == CPBoxOldStyle))
-        CPLog.warn("CPBox setBoxType: CPBoxSecondary and CPBoxOldStyle are deprecated.");
-
-    if (_boxType === aBoxType)
-        return;
-
-    _boxType = aBoxType;
-
-    [self refreshDisplay];
-}
-
-- (void)setTransparent:(BOOL)shouldBeTransparent
-{
-    if (_transparent == shouldBeTransparent)
-        return;
-
-    _transparent = shouldBeTransparent;
-
-    [self _manageTitlePositioning];
-}
-
-// MARK: -
-// MARK: Style properties which override theme values
-/*!
-    The borderColor, borderWidth, cornerRadius and fillColor properties for the receiver
-    are only supported for boxes with boxType === CPBoxCustom and borderType === CPLineBorder.
-    Boxes with the Primary boxType have fixed values which are defined by the system theme.
-    Apple does support lineTypes of Groove and Bezel for boxes of type CPBoxCustom, CPBoxSecondary and CPBoxOldStyle,
-    but they are deprecated as of macOS 10.15.
-
-    Cappuccino has supported these in the past but no longer does so - both to simplify CSS-based theming and
-    to avoid the effort needed for supporting something which will be very short-lived.
-
-    These styles can be recreated as custom theme elements by developers, as needed.
-    Additionally, boxes with boxType === CPBoxSeparator (horizontal and vertical lines) have never allowed changing these values.
-    No warnings are generated for separator boxes.
-*/
-
-// See discussion above.
-// MARK: borderColor
-- (CPColor)borderColor
-{
-    return [self valueForThemeAttribute:@"border-color"];
-}
-
-- (void)setBorderColor:(CPColor)color
-{
-    if (_boxType === CPBoxSeparator)
-    {
-        return;
-    }
-    
-    if ((_boxType !== CPBoxCustom) || (_borderType !== CPLineBorder))
-    {
-        CPLog.warn("CPBox setBorderColor: the box must be of type CPBoxCustom AND border of type CPLineBorder in order to use setBorderColor. Property is ignored.");
-        return;
-    }
-
-    if ([color isEqual:[self borderColor]])
-        return;
-
-    [self setValue:color forThemeAttribute:@"border-color"];
-}
-
-// See discussion above.
-// MARK: borderWidth
-- (float)borderWidth
-{
-    return [self valueForThemeAttribute:@"border-width"];
-}
-
-- (void)setBorderWidth:(float)width
-{
-    if (_boxType === CPBoxSeparator)
-    {
-        return;
-    }
-    
-    if ((_boxType !== CPBoxCustom) || (_borderType !== CPLineBorder))
-    {
-        CPLog.warn("CPBox setBorderWidth: the box must be of type CPBoxCustom AND border of type CPLineBorder in order to use setBorderWidth. Property is ignored.");
-        return;
-    }
-
-    if (width === [self borderWidth])
-        return;
-
-    [self setValue:width forThemeAttribute:@"border-width"];
-}
-
-// See discussion above.
-// MARK: cornerRadius
-- (float)cornerRadius
-{
-    return [self valueForThemeAttribute:@"corner-radius"];
-}
-
-- (void)setCornerRadius:(float)radius
-{
-    if (_boxType === CPBoxSeparator)
-    {
-        return;
-    }
-    
-    if ((_boxType !== CPBoxCustom) || (_borderType !== CPLineBorder))
-    {
-        CPLog.warn("CPBox setCornerRadius: the box must be of type CPBoxCustom AND border of type CPLineBorder in order to use setCornerRadius. Property is ignored.");
-        return;
-    }
-
-    if (radius === [self cornerRadius])
-        return;
-
-    [self setValue:radius forThemeAttribute:@"corner-radius"];
-}
-
-// See discussion above.
-// MARK: fillColor
-- (CPColor)fillColor
-{
-    return [self valueForThemeAttribute:@"background-color"];
-}
-
-- (void)setFillColor:(CPColor)color
-{
-    if (_boxType === CPBoxSeparator)
-    {
-        return;
-    }
-    
-    if ((_boxType !== CPBoxCustom) || (_borderType !== CPLineBorder))
-    {
-        CPLog.warn("CPBox setFillColor: the box must be of type CPBoxCustom AND border of type CPLineBorder in order to use setFillColor. Property is ignored.");
-        return;
-    }
-
-    if ([color isEqual:[self fillColor]])
-        return;
-
-    [self setValue:color forThemeAttribute:@"background-color"];
-}
-
-- (CPView)contentView
-{
-    return _contentView;
-}
-
-- (void)setContentView:(CPView)aView
-{
-    if (aView === _contentView)
-        return;
-
-    [aView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    //  A nil contentView is allowed (tested in Cocoa 2013-02-22).
-    if (!aView)
-        [_contentView removeFromSuperview];
-    else if (_contentView)
-        [_boxView replaceSubview:_contentView with:aView];
-    else
-        [_boxView addSubview:aView];
-
-    _contentView = aView;
-
-    [self sizeToFit];
-    [self refreshDisplay];
-}
-
-- (CGSize)contentViewMargins
-{
-    return [self valueForThemeAttribute:@"content-margin"];
-}
-
-- (void)setContentViewMargins:(CGSize)size
-{
-     if (size.width < 0 || size.height < 0)
-         [CPException raise:CPGenericException reason:@"Margins must be positive"];
-
-    [self setValue:CGSizeMakeCopy(size) forThemeAttribute:@"content-margin"];
-}
-
-- (void)setFrameFromContentFrame:(CGRect)aRect
-{
-    var offset = [self _titleHeightOffset],
-        borderWidth = [self borderWidth],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"],
-        contentAdjustment = [self valueForThemeAttribute:@"content-adjustment"],
-        minYCorrection = [self valueForThemeAttribute:(_titlePosition === CPNoTitle ? @"min-y-correction-no-title" : @"min-y-correction-title")];
-
-    [self setFrame:CGRectMake(aRect.origin.x - contentAdjustment.origin.x - contentMargin.width  + borderWidth,
-                              aRect.origin.y - contentAdjustment.origin.y - contentMargin.height + borderWidth - minYCorrection,
-                              aRect.size.width  + 2 * contentMargin.width  - contentAdjustment.size.width,
-                              aRect.size.height + 2 * contentMargin.height - contentAdjustment.size.height)];
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-    if (aTitle == _title)
-        return;
-
-    _title = aTitle;
-
-    [self _manageTitlePositioning];
-}
-
-- (void)setTitlePosition:(int)aTitlePotisition
-{
-    if (aTitlePotisition == _titlePosition)
-        return;
-
-    _titlePosition = aTitlePotisition;
-
-    [self _manageTitlePositioning];
-}
-
-- (CPFont)titleFont
-{
-    if ([self hasThemeAttribute:@"title-font"])
-        return [self valueForThemeAttribute:@"title-font"];
-    else
-        return [_titleView font];
-}
-
-- (void)setTitleFont:(CPFont)aFont
-{
-    if ([aFont isEqual:[self titleFont]])
-        return;
-
-    if ([self hasThemeAttribute:@"title-font"])
-        [self setValue:aFont forThemeAttribute:@"title-font"];
-
-    [_titleView setFont:aFont];
-}
-
-- (CPColor)titleColor
-{
-    if ([self hasThemeAttribute:@"title-color"])
-        return [self valueForThemeAttribute:@"title-color"];
-    else
-        return [_titleView textColor];
-}
-
-- (void)setTitleColor:(CPColor)aColor
-{
-    if ([aColor isEqual:[self titleColor]])
-        return;
-
-    if ([self hasThemeAttribute:@"title-color"])
-        [self setValue:aColor forThemeAttribute:@"title-color"];
-
-    [_titleView setTextColor:aColor];
-}
-
-/*!
-    Return the text field used to display the receiver's title.
-
-    This is the Cappuccino equivalent to the `titleCell` method.
-*/
-- (CPTextField)titleView
-{
-    return _titleView;
-}
-
-/*!
-    Return the rectangle in which the receiver’s title is drawn.
- */
-- (CGRect)titleRect
-{
-    return [_titleView frame];
-}
-
-- (void)_manageTitlePositioning
-{
-    if ((_titlePosition == CPNoTitle) || _transparent)
-    {
-        [_titleView removeFromSuperview];
-
-        if (_boxType !== CPBoxSeparator)
-            [self sizeToFit];
-
-        [self refreshDisplay];
-        return;
-    }
-
-    [_titleView setStringValue:_title];
-    [_titleView sizeToFit];
-
-    var titleLeftOffset = [self valueForThemeAttribute:@"title-left-offset"],
-        titleTopOffset  = [self valueForThemeAttribute:@"title-top-offset"];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-        case CPAboveTop:
-        case CPBelowTop:
-            [_titleView setFrameOrigin:CGPointMake(titleLeftOffset, titleTopOffset)]; // FIXME: was 0.0
-            [_titleView setAutoresizingMask:CPViewNotSizable];
-            break;
-
-        case CPAboveBottom:
-        case CPAtBottom:
-        case CPBelowBottom:
-            var h = [_titleView frameSize].height;
-            [_titleView setFrameOrigin:CGPointMake(titleLeftOffset, [self frameSize].height - h - titleTopOffset)];
-            [_titleView setAutoresizingMask:CPViewMinYMargin];
-            break;
-    }
-
-    if (!_transparent)
-        [self addSubview:_titleView];
-
-    [self sizeToFit];
-    [self refreshDisplay];
-}
-
-- (void)sizeToFit
-{
-    var offset = [self _titleHeightOffset],
-        size = [self frameSize];
-
-    [_boxView setFrame:CGRectMake(0, offset[1], size.width, size.height - offset[0])];
-
-    if (!_contentView)
-        return;
-
-    var boxSize = [_boxView frameSize],
-        contentMargin = [self valueForThemeAttribute:@"content-margin"],
-        contentAdjustment = [self valueForThemeAttribute:@"content-adjustment"],
-        borderWidth = [self valueForThemeAttribute:@"border-width"],
-        minYCorrection = [self valueForThemeAttribute:(_titlePosition === CPNoTitle ? @"min-y-correction-no-title" : @"min-y-correction-title")];
-
-    [_contentView setFrame:CGRectMake(contentAdjustment.origin.x + contentMargin.width  - borderWidth,
-                                      contentAdjustment.origin.y + contentMargin.height - borderWidth + minYCorrection,
-                                      boxSize.width  - 2 * contentMargin.width  + contentAdjustment.size.width,
-                                      boxSize.height - 2 * contentMargin.height + contentAdjustment.size.height)];
-}
-
-- (CPArray)_titleHeightOffset
-{
-    var titleTopOffset = [self valueForThemeAttribute:@"title-top-offset"];
-
-    switch (_titlePosition)
-    {
-        case CPAtTop:
-            return [[_titleView frameSize].height + titleTopOffset, [_titleView frameSize].height + titleTopOffset];
-
-        case CPAtBottom:
-            return [[_titleView frameSize].height + titleTopOffset, 0.0];
-
-        default:
-            return [0.0, 0.0];
-    }
-}
-
-- (void)setValue:(id)aValue forKey:(CPString)aKey
-{
-    if (aKey === CPDisplayPatternTitleBinding)
-        [self setTitle:aValue || @""];
-    else
-        [super setValue:aValue forKey:aKey];
-}
-
-- (void)drawRect:(CGRect)rect
-{
-    if ([self isCSSBased] && (_boxType !== CPBoxCustom))
-        return;
-
-    var bounds = [self bounds];
-
-    if (_boxType === CPBoxSeparator)
-    {
-        // NSBox does not include a horizontal flag for the separator type. We have to determine
-        // the type of separator to draw by the width and height of the frame.
-        if (CGRectGetWidth(bounds) === 5.0)
-            return [self _drawVerticalSeparatorInRect:bounds];
-        else if (CGRectGetHeight(bounds) === 5.0)
-            return [self _drawHorizontalSeparatorInRect:bounds];
-    }
-
-    if (_transparent)
-        return;
-
-    if (_titlePosition == CPAtTop)
-    {
-        bounds.origin.y += [_titleView frameSize].height;
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-    if (_titlePosition == CPAtBottom)
-    {
-        bounds.size.height -= [_titleView frameSize].height;
-    }
-
-    // Primary or secondary type boxes always draw the same way, unless they are CPNoBorder.
-    if ((_boxType === CPBoxPrimary || _boxType === CPBoxSecondary) && _borderType !== CPNoBorder)
-    {
-        [self _drawPrimaryBorderInRect:bounds];
-        return;
-    }
-
-    switch (_borderType)
-    {
-        case CPBezelBorder:
-        case CPGrooveBorder:
-        case CPLineBorder:
-            [self _drawLineBorderInRect:bounds];
-            break;
-
-        case CPNoBorder:
-            [self _drawNoBorderInRect:bounds];
-            break;
-    }
-}
-
-- (void)_drawHorizontalSeparatorInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, 1.0);
-
-    CGContextMoveToPoint(context, CGRectGetMinX(aRect), CGRectGetMidY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetWidth(aRect), CGRectGetMidY(aRect));
-    CGContextStrokePath(context);
-}
-
-- (void)_drawVerticalSeparatorInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, 1.0);
-
-    CGContextMoveToPoint(context, CGRectGetMidX(aRect), CGRectGetMinY(aRect));
-    CGContextAddLineToPoint(context, CGRectGetMidX(aRect), CGRectGetHeight(aRect));
-    CGContextStrokePath(context);
-}
-
-- (void)_drawLineBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth];
-
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextSetStrokeColor(context, [self borderColor]);
-
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-}
-
-- (void)_drawBezelBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"];
-
-    var baseRect = aRect;
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSaveGState(context);
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextRestoreGState(context);
-}
-
-- (void)_drawPrimaryBorderInRect:(CGRect)aRect
-{
-    // Draw the "primary" style CPBox.
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        cornerRadius = [self cornerRadius],
-        borderWidth = [self borderWidth],
-        shadowOffset = [self valueForThemeAttribute:@"inner-shadow-offset"],
-        shadowSize = [self valueForThemeAttribute:@"inner-shadow-size"],
-        shadowColor = [self valueForThemeAttribute:@"inner-shadow-color"],
-        baseRect = aRect;
-
-    aRect = CGRectInset(aRect, borderWidth / 2.0, borderWidth / 2.0);
-
-    CGContextSaveGState(context);
-
-    CGContextSetStrokeColor(context, [self borderColor]);
-    CGContextSetLineWidth(context, borderWidth);
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextBeginPath(context);
-    // Note we can't use the 0.5 inset rectangle when setting up clipping. The clipping has to be
-    // on integer coordinates for this to look right in Chrome.
-    CGContextAddPath(context, CGPathWithRoundedRectangleInRect(baseRect, cornerRadius, cornerRadius, YES, YES, YES, YES));
-    CGContextClip(context);
-    CGContextSetShadowWithColor(context, shadowOffset, shadowSize, shadowColor);
-    CGContextStrokeRoundedRectangleInRect(context, aRect, cornerRadius, YES, YES, YES, YES);
-
-    CGContextRestoreGState(context);
-}
-
-- (void)_drawNoBorderInRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSetFillColor(context, [self fillColor]);
-    CGContextFillRect(context, aRect);
-}
-
-@end
-
-// MARK: -
-
-@implementation CPBox (CSSTheming)
-
-- (void)layoutSubviews
-{
-    if (![self isCSSBased] || (_boxType === CPBoxCustom))
-        return;
-
-    var bounds = [self bounds];
-
-    if (_boxType === CPBoxSeparator)
-    {
-        if (bounds.size.width === 5.0)
-        {
-            // Vertical separator
-            [_boxView setFrame:CGRectMake(2,0,1,bounds.size.height)];
-        }
-        else
-        {
-            // Horizontal separator
-            [_boxView setFrame:CGRectMake(0,2,bounds.size.width,1)];
-        }
-
-        [_boxView setBackgroundColor:[self valueForThemeAttribute:@"border-color"]];
-
-        return;
-    }
-
-    // All types of boxes (beside custom which is not covered here) always draw the same way, unless they are CPNoBorder.
-    if ((_borderType !== CPNoBorder) && !_transparent)
-    {
-        [_boxView setBackgroundColor:[self valueForThemeAttribute:@"background-color"]];
-        return;
-    }
-
-    // No border or transparent
-    [_boxView setBackgroundColor:nil];
-}
-
-- (BOOL)isCSSBased
-{
-    return [[self theme] isCSSBased];
-}
-
-- (void)refreshDisplay
-{
-    if ([self isCSSBased] && (_boxType !== CPBoxCustom))
-        [self setNeedsLayout:YES];
-    else
-        [self setNeedsDisplay:YES];
-}
-
-- (void)setAutoresizesSubviews:(BOOL)flag
-{
-    // CPBox should always resize its subviews, like in Cocoa, whatever is the corresponding flag set.
-    // We have to keep the flag value as we could have to return it in -autoresizesSubview method.
-    _cachedAutoresizesSubviews = !!flag;
-    [super setAutoresizesSubviews:YES];
-}
-
-- (BOOL)autoresizesSubview
-{
-    return _cachedAutoresizesSubviews;
-}
-
-@end
-
-// MARK: -
-
-var CPBoxTypeKey          = @"CPBoxTypeKey",
-    CPBoxBorderTypeKey    = @"CPBoxBorderTypeKey",
-    CPBoxTitleKey         = @"CPBoxTitleKey",
-    CPBoxTitlePositionKey = @"CPBoxTitlePositionKey",
-    CPBoxTitleViewKey     = @"CPBoxTitleViewKey",
-    CPBoxContentViewKey   = @"CPBoxContentViewKey",
-    CPBoxBoxViewKey       = @"CPBoxBoxViewKey";
-
-@implementation CPBox (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _boxType       = [aCoder decodeIntForKey:CPBoxTypeKey];
-        _borderType    = [aCoder decodeIntForKey:CPBoxBorderTypeKey];
-
-        _title         = [aCoder decodeObjectForKey:CPBoxTitleKey];
-        _titlePosition = [aCoder decodeIntForKey:CPBoxTitlePositionKey];
-
-        // Important : see comment on encodeWithCoder below
-
-        _boxView = [aCoder decodeObjectForKey:CPBoxBoxViewKey];
-
-        if (!_boxView)
-        {
-            // We're coming from nib2cib.
-
-            _boxView     = [[CPView alloc] initWithFrame:[self bounds]];
-            _titleView   = [CPTextField labelWithTitle:_title];
-        }
-        else
-        {
-            // We're coming from elsewhere
-
-            _titleView   = [aCoder decodeObjectForKey:CPBoxTitleViewKey];
-        }
-
-        _contentView = [aCoder decodeObjectForKey:CPBoxContentViewKey];
-
-        // FIXME: super-mega-hyper-trick : _contentView has a superview which is not normal !
-        // FIXME: (see encodeWithCoder to understand why this is not possible)
-        // FIXME: we fix this by hand. This is horrible so please find a structural solution !
-
-        if (_contentView)
-            _contentView._superview = nil;
-
-        [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-        [_boxView     setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-        [_boxView     setAutoresizesSubviews:YES];
-        [self         setAutoresizesSubviews:YES];
-
-        if (_contentView)
-            [_boxView setSubviews:@[_contentView]];
-
-        [self addSubview:_boxView];
-        [self addSubview:_titleView];
-
-        if (_boxType === CPBoxSeparator)
-            _titlePosition = CPNoTitle;
-
-        [_titleView setFont:[self titleFont]];
-        [_titleView setTextColor:[self titleColor]];
-
-        [self _manageTitlePositioning];
-
-        [self refreshDisplay];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // We have to distinguish between 2 cases :
-    // - we come from nib2cib
-    // - we come from elsewhere
-    //
-    // When coming from nib2cib, we have no _boxView, _contentView, _titleView.
-    // We fix _contentView to be the first (and only) subview.
-    // They will have to be added on decoding.
-    //
-    // When coming from elsewhere, we remove _boxView (and thus _contentView) and _titleView
-    // from the view hierarchy as we'll already encode them via variables.
-    // They will be putted back during decoding. This way, we reduce the space and speed needed for coding.
-
-    var subviews = [self subviews];
-
-    if (!_boxView)
-    {
-        // We're coming from nib2cib.
-
-        _contentView = subviews[0];
-
-        [_contentView removeFromSuperview];
-    }
-    else
-    {
-        // We're coming from elsewhere.
-
-        [_boxView   removeFromSuperview];
-        [_titleView removeFromSuperview];
-    }
-
-    [super encodeWithCoder:aCoder];
-
-    [self setSubviews:subviews];
-
-    [aCoder encodeInt:_boxType forKey:CPBoxTypeKey];
-    [aCoder encodeInt:_borderType forKey:CPBoxBorderTypeKey];
-    [aCoder encodeObject:_title forKey:CPBoxTitleKey];
-    [aCoder encodeInt:_titlePosition forKey:CPBoxTitlePositionKey];
-    [aCoder encodeConditionalObject:_contentView forKey:CPBoxContentViewKey];
-    [aCoder encodeConditionalObject:_titleView forKey:CPBoxTitleViewKey];
-    [aCoder encodeConditionalObject:_boxView forKey:CPBoxBoxViewKey];
-}
-
-@end

AppKit/CPButtonBar.j

@@ -1,398 +0,0 @@
-/*
- * CPButtonBar.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPView.j"
-@import "CPWindow_Constants.j"
-
-@class CPSplitView
-
-@global CPPopUpButtonStatePullsDown
-@global CPKeyValueChangeOldKey
-@global CPKeyValueChangeNewKey
-@global CPKeyValueObservingOptionNew
-@global CPKeyValueObservingOptionOld
-
-@implementation CPButtonBar : CPView
-{
-    BOOL    _hasResizeControl;
-    BOOL    _resizeControlIsLeftAligned;
-    CPArray _buttons;
-    CPArray _rightButtons;
-}
-
-+ (id)plusButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-plus" forClass:[CPButtonBar class]];
-
-    [button setBordered:NO];
-    [button setImage:image];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
-+ (id)minusButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-minus" forClass:[CPButtonBar class]];
-
-    [button setBordered:NO];
-    [button setImage:image];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
-+ (id)actionPopupButton
-{
-    var button = [[CPPopUpButton alloc] initWithFrame:CGRectMake(0, 0, 35, 25)],
-        image = [[CPTheme defaultTheme] valueForAttributeWithName:@"button-image-action" forClass:[CPButtonBar class]];
-
-    [button addItemWithTitle:nil];
-    [[button lastItem] setImage:image];
-    [button setImagePosition:CPImageOnly];
-    [button setValue:CGInsetMake(0, 0, 0, 0) forThemeAttribute:"content-inset" inState:CPPopUpButtonStatePullsDown];
-
-    [button setPullsDown:YES];
-
-    return button;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"button-bar";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"resize-control-inset": CGInsetMake(0.0, 0.0, 0.0, 0.0),
-            @"resize-control-size": CGSizeMakeZero(),
-            @"resize-control-color": [CPNull null],
-            @"bezel-color": [CPNull null],
-            @"button-bezel-color": [CPNull null],
-            @"button-text-color": [CPNull null],
-            @"button-image-plus": [CPNull null],
-            @"button-image-minus": [CPNull null],
-            @"button-image-action": [CPNull null],
-        };
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _buttons = [];
-        _rightButtons = [];
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-- (void)awakeFromCib
-{
-    [super awakeFromCib];
-
-    var view = [self superview],
-        subview = self;
-
-    while (view)
-    {
-        if ([view isKindOfClass:[CPSplitView class]])
-        {
-            var viewIndex = [[view subviews] indexOfObject:subview];
-            [view setButtonBar:self forDividerAtIndex:viewIndex];
-
-            break;
-        }
-
-        subview = view;
-        view = [view superview];
-    }
-}
-
-- (void)setButtons:(CPArray)buttons
-{
-    for (var i = [_buttons count] - 1; i >= 0; i--)
-    {
-        [_buttons[i] removeFromSuperview];
-        [_buttons[i] removeObserver:self forKeyPath:@"hidden"];
-    }
-
-
-    _buttons = [CPArray arrayWithArray:buttons];
-
-    for (var i = [_buttons count] - 1; i >= 0; i--)
-    {
-        [_buttons[i] addObserver:self forKeyPath:@"hidden" options:CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld context:nil];
-        [_buttons[i] setBordered:YES];
-    }
-
-    [self setNeedsLayout];
-}
-
-- (CPArray)buttons
-{
-    return [CPArray arrayWithArray:_buttons];
-}
-
-- (void)setRightButtons:(CPArray)buttons
-{
-    for (var i = [_rightButtons count] - 1; i >= 0; i--)
-    {
-        [_rightButtons[i] removeFromSuperview];
-        [_rightButtons[i] removeObserver:self forKeyPath:@"hidden"];
-    }
-
-    _rightButtons = [CPArray arrayWithArray:buttons];
-
-    for (var i = [_rightButtons count] - 1; i >= 0; i--)
-    {
-        [_rightButtons[i] addObserver:self forKeyPath:@"hidden" options:CPKeyValueObservingOptionNew | CPKeyValueObservingOptionOld context:nil];
-        [_rightButtons[i] setBordered:YES];
-    }
-
-    [self setNeedsLayout];
-}
-
-- (CPArray)rightButtons
-{
-    return [CPArray arrayWithArray:_rightButtons];
-}
-
-- (void)setHasResizeControl:(BOOL)shouldHaveResizeControl
-{
-    if (_hasResizeControl === shouldHaveResizeControl)
-        return;
-
-    _hasResizeControl = !!shouldHaveResizeControl;
-    [self setNeedsLayout];
-}
-
-- (BOOL)hasResizeControl
-{
-    return _hasResizeControl;
-}
-
-- (void)setResizeControlIsLeftAligned:(BOOL)shouldBeLeftAligned
-{
-    if (_resizeControlIsLeftAligned === shouldBeLeftAligned)
-        return;
-
-    _resizeControlIsLeftAligned = !!shouldBeLeftAligned;
-    [self setNeedsLayout];
-}
-
-- (BOOL)resizeControlIsLeftAligned
-{
-    return _resizeControlIsLeftAligned;
-}
-
-- (CGRect)resizeControlFrame
-{
-    var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
-        size = [self currentValueForThemeAttribute:@"resize-control-size"],
-        currentSize = [self bounds],
-        leftOrigin = _resizeControlIsLeftAligned ? 0 : currentSize.size.width - size.width - inset.right - inset.left;
-
-    return CGRectMake(leftOrigin, 0, size.width + inset.left + inset.right, size.height + inset.top + inset.bottom);
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    if (aName === "resize-control-view")
-    {
-        var inset = [self currentValueForThemeAttribute:@"resize-control-inset"],
-            size = [self currentValueForThemeAttribute:@"resize-control-size"],
-            currentSize = [self bounds];
-
-        if (_resizeControlIsLeftAligned)
-            return CGRectMake(inset.left, inset.top, size.width, size.height);
-        else
-            return CGRectMake(currentSize.size.width - size.width - inset.right, inset.top, size.width, size.height);
-    }
-
-    return [super rectForEphemeralSubviewNamed:aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    if (aName === "resize-control-view")
-        return [[CPView alloc] initWithFrame:CGRectMakeZero()];
-
-    return [super createEphemeralSubviewNamed:aName];
-}
-
-- (void)layoutSubviews
-{
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-
-    var normalColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateNormal],
-        highlightedColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateHighlighted],
-        disabledColor = [self valueForThemeAttribute:@"button-bezel-color" inState:CPThemeStateDisabled],
-        textColor = [self valueForThemeAttribute:@"button-text-color" inState:CPThemeStateNormal];
-
-    var buttonsNotHidden = [CPArray arrayWithArray:_buttons],
-        count = [buttonsNotHidden count];
-
-    while (count--)
-    {
-        var button = buttonsNotHidden[count];
-
-        if ([button isHidden])
-        {
-            [button removeFromSuperview];
-            [buttonsNotHidden removeObject:button];
-        }
-    }
-
-    var rightButtonsNotHidden = [CPArray arrayWithArray:_rightButtons],
-        rightCount = [rightButtonsNotHidden count];
-
-    while (rightCount--)
-    {
-        var button = rightButtonsNotHidden[rightCount];
-
-        if ([button isHidden])
-        {
-            [button removeFromSuperview];
-            [rightButtonsNotHidden removeObject:button];
-        }
-    }
-
-    var bounds = [self bounds],
-        height = CGRectGetHeight(bounds) - 1,
-        frameWidth = CGRectGetWidth(bounds),
-        resizeRect = _hasResizeControl ? [self rectForEphemeralSubviewNamed:"resize-control-view"] : CGRectMakeZero(),
-        resizeWidth = CGRectGetWidth(resizeRect),
-        availableWidth = frameWidth - resizeWidth - 1;
-
-    var currentLeftOffset = _resizeControlIsLeftAligned ? resizeWidth - 1 : -1,
-        currentRightOffset = _resizeControlIsLeftAligned ? CGRectGetMaxX(bounds) + 1 : CGRectGetMaxX(bounds) - resizeWidth + 1;
-
-    var setupButton = function(button, isRightAligned)
-    {
-        var width = CGRectGetWidth([button frame]);
-
-        if (availableWidth > width)
-            availableWidth -= width;
-        else
-            return NO;
-
-        if (isRightAligned)
-        {
-            [button setFrame:CGRectMake(currentRightOffset - width, 1, width, height)];
-            currentRightOffset -= width - 1;
-        }
-        else
-        {[button setFrame:CGRectMake(currentLeftOffset, 1, width, height)];
-            currentLeftOffset += width - 1;
-        }
-
-        [button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered]];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted, CPThemeStateBordered]];
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered]];
-        [button setValue:textColor forThemeAttribute:@"text-color" inState:CPThemeStateBordered];
-
-        // FIXME shouldn't need this[button setValue:normalColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateNormal, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
-        [button setValue:highlightedColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateHighlighted, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
-        [button setValue:disabledColor forThemeAttribute:@"bezel-color" inStates:[CPThemeStateDisabled, CPThemeStateBordered, CPPopUpButtonStatePullsDown]];
-
-        [self addSubview:button];
-        
-        return YES;
-    };
-
-    for (var i = 0, count = [buttonsNotHidden count]; i < count; i++)
-    {
-        if (!setupButton(buttonsNotHidden[i], _resizeControlIsLeftAligned))
-            break;
-    }
-
-    for (var i = 0, count = [rightButtonsNotHidden count]; i < count; i++)
-    {
-        if (!setupButton(rightButtonsNotHidden[i], YES))
-            break;
-    }
-
-    if (_hasResizeControl)
-    {
-        var resizeControlView = [self layoutEphemeralSubviewNamed:@"resize-control-view"
-                                                       positioned:CPWindowAbove
-                                  relativeToEphemeralSubviewNamed:nil];
-
-        [resizeControlView setAutoresizingMask: _resizeControlIsLeftAligned ? CPViewMaxXMargin : CPViewMinXMargin];
-        [resizeControlView setBackgroundColor:[self currentValueForThemeAttribute:@"resize-control-color"]];
-    }
-}
-
-- (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context
-{
-    if ([change objectForKey:CPKeyValueChangeOldKey] == [change objectForKey:CPKeyValueChangeNewKey])
-        return;
-
-    [self setNeedsLayout];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrameSize:aSize];
-    [self setNeedsLayout];
-}
-
-@end
-
-var CPButtonBarHasResizeControlKey = @"CPButtonBarHasResizeControlKey",
-    CPButtonBarResizeControlIsLeftAlignedKey = @"CPButtonBarResizeControlIsLeftAlignedKey",
-    CPButtonBarButtonsKey = @"CPButtonBarButtonsKey",
-    CPButtonBarRightButtonsKey = @"CPButtonBarRightButtonsKey";
-
-@implementation CPButtonBar (CPCoding)
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeBool:_hasResizeControl forKey:CPButtonBarHasResizeControlKey];
-    [aCoder encodeBool:_resizeControlIsLeftAligned forKey:CPButtonBarResizeControlIsLeftAlignedKey];
-    [aCoder encodeObject:_buttons forKey:CPButtonBarButtonsKey];
-    [aCoder encodeObject:_rightButtons forKey:CPButtonBarRightButtonsKey];
-}
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _buttons = [aCoder decodeObjectForKey:CPButtonBarButtonsKey] || [];
-        _rightButtons = [aCoder decodeObjectForKey:CPButtonBarRightButtonsKey] || [];
-        _hasResizeControl = [aCoder decodeBoolForKey:CPButtonBarHasResizeControlKey];
-        _resizeControlIsLeftAligned = [aCoder decodeBoolForKey:CPButtonBarResizeControlIsLeftAlignedKey];
-    }
-
-    return self;
-}
-
-@end

AppKit/CPCheckBox.j

@@ -1,195 +0,0 @@
-/*
- * CPCheckBox.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPButton.j"
-
-
-CPCheckBoxImageOffset = 4.0;
-
-@implementation CPCheckBox : CPButton
-{
-}
-
-+ (id)checkBoxWithTitle:(CPString)aTitle theme:(CPTheme)aTheme
-{
-    return [self buttonWithTitle:aTitle theme:aTheme];
-}
-
-+ (id)checkBoxWithTitle:(CPString)aTitle
-{
-    return [self buttonWithTitle:aTitle];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"check-box";
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        return [_CPCheckBoxValueBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        [self setHighlightsBy:CPContentsCellMask];
-        [self setShowsStateBy:CPContentsCellMask];
-
-        // Defaults?
-        [self setImagePosition:CPImageLeft];
-        [self setAlignment:CPLeftTextAlignment];
-
-        [self setBordered:NO];
-    }
-
-    return self;
-}
-
-- (void)takeStateFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    var count = objects.length,
-        value = [objects[0] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState;
-
-    [self setAllowsMixedState:NO];
-    [self setState:value];
-
-    while (count-- > 1)
-    {
-        if (value !== ([objects[count] valueForKeyPath:aKeyPath] ? CPOnState : CPOffState))
-        {
-            [self setAllowsMixedState:YES];
-            [self setState:CPMixedState];
-        }
-    }
-}
-
-- (void)takeValueFromKeyPath:(CPString)aKeyPath ofObjects:(CPArray)objects
-{
-    [self takeStateFromKeyPath:aKeyPath ofObjects:objects];
-}
-
-
-// MARK: -
-// MARK: Override methods from CPButton
-
-- (CGSize)_minimumFrameSize
-{
-    var size = [super _minimumFrameSize],
-        contentView = [self ephemeralSubviewNamed:@"content-view"];
-
-    if (!contentView && [[self title] length])
-    {
-        var minSize = [self currentValueForThemeAttribute:@"min-size"],
-            maxSize = [self currentValueForThemeAttribute:@"max-size"];
-
-        // Here we always add the min size to the control which is the size of the view of the checkBox
-        size.width += minSize.width + CPCheckBoxImageOffset;
-
-        if (maxSize.width >= 0.0)
-            size.width = MIN(size.width, maxSize.width);
-    }
-
-    return size;
-}
-
-- (CPThemeState)_contentVisualState
-{
-    // Note : Behavior differs from CPButton as title doesn't follow the highlightsBy content flag
-
-    var visualState  = [self themeState] || CPThemeStateNormal, // Needed during theme compilation
-        currentState = [self state];
-
-    if ((currentState !== CPOffState) && (_showsStateBy & CPContentsCellMask))
-        visualState = visualState.and((currentState === CPOnState) ? CPThemeStateSelected : CPButtonStateMixed);
-
-    return visualState;
-}
-
-- (CPThemeState)_imageVisualState
-{
-    // Note : Behavior differs from CPButton as we don't force "not selected" theme state
-    //        when button is highglighted and selected
-
-    var visualState  = [self themeState] || CPThemeStateNormal, // Needed during theme compilation
-        currentState = [self state];
-
-    if (_isHighlighted && (_highlightsBy & CPContentsCellMask))
-        visualState = visualState.and(CPThemeStateHighlighted);
-
-    if ((currentState !== CPOffState) && (_showsStateBy & CPContentsCellMask))
-        visualState = visualState.and((currentState === CPOnState) ? CPThemeStateSelected : CPButtonStateMixed);
-
-    return visualState;
-}
-
-@end
-
-@implementation _CPCheckBoxValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [super _updatePlaceholdersWithOptions:options];
-
-    [self _setPlaceholder:CPMixedState forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:CPOffState forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setAllowsMixedState:(aValue === CPMixedState)];
-    [_source setState:aValue];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setState:aValue];
-}
-
-@end
-
-// MARK: -
-
-@implementation CPCheckBox (TableDataView)
-
-// We overide here _CPObject+Theme setValue:forThemeAttribute as CPCheckBox can be used as tableView data view
-// So, when outside a table data view, setValue:forThemeAttribute should store the value with the CPThemeStateNormal (default behavior)
-// When inside a table data view, it should store the value with the CPThemeStateTableDataView. If not, the value won't be used if the
-// theme defined a value for this attribute for state CPThemeStateTableDataView
-
-- (void)setValue:(id)aValue forThemeAttribute:(CPString)aName
-{
-    [super setValue:aValue forThemeAttribute:aName];
-    [super setValue:aValue forThemeAttribute:aName inState:CPThemeStateTableDataView];
-}
-
-@end

AppKit/CPClipView.j

@@ -1,227 +0,0 @@
-/*
- * CPClipView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPView.j"
-
-@class CPScrollView
-
-/*!
-    @ingroup appkit
-    @class CPClipView
-
-    CPClipView allows you to define a clip rect and display only that portion of its containing view.
-    It is used to hold the document view in a CPScrollView.
-*/
-@implementation CPClipView : CPView
-{
-    CPView  _documentView;
-}
-
-/*!
-    Sets the document view to be \c aView.
-    @param aView the new document view. It's frame origin will be changed to \c (0,0) after calling this method.
-*/
-- (void)setDocumentView:(CPView)aView
-{
-    if (_documentView == aView)
-        return;
-
-    if (_documentView)
-        [_documentView removeFromSuperview];
-
-    _documentView = aView;
-
-    if (_documentView)
-        [self addSubview:_documentView];
-}
-
-/*!
-    Returns the document view.
-*/
-- (id)documentView
-{
-    return _documentView;
-}
-
-/*!
-    Returns a new point that may be adjusted from \c aPoint
-    to make sure it lies within the document view.
-    @param aPoint
-    @return the adjusted point
-*/
-- (CGPoint)constrainScrollPoint:(CGPoint)aPoint
-{
-    if (!_documentView)
-        return CGPointMakeZero();
-
-    var documentFrame = [_documentView frame];
-
-    aPoint.x = MAX(0.0, MIN(aPoint.x, MAX(CGRectGetWidth(documentFrame) - CGRectGetWidth(_bounds), 0.0)));
-    aPoint.y = MAX(0.0, MIN(aPoint.y, MAX(CGRectGetHeight(documentFrame) - CGRectGetHeight(_bounds), 0.0)));
-
-    return aPoint;
-}
-
-- (void)setBoundsOrigin:(CGPoint)aPoint
-{
-    if (CGPointEqualToPoint(_bounds.origin, aPoint))
-        return;
-
-    [super setBoundsOrigin:aPoint];
-
-    var superview = [self superview],
-
-        // This is hack to avoid having to import CPScrollView.
-        // FIXME: Should CPScrollView be finding out about this on its own somehow?
-        scrollViewClass = objj_getClass("CPScrollView");
-
-    if ([superview isKindOfClass:scrollViewClass])
-        [superview reflectScrolledClipView:self];
-}
-
-/*!
-    Scrolls the clip view to the specified point. The method
-    sets its bounds origin to \c aPoint.
-*/
-- (void)scrollToPoint:(CGPoint)aPoint
-{
-    [self setBoundsOrigin:[self constrainScrollPoint:aPoint]];
-}
-
-/*!
-    Handles a CPViewBoundsDidChangeNotification.
-    @param aNotification the notification event
-*/
-- (void)viewBoundsChanged:(CPNotification)aNotification
-{
-    [self _constrainScrollPoint];
-}
-
-/*!
-    Handles a CPViewFrameDidChangeNotification.
-    @param aNotification the notification event
-*/
-- (void)viewFrameChanged:(CPNotification)aNotification
-{
-    [self _constrainScrollPoint];
-}
-
-- (void)resizeSubviewsWithOldSize:(CGSize)aSize
-{
-    [super resizeSubviewsWithOldSize:aSize];
-    [self _constrainScrollPoint];
-}
-
-- (void)_constrainScrollPoint
-{
-    var oldScrollPoint = [self bounds].origin;
-
-    // Call scrollToPoint: because the current scroll point may no longer make
-    // sense given the new frame of the document view.
-    [self scrollToPoint:oldScrollPoint];
-
-    // scrollToPoint: takes care of reflectScrollClipView: for us, so bail if
-    // the scroll points are not equal (meaning scrollToPoint: didn't early bail).
-    if (!CGPointEqualToPoint(oldScrollPoint, [self bounds].origin))
-        return;
-
-    // ... and we're in a scroll view of course.
-    var superview = [self superview],
-
-        // This is hack to avoid having to import CPScrollView.
-        // FIXME: Should CPScrollView be finding out about this on its own somehow?
-        scrollViewClass = objj_getClass("CPScrollView");
-
-    if ([superview isKindOfClass:scrollViewClass])
-        [superview reflectScrolledClipView:self];
-}
-
-- (BOOL)autoscroll:(CPEvent)anEvent
-{
-    var bounds = [self bounds],
-        eventLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        superview = [self superview],
-        deltaX = 0,
-        deltaY = 0;
-
-    if (CGRectContainsPoint(bounds, eventLocation))
-        return NO;
-
-    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasVerticalScroller])
-    {
-        if (eventLocation.y < CGRectGetMinY(bounds))
-            deltaY = CGRectGetMinY(bounds) - eventLocation.y;
-        else if (eventLocation.y > CGRectGetMaxY(bounds))
-            deltaY = CGRectGetMaxY(bounds) - eventLocation.y;
-        if (deltaY < -bounds.size.height)
-            deltaY = -bounds.size.height;
-        if (deltaY > bounds.size.height)
-            deltaY = bounds.size.height;
-    }
-
-    if (![superview isKindOfClass:[CPScrollView class]] || [superview hasHorizontalScroller])
-    {
-        if (eventLocation.x < CGRectGetMinX(bounds))
-            deltaX = CGRectGetMinX(bounds) - eventLocation.x;
-        else if (eventLocation.x > CGRectGetMaxX(bounds))
-            deltaX = CGRectGetMaxX(bounds) - eventLocation.x;
-        if (deltaX < -bounds.size.width)
-            deltaX = -bounds.size.width;
-        if (deltaX > bounds.size.width)
-            deltaX = bounds.size.width;
-    }
-
-    return [self scrollToPoint:CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY)];
-}
-
-- (CGRect)documentVisibleRect
-{
-    return [_documentView visibleRect];
-}
-
-@end
-
-
-var CPClipViewDocumentViewKey = @"CPScrollViewDocumentView";
-
-@implementation CPClipView (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        // Don't call setDocumentView: here. It calls addSubview:, but it's A) not necessary since the
-        // view hierarchy is fully encoded and B) dangerous if the subview is not fully decoded.
-        _documentView = [aCoder decodeObjectForKey:CPClipViewDocumentViewKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_documentView forKey:CPClipViewDocumentViewKey];
-}
-
-@end

AppKit/CPCollectionViewItem.j

@@ -1,111 +0,0 @@
-/*
- * CPCollectionViewItem.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPViewController.j"
-
-/*!
-    Represents an object inside a CPCollectionView.
-*/
-@implementation CPCollectionViewItem : CPViewController
-{
-    BOOL    _isSelected;
-    CPData  _cachedArchive;
-}
-
-- (id)copy
-{
-    var cibName = [self cibName],
-        copy;
-
-    if (cibName)
-    {
-        copy = [[[self class] alloc] initWithCibName:cibName bundle:[self cibBundle]];
-    }
-    else
-    {
-        if (!_cachedArchive)
-            _cachedArchive = [CPKeyedArchiver archivedDataWithRootObject:self];
-
-        copy = [CPKeyedUnarchiver unarchiveObjectWithData:_cachedArchive];
-
-        // copy connections
-    }
-
-    [copy setRepresentedObject:[self representedObject]];
-    [copy setSelected:_isSelected];
-
-    return copy;
-}
-
-// Setting the Represented Object
-/*!
-    Sets the object to be represented by this item.
-    @param anObject the object to be represented
-*/
-- (void)setRepresentedObject:(id)anObject
-{
-    [super setRepresentedObject:anObject];
-
-    var view = [self view];
-
-    if ([view respondsToSelector:@selector(setRepresentedObject:)])
-        [view setRepresentedObject:[self representedObject]];
-}
-
-// Modifying the Selection
-/*!
-    Sets whether this view item should be selected.
-    @param shouldBeSelected \c YES makes the item selected. \c NO deselects it.
-*/
-- (void)setSelected:(BOOL)shouldBeSelected
-{
-    shouldBeSelected = !!shouldBeSelected;
-
-    if (_isSelected === shouldBeSelected)
-        return;
-
-    _isSelected = shouldBeSelected;
-
-    var view = [self view];
-
-    if ([view respondsToSelector:@selector(setSelected:)])
-        [view setSelected:[self isSelected]];
-}
-
-/*!
-    Returns \c YES if the item is currently selected. \c NO if the item is not selected.
-*/
-- (BOOL)isSelected
-{
-    return _isSelected;
-}
-
-// Parent Collection View
-/*!
-    Returns the collection view of which this item is a part.
-*/
-- (CPCollectionView)collectionView
-{
-    return [_view superview];
-}
-
-@end

AppKit/CPColorPanel.j

@@ -1,721 +0,0 @@
-/*
- * CPColorPanel.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPButton.j"
-@import "CPCookie.j"
-@import "CPPanel.j"
-@import "CPPasteboard.j"
-@import "CPView.j"
-
-@class CPSlider
-@class _CPColorPanelToolbar
-@class _CPColorPanelSwatches
-@class _CPColorPanelPreview
-
-@global CPApp
-
-/*
-    A color wheel
-    @global
-    @group CPColorPanelMode
-*/
-CPWheelColorPickerMode = 1;
-
-/*
-    Slider based picker
-    @global
-    @group CPColorPanelMode
-*/
-CPSliderColorPickerMode = 2;
-
-CPColorPickerViewWidth  = 265;
-CPColorPickerViewHeight = 370;
-
-CPColorPanelColorDidChangeNotification = @"CPColorPanelColorDidChangeNotification";
-CPColorDragType = CPColorPboardType;
-
-var PREVIEW_HEIGHT = 20.0,
-    TOOLBAR_HEIGHT = 32.0,
-    SWATCH_HEIGHT  = 14.0,
-    ICON_WIDTH     = 32.0,
-    ICON_PADDING   = 12.0;
-
-var SharedColorPanel = nil,
-    ColorPickerClasses = [];
-
-/*!
-    @ingroup appkit
-    @class CPColorPanel
-
-    CPColorPanel provides a reusable panel that can be used
-    displayed on screen to prompt the user for a color selection. To
-    obtain the panel, call the \c +sharedColorPanel method.
-*/
-@implementation CPColorPanel : CPPanel
-{
-    _CPColorPanelSwatches   _swatchView;
-    _CPColorPanelPreview    _previewView;
-
-    CPSlider        _opacitySlider;
-
-    CPArray         _colorPickers;
-    CPView          _currentView;
-    id              _activePicker;
-
-    CPColor         _color;
-
-    id              _target;
-    SEL             _action;
-
-    int             _mode;
-}
-
-/*!
-    A list of color pickers is collected here, and any color panel created will contain
-    any picker in this list up to this point. In other words, call before creating a color panel.
-*/
-+ (void)provideColorPickerClass:(Class)aColorPickerSubclass
-{
-    ColorPickerClasses.push(aColorPickerSubclass);
-}
-
-/*!
-    Returns (and if necessary, creates) the shared color panel.
-*/
-+ (CPColorPanel)sharedColorPanel
-{
-    if (!SharedColorPanel)
-        SharedColorPanel = [[CPColorPanel alloc] init];
-
-    return SharedColorPanel;
-}
-
-/*!
-    Sets the mode for the shared color panel.
-    @param mode the mode to which the color panel will be set
-*/
-+ (void)setPickerMode:(CPColorPanelMode)mode
-{
-    var panel = [CPColorPanel sharedColorPanel];
-    [panel setMode:mode];
-}
-
-/*
-    To obtain the color panel, use \c +sharedColorPanel.
-    @ignore
-*/
-- (id)init
-{
-    self = [super initWithContentRect:CGRectMake(500.0, 50.0, 219.0, 370.0)
-                            styleMask:(CPTitledWindowMask | CPClosableWindowMask | CPResizableWindowMask)];
-
-    if (self)
-    {
-        [self setTitle:@"Color Panel"];
-        [self setLevel:CPFloatingWindowLevel];
-
-        [self setFloatingPanel:YES];
-        [self setBecomesKeyOnlyIfNeeded:YES];
-
-        [self setMinSize:CGSizeMake(219.0, 363.0)];
-        [self setMaxSize:CGSizeMake(323.0, 537.0)];
-    }
-
-    return self;
-}
-
-/*!
-    Sets the color of the panel, and updates the picker. Also posts a \c CPColorPanelDidChangeNotification.
-*/
-- (void)setColor:(CPColor)aColor
-{
-    if ([_color isEqual:aColor])
-        return;
-
-    _color = aColor;
-    [_previewView setBackgroundColor:_color];
-
-    // Check if the color change originated from user interaction inside the panel itself.
-    // We only broadcast `changeColor:` if the user picked a color via the panel's UI.
-    // If an external CPColorWell called `setColor:` programmatically, broadcasting it
-    // back down the responder chain would incorrectly change the previous First Responder.
-    var currentEvent = [CPApp currentEvent],
-        isFromPanel = currentEvent && ([currentEvent window] === self);
-
-    if (isFromPanel)
-    {
-        // Push color via Responder Chain (targets First Responder, i.e., the active CPColorWell)
-        [CPApp sendAction:@selector(changeColor:) to:nil from:self];
-
-        if (_target && _action)
-            [CPApp sendAction:_action to:_target from:self];
-    }
-
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPColorPanelColorDidChangeNotification
-                      object:self];
-
-    if (_activePicker)
-        [_activePicker setColor:_color];
-
-    if (_opacitySlider)
-        [_opacitySlider setFloatValue:[_color alphaComponent]];
-}
-
-/*!
-    Sets the selected color of the panel and optionally updates the picker.
-    @param bool whether or not to update the picker
-    @ignore
-*/
-- (void)setColor:(CPColor)aColor updatePicker:(BOOL)bool
-{
-    [self setColor:aColor];
-
-    if (bool && _activePicker)
-        [_activePicker setColor:_color];
-}
-
-/*!
-    Returns the panel's currently selected color.
-*/
-- (CPColor)color
-{
-    return _color;
-}
-
-- (float)opacity
-{
-    return [_opacitySlider floatValue];
-}
-
-/*!
-    Sets the target for the color panel. Messages are sent
-    to the target when colors are selected in the panel.
-*/
-- (void)setTarget:(id)aTarget
-{
-    _target = aTarget;
-}
-
-/*!
-    Returns the current target. The target receives messages
-    when colors are selected in the panel.
-*/
-- (id)target
-{
-    return _target;
-}
-
-/*!
-    Sets the action that gets sent to the target.
-    This action is sent whenever a color is selected in the panel.
-    @param anAction the action that will be sent
-*/
-- (void)setAction:(selector)anAction
-{
-    _action = anAction;
-}
-
-/*!
-    Returns the current target action.
-*/
-- (selector)action
-{
-    return _action;
-}
-
-/*!
-    Sets the mode (look) of the color panel.
-    @param mode the mode in which to display the color panel
-*/
-- (void)setMode:(CPColorPanelMode)mode
-{
-    _mode = mode;
-}
-
-- (void)_setPicker:(id)sender
-{
-    var picker = _colorPickers[[sender tag]],
-        view = [picker provideNewView:NO];
-
-    if (!view)
-        view = [picker provideNewView:YES];
-
-    if (view == _currentView)
-        return;
-
-    if (_currentView)
-        [view setFrame:[_currentView frame]];
-    else
-    {
-        var height = (TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5 + SWATCH_HEIGHT + 32),
-            bounds = [[self contentView] bounds];
-
-        [view setFrameSize:CGSizeMake(bounds.size.width - 10, bounds.size.height - height)];
-        [view setFrameOrigin:CGPointMake(5, height)];
-    }
-
-    [_currentView removeFromSuperview];
-    [[self contentView] addSubview:view];
-
-    _currentView = view;
-    _activePicker = picker;
-
-    [picker setColor:[self color]];
-}
-
-/*!
-    Returns the color panel's current display mode.
-*/
-- (CPColorPanelMode)mode
-{
-    return _mode;
-}
-
-- (void)orderFront:(id)aSender
-{
-    [self _loadContentsIfNecessary];
-    [super orderFront:aSender];
-}
-
-/* @ignore */
-- (void)_loadContentsIfNecessary
-{
-    if (_toolbar)
-        return;
-
-    if (!_color)
-        _color = [CPColor whiteColor];
-
-    _colorPickers = [];
-
-    var count = [ColorPickerClasses count];
-    for (var i = 0; i < count; i++)
-    {
-        var currentPickerClass = ColorPickerClasses[i],
-            currentPicker = [[currentPickerClass alloc] initWithPickerMask:0 colorPanel:self];
-
-        _colorPickers.push(currentPicker);
-    }
-
-    var contentView = [self contentView],
-        bounds = [contentView bounds];
-
-    _toolbar = [[CPView alloc] initWithFrame:CGRectMake(0, 6, CGRectGetWidth(bounds), TOOLBAR_HEIGHT)];
-    [_toolbar setAutoresizingMask:CPViewWidthSizable];
-
-    var totalToolbarWidth = count * ICON_WIDTH + (count - 1) * ICON_PADDING,
-        leftOffset = (CGRectGetWidth(bounds) - totalToolbarWidth) / 2.0,
-        buttonForLater = nil;
-
-    for (var i = 0; i < count; i++)
-    {
-        var image = [_colorPickers[i] provideNewButtonImage],
-            highlightImage = [_colorPickers[i] provideNewAlternateButtonImage],
-            button = [[CPButton alloc] initWithFrame:CGRectMake(leftOffset + i * (ICON_WIDTH + ICON_PADDING), 0, ICON_WIDTH, ICON_WIDTH)];
-
-        [button setTag:i];
-        [button setTarget:self];
-        [button setAction:@selector(_setPicker:)];
-        [button setBordered:NO];
-        [button setAutoresizingMask:CPViewMinXMargin | CPViewMaxXMargin];
-
-        [button setImage:image];
-        [button setAlternateImage:highlightImage];
-
-        [_toolbar addSubview:button];
-
-        if (!buttonForLater)
-            buttonForLater = button;
-    }
-
-    // Preview
-    var previewBox = [[CPView alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + 10, CGRectGetWidth(bounds) - 86, PREVIEW_HEIGHT)];
-
-    _previewView = [[_CPColorPanelPreview alloc] initWithFrame:CGRectInset([previewBox bounds], 2.0, 2.0)];
-
-    [_previewView setColorPanel:self];
-    [_previewView setAutoresizingMask:CPViewWidthSizable];
-
-    [previewBox setBackgroundColor:[CPColor colorWithWhite:0.8 alpha:1.0]];
-    [previewBox setAutoresizingMask:CPViewWidthSizable];
-
-    [previewBox addSubview:_previewView];
-
-    var _previewLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 10, 60, 15)];
-    [_previewLabel setStringValue:"Preview:"];
-    [_previewLabel setTextColor:[CPColor blackColor]];
-    [_previewLabel setAlignment:CPRightTextAlignment];
-
-    // Swatches
-    var swatchBox = [[CPView alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + 10 + PREVIEW_HEIGHT + 5, CGRectGetWidth(bounds) - 86, SWATCH_HEIGHT + 2.0)];
-
-    [swatchBox setBackgroundColor:[CPColor colorWithWhite:0.8 alpha:1.0]];
-    [swatchBox setAutoresizingMask:CPViewWidthSizable];
-
-    _swatchView = [[_CPColorPanelSwatches alloc] initWithFrame:CGRectInset([swatchBox bounds], 1.0, 1.0)];
-
-    [_swatchView setColorPanel:self];
-    [_swatchView setAutoresizingMask:CPViewWidthSizable];
-
-    [swatchBox addSubview:_swatchView];
-
-    var _swatchLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + 8 + PREVIEW_HEIGHT + 6, 60, 15)];
-    [_swatchLabel setStringValue:"Swatches:"];
-    [_swatchLabel setTextColor:[CPColor blackColor]];
-    [_swatchLabel setAlignment:CPRightTextAlignment];
-
-
-    var opacityLabel = [[CPTextField alloc] initWithFrame:CGRectMake(10, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 35, 60, 20)];
-    [opacityLabel setStringValue:"Opacity:"];
-    [opacityLabel setTextColor:[CPColor blackColor]];
-    [opacityLabel setAlignment:CPRightTextAlignment];
-
-    _opacitySlider = [[CPSlider alloc] initWithFrame:CGRectMake(76, TOOLBAR_HEIGHT + PREVIEW_HEIGHT + 34, CGRectGetWidth(bounds) - 86, 20.0)];
-
-    [_opacitySlider setMinValue:0.0];
-    [_opacitySlider setMaxValue:1.0];
-    [_opacitySlider setAutoresizingMask:CPViewWidthSizable];
-
-    [_opacitySlider setTarget:self];
-    [_opacitySlider setAction:@selector(setOpacity:)];
-
-    [contentView addSubview:_toolbar];
-    [contentView addSubview:previewBox];
-    [contentView addSubview:_previewLabel];
-    [contentView addSubview:swatchBox];
-    [contentView addSubview:_swatchLabel];
-    [contentView addSubview:opacityLabel];
-    [contentView addSubview:_opacitySlider];
-
-    _activePicker = nil;
-
-    [_previewView setBackgroundColor:_color];
-
-    if (buttonForLater)
-        [self _setPicker:buttonForLater];
-}
-
-- (void)setOpacity:(id)sender
-{
-    var components = [[self color] components],
-        alpha = [sender floatValue];
-
-    [self setColor:[_color colorWithAlphaComponent:alpha] updatePicker:YES];
-}
-
-@end
-
-
-var CPColorPanelSwatchesCookie = "CPColorPanelSwatchesCookie";
-
-/* @ignore */
-@implementation _CPColorPanelSwatches : CPView
-{
-    CPArray         _swatches;
-    CPColor         _dragColor;
-    CPColorPanel    _colorPanel;
-    CPCookie        _swatchCookie;
-    CGPoint         _mouseDownPoint;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    _mouseDownPoint = CGPointMake(0, 0);
-    [self setBackgroundColor:[CPColor grayColor]];
-
-    [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
-
-    var whiteColor = [CPColor whiteColor];
-
-    _swatchCookie = [[CPCookie alloc] initWithName:CPColorPanelSwatchesCookie];
-    var colorList = [self startingColorList];
-
-    _swatches = [];
-
-    for (var i = 0; i < 50; i++)
-    {
-        var view = [[CPView alloc] initWithFrame:CGRectMake(13 * i + 1, 1, 12, 12)],
-            fillView = [[CPView alloc] initWithFrame:CGRectInset([view bounds], 1.0, 1.0)];
-
-        [view setBackgroundColor:whiteColor];
-        [fillView setBackgroundColor:(i < colorList.length) ? colorList[i] : whiteColor];
-
-        [view addSubview:fillView];
-
-        [self addSubview:view];
-
-        _swatches.push(view);
-    }
-
-    return self;
-}
-
-- (BOOL)isOpaque
-{
-    return YES;
-}
-
-- (CPArray)startingColorList
-{
-    var cookieValue = [_swatchCookie value];
-
-    if (!cookieValue)
-    {
-        return [
-            [CPColor blackColor],
-            [CPColor darkGrayColor],
-            [CPColor grayColor],
-            [CPColor lightGrayColor],
-            [CPColor whiteColor],
-            [CPColor redColor],
-            [CPColor greenColor],
-            [CPColor blueColor],
-            [CPColor yellowColor]
-        ];
-    }
-
-    var cookieValue = JSON.parse(cookieValue);
-
-    return [cookieValue arrayByApplyingBlock:function(value)
-    {
-        return [CPColor colorWithHexString:value];
-    }];
-}
-
-- (CPArray)saveColorList
-{
-    var result = [];
-    for (var i = 0; i < _swatches.length; i++)
-        result.push([[[_swatches[i] subviews][0] backgroundColor] hexString]);
-
-    var future = new Date();
-    future.setYear(2019);
-
-    [_swatchCookie setValue:JSON.stringify(result) expires:future domain:nil];
-}
-
-- (void)setColorPanel:(CPColorPanel)panel
-{
-    _colorPanel = panel;
-}
-
-- (CPColorPanel)colorPanel
-{
-    return _colorPanel;
-}
-
-- (CPColor)colorAtIndex:(int)index
-{
-    return [[_swatches[index] subviews][0] backgroundColor];
-}
-
-- (void)setColor:(CPColor)aColor atIndex:(int)index
-{
-    [[_swatches[index] subviews][0] setBackgroundColor:aColor];
-    [self saveColorList];
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    _mouseDownPoint = [anEvent locationInWindow];
-}
-
-- (void)mouseUp:(CPEvent)anEvent
-{
-    var point = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        bounds = [self bounds];
-
-    if (!CGRectContainsPoint(bounds, point) || point.x > [self bounds].size.width - 1 || point.x < 1)
-        return;
-
-    [_colorPanel setColor:[self colorAtIndex:FLOOR(point.x / 13)] updatePicker:YES];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    var windowPoint = [anEvent locationInWindow];
-    
-    // Prevent accidental drags from rapid clicking causing small micro-movements
-    if (ABS(windowPoint.x - _mouseDownPoint.x) < 3 && ABS(windowPoint.y - _mouseDownPoint.y) < 3)
-        return;
-
-    var point = [self convertPoint:windowPoint fromView:nil];
-
-     if (point.x > [self bounds].size.width - 1 || point.x < 1)
-        return;
-
-    var swatch = _swatches[FLOOR(point.x / 13)];
-    _dragColor = [[swatch subviews][0] backgroundColor];
-
-    var bounds = CGRectMakeCopy([swatch bounds]);
-
-    var dragView = [[CPView alloc] initWithFrame:bounds],
-        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
-
-    [dragView setBackgroundColor:[CPColor blackColor]];
-    [dragFillView setBackgroundColor:_dragColor];
-
-    [dragView addSubview:dragFillView];
-
-    var pasteboard = [CPPasteboard pasteboardWithName:CPDragPboard];
-    [pasteboard declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];
-    [pasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:CPColorDragType];
-
-    [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:pasteboard
-            source:self
-         slideBack:YES];
-}
-
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    if (aType == CPColorDragType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_dragColor] forType:aType];
-}
-
-- (BOOL)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
-{
-    var location = [self convertPoint:[aSender draggingLocation] fromView:nil],
-        pasteboard = [aSender draggingPasteboard],
-        swatch = nil;
-
-    if (![pasteboard availableTypeFromArray:[CPColorDragType]] || location.x > [self bounds].size.width - 1 || location.x < 1)
-        return NO;
-
-    [self setColor:[CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]] atIndex:FLOOR(location.x / 13)];
-    
-    return YES;
-}
-
-- (unsigned)draggingSourceOperationMaskForLocal:(BOOL)isLocal
-{
-    return CPDragOperationCopy;
-}
-
-@end
-
-/* @ignore */
-@implementation _CPColorPanelPreview : CPView
-{
-    CPColorPanel    _colorPanel;
-    CGPoint         _mouseDownPoint;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-    _mouseDownPoint = CGPointMake(0, 0);
-
-    [self registerForDraggedTypes:[CPArray arrayWithObjects:CPColorDragType]];
-
-    return self;
-}
-
-- (void)setColorPanel:(CPColorPanel)aPanel
-{
-    _colorPanel = aPanel;
-}
-
-- (CPColorPanel)colorPanel
-{
-    return _colorPanel;
-}
-
-- (BOOL)performDragOperation:(id /*<CPDraggingInfo>*/)aSender
-{
-    var pasteboard = [aSender draggingPasteboard];
-
-    if (![pasteboard availableTypeFromArray:[CPColorDragType]])
-        return NO;
-
-    var color = [CPKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:CPColorDragType]];
-    [_colorPanel setColor:color updatePicker:YES];
-    
-    return YES;
-}
-
-- (BOOL)isOpaque
-{
-    return YES;
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    _mouseDownPoint = [anEvent locationInWindow];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    var windowPoint = [anEvent locationInWindow];
-    
-    if (ABS(windowPoint.x - _mouseDownPoint.x) < 3 && ABS(windowPoint.y - _mouseDownPoint.y) < 3)
-        return;
-
-    var point = [self convertPoint:windowPoint fromView:nil];
-
-    var bounds = CGRectMake(0, 0, 15, 15);
-
-    var dragView = [[CPView alloc] initWithFrame:bounds],
-        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
-
-    [dragView setBackgroundColor:[CPColor blackColor]];
-    [dragFillView setBackgroundColor:[self backgroundColor]];
-
-    [dragView addSubview:dragFillView];
-
-    var pasteboard = [CPPasteboard pasteboardWithName:CPDragPboard];
-    [pasteboard declareTypes:[CPArray arrayWithObject:CPColorDragType] owner:self];
-    [pasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:[self backgroundColor]] forType:CPColorDragType];
-
-    [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:pasteboard
-            source:self
-         slideBack:YES];
-}
-
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    if (aType == CPColorDragType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:[self backgroundColor]] forType:aType];
-}
-
-- (unsigned)draggingSourceOperationMaskForLocal:(BOOL)isLocal
-{
-    return CPDragOperationCopy;
-}
-
-@end
-
-@import "CPColorPicker.j"
-@import "CPSliderColorPicker.j"
-
-[CPColorPanel provideColorPickerClass:CPColorWheelColorPicker];
-[CPColorPanel provideColorPickerClass:CPSliderColorPicker];

AppKit/CPColorPicker.j

@@ -1,389 +0,0 @@
-/*
- * CPColorPicker.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CPView.j"
-
-@class CPSlider
-@class CPColorPanel
-@class __CPColorWheel
-
-@global CPColorPickerViewWidth
-@global CPColorPickerViewHeight
-@global CPWheelColorPickerMode
-
-
-/*!
-    @ingroup appkit
-    @class CPColorPicker
-
-    CPColorPicker is an abstract superclass for all color picker subclasses. If you want a particular color picker, use CPColorPanel's \c +setPickerMode: method. The simplest way to implement your own color picker is to create a subclass of CPColorPicker.
-*/
-@implementation CPColorPicker : CPObject
-{
-    CPColorPanel    _panel;
-    int             _mask;
-}
-
-/*!
-    Initializes the color picker.
-    @param aMask a unique unsigned int identifying your color picker
-    @param aPanel the color panel that owns this picker
-*/
-- (id)initWithPickerMask:(int)aMask colorPanel:(CPColorPanel)aPanel
-{
-    if (self = [super init])
-    {
-        _panel = aPanel;
-        _mask  = aMask;
-    }
-
-    return self;
-}
-
-/*!
-    Returns the color panel that owns this picker
-*/
-- (CPColorPanel)colorPanel
-{
-    return _panel;
-}
-
-/*
-    FIXME Not implemented.
-    @return \c nil
-    @ignore
-*/
-- (CPImage)provideNewButtonImage
-{
-    return nil;
-}
-
-/*!
-    Sets the color picker's mode.
-    @param mode the color panel mode
-*/
-- (void)setMode:(CPColorPanelMode)mode
-{
-}
-
-/*!
-    Sets the picker's color.
-    @param aColor the new color for the picker
-*/
-- (void)setColor:(CPColor)aColor
-{
-}
-
-@end
-
-/*
-    The wheel mode color picker.
-    @ignore
-*/
-@implementation CPColorWheelColorPicker : CPColorPicker
-{
-    CPView          _pickerView;
-    CPView          _brightnessSlider;
-    __CPColorWheel  _hueSaturationView;
-
-    CPColor         _cachedColor;
-}
-
-- (id)initWithPickerMask:(int)mask colorPanel:(CPColorPanel)owningColorPanel
-{
-    return [super initWithPickerMask:mask colorPanel: owningColorPanel];
-}
-
-- (id)initView
-{
-    var aFrame = CGRectMake(0, 0, CPColorPickerViewWidth, CPColorPickerViewHeight);
-
-    _pickerView = [[CPView alloc] initWithFrame:aFrame];
-    [_pickerView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-
-    _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
-
-    [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
-    var brightnessImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"] size:CGSizeMake(272, 20)];
-    [_brightnessSlider setValue:[CPColor colorWithPatternImage:brightnessImage] forThemeAttribute:@"track-color"];
-
-    [_brightnessSlider setMinValue:0.0];
-    [_brightnessSlider setMaxValue:100.0];
-    [_brightnessSlider setFloatValue:100.0];
-
-    [_brightnessSlider setTarget:self];
-    [_brightnessSlider setAction:@selector(brightnessSliderDidChange:)];
-    [_brightnessSlider setAutoresizingMask:CPViewWidthSizable | CPViewMinYMargin];
-
-    _hueSaturationView = [[__CPColorWheel alloc] initWithFrame:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height - 38)];
-    [_hueSaturationView setDelegate:self];
-    [_hueSaturationView setAutoresizingMask:(CPViewWidthSizable | CPViewHeightSizable)];
-
-    [_pickerView addSubview:_hueSaturationView];
-    [_pickerView addSubview:_brightnessSlider];
-}
-
-- (void)brightnessSliderDidChange:(id)sender
-{
-    [self updateColor];
-}
-
-- (void)colorWheelDidChange:(id)sender
-{
-    [self updateColor];
-}
-
-- (void)updateColor
-{
-    var hue        = [_hueSaturationView angle],
-        saturation = [_hueSaturationView distance],
-        brightness = [_brightnessSlider floatValue];
-
-    [_hueSaturationView setWheelBrightness:brightness / 100.0];
-    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hue / 360.0 saturation:saturation / 100.0 brightness:1]];
-
-    var colorPanel = [self colorPanel],
-        opacity = [colorPanel opacity];
-
-    _cachedColor = [CPColor colorWithHue:hue / 360.0 saturation:saturation / 100.0 brightness:brightness / 100.0 alpha:opacity];
-
-    [[self colorPanel] setColor:_cachedColor];
-}
-
-- (BOOL)supportsMode:(int)mode
-{
-    return (mode == CPWheelColorPickerMode) ? YES : NO;
-}
-
-- (int)currentMode
-{
-    return CPWheelColorPickerMode;
-}
-
-- (CPView)provideNewView:(BOOL)initialRequest
-{
-    if (initialRequest)
-        [self initView];
-
-    return _pickerView;
-}
-
-- (void)setColor:(CPColor)newColor
-{
-    if ([newColor isEqual:_cachedColor])
-        return;
-
-    var hsb = [newColor hsbComponents];
-
-    [_hueSaturationView setPositionToColor:newColor];
-    [_brightnessSlider setFloatValue:hsb[2] * 100.0];
-    [_hueSaturationView setWheelBrightness:hsb[2]];
-
-    [_brightnessSlider setBackgroundColor:[CPColor colorWithHue:hsb[0] saturation:hsb[1] brightness:1]];
-}
-
-- (CPImage)provideNewButtonImage
-{
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"wheel_button.png"] size:CGSizeMake(32, 32)];
-}
-
-- (CPImage)provideNewAlternateButtonImage
-{
-    return [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:CPColorPicker] pathForResource:"wheel_button_h.png"] size:CGSizeMake(32, 32)];
-}
-
-@end
-
-/* @ignore */
-@implementation __CPColorWheel : CPView
-{
-    DOMElement  _wheelImage;
-    DOMElement  _blackWheelImage;
-
-    CPView      _crosshair;
-
-    id          _delegate;
-
-    float       _angle;
-    float       _distance;
-
-    float       _radius;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-#if PLATFORM(DOM)
-        var path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel.png"];
-
-        _wheelImage = new Image();
-        _wheelImage.src = path;
-        _wheelImage.style.position = "absolute";
-
-        path = [[CPBundle bundleForClass:CPColorPicker] pathForResource:@"wheel_black.png"];
-
-        _blackWheelImage = new Image();
-        _blackWheelImage.src = path;
-        _blackWheelImage.style.opacity = "0";
-        _blackWheelImage.style.filter = "alpha(opacity=0)";
-        _blackWheelImage.style.position = "absolute";
-
-        _DOMElement.appendChild(_wheelImage);
-        _DOMElement.appendChild(_blackWheelImage);
-#endif
-
-        [self setWheelSize:aFrame.size];
-
-        _crosshair = [[CPView alloc] initWithFrame:CGRectMake(_radius - 2, _radius - 2, 4, 4)];
-        [_crosshair setBackgroundColor:[CPColor blackColor]];
-
-        var view = [[CPView alloc] initWithFrame:CGRectInset([_crosshair bounds], 1.0, 1.0)];
-        [view setBackgroundColor:[CPColor whiteColor]];
-
-        [_crosshair addSubview:view];
-
-        [self addSubview:_crosshair];
-    }
-
-    return self;
-}
-
-- (void)setWheelBrightness:(float)brightness
-{
-#if PLATFORM(DOM)
-    _blackWheelImage.style.opacity = 1.0 - brightness;
-    _blackWheelImage.style.filter = "alpha(opacity=" + (1.0 - brightness) * 100 + ")"
-#endif
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrameSize:aSize];
-    [self setWheelSize:aSize];
-}
-
-- (void)setWheelSize:(CGSize)aSize
-{
-    var min = MIN(aSize.width, aSize.height);
-
-#if PLATFORM(DOM)
-    _blackWheelImage.style.width = min;
-    _blackWheelImage.style.height = min;
-    _blackWheelImage.width = min;
-    _blackWheelImage.height = min;
-    _blackWheelImage.style.top = (aSize.height - min) / 2.0 + "px";
-    _blackWheelImage.style.left = (aSize.width - min) / 2.0 + "px";
-
-    _wheelImage.style.width = min;
-    _wheelImage.style.height = min;
-    _wheelImage.width = min;
-    _wheelImage.height = min;
-    _wheelImage.style.top = (aSize.height - min) / 2.0 + "px";
-    _wheelImage.style.left = (aSize.width - min) / 2.0 + "px";
-#endif
-
-    _radius = min / 2.0;
-
-    [self setAngle:[self degreesToRadians:_angle] distance:(_distance / 100.0) * _radius];
-}
-
-- (void)setDelegate:(id)aDelegate
-{
-    _delegate = aDelegate;
-}
-
-- (id)delegate
-{
-    return _delegate;
-}
-
-- (float)angle
-{
-    return _angle;
-}
-
-- (float)distance
-{
-    return _distance;
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    [self reposition:anEvent];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    [self reposition:anEvent];
-}
-
-- (void)reposition:(CPEvent)anEvent
-{
-    var bounds   = [self bounds],
-        location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        midX     = CGRectGetMidX(bounds),
-        midY     = CGRectGetMidY(bounds),
-        distance = MIN(SQRT((location.x - midX) * (location.x - midX) + (location.y - midY) * (location.y - midY)), _radius),
-        angle    = ATAN2(location.y - midY, location.x - midX);
-
-    [self setAngle:angle distance:distance];
-
-    [_delegate colorWheelDidChange:self];
-}
-
-- (void)setAngle:(int)angle distance:(float)distance
-{
-    var bounds = [self bounds],
-        midX   = CGRectGetMidX(bounds),
-        midY   = CGRectGetMidY(bounds);
-
-    _angle     = [self radiansToDegrees:angle];
-    _distance  = (distance / _radius) * 100.0;
-
-    [_crosshair setFrameOrigin:CGPointMake(COS(angle) * distance + midX - 2.0, SIN(angle) * distance + midY - 2.0)];
-}
-
-- (void)setPositionToColor:(CPColor)aColor
-{
-    var hsb    = [aColor hsbComponents],
-        bounds = [self bounds],
-        angle    = [self degreesToRadians:hsb[0] * 360.0],
-        distance = hsb[1] * _radius;
-
-    [self setAngle:angle distance:distance];
-}
-
-- (int)radiansToDegrees:(float)radians
-{
-    return ((-radians / PI) * 180 + 360) % 360;
-}
-
-- (float)degreesToRadians:(float)degrees
-{
-    return -(((degrees - 360) / 180) * PI);
-}
-
-@end
-

AppKit/CPColorSpace.j

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

AppKit/CPColorWell.j

@@ -1,485 +0,0 @@
-/*
- * CPColorWell.j
- * AppKit
- *
- * Created by Ross Boucher.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPString.j>
-
-@import "CPView.j"
-@import "CPColor.j"
-@import "CPColorPanel.j"
-@import "CPPasteboard.j"
-
-var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiveNotification";
-
-/*!
-    @ingroup appkit
-    @class CPColorWell
-
-    CPColorWell is a CPControl for selecting and displaying a single color value. An example of a CPColorWell object (or simply color well) is found in CPColorPanel, which uses a color well to display the current color selection.</p>
-
-    <p>An application can have one or more active CPColorWells. You can activate multiple CPColorWells by invoking the \c -activate: method with \c NO as its argument. When a mouse-down event occurs on an CPColorWell's border, it becomes the only active color well. When a color well becomes active, it brings up the color panel also.
-*/
-@implementation CPColorWell : CPControl
-{
-    BOOL    _bordered;
-    CPColor _color;
-    BOOL    _isChangingColorFromPanel; // Guard flag to prevent recursion
-    CGPoint _mouseDownPoint;
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return [CPColorWellValueBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"colorwell";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"bezel-inset": CGInsetMakeZero(),
-            @"bezel-color": [CPNull null],
-            @"content-inset": CGInsetMake(3.0, 3.0, 3.0, 3.0),
-            @"content-border-inset": CGInsetMakeZero(),
-            @"content-border-color": [CPNull null],
-        };
-}
-
-- (void)_reverseSetBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:CPValueBinding],
-        theBinding = [binderClass getBinding:CPValueBinding forObject:self];
-
-    [theBinding reverseSetValueFor:@"color"];
-}
-
-- (BOOL)isFirstResponder
-{
-    return [[self window] firstResponder] === self;
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return [self isEnabled];
-}
-
-- (void)activate:(BOOL)shouldBeExclusive
-{
-    [[self window] makeFirstResponder:self];
-    [[CPColorPanel sharedColorPanel] orderFront:self];
-}
-
-- (BOOL)isActive
-{
-    return [self isFirstResponder] && [self isEnabled];
-}
-
-/*!
-    Deactivates the color well.
-*/
-- (void)deactivate
-{
-    if ([self isFirstResponder])
-        [[self window] makeFirstResponder:nil];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _color = [CPColor whiteColor];
-        _mouseDownPoint = CGPointMakeZero();
-        [self setBordered:YES];
-        
-        [self registerForDraggedTypes:[CPArray arrayWithObject:CPColorPboardType]];
-    }
-
-    return self;
-}
-
-// MARK: -
-// MARK: Draw
-
-/*!
-    Sets whether the color well is bordered.
-*/
-- (void)setBordered:(BOOL)shouldBeBordered
-{
-    if (shouldBeBordered)
-        [self setThemeState:CPThemeStateBordered];
-    else
-        [self unsetThemeState:CPThemeStateBordered];
-}
-
-/*!
-    Returns whether the color well is bordered
-*/
-- (BOOL)isBordered
-{
-    return [self hasThemeState:CPThemeStateBordered];
-}
-
-// MARK: -
-// MARK: Managing Color
-
-/*!
-    Returns the color well's current color.
-*/
-- (CPColor)color
-{
-    return _color;
-}
-
-/*!
-    Sets the color well's current color.
-*/
-- (void)setColor:(CPColor)aColor
-{
-    if ([_color isEqual:aColor])
-        return;
-
-    _color = aColor;
-
-    [self setNeedsLayout];
-    
-    // Only push back to the panel if we initiated the change (not if the panel pushed it to us)
-    // AND if we are the current focus.
-    if (!_isChangingColorFromPanel && [self isFirstResponder])
-        [[CPColorPanel sharedColorPanel] setColor:_color];
-}
-
-/*!
-    Changes the color of the well to that of \c aSender.
-    @param aSender the object from which to retrieve the color
-*/
-- (void)takeColorFrom:(id)aSender
-{
-    [self setColor:[aSender color]];
-}
-
-/*!
-    Standard action method sent by CPColorPanel via the Responder Chain.
-*/
-- (void)changeColor:(id)aSender
-{
-    if ([aSender isKindOfClass:[CPColorPanel class]])
-    {
-        _isChangingColorFromPanel = YES;
-        [self setColor:[aSender color]];
-        _isChangingColorFromPanel = NO;
-        
-        // Forward the action to our target (e.g. controller)
-        [self sendAction:[self action] to:[self target]];
-    }
-}
-
-// MARK: -
-// MARK: Activating and Deactivating
-
-/*!
-    Activates the color well, displays the color panel, and makes the panel's current color the same as its own.
-    If exclusive is \c YES, deactivates any other CPColorWells. \c NO, keeps them active.
-    @param shouldBeExclusive whether other color wells should be deactivated.
-*/
-- (BOOL)becomeFirstResponder
-{
-    [self setThemeState:CPThemeStateFirstResponder];
-    
-    var panel = [CPColorPanel sharedColorPanel];
-
-    // EXPLICITLY set ourselves as the target.
-    // This ensures that when the user clicks the panel (making Panel key),
-    // the panel still knows to send messages back to us.
-    [panel setTarget:self];
-    [panel setAction:@selector(changeColor:)];
-
-    // Sync panel to our current color
-    [panel setColor:_color];
-
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:_CPColorWellDidBecomeExclusiveNotification object:self];
-    
-    return YES;
-}
-
-- (BOOL)resignFirstResponder
-{
-    [self unsetThemeState:CPThemeStateFirstResponder];
-    
-    var panel = [CPColorPanel sharedColorPanel];
-
-    // Clean up if we were the target
-    if ([panel target] == self)
-        [panel setTarget:nil];
-        
-    return YES;
-}
-
-// MARK: -
-// MARK: Event Handling
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    _mouseDownPoint = [anEvent locationInWindow];
-    [self activate:YES];
-}
-
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-        
-    var windowPoint = [anEvent locationInWindow];
-    
-    // Prevent accidental drags from rapid clicking causing small micro-movements
-    if (ABS(windowPoint.x - _mouseDownPoint.x) < 3 && ABS(windowPoint.y - _mouseDownPoint.y) < 3)
-        return;
-
-    var bounds = CGRectMake(0, 0, 15, 15);
-    var dragView = [[CPView alloc] initWithFrame:bounds],
-        dragFillView = [[CPView alloc] initWithFrame:CGRectInset(bounds, 1.0, 1.0)];
-
-    [dragView setBackgroundColor:[CPColor blackColor]];
-    [dragFillView setBackgroundColor:_color];
-
-    [dragView addSubview:dragFillView];
-
-    var pasteboard = [CPPasteboard pasteboardWithName:CPDragPboard];
-    [pasteboard declareTypes:[CPArray arrayWithObject:CPColorPboardType] owner:self];
-    [pasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_color] forType:CPColorPboardType];
-
-    var point = [self convertPoint:windowPoint fromView:nil];
-
-    [self dragView:dragView
-                at:CGPointMake(point.x - bounds.size.width / 2.0, point.y - bounds.size.height / 2.0)
-            offset:CGPointMake(0.0, 0.0)
-             event:anEvent
-        pasteboard:pasteboard
-            source:self
-         slideBack:YES];
-}
-
-
-// MARK: -
-// MARK: Drag and Drop
-
-- (void)draggingEntered:(id)sender
-{
-    var pasteboard = [sender draggingPasteboard];
-    
-    if ([[pasteboard types] containsObject:CPColorPboardType])
-    {
-        [self setThemeState:CPThemeStateHighlighted];
-        return CPDragOperationCopy;
-    }
-    
-    return CPDragOperationNone;
-}
-
-- (void)draggingExited:(id)sender
-{
-    [self unsetThemeState:CPThemeStateHighlighted];
-}
-
-- (BOOL)performDragOperation:(id)sender
-{
-    var pasteboard = [sender draggingPasteboard];
-    
-    if ([[pasteboard types] containsObject:CPColorPboardType])
-    {
-        var data = [pasteboard dataForType:CPColorPboardType],
-            newColor = [CPKeyedUnarchiver unarchiveObjectWithData:data];
-            
-        if (newColor && [newColor isKindOfClass:[CPColor class]])
-        {
-            [self setColor:newColor];
-            [self sendAction:[self action] to:[self target]];
-            
-            // Activate nicely after drop
-            [self activate:YES];
-            [self unsetThemeState:CPThemeStateHighlighted];
-            
-            return YES;
-        }
-    }
-    
-    return NO;
-}
-
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    if (aType == CPColorPboardType)
-        [aPasteboard setData:[CPKeyedArchiver archivedDataWithRootObject:_color] forType:aType];
-}
-
-- (unsigned)draggingSourceOperationMaskForLocal:(BOOL)isLocal
-{
-    return CPDragOperationCopy;
-}
-
-// MARK: -
-// MARK: Layout
-
-- (CGRect)contentRectForBounds:(CGRect)bounds
-{
-    var contentInset = [self currentValueForThemeAttribute:@"content-inset"];
-    return CGRectInsetByInset(bounds, contentInset);
-}
-
-- (CGRect)bezelRectForBounds:(CGRect)bounds
-{
-    var bezelInset = [self currentValueForThemeAttribute:@"bezel-inset"];
-
-    return CGRectInsetByInset(bounds, bezelInset);
-}
-
-- (CGRect)contentBorderRectForBounds:(CGRect)bounds
-{
-    var contentBorderInset = [self currentValueForThemeAttribute:@"content-border-inset"];
-
-    return CGRectInsetByInset(bounds, contentBorderInset);
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    switch (aName)
-    {
-        case "bezel-view":
-            return [self bezelRectForBounds:[self bounds]];
-        case "content-view":
-            return [self contentRectForBounds:[self bounds]];
-        case "content-border-view":
-            return [self contentBorderRectForBounds:[self bounds]];
-    }
-
-    return [super rectForEphemeralSubviewNamed:aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-
-    [view setHitTests:NO];
-
-    return view;
-}
-
-- (void)layoutSubviews
-{
-    var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
-                                           positioned:CPWindowBelow
-                      relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [bezelView setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-
-    var contentView = [self layoutEphemeralSubviewNamed:@"content-view"
-                                             positioned:CPWindowAbove
-                        relativeToEphemeralSubviewNamed:@"bezel-view"];
-
-    [contentView setBackgroundColor:_color];
-
-    var contentBorderView = [self layoutEphemeralSubviewNamed:@"content-border-view"
-                                                   positioned:CPWindowAbove
-                              relativeToEphemeralSubviewNamed:@"content-view"];
-
-    [contentBorderView setBackgroundColor:[self currentValueForThemeAttribute:@"content-border-color"]];
-}
-
-@end
-
-@implementation CPColorWellValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var placeholderColor = [CPColor blackColor];
-
-    [self _setPlaceholder:placeholderColor forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:placeholderColor forMarker:CPNullMarker isDefault:YES];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source color];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)theBinding
-{
-    [_source setColor:aValue];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setColor:aValue];
-}
-
-@end
-
-var CPColorWellColorKey     = "CPColorWellColorKey",
-    CPColorWellBorderedKey  = "CPColorWellBorderedKey";
-
-@implementation CPColorWell (CPCoding)
-
-/*!
-    Initializes the color well by unarchiving data from \c aCoder.
-    @param aCoder the coder containing the archived CPColorWell.
-*/
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _color = [aCoder decodeObjectForKey:CPColorWellColorKey];
-        [self setBordered:[aCoder decodeBoolForKey:CPColorWellBorderedKey]];
-        [self registerForDraggedTypes:[CPArray arrayWithObject:CPColorPboardType]];
-    }
-
-    return self;
-}
-
-/*!
-    Archives this button into the provided coder.
-    @param aCoder the coder to which the color well's instance data will be written.
-*/
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_color forKey:CPColorWellColorKey];
-    [aCoder encodeObject:[self isBordered] forKey:CPColorWellBorderedKey];
-}
-
-@end

AppKit/CPCompatibility.j

@@ -1,510 +0,0 @@
-/*
- * CPCompatibility.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPEvent_Constants.j"
-@import "CPPlatform.j"
-
-
-// Browser Engines
-CPUnknownBrowserEngine                  = 0;
-CPGeckoBrowserEngine                    = 1 << 0;
-CPInternetExplorerBrowserEngine         = 1 << 1;
-CPKHTMLBrowserEngine                    = 1 << 2;
-CPOperaBrowserEngine                    = 1 << 3;
-CPWebKitBrowserEngine                   = 1 << 4;  // Safari + Chrome
-CPBlinkBrowserEngine                    = 1 << 5;  // Recent Chrome
-CPEdgeBrowserEngine                     = 1 << 6;
-
-// Operating Systems
-CPMacOperatingSystem                    = 0;
-CPWindowsOperatingSystem                = 1;
-CPOtherOperatingSystem                  = 2;
-
-// Features
-CPCSSRGBAFeature                        = 5;
-
-CPHTMLCanvasFeature                     = 6;
-CPHTMLContentEditableFeature            = 7;
-CPHTMLDragAndDropFeature                = 8;
-
-CPJavaScriptInnerTextFeature            = 9;
-CPJavaScriptTextContentFeature          = 10;
-// In onpaste, oncopy and oncut events, the event has an event.clipboardData from which the current pasteboard contents can be read with event.clipboardData.getData.
-CPJavaScriptClipboardEventsFeature      = 11;
-// window.clipboardData exists and can be read and written to at any time using window.clipboardData.getData/setData.
-CPJavaScriptClipboardAccessFeature      = 12;
-CPJavaScriptCanvasDrawFeature           = 13;
-CPJavaScriptCanvasTransformFeature      = 14;
-
-CPVMLFeature                            = 15;
-
-CPJavaScriptRemedialKeySupport          = 16;
-CPJavaScriptShadowFeature               = 20;
-
-CPJavaScriptNegativeMouseWheelValues    = 22;
-CPJavaScriptMouseWheelValues_8_15       = 23;
-
-CPOpacityRequiresFilterFeature          = 24;
-
-// Internet explorer does not allow dynamically changing the type of an input element
-CPInputTypeCanBeChangedFeature          = 25;
-CPHTML5DragAndDropSourceYOffBy1         = 26;
-
-CPSOPDisabledFromFileURLs               = 27;
-
-// element.style.font can be set for an element not in the DOM.
-CPInputSetFontOutsideOfDOM              = 28;
-
-// Input elements have 1 px of extra padding on the left regardless of padding setting.
-CPInput1PxLeftPadding                   = 29;
-CPInputOnInputEventFeature              = 30;
-
-CPFileAPIFeature                        = 31;
-
-CPAltEnterTextAreaFeature               = 32;
-
-CPCSSAnimationFeature                   = 33;
-
-CPBackspaceTriggersPageBack             = 34;
-/*
-    When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
- */
-CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
-
-// The paste event is only sent if an input or textarea has focus.
-CPJavaScriptPasteRequiresEditableTarget = 1 << 1;
-// Redirecting the focus of the browser on keydown to an input for Cmd-V or Ctrl-V makes the paste fail.
-CPJavaScriptPasteCantRefocus            = 1 << 2;
-
-/*
-   Safari calculates incorrect text size unless you set the canvas font even if it is already set
-       You can see the bug after disabling the workaround and opening any panel while typing.
-       You can use the font panel in the manual test for CPTextView.
-       Look out for a displaced cursor, i.e. after typing letters of small width, such as the 'i'.
-       https://bugs.webkit.org/show_bug.cgi?id=150224
- */
-CPTextSizingAlwaysNeedsSetFontBug       = 1 << 3;
-
-
-var USER_AGENT                          = "",
-    PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
-    PLATFORM_FEATURES                   = [],
-    PLATFORM_BUGS                       = 0,
-    PLATFORM_STYLE_JS_PROPERTIES        = {};
-
-// default these features to true
-PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = YES;
-PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = YES;
-PLATFORM_FEATURES[CPAltEnterTextAreaFeature] = YES;
-
-if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
-    USER_AGENT = window.navigator.userAgent;
-
-// Opera
-if (typeof window !== "undefined" && window.opera)
-{
-    PLATFORM_ENGINE |= CPOperaBrowserEngine;
-
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
-}
-
-// Internet Explorer
-else if (typeof window !== "undefined" && (window.attachEvent || (!(window.ActiveXObject) && "ActiveXObject" in window))) // Must follow Opera check.
-{
-    PLATFORM_ENGINE |= CPInternetExplorerBrowserEngine;
-
-    // Features we can only be sure of with IE (no known independent tests)
-    PLATFORM_FEATURES[CPVMLFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
-
-    PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = YES;
-
-    PLATFORM_FEATURES[CPInputTypeCanBeChangedFeature] = NO;
-
-    // Tested in Internet Explore 8 and 9.
-    PLATFORM_FEATURES[CPInputSetFontOutsideOfDOM] = NO;
-
-    // IE allows free clipboard access.
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
-}
-
-// Edge
-else if (USER_AGENT.indexOf("Edge/") != -1)
-{
-    PLATFORM_ENGINE |= CPEdgeBrowserEngine;
-
-    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
-    PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;
-
-    PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = NO;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
-
-    var versionStart = USER_AGENT.indexOf("Edge/") + "Edge/".length,
-        versionEnd = USER_AGENT.indexOf(" ", versionStart),
-        versionString = USER_AGENT.substring(versionStart, versionEnd),
-        versionDivision = versionString.indexOf('.'),
-        majorVersion = parseInt(versionString.substring(0, versionDivision)),
-        minorVersion = parseInt(versionString.substr(versionDivision + 1));
-
-    PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-}
-
-// Safari + Chrome (WebKit and Blink)
-else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
-{
-    PLATFORM_ENGINE |= CPWebKitBrowserEngine;
-
-    // Features we can only be sure of with WebKit (no known independent tests)
-    PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
-    PLATFORM_FEATURES[CPHTMLContentEditableFeature] = YES;
-
-    PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-    PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = NO;
-    PLATFORM_FEATURES[CPJavaScriptShadowFeature] = YES;
-
-    var versionStart = USER_AGENT.indexOf("AppleWebKit/") + "AppleWebKit/".length,
-        versionEnd = USER_AGENT.indexOf(" ", versionStart),
-        versionString = USER_AGENT.substring(versionStart, versionEnd),
-        versionDivision = versionString.indexOf('.'),
-        majorVersion = parseInt(versionString.substring(0, versionDivision)),
-        minorVersion = parseInt(versionString.substr(versionDivision + 1));
-
-    if ((USER_AGENT.indexOf("Safari") !== CPNotFound && (majorVersion > 525 || (majorVersion === 525 && minorVersion > 14))) || USER_AGENT.indexOf("Chrome") !== CPNotFound)
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-
-    // FIXME this is a terrible hack to get around this bug:
-    // https://bugs.webkit.org/show_bug.cgi?id=21548
-    if (![CPPlatform isBrowser])
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-
-    if (majorVersion < 532 || (majorVersion === 532 && minorVersion < 6))
-        PLATFORM_FEATURES[CPHTML5DragAndDropSourceYOffBy1] = YES;
-
-    // This is supposedly fixed in webkit r123603. Seems to work in Chrome 21 but not Safari 6.0.
-    if (majorVersion < 537)
-        PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
-
-    if (USER_AGENT.indexOf("Chrome") === CPNotFound)
-    {
-        PLATFORM_FEATURES[CPSOPDisabledFromFileURLs] = YES;
-        PLATFORM_FEATURES[CPHTMLDragAndDropFeature] = YES;
-        // https://bugs.webkit.org/show_bug.cgi?id=75891
-        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
-        // https://bugs.webkit.org/show_bug.cgi?id=39689
-        PLATFORM_BUGS |= CPJavaScriptPasteCantRefocus;
-        PLATFORM_BUGS |= CPTextSizingAlwaysNeedsSetFontBug;
-    }
-    else if ((window.chrome || (window.Intl && Intl.v8BreakIterator)) && 'CSS' in window)
-        PLATFORM_ENGINE |= CPBlinkBrowserEngine;
-
-    // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
-    if (majorVersion > 533)
-        PLATFORM_BUGS |= CPCanvasParentDrawErrorsOnMovementBug;
-}
-
-// KHTML
-else if (USER_AGENT.indexOf("KHTML") != -1) // Must follow WebKit check.
-{
-    PLATFORM_ENGINE |= CPKHTMLBrowserEngine;
-}
-
-// Gecko
-else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
-{
-    PLATFORM_ENGINE |= CPGeckoBrowserEngine;
-
-    PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
-    PLATFORM_FEATURES[CPBackspaceTriggersPageBack] = YES;
-
-    var index = USER_AGENT.indexOf("Firefox"),
-        version = (index === -1) ? 2.0 : parseFloat(USER_AGENT.substring(index + "Firefox".length + 1));
-
-    if (version >= 3.0)
-        PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
-
-    if (version < 3.0)
-        PLATFORM_FEATURES[CPJavaScriptMouseWheelValues_8_15] = YES;
-
-    if (version >= 66)
-        PLATFORM_FEATURES[CPJavaScriptRemedialKeySupport] = YES;
-
-    // Some day this might be fixed and should be version prefixed. No known fixed version yet.
-    PLATFORM_FEATURES[CPInput1PxLeftPadding] = YES;
-
-    PLATFORM_FEATURES[CPAltEnterTextAreaFeature] = NO;
-    // This was supposed to be added in Firefox 22, but when testing with the latest beta as of 2013-06-14
-    // it does not seem to work. It seems to exhibit the CPJavaScriptPasteRequiresEditableTarget problem,
-    // and in addition doesn't seem to work with our native copy code either.
-    /*if (version >= 22.0)
-    {
-        PLATFORM_FEATURES[CPJavaScriptClipboardEventsFeature] = YES;
-        // TODO File a bug at https://bugzilla.mozilla.org/. In other browsers, one can return "false" from the
-        // beforepaste event to indicate a paste should be enabled even that the DOMEvent.target is not editable.
-        PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
-    }*/
-}
-
-// Feature-specific checks
-if (typeof document != "undefined")
-{
-    var canvasElement = document.createElement("canvas");
-
-    // Detect canvas support
-    if (canvasElement && canvasElement.getContext)
-    {
-        PLATFORM_FEATURES[CPHTMLCanvasFeature] = YES;
-
-        // Any browser that supports canvas supports CSS opacity
-        PLATFORM_FEATURES[CPOpacityRequiresFilterFeature] = NO;
-
-        // Detect canvas setTransform/transform support
-        var context = document.createElement("canvas").getContext("2d");
-
-        if (context && context.setTransform && context.transform)
-            PLATFORM_FEATURES[CPJavaScriptCanvasTransformFeature] = YES;
-    }
-
-    var DOMElement = document.createElement("div");
-
-    // Detect whether we have innerText or textContent (or neither)
-    if (DOMElement.innerText != undefined)
-        PLATFORM_FEATURES[CPJavaScriptInnerTextFeature] = YES;
-    else if (DOMElement.textContent != undefined)
-        PLATFORM_FEATURES[CPJavaScriptTextContentFeature] = YES;
-
-    var DOMInputElement = document.createElement("input");
-
-    if ("oninput" in DOMInputElement)
-        PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
-    else if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("oninput", "return;");
-
-        if (typeof DOMInputElement.oninput === "function")
-            PLATFORM_FEATURES[CPInputOnInputEventFeature] = YES;
-    }
-
-    // Detect FileAPI support
-    if (typeof DOMInputElement.setAttribute === "function")
-    {
-        DOMInputElement.setAttribute("type", "file");
-        PLATFORM_FEATURES[CPFileAPIFeature] = !!DOMInputElement["files"];
-    }
-    else
-        PLATFORM_FEATURES[CPFileAPIFeature] = NO;
-}
-
-function CPFeatureIsCompatible(aFeature)
-{
-    return !!PLATFORM_FEATURES[aFeature];
-}
-
-function CPPlatformHasBug(aBug)
-{
-    return PLATFORM_BUGS & aBug;
-}
-
-function CPBrowserIsEngine(anEngine)
-{
-    return PLATFORM_ENGINE & anEngine;
-}
-
-function CPBrowserIsOperatingSystem(anOperatingSystem)
-{
-    return OPERATING_SYSTEM === anOperatingSystem;
-}
-
-OPERATING_SYSTEM = CPOtherOperatingSystem;
-
-if (USER_AGENT.indexOf("Mac") !== -1)
-{
-    OPERATING_SYSTEM = CPMacOperatingSystem;
-
-    CPPlatformActionKeyMask = CPCommandKeyMask;
-
-    CPUndoKeyEquivalent = @"z";
-    CPRedoKeyEquivalent = @"Z";
-
-    CPUndoKeyEquivalentModifierMask = CPCommandKeyMask;
-    CPRedoKeyEquivalentModifierMask = CPCommandKeyMask;
-}
-else
-{
-    if (USER_AGENT.indexOf("Windows") !== -1)
-        OPERATING_SYSTEM = CPWindowsOperatingSystem;
-
-    CPPlatformActionKeyMask = CPControlKeyMask;
-
-    CPUndoKeyEquivalent = @"z";
-    CPRedoKeyEquivalent = @"y";
-
-    CPUndoKeyEquivalentModifierMask = CPControlKeyMask;
-    CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
-}
-
-/*!
-    Sets a feature with the given value.
-*/
-function CPSetPlatformFeature(aFeature, aBool)
-{
-    PLATFORM_FEATURES[aFeature] = aBool;
-}
-
-/*!
-    Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
-    CPBrowserStyleProperty('transition') -> WebkitTransition
-
-    While technically not a style property, style related event handler names are also supported.
-    CPBrowserStyleProperty('transitionend') -> 'webkitTransitionEnd'
-
-    CSS is only available in platform(dom), so don't rely too heavily on it.
-*/
-function CPBrowserStyleProperty(aProperty)
-{
-    var lowerProperty = aProperty.toLowerCase();
-
-    if (PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] === undefined)
-    {
-        var r = nil;
-
-#if PLATFORM(DOM)
-        var testElement = document.createElement('div');
-
-        switch (lowerProperty)
-        {
-            case 'transitionend':
-                var candidates = {
-                        'WebkitTransition' : 'webkitTransitionEnd',
-                        'MozTransition'    : 'transitionend',
-                        'OTransition'      : 'oTransitionEnd',
-                        'msTransition'     : 'MSTransitionEnd',
-                        'transition'       : 'transitionend'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transition']] || nil;
-                break;
-
-            case 'transformorigin':
-
-                var candidates = {
-                        'WebkitTransform' : 'WebkitTransformOrigin',
-                        'MozTransform'    : 'MozTransformOrigin',
-                        'OTransform'      : 'OTransformOrigin',
-                        'msTransform'     : 'MSTransformOrigin',
-                        'transform'       : 'transformOrigin'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transform']] || nil;
-                break;
-
-            case 'animationend':
-                var candidates = {
-                        'WebkitAnimation' : 'webkitAnimationEnd',
-                        'MozAnimation'    : 'animationend',
-                        'OAnimation'      : 'oAnimationEnd',
-                        'msAnimation'     : 'MSAnimationEnd',
-                        'animation'       : 'animationend'
-                    };
-
-                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['animation']] || nil;
-                break;
-
-            default:
-                var prefixes = ["Webkit", "Moz", "O", "ms"],
-                    strippedProperty = aProperty.split('-').join(' '),
-                    capProperty = [strippedProperty capitalizedString].split(' ').join('');
-
-                for (var i = 0; i < prefixes.length; i++)
-                {
-                    // First check if the property is already valid without being formatted, otherwise try the capitalized property
-                    if (prefixes[i] + aProperty in testElement.style)
-                    {
-                        r = prefixes[i] + aProperty;
-                        break;
-                    }
-                    else if (prefixes[i] + capProperty in testElement.style)
-                    {
-                        r = prefixes[i] + capProperty;
-                        break;
-                    }
-                }
-
-                if (!r && lowerProperty in testElement.style)
-                    r = lowerProperty;
-
-                break;
-        }
-#endif
-
-        PLATFORM_STYLE_JS_PROPERTIES[lowerProperty] = r;
-    }
-
-    return PLATFORM_STYLE_JS_PROPERTIES[lowerProperty];
-}
-
-function CPBrowserCSSProperty(aProperty)
-{
-    var browserProperty = CPBrowserStyleProperty(aProperty);
-
-    if (!browserProperty)
-        return nil;
-
-    var prefixes = {
-            'Webkit': '-webkit-',
-            'Moz': '-moz-',
-            'O': '-o-',
-            'ms': '-ms-'
-        };
-
-    for (var prefix in prefixes)
-    {
-        if (browserProperty.substring(0, prefix.length) == prefix)
-        {
-            var browserPropertyWithoutPrefix = browserProperty.substring(prefix.length),
-                parts = browserPropertyWithoutPrefix.match(/[A-Z][a-z]+/g);
-
-            // If there were any capitalized words in the browserProperty, insert a "-" between each one
-            if (parts && parts.length > 0)
-                browserPropertyWithoutPrefix = parts.join("-");
-
-            return prefixes[prefix] + browserPropertyWithoutPrefix.toLowerCase();
-        }
-    }
-
-    var parts = browserProperty.match(/[A-Z][a-z]+/g);
-
-    if (parts && parts.length > 0)
-        browserProperty = parts.join("-");
-
-    return browserProperty.toLowerCase();
-}
-
-function CPBrowserBackingStorePixelRatio(context)
-{
-    return  context.webkitBackingStorePixelRatio ||
-            context.mozBackingStorePixelRatio ||
-            context.msBackingStorePixelRatio ||
-            context.oBackingStorePixelRatio ||
-            context.backingStorePixelRatio || 1;
-}

AppKit/CPController.j

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

AppKit/CPCookie.j

@@ -1,129 +0,0 @@
-/*
- * CPCookie.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPString.j>
-
-
-/*!
-    @ingroup appkit
-    @class CPCookie
-    CPCookie is the Cappuccino interface to a web browser cookie. You can set the name
-*/
-@implementation CPCookie : CPObject
-{
-    CPString    _cookieName;
-    CPString    _cookieValue;
-
-    CPString    _expires;
-}
-
-@global document
-
-/*!
-    Initializes a cookie with a given name \c aName.
-    @param the name for the cookie
-*/
-- (id)initWithName:(CPString)aName
-{
-    self = [super init];
-
-    _cookieName  = aName;
-    _cookieValue = [self _readCookieValue];
-
-    return self;
-}
-
-/*!
-    Returns the cookie's data value
-*/
-- (CPString)value
-{
-    return _cookieValue;
-}
-
-/*!
-    Returns the cookie's name
-*/
-- (CPString)name
-{
-    return _cookieName;
-}
-
-/*!
-    Returns the cookie's expiration date
-*/
-- (CPString)expires
-{
-    return _expires;
-}
-
-/*!
-    Sets a value, expiration date, and domain for the cookie
-    @param value the cookie's value
-    @param date the cookie's expiration date
-    @param domain the cookie's domain
-*/
-- (void)setValue:(CPString)value expires:(CPDate)date domain:(CPString)domain
-{
-    if (date)
-        var expires = "; expires=" + date.toGMTString();
-    else
-        var expires = "";
-
-    if (domain)
-        domain = "; domain=" + domain;
-    else
-        domain = "";
-
-#if PLATFORM(DOM)
-    document.cookie = _cookieName + "=" + value + expires + "; path=/" + domain;
-#else
-    _cookieValue = value;
-    _expires = expires;
-#endif
-}
-
-/* @ignore */
-- (CPString)_readCookieValue
-{
-#if PLATFORM(DOM)
-    var nameEQ = _cookieName + "=",
-        ca = document.cookie.split(';');
-
-    for (var i = 0; i < ca.length; i++)
-    {
-        var c = ca[i];
-
-        while (c.charAt(0) == ' ')
-            c = c.substring(1, c.length);
-
-        if (c.indexOf(nameEQ) == 0)
-            return c.substring(nameEQ.length, c.length);
-    }
-#endif
-    return "";
-}
-
-@end
-
-//http://www.quirksmode.org/js/cookies.html

AppKit/CPCursor.j

@@ -1,404 +0,0 @@
-/*
-Cursor support by browser:
-    OS X 10.6/Chrome 8       : All
-    OS X 10.6/Safari 5       : All
-    OS X 10.6/Firefox 3      : All except disappearingItemCursor (no url() support)
-    OS X 10.6/Firefox 3.5    : All except disappearingItemCursor (no url() support)
-    OS X 10.6/Firefox 3.6    : All except disappearingItemCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
-    OS X 10.6/Firefox 4.0b10 : All
-    OS X/Opera 9             : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor  (no url() support)
-    OS X/Opera 10            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
-    OS X/Opera 11            : All except disappearingItemCursor, closedHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor (no url() support)
-    Win XP/Chrome 8          : All
-    Win XP/Safari 5          : All
-    Win XP/Firefox 3         : All
-    Win XP/Firefox 3.5       : All
-    Win XP/Firefox 3.6       : All
-    Win XP/Firefox 4.0b10    : All
-    Win XP/Opera 10          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
-    Win XP/Opera 11          : All except disappearingItemCursor, closedHandCursor, openHandCursor, contextualMenuCursor, dragLinkCursor, dragCopyCursor, operationNotAllowedCursor, resizeUpDownCursor, resizeLeftRightCursor (no url() support)
-    Win XP/IE 7              : All
-    Win XP/IE 8              : All
-*/
-
-@import <Foundation/CPObject.j>
-@import "CPImage.j"
-@import "CPCompatibility.j"
-
-@global CPApp
-
-var currentCursor = nil,
-    cursorStack = [],
-    cursors = {},
-    ieCursorMap = {};
-
-@typedef CPCursorPlatform
-CPCursorPlatformNone    = 0;
-CPCursorPlatformMac     = 1;
-CPCursorPlatformWindows = 2;
-CPCursorPlatformBoth    = 3;
-
-@implementation CPCursor : CPObject
-{
-    CPString _cssString @accessors(readonly);
-    CPString _hotSpot @accessors(readonly, getter=hotSpot);
-    CPImage  _image @accessors(readonly, getter=image);
-    BOOL     _isSetOnMouseEntered @accessors(readwrite, getter=isSetOnMouseEntered, setter=setOnMouseEntered:);
-    BOOL     _isSetOnMouseExited @accessors(readwrite, getter=isSetOnMouseExited, setter=setOnMouseExited:);
-}
-
-+ (void)initialize
-{
-    if (self !== CPCursor)
-        return;
-
-    // IE < 9 does not support some CSS cursors, we map them to supported ones
-    ieCursorMap = {
-        "ew-resize":   "e-resize",
-        "ns-resize":   "n-resize",
-        "nesw-resize": "ne-resize",
-        "nwse-resize": "nw-resize"
-    };
-}
-
-- (id)initWithCSSString:(CPString)aString
-{
-    if (self = [super init])
-        _cssString = aString;
-
-    return self;
-}
-
-/*!
-    Init a cursor with the given image and hotspot.
-    hotspot is supported in CSS3 (but not IE).
-*/
-- (id)initWithImage:(CPImage)image hotSpot:(CGPoint)hotSpot
-{
-    _hotSpot = hotSpot;
-    _image = image;
-    return [self initWithCSSString:"url(" + [_image filename] + ")" + hotSpot.x + " " + hotSpot.y + ", auto"];
-}
-
-/*!
-    Init a cursor with the given image and hotspot. This is provided
-    for compliance with Cocoa. Note that foregroundColor and backgroundColor are ignored
-    (as they are in Cocoa). See http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/ApplicationKit/Classes/NSCursor_Class/Reference/Reference.html
-*/
-- (id)initWithImage:(CPImage)image foregroundColorHint:(CPColor)foregroundColor backgroundColorHint:(CPColor)backgroundColor hotSpot:(CGPoint)aHotSpot
-{
-    return [self initWithImage:image hotSpot:aHotSpot];
-}
-
-+ (void)hide
-{
-    [self _setCursorCSS:@"none"]; // Not supported in IE < 9
-}
-
-+ (void)unhide
-{
-    [self _setCursorCSS:[currentCursor _cssString]];
-}
-
-+ (void)setHiddenUntilMouseMoves:(BOOL)flag
-{
-    if (flag)
-        [CPCursor hide];
-    else
-        [CPCursor unhide];
-}
-
-- (void)pop
-{
-    [CPCursor pop];
-}
-
-+ (void)pop
-{
-    if (cursorStack.length > 1)
-    {
-        cursorStack.pop();
-        currentCursor = cursorStack[cursorStack.length - 1];
-    }
-}
-
-- (void)push
-{
-    cursorStack.push(self);
-    currentCursor = self;
-}
-
-- (void)set
-{
-    if (currentCursor === self)
-        return;
-    
-    currentCursor = self;
-
-#if PLATFORM(DOM)
-    [[self class] _setCursorCSS:_cssString];
-#endif
-}
-
-- (void)mouseEntered:(CPEvent)event
-{
-}
-
-- (void)mouseExited:(CPEvent)event
-{
-}
-
-+ (CPCursor)currentCursor
-{
-    return currentCursor;
-}
-
-+ (void)_setCursorCSS:(CPString)aString
-{
-#if PLATFORM(DOM)
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects];
-
-    for (var i = 0, count = [platformWindows count]; i < count; i++)
-        platformWindows[i]._DOMBodyElement.style.cursor = aString;
-#endif
-}
-
-// Internal method that is used to return the system cursors.  Caches the system cursors for performance.
-+ (CPCursor)_nativeSystemCursorWithName:(CPString)cursorName cssString:(CPString)aString
-{
-    var cursor = cursors[cursorName];
-
-    if (typeof cursor === "undefined")
-    {
-        var cssString;
-
-        // IE <= 8 does not support some cursors, map them to supported cursors
-        var ieLessThan9 = CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPFeatureIsCompatible(CPHTMLCanvasFeature);
-
-        if (ieLessThan9)
-            cssString = ieCursorMap[aString] || aString;
-        else
-            cssString = aString;
-
-        cursors[cursorName] = cursor = [[CPCursor alloc] initWithCSSString:cssString];
-    }
-
-    return cursor;
-}
-
-+ (CPCursor)_imageCursorWithName:(CPString)cursorName cssString:(CPString)aString
-{
-    var cursor = cursors[cursorName];
-
-    if (typeof cursor === "undefined")
-    {
-        var themeResourcePath = [[[CPApp themeBlend] bundle] resourcePath],
-            extension = CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) ? @"cur" : @"png",
-            cssString = [CPString stringWithFormat:@"url(%@cursors/%@.%@), %@", themeResourcePath, cursorName, extension, aString];
-
-        cursors[cursorName] = cursor = [[CPCursor alloc] initWithCSSString:cssString];
-    }
-
-    return cursor;
-}
-
-+ (CPCursor)_tryUsingNativeSystemCursorWithName:(CPString)cursorName cssString:(CPString)cssName onPlatform:(CPCursorPlatform)shouldUseNativeCursorOn fallingBackWithImageAndCSSPointer:(CPString)aString
-{
-    var useNativeSystemCursor = (((shouldUseNativeCursorOn == CPCursorPlatformBoth) ||
-                                  ((shouldUseNativeCursorOn == CPCursorPlatformMac) && CPBrowserIsOperatingSystem(CPMacOperatingSystem)) ||
-                                  ((shouldUseNativeCursorOn == CPCursorPlatformWindows) && CPBrowserIsOperatingSystem(CPWindowsOperatingSystem)))
-                                 && [CPCursor _nativeCursorExists:cssName]);
-
-    if (useNativeSystemCursor)
-        return [CPCursor _nativeSystemCursorWithName:cursorName cssString:cssName];
-    else
-        return [CPCursor _imageCursorWithName:cursorName cssString:aString];
-}
-
-+ (BOOL)_nativeCursorExists:(CPString)cursorCSSName
-{
-#if PLATFORM(DOM)
-
-    // FIXME: Trick until FF/Win & Chrome/Win correctly implement context-menu cursor
-    // They will answer that they implement it but they actually don't
-
-    if ([cursorCSSName isEqualToString:@"context-menu"] && CPBrowserIsOperatingSystem(CPWindowsOperatingSystem) && !CPBrowserIsEngine(CPInternetExplorerBrowserEngine) && !CPBrowserIsEngine(CPEdgeBrowserEngine))
-        return NO;
-
-    // Normal usage : try to set the cursor and check if resulting cursor is the one we tried to set.
-    // If yes, then the browser implements the cursor. If no (and usually we get "default"), then it doesn't.
-
-    var platformWindows = [[CPPlatformWindow visiblePlatformWindows] allObjects],
-        count = [platformWindows count];
-
-    if (count > 0)
-    {
-        var currentPlatformCursor = platformWindows[0]._DOMBodyElement.style.cursor;
-        platformWindows[0]._DOMBodyElement.style.cursor = cursorCSSName;
-        var doesExist = (platformWindows[0]._DOMBodyElement.style.cursor == cursorCSSName);
-        platformWindows[0]._DOMBodyElement.style.cursor = currentPlatformCursor;
-
-        return doesExist;
-    }
-#endif
-
-    return NO;
-}
-
-+ (CPCursor)arrowCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"default"];
-}
-
-+ (CPCursor)crosshairCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"crosshair"];
-}
-
-+ (CPCursor)IBeamCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"text"];
-}
-
-+ (CPCursor)pointingHandCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"pointer"];
-}
-
-+ (CPCursor)resizeNorthwestCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nw-resize"];
-}
-
-+ (CPCursor)resizeNorthwestSoutheastCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nwse-resize"];
-}
-
-+ (CPCursor)resizeNortheastCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ne-resize"];
-}
-
-+ (CPCursor)resizeNortheastSouthwestCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"nesw-resize"];
-}
-
-+ (CPCursor)resizeSouthwestCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"sw-resize"];
-}
-
-+ (CPCursor)resizeSoutheastCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"se-resize"];
-}
-
-+ (CPCursor)resizeDownCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"s-resize"];
-}
-
-+ (CPCursor)resizeUpCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"n-resize"];
-}
-
-+ (CPCursor)resizeLeftCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"w-resize"];
-}
-
-+ (CPCursor)resizeRightCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"e-resize"];
-}
-
-+ (CPCursor)resizeLeftRightCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"col-resize"];
-}
-
-+ (CPCursor)resizeEastWestCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ew-resize"];
-}
-
-+ (CPCursor)resizeUpDownCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"row-resize"];
-}
-
-+ (CPCursor)resizeNorthSouthCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"ns-resize"];
-}
-
-+ (CPCursor)operationNotAllowedCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"not-allowed"];
-}
-
-+ (CPCursor)dragCopyCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"copy"];
-}
-
-+ (CPCursor)dragLinkCursor
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"alias"];
-}
-
-+ (CPCursor)contextualMenuCursor
-{
-    return [CPCursor _tryUsingNativeSystemCursorWithName:CPStringFromSelector(_cmd)
-                                               cssString:@"context-menu"
-                                              onPlatform:CPCursorPlatformBoth
-                       fallingBackWithImageAndCSSPointer:@"default"];
-}
-
-+ (CPCursor)openHandCursor
-{
-    return [CPCursor _tryUsingNativeSystemCursorWithName:CPStringFromSelector(_cmd)
-                                               cssString:@"grab"
-                                              onPlatform:CPCursorPlatformMac
-                       fallingBackWithImageAndCSSPointer:@"default"];
-}
-
-+ (CPCursor)closedHandCursor
-{
-    return [CPCursor _tryUsingNativeSystemCursorWithName:CPStringFromSelector(_cmd)
-                                               cssString:@"grabbing"
-                                              onPlatform:CPCursorPlatformMac
-                       fallingBackWithImageAndCSSPointer:@"default"];
-}
-
-+ (CPCursor)disappearingItemCursor
-{
-    return [CPCursor _imageCursorWithName:CPStringFromSelector(_cmd) cssString:@"default"];
-}
-
-+ (CPCursor)IBeamCursorForVerticalLayout
-{
-    return [CPCursor _nativeSystemCursorWithName:CPStringFromSelector(_cmd) cssString:@"vertical-text"];
-}
-
-@end
-
-@implementation CPCursor(CPCoding)
-
-- (id)initWithCoder:(CPCoder)coder
-{
-    if (self = [super init])
-        _cssString = [coder decodeObjectForKey:@"CPCursorNameKey"];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)coder
-{
-    [coder encodeObject:_cssString forKey:@"CPCursorNameKey"];
-}
-
-@end

AppKit/CPDatePicker/CPDatePicker.j

@@ -1,837 +0,0 @@
-/* CPDatePicker.j
-* AppKit
-*
-* Created by Alexandre Wilhelm 
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import "CPControl.j"
-@import "CPFont.j"
-@import "CPTextField.j"
-@import "_CPDatePickerTextField.j"
-@import "_CPDatePickerCalendar.j"
-
-@import <Foundation/CPArray.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPDate.j>
-@import <Foundation/CPLocale.j>
-@import <Foundation/CPTimeZone.j>
-
-@class CPStepper
-@class CPApp
-
-@global CPLocaleLanguageCode
-@global CPDateFormatterShortStyle
-
-var CPDatePicker_validateProposedDateValue_timeInterval = 1 << 1;
-
-CPSingleDateMode = 0;
-CPRangeDateMode = 1;
-
-CPTextFieldAndStepperDatePickerStyle    = 0;
-CPClockAndCalendarDatePickerStyle       = 1;
-CPTextFieldDatePickerStyle              = 2;
-
-CPHourMinuteDatePickerElementFlag       = 0x000c;
-CPHourMinuteSecondDatePickerElementFlag = 0x000e;
-CPTimeZoneDatePickerElementFlag         = 0x0010;
-CPYearMonthDatePickerElementFlag        = 0x00c0;
-CPYearMonthDayDatePickerElementFlag     = 0x00e0;
-CPEraDatePickerElementFlag              = 0x0100;
-
-/*!
-    @ingroup appkit
-    This control displays a datepicker in a Cappuccino application
-*/
-@implementation CPDatePicker : CPControl
-{
-    BOOL                    _isBordered         @accessors(getter=isBordered, setter=setBordered:);
-    BOOL                    _isBezeled          @accessors(getter=isBezeled, setter=setBezeled:);
-    BOOL                    _drawsBackground    @accessors(property=drawsBackground);
-    CPDate                  _dateValue          @accessors(property=dateValue);
-    CPDate                  _minDate            @accessors(property=minDate);
-    CPDate                  _maxDate            @accessors(property=maxDate);
-    CPFont                  _textFont           @accessors(property=textFont);
-    CPLocale                _locale             @accessors(property=locale);
-    //CPCalendar            _calendar           @accessors(property=calendar);
-    CPTimeZone              _timeZone           @accessors(property=timeZone);
-    id                      _delegate           @accessors(property=delegate);
-    CPInteger               _datePickerElements @accessors(property=datePickerElements);
-    CPInteger               _datePickerMode     @accessors(property=datePickerMode);
-    CPInteger               _datePickerStyle    @accessors(property=datePickerStyle);
-    CPInteger               _timeInterval       @accessors(property=timeInterval);
-
-    BOOL                    _invokedByUserEvent;
-    unsigned                _implementedCDatePickerDelegateMethods;
-    BOOL                    _isTextual;
-    id                      _datePickerComponent;
-}
-
-
-// MARK: -
-// MARK: Theme methods
-
-+ (CPString)defaultThemeClass
-{
-    return @"datePicker";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPColor clearColor],
-            @"border-width" : 1.0,
-            @"border-color": [CPColor clearColor],
-            @"content-inset": CGInsetMakeZero(),
-            @"bezel-inset": CGInsetMakeZero(),
-            @"datepicker-textfield-bezel-color": [CPColor clearColor],
-            @"min-size-datepicker-textfield": CGSizeMakeZero(),
-            @"content-inset-datepicker-textfield": CGInsetMakeZero(),
-            @"content-inset-datepicker-textfield-separator": CGInsetMakeZero(),
-            @"separator-content-inset": CGInsetMakeZero(),
-            @"date-hour-margin": 5.0,
-            @"stepper-margin": 5.0,
-            @"bezel-color-calendar": [CPColor clearColor],
-            @"title-text-color": [CPColor blackColor],
-            @"title-text-shadow-color": [CPColor clearColor],
-            @"title-text-shadow-offset": CGSizeMakeZero(),
-            @"title-font": [CPNull null],
-            @"weekday-text-color": [CPColor blackColor],
-            @"weekday-text-shadow-color": [CPColor clearColor],
-            @"weekday-text-shadow-offset": CGSizeMakeZero(),
-            @"weekday-font": [CPNull null],
-            @"arrow-image-left": [CPNull null],
-            @"arrow-image-right": [CPNull null],
-            @"arrow-image-left-highlighted": [CPNull null],
-            @"arrow-image-right-highlighted": [CPNull null],
-            @"arrow-inset": CGInsetMakeZero(),
-            @"circle-image": [CPNull null],
-            @"circle-image-highlighted": [CPNull null],
-            @"tile-text-color": [CPColor blackColor],
-            @"tile-text-shadow-color": [CPColor clearColor],
-            @"tile-text-shadow-offset": CGSizeMakeZero(),
-            @"tile-font": [CPNull null],
-            @"size-tile": CGSizeMakeZero(),
-            @"size-calendar": CGSizeMakeZero(),
-            @"size-header": CGSizeMakeZero(),
-            @"min-size-calendar": CGSizeMakeZero(),
-            @"max-size-calendar": CGSizeMakeZero(),
-            @"bezel-color-clock": [CPColor clearColor],
-            @"clock-text-color": [CPColor blackColor],
-            @"clock-text-shadow-color": [CPColor clearColor],
-            @"clock-text-shadow-offset": CGSizeMakeZero(),
-            @"clock-font": [CPNull null],
-            @"second-hand-image": [CPNull null],
-            @"hour-hand-image": [CPNull null],
-            @"middle-hand-image": [CPNull null],
-            @"minute-hand-image": [CPNull null],
-            @"size-clock": CGSizeMakeZero(),
-            @"second-hand-size": CGSizeMakeZero(),
-            @"hour-hand-size": CGSizeMakeZero(),
-            @"middle-hand-size": CGSizeMakeZero(),
-            @"minute-hand-size": CGSizeMakeZero(),
-            @"previous-button-size": CGSizeMakeZero(),
-            @"current-button-size": CGSizeMakeZero(),
-            @"next-button-size": CGSizeMakeZero(),
-            @"title-inset": [CPNull null],
-            @"day-label-inset": [CPNull null],
-            @"tile-content-inset": CGInsetMakeZero(),
-            @"tile-margin": [CPNull null],
-            @"tile-inset": CGInsetMakeZero(),
-            @"separator-color": [CPNull null],
-            @"separator-margin-width": 0,
-            @"separator-height": 0,
-            @"bezel-color-calendar-left": [CPNull null],
-            @"bezel-color-calendar-middle": [CPNull null],
-            @"bezel-color-calendar-right": [CPNull null],
-            @"tile-vertical-alignment": CPCenterVerticalTextAlignment,
-            @"tile-text-alignment": CPCenterTextAlignment,
-            @"hour-ampm-margin": 2,
-            @"time-separator-content-inset": CGInsetMakeZero(),
-            @"clock-second-hand-over": NO,
-            @"clock-draws-hours": NO,
-            @"clock-hours-font": [CPNull null],
-            @"clock-hours-text-color": [CPColor clearColor],
-            @"clock-hours-radius": 0,
-            @"calendar-clock-margin": 10,
-            @"clock-only-nib2cib-adjustment-frame": CPRectMakeZero(),
-            @"uses-focus-ring": NO
-    };
-}
-
-
-// MARK: -
-// MARK: Binding methods
-
-+ (Class)_binderClassForBinding:(CPString)theBinding
-{
-    if (theBinding == CPValueBinding || theBinding == CPMinValueBinding || theBinding == CPMaxValueBinding)
-        return [_CPDatePickerValueBinder class];
-
-    return [super _binderClassForBinding:theBinding];
-}
-
-- (CPString)_replacementKeyPathForBinding:(CPString)aBinding
-{
-    if (aBinding == CPValueBinding)
-        return @"dateValue";
-
-    if (aBinding == CPMinValueBinding)
-        return @"minDate";
-
-    if (aBinding == CPMaxValueBinding)
-        return @"maxDate";
-
-    return [super _replacementKeyPathForBinding:aBinding];
-}
-
-
-// MARK: -
-// MARK: Init methods
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _drawsBackground = YES;
-        _datePickerStyle = CPTextFieldAndStepperDatePickerStyle;
-        _datePickerMode = CPSingleDateMode;
-        _datePickerElements = CPYearMonthDayDatePickerElementFlag | CPHourMinuteSecondDatePickerElementFlag;
-        _timeInterval = 0;
-        _implementedCDatePickerDelegateMethods = 0;
-
-        [self setObjectValue:[CPDate date]];
-        _minDate = [CPDate distantPast];
-        _maxDate = [CPDate distantFuture];
-
-        [self setBezeled:YES];
-        [self setBordered:YES];
-
-        [self _init];
-    }
-
-    return self
-}
-
-- (void)_init
-{
-    if (!_locale)
-        _locale = [CPLocale currentLocale];
-
-    _datePickerComponent = nil;
-
-    [self _createComponents];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-- (void)_createComponents
-{
-    _isTextual = (_datePickerStyle == CPTextFieldAndStepperDatePickerStyle) || (_datePickerStyle == CPTextFieldDatePickerStyle);
-
-    if (_datePickerComponent)
-    {
-        [_datePickerComponent removeFromSuperview];
-
-        _datePickerComponent = nil;
-    }
-
-    _datePickerComponent = [[(_isTextual ? _CPDatePickerTextField : _CPDatePickerCalendar) alloc] initWithFrame:[self bounds] withDatePicker:self];
-
-    [_datePickerComponent setDateValue:_dateValue];
-    [_datePickerComponent setControlSize:[self controlSize]];
-    [_datePickerComponent setDatePickerElements:_datePickerElements];
-
-    // FIXME: Don't know why but next line will cause theme compilation to fail...
-    // Workaround: added "if PLATFORM(DOM)"
-#if PLATFORM(DOM)
-    [_datePickerComponent setEnabled:[self isEnabled]];
-#endif
-
-    if (_isTextual)
-        // We need to transmit text color to the text field version (Cocoa doesn't permit adapting the calendar view text color)
-        [_datePickerComponent setTextColor:[self textColor]];
-
-    [self addSubview:_datePickerComponent];
-}
-
-
-// MARK: -
-// MARK: Control Size
-
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    [super setControlSize:aControlSize];
-
-    [_datePickerComponent setControlSize:aControlSize];
-
-    if (_isTextual)
-        [self _sizeToControlSize];
-}
-
-
-// MARK: -
-// MARK: Delegate methods
-
-/*! Set the delegate of the datePicker
-    @param aDelegate delegate of the datePicker
-*/
-- (void)setDelegate:(id)aDelegate
-{
-    _delegate = aDelegate;
-    _implementedCDatePickerDelegateMethods = 0;
-
-    // Look if the delegate implements or not the delegate methods
-    if ([_delegate respondsToSelector:@selector(datePicker:validateProposedDateValue:timeInterval:)])
-        _implementedCDatePickerDelegateMethods |= CPDatePicker_validateProposedDateValue_timeInterval;
-}
-
-
-// MARK: -
-// MARK: Layout method
-
-/*! Layout the subviews
-*/
-- (void)layoutSubviews
-{
-    [_datePickerComponent setNeedsLayout];
-    [_datePickerComponent setNeedsDisplay:YES];
-}
-
-// MARK: -
-// MARK: Setter
-
-/*! Return the objectValue of the datePicker. The objectValue should take the timeZoneEffect
-*/
-- (id)objectValue
-{
-    // TODO : add timeZone effect. How to do it because js ???
-    return _dateValue
-}
-
-/*! Set the objectValue of the datePicker. It has to be a CPDate
-    @param aDateValue the dateValue
-*/
-- (void)setObjectValue:(CPDate)aValue
-{
-    if (![aValue isKindOfClass:[CPDate class]])
-        return;
-
-    [self setDateValue:aValue];
-}
-
-/* Set the dateValue of the datePicker
-    @param aDateValue the dateValue
-*/
-- (void)setDateValue:(CPDate)aDateValue
-{
-    if (aDateValue == nil)
-        return;
-
-    _invokedByUserEvent = NO;
-    [self _setDateValue:aDateValue timeInterval:_timeInterval];
-}
-
-/*! Set the dateValue and the timeInterval. This method checks the min and max date of the datePicker also. It will call the delegate if possible.
-    @param aDateValue the dateValue
-    @param aTimeInterval the timeInterval
-*/
-- (void)_setDateValue:(CPDate)aDateValue timeInterval:(CPTimeInterval)aTimeInterval
-{
-    // Make sure to have a valid date and avoid NaN values
-    if (!isFinite(aDateValue))
-    {
-        [CPException raise:CPInvalidArgumentException
-                    reason:@"aDateValue is not valid"];
-        return;
-    }
-
-    if (_minDate)
-        aDateValue = new Date (MAX(aDateValue, _minDate));
-
-    if (_maxDate)
-        aDateValue = new Date (MIN(aDateValue, _maxDate));
-
-    aTimeInterval = MAX(MIN(aTimeInterval, [_maxDate timeIntervalSinceDate:aDateValue]), [_minDate timeIntervalSinceDate:aDateValue]);
-
-    if ([aDateValue isEqualToDate:_dateValue] && aTimeInterval == _timeInterval)
-    {
-        [_datePickerComponent setDateValue:_dateValue];
-
-        return;
-    }
-
-    if (_implementedCDatePickerDelegateMethods & CPDatePicker_validateProposedDateValue_timeInterval)
-    {
-        // constrain timeInterval also
-        var aStartDateRef = function(x){if (typeof x == 'undefined') return aDateValue; aDateValue = x;};
-        var aTimeIntervalRef = function(x){if (typeof x == 'undefined') return aTimeInterval; aTimeInterval = x;};
-
-        [_delegate datePicker:self validateProposedDateValue:aStartDateRef timeInterval:aTimeIntervalRef];
-    }
-
-    [self willChangeValueForKey:@"objectValue"];
-    [self willChangeValueForKey:@"dateValue"];
-    _dateValue = aDateValue;
-    [super setObjectValue:_dateValue];
-    [self didChangeValueForKey:@"objectValue"];
-    [self didChangeValueForKey:@"dateValue"];
-
-    [self willChangeValueForKey:@"timeInterval"];
-    _timeInterval = (_datePickerMode == CPSingleDateMode)? 0 : aTimeInterval;
-    [self didChangeValueForKey:@"timeInterval"];
-
-    if (_invokedByUserEvent)
-        [self sendAction:[self action] to:[self target]];
-
-    [_datePickerComponent setDateValue:_dateValue];
-}
-
-/*! Set the minDate of the datePicker
-    @param aMinDate the minDate
-*/
-- (void)setMinDate:(CPDate)aMinDate
-{
-    if (_minDate === aMinDate)
-        return;
-
-    [self willChangeValueForKey:@"minDate"];
-    _minDate = aMinDate;
-    [self didChangeValueForKey:@"minDate"];
-
-    [self _setDateValue:_dateValue timeInterval:_timeInterval];
-}
-
-/*! Set the maxDate of the datePicker
-    @param aMaxDate the maxDate
-*/
-- (void)setMaxDate:(CPDate)aMaxDate
-{
-    if (_maxDate === aMaxDate)
-        return;
-
-    [self willChangeValueForKey:@"maxDate"];
-    _maxDate = aMaxDate;
-    [self didChangeValueForKey:@"maxDate"];
-
-    [self _setDateValue:_dateValue timeInterval:_timeInterval];
-}
-
-/*! Set the syle of the datePicker
-    @param aDatePickerStyle the datePicker style
-*/
-- (void)setDatePickerStyle:(CPInteger)aDatePickerStyle
-{
-    if (_datePickerStyle === aDatePickerStyle)
-        return;
-
-    _datePickerStyle = aDatePickerStyle;
-
-    // This is needed in order to specify different theme attributes values for textual / graphical date picker
-    if (_datePickerStyle === CPClockAndCalendarDatePickerStyle)
-        [self setThemeState:CPThemeStateAlternateState];
-    else
-        [self unsetThemeState:CPThemeStateAlternateState];
-
-    // This is needed in order to specify different theme attributes values for with / without stepper textual date picker
-    if (_datePickerStyle === CPTextFieldAndStepperDatePickerStyle)
-        [self setThemeState:CPThemeStateComposedControl];
-    else
-        [self unsetThemeState:CPThemeStateComposedControl];
-
-    [self setControlSize:[self controlSize]];
-
-    if (_datePickerComponent)
-    {
-        // We already have a component so we need to update it
-        [_datePickerComponent resignFirstResponder];
-        [self _createComponents];
-    }
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*! Set the elements of the datePicker
-    @param aDatePickerElements the datePicker elements
-*/
-- (void)setDatePickerElements:(CPInteger)aDatePickerElements
-{
-    if (_datePickerElements === aDatePickerElements)
-        return;
-
-    _datePickerElements = aDatePickerElements;
-
-    // Notify the component of the new value
-    [_datePickerComponent setDatePickerElements:_datePickerElements];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*! Set the mode of the datePicker
-    @param aDatePickerMode the datePicker mode
-*/
-- (void)setDatePickerMode:(CPInteger)aDatePickerMode
-{
-    if (_datePickerMode === aDatePickerMode)
-        return;
-
-    _datePickerMode = aDatePickerMode;
-
-    if (_datePickerMode == CPSingleDateMode)
-        [self _setDateValue:[self dateValue] timeInterval:0];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*! Set the timeInterval of the datePicker
-    @param aTimeInterval the timeInterval of the datePicker
-*/
-- (void)setTimeInterval:(CPInteger)aTimeInterval
-{
-    if (_datePickerMode == CPSingleDateMode)
-        return;
-
-    [self _setDateValue:[self dateValue] timeInterval:aTimeInterval];
-}
-
-/*! Set the locale of the datePicker. This update laso the locale of the formatter.
-    @param aLocale the locale
-*/
-- (void)setLocale:(CPLocale)aLocale
-{
-    if (_locale === aLocale)
-        return;
-
-    _locale = aLocale;
-
-    if (_formatter)
-    {
-        [self willChangeValueForKey:@"locale"];
-        [_formatter setLocale:_locale];
-        [self didChangeValueForKey:@"locale"];
-    }
-
-    // This will update the textFields (usefull when changing with a date with pm and am)
-    if (_isTextual)
-        [_datePickerComponent setDateValue:_dateValue];
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-/*!
-    Sets whether the datepicker will have a bezeled border.
-    @param shouldBeBezeled \c YES means the datepicker will draw a bezeled border
-*/
-- (void)setBezeled:(BOOL)shouldBeBezeled
-{
-    if (_isBezeled === shouldBeBezeled)
-        return;
-
-    _isBezeled = shouldBeBezeled;
-
-    if (shouldBeBezeled)
-        [self setThemeState:CPThemeStateBezeled];
-    else
-        [self unsetThemeState:CPThemeStateBezeled];
-}
-
-/*!
-    Sets whether the datepicker will have a border drawn. (actually it does nothing)
-    @param shouldBeBordered \c YES makes the datepicker draw a border
-*/
-- (void)setBordered:(BOOL)shouldBeBordered
-{
-    if (_isBordered === shouldBeBordered)
-        return;
-
-    _isBordered = shouldBeBordered;
-
-    if (shouldBeBordered)
-        [self setThemeState:CPThemeStateBordered];
-    else
-        [self unsetThemeState:CPThemeStateBordered];
-}
-
-/*!
-    Sets the font of the control.
-    @param aFont
-*/
-- (void)setTextFont:(CPFont)aFont
-{
-    [self setFont:aFont];
-
-    if (_isTextual)
-        [_datePickerComponent setTextFont:aFont];
-}
-
-/*!
- Sets the color of the control.
- @param aColor
- */
-- (void)setTextColor:(CPColor)aColor
-{
-    [super setTextColor:aColor];
-
-    if (_isTextual)
-        [_datePickerComponent setTextColor:aColor];
-    // REM: in Cocoa, setTextColor has no effect on calendar view
-}
-
-/*! Sets the enabled status of the control. Controls that are not enabled can not be used by the user and obtain the CPThemeStateDisabled theme state.
-    @param a boolean. YES if the control should be enabled, otherwise NO.
-*/
-- (void)setEnabled:(BOOL)aBoolean
-{
-    [super setEnabled:aBoolean];
-
-    [_datePickerComponent setEnabled:aBoolean];
-
-    if (!aBoolean)
-        [self resignFirstResponder];
-}
-
-/*! Set the background color of the datePicker
-    @param aColor
-*/
-- (void)setBackgroundColor:(CPColor)aColor
-{
-    _backgroundColor = aColor;
-    [self setNeedsLayout];
-}
-
-/*! Set the boolean drawsBackgroundColor
-    @param aBoolean
-*/
-- (void)setDrawsBackground:(BOOL)aBoolean
-{
-    if (_drawsBackground === aBoolean)
-        return;
-
-    [self willChangeValueForKey:@"drawsBackground"];
-    _drawsBackground = aBoolean;
-    [self didChangeValueForKey:@"drawsBackground"];
-
-    [self setNeedsLayout];
-}
-
-/*! Set the timeZone
-    @param aTimeZone
-*/
-- (void)setTimeZone:(CPTimeZone)aTimeZone
-{
-    if (_timeZone === aTimeZone)
-        return;
-
-    [self willChangeValueForKey:@"timeZone"];
-    _timeZone = aTimeZone;
-    [self didChangeValueForKey:@"timeZone"];
-
-    [self setNeedsLayout];
-
-    [_datePickerComponent setDateValue:_dateValue];
-}
-
-
-// MARK: -
-// MARK: First responder methods
-
-/*! Return YES if style is set to CPTextFieldAndStepperDatePickerStyle or CPTextFieldDatePickerStyle
-*/
-- (BOOL)becomeFirstResponder
-{
-    if (_isTextual)
-    {
-        if (![super becomeFirstResponder])
-            return NO;
-
-        [_datePickerComponent _selectTextFieldWithFlags:[[CPApp currentEvent] modifierFlags]];
-
-        return YES;
-    }
-
-    return NO;
-}
-
-/*! Return YES
-*/
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-/*! Return YES
-*/
-- (BOOL)resignFirstResponder
-{
-    if (_isTextual)
-        [_datePickerComponent resignFirstResponder];
-
-    return YES;
-}
-
-
-// MARK: -
-// MARK: getter
-
-/*!
-    Returns \c YES if the textfield is bezeled.
-*/
-- (BOOL)isBezeled
-{
-    return [self hasThemeState:CPThemeStateBezeled];
-}
-
-/*!
-    Returns \c YES if the textfield has a border.
-*/
-- (BOOL)isBordered
-{
-    return [self hasThemeState:CPThemeStateBordered];
-}
-
-/*!
-    Returns the font of the control.
-*/
-- (CPFont)textFont
-{
-    return [self font];
-}
-
-/*! Check if we are in the american format or not. Depending on the locale
-*/
-- (BOOL)_isAmericanFormat
-{
-    return [[_locale objectForKey:CPLocaleCountryCode] isEqualToString:@"US"];
-}
-
-// MARK: -
-// MARK: Key event
-
-/*! Key down event
-    @param anEvent
-*/
-- (void)keyDown:(CPEvent)anEvent
-{
-    if (_isTextual)
-        [_datePickerComponent keyDown:anEvent];
-}
-
-@end
-
-var CPDatePickerModeKey         = @"CPDatePickerModeKey",
-    CPIntervalKey               = @"CPIntervalKey",
-    CPMinDateKey                = @"CPMinDateKey",
-    CPMaxDateKey                = @"CPMaxDateKey",
-    CPBackgroundColorKey        = @"CPBackgroundColorKey",
-    CPDrawsBackgroundKey        = @"CPDrawsBackgroundKey",
-    CPTextFontKey               = @"CPTextFontKey",
-    CPDatePickerElementsKey     = @"CPDatePickerElementsKey",
-    CPDatePickerStyleKey        = @"CPDatePickerStyleKey",
-    CPLocaleKey                 = @"CPLocaleKey",
-    CPBorderedKey               = @"CPBorderedKey",
-    CPDateValueKey              = @"CPDateValueKey";
-
-@implementation CPDatePicker (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-        _backgroundColor = [aCoder decodeObjectForKey:CPBackgroundColorKey];
-        [self setBordered:[aCoder decodeBoolForKey:CPBorderedKey]];
-        [self setDrawsBackground:[aCoder decodeBoolForKey:CPDrawsBackgroundKey]];
-
-        [self setDatePickerElements:[aCoder decodeIntForKey:CPDatePickerElementsKey]];
-        [self setDatePickerMode:[aCoder decodeIntForKey:CPDatePickerModeKey]];
-        [self setDatePickerStyle:[aCoder decodeIntForKey:CPDatePickerStyleKey]];
-        [self setMinDate:[aCoder decodeObjectForKey:CPMinDateKey] || [CPDate distantPast]];
-        [self setMaxDate:[aCoder decodeObjectForKey:CPMaxDateKey] || [CPDate distantFuture]];
-        [self setLocale:[aCoder decodeObjectForKey:CPLocaleKey]];
-
-        [self _init];
-
-        [self setTextFont:[aCoder decodeObjectForKey:CPTextFontKey]];
-        [self setTimeInterval:[aCoder decodeDoubleForKey:CPIntervalKey]];
-        [self setDateValue:[aCoder decodeObjectForKey:CPDateValueKey]];
-    }
-
-    return self
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // Before encoding, we remove all subviews as we'll recreate them at loading
-    while ([[self subviews] count] > 0)
-        [[[self subviews] lastObject] removeFromSuperview];
-
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeDouble:_timeInterval forKey:CPIntervalKey];
-    [aCoder encodeInt:_datePickerMode forKey:CPDatePickerModeKey];
-    [aCoder encodeInt:_datePickerStyle forKey:CPDatePickerStyleKey];
-    [aCoder encodeInt:_datePickerElements forKey:CPDatePickerElementsKey];
-    [aCoder encodeObject:_minDate forKey:CPMinDateKey];
-    [aCoder encodeObject:_maxDate forKey:CPMaxDateKey];
-    [aCoder encodeObject:_dateValue forKey:CPDateValueKey];
-    [aCoder encodeObject:_textFont forKey:CPTextFontKey];
-    [aCoder encodeObject:_locale forKey:CPLocaleKey];
-    [aCoder encodeObject:_backgroundColor forKey:CPBackgroundColorKey];
-    [aCoder encodeObject:_drawsBackground forKey:CPDrawsBackgroundKey];
-    [aCoder encodeObject:_isBordered forKey:CPBorderedKey];
-
-}
-
-@end
-
-// FIXME: add support for CPEditorRegistrationProtocol as implemented for CPTextField
-@implementation _CPDatePickerValueBinder : CPBinder
-{
-}
-
-@end
-
-@implementation CPDate (CPDatePickerAdditions)
-
-- (int)_daysInMonth
-{
-    return 32 - new Date(self.getFullYear(), self.getMonth(), 32).getDate();
-}
-
-- (void)_resetToMidnight
-{
-    self.setHours(0);
-    self.setMinutes(0);
-    self.setSeconds(0);
-    self.setMilliseconds(0);
-}
-
-- (void)_resetToLastSeconds
-{
-    self.setHours(23);
-    self.setMinutes(59);
-    self.setSeconds(59);
-    self.setMilliseconds(99);
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerBox.j

@@ -1,98 +0,0 @@
-/* _CPDatePickerBox.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/Foundation.j>
-@import "CPView.j"
-
-@class CPDatePicker
-
-@implementation _CPDatePickerBox : CPView
-{
-    CPDatePicker _datePicker @accessors(property=datePicker);
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    [super drawRect:aRect];
-
-    if ([_datePicker isCSSBased])
-        return;
-
-    if ([_datePicker isBordered])
-    {
-        var context = [[CPGraphicsContext currentContext] graphicsPort],
-            borderWidth = [_datePicker valueForThemeAttribute:@"border-width"] / 2;
-
-        CGContextBeginPath(context);
-        CGContextSetStrokeColor(context, [_datePicker valueForThemeAttribute:@"border-color" inState:[_datePicker themeState]]);
-        CGContextSetLineWidth(context,  [_datePicker valueForThemeAttribute:@"border-width"]);
-
-        CGContextMoveToPoint(context, borderWidth, borderWidth);
-        CGContextAddLineToPoint(context, aRect.size.width - borderWidth, borderWidth);
-        CGContextAddLineToPoint(context, aRect.size.width - borderWidth, aRect.size.height - borderWidth);
-        CGContextAddLineToPoint(context, borderWidth, aRect.size.height - borderWidth);
-        CGContextAddLineToPoint(context, borderWidth,borderWidth);
-
-        CGContextStrokePath(context);
-        CGContextClosePath(context);
-    }
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    if (aName === "bezel-view")
-        return [self bounds];
-
-    return [super rectForEphemeralSubviewNamed:aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    if (aName === "bezel-view")
-    {
-        var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-
-        [view setHitTests:NO];
-
-        return view;
-    }
-
-    return [super createEphemeralSubviewNamed:aName];
-}
-
-- (void)layoutSubviews
-{
-    if ([_datePicker isCSSBased])
-    {
-        var bezelView = [self layoutEphemeralSubviewNamed:@"bezel-view"
-                                               positioned:CPWindowBelow
-                          relativeToEphemeralSubviewNamed:nil];
-
-        [bezelView setBackgroundColor:[_datePicker currentValueForThemeAttribute:@"bezel-color"]];
-    }
-
-    if ([_datePicker drawsBackground])
-        [self setBackgroundColor:[_datePicker backgroundColor]];
-    else
-        [self setBackgroundColor:[CPColor clearColor]];
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerCalendar.j

@@ -1,302 +0,0 @@
-/* _CPDatePickerCalendar.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/Foundation.j>
-
-@import "_CPDatePickerClock.j"
-@import "_CPDatePickerBox.j"
-@import "_CPDatePickerMonthView.j"
-@import "_CPDatePickerHeaderView.j"
-
-@class CPDatePicker
-
-@global CPApp
-@global CPHourMinuteDatePickerElementFlag
-@global CPHourMinuteSecondDatePickerElementFlag
-@global CPTimeZoneDatePickerElementFlag
-@global CPYearMonthDatePickerElementFlag
-@global CPYearMonthDayDatePickerElementFlag
-@global CPEraDatePickerElementFlag
-
-@implementation _CPDatePickerCalendar : CPControl
-{
-    _CPDatePickerMonthView          _monthView;
-    _CPDatePickerHeaderView         _headerView;
-    _CPDatePickerClock              _datePickerClock;
-    _CPDatePickerBox                _box;
-    CPDatePicker                    _datePicker;
-    CPInteger                       _startSelectionIndex;
-    CPInteger                       _currentSelectionIndex;
-    BOOL                            _hasClock;
-    BOOL                            _hasCalendar;
-    BOOL                            _isClockOnly;
-    CPInteger                       _datePickerElements         @accessors(getter=datePickerElements);
-}
-
-
-// MARK: Init method
-
-/*! Init a _CPDatePickerCalendar
-    @param aFrame
-    @param aDatePicker
-    @return a new instance of _CPDatePickerCalendar
-*/
-- (id)initWithFrame:(CGRect)aFrame withDatePicker:(CPDatePicker)aDatePicker
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _datePicker         = aDatePicker;
-        _datePickerElements = [_datePicker datePickerElements];
-
-        [self _init];
-    }
-
-    return self;
-}
-
-/*! Init the object
-*/
-- (void)_init
-{
-    var sizeHeader          = [_datePicker valueForThemeAttribute:@"size-header"],
-        sizeCalendar        = [_datePicker valueForThemeAttribute:@"size-calendar"],
-        sizeClock           = [_datePicker valueForThemeAttribute:@"size-clock"],
-        calendarClockMargin = [_datePicker valueForThemeAttribute:@"calendar-clock-margin"];
-
-    _hasClock    = (_datePickerElements & CPHourMinuteSecondDatePickerElementFlag) || (_datePickerElements & CPHourMinuteDatePickerElementFlag);
-    _hasCalendar = (_datePickerElements & CPYearMonthDayDatePickerElementFlag) || (_datePickerElements & CPYearMonthDatePickerElementFlag);
-    _isClockOnly = _hasClock && !_hasCalendar;
-
-    if (_hasCalendar && !_box)
-    {
-        _box = [[_CPDatePickerBox alloc] initWithFrame:CGRectMake(0, 0, sizeCalendar.width, sizeHeader.height + sizeCalendar.height)];
-        [_box setDatePicker:_datePicker];
-        [self addSubview:_box];
-
-        _headerView = [[_CPDatePickerHeaderView alloc] initWithFrame:CGRectMake(0, 0, sizeHeader.width, sizeHeader.height) datePicker:_datePicker delegate:self];
-        [_box addSubview:_headerView];
-
-        _monthView = [[_CPDatePickerMonthView alloc] initWithFrame:CGRectMake(0, sizeHeader.height, sizeCalendar.width, sizeCalendar.height) datePicker:_datePicker delegate:self];
-        [_box addSubview:_monthView];
-    }
-
-    if (_hasClock && !_datePickerClock)
-    {
-        _datePickerClock = [[_CPDatePickerClock alloc] initWithFrame:CGRectMake(0, 0, sizeClock.width, sizeClock.height) datePicker:_datePicker];
-        [self addSubview:_datePickerClock];
-    }
-
-    if (_hasClock)
-        [_datePickerClock setDatePickerElements:_datePickerElements];
-
-    [self setDateValue:[_datePicker dateValue]];
-}
-
-
-// MARK: -
-// MARK: Responder methods
-
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-
-// MARK: -
-// MARK: Getter Setter methods
-
-/*! Set the date value of the component. It sets the dateValue of the header and the monthView also
-    @param aDateValue
-*/
-- (void)setDateValue:(CPDate)aDateValue
-{
-    var dateValue = [aDateValue copy];
-    [dateValue _dateWithTimeZone:[_datePicker timeZone]];
-
-    [_monthView setMonthForDate:dateValue];
-    [_headerView setMonthForDate:[_monthView monthDate]];
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-/*! Set enabled
-    @param aBoolean
-*/
-- (void)setEnabled:(BOOL)aBoolean
-{
-    [super setEnabled:aBoolean];
-
-    [_datePickerClock setEnabled:aBoolean];
-    [_headerView setEnabled:aBoolean];
-    [_monthView setEnabled:aBoolean];
-}
-
-- (void)setDatePickerElements:(CPInteger)aDatePickerElements
-{
-    if (_datePickerElements === aDatePickerElements)
-        return;
-
-    _datePickerElements = aDatePickerElements;
-
-    [self _init];
-}
-
-// MARK: -
-// MARK: Layout methods
-
-/*! Manager the subviews. It hides or not the clock.
-*/
-- (void)layoutSubviews
-{
-    var minSize = [_datePicker valueForThemeAttribute:@"min-size-calendar"],
-        sizeHeader = [_datePicker valueForThemeAttribute:@"size-header"],
-        sizeCalendar = [_datePicker valueForThemeAttribute:@"size-calendar"],
-        sizeClock = [_datePicker valueForThemeAttribute:@"size-clock"],
-        calendarClockMargin = [_datePicker valueForThemeAttribute:@"calendar-clock-margin"];
-
-    if (_hasClock)
-    {
-        if (!_isClockOnly)
-        {
-            var frameSize = CGSizeMakeCopy(minSize);
-            frameSize.width += sizeClock.width + calendarClockMargin;
-
-            [_datePicker setFrameSize:frameSize];
-            [_datePickerClock setFrameOrigin:CGPointMake(sizeCalendar.width + calendarClockMargin, [self bounds].size.height / 2 - sizeClock.height / 2)];
-        }
-        else
-        {
-            [_datePicker setFrameSize:sizeClock];
-            [_datePickerClock setFrameOrigin:CGPointMake(0, 0)];
-        }
-
-        [_datePickerClock setHidden:NO];
-        [_datePickerClock setFrameSize:sizeClock];
-        [_datePickerClock setNeedsLayout];
-    }
-    else
-    {
-        [_datePicker setFrameSize:minSize];
-        [_datePickerClock setHidden:YES];
-    }
-
-    if (_hasCalendar)
-    {
-        [_box setHidden:NO];
-        [_headerView setHidden:NO];
-        [_monthView setHidden:NO];
-        [_box setNeedsLayout];
-        [_box setNeedsDisplay:YES];
-        [_headerView setNeedsLayout];
-        [_monthView setNeedsLayout];
-        [_monthView setNeedsDisplay:YES];
-    }
-    else
-    {
-        [_box setHidden:YES];
-        [_headerView setHidden:YES];
-        [_monthView setHidden:YES];
-    }
-
-    [self setFrameSize:[_datePicker frameSize]];
-}
-
-
-// MARK: -
-// MARK: Action methods
-
-/*! Move to the nextMonth without changing the dateValue of the datePicker
-*/
-- (void)_clickArrowNext:(id)sender
-{
-    var currentEvent = [CPApp currentEvent],
-        modifierFlags = [currentEvent modifierFlags];
-
-    if (modifierFlags & (CPCommandKeyMask | CPControlKeyMask | CPAlternateKeyMask))
-    {
-        var date = [[_monthView monthDate] copy];
-        date.setDate(1);
-
-        if (modifierFlags & CPAlternateKeyMask)
-            date.setUTCFullYear(date.getUTCFullYear() + 10);
-        else
-            date.setUTCFullYear(date.getUTCFullYear() + 1);
-
-        [self setDateValue:date];
-    }
-    else
-    {
-         [self _displayNextMonth];
-    }
-}
-
-- (void)_displayNextMonth
-{
-    // Copy the date so we don't modify the view's state directly
-    var nextDate = [[_monthView nextMonth] copy];
-    
-    // Set to the middle of the month (15th).
-    // This prevents [setDateValue:]'s timezone adjustment from 
-    // shifting the date back into the previous month (e.g., Nov 1 -> Oct 31).
-    nextDate.setDate(15);
-    
-    [self setDateValue:nextDate];
-}
-
-- (void)_displayPreviousMonth
-{
-    [self setDateValue:[_monthView previousMonth]];
-}
-
-/*! Move to the previous month without changing the dateValue of the datePicker
-*/
-- (void)_clickArrowPrevious:(id)sender
-{
-    var currentEvent = [CPApp currentEvent],
-        modifierFlags = [currentEvent modifierFlags];
-
-    if (modifierFlags & (CPCommandKeyMask | CPControlKeyMask | CPAlternateKeyMask))
-    {
-        var date = [[_monthView monthDate] copy];
-        date.setDate(1);
-
-        if (modifierFlags & CPAlternateKeyMask)
-            date.setUTCFullYear(date.getUTCFullYear() - 10);
-        else
-            date.setUTCFullYear(date.getUTCFullYear() - 1);
-
-        [self setDateValue:date];
-    }
-    else
-    {
-         [self _displayPreviousMonth];
-    }
-}
-
-/*! Move to the current selected day
-*/
-- (void)_currentMonth:(id)sender
-{
-    [self setDateValue:[_datePicker dateValue]];
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerClock.j

@@ -1,611 +0,0 @@
-/*
-* _CPDatePickerClock.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/CPKeyedArchiver.j>
-@import <Foundation/CPKeyedUnarchiver.j>
-@import "CPView.j"
-@import "CPTextField.j"
-@import "CPImage.j"
-@import "CALayer.j"
-
-@class _CPCibCustomResource
-@class CPDatePicker
-@class HandImageLayer
-@class HoursLayer
-@class HandLayer
-
-@global CPHourMinuteSecondDatePickerElementFlag
-@global CPTextFieldAndStepperDatePickerStyle
-@global CPTextFieldDatePickerStyle
-
-var RADIANS = Math.PI / 180;
-
-@typedef _CPDatePickerClockHand
-_CPDatePickerClockHours   = 1;
-_CPDatePickerClockMinutes = 2;
-_CPDatePickerClockSeconds = 3;
-
-@implementation _CPDatePickerClock : CPControl
-{
-    BOOL                    _isEnabled;
-    HoursLayer              _rootLayer;
-    HandLayer               _hourHandLayer;
-    HandLayer               _minuteHandLayer;
-    HandLayer               _secondHandLayer;
-    CALayer                 _middleHandLayer;
-    CPDatePicker            _datePicker;
-    CPTextField             _PMAMTextField;
-
-    CALayer                 _currentHandLayer;
-    _CPDatePickerClockHand  _currentHand;
-    CPInteger               _currentRepresentedValue;
-    float                   _currentValueShift;
-    CPInteger               _numberOfUnits;
-    BOOL                    _trackingHand;
-
-    CPInteger               _representedHours;
-    CPInteger               _representedMinutes;
-    CPInteger               _representedSeconds;
-    BOOL                    _representedHourIsPM;
-
-    CPInteger                _datePickerElements         @accessors(getter=datePickerElements);
-}
-
-
-// MARK: -
-// MARK: Init methods
-
-- (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _datePicker         = aDatePicker;
-        _datePickerElements = [_datePicker datePickerElements];
-        _trackingHand       = NO;
-
-        _PMAMTextField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-font" inState:CPThemeStateNormal] forThemeAttribute:@"font" inState:CPThemeStateNormal];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-color" inState:CPThemeStateNormal];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateNormal];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-offset" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateNormal];
-
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-font" inState:CPThemeStateDisabled] forThemeAttribute:@"font" inState:CPThemeStateDisabled];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
-        [_PMAMTextField setValue:[_datePicker valueForThemeAttribute:@"clock-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
-
-        [self addSubview:_PMAMTextField];
-
-        var middleHandSize = [_datePicker valueForThemeAttribute:@"middle-hand-size"],
-            minuteHandSize = [_datePicker valueForThemeAttribute:@"minute-hand-size"],
-            hourHandSize   = [_datePicker valueForThemeAttribute:@"hour-hand-size"],
-            secondHandSize = [_datePicker valueForThemeAttribute:@"second-hand-size"];
-
-        // We use layer to make the rotation possible
-        _hourHandLayer = [[HandLayer alloc] initWithSize:hourHandSize];
-        [_hourHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_hourHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_hourHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _minuteHandLayer = [[HandLayer alloc] initWithSize:minuteHandSize];
-        [_minuteHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_minuteHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_minuteHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _secondHandLayer = [[HandLayer alloc] initWithSize:secondHandSize];
-        [_secondHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_secondHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_secondHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _middleHandLayer = [[HandLayer alloc] initWithSize:middleHandSize];
-        [_middleHandLayer setBounds:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-        [_middleHandLayer setAnchorPoint:CGPointMakeZero()];
-        [_middleHandLayer setPosition:CGPointMake(0.0, 0.0)];
-
-        _rootLayer = [[HoursLayer alloc] init];
-        [self setWantsLayer:YES];
-        [self setLayer:_rootLayer];
-
-        [self _initHands];
-
-        [_rootLayer addSublayer:_hourHandLayer];
-        [_rootLayer addSublayer:_minuteHandLayer];
-
-        if ([_datePicker valueForThemeAttribute:@"clock-second-hand-over"])
-        {
-            [_rootLayer addSublayer:_middleHandLayer];
-            [_rootLayer addSublayer:_secondHandLayer];
-        }
-        else
-        {
-            [_rootLayer addSublayer:_secondHandLayer];
-            [_rootLayer addSublayer:_middleHandLayer];
-        }
-
-        [_rootLayer setDrawsHours:[_datePicker valueForThemeAttribute:@"clock-draws-hours"]];
-        [_rootLayer setNeedsDisplay];
-    }
-
-    return self;
-}
-
-- (void)_initHands
-{
-    var middleHandImage = [_datePicker currentValueForThemeAttribute:@"middle-hand-image"],
-        hourHandImage   = [_datePicker currentValueForThemeAttribute:@"hour-hand-image"],
-        minuteHandImage = [_datePicker currentValueForThemeAttribute:@"minute-hand-image"],
-        secondHandImage = [_datePicker currentValueForThemeAttribute:@"second-hand-image"];
-
-    // If hand images are true CPImage, we have to duplicate them to avoid
-    // the multiple delegates bug when multiple clocks are displayed
-
-    if ([middleHandImage isKindOfClass:[CPImage class]])
-        middleHandImage = [middleHandImage duplicate];
-
-    if ([hourHandImage isKindOfClass:[CPImage class]])
-        hourHandImage = [hourHandImage duplicate];
-
-    if ([minuteHandImage isKindOfClass:[CPImage class]])
-        minuteHandImage = [minuteHandImage duplicate];
-
-    if ([secondHandImage isKindOfClass:[CPImage class]])
-        secondHandImage = [secondHandImage duplicate];
-
-    [_middleHandLayer setImage:middleHandImage];
-    [_hourHandLayer   setImage:hourHandImage];
-    [_minuteHandLayer setImage:minuteHandImage];
-    [_secondHandLayer setImage:secondHandImage];
-
-    [_hourHandLayer   setNeedsDisplay];
-    [_middleHandLayer setNeedsDisplay];
-    [_secondHandLayer setNeedsDisplay];
-    [_minuteHandLayer setNeedsDisplay];
-
-    [_rootLayer setFont:[_datePicker currentValueForThemeAttribute:@"clock-hours-font"]];
-    [_rootLayer setTextColor:[_datePicker currentValueForThemeAttribute:@"clock-hours-text-color"]];
-    [_rootLayer setRadius:[_datePicker currentValueForThemeAttribute:@"clock-hours-radius"]];
-
-    [_rootLayer setNeedsDisplay];
-}
-
-- (void)setDatePickerElements:(CPInteger)aDatePickerElements
-{
-    _datePickerElements = aDatePickerElements;
-
-    // Check if we have to display the hand second
-    // FIXME: Don't know why but next line will cause theme compilation to fail...
-    // Workaround: added "if PLATFORM(DOM)"
-#if PLATFORM(DOM)
-    [_secondHandLayer setHidden:!((_datePickerElements & CPHourMinuteSecondDatePickerElementFlag) == CPHourMinuteSecondDatePickerElementFlag)];
-#endif
-}
-
-// MARK: Layout methods
-
-- (void)layoutSubviews
-{
-    // While tracking a hand, we don't want the whole thing to be relayouted at each mouse movement
-    if (_trackingHand)
-        return;
-
-    [self setBackgroundColor:[_datePicker currentValueForThemeAttribute:@"bezel-color-clock"]];
-
-    var dateValue = [[_datePicker dateValue] copy];
-
-    [dateValue _dateWithTimeZone:[_datePicker timeZone]];
-
-    _representedHours    = dateValue.getHours();
-    _representedMinutes  = dateValue.getMinutes();
-    _representedSeconds  = dateValue.getSeconds();
-    _representedHourIsPM = (_representedHours > 11);
-
-    // Hours are expressed in 24 hours format, we need 12 hours format
-    _representedHours -= (_representedHourIsPM ? 12 : 0);
-
-    [self _updateHands];
-
-    // FIXME: Workaround. Seems that CALayer doesn't redraw without an event
-    [CALayer runLoopUpdateLayers];
-}
-
-- (void)_updateHands
-{
-    var bounds = [self bounds];
-
-    [_PMAMTextField setStringValue:_representedHourIsPM ? @"PM" : @"AM"];
-    [_PMAMTextField sizeToFit];
-    [_PMAMTextField setFrameOrigin:CGPointMake(bounds.size.width / 2 - [_PMAMTextField frameSize].width / 2, bounds.size.height / 2 + 15)];
-
-    [_hourHandLayer   setRotationRadians:(360 * (_representedHours   + _representedMinutes / 60) / 12) * RADIANS];
-    [_minuteHandLayer setRotationRadians:(360 * (_representedMinutes + _representedSeconds / 60) / 60) * RADIANS];
-    [_secondHandLayer setRotationRadians:(360 * _representedSeconds / 60) * RADIANS];
-
-    [_hourHandLayer   setNeedsDisplay];
-    [_minuteHandLayer setNeedsDisplay];
-    [_secondHandLayer setNeedsDisplay];
-//    [_middleHandLayer setNeedsDisplay];
-}
-
-// MARK: Accessors
-
-- (void)setEnabled:(BOOL)shouldEnable
-{
-    shouldEnable = !!shouldEnable;
-
-    if (shouldEnable === _isEnabled)
-        return;
-
-    _isEnabled = shouldEnable;
-
-    [self _initHands];
-    [self setNeedsLayout];
-}
-
-// MARK: Mouse actions
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if (!_isEnabled)
-        return;
-
-    var currentLocation = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
-    if ([_secondHandLayer handIsHitAtPoint:currentLocation])
-    {
-        _currentHandLayer        = _secondHandLayer;
-        _currentHand             = _CPDatePickerClockSeconds;
-        _currentRepresentedValue = _representedSeconds;
-        _currentValueShift       = 0;
-        _numberOfUnits           = 60;
-    }
-    else if ([_minuteHandLayer handIsHitAtPoint:currentLocation])
-    {
-        _currentHandLayer        = _minuteHandLayer;
-        _currentHand             = _CPDatePickerClockMinutes;
-        _currentRepresentedValue = _representedMinutes;
-        _currentValueShift       = _representedSeconds / 60;
-        _numberOfUnits           = 60;
-    }
-    else if ([_hourHandLayer handIsHitAtPoint:currentLocation])
-    {
-        _currentHandLayer        = _hourHandLayer;
-        _currentHand             = _CPDatePickerClockHours;
-        _currentRepresentedValue = _representedHours;
-        _currentValueShift       = _representedMinutes / 60;
-        _numberOfUnits           = 12;
-    }
-    else
-    {
-        _currentHandLayer        = nil;
-        _currentHand             = CPNotFound;
-        _currentRepresentedValue = CPNotFound;
-        _currentValueShift       = CPNotFound;
-        _numberOfUnits           = CPNotFound;
-    }
-
-    if (_currentHandLayer)
-        [self trackMouse:anEvent];
-}
-
-- (BOOL)tracksMouseOutsideOfFrame
-{
-    return YES;
-}
-
-- (BOOL)startTrackingAt:(CGPoint)aPoint
-{
-    _trackingHand = YES;
-
-    return YES;
-}
-
-- (BOOL)continueTracking:(CGPoint)lastPoint at:(CGPoint)aPoint
-{
-    var dx    = aPoint.x -_bounds.size.width / 2,
-        dy    = _bounds.size.height / 2 - aPoint.y,
-        angle = (PI_2 - ATAN2(dy,dx) + PI2) % PI2,
-        value = ROUND(angle * _numberOfUnits / PI2 - _currentValueShift) % _numberOfUnits;
-
-    if (value !== _currentRepresentedValue)
-    {
-        var movedForward  = (_currentRepresentedValue > _numberOfUnits * 3/4) && (value < _numberOfUnits / 4),
-            movedBackward = (_currentRepresentedValue < _numberOfUnits / 4)   && (value > _numberOfUnits * 3/4),
-            dateValue     = [[_datePicker dateValue] copy];
-
-        [dateValue _dateWithTimeZone:[_datePicker timeZone]];
-
-        switch (_currentHand)
-        {
-            case _CPDatePickerClockHours:
-
-                if (movedForward || movedBackward)
-                {
-                    _representedHourIsPM = !_representedHourIsPM;
-
-                    if (movedForward && !_representedHourIsPM)
-                        // Day++
-                        dateValue.setDate(dateValue.getDate() + 1);
-
-                    else if (movedBackward && _representedHourIsPM)
-                        // Day--
-                        dateValue.setDate(dateValue.getDate() - 1);
-                }
-
-                dateValue.setHours(value + (_representedHourIsPM ? 12 : 0));
-                break;
-
-            case _CPDatePickerClockMinutes:
-
-                if (movedForward)
-                    // Hours++
-                    dateValue.setHours(dateValue.getHours() + 1);
-
-                else if (movedBackward)
-                    // Hours--
-                    dateValue.setHours(dateValue.getHours() - 1);
-
-                dateValue.setMinutes(value);
-                break;
-
-            case _CPDatePickerClockSeconds:
-
-                if (movedForward)
-                    // Minutes++
-                    dateValue.setMinutes(dateValue.getMinutes() + 1);
-
-                else if (movedBackward)
-                    // Minutes--
-                    dateValue.setMinutes(dateValue.getMinutes() - 1);
-
-                dateValue.setSeconds(value);
-                break;
-        }
-
-#if PLATFORM(DOM)
-        _datePicker._invokedByUserEvent = YES;
-#endif
-        [_datePicker _setDateValue:dateValue timeInterval:[_datePicker timeInterval]];
-#if PLATFORM(DOM)
-        _datePicker._invokedByUserEvent = NO;
-#endif
-
-        // We have to adapt represented values
-        _representedHours    = dateValue.getHours();
-        _representedMinutes  = dateValue.getMinutes();
-        _representedSeconds  = dateValue.getSeconds();
-        _representedHourIsPM = (_representedHours > 11);
-
-        // Hours are expressed in 24 hours format, we need 12 hours format
-        _representedHours -= (_representedHourIsPM ? 12 : 0);
-
-        switch (_currentHand) {
-            case _CPDatePickerClockHours:
-                _currentRepresentedValue = _representedHours;
-                break;
-
-            case _CPDatePickerClockMinutes:
-                _currentRepresentedValue = _representedMinutes;
-                break;
-
-            case _CPDatePickerClockSeconds:
-                _currentRepresentedValue = _representedSeconds;
-                break;
-        }
-
-        [self _updateHands];
-    }
-
-    return YES;
-}
-
-- (void)stopTracking:(CGPoint)lastPoint at:(CGPoint)aPoint mouseIsUp:(BOOL)mouseIsUp
-{
-    _trackingHand = NO;
-}
-
-@end
-
-// MARK: -
-
-@implementation HandLayer : CALayer
-{
-    CPImage         _image;
-    HandImageLayer  _imageLayer;
-    float           _rotationRadians;
-}
-
-// MARK: Init methods
-
-- (id)initWithSize:(CGSize)aSize
-{
-    if (self = [super init])
-    {
-        _imageLayer = [HandImageLayer layer];
-        _rotationRadians = 0;
-
-        [_imageLayer setDelegate:self];
-        [_imageLayer setBounds:CGRectMake(0.0, 0.0, aSize.width, aSize.height)];
-
-        [self addSublayer:_imageLayer];
-    }
-
-    return self;
-}
-
-
-// MARK: Setter Getter methods
-
-/*!
-    Set the bounds of the layer. The imageLayer will be at the center of this bounds.
-*/
-- (void)setBounds:(CGRect)aRect
-{
-    [super setBounds:aRect];
-
-    [_imageLayer setPosition:CGPointMake(CGRectGetMidX(aRect), CGRectGetMidY(aRect))];
-}
-
-- (void)setImage:(CPImage)anImage
-{
-    if (_image === anImage)
-        return;
-
-    if ([anImage isKindOfClass:[_CPCibCustomResource class]])
-        _image = [anImage imageFromCoder:nil];
-    else
-        _image = anImage;
-
-    [_imageLayer setNeedsDisplay];
-}
-
-- (void)setRotationRadians:(float)radians
-{
-    if (_rotationRadians === radians)
-        return;
-
-    _rotationRadians = radians;
-
-    [_imageLayer setAffineTransform:CGAffineTransformScale(
-        CGAffineTransformMakeRotation(_rotationRadians),
-        1.0, 1.0)];
-}
-
-- (void)imageDidLoad:(CPImage)anImage
-{
-    [_imageLayer setNeedsDisplay];
-}
-
-- (void)drawLayer:(CALayer)aLayer inContext:(CGContext)aContext
-{
-    if ([_image loadStatus] != CPImageLoadStatusCompleted)
-        [_image setDelegate:self];
-    else
-        CGContextDrawImage(aContext, [aLayer bounds], _image);
-}
-
-- (BOOL)handIsHitAtPoint:(CGPoint)aPoint
-{
-    return (!_isHidden && [_imageLayer hitTest:aPoint] === _imageLayer);
-}
-
-- (void)setNeedsDisplay
-{
-    [super       setNeedsDisplay];
-    [_imageLayer setNeedsDisplay];
-}
-
-@end
-
-// MARK: -
-
-@implementation HandImageLayer : CALayer
-{
-    CGRect  _handBounds;
-}
-
-// We have to adapt hitTest so it only takes the hand into account (that's the top half of the image layer)
-// We are also sure there's no sublayers
-- (CALayer)hitTest:(CGPoint)aPoint
-{
-    if (_isHidden)
-        return nil;
-
-    var point = CGPointApplyAffineTransform(aPoint, _transformToLayer);
-
-    return CGRectContainsPoint(_handBounds, point) ? self : nil;
-}
-
-- (void)setBounds:(CGRect)aBounds
-{
-    if (CGRectEqualToRect(_bounds, aBounds))
-        return;
-
-    _handBounds = CGRectMakeCopy(aBounds);
-
-    _handBounds.size.height = _handBounds.size.height / 2;
-
-    [super setBounds:aBounds];
-}
-
-
-@end
-
-// MARK: -
-
-@implementation HoursLayer : CALayer
-{
-    BOOL    _drawsHours;
-
-    CPFont  _font           @accessors(property=font);
-    CPColor _textColor      @accessors(property=textColor);
-    float   _radius         @accessors(property=radius);
-}
-
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _drawsHours = NO;
-    }
-
-    return self;
-}
-
-- (void)setDrawsHours:(BOOL)shouldDrawHours
-{
-    shouldDrawHours = !!shouldDrawHours;
-
-    if (_drawsHours === shouldDrawHours)
-        return;
-
-    _drawsHours = shouldDrawHours;
-    [self setNeedsDisplay];
-}
-
-- (void)drawInContext:(CGContext)aContext
-{
-    [super drawInContext:aContext];
-
-    if (_drawsHours)
-    {
-        var bounds = [self bounds],
-            centerX = bounds.size.width / 2,
-            centerY = bounds.size.height / 2;
-
-        CGContextSelectFont(aContext, _font);
-        CGContextSetFillColor(aContext, _textColor);
-        aContext.textBaseline = @"middle";
-        aContext.textAlign = @"center";
-
-        for (var i = 1, angle = 60.0, x, y; i < 13; i++, angle -= 30.0)
-        {
-            x = centerX + _radius * COS(angle * RADIANS);
-            y = centerY - _radius * SIN(angle * RADIANS);
-
-            aContext.fillText(i, x, y);
-        }
-    }
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerDayView.j

@@ -1,280 +0,0 @@
-/* _CPDatePickerDayView.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/Foundation.j>
-
-@import "_CPDatePickerDayViewTextField.j"
-
-@class CPDatePicker
-
-@implementation _CPDatePickerDayView : CPControl
-{
-    CPDate          _date @accessors(property=date);
-
-    BOOL            _isDisabled;
-    BOOL            _isHighlighted;
-    BOOL            _isSelected;
-    CPDatePicker    _datePicker;
-    CPTextField     _textField;
-
-    CPInteger       _dayInWeek      @accessors(property=dayInWeek);
-    BOOL            _firstSelected  @accessors(property=firstSelected);
-    BOOL            _lastSelected   @accessors(property=lastSelected);
-}
-
-
-// MARK: Init methods
-
-/*! Create a new instance of _CPDatePickerDayView
-    @param aFrame
-    @param aDatePicker
-    @return a new instance of _CPDatePickerDayView
-*/
-- (id)initWithFrame:(CGRect)aFrame withDatePicker:(CPDatePicker)aDatePicker
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        [self setHitTests:NO];
-
-        _datePicker = aDatePicker;
-
-        // FIXME: Beginning with Aristo3, the text field is directly themed based on a new class _CPDatePickerDayViewTextField
-        if ([self isCSSBased])
-        {
-            _textField = [[_CPDatePickerDayViewTextField alloc] initWithFrame:aFrame];
-        }
-        else
-        {
-            _textField = [[CPTextField alloc] initWithFrame:aFrame];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-alignment"] forThemeAttribute:@"alignment"];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-vertical-alignment"] forThemeAttribute:@"vertical-alignment"];
-
-            var contentInset = [_datePicker valueForThemeAttribute:@"tile-content-inset"];
-
-            if (contentInset)
-                [_textField setValue:contentInset forThemeAttribute:@"content-inset"];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateNormal] forThemeAttribute:@"font" inState:CPThemeStateNormal];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-color" inState:CPThemeStateNormal];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateNormal];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateNormal];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateSelected] forThemeAttribute:@"font" inState:CPThemeStateSelected];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateSelected] forThemeAttribute:@"text-color" inState:CPThemeStateSelected];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateSelected] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateSelected];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateSelected] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateSelected];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateDisabled] forThemeAttribute:@"font" inState:CPThemeStateDisabled];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"font" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]]forThemeAttribute:@"text-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateSelected]];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inState:CPThemeStateHighlighted] forThemeAttribute:@"font" inState:CPThemeStateHighlighted];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-color" inState:CPThemeStateHighlighted];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateHighlighted];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inState:CPThemeStateHighlighted] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateHighlighted];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateHighlighted, CPThemeStateSelected]];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted, CPThemeStateSelected]];
-
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"font" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-color" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-            [_textField setValue:[_datePicker valueForThemeAttribute:@"tile-text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]] forThemeAttribute:@"text-shadow-offset" inStates:[CPThemeStateDisabled, CPThemeStateHighlighted]];
-        }
-
-        [self addSubview:_textField];
-
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-
-// MARK: -
-// MARK: Theme methods
-
-/*! Set a theme
-*/
-- (BOOL)setThemeState:(ThemeState)aState
-{
-    [_textField setThemeState:aState];
-    [super setThemeState:aState];
-}
-
-/*! Unset a theme
-*/
-- (BOOL)unsetThemeState:(ThemeState)aState
-{
-    [_textField unsetThemeState:aState];
-    [super unsetThemeState:aState];
-}
-
-
-// MARK: -
-// MARK: Getter methods
-
-/*! Select the tile
-*/
-- (void)setSelected:(BOOL)shouldBeSelected
-{
-    if (_isSelected === shouldBeSelected)
-        return;
-
-    _isSelected = shouldBeSelected;
-
-    if (_isSelected)
-        [self setThemeState:CPThemeStateSelected];
-    else
-        [self unsetThemeState:CPThemeStateSelected];
-}
-
-/*! Disabled the tile (used for previous and next month tile)
-*/
-- (void)setDisabled:(BOOL)shouldBeDisabled
-{
-    if (_isDisabled === shouldBeDisabled)
-        return;
-
-    _isDisabled = shouldBeDisabled;
-
-    if (_isDisabled)
-        [self setThemeState:CPThemeStateDisabled];
-    else
-        [self unsetThemeState:CPThemeStateDisabled];
-}
-
-- (BOOL)isDisabled
-{
-    return _isDisabled;
-}
-
-/*! Highlight the tile (used for current day)
-*/
-- (void)setHighlighted:(BOOL)shouldBeHighlighted
-{
-    if (_isHighlighted === shouldBeHighlighted)
-        return;
-
-    _isHighlighted = shouldBeHighlighted;
-
-    if (_isHighlighted)
-        [self setThemeState:CPThemeStateHighlighted];
-    else
-        [self unsetThemeState:CPThemeStateHighlighted];
-}
-
-/*! Set the stringValue of the tile
-    @param aStringValue
-*/
-- (void)setStringValue:(CPString)aStringValue
-{
-    [_textField setStringValue:aStringValue];
-}
-
-
-// MARK: -
-// MARK: Layout methods
-
-/*! Layout the subviews
-*/
-- (void)layoutSubviews
-{
-    if ([_datePicker isCSSBased])
-    {
-        var attributeName = @"bezel-color-calendar";
-
-        if (_isSelected)
-        {
-            if (_firstSelected && !_lastSelected)
-                attributeName = @"bezel-color-calendar-left";
-            else if (_lastSelected && !_firstSelected)
-                attributeName = @"bezel-color-calendar-right";
-            else if (!_firstSelected && !_lastSelected)
-            {
-                if (_dayInWeek == 0)
-                    attributeName = @"bezel-color-calendar-left";
-                else if (_dayInWeek == 6)
-                    attributeName = @"bezel-color-calendar-right";
-                else
-                    attributeName = @"bezel-color-calendar-middle";
-            }
-        }
-
-        [self setBackgroundColor:[_datePicker valueForThemeAttribute:attributeName inState:[self themeState]]];
-        return;
-    }
-
-    var bounds = [self bounds];
-    [_textField sizeToFit];
-    [_textField setFrameOrigin:CGPointMake(bounds.size.width / 2 - [_textField frameSize].width / 2 + [_datePicker valueForThemeAttribute:@"border-width"], bounds.size.height / 2 - [_textField frameSize].height / 2)];
-}
-
-- (void)setFrame:(CGRect)aFrame
-{
-    [super setFrame:aFrame];
-    [_textField setFrame:CGRectMake(0, 0, aFrame.size.width, aFrame.size.height)];
-}
-
-/*! Drawrect
-*/
-- (void)drawRect:(CGRect)aRect
-{
-    [super drawRect:aRect];
-
-    if ([_datePicker isCSSBased])
-        return;
-
-    var themeState = [self themeState],
-        context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    if (themeState.hasThemeState(CPThemeStateSelected))
-    {
-        [self setBackgroundColor:[_datePicker valueForThemeAttribute:@"bezel-color-calendar" inState:themeState]];
-        CGContextSetLineWidth(context, [_datePicker valueForThemeAttribute:@"border-width"]);
-        CGContextSetStrokeColor(context, [_datePicker valueForThemeAttribute:@"border-color" inState:themeState]);
-        CGContextAddRect(context, [self bounds]);
-        CGContextStrokeRect(context, [self bounds]);
-    }
-    else
-    {
-        // Clear color, because the original color of a tile is handle by his superview
-        [self setBackgroundColor:[CPColor clearColor]];
-    }
-
-}
-
-@end
-

AppKit/CPDatePicker/_CPDatePickerDayViewTextField.j

@@ -1,48 +0,0 @@
-/* _CPDatePickerDayViewTextField.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/Foundation.j>
-
-@import "CPTextField.j"
-
-@implementation _CPDatePickerDayViewTextField : CPTextField
-
-+ (CPString)defaultThemeClass
-{
-    return @"datePickerDayViewTextField";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-             @"min-size": CGSizeMakeZero(),
-             @"content-inset": CGInsetMakeZero(),
-             @"text-color": [CPColor blackColor],
-             @"text-shadow-color": [CPColor clearColor],
-             @"text-shadow-offset": CGSizeMakeZero(),
-             @"font": [CPNull null],
-             @"vertical-alignment": CPCenterVerticalTextAlignment,
-             @"alignment": CPCenterTextAlignment,
-             };
-}
-
-@end
-

AppKit/CPDatePicker/_CPDatePickerElementTextField.j

@@ -1,604 +0,0 @@
-/* _CPDatePickerElementTextField.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import "CPTextField.j"
-
-@class CPDatePicker
-@class _CPDatePickerElementView
-
-CPDatePickerElementTextFieldBecomeFirstResponder = @"CPDatePickerElementTextFieldBecomeFirstResponder";
-CPDatePickerElementTextFieldAMPMChangedNotification = @"CPDatePickerElementTextFieldAMPMChangedNotification";
-
-// Removed hardcoded KeyCodes (CPZeroKeyCode, etc) as they are unreliable across browsers/layouts.
-
-CPMonthDateType = 0;
-CPDayDateType = 1;
-CPYearDateType = 2;
-CPHourDateType = 3;
-CPSecondDateType = 4;
-CPMinuteDateType = 5;
-CPAMPMDateType = 6;
-
-/*! An element textField
-*/
-@implementation _CPDatePickerElementTextField : CPTextField
-{
-    _CPDatePickerElementTextField _nextTextField            @accessors(property=nextTextField);
-    _CPDatePickerElementTextField _previousTextField        @accessors(property=previousTextField);
-    _CPDatePickerElementView      _datePickerElementView    @accessors(property=datePickerElementView);
-
-    CPDatePicker    _datePicker @accessors(setter=setDatePicker:);
-
-    int _dateType  @accessors(getter=dateType);
-    int _maxNumber @accessors(getter=maxNumber);
-    int _minNumber @accessors(getter=minNumber);
-
-    BOOL    _firstEvent;
-    CPTimer _timerEdition;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"datePickerElementTextField";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-             @"content-inset":  CGInsetMake(1.0, 0.0, 0.0, 0.0),
-             @"bezel-color":    [CPNull null],
-             @"min-size":       CGSizeMakeZero()
-             };
-}
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _firstEvent = YES;
-    }
-
-    return self;
-}
-
-/*! @ignore */
-- (BOOL)acceptsFirstResponder
-{
-    return [_datePicker isEnabled];
-}
-
-/*! Set the dateType of the textField
-*/
-- (void)setDateType:(int)aDateType
-{
-    _dateType = aDateType;
-
-    switch (aDateType)
-    {
-        case CPMonthDateType:
-            _minNumber = 1;
-            _maxNumber = 12;
-            break;
-
-        case CPDayDateType:
-            _minNumber = 1;
-            _maxNumber = 31;
-            break;
-
-        case CPYearDateType:
-            _minNumber = 0;
-            _maxNumber = 9999;
-            break;
-
-        case CPHourDateType:
-            _minNumber = 0;
-            _maxNumber = 23;
-            break;
-
-        case CPSecondDateType:
-            _minNumber = 0;
-            _maxNumber = 59;
-            break;
-
-        case CPMinuteDateType:
-            _minNumber = 0;
-            _maxNumber = 59;
-            break;
-    }
-}
-
-/*! Return the maxNumber of the textField
-*/
-- (int)maxNumber
-{
-    if (_dateType == CPDayDateType)
-        return [[_datePicker dateValue] _daysInMonth];
-
-    return _maxNumber;
-}
-
-/*! Return the maxNumber of the textField depending of the maxDate
-*/
-- (int)_maxNumberWithMaxDate
-{
-    var maxDate = [_datePicker maxDate],
-        date = [_datePicker dateValue];
-
-    if (maxDate)
-    {
-        switch (_dateType)
-        {
-            case CPMonthDateType:
-                if (maxDate.getFullYear() == date.getFullYear())
-                    return maxDate.getMonth();
-                break;
-
-            case CPDayDateType:
-                if (maxDate.getFullYear() == date.getFullYear() && maxDate.getMonth() == date.getMonth())
-                    return maxDate.getDate();
-                break;
-
-            case CPYearDateType:
-                return maxDate.getFullYear();
-
-            case CPHourDateType:
-                if (maxDate.getFullYear() == date.getFullYear() && maxDate.getMonth() == date.getMonth() && maxDate.getDate() == date.getDate())
-                    return maxDate.getHours();
-                break;
-
-            case CPSecondDateType:
-                if (maxDate.getFullYear() == date.getFullYear() && maxDate.getMonth() == date.getMonth() && maxDate.getDate() == date.getDate() && maxDate.getHours() == date.getHours() && maxDate.getMinutes() == date.getMinutes())
-                    return maxDate.getSeconds();
-                break;
-
-            case CPMinuteDateType:
-                if (maxDate.getFullYear() == date.getFullYear() && maxDate.getMonth() == date.getMonth() && maxDate.getDate() == date.getDate() && maxDate.getHours() == date.getHours())
-                    return maxDate.getMinutes();
-                break;
-        }
-    }
-
-    return _maxNumber;
-}
-
-/*! Set the stringValue of the textField. This is going to check if there is 2 or 4 letters. If not it adds a space. Check also the maxDate
-    It's called when the user is editing with the keyboard
-    @param aStringValue a CPString
-*/
-- (void)setValueForKeyEvent:(CPEvent)anEvent
-{
-    var keyCode = [anEvent keyCode],
-        characters = [anEvent characters];
-
-    // Check if the event is a deletion
-    var isDelete = (keyCode === CPDeleteKeyCode || keyCode === CPDeleteForwardKeyCode);
-
-    // Check if the event is a numeric input.
-    // By testing the character string against a regex, we support num-pads and
-    // international keyboards correctly, rather than relying on keyCode ranges.
-    var isNumeric = (characters && [characters length] > 0 && /^[0-9]$/.test(characters));
-
-    // If it is neither a delete command nor a digit, we ignore it.
-    if (!isDelete && !isNumeric)
-        return;
-
-    var newValue = [self stringValue].replace(/\s/g, ''),
-        length = [newValue length];
-
-    if (isDelete)
-    {
-        [_timerEdition invalidate];
-        _timerEdition = nil;
-        
-        // Ensure we don't substring if length is 0
-        if (length > 0)
-            newValue = [newValue substringToIndex:(length - 1)];
-    }
-    else
-    {
-        // Since isNumeric is true, characters is a valid digit string
-        var eventKeyValue = characters;
-
-        if (!_timerEdition)
-        {
-            _timerEdition = [CPTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(_timerKeyEvent:) userInfo:nil repeats:NO];
-
-            if (_firstEvent || !length)
-                newValue = eventKeyValue;
-            else
-                newValue = parseInt(newValue).toString() + eventKeyValue;
-        }
-        else
-        {
-            var newFireDate = [CPDate date];
-
-            newFireDate.setSeconds(newFireDate.getSeconds() + 2);
-            [_timerEdition setFireDate:newFireDate];
-
-            newValue = parseInt(newValue).toString() + eventKeyValue;
-        }
-    }
-
-    // Safety check for NaN before comparison
-    var numericValue = parseInt(newValue);
-    if (isNaN(numericValue))
-        numericValue = 0;
-
-    if (numericValue > [self _maxNumberWithMaxDate] || ([_datePicker _isAmericanFormat] && _dateType == CPHourDateType && numericValue > 12))
-        return;
-
-    _firstEvent = NO;
-
-    [super setObjectValue:newValue];
-}
-
-/*!
-    End of the timer
-*/
-- (void)_timerKeyEvent:(id)sender
-{
-    var stringValue = [self stringValue];
-
-    _timerEdition = nil;
-
-    if ([stringValue length])
-    {
-        if ([_datePicker _isAmericanFormat] && [self dateType] == CPHourDateType)
-        {
-            var isAMHour = [[self superview] _isAMHour];
-
-            if (!isAMHour && stringValue != 12)
-                stringValue = parseInt(stringValue) + 12;
-
-            if (stringValue == 12 && !isAMHour)
-                stringValue = 12;
-            else if (stringValue == 12)
-                stringValue = 0;
-        }
-
-        [self setObjectValue:stringValue];
-    }
-}
-
-/*!
-    We force to end the timer
-*/
-- (void)_invalidTimer
-{
-    if (_timerEdition)
-    {
-        [_timerEdition invalidate];
-        _timerEdition = nil;
-    }
-}
-
-/*!
-    We force to end the timer and to update the objectValue of the datePicker
-*/
-- (void)_endEditing
-{
-    if (_timerEdition)
-        [_timerEdition invalidate];
-
-    _timerEdition = nil;
-
-    var objectValue = [self stringValue];
-
-    if (![objectValue length])
-        objectValue = [self objectValue];
-
-    if ([_datePicker _isAmericanFormat] && [self dateType] == CPHourDateType)
-    {
-        var isAMHour = [[self superview] _isAMHour];
-
-        if (!isAMHour && objectValue != 12)
-            objectValue = parseInt(objectValue) + 12;
-
-        if (objectValue == 12 && !isAMHour)
-            objectValue = 12;
-        else if (objectValue == 12)
-            objectValue = 0;
-    }
-
-    [self setObjectValue:objectValue];
-}
-
-/*! Set the stringValue of the TextField. Add some zeros of there isn't 2/4 letters in the value. It's called at the end of the editing process
-    @param aStringValue a CPString
-*/
-- (void)setStringValue:(CPString)aStringValue
-{
-    if (_dateType == CPYearDateType)
-    {
-        while ([aStringValue length] < 4)
-            aStringValue = "0" + aStringValue;
-    }
-    else if (_dateType != CPAMPMDateType)
-    {
-        if (_dateType == CPHourDateType && [_datePicker _isAmericanFormat])
-        {
-            var value = parseInt(aStringValue);
-
-            if (value == 0)
-                value = 12;
-            else if (value > 12)
-                value = value - 12;
-
-            aStringValue = value.toString();
-        }
-
-        while ([aStringValue length] < 2)
-        {
-            if (_dateType == CPSecondDateType || _dateType == CPMinuteDateType)
-                aStringValue = @"0" + aStringValue;
-            else
-                aStringValue = @" " + aStringValue;
-        }
-
-    }
-
-    [super setObjectValue:aStringValue];
-}
-
-/*! Set the objectValue. This will update the dateValue of the datePicker also. It's called with the binding of the stepper or arrows
-    This is not going to update the objectValue of the control !!! It updates the dateValue of the datePicker who's going to update the datePickerTextField if necessary
-    It's a bit tricky
-    @param aObjectValue
-*/
-- (void)setObjectValue:(id)anObjectValue
-{
-    var dateValue = [[_datePicker dateValue] copy],
-        lengthString = [[self stringValue] length],
-        objectValue = parseInt(anObjectValue);
-
-    switch (_dateType)
-    {
-        case CPMonthDateType:
-
-            if (objectValue == 0 || !lengthString)
-            {
-                [self setStringValue:(dateValue.getMonth() + 1).toString()];
-                return;
-            }
-
-            var dateNextMonth = [dateValue copy];
-
-            dateNextMonth.setDate(1);
-            dateNextMonth.setMonth(parseInt(anObjectValue) - 1);
-
-            var numberDayNextMonth = [dateNextMonth _daysInMonth];
-
-            if (numberDayNextMonth < [dateValue _daysInMonth] && dateValue.getDate() > numberDayNextMonth)
-                [_datePickerElementView setDayDateValue:numberDayNextMonth.toString()];
-
-            [super setObjectValue:objectValue];
-            break;
-
-        case CPDayDateType:
-
-            if (objectValue == 0 || !lengthString)
-            {
-                [self setStringValue:dateValue.getDate().toString()];
-                return;
-            }
-
-            // if we enter a day that is too high for the current month
-            // we need to increase the month by one
-            // if we do not do this, the user input would be silently reset
-            // very poor user experience
-
-            if (parseInt(anObjectValue, 10) > [dateValue _daysInMonth])
-            {
-                [_datePickerElementView._textFieldMonth setIntValue:(dateValue.getMonth() + 2)];
-                [super setObjectValue:objectValue];
-                return;
-            }
-
-            [super setObjectValue:objectValue];
-            break;
-
-        case CPYearDateType:
-
-            if (objectValue == 0 || !lengthString)
-            {
-                [self setStringValue:dateValue.getFullYear().toString()];
-                return;
-            }
-
-            [super setObjectValue:objectValue];
-            break;
-
-        case CPHourDateType:
-
-            if (!lengthString)
-            {
-                [self setStringValue:dateValue.getHours().toString()];
-                return;
-            }
-
-            [super setObjectValue:objectValue];
-            break;
-
-        case CPSecondDateType:
-
-            if (!lengthString)
-            {
-                [self setStringValue:dateValue.getSeconds().toString()];
-                return;
-            }
-
-            [super setObjectValue:objectValue];
-            break;
-
-        case CPMinuteDateType:
-
-            if (!lengthString)
-            {
-                [self setStringValue:dateValue.getMinutes().toString()];
-                return;
-            }
-
-            [super setObjectValue:objectValue];
-            break;
-    }
-
-    var newDateValue = [_datePickerElementView dateValue],
-        timeZone = [_datePicker timeZone];
-
-    if (timeZone)
-    {
-        var secondsFromGMT = [timeZone secondsFromGMTForDate:newDateValue],
-            secondsFromGMTTimeZone = [timeZone secondsFromGMT];
-
-        newDateValue.setSeconds(newDateValue.getSeconds() + secondsFromGMT - secondsFromGMTTimeZone);
-    }
-
-#if PLATFORM(DOM)
-    _datePicker._invokedByUserEvent = YES;
-#endif
-    [_datePicker _setDateValue:newDateValue timeInterval:[_datePicker timeInterval]];
-#if PLATFORM(DOM)
-    _datePicker._invokedByUserEvent = NO;
-#endif
-}
-
-
-// MARK: -
-// MARK: Mouse event
-
-/*! Mouse down event. Launch a notification to notif the new first responder textField
-*/
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    [super mouseDown:anEvent];
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPDatePickerElementTextFieldBecomeFirstResponder object:[[self superview] superview] userInfo:[CPDictionary dictionaryWithObject:self forKey:@"textField"]];
-}
-
-
-// MARK: -
-// MARK: Theme functions
-
-/*! Set the theme CPThemeStateSelected
-*/
-- (void)makeSelectable
-{
-    [self setThemeState:CPThemeStateSelected];
-    [_datePicker setThemeState:CPThemeStateEditing];
-}
-
-/*! Unsert the theme CPThemeStateSelected
-*/
-- (void)makeDeselectable
-{
-    _firstEvent = YES;
-    [self unsetThemeState:CPThemeStateSelected];
-    [_datePicker unsetThemeState:CPThemeStateEditing];
-}
-
-
-// MARK: -
-// MARK: Override
-
-/*!
-    We override this method to get all the time the good width
-*/
-- (CGSize)_minimumFrameSize
-{
-    var frameSize = [self frameSize],
-        contentInset = [self currentValueForThemeAttribute:@"content-inset"],
-        minSize = [self currentValueForThemeAttribute:@"min-size"],
-        maxSize = [self currentValueForThemeAttribute:@"max-size"],
-        lineBreakMode = [self lineBreakMode],
-        text = (_dateType == CPYearDateType) ? @"0000" : (_dateType == CPMonthDateType) ? @"10" : @"00",
-        textSize = CGSizeMakeCopy(frameSize),
-        font = [self currentValueForThemeAttribute:@"font"];
-
-    textSize.width -= contentInset.left + contentInset.right;
-    textSize.height -= contentInset.top + contentInset.bottom;
-
-    if (_dateType == CPAMPMDateType)
-        text = [self stringValue];
-
-    if (frameSize.width !== 0 &&
-        ![self isBezeled]     &&
-        (lineBreakMode === CPLineBreakByWordWrapping || lineBreakMode === CPLineBreakByCharWrapping))
-    {
-        textSize = [text sizeWithFont:font inWidth:textSize.width];
-    }
-    else
-    {
-        textSize = [text sizeWithFont:font];
-
-        // Account for possible fractional pixels at right edge
-        textSize.width += 1;
-    }
-
-    // Account for possible fractional pixels at bottom edge
-    textSize.height += 1;
-
-    frameSize.height = textSize.height + contentInset.top + contentInset.bottom;
-
-    if ([self isBezeled])
-    {
-        frameSize.height = MAX(frameSize.height, minSize.height);
-
-        if (maxSize.width > 0.0)
-            frameSize.width = MIN(frameSize.width, maxSize.width);
-
-        if (maxSize.height > 0.0)
-            frameSize.height = MIN(frameSize.height, maxSize.height);
-    }
-    else
-        frameSize.width = textSize.width + contentInset.left + contentInset.right;
-
-    frameSize.width = MAX(frameSize.width, minSize.width);
-
-    return frameSize;
-}
-
-- (CGRect)bezelRectForBounds:(CGRect)bounds
-{
-    return CGRectMakeCopy(bounds);
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPDatePickerElementSeparator : CPTextField
-
-+ (CPString)defaultThemeClass
-{
-    return @"datePickerElementSeparator";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-             @"content-inset":  CGInsetMake(1.0, 0.0, 0.0, 0.0),
-             @"min-size":       CGSizeMakeZero()
-             };
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerHeaderView.j

@@ -1,306 +0,0 @@
-/* _CPDatePickerHeaderView.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/Foundation.j>
-
-@import "CPControl.j"
-@import "CPTextField.j"
-@import "CPButton.j"
-
-@class CPDatePicker
-
-var CPShortWeekDayNameArrayEn = [@"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa", @"Su"],
-    CPShortWeekDayNameArrayUS = [@"Su", @"Mo", @"Tu", @"We", @"Th", @"Fr", @"Sa"],
-    CPShortWeekDayNameArrayFr = [@"L", @"M", @"M", @"J", @"V", @"S", @"D"],
-    CPShortWeekDayNameArrayDe = [@"M", @"D", @"M", @"D", @"F", @"S", @"S"],
-    CPShortWeekDayNameArrayEs = [@"L", @"M", @"X", @"J", @"V", @"S", @"D"],
-    CPShortMonthNameArrayEn = [@"Jan", @"Feb", @"Mar", @"Apr", @"May", @"Jun", @"Jul", @"Aug", @"Sep", @"Oct", @"Nov", @"Dec"],
-    CPShortMonthNameArrayFr = [@"janv.", String.fromCharCode(102, 233, 118, 46), @"mars", @"apr.", @"mai", @"juin", @"juil.", String.fromCharCode(97, 111, 251, 116), @"sept.", @"oct.", @"nov.", String.fromCharCode(100, 233, 99, 46)],
-    CPShortMonthNameArrayDe = [@"Jan", @"Feb", String.fromCharCode(77, 228, 114), @"Apr", @"Mai", @"Jun", @"Jul", @"Aug", @"Sep", @"Okt", @"Nov", @"Dez"],
-    CPShortMonthNameArrayEs = [@"ene", @"feb", @"mar", @"abr", @"may", @"jun", @"jul", @"ago", @"sep", @"oct", @"nov", @"dic"];
-
-@implementation _CPDatePickerHeaderView : CPControl
-{
-    CPArray      _dayLabels;
-    CPArray      _monthNames;
-    CPButton     _nextButton;
-    CPButton     _previousButton;
-    CPButton     _currentButton;
-    CPDatePicker _datePicker;
-    CPDate       _date;
-    CPTextField  _title;
-}
-
-
-// MARK: Init methods
-
-/*! Init a new instance of _CPDatePickerHeaderView
-    @param aFrame
-    @param aDatePicker
-    @return a new instance of _CPDatePickerHeaderView
-*/
-- (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker delegate:(id)aDelegate
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _datePicker = aDatePicker;
-
-        // Title
-        _title = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-font" inState:CPThemeStateNormal] forThemeAttribute:@"font" inState:CPThemeStateNormal];
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-text-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-color" inState:CPThemeStateNormal];
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-text-shadow-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateNormal];
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-text-shadow-offset" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateNormal];
-
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-font" inState:CPThemeStateDisabled] forThemeAttribute:@"font" inState:CPThemeStateDisabled];
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-text-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
-        [_title setValue:[_datePicker valueForThemeAttribute:@"title-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
-
-        [self addSubview:_title];
-
-        _dayLabels = [CPArray array];
-
-        // Days
-        for (var i = 0, count = [[self _dayNames] count]; i < count; i++)
-        {
-            var label = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-            [label setValue:[_datePicker valueForThemeAttribute:@"tile-text-alignment"] forThemeAttribute:@"alignment"];
-
-            var contentInset = [_datePicker valueForThemeAttribute:@"tile-content-inset"];
-
-            if (contentInset)
-                [label setValue:contentInset forThemeAttribute:@"content-inset"];
-
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-font" inState:CPThemeStateNormal] forThemeAttribute:@"font" inState:CPThemeStateNormal];
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-text-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-color" inState:CPThemeStateNormal];
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-text-shadow-color" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateNormal];
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-text-shadow-offset" inState:CPThemeStateNormal] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateNormal];
-
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-font" inState:CPThemeStateDisabled] forThemeAttribute:@"font" inState:CPThemeStateDisabled];
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-text-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-color" inState:CPThemeStateDisabled];
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-text-shadow-color" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-color" inState:CPThemeStateDisabled];
-            [label setValue:[_datePicker valueForThemeAttribute:@"weekday-text-shadow-offset" inState:CPThemeStateDisabled] forThemeAttribute:@"text-shadow-offset" inState:CPThemeStateDisabled];
-
-            [_dayLabels addObject:label];
-            [self addSubview:label];
-        }
-
-        // Arrows
-        var size = [_datePicker valueForThemeAttribute:@"previous-button-size"];
-
-        _previousButton = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)];
-        [_previousButton setButtonType:CPMomentaryChangeButton];
-        [_previousButton setBordered:NO];
-        [_previousButton setImage:[_datePicker valueForThemeAttribute:@"arrow-image-left"]];
-        [_previousButton setAlternateImage:[_datePicker valueForThemeAttribute:@"arrow-image-left-highlighted"]];
-        [self addSubview:_previousButton];
-
-        size = [_datePicker valueForThemeAttribute:@"next-button-size"];
-
-        _nextButton = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)];
-        [_nextButton setButtonType:CPMomentaryChangeButton];
-        [_nextButton setBordered:NO];
-        [_nextButton setImage:[_datePicker valueForThemeAttribute:@"arrow-image-right"]];
-        [_nextButton setAlternateImage:[_datePicker valueForThemeAttribute:@"arrow-image-right-highlighted"]];
-        [self addSubview:_nextButton];
-
-        size = [_datePicker valueForThemeAttribute:@"current-button-size"];
-
-        _currentButton = [[CPButton alloc] initWithFrame:CGRectMake(0, 0, size.width, size.height)];
-        [_currentButton setButtonType:CPMomentaryChangeButton];
-        [_currentButton setBordered:NO];
-        [_currentButton setImage:[_datePicker valueForThemeAttribute:@"circle-image"]];
-        [_currentButton setAlternateImage:[_datePicker valueForThemeAttribute:@"circle-image-highlighted"]];
-        [self addSubview:_currentButton];
-
-        [_previousButton setTarget:aDelegate];
-        [_previousButton setAction:@selector(_clickArrowPrevious:)];
-        [_previousButton setContinuous:YES];
-
-        [_nextButton setTarget:aDelegate];
-        [_nextButton setAction:@selector(_clickArrowNext:)];
-        [_nextButton setContinuous:YES];
-
-        [_currentButton setTarget:aDelegate];
-        [_currentButton setAction:@selector(_currentMonth:)];
-
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-
-// MARK: -
-// MARK: Getter Setter methods
-
-/*! Return the day names depending on the CPLocale of the datePicker
-    @return an array
-*/
-- (CPArray)_dayNames
-{
-    switch ([[_datePicker locale] objectForKey:CPLocaleLanguageCode])
-    {
-        case @"en":
-
-            // Check if it's in the american format. If yes the week will begin the sunday
-            if ([_datePicker _isAmericanFormat])
-                return CPShortWeekDayNameArrayUS;
-            else
-                return CPShortWeekDayNameArrayEn;
-            break;
-
-        case @"es":
-            return CPShortWeekDayNameArrayEs;
-            break;
-
-        case @"de":
-            return CPShortWeekDayNameArrayDe;
-            break;
-
-        case @"fr":
-            return CPShortWeekDayNameArrayFr;
-            break;
-
-        default:
-            return CPShortWeekDayNameArrayEn;
-            break;
-    }
-}
-
-/*! Return the month names depending on the CPLocale of the datePicker
-    @return an array
-*/
-- (CPArray)_monthNames
-{
-    switch ([[_datePicker locale] objectForKey:CPLocaleLanguageCode])
-    {
-        case @"en":
-            return CPShortMonthNameArrayEn;
-            break;
-
-        case @"es":
-            return CPShortMonthNameArrayEs;
-            break;
-
-        case @"de":
-            return CPShortMonthNameArrayDe;
-            break;
-
-        case @"fr":
-            return CPShortMonthNameArrayFr;
-            break;
-
-        default:
-            return CPShortMonthNameArrayEn;
-            break;
-    }
-
-}
-
-/*! Set the monthDate of the header
-    @aMonthDate the new monthDate
-*/
-- (void)setMonthForDate:(CPDate)aMonthDate
-{
-    _date = aMonthDate;
-    [self setNeedsLayout];
-}
-
-/*! Set enabled
-    @param aBoolean
-*/
-- (void)setEnabled:(BOOL)aBoolean
-{
-    [_previousButton setEnabled:aBoolean];
-    [_nextButton setEnabled:aBoolean];
-    [_currentButton setEnabled:aBoolean];
-    [_dayLabels makeObjectsPerformSelector:@selector(setEnabled:) withObject:aBoolean];
-    [_title setEnabled:aBoolean];
-}
-
-
-// MARK: -
-// MARK: Layout methods
-
-/*! Layout the subviews
-*/
-- (void)layoutSubviews
-{
-    var bounds = [self bounds],
-        dayNames = [self _dayNames],
-        width = CGRectGetWidth(bounds),
-        buttonInset = [_datePicker valueForThemeAttribute:@"arrow-inset"],
-        numberOfLabels = [_dayLabels count],
-        labelWidth = width / numberOfLabels,
-        sizeButtonLeft = [[_datePicker valueForThemeAttribute:@"arrow-image-left"] size],
-        sizeButtonRight = [[_datePicker valueForThemeAttribute:@"arrow-image-right"] size],
-        sizeButtonCircle = [[_datePicker valueForThemeAttribute:@"circle-image"] size],
-        sizeTileWidth = [_datePicker valueForThemeAttribute:@"size-tile"].width,
-        titleInset    = [_datePicker valueForThemeAttribute:@"title-inset"],
-        dayLabelInset = [_datePicker valueForThemeAttribute:@"day-label-inset"];
-
-    // Arrows
-    [_nextButton setFrame:CGRectMake(width - [_nextButton frameSize].width - buttonInset.right, buttonInset.top, sizeButtonRight.width, sizeButtonRight.height)];
-    [_currentButton setFrame:CGRectMake(CGRectGetMinX([_nextButton frame]) - sizeButtonCircle.width - buttonInset.left - buttonInset.right, buttonInset.top, sizeButtonCircle.width, sizeButtonCircle.height)];
-    [_previousButton setFrame:CGRectMake(CGRectGetMinX([_currentButton frame]) - sizeButtonLeft.width - buttonInset.left - buttonInset.right, buttonInset.top, sizeButtonLeft.width, sizeButtonLeft.height)];
-
-    var firstDayTileX;
-
-    // Weekday label
-    for (var i = 0; i < numberOfLabels; i++)
-    {
-        var dayLabel = _dayLabels[i];
-
-        [dayLabel setStringValue:dayNames[i]];
-
-        if (dayLabelInset) // Beginning with Aristo3
-        {
-            var thisWidth = ROUND((i+1) * sizeTileWidth) - ROUND(i * sizeTileWidth);
-
-            [dayLabel sizeToFit];
-            [dayLabel setFrame:CGRectMake(dayLabelInset.left + ROUND(i * sizeTileWidth), dayLabelInset.top, thisWidth, [dayLabel frameSize].height)];
-        }
-        else
-        {
-            [dayLabel sizeToFit];
-            [dayLabel setFrameOrigin:CGPointMake(sizeTileWidth * (i + 1) - sizeTileWidth / 2 - [dayLabel frameSize].width / 2, 23)];
-
-            if (i == 0)
-                firstDayTileX = sizeTileWidth * (i + 1) - sizeTileWidth / 2 - [dayLabel frameSize].width / 2;
-        }
-    }
-
-    // Title
-    [_title setStringValue:[CPString stringWithFormat:@"%s %i", [self _monthNames][_date.getMonth()], _date.getFullYear()]];
-    [_title sizeToFit];
-
-    if (titleInset) // Beginning with Aristo3
-        [_title setFrameOrigin:CGPointMake(titleInset.left, titleInset.top)];
-    else
-        [_title setFrameOrigin:CGPointMake(firstDayTileX, 6)];
-}
-
-@end

AppKit/CPDatePicker/_CPDatePickerMonthView.j

@@ -1,636 +0,0 @@
-/* _CPDatePickerMonthView.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import <Foundation/Foundation.j>
-
-@import "CPControl.j"
-@import "_CPDatePickerDayView.j"
-
-@class CPDatePicker
-
-@global CPSingleDateMode
-@global CPRangeDateMode
-
-@implementation _CPDatePickerMonthView : CPControl
-{
-    BOOL         _isMonthJustChanged;
-    CPArray      _dayTiles;
-    CPDate       _clickDate;
-    CPDate       _dragDate;
-    CPDate       _date;
-    CPDate       _previousMonth @accessors(property=previousMonth);
-    CPDate       _nextMonth @accessors(property=nextMonth);
-    CPDatePicker _datePicker;
-    CPEvent      _eventDragged;
-    CPTimer      _timerMonth;
-    id           _delegate;
-    int          _indexDayTile;
-}
-
-
-// MARK: Init methods
-
-/*! Init a _CPDatePickerMonthView
-    @param aFrame
-    @param aDatePicker
-    @return a new _CPDatePickerMonthView
-*/
-- (id)initWithFrame:(CGRect)aFrame datePicker:(CPDatePicker)aDatePicker delegate:(id)aDelegate
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _delegate = aDelegate;
-        _isMonthJustChanged = NO;
-        _indexDayTile = -1;
-        _datePicker = aDatePicker;
-        _dayTiles = [CPArray array];
-
-        // Create tiles
-        for (var i = 0; i < 42; i++)
-        {
-            var dayView = [[_CPDatePickerDayView alloc] initWithFrame:CGRectMakeZero() withDatePicker:_datePicker];
-            [self addSubview:dayView];
-            [_dayTiles addObject:dayView];
-        }
-
-        [self setNeedsLayout];
-    }
-    return self;
-}
-
-
-// MARK: -
-// MARK: Getter Setter methods
-
-/*! Set the monthDate of the component
-    @param aDate
-*/
-- (void)setMonthForDate:(CPDate)aDate
-{
-    if (_dragDate)
-    {
-         if (_dragDate.getMonth() != _date.getMonth())
-             _isMonthJustChanged = YES;
-
-         _date = [_dragDate copy];
-    }
-    else
-    {
-        _date = [aDate copy];
-    }
-
-    if (![aDate isEqualToDate:[CPDate distantFuture]])
-    {
-        // Reset the date to the first day of the month & midnight
-        _date.setDate(1);
-        [_date _resetToMidnight];
-
-        // There must be a better way to do this.
-        var firstDay = [_date copy];
-        firstDay.setDate(1);
-
-        // Set the previous and next month date. This is usefull for the tile of the next/previous month
-        _previousMonth = new Date(firstDay.getTime() - 86400000);
-        _previousMonth.setDate(1);
-
-        _nextMonth = new Date(firstDay.getTime() + (([_date _daysInMonth] + 1) * 86400000));
-        _nextMonth.setDate(1);
-    }
-
-    [self reloadData];
-
-    if (_isMonthJustChanged)
-    {
-        var dayTile = [_dayTiles objectAtIndex:_indexDayTile];
-
-        if ([dayTile date].getMonth() == _date.getMonth())
-        {
-            [self mouseDragged:_eventDragged];
-        }
-        else
-        {
-            if ([dayTile date].getMonth() - _date.getMonth() == 1 || [dayTile date].getFullYear() - _date.getFullYear() == 1)
-                _timerMonth = [CPTimer scheduledTimerWithTimeInterval:1.5 target:self selector:@selector(_timerNextMonthEvent:) userInfo:nil repeats:NO];
-            else
-                _timerMonth = [CPTimer scheduledTimerWithTimeInterval:1.5 target:self selector:@selector(_timerPreviousMonthEvent:) userInfo:nil repeats:NO];
-        }
-    }
-}
-
-- (void)monthDate
-{
-    return _date;
-}
-
-/*! Return the size of a tile
-*/
-- (CGSize)tileSize
-{
-    return [_datePicker valueForThemeAttribute:@"size-tile"];
-}
-
-/*! Return the first index day of the month
-*/
-- (int)startOfWeekForDate:(CPDate)aDate
-{
-    var day = aDate.getDay();
-
-    // American people begins the week the sunday
-    if (![_datePicker _isAmericanFormat])
-        return (day + 6) % 7;
-
-    return day;
-}
-
-/*! Set enabled
-    @param aBoolean
-*/
-- (void)setEnabled:(BOOL)aBoolean
-{
-    [super setEnabled:aBoolean];
-    [self reloadData];
-}
-
-
-/*! Return the index of tile depending of the giving event
-    @param anEvent
-    @return an index
-*/
-- (CPInteger)indexOfTileForEvent:(CPEvent)anEvent
-{
-    var locationInView = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-        tileSize       = [self tileSize],
-        borderWidth    = [_datePicker valueForThemeAttribute:@"border-width"],
-        margin         = [_datePicker valueForThemeAttribute:@"tile-margin"] || CGSizeMakeZero(),
-        tileInset      = [_datePicker valueForThemeAttribute:@"tile-inset"] || CGInsetMakeZero();
-
-    // Get the week row
-    var rowIndex    = FLOOR((locationInView.y - tileInset.top - margin.height) / (tileSize.height + 2 * margin.height + borderWidth)),
-        columnIndex = FLOOR((locationInView.x - tileInset.left) / (tileSize.width + 2 * margin.width + borderWidth));
-
-    columnIndex = MIN(MAX(columnIndex, 0), 6);
-    rowIndex = MIN(MAX(rowIndex, 0), 5);
-
-    var tileIndex = (rowIndex * 7) + columnIndex;
-
-    return tileIndex;
-}
-
-// MARK: -
-// MARK: Reload data
-
-/*! Reload the data
-*/
-- (void)reloadData
-{
-    if (!_date)
-        return;
-
-    var currentMonth = _date,
-        startOfMonthDay = [self startOfWeekForDate:currentMonth],
-        daysInPreviousMonth = [_previousMonth _daysInMonth],
-        firstDayToShowInPreviousMonth = daysInPreviousMonth - startOfMonthDay,
-        currentDate = new Date(_previousMonth.getFullYear(), _previousMonth.getMonth(), firstDayToShowInPreviousMonth),
-        now = [CPDate date],
-        dateValue = [_datePicker dateValue];
-
-    // Update the tiles
-    for (var i = 0; i < [_dayTiles count]; i++)
-    {
-        var dayTile = _dayTiles[i];
-
-        // Increment to next day
-        currentDate.setTime(currentDate.getTime() + 90000000);
-        [currentDate _resetToMidnight];
-
-        var isPresentMonth = (now.getMonth() == currentDate.getMonth()
-                      && now.getFullYear() == currentDate.getFullYear());
-
-        [dayTile setDate:[currentDate copy]];
-        [dayTile setStringValue:currentDate.getDate()];
-        [dayTile setDisabled:/*![self isEnabled] ||*/ currentDate.getMonth() !== currentMonth.getMonth() || currentDate < [_datePicker minDate] || currentDate > [_datePicker maxDate]];
-        [dayTile setHighlighted:isPresentMonth && currentDate.getDate() == now.getDate()];
-    }
-
-    // Select the dates
-    [self _selectDate:[_datePicker dateValue] timeInterval:[_datePicker timeInterval]];
-}
-
-
-// MARK: -
-// MARK: Select methods
-
-/*! Select one date or several date depending of the giving interval
-    @param aStartDate
-    @param anInterval;
-*/
-- (void)_selectDate:(CPDate)aStartDate timeInterval:(CPInteger)anInterval
-{
-    var endDate = [[CPDate alloc] initWithTimeInterval:anInterval sinceDate:aStartDate],
-        tilesCount = [_dayTiles count];
-
-    aStartDate = [aStartDate copy];
-
-    [aStartDate _resetToMidnight];
-    [endDate _resetToMidnight];
-
-    var firstSelected = NO;
-
-    for (var i = 0; i < tilesCount; i++)
-    {
-        var tile = _dayTiles[i],
-            tileDate = [[tile date] copy],
-            selected = NO;
-
-        [tileDate _resetToMidnight];
-
-        if (aStartDate)
-            selected = tileDate >= aStartDate && tileDate <= endDate;
-
-        // Select a tile
-        [tile setSelected:selected];
-
-        // If we are disabled, we have to disable selected tiles so they will appear disabled
-        [tile setDisabled:[tile isDisabled] || (selected && ![self isEnabled])];
-
-        if (selected)
-        {
-            if (!firstSelected)
-            {
-                firstSelected = YES;
-                [tile setFirstSelected:YES];
-            }
-            else
-                [tile setFirstSelected:NO];
-
-            [tile setLastSelected:NO];
-        }
-        else
-        {
-            if (firstSelected)
-            {
-                firstSelected = NO;
-
-                // As there was a first selected and we are now on an unselected tile,
-                // we are sure that i > 0
-                [_dayTiles[i-1] setLastSelected:YES];
-            }
-        }
-    }
-}
-
-// MARK: -
-// MARK: Layout methods
-
-/*! Tile the view
-*/
-- (void)tile
-{
-    var tileSize = [self tileSize],
-        width = tileSize.width,
-        height = tileSize.height,
-        tilesCount = [_dayTiles count],
-        borderWidth =  [_datePicker valueForThemeAttribute:@"border-width"],
-        margin = [_datePicker valueForThemeAttribute:@"tile-margin"],
-        tileInset = [_datePicker valueForThemeAttribute:@"tile-inset"],
-        thisWidth,
-        thisX,
-        dayInWeek,
-        weekInMonth,
-        tileFrame,
-        tileIndex;
-
-    // Set the frame of the tiles
-    for (tileIndex = 0; tileIndex < tilesCount; tileIndex++)
-    {
-        dayInWeek   = tileIndex % 7;
-        weekInMonth = (tileIndex - dayInWeek) / 7;
-        tileFrame;
-
-        if (margin) // Beginning with Aristo3
-        {
-            thisX     = ROUND(dayInWeek * (width + 2 * margin.width));
-            thisWidth = ROUND((dayInWeek+1) * (width + 2 * margin.width)) - thisX;
-
-            tileFrame = CGRectMake(tileInset.left + thisX, tileInset.top + margin.height + weekInMonth * (height + 2 * margin.height), thisWidth + borderWidth, height + borderWidth);
-        }
-        else
-            tileFrame = CGRectMake(dayInWeek * width, weekInMonth * height, width + borderWidth, height + borderWidth);
-
-        [_dayTiles[tileIndex] setFrame:tileFrame];
-        [_dayTiles[tileIndex] setDayInWeek:dayInWeek];
-    }
-
-    [self reloadData];
-}
-
-/*! Layout the subviews
-*/
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    [self tile];
-    [_dayTiles makeObjectsPerformSelector:@selector(setNeedsLayout)];
-}
-
-/*! Draw the component. This draws the border of the tile.
-    The selected tile are drawed in the drawRect method of the tile. But the unselected tile here.
-    It avoids some problems with tiles over other tiles (otherwise the color of the tile border would be different).
-    Rememeber that the first pixel of a tile are over the last pixel of the last tile (because the border)
-*/
-- (void)drawRect:(CGRect)aRect
-{
-    [super drawRect:aRect];
-
-    if ([_datePicker isCSSBased])
-    {
-        // We just have to draw the separator (if any)
-        // No separator color means no separator
-        var separatorColor       = [_datePicker valueForThemeAttribute:@"separator-color"],
-            separatorHeight      = [_datePicker valueForThemeAttribute:@"separator-height"],
-            separatorMarginWidth = [_datePicker valueForThemeAttribute:@"separator-margin-width"];
-
-        if (separatorColor)
-        {
-            var context = [[CPGraphicsContext currentContext] graphicsPort],
-                bounds  = [self bounds];
-
-            CGContextBeginPath(context);
-            CGContextSetStrokeColor(context, separatorColor);
-            CGContextSetLineWidth(context, separatorHeight);
-            CGContextMoveToPoint(context, separatorMarginWidth, 0.5);
-            CGContextAddLineToPoint(context, bounds.size.width - separatorMarginWidth, 0.5);
-            CGContextStrokePath(context);
-            CGContextClosePath(context);
-        }
-
-        return;
-    }
-
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        width = [self tileSize].width,
-        height = [self tileSize].height,
-        isBorderPair = ([_datePicker valueForThemeAttribute:@"border-width"] % 2) == 0;
-
-    CGContextBeginPath(context);
-    CGContextSetStrokeColor(context, [_datePicker valueForThemeAttribute:@"border-color" inState:[_datePicker themeState]]);
-    CGContextSetLineWidth(context,  [_datePicker valueForThemeAttribute:@"border-width"]);
-
-    if ([_datePicker isBordered])
-    {
-        for (var i = 0; i < 6; i++)
-        {
-            var y = i * height;
-
-            // Very usefull to avoid to have a line of two pixels instead one
-            if (!isBorderPair)
-                y += 0.5;
-
-            CGContextMoveToPoint(context, 0, y);
-            CGContextAddLineToPoint(context, [self bounds].size.width, y);
-        }
-
-        for (var i = 0; i < 7; i++)
-        {
-            var x = i * width;
-
-            // Very usefull to avoid to have a line of two pixels instead one
-            if (!isBorderPair)
-                x += 0.5;
-
-            CGContextMoveToPoint(context, x, 0);
-            CGContextAddLineToPoint(context, x, [self bounds].size.height);
-        }
-    }
-    else
-    {
-        var y = 0;
-
-        // Very usefull to avoid to have a line of two pixels instead one
-        if (!isBorderPair)
-            y += 0.5;
-
-        CGContextMoveToPoint(context, 0, y);
-        CGContextAddLineToPoint(context, [self bounds].size.width, y);
-    }
-
-    CGContextStrokePath(context);
-    CGContextClosePath(context);
-}
-
-
-// MARK: -
-// MARK: Mouse event
-
-/*! Mouse down event
-*/
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    var dayTile = [_dayTiles objectAtIndex:[self indexOfTileForEvent:anEvent]],
-        dateTile = [[dayTile date] copy],
-        dateValue = [_datePicker dateValue];
-
-    _clickDate = [dateTile copy];
-    _dragDate = nil;
-    _indexDayTile = -1;
-    _eventDragged = nil;
-
-#if PLATFORM(DOM)
-    _datePicker._invokedByUserEvent = YES;
-#endif
-
-    // Check if we have to change or not the month of the component
-    if ([dayTile date].getMonth() == _date.getMonth())
-    {
-        if ([_datePicker datePickerMode] == CPRangeDateMode && [anEvent modifierFlags] & CPShiftKeyMask)
-        {
-            var dateValueAtMidnight = [[_datePicker dateValue] copy];
-
-            [dateValueAtMidnight _resetToMidnight];
-
-            if (dateTile < dateValueAtMidnight)
-            {
-                var interval;
-
-                if (dateTile == dateValueAtMidnight)
-                    interval = [_datePicker timeInterval];
-                else
-                    interval = ([dateValueAtMidnight timeIntervalSinceDate:dateTile] + [_datePicker timeInterval]);
-
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:interval];
-            }
-            else if ([[dayTile date] isEqualToDate:dateValueAtMidnight])
-            {
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
-            }
-            else
-            {
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:[dateValueAtMidnight copy]] timeInterval:([dateTile timeIntervalSinceDate:dateValueAtMidnight])];
-            }
-
-            // Be sure to display the good month
-            [_delegate setDateValue:dateTile];
-        }
-        else
-        {
-            var minDate = [[_datePicker minDate] copy],
-                maxDate = [[_datePicker maxDate] copy];
-
-            [minDate _resetToMidnight];
-            [maxDate _resetToLastSeconds];
-
-            if (dateTile >= minDate && dateTile <= maxDate)
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
-        }
-    }
-    else
-    {
-        // Check the year and the month. The year is usefull when changing from Jan to Dec.
-        if (_date.getMonth() - [dayTile date].getMonth() == 1 || _date.getFullYear() - [dayTile date].getFullYear() == 1)
-            [_delegate _displayPreviousMonth];
-        else
-            [_delegate _displayNextMonth];
-    }
-
-#if PLATFORM(DOM)
-    _datePicker._invokedByUserEvent = NO;
-#endif
-}
-
-/*! Mouse dragged event
-*/
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    if (![self isEnabled]  || !CGRectContainsPoint([self bounds],[self convertPoint:[anEvent locationInWindow] fromView:nil]))
-        return;
-
-    var dayTile = [_dayTiles objectAtIndex:[self indexOfTileForEvent:anEvent]],
-        dateTile = [[dayTile date] copy],
-        dateValue = [_datePicker dateValue];
-
-    _dragDate = [dateTile copy];
-    _indexDayTile = [self indexOfTileForEvent:anEvent];
-    _eventDragged = anEvent;
-
-#if PLATFORM(DOM)
-    _datePicker._invokedByUserEvent = YES;
-#endif
-
-    if ([_datePicker datePickerMode] == CPSingleDateMode)
-    {
-        // Check if we have to change or not the month of the component
-        if ([dayTile date].getMonth() == _date.getMonth())
-        {
-            [_timerMonth invalidate];
-            _isMonthJustChanged = NO;
-
-            [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
-        }
-        else if (!_isMonthJustChanged)
-        {
-            [_timerMonth invalidate];
-            _isMonthJustChanged = NO;
-
-            // Check the year and the month. The year is usefull when changing from Jan to Dec.
-            if (_date.getMonth() - [dayTile date].getMonth() == 1 || _date.getFullYear() - [dayTile date].getFullYear() == 1)
-                [_delegate _displayPreviousMonth];
-            else
-                [_delegate _displayNextMonth];
-        }
-    }
-    else
-    {
-        if (dateTile.getMonth() == _date.getMonth() || !_isMonthJustChanged)
-        {
-            [_timerMonth invalidate];
-            _isMonthJustChanged = NO;
-
-            var dateValueAtMidnight = [[_datePicker dateValue] copy];
-
-            [dateValueAtMidnight _resetToMidnight];
-
-            if (dateTile < _clickDate)
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:[_clickDate timeIntervalSinceDate:dateTile]];
-            else if ([[dayTile date] isEqualToDate:_clickDate])
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:dateTile] timeInterval:0];
-            else
-                [_datePicker _setDateValue:[self _hoursMinutesSecondsFromDatePickerForDate:_clickDate] timeInterval:[dateTile timeIntervalSinceDate:dateValueAtMidnight]];
-        }
-    }
-
-#if PLATFORM(DOM)
-    _datePicker._invokedByUserEvent = NO;
-#endif
-}
-
-- (void)mouseUp:(CPEvent)anEvent
-{
-    [_timerMonth invalidate];
-    _dragDate = nil;
-    _clickDate = nil;
-    _isMonthJustChanged = NO;
-    _indexDayTile = -1;
-    _eventDragged = nil;
-}
-
-
-// MARK: -
-// MARK: Timer
-
-- (void)_timerNextMonthEvent:(CPEvent)anEvent
-{
-    if (_isMonthJustChanged)
-    {
-        _dragDate.setMonth(_date.getMonth() + 1);
-        [_delegate _displayNextMonth];
-    }
-}
-
-- (void)_timerPreviousMonthEvent:(CPEvent)anEvent
-{
-    if (_isMonthJustChanged)
-    {
-        _dragDate.setMonth(_date.getMonth() - 1);
-        [_delegate _displayPreviousMonth];
-    }
-}
-
-
-// MARK: -
-// MARK: Date methods
-
-- (CPDate)_hoursMinutesSecondsFromDatePickerForDate:(CPDate)aDate
-{
-    var dateValue = [_datePicker dateValue];
-
-    aDate.setHours(dateValue.getHours());
-    aDate.setMinutes(dateValue.getMinutes());
-    aDate.setSeconds(dateValue.getSeconds());
-
-    return aDate;
-}
-
-@end
-

AppKit/CPDatePicker/_CPDatePickerTextField.j

@@ -1,633 +0,0 @@
-/* _CPDatePickerTextField.j
-* AppKit
-*
-* Created by Alexandre Wilhelm
-* Copyright 2012 <alexandre.wilhelmfr@gmail.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation; either
-* version 2.1 of the License, or (at your option) any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-@import "CPControl.j"
-@import "CPFont.j"
-@import "CPTextField.j"
-@import "CPStepper.j"
-
-@import <Foundation/CPArray.j>
-@import <Foundation/CPObject.j>
-@import <Foundation/CPDate.j>
-@import <Foundation/CPDateFormatter.j>
-@import <Foundation/CPLocale.j>
-
-@class CPDatePicker
-@class _CPDatePickerElementView
-
-@import "_CPDatePickerElementView.j"
-
-@global CPSingleDateMode
-@global CPRangeDateMode
-
-@global CPTextFieldAndStepperDatePickerStyle
-@global CPTextFieldDatePickerStyle
-
-@global CPHourMinuteDatePickerElementFlag
-@global CPHourMinuteSecondDatePickerElementFlag
-@global CPTimeZoneDatePickerElementFlag
-@global CPYearMonthDatePickerElementFlag
-@global CPYearMonthDayDatePickerElementFlag
-@global CPEraDatePickerElementFlag
-
-// This class is used to represente the datePicker with the CPTextFieldAndStepperDatePickerStyle/CPTextFieldDatePickerStyle mode
-@implementation _CPDatePickerTextField : CPControl
-{
-    _CPDatePickerElementTextField       _firstTextField @accessors(property=firstTextField);
-    _CPDatePickerElementTextField       _lastTextField @accessors(property=lastTextField);
-
-    _CPDatePickerElementTextField       _currentTextField;
-    _CPDatePickerElementView            _datePickerElementView;
-    CPDatePicker                        _datePicker;
-    CPStepper                           _stepper;
-    CPInteger                           _datePickerElements         @accessors(getter=datePickerElements);
-}
-
-
-// MARK: Init
-
-- (id)initWithFrame:(CGRect)aFrame withDatePicker:(CPDatePicker)aDatePicker
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _datePicker = aDatePicker;
-        [self _init];
-    }
-    return self;
-}
-
-- (void)_init
-{
-    _datePickerElements = [_datePicker datePickerElements];
-
-    _datePickerElementView = [[_CPDatePickerElementView alloc] initWithFrame:CGRectMakeZero() withDatePicker:_datePicker];
-    [self addSubview:_datePickerElementView];
-
-    _stepper = [CPStepper stepper];
-    [_stepper setTarget:self];
-    [_stepper setAction:@selector(_clickStepper:)];
-    [self addSubview:_stepper];
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-
-#if PLATFORM(DOM)
-    if ([_datePicker currentValueForThemeAttribute:@"uses-focus-ring"])
-    {
-        // As with overflow:hidden, views are clipping their content, in order
-        // to show a focus ring (which is external to a view), we need to let
-        // content extend outside the view.
-        _datePicker._DOMElement.style.overflow            = "visible";
-        _DOMElement.style.overflow                        = "visible";
-        _datePickerElementView._DOMElement.style.overflow = "visible";
-    }
-#endif
-}
-
-
-// MARK: -
-// MARK: Override responder methods
-
-- (BOOL)becomeFirstResponder
-{
-    return NO;
-}
-
-- (BOOL)acceptsFirstResponder
-{
-    return YES;
-}
-
-- (BOOL)resignFirstResponder
-{
-    // End the timer of editing
-    [_currentTextField _endEditing];
-
-    // Don't forget to unbind, otherwise several steppers will increase or decrease
-    [_currentTextField unbind:@"objectValue"];
-    [_currentTextField makeDeselectable];
-    _currentTextField = nil;
-
-    // This is usefull when clicking on the stepper when the datePicker is not selected
-    [_stepper setObjectValue:0];
-
-    return YES;
-}
-
-- (BOOL)canBecomeKeyView
-{
-    return NO;
-}
-
-
-// MARK: -
-// MARK: Setter Getter methods
-
-/*! Set the value of the control
-    @param aDateValue
-*/
-- (void)setDateValue:(CPDate)aDateValue
-{
-    var dateValue = [aDateValue copy];
-    [dateValue _dateWithTimeZone:[_datePicker timeZone]];
-    [_datePickerElementView setDateValue:dateValue];
-
-    // Be sure to update the stepper value. We don't use -setObjectValue to avoid a binding update.
-    if (_currentTextField)
-        _stepper._value = [_currentTextField intValue];
-}
-
-/*! Set the widget enabled or not
-    @param aBoolean
-*/
-- (void)setEnabled:(BOOL)aBoolean
-{
-    [super setEnabled:aBoolean];
-    [_stepper setEnabled:aBoolean];
-    [_datePickerElementView setEnabled:aBoolean];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    [super setTextColor:aColor];
-    [_datePickerElementView setTextColor:aColor];
-}
-
-- (void)setTextFont:(CPFont)aFont
-{
-    [self setFont:aFont];
-    [_datePickerElementView setTextFont:aFont];
-}
-
-- (void)setDatePickerElements:(CPInteger)aDatePickerElements
-{
-    if (_datePickerElements === aDatePickerElements)
-        return;
-
-    _datePickerElements = aDatePickerElements;
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-// MARK: -
-// MARK: Notification methods
-
-/*! This is called to when the user just changed the selected textField
-    @param aNotification
-*/
-- (void)_datePickerElementTextFieldBecomeFirstResponder:(CPNotification)aNotification
-{
-    if ([[aNotification userInfo] objectForKey:@"textField"] == _currentTextField)
-        return;
-
-    [self _selectTextField:[[aNotification userInfo] objectForKey:@"textField"]];
-
-    // This is tricky, its to avoid to have the cursor
-    if ([[self window] firstResponder] != _datePicker)
-        [[self window] makeFirstResponder:_datePicker];
-}
-
-
-// MARK: -
-// MARK: SelectTextField action
-
-- (void)_selectTextFieldWithFlags:(unsigned)flags
-{
-    [_datePickerElementView _updateResponderTextField];
-
-    if (!_currentTextField)
-    {
-        var targetField = nil;
-
-        if (flags & CPShiftKeyMask)
-        {
-            // Try last field; if hidden, find previous visible
-            if ([_lastTextField isHidden])
-                targetField = [self _previousVisibleTextFieldFrom:_lastTextField];
-            else
-                targetField = _lastTextField;
-        }
-        else
-        {
-            // Try first field; if hidden, find next visible
-            if ([_firstTextField isHidden])
-                targetField = [self _nextVisibleTextFieldFrom:_firstTextField];
-            else
-                targetField = _firstTextField;
-        }
-
-        // Only select if we actually found a valid visible field
-        if (targetField)
-            [self _selectTextField:targetField];
-    }
-}
-
-/*! Select a textField
-    @param aDatePickerElementTextField the textField
-*/
-- (void)_selectTextField:(_CPDatePickerElementTextField)aDatePickerElementTextField
-{
-    if (_currentTextField == aDatePickerElementTextField)
-        return;
-
-    // End the timer of editing
-    [_currentTextField _endEditing];
-
-    // Don't forget to unbind, otherwise several steppers will increase or decrease
-    [_currentTextField unbind:@"objectValue"];
-    [_currentTextField makeDeselectable];
-
-    _currentTextField = aDatePickerElementTextField;
-    [_currentTextField makeSelectable];
-
-    // We cannot assign a value with the textField AM/PM
-    if ([_currentTextField dateType] != CPAMPMDateType)
-    {
-        // We update the value of the stepper dependind on the textField
-        [_stepper setObjectValue:[_currentTextField intValue]];
-        [_stepper setMaxValue:[_currentTextField maxNumber]];
-        [_stepper setMinValue:[_currentTextField minNumber]];
-
-        // We bind the stepper with textField
-        [_currentTextField bind:@"objectValue" toObject:_stepper withKeyPath:@"objectValue" options:nil];
-    }
-}
-
-
-// MARK: -
-// MARK: Events
-
-/*! Called when the user click on the stepper
-*/
-- (void)_clickStepper:(id)sender
-{
-    // Success when clicking on the stepper if the datePicker is not selected
-    if ([[self window] firstResponder] != _datePicker || !_currentTextField)
-    {
-        var isUp = NO;
-
-        if ([sender objectValue] == 1)
-            isUp = YES;
-
-        [self _selectTextField:_firstTextField];
-        [[self window] makeFirstResponder:_datePicker];
-
-        // Update the dateValue with the binding.
-        if (isUp)
-            [_stepper setDoubleValue:[_currentTextField intValue] + 1];
-        else
-            [_stepper setDoubleValue:[_currentTextField intValue] - 1];
-
-        return;
-    }
-
-    if ([_currentTextField dateType] != CPAMPMDateType)
-    {
-        // Make sure to get the good value, especially when we reach the maxDate or minDate
-        [sender setDoubleValue:[_currentTextField intValue]];
-    }
-    else
-    {
-        // AM/PM behavior
-        if ([[_currentTextField stringValue] isEqualToString:@"PM"])
-            [_currentTextField setStringValue:@"AM"];
-        else
-            [_currentTextField setStringValue:@"PM"];
-
-        [[CPNotificationCenter defaultCenter] postNotificationName:CPDatePickerElementTextFieldAMPMChangedNotification object:_currentTextField userInfo:nil];
-    }
-}
-
-/*!
-    PerformKeyEquivalent event
-    We need to override that to handle the tab key
-*/
-- (BOOL)performKeyEquivalent:(CPEvent)anEvent
-{
-    if (![self isEnabled] || !_currentTextField || [[self window] firstResponder] != _datePicker)
-        return NO;
-
-    if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
-    {
-        if ([anEvent modifierFlags] & CPShiftKeyMask)
-            [self insertBacktab:self];
-        else
-            [self insertTab:self];
-
-        return YES;
-    }
-    else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
-    {
-        [self insertBacktab:self];
-        return YES;
-    }
-
-    return [super performKeyEquivalent:anEvent];
-}
-
-- (_CPDatePickerElementTextField)_nextVisibleTextFieldFrom:(_CPDatePickerElementTextField)aTextField
-{
-    var runner = [aTextField nextTextField];
-
-    // If we wrapped back to the start immediately, or runner is nil, we are done.
-    if (!runner || runner == _firstTextField)
-        return nil;
-
-    // Traverse hidden fields
-    while (runner && [runner isHidden])
-    {
-        // If we hit the absolute last field and it is hidden, we've reached the end.
-        if (runner == _lastTextField)
-            return nil;
-
-        runner = [runner nextTextField];
-
-        // Safety: if we wrapped back to the start inside the loop
-        if (runner == _firstTextField)
-            return nil;
-    }
-
-    return runner;
-}
-
-- (_CPDatePickerElementTextField)_previousVisibleTextFieldFrom:(_CPDatePickerElementTextField)aTextField
-{
-    var runner = [aTextField previousTextField];
-
-    // If we wrapped back to the end immediately, or runner is nil, we are done.
-    if (!runner || runner == _lastTextField)
-        return nil;
-
-    // Traverse hidden fields
-    while (runner && [runner isHidden])
-    {
-        // If we hit the absolute first field and it is hidden, we've reached the start.
-        if (runner == _firstTextField)
-            return nil;
-
-        runner = [runner previousTextField];
-
-        // Safety: if we wrapped back to the end inside the loop
-        if (runner == _lastTextField)
-            return nil;
-    }
-
-    return runner;
-}
-
-- (void)insertTab:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    // Ensure boundaries are up to date
-    [_datePickerElementView _updateResponderTextField];
-
-    var nextField = [self _nextVisibleTextFieldFrom:_currentTextField];
-
-    if (nextField)
-    {
-        [self _selectTextField:nextField];
-    }
-    else
-    {
-        // We reached the visual end. Manually find the next external view.
-        // We cannot rely on [[self window] selectNextKeyView:self] because it might 
-        // loop back into our own internal fields or select 'self' which refuses focus.
-        var nextView = [_currentTextField nextValidKeyView];
-
-        // Skip any view that is part of this control (descendant)
-        while (nextView && [nextView isDescendantOf:self])
-        {
-            // If we looped back to the current field, we are trapped in a closed loop with no exit.
-            if (nextView == _currentTextField)
-            {
-                nextView = nil;
-                break;
-            }
-            nextView = [nextView nextValidKeyView];
-        }
-
-        if (nextView)
-            [[self window] makeFirstResponder:nextView];
-    }
-}
-
-- (void)insertBacktab:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    [_datePickerElementView _updateResponderTextField];
-
-    var prevField = [self _previousVisibleTextFieldFrom:_currentTextField];
-
-    if (prevField)
-    {
-        [self _selectTextField:prevField];
-    }
-    else
-    {
-        // We reached the visual start. Manually find the previous external view.
-        var prevView = [_currentTextField previousValidKeyView];
-
-        // Skip any view that is part of this control
-        while (prevView && [prevView isDescendantOf:self])
-        {
-            if (prevView == _currentTextField)
-            {
-                prevView = nil;
-                break;
-            }
-            prevView = [prevView previousValidKeyView];
-        }
-
-        if (prevView)
-            [[self window] makeFirstResponder:prevView];
-    }
-}
-
-- (void)moveRight:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    [_datePickerElementView _updateResponderTextField];
-
-    // Use the helper to skip hidden fields
-    var nextField = [self _nextVisibleTextFieldFrom:_currentTextField];
-    
-    if (nextField)
-        [self _selectTextField:nextField];
-}
-
-- (void)moveLeft:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    [_datePickerElementView _updateResponderTextField];
-
-    // Use the helper to skip hidden fields to be safe
-    var prevField = [self _previousVisibleTextFieldFrom:_currentTextField];
-
-    if (prevField)
-        [self _selectTextField:prevField];
-}
-
-- (void)moveDown:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    [_currentTextField _invalidTimer];
-    [_stepper setDoubleValue:[_currentTextField intValue]];
-    [_stepper performClickDown:self];
-}
-
-- (void)moveUp:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    [_currentTextField _invalidTimer];
-    [_stepper setDoubleValue:[_currentTextField intValue]];
-    [_stepper performClickUp:self];
-}
-
-- (void)insertNewline:(id)sender
-{
-    if (!_currentTextField)
-        return;
-
-    [_currentTextField _endEditing];
-}
-
-/*! KeyDown event
-    We just care about the event A/P and every numbers
-*/
-- (void)keyDown:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    [self interpretKeyEvents:[anEvent]];
-
-    var characters = [anEvent characters];
-
-    if ([_datePicker _isAmericanFormat] && [_currentTextField dateType] == CPAMPMDateType && [characters length] > 0)
-    {
-        var charUpper = [characters uppercaseString];
-
-        if (charUpper === "A")
-        {
-            [_currentTextField setStringValue:@"AM"];
-            [[CPNotificationCenter defaultCenter] postNotificationName:CPDatePickerElementTextFieldAMPMChangedNotification object:_currentTextField userInfo:nil];
-            return;
-        }
-        else if (charUpper === "P")
-        {
-            [_currentTextField setStringValue:@"PM"];
-            [[CPNotificationCenter defaultCenter] postNotificationName:CPDatePickerElementTextFieldAMPMChangedNotification object:_currentTextField userInfo:nil];
-            return;
-        }
-    }
-
-    // Pass the event down to the specific field (which handles numeric input validation via regex)
-    [_currentTextField setValueForKeyEvent:anEvent];
-}
-
-
-// MARK: -
-// MARK: Layout methods
-
-/*! Layout the subviews
-*/
-- (void)layoutSubviews
-{
-    [_datePicker _sizeToControlSize];
-    [self setFrameSize:[_datePicker frameSize]];
-
-    [super layoutSubviews];
-
-    var frameSize,
-        bezelInset = [_datePicker valueForThemeAttribute:@"bezel-inset" inState:[_datePicker themeState]];
-
-    // Check the mode to display or not the stepper
-    if ([_datePicker datePickerStyle] == CPTextFieldAndStepperDatePickerStyle)
-    {
-        [_stepper setHidden:NO];
-        [_stepper setControlSize:[_datePicker controlSize]];
-
-        frameSize = CGSizeMake(CGRectGetWidth([_datePicker frame]) - CGRectGetWidth([_stepper frame]) - [_datePicker currentValueForThemeAttribute:@"stepper-margin"], CGRectGetHeight([_datePicker frame]));
-
-        frameSize.width -= bezelInset.left;
-        frameSize.height -= bezelInset.top + bezelInset.bottom;
-
-        [_datePickerElementView setFrameSize:frameSize];
-        [_datePickerElementView setFrameOrigin:CGPointMake(bezelInset.left, bezelInset.top)];
-
-        [_stepper setFrameOrigin:CGPointMake(CGRectGetMaxX([_datePickerElementView frame]) + [_datePicker currentValueForThemeAttribute:@"stepper-margin"], bezelInset.top + CGRectGetHeight([_datePickerElementView frame]) / 2 - CGRectGetHeight([_stepper frame]) / 2)];
-    }
-    else if ([_datePicker datePickerStyle] == CPTextFieldDatePickerStyle)
-    {
-        frameSize = CGSizeMake(CGRectGetWidth([_datePicker frame]), CGRectGetHeight([_datePicker frame]));
-
-        frameSize.width -= bezelInset.left + bezelInset.right;
-        frameSize.height -= bezelInset.top + bezelInset.bottom;
-
-        [_datePickerElementView setFrameSize:frameSize];
-        [_datePickerElementView setFrameOrigin:CGPointMake(bezelInset.left, bezelInset.top)];
-        [_stepper setHidden:YES];
-    }
-
-    // FIXME: should be done in a self setControlSize
-    [_datePickerElementView setControlSize:[_datePicker controlSize]];
-
-    [_datePickerElementView setNeedsLayout];
-}
-
-
-// MARK: -
-// MARK: Override observers
-
-- (void)_removeObservers
-{
-    if (!_isObserving)
-        return;
-
-    [super _removeObservers];
-
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPDatePickerElementTextFieldBecomeFirstResponder object:self];
-}
-
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    [super _addObservers];
-
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_datePickerElementTextFieldBecomeFirstResponder:) name:CPDatePickerElementTextFieldBecomeFirstResponder object:self];
-}
-
-@end

AppKit/CPDictionaryController.j

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

AppKit/CPDocument.j

@@ -1,932 +0,0 @@
-/*
- * CPDocument.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPString.j>
-@import <Foundation/CPArray.j>
-
-@import "CPAlert.j"
-@import "CPResponder.j"
-@import "CPSavePanel.j"
-@import "CPViewController.j"
-@import "CPWindowController.j"
-
-@class CPDocumentController
-
-@global CPApp
-
-
-/*
-    @global
-    @group CPSaveOperationType
-*/
-CPSaveOperation             = 0;
-/*
-    @global
-    @group CPSaveOperationType
-*/
-CPSaveAsOperation           = 1;
-/*
-    @global
-    @group CPSaveOperationType
-*/
-CPSaveToOperation           = 2;
-/*
-    @global
-    @group CPSaveOperationType
-*/
-CPAutosaveOperation         = 3;
-
-/*
-    @global
-    @group CPDocumentChangeType
-*/
-CPChangeDone                = 0;
-/*
-    @global
-    @group CPDocumentChangeType
-*/
-CPChangeUndone              = 1;
-/*
-    @global
-    @group CPDocumentChangeType
-*/
-CPChangeCleared             = 2;
-/*
-    @global
-    @group CPDocumentChangeType
-*/
-CPChangeReadOtherContents   = 3;
-/*
-    @global
-    @group CPDocumentChangeType
-*/
-CPChangeAutosaved           = 4;
-
-CPDocumentWillSaveNotification      = @"CPDocumentWillSaveNotification";
-CPDocumentDidSaveNotification       = @"CPDocumentDidSaveNotification";
-CPDocumentDidFailToSaveNotification = @"CPDocumentDidFailToSaveNotification";
-
-var CPDocumentUntitledCount = 0;
-
-/*!
-    @ingroup appkit
-    @class CPDocument
-
-    CPDocument is used to represent a document/file in a Cappuccino application.
-    In a document-based application, generally multiple documents are open simultaneously
-    (multiple text documents, slide presentations, spreadsheets, etc.), and multiple
-    CPDocuments should be used to represent this.
-*/
-@implementation CPDocument : CPResponder
-{
-    CPWindow            _window; // For outlet purposes.
-    CPView              _view; // For outlet purposes
-    CPDictionary        _viewControllersForWindowControllers;
-
-    CPURL               _fileURL;
-    CPString            _fileType;
-    CPArray             _windowControllers;
-    unsigned            _untitledDocumentIndex;
-
-    BOOL                _hasUndoManager;
-    CPUndoManager       _undoManager;
-
-    int                 _changeCount;
-
-    CPURLConnection     _readConnection;
-    CPURLRequest        _writeRequest;
-
-    CPAlert             _canCloseAlert;
-}
-
-/*!
-    Initializes an empty document.
-    @return the initialized document
-*/
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _windowControllers = [];
-        _viewControllersForWindowControllers = @{};
-
-        _hasUndoManager = YES;
-        _changeCount = 0;
-
-        [self setNextResponder:CPApp];
-    }
-
-    return self;
-}
-
-/*!
-    Initializes the document with a specific data type.
-    @param aType the type of document to initialize
-    @param anError not used
-    @return the initialized document
-*/
-- (id)initWithType:(CPString)aType error:(/*{*/CPError/*}*/)anError
-{
-    self = [self init];
-
-    if (self)
-        [self setFileType:aType];
-
-    return self;
-}
-
-/*!
-    Initializes a document of a specific type located at a URL. Notifies
-    the provided delegate after initialization.
-    @param anAbsoluteURL the url of the document content
-    @param aType the type of document located at the URL
-    @param aDelegate the delegate to notify
-    @param aDidReadSelector the selector used to notify the delegate
-    @param aContextInfo context information passed to the delegate
-    after initialization
-    @return the initialized document
-*/
-- (id)initWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
-{
-    self = [self init];
-
-    if (self)
-    {
-        [self setFileURL:anAbsoluteURL];
-        [self setFileType:aType];
-
-        [self readFromURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
-    }
-
-    return self;
-}
-
-/*!
-    Initializes the document from a URL.
-    @param anAbsoluteURL the document location
-    @param absoluteContentsURL the location of the document's contents
-    @param aType the type of the contents
-    @param aDelegate this object will receive a callback after the document's contents are loaded
-    @param aDidReadSelector the message selector that will be sent to \c aDelegate
-    @param aContextInfo passed as the argument to the message sent to the \c aDelegate
-    @return the initialized document
-*/
-- (id)initForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
-{
-    self = [self init];
-
-    if (self)
-    {
-        [self setFileURL:anAbsoluteURL];
-        [self setFileType:aType];
-
-        [self readFromURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aDidReadSelector contextInfo:aContextInfo];
-    }
-
-    return self;
-}
-
-/*!
-    Returns the receiver's data in a specified type. The default implementation just
-    throws an exception.
-    @param aType the format of the data
-    @param anError not used
-    @throws CPUnsupportedMethodException if this method hasn't been overridden by the subclass
-    @return the document data
-*/
-- (CPData)dataOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:"dataOfType:error: must be overridden by the document subclass."];
-}
-
-/*!
-    Sets the content of the document by reading the provided
-    data. The default implementation just throws an exception.
-    @param aData the document's data
-    @param aType the document type
-    @param anError not used
-    @throws CPUnsupportedMethodException if this method hasn't been
-    overridden by the subclass
-*/
-- (void)readFromData:(CPData)aData ofType:(CPString)aType error:(CPError)anError
-{
-    [CPException raise:CPUnsupportedMethodException
-                reason:"readFromData:ofType: must be overridden by the document subclass."];
-}
-
-- (void)viewControllerWillLoadCib:(CPViewController)aViewController
-{
-}
-
-- (void)viewControllerDidLoadCib:(CPViewController)aViewController
-{
-}
-
-// Creating and managing window controllers
-/*!
-    Creates the window controller for this document.
-*/
-- (void)makeWindowControllers
-{
-    [self makeViewAndWindowControllers];
-}
-
-- (void)makeViewAndWindowControllers
-{
-    var viewCibName = [self viewCibName],
-        windowCibName = [self windowCibName],
-        viewController = nil,
-        windowController = nil;
-
-    // Create our view controller if we have a cib for it.
-    if ([viewCibName length])
-        viewController = [[CPViewController alloc] initWithCibName:viewCibName bundle:nil owner:self];
-
-    // From a cib if we have one.
-    if ([windowCibName length])
-        windowController = [[CPWindowController alloc] initWithWindowCibName:windowCibName owner:self];
-
-    // If not you get a standard window capable of displaying multiple documents and view
-    else if (viewController)
-    {
-        var view = [viewController view],
-            viewFrame = [view frame];
-
-        viewFrame.origin = CGPointMake(50, 50);
-
-        var theWindow = [[CPWindow alloc] initWithContentRect:viewFrame styleMask:CPTitledWindowMask | CPClosableWindowMask | CPMiniaturizableWindowMask | CPResizableWindowMask];
-
-        windowController = [[CPWindowController alloc] initWithWindow:theWindow];
-    }
-
-    if (windowController && viewController)
-        [windowController setSupportsMultipleDocuments:YES];
-
-    if (windowController)
-        [self addWindowController:windowController];
-
-    if (viewController)
-        [self addViewController:viewController forWindowController:windowController];
-}
-
-/*!
-    Returns the document's window controllers
-*/
-- (CPArray)windowControllers
-{
-    return _windowControllers;
-}
-
-/*!
-    Add a controller to the document's list of controllers. This should
-    be called after making a new window controller.
-    @param aWindowController the controller to add
-*/
-- (void)addWindowController:(CPWindowController)aWindowController
-{
-    [_windowControllers addObject:aWindowController];
-
-    if ([aWindowController document] !== self)
-        [aWindowController setDocument:self];
-}
-
-/*!
-    Remove a controller to the document's list of controllers. This should
-    be called after closing the controller's window.
-    @param aWindowController the controller to remove
-*/
-- (void)removeWindowController:(CPWindowController)aWindowController
-{
-    if (aWindowController)
-        [_windowControllers removeObject:aWindowController];
-
-    if ([aWindowController document] === self)
-        [aWindowController setDocument:nil];
-}
-
-- (CPView)view
-{
-    return _view;
-}
-
-- (CPArray)viewControllers
-{
-    return [_viewControllersForWindowControllers allValues];
-}
-
-- (void)addViewController:(CPViewController)aViewController forWindowController:(CPWindowController)aWindowController
-{
-    // FIXME: exception if we don't own the window controller?
-    [_viewControllersForWindowControllers setObject:aViewController forKey:[aWindowController UID]];
-
-    if ([aWindowController document] === self)
-        [aWindowController setViewController:aViewController];
-}
-
-- (void)removeViewController:(CPViewController)aViewController
-{
-    [_viewControllersForWindowControllers removeObject:aViewController];
-}
-
-- (CPViewController)viewControllerForWindowController:(CPWindowController)aWindowController
-{
-    return [_viewControllersForWindowControllers objectForKey:[aWindowController UID]];
-}
-
-// Managing Document Windows
-/*!
-    Shows all the document's windows.
-*/
-- (void)showWindows
-{
-    [_windowControllers makeObjectsPerformSelector:@selector(setDocument:) withObject:self];
-    [_windowControllers makeObjectsPerformSelector:@selector(showWindow:) withObject:self];
-}
-
-/*!
-    Returns the name of the document as displayed in the title bar.
-*/
-- (CPString)displayName
-{
-    if (_fileURL)
-        return [_fileURL lastPathComponent];
-
-    if (!_untitledDocumentIndex)
-        _untitledDocumentIndex = ++CPDocumentUntitledCount;
-
-    if (_untitledDocumentIndex == 1)
-       return @"Untitled";
-
-    return @"Untitled " + _untitledDocumentIndex;
-}
-
-- (CPString)viewCibName
-{
-    return nil;
-}
-
-/*!
-    Returns the document's Cib name
-*/
-- (CPString)windowCibName
-{
-    return nil;
-}
-
-/*!
-    Called after \c aWindowController loads the document's Nib file.
-    @param aWindowController the controller that loaded the Nib file
-*/
-- (void)windowControllerDidLoadCib:(CPWindowController)aWindowController
-{
-}
-
-/*!
-    Called before \c aWindowController will load the document's Nib file.
-    @param aWindowController the controller that will load the Nib file
-*/
-- (void)windowControllerWillLoadCib:(CPWindowController)aWindowController
-{
-}
-
-// Reading from and Writing to URLs
-/*!
-    Set the document's data from a URL. Notifies the provided delegate afterwards.
-    @param anAbsoluteURL the URL to the document's content
-    @param aType the document type
-    @param aDelegate delegate to notify after reading the data
-    @param aDidReadSelector message that will be sent to the delegate
-    @param aContextInfo context information that gets sent to the delegate
-*/
-- (void)readFromURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aDidReadSelector contextInfo:(id)aContextInfo
-{
-    [_readConnection cancel];
-
-    // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
-    _readConnection = [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:anAbsoluteURL] delegate:self];
-
-    _readConnection.session = _CPReadSessionMake(aType, aDelegate, aDidReadSelector, aContextInfo);
-}
-
-/*!
-    Returns the path to the document's file.
-*/
-- (CPURL)fileURL
-{
-    return _fileURL;
-}
-
-/*!
-    Sets the path to the document's file.
-    @param aFileURL the path to the document's file
-*/
-- (void)setFileURL:(CPURL)aFileURL
-{
-    if (_fileURL === aFileURL)
-        return;
-
-    _fileURL = aFileURL;
-
-    [_windowControllers makeObjectsPerformSelector:@selector(synchronizeWindowTitleWithDocumentName)];
-}
-
-/*!
-    Saves the document to the specified URL. Notifies the provided delegate
-    with the provided selector and context info afterwards.
-    @param anAbsoluteURL the url to write the document data to
-    @param aTypeName the document type
-    @param aSaveOperation the type of save operation
-    @param aDelegate the delegate to notify after saving
-    @param aDidSaveSelector the selector to send the delegate
-    @param aContextInfo context info that gets passed to the delegate
-*/
-- (void)saveToURL:(CPURL)anAbsoluteURL ofType:(CPString)aTypeName forSaveOperation:(CPSaveOperationType)aSaveOperation delegate:(id)aDelegate didSaveSelector:(SEL)aDidSaveSelector contextInfo:(id)aContextInfo
-{
-    var data = [self dataOfType:[self fileType] error:nil],
-        oldChangeCount = _changeCount;
-
-    _writeRequest = [CPURLRequest requestWithURL:anAbsoluteURL];
-
-    // FIXME: THIS IS WRONG! We need a way to decide
-    if ([CPPlatform isBrowser])
-        [_writeRequest setHTTPMethod:@"POST"];
-    else
-        [_writeRequest setHTTPMethod:@"PUT"];
-
-    [_writeRequest setHTTPBody:[data rawString]];
-
-    [_writeRequest setValue:@"close" forHTTPHeaderField:@"Connection"];
-
-    if (aSaveOperation === CPSaveOperation)
-        [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
-
-    if (aSaveOperation !== CPSaveToOperation)
-        [self updateChangeCount:CPChangeCleared];
-
-    // FIXME: Oh man is this every looking for trouble, we need to handle login at the Cappuccino level, with HTTP Errors.
-    var connection = [CPURLConnection connectionWithRequest:_writeRequest delegate:self];
-
-    connection.session = _CPSaveSessionMake(anAbsoluteURL, aSaveOperation, oldChangeCount, aDelegate, aDidSaveSelector, aContextInfo, connection);
-}
-
-/*
-    Implemented as a delegate method for CPURLConnection
-    @ignore
-*/
-- (void)connection:(CPURLConnection)aConnection didReceiveResponse:(CPURLResponse)aResponse
-{
-    // If we got this far and it wasn't an HTTP request, then everything is fine.
-    if (![aResponse isKindOfClass:[CPHTTPURLResponse class]])
-        return;
-
-    var statusCode = [aResponse statusCode];
-
-    // Nothing to do if everything is hunky dory.
-    if (statusCode === 200)
-        return;
-
-    var session = aConnection.session;
-
-    if (aConnection == _readConnection)
-    {
-        [aConnection cancel];
-
-        alert("There was an error retrieving the document.");
-
-        var theDelegate = session.delegate;
-
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, NO, session.contextInfo);
-    }
-    else
-    {
-        // 409: Conflict, in Cappuccino, overwrite protection for documents.
-        if (statusCode == 409)
-        {
-            [aConnection cancel];
-
-            if (confirm("There already exists a file with that name, would you like to overwrite it?"))
-            {
-                [_writeRequest setValue:@"true" forHTTPHeaderField:@"x-cappuccino-overwrite"];
-
-                [aConnection start];
-            }
-            else
-            {
-                if (session.saveOperation != CPSaveToOperation)
-                {
-                    _changeCount += session.changeCount;
-                    [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
-                }
-
-                _writeRequest = nil;
-
-                var theDelegate = session.delegate;
-
-                theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, NO, session.contextInfo);
-                [self _sendDocumentSavedNotification:NO];
-            }
-        }
-    }
-}
-
-/*
-    Implemented as a delegate method for CPURLConnection
-    @ignore
-*/
-- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)aData
-{
-    var session = aConnection.session,
-        theDelegate = session.delegate;
-
-    // READ
-    if (aConnection == _readConnection)
-    {
-        [self readFromData:[CPData dataWithRawString:aData] ofType:session.fileType error:nil];
-
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, YES, session.contextInfo);
-    }
-    else
-    {
-        if (session.saveOperation != CPSaveToOperation)
-            [self setFileURL:session.absoluteURL];
-
-        _writeRequest = nil;
-
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, YES, session.contextInfo);
-        [self _sendDocumentSavedNotification:YES];
-    }
-}
-
-/*
-    Implemented as a delegate method for CPURLConnection
-    @ignore
-*/
-- (void)connection:(CPURLConnection)aConnection didFailWithError:(CPError)anError
-{
-    var session = aConnection.session,
-        theDelegate = session.delegate;
-
-    if (_readConnection == aConnection)
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didReadSelector, self, NO, session.contextInfo);
-
-    else
-    {
-        if (session.saveOperation != CPSaveToOperation)
-        {
-            _changeCount += session.changeCount;
-            [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
-        }
-
-        _writeRequest = nil;
-
-        alert("There was an error saving the document.");
-
-        theDelegate.isa.objj_msgSend3(theDelegate, session.didSaveSelector, self, NO, session.contextInfo);
-        [self _sendDocumentSavedNotification:NO];
-    }
-}
-
-/*
-    Implemented as a delegate method for CPURLConnection
-    @ignore
-*/
-- (void)connectionDidFinishLoading:(CPURLConnection)aConnection
-{
-    if (_readConnection == aConnection)
-        _readConnection = nil;
-}
-
-// Managing Document Status
-/*!
-    Returns \c YES if there are any unsaved changes.
-*/
-- (BOOL)isDocumentEdited
-{
-    return _changeCount != 0;
-}
-
-/*!
-    Updates the number of unsaved changes to the document.
-    @param aChangeType a new document change to apply
-*/
-- (void)updateChangeCount:(CPDocumentChangeType)aChangeType
-{
-    if (aChangeType == CPChangeDone)
-        ++_changeCount;
-    else if (aChangeType == CPChangeUndone)
-        --_changeCount;
-    else if (aChangeType == CPChangeCleared)
-        _changeCount = 0;
-    /*else if (aChangeType == CPCHangeReadOtherContents)
-
-    else if (aChangeType == CPChangeAutosaved)*/
-
-    [_windowControllers makeObjectsPerformSelector:@selector(setDocumentEdited:) withObject:[self isDocumentEdited]];
-}
-
-// Managing File Types
-/*!
-    Sets the document's file type
-    @param aType the document's type
-*/
-- (void)setFileType:(CPString)aType
-{
-    _fileType = aType;
-}
-
-/*!
-    Returns the document's file type
-*/
-- (CPString)fileType
-{
-    return _fileType;
-}
-
-// Working with Undo Manager
-/*!
-    Returns \c YES if the document has a
-    CPUndoManager.
-*/
-- (BOOL)hasUndoManager
-{
-    return _hasUndoManager;
-}
-
-/*!
-    Sets whether the document should have a CPUndoManager.
-    @param aFlag \c YES makes the document have an undo manager
-*/
-- (void)setHasUndoManager:(BOOL)aFlag
-{
-    if (_hasUndoManager == aFlag)
-        return;
-
-    _hasUndoManager = aFlag;
-
-    if (!_hasUndoManager)
-        [self setUndoManager:nil];
-}
-
-/* @ignore */
-- (void)_undoManagerWillCloseGroup:(CPNotification)aNotification
-{
-    var undoManager = [aNotification object];
-
-    if ([undoManager isUndoing] || [undoManager isRedoing])
-        return;
-
-    [self updateChangeCount:CPChangeDone];
-}
-
-/* @ignore */
-- (void)_undoManagerDidUndoChange:(CPNotification)aNotification
-{
-    [self updateChangeCount:CPChangeUndone];
-}
-
-/* @ignore */
-- (void)_undoManagerDidRedoChange:(CPNotification)aNotification
-{
-    [self updateChangeCount:CPChangeDone];
-}
-
-/*
-    Sets the document's undo manager. This method will add the
-    undo manager as an observer to the notification center.
-    @param anUndoManager the new undo manager for the document
-*/
-- (void)setUndoManager:(CPUndoManager)anUndoManager
-{
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (_undoManager)
-    {
-        [defaultCenter removeObserver:self
-                                 name:CPUndoManagerDidUndoChangeNotification
-                               object:_undoManager];
-
-        [defaultCenter removeObserver:self
-                                 name:CPUndoManagerDidRedoChangeNotification
-                               object:_undoManager];
-
-        [defaultCenter removeObserver:self
-                                 name:CPUndoManagerWillCloseUndoGroupNotification
-                               object:_undoManager];
-    }
-
-    _undoManager = anUndoManager;
-
-    if (_undoManager)
-    {
-
-        [defaultCenter addObserver:self
-                          selector:@selector(_undoManagerDidUndoChange:)
-                              name:CPUndoManagerDidUndoChangeNotification
-                            object:_undoManager];
-
-        [defaultCenter addObserver:self
-                          selector:@selector(_undoManagerDidRedoChange:)
-                              name:CPUndoManagerDidRedoChangeNotification
-                            object:_undoManager];
-
-        [defaultCenter addObserver:self
-                          selector:@selector(_undoManagerWillCloseGroup:)
-                              name:CPUndoManagerWillCloseUndoGroupNotification
-                            object:_undoManager];
-    }
-}
-
-/*!
-    Returns the document's undo manager. If the document
-    should have one, but the manager is \c nil, it
-    will be created and then returned.
-    @return the document's undo manager
-*/
-- (CPUndoManager)undoManager
-{
-    if (_hasUndoManager && !_undoManager)
-        [self setUndoManager:[[CPUndoManager alloc] init]];
-
-    return _undoManager;
-}
-
-/*
-    Implemented as a delegate of a CPWindow
-    @ignore
-*/
-- (CPUndoManager)windowWillReturnUndoManager:(CPWindow)aWindow
-{
-    return [self undoManager];
-}
-
-// Handling User Actions
-/*!
-    Saves the document. If the document does not
-    have a file path to save to (\c fileURL)
-    then \c -saveDocumentAs: will be called.
-    @param aSender the object requesting the save
-*/
-- (void)saveDocument:(id)aSender
-{
-    [self saveDocumentWithDelegate:nil didSaveSelector:nil contextInfo:nil];
-}
-
-- (void)saveDocumentWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
-{
-    if (_fileURL)
-    {
-        [[CPNotificationCenter defaultCenter]
-            postNotificationName:CPDocumentWillSaveNotification
-                          object:self];
-
-        [self saveToURL:_fileURL ofType:[self fileType] forSaveOperation:CPSaveOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
-    }
-    else
-        [self _saveDocumentAsWithDelegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
-}
-
-/*!
-    Saves the document to a user specified path.
-    @param aSender the object requesting the operation
-*/
-- (void)saveDocumentAs:(id)aSender
-{
-    [self _saveDocumentAsWithDelegate:nil didSaveSelector:nil contextInfo:nil];
-}
-
-- (void)_saveDocumentAsWithDelegate:(id)delegate didSaveSelector:(SEL)didSaveSelector contextInfo:(Object)contextInfo
-{
-    var savePanel = [CPSavePanel savePanel],
-        response = [savePanel runModal];
-
-    if (!response)
-        return;
-
-    var saveURL = [savePanel URL];
-
-    [[CPNotificationCenter defaultCenter]
-        postNotificationName:CPDocumentWillSaveNotification
-                      object:self];
-
-    [self saveToURL:saveURL ofType:[self fileType] forSaveOperation:CPSaveAsOperation delegate:delegate didSaveSelector:didSaveSelector contextInfo:contextInfo];
-}
-
-/*
-    @ignore
-*/
-- (void)_sendDocumentSavedNotification:(BOOL)didSave
-{
-    if (didSave)
-        [[CPNotificationCenter defaultCenter]
-            postNotificationName:CPDocumentDidSaveNotification
-                          object:self];
-    else
-        [[CPNotificationCenter defaultCenter]
-            postNotificationName:CPDocumentDidFailToSaveNotification
-                          object:self];
-}
-
-@end
-
-@implementation CPDocument (ClosingDocuments)
-
-- (void)close
-{
-    [_windowControllers makeObjectsPerformSelector:@selector(removeDocumentAndCloseIfNecessary:) withObject:self];
-    [[CPDocumentController sharedDocumentController] removeDocument:self];
-}
-
-- (void)shouldCloseWindowController:(CPWindowController)controller delegate:(id)delegate shouldCloseSelector:(SEL)selector contextInfo:(Object)info
-{
-    if ([controller shouldCloseDocument] || ([_windowControllers count] < 2 && [_windowControllers indexOfObject:controller] !== CPNotFound))
-        [self canCloseDocumentWithDelegate:self shouldCloseSelector:@selector(_document:shouldClose:context:) contextInfo:{delegate:delegate, selector:selector, context:info}];
-
-    else if ([delegate respondsToSelector:selector])
-        delegate.isa.objj_msgSend3(delegate, selector, self, YES, info);
-}
-
-- (void)_document:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
-{
-    var theDelegate = context.delegate;
-
-    // Only close the document explicitly if there is NO delegate to handle the action.
-    // If a delegate exists (e.g., the CPWindow), it is responsible for performing the close
-    // upon receiving the callback below. Calling [self close] here would cause a double-close.
-    if (aDocument === self && shouldClose && theDelegate == nil)
-        [self close];
-
-    if (theDelegate)
-        theDelegate.isa.objj_msgSend3(theDelegate, context.selector, aDocument, shouldClose, context.context);
-}
-
-- (void)canCloseDocumentWithDelegate:(id)aDelegate shouldCloseSelector:(SEL)aSelector contextInfo:(Object)context
-{
-    if (![self isDocumentEdited])
-        return [aDelegate respondsToSelector:aSelector] && aDelegate.isa.objj_msgSend3(aDelegate, aSelector, self, YES, context);
-
-    _canCloseAlert = [[CPAlert alloc] init];
-
-    [_canCloseAlert setDelegate:self];
-    [_canCloseAlert setAlertStyle:CPWarningAlertStyle];
-    [_canCloseAlert setTitle:@"Unsaved Document"];
-    [_canCloseAlert setMessageText:@"Do you want to save the changes you've made to the document \"" + ([self displayName] || [self fileName]) + "\"?"];
-
-    [_canCloseAlert addButtonWithTitle:@"Save"];
-    [_canCloseAlert addButtonWithTitle:@"Cancel"];
-    [_canCloseAlert addButtonWithTitle:@"Don't Save"];
-
-    _canCloseAlert._context = {delegate:aDelegate, selector:aSelector, context:context};
-
-    [_canCloseAlert runModal];
-}
-
-- (void)alertDidEnd:(CPAlert)alert returnCode:(int)returnCode
-{
-    if (alert !== _canCloseAlert)
-        return;
-
-    var delegate = alert._context.delegate,
-        selector = alert._context.selector,
-        context = alert._context.context;
-
-    if (returnCode === 0)
-        [self saveDocumentWithDelegate:delegate didSaveSelector:selector contextInfo:context];
-    else if (delegate != null)
-        delegate.isa.objj_msgSend3(delegate, selector, self, returnCode === 2, context);
-
-    _canCloseAlert = nil;
-}
-
-@end
-
-var _CPReadSessionMake = function(aType, aDelegate, aDidReadSelector, aContextInfo)
-{
-    return { fileType:aType, delegate:aDelegate, didReadSelector:aDidReadSelector, contextInfo:aContextInfo };
-};
-
-var _CPSaveSessionMake = function(anAbsoluteURL, aSaveOperation, aChangeCount, aDelegate, aDidSaveSelector, aContextInfo, aConnection)
-{
-    return { absoluteURL:anAbsoluteURL, saveOperation:aSaveOperation, changeCount:aChangeCount, delegate:aDelegate, didSaveSelector:aDidSaveSelector, contextInfo:aContextInfo, connection:aConnection };
-};

AppKit/CPDocumentController.j

@@ -1,499 +0,0 @@
-/*
- * CPDocumentController.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPBundle.j>
-
-@import "CPDocument.j"
-@import "CPOpenPanel.j"
-@import "CPMenuItem.j"
-@import "CPWindowController.j"
-
-@global CPApp
-
-
-var CPSharedDocumentController = nil;
-
-/*!
-    @ingroup appkit
-    @class CPDocumentController
-    This class is responsible for managing an application's open documents.
-*/
-@implementation CPDocumentController : CPObject
-{
-    CPArray _documents;
-    CPArray _documentTypes;
-}
-
-/*!
-    Returns the singleton instance of the application's document controller. If it has not
-    been created yet, it will be created then returned.
-    @return a CPDocumentController
-*/
-+ (id)sharedDocumentController
-{
-    if (!CPSharedDocumentController)
-        [[self alloc] init];
-
-    return CPSharedDocumentController;
-}
-
-/*
-    @ignore
-*/
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _documents = [[CPArray alloc] init];
-
-        if (!CPSharedDocumentController)
-            CPSharedDocumentController = self;
-
-        _documentTypes = [[[CPBundle mainBundle] infoDictionary] objectForKey:@"CPBundleDocumentTypes"];
-    }
-    return self;
-}
-
-// Creating and Opening Documents
-
-/*!
-    Returns the document matching the specified URL. This
-    method searches documents already open. It does not
-    open the document at the URL if it is not already open.
-    @param aURL the url of the document
-    @return the document, or \c nil if such a document is not open
-*/
-- (CPDocument)documentForURL:(CPURL)aURL
-{
-    var index = 0,
-        count = [_documents count];
-
-    for (; index < count; ++index)
-    {
-        var theDocument = _documents[index];
-
-        if ([[theDocument fileURL] isEqual:aURL])
-            return theDocument;
-    }
-
-    return nil;
-}
-
-/*!
-    Creates a new document of the specified type.
-    @param aType the type of the new document
-    @param shouldDisplay whether to display the document on screen
-*/
-- (CPDocument)openUntitledDocumentOfType:(CPString)aType display:(BOOL)shouldDisplay
-{
-    var theDocument = [self makeUntitledDocumentOfType:aType error:nil];
-
-    if (theDocument)
-        [self addDocument:theDocument];
-
-    if (shouldDisplay)
-    {
-        [theDocument makeWindowControllers];
-        [theDocument showWindows];
-    }
-
-    return theDocument;
-}
-
-/*!
-    Creates a document of the specified type.
-    @param aType the document type
-    @param anError not used
-    @return the created document
-*/
-- (CPDocument)makeUntitledDocumentOfType:(CPString)aType error:(/*{*/CPError/*}*/)anError
-{
-    return [[[self documentClassForType:aType] alloc] initWithType:aType error:anError];
-}
-
-/*!
-    Opens the document at the specified URL.
-    @param anAbsoluteURL the path to the document's file
-    @param shouldDisplay whether to display the document on screen
-    @param anError not used
-    @return the opened document
-*/
-- (CPDocument)openDocumentWithContentsOfURL:(CPURL)anAbsoluteURL display:(BOOL)shouldDisplay error:(CPError)anError
-{
-    var result = [self documentForURL:anAbsoluteURL];
-
-    if (!result)
-    {
-        var type = [self typeForContentsOfURL:anAbsoluteURL error:anError];
-
-        result = [self makeDocumentWithContentsOfURL:anAbsoluteURL ofType:type delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:@{ @"shouldDisplay": shouldDisplay }];
-
-        [self addDocument:result];
-
-        if (result)
-            [self noteNewRecentDocument:result];
-    }
-    else if (shouldDisplay)
-        [result showWindows];
-
-    return result;
-}
-
-/*!
-    Loads a document for a specified URL with it's content
-    retrieved from another URL.
-    @param anAbsoluteURL the document URL
-    @param absoluteContentsURL the location of the document's contents
-    @param anError not used
-    @return the loaded document or \c nil if there was an error
-*/
-- (CPDocument)reopenDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL error:(CPError)anError
-{
-    return [self makeDocumentForURL:anAbsoluteURL withContentsOfURL:absoluteContentsURL  ofType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] delegate:self didReadSelector:@selector(document:didRead:contextInfo:) contextInfo:nil];
-}
-
-/*!
-    Creates a document from the contents at the specified URL.
-    Notifies the provided delegate with the provided selector afterwards.
-    @param anAbsoluteURL the location of the document data
-    @param aType the document type
-    @param aDelegate the delegate to notify
-    @param aSelector the selector to notify with
-    @param aContextInfo the context information passed to the delegate
-*/
-- (CPDocument)makeDocumentWithContentsOfURL:(CPURL)anAbsoluteURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
-{
-    return [[[self documentClassForType:aType] alloc] initWithContentsOfURL:anAbsoluteURL ofType:aType delegate:aDelegate didReadSelector:aSelector contextInfo:aContextInfo];
-}
-
-/*!
-    Creates a document from the contents of a URL, and sets
-    the document's URL location as another URL.
-    @param anAbsoluteURL the document's location
-    @param absoluteContentsURL the location of the document's contents
-    @param aType the document's data type
-    @param aDelegate receives a callback after the load has completed
-    @param aSelector the selector to invoke for the callback
-    @param aContextInfo an object passed as an argument for the callback
-    @return a new document or \c nil if there was an error
-*/
-- (CPDocument)makeDocumentForURL:(CPURL)anAbsoluteURL withContentsOfURL:(CPURL)absoluteContentsURL ofType:(CPString)aType delegate:(id)aDelegate didReadSelector:(SEL)aSelector contextInfo:(id)aContextInfo
-{
-    return [[[self documentClassForType:aType] alloc] initForURL:anAbsoluteURL withContentsOfURL:absoluteContentsURL ofType:aType delegate:aDelegate didReadSelector:aSelector contextInfo:aContextInfo];
-}
-
-/*
-    Implemented delegate method
-    @ignore
-*/
-- (void)document:(CPDocument)aDocument didRead:(BOOL)didRead contextInfo:(id)aContextInfo
-{
-    if (!didRead)
-        return;
-
-    [aDocument makeWindowControllers];
-
-    if ([aContextInfo objectForKey:@"shouldDisplay"])
-        [aDocument showWindows];
-}
-
-/*!
-    Opens a new document in the application.
-    @param aSender the requesting object
-*/
-- (CFAction)newDocument:(id)aSender
-{
-    [self openUntitledDocumentOfType:[[_documentTypes objectAtIndex:0] objectForKey:@"CPBundleTypeName"] display:YES];
-}
-
-- (void)openDocument:(id)aSender
-{
-    var openPanel = [CPOpenPanel openPanel];
-
-    [openPanel runModal];
-
-    var URLs = [openPanel URLs],
-        index = 0,
-        count = [URLs count];
-
-    for (; index < count; ++index)
-        [self openDocumentWithContentsOfURL:[CPURL URLWithString:URLs[index]] display:YES error:nil];
-}
-
-// Managing Documents
-
-/*!
-    Returns the array of all documents being managed. This is
-    the same as all open documents in the application.
-*/
-- (CPArray)documents
-{
-    return _documents;
-}
-
-/*!
-    Returns the CPDocument object associated with the main window.
-*/
-- (CPDocument)currentDocument
-{
-    return [[[CPApp mainWindow] windowController] document];
-}
-
-/*!
-    Adds \c aDocument under the control of the receiver.
-    @param aDocument the document to add
-*/
-- (void)addDocument:(CPDocument)aDocument
-{
-    [_documents addObject:aDocument];
-}
-
-/*!
-    Removes \c aDocument from the control of the receiver.
-    @param aDocument the document to remove
-*/
-- (void)removeDocument:(CPDocument)aDocument
-{
-    [_documents removeObjectIdenticalTo:aDocument];
-}
-
-/*!
-    Returns the document object whose window controller
-    owns a specified window.
-*/
-- (CPDocument)documentForWindow:(CPWindow)aWindow
-{
-   return [[aWindow windowController] document];
-}
-
-/*!
-    Returns a Boolean value that indicates whether the receiver
-    has any documents with unsaved changes.
-*/
-- (BOOL)hasEditedDocuments
-{
-    var iter = [_documents objectEnumerator],
-        obj;
-
-    while ((obj = [iter nextObject]) != nil)
-    {
-        if ([obj isDocumentEdited])
-            return YES;
-    }
-
-    return NO;
-}
-
-- (CPString)defaultType
-{
-    return [_documentTypes[0] objectForKey:@"CPBundleTypeName"];
-}
-
-- (CPString)typeForContentsOfURL:(CPURL)anAbsoluteURL error:(CPError)outError
-{
-    var index = 0,
-        count = _documentTypes.length,
-
-        extension = [[anAbsoluteURL pathExtension] lowercaseString],
-        starType = nil;
-
-    for (; index < count; ++index)
-    {
-        var documentType = _documentTypes[index],
-            extensions = [documentType objectForKey:@"CFBundleTypeExtensions"],
-            extensionIndex = 0,
-            extensionCount = extensions.length;
-
-        for (; extensionIndex < extensionCount; ++extensionIndex)
-        {
-            var thisExtension = [extensions[extensionIndex] lowercaseString];
-            if (thisExtension === extension)
-                return [documentType objectForKey:@"CPBundleTypeName"];
-
-            if (thisExtension === "****")
-                starType = [documentType objectForKey:@"CPBundleTypeName"];
-        }
-    }
-
-    return starType || [self defaultType];
-}
-
-// Managing Document Types
-
-/* @ignore */
-- (CPDictionary)_infoForType:(CPString)aType
-{
-    var i = 0,
-        count = [_documentTypes count];
-
-    for (;i < count; ++i)
-    {
-        var documentType = _documentTypes[i];
-
-        if ([documentType objectForKey:@"CPBundleTypeName"] == aType)
-            return documentType;
-    }
-
-    return nil;
-}
-
-/*!
-    Returns the CPDocument subclass associated with \c aType.
-    @param aType the type of document
-    @return a Cappuccino Class object, or \c nil if no match was found
-*/
-- (Class)documentClassForType:(CPString)aType
-{
-    var className = [[self _infoForType:aType] objectForKey:@"CPDocumentClass"];
-
-    return className ? CPClassFromString(className) : nil;
-}
-
-@end
-
-@implementation CPDocumentController (Closing)
-
-- (void)closeAllDocumentsWithDelegate:(id)aDelegate didCloseAllSelector:(SEL)didCloseSelector contextInfo:(Object)info
-{
-    var context = {
-            delegate: aDelegate,
-            selector: didCloseSelector,
-            context: info
-        };
-
-    [self _closeDocumentsStartingWith:nil shouldClose:YES context:context];
-}
-
-// Recursive callback method. Start it by passing in a document of nil.
-- (void)_closeDocumentsStartingWith:(CPDocument)aDocument shouldClose:(BOOL)shouldClose context:(Object)context
-{
-    if (shouldClose)
-    {
-        [aDocument close];
-
-        if ([[self documents] count] > 0)
-        {
-            [[[self documents] lastObject] canCloseDocumentWithDelegate:self
-                                                    shouldCloseSelector:@selector(_closeDocumentsStartingWith:shouldClose:context:)
-                                                            contextInfo:context];
-            return;
-        }
-    }
-
-    var theDelegate = context.delegate;
-
-    if ([theDelegate respondsToSelector:context.selector])
-        theDelegate.isa.objj_msgSend3(theDelegate, context.selector, self, [[self documents] count] === 0, context.context);
-}
-
-@end
-
-@implementation CPDocumentController (Recents)
-
-- (CPArray)recentDocumentURLs
-{
-    // FIXME move this to CP land
-    if (typeof window["cpRecentDocumentURLs"] === 'function')
-        return window.cpRecentDocumentURLs();
-
-    return [];
-}
-
-- (void)clearRecentDocuments:(id)sender
-{
-    if (typeof window["cpClearRecentDocuments"] === 'function')
-        window.cpClearRecentDocuments();
-
-   [self _updateRecentDocumentsMenu];
-}
-
-- (void)noteNewRecentDocument:(CPDocument)aDocument
-{
-    [self noteNewRecentDocumentURL:[aDocument fileURL]];
-}
-
-- (void)noteNewRecentDocumentURL:(CPURL)aURL
-{
-    var urlAsString = [aURL isKindOfClass:CPString] ? aURL : [aURL absoluteString];
-    if (typeof window["cpNoteNewRecentDocumentPath"] === 'function')
-        window.cpNoteNewRecentDocumentPath(urlAsString);
-
-   [self _updateRecentDocumentsMenu];
-}
-
-- (void)_removeAllRecentDocumentsFromMenu:(CPMenu)aMenu
-{
-    var items = [aMenu itemArray],
-        count = [items count];
-
-    while (count--)
-    {
-        var item = items[count];
-
-        if ([item action] === @selector(_openRecentDocument:))
-            [aMenu removeItemAtIndex:count];
-    }
-}
-
-- (void)_updateRecentDocumentsMenu
-{
-    var menu = [[CPApp mainMenu] _menuWithName:@"_CPRecentDocumentsMenu"],
-        recentDocuments = [self recentDocumentURLs],
-        menuItems = [menu itemArray],
-        documentCount = [recentDocuments count],
-        menuItemCount = [menuItems count];
-
-    [self _removeAllRecentDocumentsFromMenu:menu];
-
-    if (menuItemCount)
-    {
-        if (!documentCount)
-        {
-            if ([menuItems[0] isSeparatorItem])
-                [menu removeItemAtIndex:0];
-        }
-        else
-        {
-            if (![menuItems[0] isSeparatorItem])
-                [menu insertItem:[CPMenuItem separatorItem] atIndex:0];
-        }
-    }
-
-    while (documentCount--)
-    {
-        var path = recentDocuments[documentCount],
-            item = [[CPMenuItem alloc] initWithTitle:[path lastPathComponent] action:@selector(_openRecentDocument:) keyEquivalent:nil];
-
-        [item setTag:path];
-        [menu insertItem:item atIndex:0];
-    }
-}
-
-- (void)_openRecentDocument:(id)sender
-{
-    [self openDocumentWithContentsOfURL:[sender tag] display:YES error:nil];
-}
-
-@end

AppKit/CPDragServer.j

@@ -1,542 +0,0 @@
-/*
- * CPDragServer.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPDragServer_Constants.j"
-@import "CPEvent.j"
-@import "CPImageView.j"
-@import "CPPasteboard.j"
-@import "CPView.j"
-@import "CPWindow_Constants.j"
-@import "CPViewAnimation.j"
-
-@class CPWindow  // This file is imported by CPWindow.j
-@class _CPDOMDataTransferPasteboard
-
-@global CPApp
-
-#define DRAGGING_WINDOW(anObject) ([anObject isKindOfClass:[CPWindow class]] ? anObject : [anObject window])
-
-var CPDragServerPreviousEvent = nil,
-    CPDragServerPeriodicUpdateInterval = 0.05;
-
-var CPSharedDragServer = nil;
-
-var CPDragServerSource             = nil,
-    CPDragServerDraggingInfo       = nil;
-
-/*
-    CPDraggingInfo is a container of information about a specific dragging session.
-    @ignore
-*/
-@implementation CPDraggingInfo : CPObject
-{
-}
-
-- (CPPasteboard)draggingPasteboard
-{
-    if ([CPPlatform supportsDragAndDrop])
-        return [_CPDOMDataTransferPasteboard DOMDataTransferPasteboard];
-
-    return [[CPDragServer sharedDragServer] draggingPasteboard];
-}
-
-- (id)draggingSource
-{
-    return [[CPDragServer sharedDragServer] draggingSource];
-}
-
-/*
-- (unsigned)draggingSourceOperationMask
-*/
-
-- (CGPoint)draggingLocation
-{
-    return [[CPDragServer sharedDragServer] draggingLocation];
-}
-
-- (CPWindow)draggingDestinationWindow
-{
-    return DRAGGING_WINDOW([[CPDragServer sharedDragServer] draggingDestination]);
-}
-
-- (CPImage)draggedImage
-{
-    return [[self draggedView] image];
-}
-
-- (CGPoint)draggedImageLocation
-{
-    return [self draggedViewLocation];
-}
-
-- (CPView)draggedView
-{
-    return [[CPDragServer sharedDragServer] draggedView];
-}
-
-- (CGPoint)draggedViewLocation
-{
-    var dragServer = [CPDragServer sharedDragServer];
-
-    return [DRAGGING_WINDOW([dragServer draggingDestination]) convertPlatformWindowToBase:[[dragServer draggedView] frame].origin];
-}
-
-@end
-
-var CPDraggingSource_draggedImage_movedTo_          = 1 << 0,
-    CPDraggingSource_draggedImage_endedAt_operation_  = 1 << 1,
-    CPDraggingSource_draggedView_movedTo_           = 1 << 2,
-    CPDraggingSource_draggedView_endedAt_operation_ = 1 << 3;
-
-@implementation CPDragServer : CPObject
-{
-    BOOL            _isDragging @accessors(readonly, getter=isDragging);
-
-    CPWindow        _draggedWindow @accessors(readonly, getter=draggedWindow);
-    CPView          _draggedView @accessors(readonly, getter=draggedView);
-    CPImageView     _imageView;
-
-    BOOL            _isDraggingImage;
-
-    CGSize          _draggingOffset @accessors(readonly, getter=draggingOffset);
-
-    CPPasteboard    _draggingPasteboard @accessors(readonly, getter=draggingPasteboard);
-
-    id              _draggingSource @accessors(readonly, getter=draggingSource);
-    unsigned        _implementedDraggingSourceMethods;
-
-    CGPoint         _draggingLocation;
-    id              _draggingDestination;
-    BOOL            _draggingDestinationWantsPeriodicUpdates;
-
-    CGPoint         _startDragLocation;
-    BOOL            _shouldSlideBack;
-    unsigned        _dragOperation;
-
-    CPTimer         _draggingUpdateTimer;
-
-    // Animation State
-    CGPoint         _pendingEndLocation;
-    CPDragOperation _pendingEndOperation;
-}
-
-/*
-    Private Objective-J/Cappuccino method
-    @ignore
-*/
-+ (void)initialize
-{
-    if (self !== [CPDragServer class])
-        return;
-
-    CPDragServerDraggingInfo = [[CPDraggingInfo alloc] init];
-}
-
-+ (CPDragServer)sharedDragServer
-{
-    if (!CPSharedDragServer)
-        CPSharedDragServer = [[CPDragServer alloc] init];
-
-    return CPSharedDragServer;
-}
-
-/*
-    @ignore
-*/
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _draggedWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessWindowMask];
-
-        [_draggedWindow setLevel:CPDraggingWindowLevel];
-    }
-
-    return self;
-}
-
-- (id)draggingDestination
-{
-    return _draggingDestination;
-}
-
-- (CGPoint)draggingLocation
-{
-    return _draggingLocation
-}
-
-- (void)draggingStartedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation
-{
-    if (_isDraggingImage)
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:beganAt:)])
-            [_draggingSource draggedImage:[_draggedView image] beganAt:aLocation];
-    }
-    else
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedView:beganAt:)])
-            [_draggingSource draggedView:_draggedView beganAt:aLocation];
-    }
-
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow orderFront:self];
-}
-
-- (void)draggingSourceUpdatedWithGlobalLocation:(CGPoint)aGlobalLocation
-{
-    if (![CPPlatform supportsDragAndDrop])
-    {
-        var frame = [_draggedWindow frame];
-        frame.origin.x = aGlobalLocation.x - _draggingOffset.width;
-        frame.origin.y = aGlobalLocation.y - _draggingOffset.height;
-        [_draggedWindow _setFrame:frame display:YES animate:NO constrainWidth:NO constrainHeight:NO];
-    }
-
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_movedTo_)
-        [_draggingSource draggedImage:[_draggedView image] movedTo:aGlobalLocation];
-
-    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_movedTo_)
-        [_draggingSource draggedView:_draggedView movedTo:aGlobalLocation];
-}
-
-- (CPDragOperation)draggingUpdatedInPlatformWindow:(CPPlatformWindow)aPlatformWindow location:(CGPoint)aLocation
-{
-    [_draggingUpdateTimer invalidate];
-    _draggingUpdateTimer = nil;
-
-    var dragOperation = CPDragOperationCopy,
-    // We have to convert base to bridge since the drag event comes from the source window, not the drag window.
-        draggingDestination = [aPlatformWindow _dragHitTest:aLocation pasteboard:[CPDragServerDraggingInfo draggingPasteboard]];
-
-    if (draggingDestination)
-        _draggingLocation = [DRAGGING_WINDOW(draggingDestination) convertPlatformWindowToBase:aLocation];
-
-    if (draggingDestination !== _draggingDestination)
-    {
-        if ([_draggingDestination respondsToSelector:@selector(draggingExited:)])
-            [_draggingDestination draggingExited:CPDragServerDraggingInfo];
-
-        _draggingDestination = draggingDestination;
-
-        if ([_draggingDestination respondsToSelector:@selector(wantsPeriodicDraggingUpdates)])
-            _draggingDestinationWantsPeriodicUpdates = [_draggingDestination wantsPeriodicDraggingUpdates];
-        else
-            _draggingDestinationWantsPeriodicUpdates = YES;
-
-        if ([_draggingDestination respondsToSelector:@selector(draggingEntered:)])
-            dragOperation = [_draggingDestination draggingEntered:CPDragServerDraggingInfo];
-    }
-    else if ([_draggingDestination respondsToSelector:@selector(draggingUpdated:)])
-        dragOperation = [_draggingDestination draggingUpdated:CPDragServerDraggingInfo];
-
-    if (!_draggingDestination)
-        dragOperation = CPDragOperationNone;
-    else
-    {
-        if (_draggingDestinationWantsPeriodicUpdates)
-            _draggingUpdateTimer = [CPTimer scheduledTimerWithTimeInterval:CPDragServerPeriodicUpdateInterval
-                                                                    target:self
-                                                                  selector:@selector(_sendPeriodicDraggingUpdate:)
-                                                                  userInfo:@{ "platformWindow":aPlatformWindow, "location":aLocation }
-                                                                   repeats:NO];
-
-        var scrollView = [_draggingDestination isKindOfClass:[CPView class]] ? [_draggingDestination enclosingScrollView] : nil;
-        if (scrollView)
-        {
-            var contentView = [scrollView contentView],
-                bounds = [contentView bounds],
-                eventLocation = [contentView convertPoint:_draggingLocation fromView:nil],
-                deltaX = 0,
-                deltaY = 0,
-                insetSize = 30;
-            
-            if ([contentView respondsToSelector:@selector(documentView)] &&
-                [[contentView documentView] respondsToSelector:@selector(rowHeight)])
-            {
-                // Adjust inset bounds based on CPTableView row height
-                insetSize = MAX(insetSize, [[contentView documentView] rowHeight]);
-            }
-            
-            var insetBounds = CGRectInset(bounds, insetSize, insetSize);
-
-            if (!CGRectContainsPoint(insetBounds, eventLocation))
-            {
-                if ([scrollView hasVerticalScroller])
-                {
-                    if (eventLocation.y < CGRectGetMinY(insetBounds))
-                        deltaY = CGRectGetMinY(insetBounds) - eventLocation.y;
-                    else if (eventLocation.y > CGRectGetMaxY(insetBounds))
-                        deltaY = CGRectGetMaxY(insetBounds) - eventLocation.y;
-                    if (deltaY < -insetBounds.size.height)
-                        deltaY = -insetBounds.size.height;
-                    if (deltaY > insetBounds.size.height)
-                        deltaY = insetBounds.size.height;
-                }
-
-                if ([scrollView hasHorizontalScroller])
-                {
-                    if (eventLocation.x < CGRectGetMinX(insetBounds))
-                        deltaX = CGRectGetMinX(insetBounds) - eventLocation.x;
-                    else if (eventLocation.x > CGRectGetMaxX(insetBounds))
-                        deltaX = CGRectGetMaxX(insetBounds) - eventLocation.x;
-                    if (deltaX < -insetBounds.size.width)
-                        deltaX = -insetBounds.size.width;
-                    if (deltaX > insetBounds.size.width)
-                        deltaX = insetBounds.size.width;
-                }
-
-                var scrollPoint = CGPointMake(bounds.origin.x - deltaX, bounds.origin.y - deltaY);
-
-                [contentView scrollToPoint:scrollPoint];
-                [[scrollView _headerView] scrollPoint:scrollPoint];
-
-            }
-        }
-    }
-
-    return dragOperation;
-}
-
-- (void)_sendPeriodicDraggingUpdate:(CPTimer)aTimer
-{
-    var userInfo = [aTimer userInfo];
-    _dragOperation = [self draggingUpdatedInPlatformWindow:[userInfo objectForKey:@"platformWindow"]
-                                                  location:[userInfo objectForKey:@"location"]];
-}
-
-- (void)draggingEndedInPlatformWindow:(CPPlatformWindow)aPlatformWindow globalLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
-{
-    [_draggingUpdateTimer invalidate];
-    _draggingUpdateTimer = nil;
-
-    // Check if we should slide back (drag failed + slideBack requested)
-    if (![CPPlatform supportsDragAndDrop] && _shouldSlideBack && anOperation === CPDragOperationNone)
-    {
-        // Store state to finalize drag after animation completes
-        _pendingEndLocation = aLocation;
-        _pendingEndOperation = anOperation;
-
-        var currentFrame = [_draggedWindow frame],
-            targetFrame = CGRectMake(_startDragLocation.x, _startDragLocation.y, currentFrame.size.width, currentFrame.size.height);
-
-        // We use CPViewAnimation. Even though _draggedWindow is a CPWindow, 
-        // CPViewAnimation supports targets that respond to setFrame: (like NSViewAnimation does for NSWindow).
-        var animation = [[CPViewAnimation alloc] initWithViewAnimations:[
-            [CPDictionary dictionaryWithObjects:[_draggedWindow, currentFrame, targetFrame] 
-                                        forKeys:[CPViewAnimationTargetKey, CPViewAnimationStartFrameKey, CPViewAnimationEndFrameKey]]
-        ]];
-
-        [animation setAnimationCurve:CPAnimationEaseOut];
-        [animation setDuration:0.25];
-        [animation setDelegate:self];
-        [animation startAnimation];
-
-        return;
-    }
-
-    [self _performFinalCleanupWithLocation:aLocation operation:anOperation];
-}
-
-- (void)animationDidEnd:(CPAnimation)anAnimation
-{
-    [self _performFinalCleanupWithLocation:_pendingEndLocation operation:_pendingEndOperation];
-}
-
-- (void)animationDidStop:(CPAnimation)anAnimation
-{
-    [self _performFinalCleanupWithLocation:_pendingEndLocation operation:_pendingEndOperation];
-}
-
-- (void)_performFinalCleanupWithLocation:(CGPoint)aLocation operation:(CPDragOperation)anOperation
-{
-    [_draggedView removeFromSuperview];
-
-    if (![CPPlatform supportsDragAndDrop])
-        [_draggedWindow orderOut:self];
-
-    if (_implementedDraggingSourceMethods & CPDraggingSource_draggedImage_endedAt_operation_)
-        [_draggingSource draggedImage:[_draggedView image] endedAt:aLocation operation:anOperation];
-    else if (_implementedDraggingSourceMethods & CPDraggingSource_draggedView_endedAt_operation_)
-        [_draggingSource draggedView:_draggedView endedAt:aLocation operation:anOperation];
-
-    _isDragging = NO;
-}
-
-- (void)performDragOperationInPlatformWindow:(CPPlatformWindow)aPlatformWindow
-{
-    if (_draggingDestination &&
-        (![_draggingDestination respondsToSelector:@selector(prepareForDragOperation:)] || [_draggingDestination prepareForDragOperation:CPDragServerDraggingInfo]) &&
-        (![_draggingDestination respondsToSelector:@selector(performDragOperation:)] || [_draggingDestination performDragOperation:CPDragServerDraggingInfo]) &&
-        [_draggingDestination respondsToSelector:@selector(concludeDragOperation:)])
-        [_draggingDestination concludeDragOperation:CPDragServerDraggingInfo];
-}
-
-/*!
-    Initiates a drag session.
-    @param aView the view being dragged
-    @param aWindow the window where the drag source is
-    @param viewLocation
-    @param mouseOffset
-    @param anEvent
-    @param aPasteboard the pasteboard that contains the drag data
-    @param aSourceObject the object where the drag started
-    @param slideBack if \c YES, \c aView slides back to
-    its origin on a failed drop
-*/
-- (void)dragView:(CPView)aView fromWindow:(CPWindow)aWindow at:(CGPoint)viewLocation offset:(CGSize)mouseOffset event:(CPEvent)mouseDownEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
-{
-    _isDragging = YES;
-
-    _draggedView = aView;
-    _draggingPasteboard = aPasteboard || [CPPasteboard pasteboardWithName:CPDragPboard];
-    _draggingSource = aSourceObject;
-    _draggingDestination = nil;
-    _shouldSlideBack = slideBack;
-
-    // The offset is based on the distance from where we want the view to be initially from where the mouse is initially
-    // Hence the use of mouseDownEvent's location and view's location in global coordinates.
-    var mouseDownWindow = [mouseDownEvent window],
-        mouseDownEventLocation = [mouseDownEvent locationInWindow];
-
-    if (mouseDownEventLocation)
-    {
-        if (mouseDownWindow)
-            mouseDownEventLocation = [mouseDownWindow convertBaseToGlobal:mouseDownEventLocation];
-
-        _draggingOffset = CGSizeMake(mouseDownEventLocation.x - viewLocation.x, mouseDownEventLocation.y - viewLocation.y);
-    }
-    else
-        _draggingOffset = CGSizeMakeZero();
-
-    if ([CPPlatform isBrowser])
-        [_draggedWindow setPlatformWindow:[aWindow platformWindow]];
-
-    [aView setFrameOrigin:CGPointMakeZero()];
-
-    var mouseLocation = [CPEvent mouseLocation],
-        viewSize = [aView frameSize],
-        startDragLocationX = mouseLocation.x - _draggingOffset.width,
-        startDragLocationY = mouseLocation.y - _draggingOffset.height,
-        draggedWindowFrame = CGRectMake(startDragLocationX, startDragLocationY, viewSize.width, viewSize.height);
-
-    // Place it where the mouse pointer is.
-    _startDragLocation = CGPointMake(startDragLocationX, startDragLocationY);
-
-    [_draggedWindow _setFrame:draggedWindowFrame display:YES animate:NO constrainWidth:NO constrainHeight:NO];
-
-    [[_draggedWindow contentView] addSubview:aView];
-
-    _implementedDraggingSourceMethods = 0;
-
-    if (_draggedView === _imageView)
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:movedTo:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_movedTo_;
-
-        if ([_draggingSource respondsToSelector:@selector(draggedImage:endedAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedImage_endedAt_operation_;
-    }
-    else
-    {
-        if ([_draggingSource respondsToSelector:@selector(draggedView:movedTo:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_movedTo_;
-
-        if ([_draggingSource respondsToSelector:@selector(draggedView:endedAt:operation:)])
-            _implementedDraggingSourceMethods |= CPDraggingSource_draggedView_endedAt_operation_;
-    }
-
-    if (![CPPlatform supportsDragAndDrop])
-    {
-        [self draggingStartedInPlatformWindow:[aWindow platformWindow] globalLocation:mouseLocation];
-        [self trackDragging:mouseDownEvent];
-    }
-}
-
-/*!
-    Initiates a drag session.
-    @param anImage the image to be dragged
-    @param aWindow the source window of the drag session
-    @param imageLocation
-    @param mouseOffset
-    @param anEvent
-    @param aPasteboard the pasteboard where the drag data is located
-    @param aSourceObject the object where the drag started
-    @param slideBack if \c YES, \c aView slides back to
-    its origin on a failed drop
-*/
-- (void)dragImage:(CPImage)anImage fromWindow:(CPWindow)aWindow at:(CGPoint)imageLocation offset:(CGSize)mouseOffset event:(CPEvent)anEvent pasteboard:(CPPasteboard)aPasteboard source:(id)aSourceObject slideBack:(BOOL)slideBack
-{
-    _isDraggingImage = YES;
-
-    var imageSize = [anImage size];
-
-    if (!_imageView)
-        _imageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, imageSize.width, imageSize.height)];
-
-    [_imageView setImage:anImage];
-
-    [self dragView:_imageView fromWindow:aWindow at:imageLocation offset:mouseOffset event:anEvent pasteboard:aPasteboard source:aSourceObject slideBack:slideBack];
-}
-
-- (void)trackDragging:(CPEvent)anEvent
-{
-    var type = [anEvent type],
-        platformWindow = [_draggedWindow platformWindow],
-        platformWindowLocation = [[anEvent window] convertBaseToPlatformWindow:[anEvent locationInWindow]];
-
-    if (type === CPLeftMouseUp)
-    {
-        // Make sure we do not finalize (cancel) the drag if the last drag update was disallowed
-        if (_dragOperation !== CPDragOperationNone)
-            [self performDragOperationInPlatformWindow:platformWindow];
-
-        [self draggingEndedInPlatformWindow:platformWindow globalLocation:platformWindowLocation operation:_dragOperation];
-
-        // Stop tracking events.
-        return;
-    }
-    else if (type === CPKeyDown)
-    {
-        var characters = [anEvent characters];
-
-        if (characters === CPEscapeFunctionKey)
-        {
-            _dragOperation = CPDragOperationNone;
-            [self draggingEndedInPlatformWindow:platformWindow globalLocation:CGPointMakeZero() operation:_dragOperation];
-            return;
-        }
-    }
-    else
-    {
-        [self draggingSourceUpdatedWithGlobalLocation:platformWindowLocation];
-        _dragOperation = [self draggingUpdatedInPlatformWindow:platformWindow location:platformWindowLocation];
-    }
-
-    // If we're not a mouse up, then we're going to want to grab the next event.
-    [CPApp setTarget:self selector:@selector(trackDragging:)
-        forNextEventMatchingMask:CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPKeyDownMask
-        untilDate:nil inMode:0 dequeue:YES];
-}
-
-@end

AppKit/CPDragServer_Constants.j

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

AppKit/CPEvent.j

@@ -1,703 +0,0 @@
-/*
- * CPEvent.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPEvent_Constants.j"
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
-@import <Foundation/CPString.j>
-
-@import "CPCompatibility.j"
-@import "CGGeometry.j"
-@import "CPTrackingArea.j"
-
-@class CPTextField
-@class CPWindow
-@class CPGraphicsContext
-
-@global CPApp
-@global CPNewlineCharacter
-@global CPCarriageReturnCharacter
-@global CPEnterCharacter
-
-@typedef DOMEvent
-@typedef CPEventType
-
-
-var _CPEventPeriodicEventPeriod         = 0,
-    _CPEventPeriodicEventTimer          = nil,
-    _CPEventUpperCaseRegex              = new RegExp("[A-Z]"),
-    _CPEventStartupMilliseconds         = new Date().getTime();
-
-/*!
-    @ingroup appkit
-    @class CPEvent
-    CPEvent encapsulates the details of a Cappuccino keyboard or mouse event.
-*/
-@implementation CPEvent : CPObject
-{
-    CPEventType         _type;
-    CGPoint             _location;
-    unsigned            _modifierFlags;
-    CPTimeInterval      _timestamp;
-    CPGraphicsContext   _context;
-    int                 _eventNumber;
-    unsigned            _clickCount;
-    float               _pressure;
-    CPWindow            _window;
-    Number              _windowNumber;
-    CPString            _characters;
-    CPString            _charactersIgnoringModifiers;
-    BOOL                _isARepeat;
-    unsigned            _keyCode;
-    DOMEvent            _DOMEvent;
-    BOOL                _isActionKey;
-    int                 _data1;
-    int                 _data2;
-    short               _subtype;
-
-    float               _deltaX;
-    float               _deltaY;
-    float               _deltaZ;
-    float               _scrollingDeltaX;
-    float               _scrollingDeltaY;
-    BOOL                _hasPreciseScrollingDeltas;
-
-#if PLATFORM(DOM)
-    BOOL                _suppressCappuccinoCut;
-    BOOL                _suppressCappuccinoPaste;
-#endif
-
-    CPTrackingArea      _trackingArea;
-}
-
-/*!
-    Returns the current time in fractional seconds since startup.
-*/
-+ (CPTimeInterval)currentTimestamp
-{
-    return (new Date().getTime() - _CPEventStartupMilliseconds) / 1000;
-}
-
-/*!
-    Creates a new keyboard event.
-
-    @param anEventType the event type. Must be one of CPKeyDown, CPKeyUp or CPFlagsChanged
-    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
-    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
-    @param aTimestamp the time the event occurred
-    @param aWindowNumber the number of the CPWindow where the event occurred
-    @param aGraphicsContext the graphics context where the event occurred
-    @param characters the characters associated with the event
-    @param unmodCharacters the string of keys pressed without the presence of any modifiers other than Shift
-    @param repeatKey \c YES if this is caused by the system repeat as opposed to the user pressing the key again
-    @param code a number associated with the keyboard key of this event
-    @param isAnActionKey a BOOL indicating whether this key is an action key (e.g. a function key)
-    @throws CPInternalInconsistencyException if \c anEventType is not a CPKeyDown,
-    CPKeyUp or CPFlagsChanged
-    @return the keyboard event
-*/
-+ (CPEvent)keyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
-    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)repeatKey keyCode:(unsigned short)code isActionKey:(BOOL)isAnActionKey
-{
-    return [[self alloc] _initKeyEventWithType:anEventType location:aPoint modifierFlags:modifierFlags
-        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext
-        characters:characters charactersIgnoringModifiers:unmodCharacters isARepeat:repeatKey keyCode:code isActionKey:isAnActionKey];
-}
-
-// for backwards compatibility only
-+ (CPEvent)keyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
-                  timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-                 characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)repeatKey keyCode:(unsigned short)code
-{
-    return [[self alloc] _initKeyEventWithType:anEventType location:aPoint modifierFlags:modifierFlags
-                                     timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext
-                                    characters:characters charactersIgnoringModifiers:unmodCharacters isARepeat:repeatKey keyCode:code isActionKey:NO];
-}
-
-/*!
-    Creates a new mouse event.
-
-    @param anEventType the event type
-    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
-    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
-    @param aTimestamp the time the event occurred
-    @param aWindowNumber the number of the CPWindow where the event occurred
-    @param aGraphicsContext the graphics context where the event occurred
-    @param anEventNumber a number for this event
-    @param aClickCount the number of clicks that caused this event
-    @param aPressure the amount of pressure applied to the input device (ranges from 0.0 to 1.0)
-    @throws CPInternalInconsistencyException if an invalid event type is provided
-    @return the new mouse event
-*/
-+ (id)mouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
-{
-    return [[self alloc] _initMouseEventWithType:anEventType location:aPoint modifierFlags:modifierFlags
-        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber clickCount:aClickCount pressure:aPressure];
-}
-
-/*!
-    Creates a new mouse tracking event.
-
-    @param anEventType the event type
-    @param aPoint the location of the cursor in the window specified by \c aWindowNumber
-    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
-    @param aTimestamp the time the event occurred
-    @param aWindowNumber the number of the CPWindow where the event occurred
-    @param aGraphicsContext the graphics context where the event occurred
-    @param anEventNumber a number for this event
-    @param aTrackingArea the tracking area that triggered the event
-    @throws CPInternalInconsistencyException if an invalid event type is provided
-    @return the new mouse event
- */
-+ (id)enterExitEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-               timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-             eventNumber:(int)anEventNumber trackingArea:(CPTrackingArea)aTrackingArea
-{
-    return [[self alloc] _initEnterExitEventWithType:anEventType location:aPoint modifierFlags:modifierFlags timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext eventNumber:anEventNumber trackingArea:aTrackingArea];
-}
-
-/*!
-    Creates a new custom event.
-
-    @param anEventType the event type. Must be one of CPAppKitDefined, CPSystemDefined, CPApplicationDefined or CPPeriodic
-    @param aLocation the location of the cursor in the window specified by \c aWindowNumber
-    @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
-    @param aTimestamp the time the event occurred
-    @param aWindowNumber the number of the CPWindow where the event occurred
-    @param aGraphicsContext the graphics context where the event occurred
-    @param aSubtype a numeric identifier to differentiate this event from other custom events
-    @param aData1 more data that describes the event
-    @param aData2 even more data that describes the event
-    @throws CPInternalInconsistencyException if an invalid event type is provided
-    @return the new custom event
-*/
-+ (CPEvent)otherEventWithType:(CPEventType)anEventType location:(CGPoint)aLocation modifierFlags:(unsigned)modifierFlags
-    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-    subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
-{
-    return [[self alloc] _initOtherEventWithType:anEventType location:aLocation modifierFlags:modifierFlags
-        timestamp:aTimestamp windowNumber:aWindowNumber context:aGraphicsContext subtype:aSubtype data1:aData1 data2:aData2];
-}
-
-- (id)_initWithType:(CPEventType)anEventType
-{
-    if (self = [super init])
-    {
-        _type = anEventType;
-
-        // Make sure these are 0 rather than nil.
-        _deltaX = 0;
-        _scrollingDeltaX = 0;
-        _deltaY = 0;
-        _scrollingDeltaY = 0;
-        _deltaZ = 0;
-    }
-
-    return self;
-}
-
-/* @ignore */
-- (id)_initMouseEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-    eventNumber:(int)anEventNumber clickCount:(int)aClickCount pressure:(float)aPressure
-{
-    if (self = [self _initWithType:anEventType])
-    {
-        _location = CGPointCreateCopy(aPoint);
-        _modifierFlags = modifierFlags;
-        _timestamp = aTimestamp;
-        _context = aGraphicsContext;
-        _eventNumber = anEventNumber;
-        _clickCount = aClickCount;
-        _pressure = aPressure;
-        _window = [CPApp windowWithWindowNumber:aWindowNumber];
-    }
-
-    return self;
-}
-
-/* @ignore */
-- (id)_initEnterExitEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-                        timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-                      eventNumber:(int)anEventNumber trackingArea:(CPTrackingArea)aTrackingArea
-{
-    if ((anEventType != CPMouseEntered) && (anEventType != CPMouseExited) && (anEventType != CPCursorUpdate))
-        [CPException raise:CPInternalInconsistencyException reason:"Invalid event type"];
-
-    if (self = [self _initWithType:anEventType])
-    {
-        _location = CGPointCreateCopy(aPoint);
-        _modifierFlags = modifierFlags;
-        _timestamp = aTimestamp;
-        _context = aGraphicsContext;
-        _eventNumber = anEventNumber;
-        _trackingArea = aTrackingArea;
-        _window = [CPApp windowWithWindowNumber:aWindowNumber];
-    }
-
-    return self;
-}
-
-/* @ignore */
-- (id)_initKeyEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned int)modifierFlags
-    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-    characters:(CPString)characters charactersIgnoringModifiers:(CPString)unmodCharacters isARepeat:(BOOL)isARepeat keyCode:(unsigned short)code isActionKey:(BOOL)isAnActionKey
-{
-    if (self = [self _initWithType:anEventType])
-    {
-        _location = CGPointCreateCopy(aPoint);
-        _modifierFlags = modifierFlags;
-        _timestamp = aTimestamp;
-        _context = aGraphicsContext;
-        _characters = characters;
-        _charactersIgnoringModifiers = unmodCharacters;
-        _isARepeat = isARepeat;
-        _keyCode = code;
-        _isActionKey = isAnActionKey;
-        _windowNumber = aWindowNumber;
-    }
-
-    return self;
-}
-
-/* @ignore */
-- (id)_initOtherEventWithType:(CPEventType)anEventType location:(CGPoint)aPoint modifierFlags:(unsigned)modifierFlags
-    timestamp:(CPTimeInterval)aTimestamp windowNumber:(int)aWindowNumber context:(CPGraphicsContext)aGraphicsContext
-    subtype:(short)aSubtype data1:(int)aData1 data2:(int)aData2
-{
-    if (self = [self _initWithType:anEventType])
-    {
-        _location = CGPointCreateCopy(aPoint);
-        _modifierFlags = modifierFlags;
-        _timestamp = aTimestamp;
-        _context = aGraphicsContext;
-        _subtype = aSubtype;
-        _data1 = aData1;
-        _data2 = aData2;
-        _windowNumber = aWindowNumber;
-    }
-
-    return self;
-}
-
-/*!
-    Returns the location of the mouse (for mouse events).
-    If the receiver is not a mouse event, it returns \c nil.
-    If \c window returns \c nil, then the mouse coordinates will be based on the screen coordinates.
-    Otherwise, the coordinates are relative to the window's coordinates.
-
-    @return the location of the mouse, or \c nil for non-mouse events.
-*/
-- (CGPoint)locationInWindow
-{
-    return CGPointMakeCopy(_location);
-}
-
-- (CGPoint)globalLocation
-{
-    var theWindow = [self window],
-        location = [self locationInWindow];
-
-    if (theWindow)
-        return [theWindow convertBaseToGlobal:location];
-
-    return location;
-}
-
-/*!
-    Returns event information as a bit mask.
-*/
-- (unsigned)modifierFlags
-{
-    return _modifierFlags;
-}
-
-/*!
-    Returns the time the event occurred in seconds since startup.
-*/
-- (CPTimeInterval)timestamp
-{
-    return _timestamp;
-}
-
-/*!
-    Returns the type of event.
-*/
-- (CPEventType)type
-{
-    return _type;
-}
-
-/*!
-    Returns the subtype of the event.
-*/
-- (CPEventType)subtype
-{
-    return _subtype;
-}
-
-/*!
-    Returns the event's associated window.
-*/
-- (CPWindow)window
-{
-    if (!_window)
-        _window = [CPApp windowWithWindowNumber:_windowNumber];
-
-    return _window;
-}
-
-/*!
-    The number of the window associated with the event.
-*/
-- (int)windowNumber
-{
-    return _windowNumber;
-}
-
-// Mouse Event Information
-/*!
-    Returns the button number for the mouse that generated the event.
-*/
-- (int)buttonNumber
-{
-    if (_type === CPRightMouseDown || _type === CPRightMouseUp || _type === CPRightMouseDragged)
-        return 1;
-
-    return 0;
-}
-
-/*!
-    Returns the number of clicks that caused this event (mouse only).
-*/
-- (int)clickCount
-{
-    return _clickCount;
-}
-
-/*!
-    Returns the characters associated with this event (keyboard only).
-
-    @throws CPInternalInconsistencyException if this method is called on a non-key event
-*/
-- (CPString)characters
-{
-    return _characters;
-}
-
-/*!
-    Returns the character ignoring any modifiers (except shift).
-
-    @throws CPInternalInconsistencyException if this method is called on a non-key event
-*/
-- (CPString)charactersIgnoringModifiers
-{
-    return _charactersIgnoringModifiers;
-}
-
-/*!
-    Returns \c YES if the keyboard event was caused by the key being held down.
-
-    @throws CPInternalInconsistencyException if this method is called on a non-key event
-*/
-- (BOOL)isARepeat
-{
-    return _isARepeat;
-}
-
-/*!
-    Returns the key's key code.
-
-    @throws CPInternalInconsistencyException if this method is called on a non-key event
-*/
-- (unsigned short)keyCode
-{
-    return _keyCode;
-}
-
-+ (CGPoint)mouseLocation
-{
-    // FIXME: this is incorrect, we shouldn't depend on the current event.
-    var event = [CPApp currentEvent],
-        eventWindow = [event window];
-
-    if (eventWindow)
-        return [eventWindow convertBaseToGlobal:[event locationInWindow]];
-
-    return [event locationInWindow];
-}
-
-- (float)pressure
-{
-    return _pressure;
-}
-
-/*
-    @ignore
-*/
-- (DOMEvent)_DOMEvent
-{
-    return _DOMEvent;
-}
-
-- (int)data1
-{
-    return _data1;
-}
-
-- (int)data2
-{
-    return _data2;
-}
-
-// Getting Scroll Wheel Event Information
-/*!
-    Returns the change in the x-axis for a mouse event.
-*/
-- (float)deltaX
-{
-    return _deltaX;
-}
-
-/*!
-    Returns the change in the y-axis for a mouse event.
-*/
-- (float)deltaY
-{
-    return _deltaY;
-}
-
-/*!
-    Returns the change in the x-axis for a mouse event.
-*/
-- (float)deltaZ
-{
-    return _deltaZ;
-}
-
-- (BOOL)hasPreciseScrollingDeltas
-{
-    return !!_hasPreciseScrollingDeltas;
-}
-
-/*!
-    Returns the change in points on the x-axis for a mouse movement, unless hasPreciseScrollingDeltas is NO,
-    in which case the change is measured in number of "lines" or "rows" and needs to be multiplied as appropriate
-    to get change in pixels.
-*/
-- (float)scrollingDeltaX
-{
-    return _scrollingDeltaX;
-}
-
-/*!
-    Returns the change in points on the y-axis for a mouse movement, unless hasPreciseScrollingDeltas is NO,
-    in which case the change is measured in number of "lines" or "columns" and needs to be multiplied as appropriate
-    to get change in pixels.
-*/
-- (float)scrollingDeltaY
-{
-    return _scrollingDeltaY;
-}
-
-- (BOOL)_triggersKeyEquivalent:(CPString)aKeyEquivalent withModifierMask:aKeyEquivalentModifierMask
-{
-    if (!aKeyEquivalent)
-        return NO;
-
-    if (_CPEventUpperCaseRegex.test(aKeyEquivalent))
-        aKeyEquivalentModifierMask |= CPShiftKeyMask;
-
-    // Windows and Linux don't have command keys, so just switch it to ctrl.
-    if (!CPBrowserIsOperatingSystem(CPMacOperatingSystem) && (aKeyEquivalentModifierMask & CPCommandKeyMask))
-    {
-        aKeyEquivalentModifierMask |= CPControlKeyMask;
-        aKeyEquivalentModifierMask &= ~CPCommandKeyMask;
-    }
-
-    if ((_modifierFlags & (CPShiftKeyMask | CPAlternateKeyMask | CPCommandKeyMask | CPControlKeyMask)) !== aKeyEquivalentModifierMask)
-        return NO;
-
-    // Treat \r and \n as the same key equivalent. See issue #710.
-    if (_characters === CPNewlineCharacter || _characters === CPCarriageReturnCharacter)
-        return CPNewlineCharacter === aKeyEquivalent || CPCarriageReturnCharacter === aKeyEquivalent;
-
-    return [_characters caseInsensitiveCompare:aKeyEquivalent] === CPOrderedSame;
-}
-
-- (BOOL)_couldBeKeyEquivalent
-{
-    if (_type !== CPKeyDown)
-        return NO;
-
-    var characterCount = _characters.length;
-
-    if (!characterCount)
-        return NO;
-
-    if (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask))
-        return YES;
-
-    // Cocoa allows almost any key as a key equivalent unless the first responder is a
-    // text field (presumably a subclass of NSText.)
-    var firstResponderIsText = [[_window firstResponder] isKindOfClass:[CPTextField class]];
-
-    // Some keys are accepted as key equivalents even if the first responder is a text
-    // field.
-    for (var i = 0; i < characterCount; i++)
-    {
-        var c = _characters.charAt(i);
-
-        if ((c >= CPUpArrowFunctionKey && c <= CPModeSwitchFunctionKey) ||
-            c === CPEnterCharacter ||
-            c === CPNewlineCharacter ||
-            c === CPCarriageReturnCharacter ||
-            c === CPEscapeFunctionKey)
-        {
-            return YES;
-        }
-    }
-
-    return !firstResponderIsText;
-}
-
-- (BOOL)_isActionOrCommandEvent
-{
-    // This method is now platform-agnostic. It checks for abstract properties
-    // of the event, including the _isActionKey flag that was set at creation time.
-    return (
-            // Is it a command shortcut?
-            (_modifierFlags & (CPCommandKeyMask | CPControlKeyMask)) ||
-
-            // Is it a key that doesn't produce a character?
-            ([_characters length] === 0) ||
-
-            // Was it identified as an action key by the platform-specific layer?
-            _isActionKey
-            );
-}
-/*!
-    Return YES if this event is a part of processing a browser controlled cut or paste event
-    where the browser will go ahead and do the work of cutting or pasting within the input
-    element after processing of this event. The implication is that it should not be done by
-    the CPTextField (or whatever else is controlling the input) since this would result in
-    nothing being cut (because the field already cut the text out), or a double paste
-    (because the field pasted as well as the browser).
-*/
-- (BOOL)_platformIsEffectingCutOrPaste
-{
-#if PLATFORM(DOM)
-    return _suppressCappuccinoCut || _suppressCappuccinoPaste;
-#else
-    return NO;
-#endif
-}
-
-
-/*!
-    Generates periodic events every \c aPeriod seconds.
-
-    @param aDelay the number of seconds before the first event
-    @param aPeriod the length of time in seconds between successive events
-*/
-+ (void)startPeriodicEventsAfterDelay:(CPTimeInterval)aDelay withPeriod:(CPTimeInterval)aPeriod
-{
-    _CPEventPeriodicEventPeriod = aPeriod;
-
-    // FIXME: OH TIMERS!!!
-    _CPEventPeriodicEventTimer = window.setTimeout(function() { _CPEventPeriodicEventTimer = window.setInterval(_CPEventFirePeriodEvent, aPeriod * 1000.0); }, aDelay * 1000.0);
-}
-
-/*!
-    Stops the periodic events from being generated.
-*/
-+ (void)stopPeriodicEvents
-{
-    if (_CPEventPeriodicEventTimer == nil)
-        return;
-
-    window.clearTimeout(_CPEventPeriodicEventTimer);
-
-    _CPEventPeriodicEventTimer = nil;
-}
-
-- (CPString)description
-{
-    switch (_type)
-    {
-        case CPKeyDown:
-        case CPKeyUp:
-        case CPFlagsChanged:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ chars=\"%@\" unmodchars=\"%@\" repeat=%d keyCode=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _characters, _charactersIgnoringModifiers, _isARepeat, _keyCode];
-        case CPLeftMouseDown:
-        case CPLeftMouseUp:
-        case CPRightMouseDown:
-        case CPRightMouseUp:
-        case CPMouseMoved:
-        case CPLeftMouseDragged:
-        case CPRightMouseDragged:
-        case CPMouseEntered:
-        case CPMouseExited:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ evNum=%d click=%d buttonNumber=%d pressure=%f", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _eventNumber, _clickCount, [self buttonNumber], _pressure];
-        default:
-            return [CPString stringWithFormat:@"CPEvent: type=%d loc=%@ time=%.1f flags=0x%X win=%@ winNum=%d ctxt=%@ subtype=%d data1=%d data2=%d", _type, CGStringFromPoint(_location), _timestamp, _modifierFlags, _window, _windowNumber, _context, _subtype, _data1, _data2];
-    }
-}
-
-- (CPTrackingArea)trackingArea
-{
-    if ((_type !== CPMouseEntered) && (_type !== CPMouseExited) && (_type !== CPCursorUpdate))
-        [CPException raise:CPInternalInconsistencyException format:@"You can't call trackingArea for events of type %#x", _type];
-
-    return _trackingArea;
-}
-
-@end
-
-function _CPEventFirePeriodEvent()
-{
-    [CPApp sendEvent:[CPEvent otherEventWithType:CPPeriodic location:CGPointMakeZero() modifierFlags:0 timestamp:[CPEvent currentTimestamp] windowNumber:0 context:nil subtype:0 data1:0 data2:0]];
-}
-
-var CPEventClass = [CPEvent class];
-
-function _CPEventFromNativeMouseEvent(aNativeEvent, anEventType, aPoint, modifierFlags, aTimestamp, aWindowNumber, aGraphicsContext, anEventNumber, aClickCount, aPressure)
-{
-    aNativeEvent.isa = CPEventClass;
-
-    aNativeEvent._type = anEventType;
-    aNativeEvent._location = aPoint;
-    aNativeEvent._modifierFlags = modifierFlags;
-    aNativeEvent._timestamp = aTimestamp;
-    aNativeEvent._windowNumber = aWindowNumber;
-    aNativeEvent._window = nil;
-    aNativeEvent._context = aGraphicsContext;
-    aNativeEvent._eventNumber = anEventNumber;
-    aNativeEvent._clickCount = aClickCount;
-    aNativeEvent._pressure = aPressure;
-
-    return aNativeEvent;
-}

AppKit/CPEvent_Constants.j

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

AppKit/CPFont.j

@@ -1,674 +0,0 @@
-/*
- * CPFont.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPBundle.j>
-
-@import "CPView.j"
-@import "CPFontDescriptor.j"
-@import "_CPObject+Theme.j"
-@import "CPControl.j" 
-
-CPFontDefaultSystemFontFace = @"Arial, sans-serif";
-CPFontDefaultSystemFontSize = 12;
-
-/*!
-    To create a font of a size that will dynamically reflect the current
-    system font size, use this for the size argument.
-*/
-CPFontCurrentSystemSize = -1;
-
-// For internal use only by this class and subclasses
-_CPFontSystemFacePlaceholder = "_CPFontSystemFacePlaceholder";
-
-var _CPFontCache                   = {},
-    _CPSystemFontCache             = {},
-    _CPFontSystemFontFace          = CPFontDefaultSystemFontFace,
-    _CPFontSystemFontSize          = CPFontDefaultSystemFontSize,
-    _CPFontSystemFontSizeSmall     = CPFontDefaultSystemFontSize - 1,
-    _CPFontSystemFontSizeMini      = CPFontDefaultSystemFontSize - 2,
-    _CPFontFallbackFaces           = CPFontDefaultSystemFontFace.split(", "),
-    _CPFontStripRegExp             = new RegExp("(^\\s*[\"']?|[\"']?\\s*$)", "g"),
-    _CPFontSystemFontFaceSpecified = NO;
-
-
-#define _CPRealFontSize(aSize)  (aSize <= 0 ? _CPFontSystemFontSize : aSize)
-#define _CPFontNormalizedNames(aName)  _CPFontNormalizedNameArray(aName).join(", ")
-#define _CPCachedFont(aName, aSize, isBold, isItalic)  _CPFontCache[_CPFontCreateCSSString(_CPFontNormalizedNames(aName), aSize, isBold, isItalic)]
-#define _CPUserFont(aName, aSize, isBold, isItalic)  _CPCachedFont(aName, aSize, isBold, isItalic) || [[CPFont alloc] _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO]
-
-#define _CPSystemFontCacheKey(aSize, isBold)  (String(aSize) + (isBold ? "b" : ""))
-#define _CPCachedSystemFont(aSize, isBold)  _CPSystemFontCache[_CPSystemFontCacheKey(aSize, isBold)]
-#define _CPSystemFont(aSize, isBold)  (_CPCachedSystemFont(aSize, isBold) || [[CPFont alloc] _initWithName:_CPFontSystemFacePlaceholder size:aSize bold:isBold italic:NO system:YES])
-
-/*!
-@ingroup appkit
-@class CPFont
-
-The CPFont class allows control of the fonts used for displaying text anywhere on the screen.
-The primary method for getting a particular font is through one of the class methods that take
-a name and/or size as arguments, and return the appropriate CPFont.
-
-### System fonts
-When you create a font using \c -systemFontOfSize: or \c -boldSystemFontOfSize:, a proxy font is
-created that always refers to the current system font face and size. By default the system
-font face/size is Arial 12px, with a fallback to sans-serif 12px. You may configure this at
-runtime in two ways:
-
-- By sending [CPFont setSystemFontFace:<face>] and/or [CPFont setSystemFontSize:<size>].
-  Note that if you change the system font face or size during runtime, the next time
-  any view using a system font is redrawn, it will show the new font.
-- By configuring Info.plist for your application or for AppKit. You can set the font face
-  by adding a CPSystemFontFace string item to the Info.plist, and you can set the font size
-  by adding a CPSystemFontSize integer item to the Info.plist.
-
-Note that in either case, you can specify a comma-delimited list of fonts as the font face.
-Do not quote enclose font faces that contain spaces, that is done automatically when a CSS
-representation of a font is requested.
-
-The browser will use the first available font in the list you supply. CPFont always ensures
-that Arial and sans-serif are in the CSS representation of a font as a fallback, so there is
-no need to add them to the end of your font list.
-
-### nib2cib conversion
-Fonts are converted by nib2cib according to the following algorithm:
-
-- If the font family is Lucida Grande, then a system font will be created.
-- If the font is Lucida Grande 13 (plain), the "default" font will be used at runtime.
-  The default font is taken from the "font" theme attribute if one exists,
-  otherwise from the current system font face and size.
-- Lucida Grande of any size other than 13 will retain its size.
-- Fonts using any family other than Lucida Grande will be used as is, including the size.
-
-### Using custom web fonts
-The configurability of CPFont makes it easy to use a custom web font as the system font.
-For example, if you want to use the google font Asap as the system font, you would do the
-following:
-
-- Add a <link> to the <head> of index-debug.html and index.html:
-@code
-<link href='http://fonts.googleapis.com/css?family=Asap:400,700' rel='stylesheet' type='text/css'>
-@endcode
-- Specify Asap as the system font in Info.plist by adding the following item:
-@code
-<key>CPSystemFontFace</key>
-<string>Asap</string>
-@endcode
-*/
-@implementation CPFont : CPObject <CPTheme>
-{
-    CPString    _name;
-    float       _size;
-    float       _ascender;
-    float       _descender;
-    float       _lineHeight;
-    BOOL        _isBold         @accessors(readonly, getter=isBold);
-    BOOL        _isItalic       @accessors(readonly, getter=isItalic);
-    BOOL        _isSystem       @accessors(readonly, getter=isSystem);
-
-    CPString    _cssString;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"font";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-             @"system-font-face": [CPNull null],
-             @"system-font-style": [CPNull null],
-             @"system-font-size-regular": [CPNull null],
-             @"system-font-size-small": [CPNull null],
-             @"system-font-size-mini": [CPNull null]
-             };
-}
-
-+ (void)initialize
-{
-    if (self !== [CPFont class])
-        return;
-
-    var systemFontFace = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontFace"];
-
-    if (!systemFontFace)
-        systemFontFace = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontFace"];
-
-    if (systemFontFace)
-    {
-        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);
-        _CPFontSystemFontFaceSpecified = YES;
-    }
-
-    var systemFontSize = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPSystemFontSize"];
-
-    if (!systemFontSize)
-        systemFontSize = [[CPBundle bundleForClass:[CPView class]] objectForInfoDictionaryKey:@"CPSystemFontSize"];
-
-    if (systemFontSize)
-    {
-        _CPFontSystemFontSize = systemFontSize;
-        _CPFontSystemFontFaceSpecified = YES;
-    }
-}
-
-+ (void)initializeSystemFontFromTheme:(CPTheme)aTheme
-{
-    // If something was specified via +initialize (from an Info.plist file), don't do anything
-    if (_CPFontSystemFontFaceSpecified)
-        return;
-
-    // Reset all system font caches
-    _CPSystemFontCache = {};
-
-    // Now, try to get information from the theme
-    var systemFontFace = [aTheme valueForAttributeWithName:@"system-font-face" forClass:[CPFont class]];
-
-    if (systemFontFace)
-    {
-        [self _invalidateSystemFontCache];
-        _CPFontSystemFontFace = _CPFontNormalizedNames(systemFontFace);
-    }
-
-    var systemFontSize = [aTheme valueForAttributeWithName:@"system-font-size-regular" forClass:[CPFont class]];
-
-    if (systemFontSize)
-    {
-        [self _invalidateSystemFontCache];
-        _CPFontSystemFontSize = systemFontSize;
-    }
-
-    systemFontSize = [aTheme valueForAttributeWithName:@"system-font-size-small" forClass:[CPFont class]];
-
-    if (systemFontSize)
-    {
-        [self _invalidateSystemFontCache];
-        _CPFontSystemFontSizeSmall = systemFontSize;
-    }
-
-    systemFontSize = [aTheme valueForAttributeWithName:@"system-font-size-mini" forClass:[CPFont class]];
-
-    if (systemFontSize)
-    {
-        [self _invalidateSystemFontCache];
-        _CPFontSystemFontSizeMini = systemFontSize;
-    }
-
-    // Is there something to add to the global syle definition ?
-    var systemFontStyle = [aTheme valueForAttributeWithName:@"system-font-style" forClass:[CPFont class]];
-
-    if (systemFontStyle)
-    {
-        // Yes, so install it in the DOM Style element
-        document.getElementsByTagName("STYLE")[0].innerHTML += "\n" + [aTheme setCSSResourcesPathInString:systemFontStyle];
-    }
-}
-
-/*!
-    Returns the default system font face, which may consist of several comma-separated family names.
-*/
-+ (CPString)systemFontFace
-{
-    return _CPFontSystemFontFace;
-}
-
-/*!
-    Sets the default system font face, which may consist of several comma-separated family names.
-*/
-+ (CPString)setSystemFontFace:(CPString)aFace
-{
-    var normalizedFaces = _CPFontNormalizedNames(aFace);
-
-    if (normalizedFaces === _CPFontSystemFontFace)
-        return;
-
-    [self _invalidateSystemFontCache];
-    _CPFontSystemFontFace = aFace;
-}
-
-/*!
-    Returns the default system font size.
-*/
-+ (float)systemFontSize
-{
-    return _CPFontSystemFontSize;
-}
-
-+ (CPFont)systemFontForControlSize:(CPControlSize)aSize
-{
-    switch (aSize)
-    {
-        case CPSmallControlSize:
-            return [self systemFontOfSize:_CPFontSystemFontSizeSmall];
-
-        case CPMiniControlSize:
-            return [self systemFontOfSize:_CPFontSystemFontSizeMini];
-
-        case CPRegularControlSize:
-        default:
-            return [self systemFontOfSize:_CPFontSystemFontSize];
-    }
-}
-
-/*!
-    Sets the default system font size.
-*/
-+ (float)setSystemFontSize:(float)size
-{
-    if (size > 0 && size !== _CPFontSystemFontSize)
-    {
-        [self _invalidateSystemFontCache];
-        _CPFontSystemFontSize = size;
-    }
-}
-
-+ (void)_invalidateSystemFontCache
-{
-    var systemSize = String(_CPFontSystemFontSize),
-        currentSize = String(CPFontCurrentSystemSize);
-
-    for (var key in _CPSystemFontCache)
-    {
-        if (_CPSystemFontCache.hasOwnProperty(key) &&
-            (key.indexOf(systemSize) === 0 || key.indexOf(currentSize) === 0))
-        {
-            delete _CPSystemFontCache[key];
-        }
-    }
-}
-
-/*!
-    Returns a font with the specified name and size.
-    @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
-    @return the requested font
-*/
-+ (CPFont)fontWithName:(CPString)aName size:(float)aSize
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, NO);
-}
-
-/*!
-    Returns a font with the specified name, size and style.
-    @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
-    @param italic whether the font should be italicized
-    @return the requested font
-*/
-+ (CPFont)fontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, NO, italic);
-}
-
-/*!
-    Returns a bold font with the specified name and size.
-    @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
-    @return the requested bold font
-*/
-+ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, NO);
-}
-
-/*!
-    Returns a bold font with the specified name, size and style.
-    @param aName the name of the font
-    @param aSize the size of the font (in px). 0 or negative will create a font
-           in the current system font size.
-    @param italic whether the font should be italicized
-    @return the requested font
-*/
-+ (CPFont)boldFontWithName:(CPString)aName size:(float)aSize italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, YES, italic);
-}
-
-/*!
-    Internal font getter like fontWithName:size:italic: with a bold selector.
-*/
-+ (CPFont)_fontWithName:(CPString)aName size:(float)aSize bold:(BOOL)bold italic:(BOOL)italic
-{
-    return _CPUserFont(aName, aSize <= 0 ? _CPFontSystemFontSize : aSize, bold, italic);
-}
-
-/*!
-    Returns the system font scaled to the specified size
-    @param aSize the size of the font (in px). 0 creates a static font
-           in the current system font size. Negative creates a font
-           that dynamically tracks the current system font size.
-    @return the requested system font
-*/
-+ (CPFont)systemFontOfSize:(CGSize)aSize
-{
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, NO);
-}
-
-/*!
-    Returns the bold system font scaled to the specified size
-    @param aSize the size of the font (in px). 0 creates a static font
-           in the current system font size. Negative creates a font
-           that dynamically tracks the current system font size.
-    @return the requested bold system font
-*/
-+ (CPFont)boldSystemFontOfSize:(CGSize)aSize
-{
-    return _CPSystemFont(aSize === 0 ? _CPFontSystemFontSize : aSize, YES);
-}
-
-- (id)_initWithName:(CPString)aName size:(float)aSize bold:(BOOL)isBold italic:(BOOL)isItalic system:(BOOL)isSystem
-{
-    self = [super init];
-
-    if (self)
-    {
-        _size = aSize;
-        _ascender = 0;
-        _descender = 0;
-        _lineHeight = 0;
-        _isBold = isBold;
-        _isItalic = isItalic;
-        _isSystem = isSystem;
-
-        _theme = [CPTheme defaultTheme];
-        _themeState = CPThemeStateNormal;
-        [self _loadThemeAttributes];
-
-        if (isSystem)
-        {
-            _name = aName;
-            _cssString = _CPFontCreateCSSString(_CPFontSystemFontFace, _size, _isBold, _isItalic);
-            _CPSystemFontCache[_CPSystemFontCacheKey(_size, _isBold)] = self;
-        }
-        else
-        {
-            _name = _CPFontNormalizedNames(aName);
-            _cssString = _CPFontCreateCSSString(_name, _size, _isBold, _isItalic);
-            _CPFontCache[_cssString] = self;
-        }
-    }
-
-    return self;
-}
-
-/*!
-    Returns the distance of the longest ascender's top y-coordinate from the baseline (in CSS px)
-*/
-- (float)ascender
-{
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    if (!font._ascender)
-        [font _getMetrics];
-
-    return font._ascender;
-}
-
-/*!
-    Returns the bottom y coordinate (in CSS px), offset from the baseline, of the receiver's longest descender.
-    Thus, if the longest descender extends 2 px below the baseline, descender will return –2.
-*/
-- (float)descender
-{
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    if (!font._descender)
-        [font _getMetrics];
-
-    return font._descender;
-}
-
-/*!
-    Returns the default line height.
-
-    NOTE: This was moved from NSFont to NSLayoutManager in Cocoa, but since there is no CPLayoutManager, it has been kept here.
-*/
-- (float)defaultLineHeightForFont
-{
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    if (!font._lineHeight)
-        [font _getMetrics];
-
-    return font._lineHeight;
-}
-
-/*!
-    Returns the font size (in CSS px)
-*/
-- (float)size
-{
-    return _CPRealFontSize(_size);
-}
-
-/*!
-    Returns the font size. Cocoa/AppKit compatibility alias for -size.
-*/
-- (float)pointSize
-{
-    return [self size];
-}
-
-/*!
-    Returns the font name. Cocoa/AppKit compatibility alias for -familyName.
-*/
-- (CPString)fontName
-{
-    return [self familyName];
-}
-
-/*!
-    Returns the font as a CSS string
-*/
-- (CPString)cssString
-{
-    var font = _isSystem ? _CPSystemFont(_size, _isBold) : self;
-
-    return font._cssString;
-}
-
-/*!
-    Returns the font's family name
-*/
-- (CPString)familyName
-{
-    if (_isSystem)
-        return _CPFontSystemFontFace;
-
-    return _name;
-}
-
-- (BOOL)isSystemSize
-{
-    return _size <= 0;
-}
-
-- (BOOL)isEqual:(id)anObject
-{
-    return [anObject isKindOfClass:[CPFont class]] && [anObject cssString] === _cssString;
-}
-
-- (CPString)description
-{
-    return [CPString stringWithFormat:@"%@ %@", [super description], [self cssString]];
-}
-
-- (id)copy
-{
-    return [[CPFont alloc] _initWithName:_name size:_size bold:_isBold italic:_isItalic system:_isSystem];
-}
-
-- (void)_getMetrics
-{
-    var metrics = [CPString metricsOfFont:self];
-
-    _ascender = [metrics objectForKey:@"ascender"];
-    _descender = [metrics objectForKey:@"descender"];
-    _lineHeight = [metrics objectForKey:@"lineHeight"];
-}
-
-- (CPControlSize)controlSizeCorrespondingToFontSize
-{
-    switch (_size)
-    {
-        case _CPFontSystemFontSizeSmall:
-            return CPSmallControlSize;
-
-        case _CPFontSystemFontSizeMini:
-            return CPMiniControlSize;
-
-        default:
-            // If we can't find a corresponding size, return regular control size
-            return CPRegularControlSize;
-    }
-}
-
-@end
-
-@implementation CPFont(DescriptorAdditions)
-
-- (id)_initWithFontDescriptor:(CPFontDescriptor)fontDescriptor
-{
-    var aName = [fontDescriptor objectForKey: CPFontNameAttribute] ,
-        aSize = [fontDescriptor pointSize],
-        isBold = [fontDescriptor symbolicTraits] & CPFontBoldTrait,
-        isItalic = [fontDescriptor symbolicTraits] & CPFontItalicTrait;
-
-    return [self _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO];
-}
-
-+ (CPFont)fontWithDescriptor:(CPFontDescriptor)fontDescriptor size:(float)aSize
-{
-    var aName = [fontDescriptor objectForKey: CPFontNameAttribute],
-        isBold = [fontDescriptor symbolicTraits] & CPFontBoldTrait,
-        isItalic = [fontDescriptor symbolicTraits] & CPFontItalicTrait;
-
-    return [self _fontWithName:aName size:aSize || [fontDescriptor pointSize] bold:isBold italic:isItalic];
-}
-
-- (CPFontDescriptor)fontDescriptor
-{
-    var traits = 0;
-
-    if ([self isBold])
-        traits |= CPFontBoldTrait;
-
-    if ([self isItalic])
-        traits |= CPFontItalicTrait;
-
-    return [[CPFontDescriptor fontDescriptorWithName:_name size:_size] fontDescriptorWithSymbolicTraits:traits];
-}
-
-@end
-
-
-var CPFontNameKey     = @"CPFontNameKey",
-    CPFontSizeKey     = @"CPFontSizeKey",
-    CPFontIsBoldKey   = @"CPFontIsBoldKey",
-    CPFontIsItalicKey = @"CPFontIsItalicKey",
-    CPFontIsSystemKey = @"CPFontIsSystemKey";
-
-@implementation CPFont (CPCoding)
-
-/*!
-    Initializes the font from a coder.
-    @param aCoder the coder from which to read the font data
-    @return the initialized font
-*/
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    var fontName = [aCoder decodeObjectForKey:CPFontNameKey],
-        size = [aCoder decodeFloatForKey:CPFontSizeKey],
-        isBold = [aCoder decodeBoolForKey:CPFontIsBoldKey],
-        isItalic = [aCoder decodeBoolForKey:CPFontIsItalicKey],
-        isSystem = [aCoder decodeBoolForKey:CPFontIsSystemKey];
-
-    self = [self _initWithName:fontName size:size bold:isBold italic:isItalic system:isSystem];
-
-    [self _decodeThemeObjectsWithCoder:aCoder];
-
-    return self;
-}
-
-/*!
-    Writes the font information out to a coder.
-    @param aCoder the coder to which the data will be written
-*/
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_name forKey:CPFontNameKey];
-    [aCoder encodeFloat:_size forKey:CPFontSizeKey];
-    [aCoder encodeBool:_isBold forKey:CPFontIsBoldKey];
-    [aCoder encodeBool:_isItalic forKey:CPFontIsItalicKey];
-    [aCoder encodeBool:_isSystem forKey:CPFontIsSystemKey];
-
-    [self _encodeThemeObjectsWithCoder:aCoder];
-}
-
-@end
-
-
-// aName must be normalized
-var _CPFontCreateCSSString = function(aName, aSize, isBold, isItalic)
-{
-    var properties = (isItalic ? "italic " : "") + (isBold ? "bold " : "") + _CPRealFontSize(aSize) + "px ";
-
-    return properties + _CPFontConcatNameWithFallback(aName);
-};
-
-var _CPFontConcatNameWithFallback = function(aName)
-{
-    var names = _CPFontNormalizedNameArray(aName),
-        fallbackFaces = _CPFontFallbackFaces.slice(0);
-
-    // Remove the fallback names used in the names passed in
-    for (var i = 0; i < names.length; ++i)
-    {
-        for (var j = 0; j < fallbackFaces.length; ++j)
-        {
-            if (names[i].toLowerCase() === fallbackFaces[j].toLowerCase())
-            {
-                fallbackFaces.splice(j, 1);
-                break;
-            }
-        }
-
-        if (names[i].indexOf(" ") > 0)
-            names[i] = '"' + names[i] + '"';
-    }
-
-    return names.concat(fallbackFaces).join(", ");
-};
-
-var _CPFontNormalizedNameArray = function(aName)
-{
-    var names = aName.split(",");
-
-    for (var i = 0; i < names.length; ++i)
-        names[i] = names[i].replace(_CPFontStripRegExp, "");
-
-    return names;
-};

AppKit/CPFontManager.j

@@ -1,488 +0,0 @@
-/*
- * CPFontManager.j
- * AppKit
- *
- * Created by Tom Robinson.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CPControl.j"
-@import "CPFont.j"
-@import "CPFontDescriptor.j"
-
-@global CPApp
-@class CPFontPanel
-
-@global document
-
-CPItalicFontMask                    = 1 << 0;
-CPBoldFontMask                      = 1 << 1;
-CPUnboldFontMask                    = 1 << 2;
-CPNonStandardCharacterSetFontMask   = 1 << 3;
-CPNarrowFontMask                    = 1 << 4;
-CPExpandedFontMask                  = 1 << 5;
-CPCondensedFontMask                 = 1 << 6;
-CPSmallCapsFontMask                 = 1 << 7;
-CPPosterFontMask                    = 1 << 8;
-CPCompressedFontMask                = 1 << 9;
-CPFixedPitchFontMask                = 1 << 10;
-CPUnitalicFontMask                  = 1 << 24;
-
-
-var CPSharedFontManager     = nil,
-    CPFontManagerFactory    = nil,
-    CPFontPanelFactory      = nil;
-
-/*
-    modifyFont: sender's tag
-*/
-CPNoFontChangeAction    = 0;
-CPViaPanelFontAction    = 1;
-CPAddTraitFontAction    = 2;
-CPSizeUpFontAction      = 3;
-CPSizeDownFontAction    = 4;
-CPHeavierFontAction     = 5;
-CPLighterFontAction     = 6;
-CPRemoveTraitFontAction = 7;
-
-/*!
-    @ingroup appkit
-*/
-@implementation CPFontManager : CPObject
-{
-    CPArray         _availableFonts;
-
-    id              _target @accessors(property=target);
-    SEL             _action @accessors(property=action);
-
-    id              _delegate @accessors(property=delegate);
-
-    CPFont          _selectedFont;
-    BOOL            _multiple @accessors(getter=isMultiple, setter=setMultiple:);
-
-    CPDictionary    _activeChange;
-
-    unsigned        _fontAction;
-}
-
-// Getting the Shared Font Manager
-/*!
-    Returns the application's font manager. If the font
-    manager does not exist yet, it will be created.
-*/
-+ (CPFontManager)sharedFontManager
-{
-    if (!CPSharedFontManager)
-        CPSharedFontManager = [[CPFontManagerFactory alloc] init];
-
-    return CPSharedFontManager;
-}
-
-// Changing the Default Font Conversion Classes
-/*!
-    Sets the class that will be used to create the application's
-    font manager.
-*/
-+ (void)setFontManagerFactory:(Class)aClass
-{
-    CPFontManagerFactory = aClass;
-}
-/*!
-    Sets the class that will be used to create the application's
-    Font panel.
-*/
-+ (void)setFontPanelFactory:(Class)aClass
-{
-    CPFontPanelFactory = aClass;
-}
-
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _action = @selector(changeFont:);
-    }
-
-    return self;
-}
-
-/*!
-    Returns an array of the available fonts
-*/
-- (CPArray)availableFonts
-{
-    if (!_availableFonts)
-    {
-        _availableFonts = [];
-
-#if PLATFORM(DOM)
-        _CPFontDetectSpan = document.createElement("span");
-        _CPFontDetectSpan.fontSize = "24px";
-        _CPFontDetectSpan.appendChild(document.createTextNode("mmmmmmmmmml"));
-        var div = document.createElement("div");
-        div.style.position = "absolute";
-        div.style.top = "-1000px";
-        div.appendChild(_CPFontDetectSpan);
-        document.getElementsByTagName("body")[0].appendChild(div);
-
-        _CPFontDetectReferenceFonts = _CPFontDetectPickTwoDifferentFonts(["monospace", "serif", "sans-serif", "cursive"]);
-
-        for (var i = 0; i < _CPFontDetectAllFonts.length; i++)
-        {
-            var available = _CPFontDetectFontAvailable(_CPFontDetectAllFonts[i]);
-            if (available)
-                _availableFonts.push(_CPFontDetectAllFonts[i]);
-        }
-#else
-        // If there's no font detection, just assume all fonts are available.
-        _availableFonts = _CPFontDetectAllFonts;
-#endif
-    }
-    return _availableFonts;
-}
-
-/*!
-    Returns the available fonts matching the provided name.
-    @param aFontName the name of the font
-*/
-- (CPArray)fontWithNameIsAvailable:(CPString)aFontName
-{
-    return _CPFontDetectFontAvailable(aFontName);
-}
-
-- (void)setSelectedFont:(CPFont)aFont isMultiple:(BOOL)aFlag
-{
-    _selectedFont = aFont;
-    _multiple = aFlag;
-
-    // TODO Notify CPFontPanel when it exists.
-}
-
-- (CPFont)selectedFont
-{
-    return _selectedFont;
-}
-
-- (int)weightOfFont:(CPFont)aFont
-{
-    // TODO Weight 5 is a normal of book weight and 9 and above is bold, but it would be nice to be more
-    // precise than that.
-    return [aFont isBold] ? 9 : 5;
-}
-
-- (CPFontTraitMask)traitsOfFont:(CPFont)aFont
-{
-    return ([aFont isBold] ? CPBoldFontMask : 0) | ([aFont isItalic] ? CPItalicFontMask : 0);
-}
-
-- (CPFont)convertFont:(CPFont)aFont toFace:(CPString)aTypeface
-{
-    if (!aFont)
-        return nil;
-
-    var shouldBeBold = [aFont isBold],
-        shouldBeItalic = [aFont isItalic],
-        shouldBeSize = [aFont size];
-
-    aFont = [CPFont _fontWithName:aTypeface size:shouldBeSize bold:shouldBeBold italic:shouldBeItalic] || aFont;
-
-    return aFont;
-}
-
-- (@action)addFontTrait:(id)sender
-{
-    var tag = sender;
-
-    if ([sender respondsToSelector:@selector(tag)])
-        tag = [sender tag];
-
-    _activeChange = tag == nil ? @{} : @{ @"addTraits": tag };
-    _fontAction = CPAddTraitFontAction;
-
-    [self sendAction];
-}
-
-- (BOOL)sendAction
-{
-    return [CPApp sendAction:_action to:_target from:self];
-}
-
-
-/*!
-    This method open the font panel, create it if necessary.
-    @param sender The object that sent the message.
-*/
-- (CPFontPanel)fontPanel:(BOOL)createIt
-{
-    var panel = nil,
-        panelExists = [CPFontPanelFactory sharedFontPanelExists];
-
-    if ((panelExists) || (!panelExists && createIt))
-        panel = [CPFontPanelFactory sharedFontPanel];
-
-    return panel;
-}
-
-/*!
-    Convert a font to have the specified Font traits. The font is unchanged expect for the specified Font traits.
-    Using CPUnboldFontMask or CPUnitalicFontMask will respectively remove Bold and Italic traits.
-    @param aFont The font to convert.
-    @param fontTrait The new font traits mask.
-    @result The converted font or \c aFont if the conversion failed.
-*/
-- (CPFont)convertFont:(CPFont)aFont toHaveTrait:(CPFontTraitMask)fontTrait
-{
-    var attributes = [[[aFont fontDescriptor] fontAttributes] copy],
-        symbolicTrait = [[aFont fontDescriptor] symbolicTraits];
-
-    if (fontTrait & CPBoldFontMask)
-        symbolicTrait |= CPFontBoldTrait;
-
-    if (fontTrait & CPItalicFontMask)
-        symbolicTrait |= CPFontItalicTrait;
-
-    if (fontTrait & CPUnboldFontMask) /* FIXME: this only change CPFontSymbolicTrait what about CPFontWeightTrait */
-        symbolicTrait &= ~CPFontBoldTrait;
-
-    if (fontTrait & CPUnitalicFontMask)
-        symbolicTrait &= ~CPFontItalicTrait;
-
-    if (fontTrait & CPExpandedFontMask)
-        symbolicTrait |= CPFontExpandedTrait;
-
-    if (fontTrait & CPSmallCapsFontMask)
-        symbolicTrait |= CPFontSmallCapsTrait;
-
-    if (![attributes containsKey:CPFontTraitsAttribute])
-        [attributes setObject:[CPDictionary dictionaryWithObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
-                                                          forKey:CPFontSymbolicTrait]
-                       forKey:CPFontTraitsAttribute];
-    else
-        [[attributes objectForKey:CPFontTraitsAttribute] setObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
-                                                            forKey:CPFontSymbolicTrait];
-
-    return [[aFont class] fontWithDescriptor:[CPFontDescriptor fontDescriptorWithFontAttributes:attributes] size:0.0];
-}
-
-/*!
-    Convert a font to not have the specified Font traits. The font is unchanged expect for the specified Font traits.
-    @param aFont The font to convert.
-    @param fontTrait The font traits mask to remove.
-    @result The converted font or \c aFont if the conversion failed.
-*/
-- (CPFont)convertFont:(CPFont)aFont toNotHaveTrait:(CPFontTraitMask)fontTrait
-{
-    var attributes = [[[aFont fontDescriptor] fontAttributes] copy],
-        symbolicTrait = [[aFont fontDescriptor] symbolicTraits];
-
-    if ((fontTrait & CPBoldFontMask) || (fontTrait & CPUnboldFontMask)) /* FIXME: see convertFont:toHaveTrait: about CPFontWeightTrait */
-        symbolicTrait &= ~CPFontBoldTrait;
-
-    if ((fontTrait & CPItalicFontMask) || (fontTrait & CPUnitalicFontMask))
-        symbolicTrait &= ~CPFontItalicTrait;
-
-    if (fontTrait & CPExpandedFontMask)
-        symbolicTrait &= ~CPFontExpandedTrait;
-
-    if (fontTrait & CPSmallCapsFontMask)
-        symbolicTrait &= ~CPFontSmallCapsTrait;
-
-    if (![attributes containsKey:CPFontTraitsAttribute])
-        [attributes setObject:[CPDictionary dictionaryWithObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
-                                                          forKey:CPFontSymbolicTrait]
-                       forKey:CPFontTraitsAttribute];
-    else
-        [[attributes objectForKey:CPFontTraitsAttribute] setObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
-                                                            forKey:CPFontSymbolicTrait];
-
-    return [[aFont class] fontWithDescriptor:[CPFontDescriptor fontDescriptorWithFontAttributes:attributes] size:0.0];
-}
-
-/*!
-    Convert a font to have specified size. The font is unchanged expect for the specified size.
-    @param aFont The font to convert.
-    @param aSize The new font size.
-    @result The converted font or \c aFont if the conversion failed.
-*/
-- (CPFont)convertFont:(CPFont)aFont toSize:(float)aSize
-{
-    var descriptor = [aFont fontDescriptor];
-
-    return [[aFont class] fontWithDescriptor: descriptor size:aSize]
-}
-
-- (void)orderFrontFontPanel:(id)sender
-{
-    [[self fontPanel:YES] orderFront:sender];
-}
-
-- (void)modifyFont:(id)sender
-{
-    _fontAction = [sender tag];
-    [self sendAction];
-
-    if (_selectedFont)
-        [self setSelectedFont:[self convertFont:_selectedFont] isMultiple:NO];
-}
-
-/*!
-    This method causes the receiver to send its action message.
-    @param sender The object that sent the message. (a Font panel)
-*/
-- (void)modifyFontViaPanel:(id)sender
-{
-    _fontAction = CPViaPanelFontAction;
-    if (_selectedFont)
-        [self setSelectedFont:[self convertFont:_selectedFont] isMultiple:NO];
-
-    [self sendAction];
-}
-
-/*!
-    Convert a font according to current font changes, provided by the object that initiated the font change.
-    @param aFont The font to convert.
-    @result The converted font or \c aFont if the conversion failed.
-*/
-- (CPFont)convertFont:(CPFont)aFont
-{
-    var newFont = nil;
-
-    switch (_fontAction)
-    {
-        case CPNoFontChangeAction:
-            newFont = aFont;
-            break;
-
-        case CPViaPanelFontAction:
-            newFont = [[self fontPanel:NO] panelConvertFont:aFont];
-            break;
-
-        case CPAddTraitFontAction:
-            newFont = aFont;
-
-            if (!_activeChange)
-                break;
-
-            var addTraits = [_activeChange valueForKey:@"addTraits"];
-
-            if (addTraits)
-                newFont = [self convertFont:aFont toHaveTrait:addTraits];
-            break;
-
-        case CPSizeUpFontAction:
-            newFont = [self convertFont:aFont toSize:[aFont size] + 1.0]; /* any limit ? */
-            break;
-
-        case CPSizeDownFontAction:
-            if ([aFont size] > 1)
-                newFont = [self convertFont:aFont toSize:[aFont size] - 1.0];
-            /* else CPBeep() :-p */
-            break;
-
-        default:
-            CPLog.trace(@"-[" + [self className] + " " + _cmd + "] unsupported font action: " + _fontAction + " aFont unchanged");
-            newFont = aFont;
-            break;
-    }
-
-    return newFont;
-}
-
-@end
-
-var _CPFontDetectSpan,
-    _CPFontDetectReferenceFonts,
-    _CPFontDetectAllFonts = [
-        /* "04b_21", "A Charming Font", "Abadi MT Condensed", "Abadi MT Condensed Extra Bold", "Abadi MT Condensed Light", "Academy Engraved LET", "Agency FB", "Alba", "Alba Matter", "Alba Super", "Algerian",*/
-        "American Typewriter",
-        /* "Andale Mono", "Andale Mono IPA", "Andy", */
-        "Apple Chancery", "Arial", "Arial Black", "Arial Narrow", "Arial Rounded MT Bold", "Arial Unicode MS",
-        /* "Avant Garde", "Avantgarde", "Baby Kruffy", "Base 02", "Baskerville", "Baskerville Old Face", "Bauhaus 93", "Beesknees ITC", "Bell MT", "Berlin Sans FB", "Berlin Sans FB Demi", "Bernard MT Condensed", "Bickley Script",*/
-        "Big Caslon", "Bitstream Vera Sans", "Bitstream Vera Sans Mono", "Bitstream Vera Serif",
-        /* "Blackadder ITC", "Blackletter686 BT", "Bodoni MT", "Bodoni MT Black", "Bodoni MT Condensed", "Bodoni MT Poster Compressed", "Book Antiqua", "Bookman", "Bookman Old Style", "Bradley Hand ITC", "Braggadocio", "Britannic Bold", "Broadway", "Broadway BT",*/
-        "Brush Script MT",
-        /* "BudHand", "CAMPBELL", "Calibri", "Californian FB", "Calisto MT", "Calligraph421 BT",*/
-        "Cambria",
-        /* "Candara", "Capitals",*/
-        "Caslon", "Castellar", "Cataneo BT", "Centaur", "Century Gothic", "Century Schoolbook", "Century Schoolbook L",
-        /* "Champignon", "Charcoal", "Charter", "Charter BT", "Chicago", "Chick", "Chiller", "ClearlyU", "Colonna MT",*/
-        "Comic Sans", "Comic Sans MS", "Consolas", "Constantia", "Cooper Black", "Copperplate", "Copperplate Gothic Bold", "Copperplate Gothic Light", "Corbel", "Courier", "Courier New",
-        /* "Croobie", "Curlz MT", "Desdemona", "Didot", "DomBold BT", "Edwardian Script ITC", "Engravers MT", "Eras Bold ITC", "Eras Demi ITC", "Eras Light ITC", "Eras Medium ITC", "Eurostile", "FIRSTHOME", "Fat", "Felix Titling", "Fine Hand", "Fixed", "Footlight MT Light", "Forte", "Franklin Gothic Book", "Franklin Gothic Demi", "Franklin Gothic Demi Cond", "Franklin Gothic Heavy", "Franklin Gothic Medium", "Franklin Gothic Medium Cond", "Freestyle Script", "French Script MT", "Freshbot", "Frosty",*/
-        "Futura",
-        /* "GENUINE", "Gadget", "Garamond",*/
-        "Geneva", "Georgia", "Georgia Ref", "Geeza Pro", "Gigi", "Gill Sans", "Gill Sans MT", "Gill Sans MT Condensed", "Gill Sans MT Ext Condensed Bold", "Gill Sans Ultra Bold", "Gill Sans Ultra Bold Condensed",
-        /* "GlooGun", "Gloucester MT Extra Condensed", "Goudy Old Style", "Goudy Stout", "Haettenschweiler", "Harlow Solid Italic", "Harrington",*/
-        "Helvetica", "Helvetica Narrow", "Helvetica Neue", "Herculanum", "High Tower Text", "Highlight LET", "Hoefler Text", "Impact", "Imprint MT Shadow",
-        /* "Informal Roman", "Jenkins v2.0", "John Handy LET", "Jokerman", "Jokerman LET", "Jokewood", "Juice ITC", "Kabel Ult BT", "Kartika", "Kino MT", "Kristen ITC", "Kunstler Script", "La Bamba LET", */
-        "Lucida", "Lucida Bright", "Lucida Calligraphy", "Lucida Console", "Lucida Fax", "Lucida Grande", "Lucida Handwriting", "Lucida Sans", "Lucida Sans Typewriter", "Lucida Sans Unicode",
-        /* "Luxi Mono", "Luxi Sans", "Luxi Serif", "MARKETPRO", "MS Reference Sans Serif", "MS Reference Serif", "Magneto", "Maiandra GD", */
-        "Marker Felt",
-        /* "Matisse ITC", "Matura MT Script Capitals", "Mead Bold", "Mekanik LET", "Mercurius Script MT Bold", */
-        "Microsoft Sans Serif", "Milano LET", "Minion Web", "MisterEarl BT", "Mistral", "Monaco", "Monotype Corsiva", "Monotype.com", "New Century Schoolbook", "New York", "News Gothic MT",
-        /* "Niagara Engraved", "Niagara Solid", "Nimbus Mono L", "Nimbus Roman No9 L", "OCR A Extended", "OCRB", "Odessa LET", "Old English Text MT", "OldDreadfulNo7 BT", "One Stroke Script LET", "Onyx", "Optima", "Orange LET", "Palace Script MT", "Palatino", "Palatino Linotype", */
-        "Papyrus",
-        /* "ParkAvenue BT", "Pepita MT", "Perpetua", "Perpetua Titling MT", "Placard Condensed", "Playbill", "Poornut", "Pristina", "Pump Demi Bold LET", "Pussycat", "Quixley LET", "Rage Italic", "Rage Italic LET", "Ravie", "Rockwell", "Rockwell Condensed", "Rockwell Extra Bold", "Ruach LET", "Runic MT Condensed", "Sand", "Script MT Bold", "Scruff LET", "Segoe UI", "Showcard Gothic", "Skia", "Smudger LET", "Snap ITC", "Square721 BT", "Staccato222 BT", "Stencil", "Sylfaen", */
-        "Tahoma", "Techno", "Tempus Sans ITC", "Terminal", "Textile", "Times", "Times New Roman", "Tiranti Solid LET", "Trebuchet MS",
-        /* "Tw Cen MT", "Tw Cen MT Condensed", "Tw Cen MT Condensed Extra Bold", "URW Antiqua T", "URW Bookman L", "URW Chancery L", "URW Gothic L", "URW Palladio L", "Univers", "University Roman LET", "Utopia", */
-        "Verdana", "Verdana Ref", /* "Victorian LET", "Viner Hand ITC", "Vivaldi", "Vladimir Script", "Vrinda", "Weltron Urban", "Westwood LET", "Wide Latin", "Zapf Chancery", */
-        "Zapfino"];
-
-// Compare against the reference fonts. Return true if it produces a different size than at least one of them.
-var _CPFontDetectFontAvailable = function(font)
-{
-    for (var i = 0; i < _CPFontDetectReferenceFonts.length; i++)
-        if (_CPFontDetectCompareFonts(_CPFontDetectReferenceFonts[i], font))
-            return true;
-    return false;
-};
-
-var _CPFontDetectCache = {};
-
-// Compares two given fonts. Returns true if they produce different sizes (i.e. fontA didn't fallback to fontB)
-var _CPFontDetectCompareFonts = function(fontA, fontB)
-{
-    var a;
-    if (_CPFontDetectCache[fontA])
-        a = _CPFontDetectCache[fontA];
-
-    else
-    {
-        _CPFontDetectSpan.style.fontFamily = '"' + fontA + '"';
-        _CPFontDetectCache[fontA] = a = { w: _CPFontDetectSpan.offsetWidth, h: _CPFontDetectSpan.offsetHeight };
-    }
-
-    _CPFontDetectSpan.style.fontFamily = '"' + fontB + '", "' + fontA + '"';
-    var bWidth = _CPFontDetectSpan.offsetWidth,
-        bHeight = _CPFontDetectSpan.offsetHeight;
-
-    return (a.w != bWidth || a.h != bHeight);
-};
-
-// Test the candidate fonts pairwise until we find two that are different. Otherwise return the first.
-var _CPFontDetectPickTwoDifferentFonts = function(candidates)
-{
-    for (var i = 0; i < candidates.length; i++)
-        for (var j = 0; j < i; j++)
-            if (_CPFontDetectCompareFonts(candidates[i], candidates[j]))
-                return [candidates[i], candidates[j]];
-    return [candidates[0]];
-};
-
-[CPFontManager setFontManagerFactory:[CPFontManager class]];

AppKit/CPGradient.j

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

AppKit/CPGraphics.j

@@ -1,121 +0,0 @@
-/*
- * CPGraphics.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2010, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPColor.j"
-@import "CPGraphicsContext.j"
-
-CPCalibratedWhiteColorSpace = @"CalibratedWhiteColorSpace";
-CPCalibratedBlackColorSpace = @"CalibratedBlackColorSpace";
-CPCalibratedRGBColorSpace   = @"CalibratedRGBColorSpace";
-CPDeviceWhiteColorSpace     = @"DeviceWhiteColorSpace";
-CPDeviceBlackColorSpace     = @"DeviceBlackColorSpace";
-CPDeviceRGBColorSpace       = @"DeviceRGBColorSpace";
-CPDeviceCMYKColorSpace      = @"DeviceCMYKColorSpace";
-CPNamedColorSpace           = @"NamedColorSpace";
-CPPatternColorSpace         = @"PatternColorSpace";
-CPCustomColorSpace          = @"CustomColorSpace";
-
-function CPDrawTiledRects(
-   /* CGRect */ boundsRect,
-   /* CGRect */ clipRect,
-   /* CPRectEdge[] */ sides,
-   /* float[] */ grays)
-{
-    if (sides.length != grays.length)
-        [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and grays (length: " + grays.length + ") must have the same length."];
-
-    var colors = [grays arrayByApplyingBlock:function(gray)
-    {
-        return [CPColor colorWithCalibratedWhite:gray alpha:1.0];
-    }];
-
-    return CPDrawColorTiledRects(boundsRect, clipRect, sides, colors);
-}
-
-function CPDrawColorTiledRects(
-   /* CGRect */ boundsRect,
-   /* CGRect */ clipRect,
-   /* CPRectEdge[] */ sides,
-   /* CPColor[] */ colors)
-{
-    if (sides.length != colors.length)
-        [CPException raise:CPInvalidArgumentException reason:@"sides (length: " + sides.length + ") and colors (length: " + colors.length + ") must have the same length."];
-
-    var resultRect = CGRectMakeCopy(boundsRect),
-        slice = CGRectMakeZero(),
-        remainder = CGRectMakeZero(),
-        context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextSaveGState(context);
-    CGContextSetLineWidth(context, 1.0);
-
-    for (var sideIndex = 0; sideIndex < sides.length; ++sideIndex)
-    {
-        var side = sides[sideIndex];
-
-        CGRectDivide(resultRect, slice, remainder, 1.0, side);
-        resultRect = remainder;
-        slice = CGRectIntersection(slice, clipRect);
-
-        // Cocoa docs say that only slices that are within the clipRect are actually drawn
-        if (CGRectIsEmpty(slice))
-            continue;
-
-        var minX,
-            maxX,
-            minY,
-            maxY;
-
-        if (side == CPMinXEdge || side == CPMaxXEdge)
-        {
-            // Make sure we have at least 1 pixel to draw a line
-            if (CGRectGetWidth(slice) < 1.0)
-                continue;
-
-            minX = CGRectGetMinX(slice) + 0.5;
-            maxX = minX;
-            minY = CGRectGetMinY(slice);
-            maxY = CGRectGetMaxY(slice);
-        }
-        else // CPMinYEdge || CPMaxYEdge
-        {
-            // Make sure we have at least 1 pixel to draw a line
-            if (CGRectGetHeight(slice) < 1.0)
-                continue;
-
-            minX = CGRectGetMinX(slice);
-            maxX = CGRectGetMaxX(slice);
-            minY = CGRectGetMinY(slice) + 0.5;
-            maxY = minY;
-        }
-
-        CGContextBeginPath(context);
-        CGContextMoveToPoint(context, minX, minY);
-        CGContextAddLineToPoint(context, maxX, maxY);
-        CGContextSetStrokeColor(context, colors[sideIndex]);
-        CGContextStrokePath(context);
-    }
-
-    CGContextRestoreGState(context);
-
-    return resultRect;
-}

AppKit/CPGraphicsContext.j

@@ -1,136 +0,0 @@
-/*
- * CPGraphicsContext.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CGContext.j"
-
-
-var CPGraphicsContextCurrent = nil,
-    CPGraphicsContextThreadStack = nil;
-
-/*!
-    @ingroup appkit
-    Provides an interface for drawing to the screen.
-*/
-@implementation CPGraphicsContext : CPObject
-{
-    CGContext   _graphicsPort;
-}
-
-/*!
-    Returns the current graphics context.
-*/
-+ (CPGraphicsContext)currentContext
-{
-    return CPGraphicsContextCurrent;
-}
-
-/*!
-    Sets the current graphics context
-*/
-+ (void)setCurrentContext:(CPGraphicsContext)aGraphicsContext
-{
-    CPGraphicsContextCurrent = aGraphicsContext;
-}
-
-+ (void)saveGraphicsState
-{
-    if (!CPGraphicsContextCurrent)
-        return;
-
-    if (!CPGraphicsContextThreadStack)
-        CPGraphicsContextThreadStack = [CPMutableArray array];
-
-    [CPGraphicsContextThreadStack addObject:CPGraphicsContextCurrent];
-    [CPGraphicsContextCurrent saveGraphicsState];
-}
-
-+ (void)restoreGraphicsState
-{
-    var lastContext = [CPGraphicsContextThreadStack lastObject];
-
-    if (lastContext)
-    {
-        [lastContext restoreGraphicsState];
-        [CPGraphicsContextThreadStack removeLastObject];
-    }
-}
-
-/*!
-    Creates a graphics context with a provided port.
-    @param aContext the context to initialize with
-    @param aFlag whether the context should be flipped
-    @return the initialized graphics context
-*/
-+ (CPGraphicsContext)graphicsContextWithGraphicsPort:(CGContext)aContext flipped:(BOOL)aFlag
-{
-    return [[self alloc] initWithGraphicsPort:aContext];
-}
-
-/*!
-    Initializes the context with a graphics port.
-    @param aGraphicsPort the graphics port to initialize with
-    @return the initialized context
-*/
-- (id)initWithGraphicsPort:(CGContext)aGraphicsPort
-{
-    self = [super init];
-
-    if (self)
-        _graphicsPort = aGraphicsPort;
-
-    return self;
-}
-
-/*!
-    Returns the graphics context's port.
-*/
-- (CGContext)graphicsPort
-{
-    return _graphicsPort;
-}
-
-/*!
-    (Not implemented. Always returns Cappuccino's default, `YES`.)
-
-    Return `isFlipped` of the receiver's focused view, unless no view is focused in which case the receiver's
-    `flipped` flag, as set by `graphicsContextWithGraphicsPort:flipped:`, is returned.
-
-    Note: Cappuccino is flipped by default.
-*/
-- (BOOL)isFlipped
-{
-    return YES;
-}
-
-- (void)saveGraphicsState
-{
-    CGContextSaveGState(_graphicsPort);
-}
-
-- (void)restoreGraphicsState
-{
-    CGContextRestoreGState(_graphicsPort);
-}
-
-@end

AppKit/CPImageView.j

@@ -1,640 +0,0 @@
-/*
- * CPImageView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPNotificationCenter.j>
-
-@import "CPControl.j"
-@import "CPImage.j"
-@import "CPShadowView.j"
-
-@global CPImagesPboardType
-@global appkit_tag_dom_elements
-
-@global document
-
-@typedef CPImageAlignment
-CPImageAlignCenter      = 0;
-CPImageAlignTop         = 1;
-CPImageAlignTopLeft     = 2;
-CPImageAlignTopRight    = 3;
-CPImageAlignLeft        = 4;
-CPImageAlignBottom      = 5;
-CPImageAlignBottomLeft  = 6;
-CPImageAlignBottomRight = 7;
-CPImageAlignRight       = 8;
-
-var CPImageViewEmptyPlaceholderImage = nil;
-
-/*!
-    @ingroup appkit
-    @class CPImageView
-
-    This class is a control that displays an image.
-*/
-@implementation CPImageView : CPControl
-{
-    DOMElement          _DOMImageElement;
-
-    BOOL                _hasShadow;
-    CPView              _shadowView;
-
-    BOOL                _isEditable;
-
-    CGRect              _imageRect;
-    CPImageAlignment    _imageAlignment;
-}
-
-+ (void)initialize
-{
-    if (self !== [CPImageView class])
-        return;
-
-    var bundle = [CPBundle bundleForClass:[CPView class]];
-
-    CPImageViewEmptyPlaceholderImage = [[CPImage alloc] initWithContentsOfFile:[bundle pathForResource:@"empty.png"]];
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding || aBinding === CPValueURLBinding || aBinding === CPValuePathBinding || aBinding === CPDataBinding)
-        return [CPImageViewValueBinder class];
-    else if ([aBinding hasPrefix:CPEditableBinding])
-        return [CPMultipleValueAndBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-#if PLATFORM(DOM)
-        [self _createDOMImageElement];
-#endif
-    }
-
-    return self;
-}
-
-- (void)_createDOMImageElement
-{
-#if PLATFORM(DOM)
-    var image = [self objectValue],
-        isCSSBasedImage = [image isCSSBased],
-        isIMGImageElement = _DOMImageElement && (_DOMImageElement.nodeName == "IMG");
-
-    // First, check if we need to destroy a current DOM image element. This is the case if :
-    // - we have one but not the right one (that is a DIV but needing an IMG, and vice versa)
-
-    if (_DOMImageElement)
-    {
-        if ((isIMGImageElement && isCSSBasedImage) || (!isIMGImageElement && !isCSSBasedImage))
-        {
-            // OK, destroy it
-
-            _DOMElement.removeChild(_DOMImageElement);
-
-            _DOMImageElement = nil;
-
-            // CSS styling cleaning
-            _cssStylePreviousState = @[];
-            _cssStyleNode = nil;
-        }
-        else
-            return;
-    }
-
-    _DOMImageElement = document.createElement(isCSSBasedImage ? "div" : "img");
-    _DOMImageElement.style.position = "absolute";
-    _DOMImageElement.style.left = "0px";
-    _DOMImageElement.style.top = "0px";
-
-    if ([CPPlatform supportsDragAndDrop])
-    {
-        _DOMImageElement.setAttribute("draggable", "true");
-        _DOMImageElement.style["-khtml-user-drag"] = "element";
-    }
-
-    _DOMImageElement.style.visibility = "hidden";
-    AppKitTagDOMElement(self, _DOMImageElement);
-
-    CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-#endif
-}
-
-/*!
-    Returns the view's image.
-*/
-- (CPImage)image
-{
-    return [self objectValue];
-}
-
-- (void)setImage:(CPImage)anImage
-{
-    [self setObjectValue:anImage];
-}
-
-/*! @ignore */
-- (void)setObjectValue:(CPImage)anImage
-{
-    var oldImage = [self objectValue];
-
-    if (oldImage === anImage)
-        return;
-
-    [super setObjectValue:anImage];
-
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (oldImage)
-        [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage];
-
-    var newImage = [self objectValue];
-
-#if PLATFORM(DOM)
-    [self _createDOMImageElement];
-
-    if ([newImage isCSSBased])
-        _cssStyleNode = [newImage applyCSSImageForView:self
-                                          onDOMElement:_DOMImageElement
-                                             styleNode:_cssStyleNode
-                                         previousState:@ref(_cssStylePreviousState)];
-    else
-        _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
-#endif
-
-    var size = [newImage size];
-
-    if (size && size.width === -1 && size.height === -1)
-    {
-        [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage];
-
-#if PLATFORM(DOM)
-        _DOMImageElement.width = 0;
-        _DOMImageElement.height = 0;
-#endif
-
-        [_shadowView setHidden:YES];
-    }
-    else
-    {
-        [self hideOrDisplayContents];
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-    }
-}
-
-- (void)imageDidLoad:(CPNotification)aNotification
-{
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPImageDidLoadNotification object:[self objectValue]];
-    [self hideOrDisplayContents];
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-/*!
-    Returns \c YES if the image view draws with
-    a drop shadow. The default is \c NO.
-*/
-- (BOOL)hasShadow
-{
-    return _hasShadow;
-}
-
-/*!
-    Sets whether the image view should draw with a drop shadow.
-    @param shouldHaveShadow whether the image view should have a shadow
-*/
-- (void)setHasShadow:(BOOL)shouldHaveShadow
-{
-    if (_hasShadow == shouldHaveShadow)
-        return;
-
-    _hasShadow = shouldHaveShadow;
-
-    if (_hasShadow)
-    {
-        _shadowView = [[CPShadowView alloc] initWithFrame:[self bounds]];
-
-        [self addSubview:_shadowView];
-
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-    }
-    else
-    {
-        [_shadowView removeFromSuperview];
-
-        _shadowView = nil;
-    }
-
-    [self hideOrDisplayContents];
-}
-
-/*!
-    Sets the type of image alignment that should be used to
-    render the image.
-    @param anImageAlignment the type of scaling to use
-*/
-- (void)setImageAlignment:(CPImageAlignment)anImageAlignment
-{
-    if (_imageAlignment == anImageAlignment)
-        return;
-
-    _imageAlignment = anImageAlignment;
-
-    if (![self image])
-        return;
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-- (unsigned)imageAlignment
-{
-    return _imageAlignment;
-}
-
-/*!
-    Sets the type of image scaling that should be used to
-    render the image.
-    @param anImageScaling the type of scaling to use
-*/
-- (void)setImageScaling:(CPImageScaling)anImageScaling
-{
-    [super setImageScaling:anImageScaling];
-
-#if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
-    {
-        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
-    }
-#endif
-
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-- (CPUInteger)imageScaling
-{
-    return [self currentValueForThemeAttribute:@"image-scaling"];
-}
-
-/*!
-    Toggles the display of the image view.
-*/
-- (void)hideOrDisplayContents
-{
-    if (![self image])
-    {
-#if PLATFORM(DOM)
-        _DOMImageElement.style.visibility = "hidden";
-#endif
-        [_shadowView setHidden:YES];
-    }
-    else
-    {
-#if PLATFORM(DOM)
-        _DOMImageElement.style.visibility = "visible";
-#endif
-        [_shadowView setHidden:NO];
-    }
-}
-
-/*!
-    Returns the view's image rectangle
-*/
-- (CGRect)imageRect
-{
-    return _imageRect;
-}
-
-/*!
-    Add a description
-*/
-- (void)layoutSubviews
-{
-    if (![self image])
-        return;
-
-    var bounds = [self bounds],
-        image = [self image],
-        imageScaling = [self currentValueForThemeAttribute:@"image-scaling"],
-        x = 0.0,
-        y = 0.0,
-        insetWidth = (_hasShadow ? [_shadowView horizontalInset] : 0.0),
-        insetHeight = (_hasShadow ? [_shadowView verticalInset] : 0.0),
-        boundsWidth = CGRectGetWidth(bounds),
-        boundsHeight = CGRectGetHeight(bounds),
-        width = boundsWidth - insetWidth,
-        height = boundsHeight - insetHeight;
-
-    if (imageScaling === CPImageScaleAxesIndependently)
-    {
-        #if PLATFORM(DOM)
-            _DOMImageElement.width = ROUND(width);
-            _DOMImageElement.height = ROUND(height);
-        #endif
-    }
-    else
-    {
-        var size = [image size];
-
-        if (size.width == -1 && size.height == -1)
-            return;
-
-        switch (imageScaling)
-        {
-            case CPImageScaleProportionallyDown:
-                if (width >= size.width && height >= size.height)
-                {
-                    width = size.width;
-                    height = size.height;
-                    break;
-                }
-
-                // intentionally fall through to the next case
-
-            case CPImageScaleProportionallyUpOrDown:
-                var imageRatio = size.width / size.height,
-                    viewRatio = width / height;
-
-                if (viewRatio > imageRatio)
-                    width = height * imageRatio;
-                else
-                    height = width / imageRatio;
-                break;
-
-            case CPImageScaleAxesIndependently:
-            case CPImageScaleNone:
-                width = size.width;
-                height = size.height;
-                break;
-        }
-
-        #if PLATFORM(DOM)
-            _DOMImageElement.width = ROUND(width);
-            _DOMImageElement.height = ROUND(height);
-        #endif
-
-        var x,
-            y;
-
-        switch (_imageAlignment)
-        {
-            case CPImageAlignLeft:
-            case CPImageAlignTopLeft:
-            case CPImageAlignBottomLeft:
-                x = 0.0;
-                break;
-
-            case CPImageAlignRight:
-            case CPImageAlignTopRight:
-            case CPImageAlignBottomRight:
-                x = boundsWidth - width;
-                break;
-
-            default:
-                x = (boundsWidth - width) / 2.0;
-                break;
-        }
-
-        switch (_imageAlignment)
-        {
-            case CPImageAlignTop:
-            case CPImageAlignTopLeft:
-            case CPImageAlignTopRight:
-                y = 0.0;
-                break;
-
-            case CPImageAlignBottom:
-            case CPImageAlignBottomLeft:
-            case CPImageAlignBottomRight:
-                y = boundsHeight - height;
-                break;
-
-            default:
-                y = (boundsHeight - height) / 2.0;
-                break;
-        }
-
-#if PLATFORM(DOM)
-        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
-#endif
-    }
-
-#if PLATFORM(DOM)
-    if ([image isCSSBased] && [image _shouldBeResized])
-    {
-        [image _setDisplaySize:CGSizeMake(ROUND(width), ROUND(height))];
-
-        _cssStyleNode = [image applyCSSImageForView:self
-                                       onDOMElement:_DOMImageElement
-                                          styleNode:_cssStyleNode
-                                      previousState:@ref(_cssStylePreviousState)];
-    }
-#endif
-
-    _imageRect = CGRectMake(x, y, width, height);
-
-    if (_hasShadow)
-        [_shadowView setFrame:CGRectMake(x - [_shadowView leftInset], y - [_shadowView topInset], width + insetWidth, height + insetHeight)];
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    // Should we do something with this event?
-    [[self nextResponder] mouseDown:anEvent];
-}
-
-- (void)setEditable:(BOOL)shouldBeEditable
-{
-    if (_isEditable === shouldBeEditable)
-        return;
-
-    _isEditable = shouldBeEditable;
-
-    if (_isEditable)
-        [self registerForDraggedTypes:[CPImagesPboardType]];
-
-    else
-    {
-        var draggedTypes = [self registeredDraggedTypes];
-
-        [self unregisterDraggedTypes];
-
-        [draggedTypes removeObjectIdenticalTo:CPImagesPboardType];
-
-        [self registerForDraggedTypes:draggedTypes];
-    }
-}
-
-- (BOOL)isEditable
-{
-    return _isEditable;
-}
-
-- (BOOL)performDragOperation:(CPDraggingInfo)aSender
-{
-    var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]];
-
-    if ([images count])
-    {
-        [self setImage:images[0]];
-        [self sendAction:[self action] to:[self target]];
-    }
-
-    return YES;
-}
-
-@end
-
-@implementation CPImageViewValueBinder : CPBinder
-{
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    [self _setPlaceholder:nil forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:nil forMarker:CPNullMarker isDefault:YES];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setImage:nil];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    var image;
-
-    if (aValue == nil)
-        image = nil;
-    else if (aBinding === CPDataBinding)
-        image = [[CPImage alloc] initWithData:aValue];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        image = [CPImage cachedImageWithContentsOfFile:aValue];
-    else if (aBinding === CPValueBinding)
-        image = aValue;
-
-    [_source setImage:image];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    var image = [_source image];
-
-    if (aBinding === CPDataBinding)
-        return [image data];
-    else if (aBinding === CPValueURLBinding || aBinding === CPValuePathBinding)
-        return [image filename];
-    else if (aBinding === CPValueBinding)
-        return image;
-}
-
-@end
-
-var CPImageViewImageKey          = @"CPImageViewImageKey",
-    CPImageViewImageScalingKey   = @"CPImageViewImageScalingKey",
-    CPImageViewImageAlignmentKey = @"CPImageViewImageAlignmentKey",
-    CPImageViewHasShadowKey      = @"CPImageViewHasShadowKey",
-    CPImageViewIsEditableKey     = @"CPImageViewIsEditableKey";
-
-@implementation CPImageView (CPCoding)
-
-/*!
-    Initializes the image view with the provided coder.
-    @param aCoder the coder from which data will be read.
-    @return the initialized image view
-*/
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-    {
-#if PLATFORM(DOM)
-        [self _createDOMImageElement];
-#endif
-
-        [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
-        [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];
-
-        if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey])
-            [self setEditable:YES];
-
-        [self setNeedsLayout];
-        [self setNeedsDisplay:YES];
-    }
-
-    return self;
-}
-
-/*!
-    Writes the image view out to the coder.
-    @param aCoder the coder to which the image
-    view will be written
-*/
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // We do this in order to avoid encoding the _shadowView, which
-    // should just automatically be created programmatically as needed.
-    if (_shadowView)
-        [_shadowView removeFromSuperview];
-
-    [super encodeWithCoder:aCoder];
-
-    if (_shadowView)
-        [self addSubview:_shadowView];
-
-    [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey];
-    [aCoder encodeInt:_imageAlignment forKey:CPImageViewImageAlignmentKey];
-
-    if (_isEditable)
-        [aCoder encodeBool:_isEditable forKey:CPImageViewIsEditableKey];
-}
-
-@end
-
-@implementation CPImage (CachedImage)
-
-+ (CPImage)cachedImageWithContentsOfFile:(CPString)aFile
-{
-    var cached_name = [CPString stringWithFormat:@"%@_%d", [self class], [aFile hash]],
-        image = [CPImage imageNamed:cached_name];
-
-    if (!image)
-    {
-        image = [[CPImage alloc] initWithContentsOfFile:aFile];
-        [image setName:cached_name];
-    }
-
-    return image;
-}
-
-@end

AppKit/CPKeyBinding.j

@@ -1,266 +0,0 @@
-/*
- * CPKeyBinding.j
- * AppKit
- *
- * Created by Nicholas Small.
- * Copyright 2010, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPArray.j>
-
-@import "CPEvent_Constants.j"
-@import "CPText.j"
-
-CPStandardKeyBindings = {
-    @"@.": @"cancelOperation:",
-
-    @"@a": @"selectAll:",
-    @"@~$v": @"pasteAsPlainText:",
-    @"^a": @"moveToBeginningOfParagraph:",
-    @"^$a": @"moveToBeginningOfParagraphAndModifySelection:",
-    @"^b": @"moveBackward:",
-    @"^$b": @"moveBackwardAndModifySelection:",
-    @"^~b": @"moveWordBackward:",
-    @"^~$b": @"moveWordBackwardAndModifySelection:",
-    @"^d": @"deleteForward:",
-    @"^e": @"moveToEndOfParagraph:",
-    @"^$e": @"moveToEndOfParagraphAndModifySelection:",
-    @"^f": @"moveForward:",
-    @"^$f": @"moveForwardAndModifySelection:",
-    @"^~f": @"moveWordForward:",
-    @"^~$f": @"moveWordForwardAndModifySelection:",
-    @"^h": @"deleteBackward:",
-    @"^k": @"deleteToEndOfParagraph:",
-    @"^l": @"centerSelectionInVisibleArea:",
-    @"^n": @"moveDown:",
-    @"^$n": @"moveDownAndModifySelection:",
-    @"^o": [@"insertNewlineIgnoringFieldEditor:", @"moveBackward:"],
-    @"^p": @"moveUp:",
-    @"^$p": @"moveUpAndModifySelection:",
-    @"^t": @"transpose:",
-    @"^v": @"pageDown:",
-    @"^$v": @"pageDownAndModifySelection:",
-    @"^y": @"yank:"
-};
-
-CPStandardKeyBindings[CPNewlineCharacter] = @"insertNewline:";
-CPStandardKeyBindings[CPCarriageReturnCharacter] = @"insertNewline:";
-CPStandardKeyBindings[CPEnterCharacter] = @"insertNewline:";
-CPStandardKeyBindings[@"~" + CPNewlineCharacter] = @"insertNewlineIgnoringFieldEditor:";
-CPStandardKeyBindings[@"~" + CPCarriageReturnCharacter] = @"insertNewlineIgnoringFieldEditor:";
-CPStandardKeyBindings[@"~" + CPEnterCharacter] = @"insertNewlineIgnoringFieldEditor:";
-CPStandardKeyBindings[@"^" + CPNewlineCharacter] = @"insertLineBreak:";
-CPStandardKeyBindings[@"^" + CPCarriageReturnCharacter] = @"insertLineBreak:";
-CPStandardKeyBindings[@"^" + CPEnterCharacter] = @"insertLineBreak:";
-
-CPStandardKeyBindings[CPBackspaceCharacter] = @"deleteBackward:";
-CPStandardKeyBindings[@"~" + CPBackspaceCharacter] = @"deleteWordBackward:";
-CPStandardKeyBindings[CPDeleteCharacter] = @"deleteBackward:";
-CPStandardKeyBindings[@"@" + CPDeleteCharacter] = @"deleteToBeginningOfLine:";
-CPStandardKeyBindings[@"~" + CPDeleteCharacter] = @"deleteWordBackward:";
-CPStandardKeyBindings[@"^" + CPDeleteCharacter] = @"deleteBackwardByDecomposingPreviousCharacter:";
-CPStandardKeyBindings[@"^~" + CPDeleteCharacter] = @"deleteWordBackward:";
-
-CPStandardKeyBindings[CPDeleteFunctionKey] = @"deleteForward:";
-CPStandardKeyBindings[@"~" + CPDeleteFunctionKey] = @"deleteWordForward:";
-
-CPStandardKeyBindings[CPTabCharacter] = @"insertTab:";
-CPStandardKeyBindings[@"~" + CPTabCharacter] = @"insertTabIgnoringFieldEditor:";
-CPStandardKeyBindings[@"^" + CPTabCharacter] = @"selectNextKeyView:";
-CPStandardKeyBindings[CPBackTabCharacter] = @"insertBacktab:";
-CPStandardKeyBindings[@"^" + CPBackTabCharacter] = @"selectPreviousKeyView:";
-
-CPStandardKeyBindings[CPEscapeFunctionKey] = @"cancelOperation:";
-CPStandardKeyBindings[@"~" + CPEscapeFunctionKey] = @"complete:";
-CPStandardKeyBindings[CPF5FunctionKey] = @"complete:";
-
-CPStandardKeyBindings[CPLeftArrowFunctionKey] = @"moveLeft:";
-CPStandardKeyBindings[@"~" + CPLeftArrowFunctionKey] = @"moveWordLeft:";
-CPStandardKeyBindings[@"^" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLine:";
-CPStandardKeyBindings[@"@" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLine:";
-CPStandardKeyBindings[@"$" + CPLeftArrowFunctionKey] = @"moveLeftAndModifySelection:";
-CPStandardKeyBindings[@"$~" + CPLeftArrowFunctionKey] = @"moveWordLeftAndModifySelection:";
-CPStandardKeyBindings[@"$^" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLineAndModifySelection:";
-CPStandardKeyBindings[@"$@" + CPLeftArrowFunctionKey] = @"moveToLeftEndOfLineAndModifySelection:";
-CPStandardKeyBindings[@"@^" + CPLeftArrowFunctionKey] = @"makeBaseWritingDirectionRightToLeft:";
-CPStandardKeyBindings[@"@^~" + CPLeftArrowFunctionKey] = @"makeTextWritingDirectionRightToLeft:";
-
-CPStandardKeyBindings[CPRightArrowFunctionKey] = @"moveRight:";
-CPStandardKeyBindings[@"~" + CPRightArrowFunctionKey] = @"moveWordRight:";
-CPStandardKeyBindings[@"^" + CPRightArrowFunctionKey] = @"moveToRightEndOfLine:";
-CPStandardKeyBindings[@"@" + CPRightArrowFunctionKey] = @"moveToRightEndOfLine:";
-CPStandardKeyBindings[@"$" + CPRightArrowFunctionKey] = @"moveRightAndModifySelection:";
-CPStandardKeyBindings[@"$~" + CPRightArrowFunctionKey] = @"moveWordRightAndModifySelection:";
-CPStandardKeyBindings[@"$^" + CPRightArrowFunctionKey] = @"moveToRightEndOfLineAndModifySelection:";
-CPStandardKeyBindings[@"$@" + CPRightArrowFunctionKey] = @"moveToRightEndOfLineAndModifySelection:";
-CPStandardKeyBindings[@"@^" + CPRightArrowFunctionKey] = @"makeBaseWritingDirectionLeftToRight:";
-CPStandardKeyBindings[@"@^~" + CPRightArrowFunctionKey] = @"makeTextWritingDirectionLeftToRight:";
-
-CPStandardKeyBindings[CPUpArrowFunctionKey] = @"moveUp:";
-CPStandardKeyBindings[@"~" + CPUpArrowFunctionKey] = [@"moveBackward:", @"moveToBeginningOfParagraph:"];
-CPStandardKeyBindings[@"^" + CPUpArrowFunctionKey] = @"scrollPageUp:";
-CPStandardKeyBindings[@"@" + CPUpArrowFunctionKey] = @"moveToBeginningOfDocument:";
-CPStandardKeyBindings[@"$" + CPUpArrowFunctionKey] = @"moveUpAndModifySelection:";
-CPStandardKeyBindings[@"$~" + CPUpArrowFunctionKey] = @"moveParagraphBackwardAndModifySelection:";
-CPStandardKeyBindings[@"$@" + CPUpArrowFunctionKey] = @"moveToBeginningOfDocumentAndModifySelection:";
-
-CPStandardKeyBindings[CPDownArrowFunctionKey] = @"moveDown:";
-CPStandardKeyBindings[@"~" + CPDownArrowFunctionKey] = [@"moveForward:", @"moveToEndOfParagraph:"];
-CPStandardKeyBindings[@"^" + CPDownArrowFunctionKey] = @"scrollPageDown:";
-CPStandardKeyBindings[@"@" + CPDownArrowFunctionKey] = @"moveToEndOfDocument:";
-CPStandardKeyBindings[@"$" + CPDownArrowFunctionKey] = @"moveDownAndModifySelection:";
-CPStandardKeyBindings[@"$~" + CPDownArrowFunctionKey] = @"moveParagraphForwardAndModifySelection:";
-CPStandardKeyBindings[@"$@" + CPDownArrowFunctionKey] = @"moveToEndOfDocumentAndModifySelection:";
-CPStandardKeyBindings[@"@^" + CPDownArrowFunctionKey] = @"makeBaseWritingDirectionNatural:";
-CPStandardKeyBindings[@"@^~" + CPDownArrowFunctionKey] = @"makeTextWritingDirectionNatural:";
-
-CPStandardKeyBindings[CPHomeFunctionKey] = @"scrollToBeginningOfDocument:";
-CPStandardKeyBindings[@"$" + CPHomeFunctionKey] = @"moveToBeginningOfDocumentAndModifySelection:";
-CPStandardKeyBindings[CPEndFunctionKey] = @"scrollToEndOfDocument:";
-CPStandardKeyBindings[@"$" + CPEndFunctionKey] = @"moveToEndOfDocumentAndModifySelection:";
-
-CPStandardKeyBindings[CPPageUpFunctionKey] = @"scrollPageUp:";
-CPStandardKeyBindings[@"~" + CPPageUpFunctionKey] = @"pageUp:";
-CPStandardKeyBindings[@"$" + CPPageUpFunctionKey] = @"pageUpAndModifySelection:";
-CPStandardKeyBindings[CPPageDownFunctionKey] = @"scrollPageDown:";
-CPStandardKeyBindings[@"~" + CPPageDownFunctionKey] = @"pageDown:";
-CPStandardKeyBindings[@"$" + CPPageDownFunctionKey] = @"pageDownAndModifySelection:";
-
-var CPKeyBindingCache = {};
-
-@implementation CPKeyBinding : CPObject
-{
-    CPString    _key;
-    unsigned    _modifierFlags;
-
-    CPArray     _selectors;
-
-    CPString    _cacheName;
-}
-
-+ (void)initialize
-{
-    if (self !== [CPKeyBinding class])
-        return;
-
-    [self createKeyBindingsFromJSObject:CPStandardKeyBindings];
-}
-
-+ (void)createKeyBindingsFromJSObject:(JSObject)anObject
-{
-    var binding;
-    for (binding in anObject)
-        [self cacheKeyBinding:[[CPKeyBinding alloc] initWithPhysicalKeyString:binding selectors:anObject[binding]]];
-}
-
-+ (void)cacheKeyBinding:(CPKeyBinding)aBinding
-{
-    if (!aBinding)
-        return;
-
-    CPKeyBindingCache[[aBinding _cacheName]] = aBinding;
-}
-
-+ (CPKeyBinding)keyBindingForKey:(CPString)aKey modifierFlags:(unsigned)aFlag
-{
-    var tempBinding = [[self alloc] initWithKey:aKey modifierFlags:aFlag selectors:nil];
-    return CPKeyBindingCache[[tempBinding _cacheName]];
-}
-
-+ (CPArray)selectorsForKey:(CPString)aKey modifierFlags:(unsigned)aFlag
-{
-    return [[self keyBindingForKey:aKey modifierFlags:aFlag] selectors];
-}
-
-- (id)initWithPhysicalKeyString:(CPString)binding selectors:(CPArray)selectors
-{
-    var components = binding.split(@""),
-        modifierFlags = ([components containsObject:@"$"] ? CPShiftKeyMask : 0) |
-                        ([components containsObject:@"^"] ? CPControlKeyMask : 0) |
-                        ([components containsObject:@"~"] ? CPAlternateKeyMask : 0) |
-                        ([components containsObject:@"@"] ? CPCommandKeyMask : 0);
-
-    if (![selectors isKindOfClass:CPArray])
-        selectors = [selectors];
-
-    return [self initWithKey:[components lastObject] modifierFlags:modifierFlags selectors:selectors];
-}
-
-- (id)initWithKey:(CPString)aKey modifierFlags:(unsigned)aFlag selectors:(CPArray)selectors
-{
-    self = [super init];
-
-    if (self)
-    {
-        _key = aKey;
-        _modifierFlags = aFlag;
-
-        _selectors = selectors;
-
-        // We normalize our key binding string in order to properly cache it.
-        // We want to ensure the modifiers are always in the same order.
-        var cacheName = [];
-
-        if (_modifierFlags & CPCommandKeyMask)
-            cacheName.push(@"@");
-        if (_modifierFlags & CPControlKeyMask)
-            cacheName.push(@"^");
-        if (_modifierFlags & CPAlternateKeyMask)
-            cacheName.push(@"~");
-        if (_modifierFlags & CPShiftKeyMask)
-            cacheName.push(@"$");
-
-        cacheName.push(_key);
-
-        _cacheName = cacheName.join(@"");
-    }
-
-    return self;
-}
-
-- (CPString)key
-{
-    return _key;
-}
-
-- (unsigned)modifierFlags
-{
-    return _modifierFlags;
-}
-
-- (CPArray)selectors
-{
-    return _selectors;
-}
-
-- (CPString)_cacheName
-{
-    return _cacheName;
-}
-
-- (BOOL)isEqual:(CPKeyBinding)rhs
-{
-    return _key === [rhs key] && _modifierFlags === [rhs modifierFlags];
-}
-
-- (CPString)description
-{
-    return [CPString stringWithFormat:@"<KeyBinding string: '%@' modifierFlags: 0x%lx selectors: %@>", _key, _modifierFlags, _selectors];
-}
-
-@end

AppKit/CPKeyValueBinding.j

@@ -1,963 +0,0 @@
-/*
- * CPKeyValueBinding.j
- * AppKit
- *
- * Created by Ross Boucher 1/13/09
- * Copyright 280 North, Inc.
- *
- * Adapted from GNUStep
- * Released under the LGPL.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPArray.j>
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPInvocation.j>
-@import <Foundation/CPValueTransformer.j>
-@import <Foundation/CPKeyValueObserving.j>
-
-@class CPButton
-
-var exposedBindingsMap = @{},
-    bindingsMap = @{};
-
-@typedef CPBindingOperationKind
-var CPBindingOperationAnd = 0,
-    CPBindingOperationOr  = 1;
-
-@implementation CPBinder : CPObject
-{
-    CPDictionary    _info;
-    id              _source @accessors(getter=source);
-
-    JSObject        _suppressedNotifications;
-    JSObject        _placeholderForMarker;
-}
-
-+ (void)exposeBinding:(CPString)aBinding forClass:(Class)aClass
-{
-    var bindings = [exposedBindingsMap objectForKey:[aClass UID]];
-
-    if (!bindings)
-    {
-        bindings = [];
-        [exposedBindingsMap setObject:bindings forKey:[aClass UID]];
-    }
-
-    bindings.push(aBinding);
-}
-
-+ (CPArray)exposedBindingsForClass:(Class)aClass
-{
-    return [[exposedBindingsMap objectForKey:[aClass UID]] copy];
-}
-
-+ (CPBinder)getBinding:(CPString)aBinding forObject:(id)anObject
-{
-    return [[bindingsMap objectForKey:[anObject UID]] objectForKey:aBinding];
-}
-
-+ (void)_reverseSetValueFromExclusiveBinderForObject:(id)anObject
-{
-    var bindersByBindingName = [bindingsMap objectForKey:[anObject UID]];
-
-    [bindersByBindingName enumerateKeysAndObjectsUsingBlock:function(binding, binder, stop)
-    {
-        if ([binder isKindOfClass:[self class]])
-        {
-            [binder reverseSetValueFor:binding];
-            stop(YES);
-        }
-    }];
-}
-
-+ (CPDictionary)infoForBinding:(CPString)aBinding forObject:(id)anObject
-{
-    var theBinding = [self getBinding:aBinding forObject:anObject];
-
-    if (theBinding)
-        return theBinding._info;
-
-    return nil;
-}
-
-+ (CPDictionary)allBindingsForObject:(id)anObject
-{
-    return [bindingsMap objectForKey:[anObject UID]];
-}
-
-+ (void)unbind:(CPString)aBinding forObject:(id)anObject
-{
-    var bindings = [bindingsMap objectForKey:[anObject UID]];
-
-    if (!bindings)
-        return;
-
-    var theBinding = [bindings objectForKey:aBinding];
-
-    if (!theBinding)
-        return;
-
-    var info = theBinding._info,
-        observedObject = [info objectForKey:CPObservedObjectKey],
-        keyPath = [info objectForKey:CPObservedKeyPathKey];
-
-    [observedObject removeObserver:theBinding forKeyPath:keyPath];
-    [bindings removeObjectForKey:aBinding];
-}
-
-+ (void)unbindAllForObject:(id)anObject
-{
-    var bindings = [bindingsMap objectForKey:[anObject UID]];
-
-    if (!bindings)
-        return;
-
-    var allKeys = [bindings allKeys],
-        count = allKeys.length;
-
-    while (count--)
-        [anObject unbind:allKeys[count]];
-
-    [bindingsMap removeObjectForKey:[anObject UID]];
-}
-
-- (id)initWithBinding:(CPString)aBinding name:(CPString)aName to:(id)aDestination keyPath:(CPString)aKeyPath options:(CPDictionary)options from:(id)aSource
-{
-    // We use [self init] here because subclasses override init. We can't override this method
-    // because their initialization has to occur before this method in this class is executed.
-    self = [self init];
-
-    if (self)
-    {
-        _source = aSource;
-        _info = @{
-                CPObservedObjectKey: aDestination,
-                CPObservedKeyPathKey: aKeyPath,
-            };
-        _suppressedNotifications = {};
-        _placeholderForMarker = {};
-
-        if (options)
-            [_info setObject:options forKey:CPOptionsKey];
-
-        [self _updatePlaceholdersWithOptions:options forBinding:aName];
-
-        [aDestination addObserver:self forKeyPath:aKeyPath options:0 context:aBinding];
-
-        var bindings = [bindingsMap objectForKey:[_source UID]];
-
-        if (!bindings)
-        {
-            bindings = @{};
-            [bindingsMap setObject:bindings forKey:[_source UID]];
-        }
-
-        [bindings setObject:self forKey:aName];
-        [self setValueFor:aBinding];
-    }
-
-    return self;
-}
-
-+ (BOOL)isBindingAllowed:(CPString)aBinding forObject:(id)anObject
-{
-    if ([[anObject class] isBindingExclusive:aBinding])
-    {
-        var bindingsForObject = [bindingsMap objectForKey:[anObject UID]],
-            allBindings = [bindingsForObject allKeys],
-            count = [allBindings count];
-
-        while (count--)
-        {
-            if ([[anObject class] isBindingExclusive:allBindings[count]])
-                return NO;
-        }
-    }
-
-    return YES;
-}
-
-- (void)raiseIfNotApplicable:(id)aValue forKeyPath:(CPString)keyPath options:(CPDictionary)options
-{
-    if (aValue === CPNotApplicableMarker && [options objectForKey:CPRaisesForNotApplicableKeysBindingOption])
-    {
-       [CPException raise:CPGenericException
-                   reason:@"Cannot transform non-applicable key on: " + _source + " key path: " + keyPath + " value: " + aValue];
-    }
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [destination valueForKeyPath:keyPath];
-
-    // give nil values the chance to be transformed to true via CPNegateBoolean (issue #1986)
-    if ((newValue == nil || CPIsControllerMarker(newValue)) && [options objectForKey:CPValueTransformerNameBindingOption] === CPNegateBooleanTransformerName)
-        [self setValue:[self transformValue:NO withOptions:options] forBinding:theBinding];
-
-    else if (CPIsControllerMarker(newValue))
-    {
-        [self raiseIfNotApplicable:newValue forKeyPath:keyPath options:options];
-
-        var value = [self _placeholderForMarker:newValue];
-        [self setPlaceholderValue:value withMarker:newValue forBinding:theBinding];
-    }
-    else
-    {
-        var value = [self transformValue:newValue withOptions:options];
-        [self setValue:value forBinding:theBinding];
-    }
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [_source setValue:aValue forKey:aBinding];
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source setValue:aValue forKey:aBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)aBinding
-{
-    var destination = [_info objectForKey:CPObservedObjectKey],
-        keyPath = [_info objectForKey:CPObservedKeyPathKey],
-        options = [_info objectForKey:CPOptionsKey],
-        newValue = [self valueForBinding:aBinding];
-
-    newValue = [self reverseTransformValue:newValue withOptions:options];
-
-    [self suppressSpecificNotificationFromObject:destination keyPath:keyPath];
-    [destination setValue:newValue forKeyPath:keyPath];
-    [self unsuppressSpecificNotificationFromObject:destination keyPath:keyPath];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source valueForKeyPath:aBinding];
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    if (!changes)
-        return;
-
-    var objectSuppressions = _suppressedNotifications[[anObject UID]];
-
-    if (objectSuppressions && objectSuppressions[aKeyPath])
-        return;
-
-    [self setValueFor:context];
-}
-
-- (id)transformValue:(id)aValue withOptions:(CPDictionary)options
-{
-    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
-        valueTransformer;
-
-    if (valueTransformerName)
-    {
-        valueTransformer = [CPValueTransformer valueTransformerForName:valueTransformerName];
-
-        if (!valueTransformer)
-        {
-            var valueTransformerClass = CPClassFromString(valueTransformerName);
-
-            if (valueTransformerClass)
-            {
-                valueTransformer = [[valueTransformerClass alloc] init];
-                [valueTransformerClass setValueTransformer:valueTransformer forName:valueTransformerName];
-            }
-        }
-    }
-    else
-        valueTransformer = [options objectForKey:CPValueTransformerBindingOption];
-
-    if (valueTransformer)
-        aValue = [valueTransformer transformedValue:aValue];
-
-    // If the value is nil AND the source doesn't respond to setPlaceholderString: then
-    // we set the value to the placeholder. Otherwise, we do not want to short cut the process
-    // of setting the placeholder that is based on the fact that the value is nil.
-    if ((aValue == nil || aValue === [CPNull null])
-        && ![_source respondsToSelector:@selector(setPlaceholderString:)])
-        aValue = [options objectForKey:CPNullPlaceholderBindingOption] || nil;
-
-    return aValue;
-}
-
-- (id)reverseTransformValue:(id)aValue withOptions:(CPDictionary)options
-{
-    var valueTransformerName = [options objectForKey:CPValueTransformerNameBindingOption],
-        valueTransformer;
-
-    if (valueTransformerName)
-        valueTransformer = [CPValueTransformer valueTransformerForName:valueTransformerName];
-    else
-        valueTransformer = [options objectForKey:CPValueTransformerBindingOption];
-
-    if (valueTransformer && [[valueTransformer class] allowsReverseTransformation])
-        aValue = [valueTransformer reverseTransformedValue:aValue];
-
-    return aValue;
-}
-
-- (BOOL)continuouslyUpdatesValue
-{
-    var options = [_info objectForKey:CPOptionsKey];
-    return [[options objectForKey:CPContinuouslyUpdatesValueBindingOption] boolValue];
-}
-
-- (BOOL)handlesContentAsCompoundValue
-{
-    var options = [_info objectForKey:CPOptionsKey];
-    return [[options objectForKey:CPHandlesContentAsCompoundValueBindingOption] boolValue];
-}
-
-/*!
-    Use this to avoid reacting to the notifications coming out of a reverseTransformedValue:.
-*/
-- (void)suppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
-{
-    if (!anObject)
-        return;
-
-    var uid = [anObject UID],
-        objectSuppressions = _suppressedNotifications[uid];
-
-    if (!objectSuppressions)
-        _suppressedNotifications[uid] = objectSuppressions = {};
-
-    objectSuppressions[aKeyPath] = YES;
-}
-
-/*!
-    Use this to cancel suppressSpecificNotificationFromObject:keyPath:.
-*/
-- (void)unsuppressSpecificNotificationFromObject:(id)anObject keyPath:(CPString)aKeyPath
-{
-    if (!anObject)
-        return;
-
-    var uid = [anObject UID],
-        objectSuppressions = _suppressedNotifications[uid];
-
-    if (!objectSuppressions)
-        return;
-
-    delete objectSuppressions[aKeyPath];
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options
-{
-    var count = [CPBinderPlaceholderMarkers count];
-
-    while (count--)
-    {
-        var marker = CPBinderPlaceholderMarkers[count],
-            optionName = CPBinderPlaceholderOptions[count],
-            isExplicit = [options containsKey:optionName],
-            placeholder = isExplicit ? [options objectForKey:optionName] : nil;
-
-        [self _setPlaceholder:placeholder forMarker:marker isDefault:!isExplicit];
-    }
-}
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    [self _updatePlaceholdersWithOptions:options];
-}
-
-- (JSObject)_placeholderForMarker:(id)aMarker
-{
-    var placeholder = _placeholderForMarker[[aMarker UID]];
-
-    if (placeholder)
-        return placeholder.value;
-
-    return nil;
-}
-
-- (void)_setPlaceholder:(id)aPlaceholder forMarker:(id)aMarker isDefault:(BOOL)isDefault
-{
-    if (isDefault)
-    {
-        var existingPlaceholder = _placeholderForMarker[[aMarker UID]];
-
-        // Don't overwrite an explicitly set placeholder with a default.
-        if (existingPlaceholder && !existingPlaceholder.isDefault)
-            return;
-    }
-
-    _placeholderForMarker[[aMarker UID]] = { 'isDefault': isDefault, 'value': aPlaceholder };
-}
-
-@end
-
-@implementation CPObject (KeyValueBindingCreation)
-
-+ (void)exposeBinding:(CPString)aBinding
-{
-    [CPBinder exposeBinding:aBinding forClass:[self class]];
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    return [CPBinder class];
-}
-
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return NO;
-}
-
-- (CPArray)exposedBindings
-{
-    var exposedBindings = [],
-        theClass = [self class];
-
-    while (theClass)
-    {
-        var temp = [CPBinder exposedBindingsForClass:theClass];
-
-        if (temp)
-            [exposedBindings addObjectsFromArray:temp];
-
-        theClass = [theClass superclass];
-    }
-
-    return exposedBindings;
-}
-
-- (Class)valueClassForBinding:(CPString)binding
-{
-    return [CPString class];
-}
-
-- (void)bind:(CPString)aBinding toObject:(id)anObject withKeyPath:(CPString)aKeyPath options:(CPDictionary)options
-{
-    if (!anObject || !aKeyPath)
-        return CPLog.error("Invalid object or path on " + self + " for " + aBinding);
-
-    if (![CPBinder isBindingAllowed:aBinding forObject:self])
-    {
-        CPLog.warn([self description] + " : cannot bind " + aBinding + " because another binding with the same functionality is already in use.");
-        return;
-    }
-    //if (![[self exposedBindings] containsObject:aBinding])
-    //    CPLog.warn("No binding exposed on " + self + " for " + aBinding);
-
-    var binderClass = [[self class] _binderClassForBinding:aBinding];
-
-    [self unbind:aBinding];
-    [[binderClass alloc] initWithBinding:[self _replacementKeyPathForBinding:aBinding] name:aBinding to:anObject keyPath:aKeyPath options:options from:self];
-}
-
-- (CPDictionary)infoForBinding:(CPString)aBinding
-{
-    return [CPBinder infoForBinding:aBinding forObject:self];
-}
-
-- (void)unbind:(CPString)aBinding
-{
-    var binderClass = [[self class] _binderClassForBinding:aBinding];
-    [binderClass unbind:aBinding forObject:self];
-}
-
-- (CPString)_replacementKeyPathForBinding:(CPString)binding
-{
-    return binding;
-}
-
-@end
-
-/*!
-    @ignore
-    Provides stub implementations that simply calls super for the "objectValue" binding.
-    This class should not be necessary but assures backwards compliance with our old way of doing bindings.
-
-    IMPORTANT!
-    Every class with a value binding should implement a subclass to handle its specific value binding logic.
-*/
-@implementation _CPValueBinder : CPBinder
-
-- (void)setValueFor:(CPString)theBinding
-{
-    [super setValueFor:@"objectValue"];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    [super reverseSetValueFor:@"objectValue"];
-}
-
-@end
-
-@implementation _CPMultipleValueBooleanBinding : CPBinder
-{
-    CPBindingOperationKind _operation;
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    var baseBinding = aBinding.replace(/\d$/, "");
-
-    [_source setValue:[self resolveMultipleValuesForBinding:baseBinding bindings:bindings booleanOperation:_operation] forKey:baseBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // read-only
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-- (BOOL)resolveMultipleValuesForBinding:(CPString)aBinding bindings:(CPDictionary)bindings booleanOperation:(CPBindingOperationKind)operation
-{
-    var bindingName = aBinding,
-        theBinding,
-        count = 2;
-
-    while (theBinding = [bindings objectForKey:bindingName])
-    {
-        var info    = theBinding._info,
-            object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            options = [info objectForKey:CPOptionsKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (CPIsControllerMarker(value))
-        {
-            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
-            value = [theBinding _placeholderForMarker:value];
-        }
-        else
-            value = [theBinding transformValue:value withOptions:options];
-
-        if (operation === CPBindingOperationOr)
-        {
-            // Any true condition means true for OR
-            if (value)
-                return YES;
-        }
-
-        // Any false condition means false for AND
-        else if (!value)
-            return NO;
-
-        bindingName = aBinding + (count++);
-    }
-
-    // If we get here, all OR conditions were false or all AND conditions were true
-    return operation === CPBindingOperationOr ? NO : YES;
-}
-
-@end
-
-@implementation CPMultipleValueAndBinding : _CPMultipleValueBooleanBinding
-
-- (id)init
-{
-    if (self = [super init])
-        _operation = CPBindingOperationAnd;
-
-    return self;
-}
-
-@end
-
-@implementation CPMultipleValueOrBinding : _CPMultipleValueBooleanBinding
-
-- (id)init
-{
-    if (self = [super init])
-        _operation = CPBindingOperationOr;
-
-    return self;
-}
-
-@end
-
-@implementation _CPMultipleValueActionBinding : CPBinder
-{
-    CPString _argumentBinding;
-    CPString _targetBinding;
-}
-
-- (void)setValueFor:(CPString)theBinding
-{
-    // Called when the binding is first created
-    [self checkForNullBinding:theBinding initializing:YES];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // no-op
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    // context is the binding name
-    [self checkForNullBinding:context initializing:NO];
-}
-
-/*!
-    @ignore
-
-    When the value of a multiple-value argument binding changes,
-    if the binding is marked not to allow null arguments, we have to check
-    if the binding's value is nil and disable the button if it is.
-    Otherwise the button is enabled.
-*/
-- (void)checkForNullBinding:(CPString)theBinding initializing:(BOOL)isInitializing
-{
-    // Only done for buttons
-    if (![_source isKindOfClass:CPButton])
-        return;
-
-    // We start with the button enabled for the first argument during init,
-    // and subsequent checks can disable it.
-    if (isInitializing && theBinding === CPArgumentBinding)
-        [_source setEnabled:YES];
-
-    var bindings = [bindingsMap valueForKey:[_source UID]],
-        binding  = [bindings objectForKey:theBinding],
-        info     = binding._info,
-        options  = [info objectForKey:CPOptionsKey];
-
-    if (![options valueForKey:CPAllowsNullArgumentBindingOption])
-    {
-        var object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (value == nil)
-        {
-            [_source setEnabled:NO];
-            return;
-        }
-    }
-
-    // If a binding value changed and did not fail the null test, enable the button
-    if (!isInitializing)
-        [_source setEnabled:YES];
-}
-
-- (void)invokeAction
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]],
-        theBinding = [bindings objectForKey:CPTargetBinding],
-
-        info     = theBinding._info,
-        object   = [info objectForKey:CPObservedObjectKey],
-        keyPath  = [info objectForKey:CPObservedKeyPathKey],
-        options  = [info objectForKey:CPOptionsKey],
-
-        target   = [object valueForKeyPath:keyPath],
-        selector = [options objectForKey:CPSelectorNameBindingOption];
-
-    if (!target || !selector)
-        return;
-
-    var invocation = [CPInvocation invocationWithMethodSignature:[target methodSignatureForSelector:selector]],
-        bindingName = CPArgumentBinding,
-        count = 1;
-
-    while (theBinding = [bindings objectForKey:bindingName])
-    {
-        info   = theBinding._info;
-        object = [info objectForKey:CPObservedObjectKey];
-        keyPath  = [info objectForKey:CPObservedKeyPathKey];
-
-        [invocation setArgument:[object valueForKeyPath:keyPath] atIndex:++count];
-
-        bindingName = CPArgumentBinding + count;
-    }
-
-    [invocation setSelector:selector];
-    [invocation invokeWithTarget:target];
-}
-
-@end
-
-@implementation CPActionBinding : _CPMultipleValueActionBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _argumentBinding = CPArgumentBinding;
-        _targetBinding = CPTargetBinding;
-    }
-
-    return self;
-}
-
-@end
-
-@implementation CPDoubleClickActionBinding : _CPMultipleValueActionBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _argumentBinding = CPArgumentBinding;
-        _targetBinding = CPTargetBinding;
-    }
-
-    return self;
-}
-
-@end
-
-/*!
-    Abstract superclass for CPValueWithPatternBinding and CPTitleWithPatternBinding.
-*/
-@implementation _CPPatternBinding : CPBinder
-{
-    CPString _bindingKey;
-    CPString _patternPlaceholder;
-}
-
-- (void)setValueFor:(CPString)aBinding
-{
-    var bindings = [bindingsMap valueForKey:[_source UID]];
-
-    if (!bindings)
-        return;
-
-    // Strip off any trailing number from the binding name
-    var baseBinding = aBinding.replace(/\d$/, ""),
-        result = [self resolveMultipleValuesForBindings:bindings];
-
-    if (result.isPlaceholder)
-        [self setPlaceholderValue:result.value withMarker:result.marker forBinding:baseBinding];
-    else
-        [self setValue:result.value forBinding:baseBinding];
-}
-
-- (void)reverseSetValueFor:(CPString)theBinding
-{
-    // read-only
-}
-
-- (void)observeValueForKeyPath:(CPString)aKeyPath ofObject:(id)anObject change:(CPDictionary)changes context:(id)context
-{
-    [self setValueFor:context];
-}
-
-- (JSObject)resolveMultipleValuesForBindings:(CPDictionary)bindings
-{
-    var theBinding,
-        result = { value:@"", isPlaceholder:NO, marker:nil };
-
-    for (var count = 1; theBinding = [bindings objectForKey:_bindingKey + count]; ++count)
-    {
-        var info    = theBinding._info,
-            object  = [info objectForKey:CPObservedObjectKey],
-            keyPath = [info objectForKey:CPObservedKeyPathKey],
-            options = [info objectForKey:CPOptionsKey],
-            value   = [object valueForKeyPath:keyPath];
-
-        if (count === 1)
-            result.value = [options objectForKey:CPDisplayPatternBindingOption];
-
-        if (CPIsControllerMarker(value))
-        {
-            [self raiseIfNotApplicable:value forKeyPath:keyPath options:options];
-
-            result.isPlaceholder = YES;
-            result.marker = value;
-
-            value = [theBinding _placeholderForMarker:value];
-        }
-        else
-            value = [theBinding transformValue:value withOptions:options];
-
-        if (value == nil)
-            value = @"";
-
-        result.value = result.value.replace("%{" + _patternPlaceholder + count + "}@", [value description]);
-    }
-
-    return result;
-}
-
-@end
-
-
-/*!
-    Users of this class must override setValue:forKey: and if the
-    key is CPDisplayPatternValueBinding, set the appropriate value
-    for the control class. For example, CPTextField uses setObjectValue.
-*/
-@implementation CPValueWithPatternBinding : _CPPatternBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _bindingKey = CPDisplayPatternValueBinding;
-        _patternPlaceholder = @"value";
-    }
-
-    return self;
-}
-
-@end
-
-
-/*!
-    Users of this class must override setValue:forKey: and if the
-    key is CPDisplayPatternTitleBinding, set the appropriate value
-    for the control class. For example, CPBox uses setTitle.
-*/
-@implementation CPTitleWithPatternBinding : _CPPatternBinding
-
-- (id)init
-{
-    if (self = [super init])
-    {
-        _bindingKey = CPDisplayPatternTitleBinding;
-        _patternPlaceholder = @"title";
-    }
-
-    return self;
-}
-
-@end
-
-@implementation _CPStateMarker : CPObject
-{
-    CPString _name;
-}
-
-- (id)initWithName:(CPString)aName
-{
-    if (self = [super init])
-        _name = aName;
-
-    return self;
-}
-
-- (CPString)description
-{
-    return "<" + _name + ">";
-}
-
-@end
-
-
-// Keys in options dictionary
-
-// Keys in dictionary returned by infoForBinding
-CPObservedObjectKey     = @"CPObservedObjectKey";
-CPObservedKeyPathKey    = @"CPObservedKeyPathKey";
-CPOptionsKey            = @"CPOptionsKey";
-
-// special markers
-CPNoSelectionMarker     = [[_CPStateMarker alloc] initWithName:@"NO SELECTION MARKER"];
-CPMultipleValuesMarker  = [[_CPStateMarker alloc] initWithName:@"MULTIPLE VALUES MARKER"];
-CPNotApplicableMarker   = [[_CPStateMarker alloc] initWithName:@"NOT APPLICABLE MARKER"];
-CPNullMarker            = [[_CPStateMarker alloc] initWithName:@"NULL MARKER"];
-
-// Binding name constants
-CPAlignmentBinding                        = @"alignment";
-CPArgumentBinding                         = @"argument";
-CPContentArrayBinding                     = @"contentArray";
-CPContentBinding                          = @"content";
-CPContentObjectBinding                    = @"contentObject";
-CPContentObjectsBinding                   = @"contentObjects";
-CPContentValuesBinding                    = @"contentValues";
-CPDisplayPatternTitleBinding              = @"displayPatternTitle";
-CPDisplayPatternValueBinding              = @"displayPatternValue";
-CPDoubleClickArgumentBinding              = @"doubleClickArgument";
-CPDoubleClickTargetBinding                = @"doubleClickTarget";
-CPEditableBinding                         = @"editable";
-CPEnabledBinding                          = @"enabled";
-CPFontBinding                             = @"font";
-CPFontNameBinding                         = @"fontName";
-CPFontBoldBinding                         = @"fontBold";
-CPHiddenBinding                           = @"hidden";
-CPFilterPredicateBinding                  = @"filterPredicate";
-CPMaxValueBinding                         = @"maxValue";
-CPMinValueBinding                         = @"minValue";
-CPPredicateBinding                        = @"predicate";
-CPSelectedIndexBinding                    = @"selectedIndex";
-CPSelectedLabelBinding                    = @"selectedLabel";
-CPSelectedObjectBinding                   = @"selectedObject";
-CPSelectedObjectsBinding                  = @"selectedObjects";
-CPSelectedTagBinding                      = @"selectedTag";
-CPSelectedValueBinding                    = @"selectedValue";
-CPSelectedValuesBinding                   = @"selectedValues";
-CPSelectionIndexesBinding                 = @"selectionIndexes";
-CPTargetBinding                           = @"target";
-CPTextColorBinding                        = @"textColor";
-CPTitleBinding                            = @"title";
-CPToolTipBinding                          = @"toolTip";
-CPValueBinding                            = @"value";
-CPAttributedStringBinding                 = @"attributedString";
-CPValueURLBinding                         = @"valueURL";
-CPValuePathBinding                        = @"valuePath";
-CPDataBinding                             = @"data";
-
-// Binding options constants
-CPAllowsEditingMultipleValuesSelectionBindingOption = @"CPAllowsEditingMultipleValuesSelection";
-CPAllowsNullArgumentBindingOption                   = @"CPAllowsNullArgument";
-CPConditionallySetsEditableBindingOption            = @"CPConditionallySetsEditable";
-CPConditionallySetsEnabledBindingOption             = @"CPConditionallySetsEnabled";
-CPConditionallySetsHiddenBindingOption              = @"CPConditionallySetsHidden";
-CPContinuouslyUpdatesValueBindingOption             = @"CPContinuouslyUpdatesValue";
-CPCreatesSortDescriptorBindingOption                = @"CPCreatesSortDescriptor";
-CPDeletesObjectsOnRemoveBindingsOption              = @"CPDeletesObjectsOnRemove";
-CPDisplayNameBindingOption                          = @"CPDisplayName";
-CPDisplayPatternBindingOption                       = @"CPDisplayPattern";
-CPHandlesContentAsCompoundValueBindingOption        = @"CPHandlesContentAsCompoundValue";
-CPInsertsNullPlaceholderBindingOption               = @"CPInsertsNullPlaceholder";
-CPInvokesSeparatelyWithArrayObjectsBindingOption    = @"CPInvokesSeparatelyWithArrayObjects";
-CPMultipleValuesPlaceholderBindingOption            = @"CPMultipleValuesPlaceholder";
-CPNoSelectionPlaceholderBindingOption               = @"CPNoSelectionPlaceholder";
-CPNotApplicablePlaceholderBindingOption             = @"CPNotApplicablePlaceholder";
-CPNullPlaceholderBindingOption                      = @"CPNullPlaceholder";
-CPPredicateFormatBindingOption                      = @"CPPredicateFormat";
-CPRaisesForNotApplicableKeysBindingOption           = @"CPRaisesForNotApplicableKeys";
-CPSelectorNameBindingOption                         = @"CPSelectorName";
-CPSelectsAllWhenSettingContentBindingOption         = @"CPSelectsAllWhenSettingContent";
-CPValidatesImmediatelyBindingOption                 = @"CPValidatesImmediately";
-CPValueTransformerNameBindingOption                 = @"CPValueTransformerName";
-CPValueTransformerBindingOption                     = @"CPValueTransformer";
-
-CPIsControllerMarker = function(/*id*/anObject)
-{
-    return anObject === CPMultipleValuesMarker || anObject === CPNoSelectionMarker || anObject === CPNotApplicableMarker || anObject === CPNullMarker;
-};
-
-var CPBinderPlaceholderMarkers = [CPMultipleValuesMarker, CPNoSelectionMarker, CPNotApplicableMarker, CPNullMarker],
-    CPBinderPlaceholderOptions = [CPMultipleValuesPlaceholderBindingOption, CPNoSelectionPlaceholderBindingOption, CPNotApplicablePlaceholderBindingOption, CPNullPlaceholderBindingOption];
-

AppKit/CPLevelIndicator.j

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

AppKit/CPMenu/_CPMenuBarWindow.j

@@ -1,510 +0,0 @@
-/*
- * _CPMenuBarWindow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPPanel.j"
-@import "_CPMenuManager.j"
-
-@class _CPMenuView
-@class CPMenu
-@class CPMenuItem
-
-@global CPMenuDidAddItemNotification
-@global CPMenuDidChangeItemNotification
-@global CPMenuDidRemoveItemNotification
-
-@global document
-
-@implementation _CPMenuBarWindow : CPPanel
-{
-    CPView      _highlightView;
-    CPArray     _menuItemViews;
-
-    CPMenuItem  _trackingMenuItem;
-
-    CPImageView _iconImageView;
-    CPTextField _titleField;
-
-    CPColor     _textColor;
-    CPColor     _titleColor;
-
-    CPColor     _textShadowColor;
-    CPColor     _titleShadowColor;
-
-    CPColor     _highlightColor;
-    CPColor     _highlightTextColor;
-    CPColor     _highlightTextShadowColor;
-}
-
-+ (CPFont)font
-{
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-font" forClass:_CPMenuView];
-}
-
-- (id)init
-{
-    // This only shows up in browser land, so don't bother calculating metrics in desktop.
-    var contentRect = [[CPPlatformWindow primaryPlatformWindow] contentBounds];
-
-    contentRect.size.height = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView];
-
-    self = [super initWithContentRect:contentRect styleMask:CPBorderlessWindowMask];
-
-    if (self)
-    {
-        _constrainsToUsableScreen = NO;
-
-        [self setLevel:CPMainMenuWindowLevel];
-        [self setAutoresizingMask:CPWindowWidthSizable];
-
-        var contentView = [self contentView];
-
-        [contentView setAutoresizesSubviews:NO];
-
-        [self setBecomesKeyOnlyIfNeeded:YES];
-
-        //
-        _iconImageView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 16.0, 16.0)];
-
-        [contentView addSubview:_iconImageView];
-
-        _titleField = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
-
-        [_titleField setFont:[CPFont boldSystemFontOfSize:[CPFont systemFontSize] + 1]];
-        [_titleField setAlignment:CPCenterTextAlignment];
-        [_titleField setTextShadowOffset:CGSizeMake(0, 1)];
-
-        [contentView addSubview:_titleField];
-    }
-
-    return self;
-}
-
-- (void)setTitle:(CPString)aTitle
-{
-#if PLATFORM(DOM)
-    var bundleName = [[CPBundle mainBundle] objectForInfoDictionaryKey:@"CPBundleName"];
-
-    if (![bundleName length])
-        document.title = aTitle;
-    else if ([aTitle length])
-        document.title = aTitle + @" - " + bundleName;
-    else
-        document.title = bundleName;
-#endif
-
-    [_titleField setStringValue:aTitle];
-    [_titleField sizeToFit];
-
-    [self tile];
-}
-
-- (void)setIconImage:(CPImage)anImage
-{
-    [_iconImageView setImage:anImage];
-    [_iconImageView setHidden:anImage == nil];
-
-    [self tile];
-}
-
-- (void)setIconImageAlphaValue:(float)anAlphaValue
-{
-    [_iconImageView setAlphaValue:anAlphaValue];
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    var targetView = [[CPTheme defaultTheme] valueForAttributeWithName:@"css-based" forClass:CPView] ? [[self contentView] superview] : [self contentView];
-
-    if (!aColor)
-        [targetView setBackgroundColor:[[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-color" forClass:_CPMenuView]];
-    else
-        [targetView setBackgroundColor:aColor];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    if (_textColor == aColor)
-        return;
-
-    _textColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setTextColor:) withObject:_textColor];
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuTextColor:) withObject:_textColor];
-}
-
-- (void)setTitleColor:(CPColor)aColor
-{
-    if (_titleColor == aColor)
-        return;
-
-    _titleColor = aColor;
-
-    [_titleField setTextColor:aColor ? aColor : [CPColor blackColor]];
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    if (_textShadowColor == aColor)
-        return;
-
-    _textShadowColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setTextShadowColor:) withObject:_textShadowColor];
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuTextShadowColor:) withObject:_textShadowColor];
-}
-
-- (void)setTitleShadowColor:(CPColor)aColor
-{
-    if (_titleShadowColor == aColor)
-        return;
-
-    _titleShadowColor = aColor;
-
-    [_titleField setTextShadowColor:aColor ? aColor : [CPColor whiteColor]];
-}
-
-- (void)setHighlightColor:(CPColor)aColor
-{
-    if (_highlightColor == aColor)
-        return;
-
-    _highlightColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightColor:) withObject:_highlightColor];
-}
-
-- (void)setHighlightTextColor:(CPColor)aColor
-{
-    if (_highlightTextColor == aColor)
-        return;
-
-    _highlightTextColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightTextColor:) withObject:_highlightTextColor];
-}
-
-- (void)setHighlightTextShadowColor:(CPColor)aColor
-{
-    if (_highlightTextShadowColor == aColor)
-        return;
-
-    _highlightTextShadowColor = aColor;
-
-    [_menuItemViews makeObjectsPerformSelector:@selector(setParentMenuHighlightTextShadowColor:) withObject:_highlightTextShadowColor];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    if (_menu == aMenu)
-        return;
-
-    var defaultCenter = [CPNotificationCenter defaultCenter];
-
-    if (_menu)
-    {
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidAddItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidChangeItemNotification
-                    object:_menu];
-
-        [defaultCenter
-            removeObserver:self
-                      name:CPMenuDidRemoveItemNotification
-                    object:_menu];
-
-        var items = [_menu itemArray],
-            count = items.length;
-
-        while (count--)
-            [[items[count] _menuItemView] removeFromSuperview];
-    }
-
-    _menu = aMenu;
-
-    if (_menu)
-    {
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidAddItem:)
-                  name:CPMenuDidAddItemNotification
-                object:_menu];
-
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidChangeItem:)
-                  name:CPMenuDidChangeItemNotification
-                object:_menu];
-
-        [defaultCenter
-            addObserver:self
-              selector:@selector(menuDidRemoveItem:)
-                  name:CPMenuDidRemoveItemNotification
-                object:_menu];
-    }
-
-    _menuItemViews = [];
-
-    var contentView = [self contentView],
-        items = [_menu itemArray],
-        count = items.length;
-
-    for (var index = 0; index < count; ++index)
-    {
-        var item = items[index],
-            menuItemView = [item _menuItemView];
-
-        _menuItemViews.push(menuItemView);
-
-        [menuItemView setTextColor:_textColor];
-        [menuItemView setHidden:[item isHidden]];
-
-        // If first menu item has tag -1 and if there is a special theme value menu-bar-window-first-item-font,
-        // set the corresponding font. This is used to set bold on the first item of the menubar (à la Cocoa)
-        if ((index == 0) && ([item tag] == -1))
-        {
-            var firstItemFont = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-first-item-font" forClass:_CPMenuView];
-
-            if (firstItemFont)
-                [item setFont:firstItemFont];
-        }
-
-        [menuItemView synchronizeWithMenuItem];
-
-        [contentView addSubview:menuItemView];
-    }
-
-    [self tile];
-}
-
-- (void)menuDidChangeItem:(CPNotification)aNotification
-{
-    var menuItem = [_menu itemAtIndex:[[aNotification userInfo] objectForKey:@"CPMenuItemIndex"]],
-        menuItemView = [menuItem _menuItemView];
-
-    [menuItemView setHidden:[menuItem isHidden]];
-    [menuItemView synchronizeWithMenuItem];
-
-    [self tile];
-}
-
-- (void)menuDidAddItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
-        menuItem = [_menu itemAtIndex:index],
-        menuItemView = [menuItem _menuItemView];
-
-    [_menuItemViews insertObject:menuItemView atIndex:index];
-
-    [menuItemView setTextColor:_textColor];
-    [menuItemView setHidden:[menuItem isHidden]];
-
-    [menuItemView synchronizeWithMenuItem];
-
-    [[self contentView] addSubview:menuItemView];
-
-    [self tile];
-}
-
-- (void)menuDidRemoveItem:(CPNotification)aNotification
-{
-    var index = [[aNotification userInfo] objectForKey:@"CPMenuItemIndex"],
-        menuItemView = [_menuItemViews objectAtIndex:index];
-
-    [_menuItemViews removeObjectAtIndex:index];
-
-    [menuItemView removeFromSuperview];
-
-    [self tile];
-}
-
-- (BOOL)acceptsFirstMouse:(CPEvent)anEvent
-{
-    return YES;
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    var constraintRect = CGRectInset([[self platformWindow] visibleFrame], 5.0, 0.0);
-
-    constraintRect.size.height -= 5.0;
-
-    [[_CPMenuManager sharedMenuManager]
-        beginTracking:anEvent
-        menuContainer:self
-       constraintRect:constraintRect
-             callback:function(aMenuContainer, aMenu)
-             {
-                [aMenu _performActionOfHighlightedItemChain];
-                [aMenu _highlightItemAtIndex:CPNotFound];
-             }];
-}
-
-- (CPFont)font
-{
-    return [CPFont systemFontOfSize:[CPFont systemFontSize]];
-}
-
-- (void)tile
-{
-    var bounds = [[self contentView] bounds],
-        height = CGRectGetHeight(bounds),
-        x = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-left-margin" forClass:_CPMenuView];
-
-    // 1. Layout the Icon (if present)
-    if (_iconImageView && ![_iconImageView isHidden])
-    {
-        var iconFrame = [_iconImageView frame];
-
-        iconFrame.origin.x = x;
-        // Vertically center
-        iconFrame.origin.y = (height - CGRectGetHeight(iconFrame)) / 2.0;
-
-        [_iconImageView setFrame:iconFrame];
-
-        x = CGRectGetMaxX(iconFrame) + 6.0; // Spacing between icon and title
-    }
-
-    // 2. Layout the Title (if present)
-    if (_titleField && [_titleField stringValue] && [[_titleField stringValue] length] > 0)
-    {
-        var titleFrame = [_titleField frame];
-
-        titleFrame.origin.x = x;
-        titleFrame.origin.y = (height - CGRectGetHeight(titleFrame)) / 2.0;
-
-        [_titleField setFrame:titleFrame];
-
-        x = CGRectGetMaxX(titleFrame) + 12.0; // Spacing between title and menu items
-    }
-
-    // 3. Layout the Menu Items
-    var items = [_menu itemArray],
-        index = 0,
-        count = items ? items.length : 0,
-        isLeftAligned = YES;
-
-    for (; index < count; ++index)
-    {
-        var item = items[index];
-
-        if ([item isSeparatorItem])
-        {
-            x = CGRectGetWidth([self frame]) - [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-right-margin" forClass:_CPMenuView];
-            isLeftAligned = NO;
-
-            continue;
-        }
-
-        // Fix for #1742: If a main menu item does not have a submenu, it should not appear in the menu bar.
-        if ([item isHidden] || ![item submenu])
-        {
-            [[item _menuItemView] setHidden:YES];
-            continue;
-        }
-
-        var menuItemView = [item _menuItemView];
-
-        [menuItemView setHidden:NO];
-
-        var frame = [menuItemView frame];
-
-        if (isLeftAligned)
-        {
-            [menuItemView setFrame:CGRectMake(x, 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
-
-            x += CGRectGetWidth([menuItemView frame]);
-        }
-        else
-        {
-            [menuItemView setFrame:CGRectMake(x - CGRectGetWidth(frame), 0.0, CGRectGetWidth(frame), [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-height" forClass:_CPMenuView])];
-
-            x = CGRectGetMinX([menuItemView frame]);
-        }
-    }
-}
-
-- (void)setFrame:(CGRect)aRect display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
-{
-    var size = [self frame].size;
-
-    [super setFrame:aRect display:shouldDisplay animate:shouldAnimate];
-
-    if (!CGSizeEqualToSize(size, aRect.size))
-        [self tile];
-}
-
-@end
-
-@implementation _CPMenuBarWindow (CPMenuContainer)
-
-- (BOOL)isMenuBar
-{
-    return YES;
-}
-
-- (CGRect)globalFrame
-{
-    return [self frame];
-}
-
-- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
-{
-    return _CPMenuManagerScrollingStateNone;
-}
-
-- (CPInteger)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var items = [_menu itemArray],
-        index = items.length;
-
-    while (index--)
-    {
-        var item = items[index];
-
-        if ([item isHidden] || [item isSeparatorItem] || ![item submenu])
-            continue;
-
-        if (CGRectContainsPoint([self rectForItemAtIndex:index], aPoint))
-            return index;
-    }
-
-    // If the mouse is within the menu bar bounds but not over an item
-    // (e.g. dragging far left or right), force the menu to unhighlight.
-    if (CGRectContainsPoint([[self contentView] bounds], aPoint))
-        [_menu _highlightItemAtIndex:CPNotFound];
-
-    return CPNotFound;
-}
-
-- (CGRect)rectForItemAtIndex:(CPInteger)anIndex
-{
-    var menuItem = [_menu itemAtIndex:anIndex === CPNotFound ? 0 : anIndex];
-
-    return [[menuItem _menuItemView] frame];
-}
-
-@end

AppKit/CPMenu/_CPMenuManager.j

@@ -1,791 +0,0 @@
-/*
- * _CPMenuManager.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPNotificationCenter.j>
-
-@import "CPEvent.j"
-@import "CPKeyBinding.j"
-
-@class CPWindow
-@class _CPMenuWindow
-@class _CPMenuView
-@class CPMenuItem
-
-
-@global CPApp
-@global CPMenuDidEndTrackingNotification
-@global _CPMenuWindowMenuBarBackgroundStyle
-@global _CPMenuWindowPopUpBackgroundStyle
-
-_CPMenuManagerScrollingStateUp      = -1;
-_CPMenuManagerScrollingStateDown    = 1;
-_CPMenuManagerScrollingStateNone    = 0;
-
-var STICKY_TIME_INTERVAL            = 0.4,
-    SharedMenuManager               = nil;
-
-@implementation _CPMenuManager: CPObject
-{
-    CPTimeInterval      _startTime;
-    CPEvent             _openEvent;
-    BOOL                _mouseWasDragged;
-    int                 _scrollingState;
-    CGPoint             _lastGlobalLocation;
-
-    CPView              _lastMouseOverMenuView;
-
-    CGRect              _constraintRect;
-    CPMutableArray      _menuContainerStack;
-
-    Function            _trackingCallback;
-
-    CPString            _keyBuffer;
-
-    CPMenuItem          _previousActiveItem;
-    int                 _showTimerID;
-
-    int                 _menuBarButtonItemIndex;
-}
-
-+ (_CPMenuManager)sharedMenuManager
-{
-    if (!SharedMenuManager)
-        SharedMenuManager = [[_CPMenuManager alloc] init];
-
-    return SharedMenuManager;
-}
-
-- (id)init
-{
-    if (SharedMenuManager)
-        return SharedMenuManager;
-
-    return [super init];
-}
-
-- (id)trackingMenuContainer
-{
-    return _menuContainerStack[0];
-}
-
-- (CPMenu)trackingMenu
-{
-    return [[self trackingMenuContainer] menu];
-}
-
-- (void)beginTracking:(CPEvent)anEvent
-        menuContainer:(id)aMenuContainer
-       constraintRect:(CGRect)aRect
-             callback:(Function)aCallback
-{
-    var menu = [aMenuContainer menu];
-
-    if ([menu numberOfItems] <= 0)
-        return;
-
-    CPApp._activeMenu = menu;
-
-    _startTime = [anEvent timestamp];
-    _openEvent = anEvent;
-    _scrollingState = _CPMenuManagerScrollingStateNone;
-
-    _constraintRect = aRect;
-    _menuContainerStack = [aMenuContainer];
-    _trackingCallback = aCallback;
-
-    if (menu === [CPApp mainMenu])
-    {
-        var globalLocation = [anEvent globalLocation],
-
-            // Find which menu window the mouse is currently on top of
-            menuLocation = [aMenuContainer convertGlobalToBase:globalLocation],
-
-            // Find out the item the mouse is currently on top of
-            activeItemIndex = [aMenuContainer itemIndexAtPoint:menuLocation],
-            activeItem = activeItemIndex !== CPNotFound ? [menu itemAtIndex:activeItemIndex] : nil;
-
-        _menuBarButtonItemIndex = activeItemIndex;
-//        _menuBarButtonMenuContainer = aMenuContainer;
-
-        if ([activeItem _isMenuBarButton])
-            return [self trackMenuBarButtonEvent:anEvent];
-    }
-
-    _mouseWasDragged = NO;
-
-    [self trackEvent:anEvent];
-}
-
-- (void)_trackAgain
-{
-    [CPApp setTarget:self selector:@selector(trackEvent:) forNextEventMatchingMask:CPKeyDownMask | CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseDownMask | CPLeftMouseUpMask | CPRightMouseUpMask | CPAppKitDefinedMask | CPScrollWheelMask untilDate:nil inMode:nil dequeue:YES];
-}
-
-- (void)trackEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type],
-        trackingMenu = [self trackingMenu];
-
-    // Close Menu Event.
-    if (type === CPAppKitDefined)
-        return [self completeTracking];
-
-    if (type === CPKeyDown)
-    {
-        var menu = trackingMenu,
-            submenu = [[menu  highlightedItem] submenu];
-
-        // get the current active menu
-        while (submenu && [submenu._menuWindow isVisible])
-        {
-            menu = submenu;
-            submenu = [[menu  highlightedItem] submenu];
-        }
-
-        if ([menu numberOfItems])
-            [self interpretKeyEvent:anEvent forMenu:menu];
-
-        [self _trackAgain];
-        return;
-    }
-
-    // Periodic events don't have a valid location.
-    var globalLocation = type === CPPeriodic ? _lastGlobalLocation : [anEvent globalLocation];
-
-    if (!globalLocation)
-    {
-        [self _trackAgain];
-        return;
-    }
-
-    // Find which menu window the mouse is currently on top of
-    var activeMenuContainer = [self menuContainerForPoint:globalLocation],
-        activeMenu = [activeMenuContainer menu],
-        menuLocation = [activeMenuContainer convertGlobalToBase:globalLocation],
-
-        // Find out the item the mouse is currently on top of
-        activeItemIndex = activeMenuContainer ? [activeMenuContainer itemIndexAtPoint:menuLocation] : CPNotFound,
-        activeItem = activeItemIndex !== CPNotFound ? [activeMenu itemAtIndex:activeItemIndex] : nil;
-
-    /*
-    Click outside the menu structure?
-
-    The event which caused the menu to open is not considered even if it's
-    technically a click outside of an open menu, since this would mean the same
-    click which opened the menu could also close it. This is actually common.
-    E.g. you click on a button and it opens a menu below itself.
-    */
-    if (type === CPLeftMouseDown && _openEvent !== anEvent && (!activeMenuContainer || !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation)))
-    {
-        [self completeTracking];
-
-        /*
-        You can close and interact with a control in a single click. E.g. you can have a menu open,
-        click on a button outside of it and have the menu immediately close and the button activate,
-        without having to click once to close the menu and once to activate the button.
-
-        Since we normally dequeue the event after tracking it, we'll have to put it back on the stack
-        in this special case. Note that it's important the event is executed /right now/, since certain
-        controls such as HTML upload buttons need a native click event at the top of the stack trace
-        to activate - it's not something we can fake later.
-        */
-        [CPApp sendEvent:anEvent];
-
-        return;
-    }
-
-    [self _trackAgain];
-
-    // unhighlight when mouse is moved off the menu
-    if (_lastGlobalLocation && CGRectContainsPoint([activeMenuContainer globalFrame], _lastGlobalLocation)
-                            && !CGRectContainsPoint([activeMenuContainer globalFrame], globalLocation))
-        [activeMenu _highlightItemAtIndex:CPNotFound];
-
-    // Remember this for the next periodic event.
-    _lastGlobalLocation = globalLocation;
-
-    // If the item isn't enabled its as if we clicked on nothing.
-    if ([activeItem _isMenuBarButton])
-    {
-        activeItemIndex = CPNotFound;
-        activeItem = nil;
-    }
-
-    var mouseOverMenuView = [activeItem view];
-
-    if (type === CPScrollWheel && ![activeMenuContainer isMenuBar])
-        [activeMenuContainer scrollByDelta:[anEvent deltaY]];
-
-    if (type === CPPeriodic)
-    {
-        if (_scrollingState === _CPMenuManagerScrollingStateUp)
-            [activeMenuContainer scrollUp];
-        else if (_scrollingState === _CPMenuManagerScrollingStateDown)
-            [activeMenuContainer scrollDown];
-    }
-
-    // If we're over a custom menu view...
-    if (mouseOverMenuView)
-    {
-        if (!_lastMouseOverMenuView)
-            [activeMenu _highlightItemAtIndex:CPNotFound];
-
-        if (_lastMouseOverMenuView != mouseOverMenuView)
-        {
-            [_lastMouseOverMenuView mouseExited:anEvent];
-            // FIXME: Possibly multiple of these?
-            [mouseOverMenuView mouseEntered:anEvent];
-
-            _lastMouseOverMenuView = mouseOverMenuView;
-        }
-
-        var menuContainerWindow = activeMenuContainer;
-
-        if (![menuContainerWindow isKindOfClass:CPWindow])
-            menuContainerWindow = [menuContainerWindow window];
-
-        [menuContainerWindow
-            sendEvent:[CPEvent mouseEventWithType:type
-                                         location:menuLocation
-                                    modifierFlags:[anEvent modifierFlags]
-                                        timestamp:[anEvent timestamp]
-                                     windowNumber:menuContainerWindow
-                                          context:nil
-                                      eventNumber:0
-                                       clickCount:[anEvent clickCount]
-                                         pressure:[anEvent pressure]]];
-    }
-    else
-    {
-        if (_lastMouseOverMenuView)
-        {
-            [_lastMouseOverMenuView mouseExited:anEvent];
-            _lastMouseOverMenuView = nil;
-        }
-
-        if (activeItemIndex !== CPNotFound)
-            [activeMenu _highlightItemAtIndex:activeItemIndex];
-
-        if (type === CPMouseMoved || type === CPLeftMouseDragged || type === CPLeftMouseDown || type === CPPeriodic)
-        {
-            if (type === CPLeftMouseDragged)
-                _mouseWasDragged = YES;
-
-            var oldScrollingState = _scrollingState;
-
-            _scrollingState = [activeMenuContainer scrollingStateForPoint:globalLocation];
-
-            if (_scrollingState !== oldScrollingState)
-            {
-                if (_scrollingState === _CPMenuManagerScrollingStateNone)
-                    [CPEvent stopPeriodicEvents];
-                else if (oldScrollingState === _CPMenuManagerScrollingStateNone)
-                    [CPEvent startPeriodicEventsAfterDelay:0.0 withPeriod:0.04];
-            }
-        }
-        else if (type === CPLeftMouseUp || type === CPRightMouseUp)
-        {
-            /*
-                There are a few possibilites:
-
-                1. The user clicks and releases without dragging within the sticky time.
-                   This is considered a regular mouse click and not a drag. In this case
-                   we allow the user to track the menu by moving the mouse. The next
-                   mouse up will end tracking.
-
-                2. The user clicks and releases without dragging after the sticky time.
-                   This is considered a drag and release and tracking ends.
-
-                3. The user clicks, drags and then releases. Tracking ends.
-            */
-            if (_mouseWasDragged || ([anEvent timestamp] - _startTime > STICKY_TIME_INTERVAL))
-            {
-                /*
-                    Close the menu if:
-
-                    1. The mouse was dragged.
-                    2. The mouse is released in the menubar.
-                    3. The current item has a submenu with a custom action.
-                */
-                if (_mouseWasDragged ||
-                    [activeMenuContainer isMenuBar] ||
-                    [activeItem action] !== @selector(submenuAction:))
-                {
-                    [trackingMenu cancelTracking];
-                }
-            }
-        }
-    }
-
-    // Prevent previous selected menu items from opening by stopping the timer if a
-    // new item is selected before the timer runs out
-    if (_previousActiveItem !== activeItem)
-    {
-        clearTimeout(_showTimerID);
-        _showTimerID = undefined;
-    }
-
-    // If the item has a submenu, show it.
-    if ([activeItem hasSubmenu]) // && [activeItem action] === @selector(submenuAction:))
-    {
-        var activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
-            newMenuOrigin;
-
-        if ([activeMenuContainer isMenuBar])
-            newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
-        else
-        {
-            // New theme attributes to have more precise submenus positioning
-
-            var defaultTheme     = [CPTheme defaultTheme],
-                themeDeltaX      = [defaultTheme valueForAttributeWithName:@"menu-window-submenu-delta-x" forClass:_CPMenuView],
-                themeDeltaY      = [defaultTheme valueForAttributeWithName:@"menu-window-submenu-delta-y" forClass:_CPMenuView],
-                themeFirstDeltaY = [defaultTheme valueForAttributeWithName:@"menu-window-submenu-first-level-delta-y" forClass:_CPMenuView],
-                activeMenuIndex  = [_menuContainerStack indexOfObject:activeMenuContainer],
-
-                deltaX = themeDeltaX ? themeDeltaX : 0,
-                deltaY = themeDeltaY ? themeDeltaY : 0;
-
-            if (themeFirstDeltaY && (activeMenuIndex == 1) && [_menuContainerStack[0] isMenuBar])
-                deltaY += themeFirstDeltaY;
-
-            newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect)+deltaX, CGRectGetMinY(activeItemRect)+deltaY);
-        }
-
-        newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
-
-        // Only start a new timer if the previous was cancelled
-        if (_showTimerID === undefined)
-        {
-            // Close the current menu item because we are going to select a new one after a short delay
-            [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
-
-            if (![activeMenuContainer isMenuBar])
-            {
-                _showTimerID = setTimeout(function()
-                {
-                    [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
-                }, 250);
-            }
-            else
-                [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
-        }
-    }
-
-    // This handles both the case where we've moved away from the menu, and where
-    // we've moved to an item without a submenu.
-    else
-        [self showMenu:nil fromMenu:activeMenu atPoint:CGPointMakeZero()];
-
-    _previousActiveItem = activeItem;
-}
-
-- (void)trackMenuBarButtonEvent:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type === CPAppKitDefined)
-        return [self completeTracking];
-
-    var globalLocation = [anEvent globalLocation],
-
-        // Find which menu window the mouse is currently on top of
-        menu = [self trackingMenu],
-        trackingMenuContainer = [self trackingMenuContainer],
-        menuLocation = [trackingMenuContainer convertGlobalToBase:globalLocation];
-
-    if ([trackingMenuContainer itemIndexAtPoint:menuLocation] === _menuBarButtonItemIndex)
-        [menu _highlightItemAtIndex:_menuBarButtonItemIndex];
-    else
-        [menu _highlightItemAtIndex:CPNotFound];
-
-    [CPApp setTarget:self selector:@selector(trackMenuBarButtonEvent:) forNextEventMatchingMask:CPPeriodicMask | CPMouseMovedMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask | CPAppKitDefinedMask untilDate:nil inMode:nil dequeue:YES];
-
-    if (type === CPLeftMouseUp)
-        [menu cancelTracking];
-}
-
-- (void)cancelActiveMenu
-{
-    if (CPApp._activeMenu)
-    {
-        [self completeTracking];
-        _menuContainerStack = [];
-    }
-}
-
-- (void)completeTracking
-{
-    var trackingMenu = [self trackingMenu];
-
-    // Stop all periodic events at this point.
-    [CPEvent stopPeriodicEvents];
-
-    // Hide all submenus.
-    [self showMenu:nil fromMenu:trackingMenu atPoint:nil];
-    [trackingMenu _menuDidClose];
-
-    if (_trackingCallback)
-        _trackingCallback([self trackingMenuContainer], trackingMenu);
-
-    [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidEndTrackingNotification
-                                                        object:trackingMenu];
-
-    CPApp._activeMenu = nil;
-}
-
-- (id)menuContainerForPoint:(float)aGlobalLocation
-{
-    var count = [_menuContainerStack count],
-        firstMenuContainer = _menuContainerStack[0];
-
-    // Trivial case.
-    if (count === 1)
-        return firstMenuContainer;
-
-    var firstMenuWindowIndex = 0,
-        lastMenuWindowIndex = count - 1;
-
-    // If the first menu container is a bar, then it has to fall strictly within its bounds.
-    if ([firstMenuContainer isMenuBar])
-    {
-        if (CGRectContainsPoint([firstMenuContainer globalFrame], aGlobalLocation))
-            return firstMenuContainer;
-
-        firstMenuWindowIndex = 1;
-    }
-
-    var index = count,
-        x = aGlobalLocation.x,
-        closerDeltaX = Infinity,
-        closerMenuContainer = nil;
-
-    while (index-- > firstMenuWindowIndex)
-    {
-        var menuContainer = _menuContainerStack[index],
-            menuContainerFrame = [menuContainer globalFrame],
-            menuContainerMinX = CGRectGetMinX(menuContainerFrame),
-            menuContainerMaxX = CGRectGetMaxX(menuContainerFrame);
-
-        // If within the x bounds of this menu container, return it.
-        if (x < menuContainerMaxX && x >= menuContainerMinX)
-            return menuContainer;
-
-        // If this is either the first or last menu *window*, check to see how close we are to it.
-        if (index === firstMenuWindowIndex || index === lastMenuWindowIndex)
-        {
-            var deltaX = ABS(x < menuContainerMinX ? menuContainerMinX - x : menuContainerMaxX - x);
-
-            if (deltaX < closerDeltaX)
-            {
-                closerMenuContainer = menuContainer;
-                closerDeltaX = deltaX;
-            }
-        }
-    }
-
-    return closerMenuContainer;
-}
-
-- (void)showMenu:(CPMenu)newMenu fromMenu:(CPMenu)baseMenu atPoint:(CGPoint)aGlobalLocation
-{
-    var count = _menuContainerStack.length,
-        index = count;
-
-    [newMenu _menuWillOpen];
-
-    // Hide all menus up to the base menu...
-    while (index--)
-    {
-        var menuContainer = _menuContainerStack[index],
-            menu = [menuContainer menu];
-
-        // If we reach the base menu, or this menu is already being shown, break.
-        if (menu === baseMenu)
-            break;
-
-        // If this menu is already being shown, unhighlight and return.
-        if (menu === newMenu) //&& [menu supermenu] === baseMenu)
-            return [newMenu _highlightItemAtIndex:CPNotFound];
-
-        [menuContainer orderOut:self];
-        [menuContainer setMenu:nil];
-
-        [_CPMenuWindow poolMenuWindow:menuContainer];
-        [_menuContainerStack removeObjectAtIndex:index];
-
-        [menu _menuDidClose];
-    }
-
-    if (!newMenu)
-        return;
-
-    // Unhighlight any previously highlighted item.
-    [newMenu _highlightItemAtIndex:CPNotFound];
-
-    var menuWindow = [_CPMenuWindow menuWindowWithMenu:newMenu font:[_menuContainerStack[0] font]];
-
-    [_menuContainerStack addObject:menuWindow];
-
-    [menuWindow setConstraintRect:_constraintRect];
-
-    // If our parent menu is a menu bar...
-    if (baseMenu === [self trackingMenu] && [[self trackingMenuContainer] isMenuBar])
-        [menuWindow setBackgroundStyle:_CPMenuWindowMenuBarBackgroundStyle];
-    else
-        [menuWindow setBackgroundStyle:_CPMenuWindowPopUpBackgroundStyle];
-
-    [menuWindow setFrameOrigin:aGlobalLocation];
-    [menuWindow orderFront:self];
-}
-
-/// handle keyboard navigation
-- (void)interpretKeyEvent:(CPEvent)anEvent forMenu:(CPMenu)menu
-{
-    var modifierFlags = [anEvent modifierFlags],
-        character = [anEvent charactersIgnoringModifiers],
-        selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
-
-    if (selectorNames)
-    {
-        var iter = [selectorNames objectEnumerator],
-            obj;
-
-        while ((obj = [iter nextObject]) != nil)
-        {
-            var aSelector = CPSelectorFromString(obj);
-
-            if ([self respondsToSelector:aSelector])
-                [self performSelector:aSelector withObject:menu];
-        }
-    }
-    else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)))
-    {
-        if (([anEvent timestamp] - _startTime) > STICKY_TIME_INTERVAL)
-            _keyBuffer = nil;
-
-        if (!_keyBuffer)
-        {
-            _startTime = [anEvent timestamp];
-            _keyBuffer = character;
-
-            [CPEvent stopPeriodicEvents];
-            [CPEvent startPeriodicEventsAfterDelay:0.1 withPeriod:0.1];
-        }
-        else
-            _keyBuffer += character;
-
-        [self selectNextItemBeginningWith:_keyBuffer inMenu:menu];
-        _lastGlobalLocation = nil;
-    }
-
-    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO];
-}
-
-- (void)selectNextItemBeginningWith:(CPString)characters inMenu:(CPMenu)menu
-{
-    var iter = [[menu itemArray] objectEnumerator],
-        obj;
-
-    while ((obj = [iter nextObject]) != nil)
-    {
-        if ([obj isHidden] || ![obj isEnabled])
-            continue;
-
-        if ([[[obj title] commonPrefixWithString:characters options:CPCaseInsensitiveSearch] length] == [characters length])
-        {
-            [menu _highlightItemAtIndex:iter._index];
-            break;
-        }
-    }
-
-    _startTime = [CPEvent currentTimestamp];
-}
-
-- (void)scrollToBeginningOfDocument:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:0];
-}
-
-- (void)scrollToEndOfDocument:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-}
-
-- (void)scrollPageDown:(CPMenu)menu
-{
-    var menuWindow = menu._menuWindow,
-        menuClipView = menuWindow._menuClipView,
-        bottom = [menuClipView bounds].size.height,
-        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
-        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
-        current = [menu indexOfItem:[menu highlightedItem]];
-
-    if (current == CPNotFound)
-    {
-        [menu _highlightItemAtIndex:0];
-        return;
-    }
-
-    var next = current + (last - first);
-
-    if (next < [menu numberOfItems])
-        [menu _highlightItemAtIndex:next];
-    else
-        [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveDown:menu];
-}
-
-- (void)scrollPageUp:(CPMenu)menu
-{
-    var menuWindow = menu._menuWindow,
-        menuClipView = menuWindow._menuClipView,
-        bottom = [menuClipView bounds].size.height,
-        first = [menuWindow itemIndexAtPoint:CGPointMake(1, 10)],
-        last = [menuWindow itemIndexAtPoint:CGPointMake(1, bottom)],
-        current = [menu indexOfItem:[menu highlightedItem]];
-
-    if (current == CPNotFound)
-    {
-        [menu _highlightItemAtIndex:0];
-        return;
-    }
-
-    var next = current - (last - first);
-
-    if (next < 0)
-        [menu _highlightItemAtIndex:0];
-    else
-        [menu _highlightItemAtIndex:next];
-
-    var item = [menu highlightedItem];
-
-    if ([item isSeparatorItem] || [item isHidden] || ![item isEnabled])
-        [self moveUp:menu];
-}
-
-- (void)moveLeft:(CPMenu)menu
-{
-    if ([menu supermenu])
-    {
-        if ([menu supermenu] == [CPApp mainMenu])
-        {
-            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
-            [self moveUp:[CPApp mainMenu]];
-
-            var activeItem = [[CPApp mainMenu] highlightedItem],
-                menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
-
-            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
-        }
-        else
-            [self showMenu:nil fromMenu:[menu supermenu] atPoint:CGPointMakeZero()];
-    }
-}
-
-- (void)moveRight:(CPMenu)menu
-{
-    var activeItem = [menu highlightedItem];
-
-    if ([activeItem hasSubmenu])
-    {
-        if ([[activeItem submenu] numberOfItems])
-        {
-            var activeItemIndex = [menu indexOfItem:activeItem],
-                activeMenuContainer = menu._menuWindow,
-                activeItemRect = [activeMenuContainer rectForItemAtIndex:activeItemIndex],
-                newMenuOrigin;
-
-            if ([activeMenuContainer isMenuBar])
-                newMenuOrigin = CGPointMake(CGRectGetMinX(activeItemRect), CGRectGetMaxY(activeItemRect));
-            else
-                newMenuOrigin = CGPointMake(CGRectGetMaxX(activeItemRect), CGRectGetMinY(activeItemRect));
-
-            newMenuOrigin = [activeMenuContainer convertBaseToGlobal:newMenuOrigin];
-
-            [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:newMenuOrigin];
-            [self moveDown:[activeItem submenu]];
-        }
-    }
-    else if ([self trackingMenu] == [CPApp mainMenu])
-    {
-        [self showMenu:nil fromMenu:menu atPoint:CGPointMakeZero()];
-        [self moveDown:[CPApp mainMenu]];
-
-        var activeItem = [[CPApp mainMenu] highlightedItem],
-            menuLocation = CGPointMake([[activeItem _menuItemView] frameOrigin].x , [[activeItem _menuItemView] frameSize].height);
-
-        [self showMenu:[activeItem submenu] fromMenu:[activeItem menu] atPoint:menuLocation];
-    }
-}
-
-- (void)moveDown:(CPMenu)menu
-{
-    var index = menu._highlightedIndex + 1,
-        item;
-
-    // Search for the next enabled item
-    while ((index < [menu numberOfItems]) && (item = [menu itemAtIndex:index]) && ([item isSeparatorItem] || [item isHidden] || ![item isEnabled]))
-        index++;
-
-    if (index < [menu numberOfItems])
-        [menu _highlightItemAtIndex:index];
-    else if (menu == [CPApp mainMenu])
-         [menu _highlightItemAtIndex:0];
-}
-
-- (void)moveUp:(CPMenu)menu
-{
-    var index = menu._highlightedIndex - 1,
-        item;
-
-    // Search for the previous enabled item
-    while ((index >= 0) && (item = [menu itemAtIndex:index]) && ([item isSeparatorItem] || [item isHidden] || ![item isEnabled]))
-        index--;
-
-    if (index >= 0)
-        [menu _highlightItemAtIndex:index];
-    else if (menu == [CPApp mainMenu])
-        [menu _highlightItemAtIndex:[menu numberOfItems] - 1];
-}
-
-- (void)insertNewline:(CPMenu)menu
-{
-    if ([[menu highlightedItem] hasSubmenu])
-        [self moveRight:menu];
-    else
-        [menu cancelTracking]
-}
-
-- (void)cancelOperation:(CPMenu)menu
-{
-    [menu _highlightItemAtIndex:CPNotFound];
-    [CPEvent stopPeriodicEvents];
-    [[self trackingMenu] cancelTracking];
-}
-
-@end

AppKit/CPMenu/_CPMenuWindow.j

@@ -1,633 +0,0 @@
-/*
- * _CPMenuWindow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPClipView.j"
-@import "CPImageView.j"
-@import "CPWindow.j"
-@import "_CPMenuManager.j"
-
-@class _CPMenuView
-@class CPMenuItem
-
-var _CPMenuWindowPool                       = [],
-    _CPMenuWindowPoolCapacity               = 5,
-
-    _CPMenuWindowBackgroundColors           = [];
-
-_CPMenuWindowMenuBarBackgroundStyle         = 0;
-_CPMenuWindowPopUpBackgroundStyle           = 1;
-_CPMenuWindowAttachedMenuBackgroundStyle    = 2;
-
-/*
-    @ignore
-*/
-@implementation _CPMenuWindow : CPWindow
-{
-    _CPMenuView         _menuView;
-    CPClipView          _menuClipView;
-
-    CPImageView         _moreAboveView;
-    CPImageView         _moreBelowView;
-
-    CGRect              _unconstrainedFrame;
-    CGRect              _constraintRect;
-}
-
-+ (id)menuWindowWithMenu:(CPMenu)aMenu font:(CPFont)aFont
-{
-    var menuWindow = nil;
-
-    if (_CPMenuWindowPool.length)
-    {
-        menuWindow = _CPMenuWindowPool.pop();
-
-        // Do this so that coordinates will be accurate.
-        [menuWindow setFrameOrigin:CGPointMakeZero()];
-    }
-    else
-        menuWindow = [[_CPMenuWindow alloc] init];
-
-    [menuWindow setFont:aFont];
-    [menuWindow setMenu:aMenu];
-    [menuWindow setMinWidth:[aMenu minimumWidth]];
-
-    return menuWindow;
-}
-
-+ (void)poolMenuWindow:(_CPMenuWindow)aMenuWindow
-{
-    // FIXME :the poolMenuWindow is called too many times somewhere....
-    if (!aMenuWindow || _CPMenuWindowPool.length >= _CPMenuWindowPoolCapacity || [_CPMenuWindowPool containsObject:aMenuWindow])
-        return;
-
-    _CPMenuWindowPool.push(aMenuWindow);
-}
-
-- (id)initWithContentRect:(CGRect)aRect styleMask:(unsigned)aStyleMask
-{
-    _constraintRect = CGRectMakeZero();
-    _unconstrainedFrame = CGRectMakeZero();
-
-    self = [super initWithContentRect:aRect styleMask:CPBorderlessWindowMask];
-
-    if (self)
-    {
-        _constrainsToUsableScreen = NO;
-
-        [self setLevel:CPPopUpMenuWindowLevel];
-        [self setHasShadow:YES];
-        [self setShadowStyle:CPMenuWindowShadowStyle];
-        [self setAcceptsMouseMovedEvents:YES];
-
-        var contentView = [self contentView];
-
-        _menuView = [[_CPMenuView alloc] initWithFrame:CGRectMakeZero()];
-
-        _menuClipView = [[CPClipView alloc] initWithFrame:CGRectMake([_menuView valueForThemeAttribute:@"menu-window-margin-inset"].left, [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top, 0.0, 0.0)];
-        [_menuClipView setDocumentView:_menuView];
-
-        [contentView addSubview:_menuClipView];
-
-        _moreAboveView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-        [_moreAboveView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-above-image"]];
-        [_moreAboveView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-above-image"] size]];
-
-        [contentView addSubview:_moreAboveView];
-
-        _moreBelowView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-        [_moreBelowView setImage:[_menuView valueForThemeAttribute:@"menu-window-more-below-image"]];
-        [_moreBelowView setFrameSize:[[_menuView valueForThemeAttribute:@"menu-window-more-below-image"] size]];
-
-        [contentView addSubview:_moreBelowView];
-    }
-
-    return self;
-}
-
-+ (float)_standardLeftMargin
-{
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-margin-inset" forClass:_CPMenuView].left;
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    [_menuView setFont:aFont];
-}
-
-- (CPFont)font
-{
-    return [_menuView font];
-}
-
-+ (CPColor)backgroundColorForBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
-{
-    var color = _CPMenuWindowBackgroundColors[aBackgroundStyle];
-
-    if (!color)
-    {
-        var bundle = [CPBundle bundleForClass:[self class]];
-
-        if (aBackgroundStyle == _CPMenuWindowPopUpBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-pop-up-background-style-color" forClass:_CPMenuView];
-
-        else if (aBackgroundStyle == _CPMenuWindowMenuBarBackgroundStyle)
-            color = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-window-menu-bar-background-style-color" forClass:_CPMenuView];
-
-        _CPMenuWindowBackgroundColors[aBackgroundStyle] = color;
-    }
-
-    return color;
-}
-
-- (void)setBackgroundStyle:(_CPMenuWindowBackgroundStyle)aBackgroundStyle
-{
-    [self setBackgroundColor:[[self class] backgroundColorForBackgroundStyle:aBackgroundStyle]];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    [aMenu _setMenuWindow:self];
-    [_menuView setMenu:aMenu];
-
-    var menuViewSize = [_menuView frame].size,
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"];
-
-    [self setFrameSize:CGSizeMake(marginInset.left + menuViewSize.width + marginInset.right, marginInset.top + menuViewSize.height + marginInset.bottom)];
-
-    [_menuView scrollPoint:CGPointMake(0.0, 0.0)];
-    [_menuClipView setFrame:CGRectMake(marginInset.left, marginInset.top, menuViewSize.width, menuViewSize.height)];
-}
-
-- (void)setMinWidth:(float)aWidth
-{
-    var size = [self unconstrainedFrame].size;
-
-    [self setFrameSize:CGSizeMake(MAX(size.width, aWidth), size.height)];
-}
-
-- (CPMenu)menu
-{
-    return [_menuView menu];
-}
-
-- (_CPMenuView)_menuView
-{
-    return _menuView;
-}
-
-- (void)orderFront:(id)aSender
-{
-    [[self menu] update];
-    [self setFrame:_unconstrainedFrame];
-
-    [super orderFront:aSender];
-}
-
-- (void)setConstraintRect:(CGRect)aRect
-{
-    _constraintRect = aRect;
-
-    [self setFrame:_unconstrainedFrame];
-}
-
-- (CGRect)unconstrainedFrame
-{
-    return CGRectMakeCopy(_unconstrainedFrame);
-}
-
-// We need this because if not this will call setFrame: with -frame instead of -unconstrainedFrame, turning
-// the constrained frame into the unconstrained frame.
-- (void)setFrameOrigin:(CGPoint)aPoint
-{
-    [super setFrame:CGRectMake(aPoint.x, aPoint.y, CGRectGetWidth(_unconstrainedFrame), CGRectGetHeight(_unconstrainedFrame))];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrame:CGRectMake(CGRectGetMinX(_unconstrainedFrame), CGRectGetMinY(_unconstrainedFrame), aSize.width, aSize.height)];
-}
-
-- (void)setFrame:(CGRect)aFrame display:(BOOL)shouldDisplay animate:(BOOL)shouldAnimate
-{
-    // FIXME: There are integral window issues with platform windows.
-    // FIXME: This gets called far too often.
-    _unconstrainedFrame = CGRectMakeCopy(aFrame);
-
-    // If we are a submenu and we are being displayed off the right of the screen,
-    // we should try and display on the left of our supermenu.
-    var supermenu = [[self menu] supermenu];
-    if (supermenu && (CGRectGetMaxX(_unconstrainedFrame) > CGRectGetMaxX(_constraintRect)))
-    {
-        var supermenuWindow = supermenu._menuWindow;
-        if (supermenuWindow)
-        {
-            var supermenuFrame = [supermenuWindow frame];
-            _unconstrainedFrame.origin.x = CGRectGetMinX(supermenuFrame) - CGRectGetWidth(_unconstrainedFrame);
-        }
-    }
-
-    var constrainedFrame = CGRectIntersection(_unconstrainedFrame, _constraintRect),
-        marginInset = [_menuView valueForThemeAttribute:@"menu-window-margin-inset"],
-        scrollIndicatorHeight = [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"];
-
-    // We don't want to simply intersect the visible frame and the unconstrained frame.
-    // We should be allowing as much of the width to fit as possible (pushing back and forward).
-    constrainedFrame.origin.x = CGRectGetMinX(_unconstrainedFrame);
-    constrainedFrame.size.width = CGRectGetWidth(_unconstrainedFrame);
-
-    if (CGRectGetWidth(constrainedFrame) > CGRectGetWidth(_constraintRect))
-        constrainedFrame.size.width = CGRectGetWidth(_constraintRect);
-
-    if (CGRectGetMaxX(constrainedFrame) > CGRectGetMaxX(_constraintRect))
-        constrainedFrame.origin.x -= CGRectGetMaxX(constrainedFrame) - CGRectGetMaxX(_constraintRect);
-
-    if (CGRectGetMinX(constrainedFrame) < CGRectGetMinX(_constraintRect))
-        constrainedFrame.origin.x = CGRectGetMinX(_constraintRect);
-
-    [super setFrame:constrainedFrame display:shouldDisplay animate:shouldAnimate];
-
-    // This needs to happen before changing the frame.
-    var menuViewOrigin = CGPointMake(CGRectGetMinX(aFrame) + marginInset.left, CGRectGetMinY(aFrame) + marginInset.top),
-        moreAbove = menuViewOrigin.y < CGRectGetMinY(constrainedFrame) + marginInset.top,
-        moreBelow = menuViewOrigin.y + CGRectGetHeight([_menuView frame]) > CGRectGetMaxY(constrainedFrame) - marginInset.bottom,
-
-        topMargin = marginInset.top,
-        bottomMargin = marginInset.bottom,
-
-        contentView = [self contentView],
-        bounds = [contentView bounds];
-
-    if (moreAbove)
-    {
-        topMargin += scrollIndicatorHeight;
-
-        var frame = [_moreAboveView frame];
-
-        [_moreAboveView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth(frame)) / 2.0, (marginInset.top + scrollIndicatorHeight - CGRectGetHeight(frame)) / 2.0)];
-    }
-
-    [_moreAboveView setHidden:!moreAbove];
-
-    if (moreBelow)
-    {
-        bottomMargin += scrollIndicatorHeight;
-
-        [_moreBelowView setFrameOrigin:CGPointMake((CGRectGetWidth(bounds) - CGRectGetWidth([_moreBelowView frame])) / 2.0, CGRectGetHeight(bounds) - scrollIndicatorHeight - marginInset.bottom)];
-    }
-
-    [_moreBelowView setHidden:!moreBelow];
-
-    var clipFrame = CGRectMakeZero();
-
-    clipFrame.origin.x = marginInset.left;
-    clipFrame.origin.y = topMargin;
-    clipFrame.size.width = CGRectGetWidth(constrainedFrame) - marginInset.left - marginInset.right;
-    clipFrame.size.height = CGRectGetHeight(constrainedFrame) - topMargin - bottomMargin;
-
-    [_menuClipView setFrame:clipFrame];
-    [_menuView setFrameSize:CGSizeMake(CGRectGetWidth(clipFrame), CGRectGetHeight([_menuView frame]))];
-
-    [_menuView scrollPoint:CGPointMake(0.0, [self convertBaseToGlobal:clipFrame.origin].y - menuViewOrigin.y)];
-}
-
-- (BOOL)hasMinimumNumberOfVisibleItems
-{
-    var visibleRect = [_menuView visibleRect];
-
-    // Clearly if the entire view isn't visible the minimum won't be visible.
-    if (CGRectIsEmpty(visibleRect))
-        return NO;
-
-    var numberOfUnhiddenItems = [_menuView numberOfUnhiddenItems],
-        minimumNumberOfVisibleItems = MIN(numberOfUnhiddenItems, 3),
-        count = 0,
-        index = [_menuView itemIndexAtPoint:[_menuView convertPoint:[_menuClipView frame].origin fromView:nil]];
-
-    for (; index < numberOfUnhiddenItems && count < minimumNumberOfVisibleItems; ++index)
-    {
-        var itemRect = [_menuView rectForUnhiddenItemAtIndex:index],
-            visibleItemRect = CGRectIntersection(visibleRect, itemRect);
-
-        // As soon as we get to the first unhidden item that is no longer visible, stop.
-        if (CGRectIsEmpty(visibleItemRect))
-            break;
-
-        // If the item is *completely* visible, count it.
-        if (CGRectEqualToRect(visibleItemRect, itemRect))
-            ++count;
-    }
-
-    return count >= minimumNumberOfVisibleItems;
-}
-
-- (BOOL)canScrollUp
-{
-    return ![_moreAboveView isHidden];
-}
-
-- (BOOL)canScrollDown
-{
-    return ![_moreBelowView isHidden];
-}
-
-- (BOOL)canScroll
-{
-    return [self canScrollUp] || [self canScrollDown];
-}
-
-- (void)scrollByDelta:(float)theDelta
-{
-    if (theDelta === 0.0)
-        return;
-
-    if (theDelta > 0.0 && ![self canScrollDown])
-        return;
-
-    if (theDelta < 0.0 && ![self canScrollUp])
-        return;
-
-    _unconstrainedFrame.origin.y -= theDelta;
-    [self setFrame:_unconstrainedFrame];
-}
-
-- (void)scrollUp
-{
-    [self scrollByDelta:-10.0];
-}
-
-- (void)scrollDown
-{
-    [self scrollByDelta:10.0];
-}
-
-@end
-
-@implementation _CPMenuWindow (CPMenuContainer)
-
-- (CGRect)globalFrame
-{
-    return [self frame];
-}
-
-- (BOOL)isMenuBar
-{
-    return NO;
-}
-
-- (_CPManagerScrollingState)scrollingStateForPoint:(CGPoint)aGlobalLocation
-{
-    var frame = [self frame];
-    if (!CGRectContainsPoint(frame,aGlobalLocation) || ![self canScroll])
-        return _CPMenuManagerScrollingStateNone;
-
-    // If we're at or above of the top scroll indicator...
-    if (aGlobalLocation.y < CGRectGetMinY(frame) + [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreAboveView isHidden])
-        return _CPMenuManagerScrollingStateUp;
-
-    // If we're at or below the bottom scroll indicator...
-    if (aGlobalLocation.y > CGRectGetMaxY(frame) - [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].bottom - [_menuView valueForThemeAttribute:@"menu-window-scroll-indicator-height"] &&  ![_moreBelowView isHidden])
-        return _CPMenuManagerScrollingStateDown;
-
-    return _CPMenuManagerScrollingStateNone;
-}
-
-- (float)deltaYForItemAtIndex:(int)anIndex
-{
-    return [_menuView valueForThemeAttribute:@"menu-window-margin-inset"].top + CGRectGetMinY([_menuView rectForItemAtIndex:anIndex]);
-}
-
-- (CGPoint)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuView convertRect:[_menuView rectForItemAtIndex:anIndex] toView:nil];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    // Don't return indexes of items that aren't visible.
-    if (!CGRectContainsPoint([_menuClipView bounds], [_menuClipView convertPoint:aPoint fromView:nil]))
-        return CPNotFound;
-
-    return [_menuView itemIndexAtPoint:[_menuView convertPoint:aPoint fromView:nil]];
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPMenuWindow (CSSTheming)
-
-- (void)_setThemeIncludingDescendants:(CPTheme)aTheme
-{
-    [[self contentView] _setThemeIncludingDescendants:aTheme];
-    [_menuView _setThemeIncludingDescendants:aTheme];
-    [_menuView tile];
-}
-
-@end
-
-// MARK: -
-
-/*
-    @ignore
-*/
-
-@implementation _CPMenuView : CPView
-{
-    CPArray _menuItemViews;
-    CPArray _visibleMenuItemInfos;
-
-    CPFont  _font @accessors(property=font);
-}
-
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-view";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"menu-window-more-above-image": [CPNull null],
-            @"menu-window-more-below-image": [CPNull null],
-            @"menu-window-pop-up-background-style-color": [CPNull null],
-            @"menu-window-menu-bar-background-style-color": [CPNull null],
-            @"menu-window-margin-inset": CGInsetMake(5.0, 1.0, 1.0, 5.0),
-            @"menu-window-scroll-indicator-height": 16.0,
-            @"menu-bar-window-background-color": [CPNull null],
-            @"menu-bar-window-background-selected-color": [CPNull null],
-            @"menu-bar-window-font": [CPNull null],
-            @"menu-bar-window-first-item-font": [CPNull null],
-            @"menu-bar-window-height": 30.0,
-            @"menu-bar-window-margin": 10.0,
-            @"menu-bar-window-left-margin": 10.0,
-            @"menu-bar-window-right-margin": 10.0,
-            @"menu-bar-text-color": [CPNull null],
-            @"menu-bar-title-color": [CPNull null],
-            @"menu-bar-text-shadow-color": [CPNull null],
-            @"menu-bar-title-shadow-color": [CPNull null],
-            @"menu-bar-highlight-color": [CPNull null],
-            @"menu-bar-highlight-text-color": [CPNull null],
-            @"menu-bar-highlight-text-shadow-color": [CPNull null],
-            @"menu-bar-height": 28.0,
-            @"menu-bar-icon-image": [CPNull null],
-            @"menu-bar-icon-image-alpha-value": 1.0,
-            @"menu-general-icon-new": [CPNull null],
-            @"menu-general-icon-save": [CPNull null],
-            @"menu-general-icon-open": [CPNull null],
-            @"menu-window-submenu-delta-x": 0.0,
-            @"menu-window-submenu-delta-y": 0.0,
-            @"menu-window-submenu-first-level-delta-y": 0.0
-        };
-}
-
-- (unsigned)numberOfUnhiddenItems
-{
-    return _visibleMenuItemInfos.length;
-}
-
-- (CGRect)rectForUnhiddenItemAtIndex:(int)anIndex
-{
-    return [self rectForItemAtIndex:_visibleMenuItemInfos[anIndex].index];
-}
-
-- (CGRect)rectForItemAtIndex:(int)anIndex
-{
-    return [_menuItemViews[anIndex === CPNotFound ? 0 : anIndex] frame];
-}
-
-- (int)itemIndexAtPoint:(CGPoint)aPoint
-{
-    var x = aPoint.x,
-        bounds = [self bounds];
-
-    if (x < CGRectGetMinX(bounds) || x > CGRectGetMaxX(bounds))
-        return CPNotFound;
-
-    var y = aPoint.y,
-        low = 0,
-        high = _visibleMenuItemInfos.length - 1;
-
-    while (low <= high)
-    {
-        var middle = FLOOR(low + (high - low) / 2),
-            info = _visibleMenuItemInfos[middle],
-            frame = [info.view frame];
-
-        if (y < CGRectGetMinY(frame))
-            high = middle - 1;
-
-        else if (y > CGRectGetMaxY(frame))
-            low = middle + 1;
-
-        else
-            return info.index;
-   }
-
-   return CPNotFound;
-}
-
-- (void)tile
-{
-    [_menuItemViews makeObjectsPerformSelector:@selector(removeFromSuperview)];
-
-    _menuItemViews = [];
-    _visibleMenuItemInfos = [];
-
-    var menu = [self menu];
-
-    if (!menu)
-        return;
-
-    var items = [menu itemArray],
-        index = 0,
-        count = [items count],
-        maxWidth = 0,
-        y = 0,
-        showsStateColumn = [menu showsStateColumn];
-
-    for (; index < count; ++index)
-    {
-        var item = items[index],
-            view = [item _menuItemView];
-
-        _menuItemViews.push(view);
-
-        if ([item isHidden])
-            continue;
-
-        _visibleMenuItemInfos.push({ view:view, index:index });
-
-        [view setFont:_font];
-        [view setShowsStateColumn:showsStateColumn];
-        [view synchronizeWithMenuItem];
-
-        [view setFrameOrigin:CGPointMake(0.0, y)];
-
-        [view _setThemeIncludingDescendants:[CPTheme defaultTheme]];
-        [self addSubview:view];
-
-        var size = [view minSize],
-            width = size.width;
-
-        if (maxWidth < width)
-            maxWidth = width;
-
-        y += size.height;
-    }
-
-    for (index = 0; index < count; ++index)
-    {
-        var view = _menuItemViews[index];
-
-        [view setFrameSize:CGSizeMake(maxWidth, CGRectGetHeight([view frame]))];
-    }
-
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(maxWidth, y)];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    [super setMenu:aMenu];
-    [self tile];
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPMenuView (CSSTheming)
-
-- (void)_setThemeIncludingDescendants:(CPTheme)aTheme
-{
-    [self setTheme:aTheme];
-    [_menuItemViews makeObjectsPerformSelector:@selector(_setThemeIncludingDescendants:) withObject:aTheme];
-
-    for (var i = 0, items = [[self menu] itemArray], count = [items count]; i < count; i++)
-        [[items[i] _menuItemView] _setThemeIncludingDescendants:aTheme];
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemMenuBarView.j

@@ -1,207 +0,0 @@
-/*
- * _CPMenuItemMenuBarView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPControl.j"
-@import "_CPImageAndTextView.j"
-
-@class _CPMenuBarWindow
-@class _CPMenuView
-@class CPMenuItem
-
-@implementation _CPMenuItemMenuBarView : CPView
-{
-    CPColor                 _highlightColor @accessors(property=highlightColor);
-    CPColor                 _textColor @accessors(property=textColor);
-    CPColor                 _textShadowColor @accessors(property=textShadowColor);
-    CPColor                 _highlightTextColor @accessors(property=highlightTextColor);
-    CPColor                 _highlightTextShadowColor @accessors(property=highlightTextShadowColor);
-
-    CPMenuItem              _menuItem @accessors(property=menuItem);
-
-    CPFont                  _font;
-
-    BOOL                    _isDirty;
-    BOOL                    _shouldHighlight;
-
-    _CPImageAndTextView     _imageAndTextView;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-item-bar-view";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"horizontal-margin": 9.0,
-            @"submenu-indicator-margin": 3.0,
-            @"vertical-margin": 4.0,
-        };
-}
-
-+ (id)view
-{
-    return [[self alloc] init];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake([self valueForThemeAttribute:@"horizontal-margin"], 0.0, 0.0, 0.0)];
-
-        [_imageAndTextView setImagePosition:CPImageLeft];
-        [_imageAndTextView setImageOffset:3.0];
-        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-        [_imageAndTextView setAutoresizingMask:CPViewMinYMargin | CPViewMaxYMargin];
-
-        [self addSubview:_imageAndTextView];
-
-        [self setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
-    }
-
-    return self;
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    _textColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    _textShadowColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (void)setHighlightTextColor:(CPColor)aColor
-{
-    _highlightTextColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (void)setHighlightTextShadowColor:(CPColor)aColor
-{
-    _highlightTextShadowColor = aColor;
-    [self setNeedsLayout];
-}
-
-- (CPColor)textColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    return _textColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-color" forClass:_CPMenuView];
-}
-
-- (CPColor)textShadowColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor clearColor];
-
-    return _textShadowColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-text-shadow-color" forClass:_CPMenuView];
-}
-
-- (CPColor)highlightTextColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor lightGrayColor];
-
-    return _highlightTextColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-color" forClass:_CPMenuView];
-}
-
-- (CPColor)highlightTextShadowColor
-{
-    if (![_menuItem isEnabled])
-        return [CPColor clearColor];
-
-    return _highlightTextShadowColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-highlight-text-shadow-color" forClass:_CPMenuView];
-}
-
-- (CPColor)highlightColor
-{
-    return _highlightColor || [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-bar-window-background-selected-color" forClass:_CPMenuView];
-}
-
-- (void)update
-{
-    var x = [self valueForThemeAttribute:@"horizontal-margin"],
-        height = 0.0;
-
-    [_imageAndTextView setText:[_menuItem title]];
-    [_imageAndTextView setFont:[_menuItem font] || [_CPMenuBarWindow font]];
-    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-    [_imageAndTextView setImage:[_menuItem image]];
-    [_imageAndTextView sizeToFit];
-
-    var imageAndTextViewFrame = [_imageAndTextView frame];
-
-    imageAndTextViewFrame.origin.x = x;
-    x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame)) + 2.0 * [self valueForThemeAttribute:@"vertical-margin"];
-
-    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0);
-    [_imageAndTextView setFrame:imageAndTextViewFrame];
-
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:CGSizeMake(x + [self valueForThemeAttribute:@"horizontal-margin"], height)];
-    [self setAutoresizesSubviews:YES];
-    [self setNeedsLayout];
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    // FIXME: This should probably be even throw.
-    if (![_menuItem isEnabled])
-        shouldHighlight = NO;
-
-    _shouldHighlight = shouldHighlight;
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
-{
-    if (_shouldHighlight)
-    {
-        if (![_menuItem _isMenuBarButton])
-            [self setBackgroundColor:[self highlightColor]];
-
-        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-        [_imageAndTextView setTextColor:[self highlightTextColor]];
-        [_imageAndTextView setTextShadowColor:[self highlightTextShadowColor]];
-    }
-    else
-    {
-        [self setBackgroundColor:nil];
-
-        [_imageAndTextView setImage:[_menuItem image]];
-        [_imageAndTextView setTextColor:[self textColor]];
-        [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    }
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemSeparatorView.j

@@ -1,76 +0,0 @@
-/*
- * _CPMenuItemSeparatorView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPView.j"
-
-@class _CPMenuItemStandardView
-
-
-@implementation _CPMenuItemSeparatorView : CPView
-{
-}
-
-+ (id)view
-{
-    var themedHeight = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-view-height" forClass:_CPMenuItemStandardView];
-
-    return [[self alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, (themedHeight ? themedHeight : 10.0))];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-        [self setAutoresizingMask:CPViewWidthSizable];
-
-    return self;
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds],
-        height = CGRectGetMaxY(bounds),
-        themedHeight = [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-height" forClass:_CPMenuItemStandardView],
-        lineHeight = themedHeight ? themedHeight : 1.0;
-
-    CGContextBeginPath(context);
-
-    CGContextSetLineWidth(context, lineHeight);
-
-    if (!!((height - lineHeight) % 2))
-    {
-        CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-        CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)) - 0.5);
-    }
-    else
-    {
-        CGContextMoveToPoint(context, CGRectGetMinX(bounds), FLOOR(CGRectGetMidY(bounds)));
-        CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), FLOOR(CGRectGetMidY(bounds)));
-    }
-
-    CGContextSetStrokeColor(context, [[CPTheme defaultTheme] valueForAttributeWithName:@"menu-item-separator-color" forClass:_CPMenuItemStandardView]);
-    CGContextStrokePath(context);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemStandardView.j

@@ -1,457 +0,0 @@
-/*
- * _CPMenuItemStandardView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPControl.j"
-@import "CPImageView.j"
-@import "_CPImageAndTextView.j"
-
-@class CPMenuItem
-
-
-@implementation _CPMenuItemStandardView : CPView
-{
-    CPMenuItem              _menuItem @accessors(property=menuItem);
-
-    CPFont                  _font;
-
-    CGSize                  _minSize @accessors(readonly, property=minSize);
-    BOOL                    _isDirty;
-    BOOL                    _highlighted;
-
-    CPImageView             _stateView;
-    _CPImageAndTextView     _imageAndTextView;
-    _CPImageAndTextView     _keyEquivalentView;
-    CPView                  _submenuIndicatorView;
-
-    BOOL                    _hasSubmenuIndicatorImage;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-item-standard-view";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"submenu-indicator-color": [CPNull null],
-            @"menu-item-selection-color": [CPNull null],
-            @"menu-item-text-shadow-color": [CPNull null],
-            @"menu-item-text-color": [CPNull null],
-            @"menu-item-disabled-text-color": [CPColor lightGrayColor],
-            @"menu-item-default-off-state-image": [CPNull null],
-            @"menu-item-default-off-state-highlighted-image": [CPNull null],
-            @"menu-item-default-on-state-image": [CPNull null],
-            @"menu-item-default-on-state-highlighted-image": [CPNull null],
-            @"menu-item-default-mixed-state-image": [CPNull null],
-            @"menu-item-default-mixed-state-highlighted-image": [CPNull null],
-            @"menu-item-separator-color": [CPNull null],
-            @"menu-item-separator-height": 1.0,
-            @"menu-item-separator-view-height": 10.0,
-            @"left-margin": 3.0,
-            @"right-margin": 17.0,
-            @"state-column-width": 14.0,
-            @"indentation-width": 17.0,
-            @"vertical-margin": 4.0,
-            @"vertical-offset": 0.0,
-            @"right-columns-margin": 30.0,
-            @"submenu-indicator-image": [CPNull null],
-            @"submenu-indicator-highlighted-image": [CPNull null]
-        };
-}
-
-+ (id)view
-{
-    return [[self alloc] init];
-}
-
-+ (float)_standardLeftMargin
-{
-    return [[CPTheme defaultTheme] valueForAttributeWithName:@"left-margin" forClass:[self class]] + [[CPTheme defaultTheme] valueForAttributeWithName:@"state-column-width" forClass:[self class]];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _stateView = [[CPImageView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_stateView setImageScaling:CPImageScaleNone];
-        [_stateView setImageAlignment:CPImageAlignCenter];
-
-        [self addSubview:_stateView];
-
-        _imageAndTextView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_imageAndTextView setImagePosition:CPImageLeft];
-        [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-
-        [self addSubview:_imageAndTextView];
-
-        _keyEquivalentView = [[_CPImageAndTextView alloc] initWithFrame:CGRectMake(0.0, 0.0, 0.0, 0.0)];
-
-        [_keyEquivalentView setImagePosition:CPNoImage];
-        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-        [_keyEquivalentView setAutoresizingMask:CPViewMinXMargin];
-
-        [self addSubview:_keyEquivalentView];
-
-        // Do we have a submenu indicator image specified in the theme ?
-        _hasSubmenuIndicatorImage = !![self valueForThemeAttribute:@"submenu-indicator-image"];
-
-        if (_hasSubmenuIndicatorImage)
-        {
-            // Yes, then use an imageView
-            _submenuIndicatorView = [[CPImageView alloc] initWithFrame:CGRectMakeZero()];
-
-            [_submenuIndicatorView setImageAlignment:CPImageAlignCenter];
-        }
-        else
-        {
-            // No, then use self drawing _CPMenuItemSubmenuIndicatorView
-            _submenuIndicatorView = [[_CPMenuItemSubmenuIndicatorView alloc] initWithFrame:CGRectMake(0.0, 0.0, 8.0, 10.0)];
-
-            [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
-        }
-
-        [_submenuIndicatorView setAutoresizingMask:CPViewMinXMargin];
-
-        [self addSubview:_submenuIndicatorView];
-
-        [self setAutoresizingMask:CPViewWidthSizable];
-    }
-
-    return self;
-}
-
-- (CPColor)textColor
-{
-    if (![_menuItem isEnabled])
-        return [self valueForThemeAttribute:@"menu-item-disabled-text-color"];
-
-    if (_highlighted)
-        return [CPColor whiteColor];
-
-    return [self valueForThemeAttribute:@"menu-item-text-color"];
-}
-
-- (CPColor)textShadowColor
-{
-    if (![_menuItem isEnabled])
-        return nil;
-
-    if (_highlighted)
-        return nil;
-
-    return [self valueForThemeAttribute:@"menu-item-text-shadow-color"];
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    _font = aFont;
-}
-
-- (CPFont)font
-{
-    // Menu item font is forced local font or _menuItem font or system font
-    return _font || [_menuItem font] || [CPFont systemFontOfSize:CPFontCurrentSystemSize];
-}
-
-// FIXME: update is called 2 times at each display. Find why and fix.
-- (void)update
-{
-    var x = [self valueForThemeAttribute:@"left-margin"] + [_menuItem indentationLevel] * [self valueForThemeAttribute:@"indentation-width"],
-        height = 0.0,
-        hasStateColumn = [[_menuItem menu] showsStateColumn],
-        myFont = [self font],
-
-        // When possible, use specific vertical margin/offset value based on font size (which could have been set by control size)
-        correspondingControlSize = [myFont controlSizeCorrespondingToFontSize],
-        verticalMargin = [self valueForThemeAttribute:@"vertical-margin" inState:CPControlSizeThemeStates[correspondingControlSize]],
-        verticalOffset = [self valueForThemeAttribute:@"vertical-offset" inState:CPControlSizeThemeStates[correspondingControlSize]];
-
-    if (hasStateColumn)
-    {
-        [_stateView setHidden:NO];
-        //[_stateView setImage:_CPMenuItemDefaultStateImages[[_menuItem state]] || nil];
-
-        switch ([_menuItem state])
-        {
-            case CPOnState:
-                [_stateView setImage:[_menuItem onStateImage] || [self valueForThemeAttribute:@"menu-item-default-on-state-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                break;
-
-            case CPOffState:
-                [_stateView setImage:[_menuItem offStateImage] || [self valueForThemeAttribute:@"menu-item-default-off-state-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                break;
-
-            case CPMixedState:
-                [_stateView setImage:[_menuItem mixedStateImage] || [self valueForThemeAttribute:@"menu-item-default-mixed-state-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                break;
-
-            default:
-                break;
-        }
-
-        var stateViewFrameOrigin = [_stateView frameOrigin];
-
-        stateViewFrameOrigin.x = x;
-        [_stateView setFrameOrigin:stateViewFrameOrigin];
-
-        x += [self valueForThemeAttribute:@"state-column-width"];
-    }
-    else
-        [_stateView setHidden:YES];
-
-    [_imageAndTextView setFont:myFont];
-    [_imageAndTextView setVerticalAlignment:CPCenterVerticalTextAlignment];
-    [_imageAndTextView setImage:[_menuItem image]];
-    [_imageAndTextView setText:[_menuItem title]];
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    [_imageAndTextView setTextShadowOffset:CGSizeMake(0.0, 1.0)];
-    [_imageAndTextView sizeToFit];
-
-    var imageAndTextViewFrame = [_imageAndTextView frame];
-
-    imageAndTextViewFrame.origin.x = x;
-    x += CGRectGetWidth(imageAndTextViewFrame);
-    height = MAX(height, CGRectGetHeight(imageAndTextViewFrame)); // FIXME: here, height = 0 -> MAX useless
-
-    var hasKeyEquivalent = !![_menuItem keyEquivalent],
-        hasSubmenu = [_menuItem hasSubmenu];
-
-    if (hasKeyEquivalent || hasSubmenu)
-        x += [self valueForThemeAttribute:@"right-columns-margin"];
-
-    if (hasKeyEquivalent)
-    {
-        [_keyEquivalentView setFont:myFont];
-        [_keyEquivalentView setVerticalAlignment:CPCenterVerticalTextAlignment];
-        [_keyEquivalentView setImage:[_menuItem image]];
-        [_keyEquivalentView setText:[_menuItem keyEquivalentStringRepresentation]];
-        [_keyEquivalentView setTextColor:[self textColor]];
-        [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-        [_keyEquivalentView setTextShadowOffset:CGSizeMake(0, 1)];
-        [_keyEquivalentView setFrameOrigin:CGPointMake(x, verticalMargin)];
-        [_keyEquivalentView sizeToFit];
-
-        var keyEquivalentViewFrame = [_keyEquivalentView frame];
-
-        keyEquivalentViewFrame.origin.x = x;
-        x += CGRectGetWidth(keyEquivalentViewFrame);
-        height = MAX(height, CGRectGetHeight(keyEquivalentViewFrame));
-
-        if (hasSubmenu)
-            x += [self valueForThemeAttribute:@"right-columns-margin"];
-    }
-    else
-        [_keyEquivalentView setHidden:YES];
-
-    if (hasSubmenu)
-    {
-        if (_hasSubmenuIndicatorImage)
-        {
-            var submenuIndicatorImage = [self valueForThemeAttribute:@"submenu-indicator-image" inState:CPControlSizeThemeStates[correspondingControlSize]];
-
-            [_submenuIndicatorView setImage:submenuIndicatorImage];
-            [_submenuIndicatorView setFrameSize:[submenuIndicatorImage size]];
-        }
-
-        [_submenuIndicatorView setHidden:NO];
-
-        var submenuViewFrame = [_submenuIndicatorView frame];
-
-        submenuViewFrame.origin.x = x;
-
-        x += CGRectGetWidth(submenuViewFrame);
-        height = MAX(height, CGRectGetHeight(submenuViewFrame));
-    }
-    else
-        [_submenuIndicatorView setHidden:YES];
-
-    height += 2.0 * verticalMargin;
-
-    imageAndTextViewFrame.origin.y = FLOOR((height - CGRectGetHeight(imageAndTextViewFrame)) / 2.0) + verticalOffset;
-    [_imageAndTextView setFrame:imageAndTextViewFrame];
-
-    if (hasStateColumn)
-        [_stateView setFrameSize:CGSizeMake([self valueForThemeAttribute:@"state-column-width"], height)];
-
-    if (hasKeyEquivalent)
-    {
-        keyEquivalentViewFrame.origin.y = FLOOR((height - CGRectGetHeight(keyEquivalentViewFrame)) / 2.0) + verticalOffset;
-        [_keyEquivalentView setFrame:keyEquivalentViewFrame];
-    }
-
-    if (hasSubmenu)
-    {
-        submenuViewFrame.origin.y = FLOOR((height - CGRectGetHeight(submenuViewFrame)) / 2.0);
-        [_submenuIndicatorView setFrame:submenuViewFrame];
-    }
-
-    _minSize = CGSizeMake(x + [self valueForThemeAttribute:@"right-margin"], height);
-
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    // FIXME: This should probably be even throw.
-    if (![_menuItem isEnabled])
-        return;
-
-    _highlighted = shouldHighlight;
-
-    var correspondingControlSize = [[self font] controlSizeCorrespondingToFontSize];
-
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_keyEquivalentView setTextColor:[self textColor]];
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    [_keyEquivalentView setTextShadowColor:[self textShadowColor]];
-
-    if (shouldHighlight)
-    {
-        [self setBackgroundColor:[self valueForThemeAttribute:@"menu-item-selection-color"]];
-        [_imageAndTextView setImage:[_menuItem alternateImage] || [_menuItem image]];
-
-        if (_hasSubmenuIndicatorImage)
-            [_submenuIndicatorView setImage:[self valueForThemeAttribute:@"submenu-indicator-highlighted-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-        else
-            [_submenuIndicatorView setColor:[self textColor]];
-    }
-    else
-    {
-        [self setBackgroundColor:nil];
-        [_imageAndTextView setImage:[_menuItem image]];
-
-        if (_hasSubmenuIndicatorImage)
-            [_submenuIndicatorView setImage:[self valueForThemeAttribute:@"submenu-indicator-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-        else
-            [_submenuIndicatorView setColor:[self valueForThemeAttribute:@"submenu-indicator-color"]];
-    }
-
-    if ([[_menuItem menu] showsStateColumn])
-    {
-        if (shouldHighlight)
-        {
-            switch ([_menuItem state])
-            {
-                case CPOnState:
-                    [_stateView setImage:[_menuItem onStateImage] || [self valueForThemeAttribute:@"menu-item-default-on-state-highlighted-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                    break;
-
-                case CPOffState:
-                    [_stateView setImage:[_menuItem offStateImage] || [self valueForThemeAttribute:@"menu-item-default-off-state-highlighted-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                    break;
-
-                case CPMixedState:
-                    [_stateView setImage:[_menuItem mixedImage] || [self valueForThemeAttribute:@"menu-item-default-mixed-state-highlighted-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                    break;
-
-                default:
-                    break;
-            }
-        }
-        else
-        {
-            switch ([_menuItem state])
-            {
-                case CPOnState:
-                    [_stateView setImage:[_menuItem onStateImage] || [self valueForThemeAttribute:@"menu-item-default-on-state-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                    break;
-
-                case CPOffState:
-                    [_stateView setImage:[_menuItem offStateImage] || [self valueForThemeAttribute:@"menu-item-default-off-state-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                    break;
-
-                case CPMixedState:
-                    [_stateView setImage:[_menuItem mixedImage] || [self valueForThemeAttribute:@"menu-item-default-mixed-state-image" inState:CPControlSizeThemeStates[correspondingControlSize]]];
-                    break;
-
-                default:
-                    break;
-            }
-        }
-    }
-}
-
-- (BOOL)isHighlighted
-{
-    return _highlighted;
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPMenuItemStandardView (CSSTheming)
-
-// MARK: Override
-
-- (void)_setThemeIncludingDescendants:(CPTheme)aTheme
-{
-    [self setTheme:aTheme];
-    [[self subviews] makeObjectsPerformSelector:@selector(_setThemeIncludingDescendants:) withObject:aTheme];
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPMenuItemSubmenuIndicatorView : CPView
-{
-    CPColor _color;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color === aColor)
-        return;
-
-    _color = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort],
-        bounds = [self bounds];
-
-    CGContextBeginPath(context);
-
-    CGContextMoveToPoint(context, CGRectGetMinX(bounds), CGRectGetMinY(bounds));
-    CGContextAddLineToPoint(context, CGRectGetMaxX(bounds), CGRectGetMidY(bounds));
-    CGContextAddLineToPoint(context, CGRectGetMinX(bounds), CGRectGetMaxY(bounds));
-
-    CGContextClosePath(context);
-
-    CGContextSetFillColor(context, _color);
-    CGContextFillPath(context);
-}
-
-@end

AppKit/CPMenuItem/_CPMenuItemView.j

@@ -1,310 +0,0 @@
-/*
- * _CPMenuItemView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPControl.j"
-
-@import "_CPMenuItemSeparatorView.j"
-@import "_CPMenuItemStandardView.j"
-@import "_CPMenuItemMenuBarView.j"
-
-@class CPMenuItem
-@global CPApp
-
-/*
-    @ignore
-*/
-@implementation _CPMenuItemView : CPView
-{
-    CPMenuItem              _menuItem;
-    CPView                  _view       @accessors(property=view, readonly);
-
-    CPFont                  _font;
-    CPColor                 _textColor;
-    CPColor                 _textShadowColor;
-
-    CGSize                  _minSize;
-    BOOL                    _isDirty;
-    BOOL                    _showsStateColumn;
-
-    _CPImageAndTextView     _imageAndTextView;
-    CPView                  _submenuView;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "menu-item-view";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{};
-}
-
-// Not used in the Appkit
-// + (float)leftMargin
-// {
-//     return LEFT_MARGIN + STATE_COLUMN_WIDTH;
-// }
-
-- (id)initWithFrame:(CGRect)aFrame forMenuItem:(CPMenuItem)aMenuItem
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _menuItem = aMenuItem;
-        _showsStateColumn = YES;
-        _isDirty = YES;
-
-        [self setAutoresizingMask:CPViewWidthSizable];
-
-        [self synchronizeWithMenuItem];
-    }
-
-    return self;
-}
-
-- (CGSize)minSize
-{
-    return _minSize;
-}
-
-- (void)setDirty
-{
-    _isDirty = YES;
-}
-
-- (void)synchronizeWithMenuItem
-{
-    var menuItemView = [_menuItem view];
-
-    if ([_menuItem isSeparatorItem])
-    {
-        if (![_view isKindOfClass:[_CPMenuItemSeparatorView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemSeparatorView view];
-        }
-    }
-    else if (menuItemView)
-    {
-        if (_view !== menuItemView)
-        {
-            [_view removeFromSuperview];
-            _view = menuItemView;
-        }
-    }
-    else if ([_menuItem menu] == [CPApp mainMenu])
-    {
-        if (![_view isKindOfClass:[_CPMenuItemMenuBarView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemMenuBarView view];
-        }
-
-        [_view setMenuItem:_menuItem];
-    }
-    else
-    {
-        if (![_view isKindOfClass:[_CPMenuItemStandardView class]])
-        {
-            [_view removeFromSuperview];
-            _view = [_CPMenuItemStandardView view];
-        }
-
-        [_view setMenuItem:_menuItem];
-    }
-
-    if ([_view superview] !== self)
-        [self addSubview:_view];
-
-    if ([_view respondsToSelector:@selector(update)])
-        [_view update];
-
-    _minSize = [_view frame].size;
-    [self setAutoresizesSubviews:NO];
-    [self setFrameSize:_minSize];
-    [self setAutoresizesSubviews:YES];
-}
-
-- (void)setShowsStateColumn:(BOOL)shouldShowStateColumn
-{
-    _showsStateColumn = shouldShowStateColumn;
-}
-
-- (void)highlight:(BOOL)shouldHighlight
-{
-    if ([_view respondsToSelector:@selector(highlight:)])
-        [_view highlight:shouldHighlight];
-}
-
-- (BOOL)eventOnSubmenu:(CPEvent)anEvent
-{
-    if (![_menuItem hasSubmenu])
-        return NO;
-
-    return CGRectContainsPoint([_submenuView frame], [self convertPoint:[anEvent locationInWindow] fromView:nil]);
-}
-
-- (BOOL)isHidden
-{
-    return [_menuItem isHidden];
-}
-
-- (CPMenuItem)menuItem
-{
-    return _menuItem;
-}
-
-- (void)setFont:(CPFont)aFont
-{
-    if ([_font isEqual:aFont])
-        return;
-
-    _font = aFont;
-
-    if ([_view respondsToSelector:@selector(setFont:)])
-        [_view setFont:aFont];
-
-    [self setDirty];
-}
-
-- (void)setTextColor:(CPColor)aColor
-{
-    if (_textColor == aColor)
-        return;
-
-    _textColor = aColor;
-
-    [_imageAndTextView setTextColor:[self textColor]];
-    [_submenuView setColor:[self textColor]];
-}
-
-- (CPColor)textColor
-{
-    return nil;
-}
-
-- (void)setTextShadowColor:(CPColor)aColor
-{
-    if (_textShadowColor == aColor)
-        return;
-
-    _textShadowColor = aColor;
-
-    [_imageAndTextView setTextShadowColor:[self textShadowColor]];
-    //[_submenuView setColor:[self textColor]];
-}
-
-- (CPColor)textShadowColor
-{
-    return [_menuItem isEnabled] ? (_textShadowColor ? _textShadowColor : [CPColor colorWithWhite:1.0 alpha:0.8]) : [CPColor colorWithWhite:0.8 alpha:0.8];
-}
-
-- (void)setParentMenuHighlightColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setHighlightColor:)])
-        [_view setHighlightColor:aColor];
-}
-
-- (void)setParentMenuHighlightTextColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setHighlightTextColor:)])
-        [_view setHighlightTextColor:aColor];
-}
-
-- (void)setParentMenuHighlightTextShadowColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setHighlightTextShadowColor:)])
-        [_view setHighlightTextShadowColor:aColor];
-}
-
-- (void)setParentMenuTextColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setTextColor:)])
-        [_view setTextColor:aColor];
-}
-
-- (void)setParentMenuTextShadowColor:(CPColor)aColor
-{
-    if ([_view respondsToSelector:@selector(setTextShadowColor:)])
-        [_view setTextShadowColor:aColor];
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPMenuItemView (CSSTheming)
-
-// MARK: Override
-
-- (void)_setThemeIncludingDescendants:(CPTheme)aTheme
-{
-    [self setTheme:aTheme];
-    [_view _setThemeIncludingDescendants:aTheme];
-
-    // Items must also perform this (without this, only the selected item does)
-
-    [_imageAndTextView _setThemeIncludingDescendants:aTheme];
-    [_submenuView _setThemeIncludingDescendants:aTheme];
-    [[_menuItem view] _setThemeIncludingDescendants:aTheme];
-
-    if ([_view respondsToSelector:@selector(update)])
-        [_view update];
-}
-
-@end
-
-// MARK: -
-
-@implementation _CPMenuItemArrowView : CPView
-{
-    CPColor _color;
-}
-
-- (void)setColor:(CPColor)aColor
-{
-    if (_color == aColor)
-        return;
-
-    _color = aColor;
-
-    [self setNeedsDisplay:YES];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-    CGContextBeginPath(context);
-
-    CGContextMoveToPoint(context, 1.0, 4.0);
-    CGContextAddLineToPoint(context, 9.0, 4.0);
-    CGContextAddLineToPoint(context, 5.0, 8.0);
-    CGContextClosePath(context);
-
-    CGContextSetFillColor(context, _color);
-    CGContextFillPath(context);
-}
-
-@end

AppKit/CPObjectController.j

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

AppKit/CPOpenPanel.j

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

AppKit/CPPanel.j

@@ -1,143 +0,0 @@
-/*
- * CPPanel.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPWindow.j"
-
-@global CPApp
-
-CPOKButton      = 1;
-CPCancelButton  = 0;
-
-CPDocModalWindowMask    = 1 << 6;
-
-/*!
-    @ingroup appkit
-    @class CPPanel
-
-    The CPPanel class defines objects that manage the panels of the Cappuccino user interface. A panel is a window that serves an auxiliary function within an application. It generally displays controls that the user can act on to give instructions to the application or to modify the contents of a standard window.</p>
-
-<p>Panels behave differently from standard windows in only a small number of ways, but the ways are important to the user interface:</p>
-
-<ul>
-    <li>Panels can assume key window status but not main window status. (The key window receives keyboard events. The main window is the primary focus of user actions; it might contain the document the user is working on, for example.)</li>
-</ul>
-
-<p>To aid in their auxiliary role, panels can be assigned special behaviors:</p>
-
-<ul>
-    <li>A panel can be precluded from becoming the key window until the user makes a selection (makes some view in the panel the first responder) indicating an intention to begin typing. This prevents key window status from shifting to the panel unnecessarily.</li>
-    <li>Palettes and similar panels can be made to float above standard windows and other panels. This prevents them from being covered and keeps them readily available to the user.</li>
-    <li>A panel can be made to work even when there's an attention panel on-screen. This permits actions within the panel to affect the attention panel.</li>
-</ul>
-*/
-
-/*
-    @global
-    @class CPWindow
-*/
-@implementation CPPanel : CPWindow
-{
-    BOOL    _becomesKeyOnlyIfNeeded;
-    BOOL    _worksWhenModal;
-}
-
-/*!
-    Returns \c YES if the receiver is a floating panel (like a palette).
-*/
-- (BOOL)isFloatingPanel
-{
-    return [self level] == CPFloatingWindowLevel;
-}
-
-/*!
-    Sets the receiver to be a floating panel. \c YES
-    makes the window a floating panel. \c NO makes it a normal window.
-    @param isFloatingPanel specifies whether to make it floating
-*/
-- (void)setFloatingPanel:(BOOL)isFloatingPanel
-{
-    [self setLevel:isFloatingPanel ? CPFloatingWindowLevel : CPNormalWindowLevel];
-}
-
-/*!
-    Returns \c YES if the window only becomes key
-    if needed. \c NO means it behaves just like other windows.
-*/
-- (BOOL)becomesKeyOnlyIfNeeded
-{
-    return _becomesKeyOnlyIfNeeded;
-}
-
-/*!
-    Sets whether the the window becomes key only if needed.
-    @param shouldBecomeKeyOnlyIfNeeded \c YES makes the window become key only if needed
-*/
-- (void)setBecomesKeyOnlyIfNeeded:(BOOL)shouldBecomeKeyOnlyIfNeeded
-{
-    _becomesKeyOnlyIfNeeded = shouldBecomeKeyOnlyIfNeeded
-}
-
-- (BOOL)worksWhenModal
-{
-    return _worksWhenModal;
-}
-
-/*!
-    Sets whether this window can receive input while another window is running modally.
-    @param shouldWorkWhenModal whether to receive input while another window is modal
-*/
-- (void)setWorksWhenModal:(BOOL)shouldWorkWhenModal
-{
-    _worksWhenModal = shouldWorkWhenModal;
-}
-
-- (BOOL)canBecomeMainWindow
-{
-    return NO;
-}
-
-- (BOOL)canBecomeKeyWindow
-{
-    return YES;
-}
-
-
-// MARK: -
-// MARK: Overrides
-
-/*!
-    @ignore
-*/
-- (void)cancelOperation:(id)sender
-{
-    if ([[CPApp currentEvent] _couldBeKeyEquivalent] && [self performKeyEquivalent:[CPApp currentEvent]])
-        return;
-
-    [[self firstResponder] tryToPerform:@selector(cancel:) with:self];
-}
-
-- (void)cancel:(id)sender
-{
-    [self performClose:sender];
-}
-
-@end

AppKit/CPPasteboard.j

@@ -1,391 +0,0 @@
-/*
- * CPPasteboard.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPArray.j>
-@import <Foundation/CPData.j>
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPPropertyListSerialization.j>
-
-@class CPWebScriptObject
-
-@typedef DataTransfer
-
-CPGeneralPboard         = @"CPGeneralPboard";
-CPFontPboard            = @"CPFontPboard";
-CPRulerPboard           = @"CPRulerPboard";
-CPFindPboard            = @"CPFindPboard";
-CPDragPboard            = @"CPDragPboard";
-
-CPColorPboardType       = @"CPColorPboardType";
-CPFilenamesPboardType   = @"CPFilenamesPboardType";
-CPFontPboardType        = @"CPFontPboardType";
-CPHTMLPboardType        = @"CPHTMLPboardType";
-CPStringPboardType      = @"CPStringPboardType";
-CPURLPboardType         = @"CPURLPboardType";
-CPImagesPboardType      = @"CPImagesPboardType";
-CPVideosPboardType      = @"CPVideosPboardType";
-CPRTFPboardType         = @"CPRTFPboardType";
-_CPSmartPboardType      = @"_CPSmartPboardType";
-_CPASPboardType         = @"_CPASPboardType";
-
-UTF8PboardType          = @"public.utf8-plain-text";
-
-// Deprecated
-CPImagePboardType       = @"CPImagePboardType";
-
-
-var CPPasteboards = nil;
-
-/*!
-    @ingroup appkit
-    @class CPPasteboard
-
-    CPPasteBoard is the object responsible for cut/copy/paste and drag&drop operations.
-*/
-@implementation CPPasteboard : CPObject
-{
-    CPArray         _types;
-    CPDictionary    _owners;
-    CPDictionary    _provided;
-
-    unsigned        _changeCount;
-    CPString        _stateUID;
-}
-
-/*
-    @ignore
-*/
-+ (void)initialize
-{
-    if (self !== [CPPasteboard class])
-        return;
-
-    [self setVersion:1.0];
-
-    CPPasteboards = @{};
-}
-
-/*!
-    Returns a new instance of a pasteboard
-*/
-+ (id)generalPasteboard
-{
-    return [CPPasteboard pasteboardWithName:CPGeneralPboard];
-}
-
-/*!
-    Returns a pasteboard with the specified name. If the pasteboard doesn't exist, it will be created.
-    @param aName the name of the pasteboard
-    @return the requested pasteboard
-*/
-+ (id)pasteboardWithName:(CPString)aName
-{
-    var pasteboard = [CPPasteboards objectForKey:aName];
-
-    if (pasteboard)
-        return pasteboard;
-
-    pasteboard = [[CPPasteboard alloc] _initWithName:aName];
-    [CPPasteboards setObject:pasteboard forKey:aName];
-
-    return pasteboard;
-}
-
-/* @ignore */
-- (id)_initWithName:(CPString)aName
-{
-    self = [super init];
-
-    if (self)
-    {
-//        _name = aName;
-        _types = [];
-
-        _owners = @{};
-        _provided = @{};
-
-        _changeCount = 0;
-    }
-
-    return self;
-}
-
-/*!
-    Adds supported data types to the pasteboard
-    @param types the data types
-    @param anOwner the object that contains the data types
-    @return the pasteboard's change count
-*/
-- (unsigned)addTypes:(CPArray)types owner:(id)anOwner
-{
-    var i = 0,
-        count = types.length;
-
-    for (; i < count; ++i)
-    {
-        var type = types[i];
-
-        if (![_owners objectForKey:type])
-        {
-            [_types addObject:type];
-            [_provided removeObjectForKey:type];
-        }
-
-        [_owners setObject:anOwner forKey:type];
-    }
-
-    return ++_changeCount;
-}
-
-/*!
-    Sets the data types that this pasteboard will contain.
-    @param type the data types it will support
-    @param anOwner the object that contains the the data
-    @return the pasteboard's change count
-*/
-- (unsigned)declareTypes:(CPArray)types owner:(id)anOwner
-{
-    [_types setArray:types];
-
-    _owners = @{};
-    _provided = @{};
-
-    if (anOwner)
-    {
-        var count = _types.length;
-        while (count--)
-            [_owners setObject:anOwner forKey:_types[count]];
-    }
-
-    return ++_changeCount;
-}
-
-/*!
-    Sets the pasteboard data for the specified type
-    @param aData the data
-    @param aType the data type being set
-    @return \c YES if the data was successfully written to the pasteboard
-*/
-- (BOOL)setData:(CPData)aData forType:(CPString)aType
-{
-    [_provided setObject:aData forKey:aType];
-
-    if (aType === CPStringPboardType)
-        [self setData:aData forType:UTF8PboardType];
-
-    return YES;
-}
-
-/*!
-    Writes the specified property list as data for the specified type
-    @param aPropertyList the property list to write
-    @param aType the data type
-    @return \c YES if the property list was successfully written to the pasteboard
-*/
-- (BOOL)setPropertyList:(id)aPropertyList forType:(CPString)aType
-{
-    return [self setData:[CPPropertyListSerialization dataFromPropertyList:aPropertyList format:CPPropertyList280NorthFormat_v1_0] forType:aType];
-}
-
-/*!
-    Sets the specified string as data for the specified type
-    @param aString the string to write
-    @param aType the data type
-    @return \c YES if the string was successfully written to the pasteboard
-*/
-- (void)setString:(CPString)aString forType:(CPString)aType
-{
-    // Putting a non-string on the string pasteboard can lead to strange crashes.
-    if (aString && aString.isa && ![aString isKindOfClass:CPString])
-        [CPException raise:CPInvalidArgumentException reason:"CPPasteboard setString:forType: must be called with a string."];
-
-    [self setPropertyList:aString forType:aType];
-}
-
-// Determining Types
-/*!
-    Checks the pasteboard's types for a match with the types listed in the specified array. The array should
-    be ordered by the requestor's most preferred data type first.
-    @param anArray an array of requested types ordered by preference
-    @return the highest match with the pasteboard's supported types or \c nil if no match was found
-*/
-- (CPString)availableTypeFromArray:(CPArray)anArray
-{
-    return [anArray firstObjectCommonWithArray:[self types]];
-}
-
-/*!
-    Returns the pasteboards supported types
-*/
-- (CPArray)types
-{
-    return _types;
-}
-
-// Reading data
-/*!
-    Returns the number of changes that have occurred to this pasteboard
-*/
-- (unsigned)changeCount
-{
-    return _changeCount;
-}
-
-/*!
-    Returns the pasteboard data for the specified data type
-    @param aType the requested data type
-    @return the requested data or \c nil if the data doesn't exist
-*/
-- (CPData)dataForType:(CPString)aType
-{
-    var data = [_provided objectForKey:aType];
-
-    if (data)
-        return data;
-
-    var owner = [_owners objectForKey:aType];
-
-    if (owner)
-    {
-        [owner pasteboard:self provideDataForType:aType];
-        return [_provided objectForKey:aType];
-    }
-
-    if (aType === CPStringPboardType)
-        return [self dataForType:UTF8PboardType];
-
-    return nil;
-}
-
-/*!
-    Returns the property list for the specified data type
-    @param aType the requested data type
-    @return the property list or \c nil if the list was not found
-*/
-- (id)propertyListForType:(CPString)aType
-{
-    var data = [self dataForType:aType];
-
-    if (data)
-        return [CPPropertyListSerialization propertyListFromData:data format:CPPropertyList280NorthFormat_v1_0];
-
-    return nil;
-}
-
-/*!
-    Returns the string for the specified data type
-    @param aType the requested data type
-    @return the string or \c nil if the string was not found
-*/
-- (CPString)stringForType:(CPString)aType
-{
-    return [self propertyListForType:aType];
-}
-
-/* @ignore */
-- (CPString)_generateStateUID
-{
-    var bits = 32;
-
-    _stateUID = @"";
-
-    while (bits--)
-        _stateUID += FLOOR(RAND() * 16.0).toString(16).toUpperCase();
-
-    return _stateUID;
-}
-
-/* @ignore */
-- (CPString)_stateUID
-{
-    return _stateUID;
-}
-
-@end
-
-#if PLATFORM(DOM)
-
-var DOMDataTransferPasteboard = nil;
-
-@implementation _CPDOMDataTransferPasteboard : CPPasteboard
-{
-    DataTransfer    _dataTransfer;
-}
-
-+ (_CPDOMDataTransferPasteboard)DOMDataTransferPasteboard
-{
-    if (!DOMDataTransferPasteboard)
-        DOMDataTransferPasteboard = [[_CPDOMDataTransferPasteboard alloc] init];
-
-    return DOMDataTransferPasteboard;
-}
-
-- (void)_setDataTransfer:(DataTransfer)aDataTransfer
-{
-    _dataTransfer = aDataTransfer;
-}
-
-- (void)_setPasteboard:(CPPasteboard)aPasteboard
-{
-    _dataTransfer.clearData();
-
-    var types = [aPasteboard types],
-        count = types.length;
-
-    while (count--)
-    {
-        var type = types[count];
-
-        if (type === CPStringPboardType)
-            _dataTransfer.setData(type, [aPasteboard stringForType:type]);
-        else
-            _dataTransfer.setData(type, [[aPasteboard dataForType:type] rawString]);
-    }
-}
-
-- (CPArray)types
-{
-    return Array.prototype.slice.apply(_dataTransfer.types);
-}
-
-- (CPData)dataForType:(CPString)aType
-{
-    var dataString = _dataTransfer.getData(aType);
-
-    if (aType === CPStringPboardType)
-        return [CPData dataFromPropertyList:dataString format:kCFPropertyList280NorthFormat_v1_0];
-
-    return [CPData dataWithRawString:dataString];
-}
-
-- (id)propertyListForType:(CPString)aType
-{
-    if (aType === CPStringPboardType)
-        return _dataTransfer.getData(aType);
-
-    return [CPPropertyListSerialization propertyListFromData:[self dataForType:aType] format:CPPropertyListUnknownFormat];
-}
-
-@end
-
-#endif

AppKit/CPPopover.j

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

AppKit/CPProgressIndicator.j

@@ -1,590 +0,0 @@
-/*
- * CPProgressIndicator.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CGGeometry.j"
-@import "CPImageView.j"
-@import "CPView.j"
-@import "CPWindow_Constants.j"
-
-
-@typedef CPProgressIndicatorStyle
-/*
-    @global
-    @group CPProgressIndicatorStyle
-*/
-CPProgressIndicatorBarStyle = 0;
-/*
-    @global
-    @group CPProgressIndicatorStyle
-*/
-CPProgressIndicatorSpinningStyle = 1;
-/*
-    @global
-    @group CPProgressIndicatorStyle
-*/
-CPProgressIndicatorHUDBarStyle = 2;
-
-var CPProgressIndicatorSpinningStyleColors = [];
-
-/*!
-    @ingroup appkit
-    @class CPProgressIndicator
-
-    This class is used in a Cappuccino GUI to display the progress of a
-    function or task. If the duration of the task is unknown, there is
-    also an indeterminate mode for the indicator.
-*/
-@implementation CPProgressIndicator : CPView
-{
-    double                      _minValue;
-    double                      _maxValue;
-
-    double                      _doubleValue;
-
-    CPControlSize               _controlSize;
-
-    BOOL                        _indeterminate;
-    CPProgressIndicatorStyle    _style;
-
-    BOOL                        _isAnimating;
-
-    BOOL                        _isDisplayedWhenStoppedSet;
-    BOOL                        _isDisplayedWhenStopped;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"progress-indicator";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"indeterminate-bar-color": [CPNull null],
-            @"bar-color": [CPNull null],
-            @"default-height": 20,
-            @"bezel-color": [CPNull null],
-            @"spinning-mini-gif": [CPNull null],
-            @"spinning-small-gif": [CPNull null],
-            @"spinning-regular-gif": [CPNull null],
-            @"circular-border-color": [CPNull null],
-            @"circular-border-size": 1,
-            @"circular-color": [CPNull null]
-        };
-}
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding || aBinding === @"isIndeterminate")
-        return [_CPProgressIndicatorBinder class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        _minValue = 0.0;
-        _maxValue = 100.0;
-
-        _doubleValue = 0.0;
-
-        _style = CPProgressIndicatorBarStyle;
-        _isDisplayedWhenStoppedSet = NO;
-
-        _controlSize = CPRegularControlSize;
-
-        [self setNeedsLayout];
-    }
-
-    return self;
-}
-
-/*
-    @ignore
-*/
-- (void)setUsesThreadedAnimation:(BOOL)aFlag
-{
-}
-
-/*!
-    Starts the animation of the progress indicator in indeterminate mode.
-    @param the requesting object
-*/
-- (void)startAnimation:(id)aSender
-{
-    _isAnimating = YES;
-
-    [self _hideOrDisplay];
-}
-
-/*!
-    Stops the animation of the progress indicator in indeterminate mode.
-    @param the requesting object
-*/
-- (void)stopAnimation:(id)aSender
-{
-    _isAnimating = NO;
-
-    [self _hideOrDisplay];
-}
-
-/*!
-    Always returns \c NO. Cappuccino does not have multiple threads.
-*/
-- (BOOL)usesThreadedAnimation
-{
-    return NO;
-}
-
-// Advancing the Progress Bar
-/*!
-    Increases the progress of the bar by the specified value.
-    @param aValue the amount to increase the progress value
-*/
-- (void)incrementBy:(double)aValue
-{
-    [self setDoubleValue:_doubleValue + aValue];
-}
-
-/*!
-    Sets the progress value of the indicator.
-*/
-- (void)setDoubleValue:(double)aValue
-{
-    _doubleValue = MIN(MAX(aValue, _minValue), _maxValue);
-
-    [self drawBar];
-}
-
-/*!
-    Returns the value of the progress indicator.
-*/
-- (double)doubleValue
-{
-    return _doubleValue;
-}
-
-/*!
-    Sets the minimum value of the progress indicator. The default is 0.0.
-    @param aValue the new minimum value
-*/
-- (void)setMinValue:(double)aValue
-{
-    _minValue = aValue;
-}
-
-/*!
-    Returns the minimum value of the progress indicator.
-*/
-- (double)minValue
-{
-    return _minValue;
-}
-
-/*!
-    Sets the maximum value of the progress indicator. The default is 100.0.
-    @param aValue the new maximum value.
-*/
-- (void)setMaxValue:(double)aValue
-{
-    _maxValue = aValue;
-}
-
-/*!
-    Returns the maximum value of the progress indicator.
-*/
-- (double)maxValue
-{
-    return _maxValue;
-}
-
-// Setting the Appearance
-/*!
-    Sets the progress indicator's size.
-    @param aControlSize the new size
-*/
-- (void)setControlSize:(CPControlSize)aControlSize
-{
-    if (_controlSize == aControlSize)
-        return;
-
-    _controlSize = aControlSize;
-
-    [self updateBackgroundColor];
-}
-
-/*!
-    Returns the progress indicator's size
-*/
-- (CPControlSize)controlSize
-{
-    return _controlSize;
-}
-
-/*
-    Not yet implemented
-*/
-- (void)setControlTint:(CPControlTint)aControlTint
-{
-}
-
-/*
-    Not yet implemented.
-*/
-- (CPControlTint)controlTint
-{
-    return 0;
-}
-
-/*
-    Not yet implemented.
-*/
-- (void)setBezeled:(BOOL)isBezeled
-{
-}
-
-/*
-    Not yet implemented.
-*/
-- (BOOL)isBezeled
-{
-    return YES;
-}
-
-/*!
-    Specifies whether this progress indicator should be indeterminate or display progress based on it's max and min.
-    @param isDeterminate \c YES makes the indicator indeterminate
-*/
-- (void)setIndeterminate:(BOOL)indeterminate
-{
-    if (_indeterminate == indeterminate)
-        return;
-
-    _indeterminate = indeterminate;
-
-    [self updateBackgroundColor];
-}
-
-/*!
-    Returns \c YES if the progress bar is indeterminate.
-*/
-- (BOOL)isIndeterminate
-{
-    return _indeterminate;
-}
-
-/*!
-    Sets the progress indicator's style
-    @param aStyle the style to set it to
-*/
-- (void)setStyle:(CPProgressIndicatorStyle)aStyle
-{
-    if (_style == aStyle)
-        return;
-
-    _style = aStyle;
-
-    [self setTheme:(_style === CPProgressIndicatorHUDBarStyle) ? [CPTheme defaultHudTheme] : [CPTheme defaultTheme]];
-
-    [self updateBackgroundColor];
-}
-
-/*!
-    Resizes the indicator based on it's style.
-*/
-- (void)sizeToFit
-{
-    if (_style == CPProgressIndicatorSpinningStyle)
-        [self setFrameSize:[[CPProgressIndicatorSpinningStyleColors[_controlSize] patternImage] size]];
-    else
-        [self setFrameSize:CGSizeMake(CGRectGetWidth([self frame]), [self valueForThemeAttribute:@"default-height"])];
-}
-
-/*!
-    Sets whether the indicator should be displayed when it isn't animating. By default this is \c YES if the style
-    is CPProgressIndicatorBarStyle, and \c NO if it's CPProgressIndicatorSpinningStyle.
-    @param isDisplayedWhenStopped \c YES means the indicator will be displayed when it's not animating.
-*/
-- (void)setDisplayedWhenStopped:(BOOL)isDisplayedWhenStopped
-{
-    if (_isDisplayedWhenStoppedSet && _isDisplayedWhenStopped == isDisplayedWhenStopped)
-        return;
-
-    _isDisplayedWhenStoppedSet = YES;
-
-    _isDisplayedWhenStopped = isDisplayedWhenStopped;
-
-    [self _hideOrDisplay];
-}
-
-/*!
-    Returns \c YES if the progress bar is displayed when not animating.
-*/
-- (BOOL)isDisplayedWhenStopped
-{
-    if (_isDisplayedWhenStoppedSet)
-        return _isDisplayedWhenStopped;
-
-    if (_style == CPProgressIndicatorBarStyle || _style == CPProgressIndicatorHUDBarStyle)
-        return YES;
-
-    return NO;
-}
-
-/* @ignore */
-- (void)_hideOrDisplay
-{
-    [self setHidden:!_isAnimating && ![self isDisplayedWhenStopped]];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrameSize:aSize];
-
-    [self drawBar];
-}
-
-/* @ignore */
-- (void)drawBar
-{
-    [self setNeedsLayout];
-    [self setNeedsDisplay:YES];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    return [[CPView alloc] initWithFrame:CGRectMakeZero()];
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aViewName
-{
-    if (aViewName === @"bar-view" && _style !== CPProgressIndicatorSpinningStyle)
-    {
-        var width = CGRectGetWidth([self bounds]),
-            barWidth = width * ((_doubleValue - _minValue) / (_maxValue - _minValue));
-
-        if (barWidth > 0.0 && barWidth < 4.0)
-            barWidth = 4.0;
-
-        if (_indeterminate)
-            barWidth = width;
-
-        return CGRectMake(0, 0, barWidth, [self valueForThemeAttribute:@"default-height"]);
-    }
-
-    return nil;
-}
-
-/* @ignore */
-- (void)updateBackgroundColor
-{
-    if ([CPProgressIndicatorSpinningStyleColors count] === 0)
-    {
-        CPProgressIndicatorSpinningStyleColors[CPMiniControlSize] = [self valueForThemeAttribute:@"spinning-mini-gif"];
-        CPProgressIndicatorSpinningStyleColors[CPSmallControlSize] = [self valueForThemeAttribute:@"spinning-small-gif"];
-        CPProgressIndicatorSpinningStyleColors[CPRegularControlSize] = [self valueForThemeAttribute:@"spinning-regular-gif"];
-    }
-
-    [self setNeedsLayout];
-}
-
-- (void)layoutSubviews
-{
-    if (YES)//_isBezeled)
-    {
-        if (_style == CPProgressIndicatorSpinningStyle)
-        {
-            if (!_indeterminate)
-                return;
-
-            // This will cause the bar view to go away due to having a nil rect when _style == CPProgressIndicatorSpinningStyle.
-            [self layoutEphemeralSubviewNamed:"bar-view"
-                                   positioned:CPWindowBelow
-              relativeToEphemeralSubviewNamed:nil];
-
-            [self setBackgroundColor:CPProgressIndicatorSpinningStyleColors[_controlSize]];
-        }
-        else
-        {
-           [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-
-           var barView = [self layoutEphemeralSubviewNamed:"bar-view"
-                                                 positioned:CPWindowBelow
-                            relativeToEphemeralSubviewNamed:nil];
-
-           if (_indeterminate)
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"indeterminate-bar-color"]];
-           else
-               [barView setBackgroundColor:[self currentValueForThemeAttribute:@"bar-color"]];
-        }
-    }
-    else
-        [self setBackgroundColor:nil];
-}
-
-- (void)drawRect:(CGRect)aRect
-{
-    if (_style == CPProgressIndicatorSpinningStyle && !_indeterminate)
-    {
-        var context = [[CPGraphicsContext currentContext] graphicsPort],
-            rect = CGRectMakeCopy(aRect),
-            borderSize = [self currentValueForThemeAttribute:@"circular-border-size"];
-
-        rect.origin.x += borderSize;
-        rect.origin.y += borderSize;
-        rect.size.width = rect.size.width - borderSize * 2;
-        rect.size.height = rect.size.height - borderSize * 2;
-
-        if ([self doubleValue] > [self minValue] && [self doubleValue] < [self maxValue])
-        {
-            var midX = CGRectGetMidX(rect),
-                midY = CGRectGetMidY(rect),
-                endAngle = Math.PI * 2 * (([self doubleValue] - [self minValue]) / ([self maxValue] - [self minValue])) - Math.PI / 2,
-                radius = MIN(rect.size.width / 2, rect.size.height / 2);
-
-            CGContextBeginPath(context);
-            CGContextSetLineWidth(context, borderSize);
-            CGContextSetFillColor(context, [self currentValueForThemeAttribute:@"circular-color"]);
-            CGContextMoveToPoint(context, midX, midY);
-            CGContextAddArc(context, midX, midY, radius, 3 * Math.PI / 2, endAngle, YES);
-            CGContextAddLineToPoint(context, midX, midY);
-            CGContextClosePath(context);
-            CGContextFillPath(context);
-            CGContextStrokePath(context);
-        }
-        else if ([self doubleValue] == [self maxValue])
-        {
-            CGContextBeginPath(context);
-            CGContextSetFillColor(context, [self currentValueForThemeAttribute:@"circular-color"]);
-            CGContextAddEllipseInRect(context, rect);
-            CGContextClosePath(context);
-            CGContextFillPath(context);
-        }
-
-        CGContextBeginPath(context);
-        CGContextSetStrokeColor(context , [self currentValueForThemeAttribute:@"circular-border-color"]);
-        CGContextSetLineWidth(context, borderSize);
-        CGContextAddEllipseInRect(context, rect);
-        CGContextClosePath(context);
-        CGContextStrokePath(context);
-    }
-}
-
-@end
-
-
-@implementation CPProgressIndicator (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _minValue                   = [aCoder decodeObjectForKey:@"_minValue"];
-        _maxValue                   = [aCoder decodeObjectForKey:@"_maxValue"];
-        _doubleValue                = [aCoder decodeObjectForKey:@"_doubleValue"];
-        _controlSize                = [aCoder decodeObjectForKey:@"_controlSize"];
-        _indeterminate              = [aCoder decodeObjectForKey:@"_indeterminate"];
-        _style                      = [aCoder decodeIntForKey:@"_style"];
-        _isAnimating                = [aCoder decodeObjectForKey:@"_isAnimating"];
-        _isDisplayedWhenStoppedSet  = [aCoder decodeObjectForKey:@"_isDisplayedWhenStoppedSet"];
-        _isDisplayedWhenStopped     = [aCoder decodeObjectForKey:@"_isDisplayedWhenStopped"];
-
-        [self updateBackgroundColor];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // Don't encode the background colour. It can be recreated based on the flags
-    // and if encoded causes hardcoded image paths in the cib while just wasting space.
-    var backgroundColor = [self backgroundColor];
-    [self setBackgroundColor:nil];
-    [super encodeWithCoder:aCoder];
-    [self setBackgroundColor:backgroundColor];
-
-    [aCoder encodeObject:_minValue forKey:@"_minValue"];
-    [aCoder encodeObject:_maxValue forKey:@"_maxValue"];
-    [aCoder encodeObject:_doubleValue forKey:@"_doubleValue"];
-    [aCoder encodeObject:_controlSize forKey:@"_controlSize"];
-    [aCoder encodeObject:_indeterminate forKey:@"_indeterminate"];
-    [aCoder encodeInt:_style forKey:@"_style"];
-    [aCoder encodeObject:_isAnimating forKey:@"_isAnimating"];
-    [aCoder encodeObject:_isDisplayedWhenStoppedSet forKey:@"_isDisplayedWhenStoppedSet"];
-    [aCoder encodeObject:_isDisplayedWhenStopped forKey:@"_isDisplayedWhenStopped"];
-}
-
-@end
-
-
-@implementation _CPProgressIndicatorBinder : CPBinder
-
-- (void)_updatePlaceholdersWithOptions:(CPDictionary)options forBinding:(CPString)aBinding
-{
-    var value = aBinding === CPValueBinding ? 0.0 : YES;
-
-    [self _setPlaceholder:value forMarker:CPMultipleValuesMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNoSelectionMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNotApplicableMarker isDefault:YES];
-    [self _setPlaceholder:value forMarker:CPNullMarker isDefault:YES];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        return [_source doubleValue];
-    else if (aBinding === @"isIndeterminate")
-        [_source isIndeterminate];
-    else
-        return [super valueForBinding:aBinding];
-}
-
-- (BOOL)_setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (aBinding === CPValueBinding)
-        [_source setDoubleValue:aValue];
-    else if (aBinding === @"isIndeterminate")
-        [_source setIndeterminate:aValue];
-    else
-        return NO;
-
-    return YES;
-}
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    if (![self _setValue:aValue forBinding:aBinding])
-        [super setValue:aValue forBinding:aBinding];
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    if (![self _setValue:aValue forBinding:aBinding])
-        [super setPlaceholderValue:aValue withMarker:aMarker forBinding:aBinding];
-}
-
-@end

AppKit/CPRadio.j

@@ -1,568 +0,0 @@
-/*
- * CPRadio.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2009, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPSet.j>
-
-@import "CPButton.j"
-
-@class CPRadioGroup
-
-@global CPApp
-
-CPRadioImageOffset = 4.0;
-
-/*!
-    @ingroup appkit
-
-    from this mailing list thread:
-    http://groups.google.com/group/objectivej/browse_thread/thread/7c41cbd9cbee9ea3
-
-    -----------------------------------
-
-    Creating a checkbox is easy enough:
-
-    checkbox = [[CPCheckBox alloc] initWithFrame:aFrame];
-
-    That's basically all there is to it. Radio buttons are very similar,
-    the key difference is the introduction of a new class CPRadioGroup,
-    which defines which radio buttons are part of the same group:
-
-    [myRadioButton setRadioGroup:aRadioGroup];
-
-    Every radio button receives a unique radio group by default (so if you
-    do nothing further, they will all behave independently), but you can
-    use an existing radio button's group with other buttons as so:
-
-    button1 = [[CPRadio alloc] initWithFrame:aFrame];
-    ...
-    button2 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
-    radioGroup]];
-    ...
-    button3 = [[CPRadio alloc] initWithFrame:aFrame radioGroup:[button1
-    radioGroup]];
-    ...etc...
-
-    Here, all the radio buttons will act "together". [[button1 radioGroup]
-    allRadios] returns every button that's part of this group, and
-    [[button1 radioGroup] selectedRadio] returns the currently selected
-    option.
-
-    UPDATE 09/2020 : Implementation of modern Cocoa behavior :
-
-    As in Cocoa, radio buttons grouping is now automatic.
-
-    To be associated in a common group (and so being mutually exclusive),
-    radio buttons must combine 2 criteria :
-
-    - same superview (enclosing view)
-    - same action
-
-    TODO: This first implementation uses "as is" CPRadioGroup. This could
-          be simplified (no more need for radio group action, for example)
-*/
-@implementation CPRadio : CPButton
-{
-    CPRadioGroup    _radioGroup;
-}
-
-+ (id)radioWithTitle:(CPString)aTitle theme:(CPTheme)aTheme
-{
-    return [self buttonWithTitle:aTitle theme:aTheme];
-}
-
-+ (id)radioWithTitle:(CPString)aTitle
-{
-    return [self buttonWithTitle:aTitle];
-}
-
-+ (CPButton)standardButtonWithTitle:(CPString)aTitle
-{
-    var button = [[CPRadio alloc] init];
-
-    [button setTitle:aTitle];
-
-    return button;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return @"radio";
-}
-
-// Designated Initializer
-- (id)initWithFrame:(CGRect)aFrame radioGroup:(CPRadioGroup)aRadioGroup
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        [self setRadioGroup:aRadioGroup];
-
-        [self setHighlightsBy:CPContentsCellMask];
-        [self setShowsStateBy:CPContentsCellMask];
-
-        // Defaults?
-        [self setImagePosition:CPImageLeft];
-        [self setAlignment:CPLeftTextAlignment];
-
-        [self setBordered:YES];
-    }
-
-    return self;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    return [self initWithFrame:aFrame radioGroup:[CPRadioGroup new]];
-}
-
-- (CPInteger)nextState
-{
-    return CPOnState;
-}
-
-- (void)setRadioGroup:(CPRadioGroup)aRadioGroup
-{
-    if (_radioGroup === aRadioGroup)
-        return;
-
-    [_radioGroup _removeRadio:self];
-    _radioGroup = aRadioGroup;
-    [_radioGroup _addRadio:self];
-}
-
-- (CPRadioGroup)radioGroup
-{
-    return _radioGroup;
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:aValue];
-
-    if ([self state] === CPOnState)
-        [_radioGroup _setSelectedRadio:self];
-}
-
-- (BOOL)sendAction:(SEL)anAction to:(id)anObject
-{
-    [super sendAction:anAction to:anObject];
-
-    if (_radioGroup)
-        [CPApp sendAction:[_radioGroup action] to:[_radioGroup target] from:_radioGroup];
-}
-
-- (void)viewDidMoveToSuperview
-{
-    [self _setRadioGroup];
-    [super viewDidMoveToSuperview];
-}
-
-- (void)setAction:(SEL)anAction
-{
-    if (anAction === _action)
-        return;
-
-    [super setAction:anAction];
-    [self _setRadioGroup];
-}
-
-// MARK: Private methods
-
-- (void)_setRadioGroup
-{
-    // Implementation of modern Cocoa behavior : automatic radio group
-
-    // If no action is set or no superview, no grouping can be done.
-    if (![self action] || ![self superview])
-    {
-        // If this radio is in a group (size > 1), remove it.
-        if ([[self radioGroup] size] > 1)
-        {
-            [self setRadioGroup:[CPRadioGroup new]];
-
-            if ([self state] === CPOnState)
-                [_radioGroup _setSelectedRadio:self];
-        }
-
-        return;
-    }
-
-    // Search in superview subviews for other radio buttons having the same action.
-    // Take the one with the radio group having the greatest number of members.
-
-    var radioGroup;
-
-    for (var i = 0, superviewSubviews = [[self superview] subviews], count = [superviewSubviews count], aSubview, myAction = [self action], radioGroupSize = -1; (i < count); i++)
-    {
-        aSubview = superviewSubviews[i];
-
-        if ([aSubview isKindOfClass:CPRadio] && (aSubview !== self) && ([aSubview action] === myAction) && ([[aSubview radioGroup] size] > radioGroupSize))
-        {
-            radioGroup     = [aSubview radioGroup];
-            radioGroupSize = [radioGroup size];
-        }
-    }
-
-    if (radioGroup)
-        [self setRadioGroup:radioGroup];
-    else
-        // No other radio buttons to group with found.
-        // It may be because this radio button was in a radio group and its action was changed.
-        // If this is the case, we must reisolate it in a new radio group.
-        if ([_radioGroup size] > 1)
-            [self setRadioGroup:[CPRadioGroup new]];
-
-    if ([self state] === CPOnState)
-        [_radioGroup _setSelectedRadio:self];
-}
-
-@end
-
-var CPRadioRadioGroupKey    = @"CPRadioRadioGroupKey";
-
-@implementation CPRadio (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super initWithCoder:aCoder];
-
-    if (self)
-        _radioGroup = [aCoder decodeObjectForKey:CPRadioRadioGroupKey];
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeObject:_radioGroup forKey:CPRadioRadioGroupKey];
-}
-
-// MARK: -
-// MARK: Override methods from CPButton
-
-- (CPThemeState)_contentVisualState
-{
-    // Note : Behavior differs from CPButton as title doesn't follow the highlightsBy content flag
-
-    var visualState  = [self themeState] || CPThemeStateNormal, // Needed during theme compilation
-        currentState = [self state];
-
-    if ((currentState !== CPOffState) && (_showsStateBy & CPContentsCellMask))
-        visualState = visualState.and((currentState === CPOnState) ? CPThemeStateSelected : CPButtonStateMixed);
-
-    return visualState;
-}
-
-- (CPThemeState)_imageVisualState
-{
-    // Note : Behavior differs from CPButton as we don't force "not selected" theme state
-    //        when button is highglighted and selected
-
-    var visualState  = [self themeState] || CPThemeStateNormal, // Needed during theme compilation
-        currentState = [self state];
-
-    if (_isHighlighted && (_highlightsBy & CPContentsCellMask))
-        visualState = visualState.and(CPThemeStateHighlighted);
-
-    if ((currentState !== CPOffState) && (_showsStateBy & CPContentsCellMask))
-        visualState = visualState.and((currentState === CPOnState) ? CPThemeStateSelected : CPButtonStateMixed);
-
-    return visualState;
-}
-
-@end
-
-@implementation CPRadioGroup : CPObject
-{
-    CPArray _radios;
-    CPRadio _selectedRadio;
-
-    BOOL    _enabled @accessors(getter=enabled);
-    BOOL    _hidden @accessors(getter=hidden);
-
-    id      _target @accessors(property=target);
-    SEL     _action @accessors(property=action);
-}
-
-+ (void)initialize
-{
-    if (self !== [CPRadioGroup class])
-        return;
-
-    [self exposeBinding:CPSelectedValueBinding];
-    [self exposeBinding:CPSelectedTagBinding];
-    [self exposeBinding:CPSelectedIndexBinding];
-
-    [self exposeBinding:CPEnabledBinding];
-    [self exposeBinding:CPHiddenBinding];
-}
-
-- (id)init
-{
-    self = [super init];
-
-    if (self)
-    {
-        _radios = [];
-        _selectedRadio = nil;
-        _enabled = YES;
-        _hidden = NO;
-    }
-
-    return self;
-}
-
-/*!
-    Selects the radio button at the given index within the group.
-    If index is -1, all of the radio buttons are turned off.
-*/
-- (void)selectRadioAtIndex:(int)index
-{
-    if (index === -1)
-        [self _setSelectedRadio:nil];
-    else
-    {
-        var radio = [_radios objectAtIndex:index];
-
-        [self _setSelectedRadio:radio];
-        [radio setState:CPOnState];
-    }
-}
-
-/*!
-    Selects the first radio button within the group with the given tag.
-    If a radio button with the given tag is found, selects it
-    and returns YES. Otherwise returns NO.
-*/
-- (BOOL)selectRadioWithTag:(int)tag
-{
-    var index = [_radios indexOfObjectPassingTest:function(radio)
-                {
-                    return [radio tag] === tag;
-                }];
-
-    if (index !== CPNotFound)
-    {
-        [self selectRadioAtIndex:index];
-        return YES;
-    }
-    else
-        return NO;
-}
-
-/*!
-    Returns the CPRadio that is currently selected within the group,
-    or nil if none are selected.
-*/
-- (CPRadio)selectedRadio
-{
-    return _selectedRadio;
-}
-
-/*!
-    Returns the index of the selected radio within the array of radio buttons.
-    Buttons are numbered going left to right and top to bottom. Returns -1
-    if no radio within the group is selected.
-*/
-- (int)selectedRadioIndex
-{
-    return [_radios indexOfObject:_selectedRadio];
-}
-
-- (CPArray)radios
-{
-    return _radios;
-}
-
-- (int)size
-{
-    return [_radios count];
-}
-
-- (void)setEnabled:(BOOL)enabled
-{
-    [_radios makeObjectsPerformSelector:@selector(setEnabled:) withObject:enabled];
-}
-
-- (void)setHidden:(BOOL)hidden
-{
-    [_radios makeObjectsPerformSelector:@selector(setHidden:) withObject:hidden];
-}
-
-// MARK: Private
-
-- (void)_addRadio:(CPRadio)aRadio
-{
-    if ([_radios indexOfObject:aRadio] === CPNotFound)
-        [_radios addObject:aRadio];
-
-    if ([aRadio state] === CPOnState)
-        [self _setSelectedRadio:aRadio];
-}
-
-- (void)_removeRadio:(CPRadio)aRadio
-{
-    if (_selectedRadio === aRadio)
-        _selectedRadio = nil;
-
-    [_radios removeObject:aRadio];
-}
-
-/*!
-    Selects the first radio button within the group with the given tag.
-    If a radio button with the given tag is found, selects it
-    and returns YES. Otherwise returns NO.
-*/
-- (void)_selectRadioWithTitle:(CPString)aTitle
-{
-    var index = [_radios indexOfObjectPassingTest:function(radio)
-                    {
-                        return [radio title] === aTitle;
-                    }];
-
-    [self selectRadioAtIndex:index];
-}
-
-- (void)_setSelectedRadio:(CPRadio)aRadio
-{
-    if (_selectedRadio === aRadio)
-        return;
-
-    [_selectedRadio setState:CPOffState];
-
-    _selectedRadio = aRadio;
-    [_CPRadioGroupSelectionBinder _reverseSetValueFromExclusiveBinderForObject:self];
-}
-
-@end
-
-var CPRadioGroupRadiosKey           = @"CPRadioGroupRadiosKey",
-    CPRadioGroupSelectedRadioKey    = @"CPRadioGroupSelectedRadioKey";
-
-@implementation CPRadioGroup (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        _radios = [aCoder decodeObjectForKey:CPRadioGroupRadiosKey];
-        _selectedRadio = [aCoder decodeObjectForKey:CPRadioGroupSelectedRadioKey];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [aCoder encodeObject:_radios forKey:CPRadioGroupRadiosKey];
-    [aCoder encodeObject:_selectedRadio forKey:CPRadioGroupSelectedRadioKey];
-}
-
-@end
-
-@implementation CPRadioGroup (BindingSupport)
-
-+ (Class)_binderClassForBinding:(CPString)aBinding
-{
-    if (aBinding === CPSelectedValueBinding   ||
-        aBinding === CPSelectedTagBinding     ||
-        aBinding === CPSelectedIndexBinding)
-    {
-        var capitalizedBinding = aBinding.charAt(0).toUpperCase() + aBinding.substr(1);
-
-        return [CPClassFromString(@"_CPRadioGroup" + capitalizedBinding + "Binder") class];
-    }
-    else if ([aBinding hasPrefix:CPEnabledBinding])
-        return [CPMultipleValueAndBinding class];
-    else if ([aBinding hasPrefix:CPHiddenBinding])
-        return [CPMultipleValueOrBinding class];
-
-    return [super _binderClassForBinding:aBinding];
-}
-
-+ (BOOL)isBindingExclusive:(CPString)aBinding
-{
-    return (aBinding == CPSelectedIndexBinding ||
-           aBinding == CPSelectedTagBinding ||
-           aBinding == CPSelectedValueBinding);
-}
-
-@end
-
-@implementation _CPRadioGroupSelectionBinder : CPBinder
-{
-}
-
-- (void)setPlaceholderValue:(id)aValue withMarker:(CPString)aMarker forBinding:(CPString)aBinding
-{
-    [self setValue:aValue forBinding:aBinding];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedIndexBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectRadioAtIndex:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [_source selectedRadioIndex];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedTagBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source selectRadioWithTag:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedRadio] tag];
-}
-
-@end
-
-@implementation _CPRadioGroupSelectedValueBinder : _CPRadioGroupSelectionBinder
-
-- (void)setValue:(id)aValue forBinding:(CPString)aBinding
-{
-    [_source _selectRadioWithTitle:aValue];
-}
-
-- (id)valueForBinding:(CPString)aBinding
-{
-    return [[_source selectedRadio] title];
-}
-
-@end

AppKit/CPResponder.j

@@ -1,406 +0,0 @@
-/*
- * CPResponder.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPObjJRuntime.j>
-
-@import "CPEvent.j"
-@import "CPCursor.j"
-
-@class CPKeyBinding
-@class CPMenu
-
-CPDeleteKeyCode         = 8;
-CPTabKeyCode            = 9;
-CPReturnKeyCode         = 13;
-CPEscapeKeyCode         = 27;
-CPSpaceKeyCode          = 32;
-CPPageUpKeyCode         = 33;
-CPPageDownKeyCode       = 34;
-CPLeftArrowKeyCode      = 37;
-CPUpArrowKeyCode        = 38;
-CPRightArrowKeyCode     = 39;
-CPDownArrowKeyCode      = 40;
-CPDeleteForwardKeyCode  = 46;
-
-/*!
-    @ingroup appkit
-    @class CPResponder
-
-    Subclasses of CPResonder can be part of the responder chain.
-*/
-@implementation CPResponder : CPObject
-{
-    CPMenu      _menu;
-    CPResponder _nextResponder;
-}
-
-// Changing the first responder
-/*!
-    Returns \c YES if the receiver is able to become the first responder. \c NO otherwise.
-*/
-- (BOOL)acceptsFirstResponder
-{
-    return NO;
-}
-
-/*!
-    Notifies the receiver that it will become the first responder. The receiver can reject first
-    responder if it returns \c NO. The default implementation always returns \c YES.
-    @return \c YES if the receiver accepts first responder status.
-*/
-- (BOOL)becomeFirstResponder
-{
-    return YES;
-}
-
-/*!
-    Notifies the receiver that it has been asked to give up first responder status.
-    @return \c YES if the receiver is willing to give up first responder status.
-*/
-- (BOOL)resignFirstResponder
-{
-    return YES;
-}
-
-// Setting the next responder
-/*!
-    Sets the receiver's next responder.
-    @param aResponder the responder after the receiver
-*/
-- (void)setNextResponder:(CPResponder)aResponder
-{
-    _nextResponder = aResponder;
-}
-
-/*!
-    Returns the responder after the receiver.
-*/
-- (CPResponder)nextResponder
-{
-    return _nextResponder;
-}
-
-/*!
-    Called to interpret a series of key events.
-    @param events an array of key CPEvents
-*/
-- (void)interpretKeyEvents:(CPArray)events
-{
-    var index = 0,
-        count = [events count];
-
-    for (; index < count; ++index)
-    {
-        var event = events[index],
-            modifierFlags = [event modifierFlags],
-            character = [event charactersIgnoringModifiers],
-            selectorNames = [CPKeyBinding selectorsForKey:character modifierFlags:modifierFlags];
-
-        if (selectorNames)
-        {
-            for (var s = 0, scount = selectorNames.length; s < scount; s++)
-            {
-                var selector = selectorNames[s];
-                if (!selector)
-                    continue;
-
-                [self doCommandBySelector:CPSelectorFromString(selector)];
-            }
-        }
-        else if (!(modifierFlags & (CPCommandKeyMask | CPControlKeyMask)) && [self respondsToSelector:@selector(insertText:)])
-            [self insertText:[event characters]];
-    }
-}
-
-/*!
-    Notifies the receiver that the user has clicked the mouse down in its area.
-    @param anEvent contains information about the click
-*/
-- (void)mouseDown:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has clicked the right mouse down in its area.
-    @param anEvent contains information about the right click
-*/
-- (void)rightMouseDown:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has initiated a drag
-    over it. A drag is a mouse movement while the left button is down.
-    @param anEvent contains information about the drag
-*/
-- (void)mouseDragged:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has released the left mouse button.
-    @param anEvent contains information about the release
-*/
-- (void)mouseUp:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has released the right mouse button.
-    @param anEvent contains information about the release
-*/
-- (void)rightMouseUp:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has moved the mouse (with no buttons down).
-    @param anEvent contains information about the movement
-*/
-- (void)mouseMoved:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the mouse exited the receiver's area.
-    @param anEvent contains information about the exit
-*/
-- (void)mouseExited:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
- Notifies the receiver that the mouse entered the receiver's area and that it can adapt the cursor.
- @param anEvent contains information about the exit
- */
-- (void)cursorUpdate:(CPEvent)anEvent
-{
-    if (_nextResponder)
-        [_nextResponder performSelector:_cmd withObject:anEvent];
-    else
-        [[CPCursor arrowCursor] set];
-}
-
-/*!
-    Notifies the receiver that the mouse scroll wheel has moved.
-    @param anEvent information about the scroll
-*/
-- (void)scrollWheel:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has pressed a key.
-    @param anEvent information about the key press
-*/
-- (void)keyDown:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has released a key.
-    @param anEvent information about the key press
-*/
-- (void)keyUp:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Notifies the receiver that the user has pressed or released a modifier key (Shift, Control, and so on).
-    @param anEvent information about the key press
-*/
-- (void)flagsChanged:(CPEvent)anEvent
-{
-    [_nextResponder performSelector:_cmd withObject:anEvent];
-}
-
-/*!
-    Overridden by subclasses to handle a key equivalent.
-
-    If the character code or codes in \c anEvent match the receiver’s key equivalent,
-    the receiver should respond to the event and return \c YES. The default implementation
-    does nothing and returns \c NO.
-
-    You should extract the characters for a key equivalent using
-    \ref CPEvent::charactersIgnoringModifiers "[anEvent charactersIgnoringModifiers]".
-
-    @param anEvent An event object that represents the key equivalent pressed
-    @return \c YES if theEvent is a key equivalent that the receiver handled, \c NO if it is not a key equivalent that it should handle.
-*/
-- (BOOL)performKeyEquivalent:(CPEvent)anEvent
-{
-    return NO;
-}
-
-// Action Methods
-/*!
-    Insert a line break at the caret position or selection.
-    @param aSender the object requesting this
-*/
-- (void)insertLineBreak:(id)aSender
-{
-    [self insertNewline:aSender];
-}
-
-/*!
-    Insert a line break at the caret position or selection.
-    @param aSender the object requesting this
-*/
-- (void)insertNewline:(id)aSender
-{
-    [[self nextResponder] insertNewline:aSender];
-}
-
-- (void)insertTab:(id)sender
-{
-}
-
-- (void)insertBackTab:(id)sender
-{
-}
-
-/*!
-    Inserts some text at the caret position or selection.
-    @param aString the string to insert
-*/
-- (void)insertText:(CPString)aString
-{
-}
-
-// Dispatch methods
-/*!
-    The receiver will attempt to perform the command,
-    if it responds to it. If not, the \c -nextResponder will be called to do it.
-    @param aSelector the command to attempt
-*/
-- (void)doCommandBySelector:(SEL)aSelector
-{
-    if ([self respondsToSelector:aSelector])
-        [self performSelector:aSelector];
-    else
-        [_nextResponder doCommandBySelector:aSelector];
-}
-
-/*!
-    The receiver will attempt to perform the command, or pass it on to the next responder if it doesn't respond to it.
-    @param aSelector the command to perform
-    @param anObject the argument to the method
-    @return \c YES if the receiver was able to perform the command, or a responder down the chain was
-    able to perform the command.
-*/
-- (BOOL)tryToPerform:(SEL)aSelector with:(id)anObject
-{
-    if ([self respondsToSelector:aSelector])
-    {
-        [self performSelector:aSelector withObject:anObject];
-
-        return YES;
-    }
-
-    return [_nextResponder tryToPerform:aSelector with:anObject];
-}
-
-// Managing a Responder's menu
-
-- (void)setMenu:(CPMenu)aMenu
-{
-    _menu = aMenu;
-}
-
-- (CPMenu)menu
-{
-    return _menu;
-}
-
-// Getting the Undo Manager
-/*!
-    Returns the undo manager for the receiver.
-*/
-- (CPUndoManager)undoManager
-{
-    return [_nextResponder performSelector:_cmd];
-}
-
-// Terminating the responder chain
-/*!
-    Called when an event finds no suitable responder.
-    @param anEventSelector the command that failed
-*/
-- (void)noResponderFor:(SEL)anEventSelector
-{
-}
-
-@end
-
-var CPResponderNextResponderKey = @"CPResponderNextResponderKey",
-    CPResponderMenuKey = @"CPResponderMenuKey";
-
-@implementation CPResponder (CPCoding) <CPCoding>
-
-/*!
-    Initializes the responder with data from a coder.
-    @param aCoder the coder from which data will be read
-    @return the initialized responder
-*/
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    self = [super init];
-
-    if (self)
-    {
-        [self setNextResponder:[aCoder decodeObjectForKey:CPResponderNextResponderKey]];
-        [self setMenu:[aCoder decodeObjectForKey:CPResponderMenuKey]];
-    }
-
-    return self;
-}
-
-/*!
-    Archives the responder to a coder.
-    @param aCoder the coder to which the responder will be archived
-*/
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    // This will come out nil on the other side with decodeObjectForKey:
-    if (_nextResponder != nil)
-        [aCoder encodeConditionalObject:_nextResponder forKey:CPResponderNextResponderKey];
-
-    [aCoder encodeObject:_menu forKey:CPResponderMenuKey];
-}
-
-@end

AppKit/CPRuleEditor/CPPredicateEditor.j

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

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

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

AppKit/CPRuleEditor/CPRuleEditor_Constants.j

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

AppKit/CPRuleEditor/_CPPredicateEditorRowNode.j

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

AppKit/CPRuleEditor/_CPPredicateEditorTree.j

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

AppKit/CPRuleEditor/_CPRuleEditorLocalizer.j

@@ -1,327 +0,0 @@
-/*
- * Created by cacaodev@gmail.com.
- * Copyright (c) 2011 Pear, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-@import <Foundation/CPDictionary.j>
-@import <Foundation/CPString.j>
-@import <Foundation/CPURLConnection.j>
-@import <Foundation/CPURLRequest.j>
-
-var LocalizerStringsRegex = new RegExp("\"(.+)\"\\s*=\\s*\"(.+)\"\\s*;\\s*(//.+)?");
-
-@implementation _CPRuleEditorLocalizer : CPObject
-{
-    CPDictionary    _dictionary @accessors(property=dictionary);
-    CPURLConnection connection;
-    CPURLRequest    request;
-}
-
-- (void)loadContentOfURL:(CPURL)aURL
-{
-    request = [CPURLRequest requestWithURL:aURL];
-    connection = [CPURLConnection connectionWithRequest:request delegate:self];
-}
-
-- (void)reloadIfNeeded
-{
-    if (connection != nil) // Connection waiting
-    {
-        connection = nil;
-
-        var data = [CPURLConnection sendSynchronousRequest:request returningResponse:NULL];
-        [self loadContent:[data rawString]];
-    }
-}
-
-- (void)connection:(CPURLConnection)aConnection didReceiveData:(CPString)rawString
-{
-    if (connection != nil && rawString != nil)
-        [self loadContent:rawString];
-
-    connection = nil;
-}
-
-- (void)loadContent:(CPString)aContent
-{
-    var dict = @{},
-        lines = [aContent componentsSeparatedByString:"\n"],
-        count = [lines count];
-
-    for (var i = 0 ; i < count ; i++)
-    {
-        var line = [lines objectAtIndex:i];
-
-        if (line.length > 1)
-        {
-            var match = LocalizerStringsRegex.exec(line);
-
-            if (match && match.length >= 3)
-                [dict setObject:match[2] forKey:match[1]];
-        }
-    }
-
-    _dictionary = [CPDictionary dictionaryWithDictionary:dict];
-
-    // Post notification to let the rule editor know the translation dictionary is ready
-    [[CPNotificationCenter defaultCenter] postNotificationName:@"_CPRuleEditorLocalizerDidLoadNotification" object:self];
-}
-
-- (CPString)localizedStringForString:(CPString)aString
-{
-    [self reloadIfNeeded];
-
-    if (_dictionary != nil && aString != nil)
-    {
-        var localized = [_dictionary objectForKey:aString];
-
-        if (localized != nil)
-            return localized;
-    }
-
-    return aString;
-}
-
-// MARK: - Formatting & Reordering Helpers
-
-- (CPString)_englishRepresentationForView:(id)aView
-{
-    if ([aView isKindOfClass:[CPPopUpButton class]])
-    {
-        var selectedItem = [aView selectedItem];
-        if (selectedItem)
-        {
-            var originalTitle = selectedItem._originalTitle;
-            
-            // Fallback: If not cached directly, inspect representedObject payload dictionary
-            if (!originalTitle)
-            {
-                var rep = [selectedItem representedObject];
-                if (rep && typeof rep === "object" && [rep respondsToSelector:@selector(objectForKey:)])
-                {
-                    originalTitle = [rep objectForKey:@"value"];
-                }
-                else if (rep && typeof rep === "string")
-                {
-                    originalTitle = rep;
-                }
-            }
-            if (!originalTitle)
-            {
-                originalTitle = [selectedItem title];
-            }
-            return "%[" + originalTitle + "]@";
-        }
-        return "%[]@";
-    }
-    else if ([aView isKindOfClass:[CPTextField class]] && ![aView isEditable])
-    {
-        return aView._originalText || [aView stringValue];
-    }
-    else
-    {
-        return "%@";
-    }
-}
-
-- (CPString)formattingKeyForViews:(CPArray)views
-{
-    var keyParts = [];
-    var count = [views count];
-    for (var i = 0; i < count; i++)
-    {
-        var view = [views objectAtIndex:i];
-        [keyParts addObject:[self _englishRepresentationForView:view]];
-    }
-    return [keyParts componentsJoinedByString:@" "];
-}
-
-- (void)localizeMenuItemsForViews:(CPArray)views
-{
-    var count = [views count];
-    for (var i = 0; i < count; i++)
-    {
-        var view = [views objectAtIndex:i];
-        if ([view isKindOfClass:[CPPopUpButton class]])
-        {
-            var menuItems = [view itemArray];
-            var menuItemsCount = [menuItems count];
-            var selectedItem = [view selectedItem];
-
-            for (var j = 0; j < menuItemsCount; j++)
-            {
-                var item = [menuItems objectAtIndex:j];
-                
-                if (!item._originalTitle)
-                {
-                    var rep = [item representedObject];
-                    if (rep && typeof rep === "object" && [rep respondsToSelector:@selector(objectForKey:)])
-                    {
-                        item._originalTitle = [rep objectForKey:@"value"];
-                    }
-                    else
-                    {
-                        item._originalTitle = [item title];
-                    }
-                }
-
-                // Temporarily select item to generate formatting key context
-                [view selectItem:item];
-
-                var tempKey = [self formattingKeyForViews:views];
-                var tempPattern = [self localizedStringForString:tempKey];
-
-                if (tempPattern !== tempKey)
-                {
-                    var regex = /%(\d+)\$(?:\[([^\]]+)\])?@/g;
-                    var match;
-                    while ((match = regex.exec(tempPattern)) !== null)
-                    {
-                        var position = parseInt(match[1], 10) - 1;
-                        var translatedValue = match[2];
-
-                        if (position === i && translatedValue)
-                        {
-                            [item setTitle:translatedValue];
-                            break;
-                        }
-                    }
-                }
-                else
-                {
-                    [item setTitle:item._originalTitle];
-                }
-            }
-
-            if (selectedItem)
-            {
-                [view selectItem:selectedItem];
-            }
-        }
-    }
-}
-
-- (CPArray)localizeAndReorderViews:(CPArray)views
-{
-    var key = [self formattingKeyForViews:views];
-    var localizedPattern = [self localizedStringForString:key];
-
-    if (localizedPattern === key)
-    {
-        var count = [views count];
-
-        for (var i = 0; i < count; i++)
-        {
-            var originalView = [views objectAtIndex:i];
-            if ([originalView isKindOfClass:[CPPopUpButton class]])
-            {
-                var selectedItem = [originalView selectedItem];
-                if (selectedItem && selectedItem._originalTitle)
-                {
-                    [selectedItem setTitle:selectedItem._originalTitle];
-                }
-            }
-            else if ([originalView respondsToSelector:@selector(setStringValue:)] && originalView._originalText)
-            {
-                [originalView setStringValue:originalView._originalText];
-                
-                if ([originalView isKindOfClass:[CPTextField class]] && ![originalView isEditable])
-                {
-                    var font = [originalView font] || [CPFont systemFontOfSize:[CPFont systemFontSize]],
-                        size = [originalView._originalText sizeWithFont:font];
-                    [originalView setFrameSize:CGSizeMake(size.width + 4, CGRectGetHeight([originalView frame]))];
-                }
-            }
-        }
-
-        return views;
-    }
-
-    var newViews = [CPMutableArray array];
-    var regex = /%(\d+)\$(?:\[([^\]]+)\])?@/g;
-    var lastIndex = 0;
-    var match;
-
-    while ((match = regex.exec(localizedPattern)) !== null)
-    {
-        var literalText = localizedPattern.substring(lastIndex, match.index);
-        
-        // Only add a label if there are actual non-whitespace characters (like 'y')
-        if (literalText.length > 0 && /\S/.test(literalText))
-        {
-            var label = [CPTextField labelWithTitle:literalText];
-            [newViews addObject:label];
-        }
-
-        var position = parseInt(match[1], 10) - 1;
-        var translatedValue = match[2];
-
-        if (position >= 0 && position < [views count])
-        {
-            var originalView = [views objectAtIndex:position];
-
-            if (translatedValue !== undefined && translatedValue !== null)
-            {
-                if ([originalView isKindOfClass:[CPPopUpButton class]])
-                {
-                    var selectedItem = [originalView selectedItem];
-                    if (selectedItem)
-                    {
-                        if (!selectedItem._originalTitle)
-                        {
-                            selectedItem._originalTitle = [selectedItem title];
-                        }
-                        [selectedItem setTitle:translatedValue];
-                    }
-                }
-                else if ([originalView respondsToSelector:@selector(setStringValue:)])
-                {
-                    [originalView setStringValue:translatedValue];
-
-                    // Recalculate frame size if it is a static CPTextField to avoid visual clipping
-                    if ([originalView isKindOfClass:[CPTextField class]] && ![originalView isEditable])
-                    {
-                        var font = [originalView font] || [CPFont systemFontOfSize:[CPFont systemFontSize]],
-                            size = [translatedValue sizeWithFont:font];
-                        [originalView setFrameSize:CGSizeMake(size.width + 4, CGRectGetHeight([originalView frame]))];
-                    }
-                }
-            }
-
-            [newViews addObject:originalView];
-        }
-
-        lastIndex = regex.lastIndex;
-    }
-
-    if (lastIndex < localizedPattern.length)
-    {
-        var literalText = localizedPattern.substring(lastIndex);
-        
-        // Only add a label if there are actual non-whitespace characters
-        if (literalText.length > 0 && /\S/.test(literalText))
-        {
-            var label = [CPTextField labelWithTitle:literalText];
-            [newViews addObject:label];
-        }
-    }
-
-    return newViews;
-}
-
-@end

AppKit/CPRuleEditor/_CPRuleEditorViewSlice.j

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

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -1,576 +0,0 @@
-/*
- * Created by cacaodev@gmail.com.
- * Copyright (c) 2011 Pear, Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import "CPRuleEditor_Constants.j"
-@import "_CPRuleEditorViewSlice.j"
-
-@import "CPButton.j"
-@import "CPDatePicker.j"
-@import "CPPopUpButton.j"
-
-@global CPApp
-@global CPMiniControlSize
-@global CPSmallControlSize
-
-@implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
-{
-    CPButton                _addButton;
-    CPButton                _subtractButton;
-    CPMutableArray          _correspondingRuleItems;
-    CPMutableArray          _ruleOptionFrames;
-    CPMutableArray          _ruleOptionInitialViewFrames;
-    CPMutableArray          _ruleOptionViews;
-
-
-    CPRuleEditorRowType     _rowType @accessors;
-    CPRuleEditorRowType     _plusButtonRowType;
-}
-
-- (id)initWithFrame:(CGRect)frame ruleEditorView:(id)editor
-{
-    if (self = [super initWithFrame:frame ruleEditorView:editor])
-        [self _initShared];
-
-    return self;
-}
-
-- (void)_initShared
-{
-    _correspondingRuleItems         = [[CPMutableArray alloc] init];
-    _ruleOptionFrames               = [[CPMutableArray alloc] init];
-    _ruleOptionInitialViewFrames    = [[CPMutableArray alloc] init];
-    _ruleOptionViews                = [[CPMutableArray alloc] init];
-    _editable                       = [_ruleEditor isEditable];
-
-    _addButton                      = [self _createAddRowButton];
-    _subtractButton                 = [self _createDeleteRowButton];
-
-    [self addSubview:_addButton];
-    [self addSubview:_subtractButton];
-
-    [self setAutoresizingMask:CPViewWidthSizable];
-}
-
-- (CPButton)_createRowButton
-{
-    var button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
-
-    [button setFont:[_ruleEditor font]];
-    [button setTextColor:[_ruleEditor _fontColor]];
-
-    [button setAlignment:CPCenterTextAlignment];
-    [button setAutoresizingMask:CPViewMinXMargin];
-    [button setButtonType:CPMomentaryChangeButton];
-    [button setBordered:NO];
-    [button setHidden:!_editable];
-    [button setImagePosition:CPImageOnly];
-
-    return button;
-}
-
-- (CPButton)_createAddRowButton
-{
-    var button = [self _createRowButton];
-
-    [button setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
-    [button setValue:[_ruleEditor _imageAdd] forThemeAttribute:@"image" inState:CPThemeStateNormal];
-    [button setValue:[_ruleEditor _imageAddHighlighted] forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
-
-    [button setAction:@selector(_addOption:)];
-    [button setTarget:self];
-
-    return button;
-}
-
-- (CPButton)_createDeleteRowButton
-{
-    var button = [self _createRowButton];
-
-    [button setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-    [button setValue:[_ruleEditor _imageRemove] forThemeAttribute:@"image" inState:CPThemeStateNormal];
-    [button setValue:[_ruleEditor _imageRemoveHighlighted] forThemeAttribute:@"image" inState:CPThemeStateHighlighted];
-
-    [button setAction:@selector(_deleteOption:)];
-    [button setTarget:self];
-
-    return button;
-}
-
-- (CPMenuItem)_createMenuItemWithTitle:(CPString )title
-{
-    var originalTitle = title;
-    var localizedTitle = [[_ruleEditor standardLocalizer] localizedStringForString:title];
-    var item = [[CPMenuItem alloc] initWithTitle:localizedTitle action:nil keyEquivalent:@""];
-    
-    // Cache the raw English title for pattern-matching
-    item._originalTitle = originalTitle;
-    return item;
-}
-
-- (CPTextField)_createStaticTextFieldWithStringValue:(CPString)text
-{
-    var textField       = [[CPTextField alloc] initWithFrame:CGRectMakeZero()],
-        ruleEditorFont  = [_ruleEditor font],
-        font            = [CPFont fontWithName:[ruleEditorFont familyName] size:[ruleEditorFont size] + 2],
-        localizedText   = [[_ruleEditor standardLocalizer] localizedStringForString:text],
-        size            = [localizedText sizeWithFont:font];
-
-    [textField setFrameSize:CGSizeMake(size.width + 4, [_ruleEditor rowHeight])];
-    [textField setValue:font forThemeAttribute:@"font"];
-    [textField setValue:[_ruleEditor _verticalAlignment] forThemeAttribute:@"vertical-alignment"];
-    [textField setStringValue:localizedText];
-    
-    // Cache the raw English text for pattern-matching
-    textField._originalText = text;
-
-    return textField;
-}
-
-- (CPPopUpButton)_createPopUpButtonWithItems:(CPArray)itemsArray selectedItemIndex:(int)index
-{
-    var title   = [[itemsArray objectAtIndex:index] title],
-        font    = [_ruleEditor font],
-        width   = [title sizeWithFont:font].width + 35, // 35 for right arrows + margins
-        rect    = CGRectMake(0, 0, width, [_ruleEditor rowHeight]),
-        popup   = [[CPPopUpButton alloc] initWithFrame:rect];
-
-    [popup setValue:font forThemeAttribute:@"font"];
-
-    var count = [itemsArray count];
-    for (var i = 0; i < count; i++)
-        [popup addItem:[itemsArray objectAtIndex:i]];
-
-    [popup selectItemAtIndex:index];
-
-    return popup;
-}
-
-- (CPMenuItem)_createMenuSeparatorItem
-{
-    return [CPMenuItem separatorItem];
-}
-
-- (void)_addOption:(id)sender
-{
-    if (_rowIndex == [_ruleEditor numberOfRows] - 1)
-        [self setNeedsDisplay:YES];
-
-    var type = _plusButtonRowType;
-
-    if ([_ruleEditor nestingMode] == CPRuleEditorNestingModeCompound && ([[CPApp currentEvent] modifierFlags] & CPAlternateKeyMask))
-        type = CPRuleEditorRowTypeCompound;
-
-    [_ruleEditor _addOptionFromSlice:self ofRowType:type];
-}
-
-- (void)_deleteOption:(id)sender
-{
-    [_ruleEditor _deleteSlice:self];
-}
-
-- (void)_ruleOptionPopupChangedAction:(CPMenuItem)sender
-{
-    var layoutdict      = [sender representedObject],
-        newItem         = [layoutdict objectForKey:@"item"],
-        indexInCriteria = [layoutdict objectForKey:@"indexInCriteria"],
-        oldItem         = [_correspondingRuleItems objectAtIndex:indexInCriteria];
-
-    if (![newItem isEqual:oldItem])
-    {
-        [_correspondingRuleItems replaceObjectAtIndex:indexInCriteria withObject:newItem];
-        [_ruleEditor _changedItem:oldItem toItem:newItem inRow:_rowIndex atCriteriaIndex:indexInCriteria];
-    }
-}
-
-- (BOOL)validateMenuItem:(CPMenuItem )menuItem
-{
-    return [_ruleEditor _validateItem:menuItem value:[[menuItem representedObject] valueForKey:@"item"] inRow:_rowIndex];
-}
-
-- (void)_emptyRulePartSubviews
-{
-    var count = [_ruleOptionViews count];
-
-    while (count--)
-        [_ruleOptionViews[count] removeFromSuperview];
-
-    [_ruleOptionViews removeAllObjects];
-    [_ruleOptionFrames removeAllObjects];
-    [_ruleOptionInitialViewFrames removeAllObjects];
-}
-
-- (void)_reconfigureSubviews
-{
-    var criteria,
-        repObject,
-        menuItem,
-        ruleView,
-        criterion,
-        parent,
-        numberOfCriteria,
-        numberOfChildren,
-        firstResponderIndex,
-
-        ruleItems = [CPMutableArray array],
-        responder = [[self window] firstResponder];
-
-    [self _emptyRulePartSubviews];
-
-    criteria = [_ruleEditor criteriaForRow:_rowIndex];
-    numberOfCriteria = [criteria count];
-
-    firstResponderIndex = numberOfCriteria - 1;
-    if (responder)
-        firstResponderIndex = [_ruleOptionViews indexOfObjectIdenticalTo:responder];
-
-    for (var i = 0; i < numberOfCriteria; i++)
-    {
-        ruleView = nil;
-        parent = nil;
-        criterion = [criteria objectAtIndex:i];
-
-        if (i > 0)
-            parent = [criteria objectAtIndex:i - 1];
-
-        var childItems = [],
-            childValues = [];
-
-        [_ruleEditor _getAllAvailableItems:childItems values:childValues asChildrenOfItem:parent inRow:_rowIndex];
-
-        numberOfChildren = [childItems count];
-        if (numberOfChildren > 1)
-        {
-            var menuItems = [CPMutableArray arrayWithCapacity:numberOfChildren],
-                selectedIndex = [childItems indexOfObject:criterion];
-
-            if (selectedIndex == CPNotFound)
-                break;
-
-            for (var j = 0; j < numberOfChildren; ++j)
-            {
-                var childItem = [childItems objectAtIndex:j],
-                    childValue = [childValues objectAtIndex:j];
-
-                if ([childValue isKindOfClass:[CPMenuItem class]])
-                {
-                    [[childValue menu] removeItem:childValue];
-                    menuItem = childValue;
-                }
-                else
-                {
-                    if ([childValue isEqualToString:@""])
-                        menuItem = [self _createMenuSeparatorItem];
-                    else
-                    {
-                        menuItem = [self _createMenuItemWithTitle:childValue];
-                        [menuItem setTarget:self];
-                        [menuItem setAction:@selector(_ruleOptionPopupChangedAction:)];
-                    }
-                }
-
-                repObject = @{
-                        @"item": childItem,
-                        @"value": childValue,
-                        @"indexInCriteria": i
-                    };
-                [menuItem setRepresentedObject:repObject];
-                [menuItems addObject:menuItem];
-            }
-
-            ruleView = [self _createPopUpButtonWithItems:menuItems selectedItemIndex:selectedIndex];
-        }
-        else
-        {
-            var value = [childValues objectAtIndex:0],
-                type = [value valueType];
-
-            if (type === 0)
-                ruleView = [self _createStaticTextFieldWithStringValue:value];
-            else
-            {
-                if (type !== 1)
-                {
-                    [CPException raise:CPInternalInconsistencyException reason:@"Display value must be a string or a menu item"];
-                    continue;
-                }
-
-                ruleView = value;
-                [ruleView setTarget:self];
-                [ruleView setAction:@selector(_sendRuleAction:)];
-                if ([ruleView respondsToSelector:@selector(setDelegate:)])
-                    [ruleView setDelegate:self];
-            }
-        }
-
-        if (ruleView != nil)
-        {
-            [ruleView setControlSize:CPSmallControlSize];
-
-            var minSize = [ruleView currentValueForThemeAttribute:@"min-size"],
-                frame = [ruleView frame];
-
-            // Force controls to their minimum size
-            frame.size.height = minSize.height;
-            [ruleView setFrame:frame];
-
-            [_ruleOptionViews addObject:ruleView];
-            [_ruleOptionInitialViewFrames addObject:frame];
-            [_ruleOptionFrames addObject:frame];
-
-            if (!criterion)
-                criterion = [CPNull null];
-
-            [ruleItems addObject:criterion];
-        }
-    }
-
-    [_correspondingRuleItems setArray:ruleItems];
-
-    // Localize drop-down options in context and reorder/insert intermediate labels natively
-    var localizer = [_ruleEditor standardLocalizer];
-    if (localizer)
-    {
-        [localizer localizeMenuItemsForViews:_ruleOptionViews];
-        _ruleOptionViews = [localizer localizeAndReorderViews:_ruleOptionViews];
-    }
-
-    // Rebuild frame configurations to match the new localized layout order
-    [_ruleOptionFrames removeAllObjects];
-    [_ruleOptionInitialViewFrames removeAllObjects];
-
-    var newCount = [_ruleOptionViews count];
-    for (var i = 0; i < newCount; i++)
-    {
-        var view = [_ruleOptionViews objectAtIndex:i],
-            frame = [view frame];
-
-        [_ruleOptionFrames addObject:frame];
-        [_ruleOptionInitialViewFrames addObject:frame];
-    }
-
-    if (!_editable)
-        [self _updateEnabledStateForSubviews];
-
-    [self _relayoutSubviewsWidthChanged:YES];
-
-    if (firstResponderIndex != CPNotFound)
-    {
-        var aView = [_ruleOptionViews objectAtIndex:firstResponderIndex];
-        [[self window] makeFirstResponder:aView]; // This is not working. bug in CPPopUpButton firstResponder ?
-    }
-}
-
-- (void)_updateEnabledStateForSubviews
-{
-    [_ruleOptionViews makeObjectsPerformSelector:@selector(setEnabled:) withObject:NO];
-}
-
-- (void)layoutSubviews
-{
-    [self _relayoutSubviewsWidthChanged:YES];
-}
-
-- (void)_relayoutSubviewsWidthChanged:(BOOL)widthChanged
-{
-    var optionViewOriginX,
-        leftHorizontalPadding,
-        leftButtonMinX,
-        rowHeight   = [_ruleEditor rowHeight],
-        count       = [_ruleOptionViews count],
-        sliceFrame  = [self frame],
-        image       = [_ruleEditor _imageAdd],
-        imageSize   = image ? [image size] : CGSizeMake(0,0),
-
-        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - imageSize.width - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - imageSize.height) / 2 - 1, imageSize.width, imageSize.height);
-
-    [_addButton setFrame:buttonFrame];
-    buttonFrame.origin.x -= imageSize.width + [self _rowButtonsInterviewHorizontalPadding];
-    [_subtractButton setFrame:buttonFrame];
-
-    if (widthChanged)
-    {
-        optionViewOriginX = [self _leftmostViewFixedHorizontalPadding] + [self _indentationHorizontalPadding] * _indentation;
-        leftHorizontalPadding = [self _rowButtonsLeftHorizontalPadding];
-        leftButtonMinX = CGRectGetMinX(buttonFrame);
-    }
-
-    for (var i = 0; i < count; i++)
-    {
-        var ruleOptionView = _ruleOptionViews[i],
-            optionFrame = _ruleOptionFrames[i];
-
-        // Use a pixel correction to align controls
-        optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2;
-
-        if (widthChanged)
-        {
-            optionFrame.origin.x = optionViewOriginX;
-            if (i == count - 1 && ![self _isRulePopup:ruleOptionView])
-            {
-                var initialFrame = _ruleOptionInitialViewFrames[i];
-                optionFrame.size.width = MIN(CGRectGetWidth(initialFrame), leftButtonMinX - leftHorizontalPadding - optionViewOriginX);
-            }
-        }
-
-        [ruleOptionView setFrame:optionFrame];
-        [self addSubview:ruleOptionView];
-
-        if (widthChanged)
-            optionViewOriginX += CGRectGetWidth(optionFrame) + [self _interviewHorizontalPadding];
-    }
-}
-
-- (void)_updateButtonVisibilities
-{
-    [_addButton setHidden:[_ruleEditor _shouldHideAddButtonForSlice:self]];
-    [_subtractButton setHidden:[_ruleEditor _shouldHideSubtractButtonForSlice:self]];
-
-    [_addButton setToolTip:[_ruleEditor _toolTipForAddSimpleRowButton]];
-    [_subtractButton setToolTip:[_ruleEditor _toolTipForDeleteRowButton]];
-}
-
-- (void)_configurePlusButtonByRowType:(CPRuleEditorRowType)type
-{
-    [self _setRowTypeToAddFromPlusButton:type];
-}
-
-- (void)setEditable:(BOOL)value
-{
-    [super setEditable:value]
-//  [self _updateEnabledStateForSubviews];
-    [self _updateButtonVisibilities];
-}
-
-- (float)_alignmentGridWidth
-{
-    return [_ruleEditor _alignmentGridWidth];
-}
-
-- (float)_indentationHorizontalPadding
-{
-    return 30.;
-}
-
-- (float)_interviewHorizontalPadding
-{
-    return 6.;
-}
-
-- (float)_leftmostViewFixedHorizontalPadding
-{
-    return 7.;
-}
-
-- (float)_minimumVerticalPopupPadding
-{
-    return 2.;
-}
-
-- (float)_rowButtonsInterviewHorizontalPadding
-{
-    return 6.;
-}
-
-- (float)_rowButtonsLeftHorizontalPadding
-{
-    return 10.;
-}
-
-- (float)_rowButtonsRightHorizontalPadding
-{
-    return ([[_ruleEditor superview] isKindOfClass:[CPClipView class]]) ? 18. : 10.;
-}
-
-- (void)_setRowTypeToAddFromPlusButton:(int)type
-{
-    _plusButtonRowType = type;
-}
-
-- (void)setNeedsDisplay:(BOOL)flag
-{
-    [super setNeedsDisplay:flag];
-}
-
-- (BOOL)_nestingModeShouldHideAddButton
-{
-    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
-}
-
-- (BOOL)_nestingModeShouldHideSubtractButton
-{
-    return [_ruleEditor _applicableNestingMode] == CPRuleEditorNestingModeSingle;
-}
-
-- (BOOL)containsDisplayValue:(id)value
-{
-    return [[_ruleEditor displayValuesForRow:_rowIndex] containsObject:value];
-    // Ou alors avec _correspondingRuleItems
-}
-
-- (void)viewDidMoveToWindow
-{
-    [self layoutSubviews];
-}
-
-- (void)_addObservers
-{
-    if (_isObserving)
-        return;
-
-    [super _addObservers];
-
-    [[CPNotificationCenter defaultCenter] addObserver:self selector:@selector(_textDidChange:) name:CPControlTextDidChangeNotification object:nil];
-}
-
-- (void)_removeObservers
-{
-    if (!_isObserving)
-        return;
-
-    [super _removeObservers];
-
-    [[CPNotificationCenter defaultCenter] removeObserver:self name:CPControlTextDidChangeNotification object:nil];
-}
-
-- (void)drawRect:(CGRect)rect
-{
-    [super drawRect:rect];
-}
-
-- (BOOL)_isRulePopup:(CPView)view
-{
-    if ([view isKindOfClass:[CPPopUpButton class]])
-        return YES;
-
-    return NO;
-}
-
-- (void)_sendRuleAction:(id)sender
-{
-    [_ruleEditor _updatePredicate];
-    [_ruleEditor _sendRuleAction];
-}
-
-- (void)_textDidChange:(CPNotification)aNotif
-{
-    if ([[aNotif object] superview] == self && [_ruleEditor _sendsActionOnIncompleteTextChange])
-        [self _sendRuleAction:nil];
-}
-
-@end

AppKit/CPSavePanel.j

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

AppKit/CPScreen.j

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

AppKit/CPScroller.j

@@ -1,857 +0,0 @@
-/*
- * CPScroller.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * Modified to match Lion style by Antoine Mercadal 2011
- * <antoine.mercadal@archipelproject.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "../Foundation/Foundation.h"
-
-@import "CPAnimation.j"
-@import "CPControl.j"
-@import "CPWindow_Constants.j"
-@import "CPViewAnimation.j"
-
-@global CPApp
-
-// CPScroller Constants
-@typedef CPScrollerPart
-CPScrollerNoPart            = 0;
-CPScrollerDecrementPage     = 1;
-CPScrollerKnob              = 2;
-CPScrollerIncrementPage     = 3;
-CPScrollerDecrementLine     = 4;
-CPScrollerIncrementLine     = 5;
-CPScrollerKnobSlot          = 6;
-
-CPScrollerIncrementArrow    = 0;
-CPScrollerDecrementArrow    = 1;
-
-@typedef CPUsableScrollerParts
-CPNoScrollerParts           = 0;
-CPOnlyScrollerArrows        = 1;
-CPAllScrollerParts          = 2;
-
-var PARTS_ARRANGEMENT   = [CPScrollerKnobSlot, CPScrollerDecrementLine, CPScrollerIncrementLine, CPScrollerKnob],
-    NAMES_FOR_PARTS     = {},
-    PARTS_FOR_NAMES     = {};
-
-var _CACHED_THEME_SCROLLER = nil; // This is used by the class methods to pull the theme attributes.
-
-NAMES_FOR_PARTS[CPScrollerDecrementLine]    = @"decrement-line";
-NAMES_FOR_PARTS[CPScrollerIncrementLine]    = @"increment-line";
-NAMES_FOR_PARTS[CPScrollerKnobSlot]         = @"knob-slot";
-NAMES_FOR_PARTS[CPScrollerKnob]             = @"knob";
-
-
-@typedef CPScrollerStyle
-CPScrollerStyleLegacy           = 0;
-CPScrollerStyleOverlay          = 1;
-
-CPScrollerKnobStyleDefault      = 0;
-CPScrollerKnobStyleDark         = 1;
-CPScrollerKnobStyleLight        = 2;
-
-CPThemeStateScrollViewLegacy    = CPThemeState("scroller-style-legacy");
-CPThemeStateScrollerKnobLight   = CPThemeState("scroller-knob-light");
-CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
-
-/*!
-    @ingroup appkit
-    @class CPScroller
-*/
-
-@implementation CPScroller : CPControl
-{
-    CPUsableScrollerParts   _usableParts;
-    CPArray                 _partRects;
-
-    BOOL                    _isVertical @accessors(readonly, getter=isVertical);
-    float                   _knobProportion;
-
-    CPScrollerPart          _hitPart;
-
-    CPScrollerPart          _trackingPart;
-    float                   _trackingFloatValue;
-    CGPoint                 _trackingStartPoint;
-
-    CPViewAnimation         _animationScroller;
-
-    BOOL                    _allowFadingOut @accessors(getter=allowFadingOut);
-    int                     _style;
-    CPTimer                 _timerFadeOut;
-    BOOL                    _isMouseOver;
-}
-
-
-// MARK: -
-// MARK: Class methods
-
-+ (CPString)defaultThemeClass
-{
-    return "scroller";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"scroller-width": 7.0,
-            @"knob-slot-color": [CPNull null],
-            @"decrement-line-color": [CPNull null],
-            @"increment-line-color": [CPNull null],
-            @"knob-color": [CPNull null],
-            @"decrement-line-size": CGSizeMakeZero(),
-            @"increment-line-size": CGSizeMakeZero(),
-            @"track-inset": CGInsetMakeZero(),
-            @"knob-inset": CGInsetMakeZero(),
-            @"minimum-knob-length": 21.0,
-            @"track-border-overlay": 9.0
-        };
-}
-
-+ (float)scrollerWidth
-{
-    return [self scrollerWidthInStyle:CPScrollerStyleLegacy];
-}
-
-/*!
-    Returns the CPScroller's width for a CPRegularControlSize.
-*/
-+ (float)scrollerWidthInStyle:(CPScrollerStyle)aStyle
-{
-    if (!_CACHED_THEME_SCROLLER)
-        _CACHED_THEME_SCROLLER = [[self alloc] init];
-
-    if (aStyle == CPScrollerStyleLegacy)
-        return [_CACHED_THEME_SCROLLER valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-
-    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"scroller-width"];
-}
-
-/*!
-    Returns the CPScroller's overlay value.
-*/
-+ (float)scrollerOverlay
-{
-    if (!_CACHED_THEME_SCROLLER)
-        _CACHED_THEME_SCROLLER = [[self alloc] init];
-
-    return [_CACHED_THEME_SCROLLER currentValueForThemeAttribute:@"track-border-overlay"];
-}
-
-/*!
-    Returns the width of a CPScroller for the specified CPControlSize.
-    @param aControlSize the size of a controller to return the width for
-*/
-+ (float)scrollerWidthForControlSize:(CPControlSize)aControlSize
-{
-    return [self scrollerWidth];
-}
-
-
-// MARK: -
-// MARK: Initialization
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    if (self = [super initWithFrame:aFrame])
-    {
-        _partRects = [];
-
-        [self setFloatValue:0.0];
-        [self setKnobProportion:1.0];
-
-        _hitPart = CPScrollerNoPart;
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-        _style = CPScrollerStyleOverlay;
-
-        var paramAnimFadeOut = @{
-                CPViewAnimationTargetKey: self,
-                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
-            };
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-
-        // We have to choose an orientation. If for some bizarre reason width === height,
-        // punt and choose vertical.
-        [self _setIsVertical:CGRectGetHeight(aFrame) >= CGRectGetWidth(aFrame)];
-    }
-
-    return self;
-}
-
-
-// MARK: -
-// MARK: Getters / Setters
-
-/*!
-    Returns the scroller's style
-*/
-- (int)style
-{
-    return _style;
-}
-
-/*!
-    Set the scroller's control size
-    @param aStyle the scroller style: CPScrollerStyleLegacy or CPScrollerStyleOverlay
-*/
-- (void)setStyle:(CPScrollerStyle)aStyle
-{
-    if (_style != nil && _style === aStyle)
-        return;
-
-    _style = aStyle;
-
-    if (_style === CPScrollerStyleLegacy)
-    {
-        _allowFadingOut = NO;
-        [self fadeIn];
-        [self setThemeState:CPThemeStateScrollViewLegacy];
-    }
-    else
-    {
-        _allowFadingOut = YES;
-        [self unsetThemeState:CPThemeStateScrollViewLegacy];
-    }
-
-    //[self _adjustScrollerSize];
-}
-
-- (void)setObjectValue:(id)aValue
-{
-    [super setObjectValue:MIN(1.0, MAX(0.0, +aValue))];
-}
-
-/*!
-    Return's the knob's proportion
-*/
-- (float)knobProportion
-{
-    return _knobProportion;
-}
-
-/*!
-    Set the knob's proportion
-    @param aProportion the desired proportion
-*/
-- (void)setKnobProportion:(float)aProportion
-{
-    if (!_IS_NUMERIC(aProportion))
-        [CPException raise:CPInvalidArgumentException reason:"aProportion must be numeric, was: "+aProportion];
-
-    _knobProportion = MIN(1.0, MAX(0.0001, aProportion));
-
-    [self setNeedsDisplay:YES];
-    [self setNeedsLayout];
-}
-
-
-// MARK: -
-// MARK: Privates
-
-/*! @ignore */
-- (void)_adjustScrollerSize
-{
-    var frame = [self frame],
-        scrollerWidth = [self currentValueForThemeAttribute:@"scroller-width"];
-
-    if ([self isVertical] && CGRectGetWidth(frame) !== scrollerWidth)
-        frame.size.width = scrollerWidth;
-
-    if (![self isVertical] && CGRectGetHeight(frame) !== scrollerWidth)
-        frame.size.height = scrollerWidth;
-
-    [self setFrame:frame];
-}
-
-/*! @ignore */
-- (void)_performFadeOut:(CPTimer)aTimer
-{
-    [self fadeOut];
-    _timerFadeOut = nil;
-}
-
-
-// MARK: -
-// MARK: Utilities
-
-- (CGRect)rectForPart:(CPScrollerPart)aPart
-{
-    if (aPart == CPScrollerNoPart)
-        return CGRectMakeZero();
-
-    return _partRects[aPart];
-}
-
-/*!
-    Returns the part of the scroller that would be hit by \c aPoint.
-    @param aPoint the simulated point hit
-    @return the part of the scroller that intersects the point
-*/
-- (CPScrollerPart)testPart:(CGPoint)aPoint
-{
-    aPoint = [self convertPoint:aPoint fromView:nil];
-
-    // The ordering of these tests is important.  We check the knob and
-    // page rects first since they may overlap with the arrows.
-
-    if (![self hasThemeState:CPThemeStateSelected] && ![self hasThemeState:CPThemeStateScrollViewLegacy])
-        return CPScrollerNoPart;
-
-    if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))
-        return CPScrollerKnob;
-
-    if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementPage], aPoint))
-        return CPScrollerDecrementPage;
-
-    if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementPage], aPoint))
-        return CPScrollerIncrementPage;
-
-    if (CGRectContainsPoint([self rectForPart:CPScrollerDecrementLine], aPoint))
-        return CPScrollerDecrementLine;
-
-    if (CGRectContainsPoint([self rectForPart:CPScrollerIncrementLine], aPoint))
-        return CPScrollerIncrementLine;
-
-    if (CGRectContainsPoint([self rectForPart:CPScrollerKnobSlot], aPoint))
-        return CPScrollerKnobSlot;
-
-    return CPScrollerNoPart;
-}
-
-/*!
-    Check if there's enough space in the scroller to display the knob
-*/
-- (void)checkSpaceForParts
-{
-    var bounds = [self bounds];
-
-    // Assume we won't be needing the arrows.
-    if (_knobProportion === 1.0)
-    {
-        _usableParts = CPNoScrollerParts;
-
-        _partRects[CPScrollerDecrementPage] = CGRectMakeZero();
-        _partRects[CPScrollerKnob]          = CGRectMakeZero();
-        _partRects[CPScrollerIncrementPage] = CGRectMakeZero();
-        _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-        _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
-
-        // In this case, the slot is the entirety of the scroller.
-        _partRects[CPScrollerKnobSlot] = CGRectMakeCopy(bounds);
-
-        return;
-    }
-
-    // At this point we know we're going to need arrows.
-    _usableParts = CPAllScrollerParts;
-
-    var knobInset = [self currentValueForThemeAttribute:@"knob-inset"],
-        trackInset = [self currentValueForThemeAttribute:@"track-inset"],
-        width = CGRectGetWidth(bounds),
-        height = CGRectGetHeight(bounds);
-
-    if ([self isVertical])
-    {
-        var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
-            incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
-            effectiveDecrementLineHeight = decrementLineSize.height + trackInset.top,
-            effectiveIncrementLineHeight = incrementLineSize.height + trackInset.bottom,
-            slotSize = height - effectiveDecrementLineHeight - effectiveIncrementLineHeight,
-            minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
-            knobVerticalInset = knobInset.top + knobInset.bottom,
-            knobWidth = width - knobInset.left - knobInset.right,
-            knobHeight = MAX(minimumKnobLength, ((slotSize - knobVerticalInset) * _knobProportion)),
-            knobLocation = effectiveDecrementLineHeight + (slotSize - knobHeight - knobVerticalInset) * [self floatValue] + knobInset.top;
-
-        _partRects[CPScrollerDecrementPage] = CGRectMake(0.0, effectiveDecrementLineHeight, width, knobLocation - effectiveDecrementLineHeight);
-        _partRects[CPScrollerKnob]          = CGRectMake(knobInset.left, knobLocation, knobWidth, knobHeight);
-        _partRects[CPScrollerIncrementPage] = CGRectMake(0.0, knobLocation + knobHeight, width, height - (knobLocation + knobHeight) - effectiveIncrementLineHeight);
-        _partRects[CPScrollerKnobSlot]      = CGRectMake(trackInset.left, effectiveDecrementLineHeight, width - trackInset.left - trackInset.right, slotSize);
-        _partRects[CPScrollerDecrementLine] = CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = CGRectMake(0.0, height - incrementLineSize.height, incrementLineSize.width, incrementLineSize.height);
-
-        if (height < knobHeight + decrementLineSize.height + incrementLineSize.height + trackInset.top + trackInset.bottom)
-            _partRects[CPScrollerKnob] = CGRectMakeZero();
-
-        if (height < decrementLineSize.height + incrementLineSize.height - 2)
-        {
-            _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = CGRectMake(trackInset.left, 0,  width - trackInset.left - trackInset.right, height);
-        }
-    }
-    else
-    {
-        var decrementLineSize = [self currentValueForThemeAttribute:"decrement-line-size"],
-            incrementLineSize = [self currentValueForThemeAttribute:"increment-line-size"],
-            effectiveDecrementLineWidth = decrementLineSize.width + trackInset.left,
-            effectiveIncrementLineWidth = incrementLineSize.width + trackInset.right,
-            slotSize = width - effectiveDecrementLineWidth - effectiveIncrementLineWidth,
-            minimumKnobLength = [self currentValueForThemeAttribute:"minimum-knob-length"],
-            knobHorizontalInset = knobInset.left + knobInset.right,
-            knobWidth = MAX(minimumKnobLength, ((slotSize - knobHorizontalInset) * _knobProportion)),
-            knobHeight = height - knobInset.top - knobInset.bottom,
-            knobLocation = effectiveDecrementLineWidth + (slotSize - knobWidth - knobHorizontalInset) * [self floatValue] + knobInset.left;
-
-        _partRects[CPScrollerDecrementPage] = CGRectMake(effectiveDecrementLineWidth, 0.0, knobLocation - effectiveDecrementLineWidth, height);
-        _partRects[CPScrollerKnob]          = CGRectMake(knobLocation, knobInset.top, knobWidth, knobHeight);
-        _partRects[CPScrollerIncrementPage] = CGRectMake(knobLocation + knobWidth, 0.0, width - (knobLocation + knobWidth) - effectiveIncrementLineWidth, height);
-        _partRects[CPScrollerKnobSlot]      = CGRectMake(effectiveDecrementLineWidth, trackInset.top, slotSize, height - trackInset.top - trackInset.bottom);
-        _partRects[CPScrollerDecrementLine] = CGRectMake(0.0, 0.0, decrementLineSize.width, decrementLineSize.height);
-        _partRects[CPScrollerIncrementLine] = CGRectMake(width - incrementLineSize.width, 0.0, incrementLineSize.width, incrementLineSize.height);
-
-        if (width < knobWidth + decrementLineSize.width + incrementLineSize.width + trackInset.left + trackInset.right)
-            _partRects[CPScrollerKnob] = CGRectMakeZero();
-
-        if (width < decrementLineSize.width + incrementLineSize.width - 2)
-        {
-            _partRects[CPScrollerIncrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerDecrementLine] = CGRectMakeZero();
-            _partRects[CPScrollerKnobSlot]      = CGRectMake(0.0, 0.0,  width, slotSize);
-        }
-    }
-}
-
-/*!
-    Returns all the parts of the scroller that
-    are usable for displaying.
-*/
-- (CPUsableScrollerParts)usableParts
-{
-    return _usableParts;
-}
-
-/*!
-    Display the scroller
-*/
-- (void)fadeIn
-{
-    if (_isMouseOver && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    [self setAlphaValue:1.0];
-}
-
-/*!
-    Start the fade out anination
-*/
-- (void)fadeOut
-{
-    [_animationScroller startAnimation];
-}
-
-
-// MARK: -
-// MARK:  Drawing
-
-/*!
-    Draws the specified arrow and sets the highlight.
-    @param anArrow the arrow to draw
-    @param shouldHighlight sets whether the arrow should be highlighted
-*/
-- (void)drawArrow:(CPScrollerArrow)anArrow highlight:(BOOL)shouldHighlight
-{
-}
-
-/*!
-    Draws the knob
-*/
-- (void)drawKnob
-{
-}
-
-/*!
-    Draws the knob's slot
-*/
-- (void)drawKnobSlot
-{
-}
-
-- (CPView)createViewForPart:(CPScrollerPart)aPart
-{
-    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-
-    [view setHitTests:NO];
-
-    return view;
-}
-
-- (CGRect)rectForEphemeralSubviewNamed:(CPString)aName
-{
-    return _partRects[aName];
-}
-
-- (CPView)createEphemeralSubviewNamed:(CPString)aName
-{
-    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-
-    [view setHitTests:NO];
-
-    return view;
-}
-
-- (void)layoutSubviews
-{
-    [self _adjustScrollerSize];
-    [self checkSpaceForParts];
-
-    var index = 0,
-        count = PARTS_ARRANGEMENT.length,
-        view;
-
-    for (; index < count; ++index)
-    {
-        var part = PARTS_ARRANGEMENT[index];
-
-        if (index === 0)
-            view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowBelow relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index + 1]];
-        else
-            view = [self layoutEphemeralSubviewNamed:part positioned:CPWindowAbove relativeToEphemeralSubviewNamed:PARTS_ARRANGEMENT[index - 1]];
-
-        if (view)
-            [view setBackgroundColor:[self currentValueForThemeAttribute:NAMES_FOR_PARTS[part] + "-color"]];
-    }
-}
-
-/*!
-    Caches images for the scroll arrow and knob.
-*/
-- (void)drawParts
-{
-    [self drawKnobSlot];
-    [self drawKnob];
-    [self drawArrow:CPScrollerDecrementArrow highlight:NO];
-    [self drawArrow:CPScrollerIncrementArrow highlight:NO];
-}
-
-// Event Handling
-/*!
-    Returns the part of the scroller that was hit.
-*/
-- (CPScrollerPart)hitPart
-{
-    return _hitPart;
-}
-
-/*!
-    Tracks the knob.
-    @param anEvent the input event
-*/
-- (void)trackKnob:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type === CPLeftMouseUp)
-    {
-        _hitPart = CPScrollerNoPart;
-
-        return;
-    }
-
-    if (type === CPLeftMouseDown)
-    {
-        _trackingFloatValue = [self floatValue];
-        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-    }
-
-    else if (type === CPLeftMouseDragged)
-    {
-        var knobRect = [self rectForPart:CPScrollerKnob],
-            knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
-            remainder = ![self isVertical] ? (CGRectGetWidth(knobSlotRect) - CGRectGetWidth(knobRect)) : (CGRectGetHeight(knobSlotRect) - CGRectGetHeight(knobRect));
-
-        if (remainder <= 0)
-            [self setFloatValue:0.0];
-        else
-        {
-            var location = [self convertPoint:[anEvent locationInWindow] fromView:nil],
-                delta = ![self isVertical] ? location.x - _trackingStartPoint.x : location.y - _trackingStartPoint.y;
-
-            [self setFloatValue:_trackingFloatValue + delta / remainder];
-        }
-    }
-
-    [CPApp setTarget:self selector:@selector(trackKnob:) forNextEventMatchingMask:CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-
-    if (type === CPLeftMouseDragged)
-        [self sendAction:[self action] to:[self target]];
-}
-
-/*!
-    Tracks the scroll button.
-    @param anEvent the input event
-*/
-- (void)trackScrollButtons:(CPEvent)anEvent
-{
-    var type = [anEvent type];
-
-    if (type === CPLeftMouseUp)
-    {
-        [self highlight:NO];
-        [CPEvent stopPeriodicEvents];
-
-        _hitPart = CPScrollerNoPart;
-
-        return;
-    }
-
-    if (type === CPLeftMouseDown)
-    {
-        _trackingPart = [self hitPart];
-
-        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
-        if ([anEvent modifierFlags] & CPAlternateKeyMask)
-        {
-            if (_trackingPart === CPScrollerDecrementLine)
-                _hitPart = CPScrollerDecrementPage;
-
-            else if (_trackingPart === CPScrollerIncrementLine)
-                _hitPart = CPScrollerIncrementPage;
-
-            else if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
-            {
-                var knobRect = [self rectForPart:CPScrollerKnob],
-                    knobWidth = ![self isVertical] ? CGRectGetWidth(knobRect) : CGRectGetHeight(knobRect),
-                    knobSlotRect = [self rectForPart:CPScrollerKnobSlot],
-                    remainder = (![self isVertical] ? CGRectGetWidth(knobSlotRect) : CGRectGetHeight(knobSlotRect)) - knobWidth;
-
-                [self setFloatValue:((![self isVertical] ? _trackingStartPoint.x - CGRectGetMinX(knobSlotRect) : _trackingStartPoint.y - CGRectGetMinY(knobSlotRect)) - knobWidth / 2.0) / remainder];
-
-                _hitPart = CPScrollerKnob;
-
-                [self sendAction:[self action] to:[self target]];
-
-                // Now just track the knob.
-                return [self trackKnob:anEvent];
-            }
-        }
-
-        [self highlight:YES];
-        [self sendAction:[self action] to:[self target]];
-
-        [CPEvent startPeriodicEventsAfterDelay:0.5 withPeriod:0.04];
-    }
-
-    else if (type === CPLeftMouseDragged)
-    {
-        _trackingStartPoint = [self convertPoint:[anEvent locationInWindow] fromView:nil];
-
-        if (_trackingPart === CPScrollerDecrementPage || _trackingPart === CPScrollerIncrementPage)
-        {
-            var hitPart = [self testPart:[anEvent locationInWindow]];
-
-            if (hitPart === CPScrollerDecrementPage || hitPart === CPScrollerIncrementPage)
-            {
-                _trackingPart = hitPart;
-                _hitPart = hitPart;
-            }
-        }
-
-        [self highlight:CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint)];
-    }
-    else if (type == CPPeriodic && CGRectContainsPoint([self rectForPart:_trackingPart], _trackingStartPoint))
-        [self sendAction:[self action] to:[self target]];
-
-    [CPApp setTarget:self selector:@selector(trackScrollButtons:) forNextEventMatchingMask:CPPeriodicMask | CPLeftMouseDraggedMask | CPLeftMouseUpMask untilDate:nil inMode:nil dequeue:YES];
-
-}
-
-- (void)_setIsVertical:(BOOL)isVertical
-{
-    _isVertical = isVertical;
-
-    if (_isVertical)
-        [self setThemeState:CPThemeStateVertical];
-    else
-        [self unsetThemeState:CPThemeStateVertical];
-}
-
-- (void)setFrameSize:(CGSize)aSize
-{
-    [super setFrameSize:aSize];
-
-    [self checkSpaceForParts];
-    [self setNeedsLayout];
-}
-
-
-// MARK: -
-// MARK: Overrides
-
-- (id)currentValueForThemeAttribute:(CPString)anAttributeName
-{
-    var themeState = _themeState;
-
-    if (NAMES_FOR_PARTS[_hitPart] + "-color" !== anAttributeName)
-        themeState = themeState.without(CPThemeStateHighlighted);
-
-    return [self valueForThemeAttribute:anAttributeName inState:themeState];
-}
-
-- (void)mouseDown:(CPEvent)anEvent
-{
-    if (![self isEnabled])
-        return;
-
-    _hitPart = [self testPart:[anEvent locationInWindow]];
-
-    switch (_hitPart)
-    {
-        case CPScrollerKnob:
-            return [self trackKnob:anEvent];
-
-        case CPScrollerDecrementLine:
-        case CPScrollerIncrementLine:
-        case CPScrollerDecrementPage:
-        case CPScrollerIncrementPage:
-            return [self trackScrollButtons:anEvent];
-    }
-}
-
-- (void)mouseEntered:(CPEvent)anEvent
-{
-    [super mouseEntered:anEvent];
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    if (![self isEnabled])
-        return;
-
-    _allowFadingOut = NO;
-    _isMouseOver = YES;
-
-    if ([self alphaValue] > 0 && _knobProportion != 1.0)
-        [self setThemeState:CPThemeStateSelected];
-}
-
-- (void)mouseExited:(CPEvent)anEvent
-{
-    [super mouseExited:anEvent];
-
-    if ([self isHidden] || ![self isEnabled] || !_isMouseOver)
-        return;
-
-    _allowFadingOut = (_style !== CPScrollerStyleLegacy);
-    _isMouseOver = NO;
-
-    if (_timerFadeOut)
-        [_timerFadeOut invalidate];
-
-    if ([self hasThemeState:CPThemeStateScrollViewLegacy])
-        [self unsetThemeState:CPThemeStateSelected];
-    else
-        _timerFadeOut = [CPTimer scheduledTimerWithTimeInterval:1.2 target:self selector:@selector(_performFadeOut:) userInfo:nil repeats:NO];
-}
-
-- (float)scrollerWidth
-{
-    if (_style == CPScrollerStyleLegacy)
-        return [self valueForThemeAttribute:@"scroller-width" inState:CPThemeStateScrollViewLegacy];
-
-    return [self currentValueForThemeAttribute:@"scroller-width"];
-}
-
-// MARK: -
-// MARK: Delegates
-
-- (void)animationDidEnd:(CPAnimation)animation
-{
-    [self unsetThemeState:CPThemeStateSelected];
-}
-
-@end
-
-var CPScrollerIsVerticalKey     = @"CPScrollerIsVerticalKey",
-    CPScrollerKnobProportionKey = @"CPScrollerKnobProportion",
-    CPScrollerStyleKey          = @"CPScrollerStyleKey";
-
-@implementation CPScroller (CPCoding)
-
-- (id)initWithCoder:(CPCoder)aCoder
-{
-    if (self = [super initWithCoder:aCoder])
-    {
-        _knobProportion = 1.0;
-
-        if ([aCoder containsValueForKey:CPScrollerKnobProportionKey])
-            _knobProportion = [aCoder decodeFloatForKey:CPScrollerKnobProportionKey];
-
-        _partRects = [];
-
-        _hitPart = CPScrollerNoPart;
-
-        _allowFadingOut = YES;
-        _isMouseOver = NO;
-
-        var paramAnimFadeOut = @{
-                CPViewAnimationTargetKey: self,
-                CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect,
-            };
-
-        _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut];
-        [_animationScroller setViewAnimations:[paramAnimFadeOut]];
-        [_animationScroller setDelegate:self];
-        [self setAlphaValue:0.0];
-
-        [self setStyle:[aCoder decodeIntForKey:CPScrollerStyleKey]];
-
-        [self _setIsVertical:[aCoder decodeBoolForKey:CPScrollerIsVerticalKey]];
-    }
-
-    return self;
-}
-
-- (void)encodeWithCoder:(CPCoder)aCoder
-{
-    [super encodeWithCoder:aCoder];
-
-    [aCoder encodeInt:_isVertical forKey:CPScrollerIsVerticalKey];
-    [aCoder encodeFloat:_knobProportion forKey:CPScrollerKnobProportionKey];
-    [aCoder encodeInt:_style forKey:CPScrollerStyleKey];
-}
-
-@end
-
-@implementation CPScroller (Deprecated)
-
-/*!
-    Sets the position and proportion of the knob.
-    @param aValue the knob position (ranges from 0.0 to 1.0)
-    @param aProportion the knob's proportion (ranges from 0.0 to 1.0)
-*/
-- (void)setFloatValue:(float)aValue knobProportion:(float)aProportion
-{
-    [self setFloatValue:aValue];
-    [self setKnobProportion:aProportion];
-}
-
-@end

AppKit/CPSecureTextField.j

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

AppKit/CPShadow.j

@@ -1,84 +0,0 @@
-/*
- * CPShadow.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPObject.j>
-
-@import "CGGeometry.j"
-@import "CPColor.j"
-@import "CPGraphicsContext.j"
-
-/*!
-    @deprecated
-    @class CPShadow
-
-    Instances of this class contain the attributes of a drop shadow used in Cappuccino.
-*/
-@implementation CPShadow : CPObject
-{
-    CGSize      _offset     @accessors(property=shadowOffset);
-    float       _blurRadius @accessors(property=shadowBlurRadius);
-    CPColor     _color      @accessors(property=shadowColor);
-}
-
-/*!
-    Creates a shadow with the specified attributes.
-    @param anOffset the shadow's offset
-    @param aBlurRadius the shadow's blur radius
-    @param aColor the shadow's color
-    @return the new shadow
-*/
-+ (id)shadowWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
-{
-    return [[CPShadow alloc] _initWithOffset:anOffset blurRadius:aBlurRadius color:aColor];
-}
-
-/* @ignore */
-- (id)_initWithOffset:(CGSize)anOffset blurRadius:(float)aBlurRadius color:(CPColor)aColor
-{
-    self = [super init];
-
-    if (self)
-    {
-        _offset = anOffset;
-        _blurRadius = aBlurRadius;
-        _color = aColor;
-    }
-
-    return self;
-}
-
-- (void)set
-{
-   var context = [[CPGraphicsContext currentContext] graphicsPort];
-
-   CGContextSetShadowWithColor(context, _offset, _blurRadius, _color);
-}
-
-/*!
-    Returns a CSS string representation of the shadow.
-*/
-- (CPString)cssString
-{
-    return [_color cssString] + " " + ROUND(_offset.width) + @"px " + ROUND(_offset.height) + @"px " + ROUND(_blurRadius) + @"px";
-}
-
-@end

AppKit/CPShadowView.j

@@ -1,176 +0,0 @@
-/*
- * CPShadowView.j
- * AppKit
- *
- * Created by Francisco Tolmasky.
- * Copyright 2008, 280 North, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-@import <Foundation/CPBundle.j>
-
-@import "CGGeometry.j"
-@import "CPImage.j"
-@import "CPView.j"
-
-@typedef CPShadowWeight
-CPLightShadow   = 0;
-CPHeavyShadow   = 1;
-
-CPThemeStateShadowViewLight = CPThemeState("shadowview-style-light");
-CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy");
-
-
-/*!
-    @ingroup appkit
-*/
-@implementation CPShadowView : CPView
-{
-    CPShadowWeight  _weight;
-}
-
-+ (CPString)defaultThemeClass
-{
-    return "shadow-view";
-}
-
-+ (CPDictionary)themeAttributes
-{
-    return @{
-            @"bezel-color": [CPNull null],
-            @"content-inset": CGInsetMakeZero()
-        };
-}
-
-+ (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight
-{
-    var shadowView = [CPShadowView new],
-        inset = [shadowView valueForThemeAttribute:@"content-inset" inState:(aWeight == CPLightShadow) ? CPThemeStateShadowViewLight : CPThemeStateShadowViewHeavy];
-
-    return CGRectMake(CGRectGetMinX(aFrame) - inset.left, CGRectGetMinY(aFrame) - inset.top, CGRectGetWidth(aFrame) + inset.left + inset.right, CGRectGetHeight(aFrame) + inset.top + inset.bottom);
-}
-
-+ (id)shadowViewEnclosingView:(CPView)aView
-{
-    return [self shadowViewEnclosingView:aView withWeight:CPLightShadow];
-}
-
-+ (id)shadowViewEnclosingView:(CPView)aView withWeight:(CPShadowWeight)aWeight
-{
-    var shadowView = [[self alloc] initWithFrame:[aView frame]];
-
-    if (shadowView)
-    {
-        [shadowView setWeight:aWeight];
-
-        var size = [shadowView frame].size,
-            inset = [shadowView currentValueForThemeAttribute:@"content-inset"],
-            width = size.width - inset.left - inset.right,
-            height = size.height - inset.top - inset.bottom,
-            enclosingView = [aView superview];
-
-        [shadowView setHitTests:[aView hitTests]];
-        [shadowView setAutoresizingMask:[aView autoresizingMask]];
-        [aView removeFromSuperview];
-        [shadowView addSubview:aView];
-        [aView setFrame:CGRectMake(inset.left, inset.top, width, height)];
-        [enclosingView addSubview:shadowView];
-    }
-
-    return shadowView;
-}
-
-- (id)initWithFrame:(CGRect)aFrame
-{
-    self = [super initWithFrame:aFrame];
-
-    if (self)
-    {
-        [self setWeight:CPLightShadow];
-
-        [self setHitTests:NO];
-    }
-
-    return self;
-}
-
-- (void)setWeight:(CPShadowWeight)aWeight
-{
-    if (_weight == aWeight)
-        return;
-
-    _weight = aWeight;
-
-    if (_weight == CPLightShadow)
-        [self setThemeState:CPThemeStateShadowViewLight];
-    else
-        [self setThemeState:CPThemeStateShadowViewHeavy];
-
-    [self setNeedsLayout];
-}
-
-- (float)leftInset
-{
-    return [self currentValueForThemeAttribute:@"content-inset"].left;
-}
-
-- (float)rightInset
-{
-    return [self currentValueForThemeAttribute:@"content-inset"].right;
-}
-
-- (float)topInset
-{
-    return [self currentValueForThemeAttribute:@"content-inset"].top;
-}
-
-- (float)bottomInset
-{
-    return [self currentValueForThemeAttribute:@"content-inset"].bottom;
-}
-
-- (float)horizontalInset
-{
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
-
-    return currentContentInset.left + currentContentInset.right;
-}
-
-- (float)verticalInset
-{
-    var currentContentInset = [self currentValueForThemeAttribute:@"content-inset"];
-
-    return currentContentInset.top + currentContentInset.bottom;
-}
-
-- (CGRect)frameForContentFrame:(CGRect)aFrame
-{
-    return [[self class] frameForContentFrame:aFrame withWeight:_weight];
-}
-
-- (void)setFrameForContentFrame:(CGRect)aFrame
-{
-    [self setFrame:[self frameForContentFrame:aFrame]];
-}
-
-- (void)layoutSubviews
-{
-    [super layoutSubviews];
-
-    [self setBackgroundColor:[self currentValueForThemeAttribute:@"bezel-color"]];
-}
-
-@end