@@ -17,7 +17,7 @@ <key>CFBundleSignature</key> <string>zwily</string> <key>CFBundleVersion</key> - <string>0.66</string> + <string>0.67</string> <key>NSMainNibFile</key> <string>Panel.nib</string> <key>NSPrincipalClass</key> Info.plist @@ -400,6 +400,54 @@ <key>Split Forks</key> <true/> </dict> + <key>Plugins</key> + <dict> + <key>PluginsList</key> + <array> + <dict> + <key>Path</key> + <string>Introduction</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>ReadMe</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>License</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>Target</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>PackageSelection</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>Install</string> + <key>Type</key> + <integer>0</integer> + </dict> + <dict> + <key>Path</key> + <string>FinishUp</string> + <key>Type</key> + <integer>0</integer> + </dict> + </array> + </dict> <key>Scripts</key> <dict> <key>Additional Resources</key> @@ -468,13 +516,13 @@ <key>IFPkgDescriptionTitle</key> <string>iPhotoToGallery</string> <key>IFPkgDescriptionVersion</key> - <string>0.66</string> + <string>0.67</string> </dict> </dict> <key>Display Information</key> <dict> <key>CFBundleGetInfoString</key> - <string>iPhotoToGallery 0.66</string> + <string>iPhotoToGallery 0.67</string> <key>CFBundleIconFile</key> <string></string> <key>CFBundleIconFile Path Type</key> @@ -484,7 +532,7 @@ <key>CFBundleName</key> <string>iPhotoToGallery</string> <key>CFBundleShortVersionString</key> - <string>0.63</string> + <string>0.67</string> </dict> <key>Options</key> <dict> Packaging/iPhotoToGallery Installer/iPhotoToGallery Installer.packproj @@ -10,14 +10,14 @@ <array/> <key>IBOpenObjects</key> <array> - <integer>165</integer> <integer>182</integer> <integer>546</integer> - <integer>6</integer> - <integer>527</integer> + <integer>165</integer> <integer>204</integer> + <integer>527</integer> + <integer>6</integer> </array> <key>IBSystem Version</key> - <string>8I127</string> + <string>8R218</string> </dict> </plist> Resources/English.lproj/Panel.nib/info.nib Resources/English.lproj/Panel.nib/keyedobjects.nib @@ -67,6 +67,7 @@ - thumbnailPathAtIndex:(unsigned int)fp12; - imagePathAtIndex:(unsigned int)fp12; - imageCaptionAtIndex:(unsigned int)fp12; +- imageTitleAtIndex:(unsigned int)fp12; // added in iPhoto 7 - imageCommentsAtIndex:(unsigned int)fp12; // added in iPhoto 5 - (unsigned int)imageFormatAtIndex:(unsigned int)fp12; - (struct _NSSize)imageSizeAtIndex:(unsigned int)fp12; Source/iPhotoExporter.h @@ -209,6 +209,10 @@ static int loggingIn; return NO; } +- (char)handlesMovieFiles { + return NO; +} + - (NSString *)defaultDirectory { return [NSHomeDirectory() stringByAppendingPathComponent:@"Pictures"]; } @@ -307,10 +311,21 @@ static int loggingIn; // Get defaults for the Title and Description fields (thx Nathaniel Gray) NSString *currAlbum, *currComments = nil; - currAlbum = [exportManager albumName]; + if ([exportManager respondsToSelector:@selector(albumName)]) { + currAlbum = [exportManager albumName]; + if ([exportManager respondsToSelector:@selector(albumComments)]) + currComments = [exportManager albumComments]; + } + else if ([exportManager respondsToSelector:@selector(albumNameAtIndex:)]) { + // iPhoto 7 + if ([exportManager albumCount] > 0) { + currAlbum = [exportManager albumNameAtIndex:0]; + currComments = [exportManager albumCommentsAtIndex:0]; + } + } + + // Make these empty strings if they're nil currAlbum = currAlbum ? currAlbum : @""; - if ([exportManager respondsToSelector:@selector(albumComments)]) - currComments = [exportManager albumComments]; currComments = currComments ? currComments : @""; [albumSettingsPanel makeFirstResponder:albumSettingsTitleField]; @@ -859,7 +874,11 @@ static int loggingIn; return [exportManager imageDictionaryAtIndex:index]; NSMutableDictionary *imageDict = [NSMutableDictionary dictionary]; - if ([exportManager respondsToSelector:@selector(imageCaptionAtIndex:)]) + + // iPhoto7 changes this to imageTitleAtIndex (thx Jamie Neufeld) + if ([exportManager respondsToSelector:@selector(imageTitleAtIndex:)]) + [imageDict setObject:[exportManager imageTitleAtIndex:index] forKey:@"Caption"]; + else if ([exportManager respondsToSelector:@selector(imageCaptionAtIndex:)]) [imageDict setObject:[exportManager imageCaptionAtIndex:index] forKey:@"Caption"]; if ([exportManager respondsToSelector:@selector(imageCommentsAtIndex:)]) Source/iPhotoToGallery.m f99768b926b59604e19d12c77dd7cfa53a473d4d zwily zwily@49005c40-f3f4-0310-a958-d65eefcbef40 http://github.com/zwily/iphototogallery/commit/23f551b0f6d8a5e0c271124e98bee21eddd94a6f 23f551b0f6d8a5e0c271124e98bee21eddd94a6f 2008-05-03T09:01:47-07:00 2007-09-06T07:40:41-07:00 update to work with iPhoto 7.0.2, bump to v0.67 523e28fd8798a031b4b3994a878f1d34e27966c5 Zach Wily zach@zwily.com