First stab at using a seperate sheet for creating a new gallery.

Once this is hashed out and prettied up, the same will be done with
the connection parameters, and the ability to add/remember multiple ansel
servers will be included.

diff --git a/iPhoto2Ansel/AnselExportController.h b/iPhoto2Ansel/AnselExportController.h
index 85df06e..92f8abd 100644 (file)
--- a/iPhoto2Ansel/AnselExportController.h
+++ b/iPhoto2Ansel/AnselExportController.h
@@ -11,6 +11,7 @@
 
 @class TURAnsel, TURAnselGallery;
 @class FBProgressController;
+@class TURNewGalleryController;
 
 @interface AnselExportController : NSObject <ExportPluginProtocol> {
 
@@ -29,20 +30,29 @@
     IBOutlet NSSecureTextField *password;
     IBOutlet NSComboBox *galleryCombo;
     IBOutlet NSTextField *connectedLabel;
-    IBOutlet NSTextField *newGalleryName;
     IBOutlet NSButton *beginButton;
     IBOutlet NSButton *newGalleryButton;
     IBOutlet NSProgressIndicator *spinner;
+    IBOutlet NSWindow *newGallerySheet;
+
+    // New Gallery Panel
+    IBOutlet NSTextField *galleryNameTextField;
+    IBOutlet NSTextField *gallerySlugTextField;
+    IBOutlet NSTextField *galleryDescTextField;
+    
     // User choosen settings
     int size;
-    int quality;
-    
+        
     // Progress struct (This one is part of the protocol, but we don't use it)
     ExportPluginProgress progress;
     
     // This is our real progress controller (stolen from Facebook exporter).
     FBProgressController *progressController;
     
+    // New Gallery dialog controller (Can't get this to work with the modal
+    // iPhoto plugin interface??)
+    //TURNewGalleryController *newGalleryController;
+    
     // Mutex lock (required for the protocol, but not used)
     NSRecursiveLock *progressLock;
 
@@ -54,11 +64,15 @@
 }
 @property (readwrite, retain) TURAnselGallery *currentGallery;
 @property (readwrite) int size;
-@property (readwrite) int quality;
 
+// Getter/setter
 - (NSWindow *)window;
+
+// Actions
 - (IBAction) doConnect: (id)sender;
 - (IBAction) doNewGallery: (id)sender;
+- (IBAction) showNewGallery: (id)sender;
+- (IBAction) cancelNewGallery: (id)sender;
 
 // overrides
 - (void)awakeFromNib;

diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m
index fe482c1..31d8990 100644 (file)
--- a/iPhoto2Ansel/AnselExportController.m
+++ b/iPhoto2Ansel/AnselExportController.m
@@ -5,9 +5,10 @@
 //  Created by Michael Rubinsky on 10/23/08.
 //  Copyright 2008 __MyCompanyName__. All rights reserved.
 //
-#import "TURAnsel.h"
-#import "TURAnselGallery.h"
-#import "AnselExportController.h"
+#import "TURAnsel.h";
+#import "TURAnselGallery.h";
+#import "TURNewGalleryController.h";
+#import "AnselExportController.h";
 #import "FBProgressController.h";
 #import "ImageResizer.h";
 
@@ -23,7 +24,6 @@
 @implementation AnselExportController
 
 @synthesize size;
-@synthesize quality;
 @synthesize currentGallery;
 
 #pragma mark Overrides
@@ -77,18 +77,43 @@
 }
 
 
