From: Michael J. Rubinsky Date: Sun, 7 Dec 2008 20:29:38 +0000 (-0500) Subject: * More UI tweaking X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4676279f73b1f6a48ced66ee5100e32b9dfaac8b;p=horde.git * More UI tweaking * Show the selected gallery's default image. --- 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 df43ae910..b3b6d4d8c 100644 Binary files a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib and b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib differ 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