Added a note to the Mac OS X memory editor's source code.

Let's have the tab that opens in Mac preferences be the first tab. Somewhere this got changed.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72671 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 31 insertions, 45 deletions

diff --git a/macosx/English.lproj/Configuration.xib b/macosx/English.lproj/Configuration.xib
index 3b3afa29..5274a275 100644
--- a/macosx/English.lproj/Configuration.xib
+++ b/macosx/English.lproj/Configuration.xib
@@ -67,13 +67,14 @@
 							<string key="NSFrame">{{13, 10}, {526, 344}}</string>
 							<reference key="NSSuperview" ref="644483536"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="309207255"/>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="150404821">
 									<object class="NSMutableString" key="NSIdentifier">
 										<characters key="NS.bytes">1</characters>
 									</object>
 									<object class="NSView" key="NSView" id="309207255">
-										<nil key="NSNextResponder"/>
+										<reference key="NSNextResponder" ref="145760790"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSBox" id="324328678">
@@ -89,6 +90,7 @@
 																<int key="NSvFlags">274</int>
 																<string key="NSFrame">{{18, 51}, {135, 106}}</string>
 																<reference key="NSSuperview" ref="501435377"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="197815183"/>
 																<bool key="NSEnabled">YES</bool>
 																<int key="NSNumRows">5</int>
@@ -293,6 +295,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{17, 16}, {137, 26}}</string>
 																<reference key="NSSuperview" ref="501435377"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="715888890"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSPopUpButtonCell" key="NSCell" id="27092767">
@@ -401,11 +404,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {175, 167}}</string>
 														<reference key="NSSuperview" ref="324328678"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="260387224"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{17, 108}, {179, 184}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="501435377"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -450,6 +455,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">306</int>
 																<string key="NSFrame">{{18, 16}, {238, 40}}</string>
 																<reference key="NSSuperview" ref="593482660"/>
+																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="776429699"/>
 																<bool key="NSEnabled">YES</bool>
 																<int key="NSNumRows">2</int>
@@ -516,11 +522,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {273, 74}}</string>
 														<reference key="NSSuperview" ref="715888890"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="263292685"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{212, 201}, {277, 91}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="593482660"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -553,6 +561,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{18, 16}, {232, 40}}</string>
 																<reference key="NSSuperview" ref="584348218"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView" ref="145760790"/>
 																<bool key="NSEnabled">YES</bool>
 																<int key="NSNumRows">2</int>
 																<int key="NSNumCols">1</int>
@@ -653,11 +663,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {273, 74}}</string>
 														<reference key="NSSuperview" ref="776429699"/>
+														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="874213588"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{212, 108}, {277, 91}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
+												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="584348218"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -679,6 +691,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
+										<reference key="NSSuperview" ref="145760790"/>
+										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="324328678"/>
 									</object>
 									<string key="NSLabel">Emulation</string>
@@ -1416,7 +1430,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<object class="NSTabViewItem" id="683723192">
 									<string key="NSIdentifier">3</string>
 									<object class="NSView" key="NSView" id="782866499">
-										<reference key="NSNextResponder" ref="145760790"/>
+										<nil key="NSNextResponder"/>
 										<int key="NSvFlags">256</int>
 										<array class="NSMutableArray" key="NSSubviews">
 											<object class="NSBox" id="834173564">
@@ -1432,7 +1446,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{13, 50}, {454, 17}}</string>
 																<reference key="NSSuperview" ref="126676794"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="617854318"/>
 																<int key="NSTag">1</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1460,7 +1473,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{123, 2}, {100, 32}}</string>
 																<reference key="NSSuperview" ref="126676794"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="36812309"/>
 																<int key="NSTag">1</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1487,7 +1499,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{231, 2}, {125, 32}}</string>
 																<reference key="NSSuperview" ref="126676794"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="278956568"/>
 																<int key="NSTag">1</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1512,13 +1523,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {480, 82}}</string>
 														<reference key="NSSuperview" ref="834173564"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="368748693"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{8, 199}, {484, 99}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="126676794"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1551,7 +1560,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{13, 47}, {454, 17}}</string>
 																<reference key="NSSuperview" ref="902969450"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="280316263"/>
 																<int key="NSTag">2</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1571,7 +1579,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{123, 3}, {100, 32}}</string>
 																<reference key="NSSuperview" ref="902969450"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="194441705"/>
 																<int key="NSTag">2</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1598,7 +1605,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSvFlags">256</int>
 																<string key="NSFrame">{{232, 3}, {125, 32}}</string>
 																<reference key="NSSuperview" ref="902969450"/>
-																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="753962594"/>
 																<int key="NSTag">2</int>
 																<bool key="NSEnabled">YES</bool>
@@ -1623,13 +1629,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														</array>
 														<string key="NSFrame">{{2, 2}, {480, 79}}</string>
 														<reference key="NSSuperview" ref="278956568"/>
-														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="207334049"/>
 													</object>
 												</array>
 												<string key="NSFrame">{{8, 99}, {484, 96}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
-												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="902969450"/>
 												<string key="NSOffsets">{0, 0}</string>
 												<object class="NSTextFieldCell" key="NSTitleCell">
@@ -1654,7 +1658,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<int key="NSvFlags">268</int>
 												<string key="NSFrame">{{191, 55}, {118, 32}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
-												<reference key="NSWindow"/>
 												<string key="NSReuseIdentifierKey">_NS:687</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="679395404">
@@ -1674,8 +1677,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
-										<reference key="NSSuperview" ref="145760790"/>
-										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="834173564"/>
 									</object>
 									<string key="NSLabel">Memory Cards</string>
@@ -1683,13 +1684,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 									<reference key="NSTabView" ref="145760790"/>
 								</object>
 							</array>
-							<reference key="NSSelectedTabViewItem" ref="683723192"/>
+							<reference key="NSSelectedTabViewItem" ref="150404821"/>
 							<reference key="NSFont" ref="113129670"/>
 							<int key="NSTvFlags">0</int>
 							<bool key="NSAllowTruncatedLabels">YES</bool>
 							<bool key="NSDrawsBackground">YES</bool>
 							<array class="NSMutableArray" key="NSSubviews">
-								<reference ref="782866499"/>
+								<reference ref="309207255"/>
 							</array>
 						</object>
 					</array>
@@ -2972,6 +2973,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="238.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">InitialTabViewItem</string>
+					<object class="IBInitialTabViewItemAttribute" key="NS.object.0">
+						<string key="name">InitialTabViewItem</string>
+						<reference key="object" ref="145760790"/>
+						<reference key="initialTabViewItem" ref="150404821"/>
+					</object>
+				</object>
 				<string key="238.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3281,16 +3290,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NetSfPeopsSPUPluginNamedSlider</string>
-					<string key="superclassName">NSSlider</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/NetSfPeopsSPUPluginNamedSlider.h</string>
-					</object>
-				</object>
-				<object class="IBPartialClassDescription">
 					<string key="className">PluginController</string>
-					<string key="superclassName">NSObject</string>
+					<string key="superclassName">NSWindowController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="cancel:">id</string>
 						<string key="ok:">id</string>
@@ -3311,27 +3312,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="aboutButton">NSButton</string>
-						<string key="configureButton">NSButton</string>
 						<string key="hiCompBox">NSControl</string>
 						<string key="interpolValue">NetSfPeopsSPUPluginNamedSlider</string>
 						<string key="irqWaitBox">NSControl</string>
 						<string key="monoSoundBox">NSControl</string>
-						<string key="pluginMenu">NSPopUpButton</string>
 						<string key="reverbValue">NetSfPeopsSPUPluginNamedSlider</string>
 						<string key="volumeValue">NetSfPeopsSPUPluginNamedSlider</string>
 						<string key="xaEnableBox">NSControl</string>
 						<string key="xaSpeedBox">NSControl</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="aboutButton">
-							<string key="name">aboutButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="configureButton">
-							<string key="name">configureButton</string>
-							<string key="candidateClassName">NSButton</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="hiCompBox">
 							<string key="name">hiCompBox</string>
 							<string key="candidateClassName">NSControl</string>
@@ -3348,10 +3338,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">monoSoundBox</string>
 							<string key="candidateClassName">NSControl</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="pluginMenu">
-							<string key="name">pluginMenu</string>
-							<string key="candidateClassName">NSPopUpButton</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="reverbValue">
 							<string key="name">reverbValue</string>
 							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
diff --git a/macosx/PcsxrMemCardController.m b/macosx/PcsxrMemCardController.m
index de918f74..0b594e71 100644
--- a/macosx/PcsxrMemCardController.m
+++ b/macosx/PcsxrMemCardController.m
@@ -12,6 +12,8 @@
 
 #define MAX_MEMCARD_BLOCKS 15
 
+//FIXME: This code uses similar code to the GTK memory card manager, and both don't recognize saves that span multiple blocks.
+
 static NSImage *imageFromMcd(short * icon)
 {
 	NSBitmapImageRep *imageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:16 pixelsHigh:16 bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
@@ -266,12 +268,11 @@ static inline void CopyMemcardData(char *from, char *to, int *i, char *str, int
 		if (memCardSelect == 1) {
 			CreateMcd(Config.Mcd1);
 			LoadMcd(1, Config.Mcd1);
-			[self loadMemoryCardInfoForCard:1];
 		} else {
 			CreateMcd(Config.Mcd2);
 			LoadMcd(2, Config.Mcd2);
-			[self loadMemoryCardInfoForCard:2];
 		}
+		[self loadMemoryCardInfoForCard:memCardSelect];
 	}
 }
 
@@ -336,11 +337,10 @@ static inline void CopyMemcardData(char *from, char *to, int *i, char *str, int
 		
 		if (memCardSelect == 1) {
 			LoadMcd(1, Config.Mcd1);
-			[self loadMemoryCardInfoForCard:1];
 		} else {
 			LoadMcd(2, Config.Mcd2);
-			[self loadMemoryCardInfoForCard:2];
 		}
+		[self loadMemoryCardInfoForCard:memCardSelect];
 	}
 }