LICENSE @@ -1128,38 +1128,10 @@ <object class="NSCustomView" id="260292442"> <reference key="NSNextResponder" ref="439893737"/> <int key="NSvFlags">310</int> - <string key="NSFrame">{{0, 20}, {623, 229}}</string> + <string key="NSFrameSize">{623, 249}</string> <reference key="NSSuperview" ref="439893737"/> <string key="NSClassName">MBCoverFlowView</string> </object> - <object class="NSButton" id="184616755"> - <reference key="NSNextResponder" ref="439893737"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{6, 0}, {33, 19}}</string> - <reference key="NSSuperview" ref="439893737"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="18111438"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Round Rect Button</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.200000e+01</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="184616755"/> - <int key="NSButtonFlags">-2033958657</int> - <int key="NSButtonFlags2">164</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSAddTemplate</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - </object> - </object> </object> <string key="NSFrameSize">{623, 249}</string> <reference key="NSSuperview"/> @@ -1713,14 +1685,6 @@ </object> <int key="connectionID">452</int> </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">addItem:</string> - <reference key="source" ref="593156221"/> - <reference key="destination" ref="184616755"/> - </object> - <int key="connectionID">455</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -2308,7 +2272,6 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="260292442"/> - <reference ref="184616755"/> </object> <reference key="parent" ref="972006081"/> </object> @@ -2632,20 +2595,6 @@ <reference key="object" ref="593156221"/> <reference key="parent" ref="1049"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">453</int> - <reference key="object" ref="184616755"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="18111438"/> - </object> - <reference key="parent" ref="439893737"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">454</int> - <reference key="object" ref="18111438"/> - <reference key="parent" ref="184616755"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -2840,8 +2789,6 @@ <string>420.IBPluginDependency</string> <string>450.IBPluginDependency</string> <string>451.IBPluginDependency</string> - <string>453.IBPluginDependency</string> - <string>454.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>5.ImportedFromIB2</string> <string>56.IBPluginDependency</string> @@ -3069,8 +3016,6 @@ <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> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> @@ -3143,10 +3088,6 @@ <object class="IBPartialClassDescription"> <string key="className">MBCoverFlowViewController</string> <string key="superclassName">NSViewController</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">addItem:</string> - <string key="NS.object.0">id</string> - </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">MBCoverFlowViewController.h</string> English.lproj/MainMenu.xib @@ -413,7 +413,9 @@ static NSString *MBCoverFlowViewSelectionIndexContext; for (NSObject *object in itemsToAdd) { CALayer *layer = [self _newLayer]; [layer setValue:object forKey:@"representedObject"]; - [object addObserver:self forKeyPath:self.imageKeyPath options:0 context:&MBCoverFlowViewImagePathContext]; + if (self.imageKeyPath) { + [object addObserver:self forKeyPath:self.imageKeyPath options:0 context:&MBCoverFlowViewImagePathContext]; + } [self _refreshLayer:layer]; } @@ -422,7 +424,9 @@ static NSString *MBCoverFlowViewSelectionIndexContext; [itemsToRemove removeObjectsInArray:self.content]; for (NSObject *object in itemsToRemove) { CALayer *layer = [self _layerForObject:object]; - [[layer valueForKey:@"representedObject"] removeObserver:self forKeyPath:self.imageKeyPath]; + if (self.imageKeyPath) { + [[layer valueForKey:@"representedObject"] removeObserver:self forKeyPath:self.imageKeyPath]; + } [layer removeFromSuperlayer]; } @@ -438,13 +442,13 @@ static NSString *MBCoverFlowViewSelectionIndexContext; } - (void)setImageKeyPath:(NSString *)keyPath -{ - // Remove any observations for the existing key path - for (NSObject *object in self.content) { - [object removeObserver:self forKeyPath:self.imageKeyPath]; - } - +{ if (_imageKeyPath) { + // Remove any observations for the existing key path + for (NSObject *object in self.content) { + [object removeObserver:self forKeyPath:self.imageKeyPath]; + } + [_imageKeyPath release]; _imageKeyPath = nil; } @@ -455,7 +459,9 @@ static NSString *MBCoverFlowViewSelectionIndexContext; // Refresh all the layers with images at the new key path for (CALayer *layer in [_scrollLayer sublayers]) { - [[layer valueForKey:@"representedObject"] addObserver:self forKeyPath:self.imageKeyPath options:0 context:&MBCoverFlowViewImagePathContext]; + if (self.imageKeyPath) { + [[layer valueForKey:@"representedObject"] addObserver:self forKeyPath:self.imageKeyPath options:0 context:&MBCoverFlowViewImagePathContext]; + } [self _refreshLayer:layer]; } } MBCoverFlowView.m @@ -28,9 +28,7 @@ @interface MBCoverFlowViewController : NSViewController { - NSArray *items; + } -- (void)addItem:(id)sender; - @end MBCoverFlowViewController.h @@ -31,27 +31,7 @@ @implementation MBCoverFlowViewController - (void)awakeFromNib -{ - NSMutableArray *images = [NSMutableArray array]; - - NSString *file; - NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:@"/Users/matt/Pictures/Photo Booth"]; - - int count = 0; - while ((file = [dirEnum nextObject])) - { - NSImage *image = [[NSImage alloc] initWithContentsOfFile:[@"/Users/matt/Pictures/Photo Booth" stringByAppendingPathComponent:file]]; - if (image != nil) { - [image setName:file]; - [images addObject:image]; - } - [image release]; - - count++; - } - - items = [images copy]; - +{ NSViewController *labelViewController = [[NSViewController alloc] initWithNibName:nil bundle:nil]; NSTextField *label = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 10, 10)]; [label setBordered:NO]; @@ -73,24 +53,38 @@ [(MBCoverFlowView *)self.view setAccessoryController:labelViewController]; [labelViewController release]; + [(MBCoverFlowView *)self.view setImageKeyPath:@"image"]; [(MBCoverFlowView *)self.view setShowsScrollbar:YES]; + + [NSThread detachNewThreadSelector:@selector(loadImages) toTarget:self withObject:nil]; } -- (void)dealloc -{ - [items release]; - [super dealloc]; -} - -- (void)addItem:(id)sender +- (void)loadImages { - /*if ([items isEqualToArray:[(MBCoverFlowView *)self.view content]]) { - return; + NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; + NSMutableArray *images = [NSMutableArray array]; + + NSString *file; + NSDirectoryEnumerator *dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:@"/Library/Desktop Pictures/Nature"]; + + int count = 0; + while ((file = [dirEnum nextObject])) + { + NSImage *image = [[NSImage alloc] initWithContentsOfFile:[@"/Library/Desktop Pictures/Nature" stringByAppendingPathComponent:file]]; + if (image != nil) { + // Scale down the image -- CoreAnimation doesn't like huge images + [image setSize:NSMakeSize([image size].width/2, [image size].height/2)]; + NSDictionary *imageInfo = [NSDictionary dictionaryWithObjectsAndKeys:image, @"image", file, @"name", nil]; + [images addObject:imageInfo]; + } + [image release]; + + [(MBCoverFlowView *)self.view performSelectorOnMainThread:@selector(setContent:) withObject:images waitUntilDone:NO]; + + count++; } - NSArray *content = [items subarrayWithRange:NSMakeRange(0, [[(MBCoverFlowView *)self.view content] count]+1)]; - [(MBCoverFlowView *)self.view setContent:content];*/ - [(MBCoverFlowView *)self.view setContent:items]; + [pool release]; } @end MBCoverFlowViewController.m ce71fbe9acc1350c937885a6838859965f83a609 Matt Ball ball.matt@gmail.com http://github.com/mattball/MBCoverFlowView/commit/1981f29e8a38750a5c5bfe61156e6c3ac9dfefed 1981f29e8a38750a5c5bfe61156e6c3ac9dfefed 2009-04-29T13:10:14-07:00 2009-04-29T13:10:14-07:00 * Fix sample project * Include license file 5ac3e24381bc82a02777d4aedfe63a2db3e3a483 Matt Ball ball.matt@gmail.com