-//TODO
--(void)doNewGallery: (id)sender
+// Start the process of creating a new gallery. This is called from an action
+// from the newGallerySheet NSPanel.
+- (void)doNewGallery: (id)sender
+{
+    [NSApplication detachDrawingThread: @selector(newGallery)
+                              toTarget: self 
+                            withObject:nil]; 
+}
+
+// Put up the newGallerySheet NSPanel
+- (IBAction)showNewGallery: (id)sender
 {
     // Make sure we're not doing this for nothing
-    if ([anselController state] == TURAnselStateConnected &&
-        [[newGalleryName stringValue] length] > 0) {
-        [NSApplication detachDrawingThread: @selector(newGallery:)
-                                  toTarget: self 
-                                withObject: [newGalleryName stringValue]];
+    if ([anselController state] == TURAnselStateConnected) {
+        
+        if (!newGallerySheet) {
+            
+            [NSBundle loadNibNamed: @"AnselGalleryPanel"
+                             owner: self];
+        
+            [galleryNameTextField setStringValue:@"Untitled"];
+        }
+        
+        [NSApp beginSheet: newGallerySheet
+           modalForWindow: [self window]
+            modalDelegate: self
+           didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
+              contextInfo: self];
     }
 }
 
+- (IBAction)cancelNewGallery: (id)sender
+{
+    [NSApp endSheet: newGallerySheet];
+    [newGallerySheet orderOut: nil];
+}
+
 #pragma mark ExportPluginProtocol
 // Initialize
 - (id)initWithExportImageObj:(id <ExportImageProtocol>)obj
@@ -204,6 +229,51 @@
 
 #pragma mark PrivateAPI
 
+- (void)newGallery
+{
+    // Get Gallery Properties from the panel.
+    NSString *galleryName = [galleryNameTextField stringValue];
+    NSString *gallerySlug = [gallerySlugTextField stringValue];
+    NSString *galleryDescription = [galleryDescTextField stringValue];
+    
+    if (!galleryName) {
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert setMessageText:@"Gallery names cannot be empty"];
+        [alert setAlertStyle: NSCriticalAlertStyle];
+        [alert beginSheetModalForWindow: [self window]
+                          modalDelegate: nil 
+                         didEndSelector: nil
+                            contextInfo: nil];
+        [alert release];
+        return;
+    }
+    NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:
+                            galleryName, @"name",
+                            gallerySlug, @"slug",
+                            galleryDescription, @"desc", nil];
+    
+    NSDictionary *results = [[anselController createNewGallery: params] retain];
+    
+    [NSApp endSheet: newGallerySheet];
+    [newGallerySheet orderOut: nil];
+    
+    if ([anselController state] != TURAnselStateError) {
+        NSAlert *alert = [[NSAlert alloc] init];
+        [alert setMessageText: @"Gallery successfully created."];
+        [alert beginSheetModalForWindow: [self window]
+                          modalDelegate: nil
+                         didEndSelector: nil
+                            contextInfo: nil];
+        
+        // Reload the NSComboBox and autoselect the last item.
+        [galleryCombo reloadData];
+        [galleryCombo selectItemAtIndex: [galleryCombo numberOfItems] - 1];
+        [alert release];
+    }
+    
+    [results release];
+}
+
 // See if we have everything we need to export...
 - (void)canExport
 {
@@ -248,29 +318,6 @@
                               toTarget: self
                             withObject: nil];
 }
-
-// Create a new gallery on the Horde server
-// TODO
-- (void)newGallery: (NSString *)galleryName
-{    
-    NSDictionary *results = [[anselController createNewGallery: [NSDictionary dictionaryWithObjectsAndKeys: galleryName, @"name", nil]] retain];
-    
-    if ([anselController state] != TURAnselStateError) {
-        NSAlert *alert = [[NSAlert alloc] init];
-        [alert setMessageText: @"Gallery successfully created."];
-        [alert beginSheetModalForWindow: [self window]
-                          modalDelegate: nil
-                         didEndSelector: nil
-                            contextInfo: nil];
-        
-        // Reload the NSComboBox and autoselect the last item.
-        [galleryCombo reloadData];
-        [galleryCombo selectItemAtIndex: [galleryCombo numberOfItems] - 1];
-        [alert release];
-    }
-    
-    [results release];
-}
         
 // Runs the actual export (This is run in it's own thread)
 - (void) runExport
@@ -440,4 +487,9 @@
     [currentGallery setDelegate: self];
     [self canExport];
 }
