colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-15 15:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.mv.usa.alcatel.com:amercada/Cappuccino

Browse Source
This commit is contained in:
Alexandre Wilhelm
2013-01-23 17:22:16 -08:00
parent c5fbeffa9c 1f98dbdf65
commit c1dc40c79b
17 changed files with 314 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPTextField.j
+1 -1
View File
@@ -205,7 +205,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
+ (id)themeAttributes
{
return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMake(2.0, 2.0, 2.0, 2.0), [CPNull null]]
return [CPDictionary dictionaryWithObjects:[_CGInsetMakeZero(), _CGInsetMakeZero(), [CPNull null]]
forKeys:[@"bezel-inset", @"content-inset", @"bezel-color"]];
}
Tests/AppKit/CGContextTest.j
+4
View File
@@ -2,6 +2,10 @@
@import "CGTestCase.j"
// These are left undefined in CGContext.j if CPFeatureIsCompatible(CPHTMLCanvasFeature)
@global CGGStateCreate
@global CGGStateCreateCopy
@implementation CGContextTest : CGTestCase
- (void)testEnsureTestingCanvas
Tests/AppKit/CPCheckBoxTest.j
+8 -6
View File
@@ -14,7 +14,8 @@
var control = [[CPCheckBox alloc] initWithFrame:CGRectMakeZero()];
[control setAllowsMixedState:YES];
var content = [
var content =
[
CPOffState,
CPOnState
],
@@ -78,11 +79,12 @@
{
var control = [[CPCheckBox alloc] initWithFrame:CGRectMakeZero()];
content = [
[CPDictionary dictionaryWithObject:YES forKey:@"state"],
[CPDictionary dictionaryWithObject:NO forKey:@"state"]
];
arrayController = [[CPArrayController alloc] initWithContent:content];
var content =
[
[CPDictionary dictionaryWithObject:YES forKey:@"state"],
[CPDictionary dictionaryWithObject:NO forKey:@"state"]
],
arrayController = [[CPArrayController alloc] initWithContent:content];
// First test defaults.
[control bind:CPValueBinding toObject:arrayController withKeyPath:@"selection.state" options:[CPDictionary dictionaryWithObject:@"CPNegateBoolean" forKey:CPValueTransformerNameBindingOption]];
Tests/AppKit/CPKeyValueBindingTest.j
+2 -2
View File
@@ -160,7 +160,7 @@
[tableView addTableColumn:tableColumn];
content = [
var content = [
[AccessCounter counterWithValueA:"1" valueB:"2"],
[AccessCounter counterWithValueA:"3" valueB:"4"],
[AccessCounter counterWithValueA:"5" valueB:"6"],
@@ -229,7 +229,7 @@
[textField bind:@"hidden" toObject:self withKeyPath:@"FOO" options:nil];
[self assert:@"cheese" equals:[textField placeholderString] message:"placeholder should not be cleared when a binding is established"];
content = [
var content = [
[BindingTester testerWithCheese:@"yellow"],
[BindingTester testerWithCheese:@"green"],
];
Tests/AppKit/CPResponderTest.j
+2
View File
@@ -41,6 +41,7 @@
selector = tests[i + 2];
responder.doCommandCalls = [];
var keyEvent = [CPEvent keyEventWithType:CPKeyDown location:CGPointMakeZero() modifierFlags:0
timestamp:0 windowNumber:0 context:nil
characters:character charactersIgnoringModifiers:character isARepeat:NO keyCode:keyCode];
@@ -52,6 +53,7 @@
- (void)testInterpretKeyEventsWithModifierFlags
{
responder.doCommandCalls = [];
var keyEvent = [CPEvent keyEventWithType:CPKeyDown location:CGPointMakeZero() modifierFlags:CPShiftKeyMask
timestamp:0 windowNumber:0 context:nil
characters:CPLeftArrowFunctionKey charactersIgnoringModifiers:CPLeftArrowFunctionKey isARepeat:NO keyCode:CPKeyCodes.LEFT];
Tests/AppKit/CPSliderTest.j
+1
View File
@@ -23,6 +23,7 @@
var slider = [[CPSlider alloc] initWithFrame:CGRectMakeZero()];
[slider setContinuous:NO];
var decoded = [CPKeyedUnarchiver unarchiveObjectWithData:[CPKeyedArchiver archivedDataWithRootObject:slider]];
[self assert:[slider isContinuous] equals:[decoded isContinuous] message:@"a decoded slider should preserve isContinuous (NO case)"];
Tests/Foundation/CPArrayPerformanceTest.j
+2
View File
@@ -5,6 +5,8 @@ var FILE = require("file");
@import <Foundation/CPNumber.j>
@import <Foundation/CPSortDescriptor.j>
@global module
var ELEMENTS = 100,
REPEATS = 10;
Tests/Foundation/CPDecimalTest.j
+2 -5
View File
@@ -143,11 +143,8 @@
- (void)testNormalize
{
var dcm1,
dcm2;
dcm1 = CPDecimalMakeWithString( @"200" );
dcm2 = CPDecimalMakeWithString( @"2" );
var dcm1 = CPDecimalMakeWithString( @"200" ),
dcm2 = CPDecimalMakeWithString( @"2" );
[self assert:0 equals:CPDecimalNormalize(dcm1,dcm2,CPRoundDown) message:"CPDecimalNormalise() Tn1:call" ];
[self assert:[2,0,0] equals:dcm1._mantissa message:"CPDecimalNormalise() Tn1: mantissa"];
[self assert:0 equals:dcm1._exponent message:"CPDecimalNormalise() Tn1: exponent"];
Tests/Foundation/CPExceptionTest.j
+1 -1
View File
@@ -7,7 +7,7 @@
- (void)setUp
{
exception = [CPException exceptionWithName:@"CPGenericException"
var exception = [CPException exceptionWithName:@"CPGenericException"
reason:@"Margins must be positive"
userInfo:nil];
}
Tests/Foundation/CPFunctionOperationTest.j
+1 -1
View File
@@ -19,8 +19,8 @@
{
var so = [[SomeObject alloc] init],
someVar = nil,
funcOp = [CPFunctionOperation functionOperationWithFunction:function() {[so setAString:@"Hello World"]}];
funcOp = [CPFunctionOperation functionOperationWithFunction:function() { [so setAString:@"Hello World"] }];
[funcOp addExecutionFunction:function() {someVar = 'Soylent Green';}];
[funcOp start];
Tests/Foundation/CPMutableArrayTest.j
+2 -5
View File
@@ -449,11 +449,8 @@
- (void)testMutableCopy
{
var normalArray = [CPArray array];
[self assertThrows:function () { [array addObject:[CPNull null]] }];
var mutableArray = [normalArray mutableCopy];
var normalArray = [],
mutableArray = [normalArray mutableCopy];
[mutableArray addObject:[CPNull null]];
Tests/Manual/CPGraphicsTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/CPTextFieldHeightTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/Nib2CibBaselineAlignementTest/Resources/MainMenu.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/Manual/Nib2CibBaselineAlignementTest/Resources/MainMenu.xib
+263 -59
View File
@@ -2,22 +2,22 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">11E2620</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">12D54</string>
<string key="IBDocument.InterfaceBuilderVersion">2844</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">2844</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSTextField</string>
<string>NSBox</string>
<string>NSWindowTemplate</string>
<string>NSView</string>
<string>NSTextFieldCell</string>
<string>NSCustomObject</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>
@@ -41,7 +41,7 @@
<object class="NSWindowTemplate" id="972006081">
<int key="NSWindowStyleMask">7</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{335, 390}, {316, 347}}</string>
<string key="NSWindowRect">{{335, 390}, {316, 439}}</string>
<int key="NSWTFlags">1946157056</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
@@ -55,13 +55,13 @@
<object class="NSTextField" id="280557241">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 134}, {77, 20}}</string>
<string key="NSFrame">{{37, 226}, {77, 20}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="15834664"/>
<reference key="NSNextKeyView" ref="427117076"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1057445446">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">67109888</int>
<string key="NSContents">pdpdpd</string>
<object class="NSFont" key="NSSupport" id="403375637">
@@ -89,16 +89,18 @@
</object>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="661156209">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{119, 104}, {155, 22}}</string>
<string key="NSFrame">{{119, 196}, {155, 22}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="141034066"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="985227724">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">268436480</int>
<string key="NSContents">pdpdpd</string>
<object class="NSFont" key="NSSupport" id="225108236">
@@ -125,17 +127,18 @@
<reference key="NSColor" ref="916412379"/>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="15834664">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 106}, {77, 17}}</string>
<string key="NSFrame">{{37, 198}, {77, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="661156209"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="290212594">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">pdpdpd</string>
<object class="NSFont" key="NSSupport" id="605539953">
@@ -147,16 +150,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="757957560">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{119, 76}, {155, 22}}</string>
<string key="NSFrame">{{119, 168}, {155, 22}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="191113100"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="208809859">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">268436480</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="225108236"/>
@@ -166,17 +171,18 @@
<reference key="NSBackgroundColor" ref="242800476"/>
<reference key="NSTextColor" ref="1018306022"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="8790711">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 78}, {77, 17}}</string>
<string key="NSFrame">{{37, 170}, {77, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="757957560"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="669441461">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="403375637"/>
@@ -184,16 +190,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="427117076">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{116, 134}, {161, 20}}</string>
<string key="NSFrame">{{116, 226}, {161, 20}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="681680856"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="533012071">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">268436480</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="605539953"/>
@@ -201,16 +209,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="377262076">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 159}, {77, 20}}</string>
<string key="NSFrame">{{37, 251}, {77, 20}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="920384541"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="153372058">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">67109888</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="403375637"/>
@@ -218,16 +228,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="920384541">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{116, 159}, {161, 20}}</string>
<string key="NSFrame">{{116, 251}, {161, 20}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="984299682"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1072816098">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">268436480</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="403375637"/>
@@ -235,16 +247,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="698296597">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 187}, {77, 20}}</string>
<string key="NSFrame">{{37, 279}, {77, 20}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="64512670"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="541801782">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">67109888</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="605539953"/>
@@ -252,16 +266,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="64512670">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{116, 187}, {77, 20}}</string>
<string key="NSFrame">{{116, 279}, {77, 20}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="727918403"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="984402115">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">1024</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="605539953"/>
@@ -269,17 +285,19 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSBox" id="727918403">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 163}, {276, 5}}</string>
<string key="NSFrame">{{20, 255}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="377262076"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -305,13 +323,14 @@
<object class="NSBox" id="125200402">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 191}, {276, 5}}</string>
<string key="NSFrame">{{20, 283}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="698296597"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -331,13 +350,14 @@
<object class="NSBox" id="984299682">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 138}, {276, 5}}</string>
<string key="NSFrame">{{20, 230}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="280557241"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -357,13 +377,14 @@
<object class="NSBox" id="681680856">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 107}, {276, 5}}</string>
<string key="NSFrame">{{20, 199}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="15834664"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -383,13 +404,14 @@
<object class="NSBox" id="141034066">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 79}, {276, 5}}</string>
<string key="NSFrame">{{20, 171}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="8790711"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -409,12 +431,13 @@
<object class="NSTextField" id="774385661">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{119, 48}, {155, 22}}</string>
<string key="NSFrame">{{119, 140}, {155, 22}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="269093242"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="758911011">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">268436480</int>
<string key="NSContents">pdpdpd</string>
<object class="NSFont" key="NSSupport" id="424335836">
@@ -428,17 +451,18 @@
<reference key="NSBackgroundColor" ref="242800476"/>
<reference key="NSTextColor" ref="1018306022"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="952098131">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 50}, {77, 17}}</string>
<string key="NSFrame">{{37, 142}, {77, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="774385661"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="426191350">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="403375637"/>
@@ -446,17 +470,19 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSBox" id="191113100">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 51}, {276, 5}}</string>
<string key="NSFrame">{{20, 143}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="952098131"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -476,12 +502,13 @@
<object class="NSTextField" id="919475669">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{119, 20}, {155, 22}}</string>
<string key="NSFrame">{{119, 112}, {155, 22}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="843280105"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="919062859">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags">-1804599231</int>
<int key="NSCellFlags2">268436480</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="424335836"/>
@@ -491,17 +518,18 @@
<reference key="NSBackgroundColor" ref="242800476"/>
<reference key="NSTextColor" ref="1018306022"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="744992003">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 22}, {77, 17}}</string>
<string key="NSFrame">{{37, 114}, {77, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="919475669"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="605551730">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">pdpdpd</string>
<reference key="NSSupport" ref="605539953"/>
@@ -509,17 +537,19 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSBox" id="269093242">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 23}, {276, 5}}</string>
<string key="NSFrame">{{20, 115}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="744992003"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
@@ -536,15 +566,49 @@
<reference key="NSBorderColor2" ref="378851385"/>
<reference key="NSFillColor2" ref="466184815"/>
</object>
<object class="NSBox" id="843280105">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">12</int>
<string key="NSFrame">{{20, 70}, {276, 5}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="383494131"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
<reference key="NSSupport" ref="225108236"/>
<reference key="NSBackgroundColor" ref="242800476"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
</object>
</object>
<int key="NSBorderType">3</int>
<int key="NSBoxType">2</int>
<int key="NSTitlePosition">0</int>
<bool key="NSTransparent">NO</bool>
<object class="NSColor" key="NSBorderColor2">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNDUwOTgwNDg0IDAuNjM1Mjk0MTM5NCAxIDAuNTIAA</bytes>
</object>
<object class="NSColor" key="NSFillColor2">
<int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4zNDUwOTgwNDg0IDAuNjM1Mjk0MTM5NCAxIDAuNTIAA</bytes>
</object>
</object>
<object class="NSTextField" id="432916156">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{25, 305}, {169, 22}}</string>
<string key="NSFrame">{{25, 397}, {169, 22}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="444517316"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="50744124">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">268435968</int>
<string key="NSContents">Alignment testing</string>
<object class="NSFont" key="NSSupport">
@@ -556,16 +620,18 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="444517316">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{25, 234}, {252, 68}}</string>
<string key="NSFrame">{{25, 326}, {252, 68}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="125200402"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="983574529">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">The following labels and text fields content should all have their baselines aligned to the blue lines (last pixel on the line) and should not be truncated.</string>
<reference key="NSSupport" ref="403375637"/>
@@ -573,11 +639,84 @@
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="638665668">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{103, 68.5}, {46, 14}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="274973254"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="967288568">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">pdpdpd</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="638665668"/>
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="383494131">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{37, 69}, {62, 17}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="638665668"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="227787191">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">pdpdpdp</string>
<reference key="NSSupport" ref="225108236"/>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="383494131"/>
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="274973254">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{159, 67.5}, {44, 14}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="966631655">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">pdpdpdp</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">3614</int>
</object>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="274973254"/>
<reference key="NSBackgroundColor" ref="794115624"/>
<reference key="NSTextColor" ref="21122350"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</object>
<string key="NSFrameSize">{316, 347}</string>
<string key="NSFrameSize">{316, 439}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="432916156"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
@@ -697,6 +836,10 @@
<reference ref="432916156"/>
<reference ref="444517316"/>
<reference ref="64512670"/>
<reference ref="638665668"/>
<reference ref="843280105"/>
<reference ref="383494131"/>
<reference ref="274973254"/>
</object>
<reference key="parent" ref="972006081"/>
</object>
@@ -964,6 +1107,53 @@
<reference key="object" ref="984402115"/>
<reference key="parent" ref="64512670"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">561</int>
<reference key="object" ref="638665668"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="967288568"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">562</int>
<reference key="object" ref="967288568"/>
<reference key="parent" ref="638665668"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">563</int>
<reference key="object" ref="843280105"/>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">566</int>
<reference key="object" ref="383494131"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="227787191"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">567</int>
<reference key="object" ref="227787191"/>
<reference key="parent" ref="383494131"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">568</int>
<reference key="object" ref="274973254"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="966631655"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">569</int>
<reference key="object" ref="966631655"/>
<reference key="parent" ref="274973254"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1017,6 +1207,13 @@
<string>558.IBPluginDependency</string>
<string>559.IBPluginDependency</string>
<string>560.IBPluginDependency</string>
<string>561.IBPluginDependency</string>
<string>562.IBPluginDependency</string>
<string>563.IBPluginDependency</string>
<string>566.IBPluginDependency</string>
<string>567.IBPluginDependency</string>
<string>568.IBPluginDependency</string>
<string>569.IBPluginDependency</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1067,6 +1264,13 @@
<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>
<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">
@@ -1081,7 +1285,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
<int key="maxID">560</int>
<int key="maxID">569</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
Tests/Objective-J/CFPropertyListTest.j
+2 -1
View File
@@ -1,3 +1,4 @@
@global module
var FILE = require("file"),
FileList = require("jake").FileList;
@@ -19,7 +20,7 @@ var FILE = require("file"),
var path = FILE.join(FILE.dirname(module.path), "PropertyLists/XMLDate.plist"),
object = CFPropertyList.readPropertyListFromFile(path),
date = [object objectForKey:@"date"];
[self assert:[CPDate class] equals:[date class]];
[self assert:[[CPDate alloc] initWithString:"2012-01-01 10:00:00 +0100"] equals:date];
}
Tools/nib2cib/NSTextField.j
+20 -2
View File
@@ -70,11 +70,29 @@
}
else
{
// Adjust frame for difference between layout->bounds rect in IB
// // Adjust frame for difference between layout->bounds rect in IB
[self setFrame:CGRectInset(frame, 3.0, 0.0)];
// Hack to get baselines to align
[self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y - 1.0)];
var fontSize = [[self font] size];
switch (fontSize)
{
// normal
case 13.0:
[self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y - 1.0)];
break;
// small
case 11.0:
[self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y + 2.0)];
break;
// mini
case 9.0:
[self setFrameOrigin:CGPointMake(frame.origin.x, frame.origin.y + 1.0)];
break;
}
}
CPLog.debug("NSTextField: title=\"" + [self stringValue] + "\", placeholder=" + ([cell placeholderString] == null ? "<none>" : '"' + [cell placeholderString] + '"') + ", isBordered=" + [self isBordered] + ", isBezeled=" + [self isBezeled] + ", bezelStyle=" + [self bezelStyle]);