From: Michael J. Rubinsky Date: Fri, 8 May 2009 22:57:01 +0000 (-0400) Subject: Enable/disable the view gallery button X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4c3b839ae5f684ee47e66943104d3ca2bbdf1e94;p=horde.git Enable/disable the view gallery button --- diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m index a21b99b2b..51f0dfade 100644 --- 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 4fc9a538e..939e60ff0 100644 --- a/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib +++ b/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib @@ -9,7 +9,6 @@ YES - YES @@ -582,7 +581,7 @@ {3.40282e+38, 3.40282e+38} - + 256 YES @@ -755,7 +754,6 @@ {{1, 1}, {423, 251}} - 6 @@ -783,7 +781,6 @@ {{20, 60}, {440, 268}} - 50 @@ -792,7 +789,6 @@ {480, 327} - {{0, 0}, {1920, 1178}} {3.40282e+38, 3.40282e+38} @@ -1270,26 +1266,6 @@ 1 - - - 268 - {{363, 10}, {112, 28}} - - YES - - 604110336 - 134348800 - Choose Default - - - -2038284033 - 129 - - - 200 - 25 - - 268 @@ -1297,7 +1273,7 @@ YES - 67239424 + 604110336 134348800 View Gallery @@ -2070,7 +2046,6 @@ YES - @@ -2115,20 +2090,6 @@ - 364 - - - YES - - - - - - 467 - - - - 18 @@ -2435,8 +2396,6 @@ 357.ImportedFromIB2 360.IBPluginDependency 360.ImportedFromIB2 - 364.IBPluginDependency - 364.ImportedFromIB2 387.IBEditorWindowLastContentRect 387.IBPluginDependency 387.IBWindowTemplateEditedContentRect @@ -2557,8 +2516,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{351, 386}, {455, 195}} com.apple.InterfaceBuilder.CocoaPlugin {{351, 386}, {455, 195}} diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib index d2ba054a6..5be88d567 100644 Binary files a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib and b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib differ