AppKit/Cib/_CPCibCustomResource.j Tools/nib2cib/NSCustomResource.j Tools/nib2cib/NSImageView.j Tools/nib2cib/NSSet.j @@ -534,6 +534,8 @@ var CPControlValueKey = "CPControlValueKey", CPControlActionKey = "CPControlActionKey", CPControlSendActionOnKey = "CPControlSendActionOnKey"; +var __Deprecated__CPImageViewImageKey = @"CPImageViewImageKey"; + @implementation CPControl (CPCoding) /* @@ -549,6 +551,9 @@ var CPControlValueKey = "CPControlValueKey", { [self setObjectValue:[aCoder decodeObjectForKey:CPControlValueKey]]; + if ([aCoder containsValueForKey:__Deprecated__CPImageViewImageKey]) + [self setObjectValue:[aCoder decodeObjectForKey:_DeprecatedCPImageViewImageKey]]; + [self setEnabled:[aCoder decodeBoolForKey:CPControlIsEnabledKey]]; [self setAlignment:[aCoder decodeIntForKey:CPControlAlignmentKey]]; AppKit/CPControl.j @@ -64,7 +64,6 @@ var LEFT_SHADOW_INSET = 3.0, */ @implementation CPImageView : CPControl { - CPImage _image; DOMElement _DOMImageElement; CPImageScaling _imageScaling; @@ -101,35 +100,46 @@ var LEFT_SHADOW_INSET = 3.0, */ - (CPImage)image { - return _image; + return [self objectValue]; } -/*! - Sets the image for the view. - @param anImage the view's image -*/ - (void)setImage:(CPImage)anImage { - if (_image == anImage) + [self setObjectValue:anImage]; +} + +/*! @ignore */ +- (void)setObjectValue:(CPImage)anImage +{ + var oldImage = [self objectValue]; + + if (oldImage === anImage) return; + + [super setObjectValue:anImage]; - var center = [CPNotificationCenter defaultCenter]; + var defaultCenter = [CPNotificationCenter defaultCenter]; - if (_image) - [center removeObserver:self name:CPImageDidLoadNotification object:_image]; + if (oldImage) + [defaultCenter removeObserver:self name:CPImageDidLoadNotification object:oldImage]; - _image = anImage; - _DOMImageElement.src = [anImage filename]; + var newImage = [self objectValue]; + +#if PLATFORM(DOM) + _DOMImageElement.src = newImage ? [newImage filename] : ""; +#endif - var size = [_image size]; + var size = [newImage size]; - if (size && size.width == -1 && size.height == -1) + if (size && size.width === -1 && size.height === -1) { - [center addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:_image]; - + [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage]; + +#if PLATFORM(DOM) _DOMImageElement.width = 0; _DOMImageElement.height = 0; - +#endif + [_shadowView setHidden:YES]; } else @@ -195,10 +205,12 @@ var LEFT_SHADOW_INSET = 3.0, _imageScaling = anImageScaling; +#if PLATFORM(DOM) if (_imageScaling == CPScaleToFit) { CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0); } +#endif [self tile]; } @@ -224,14 +236,18 @@ var LEFT_SHADOW_INSET = 3.0, */ - (void)hideOrDisplayContents { - if (!_image) + if (![self image]) { +#if PLATFORM(DOM) _DOMImageElement.style.visibility = "hidden"; +#endif [_shadowView setHidden:YES]; } else { +#if PLATFORM(DOM) _DOMImageElement.style.visibility = "visible"; +#endif [_shadowView setHidden:NO]; } } @@ -249,10 +265,11 @@ var LEFT_SHADOW_INSET = 3.0, */ - (void)tile { - if (!_image) + if (![self image]) return; var bounds = [self bounds], + image = [self image], x = 0.0, y = 0.0, insetWidth = (_hasShadow ? HORIZONTAL_SHADOW_INSET : 0.0), @@ -264,12 +281,14 @@ var LEFT_SHADOW_INSET = 3.0, if (_imageScaling == CPScaleToFit) { +#if PLATFORM(DOM) _DOMImageElement.width = ROUND(width); _DOMImageElement.height = ROUND(height); +#endif } else { - var size = [_image size]; + var size = [image size]; if (size.width == -1 && size.height == -1) return; @@ -293,9 +312,11 @@ var LEFT_SHADOW_INSET = 3.0, else height = width / imageRatio; } - + +#if PLATFORM(DOM) _DOMImageElement.width = ROUND(width); _DOMImageElement.height = ROUND(height); +#endif } else { @@ -305,13 +326,15 @@ var LEFT_SHADOW_INSET = 3.0, if (_imageScaling == CPScaleNone) { +#if PLATFORM(DOM) _DOMImageElement.width = ROUND(size.width); _DOMImageElement.height = ROUND(size.height); +#endif } var x = (boundsWidth - width) / 2.0, y = (boundsHeight - height) / 2.0; - + CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y); } @@ -336,20 +359,22 @@ var CPImageViewImageKey = @"CPImageViewImageKey", */ - (id)initWithCoder:(CPCoder)aCoder { +#if PLATFORM(DOM) + _DOMImageElement = document.createElement("img"); + _DOMImageElement.style.position = "absolute"; + _DOMImageElement.style.left = "0px"; + _DOMImageElement.style.top = "0px"; + _DOMImageElement.style.visibility = "hidden"; +#endif + self = [super initWithCoder:aCoder]; if (self) { - _DOMImageElement = document.createElement("img"); - _DOMImageElement.style.position = "absolute"; - _DOMImageElement.style.left = "0px"; - _DOMImageElement.style.top = "0px"; - +#if PLATFORM(DOM) _DOMElement.appendChild(_DOMImageElement); - _DOMImageElement.style.visibility = "hidden"; - - [self setImage:[aCoder decodeObjectForKey:CPImageViewImageKey]]; - +#endif + [self setImageScaling:[aCoder decodeIntForKey:CPImageViewImageScalingKey]]; [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]]; @@ -381,8 +406,6 @@ var CPImageViewImageKey = @"CPImageViewImageKey", if (_shadowView) _subviews = actualSubviews; - [aCoder encodeObject:_image forKey:CPImageViewImageKey]; - [aCoder encodeInt:_imageScaling forKey:CPImageViewImageScalingKey]; [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey]; } AppKit/CPImageView.j @@ -25,6 +25,7 @@ @import <Foundation/CPURLRequest.j> @import "_CPCibCustomObject.j" +@import "_CPCibCustomResource.j" @import "_CPCibCustomView.j" @import "_CPCibKeyedUnarchiver.j" @import "_CPCibObjectData.j" @@ -38,7 +39,8 @@ var CPCibObjectDataKey = @"CPCibObjectDataKey"; @implementation CPCib : CPObject { - CPData _data; + CPData _data; + CPBundle _bundle; } - (id)initWithContentsOfURL:(CPURL)aURL @@ -51,9 +53,21 @@ var CPCibObjectDataKey = @"CPCibObjectDataKey"; return self; } -- (BOOL)instantiateCibWithExternalNameTable:(CPDictionary)anExternalNameTable +- (id)initWithCibNamed:(CPString)aName bundle:(CPBundle)aBundle { - var unarchiver = [[_CPCibKeyedUnarchiver alloc] initForReadingWithData:_data], + self = [self initWithContentsOfURL:aName]; + + if (self) + { + _bundle = aBundle; + } + + return self; +} + +- (BOOL)instantiateCibWithExternalNameTable:(CPDictionary)anExternalNameTable +{ + var unarchiver = [[_CPCibKeyedUnarchiver alloc] initForReadingWithData:_data bundle:_bundle], objectData = [unarchiver decodeObjectForKey:CPCibObjectDataKey]; if (!objectData || ![objectData isKindOfClass:[_CPCibObjectData class]]) AppKit/Cib/CPCib.j @@ -46,8 +46,12 @@ var _CPCibCustomViewClassNameKey = @"_CPCibCustomViewClassNameKey"; self = [super initWithCoder:aCoder]; if (self) + { _className = [aCoder decodeObjectForKey:_CPCibCustomViewClassNameKey]; - + + [self setBackgroundColor:[CPColor blueColor]]; + } + return self; } @@ -70,6 +74,10 @@ var _CPCibCustomViewClassNameKey = @"_CPCibCustomViewClassNameKey"; theClass = [CPView class]; } + + // Hey this is us! + if (theClass === [self class]) + return self; var view = [[theClass alloc] initWithFrame:[self frame]]; AppKit/Cib/_CPCibCustomView.j @@ -4,18 +4,28 @@ @implementation _CPCibKeyedUnarchiver : CPKeyedUnarchiver { + CPBundle _bundle; } -- (id)initForReadingWithData:(CPData)data +- (id)initForReadingWithData:(CPData)data bundle:(CPBundle)aBundle { self = [super initForReadingWithData:data]; if (self) + { + _bundle = aBundle; + [self setDelegate:self]; + } return self; } +- (CPBundle)bundle +{ + return _bundle; +} + - (id)unarchiver:(CPKeyedUnarchiver)aKeyedUnarchiver didDecodeObject:(id)anObject { if ([anObject respondsToSelector:@selector(_cibInstantiate)]) AppKit/Cib/_CPCibKeyedUnarchiver.j @@ -261,7 +261,7 @@ { if (self.__address == nil) self.__address = _objj_generateObjectHash(); - + return self.__address; } @@ -800,7 +800,7 @@ if (i != count - 1) description += ", "; } - + return description + ')'; } @@ -1183,7 +1183,7 @@ - (id)initWithCoder:(CPCoder)aCoder { - return [aCoder _decodeArrayOfObjectsForKey:@"CP.objects"]; + return [aCoder decodeObjectForKey:@"CP.objects"]; } - (void)encodeWithCoder:(CPCoder)aCoder Foundation/CPArray.j @@ -181,26 +181,6 @@ var _CPKeyedUnarchiverArrayClass = Ni } /* @ignore */ -- (id)_decodeArrayOfObjectsForKey:(CPString)aKey -{ - var object = [_plistObject objectForKey:aKey]; - - if ([object isKindOfClass:_CPKeyedUnarchiverArrayClass]) - { - var index = 0, - count = object.length, - array = []; - - for (; index < count; ++index) - array[index] = _CPKeyedUnarchiverDecodeObjectAtIndex(self, [object[index] objectForKey:_CPKeyedArchiverUIDKey]); - - return array; - } - - return nil; -} - -/* @ignore */ - (void)_decodeDictionaryOfObjectsForKey:(CPString)aKey { var object = [_plistObject objectForKey:aKey]; @@ -313,13 +293,26 @@ var _CPKeyedUnarchiverArrayClass = Ni - (id)decodeObjectForKey:(CPString)aKey { var object = [_plistObject objectForKey:aKey]; - + if ([object isKindOfClass:_CPKeyedUnarchiverDictionaryClass]) return _CPKeyedUnarchiverDecodeObjectAtIndex(self, [object objectForKey:_CPKeyedArchiverUIDKey]); + else if ([object isKindOfClass:[CPNumber class]] || [object isKindOfClass:[CPData class]]) return object; + + else if ([object isKindOfClass:_CPKeyedUnarchiverArrayClass]) + { + var index = 0, + count = object.length, + array = []; + + for (; index < count; ++index) + array[index] = _CPKeyedUnarchiverDecodeObjectAtIndex(self, [object[index] objectForKey:_CPKeyedArchiverUIDKey]); + + return array; + } /* else - alert([object className] + " " + object + " " + aKey + " " + [_plistObject description]);*/ + CPLog([object className] + " " + object + " " + aKey + " " + [_plistObject description]);*/ return nil; } Foundation/CPKeyedUnarchiver.j @@ -101,12 +101,14 @@ Initializes a newly allocated set with the objects that are contained in a given array. @param array An array of objects to add to the new set. If the same object appears more than once in array, it is represented only once in the returned set. */ -- (id)initWithArray:(CPArray)array +- (id)initWithArray:(CPArray)anArray { if (self = [self init]) { - for (var i = 0; i<array.length; i++) - [self addObject:array[i]]; + var count = anArray.length; + + while (count--) + [self addObject:anArray[count]]; } return self; @@ -414,6 +416,21 @@ @end +var CPSetObjectsKey = @"CPSetObjectsKey"; + +@implementation CPSet (CPCoding) + +- (id)initWithCoder:(CPCoder)aCoder +{ + return [[CPSet alloc] initWithArray:[aCoder decodeObjectForKey:CPSetObjectsKey]]; +} + +- (void)encodeWithCoder:(CPCoder)aCoder +{ + [aCoder encodeObject:[self allObjects] forKey:CPSetObjectsKey]; +} + +@end @implementation CPMutableSet : CPSet @end Foundation/CPSet.j @@ -27,9 +27,11 @@ @import "NSColorWell.j" @import "NSControl.j" @import "NSCustomObject.j" +@import "NSCustomResource.j" @import "NSCustomView.j" @import "NSFont.j" @import "NSIBObjectData.j" +@import "NSImageView.j" @import "NSMenu.j" @import "NSMenuItem.j" @import "NSNibConnector.j" @@ -37,6 +39,7 @@ @import "NSResponder.j" @import "NSScrollView.j" @import "NSScroller.j" +@import "NSSet.j" @import "NSSegmentedControl.j" @import "NSSlider.j" @import "NSSplitView.j" @@ -51,15 +54,16 @@ function CP_NSMapClassName(aClassName) { - switch (aClassName) + if (aClassName.indexOf("NS") === 0) { - case @"NSApplication": return @"CPApplication"; - case @"NSObject": return @"CPObject"; - case @"NSPanel": return @"CPPanel"; - case @"NSView": return @"CPView"; - case @"NSWindow": return @"CPWindow"; + var mappedClassName = @"CP" + aClassName.substr(2); - default: CPLog.warn("No class name mapping for \"" + aClassName + "\""); + if (window[mappedClassName]) + { + CPLog.warn("Mapping " + aClassName + " to " + mappedClassName); + + return mappedClassName; + } } return aClassName; Tools/nib2cib/NSAppKit.j @@ -29,7 +29,7 @@ - (id)initWithCoder:(CPCoder)aCoder { - return [aCoder _decodeArrayOfObjectsForKey:@"NS.objects"]; + return [aCoder decodeObjectForKey:@"NS.objects"]; } @end @@ -37,4 +37,4 @@ @implementation NSMutableArray : NSArray { } -@end \ No newline at end of file +@end Tools/nib2cib/NSArray.j 0af841cfd4c89c76778a984fe3c0f3e935f83800 Francisco Ryan Tolmasky I francisco@280north.com http://github.com/280north/cappuccino/commit/fb3c43ef6a64f630efd51f45ae118c39598003d7 fb3c43ef6a64f630efd51f45ae118c39598003d7 2009-01-09T04:38:35-08:00 2009-01-09T04:38:35-08:00 Made CPImageView nib2cib compliant. Reviewed by me. 28b5ed914f4dde442e98364195626d3c0cf2e2c3 Francisco Ryan Tolmasky I francisco@280north.com