First round of initial support for Ansel version 2 API.

Adds support for indicating which version a server exposes, and fixes
api call for the listGalleries call.

diff --git a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h
index 16ed66b..3bbf920 100644 (file)
--- a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h
+++ b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h
@@ -58,6 +58,7 @@
     IBOutlet NSSecureTextField *mServerSheetPassword;
     IBOutlet NSTextField *mServerSheetServerNickName;
     IBOutlet NSButton *mMakeNewServerDefault;
+    IBOutlet NSPopUpButton *mAnselVersion;
     
     // Server list
     IBOutlet NSPanel *serverListPanel;
@@ -82,8 +83,6 @@
 }
 
 - (IBAction) showNewGallery: (id)sender;
-- (IBAction) doAddServer: (id)sender;
-- (IBAction) doCancelAddServer: (id)sender;
 - (IBAction) clickServer: (id)sender;
 - (IBAction) clickViewGallery: (id)sender;
 - (IBAction) closeGalleryView: (id)sender;
@@ -92,4 +91,8 @@
 - (IBAction) closeServerList: (id)sender;
 - (IBAction) removeServer: (id)sender;
 - (NSWindow *)window;
+
+// New Server View
+- (IBAction) doAddServer: (id)sender;
+- (IBAction) doCancelAddServer: (id)sender;
 @end
\ No newline at end of file

diff --git a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
index 7212b22..cef3bb4 100644 (file)
--- a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
+++ b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
@@ -36,6 +36,7 @@ NSString * const TURAnselServerNickKey = @"nickname";
 NSString * const TURAnselServerEndpointKey = @"endpoint";
 NSString * const TURAnselServerUsernameKey = @"username";
 NSString * const TURAnselServerPasswordKey = @"password";
+NSString * const TURAnselServerVersionKey = @"version";
 
 @implementation ApertureToAnselExportPlugin
 
@@ -538,6 +539,7 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
                                [mServerSheetHostURL stringValue], TURAnselServerEndpointKey,
                                [mServerSheetUsername stringValue], TURAnselServerUsernameKey,
                                [mServerSheetPassword stringValue], TURAnselServerPasswordKey,
+                               [NSNumber numberWithInt: [mAnselVersion indexOfSelectedItem] + 1] , TURAnselServerVersionKey,
                                nil];
     [_anselServers addObject: newServer];
     [NSApp endSheet: newServerSheet];
@@ -584,6 +586,7 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
             [self disconnect];
         }
         _currentServer = [[mServersPopUp selectedItem] representedObject];
+        NSLog(@"Current Server: %@", _currentServer);
         [self doConnect];
     }
 }
@@ -755,6 +758,11 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
        didEndSelector: nil
           contextInfo: nil];
     
+    // Populate the version popup
+    //[mAnselVersion addItemWithTitle:@"1.x"];
+    //[mAnselVersion addItemWithTitle:@"2.x"];
+    //[mAnselVersion setTitle:@"1.x"];
+    
     // Make sure these are cleared.
     [mServerSheetHostURL setStringValue: @""];
     [mServerSheetUsername setStringValue: @""];
@@ -786,8 +794,9 @@ objectValueForTableColumn:(NSTableColumn *)aTableColumn
                                                               [_currentServer objectForKey:TURAnselServerEndpointKey],
                                                               [_currentServer objectForKey:TURAnselServerUsernameKey],
                                                               [_currentServer objectForKey:TURAnselServerPasswordKey],
+                                                              [_currentServer objectForKey:TURAnselServerVersionKey],
                                                               nil]
-                                                    forKeys: [NSArray arrayWithObjects:@"endpoint", @"username", @"password", nil]];
+                                                    forKeys: [NSArray arrayWithObjects:TURAnselServerEndpointKey, TURAnselServerUsernameKey, TURAnselServerPasswordKey, TURAnselServerVersionKey, nil]];
     // Create our controller
     [_anselController autorelease];
     _anselController = [[TURAnsel alloc] initWithConnectionParameters:p];

