From 8dd759e446c82cd1c52cbf2f37102cec17fe6414 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Tue, 23 Dec 2008 20:54:14 -0500
Subject: [PATCH] Set a default value for the new gallery name based on the
 selected albums/images

---
 iPhoto2Ansel/AnselExportController.m          | 10 +++++++++-
 iPhoto2Ansel/TURAnselGalleryPanelController.h |  1 +
 iPhoto2Ansel/TURAnselGalleryPanelController.m | 16 ++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m
index c9386b8c3..04cb74392 100644
--- a/iPhoto2Ansel/AnselExportController.m
+++ b/iPhoto2Ansel/AnselExportController.m
@@ -93,9 +93,17 @@ NSString * const TURAnselServerPasswordKey = @"password";
 // Put up the newGallerySheet NSPanel
 - (IBAction)showNewGallery: (id)sender
 {
+    TURAnselGalleryPanelController *newGalleryController;
+    NSString *albumName;
+    
     // Make sure we're not doing this for nothing
     if ([anselController state] == TURAnselStateConnected) {
-        TURAnselGalleryPanelController *newGalleryController = [[TURAnselGalleryPanelController alloc] initWithController: anselController];
+        
+        // It *looks* like index 0 is the first selected album?
+        albumName = [mExportMgr albumNameAtIndex: 0];
+        newGalleryController = [[TURAnselGalleryPanelController alloc] initWithController: anselController
+                                                                          withGalleryName: albumName
+                                                                   withGalleryDescription: [mExportMgr albumCommentsAtIndex:0]];
         [newGalleryController setDelegate: self];
         [newGalleryController showSheetForWindow: [self window]];
     }
diff --git a/iPhoto2Ansel/TURAnselGalleryPanelController.h b/iPhoto2Ansel/TURAnselGalleryPanelController.h
index d423ca66c..9e2f612b2 100644
--- a/iPhoto2Ansel/TURAnselGalleryPanelController.h
+++ b/iPhoto2Ansel/TURAnselGalleryPanelController.h
@@ -29,6 +29,7 @@
 - (IBAction)doNewGallery: (id)sender;
 - (IBAction)cancelNewGallery: (id)sender;
 - (id)initWithController: (TURAnsel *)theController;
+- (id)initWithController: (TURAnsel *)theController withGalleryName: (NSString *)galleryName;
 - (void)showSheetForWindow: (NSWindow *)theWindow;
 - (void)setDelegate: (id)theDelegate;
 @end
diff --git a/iPhoto2Ansel/TURAnselGalleryPanelController.m b/iPhoto2Ansel/TURAnselGalleryPanelController.m
index 419ebeef1..baff799ba 100644
--- a/iPhoto2Ansel/TURAnselGalleryPanelController.m
+++ b/iPhoto2Ansel/TURAnselGalleryPanelController.m
@@ -75,6 +75,22 @@
     return self;
 }
 
+- (id)initWithController: (TURAnsel *)theController
+       withGalleryName: (NSString *)galleryName 
+{
+    
+    [super init];
+    anselController = [theController retain];
+    [NSBundle loadNibNamed: @"AnselGalleryPanel"
+                     owner: self];
+    
+    [galleryNameTextField setStringValue: galleryName];
+    
+    return self;  
+    
+    
+}
+
 - (void)setDelegate: (id)theDelegate
 {
     delegate = theDelegate; // weak
-- 
2.11.0