+
+- (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
+{
+    NSLog(@"sheetDidEnd");
+}
 @end
\ No newline at end of file

diff --git a/iPhoto2Ansel/English.lproj/AnselGalleryPanel.nib/designable.nib b/iPhoto2Ansel/English.lproj/AnselGalleryPanel.nib/designable.nib
new file mode 100644 (file)
index 0000000..52a2586
--- /dev/null
+++ b/iPhoto2Ansel/English.lproj/AnselGalleryPanel.nib/designable.nib
@@ -0,0 +1,776 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
+       <data>
+               <int key="IBDocument.SystemTarget">1050</int>
+               <string key="IBDocument.SystemVersion">9F33</string>
+               <string key="IBDocument.InterfaceBuilderVersion">672</string>
+               <string key="IBDocument.AppKitVersion">949.34</string>
+               <string key="IBDocument.HIToolboxVersion">352.00</string>
+               <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <integer value="2"/>
+               </object>
+               <object class="NSArray" key="IBDocument.PluginDependencies">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+               </object>
+               <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <object class="NSCustomObject" id="1001">
+                               <string key="NSClassName">AnselExportController</string>
+                       </object>
+                       <object class="NSCustomObject" id="1003">
+                               <string key="NSClassName">FirstResponder</string>
+                       </object>
+                       <object class="NSCustomObject" id="1004">
+                               <string key="NSClassName">NSApplication</string>
+                       </object>
+                       <object class="NSWindowTemplate" id="1005">
+                               <int key="NSWindowStyleMask">19</int>
+                               <int key="NSWindowBacking">2</int>
+                               <string key="NSWindowRect">{{797, 724}, {267, 276}}</string>
+                               <int key="NSWTFlags">-536866816</int>
+                               <string key="NSWindowTitle">New Gallery</string>
+                               <string key="NSWindowClass">NSPanel</string>
+                               <nil key="NSViewClass"/>
+                               <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+                               <object class="NSView" key="NSWindowView" id="1006">
+                                       <reference key="NSNextResponder"/>
+                                       <int key="NSvFlags">256</int>
+                                       <object class="NSMutableArray" key="NSSubviews">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSTextField" id="142371246">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{20, 219}, {227, 22}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="104713052">
+                                                               <int key="NSCellFlags">-1804468671</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents"/>
+                                                               <object class="NSFont" key="NSSupport" id="1035187758">
+                                                                       <string key="NSName">LucidaGrande</string>
+                                                                       <double key="NSSize">1.300000e+01</double>
+                                                                       <int key="NSfFlags">1044</int>
+                                                               </object>
+                                                               <reference key="NSControlView" ref="142371246"/>
+                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                               <object class="NSColor" key="NSBackgroundColor" id="926502601">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">textBackgroundColor</string>
+                                                                       <object class="NSColor" key="NSColor" id="537053071">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MQA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                               <object class="NSColor" key="NSTextColor" id="649170679">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">textColor</string>
+                                                                       <object class="NSColor" key="NSColor" id="957332318">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MAA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="970595672">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 240}, {88, 16}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="303822681">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Gallery Name</string>
+                                                               <object class="NSFont" key="NSSupport" id="849304139">
+                                                                       <string key="NSName">LucidaGrande</string>
+                                                                       <double key="NSSize">1.200000e+01</double>
+                                                                       <int key="NSfFlags">16</int>
+                                                               </object>
+                                                               <reference key="NSControlView" ref="970595672"/>
+                                                               <object class="NSColor" key="NSBackgroundColor" id="264684485">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">controlColor</string>
+                                                                       <object class="NSColor" key="NSColor" id="961976611">
+                                                                               <int key="NSColorSpace">3</int>
+                                                                               <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+                                                                       </object>
+                                                               </object>
+                                                               <object class="NSColor" key="NSTextColor" id="339290383">
+                                                                       <int key="NSColorSpace">6</int>
+                                                                       <string key="NSCatalogName">System</string>
+                                                                       <string key="NSColorName">controlTextColor</string>
+                                                                       <reference key="NSColor" ref="957332318"/>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="768485006">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 195}, {73, 16}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="441648904">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Gallery Slug</string>
+                                                               <reference key="NSSupport" ref="849304139"/>
+                                                               <reference key="NSControlView" ref="768485006"/>
+                                                               <reference key="NSBackgroundColor" ref="264684485"/>
+                                                               <reference key="NSTextColor" ref="339290383"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="887381497">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{20, 174}, {227, 22}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="347914051">
+                                                               <int key="NSCellFlags">-1804468671</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="1035187758"/>
+                                                               <reference key="NSControlView" ref="887381497"/>
+                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                               <reference key="NSBackgroundColor" ref="926502601"/>
+                                                               <reference key="NSTextColor" ref="649170679"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="703267117">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{20, 103}, {227, 47}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="116149712">
+                                                               <int key="NSCellFlags">-1805517311</int>
+                                                               <int key="NSCellFlags2">272629760</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="1035187758"/>
+                                                               <reference key="NSControlView" ref="703267117"/>
+                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                               <reference key="NSBackgroundColor" ref="926502601"/>
+                                                               <reference key="NSTextColor" ref="649170679"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="568388187">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 150}, {124, 16}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="774003593">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Gallery Description</string>
+                                                               <reference key="NSSupport" ref="849304139"/>
+                                                               <reference key="NSControlView" ref="568388187"/>
+                                                               <reference key="NSBackgroundColor" ref="264684485"/>
+                                                               <reference key="NSTextColor" ref="339290383"/>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="64211119">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{116, 12}, {68, 32}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="490284298">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">Cancel</string>
+                                                               <reference key="NSSupport" ref="1035187758"/>
+                                                               <reference key="NSControlView" ref="64211119"/>
+                                                               <int key="NSButtonFlags">-2038284033</int>
+                                                               <int key="NSButtonFlags2">129</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">200</int>
+                                                               <int key="NSPeriodicInterval">25</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSButton" id="184111456">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{184, 12}, {69, 32}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSButtonCell" key="NSCell" id="13003559">
+                                                               <int key="NSCellFlags">67239424</int>
+                                                               <int key="NSCellFlags2">134217728</int>
+                                                               <string key="NSContents">Save</string>
+                                                               <reference key="NSSupport" ref="1035187758"/>
+                                                               <reference key="NSControlView" ref="184111456"/>
+                                                               <int key="NSButtonFlags">-2038284033</int>
+                                                               <int key="NSButtonFlags2">129</int>
+                                                               <string key="NSAlternateContents"/>
+                                                               <string key="NSKeyEquivalent"/>
+                                                               <int key="NSPeriodicDelay">200</int>
+                                                               <int key="NSPeriodicInterval">25</int>
+                                                       </object>
+                                               </object>
+                                               <object class="NSComboBox" id="137843971">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{20, 56}, {230, 26}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSComboBoxCell" key="NSCell" id="625134106">
+                                                               <int key="NSCellFlags">879885888</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents"/>
+                                                               <reference key="NSSupport" ref="1035187758"/>
+                                                               <reference key="NSControlView" ref="137843971"/>
+                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                               <reference key="NSBackgroundColor" ref="926502601"/>
+                                                               <reference key="NSTextColor" ref="339290383"/>
+                                                               <int key="NSVisibleItemCount">5</int>
+                                                               <bool key="NSHasVerticalScroller">YES</bool>
+                                                               <reference key="NSDelegate" ref="137843971"/>
+                                                               <object class="NSComboTableView" key="NSTableView" id="677168914">
+                                                                       <reference key="NSNextResponder"/>
+                                                                       <int key="NSvFlags">274</int>
+                                                                       <string key="NSFrameSize">{15, 0}</string>
+                                                                       <reference key="NSSuperview"/>
+                                                                       <reference key="NSWindow"/>
+                                                                       <bool key="NSEnabled">YES</bool>
+                                                                       <object class="NSMutableArray" key="NSTableColumns">
+                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                                                               <object class="NSTableColumn">
+                                                                                       <integer value="0" key="NSIdentifier" id="8"/>
+                                                                                       <double key="NSWidth">1.200000e+01</double>
+                                                                                       <double key="NSMinWidth">1.000000e+01</double>
+                                                                                       <double key="NSMaxWidth">1.000000e+03</double>
+                                                                                       <object class="NSTableHeaderCell" key="NSHeaderCell">
+                                                                                               <int key="NSCellFlags">75628032</int>
+                                                                                               <int key="NSCellFlags2">0</int>
+                                                                                               <string key="NSContents"/>
+                                                                                               <reference key="NSSupport" ref="849304139"/>
+                                                                                               <object class="NSColor" key="NSBackgroundColor">
+                                                                                                       <int key="NSColorSpace">3</int>
+                                                                                                       <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+                                                                                               </object>
+                                                                                               <reference key="NSTextColor" ref="537053071"/>
+                                                                                       </object>
+                                                                                       <object class="NSTextFieldCell" key="NSDataCell">
+                                                                                               <int key="NSCellFlags">338820672</int>
+                                                                                               <int key="NSCellFlags2">1024</int>
+                                                                                               <reference key="NSSupport" ref="1035187758"/>
+                                                                                               <reference key="NSControlView" ref="677168914"/>
+                                                                                               <bool key="NSDrawsBackground">YES</bool>
+                                                                                               <object class="NSColor" key="NSBackgroundColor" id="525076026">
+                                                                                                       <int key="NSColorSpace">6</int>
+                                                                                                       <string key="NSCatalogName">System</string>
+                                                                                                       <string key="NSColorName">controlBackgroundColor</string>
+                                                                                                       <reference key="NSColor" ref="961976611"/>
+                                                                                               </object>
+                                                                                               <reference key="NSTextColor" ref="339290383"/>
+                                                                                       </object>
+                                                                                       <int key="NSResizingMask">3</int>
+                                                                                       <bool key="NSIsResizeable">YES</bool>
+                                                                                       <reference key="NSTableView" ref="677168914"/>
+                                                                               </object>
+                                                                       </object>
+                                                                       <double key="NSIntercellSpacingWidth">3.000000e+00</double>
+                                                                       <double key="NSIntercellSpacingHeight">2.000000e+00</double>
+                                                                       <reference key="NSBackgroundColor" ref="525076026"/>
+                                                                       <object class="NSColor" key="NSGridColor">
+                                                                               <int key="NSColorSpace">6</int>
+                                                                               <string key="NSCatalogName">System</string>
+                                                                               <string key="NSColorName">gridColor</string>
+                                                                               <object class="NSColor" key="NSColor">
+                                                                                       <int key="NSColorSpace">3</int>
+                                                                                       <bytes key="NSWhite">MC41AA</bytes>
+                                                                               </object>
+                                                                       </object>
+                                                                       <double key="NSRowHeight">1.900000e+01</double>
+                                                                       <string key="NSAction">tableViewAction:</string>
+                                                                       <int key="NSTvFlags">-767524864</int>
+                                                                       <reference key="NSDelegate" ref="625134106"/>
+                                                                       <reference key="NSDataSource" ref="625134106"/>
+                                                                       <reference key="NSTarget" ref="625134106"/>
+                                                                       <int key="NSColumnAutoresizingStyle">1</int>
+                                                                       <int key="NSDraggingSourceMaskForLocal">15</int>
+                                                                       <int key="NSDraggingSourceMaskForNonLocal">0</int>
+                                                                       <bool key="NSAllowsTypeSelect">YES</bool>
+                                                               </object>
+                                                       </object>
+                                               </object>
+                                               <object class="NSTextField" id="793482582">
+                                                       <reference key="NSNextResponder" ref="1006"/>
+                                                       <int key="NSvFlags">268</int>
+                                                       <string key="NSFrame">{{17, 79}, {88, 16}}</string>
+                                                       <reference key="NSSuperview" ref="1006"/>
+                                                       <bool key="NSEnabled">YES</bool>
+                                                       <object class="NSTextFieldCell" key="NSCell" id="657594086">
+                                                               <int key="NSCellFlags">68288064</int>
+                                                               <int key="NSCellFlags2">272630784</int>
+                                                               <string key="NSContents">Gallery Parent</string>
+                                                               <reference key="NSSupport" ref="849304139"/>
+                                                               <reference key="NSControlView" ref="793482582"/>
+                                                               <reference key="NSBackgroundColor" ref="264684485"/>
+                                                               <reference key="NSTextColor" ref="339290383"/>
+                                                       </object>
+                                               </object>
+                                       </object>
+                                       <string key="NSFrameSize">{267, 276}</string>
+                                       <reference key="NSSuperview"/>
+                               </object>
+                               <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+                               <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+                       </object>
+               </object>
+               <object class="IBObjectContainer" key="IBDocument.Objects">
+                       <object class="NSMutableArray" key="connectionRecords">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">gallerySlugTextField</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="887381497"/>
+                                       </object>
+                                       <int key="connectionID">38</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">galleryParentCombo</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="137843971"/>
+                                       </object>
+                                       <int key="connectionID">39</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">galleryNameTextField</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="142371246"/>
+                                       </object>
+                                       <int key="connectionID">40</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">galleryDescTextField</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="703267117"/>
+                                       </object>
+                                       <int key="connectionID">41</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">newGallerySheet</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="1005"/>
+                                       </object>
+                                       <int key="connectionID">43</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">doNewGallery:</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="13003559"/>
+                                       </object>
+                                       <int key="connectionID">46</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">cancelNewGallery:</string>
+                                               <reference key="source" ref="1001"/>
+                                               <reference key="destination" ref="64211119"/>
+                                       </object>
+                                       <int key="connectionID">47</int>
+                               </object>
+                       </object>
+                       <object class="IBMutableOrderedSet" key="objectRecords">
+                               <object class="NSArray" key="orderedObjects">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">0</int>
+                                               <object class="NSArray" key="object" id="1002">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                               </object>
+                                               <reference key="children" ref="1000"/>
+                                               <nil key="parent"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-2</int>
+                                               <reference key="object" ref="1001"/>
+                                               <reference key="parent" ref="1002"/>
+                                               <string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-1</int>
+                                               <reference key="object" ref="1003"/>
+                                               <reference key="parent" ref="1002"/>
+                                               <string key="objectName">First Responder</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">-3</int>
+                                               <reference key="object" ref="1004"/>
+                                               <reference key="parent" ref="1002"/>
+                                               <string key="objectName">Application</string>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1</int>
+                                               <reference key="object" ref="1005"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="1006"/>
+                                               </object>
+                                               <reference key="parent" ref="1002"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">2</int>
+                                               <reference key="object" ref="1006"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="142371246"/>
+                                                       <reference ref="970595672"/>
+                                                       <reference ref="768485006"/>
+                                                       <reference ref="887381497"/>
+                                                       <reference ref="703267117"/>
+                                                       <reference ref="568388187"/>
+                                                       <reference ref="137843971"/>
+                                                       <reference ref="793482582"/>
+                                                       <reference ref="64211119"/>
+                                                       <reference ref="184111456"/>
+                                               </object>
+                                               <reference key="parent" ref="1005"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">3</int>
+                                               <reference key="object" ref="142371246"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="104713052"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">4</int>
+                                               <reference key="object" ref="104713052"/>
+                                               <reference key="parent" ref="142371246"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">5</int>
+                                               <reference key="object" ref="970595672"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="303822681"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">6</int>
+                                               <reference key="object" ref="303822681"/>
+                                               <reference key="parent" ref="970595672"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">7</int>
+                                               <reference key="object" ref="768485006"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="441648904"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">8</int>
+                                               <reference key="object" ref="441648904"/>
+                                               <reference key="parent" ref="768485006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">9</int>
+                                               <reference key="object" ref="887381497"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="347914051"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">10</int>
+                                               <reference key="object" ref="347914051"/>
+                                               <reference key="parent" ref="887381497"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">11</int>
+                                               <reference key="object" ref="703267117"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="116149712"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">12</int>
+                                               <reference key="object" ref="116149712"/>
+                                               <reference key="parent" ref="703267117"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">13</int>
+                                               <reference key="object" ref="568388187"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="774003593"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">14</int>
+                                               <reference key="object" ref="774003593"/>
+                                               <reference key="parent" ref="568388187"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">15</int>
+                                               <reference key="object" ref="64211119"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="490284298"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">16</int>
+                                               <reference key="object" ref="490284298"/>
+                                               <reference key="parent" ref="64211119"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">17</int>
+                                               <reference key="object" ref="184111456"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="13003559"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">18</int>
+                                               <reference key="object" ref="13003559"/>
+                                               <reference key="parent" ref="184111456"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">19</int>
+                                               <reference key="object" ref="137843971"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="625134106"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">20</int>
+                                               <reference key="object" ref="625134106"/>
+                                               <reference key="parent" ref="137843971"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">21</int>
+                                               <reference key="object" ref="793482582"/>
+                                               <object class="NSMutableArray" key="children">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <reference ref="657594086"/>
+                                               </object>
+                                               <reference key="parent" ref="1006"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">22</int>
+                                               <reference key="object" ref="657594086"/>
+                                               <reference key="parent" ref="793482582"/>
+                                       </object>
+                               </object>
+                       </object>
+                       <object class="NSMutableDictionary" key="flattenedProperties">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <string>-1.IBPluginDependency</string>
+                                       <string>-2.IBPluginDependency</string>
+                                       <string>-3.IBPluginDependency</string>
+                                       <string>1.IBEditorWindowLastContentRect</string>
+                                       <string>1.IBPluginDependency</string>
+                                       <string>1.IBWindowTemplateEditedContentRect</string>
+                                       <string>1.NSWindowTemplate.visibleAtLaunch</string>
+                                       <string>1.WindowOrigin</string>
+                                       <string>1.editorWindowContentRectSynchronizationRect</string>
+                                       <string>10.IBPluginDependency</string>
+                                       <string>11.IBPluginDependency</string>
+                                       <string>12.IBPluginDependency</string>
+                                       <string>13.IBPluginDependency</string>
+                                       <string>14.IBPluginDependency</string>
+                                       <string>15.IBPluginDependency</string>
+                                       <string>16.IBPluginDependency</string>
+                                       <string>17.IBPluginDependency</string>
+                                       <string>18.IBPluginDependency</string>
+                                       <string>19.IBPluginDependency</string>
+                                       <string>2.IBPluginDependency</string>
+                                       <string>20.IBPluginDependency</string>
+                                       <string>21.IBPluginDependency</string>
+                                       <string>22.IBPluginDependency</string>
+                                       <string>3.IBPluginDependency</string>
+                                       <string>4.IBPluginDependency</string>
+                                       <string>5.IBPluginDependency</string>
+                                       <string>6.IBPluginDependency</string>
+                                       <string>7.IBPluginDependency</string>
+                                       <string>8.IBPluginDependency</string>
+                                       <string>9.IBPluginDependency</string>
+                               </object>
+                               <object class="NSMutableArray" key="dict.values">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{177, 722}, {267, 276}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{177, 722}, {267, 276}}</string>
+                                       <reference ref="8"/>
+                                       <string>{196, 240}</string>
+                                       <string>{{357, 418}, {480, 270}}</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               </object>
+                       </object>
+                       <object class="NSMutableDictionary" key="unlocalizedProperties">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="NSArray" key="dict.sortedKeys">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                               </object>
+                               <object class="NSMutableArray" key="dict.values">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                               </object>
+                       </object>
+                       <nil key="activeLocalization"/>
+                       <object class="NSMutableDictionary" key="localizations">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="NSArray" key="dict.sortedKeys">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                               </object>
+                               <object class="NSMutableArray" key="dict.values">
+                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                               </object>
+                       </object>
+                       <nil key="sourceID"/>
+                       <int key="maxID">47</int>
+               </object>
+               <object class="IBClassDescriber" key="IBDocument.Classes">
+                       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">AnselExportController</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="NSMutableDictionary" key="actions">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>cancelNewGallery:</string>
+                                                       <string>doConnect:</string>
+                                                       <string>doNewGallery:</string>
+                                                       <string>showNewGallery:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                               </object>
+                                       </object>
+                                       <object class="NSMutableDictionary" key="outlets">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSMutableArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>anselHostURL</string>
+                                                       <string>beginButton</string>
+                                                       <string>connectedLabel</string>
+                                                       <string>firstView</string>
+                                                       <string>galleryCombo</string>
+                                                       <string>galleryDescTextField</string>
+                                                       <string>galleryNameTextField</string>
+                                                       <string>gallerySlugTextField</string>
+                                                       <string>mExportMgr</string>
+                                                       <string>mQualityPopUp</string>
+                                                       <string>mSettingsBox</string>
+                                                       <string>mSizePopUp</string>
+                                                       <string>newGalleryButton</string>
+                                                       <string>newGallerySheet</string>
+                                                       <string>password</string>
+                                                       <string>spinner</string>
+                                                       <string>username</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSTextField</string>
+                                                       <string>NSButton</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSControl</string>
+                                                       <string>NSComboBox</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>NSTextField</string>
+                                                       <string>id</string>
+                                                       <string>NSPopUpButton</string>
+                                                       <string>NSBox</string>
+                                                       <string>NSPopUpButton</string>
+                                                       <string>NSButton</string>
+                                                       <string>NSWindow</string>
+                                                       <string>NSSecureTextField</string>
+                                                       <string>NSProgressIndicator</string>
+                                                       <string>NSTextField</string>
+                                               </object>
+                                       </object>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">AnselExportController.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">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>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBProjectSource</string>
+                                               <string key="minorKey">xmlrpc-1.5.1/XMLRPCConnection.h</string>
+                                       </object>
+                               </object>
+                       </object>
+               </object>
+               <int key="IBDocument.localizationMode">0</int>
+               <string key="IBDocument.LastKnownRelativeProjectPath">../iPhoto2Ansel.xcodeproj</string>
+               <int key="IBDocument.defaultPropertyAccessControl">3</int>
+       </data>
+</archive>

