From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Tue, 1 Sep 2009 05:05:21 +0000 (-0400)
Subject: Get rid of some Actions and Outlets that aren't needed for the Aperture
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=80871772627cdc6ceb00433604ecc7fcbbaf4426;p=horde.git

Get rid of some Actions and Outlets that aren't needed for the Aperture
version of this exporter.
---

diff --git a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h
index 2cccc7076..91b91277b 100644
--- a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h
+++ b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.h
@@ -42,8 +42,6 @@
     IBOutlet NSImageView *defaultImageView;
     IBOutlet NSButton *mNewGalleryButton;
     IBOutlet NSPopUpButton *mServersPopUp;
-    IBOutlet NSButton *mCancelConnect;
-    IBOutlet NSTextField *mImageCountLabel;
     
     // New Server sheet
     IBOutlet NSWindow *newServerSheet;
@@ -73,17 +71,13 @@
     TURAnsel *_anselController;
     NSMutableArray *_browserData;
     
-    // Remembers the selected server before it changes. Used to reselect the
-    // proper server if necessary when server panels are closed.
-    int mIndexOfPreviouslySelectedServer;
+    BOOL isExporting;
 }
 
 - (IBAction) showNewGallery: (id)sender;
 - (IBAction) doAddServer: (id)sender;
 - (IBAction) doCancelAddServer: (id)sender;
 - (IBAction) clickServer: (id)sender;
-- (IBAction) clickCancelConnect: (id)sender;
-
 - (IBAction) clickViewGallery: (id)sender;
 - (IBAction) closeGalleryView: (id)sender;
 
diff --git a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
index 72c6ee888..1555f8bd2 100644
--- a/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
+++ b/ApertureToAnselExportPlugin/ApertureToAnselExportPlugin.m
@@ -320,6 +320,7 @@ NSString * const TURAnselServerPasswordKey = @"password";
     [[NSNotificationCenter defaultCenter] removeObserver: self 
                                                     name: @"NSPopUpButtonWillPopUpNotification"
                                                   object: nil];
+    [_anselController cancel];
     [_exportManager shouldCancelExport];
 }
 
diff --git a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/classes.nib b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/classes.nib
index 7e69241b5..b342825c7 100644
--- a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/classes.nib
+++ b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/classes.nib
@@ -60,10 +60,6 @@
 				<string>NSComboBox</string>
 				<key>lastView</key>
 				<string>NSView</string>
-				<key>mCancelConnect</key>
-				<string>NSButton</string>
-				<key>mImageCountLabel</key>
-				<string>NSTextField</string>
 				<key>mMakeNewServerDefault</key>
 				<string>NSButton</string>
 				<key>mNewGalleryButton</key>
diff --git a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib
index 16c7596e9..796131938 100644
Binary files a/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib and b/ApertureToAnselExportPlugin/English.lproj/ApertureToAnselExportPlugin.nib/keyedobjects.nib differ