colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-27 04:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into CPTableView-viewForRow-infinite-loop

Browse Source
This commit is contained in:
cacaodev
2013-03-24 18:50:41 +01:00
parent 3ef5cfe846 05fa505bb6
commit 8663b7b3fa
23 changed files with 730 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPBezierPath.j
+43
View File
@@ -48,6 +48,8 @@ var DefaultLineWidth = 1.0;
{
CGPath _path;
float _lineWidth;
CPArray _lineDashes;
float _lineDashesPhase;
}
/*!
@@ -205,6 +207,7 @@ var DefaultLineWidth = 1.0;
CGContextBeginPath(ctx);
CGContextAddPath(ctx, _path);
CGContextSetLineWidth(ctx, [self lineWidth]);
CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
CGContextStrokePath(ctx);
}
@@ -218,10 +221,50 @@ var DefaultLineWidth = 1.0;
CGContextBeginPath(ctx);
CGContextAddPath(ctx, _path);
CGContextSetLineWidth(ctx, [self lineWidth]);
CGContextSetLineDash(ctx, _lineDashesPhase, _lineDashes);
CGContextClosePath(ctx);
CGContextFillPath(ctx);
}
/*!
Cocoa compatibility.
*/
- (void)getLineDash:(CPArrayRef)patternRef count:(NSInteger)count phase:(CGFloatRef)phaseRef
{
return [self getLineDash:patternRef phase:phaseRef];
}
/*!
Retrieve the line dash pattern and phase and write them into the provided references.
*/
- (void)getLineDash:(CPArrayRef)patternRef phase:(CGFloatRef)phaseRef
{
if (patternRef)
@deref(patternRef) = [_lineDashes copy];
if (phaseRef)
@deref(phaseRef) = _lineDashesPhase;
}
/*!
Cocoa compatibility.
*/
- (void)setLineDash:(CPArray)aPattern count:(NSInteger)count phase:(CGFloat)aPhase
{
[self setLineDash:aPattern phase:aPhase];
}
/*!
Set stroke line dash pattern.
@param aPattern an array of stroke-skip lengths such as [2, 2, 4, 4]
@param aPhase amount of shift for the starting position of the first stroke
*/
- (void)setLineDash:(CPArray)aPattern phase:(CGFloat)aPhase
{
_lineDashes = aPattern;
_lineDashesPhase = aPhase;
}
/*!
Get the line width.
*/
AppKit/CPTableView.j
+67 -22
View File
@@ -93,23 +93,9 @@ CPTableViewDraggingDestinationFeedbackStyleSourceList = 1;
CPTableViewDropOn = 0;
CPTableViewDropAbove = 1;
CPSourceListGradient = "CPSourceListGradient";
CPSourceListTopLineColor = "CPSourceListTopLineColor";
CPSourceListBottomLineColor = "CPSourceListBottomLineColor";
var CPTableViewSourceListUnfocusedSelectionColor = @{
CPSourceListGradient: CGGradientCreateWithColorComponents(
CGColorSpaceCreateDeviceRGB(),
[
(218.0 / 255), (223.0 / 255), (234.0 / 255), 1.0,
(178.0 / 255), (181.0 / 255), (190.0 / 255), 1.0,
],
[0, 1],
2
),
CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:192.0 / 255.0 green:195.0 / 255.0 blue:205.0 / 255.0 alpha:1.0],
CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:151.0 / 255.0 green:153.0 / 255.0 blue:160.0 / 255.0 alpha:1.0],
};
CPSourceListGradient = @"CPSourceListGradient";
CPSourceListTopLineColor = @"CPSourceListTopLineColor";
CPSourceListBottomLineColor = @"CPSourceListBottomLineColor";
// TODO: add docs
@@ -224,6 +210,8 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
CPArray _alternatingRowBackgroundColors;
unsigned _selectionHighlightStyle;
CPColor _unfocusedSelectionHighlightColor;
CPDictionary _unfocusedSourceListSelectionColor;
CPTableColumn _currentHighlightedTableColumn;
unsigned _gridStyleMask;
@@ -852,18 +840,28 @@ NOT YET IMPLEMENTED
return;
[self setValue:aColor forThemeAttribute:@"selection-color"];
[self setNeedsDisplay:YES];
}
/*!
Returns the highlight color for a row or column selection.
Returns the highlight color for a focused row or column selection.
*/
- (CPColor)selectionHighlightColor
{
return [self currentValueForThemeAttribute:@"selection-color"];
}
/*!
Returns the highlight color for an unfocused row or column selection.
*/
- (CPColor)unfocusedSelectionHighlightColor
{
if (!_unfocusedSelectionHighlightColor)
_unfocusedSelectionHighlightColor = [self _unfocusedSelectionColorFromColor:[self selectionHighlightColor] saturation:0];
return _unfocusedSelectionHighlightColor;
}
/*!
Sets the highlight gradient for a row or column selection
@@ -878,7 +876,6 @@ NOT YET IMPLEMENTED
- (void)setSelectionGradientColors:(CPDictionary)aDictionary
{
[self setValue:aDictionary forThemeAttribute:@"sourcelist-selection-color"];
[self setNeedsDisplay:YES];
}
@@ -895,6 +892,54 @@ NOT YET IMPLEMENTED
return [self currentValueForThemeAttribute:@"sourcelist-selection-color"];
}
/*!
Returns a dictionary of containing the keys:
<pre>
CPSourceListGradient
CPSourceListTopLineColor
CPSourceListBottomLineColor
</pre>
*/
- (void)unfocusedSelectionGradientColors
{
if (!_unfocusedSourceListSelectionColor)
{
var sourceListColors = [self selectionGradientColors];
_unfocusedSourceListSelectionColor = @{
CPSourceListGradient: [self _unfocusedGradientFromGradient:[sourceListColors objectForKey:CPSourceListGradient]],
CPSourceListTopLineColor: [self _unfocusedSelectionColorFromColor:[sourceListColors objectForKey:CPSourceListTopLineColor] saturation:0.2],
CPSourceListBottomLineColor: [self _unfocusedSelectionColorFromColor:[sourceListColors objectForKey:CPSourceListBottomLineColor] saturation:0.2]
};
}
return _unfocusedSourceListSelectionColor;
}
- (CPColor)_unfocusedSelectionColorFromColor:(CPColor)aColor saturation:(float)saturation
{
var hsb = [aColor hsbComponents];
return [CPColor colorWithHue:hsb[0] saturation:hsb[1] * saturation brightness:hsb[2]];
}
- (CGGradient)_unfocusedGradientFromGradient:(CGGradient)aGradient
{
var colors = [aGradient.colors copy],
count = [colors count];
while (count--)
{
var rgba = colors[count].components,
hsb = [self _unfocusedSelectionColorFromColor:[CPColor colorWithRed:rgba[0] green:rgba[1] blue:rgba[2] alpha:rgba[3]] saturation:0.2];
colors[count] = CGColorCreate(aGradient.colorspace, [[hsb components] copy]);
}
return CGGradientCreateWithColors(aGradient.colorspace, colors, aGradient.locations);
}
/*!
Sets the grid color in the non highlighted state.
@param aColor a CPColor
@@ -4107,13 +4152,13 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
if (drawGradient)
{
var gradientCache = focused ? [self selectionGradientColors] : CPTableViewSourceListUnfocusedSelectionColor,
var gradientCache = focused ? [self selectionGradientColors] : [self unfocusedSelectionGradientColors],
topLineColor = [gradientCache objectForKey:CPSourceListTopLineColor],
bottomLineColor = [gradientCache objectForKey:CPSourceListBottomLineColor],
gradientColor = [gradientCache objectForKey:CPSourceListGradient];
}
var normalSelectionHighlightColor = focused ? [self selectionHighlightColor] : [CPColor secondarySelectedControlColor];
var normalSelectionHighlightColor = focused ? [self selectionHighlightColor] : [self unfocusedSelectionHighlightColor];
// don't do these lookups if there are no group rows
if ([_groupRows count])
AppKit/CoreGraphics/CGContext.j
+6
View File
@@ -166,6 +166,12 @@ function CGContextSetLineCap(aContext, aLineCap)
aContext.gState.lineCap = aLineCap;
}
function CGContextSetLineDash(aContext, aPhase, someDashes)
{
aContext.gState.lineDashes = someDashes;
aContext.gState.lineDashesPhase = aPhase;
}
function CGContextSetLineJoin(aContext, aLineJoin)
{
aContext.gState.lineJoin = aLineJoin;
AppKit/CoreGraphics/CGContextCanvas.j
+23
View File
@@ -68,6 +68,29 @@ function CGContextSetLineCap(aContext, aLineCap)
aContext.lineCap = CANVAS_LINECAP_TABLE[aLineCap];
}
function CGContextSetLineDash(aContext, aPhase, someDashes)
{
if (aContext.setLineDash)
{
aContext.setLineDash(someDashes);
aContext.lineDashOffset = aPhase;
}
else if (typeof aContext['webkitLineDash'] !== 'undefined')
{
aContext.webkitLineDash = someDashes;
aContext.webkitLineDashOffset = aPhase;
}
else if (typeof aContext['mozDash'] !== 'undefined')
{
aContext.mozDash = someDashes;
aContext.mozDashOffset = aPhase;
}
else if (someDashes)
{
CPLog.warn("CGContextSetLineDash not implemented in this environment.")
}
}
function CGContextSetLineJoin(aContext, aLineJoin)
{
aContext.lineJoin = CANVAS_LINEJOIN_TABLE[aLineJoin];
AppKit/Themes/Aristo/ThemeDescriptors.j
+1 -1
View File
@@ -1843,7 +1843,7 @@ var themedButtonValues = nil,
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],
CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:34.0 / 255.0 green:63.0 / 255.0 blue:123.0 / 255.0 alpha:1.0]
},
themedTableViewValues =
AppKit/Themes/Aristo2/ThemeDescriptors.j
+1 -1
View File
@@ -1304,7 +1304,7 @@ var themedButtonValues = nil,
2
),
CPSourceListTopLineColor: [CPColor colorWithCalibratedRed:70.0 / 255.0 green:107.0 / 255.0 blue:215.0 / 255.0 alpha:1.0],
CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:42.0 / 255.0 green:74.0 / 255.0 blue:177.0 / 255.0 alpha:1.0],
CPSourceListBottomLineColor: [CPColor colorWithCalibratedRed:42.0 / 255.0 green:74.0 / 255.0 blue:177.0 / 255.0 alpha:1.0]
},
themedTableViewValues =
Foundation/CPArray+KVO.j
+25 -10
View File
@@ -112,46 +112,57 @@
var capitalizedKey = _key.charAt(0).toUpperCase() + _key.substring(1);
_insertSEL = sel_getName(@"insertObject:in" + capitalizedKey + "AtIndex:");
if ([_proxyObject respondsToSelector:_insertSEL])
_insert = [_proxyObject methodForSelector:_insertSEL];
_removeSEL = sel_getName(@"removeObjectFrom" + capitalizedKey + "AtIndex:");
if ([_proxyObject respondsToSelector:_removeSEL])
_remove = [_proxyObject methodForSelector:_removeSEL];
_replaceSEL = sel_getName(@"replaceObjectIn" + capitalizedKey + "AtIndex:withObject:");
if ([_proxyObject respondsToSelector:_replaceSEL])
_replace = [_proxyObject methodForSelector:_replaceSEL];
_insertManySEL = sel_getName(@"insert" + capitalizedKey + ":atIndexes:");
if ([_proxyObject respondsToSelector:_insertManySEL])
_insertMany = [_proxyObject methodForSelector:_insertManySEL];
_removeManySEL = sel_getName(@"remove" + capitalizedKey + "AtIndexes:");
if ([_proxyObject respondsToSelector:_removeManySEL])
_removeMany = [_proxyObject methodForSelector:_removeManySEL];
_replaceManySEL = sel_getName(@"replace" + capitalizedKey + "AtIndexes:with" + capitalizedKey + ":");
if ([_proxyObject respondsToSelector:_replaceManySEL])
_replaceMany = [_proxyObject methodForSelector:_replaceManySEL];
_objectAtIndexSEL = sel_getName(@"objectIn" + capitalizedKey + "AtIndex:");
if ([_proxyObject respondsToSelector:_objectAtIndexSEL])
_objectAtIndex = [_proxyObject methodForSelector:_objectAtIndexSEL];
_objectsAtIndexesSEL = sel_getName(_key + "AtIndexes:");
if ([_proxyObject respondsToSelector:_objectsAtIndexesSEL])
_objectsAtIndexes = [_proxyObject methodForSelector:_objectsAtIndexesSEL];
_countSEL = sel_getName(@"countOf" + capitalizedKey);
if ([_proxyObject respondsToSelector:_countSEL])
_count = [_proxyObject methodForSelector:_countSEL];
_accessSEL = sel_getName(_key);
if ([_proxyObject respondsToSelector:_accessSEL])
_access = [_proxyObject methodForSelector:_accessSEL];
_setSEL = sel_getName(@"set" + capitalizedKey + ":");
if ([_proxyObject respondsToSelector:_setSEL])
_set = [_proxyObject methodForSelector:_setSEL];
@@ -525,29 +536,33 @@
@implementation CPArray (KeyValueObserving)
/*!
Raises an exception.
Raises an exception for any key path other than "@count".
CPArray objects are not observable, so this method raises an exception when invoked on an CPArray object.
Instead of observing an array, observe the ordered to-many relationship for which the array is the collection of related objects.
CPArray objects are not observable (except for @count), so this method raises an exception
when invoked on an CPArray object. Instead of observing an array, observe the ordered
to-many relationship for which the array is the collection of related objects.
*/
- (void)addObserver:(id)anObserver forKeyPath:(CPString)aKeyPath options:(CPKeyValueObservingOptions)anOptions context:(id)aContext
{
[CPException raise:CPInvalidArgumentException reason:"[CPArray " + CPStringFromSelector(_cmd) + "] is not supported. Key path: " + aKeyPath];
if (aKeyPath !== @"@count")
[CPException raise:CPInvalidArgumentException reason:"[CPArray " + CPStringFromSelector(_cmd) + "] is not supported. Key path: " + aKeyPath];
}
/*!
Raises an exception.
Raises an exception for any key path other than "@count".
CPArray objects are not observable, so this method raises an exception when invoked on an CPArray object.
Instead of observing an array, observe the ordered to-many relationship for which the array is the collection of related objects.
CPArray objects are not observable (except for @count), so this method raises an exception
when invoked on an CPArray object. Instead of observing an array, observe the ordered
to-many relationship for which the array is the collection of related objects.
*/
- (void)removeObserver:(id)anObserver forKeyPath:(CPString)aKeyPath
{
[CPException raise:CPInvalidArgumentException reason:"[CPArray " + CPStringFromSelector(_cmd) + "] is not supported. Key path: " + aKeyPath];
if (aKeyPath !== @"@count")
[CPException raise:CPInvalidArgumentException reason:"[CPArray " + CPStringFromSelector(_cmd) + "] is not supported. Key path: " + aKeyPath];
}
/*!
Registers an observer to receive key value observer notifications for the specified key-path relative to the objects at the indexes.
Registers an observer to receive key value observer notifications for the specified key-path relative to the objects at the indexes.
*/
- (void)addObserver:(id)anObserver toObjectsAtIndexes:(CPIndexSet)indexes forKeyPath:(CPString)aKeyPath options:(unsigned)options context:(id)context
{
@@ -562,7 +577,7 @@
}
/*!
Removes anObserver from all key value observer notifications associated with the specified keyPath relative to the array’s objects at indexes.
Removes anObserver from all key value observer notifications associated with the specified keyPath relative to the array’s objects at indexes.
*/
- (void)removeObserver:(id)anObserver fromObjectsAtIndexes:(CPIndexSet)indexes forKeyPath:(CPString)aKeyPath
{
Foundation/CPCharacterSet.j
+2 -2
View File
@@ -490,10 +490,10 @@ _CPCharacterSetTrimAtEnd = 1 << 2;
{
var cutEdgeEnd = str.length;
while (cutEdgeEnd > 0 && [set characterIsMember:self.charAt(cutEdgeEnd)])
while (cutEdgeEnd > 0 && [set characterIsMember:str.charAt(cutEdgeEnd - 1)])
cutEdgeEnd--;
str = str.substr(0, cutEdgeEnd + 1);
str = str.substr(0, cutEdgeEnd);
}
return str;
Tests/Foundation/CPStringTest.j
+40
View File
@@ -526,4 +526,44 @@
[self assertTrue:sawException message:"expected CPRangeException"];
}
- (void)testStringByTrimmingCharactersInSet
{
var startOneString = @".This is a test startOne",
startManyString = @".,.This is a test startMany",
endOneString = @"This is a test endOne.",
endManyString = @"This is a test endMany.,.",
bothOneString = @".This is a test bothOne,",
bothManyString = @".,,This is a test bothMany..,",
noneString = @"This is a test none",
set = [CPCharacterSet characterSetWithCharactersInString:@".,"];
[self assert:"This is a test startOne" equals:[startOneString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test startMany" equals:[startManyString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test endOne" equals:[endOneString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test endMany" equals:[endManyString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test bothOne" equals:[bothOneString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test bothMany" equals:[bothManyString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test none" equals:[noneString stringByTrimmingCharactersInSet:set]];
}
- (void)testStringByTrimmingWhitespace
{
var startOneString = @" This is a test startOne",
startManyString = @" This is a test startMany",
endOneString = @"This is a test endOne ",
endManyString = @"This is a test endMany ",
bothOneString = @" This is a test bothOne ",
bothManyString = @" This is a test bothMany ",
noneString = @"This is a test none",
set = [CPCharacterSet characterSetWithCharactersInString:@" "];
[self assert:"This is a test startOne" equals:[startOneString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test startMany" equals:[startManyString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test endOne" equals:[endOneString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test endMany" equals:[endManyString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test bothOne" equals:[bothOneString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test bothMany" equals:[bothManyString stringByTrimmingCharactersInSet:set]];
[self assert:"This is a test none" equals:[noneString stringByTrimmingCharactersInSet:set]];
}
@end
Tests/Manual/CPComboBoxTest/AppController.j
+8
View File
@@ -64,6 +64,8 @@
@outlet CPTextField comboTarget;
CPString fontName;
int nextCheckboxY;
@outlet CPComboBox disabledCombo;
}
- (id)init
@@ -85,6 +87,12 @@
{
testWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(30, 50, 500, 400) styleMask:CPTitledWindowMask | CPResizableWindowMask];
// test disabling from IB
if (![disabledCombo isEnabled])
console.log("diabledCombo box has been correctly disabled from Interface Builder.");
else
console.log("There was a problem disabling disabledCombo from Interface Builder.");
var contentView = [testWindow contentView],
companiesScrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(30, 30, 200, 100)],
companiesTable = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)],
Tests/Manual/CPComboBoxTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPComboBoxTest/Resources/MainMenu.xib
+159 -31
View File
@@ -2,26 +2,26 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2182</string>
<string key="NS.object.0">3084</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSView</string>
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSComboBox</string>
<string>NSWindowTemplate</string>
<string>NSComboBoxCell</string>
<string>NSCustomObject</string>
<string>NSObjectController</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
<string>NSButtonCell</string>
<string>NSComboBoxCell</string>
<string>NSButton</string>
<string>NSCustomObject</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -53,7 +53,7 @@
<object class="NSWindowTemplate" id="739395868">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{583, 961}, {394, 166}}</string>
<string key="NSWindowRect">{{532, 712}, {394, 166}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">CPComboBox (from cib)</string>
<string key="NSWindowClass">NSWindow</string>
@@ -73,7 +73,7 @@
<reference key="NSNextKeyView" ref="288514536"/>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="58512575">
<int key="NSCellFlags">343014976</int>
<int key="NSCellFlags">342884416</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="64180879">
@@ -124,6 +124,8 @@
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn">
@@ -131,10 +133,10 @@
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628032</int>
<int key="NSCellFlags">75497472</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport">
<object class="NSFont" key="NSSupport" id="462329275">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
@@ -146,7 +148,7 @@
<reference key="NSTextColor" ref="308779708"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell">
<int key="NSCellFlags">338820672</int>
<int key="NSCellFlags">338690112</int>
<int key="NSCellFlags2">268436480</int>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="116006387"/>
@@ -170,7 +172,7 @@
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="729693961"/>
<object class="NSColor" key="NSGridColor">
<object class="NSColor" key="NSGridColor" id="1043619474">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">gridColor</string>
@@ -193,6 +195,7 @@
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="288514536">
<reference key="NSNextResponder" ref="177694051"/>
@@ -203,12 +206,12 @@
<reference key="NSNextKeyView" ref="104434533"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="132463171">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Enabled</string>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="288514536"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage" id="887534559">
<string key="NSClassName">NSImage</string>
@@ -222,6 +225,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="104434533">
<reference key="NSNextResponder" ref="177694051"/>
@@ -232,12 +236,12 @@
<reference key="NSNextKeyView" ref="846797034"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="299849276">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Button bordered</string>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="104434533"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="887534559"/>
<reference key="NSAlternateImage" ref="286406562"/>
@@ -246,6 +250,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="121703403">
<reference key="NSNextResponder" ref="177694051"/>
@@ -256,12 +261,12 @@
<reference key="NSNextKeyView" ref="583065641"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="794409030">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Completes</string>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="121703403"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="887534559"/>
<reference key="NSAlternateImage" ref="286406562"/>
@@ -270,6 +275,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="583065641">
<reference key="NSNextResponder" ref="177694051"/>
@@ -280,12 +286,12 @@
<reference key="NSNextKeyView" ref="493411239"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="933414996">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Force selection</string>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="583065641"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="887534559"/>
<reference key="NSAlternateImage" ref="286406562"/>
@@ -294,6 +300,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="493411239">
<reference key="NSNextResponder" ref="177694051"/>
@@ -301,15 +308,14 @@
<string key="NSFrame">{{247, 18}, {129, 18}}</string>
<reference key="NSSuperview" ref="177694051"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="626840863">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Vertical scrollbar</string>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="493411239"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="887534559"/>
<reference key="NSAlternateImage" ref="286406562"/>
@@ -318,6 +324,7 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="846797034">
<reference key="NSNextResponder" ref="177694051"/>
@@ -328,7 +335,7 @@
<reference key="NSNextKeyView" ref="121703403"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1022071393">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="64180879"/>
@@ -343,6 +350,89 @@
<reference key="NSColor" ref="804288982"/>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSComboBox" id="725322893">
<reference key="NSNextResponder" ref="177694051"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 16}, {191, 26}}</string>
<reference key="NSSuperview" ref="177694051"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSComboBoxCell" key="NSCell" id="116568047">
<int key="NSCellFlags">879755328</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="64180879"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="725322893"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="1070974640"/>
<reference key="NSTextColor" ref="234844066"/>
<int key="NSVisibleItemCount">5</int>
<bool key="NSHasVerticalScroller">YES</bool>
<reference key="NSDelegate" ref="725322893"/>
<object class="NSComboTableView" key="NSTableView" id="566083914">
<reference key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{13, 0}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:24</string>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn">
<double key="NSWidth">10</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75497472</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="462329275"/>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
</object>
<reference key="NSTextColor" ref="308779708"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell">
<int key="NSCellFlags">338690112</int>
<int key="NSCellFlags2">1024</int>
<reference key="NSSupport" ref="64180879"/>
<reference key="NSControlView" ref="566083914"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="729693961"/>
<reference key="NSTextColor" ref="234844066"/>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<reference key="NSTableView" ref="566083914"/>
</object>
</object>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<reference key="NSBackgroundColor" ref="729693961"/>
<reference key="NSGridColor" ref="1043619474"/>
<double key="NSRowHeight">19</double>
<string key="NSAction">tableViewAction:</string>
<int key="NSTvFlags">-765427712</int>
<reference key="NSDelegate" ref="116568047"/>
<reference key="NSDataSource" ref="116568047"/>
<reference key="NSTarget" ref="116568047"/>
<int key="NSColumnAutoresizingStyle">1</int>
<int key="NSDraggingSourceMaskForLocal">15</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
<string key="NSFrameSize">{394, 166}</string>
@@ -350,7 +440,7 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="584113036"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -390,6 +480,14 @@
</object>
<int key="connectionID">577</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">disabledCombo</string>
<reference key="source" ref="635946545"/>
<reference key="destination" ref="725322893"/>
</object>
<int key="connectionID">585</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: selection</string>
@@ -566,6 +664,7 @@
<reference ref="493411239"/>
<reference ref="104434533"/>
<reference ref="846797034"/>
<reference ref="725322893"/>
</object>
<reference key="parent" ref="739395868"/>
</object>
@@ -672,6 +771,20 @@
<reference key="object" ref="1022071393"/>
<reference key="parent" ref="846797034"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">583</int>
<reference key="object" ref="725322893"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="116568047"/>
</object>
<reference key="parent" ref="177694051"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">584</int>
<reference key="object" ref="116568047"/>
<reference key="parent" ref="725322893"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -682,6 +795,8 @@
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>450.IBPluginDependency</string>
<string>460.IBNSWindowAutoPositionCentersHorizontal</string>
<string>460.IBNSWindowAutoPositionCentersVertical</string>
<string>460.IBPluginDependency</string>
<string>460.IBWindowTemplateEditedContentRect</string>
<string>460.NSWindowTemplate.visibleAtLaunch</string>
@@ -702,6 +817,8 @@
<string>550.IBPluginDependency</string>
<string>573.IBPluginDependency</string>
<string>574.IBPluginDependency</string>
<string>583.IBPluginDependency</string>
<string>584.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -709,6 +826,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{357, 418}, {480, 270}}</string>
<integer value="1"/>
@@ -740,6 +859,8 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -754,7 +875,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">578</int>
<int key="maxID">585</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -768,12 +889,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>cibCombo</string>
<string>comboTarget</string>
<string>disabledCombo</string>
<string>theWindow</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSComboBox</string>
<string>NSTextField</string>
<string>NSComboBox</string>
<string>NSWindow</string>
</object>
</object>
@@ -783,6 +906,7 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>cibCombo</string>
<string>comboTarget</string>
<string>disabledCombo</string>
<string>theWindow</string>
</object>
<object class="NSArray" key="dict.values">
@@ -795,6 +919,10 @@
<string key="name">comboTarget</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">disabledCombo</string>
<string key="candidateClassName">NSComboBox</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">theWindow</string>
<string key="candidateClassName">NSWindow</string>
Tests/Manual/CPDictionaryControllerTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPDictionaryControllerTest/Resources/MainMenu.xib
+134 -161
View File
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">788</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">788</string>
<string key="NS.object.0">3084</string>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2"/>
<integer value="85"/>
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSDictionaryController</string>
<string>NSScrollView</string>
<string>NSScroller</string>
<string>NSTableColumn</string>
<string>NSTableHeaderView</string>
<string>NSTableView</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -88,7 +94,7 @@
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="1006">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -109,19 +115,24 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{344, 165}</string>
<reference key="NSSuperview" ref="544211696"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="447884618"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="687245611">
<reference key="NSNextResponder" ref="142602557"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{344, 17}</string>
<reference key="NSSuperview" ref="142602557"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="544211696"/>
<reference key="NSTableView" ref="144610870"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="1006235186">
<reference key="NSNextResponder" ref="31411179"/>
<object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="31411179"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -131,7 +142,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Key</string>
<object class="NSFont" key="NSSupport" id="26">
@@ -154,7 +165,7 @@
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="133618047">
<int key="NSCellFlags">337772096</int>
<int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Text Cell</string>
<object class="NSFont" key="NSSupport" id="392541906">
@@ -195,7 +206,7 @@
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags">75497536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Value</string>
<reference key="NSSupport" ref="26"/>
@@ -203,7 +214,7 @@
<reference key="NSTextColor" ref="981977741"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="317425755">
<int key="NSCellFlags">337772096</int>
<int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Text Cell</string>
<reference key="NSSupport" ref="392541906"/>
@@ -235,7 +246,7 @@
</object>
</object>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">-624951296</int>
<int key="NSTvFlags">-557842432</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">4</int>
@@ -243,10 +254,12 @@
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</object>
<string key="NSFrame">{{1, 17}, {344, 165}}</string>
<reference key="NSSuperview" ref="31411179"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="144610870"/>
<reference key="NSDocView" ref="144610870"/>
<reference key="NSBGColor" ref="292314166"/>
@@ -257,6 +270,9 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 17}, {15, 102}}</string>
<reference key="NSSuperview" ref="31411179"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="391203022"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="31411179"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">37</double>
@@ -267,6 +283,9 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 119}, {223, 15}}</string>
<reference key="NSSuperview" ref="31411179"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1027504291"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="31411179"/>
<string key="NSAction">_doScroller:</string>
@@ -281,92 +300,106 @@
</object>
<string key="NSFrame">{{1, 0}, {344, 17}}</string>
<reference key="NSSuperview" ref="31411179"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="687245611"/>
<reference key="NSDocView" ref="687245611"/>
<reference key="NSBGColor" ref="292314166"/>
<int key="NScvFlags">4</int>
</object>
<reference ref="1006235186"/>
</object>
<string key="NSFrame">{{20, 48}, {346, 183}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSNextKeyView" ref="544211696"/>
<int key="NSsFlags">562</int>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="142602557"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="447884618"/>
<reference key="NSHScroller" ref="391203022"/>
<reference key="NSContentView" ref="544211696"/>
<reference key="NSHeaderClipView" ref="142602557"/>
<reference key="NSCornerView" ref="1006235186"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
</object>
<object class="NSButton" id="1027504291">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{14, 12}, {96, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="275684078"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="580768836">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Add</string>
<reference key="NSSupport" ref="392541906"/>
<reference key="NSControlView" ref="1027504291"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="275684078">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{110, 12}, {96, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="278100624">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Remove</string>
<reference key="NSSupport" ref="392541906"/>
<reference key="NSControlView" ref="275684078"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="35456987">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{14, 256}, {358, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="207635663"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1035276617">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">CPTableViewSelectionHighlightStyleRegular</string>
<reference key="NSSupport" ref="392541906"/>
<reference key="NSControlView" ref="35456987"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags">-2038284288</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="207635663">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 236}, {96, 22}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="31411179"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="150344314">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="392541906"/>
@@ -388,13 +421,17 @@
<reference key="NSColor" ref="296291476"/>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
<string key="NSFrameSize">{386, 304}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="35456987"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
<object class="NSWindowTemplate" id="1058317463">
<int key="NSWindowStyleMask">15</int>
@@ -404,9 +441,9 @@
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<nil key="NSUserInterfaceItemIdentifier"/>
<object class="NSView" key="NSWindowView" id="521441474">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -417,7 +454,7 @@
<reference key="NSSuperview" ref="521441474"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="732622908">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="392541906"/>
@@ -426,13 +463,14 @@
<reference key="NSBackgroundColor" ref="868093418"/>
<reference key="NSTextColor" ref="1030721833"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
<string key="NSFrameSize">{386, 304}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -446,14 +484,6 @@
</object>
<int key="connectionID">15</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dictionaryController</string>
<reference key="source" ref="793752084"/>
<reference key="destination" ref="812841958"/>
</object>
<int key="connectionID">16</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">add:</string>
@@ -462,38 +492,6 @@
</object>
<int key="connectionID">21</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: canRemove</string>
<reference key="source" ref="275684078"/>
<reference key="destination" ref="812841958"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="275684078"/>
<reference key="NSDestination" ref="812841958"/>
<string key="NSLabel">enabled: canRemove</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">canRemove</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">33</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: canAdd</string>
<reference key="source" ref="1027504291"/>
<reference key="destination" ref="812841958"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="1027504291"/>
<reference key="NSDestination" ref="812841958"/>
<string key="NSLabel">enabled: canAdd</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">canAdd</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">35</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">remove:</string>
@@ -534,6 +532,14 @@
</object>
<int key="connectionID">69</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="144610870"/>
<reference key="destination" ref="793752084"/>
</object>
<int key="connectionID">123</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: arrangedObjects.key</string>
@@ -574,6 +580,14 @@
</object>
<int key="connectionID">76</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dictionaryController</string>
<reference key="source" ref="793752084"/>
<reference key="destination" ref="812841958"/>
</object>
<int key="connectionID">16</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">tableView</string>
@@ -591,12 +605,36 @@
<int key="connectionID">122</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="144610870"/>
<reference key="destination" ref="793752084"/>
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: canAdd</string>
<reference key="source" ref="1027504291"/>
<reference key="destination" ref="812841958"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="1027504291"/>
<reference key="NSDestination" ref="812841958"/>
<string key="NSLabel">enabled: canAdd</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">canAdd</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">123</int>
<int key="connectionID">35</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: canRemove</string>
<reference key="source" ref="275684078"/>
<reference key="destination" ref="812841958"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="275684078"/>
<reference key="NSDestination" ref="812841958"/>
<string key="NSLabel">enabled: canRemove</string>
<string key="NSBinding">enabled</string>
<string key="NSKeyPath">canRemove</string>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">33</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -604,7 +642,9 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBObjectRecord">
<int key="objectID">0</int>
<reference key="object" ref="0"/>
<object class="NSArray" key="object" id="0">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
@@ -820,12 +860,9 @@
<string>-1.IBPluginDependency</string>
<string>-2.IBPluginDependency</string>
<string>-3.IBPluginDependency</string>
<string>1.IBEditorWindowLastContentRect</string>
<string>1.IBPluginDependency</string>
<string>1.IBWindowTemplateEditedContentRect</string>
<string>1.NSWindowTemplate.visibleAtLaunch</string>
<string>1.WindowOrigin</string>
<string>1.editorWindowContentRectSynchronizationRect</string>
<string>10.IBPluginDependency</string>
<string>11.IBPluginDependency</string>
<string>114.IBPluginDependency</string>
@@ -847,26 +884,21 @@
<string>82.IBPluginDependency</string>
<string>83.IBPluginDependency</string>
<string>84.IBPluginDependency</string>
<string>85.IBEditorWindowLastContentRect</string>
<string>85.IBPluginDependency</string>
<string>85.IBWindowTemplateEditedContentRect</string>
<string>85.NSWindowTemplate.visibleAtLaunch</string>
<string>85.WindowOrigin</string>
<string>85.editorWindowContentRectSynchronizationRect</string>
<string>86.IBPluginDependency</string>
<string>9.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{41, 441}, {386, 304}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{41, 441}, {386, 304}}</string>
<integer value="1"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -889,11 +921,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{478, 436}, {386, 304}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{478, 436}, {386, 304}}</string>
<integer value="1"/>
<string>{196, 240}</string>
<string>{{357, 418}, {480, 270}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
@@ -901,17 +929,13 @@
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">123</int>
@@ -922,59 +946,9 @@
<object class="IBPartialClassDescription">
<string key="className">AppController</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">nextHighlightStyle:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">nextHighlightStyle:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">nextHighlightStyle:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>dictionaryController</string>
<string>selectionHighlightStyleString</string>
<string>tableView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSDictionaryController</string>
<string>id</string>
<string>NSTableView</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>dictionaryController</string>
<string>selectionHighlightStyleString</string>
<string>tableView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">dictionaryController</string>
<string key="candidateClassName">NSDictionaryController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">selectionHighlightStyleString</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView</string>
<string key="candidateClassName">NSTableView</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/AppController.h</string>
</object>
</object>
</object>
@@ -986,7 +960,6 @@
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<nil key="IBDocument.LastKnownRelativeProjectPath"/>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
</data>
</archive>
Tests/Manual/CPGraphicsTest/AppController.j
+44
View File
@@ -23,6 +23,7 @@
@outlet CustomDrawView gradientView3;
@outlet CustomDrawView pathView0;
@outlet CustomDrawView pathView1;
}
- (void)awakeFromCib
@@ -141,6 +142,49 @@
[[CPColor blackColor] set];
[aPath stroke];
}
else if (aView === pathView1)
{
[[CPColor whiteColor] set];
[[CPBezierPath bezierPathWithRect:bounds] fill];
var frame = bounds,
shadow = [[CPShadow alloc] init];
[shadow setShadowColor:[CPColor blackColor]];
[shadow setShadowOffset:CGSizeMake(0, 3)];
[shadow setShadowBlurRadius:5];
//// Rounded Rectangle Drawing
var roundedRectanglePath = [CPBezierPath bezierPathWithRoundedRect:CGRectMake(CGRectGetMinX(frame) + 3.5, CGRectGetMinY(frame) + 3.5, CGRectGetWidth(frame) - 7, CGRectGetHeight(frame) - 7) xRadius:7 yRadius:7];
[[CPColor blackColor] setStroke];
[roundedRectanglePath setLineWidth:1];
var roundedRectanglePattern = [5, 1, 1, 1];
[roundedRectanglePath setLineDash:roundedRectanglePattern phase:0];
[roundedRectanglePath stroke];
var starPath = [CPBezierPath bezierPath];
[starPath moveToPoint:CGPointMake(CGRectGetMinX(frame) + 0.50000 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.20513 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.43029 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.35357 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.31200 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.40445 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.38720 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.54707 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.38381 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.72696 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.50000 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.66667 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.61619 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.72696 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.61280 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.54707 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.68800 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.40445 * CGRectGetHeight(frame))];
[starPath lineToPoint:CGPointMake(CGRectGetMinX(frame) + 0.56971 * CGRectGetWidth(frame), CGRectGetMinY(frame) + 0.35357 * CGRectGetHeight(frame))];
[starPath closePath];
[[CPColor yellowColor] setFill];
[starPath fill];
[CPGraphicsContext saveGraphicsState];
[shadow set];
[[CPColor whiteColor] setStroke];
[starPath setLineWidth:3];
var starPattern = [5, 1, 5, 1];
[starPath setLineDash:starPattern phase:2];
[starPath stroke];
[CPGraphicsContext restoreGraphicsState];
}
}
@end
Tests/Manual/CPGraphicsTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPGraphicsTest/Resources/MainMenu.xib
+173 -15
View File
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12C3012</string>
<string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
@@ -41,7 +41,7 @@
<object class="NSWindowTemplate" id="972006081">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{66, 464}, {840, 355}}</string>
<string key="NSWindowRect">{{66, 912}, {840, 355}}</string>
<int key="NSWTFlags">1948778496</int>
<string key="NSWindowTitle">CPGraphics Test</string>
<string key="NSWindowClass">NSWindow</string>
@@ -495,7 +495,7 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="138531732"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -505,7 +505,7 @@
<object class="NSWindowTemplate" id="959857374">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{147, 282}, {840, 490}}</string>
<string key="NSWindowRect">{{182, 766}, {840, 490}}</string>
<int key="NSWTFlags">1948778496</int>
<string key="NSWindowTitle">CPGraphics Test</string>
<string key="NSWindowClass">NSWindow</string>
@@ -546,7 +546,7 @@
<string key="NSFrame">{{438, 448}, {207, 22}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<reference key="NSNextKeyView" ref="869388303"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="514631928">
<int key="NSCellFlags">68157504</int>
@@ -621,7 +621,7 @@
<string key="NSFrame">{{229, 321}, {173, 14}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="869388303"/>
<reference key="NSNextKeyView" ref="883958257"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="748614698">
<int key="NSCellFlags">68157504</int>
@@ -753,7 +753,7 @@
<string key="NSFrame">{{236, 217}, {163, 96}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="839761053"/>
<reference key="NSNextKeyView" ref="451483103"/>
<string key="NSClassName">CustomDrawView</string>
</object>
<object class="NSTextField" id="839761053">
@@ -781,7 +781,7 @@
<string key="NSFrame">{{229, 195}, {173, 14}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="451483103"/>
<reference key="NSNextKeyView" ref="690456526"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="733965303">
<int key="NSCellFlags">68157504</int>
@@ -879,7 +879,7 @@
<string key="NSFrame">{{648, 214}, {169, 102}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="690456526"/>
<reference key="NSNextKeyView" ref="839761053"/>
<string key="NSReuseIdentifierKey">_NS:2141</string>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="40298134">
@@ -923,7 +923,7 @@
<string key="NSFrame">{{22, 50}, {163, 96}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="119939528"/>
<reference key="NSNextKeyView" ref="1070557278"/>
<string key="NSClassName">CustomDrawView</string>
</object>
<object class="NSTextField" id="1022550777">
@@ -932,7 +932,7 @@
<string key="NSFrame">{{17, 28}, {169, 14}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="476536005"/>
<reference key="NSNextKeyView" ref="627890743"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="255431316">
<int key="NSCellFlags">68157504</int>
@@ -951,6 +951,7 @@
<string key="NSFrame">{{438, 28}, {169, 14}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1023996532"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="460296097">
<int key="NSCellFlags">68157504</int>
@@ -977,7 +978,7 @@
<string key="NSFrame">{{441, 47}, {169, 102}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1022550777"/>
<reference key="NSNextKeyView" ref="31926422"/>
<string key="NSReuseIdentifierKey">_NS:2141</string>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="632457930">
@@ -996,13 +997,93 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
<object class="NSCustomView" id="1070557278">
<reference key="NSNextResponder" ref="574182546"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{236, 50}, {163, 96}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="119939528"/>
<string key="NSClassName">CustomDrawView</string>
</object>
<object class="NSTextField" id="627890743">
<reference key="NSNextResponder" ref="574182546"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{233, 28}, {169, 14}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="476536005"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="926276848">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">138544128</int>
<string key="NSContents">Strokes and Shadows</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="627890743"/>
<reference key="NSBackgroundColor" ref="44883150"/>
<reference key="NSTextColor" ref="618459948"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="1023996532">
<reference key="NSNextResponder" ref="574182546"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{645, 28}, {169, 14}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="870544509">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">138544128</int>
<string key="NSContents">Strokes and Shadows</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSControlView" ref="1023996532"/>
<reference key="NSBackgroundColor" ref="44883150"/>
<reference key="NSTextColor" ref="618459948"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSImageView" id="31926422">
<reference key="NSNextResponder" ref="574182546"/>
<int key="NSvFlags">268</int>
<set class="NSMutableSet" key="NSDragTypes">
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</set>
<string key="NSFrame">{{648, 47}, {169, 102}}</string>
<reference key="NSSuperview" ref="574182546"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1022550777"/>
<string key="NSReuseIdentifierKey">_NS:2141</string>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="639204041">
<int key="NSCellFlags">134217728</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">pathView1</string>
</object>
<string key="NSCellIdentifier">_NS:2141</string>
<int key="NSAlign">0</int>
<int key="NSScale">2</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">NO</bool>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSEditable">YES</bool>
</object>
</array>
<string key="NSFrameSize">{840, 490}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<reference key="NSNextKeyView" ref="876058946"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -1105,6 +1186,14 @@
</object>
<int key="connectionID">1302</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">pathView1</string>
<reference key="source" ref="635946545"/>
<reference key="destination" ref="1070557278"/>
</object>
<int key="connectionID">1311</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_delegate</string>
@@ -1177,6 +1266,14 @@
</object>
<int key="connectionID">1290</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">_delegate</string>
<reference key="source" ref="1070557278"/>
<reference key="destination" ref="635946545"/>
</object>
<int key="connectionID">1304</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -1499,7 +1596,11 @@
<reference ref="989587411"/>
<reference ref="249401564"/>
<reference ref="1035306418"/>
<reference ref="1070557278"/>
<reference ref="1022550777"/>
<reference ref="627890743"/>
<reference ref="1023996532"/>
<reference ref="31926422"/>
</array>
<reference key="parent" ref="959857374"/>
</object>
@@ -1767,6 +1868,50 @@
<reference key="object" ref="632457930"/>
<reference key="parent" ref="119939528"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1303</int>
<reference key="object" ref="1070557278"/>
<reference key="parent" ref="574182546"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1305</int>
<reference key="object" ref="627890743"/>
<array class="NSMutableArray" key="children">
<reference ref="926276848"/>
</array>
<reference key="parent" ref="574182546"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1306</int>
<reference key="object" ref="926276848"/>
<reference key="parent" ref="627890743"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1307</int>
<reference key="object" ref="1023996532"/>
<array class="NSMutableArray" key="children">
<reference ref="870544509"/>
</array>
<reference key="parent" ref="574182546"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1308</int>
<reference key="object" ref="31926422"/>
<array class="NSMutableArray" key="children">
<reference ref="639204041"/>
</array>
<reference key="parent" ref="574182546"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1309</int>
<reference key="object" ref="639204041"/>
<reference key="parent" ref="31926422"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1310</int>
<reference key="object" ref="870544509"/>
<reference key="parent" ref="1023996532"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1856,6 +2001,13 @@
<string key="1284.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1285.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1286.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1303.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1305.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1306.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1307.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1308.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="371.IBNSWindowAutoPositionCentersHorizontal"/>
<boolean value="NO" key="371.IBNSWindowAutoPositionCentersVertical"/>
<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1868,7 +2020,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">1302</int>
<int key="maxID">1311</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1881,6 +2033,7 @@
<string key="gradientView2">CustomDrawView</string>
<string key="gradientView3">CustomDrawView</string>
<string key="pathView0">CustomDrawView</string>
<string key="pathView1">CustomDrawView</string>
<string key="view1">CustomDrawView</string>
<string key="view2">CustomDrawView</string>
<string key="view3">CustomDrawView</string>
@@ -1909,6 +2062,10 @@
<string key="name">pathView0</string>
<string key="candidateClassName">CustomDrawView</string>
</object>
<object class="IBToOneOutletInfo" key="pathView1">
<string key="name">pathView1</string>
<string key="candidateClassName">CustomDrawView</string>
</object>
<object class="IBToOneOutletInfo" key="view1">
<string key="name">view1</string>
<string key="candidateClassName">CustomDrawView</string>
@@ -1970,6 +2127,7 @@
<string key="grad2">{163, 96}</string>
<string key="grad3">{163, 96}</string>
<string key="pathView0">{163, 96}</string>
<string key="pathView1">{163, 96}</string>
<string key="view1">{163, 96}</string>
<string key="view2">{163, 96}</string>
<string key="view3">{163, 96}</string>
Tests/Manual/CPGraphicsTest/Resources/pathView1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

Tools/XcodeCapp/xcodecapp-cocoa-icon-active.psd
BIN
View File
Binary file not shown.
Tools/XcodeCapp/xcodecapp-icon-active.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Tools/XcodeCapp/xcodecapp-icon-inactive.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Tools/XcodeCapp/xcodecapp-icon-working.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Tools/nib2cib/NSComboBox.j
+1
View File
@@ -45,6 +45,7 @@
_numberOfVisibleItems = [cell visibleItemCount];
_hasVerticalScroller = [cell hasVerticalScroller];
[self setButtonBordered:[cell borderedButton]];
[self setEnabled:[cell isEnabled]];
// Make sure the height is clipped to the max given by the theme
var maxSize = [[[Converter sharedConverter] themes][0] valueForAttributeWithName:@"max-size" forClass:[CPComboBox class]],