@@ -70,7 +70,9 @@ var LEFT_SHADOW_INSET = 3.0, BOOL _hasShadow; CPView _shadowView; - + + BOOL _isEditable; + CGRect _imageRect; } @@ -339,11 +341,47 @@ var LEFT_SHADOW_INSET = 3.0, [[self nextResponder] mouseDown:anEvent]; } +- (void)setEditable:(BOOL)shouldBeEditable +{ + if (_isEditable === shouldBeEditable) + return _isEditable; + + _isEditable = shouldBeEditable; + + if (_isEditable) + [self registerForDraggedTypes:[CPImagesPboardType]]; + + else + { + var draggedTypes = [self registeredDraggedTypes]; + + [self unregisterDraggedTypes]; + + [draggedTypes removeObjectIdenticalTo:CPImagesPboardType]; + + [self registerForDraggedTypes:draggedTypes]; + } +} + +- (BOOL)isEditable +{ + return _isEditable; +} + +- (void)performDragOperation:(CPDraggingInfo)aSender +{ + var images = [CPKeyedUnarchiver unarchiveObjectWithData:[[aSender draggingPasteboard] dataForType:CPImagesPboardType]]; + + if ([images count]) + [self setImage:images[0]]; +} + @end var CPImageViewImageKey = @"CPImageViewImageKey", CPImageViewImageScalingKey = @"CPImageViewImageScalingKey", - CPImageViewHasShadowKey = @"CPImageViewHasShadowKey"; + CPImageViewHasShadowKey = @"CPImageViewHasShadowKey", + CPImageViewIsEditableKey = @"CPImageViewIsEditableKey"; @implementation CPImageView (CPCoding) @@ -372,6 +410,9 @@ var CPImageViewImageKey = @"CPImageViewImageKey", [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]]; + if ([aCoder decodeBoolForKey:CPImageViewIsEditableKey] || NO) + [self setEditable:YES]; + [self setNeedsLayout]; [self setNeedsDisplay:YES]; } @@ -402,6 +443,9 @@ var CPImageViewImageKey = @"CPImageViewImageKey", _subviews = actualSubviews; [aCoder encodeBool:_hasShadow forKey:CPImageViewHasShadowKey]; + + if (_isEditable) + [aCoder encodeBool:_isEditable forKey:CPImageViewIsEditableKey]; } @end AppKit/CPImageView.j @@ -38,8 +38,12 @@ CPFontPboardType = @"CPFontPboardType"; CPHTMLPboardType = @"CPHTMLPboardType"; CPStringPboardType = @"CPStringPboardType"; CPURLPboardType = @"CPURLPboardType"; +CPImagesPboardType = @"CPImagesPboardType"; +CPVideosPboardType = @"CPVideosPboardType"; + +// Deprecated CPImagePboardType = @"CPImagePboardType"; -CPVideoPboardType = @"CPVideoPboardType"; + var CPPasteboards = nil; AppKit/CPPasteboard.j @@ -1465,7 +1465,7 @@ setBoundsOrigin: */ - (void)registerForDraggedTypes:(CPArray)pasteboardTypes { - if (!pasteboardTypes) + if (!pasteboardTypes || ![pasteboardTypes count]) return; var theWindow = [self window]; AppKit/CPView.j @@ -545,6 +545,8 @@ module ObjectiveJ list.each do |fileName| + fileName = File.expand_path(fileName) + File.open(fileName) do |file| if fileName.index(platform_absolute_path) == 0 Tools/Rake/lib/objective-j/bundletask.rb @@ -34,6 +34,7 @@ var cell = [aCoder decodeObjectForKey:@"NSCell"]; _imageScaling = [cell imageScaling]; + _isEditable = [cell isEditable]; } return self; Tools/nib2cib/NSImageView.j 6cab77e005333413f3c6c31e0835c29df8fc3723 Francisco Ryan Tolmasky I francisco@280north.com http://github.com/280north/cappuccino/commit/eab4f4bf780e8d07d82a711f822f8bf70cc18899 eab4f4bf780e8d07d82a711f822f8bf70cc18899 2009-06-09T15:36:53-07:00 2009-06-09T15:36:53-07:00 Made CPImageView accept image drag and drop. Reviewed by me. ed3aa024b31b12d8c311a160a890f4fc77f04df6 Francisco Ryan Tolmasky I francisco@280north.com