From ee2cb87959238e1f216ff83a8feb03c8d84a25f4 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Tue, 29 Nov 2011 04:27:27 +0000
Subject: Removing unused outlets. Naming some stuff in the xib to be more
 user-friendly.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72694 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/English.lproj/MemCardManager.xib | 33 +++------------------------------
 macosx/PcsxrMemCardController.h         |  2 --
 macosx/PcsxrMemCardController.m         |  2 +-
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/macosx/English.lproj/MemCardManager.xib b/macosx/English.lproj/MemCardManager.xib
index f661d0a0..514b14cb 100644
--- a/macosx/English.lproj/MemCardManager.xib
+++ b/macosx/English.lproj/MemCardManager.xib
@@ -605,22 +605,6 @@
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">leftMove</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="146799775"/>
-					</object>
-					<int key="connectionID">13</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">rightMove</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="589069415"/>
-					</object>
-					<int key="connectionID">14</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">memCard1view</string>
@@ -963,6 +947,7 @@
 						<int key="objectID">16</int>
 						<reference key="object" ref="810056114"/>
 						<reference key="parent" ref="3271293"/>
+						<string key="objectName">Memory Card 2 view</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">17</int>
@@ -987,6 +972,7 @@
 							<reference ref="1010857926"/>
 						</object>
 						<reference key="parent" ref="1002"/>
+						<string key="objectName">MemCardObjectView</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">23</int>
@@ -1013,6 +999,7 @@
 						<int key="objectID">26</int>
 						<reference key="object" ref="311112059"/>
 						<reference key="parent" ref="61726387"/>
+						<string key="objectName">Memory Card 1 view</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">36</int>
@@ -1304,34 +1291,24 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>leftMove</string>
 							<string>memCard1view</string>
 							<string>memCard2view</string>
-							<string>rightMove</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSButton</string>
 							<string>NSCollectionView</string>
 							<string>NSCollectionView</string>
-							<string>NSButton</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>leftMove</string>
 							<string>memCard1view</string>
 							<string>memCard2view</string>
-							<string>rightMove</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">leftMove</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">memCard1view</string>
 								<string key="candidateClassName">NSCollectionView</string>
@@ -1340,10 +1317,6 @@
 								<string key="name">memCard2view</string>
 								<string key="candidateClassName">NSCollectionView</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">rightMove</string>
-								<string key="candidateClassName">NSButton</string>
-							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/macosx/PcsxrMemCardController.h b/macosx/PcsxrMemCardController.h
index ae8d939f..c6d05121 100644
--- a/macosx/PcsxrMemCardController.h
+++ b/macosx/PcsxrMemCardController.h
@@ -13,8 +13,6 @@
 {
 	IBOutlet NSCollectionView *memCard1view;
 	IBOutlet NSCollectionView *memCard2view;
-	IBOutlet NSButton *leftMove;
-	IBOutlet NSButton *rightMove;
 	NSMutableArray *memCard1Array;
 	NSMutableArray *memCard2Array;
 }
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index 0b594e71..0fc44a90 100644
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -45,9 +45,9 @@ static NSImage *imageFromMcd(short * icon)
 #endif
 	NSImage *theImage = [[NSImage alloc] init];
 	[theImage addRepresentation:imageRep];
+	[imageRep release];
 	[theImage setScalesWhenResized:YES];
 	[theImage setSize:NSMakeSize(32, 32)];
-	[imageRep release];
 	return [theImage autorelease];
 }
 
-- 
cgit v1.2.3