From 839727664b81eafb1191589a38158cf5d9f6ea1e Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Wed, 20 Feb 2013 01:50:43 +0000
Subject: [PATCH] Cocoa Port: - Do some Cocoa bindings cleanup.

---
 .../translations/English.lproj/MainMenu.xib   | 47 ++++++++-----------
 .../userinterface/EmuControllerDelegate.h     |  4 +-
 .../userinterface/EmuControllerDelegate.mm    | 10 ++--
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
index 1201a40f0..ec469b063 100644
--- a/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
+++ b/desmume/src/cocoa/translations/English.lproj/MainMenu.xib
@@ -13,7 +13,6 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="81"/>
-			<integer value="3786"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15062,7 +15061,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<object class="NSView" key="NSWindowView" id="729561310">
-					<reference key="NSNextResponder"/>
+					<nil key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15963,7 +15962,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						</object>
 					</object>
 					<string key="NSFrameSize">{284, 560}</string>
-					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
 				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
@@ -20172,6 +20170,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<string>mainWindow.useBilinearOutput</string>
 					<string>mainWindow.useVerticalSync</string>
 					<string>mainWindow.screenshotFileFormat</string>
+					<string>selectedExportRomSaveID</string>
 				</object>
 				<string key="NSObjectClassName">EmuControllerDelegate</string>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
@@ -27414,30 +27413,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">6719</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectExportRomSaveFormat:</string>
-						<reference key="source" ref="231770064"/>
-						<reference key="destination" ref="98187887"/>
-					</object>
-					<int key="connectionID">6720</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectExportRomSaveFormat:</string>
-						<reference key="source" ref="231770064"/>
-						<reference key="destination" ref="839916386"/>
-					</object>
-					<int key="connectionID">6721</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">selectExportRomSaveFormat:</string>
-						<reference key="source" ref="231770064"/>
-						<reference key="destination" ref="472661265"/>
-					</object>
-					<int key="connectionID">6722</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">changeCoreEmuFlags:</string>
@@ -29237,6 +29212,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">7000</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">selectedTag: selection.selectedExportRomSaveID</string>
+						<reference key="source" ref="996525585"/>
+						<reference key="destination" ref="258098641"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="996525585"/>
+							<reference key="NSDestination" ref="258098641"/>
+							<string key="NSLabel">selectedTag: selection.selectedExportRomSaveID</string>
+							<string key="NSBinding">selectedTag</string>
+							<string key="NSKeyPath">selection.selectedExportRomSaveID</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">7001</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -46650,7 +46641,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">7000</int>
+			<int key="maxID">7001</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.h b/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
index 62ae5646b..2898c371e 100644
--- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
+++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.h
@@ -49,7 +49,6 @@
 	NSView *exportRomSavePanelAccessoryView;
 	
 	BOOL isSaveStateEdited;
-	NSInteger selectedExportRomSaveID;
 	
 	BOOL isWorking;
 	BOOL isRomLoading;
@@ -60,6 +59,7 @@
 	BOOL isShowingFileMigrationDialog;
 	BOOL isUserInterfaceBlockingExecution;
 	NSURL *currentSaveStateURL;
+	NSInteger selectedExportRomSaveID;
 	NSInteger selectedRomSaveTypeID;
 	
 	NSImage *iconVolumeFull;
@@ -114,6 +114,7 @@
 @property (assign) BOOL isShowingFileMigrationDialog;
 @property (assign) BOOL isUserInterfaceBlockingExecution;
 @property (retain) NSURL *currentSaveStateURL;
+@property (assign) NSInteger selectedExportRomSaveID;
 @property (assign) NSInteger selectedRomSaveTypeID;
 
 @property (assign) NSInteger render3DRenderingEngine;
@@ -142,7 +143,6 @@
 - (IBAction) saveEmuSaveStateSlot:(id)sender;
 - (IBAction) importRomSave:(id)sender;
 - (IBAction) exportRomSave:(id)sender;
-- (IBAction) selectExportRomSaveFormat:(id)sender;
 
 // Edit Menu
 - (IBAction) copy:(id)sender;
diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
index fc30f58ee..466e21747 100644
--- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
+++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
@@ -69,6 +69,7 @@
 @synthesize isUserInterfaceBlockingExecution;
 
 @synthesize currentSaveStateURL;
+@synthesize selectedExportRomSaveID;
 @synthesize selectedRomSaveTypeID;
 
 @dynamic render3DRenderingEngine;
@@ -110,8 +111,8 @@
 	isUserInterfaceBlockingExecution = NO;
 	
 	currentSaveStateURL = nil;
-	selectedExportRomSaveID = 0;
 	selectedRomSaveTypeID = ROMSAVETYPE_AUTOMATIC;
+	selectedExportRomSaveID = 0;
 	
 	iconExecute = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Execute_420x420" ofType:@"png"]];
 	iconPause = [[NSImage alloc] initWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Icon_Pause_420x420" ofType:@"png"]];
@@ -749,7 +750,7 @@
 		NSURL *romSaveURL = [CocoaDSFile fileURLFromRomURL:[[self currentRom] fileURL] toKind:@"ROM Save"];
 		if (romSaveURL != nil)
 		{
-			const BOOL isRomSaveExported = [CocoaDSFile exportRomSaveToURL:[panel URL] romSaveURL:romSaveURL fileType:selectedExportRomSaveID];
+			const BOOL isRomSaveExported = [CocoaDSFile exportRomSaveToURL:[panel URL] romSaveURL:romSaveURL fileType:[self selectedExportRomSaveID]];
 			[self setStatusText:(isRomSaveExported) ? NSSTRING_STATUS_ROM_SAVE_EXPORTED : NSSTRING_STATUS_ROM_SAVE_EXPORT_FAILED];
 		}
 	}
@@ -757,11 +758,6 @@
 	[self restoreCoreState];
 }
 
-- (IBAction) selectExportRomSaveFormat:(id)sender
-{
-	selectedExportRomSaveID = [CocoaDSUtil getIBActionSenderTag:sender];
-}
-
 - (IBAction) copy:(id)sender
 {
 	[mainWindow copy:sender];