diff --git a/AppKit/CPAlert.j b/AppKit/CPAlert.j index cee71593b..4df69bc0e 100644 --- a/AppKit/CPAlert.j +++ b/AppKit/CPAlert.j @@ -717,40 +717,40 @@ var bottomHeight = 71; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjectsAndKeys: - CGSizeMake(400.0, 110.0), @"size", - CGInsetMake(15, 15, 15, 50), @"content-inset", - 6, @"informative-offset", - 10, @"button-offset", - CPJustifiedTextAlignment, @"message-text-alignment", - [CPColor blackColor], @"message-text-color", - [CPFont boldSystemFontOfSize:13.0], @"message-text-font", - [CPNull null], @"message-text-shadow-color", - CGSizeMakeZero(), @"message-text-shadow-offset", - CPJustifiedTextAlignment, @"informative-text-alignment", - [CPColor blackColor], @"informative-text-color", - [CPFont systemFontOfSize:12.0], @"informative-text-font", - [CPNull null], @"informative-text-shadow-color", - CGSizeMakeZero(), @"informative-text-shadow-offset", - CGPointMake(15, 12), @"image-offset", - [CPNull null], @"information-image", - [CPNull null], @"warning-image", - [CPNull null], @"error-image", - [CPNull null], @"help-image", - 15, @"help-image-left-offset", - [CPNull null], @"help-image-pressed", - 0.0, @"suppression-button-y-offset", - 0.0, @"suppression-button-x-offset", - 3.0, @"default-elements-margin", - [CPColor blackColor], @"suppression-button-text-color", - [CPFont systemFontOfSize:12.0], @"suppression-button-text-font", - [CPNull null], @"suppression-button-text-shadow-color", - 0.0, @"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" - ]; + 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 diff --git a/AppKit/CPBox.j b/AppKit/CPBox.j index 06696c1da..9dc3742b2 100644 --- a/AppKit/CPBox.j +++ b/AppKit/CPBox.j @@ -78,15 +78,16 @@ CPBelowBottom = 6; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 1.0, 3.0, CGSizeMakeZero(), 6.0, [CPNull null], CGSizeMakeZero()] - forKeys:[ @"background-color", - @"border-color", - @"border-width", - @"corner-radius", - @"inner-shadow-offset", - @"inner-shadow-size", - @"inner-shadow-color", - @"content-margin"]]; + return @{ + @"background-color": [CPNull null], + @"border-color": [CPNull null], + @"border-width": 1.0, + @"corner-radius": 3.0, + @"inner-shadow-offset": CGSizeMakeZero(), + @"inner-shadow-size": 6.0, + @"inner-shadow-color": [CPNull null], + @"content-margin": CGSizeMakeZero(), + }; } + (id)boxEnclosingView:(CPView)aView diff --git a/AppKit/CPButton.j b/AppKit/CPButton.j index b92127a7e..ca041056e 100644 --- a/AppKit/CPButton.j +++ b/AppKit/CPButton.j @@ -76,9 +76,10 @@ CPButtonStateMixed = CPThemeState("mixed"); CPButtonStateBezelStyleRounded = CPThemeState("rounded"); // add all future correspondance between bezel styles and theme state here. -var CPButtonBezelStyleStateMap = [CPDictionary dictionaryWithObjectsAndKeys: - CPButtonStateBezelStyleRounded, CPRoundedBezelStyle, - [CPNull null], CPRoundRectBezelStyle]; +var CPButtonBezelStyleStateMap = @{ + CPRoundedBezelStyle: CPButtonStateBezelStyleRounded, + CPRoundRectBezelStyle: [CPNull null], + }; /// @cond IGNORE CPButtonDefaultHeight = 25.0; @@ -150,8 +151,13 @@ CPButtonImageOffset = 3.0; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], 0.0, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]] - forKeys:[@"image", @"image-offset", @"bezel-inset", @"content-inset", @"bezel-color"]]; + return @{ + @"image": [CPNull null], + @"image-offset": 0.0, + @"bezel-inset": _CGInsetMakeZero(), + @"content-inset": _CGInsetMakeZero(), + @"bezel-color": [CPNull null], + }; } /*! diff --git a/AppKit/CPButtonBar.j b/AppKit/CPButtonBar.j index 8a0249881..c96a01d76 100644 --- a/AppKit/CPButtonBar.j +++ b/AppKit/CPButtonBar.j @@ -81,24 +81,17 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[ CGInsetMake(0.0, 0.0, 0.0, 0.0), - CGSizeMakeZero(), - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null]] - forKeys:[ @"resize-control-inset", - @"resize-control-size", - @"resize-control-color", - @"bezel-color", - @"button-bezel-color", - @"button-text-color", - @"button-image-plus", - @"button-image-minus", - @"button-image-action"]]; + return @{ + @"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 diff --git a/AppKit/CPColorWell.j b/AppKit/CPColorWell.j index 474a2b756..274f9c04e 100644 --- a/AppKit/CPColorWell.j +++ b/AppKit/CPColorWell.j @@ -60,8 +60,13 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), [CPNull null], _CGInsetMake(3.0, 3.0, 3.0, 3.0), _CGInsetMakeZero(), [CPNull null]] - forKeys:[@"bezel-inset", @"bezel-color", @"content-inset", @"content-border-inset", @"content-border-color"]]; + 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 diff --git a/AppKit/CPComboBox.j b/AppKit/CPComboBox.j index 7ec88bc45..73e3097e5 100644 --- a/AppKit/CPComboBox.j +++ b/AppKit/CPComboBox.j @@ -60,7 +60,10 @@ var CPComboBoxTextSubview = @"text", + (id)themeAttributes { - return [CPDictionary dictionaryWithObjectsAndKeys:_CGSizeMake(21.0, 29.0), @"popup-button-size", _CGInsetMake(3.0, 3.0, 3.0, 3.0), @"border-inset"]; + return @{ + @"popup-button-size": _CGSizeMake(21.0, 29.0), + @"border-inset": _CGInsetMake(3.0, 3.0, 3.0, 3.0), + }; } + (Class)_binderClassForBinding:(CPString)aBinding diff --git a/AppKit/CPControl.j b/AppKit/CPControl.j index f547f2be9..f1cd1a53b 100644 --- a/AppKit/CPControl.j +++ b/AppKit/CPControl.j @@ -112,28 +112,19 @@ var CPControlBlackColor = [CPColor blackColor]; + (CPDictionary)themeAttributes { - return [CPDictionary dictionaryWithObjects:[CPLeftTextAlignment, - CPTopVerticalTextAlignment, - CPLineBreakByClipping, - [CPColor blackColor], - [CPFont systemFontOfSize:CPFontCurrentSystemSize], - [CPNull null], - _CGSizeMakeZero(), - CPImageLeft, - CPScaleToFit, - _CGSizeMakeZero(), - _CGSizeMake(-1.0, -1.0)] - forKeys:[@"alignment", - @"vertical-alignment", - @"line-break-mode", - @"text-color", - @"font", - @"text-shadow-color", - @"text-shadow-offset", - @"image-position", - @"image-scaling", - @"min-size", - @"max-size"]]; + return @{ + @"alignment": CPLeftTextAlignment, + @"vertical-alignment": CPTopVerticalTextAlignment, + @"line-break-mode": CPLineBreakByClipping, + @"text-color": [CPColor blackColor], + @"font": [CPFont systemFontOfSize:CPFontCurrentSystemSize], + @"text-shadow-color": [CPNull null], + @"text-shadow-offset": _CGSizeMakeZero(), + @"image-position": CPImageLeft, + @"image-scaling": CPScaleToFit, + @"min-size": _CGSizeMakeZero(), + @"max-size": _CGSizeMake(-1.0, -1.0), + }; } + (void)initialize @@ -618,7 +609,7 @@ var CPControlBlackColor = [CPColor blackColor]; if ([note object] != self) return; - [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]]; + [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidBeginEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }]; } - (void)textDidChange:(CPNotification)note @@ -627,7 +618,7 @@ var CPControlBlackColor = [CPColor blackColor]; if ([note object] != self) return; - [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]]; + [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidChangeNotification object:self userInfo:@{ "CPFieldEditor": [note object] }]; } - (void)textDidEndEditing:(CPNotification)note @@ -638,7 +629,7 @@ var CPControlBlackColor = [CPColor blackColor]; [self _reverseSetBinding]; - [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:[CPDictionary dictionaryWithObject:[note object] forKey:"CPFieldEditor"]]; + [[CPNotificationCenter defaultCenter] postNotificationName:CPControlTextDidEndEditingNotification object:self userInfo:@{ "CPFieldEditor": [note object] }]; } /*! diff --git a/AppKit/CPKeyValueBinding.j b/AppKit/CPKeyValueBinding.j index 0e206d8d2..e48f9fc22 100644 --- a/AppKit/CPKeyValueBinding.j +++ b/AppKit/CPKeyValueBinding.j @@ -130,7 +130,10 @@ var CPBindingOperationAnd = 0, if (self) { _source = aSource; - _info = [CPDictionary dictionaryWithObjects:[aDestination, aKeyPath] forKeys:[CPObservedObjectKey, CPObservedKeyPathKey]]; + _info = @{ + CPObservedObjectKey: aDestination, + CPObservedKeyPathKey: aKeyPath, + }; _suppressedNotifications = {}; _placeholderForMarker = {}; diff --git a/AppKit/CPLevelIndicator.j b/AppKit/CPLevelIndicator.j index 7483f7c4a..aa0cb9c76 100644 --- a/AppKit/CPLevelIndicator.j +++ b/AppKit/CPLevelIndicator.j @@ -64,12 +64,14 @@ CPRatingLevelIndicatorStyle = 3; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjectsAndKeys:[CPNull null], @"bezel-color", - [CPNull null], @"color-empty", - [CPNull null], @"color-normal", - [CPNull null], @"color-warning", - [CPNull null], @"color-critical", - 1.0, @"spacing"]; + 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 diff --git a/AppKit/CPMenu/CPMenu.j b/AppKit/CPMenu/CPMenu.j index 3884fbebc..8bc7dca64 100644 --- a/AppKit/CPMenu/CPMenu.j +++ b/AppKit/CPMenu/CPMenu.j @@ -373,7 +373,7 @@ var _CPMenuBarVisible = NO, [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidChangeItemNotification object:self - userInfo:[CPDictionary dictionaryWithObject:[_items indexOfObjectIdenticalTo:aMenuItem] forKey:@"CPMenuItemIndex"]]; + userInfo:@{ @"CPMenuItemIndex": [_items indexOfObjectIdenticalTo:aMenuItem] }]; } // Finding Menu Items @@ -1136,7 +1136,7 @@ var _CPMenuBarVisible = NO, [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidAddItemNotification object:self - userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]]; + userInfo:@{ @"CPMenuItemIndex": anIndex }]; } - (void)removeObjectFromItemsAtIndex:(CPUInteger)anIndex @@ -1150,7 +1150,7 @@ var _CPMenuBarVisible = NO, [[CPNotificationCenter defaultCenter] postNotificationName:CPMenuDidRemoveItemNotification object:self - userInfo:[CPDictionary dictionaryWithObject:anIndex forKey:@"CPMenuItemIndex"]]; + userInfo:@{ @"CPMenuItemIndex": anIndex }]; } @end diff --git a/AppKit/CPMenu/_CPMenuWindow.j b/AppKit/CPMenu/_CPMenuWindow.j index d4f01f238..ddd697051 100644 --- a/AppKit/CPMenu/_CPMenuWindow.j +++ b/AppKit/CPMenu/_CPMenuWindow.j @@ -434,39 +434,34 @@ _CPMenuWindowAttachedMenuBackgroundStyle = 2; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[ [CPNull null], [CPNull null], [CPNull null], [CPNull null], CGInsetMake(5.0, 1.0, 1.0, 5.0), 16.0, - [CPNull null], [CPNull null], [CPNull null], 30.0, 10.0, 10.0, 10.0, - [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 28.0, [CPNull null], 1.0, - [CPNull null], [CPNull null], [CPNull null]] - forKeys:[ @"menu-window-more-above-image", - @"menu-window-more-below-image", - @"menu-window-pop-up-background-style-color", - @"menu-window-menu-bar-background-style-color", - @"menu-window-margin-inset", - @"menu-window-scroll-indicator-height", - - @"menu-bar-window-background-color", - @"menu-bar-window-background-selected-color", - @"menu-bar-window-font", - @"menu-bar-window-height", - @"menu-bar-window-margin", - @"menu-bar-window-left-margin", - @"menu-bar-window-right-margin", - - @"menu-bar-text-color", - @"menu-bar-title-color", - @"menu-bar-text-shadow-color", - @"menu-bar-title-shadow-color", - @"menu-bar-highlight-color", - @"menu-bar-highlight-text-color", - @"menu-bar-highlight-text-shadow-color", - @"menu-bar-height", - @"menu-bar-icon-image", - @"menu-bar-icon-image-alpha-value", - - @"menu-general-icon-new", - @"menu-general-icon-save", - @"menu-general-icon-open"]]; + return @{ + @"menu-window-more-above-image": [CPNull null], + @"menu-window-more-below-image": [CPNull null], + @"menu-window-pop-up-background-style-color": [CPNull null], + @"menu-window-menu-bar-background-style-color": [CPNull null], + @"menu-window-margin-inset": CGInsetMake(5.0, 1.0, 1.0, 5.0), + @"menu-window-scroll-indicator-height": 16.0, + @"menu-bar-window-background-color": [CPNull null], + @"menu-bar-window-background-selected-color": [CPNull null], + @"menu-bar-window-font": [CPNull null], + @"menu-bar-window-height": 30.0, + @"menu-bar-window-margin": 10.0, + @"menu-bar-window-left-margin": 10.0, + @"menu-bar-window-right-margin": 10.0, + @"menu-bar-text-color": [CPNull null], + @"menu-bar-title-color": [CPNull null], + @"menu-bar-text-shadow-color": [CPNull null], + @"menu-bar-title-shadow-color": [CPNull null], + @"menu-bar-highlight-color": [CPNull null], + @"menu-bar-highlight-text-color": [CPNull null], + @"menu-bar-highlight-text-shadow-color": [CPNull null], + @"menu-bar-height": 28.0, + @"menu-bar-icon-image": [CPNull null], + @"menu-bar-icon-image-alpha-value": 1.0, + @"menu-general-icon-new": [CPNull null], + @"menu-general-icon-save": [CPNull null], + @"menu-general-icon-open": [CPNull null], + }; } - (unsigned)numberOfUnhiddenItems diff --git a/AppKit/CPMenuItem/CPMenuItem.j b/AppKit/CPMenuItem/CPMenuItem.j index 3f416c24b..4db407605 100644 --- a/AppKit/CPMenuItem/CPMenuItem.j +++ b/AppKit/CPMenuItem/CPMenuItem.j @@ -33,25 +33,25 @@ @global CPApp -var CPMenuItemStringRepresentationDictionary = [CPDictionary dictionaryWithObjectsAndKeys: - "\u238B", CPEscapeFunctionKey, - "\u21E5", CPTabCharacter, - "\u21E4", CPBackTabCharacter, - "\u2423", CPSpaceFunctionKey, - "\u23CE", CPCarriageReturnCharacter, - "\u232B", CPBackspaceCharacter, - "\u232B", CPDeleteFunctionKey, - "\u2326", CPDeleteCharacter, - "\u21F1", CPHomeFunctionKey, - "\u21F2", CPEndFunctionKey, - "\u21DE", CPPageUpFunctionKey, - "\u21DF", CPPageDownFunctionKey, - "\u2191", CPUpArrowFunctionKey, - "\u2193", CPDownArrowFunctionKey, - "\u2190", CPLeftArrowFunctionKey, - "\u2192", CPRightArrowFunctionKey, - "\u2327", CPClearDisplayFunctionKey - ]; +var CPMenuItemStringRepresentationDictionary = @{ + CPEscapeFunctionKey: "\u238B", + CPTabCharacter: "\u21E5", + CPBackTabCharacter: "\u21E4", + CPSpaceFunctionKey: "\u2423", + CPCarriageReturnCharacter: "\u23CE", + CPBackspaceCharacter: "\u232B", + CPDeleteFunctionKey: "\u232B", + CPDeleteCharacter: "\u2326", + CPHomeFunctionKey: "\u21F1", + CPEndFunctionKey: "\u21F2", + CPPageUpFunctionKey: "\u21DE", + CPPageDownFunctionKey: "\u21DF", + CPUpArrowFunctionKey: "\u2191", + CPDownArrowFunctionKey: "\u2193", + CPLeftArrowFunctionKey: "\u2190", + CPRightArrowFunctionKey: "\u2192", + CPClearDisplayFunctionKey: "\u2327", + }; /*! @ingroup appkit diff --git a/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j b/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j index e07d2423d..1dfd49441 100644 --- a/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j +++ b/AppKit/CPMenuItem/_CPMenuItemMenuBarView.j @@ -46,12 +46,13 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], 12.0, 3.0, 4.0] - forKeys:[ @"menu-item-selection-color", - @"menu-item-text-shadow-color", - @"horizontal-margin", - @"submenu-indicator-margin", - @"vertical-margin"]]; + return @{ + @"menu-item-selection-color": [CPNull null], + @"menu-item-text-shadow-color": [CPNull null], + @"horizontal-margin": 12.0, + @"submenu-indicator-margin": 3.0, + @"vertical-margin": 4.0, + }; } + (id)view diff --git a/AppKit/CPMenuItem/_CPMenuItemStandardView.j b/AppKit/CPMenuItem/_CPMenuItemStandardView.j index 851dba7ea..5a71538b2 100644 --- a/AppKit/CPMenuItem/_CPMenuItemStandardView.j +++ b/AppKit/CPMenuItem/_CPMenuItemStandardView.j @@ -47,24 +47,25 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], 3.0, 17.0, 14.0, 17.0, 4.0, 30.0] - forKeys:[ @"submenu-indicator-color", - @"menu-item-selection-color", - @"menu-item-text-shadow-color", - @"menu-item-text-color", - @"menu-item-default-off-state-image", - @"menu-item-default-off-state-highlighted-image", - @"menu-item-default-on-state-image", - @"menu-item-default-on-state-highlighted-image", - @"menu-item-default-mixed-state-image", - @"menu-item-default-mixed-state-highlighted-image", - @"menu-item-separator-color", - @"left-margin", - @"right-margin", - @"state-column-width", - @"indentation-width", - @"vertical-margin", - @"right-columns-margin"]]; + return @{ + @"submenu-indicator-color": [CPNull null], + @"menu-item-selection-color": [CPNull null], + @"menu-item-text-shadow-color": [CPNull null], + @"menu-item-text-color": [CPNull null], + @"menu-item-default-off-state-image": [CPNull null], + @"menu-item-default-off-state-highlighted-image": [CPNull null], + @"menu-item-default-on-state-image": [CPNull null], + @"menu-item-default-on-state-highlighted-image": [CPNull null], + @"menu-item-default-mixed-state-image": [CPNull null], + @"menu-item-default-mixed-state-highlighted-image": [CPNull null], + @"menu-item-separator-color": [CPNull null], + @"left-margin": 3.0, + @"right-margin": 17.0, + @"state-column-width": 14.0, + @"indentation-width": 17.0, + @"vertical-margin": 4.0, + @"right-columns-margin": 30.0, + }; } + (id)view diff --git a/AppKit/CPMenuItem/_CPMenuItemView.j b/AppKit/CPMenuItem/_CPMenuItemView.j index be59d79ab..a0311b333 100644 --- a/AppKit/CPMenuItem/_CPMenuItemView.j +++ b/AppKit/CPMenuItem/_CPMenuItemView.j @@ -55,8 +55,7 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[] - forKeys:[]]; + return @{}; } // Not used in the Appkit diff --git a/AppKit/CPOutlineView.j b/AppKit/CPOutlineView.j index de0c83f33..9f1694720 100644 --- a/AppKit/CPOutlineView.j +++ b/AppKit/CPOutlineView.j @@ -1452,7 +1452,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0, [[CPNotificationCenter defaultCenter] postNotificationName:CPOutlineViewItemDidExpandNotification object:self - userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]]; + userInfo:@{ "CPObject": item }]; } /*! @@ -1463,7 +1463,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0, [[CPNotificationCenter defaultCenter] postNotificationName:CPOutlineViewItemWillCollapseNotification object:self - userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]]; + userInfo:@{ "CPObject": item }]; } /*! @@ -1474,7 +1474,7 @@ var CPOutlineViewCoalesceSelectionNotificationStateOff = 0, [[CPNotificationCenter defaultCenter] postNotificationName:CPOutlineViewItemDidCollapseNotification object:self - userInfo:[CPDictionary dictionaryWithObject:item forKey:"CPObject"]]; + userInfo:@{ "CPObject": item }]; } - (void)keyDown:(CPEvent)anEvent diff --git a/AppKit/CPProgressIndicator.j b/AppKit/CPProgressIndicator.j index 2e1c62afe..1bc74dcaa 100644 --- a/AppKit/CPProgressIndicator.j +++ b/AppKit/CPProgressIndicator.j @@ -77,14 +77,15 @@ var CPProgressIndicatorSpinningStyleColors = []; + (CPDictionary)themeAttributes { - return [CPDictionary dictionaryWithObjectsAndKeys: - [CPNull null], @"indeterminate-bar-color", - [CPNull null], @"bar-color", - 20, @"default-height", - [CPNull null], @"bezel-color", - [CPNull null], @"spinning-mini-gif", - [CPNull null], @"spinning-small-gif", - [CPNull null], @"spinning-regular-gif"]; + 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], + }; } + (Class)_binderClassForBinding:(CPString)aBinding diff --git a/AppKit/CPRuleEditor/CPPredicateEditor.j b/AppKit/CPRuleEditor/CPPredicateEditor.j index c131707a1..097d4f1b1 100644 --- a/AppKit/CPRuleEditor/CPPredicateEditor.j +++ b/AppKit/CPRuleEditor/CPPredicateEditor.j @@ -360,7 +360,11 @@ rootItems = [treeChild children]; } - var row = [CPDictionary dictionaryWithObjectsAndKeys:criteria, @"criteria", values, @"displayValues", rowType, @"rowType"]; + var row = @{ + @"criteria": criteria, + @"displayValues": values, + @"rowType": rowType, + }; return row; } diff --git a/AppKit/CPRuleEditor/CPRuleEditor.j b/AppKit/CPRuleEditor/CPRuleEditor.j index 433f9a71a..107e8c972 100644 --- a/AppKit/CPRuleEditor/CPRuleEditor.j +++ b/AppKit/CPRuleEditor/CPRuleEditor.j @@ -124,8 +124,16 @@ var CPRuleEditorItemPBoardType = @"CPRuleEditorItemPBoardType", + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null], [CPNull null]] - forKeys:[@"alternating-row-colors", @"selected-color", @"slice-top-border-color", @"slice-bottom-border-color", @"slice-last-bottom-border-color", @"font", @"add-image", @"remove-image"]]; + return @{ + @"alternating-row-colors": [CPNull null], + @"selected-color": [CPNull null], + @"slice-top-border-color": [CPNull null], + @"slice-bottom-border-color": [CPNull null], + @"slice-last-bottom-border-color": [CPNull null], + @"font": [CPNull null], + @"add-image": [CPNull null], + @"remove-image": [CPNull null], + }; } - (id)initWithFrame:(CGRect)frame @@ -1387,7 +1395,10 @@ TODO: implement { var item = [items objectAtIndex:i], value = [values objectAtIndex:i], - itemAndValue = [CPDictionary dictionaryWithObjects:[item, value] forKeys:["item", "value"]]; + itemAndValue = @{ + "item": item, + "value": value, + }; [itemsAndValues addObject:itemAndValue]; } @@ -2268,7 +2279,7 @@ TODO: implement - (void)_postRowCountChangedNotificationOfType:(CPString)notificationName indexes:indexes { - var userInfo = [CPDictionary dictionaryWithObject:indexes forKey:"indexes"]; + var userInfo = @{ "indexes": indexes }; [[CPNotificationCenter defaultCenter] postNotificationName:notificationName object:self userInfo:userInfo]; } diff --git a/AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j b/AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j index c70a6ba12..bb00c8e21 100644 --- a/AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j +++ b/AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j @@ -271,7 +271,11 @@ var CONTROL_HEIGHT = 16., } } - repObject = [CPDictionary dictionaryWithObjectsAndKeys:childItem, @"item", childValue, @"value", i, @"indexInCriteria"]; + repObject = @{ + @"item": childItem, + @"value": childValue, + @"indexInCriteria": i + }; [menuItem setRepresentedObject:repObject]; [menuItems addObject:menuItem]; } diff --git a/AppKit/CPScrollView.j b/AppKit/CPScrollView.j index a177d0651..fa957fc60 100644 --- a/AppKit/CPScrollView.j +++ b/AppKit/CPScrollView.j @@ -143,10 +143,10 @@ var CPScrollerStyleGlobal = CPScrollerStyleOverlay, + (CPDictionary)themeAttributes { - return [CPDictionary dictionaryWithJSObject:{ - @"bottom-corner-color": [CPColor whiteColor], - @"border-color": [CPColor blackColor] - }]; + return @{ + @"bottom-corner-color": [CPColor whiteColor], + @"border-color": [CPColor blackColor] + }; } + (CGSize)contentSizeForFrameSize:(CGSize)frameSize hasHorizontalScroller:(BOOL)hFlag hasVerticalScroller:(BOOL)vFlag borderType:(CPBorderType)borderType diff --git a/AppKit/CPScroller.j b/AppKit/CPScroller.j index 798af9e5c..92afb74ca 100644 --- a/AppKit/CPScroller.j +++ b/AppKit/CPScroller.j @@ -110,19 +110,19 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark"); + (id)themeAttributes { - return [CPDictionary dictionaryWithJSObject:{ - @"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 - }]; + 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 @@ -182,8 +182,10 @@ CPThemeStateScrollerKnobDark = CPThemeState("scroller-knob-dark"); _allowFadingOut = YES; _isMouseOver = NO; _style = CPScrollerStyleOverlay; - var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect] - forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]]; + var paramAnimFadeOut = @{ + CPViewAnimationTargetKey: self, + CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect, + }; _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut]; [_animationScroller setViewAnimations:[paramAnimFadeOut]]; @@ -826,8 +828,10 @@ var CPScrollerControlSizeKey = @"CPScrollerControlSize", _allowFadingOut = YES; _isMouseOver = NO; - var paramAnimFadeOut = [CPDictionary dictionaryWithObjects:[self, CPViewAnimationFadeOutEffect] - forKeys:[CPViewAnimationTargetKey, CPViewAnimationEffectKey]]; + var paramAnimFadeOut = @{ + CPViewAnimationTargetKey: self, + CPViewAnimationEffectKey: CPViewAnimationFadeOutEffect, + }; _animationScroller = [[CPViewAnimation alloc] initWithDuration:0.2 animationCurve:CPAnimationEaseInOut]; [_animationScroller setViewAnimations:[paramAnimFadeOut]]; diff --git a/AppKit/CPSearchField.j b/AppKit/CPSearchField.j index 4baef5dc8..11a2ce4ef 100644 --- a/AppKit/CPSearchField.j +++ b/AppKit/CPSearchField.j @@ -69,13 +69,12 @@ var RECENT_SEARCH_PREFIX = @" "; + (CPDictionary)themeAttributes { - return [CPDictionary dictionaryWithJSObject: - { + return @{ @"image-search": [CPNull null], @"image-find": [CPNull null], @"image-cancel": [CPNull null], @"image-cancel-pressed": [CPNull null] - }]; + }; } - (id)initWithFrame:(CGRect)frame diff --git a/AppKit/CPSegmentedControl.j b/AppKit/CPSegmentedControl.j index b94cc8ea0..abda119da 100644 --- a/AppKit/CPSegmentedControl.j +++ b/AppKit/CPSegmentedControl.j @@ -58,8 +58,20 @@ CPSegmentSwitchTrackingMomentary = 2; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[CPCenterTextAlignment, CPCenterVerticalTextAlignment, CPImageLeft, CPImageScaleNone, _CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], [CPNull null], 1.0, 24.0] - forKeys:[@"alignment", @"vertical-alignment", @"image-position", @"image-scaling", @"bezel-inset", @"content-inset", @"left-segment-bezel-color", @"right-segment-bezel-color", @"center-segment-bezel-color", @"divider-bezel-color", @"divider-thickness", @"default-height"]]; + return @{ + @"alignment": CPCenterTextAlignment, + @"vertical-alignment": CPCenterVerticalTextAlignment, + @"image-position": CPImageLeft, + @"image-scaling": CPImageScaleNone, + @"bezel-inset": _CGInsetMakeZero(), + @"content-inset": _CGInsetMakeZero(), + @"left-segment-bezel-color": [CPNull null], + @"right-segment-bezel-color": [CPNull null], + @"center-segment-bezel-color": [CPNull null], + @"divider-bezel-color": [CPNull null], + @"divider-thickness": 1.0, + @"default-height": 24.0, + }; } - (id)initWithFrame:(CGRect)aRect diff --git a/AppKit/CPShadowView.j b/AppKit/CPShadowView.j index 7a3b8f261..fb1092022 100644 --- a/AppKit/CPShadowView.j +++ b/AppKit/CPShadowView.j @@ -49,11 +49,10 @@ CPThemeStateShadowViewHeavy = CPThemeState("shadowview-style-heavy"); + (id)themeAttributes { - return [CPDictionary dictionaryWithJSObject: - { + return @{ @"bezel-color": [CPNull null], @"content-inset": CGInsetMakeZero() - }]; + }; } + (CGRect)frameForContentFrame:(CGRect)aFrame withWeight:(CPShadowWeight)aWeight diff --git a/AppKit/CPSlider.j b/AppKit/CPSlider.j index ba291ac09..54bc0c36f 100644 --- a/AppKit/CPSlider.j +++ b/AppKit/CPSlider.j @@ -51,8 +51,12 @@ CPCircularSlider = 1; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], _CGSizeMakeZero(), 0.0, [CPNull null]] - forKeys:[@"knob-color", @"knob-size", @"track-width", @"track-color"]]; + return @{ + @"knob-color": [CPNull null], + @"knob-size": _CGSizeMakeZero(), + @"track-width": 0.0, + @"track-color": [CPNull null], + }; } - (id)initWithFrame:(CGRect)aFrame diff --git a/AppKit/CPSplitView.j b/AppKit/CPSplitView.j index cbd8b0bbe..3aedfa2e7 100644 --- a/AppKit/CPSplitView.j +++ b/AppKit/CPSplitView.j @@ -105,16 +105,13 @@ var ShouldSuppressResizeNotifications = 1, + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[1.0, - 10.0, - [CPColor grayColor], - [CPNull null], - [CPNull null]] - forKeys:[@"divider-thickness", - @"pane-divider-thickness", - @"pane-divider-color", - @"horizontal-divider-color", - @"vertical-divider-color"]]; + return @{ + @"divider-thickness": 1.0, + @"pane-divider-thickness": 10.0, + @"pane-divider-color": [CPColor grayColor], + @"horizontal-divider-color": [CPNull null], + @"vertical-divider-color": [CPNull null], + }; } - (id)initWithFrame:(CGRect)aFrame @@ -1032,7 +1029,7 @@ The sum of the views and the sum of the dividers should be equal to the size of var userInfo = nil; if (_currentDivider !== CPNotFound) - userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"]; + userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider }; [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewWillResizeSubviewsNotification object:self @@ -1044,7 +1041,7 @@ The sum of the views and the sum of the dividers should be equal to the size of var userInfo = nil; if (_currentDivider !== CPNotFound) - userInfo = [CPDictionary dictionaryWithObject:_currentDivider forKey:@"CPSplitViewDividerIndex"]; + userInfo = @{ @"CPSplitViewDividerIndex": _currentDivider }; [[CPNotificationCenter defaultCenter] postNotificationName:CPSplitViewDidResizeSubviewsNotification object:self diff --git a/AppKit/CPStepper.j b/AppKit/CPStepper.j index 7edb9fdfd..15b16684b 100644 --- a/AppKit/CPStepper.j +++ b/AppKit/CPStepper.j @@ -269,8 +269,12 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPNull null], _CGSizeMakeZero(), _CGSizeMakeZero()] - forKeys:[@"bezel-color-up-button", @"bezel-color-down-button", @"up-button-size", @"down-button-size"]]; + return @{ + @"bezel-color-up-button": [CPNull null], + @"bezel-color-down-button": [CPNull null], + @"up-button-size": _CGSizeMakeZero(), + @"down-button-size": _CGSizeMakeZero(), + }; } @end diff --git a/AppKit/CPTableColumn.j b/AppKit/CPTableColumn.j index 6cf191f2d..a3edfb81c 100644 --- a/AppKit/CPTableColumn.j +++ b/AppKit/CPTableColumn.j @@ -560,7 +560,7 @@ CPTableColumnUserResizingMask = 1 << 1; [[CPNotificationCenter defaultCenter] postNotificationName:CPTableViewColumnDidResizeNotification object:[self tableView] - userInfo:[CPDictionary dictionaryWithObjects:[self, oldWidth] forKeys:[@"CPTableColumn", "CPOldWidth"]]]; + userInfo:@{ @"CPTableColumn": self, @"CPOldWidth": oldWidth }]; } @end diff --git a/AppKit/CPTableHeaderView.j b/AppKit/CPTableHeaderView.j index 14a2b0220..aefc23cf2 100644 --- a/AppKit/CPTableHeaderView.j +++ b/AppKit/CPTableHeaderView.j @@ -45,8 +45,16 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], CPLeftTextAlignment, CPLineBreakByTruncatingTail, CGInsetMakeZero(), [CPNull null], [CPNull null], [CPNull null], CGSizeMakeZero()] - forKeys:[@"background-color", @"text-alignment", @"line-break-mode", @"text-inset", @"text-color", @"font", @"text-shadow-color", @"text-shadow-offset"]]; + return @{ + @"background-color": [CPNull null], + @"text-alignment": CPLeftTextAlignment, + @"line-break-mode": CPLineBreakByTruncatingTail, + @"text-inset": CGInsetMakeZero(), + @"text-color": [CPNull null], + @"font": [CPNull null], + @"text-shadow-color": [CPNull null], + @"text-shadow-offset": CGSizeMakeZero(), + }; } - (void)initWithFrame:(CGRect)frame @@ -239,8 +247,10 @@ var _CPTableColumnHeaderViewStringValueKey = @"_CPTableColumnHeaderViewStringVal + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], [CPColor grayColor]] - forKeys:[@"background-color", @"divider-color"]]; + return @{ + @"background-color": [CPNull null], + @"divider-color": [CPColor grayColor], + }; } - (void)_init diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j index 93dd78f6c..4f860d67f 100644 --- a/AppKit/CPTableView.j +++ b/AppKit/CPTableView.j @@ -274,26 +274,18 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5; */ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - [CPNull null], - 25.0] - forKeys:[@"alternating-row-colors", - @"grid-color", - @"highlighted-grid-color", - @"selection-color", - @"sourcelist-selection-color", - @"sort-image", - @"sort-image-reversed", - @"selection-radius", - @"image-generic-file", - @"default-row-height"]]; + return @{ + @"alternating-row-colors": [CPNull null], + @"grid-color": [CPNull null], + @"highlighted-grid-color": [CPNull null], + @"selection-color": [CPNull null], + @"sourcelist-selection-color": [CPNull null], + @"sort-image": [CPNull null], + @"sort-image-reversed": [CPNull null], + @"selection-radius": [CPNull null], + @"image-generic-file": [CPNull null], + @"default-row-height": 25.0, + }; } - (id)initWithFrame:(CGRect)aFrame @@ -1029,8 +1021,7 @@ NOT YET IMPLEMENTED // TODO Only notify when a column drag operation ends, not each time a column reaches a new slot? [[CPNotificationCenter defaultCenter] postNotificationName:CPTableViewColumnDidMoveNotification object:self - userInfo:[CPDictionary dictionaryWithObjects:[fromIndex, toIndex] - forKeys:[@"CPOldColumn", @"CPNewColumn"]]]; + userInfo:@{ @"CPOldColumn": fromIndex, @"CPNewColumn": toIndex }]; } /*! @@ -2355,10 +2346,11 @@ NOT YET IMPLEMENTED for (var i = 0; i < [columns count]; i++) { var column = [columns objectAtIndex:i], - metaData = [CPDictionary dictionaryWithJSObject:{ - @"identifier": [column identifier], - @"width": [column width] - }]; + metaData = @{ + @"identifier": [column identifier], + @"width": [column width] + }; + [columnsSetup addObject:metaData]; } diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j index fbc667d9a..c8076da2c 100644 --- a/AppKit/CPTextField.j +++ b/AppKit/CPTextField.j @@ -206,8 +206,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder"); + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(1.0, 0.0, 0.0, 0.0), [CPNull null]] - forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]]; + return @{ + @"bezel-inset": _CGInsetMakeZero(), + @"content-inset": _CGInsetMake(1.0, 0.0, 0.0, 0.0), + @"bezel-color": [CPNull null], + }; } /* @ignore */ diff --git a/AppKit/CPTheme.j b/AppKit/CPTheme.j index b0541e563..9d6854206 100644 --- a/AppKit/CPTheme.j +++ b/AppKit/CPTheme.j @@ -476,7 +476,7 @@ CPThemeStateKeyWindow = CPThemeState("keyWindow"); if (aValue === undefined || aValue === nil) _values = @{}; else - _values = [CPDictionary dictionaryWithObject:aValue forKey:String(CPThemeStateNormal)]; + _values = @{ String(CPThemeStateNormal): aValue }; } - (void)setValue:(id)aValue forState:(CPThemeState)aState diff --git a/AppKit/CPTokenField.j b/AppKit/CPTokenField.j index 090119065..3521610b1 100755 --- a/AppKit/CPTokenField.j +++ b/AppKit/CPTokenField.j @@ -101,7 +101,7 @@ CPTokenFieldDeleteButtonType = 1; + (id)themeAttributes { - return [CPDictionary dictionaryWithObject:_CGInsetMakeZero() forKey:@"editor-inset"]; + return @{ @"editor-inset": _CGInsetMakeZero() }; } - (id)initWithFrame:(CGRect)frame diff --git a/AppKit/CPToolbar.j b/AppKit/CPToolbar.j index 1bc21c3e5..fd97bf531 100644 --- a/AppKit/CPToolbar.j +++ b/AppKit/CPToolbar.j @@ -605,25 +605,17 @@ var _CPToolbarItemInfoMake = function(anIndex, aView, aLabel, aMinWidth) + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[10.0, - 20.0, - [CPNull null], - [CPNull null], - _CGInsetMake(4.0, 4.0, 4.0, 10), - 59.0, - 46.0, - [CPNull null], - CGRectMake(0.0, 0.0, 2.0, 32.0)] - forKeys:[ - @"item-margin", - @"extra-item-width", - @"extra-item-extra-image", - @"extra-item-extra-alternate-image", - @"content-inset", - @"regular-size-height", - @"small-size-height", - @"image-item-separator-color", - @"image-item-separator-size"]]; + return @{ + @"item-margin": 10.0, + @"extra-item-width": 20.0, + @"extra-item-extra-image": [CPNull null], + @"extra-item-extra-alternate-image": [CPNull null], + @"content-inset": _CGInsetMake(4.0, 4.0, 4.0, 10), + @"regular-size-height": 59.0, + @"small-size-height": 46.0, + @"image-item-separator-color": [CPNull null], + @"image-item-separator-size": CGRectMake(0.0, 0.0, 2.0, 32.0), + }; } - (id)initWithFrame:(CGRect)aFrame diff --git a/AppKit/CPViewAnimation.j b/AppKit/CPViewAnimation.j index 46e3d4ead..932085442 100644 --- a/AppKit/CPViewAnimation.j +++ b/AppKit/CPViewAnimation.j @@ -59,8 +59,12 @@ CPViewAnimationFadeOutEffect = @"CPViewAnimationFadeOutEffect"; For example: 
-    var animation = [CPDictionary dictionaryWithObjects:[myViewToAnimate, aStartFrame, anEndFrame, CPViewAnimationFadeInEffect]
-                                                forKeys:[CPViewAnimationTargetKey, CPViewAnimationStartFrameKey, CPViewAnimationEndFrameKey, CPViewAnimationEffectKey]];
+    var animation = @{
+            CPViewAnimationTargetKey: myViewToAnimate,
+            CPViewAnimationStartFrameKey: aStartFrame,
+            CPViewAnimationEndFrameKey: anEndFrame,
+            CPViewAnimationEffectKey: CPViewAnimationFadeInEffect,
+        };
If you pass nil instead of an array of dictionaries you should later call setViewAnimations:. diff --git a/AppKit/CPViewController.j b/AppKit/CPViewController.j index 0d0e81425..2ea3a05de 100644 --- a/AppKit/CPViewController.j +++ b/AppKit/CPViewController.j @@ -103,7 +103,7 @@ var CPViewControllerCachedCibs; - (id)initWithCibName:(CPString)aCibNameOrNil bundle:(CPBundle)aCibBundleOrNil owner:(id)anOwner { - return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]]; + return [self initWithCibName:aCibNameOrNil bundle:aCibBundleOrNil externalNameTable:@{ CPCibOwner: anOwner }]; } /*! @@ -128,7 +128,7 @@ var CPViewControllerCachedCibs; // Don't load the cib until someone actually requests the view. The user may just be intending to use setView:. _cibName = aCibNameOrNil; _cibBundle = aCibBundleOrNil || [CPBundle mainBundle]; - _cibExternalNameTable = anExternalNameTable || [CPDictionary dictionaryWithObject:self forKey:CPCibOwner]; + _cibExternalNameTable = anExternalNameTable || @{ CPCibOwner: self }; _isLoading = NO; _isLazy = NO; @@ -298,7 +298,7 @@ var CPViewControllerViewKey = @"CPViewControllerViewKey", var bundlePath = [aCoder decodeObjectForKey:CPViewControllerBundleKey]; _cibBundle = bundlePath ? [CPBundle bundleWithPath:bundlePath] : [CPBundle mainBundle]; - _cibExternalNameTable = [CPDictionary dictionaryWithObject:self forKey:CPCibOwner]; + _cibExternalNameTable = @{ CPCibOwner: self }; _isLazy = YES; } diff --git a/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j b/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j index c59b10e8c..b726343bb 100644 --- a/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j +++ b/AppKit/CPWindow/_CPBorderlessBridgeWindowView.j @@ -34,8 +34,9 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPColor grayColor]] - forKeys:[@"toolbar-background-color"]]; + return @{ + @"toolbar-background-color": [CPColor grayColor], + }; } - (void)setShowsResizeIndicator:(BOOL)shouldShowResizeIndicator diff --git a/AppKit/CPWindow/_CPDocModalWindowView.j b/AppKit/CPWindow/_CPDocModalWindowView.j index 1577a2d76..ed8b64b42 100644 --- a/AppKit/CPWindow/_CPDocModalWindowView.j +++ b/AppKit/CPWindow/_CPDocModalWindowView.j @@ -36,8 +36,10 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPColor whiteColor], 8] - forKeys:[ @"body-color", @"height-shadow"]]; + return @{ + @"body-color": [CPColor whiteColor], + @"height-shadow": 8, + }; } - (id)initWithFrame:(CGRect)aFrame styleMask:(unsigned)aStyleMask diff --git a/AppKit/CPWindow/_CPPopoverWindowView.j b/AppKit/CPWindow/_CPPopoverWindowView.j index 09173e016..020896213 100644 --- a/AppKit/CPWindow/_CPPopoverWindowView.j +++ b/AppKit/CPWindow/_CPPopoverWindowView.j @@ -56,14 +56,12 @@ var _CPPopoverWindowViewDefaultCursorSize = _CGSizeMake(16, 10), + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPNull null], - [CPNull null], - [CPNull null], - [CPNull null]] - forKeys:[@"background-gradient", - @"background-gradient-hud", - @"stroke-color", - @"stroke-color-hud"]]; + return @{ + @"background-gradient": [CPNull null], + @"background-gradient-hud": [CPNull null], + @"stroke-color": [CPNull null], + @"stroke-color-hud": [CPNull null], + }; } /*! diff --git a/AppKit/CPWindow/_CPShadowWindowView.j b/AppKit/CPWindow/_CPShadowWindowView.j index 5a0a27f03..c78811141 100644 --- a/AppKit/CPWindow/_CPShadowWindowView.j +++ b/AppKit/CPWindow/_CPShadowWindowView.j @@ -43,8 +43,7 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[] - forKeys:[]]; + return @{}; } - (void)layoutSubviews diff --git a/AppKit/CPWindow/_CPStandardWindowView.j b/AppKit/CPWindow/_CPStandardWindowView.j index fb089657f..6c7fef09a 100644 --- a/AppKit/CPWindow/_CPStandardWindowView.j +++ b/AppKit/CPWindow/_CPStandardWindowView.j @@ -41,8 +41,7 @@ var _CPStandardWindowViewDividerViewHeight = 1.0; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[] - forKeys:[]]; + return @{}; } - (id)initWithFrame:(CGRect)aFrame windowView:(_CPWindowView)parentView @@ -107,19 +106,20 @@ var _CPStandardWindowViewDividerViewHeight = 1.0; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjectsAndKeys: - [CPNull null], @"gradient-height", - [CPNull null], @"solid-color", - [CPNull null], @"bezel-head-color", - [CPColor blackColor], @"divider-color", - [CPColor whiteColor], @"body-color", - 32, @"title-bar-height", - [CPNull null], @"minimize-image-highlighted-button", - [CPNull null], @"minimize-image-button", - [CPNull null], @"close-image-button", - [CPNull null], @"close-image-highlighted-button", - [CPNull null], @"unsaved-image-button", - [CPNull null], @"unsaved-image-highlighted-button"]; + return @{ + @"gradient-height": [CPNull null], + @"solid-color": [CPNull null], + @"bezel-head-color": [CPNull null], + @"divider-color": [CPColor blackColor], + @"body-color": [CPColor whiteColor], + @"title-bar-height": 32, + @"minimize-image-highlighted-button": [CPNull null], + @"minimize-image-button": [CPNull null], + @"close-image-button": [CPNull null], + @"close-image-highlighted-button": [CPNull null], + @"unsaved-image-button": [CPNull null], + @"unsaved-image-highlighted-button": [CPNull null], + }; } + (CGRect)contentRectForFrameRect:(CGRect)aFrameRect diff --git a/AppKit/CPWindow/_CPToolTipWindowView.j b/AppKit/CPWindow/_CPToolTipWindowView.j index 289fb6abe..c11e425b2 100644 --- a/AppKit/CPWindow/_CPToolTipWindowView.j +++ b/AppKit/CPWindow/_CPToolTipWindowView.j @@ -40,16 +40,13 @@ + (id)themeAttributes { - return [CPDictionary dictionaryWithObjects:[[CPColor colorWithHexString:@"E3E3E3"], - [CPColor colorWithHexString:@"FFFFCA"], - 2.0, - 1.0, - [CPColor blackColor]] - forKeys:[@"stroke-color", - @"background-color", - @"border-radius", - @"stroke-width", - @"color"]]; + return @{ + @"stroke-color": [CPColor colorWithHexString:@"E3E3E3"], + @"background-color": [CPColor colorWithHexString:@"FFFFCA"], + @"border-radius": 2.0, + @"stroke-width": 1.0, + @"color": [CPColor blackColor], + }; } /*! compute the contentView frame from a given window frame diff --git a/AppKit/CPWindow/_CPWindowView.j b/AppKit/CPWindow/_CPWindowView.j index d3188a8c8..9b49f8624 100644 --- a/AppKit/CPWindow/_CPWindowView.j +++ b/AppKit/CPWindow/_CPWindowView.j @@ -83,26 +83,27 @@ _CPWindowViewResizeSlop = 3; + (id)themeAttributes { - return [CPDictionary dictionaryWithObjectsAndKeys: - 25, @"title-bar-height", - CGInsetMakeZero(), @"shadow-inset", - 5, @"shadow-distance", - [CPColor clearColor], @"window-shadow-color", - CGSizeMakeZero(), @"size-indicator", - [CPNull null], @"resize-indicator", - [CPColor blackColor], @"attached-sheet-shadow-color", - [CPNull null], @"close-image-origin", - [CPNull null], @"close-image-size", - [CPNull null], @"close-image", - [CPNull null], @"close-active-image", - [CPNull null] , @"bezel-color", - [CPColor blackColor], @"title-text-color", - [CPFont systemFontOfSize:CPFontCurrentSystemSize], @"title-font", - [CPNull null], @"title-text-shadow-color", - _CGSizeMakeZero(), @"title-text-shadow-offset", - CPCenterTextAlignment, @"title-alignment", - CPLineBreakByTruncatingTail, @"title-line-break-mode", - CPTopVerticalTextAlignment, @"title-vertical-alignment"]; + return @{ + @"title-bar-height": 25, + @"shadow-inset": CGInsetMakeZero(), + @"shadow-distance": 5, + @"window-shadow-color": [CPColor clearColor], + @"size-indicator": CGSizeMakeZero(), + @"resize-indicator": [CPNull null], + @"attached-sheet-shadow-color": [CPColor blackColor], + @"close-image-origin": [CPNull null], + @"close-image-size": [CPNull null], + @"close-image": [CPNull null], + @"close-active-image": [CPNull null], + @"bezel-color": [CPNull null], + @"title-text-color": [CPColor blackColor], + @"title-font": [CPFont systemFontOfSize:CPFontCurrentSystemSize], + @"title-text-shadow-color": [CPNull null], + @"title-text-shadow-offset": _CGSizeMakeZero(), + @"title-alignment": CPCenterTextAlignment, + @"title-line-break-mode": CPLineBreakByTruncatingTail, + @"title-vertical-alignment": CPTopVerticalTextAlignment, + }; } - (CGRect)contentRectForFrameRect:(CGRect)aFrameRect diff --git a/AppKit/CPWindowController.j b/AppKit/CPWindowController.j index 21b5e79c7..aca81d3d4 100644 --- a/AppKit/CPWindowController.j +++ b/AppKit/CPWindowController.j @@ -144,7 +144,7 @@ if (_window) return; - [[CPBundle mainBundle] loadCibFile:[self windowCibPath] externalNameTable:[CPDictionary dictionaryWithObject:_cibOwner forKey:CPCibOwner]]; + [[CPBundle mainBundle] loadCibFile:[self windowCibPath] externalNameTable:@{ CPCibOwner: _cibOwner }]; } /*! diff --git a/AppKit/Cib/CPCib.j b/AppKit/Cib/CPCib.j index a2b5e7afa..f92eac1c2 100644 --- a/AppKit/Cib/CPCib.j +++ b/AppKit/Cib/CPCib.j @@ -165,7 +165,7 @@ var CPCibObjectDataKey = @"CPCibObjectDataKey"; - (BOOL)instantiateCibWithOwner:(id)anOwner topLevelObjects:(CPArray)topLevelObjects { - return [self instantiateCibWithExternalNameTable:[CPDictionary dictionaryWithObjects:[anOwner, topLevelObjects] forKeys:[CPCibOwner, CPCibTopLevelObjects]]]; + return [self instantiateCibWithExternalNameTable:@{ CPCibOwner: anOwner, CPCibTopLevelObjects: topLevelObjects }]; } @end diff --git a/AppKit/Cib/CPCibLoading.j b/AppKit/Cib/CPCibLoading.j index 02e91af1e..8a46e670f 100644 --- a/AppKit/Cib/CPCibLoading.j +++ b/AppKit/Cib/CPCibLoading.j @@ -52,7 +52,7 @@ var CPCibOwner = @"CPCibOwner"; var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle], path = [bundle pathForResource:aName]; - return [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner]]; + return [self loadCibFile:path externalNameTable:@{ CPCibOwner: anOwner }]; } - (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable @@ -78,7 +78,7 @@ var CPCibOwner = @"CPCibOwner"; var bundle = anOwner ? [CPBundle bundleForClass:[anOwner class]] : [CPBundle mainBundle], path = [bundle pathForResource:aName]; - return [self loadCibFile:path externalNameTable:[CPDictionary dictionaryWithObject:anOwner forKey:CPCibOwner] loadDelegate:aDelegate]; + return [self loadCibFile:path externalNameTable:@{ CPCibOwner: anOwner } loadDelegate:aDelegate]; } - (CPCib)loadCibFile:(CPString)aFileName externalNameTable:(CPDictionary)aNameTable loadDelegate:(id)aDelegate diff --git a/AppKit/Cib/_CPCibCustomResource.j b/AppKit/Cib/_CPCibCustomResource.j index 508c5e3c2..aefe07e67 100644 --- a/AppKit/Cib/_CPCibCustomResource.j +++ b/AppKit/Cib/_CPCibCustomResource.j @@ -46,12 +46,12 @@ var _CPCibCustomResourceClassNameKey = @"_CPCibCustomResourceClassNameKey", + (id)imageResourceWithName:(CPString)aResourceName size:(CGSize)aSize { - return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObject:aSize forKey:@"size"]]; + return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:@{ @"size": aSize }]; } + (id)imageResourceWithName:(CPString)aResourceName size:(CGSize)aSize bundleClass:(CPString)aBundleClass { - return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:[CPDictionary dictionaryWithObjects:[aSize, aBundleClass] forKeys:[@"size", @"bundleClass"]]]; + return [[self alloc] initWithClassName:@"CPImage" resourceName:aResourceName properties:@{ @"size": aSize, @"bundleClass": aBundleClass }]; } - (id)initWithClassName:(CPString)aClassName resourceName:(CPString)aResourceName properties:(CPDictionary)properties diff --git a/AppKit/Platform/CPPlatformString.j b/AppKit/Platform/CPPlatformString.j index 8a8d15866..ddc7e29d1 100644 --- a/AppKit/Platform/CPPlatformString.j +++ b/AppKit/Platform/CPPlatformString.j @@ -50,7 +50,11 @@ + (CPDictionary)metricsOfFont:(CPFont)aFont { - return [CPDictionary dictionaryWithObjectsAndKeys:0, @"ascender", 0, @"descender", 0, @"lineHeight"]; + return @{ + @"ascender": 0, + @"descender": 0, + @"lineHeight": 0, + }; } @end diff --git a/AppKit/Platform/DOM/CPPlatformString.j b/AppKit/Platform/DOM/CPPlatformString.j index 1c99ebc53..aff149962 100644 --- a/AppKit/Platform/DOM/CPPlatformString.j +++ b/AppKit/Platform/DOM/CPPlatformString.j @@ -165,7 +165,11 @@ var DOMFixedWidthSpanElement = nil, baseline = DOMMetricsImgElement.offsetTop + DOMMetricsImgElement.offsetHeight, descender = baseline - lineHeight; - return [CPDictionary dictionaryWithObjectsAndKeys:baseline, @"ascender", descender, @"descender", lineHeight, @"lineHeight"]; + return @{ + @"ascender": baseline, + @"descender": descender, + @"lineHeight": lineHeight, + }; } @end diff --git a/AppKit/Themes/Aristo/ThemeDescriptors.j b/AppKit/Themes/Aristo/ThemeDescriptors.j index d471c2f9f..22d373c63 100755 --- a/AppKit/Themes/Aristo/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo/ThemeDescriptors.j @@ -1838,11 +1838,11 @@ var themedButtonValues = nil, alternatingRowColors = [[CPColor whiteColor], [CPColor colorWithRed:245.0 / 255.0 green:249.0 / 255.0 blue:252.0 / 255.0 alpha:1.0]], gridColor = [CPColor colorWithHexString:@"cccccc"], selectionColor = [CPColor colorWithHexString:@"5f83b9"], - sourceListSelectionColor = [CPDictionary dictionaryWithObjects: [CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [98.0 / 255.0, 143.0 / 210.0, 209.0 / 255.0, 1.0, 46.0 / 255.0, 88.0 / 176.0, 208.0 / 255.0,1.0], [0,1], 2), - [CPColor colorWithCalibratedRed:81.0 / 255.0 green:127.0 / 255.0 blue:200.0 / 255.0 alpha:1.0], - [CPColor colorWithCalibratedRed:34.0 / 255.0 green:63.0 / 255.0 blue:123.0 / 255.0 alpha:1.0] - ] - forKeys: [CPSourceListGradient, CPSourceListTopLineColor, CPSourceListBottomLineColor]], + sourceListSelectionColor = @{ + CPSourceListGradient: CGGradientCreateWithColorComponents(CGColorSpaceCreateDeviceRGB(), [98.0 / 255.0, 143.0 / 210.0, 209.0 / 255.0, 1.0, 46.0 / 255.0, 88.0 / 176.0, 208.0 / 255.0,1.0], [0,1], 2), + CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:81.0 / 255.0 green:127.0 / 255.0 blue:200.0 / 255.0 alpha:1.0], + CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:34.0 / 255.0 green:63.0 / 255.0 blue:123.0 / 255.0 alpha:1.0], + }, themedTableViewValues = [ diff --git a/AppKit/Themes/Aristo2/ThemeDescriptors.j b/AppKit/Themes/Aristo2/ThemeDescriptors.j index 4f5f8e44d..354730df9 100644 --- a/AppKit/Themes/Aristo2/ThemeDescriptors.j +++ b/AppKit/Themes/Aristo2/ThemeDescriptors.j @@ -1295,19 +1295,16 @@ var themedButtonValues = nil, alternatingRowColors = [[CPColor whiteColor], [CPColor colorWithRed:245.0 / 255.0 green:249.0 / 255.0 blue:252.0 / 255.0 alpha:1.0]], gridColor = [CPColor colorWithHexString:@"dce0e2"], selectionColor = [CPColor colorWithHexString:@"5780d8"], - sourceListSelectionColor = [CPDictionary dictionaryWithObjectsAndKeys: - CGGradientCreateWithColorComponents( + sourceListSelectionColor = @{ + CPSourceListGradient: CGGradientCreateWithColorComponents( CGColorSpaceCreateDeviceRGB(), [109.0 / 255.0, 150.0 / 255.0, 238.0 / 255.0, 1.0, 72.0 / 255.0, 113.0 / 255.0, 201.0 / 255.0, 1.0], [0, 1], 2 ), - CPSourceListGradient, - [CPColor colorWithCalibratedRed:73.0 / 255.0 green:109.0 / 255.0 blue:187.0 / 255.0 alpha:1.0], - CPSourceListTopLineColor, - [CPColor colorWithCalibratedRed:44.0 / 255.0 green:79.0 / 255.0 blue:155.0 / 255.0 alpha:1.0], - CPSourceListBottomLineColor - ], + CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:73.0 / 255.0 green:109.0 / 255.0 blue:187.0 / 255.0 alpha:1.0], + CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:44.0 / 255.0 green:79.0 / 255.0 blue:155.0 / 255.0 alpha:1.0], + }, themedTableViewValues = [ diff --git a/AppKit/Themes/CommonJS/blendtask.j b/AppKit/Themes/CommonJS/blendtask.j index 36cab5364..e167e4f45 100644 --- a/AppKit/Themes/CommonJS/blendtask.j +++ b/AppKit/Themes/CommonJS/blendtask.j @@ -162,7 +162,7 @@ function themeFromCibData(data) topLevelObjects = []; [cib _setAwakenCustomResources:NO]; - [cib instantiateCibWithExternalNameTable:[CPDictionary dictionaryWithObject:topLevelObjects forKey:CPCibTopLevelObjects]]; + [cib instantiateCibWithExternalNameTable:@{ CPCibTopLevelObjects: topLevelObjects }]; var count = topLevelObjects.length, theme = nil, diff --git a/Foundation/CPAttributedString.j b/Foundation/CPAttributedString.j index fe010f004..bbefafc6b 100644 --- a/Foundation/CPAttributedString.j +++ b/Foundation/CPAttributedString.j @@ -620,7 +620,7 @@ */ - (void)addAttribute:(CPString)anAttribute value:(id)aValue range:(CPRange)aRange { - [self addAttributes:[CPDictionary dictionaryWithObject:aValue forKey:anAttribute] range:aRange]; + [self addAttributes:@{ anAttribute: aValue } range:aRange]; } /*! diff --git a/Foundation/CPKeyValueCoding.j b/Foundation/CPKeyValueCoding.j index 09773e7a2..9e7d319ba 100644 --- a/Foundation/CPKeyValueCoding.j +++ b/Foundation/CPKeyValueCoding.j @@ -165,7 +165,7 @@ var CPObjectAccessorsForClassKey = @"$CPObjectAccessorsForClassKey", { [[CPException exceptionWithName:CPUndefinedKeyException reason:[self _objectDescription] + " is not key value coding-compliant for the key " + aKey - userInfo:[CPDictionary dictionaryWithObjects:[self, aKey] forKeys:[CPTargetObjectUserInfoKey, CPUnknownUserInfoKey]]] raise]; + userInfo:@{ CPTargetObjectUserInfoKey: self, CPUnknownUserInfoKey: aKey }] raise]; } - (void)setValue:(id)aValue forKeyPath:(CPString)aKeyPath @@ -258,7 +258,7 @@ var CPObjectAccessorsForClassKey = @"$CPObjectAccessorsForClassKey", { [[CPException exceptionWithName:CPUndefinedKeyException reason:[self _objectDescription] + " is not key value coding-compliant for the key " + aKey - userInfo:[CPDictionary dictionaryWithObjects:[self, aKey] forKeys:[CPTargetObjectUserInfoKey, CPUnknownUserInfoKey]]] raise]; + userInfo:@{ CPTargetObjectUserInfoKey: self, CPUnknownUserInfoKey: aKey }] raise]; } - (CPString)_objectDescription diff --git a/Foundation/CPKeyValueObserving.j b/Foundation/CPKeyValueObserving.j index b97664e34..7cd74ca4c 100644 --- a/Foundation/CPKeyValueObserving.j +++ b/Foundation/CPKeyValueObserving.j @@ -769,7 +769,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti if (newValue === nil || newValue === undefined) newValue = [CPNull null]; - var changes = [CPDictionary dictionaryWithObject:newValue forKey:CPKeyValueChangeNewKey]; + var changes = @{ CPKeyValueChangeNewKey: newValue }; [anObserver observeValueForKeyPath:aPath ofObject:_targetObject change:changes context:aContext]; } } @@ -1006,7 +1006,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti if (!aKey) return; - var changeOptions = [CPDictionary dictionaryWithObject:CPKeyValueChangeSetting forKey:CPKeyValueChangeKindKey]; + var changeOptions = @{ CPKeyValueChangeKindKey: CPKeyValueChangeSetting }; [[_CPKVOProxy proxyForObject:self] _sendNotificationsForKey:aKey changeOptions:changeOptions isBefore:YES]; } @@ -1036,7 +1036,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti if (!aKey) return; - var changeOptions = [CPDictionary dictionaryWithObjects:[change, indexes] forKeys:[CPKeyValueChangeKindKey, CPKeyValueChangeIndexesKey]]; + var changeOptions = @{ CPKeyValueChangeKindKey: change, CPKeyValueChangeIndexesKey: indexes }; [[_CPKVOProxy proxyForObject:self] _sendNotificationsForKey:aKey changeOptions:changeOptions isBefore:YES]; } @@ -1067,7 +1067,7 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti return; var changeKind = _changeKindForSetMutationKind(mutationKind), - changeOptions = [CPDictionary dictionaryWithObject:changeKind forKey:CPKeyValueChangeKindKey]; + changeOptions = @{ CPKeyValueChangeKindKey: changeKind }; //set hidden change-dict ivars to support unordered to-many relationships changeOptions[_CPKeyValueChangeSetMutationObjectsKey] = objects; changeOptions[_CPKeyValueChangeSetMutationKindKey] = mutationKind; @@ -1215,10 +1215,11 @@ var kvoNewAndOld = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti { var oldValue = [_value valueForKeyPath:_secondPart], newValue = [_object valueForKeyPath:_firstPart + "." + _secondPart], - pathChanges = [CPDictionary dictionaryWithObjectsAndKeys: - newValue ? newValue : [CPNull null], CPKeyValueChangeNewKey, - oldValue ? oldValue : [CPNull null], CPKeyValueChangeOldKey, - CPKeyValueChangeSetting, CPKeyValueChangeKindKey]; + pathChanges = @{ + CPKeyValueChangeNewKey: newValue ? newValue : [CPNull null], + CPKeyValueChangeOldKey: oldValue ? oldValue : [CPNull null], + CPKeyValueChangeKindKey: CPKeyValueChangeSetting, + }; [_observer observeValueForKeyPath:_firstPart + "." + _secondPart ofObject:_object change:pathChanges context:_context]; diff --git a/Foundation/CPKeyedArchiver.j b/Foundation/CPKeyedArchiver.j index 437ef110a..80f7a6689 100644 --- a/Foundation/CPKeyedArchiver.j +++ b/Foundation/CPKeyedArchiver.j @@ -132,7 +132,7 @@ var _CPKeyedArchiverStringClass = Nil, _CPKeyedArchiverStringClass = [CPString class]; _CPKeyedArchiverNumberClass = [CPNumber class]; - _CPKeyedArchiverNullReference = [CPDictionary dictionaryWithObject:0 forKey:_CPKeyedArchiverUIDKey]; + _CPKeyedArchiverNullReference = @{ _CPKeyedArchiverUIDKey: 0 }; } + (BOOL)allowsKeyedCoding @@ -576,7 +576,7 @@ var _CPKeyedArchiverEncodeObject = function(self, anObject, isConditional) [self._UIDs setObject:classUID forKey:className]; } - [plistObject setObject:[CPDictionary dictionaryWithObject:classUID forKey:_CPKeyedArchiverUIDKey] forKey:_CPKeyedArchiverClassKey]; + [plistObject setObject:@{ _CPKeyedArchiverUIDKey: classUID } forKey:_CPKeyedArchiverClassKey]; } UID = [self._conditionalUIDs objectForKey:GUID]; @@ -595,5 +595,5 @@ var _CPKeyedArchiverEncodeObject = function(self, anObject, isConditional) } } - return [CPDictionary dictionaryWithObject:UID forKey:_CPKeyedArchiverUIDKey]; + return @{ _CPKeyedArchiverUIDKey: UID }; }; diff --git a/Foundation/CPPredicate/_CPSubqueryExpression.j b/Foundation/CPPredicate/_CPSubqueryExpression.j index d1b0fa31f..78b50be94 100644 --- a/Foundation/CPPredicate/_CPSubqueryExpression.j +++ b/Foundation/CPPredicate/_CPSubqueryExpression.j @@ -55,7 +55,7 @@ var collection = [_collection expressionValueWithObject:object context:context], count = [collection count], result = [CPArray array], - bindings = [CPDictionary dictionaryWithObject:[CPExpression expressionForEvaluatedObject] forKey:[self variable]], + bindings = @{ [self variable]: [CPExpression expressionForEvaluatedObject] }, i = 0; for (; i < count; i++) diff --git a/Tests/AppKit/CPArrayControllerTest.j b/Tests/AppKit/CPArrayControllerTest.j index a54bb5dad..3590f9f61 100644 --- a/Tests/AppKit/CPArrayControllerTest.j +++ b/Tests/AppKit/CPArrayControllerTest.j @@ -1040,7 +1040,7 @@ var arrayController1 = [CPArrayController new], arrayController2 = [CPArrayController new]; - [arrayController2 setContent:[CPDictionary dictionaryWithObject:[1, 2, 3] forKey:@"x"]]; + [arrayController2 setContent:@{ @"x": [1, 2, 3] }]; [arrayController1 bind:@"contentArray" toObject:arrayController2 withKeyPath:@"selection.x" options:nil]; // This used to cause a bug where the _CPKVCArray wrapping the selection proxy tried to call 'count' on @@ -1165,8 +1165,14 @@ if (self) { items = [CPMutableArray array]; - [items addObject:[CPDictionary dictionaryWithObjectsAndKeys:@"Spacely Sprockets", @"name", [CPArray arrayWithObjects:@"Tom", @"Dick", @"Harry"], @"employees"]]; - [items addObject:[CPDictionary dictionaryWithObjectsAndKeys:@"Cogswell Cogs", @"name", [CPArray arrayWithObjects:@"Jane", @"Mary", @"Vic"], @"employees"]]; + [items addObject:@{ + @"name": @"Spacely Sprockets", + @"employees": [CPArray arrayWithObjects:@"Tom", @"Dick", @"Harry"] + }]; + [items addObject:@{ + @"name": @"Cogswell Cogs", + @"employees": [CPArray arrayWithObjects:@"Jane", @"Mary", @"Vic"] + }]; } return self; diff --git a/Tests/AppKit/CPCheckBoxTest.j b/Tests/AppKit/CPCheckBoxTest.j index 178ecba35..528c7bd30 100644 --- a/Tests/AppKit/CPCheckBoxTest.j +++ b/Tests/AppKit/CPCheckBoxTest.j @@ -45,17 +45,12 @@ [control unbind:CPValueBinding]; // Set up a new binding with explicit placeholders, different from the default ones. - var options = [CPDictionary dictionaryWithObjects:[ - CPOffState, - CPOnState, - CPOnState, - CPMixedState - ] forKeys:[ - CPMultipleValuesPlaceholderBindingOption, - CPNoSelectionPlaceholderBindingOption, - CPNotApplicablePlaceholderBindingOption, - CPNullPlaceholderBindingOption - ]]; + var options = @{ + CPMultipleValuesPlaceholderBindingOption: CPOffState, + CPNoSelectionPlaceholderBindingOption: CPOnState, + CPNotApplicablePlaceholderBindingOption: CPOnState, + CPNullPlaceholderBindingOption: CPMixedState, + }; [control bind:CPValueBinding toObject:arrayController withKeyPath:@"selection.self" options:options]; @@ -81,13 +76,13 @@ var content = [ - [CPDictionary dictionaryWithObject:YES forKey:@"state"], - [CPDictionary dictionaryWithObject:NO forKey:@"state"] + @{ @"state": YES }, + @{ @"state": NO } ], arrayController = [[CPArrayController alloc] initWithContent:content]; // First test defaults. - [control bind:CPValueBinding toObject:arrayController withKeyPath:@"selection.state" options:[CPDictionary dictionaryWithObject:@"CPNegateBoolean" forKey:CPValueTransformerNameBindingOption]]; + [control bind:CPValueBinding toObject:arrayController withKeyPath:@"selection.state" options:@{ CPValueTransformerNameBindingOption: @"CPNegateBoolean" }]; [arrayController setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]]; [self assert:CPOffState equals:[control objectValue] message:"content[0] is negated"] diff --git a/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j b/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j index 7475e0875..d9c0e06d1 100644 --- a/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j +++ b/Tests/AppKit/CPKeyValueBindingSimpleBindingsTest.j @@ -105,7 +105,7 @@ { // Note: this cib will connect 'objectController'. This is only for debugging purposes, // this code should run with or without that connection. - var cib = [CPBundle loadCibFile:[[CPBundle bundleForClass:CPKeyValueBindingSimpleBindingsTest] pathForResource:"SimpleBindingsAdoption_03.cib"] externalNameTable:[CPDictionary dictionaryWithObject:self forKey:CPCibOwner]]; + var cib = [CPBundle loadCibFile:[[CPBundle bundleForClass:CPKeyValueBindingSimpleBindingsTest] pathForResource:"SimpleBindingsAdoption_03.cib"] externalNameTable:@{ CPCibOwner: self }]; // Test the interaction. [textField setStringValue:@"0.7"]; diff --git a/cappuccino.sublime-project b/cappuccino.sublime-project new file mode 100644 index 000000000..668af4c74 --- /dev/null +++ b/cappuccino.sublime-project @@ -0,0 +1,10 @@ +{ + "folders": + [ + { + "path": "/Users/siker/dev/cappuccino", + "folder_exclude_patterns": ["Build", "*.environment", "AppKit/Themes/Aristo/Frameworks"], + "file_exclude_patterns": ["*.cib", "dataURLs.txt", "MHTMLData.txt", "MHTMLPaths.txt"] + } + ] +} diff --git a/cappuccino.sublime-workspace b/cappuccino.sublime-workspace new file mode 100644 index 000000000..eb2cb5991 --- /dev/null +++ b/cappuccino.sublime-workspace @@ -0,0 +1,2111 @@ +{ + "auto_complete": + { + "selected_items": + [ + [ + "CPInput", + "CPInputOnInputEventFeature" + ], + [ + "CPTextFieldInpu", + "CPTextFieldInputFunction" + ], + [ + "defaultH", + "defaultLineHeightForFont" + ], + [ + "title", + "titleBarHeight" + ], + [ + "default", + "defaultCenter" + ], + [ + "CPNoti", + "CPNotificationCenter" + ], + [ + "CPJavaScriptClipboard", + "CPJavaScriptClipboardAccessFeature" + ], + [ + "_vali", + "_validateCopyCutOrPasteEvent" + ], + [ + "PLAT", + "PLATFORM_FEATURES" + ], + [ + "CPDeci", + "CPDecimalNumber" + ], + [ + "generates", + "generatesDecimalNumbers" + ], + [ + "decimalNum", + "decimalNumberWithString" + ], + [ + "decodeObject", + "decodeObjectForKey" + ], + [ + "CPNumberFormatterCurr", + "CPNumberFormatterCurrencyCodeKey" + ], + [ + "_curr", + "_currencyCode" + ], + [ + "_max", + "_maximumFractionDigits" + ], + [ + "_minim", + "_minimumFractionDigits" + ], + [ + "CPNumberForm", + "CPNumberFormatterDecimalStyle" + ], + [ + "_grouping", + "_groupingSeparator" + ], + [ + "setMi", + "setMinimumFractionDigits" + ], + [ + "_mini", + "_minimumFractionalDigits" + ], + [ + "setM", + "setMaximumFractionDigits" + ], + [ + "_characters", + "_charactersIgnoringModifiers" + ], + [ + "_token", + "_tokenScrollView" + ], + [ + "doubleAc", + "doubleActionReceived" + ], + [ + "acceptsF", + "acceptsFirstResponder" + ], + [ + "resign", + "resignFirstResponder" + ], + [ + "setSele", + "setSelectedIndex" + ], + [ + "dictionary", + "dictionaryWithObjectsAndKeys" + ], + [ + "CPEnumer", + "CPEnumerationReverse" + ], + [ + "enum", + "enumerateObjectsWithOptions:CPEnumerationNormal" + ], + [ + "shouldBe", + "shouldBeItalic" + ], + [ + "_acti", + "_activeChange" + ], + [ + "systemFont", + "systemFontOfSize" + ], + [ + "avail", + "availableFonts" + ], + [ + "CPThem", + "CPThemeStateDisabled" + ], + [ + "CPThemeSt", + "CPThemeStateHighlighted" + ], + [ + "_CG", + "_CGInsetMakeZero" + ], + [ + "CGRectIn", + "CGRectInsetWithInset" + ], + [ + "_CGRectIn", + "_CGRectInsetWithInset" + ], + [ + "_CGRec", + "_CGRectMake" + ], + [ + "_CGIn", + "_CGInsetIsEmpty" + ], + [ + "_CGIN", + "_CGInsetIsEmpty" + ], + [ + "_CGRect", + "_CGRectMakeCopy" + ], + [ + "autosa", + "autosave" + ], + [ + "_restoreFrom", + "_restoreFromAutosaveIfNeeded" + ], + [ + "_rest", + "_restoreFromAutosaveIfNeeded" + ], + [ + "aFram", + "aFrameSize" + ], + [ + "_nee", + "_needsRestoreFromAutosave" + ], + [ + "splitVi", + "splitViewA" + ], + [ + "NSDi", + "NSDividerStyleThin" + ], + [ + "tool", + "toolbarItems" + ], + [ + "defaul", + "defaultCenter" + ], + [ + "_CPWind", + "_CPWindowDidChangeFirstResponder" + ], + [ + "_item", + "_itemIdentifiers" + ], + [ + "high", + "highlight" + ], + [ + "shoul", + "shouldHighlight" + ], + [ + "highlight", + "highlightsBy" + ], + [ + "_sele", + "_selectedRange" + ], + [ + "_se", + "_selectedRange" + ], + [ + "_au", + "_autocomplete" + ], + [ + "im", + "immediately" + ], + [ + "_tok", + "_tokenizingCharacterSet" + ], + [ + "CPToken", + "CPTokenFieldDOMInputElement" + ], + [ + "modi", + "modifierFlags" + ], + [ + "TOOL", + "TOOLBAR_ITEM_MARGIN" + ], + [ + "value", + "valueForThemeAttribute" + ], + [ + "_tool", + "_toolbar" + ], + [ + "small", + "small-size-height" + ], + [ + "CPToolbarSi", + "CPToolbarSizeModeRegular" + ], + [ + "label", + "labelOnly" + ], + [ + "CPToolbarDisplay", + "CPToolbarDisplayModeLabelOnly" + ], + [ + "disp", + "displayMode" + ], + [ + "CPToolbarDi", + "CPToolbarDisplayModeIconOnly" + ], + [ + "displ", + "_displayMode" + ], + [ + "_la", + "_labelField" + ], + [ + "scro", + "scrollFrame" + ], + [ + "spac", + "spacingHeight" + ], + [ + "contentIns", + "contentInsetNormal" + ], + [ + "cont", + "contentInsetSelected" + ], + [ + "widest", + "widestItemWidth" + ], + [ + "contn", + "contentArray" + ], + [ + "wide", + "widestItemWidth" + ], + [ + "CGRectGet", + "CGRectGetMinX" + ], + [ + "respon", + "respondsToSelector" + ], + [ + "CGRe", + "CGRectMake" + ], + [ + "initWith", + "initWithFrame" + ], + [ + "themedTok", + "themedTokenField" + ], + [ + "completion", + "completionDelay" + ], + [ + "compl", + "completionDelay" + ], + [ + "resig", + "resignFirstResponder" + ], + [ + "sele", + "selectedItem" + ], + [ + "layout", + "layoutSubviews" + ], + [ + "_autoc", + "_autocompleteMenu" + ], + [ + "_autocom", + "_autocompleteMenu" + ], + [ + "content", + "contentArray" + ], + [ + "indexOf", + "indexOfSelectedItem" + ], + [ + "_showCom", + "_showCompletionsTimer" + ], + [ + "CGRectMake", + "CGRectMakeZero" + ], + [ + "_CPT", + "_CPTokenFieldAutocompleteMenu" + ], + [ + "_auto", + "_autocompleteMenu" + ], + [ + "compare", + "compareAthenB" + ], + [ + "_rep", + "_representedObjectForEditingString" + ], + [ + "representedObj", + "representedObjectForEditingString" + ], + [ + "DEC", + "DECIMAL_DIGIT_RE" + ], + [ + "DECIM", + "DECIMAL_INTEGER_LITERAL_RE" + ], + [ + "EXP", + "EXPONENT_PART_OPT_RE" + ], + [ + "DECI", + "DECIMAL_INTEGER_LITERAL" + ], + [ + "NON", + "NON_ZERO_DIGIT_RE" + ], + [ + "DECIMA", + "DECIMAL_DIGITS_RE" + ], + [ + "DECIMAL_", + "DECIMAL_DIGIT_RE" + ], + [ + "setSeg", + "setSegmentCount" + ], + [ + "round", + "roundingMode" + ], + [ + "_Sim", + "_SimpleDivide" + ], + [ + "CPP", + "CPProgressIndicatorSpinningStyle" + ], + [ + "CPProgress", + "CPProgressIndicator" + ], + [ + "back", + "backgroundColor" + ], + [ + "sub", + "subviews" + ], + [ + "menuFor", + "menuForTableColumn" + ], + [ + "table", + "tableView" + ], + [ + "inde", + "indexSet" + ], + [ + "make", + "makeFirstResponder" + ], + [ + "_coul", + "_couldBeKeyEquivalent" + ], + [ + "forKey", + "forKeyPath" + ], + [ + "CPDate", + "CPDateFormatterShortStyle" + ], + [ + "pop", + "popUpButton2" + ], + [ + "should", + "shouldSelectItem" + ], + [ + "isItem", + "isItemExpanded" + ] + ] + }, + "buffers": + [ + { + "file": "AppKit/Themes/Aristo/ThemeDescriptors.j", + "settings": + { + "buffer_size": 93390, + "line_ending": "Unix" + } + }, + { + "file": "AppKit/CPScroller.j", + "settings": + { + "buffer_size": 25691, + "line_ending": "Unix" + } + }, + { + "file": "Foundation/CPDateFormatter.j", + "settings": + { + "buffer_size": 3262, + "line_ending": "Unix" + } + }, + { + "contents": "Searching 671 files for \"setupToolTipHanlders\" (case sensitive)\n\n0 matches across 0 files\n", + "settings": + { + "buffer_size": 90, + "line_ending": "Unix", + "name": "Find Results", + "scratch": true + } + }, + { + "file": "README.markdown", + "settings": + { + "buffer_size": 3807, + "line_ending": "Unix" + } + } + ], + "build_system": "", + "command_palette": + { + "height": 375.0, + "selected_items": + [ + [ + "pac", + "Package Control: List Packages" + ], + [ + "install", + "Package Control: Install Package" + ], + [ + "packa", + "Package Control: List Packages" + ], + [ + "up", + "Package Control: Upgrade Package" + ], + [ + "upgra", + "Package Control: Upgrade Package" + ], + [ + "insta", + "Package Control: Install Package" + ], + [ + "install p", + "Package Control: Install Package" + ], + [ + "sublime", + "SublimeLinter: Show Commands" + ], + [ + "Package Control: insta", + "Package Control: Install Package" + ], + [ + "Package Control: ", + "Package Control: Install Package" + ], + [ + "pack", + "Package Control: Discover Packages" + ], + [ + "package", + "Package Control: Install Package" + ] + ], + "width": 453.0 + }, + "console": + { + "height": 47.0 + }, + "distraction_free": + { + "menu_visible": true, + "show_minimap": false, + "show_open_files": true, + "show_tabs": false, + "side_bar_visible": false, + "status_bar_visible": false + }, + "file_history": + [ + "/Users/siker/dev/cappuccino/Foundation/CPDictionary.j", + "/Users/siker/dev/cappuccino/Tests/Manual/TableTest/HoverTableDemo/AppController.j", + "/Users/siker/dev/cappuccino/Tests/Manual/TableTest/HoverTableDemo/HoverTableRowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPTableView.j", + "/Users/siker/dev/cappuccino/Objective-J/CommonJS/lib/objective-j/compiler.js", + "/Users/siker/dev/cappuccino/bootstrap.sh", + "/Users/siker/dev/cappuccino/AppKit/CPKeyValueBinding.j", + "/Users/siker/dev/cappuccino/AppKit/CPKeyBinding.j", + "/Users/siker/dev/cappuccino/Foundation/CPArray+KVO.j", + "/Users/siker/dev/cappuccino/version.json", + "/Users/siker/dev/cappuccino/AppKit/CPCompatibility.j", + "/Users/siker/dev/cappuccino/AppKit/CPView.j", + "/Users/siker/dev/cappuccino/Foundation/CPString.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPKVCArrayTest.j", + "/Users/siker/dev/cappuccino/AppKit/CPArrayController.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/CPWindow.j", + "/Users/siker/dev/cappuccino/AppKit/CPCollectionView.j", + "/Users/siker/dev/cappuccino/Foundation/CPArray/CPMutableArray.j", + "/Users/siker/dev/cappuccino/AppKit/CPToolbar.j", + "/Users/siker/dev/cappuccino/Foundation/CPObject.j", + "/Users/siker/dev/cappuccino/AppKit/CPFont.j", + "/Users/siker/dev/cappuccino/AppKit/_CPImageAndTextView.j", + "/Users/siker/dev/cappuccino/AppKit/CPControl.j", + "/Users/siker/dev/cappuccino/Foundation/CPNotificationCenter.j", + "/Users/siker/dev/cappuccino/Tests/Manual/CPTextField/AppController.j", + "/Users/siker/dev/cappuccino/AppKit/CPEvent.j", + "/Users/siker/dev/cappuccino/AppKit/Platform/DOM/CPPlatformWindow+DOM.j", + "/Users/siker/dev/cappuccino/AppKit/CPTextField.j", + "/Users/siker/dev/cappuccino/Objective-J/Constants.js", + "/Users/siker/dev/cappuccino/AppKit/Platform/DOM/CPPlatformString.j", + "/Users/siker/dev/cappuccino/Foundation/CPArray/CPArray.j", + "/Users/siker/dev/cappuccino/Foundation/CPArray/_CPJavaScriptArray.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/_CPWindowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPStringDrawing.j", + "/Users/siker/dev/cappuccino/AppKit/Platform/CPPlatformString.j", + "/Users/siker/dev/cappuccino/AppKit/CPDragServer.j", + "/Users/siker/dev/cappuccino/AppKit/CPTheme.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/_CPTitleableWindowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/_CPStandardWindowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/_CPHUDWindowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/_CPTileableWindowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPWindow/_CPDocModalWindowView.j", + "/Users/siker/dev/cappuccino/AppKit/CPResponder.j", + "/Users/siker/dev/cappuccino/Tests/Manual/SmartFoldersDemo/ImageAndTextView.j", + "/Users/siker/dev/cappuccino/AppKit/CPColor.j", + "/Users/siker/dev/cappuccino/AppKit/CPTokenField.j", + "/Users/siker/dev/cappuccino/AppKit/CPApplication.j", + "/Users/siker/dev/cappuccino/AppKit/CPPanel.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPIndexSetTest.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPNumberFormatterTest.j", + "/Users/siker/dev/cappuccino/Tests/Manual/AttachedSheet2/SheetWindowController.j", + "/Users/siker/dev/cappuccino/AppKit/CPButton.j", + "/Users/siker/dev/cappuccino/Tests/AppKit/CPButtonTest.j", + "/Users/siker/dev/cappuccino/Tools/nib2cib/NSView.j", + "/Users/siker/dev/cappuccino/Tests/Manual/AttachedSheet2/AppController.j", + "/Users/siker/dev/cappuccino/AppKit/CPProgressIndicator.j", + "/Users/siker/dev/cappuccino/Foundation/_CGGeometry.j", + "/Users/siker/dev/cappuccino/Foundation/_CGGeometry.h", + "/Users/siker/dev/cappuccino/Tools/capp_lint/capp_lint.py", + "/Users/siker/dev/cappuccino/AppKit/CPSplitView.j", + "/Users/siker/dev/cappuccino/AppKit/Platform/CPPlatform.j", + "/Users/siker/dev/cappuccino/Foundation/CPURL.j", + "/Users/siker/dev/cappuccino/Objective-J/CFURL.js", + "/Users/siker/dev/cappuccino/AppKit/CPScrollView.j", + "/Users/siker/dev/cappuccino/AppKit/CPObjectController.j", + "/Users/siker/dev/cappuccino/AppKit/CPImage.j", + "/Users/siker/dev/cappuccino/AppKit/CPTableColumn.j", + "/Users/siker/dev/cappuccino/AppKit/CPPasteboard.j", + "/Users/siker/dev/cappuccino/Foundation/CPDateFormatter.j", + "/Users/siker/dev/cappuccino/Foundation/CPIndexSet.j", + "/Users/siker/dev/cappuccino/AppKit/Themes/Aristo/ThemeDescriptors.j", + "/Users/siker/dev/cappuccino/Foundation/CPNumber.j", + "/Users/siker/dev/cappuccino/Foundation/CPDecimal.j", + "/Users/siker/dev/cappuccino/Foundation/CPNumberFormatter.j", + "/Users/siker/dev/cappuccino/Foundation/CPDecimalNumber.j", + "/Users/siker/dev/cappuccino/Tests/AppKit/CPTextFieldTest.j", + "/Users/siker/dev/cappuccino/AppKit/_CPPopUpList.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPCharacterSetTest.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPDecimalNumberTest.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPDecimalTest.j", + "/Users/siker/dev/cappuccino/AppKit/CPBox.j", + "/Users/siker/dev/cappuccino/Tests/AppKit/CPEventTest.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPObjectTest.j", + "/Users/siker/dev/cappuccino/Foundation/CPRunLoop.j", + "/Users/siker/dev/cappuccino/Foundation/CPTimer.j", + "/Users/siker/dev/cappuccino/AppKit/CPComboBox.j", + "/Users/siker/dev/cappuccino/AppKit/_CPAutocompleteMenu.j", + "/Users/siker/dev/cappuccino/Tests/AppKit/CPTableViewTest.j", + "/Users/siker/dev/cappuccino/Foundation/CPKeyValueCoding.j", + "/Users/siker/dev/cappuccino/Tests/AppKit/CPArrayControllerTest.j", + "/Users/siker/dev/cappuccino/Foundation/CPUndoManager.j", + "/Users/siker/dev/cappuccino/Objective-J/CFData.js", + "/Users/siker/dev/cappuccino/Tests/TableTest/TableBindings", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPUndoManagerTest.j", + "/Users/siker/dev/cappuccino/AppKit/CPPopUpButton.j", + "/Users/siker/dev/cappuccino/AppKit/CPMenuItem/CPMenuItem.j", + "/Users/siker/dev/cappuccino/AppKit/CPMenu/CPMenu.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPDictionaryTest.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPSetTest.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPArrayTest.j", + "/Users/siker/dev/cappuccino/Foundation/CPPredicate/CPComparisonPredicate.j", + "/Users/siker/Library/Application Support/Sublime Text 2/Packages/User/Preferences.sublime-settings", + "/Users/siker/dev/cappuccino/AppKit/CPRuleEditor/CPRuleEditor.j", + "/Users/siker/dev/cappuccino/Foundation/CPPredicate/_CPSetExpression.j", + "/Users/siker/dev/cappuccino/Foundation/CPPredicate/CPExpression.j", + "/Users/siker/dev/cappuccino/Foundation/CPSet/CPMutableSet.j", + "/Users/siker/dev/cappuccino/Foundation/CPSet/CPSet.j", + "/Users/siker/dev/cappuccino/Foundation/CPSet/_CPConcreteMutableSet.j", + "/Users/siker/dev/cappuccino/Tests/Foundation/CPPredicateTest.j", + "/Users/siker/dev/cappuccino/Objective-J/CFPropertyList.js", + "/Users/siker/dev/cappuccino/AppKit/CPScroller.j", + "/Users/siker/dev/cappuccino/Foundation/CPDate.j", + "/Users/siker/dev/cappuccino/AppKit/_CPAttachedWindow.j", + "/Users/siker/dev/cappuccino/AppKit/CPPopover.j", + "/Users/siker/dev/cappuccino/Foundation/CPURLResponse.j", + "/Users/siker/dev/cappuccino/AppKit/CoreAnimation/CALayer.j", + "/Users/siker/dev/cappuccino/AppKit/_CPCornerView.j", + "/Users/siker/dev/cappuccino/AppKit/CPMenu/_CPMenuWindow.j", + "/Users/siker/dev/cappuccino/AppKit/CPMenu/_CPMenuManager.j", + "/Users/siker/dev/cappuccino/AppKit/CPTableHeaderView.j", + "/Users/siker/dev/cappuccino/AppKit/CPRadio.j", + "/Users/siker/dev/cappuccino/Tools/nib2cib/NSCell.j", + "/Users/siker/dev/cappuccino/Tools/nib2cib/NSButton.j", + "/Users/siker/dev/cappuccino/Tools/nib2cib/NSMatrix.j", + "/Users/siker/dev/cappuccino/Foundation/CPKeyValueObserving.j", + "/Users/siker/dev/cappuccino/Foundation/CPPredicate/CPPredicate.j", + "/Users/siker/dev/cappuccino/Foundation/CPPredicate/_CPKeyPathExpression.j", + "/Users/siker/dev/cappuccino/Foundation/CPPredicate/CPCompoundPredicate.j" + ], + "find": + { + "height": 33.0 + }, + "find_in_files": + { + "height": 91.0, + "where_history": + [ + "*.j", + "*.js", + "*.j", + "*Test.j", + "*.j", + "*", + "*.j", + "*Test.j", + "*", + "*.js", + "*.j", + "*Test.j", + "*.j", + "*.js", + "*.j", + "*.js", + "*.j", + "", + "*.j", + "*.js", + "*.j", + "", + "*.j", + "*-j", + "", + "*.j", + "", + "Tests/", + "Tests/Manual", + "", + "*.js", + "*.j", + "*.html", + "*.js", + "", + "*.j", + "", + "*.j", + "", + "*.j", + "Manual*.j", + "*.j", + "", + "*.j", + "*.js", + "*.j", + "*.sj", + "*.js", + "", + "*.j", + "", + "*.h", + "*.j", + "*Test*", + "", + "*Test*", + "*.j", + "" + ] + }, + "find_state": + { + "case_sensitive": true, + "find_history": + [ + "setupToolTipHanlders", + "Formatter", + "CPDate", + "CPView", + "CPDateFormatter", + "Formatter", + "DateFormatter", + "CPDateFormatter", + "RC", + "incluce", + "CP*ViewKey", + "CPTableViewRowViewKey", + "NSTableViewRowViewKey", + "HoverTableRowView", + "typeof", + "RegExp", + "platform", + "selection", + "setAttr", + "PLATFORM", + "DOMElement", + "CPKeyValueObservingOptionNew", + ", ...", + "theSele", + "...", + "Affec", + "affected", + "selectionIn", + "LOG", + "Math.PI", + "PI", + ".PI", + "Math.PI", + "0.0", + "location", + "_CPEventFromNativeMouseEvent", + "CPEvent", + "change", + "CPWebKitBrowserEngine", + "browser", + "defaultLineHeightForFont", + "font", + "verticalAli", + ".font", + "vertical", + "DOMMetricsImgElement", + "defaultLineHeightForFont", + "class_getInstanceMethod", + ".isa", + "_UID", + "FORWARD_TO_CONCRETE_CLASS", + "_CPPlaceholderArray", + "_CPRaiseInvalidAbstractInvocation", + "note", + "draggedView:", + "dragTypesForItemsAtIndexes", + "drag", + "metricsOfFont:", + "_lineHeight", + "defaultLineHeightForFont", + "lineHeight", + "CPValueBinding", + "_titleField", + "_CPHUDWindowViewCloseImage", + "closeSize", + "_closeButton", + "_titleFi", + "_CPTit", + "_CPTil", + "_CPTit", + "titleBar", + "titleBarHeight", + "_titleField", + "Account for", + "textRectHeight", + "Vertical", + "_dividerView", + "_titleField", + "title", + "vertical", + "setText", + "registerTheme", + "text-", + "CPThemeState(", + "CPThemeState", + "CPThemeStateScrollViewLegacy", + "_CPStandardWindowViewTitleBackgroundColor", + "titleColor", + "_windowView", + "which", + "which nar", + "titleColor", + "title", + "CPLog", + "CPTextFieldBlur", + "firstRespon", + "_windowView", + "_parentView", + "orderFront:", + "sheet", + "_parentView", + "orderFront:", + "_CPRunModalLoop", + "CPDocModalWindowMask", + "CPDoc", + "document modal", + "_windowDidResignKey", + "CPWindowDidBecomeKeyNotification", + "_firstResponder", + "runModalSession", + "beginModalSessionForWindow", + "_CPModalSessionMake", + "Archive", + "CPClassFrom", + "Drag", + "var contentR", + "{", + "= {", + "_sheetContext", + "ellip", + "elip", + "elippsis", + "class =", + "mainBody", + "DOMI", + "DOMFixedWidthSpanElement", + "CPImageLoadStatusCancelled", + "setNeeds" + ], + "highlight": true, + "in_selection": false, + "preserve_case": false, + "regex": false, + "replace_history": + [ + "className =", + "HAS_INPUT_OR_TEXTAREA_TARGET", + "minimumFractionDigits", + "maximumFractionDigits", + "minimumFractionDigits", + "\", \"", + "\" + $1", + "", + "anInset", + "aRect", + "$1_CPLocationInRange", + " _CPEmptyRange", + "\" + values + \"", + "\" + type", + ":@\"", + "\" + [", + "message:@\"", + "_shouldRestoreFromAutosaveUnlessFrameSize", + "autosave", + "_CPMakeRange", + "_CPMaxRange", + "Right", + "[self _tokens]", + "_valueForThemeAttribute", + "_desiredHeight", + "_CPAutocompleteMenuMaximumHeight", + "CPThemeStateAutocompleting", + "compareAAscendingThenBDescending", + "sortedArrayUsingDescriptors:", + "_native_sortedArrayUsingDescriptors:", + "self sort:$2 usingSortSelector:@selector($1:) withObject:descriptors", + "self sort:$2 usingSortSelector:@selector($1) withObject:descriptors", + "self sort:$2 usingSortSelector:$1 withObject:descriptors", + "//", + "'", + "/*", + "(1, 1)", + "(-3, -4)", + "(3, 4)", + "(-1, -1)", + "CGSizeMake(3, 4)", + "1 / 3, 1 / 4", + "OrderMotion", + "m$1", + "maxY", + "minY", + "maxX", + "minX", + " _CPMaxRange", + "shouldShowOutlineDisclosureControl", + "color space", + "CP", + "colorspace", + "color2", + "CP", + "NSTableCellView", + "CPTableCellView", + "tableColumn1", + "17.0", + "ViewHeavy", + "placeholder", + "Placeholder", + "placehol", + "Placeholder", + "- (CPMenuItem)enclosingMenuItem", + "", + "\"$1\" ", + ";", + "", + " }", + ";", + "/*", + "from", + "errors" + ], + "reverse": false, + "show_context": true, + "use_buffer2": true, + "whole_word": false, + "wrap": true + }, + "groups": + [ + { + "selected": 4, + "sheets": + [ + { + "buffer": 0, + "file": "AppKit/Themes/Aristo/ThemeDescriptors.j", + "settings": + { + "buffer_size": 93390, + "regions": + { + }, + "selection": + [ + [ + 38801, + 38829 + ] + ], + "settings": + { + "annotations": + [ + "TODO", + "README", + "FIXME" + ], + "csslint_options": + { + "adjoining-classes": "warning", + "box-model": true, + "box-sizing": "warning", + "compatible-vendor-prefixes": "warning", + "display-property-grouping": true, + "duplicate-background-images": "warning", + "duplicate-properties": true, + "empty-rules": true, + "errors": true, + "fallback-colors": "warning", + "floats": "warning", + "font-faces": "warning", + "font-sizes": "warning", + "gradients": "warning", + "ids": "warning", + "import": "warning", + "important": "warning", + "known-properties": true, + "outline-none": "warning", + "overqualified-elements": "warning", + "qualified-headings": "warning", + "regex-selectors": "warning", + "rules-count": "warning", + "shorthand": "warning", + "text-indent": "warning", + "unique-headings": "warning", + "universal-selector": "warning", + "vendor-prefix": true, + "zero-units": "warning" + }, + "gjslint_ignore": + [ + 110.0 + ], + "gjslint_options": + [ + ], + "javascript_linter": "jshint", + "jshint_options": + { + "browser": true, + "evil": true, + "regexdash": true, + "sub": true, + "trailing": true, + "wsh": true + }, + "pep8": true, + "pep8_ignore": + [ + "E501" + ], + "perl_linter": "perlcritic", + "pyflakes_ignore": + [ + ], + "pyflakes_ignore_import_*": true, + "sublimelinter": true, + "sublimelinter_delay": 0.0, + "sublimelinter_disable": + [ + ], + "sublimelinter_executable_map": + { + }, + "sublimelinter_fill_outlines": false, + "sublimelinter_gutter_marks": false, + "sublimelinter_notes": false, + "sublimelinter_objj_check_ascii": false, + "sublimelinter_popup_errors_on_save": false, + "sublimelinter_syntax_map": + { + "Python Django": "python" + }, + "sublimelinter_wrap_find": true, + "syntax": "Packages/Cappuccino/Objective-J.tmLanguage", + "tab_size": 4, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 12778.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 1, + "file": "AppKit/CPScroller.j", + "settings": + { + "buffer_size": 25691, + "regions": + { + }, + "selection": + [ + [ + 2127, + 2139 + ] + ], + "settings": + { + "annotations": + [ + "TODO", + "README", + "FIXME" + ], + "csslint_options": + { + "adjoining-classes": "warning", + "box-model": true, + "box-sizing": "warning", + "compatible-vendor-prefixes": "warning", + "display-property-grouping": true, + "duplicate-background-images": "warning", + "duplicate-properties": true, + "empty-rules": true, + "errors": true, + "fallback-colors": "warning", + "floats": "warning", + "font-faces": "warning", + "font-sizes": "warning", + "gradients": "warning", + "ids": "warning", + "import": "warning", + "important": "warning", + "known-properties": true, + "outline-none": "warning", + "overqualified-elements": "warning", + "qualified-headings": "warning", + "regex-selectors": "warning", + "rules-count": "warning", + "shorthand": "warning", + "text-indent": "warning", + "unique-headings": "warning", + "universal-selector": "warning", + "vendor-prefix": true, + "zero-units": "warning" + }, + "gjslint_ignore": + [ + 110.0 + ], + "gjslint_options": + [ + ], + "javascript_linter": "jshint", + "jshint_options": + { + "browser": true, + "evil": true, + "regexdash": true, + "sub": true, + "trailing": true, + "wsh": true + }, + "pep8": true, + "pep8_ignore": + [ + "E501" + ], + "perl_linter": "perlcritic", + "pyflakes_ignore": + [ + ], + "pyflakes_ignore_import_*": true, + "sublimelinter": true, + "sublimelinter_delay": 0.0, + "sublimelinter_disable": + [ + ], + "sublimelinter_executable_map": + { + }, + "sublimelinter_fill_outlines": false, + "sublimelinter_gutter_marks": false, + "sublimelinter_notes": false, + "sublimelinter_objj_check_ascii": false, + "sublimelinter_popup_errors_on_save": false, + "sublimelinter_syntax_map": + { + "Python Django": "python" + }, + "sublimelinter_wrap_find": true, + "syntax": "Packages/Cappuccino/Objective-J.tmLanguage", + "tab_size": 4, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 597.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 2, + "file": "Foundation/CPDateFormatter.j", + "settings": + { + "buffer_size": 3262, + "regions": + { + }, + "selection": + [ + [ + 1188, + 1188 + ] + ], + "settings": + { + "annotations": + [ + "TODO", + "README", + "FIXME" + ], + "csslint_options": + { + "adjoining-classes": "warning", + "box-model": true, + "box-sizing": "warning", + "compatible-vendor-prefixes": "warning", + "display-property-grouping": true, + "duplicate-background-images": "warning", + "duplicate-properties": true, + "empty-rules": true, + "errors": true, + "fallback-colors": "warning", + "floats": "warning", + "font-faces": "warning", + "font-sizes": "warning", + "gradients": "warning", + "ids": "warning", + "import": "warning", + "important": "warning", + "known-properties": true, + "outline-none": "warning", + "overqualified-elements": "warning", + "qualified-headings": "warning", + "regex-selectors": "warning", + "rules-count": "warning", + "shorthand": "warning", + "text-indent": "warning", + "unique-headings": "warning", + "universal-selector": "warning", + "vendor-prefix": true, + "zero-units": "warning" + }, + "gjslint_ignore": + [ + 110.0 + ], + "gjslint_options": + [ + ], + "javascript_linter": "jshint", + "jshint_options": + { + "browser": true, + "evil": true, + "regexdash": true, + "sub": true, + "trailing": true, + "wsh": true + }, + "pep8": true, + "pep8_ignore": + [ + "E501" + ], + "perl_linter": "perlcritic", + "pyflakes_ignore": + [ + ], + "pyflakes_ignore_import_*": true, + "sublimelinter": true, + "sublimelinter_delay": 0.0, + "sublimelinter_disable": + [ + ], + "sublimelinter_executable_map": + { + }, + "sublimelinter_fill_outlines": false, + "sublimelinter_gutter_marks": false, + "sublimelinter_notes": false, + "sublimelinter_objj_check_ascii": false, + "sublimelinter_popup_errors_on_save": false, + "sublimelinter_syntax_map": + { + "Python Django": "python" + }, + "sublimelinter_wrap_find": true, + "syntax": "Packages/Cappuccino/Objective-J.tmLanguage", + "tab_size": 4, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 3, + "settings": + { + "buffer_size": 90, + "regions": + { + }, + "selection": + [ + [ + 90, + 90 + ] + ], + "settings": + { + "detect_indentation": false, + "output_tag": 1, + "result_base_dir": "", + "result_file_regex": "^([A-Za-z\\\\/<].*):$", + "result_line_regex": "^ +([0-9]+):", + "scroll_past_end": true, + "syntax": "Packages/Default/Find Results.hidden-tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 0.0, + "zoom_level": 1.0 + }, + "type": "text" + }, + { + "buffer": 4, + "file": "README.markdown", + "settings": + { + "buffer_size": 3807, + "regions": + { + }, + "selection": + [ + [ + 1373, + 1373 + ] + ], + "settings": + { + "annotations": + [ + "TODO", + "README", + "FIXME" + ], + "csslint_options": + { + "adjoining-classes": "warning", + "box-model": true, + "box-sizing": "warning", + "compatible-vendor-prefixes": "warning", + "display-property-grouping": true, + "duplicate-background-images": "warning", + "duplicate-properties": true, + "empty-rules": true, + "errors": true, + "fallback-colors": "warning", + "floats": "warning", + "font-faces": "warning", + "font-sizes": "warning", + "gradients": "warning", + "ids": "warning", + "import": "warning", + "important": "warning", + "known-properties": true, + "outline-none": "warning", + "overqualified-elements": "warning", + "qualified-headings": "warning", + "regex-selectors": "warning", + "rules-count": "warning", + "shorthand": "warning", + "text-indent": "warning", + "unique-headings": "warning", + "universal-selector": "warning", + "vendor-prefix": true, + "zero-units": "warning" + }, + "gjslint_ignore": + [ + 110.0 + ], + "gjslint_options": + [ + ], + "javascript_linter": "jshint", + "jshint_options": + { + "browser": true, + "evil": true, + "regexdash": true, + "sub": true, + "trailing": true, + "wsh": true + }, + "pep8": true, + "pep8_ignore": + [ + "E501" + ], + "perl_linter": "perlcritic", + "pyflakes_ignore": + [ + ], + "pyflakes_ignore_import_*": true, + "sublimelinter": true, + "sublimelinter_delay": 0.0, + "sublimelinter_disable": + [ + ], + "sublimelinter_executable_map": + { + }, + "sublimelinter_fill_outlines": false, + "sublimelinter_gutter_marks": false, + "sublimelinter_notes": false, + "sublimelinter_objj_check_ascii": false, + "sublimelinter_popup_errors_on_save": false, + "sublimelinter_syntax_map": + { + "Python Django": "python" + }, + "sublimelinter_wrap_find": true, + "syntax": "Packages/Markdown/Markdown.tmLanguage", + "tab_size": 2, + "translate_tabs_to_spaces": true + }, + "translation.x": 0.0, + "translation.y": 354.0, + "zoom_level": 1.0 + }, + "type": "text" + } + ] + } + ], + "incremental_find": + { + "height": 32.0 + }, + "input": + { + "height": 30.0 + }, + "layout": + { + "cells": + [ + [ + 0, + 0, + 1, + 1 + ] + ], + "cols": + [ + 0.0, + 1.0 + ], + "rows": + [ + 0.0, + 1.0 + ] + }, + "menu_visible": true, + "replace": + { + "height": 62.0 + }, + "save_all_on_build": true, + "select_file": + { + "height": 0.0, + "selected_items": + [ + [ + "read", + "README.markdown" + ], + [ + "datefo", + "Foundation/CPDateFormatter.j" + ], + [ + "binding", + "AppKit/CPKeyValueBinding.j" + ], + [ + "bind", + "AppKit/CPKeyBinding.j" + ], + [ + "kvo", + "Foundation/CPArray+KVO.j" + ], + [ + "boots", + "bootstrap.sh" + ], + [ + "testshoverta", + "Tests/Manual/TableTest/HoverTableDemo/AppController.j" + ], + [ + "cpview", + "AppKit/CPView.j" + ], + [ + "cpcom", + "AppKit/CPCompatibility.j" + ], + [ + "cptableview", + "AppKit/CPTableView.j" + ], + [ + "cpwindow", + "AppKit/CPWindow/CPWindow.j" + ], + [ + "cptable", + "AppKit/CPTableView.j" + ], + [ + "cpcoll", + "AppKit/CPCollectionView.j" + ], + [ + "cpcomp", + "AppKit/CPCompatibility.j" + ], + [ + "cpmutabl", + "Foundation/CPArray/CPMutableArray.j" + ], + [ + "cpstring", + "Foundation/CPString.j" + ], + [ + "arraykvo", + "Foundation/CPArray+KVO.j" + ], + [ + "cpmutablearr", + "Foundation/CPArray/CPMutableArray.j" + ], + [ + "cptablevi", + "AppKit/CPTableView.j" + ], + [ + "cparrayc", + "AppKit/CPArrayController.j" + ], + [ + "const", + "Objective-J/Constants.js" + ], + [ + "cpevent", + "AppKit/CPEvent.j" + ], + [ + "cpnoti", + "Foundation/CPNotificationCenter.j" + ], + [ + "cpcon", + "AppKit/CPControl.j" + ], + [ + "compat", + "AppKit/CPCompatibility.j" + ], + [ + "cpimagete", + "AppKit/_CPImageAndTextView.j" + ], + [ + "domplatforms", + "AppKit/Platform/DOM/CPPlatformString.j" + ], + [ + "cparray", + "Foundation/CPArray/CPArray.j" + ], + [ + "javascrip", + "Foundation/CPArray/_CPJavaScriptArray.j" + ], + [ + "windowview", + "AppKit/CPWindow/_CPWindowView.j" + ], + [ + "cpwind", + "AppKit/CPWindow/CPWindow.j" + ], + [ + "cptextfi", + "AppKit/CPTextField.j" + ], + [ + "cptoo", + "AppKit/CPToolbar.j" + ], + [ + "cptextappco", + "Tests/Manual/CPTextField/AppController.j" + ], + [ + "docmodal", + "AppKit/CPWindow/_CPDocModalWindowView.j" + ], + [ + "hudwin", + "AppKit/CPWindow/_CPHUDWindowView.j" + ], + [ + "cpwindw", + "AppKit/CPWindow/CPWindow.j" + ], + [ + "cpres", + "AppKit/CPResponder.j" + ], + [ + "cpthem", + "AppKit/CPTheme.j" + ], + [ + "cptheme", + "AppKit/CPTheme.j" + ], + [ + "textview", + "AppKit/_CPImageAndTextView.j" + ], + [ + "imagete", + "Tests/Manual/SmartFoldersDemo/ImageAndTextView.j" + ], + [ + "cpcolor", + "AppKit/CPColor.j" + ], + [ + "cptextf", + "AppKit/CPTextField.j" + ], + [ + "cpcontr", + "AppKit/CPControl.j" + ], + [ + "cptokenf", + "AppKit/CPTokenField.j" + ], + [ + "cptext", + "AppKit/CPTextField.j" + ], + [ + "themedes", + "AppKit/Themes/Aristo/ThemeDescriptors.j" + ], + [ + "boot", + "bootstrap.sh" + ], + [ + "_cpstandardwindowview", + "AppKit/CPWindow/_CPStandardWindowView.j" + ], + [ + "cppa", + "AppKit/CPPanel.j" + ], + [ + "cpwindowview", + "AppKit/CPWindow/_CPWindowView.j" + ], + [ + "cpnotif", + "Foundation/CPNotificationCenter.j" + ], + [ + "them", + "AppKit/Themes/Aristo/ThemeDescriptors.j" + ], + [ + "cpwin", + "AppKit/CPWindow/CPWindow.j" + ], + [ + "cpapp", + "AppKit/CPApplication.j" + ], + [ + "textfieldappc", + "Tests/Manual/CPTextField/AppController.j" + ], + [ + "cpresp", + "AppKit/CPResponder.j" + ], + [ + "nsview", + "Tools/nib2cib/NSView.j" + ], + [ + "cpcollec", + "AppKit/CPCollectionView.j" + ], + [ + "cpbutto", + "AppKit/CPButton.j" + ], + [ + "cpbutt", + "AppKit/CPButton.j" + ], + [ + "sheetwin", + "Tests/Manual/AttachedSheet2/SheetWindowController.j" + ], + [ + "sheetappc", + "Tests/Manual/AttachedSheet2/AppController.j" + ], + [ + "cpwindowvi", + "AppKit/CPWindow/_CPWindowView.j" + ], + [ + "cpstand", + "AppKit/CPWindow/_CPStandardWindowView.j" + ], + [ + "cphudwin", + "AppKit/CPWindow/_CPHUDWindowView.j" + ], + [ + "capli", + "Tools/capp_lint/capp_lint.py" + ], + [ + "cgge", + "Foundation/_CGGeometry.h" + ], + [ + "cggeo", + "Foundation/_CGGeometry.j" + ], + [ + "textfieldapp", + "Tests/Manual/CPTextField/AppController.j" + ], + [ + "cppro", + "AppKit/CPProgressIndicator.j" + ], + [ + "cpsplitvi", + "AppKit/CPSplitView.j" + ], + [ + "cpplatf", + "AppKit/Platform/CPPlatform.j" + ], + [ + "string", + "AppKit/Platform/DOM/CPPlatformString.j" + ], + [ + "cpplatform", + "AppKit/Platform/CPPlatformString.j" + ], + [ + "cfurl", + "Objective-J/CFURL.js" + ], + [ + "cpurl", + "Foundation/CPURL.j" + ], + [ + "cpimage", + "AppKit/CPImage.j" + ], + [ + "cpobject", + "AppKit/CPObjectController.j" + ], + [ + "cpscrollv", + "AppKit/CPScrollView.j" + ], + [ + "cpmutabla", + "Foundation/CPArray/CPMutableArray.j" + ], + [ + "platformwindow", + "AppKit/Platform/DOM/CPPlatformWindow+DOM.j" + ], + [ + "cppan", + "AppKit/CPPanel.j" + ], + [ + "even", + "AppKit/CPEvent.j" + ], + [ + "windowdom", + "AppKit/Platform/DOM/CPPlatformWindow+DOM.j" + ], + [ + "cpar", + "Foundation/CPArray/CPArray.j" + ], + [ + "cppaste", + "AppKit/CPPasteboard.j" + ], + [ + "cpbutton", + "AppKit/CPButton.j" + ], + [ + "cpkeyb", + "AppKit/CPKeyBinding.j" + ], + [ + "cpwindo", + "AppKit/CPWindow/CPWindow.j" + ], + [ + "cpindexset", + "Foundation/CPIndexSet.j" + ], + [ + "cpdatefor", + "Foundation/CPDateFormatter.j" + ], + [ + "cptabl", + "AppKit/CPTableColumn.j" + ], + [ + "cpcolo", + "AppKit/CPColor.j" + ], + [ + "cppas", + "AppKit/CPPasteboard.j" + ], + [ + "cparrayco", + "AppKit/CPArrayController.j" + ], + [ + "cpnumberfo", + "Tests/Foundation/CPNumberFormatterTest.j" + ], + [ + "cpdecimal", + "Tests/Foundation/CPDecimalTest.j" + ], + [ + "cpdecimalnu", + "Foundation/CPDecimalNumber.j" + ], + [ + "cpbox", + "AppKit/CPBox.j" + ], + [ + "cpdecimanu", + "Tests/Foundation/CPDecimalNumberTest.j" + ], + [ + "cpnumber", + "Foundation/CPNumber.j" + ], + [ + "cpdecim", + "Foundation/CPDecimalNumber.j" + ], + [ + "numberfo", + "Foundation/CPNumberFormatter.j" + ], + [ + "formatt", + "Tests/Foundation/CPNumberFormatterTest.j" + ], + [ + "cpdeci", + "Foundation/CPDecimalNumber.j" + ], + [ + "cpobjectte", + "Tests/Foundation/CPObjectTest.j" + ], + [ + "cptool", + "AppKit/CPToolbar.j" + ], + [ + "cptimer", + "Foundation/CPTimer.j" + ], + [ + "cprunloop", + "Foundation/CPRunLoop.j" + ], + [ + "cptime", + "Foundation/CPTimer.j" + ], + [ + "cpobjecte", + "Tests/Foundation/CPObjectTest.j" + ], + [ + "cpappl", + "AppKit/CPApplication.j" + ], + [ + "cpeventte", + "Tests/AppKit/CPEventTest.j" + ], + [ + "cpopuplist", + "AppKit/_CPPopUpList.j" + ], + [ + "cpta", + "AppKit/CPTableColumn.j" + ], + [ + "arrayc", + "AppKit/CPArrayController.j" + ], + [ + "kvc", + "Foundation/CPKeyValueCoding.j" + ], + [ + "cptableviewte", + "Tests/AppKit/CPTableViewTest.j" + ], + [ + "cptablevie", + "AppKit/CPTableView.j" + ], + [ + "popuplist", + "AppKit/_CPPopUpList.j" + ], + [ + "cpcombo", + "AppKit/CPComboBox.j" + ], + [ + "auto", + "AppKit/_CPAutocompleteMenu.j" + ], + [ + "cparraycon", + "Tests/AppKit/CPArrayControllerTest.j" + ], + [ + "cpdicti", + "Foundation/CPDictionary.j" + ], + [ + "cprespo", + "AppKit/CPResponder.j" + ], + [ + "cpun", + "Foundation/CPUndoManager.j" + ] + ], + "width": 0.0 + }, + "select_project": + { + "height": 0.0, + "selected_items": + [ + ], + "width": 0.0 + }, + "show_minimap": true, + "show_open_files": false, + "show_tabs": true, + "side_bar_visible": true, + "side_bar_width": 227.0, + "status_bar_visible": true +}