diff --git a/iPhoto2Ansel/English.lproj/AnselGalleryPanel.nib/keyedobjects.nib b/iPhoto2Ansel/English.lproj/AnselGalleryPanel.nib/keyedobjects.nib
new file mode 100644 (file)
index 0000000..c850b23
Binary files /dev/null and b/iPhoto2Ansel/English.lproj/AnselGalleryPanel.nib/keyedobjects.nib differ

diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib b/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib
index 624a92e..f670f8e 100644 (file)
--- a/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib
+++ b/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib
@@ -20,10 +20,14 @@
                <dict>
                        <key>ACTIONS</key>
                        <dict>
+                               <key>cancelNewGallery</key>
+                               <string>id</string>
                                <key>doConnect</key>
                                <string>id</string>
                                <key>doNewGallery</key>
                                <string>id</string>
+                               <key>showNewGallery</key>
+                               <string>id</string>
                        </dict>
                        <key>CLASS</key>
                        <string>AnselExportController</string>
@@ -41,6 +45,12 @@
                                <string>NSControl</string>
                                <key>galleryCombo</key>
                                <string>NSComboBox</string>
+                               <key>galleryDescTextField</key>
+                               <string>NSTextField</string>
+                               <key>galleryNameTextField</key>
+                               <string>NSTextField</string>
+                               <key>gallerySlugTextField</key>
+                               <string>NSTextField</string>
                                <key>galleryTableView</key>
                                <string>NSTableView</string>
                                <key>mExportMgr</key>