diff --git a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/designable.nib b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/designable.nib
index 69a386a..c9f3f05 100644 (file)
--- a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/designable.nib
+++ b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/designable.nib
@@ -2,19 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">10B504</string>
-               <string key="IBDocument.InterfaceBuilderVersion">732</string>
-               <string key="IBDocument.AppKitVersion">1038.2</string>
-               <string key="IBDocument.HIToolboxVersion">437.00</string>
+               <string key="IBDocument.SystemVersion">10F569</string>
+               <string key="IBDocument.InterfaceBuilderVersion">762</string>
+               <string key="IBDocument.AppKitVersion">1038.29</string>
+               <string key="IBDocument.HIToolboxVersion">461.00</string>
                <dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="com.apple.InterfaceBuilder.CocoaPlugin">732</string>
+                       <string key="com.apple.InterfaceBuilder.CocoaPlugin">762</string>
                        <string key="com.apple.imagekit.ibplugin">1.1</string>
                </dictionary>
                <array class="NSMutableArray" key="IBDocument.EditedObjectIDs">
-                       <integer value="63"/>
-                       <integer value="176"/>
+                       <integer value="172"/>
                        <integer value="129"/>
-                       <integer value="153"/>
                </array>
                <array key="IBDocument.PluginDependencies">
                        <string>com.apple.imagekit.ibplugin</string>
@@ -32,7 +30,7 @@
                                <string key="NSClassName">NSApplication</string>
                        </object>
                        <object class="NSCustomView" id="1045929337">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">268</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="NSBox" id="1055334119">
@@ -115,11 +113,11 @@
                                                                                                                                <int key="NSKeyEquivModMask">1048576</int>
                                                                                                                                <int key="NSMnemonicLoc">2147483647</int>
                                                                                                                                <int key="NSState">1</int>
-                                                                                                                               <object class="NSCustomResource" key="NSOnImage">
+                                                                                                                               <object class="NSCustomResource" key="NSOnImage" id="930076676">
                                                                                                                                        <string key="NSClassName">NSImage</string>
                                                                                                                                        <string key="NSResourceName">NSMenuCheckmark</string>
                                                                                                                                </object>
-                                                                                                                               <object class="NSCustomResource" key="NSMixedImage">
+                                                                                                                               <object class="NSCustomResource" key="NSMixedImage" id="319096418">
                                                                                                                                        <string key="NSClassName">NSImage</string>
                                                                                                                                        <string key="NSResourceName">NSMenuMixedState</string>
                                                                                                                                </object>
@@ -447,13 +445,12 @@
                                        </object>
                                </array>
                                <string key="NSFrameSize">{528, 309}</string>
-                               <reference key="NSSuperview"/>
                                <string key="NSClassName">NSView</string>
                        </object>
                        <object class="NSWindowTemplate" id="686779824">
                                <int key="NSWindowStyleMask">23</int>
                                <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{196, 315}, {455, 195}}</string>
+                               <string key="NSWindowRect">{{196, 280}, {455, 230}}</string>
                                <int key="NSWTFlags">-1543503872</int>
                                <string key="NSWindowTitle">Add Server</string>
                                <string key="NSWindowClass">NSPanel</string>
@@ -466,7 +463,7 @@
                                                <object class="NSTextField" id="845086691">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{124, 124}, {311, 22}}</string>
+                                                       <string key="NSFrame">{{124, 159}, {311, 22}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="791018021">
@@ -488,7 +485,7 @@
                                                <object class="NSTextField" id="72046273">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 126}, {102, 17}}</string>
+                                                       <string key="NSFrame">{{17, 161}, {102, 17}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="775445119">
@@ -504,7 +501,7 @@
                                                <object class="NSTextField" id="488982721">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{124, 92}, {311, 22}}</string>
+                                                       <string key="NSFrame">{{124, 127}, {311, 22}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="109947810">
@@ -521,7 +518,7 @@
                                                <object class="NSSecureTextField" id="128187516">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{124, 60}, {311, 22}}</string>
+                                                       <string key="NSFrame">{{124, 95}, {311, 22}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSSecureTextFieldCell" key="NSCell" id="517947731">
@@ -541,7 +538,7 @@
                                                <object class="NSTextField" id="621894281">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 94}, {67, 17}}</string>
+                                                       <string key="NSFrame">{{17, 129}, {67, 17}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="884974678">
@@ -557,7 +554,7 @@
                                                <object class="NSTextField" id="563792434">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 62}, {67, 17}}</string>
+                                                       <string key="NSFrame">{{17, 97}, {67, 17}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="49221975">
@@ -573,7 +570,7 @@
                                                <object class="NSTextField" id="1997861">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{17, 158}, {102, 17}}</string>
+                                                       <string key="NSFrame">{{17, 193}, {102, 17}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="44034795">
@@ -589,7 +586,7 @@
                                                <object class="NSTextField" id="898429098">
                                                        <reference key="NSNextResponder" ref="542973235"/>
                                                        <int key="NSvFlags">268</int>
-                                                       <string key="NSFrame">{{124, 156}, {311, 22}}</string>
+                                                       <string key="NSFrame">{{124, 191}, {311, 22}}</string>
                                                        <reference key="NSSuperview" ref="542973235"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSTextFieldCell" key="NSCell" id="250306407">
@@ -643,8 +640,79 @@
                                                                <int key="NSPeriodicInterval">25</int>
                                                        </object>
                                                </object>
+                                               <object class="NSTextField" id="23042993">
+                                                       <reference key="NSNextResponder" ref="542973235"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 69}, {67, 17}}</string>
+                                                       <reference key="NSSuperview" ref="542973235"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="248878175">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Version</string>
+                                                               <reference key="NSSupport" ref="142744915"/>
+                                                               <reference key="NSControlView" ref="23042993"/>
+                                                               <reference key="NSBackgroundColor" ref="215005068"/>
+                                                               <reference key="NSTextColor" ref="821351576"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSPopUpButton" id="302065438">
+                                                       <reference key="NSNextResponder" ref="542973235"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{121, 63}, {100, 26}}</string>
+                                                       <reference key="NSSuperview" ref="542973235"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSPopUpButtonCell" key="NSCell" id="152176273">
+                                                               <int key="NSCellFlags">-2076049856</int>
+                                                               <int key="NSCellFlags2">2048</int>
+                                                               <reference key="NSSupport" ref="142744915"/>
+                                                               <reference key="NSControlView" ref="302065438"/>
+                                                               <int key="NSButtonFlags">109199615</int>
+                                                               <int key="NSButtonFlags2">129</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">400</int>
+                                                               <int key="NSPeriodicInterval">75</int>
+                                                               <object class="NSMenuItem" key="NSMenuItem" id="530059073">
+                                                                       <reference key="NSMenu" ref="957474166"/>
+                                                                       <string key="NSTitle">2.x</string>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <int key="NSState">1</int>
+                                                                       <reference key="NSOnImage" ref="930076676"/>
+                                                                       <reference key="NSMixedImage" ref="319096418"/>
+                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                       <reference key="NSTarget" ref="152176273"/>
+                                                               </object>
+                                                               <bool key="NSMenuItemRespectAlignment">YES</bool>
+                                                               <object class="NSMenu" key="NSMenu" id="957474166">
+                                                                       <string key="NSTitle">OtherViews</string>
+                                                                       <array class="NSMutableArray" key="NSMenuItems">
+                                                                               <object class="NSMenuItem" id="755760346">
+                                                                                       <reference key="NSMenu" ref="957474166"/>
+                                                                                       <string key="NSTitle">1.x</string>
+                                                                                       <string key="NSKeyEquiv"/>
+                                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                                       <reference key="NSOnImage" ref="930076676"/>
+                                                                                       <reference key="NSMixedImage" ref="319096418"/>
+                                                                                       <string key="NSAction">_popUpItemAction:</string>
+                                                                                       <reference key="NSTarget" ref="152176273"/>
+                                                                               </object>
+                                                                               <reference ref="530059073"/>
+                                                                       </array>
+                                                                       <reference key="NSMenuFont" ref="142744915"/>
+                                                               </object>
+                                                               <int key="NSSelectedIndex">1</int>
+                                                               <int key="NSPreferredEdge">1</int>
+                                                               <bool key="NSUsesItemFromMenu">YES</bool>
+                                                               <bool key="NSAltersState">YES</bool>
+                                                               <int key="NSArrowPosition">2</int>
+                                                       </object>
+                                               </object>
                                        </array>
