From 4676279f73b1f6a48ced66ee5100e32b9dfaac8b Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Sun, 7 Dec 2008 15:29:38 -0500 Subject: [PATCH] * More UI tweaking * Show the selected gallery's default image. --- iPhoto2Ansel/AnselExportController.h | 2 + iPhoto2Ansel/AnselExportController.m | 5 +- iPhoto2Ansel/English.lproj/Panel.nib/classes.nib | 2 + iPhoto2Ansel/English.lproj/Panel.nib/info.nib | 2 +- .../English.lproj/Panel.nib/keyedobjects.nib | Bin 14870 -> 14435 bytes iPhoto2Ansel/TURAnsel.m | 7 --- iPhoto2Ansel/TURAnselGallery.h | 11 ++-- iPhoto2Ansel/TURAnselGallery.m | 59 +++++++++++---------- 8 files changed, 44 insertions(+), 44 deletions(-) diff --git a/iPhoto2Ansel/AnselExportController.h b/iPhoto2Ansel/AnselExportController.h index 92f8abdcd..56cf0ebd5 100644 --- a/iPhoto2Ansel/AnselExportController.h +++ b/iPhoto2Ansel/AnselExportController.h @@ -34,6 +34,8 @@ IBOutlet NSButton *newGalleryButton; IBOutlet NSProgressIndicator *spinner; IBOutlet NSWindow *newGallerySheet; + IBOutlet NSImageView *defaultImageView; + // New Gallery Panel IBOutlet NSTextField *galleryNameTextField; diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m index 31d899042..45983276e 100644 --- a/iPhoto2Ansel/AnselExportController.m +++ b/iPhoto2Ansel/AnselExportController.m @@ -7,7 +7,6 @@ // #import "TURAnsel.h"; #import "TURAnselGallery.h"; -#import "TURNewGalleryController.h"; #import "AnselExportController.h"; #import "FBProgressController.h"; #import "ImageResizer.h"; @@ -483,8 +482,10 @@ [currentGallery setDelegate:nil]; [currentGallery autorelease]; currentGallery = [[anselController getGalleryByIndex:row] retain]; - NSLog(@"The selected gallery: %@", currentGallery); [currentGallery setDelegate: self]; + NSImage *theImage = [[NSImage alloc] initWithContentsOfURL: [currentGallery galleryDefaultImageURL]]; + [defaultImageView setImage: theImage]; + [theImage release]; [self canExport]; } diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib b/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib index f670f8ea0..38b98a848 100644 --- a/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib +++ b/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib @@ -41,6 +41,8 @@ NSButton connectedLabel NSTextField + defaultImageView + NSImageView firstView NSControl galleryCombo diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/info.nib b/iPhoto2Ansel/English.lproj/Panel.nib/info.nib index d55a3324a..63f50dec8 100644 --- a/iPhoto2Ansel/English.lproj/Panel.nib/info.nib +++ b/iPhoto2Ansel/English.lproj/Panel.nib/info.nib @@ -10,7 +10,7 @@ 5 IBOpenObjects - 6 + 137 IBSystem Version 9F33 diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib index df43ae9109fae9b6867d3f06acb3d06df1c58cd9..b3b6d4d8c0a618c21d1a5d2c51e826100e7f75d9 100644 GIT binary patch literal 14435 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