@@ -51,10 +61,12 @@
                                <string>NSBox</string>
                                <key>mSizePopUp</key>
                                <string>NSPopUpButton</string>
+                               <key>newGallery</key>
+                               <string>NSPanel</string>
                                <key>newGalleryButton</key>
                                <string>NSButton</string>
-                               <key>newGalleryName</key>
-                               <string>NSTextField</string>
+                               <key>newGallerySheet</key>
+                               <string>NSWindow</string>
                                <key>password</key>
                                <string>NSSecureTextField</string>
                                <key>spinner</key>

diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/info.nib b/iPhoto2Ansel/English.lproj/Panel.nib/info.nib
index fb256c0..d55a332 100644 (file)
--- a/iPhoto2Ansel/English.lproj/Panel.nib/info.nib
+++ b/iPhoto2Ansel/English.lproj/Panel.nib/info.nib
@@ -10,7 +10,7 @@
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>7</integer>
+               <integer>6</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9F33</string>

diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib
index 33b9caf..df43ae9 100644 (file)
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 8eba039..7c11fbe 100644 (file)
--- a/iPhoto2Ansel/TURAnsel.m
+++ b/iPhoto2Ansel/TURAnsel.m
@@ -86,10 +86,15 @@ static NSString *ERR_DOMAIN = @"com.theupstairsroom.TURAnsel";
 // and default perms etc...
 - (NSDictionary *)createNewGallery: (NSDictionary *)params
 {
-    NSDictionary *attributes = [NSDictionary dictionaryWithObjectsAndKeys:
-                                [params valueForKey: @"name"], @"name", nil];
+    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", attributes, nil]; 
+                             @"ansel", params, nil]; 
     XMLRPCResponse *response = [self callRPCMethod: @"images.createGallery"
                                         withParams: apiparams];
     if (state != TURAnselStateError) {
@@ -102,6 +107,7 @@ static NSString *ERR_DOMAIN = @"com.theupstairsroom.TURAnsel";
         TURAnselGallery *newGallery = [[TURAnselGallery alloc] initWithObject: results
                                                                    controller: self];
         [galleryList addObject: newGallery];
+        //[attributes release];
         return results;
     }
     