-                                       <string key="NSFrameSize">{455, 195}</string>
+                                       <string key="NSFrameSize">{455, 230}</string>
                                        <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
@@ -668,6 +736,7 @@
                                                        <int key="NSvFlags">268</int>
                                                        <string key="NSFrame">{{568, 28}, {96, 28}}</string>
                                                        <reference key="NSSuperview" ref="422499065"/>
+                                                       <reference key="NSWindow"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="135144973">
                                                                <int key="NSCellFlags">67239424</int>
@@ -696,12 +765,14 @@
                                                                                        <int key="NSvFlags">256</int>
                                                                                        <string key="NSFrameSize">{626, 247}</string>
                                                                                        <reference key="NSSuperview" ref="350950733"/>
+                                                                                       <reference key="NSWindow"/>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSTableHeaderView" key="NSHeaderView" id="634671268">
                                                                                                <reference key="NSNextResponder" ref="32832525"/>
                                                                                                <int key="NSvFlags">256</int>
                                                                                                <string key="NSFrameSize">{626, 17}</string>
                                                                                                <reference key="NSSuperview" ref="32832525"/>
+                                                                                               <reference key="NSWindow"/>
                                                                                                <reference key="NSTableView" ref="45425682"/>
                                                                                        </object>
                                                                                        <object class="_NSCornerView" key="NSCornerView" id="473913936">
@@ -709,6 +780,7 @@
                                                                                                <int key="NSvFlags">256</int>
                                                                                                <string key="NSFrame">{{627, 0}, {16, 17}}</string>
                                                                                                <reference key="NSSuperview" ref="1019561963"/>
+                                                                                               <reference key="NSWindow"/>
                                                                                        </object>
                                                                                        <array class="NSMutableArray" key="NSTableColumns">
                                                                                                <object class="NSTableColumn" id="640630925">
@@ -823,6 +895,7 @@
                                                                        </array>
                                                                        <string key="NSFrame">{{1, 17}, {626, 247}}</string>
                                                                        <reference key="NSSuperview" ref="1019561963"/>
+                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="45425682"/>
                                                                        <reference key="NSDocView" ref="45425682"/>
                                                                        <reference key="NSBGColor" ref="104370459"/>
@@ -833,6 +906,7 @@
                                                                        <int key="NSvFlags">256</int>
                                                                        <string key="NSFrame">{{627, 17}, {15, 247}}</string>
                                                                        <reference key="NSSuperview" ref="1019561963"/>
+                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSTarget" ref="1019561963"/>
                                                                        <string key="NSAction">_doScroller:</string>
                                                                        <double key="NSCurValue">1</double>
@@ -843,6 +917,7 @@
                                                                        <int key="NSvFlags">256</int>
                                                                        <string key="NSFrame">{{1, 264}, {626, 15}}</string>
                                                                        <reference key="NSSuperview" ref="1019561963"/>
+                                                                       <reference key="NSWindow"/>
                                                                        <int key="NSsFlags">1</int>
                                                                        <reference key="NSTarget" ref="1019561963"/>
                                                                        <string key="NSAction">_doScroller:</string>
@@ -856,6 +931,7 @@
                                                                        </array>
                                                                        <string key="NSFrame">{{1, 0}, {626, 17}}</string>
                                                                        <reference key="NSSuperview" ref="1019561963"/>
+                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="634671268"/>
                                                                        <reference key="NSDocView" ref="634671268"/>
                                                                        <reference key="NSBGColor" ref="104370459"/>
@@ -865,6 +941,7 @@
                                                        </array>
                                                        <string key="NSFrame">{{20, 60}, {643, 280}}</string>
                                                        <reference key="NSSuperview" ref="422499065"/>
+                                                       <reference key="NSWindow"/>
                                                        <reference key="NSNextKeyView" ref="350950733"/>
                                                        <int key="NSsFlags">50</int>
                                                        <reference key="NSVScroller" ref="60726835"/>
@@ -879,6 +956,7 @@
                                                        <int key="NSvFlags">268</int>
                                                        <string key="NSFrame">{{15, 28}, {96, 28}}</string>
                                                        <reference key="NSSuperview" ref="422499065"/>
+                                                       <reference key="NSWindow"/>
                                                        <bool key="NSEnabled">YES</bool>
                                                        <object class="NSButtonCell" key="NSCell" id="210123153">
                                                                <int key="NSCellFlags">67239424</int>
@@ -897,6 +975,7 @@
                                        </array>
                                        <string key="NSFrameSize">{679, 358}</string>
                                        <reference key="NSSuperview"/>
+                                       <reference key="NSWindow"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
                                <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -944,7 +1023,7 @@
                                                                        <array class="NSMutableArray" key="NSSubviews">
                                                                                <object class="IKImageBrowserView" id="81548335">
                                                                                        <reference key="NSNextResponder" ref="533397876"/>
-                                                                                       <int key="NSvFlags">274</int>
+                                                                                       <int key="NSvFlags">18</int>
                                                                                        <set class="NSMutableSet" key="NSDragTypes">
                                                                                                <string>Apple PDF pasteboard type</string>
                                                                                                <string>Apple PICT pasteboard type</string>
@@ -1028,6 +1107,7 @@
                                                                                                <string>NSTypedFilenamesPboardType:SGI</string>
                                                                                                <string>NSTypedFilenamesPboardType:SR2</string>
                                                                                                <string>NSTypedFilenamesPboardType:SRF</string>
+                                                                                               <string>NSTypedFilenamesPboardType:SRW</string>
                                                                                                <string>NSTypedFilenamesPboardType:TARGA</string>
                                                                                                <string>NSTypedFilenamesPboardType:TGA</string>
                                                                                                <string>NSTypedFilenamesPboardType:TIF</string>
@@ -1090,6 +1170,7 @@
                                                                                                <string>NSTypedFilenamesPboardType:sgi</string>
                                                                                                <string>NSTypedFilenamesPboardType:sr2</string>
                                                                                                <string>NSTypedFilenamesPboardType:srf</string>
+                                                                                               <string>NSTypedFilenamesPboardType:srw</string>
                                                                                                <string>NSTypedFilenamesPboardType:targa</string>
                                                                                                <string>NSTypedFilenamesPboardType:tga</string>
                                                                                                <string>NSTypedFilenamesPboardType:tif</string>
@@ -1158,6 +1239,9 @@
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
                                <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
                        </object>
+                       <object class="NSCustomObject" id="488565481">
+                               <string key="NSClassName">ApertureToAnselExportPlugin</string>
+                       </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <array class="NSMutableArray" key="connectionRecords">
@@ -1385,6 +1469,22 @@
                                        </object>
                                        <int key="connectionID">373</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">mAnselVersion</string>
+                                               <reference key="source" ref="883705598"/>
+                                               <reference key="destination" ref="302065438"/>
+                                       </object>
+                                       <int key="connectionID">422</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">anselVersionClick:</string>
+                                               <reference key="source" ref="883705598"/>
+                                               <reference key="destination" ref="302065438"/>
+                                       </object>
+                                       <int key="connectionID">423</int>
+                               </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
@@ -1442,8 +1542,6 @@
                                                <int key="objectID">129</int>
                                                <reference key="object" ref="542973235"/>
                                                <array class="NSMutableArray" key="children">
-                                                       <reference ref="216999931"/>
-                                                       <reference ref="842490901"/>
                                                        <reference ref="898429098"/>
                                                        <reference ref="1997861"/>
                                                        <reference ref="563792434"/>
@@ -1452,6 +1550,10 @@
                                                        <reference ref="488982721"/>
                                                        <reference ref="72046273"/>
                                                        <reference ref="845086691"/>
+                                                       <reference ref="842490901"/>
+                                                       <reference ref="216999931"/>
+                                                       <reference ref="23042993"/>
+                                                       <reference ref="302065438"/>
                                                </array>
                                                <reference key="parent" ref="686779824"/>
                                        </object>
@@ -1922,14 +2024,67 @@
                                                <reference key="object" ref="923723079"/>
                                                <reference key="parent" ref="717639853"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">404</int>
+                                               <reference key="object" ref="23042993"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="248878175"/>
+                                               </array>
+                                               <reference key="parent" ref="542973235"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">405</int>
+                                               <reference key="object" ref="248878175"/>
+                                               <reference key="parent" ref="23042993"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">414</int>
+                                               <reference key="object" ref="488565481"/>
+                                               <reference key="parent" ref="0"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">416</int>
+                                               <reference key="object" ref="302065438"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="152176273"/>
+                                               </array>
+                                               <reference key="parent" ref="542973235"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">417</int>
+                                               <reference key="object" ref="152176273"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="957474166"/>
+                                               </array>
+                                               <reference key="parent" ref="302065438"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">418</int>
+                                               <reference key="object" ref="957474166"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="755760346"/>
+                                                       <reference ref="530059073"/>
+                                               </array>
+                                               <reference key="parent" ref="152176273"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">419</int>
+                                               <reference key="object" ref="755760346"/>
+                                               <reference key="parent" ref="957474166"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">420</int>
+                                               <reference key="object" ref="530059073"/>
+                                               <reference key="parent" ref="957474166"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
                                <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="-3.ImportedFromIB2"/>
-                               <string key="128.IBEditorWindowLastContentRect">{{63, 887}, {455, 195}}</string>
+                               <string key="128.IBEditorWindowLastContentRect">{{529, 852}, {455, 230}}</string>
                                <string key="128.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="128.IBWindowTemplateEditedContentRect">{{63, 887}, {455, 195}}</string>
+                               <string key="128.IBWindowTemplateEditedContentRect">{{529, 852}, {455, 230}}</string>
                                <boolean value="YES" key="128.ImportedFromIB2"/>
                                <string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="129.ImportedFromIB2"/>
@@ -1993,11 +2148,47 @@
                                <boolean value="YES" key="176.ImportedFromIB2"/>
                                <string key="303.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="303.ImportedFromIB2"/>
+                               <string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="377.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="378.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="379.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="380.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="381.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="385.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="386.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="387.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="388.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="389.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="390.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="391.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="392.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="393.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="394.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="396.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="397.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="398.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="399.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="399.IBShouldRemoveOnLegacySave"/>
+                               <string key="400.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="400.IBShouldRemoveOnLegacySave"/>
+                               <string key="401.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="401.IBShouldRemoveOnLegacySave"/>
+                               <string key="402.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="402.IBShouldRemoveOnLegacySave"/>
+                               <string key="403.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="403.IBShouldRemoveOnLegacySave"/>
+                               <string key="404.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="405.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="414.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="416.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="417.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="418.IBEditorWindowLastContentRect">{{639, 898}, {110, 43}}</string>
+                               <string key="418.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="420.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="61.IBEditorWindowLastContentRect">{{531, 790}, {528, 309}}</string>
                                <string key="61.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="YES" key="61.ImportedFromIB2"/>
@@ -2034,7 +2225,7 @@
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">403</int>
+                       <int key="maxID">423</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2042,6 +2233,7 @@
                                        <string key="className">ApertureToAnselExportPlugin</string>
                                        <string key="superclassName">NSObject</string>
                                        <dictionary class="NSMutableDictionary" key="actions">
+                                               <string key="clickAnselVersion:">id</string>
                                                <string key="clickServer:">id</string>
                                                <string key="clickViewGallery:">id</string>
                                                <string key="closeGalleryView:">id</string>
@@ -2049,30 +2241,6 @@
                                                <string key="doAddServer:">id</string>
                                                <string key="doCancelAddServer:">id</string>
                                                <string key="removeServer:">id</string>
-                                               <string key="showNewGallery:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="browserView">IKImageBrowserView</string>
-                                               <string key="closeGalleryView">NSButton</string>
-                                               <string key="defaultImageView">NSImageView</string>
-                                               <string key="firstView">NSView</string>
-                                               <string key="galleryCombo">NSComboBox</string>
-                                               <string key="lastView">NSView</string>
-                                               <string key="mMakeNewServerDefault">NSButton</string>
-                                               <string key="mNewGalleryButton">NSButton</string>
-                                               <string key="mServerSheetHostURL">NSTextField</string>
-                                               <string key="mServerSheetPassword">NSSecureTextField</string>
-                                               <string key="mServerSheetServerNickName">NSTextField</string>
-                                               <string key="mServerSheetUsername">NSTextField</string>
-                                               <string key="mServersPopUp">NSPopUpButton</string>
-                                               <string key="mviewGallerySheet">NSWindow</string>
-                                               <string key="newServerSheet">NSWindow</string>
-                                               <string key="serverListPanel">NSPanel</string>
-                                               <string key="serverTable">NSTableView</string>
-                                               <string key="settingsView">NSView</string>
-                                               <string key="spinner">NSProgressIndicator</string>
-                                               <string key="statusLabel">NSTextField</string>
-                                               <string key="viewGallery">NSButton</string>
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
@@ -2097,6 +2265,7 @@
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">FirstResponder</string>
+                                       <string key="superclassName">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
@@ -2106,21 +2275,21 @@
                                        <string key="className">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">TURAnsel.h</string>
+                                               <string key="minorKey">TURAnselKit/TURAnsel.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">TURAnselGallery.h</string>
+                                               <string key="minorKey">TURAnselKit/TURAnselGallery.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">TURAnselGalleryPanelController.h</string>
+                                               <string key="minorKey">TURAnselKit/TURAnselGalleryPanelController.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
@@ -2774,16 +2943,21 @@
                        </array>
                </object>
                <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
                        <integer value="1050" key="NS.object.0"/>
                </object>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-                       <integer value="1050" key="NS.object.0"/>
+                       <integer value="1060" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <string key="IBDocument.LastKnownRelativeProjectPath">../ApertureToAnselExportPlugin.xcodeproj</string>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+                       <string key="NSMenuCheckmark">{9, 8}</string>
+                       <string key="NSMenuMixedState">{7, 2}</string>
+               </dictionary>
        </data>
 </archive>

diff --git a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib
index a8efc78..7c3ca87 100644 (file)
Binary files a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib and b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib differ

diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h
index 577d8ed..03e09a6 100644 (file)
--- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h
+++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.h
@@ -39,6 +39,8 @@ typedef enum {
     NSString *rpcEndPoint;
     NSString *username;
     NSString *password;
+    NSString *version;
+    
     NSMutableArray *galleryList;
     TURAnselState state;
     id delegate;
@@ -48,6 +50,7 @@ typedef enum {
 @property (readwrite, retain) NSString *rpcEndPoint;
 @property (readwrite, retain) NSString *username;
 @property (readwrite, retain) NSString *password;
+@property (readwrite, retain) NSString *version;
 
 - (id)initWithConnectionParameters: (NSDictionary *)params;
 - (void)connect;

diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m
index 79580c4..aa18f58 100644 (file)
--- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m
+++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnsel.m
@@ -20,6 +20,7 @@
 @synthesize rpcEndPoint;
 @synthesize username;
 @synthesize password;
+@synthesize version;
 
 #pragma mark -
 #pragma mark init/dealloc
@@ -37,6 +38,8 @@
             forKey: @"password"];
     [self setValue: @"The Ansel Cocoa XML-RPC Client"
             forKey: @"userAgent"];
+    [self setValue: [params objectForKey:@"version"]
+            forKey: @"version"];
 
     return self;
 }
@@ -49,6 +52,7 @@
     [username release];
     [password release];
     [userAgent release];
+    [version release];
     [super dealloc];
 }
 
@@ -284,20 +288,33 @@
  */
 - (void)doLogin
 {
-    NSArray *params = [[NSArray alloc] initWithObjects:
-                       @"ansel",                                 // Scope
-                       [NSNumber numberWithInt: PERMS_EDIT],     // Perms
-                       @"",                                      // No parent
-                       [NSNumber numberWithBool:YES],            // allLevels
-                       [NSNumber numberWithInt: 0],              // Offset
-                       [NSNumber numberWithInt: 0],              // Count
-                       [self valueForKey:@"username"], nil];     // Restrict to user (This should be an option eventually).
-
-    NSArray *order = [NSArray arrayWithObjects: kTURAnselAPIParamScope, kTURAnselAPIParamPerms,
-                                                kTURAnselAPIParamParent, kTURAnselAPIParamAllLevels,
-                                                kTURAnselAPIParamOffset, kTURAnselAPIParamCount,
-                                                kTURAnselAPIParamUserOnly, nil];
-
+    NSArray *params;
+    NSArray *order;
+    
+    if (2 == [version intValue]) {
+        params = [[NSArray alloc] initWithObjects: [[NSDictionary alloc] initWithObjectsAndKeys:
+                                                             [NSNumber numberWithInt: PERMS_EDIT], @"perm",
+                                                             [self valueForKey:@"username"], @"filter",
+                                                             nil] ,nil];    
+        order = [[NSArray arrayWithObjects kTURAnselAPIParamSingleParameter, nil];
+    } else {
+        // Assume it's version 1.x
+        params = [[NSArray alloc] initWithObjects:
+                           @"ansel",                                 // Scope
+                           [NSNumber numberWithInt: PERMS_EDIT],     // Perms
+                           @"",                                      // No parent
+                           [NSNumber numberWithBool:YES],            // allLevels
+                           [NSNumber numberWithInt: 0],              // Offset
+                           [NSNumber numberWithInt: 0],              // Count
+                           [self valueForKey:@"username"], nil];     // Restrict to user (This should be an option eventually).
+
+        order = [NSArray arrayWithObjects: kTURAnselAPIParamScope, kTURAnselAPIParamPerms,
+                                                    kTURAnselAPIParamParent, kTURAnselAPIParamAllLevels,
+                                                    kTURAnselAPIParamOffset, kTURAnselAPIParamCount,
+                                                    kTURAnselAPIParamUserOnly, nil];
+    }
+    
+    
     NSDictionary *results = [self callRPCMethod: @"images.listGalleries"
                                      withParams: params
                                       withOrder: order];

diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.h b/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.h
index 1b6a56b..7b495cf 100644 (file)
--- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.h
+++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.h
@@ -25,6 +25,9 @@ extern NSString * const kTURAnselAPIParamSetAsDefault;
 extern NSString * const kTURAnselAPIParamAdditionalData;
 extern NSString * const kTURAnselAPIParamEncoding;
 
+// Constants specific to Ansel version 2 API parameters.
+extern NSString * const kTURAnselAPIParamSingleParameter;
+
 // Constants for the dictionary keys used to describe/create TURAnselGallery
 extern NSString * const kTURAnselGalleryKeyId;
 extern NSString * const kTURAnselGalleryKeyName;

diff --git a/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.m b/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.m
index 74472bb..b361ee1 100644 (file)
--- a/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.m
+++ b/ApertureToAnselExportPlugin/TURAnselKit/TURAnselConstants.m
@@ -26,6 +26,8 @@ NSString * const kTURAnselAPIParamSetAsDefault      = @"default";
 NSString * const kTURAnselAPIParamAdditionalData    = @"additionalData";
 NSString * const kTURAnselAPIParamEncoding          = @"encoding";
 
+NSString * const kTURAnselAPIParamSingleParameter   = @"params";
+
 // Ansel gallery attribtues.
 NSString * const kTURAnselGalleryKeyId              = @"share_id";
 NSString * const kTURAnselGalleryKeyName            = @"attribute_name";