Changeset 5178

Timestamp:

01/18/08 05:53:41 (6 months ago)

Author:

morris

Message:

Use IKImagePicker on 10.5

Files:

• WiredAdditions/trunk/WIImageViewWithImagePicker.h (modified) (1 diff)
• WiredAdditions/trunk/WIImageViewWithImagePicker.m (modified) (4 diffs)
• WiredAdditions/trunk/WiredAdditions.xcodeproj/project.pbxproj (modified) (4 diffs)

WiredAdditions/trunk/WIImageViewWithImagePicker.h

@@ -31 +31 @@
-        NSSize                                  _maxImageSize;
-        
-
+
+
-        id                                              _picker;
-}

WiredAdditions/trunk/WIImageViewWithImagePicker.m

@@ -124 +124 @@
-
-
+//
+//  IKPictureTaker.h
+//  ImageKit
+//
+//  Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
+//
+
+@interface IKPictureTaker : NSPanel {
+@private
+        void *__strong _ikReserved;
+}
+
++ (IKPictureTaker *) pictureTaker;
+- (NSInteger) runModal;
+- (void) beginPictureTakerWithDelegate:(id) delegate didEndSelector:(SEL) didEndSelector contextInfo:(void *) contextInfo; 
+- (void) beginPictureTakerSheetForWindow:(NSWindow *)aWindow withDelegate:(id) delegate didEndSelector:(SEL) didEndSelector contextInfo:(void *) contextInfo; 
+- (void) popUpRecentsMenuForView:(NSView *) aView withDelegate:(id) delegate didEndSelector:(SEL) didEndSelector contextInfo:(void *) contextInfo; 
+- (void) setInputImage:(NSImage *) image;
+- (NSImage*) inputImage;
+- (NSImage*) outputImage;
+- (void) setMirroring:(BOOL)b;
+- (BOOL) mirroring;
+
+@end
+
+extern NSString *const IKPictureTakerAllowsVideoCaptureKey;
+extern NSString *const IKPictureTakerAllowsFileChoosingKey;
+extern NSString *const IKPictureTakerShowRecentPictureKey;
+extern NSString *const IKPictureTakerUpdateRecentPictureKey;
+extern NSString *const IKPictureTakerAllowsEditingKey;
+extern NSString *const IKPictureTakerShowEffectsKey;
+extern NSString *const IKPictureTakerInformationalTextKey;
+extern NSString *const IKPictureTakerImageTransformsKey;
+extern NSString *const IKPictureTakerOutputImageMaxSizeKey;
+extern NSString *const IKPictureTakerCropAreaSizeKey;
+extern NSString *const IKPictureTakerShowAddressBookPictureKey;
+extern NSString *const IKPictureTakerShowEmptyPictureKey;
+
+
+
-@interface WIImageViewWithImagePicker(Private)
-
@@ -140 +180 @@
-        recentPictureClass = NSClassFromString(@"NSIPRecentPicture");
-        
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -159 +201 @@
-        NSPoint                 point;
-        
-
+
+
+
+
+
+
+
+
+
+
-                if(!_picker) {
-                        _picker = [[NSClassFromString(@"NSImagePickerController") sharedImagePickerControllerCreate:YES withTexturedWindow:NO] retain];
@@ -330 +381 @@
-#pragma mark -
-
+- (void) pictureTakerDidEnd:(id)picker returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+        if(returnCode == NSOKButton) {
+                [self setImage:[picker outputImage]];
+                
+                [[self target] performSelector:[self action] withObject:self];
+        }
+}
+
+
+
+#pragma mark -
+
-- (void)imagePicker:(id)imagePicker selectedImage:(NSImage *)image {
-        NSIPRecentPicture       *recentPicture;

WiredAdditions/trunk/WiredAdditions.xcodeproj/project.pbxproj

@@ -183 +183 @@
-                A54E10FD0C0799C300EF5FBF /* WIImageViewWithImagePicker.m in Sources */ = {isa = PBXBuildFile; fileRef = A54E10FB0C0799C300EF5FBF /* WIImageViewWithImagePicker.m */; };
-                A54E11160C079A3900EF5FBF /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A54E11150C079A3900EF5FBF /* AddressBook.framework */; };
+                A5604A060D4069060080EA07 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5604A050D4069060080EA07 /* Quartz.framework */; };
-                A569E7FC0CCBFB740046F90E /* NSBezierPath-WIAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = A569E7FA0CCBFB740046F90E /* NSBezierPath-WIAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                A569E7FD0CCBFB740046F90E /* NSBezierPath-WIAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A569E7FB0CCBFB740046F90E /* NSBezierPath-WIAdditions.m */; };
@@ -393 +394 @@
-                A54E10FB0C0799C300EF5FBF /* WIImageViewWithImagePicker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WIImageViewWithImagePicker.m; sourceTree = "<group>"; };
-                A54E11150C079A3900EF5FBF /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = /System/Library/Frameworks/AddressBook.framework; sourceTree = "<absolute>"; };
+                A5604A050D4069060080EA07 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
-                A56288F1097ED2BD00F34C4C /* wired */ = {isa = PBXFileReference; lastKnownFileType = folder; path = wired; sourceTree = BUILT_PRODUCTS_DIR; };
-                A56443710A261F1C00ADF4F5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Japanese; path = WiredAdditions/Japanese.lproj/ReleaseNotes.nib; sourceTree = "<group>"; };
@@ -443 +445 @@
-                                8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
-                                7724739A09DD82E30010335B /* ExceptionHandling.framework in Frameworks */,
+                                A5604A060D4069060080EA07 /* Quartz.framework in Frameworks */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -463 +466 @@
-                        isa = PBXGroup;
-                        children = (
+                                A5604A050D4069060080EA07 /* Quartz.framework */,
-                                774896E40CC8A5BF00E95A83 /* Wired Additions */,
-                                774896E70CC8A5CC00E95A83 /* Wired Networking */,