diff --git a/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj b/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj
index a9cfafa..a525ad8 100644 (file)
--- a/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj
+++ b/iPhoto2Ansel/iPhoto2Ansel.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
                8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
                8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; };
+               B04FC1A90EEB4A2B008EEB0E /* AnselGalleryPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = B04FC1A70EEB4A2B008EEB0E /* AnselGalleryPanel.nib */; };
                B05C4A060EE9E001005B4B28 /* ImageResizer.m in Sources */ = {isa = PBXBuildFile; fileRef = B05C4A050EE9E001005B4B28 /* ImageResizer.m */; };
                B06C1E030EB1644600BFAFCB /* AnselExportPluginBox.m in Sources */ = {isa = PBXBuildFile; fileRef = B06C1E020EB1644600BFAFCB /* AnselExportPluginBox.m */; };
                B06C1E060EB164D900BFAFCB /* AnselExportController.m in Sources */ = {isa = PBXBuildFile; fileRef = B06C1E050EB164D900BFAFCB /* AnselExportController.m */; };
@@ -73,6 +74,7 @@
                8D5B49B6048680CD000E48DA /* iPhoto2Ansel.iPhotoExporter */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iPhoto2Ansel.iPhotoExporter; sourceTree = BUILT_PRODUCTS_DIR; };
                8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                B03D3B590ED5BB3800CF5B92 /* XMLRPC-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "XMLRPC-Info.plist"; sourceTree = SOURCE_ROOT; };
+               B04FC1A80EEB4A2B008EEB0E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/AnselGalleryPanel.nib; sourceTree = "<group>"; };
                B05C4A040EE9E001005B4B28 /* ImageResizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ImageResizer.h; sourceTree = "<group>"; };
                B05C4A050EE9E001005B4B28 /* ImageResizer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ImageResizer.m; sourceTree = "<group>"; };
                B06C1E010EB1644600BFAFCB /* AnselExportPluginBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnselExportPluginBox.h; sourceTree = "<group>"; };
@@ -146,6 +148,7 @@
                                089C167CFE841241C02AAC07 /* Resources */,
                                089C1671FE841209C02AAC07 /* Frameworks and Libraries */,
                                19C28FB8FE9D52D311CA2CBB /* Products */,
+                               B04FC1A70EEB4A2B008EEB0E /* AnselGalleryPanel.nib */,
                        );
                        name = iPhoto2Ansel;
                        sourceTree = "<group>";
@@ -372,6 +375,7 @@
                                8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */,
                                B06C1E3D0EB17E3700BFAFCB /* Panel.nib in Resources */,
                                B0C888490ED85DEA000E19FB /* ProgressSheet.nib in Resources */,
+                               B04FC1A90EEB4A2B008EEB0E /* AnselGalleryPanel.nib in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -435,6 +439,14 @@
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
                };
+               B04FC1A70EEB4A2B008EEB0E /* AnselGalleryPanel.nib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               B04FC1A80EEB4A2B008EEB0E /* English */,
+                       );
+                       name = AnselGalleryPanel.nib;
+                       sourceTree = "<group>";
+               };
                B0BFBC870ED5B32B006581A5 /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (