Messing around with the file handling XIBs.

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

4 files changed, 28 insertions, 12 deletions

diff --git a/macosx/English.lproj/AddPluginSheet.xib b/macosx/English.lproj/AddPluginSheet.xib
index ea68d918..d56102ef 100644
--- a/macosx/English.lproj/AddPluginSheet.xib
+++ b/macosx/English.lproj/AddPluginSheet.xib
@@ -42,8 +42,8 @@
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{177, 439}, {420, 131}}</string>
-				<int key="NSWTFlags">1881669632</int>
-				<string key="NSWindowTitle"/>
+				<int key="NSWTFlags">1881670656</int>
+				<string key="NSWindowTitle">Install Plug-in</string>
 				<string key="NSWindowClass">NSPanel</string>
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
@@ -92,6 +92,7 @@
 							<string key="NSFrame">{{316, 11}, {90, 34}}</string>
 							<reference key="NSSuperview" ref="802729152"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="970797641">
 								<int key="NSCellFlags">67108864</int>
@@ -260,6 +261,8 @@
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{94, 29}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<int key="NSWindowAnimationBehavior">5</int>
+				<int key="NSWindowCollectionBehavior">2</int>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 		</array>
diff --git a/macosx/English.lproj/PcsxrMemCardDocument.xib b/macosx/English.lproj/PcsxrMemCardDocument.xib
index c559b5e7..5b8c96cb 100644
--- a/macosx/English.lproj/PcsxrMemCardDocument.xib
+++ b/macosx/English.lproj/PcsxrMemCardDocument.xib
@@ -39,7 +39,7 @@
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
 				<string key="NSWindowRect">{{133, 235}, {416, 155}}</string>
-				<int key="NSWTFlags">1886912512</int>
+				<int key="NSWTFlags">1886913536</int>
 				<string key="NSWindowTitle">Memory Card</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<string key="NSViewClass">View</string>
@@ -101,7 +101,7 @@
 								<int key="NSButtonFlags2">1</int>
 								<reference key="NSAlternateImage" ref="265803471"/>
 								<string key="NSAlternateContents"/>
-								<string key="NSKeyEquivalent"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
 								<int key="NSPeriodicDelay">200</int>
 								<int key="NSPeriodicInterval">25</int>
 							</object>
@@ -269,6 +269,8 @@
 				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
 				<string key="NSMinSize">{416, 108}</string>
 				<string key="NSMaxSize">{416, 177}</string>
+				<int key="NSWindowAnimationBehavior">5</int>
+				<int key="NSWindowCollectionBehavior">2</int>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomObject" id="796877042">
@@ -328,10 +330,18 @@
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">nextKeyView</string>
+						<reference key="source" ref="665473807"/>
+						<reference key="destination" ref="678958260"/>
+					</object>
+					<int key="connectionID">100047</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
 						<reference key="source" ref="678958260"/>
-						<reference key="destination" ref="665473807"/>
+						<reference key="destination" ref="128155738"/>
 					</object>
-					<int key="connectionID">100033</int>
+					<int key="connectionID">100046</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
@@ -398,6 +408,7 @@
 							<reference ref="300791902"/>
 						</array>
 						<reference key="parent" ref="568628114"/>
+						<string key="objectName">Cancel Button</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100022</int>
@@ -406,6 +417,7 @@
 							<reference ref="492161327"/>
 						</array>
 						<reference key="parent" ref="568628114"/>
+						<string key="objectName">Slot 1 Button</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100023</int>
@@ -476,6 +488,7 @@
 							<reference ref="911160075"/>
 						</array>
 						<reference key="parent" ref="568628114"/>
+						<string key="objectName">Slot 2 Button</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">100037</int>
@@ -510,7 +523,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">100044</int>
+			<int key="maxID">100048</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/macosx/PcsxrMemCardHandler.m b/macosx/PcsxrMemCardHandler.m
index 934414d2..7d043049 100755
--- a/macosx/PcsxrMemCardHandler.m
+++ b/macosx/PcsxrMemCardHandler.m
@@ -56,11 +56,11 @@
 	if (![self window]) {
 		[NSBundle loadNibNamed:@"PcsxrMemCardDocument" owner:self];
 	}
-	[cardPath setObjectValue:[[NSURL fileURLWithPath:theFile] lastPathComponent]];
+	[cardPath setObjectValue:[theFile lastPathComponent]];
 	
 	[NSApp runModalForWindow:[self window]];
 	
-	[[self window] orderOut:self];
+	[[self window] orderOut:nil];
 	
 	if (memChosen != 0) {
 		[ConfigurationController setMemoryCard:memChosen toPath:theFile];
diff --git a/macosx/PcsxrPluginHandler.m b/macosx/PcsxrPluginHandler.m
index 9fcad0ee..a025f111 100755
--- a/macosx/PcsxrPluginHandler.m
+++ b/macosx/PcsxrPluginHandler.m
@@ -58,14 +58,14 @@
 	if (![self window])
 		[NSBundle loadNibNamed:@"AddPluginSheet" owner:self];
 	
-	[pluginName setObjectValue:[[NSURL fileURLWithPath:theFile] lastPathComponent]];
+	[pluginName setObjectValue:[theFile lastPathComponent]];
 	
 	[NSApp runModalForWindow:[self window]];
 	
-	[[self window] orderOut:self];
+	[[self window] orderOut:nil];
 	if (moveOK == YES) {
 		NSURL *supportURL = [[NSFileManager defaultManager] URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL];
-		NSURL *url = [supportURL URLByAppendingPathComponent:@"Pcsxr/PlugIns"];
+		NSURL *url = [[supportURL URLByAppendingPathComponent:@"Pcsxr"] URLByAppendingPathComponent:@"PlugIns"];
 
 		NSFileWrapper *wrapper = [[NSFileWrapper alloc] initWithPath:theFile];
 		NSString *dst = [NSString stringWithFormat:@"%@/%@",