4JJmg-ohTI2+b3b{2JV@H$yAIa< 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 Zb;|3W*IPMOVHo8v|Bmvv^>^Oz{{dK=sPF&) diff --git a/iPhoto2Ansel/TURAnsel.m b/iPhoto2Ansel/TURAnsel.m index 7c11fbe74..6789026a4 100644 --- a/iPhoto2Ansel/TURAnsel.m +++ b/iPhoto2Ansel/TURAnsel.m @@ -86,13 +86,6 @@ static NSString *ERR_DOMAIN = @"com.theupstairsroom.TURAnsel"; // and default perms etc... - (NSDictionary *)createNewGallery: (NSDictionary *)params { - NSLog(@"Calling createNewGallery"); - NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init]; -// [attributes setValue: [params valueForKey: @"name"] forKey: @"name"]; -// [attributes setValue: [params valueForKey: @"desc"] forKey: @"desc"]; -// [attributes setValue: [params valueForKey: @"slug"] forKey: @"slug"]; -// [attributes setValue: [params valueForKey - NSArray *apiparams = [NSArray arrayWithObjects: @"ansel", params, nil]; XMLRPCResponse *response = [self callRPCMethod: @"images.createGallery" diff --git a/iPhoto2Ansel/TURAnselGallery.h b/iPhoto2Ansel/TURAnselGallery.h index 656dc55ae..c83715a4c 100644 --- a/iPhoto2Ansel/TURAnselGallery.h +++ b/iPhoto2Ansel/TURAnselGallery.h @@ -18,7 +18,6 @@ typedef enum { @interface NSObject (TURAnselGalleryDelegate) - (void)TURAnselGalleryDidReceiveRPCResponse: (XMLRPCResponse *)response; - (void)TURAnselGalleryDidUploadImage: (TURAnselGallery *)gallery; -- (void)TURAnselGalleryDidReceiveDefaultURL: (TURAnselGallery *)gallery; @end @interface TURAnselGallery : NSObject { @@ -36,17 +35,17 @@ typedef enum { @property (readonly) NSString *galleryDescription; @property (readonly) int galleryImageCount; @property (readwrite) int galleryDefaultImage; -@property (readonly, retain) NSURL *galleryDefaultImageURL; - (id)initWithObject:(id)galleryData controller:(TURAnsel * )controller; -- (int)galleryId; -- (void)requestDefaultImageURL; -- (void)parseImageUrlRequest:(XMLRPCResponse *)response; - (void)uploadImageObject: (NSDictionary *)imageParameters; +- (bool)isBusy; + +// Getter / Setter - (void)setDelegate: (id)newDelegate; - (id)delegate; +- (NSURL *)galleryDefaultImageURL; +- (int)galleryId; - (TURAnselGalleryState) state; - (void)setState: (TURAnselGalleryState)theState; -- (bool)isBusy; - (void)setAnselController:(TURAnsel *)newController; @end \ No newline at end of file diff --git a/iPhoto2Ansel/TURAnselGallery.m b/iPhoto2Ansel/TURAnselGallery.m index 33fc03076..49d03765a 100644 --- a/iPhoto2Ansel/TURAnselGallery.m +++ b/iPhoto2Ansel/TURAnselGallery.m @@ -21,7 +21,6 @@ @synthesize galleryName; @synthesize galleryImageCount; @synthesize galleryDefaultImage; -@synthesize galleryDefaultImageURL; #pragma mark Instance Methods -------------------------------------------------- @@ -53,20 +52,27 @@ * This tells the anselController to send the request and sets this object up * as the delegate to receive the results. */ -- (void)requestDefaultImageURL +- (NSURL *)galleryDefaultImageURL { + if (!galleryDefaultImageURL) { -// NSArray *params = [[NSArray alloc] initWithObjects: -// @"ansel", // Scope -// [NSNumber numberWithInt: galleryDefaultImage], // Image Id -// @"thumb", // Thumbnail type -// [NSNumber numberWithBool:YES], // Full path -// nil]; -// [self setState:TURAnselGalleryStateBusy]; -// [anselController callRPCMethod:@"images.getImageUrl" -// withParams: params -// withDelegate: self]; + NSArray *params = [[NSArray alloc] initWithObjects: + @"ansel", // Scope + [NSNumber numberWithInt: galleryDefaultImage], // Image Id + @"thumb", // Thumbnail type + [NSNumber numberWithBool:YES], // Full path + nil]; + + [self setState:TURAnselGalleryStateBusy]; + XMLRPCResponse *response = [anselController callRPCMethod: @"images.getImageUrl" + withParams: params]; + + if (response) { + galleryDefaultImageURL = [[NSURL URLWithString: [NSString stringWithFormat:@"%@", response]] retain]; + } + } + return galleryDefaultImageURL; } /** @@ -87,22 +93,19 @@ } #pragma mark Response parsers called from the delegate method ------------------ -/** - * Called by the XMLRPCConnection delegate to parse the resposne - */ -- (void)parseImageUrlRequest: (XMLRPCResponse *)response -{ - [self setState:TURAnselGalleryStateReady]; - NSLog(@"Image URL For Gallery Preview: %@",[response responseObject]); - NSString *url = [NSString stringWithFormat:@"%@", [response responseObject]]; - NSURL *imageURL = [NSURL URLWithString:url]; - galleryDefaultImageURL = [imageURL retain]; - - if ([delegate respondsToSelector:@selector(TURAnselGalleryDidReceiveDefaultURL:)]) { - [delegate TURAnselGalleryDidReceiveDefaultURL: self]; - } - -} +//- (void)parseImageUrlRequest: (XMLRPCResponse *)response +//{ +// [self setState:TURAnselGalleryStateReady]; +// NSLog(@"Image URL For Gallery Preview: %@",[response responseObject]); +// NSString *url = [NSString stringWithFormat:@"%@", [response responseObject]]; +// NSURL *imageURL = [NSURL URLWithString:url]; +// galleryDefaultImageURL = [imageURL retain]; +// +// if ([delegate respondsToSelector:@selector(TURAnselGalleryDidReceiveDefaultURL:)]) { +// [delegate TURAnselGalleryDidReceiveDefaultURL: self]; +// } +// +//} #pragma mark Getter/Setter------------------------------------------------------ - (int)galleryId -- 2.11.0