Enable/disable the view gallery button

diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m
index a21b99b..51f0dfa 100644 (file)
--- a/iPhoto2Ansel/AnselExportController.m
+++ b/iPhoto2Ansel/AnselExportController.m
@@ -396,6 +396,7 @@ NSString * const TURAnselServerPasswordKey = @"password";
         [mNewGalleryButton setEnabled: NO];
         [mExportMgr disableControls];   
         [galleryCombo setEnabled: YES];
+        [viewGallery setEnabled: NO];
     }
 }
 
@@ -427,8 +428,9 @@ NSString * const TURAnselServerPasswordKey = @"password";
 {
     [galleryCombo setDelegate: nil];
     [galleryCombo setDataSource: nil];
-    [galleryCombo setEnabled: false];
-    [mNewGalleryButton setEnabled: false];
+    [galleryCombo setEnabled: NO];
+    [mNewGalleryButton setEnabled: NO];
+    [viewGallery setEnabled: NO];
     
     [currentServer release];
     currentServer = nil;
@@ -441,8 +443,9 @@ NSString * const TURAnselServerPasswordKey = @"password";
 -(void)doConnect
 {
     [galleryCombo deselectItemAtIndex: [galleryCombo indexOfSelectedItem]];
-    [mServersPopUp setEnabled: false];
-    [mNewGalleryButton setEnabled: false];
+    [mServersPopUp setEnabled: NO];
+    [mNewGalleryButton setEnabled: NO];
+    [viewGallery setEnabled: NO];
     [self setStatusText: @"Connecting..."];
     [spinner startAnimation: self];
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -626,7 +629,6 @@ NSString * const TURAnselServerPasswordKey = @"password";
     [galleryCombo reloadData];
     [galleryCombo setEnabled: true];
     [mNewGalleryButton setEnabled: true];
-    
     [self setStatusText: @"Connected" withColor: [NSColor greenColor]];
     [self canExport];
     [spinner stopAnimation: self];
@@ -687,6 +689,8 @@ NSString * const TURAnselServerPasswordKey = @"password";
     [defaultImageView setImage: theImage];
     [theImage release];
     [self canExport];
+    
+    [viewGallery setEnabled: YES];
 }
 
 #pragma mark TURAnselGalleryPanel Notifications

diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib b/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib
index 4fc9a53..939e60f 100644 (file)
--- a/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib
+++ b/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib
@@ -9,7 +9,6 @@
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <integer value="137"/>
-                       <integer value="537"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -582,7 +581,7 @@
                                <nil key="NSViewClass"/>
                                <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
                                <object class="NSView" key="NSWindowView" id="573233790">
-                                       <reference key="NSNextResponder"/>
+                                       <nil key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" key="NSSubviews">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -755,7 +754,6 @@
                                                                        </object>
                                                                        <string key="NSFrame">{{1, 1}, {423, 251}}</string>
                                                                        <reference key="NSSuperview" ref="445821140"/>
-                                                                       <reference key="NSNextKeyView" ref="798730592"/>
                                                                        <reference key="NSDocView" ref="798730592"/>
                                                                        <reference key="NSBGColor" ref="258809705"/>
                                                                        <int key="NScvFlags">6</int>
@@ -783,7 +781,6 @@
                                                        </object>
                                                        <string key="NSFrame">{{20, 60}, {440, 268}}</string>
                                                        <reference key="NSSuperview" ref="573233790"/>
-                                                       <reference key="NSNextKeyView" ref="896759949"/>
                                                        <int key="NSsFlags">50</int>
                                                        <reference key="NSVScroller" ref="34214668"/>
                                                        <reference key="NSHScroller" ref="355872151"/>
@@ -792,7 +789,6 @@
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{480, 327}</string>
-                                       <reference key="NSSuperview"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -1270,26 +1266,6 @@
                                                                                                                                <int key="NSArrowPosition">1</int>
                                                                                                                        </object>
                                                                                                                </object>
-                                                                                                               <object class="NSButton" id="958128994">
-                                                                                                                       <reference key="NSNextResponder" ref="675618554"/>
-                                                                                                                       <int key="NSvFlags">268</int>
-                                                                                                                       <string key="NSFrame">{{363, 10}, {112, 28}}</string>
-                                                                                                                       <reference key="NSSuperview" ref="675618554"/>
-                                                                                                                       <bool key="NSEnabled">YES</bool>
-                                                                                                                       <object class="NSButtonCell" key="NSCell" id="632504823">
-                                                                                                                               <int key="NSCellFlags">604110336</int>
-                                                                                                                               <int key="NSCellFlags2">134348800</int>
-                                                                                                                               <string key="NSContents">Choose Default </string>
-                                                                                                                               <reference key="NSSupport" ref="26"/>
-                                                                                                                               <reference key="NSControlView" ref="958128994"/>
-                                                                                                                               <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="511774165">
                                                                                                                        <reference key="NSNextResponder" ref="675618554"/>
                                                                                                                        <int key="NSvFlags">268</int>
@@ -1297,7 +1273,7 @@
                                                                                                                        <reference key="NSSuperview" ref="675618554"/>
                                                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                                                        <object class="NSButtonCell" key="NSCell" id="645491960">
-                                                                                                                               <int key="NSCellFlags">67239424</int>
+                                                                                                                               <int key="NSCellFlags">604110336</int>
                                                                                                                                <int key="NSCellFlags2">134348800</int>
                                                                                                                                <string key="NSContents">View Gallery</string>
                                                                                                                                <reference key="NSSupport" ref="26"/>
@@ -2070,7 +2046,6 @@
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="239316494"/>
                                                        <reference ref="60291071"/>
-                                                       <reference ref="958128994"/>
                                                        <reference ref="371122794"/>
                                                        <reference ref="597164431"/>
                                                        <reference ref="950269879"/>
@@ -2115,20 +2090,6 @@
                                                <reference key="parent" ref="60291071"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">364</int>
-                                               <reference key="object" ref="958128994"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="632504823"/>
-                                               </object>
-                                               <reference key="parent" ref="664773226"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">467</int>
-                                               <reference key="object" ref="632504823"/>
-                                               <reference key="parent" ref="958128994"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">18</int>
                                                <reference key="object" ref="371122794"/>
                                                <object class="NSMutableArray" key="children">
@@ -2435,8 +2396,6 @@
                                        <string>357.ImportedFromIB2</string>
                                        <string>360.IBPluginDependency</string>
                                        <string>360.ImportedFromIB2</string>
-                                       <string>364.IBPluginDependency</string>
-                                       <string>364.ImportedFromIB2</string>
                                        <string>387.IBEditorWindowLastContentRect</string>
                                        <string>387.IBPluginDependency</string>
                                        <string>387.IBWindowTemplateEditedContentRect</string>
@@ -2557,8 +2516,6 @@
                                        <reference ref="5"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <reference ref="5"/>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <reference ref="5"/>
                                        <string>{{351, 386}, {455, 195}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{351, 386}, {455, 195}}</string>

diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib
index d2ba054..5be88d5 100644 (file)
Binary files a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib and b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib differ