Mac Patch 13437.

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

2 files changed, 64 insertions, 61 deletions

diff --git a/macosx/plugins/DFInput/English.lproj/Credits.rtf b/macosx/plugins/DFInput/English.lproj/Credits.rtf
index 1a837294..894a64cb 100644
--- a/macosx/plugins/DFInput/English.lproj/Credits.rtf
+++ b/macosx/plugins/DFInput/English.lproj/Credits.rtf
@@ -1,17 +1,18 @@
-{\rtf1\mac\ansicpg10025\cocoartf824\cocoasubrtf420
-{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
+{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf510
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \vieww9000\viewh9000\viewkind0
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \f0\b\fs24 \cf0 Macintosh Port:
-\f1\b0 \
+\b0 \
   Wei Mingzhi\
   Gil Pedersen\
+  Nicolas P\'e9pin-Perreault\
 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
 
-\f0\b \cf0 Original coder:
-\f1\b0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+\b \cf0 Original coder:
+\b0 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 \cf0   Wei Mingzhi}
\ No newline at end of file
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
index e519f5e7..ccf49bd8 100644
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
+++ b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.xib
@@ -2,34 +2,34 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11C74</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
-		<string key="IBDocument.AppKitVersion">1138.23</string>
-		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<string key="IBDocument.SystemVersion">11G63</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2844</string>
+		<string key="IBDocument.AppKitVersion">1138.51</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1938</string>
+			<string key="NS.object.0">2844</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSPopUpButtonCell</string>
-			<string>NSTextField</string>
-			<string>NSScroller</string>
-			<string>NSTableHeaderView</string>
 			<string>NSButton</string>
-			<string>NSPopUpButton</string>
-			<string>NSScrollView</string>
 			<string>NSButtonCell</string>
-			<string>NSTextFieldCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
 			<string>NSMenu</string>
 			<string>NSMenuItem</string>
-			<string>NSTableView</string>
+			<string>NSPopUpButton</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSScrollView</string>
+			<string>NSScroller</string>
 			<string>NSTabView</string>
-			<string>NSCustomView</string>
 			<string>NSTabViewItem</string>
+			<string>NSTableColumn</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableView</string>
+			<string>NSTextField</string>
+			<string>NSTextFieldCell</string>
 			<string>NSView</string>
 			<string>NSWindowTemplate</string>
-			<string>NSTableColumn</string>
-			<string>NSCustomObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -69,7 +69,6 @@
 							<int key="NSvFlags">274</int>
 							<string key="NSFrame">{{13, 40}, {437, 378}}</string>
 							<reference key="NSSuperview" ref="608407176"/>
-							<reference key="NSWindow"/>
 							<array class="NSMutableArray" key="NSTabViewItems">
 								<object class="NSTabViewItem" id="370841406">
 									<string key="NSIdentifier">pad1</string>
@@ -82,14 +81,12 @@
 												<int key="NSvFlags">274</int>
 												<string key="NSFrameSize">{417, 332}</string>
 												<reference key="NSSuperview" ref="483107053"/>
-												<reference key="NSWindow"/>
 												<string key="NSClassName">NSView</string>
 												<string key="NSExtension">NSResponder</string>
 											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {417, 332}}</string>
 										<reference key="NSSuperview" ref="1024964375"/>
-										<reference key="NSWindow"/>
 									</object>
 									<string key="NSLabel">Controller 1</string>
 									<object class="NSColor" key="NSColor" id="809892731">
@@ -143,7 +140,6 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{328, 12}, {121, 32}}</string>
 							<reference key="NSSuperview" ref="608407176"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="180659799">
 								<int key="NSCellFlags">67239424</int>
@@ -165,7 +161,6 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{207, 12}, {121, 32}}</string>
 							<reference key="NSSuperview" ref="608407176"/>
-							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="202058205">
 								<int key="NSCellFlags">67239424</int>
@@ -187,7 +182,6 @@
 					</array>
 					<string key="NSFrameSize">{463, 424}</string>
 					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
 				<string key="NSMinSize">{310, 182}</string>
@@ -200,7 +194,7 @@
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="NSScrollView" id="11581300">
 						<reference key="NSNextResponder" ref="610373624"/>
-						<int key="NSvFlags">274</int>
+						<int key="NSvFlags">314</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="NSClipView" id="675379878">
 								<reference key="NSNextResponder" ref="11581300"/>
@@ -209,7 +203,7 @@
 									<object class="NSTableView" id="1024738144">
 										<reference key="NSNextResponder" ref="675379878"/>
 										<int key="NSvFlags">256</int>
-										<string key="NSFrameSize">{375, 233}</string>
+										<string key="NSFrameSize">{366, 233}</string>
 										<reference key="NSSuperview" ref="675379878"/>
 										<reference key="NSWindow"/>
 										<int key="NSTag">1</int>
@@ -217,21 +211,23 @@
 										<object class="NSTableHeaderView" key="NSHeaderView" id="901683476">
 											<reference key="NSNextResponder" ref="98843995"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{375, 17}</string>
+											<string key="NSFrameSize">{366, 17}</string>
 											<reference key="NSSuperview" ref="98843995"/>
 											<reference key="NSWindow"/>
 											<reference key="NSTableView" ref="1024738144"/>
 										</object>
-										<object class="_NSCornerView" key="NSCornerView">
-											<nil key="NSNextResponder"/>
+										<object class="_NSCornerView" key="NSCornerView" id="600510097">
+											<reference key="NSNextResponder" ref="11581300"/>
 											<int key="NSvFlags">256</int>
-											<string key="NSFrame">{{361, 0}, {16, 17}}</string>
+											<string key="NSFrame">{{367, 0}, {16, 17}}</string>
+											<reference key="NSSuperview" ref="11581300"/>
+											<reference key="NSWindow"/>
 										</object>
 										<array class="NSMutableArray" key="NSTableColumns">
 											<object class="NSTableColumn" id="559669958">
 												<string key="NSIdentifier">key</string>
-												<double key="NSWidth">76</double>
-												<double key="NSMinWidth">76</double>
+												<double key="NSWidth">120</double>
+												<double key="NSMinWidth">100</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
 													<int key="NSCellFlags">75628096</int>
@@ -276,7 +272,7 @@
 											</object>
 											<object class="NSTableColumn" id="486323483">
 												<string key="NSIdentifier">button</string>
-												<double key="NSWidth">292.96499633789062</double>
+												<double key="NSWidth">239.96499633789062</double>
 												<double key="NSMinWidth">46.965000152587891</double>
 												<double key="NSMaxWidth">1000</double>
 												<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -320,7 +316,7 @@
 											</object>
 										</object>
 										<double key="NSRowHeight">14</double>
-										<int key="NSTvFlags">851443712</int>
+										<int key="NSTvFlags">1925185536</int>
 										<reference key="NSDelegate"/>
 										<reference key="NSDataSource"/>
 										<int key="NSGridStyleMask">1</int>
@@ -332,7 +328,7 @@
 										<int key="NSTableViewGroupRowStyle">1</int>
 									</object>
 								</array>
-								<string key="NSFrame">{{1, 17}, {375, 233}}</string>
+								<string key="NSFrame">{{1, 17}, {366, 233}}</string>
 								<reference key="NSSuperview" ref="11581300"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="1024738144"/>
@@ -348,7 +344,7 @@
 							<object class="NSScroller" id="917222594">
 								<reference key="NSNextResponder" ref="11581300"/>
 								<int key="NSvFlags">256</int>
-								<string key="NSFrame">{{361, 17}, {15, 233}}</string>
+								<string key="NSFrame">{{367, 17}, {15, 233}}</string>
 								<reference key="NSSuperview" ref="11581300"/>
 								<reference key="NSWindow"/>
 								<reference key="NSTarget" ref="11581300"/>
@@ -372,7 +368,7 @@
 								<array class="NSMutableArray" key="NSSubviews">
 									<reference ref="901683476"/>
 								</array>
-								<string key="NSFrame">{{1, 0}, {375, 17}}</string>
+								<string key="NSFrame">{{1, 0}, {366, 17}}</string>
 								<reference key="NSSuperview" ref="11581300"/>
 								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="901683476"/>
@@ -380,8 +376,9 @@
 								<reference key="NSBGColor" ref="650028954"/>
 								<int key="NScvFlags">4</int>
 							</object>
+							<reference ref="600510097"/>
 						</array>
-						<string key="NSFrame">{{20, 42}, {377, 251}}</string>
+						<string key="NSFrame">{{20, 42}, {383, 251}}</string>
 						<reference key="NSSuperview" ref="610373624"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="675379878"/>
@@ -390,12 +387,13 @@
 						<reference key="NSHScroller" ref="229079282"/>
 						<reference key="NSContentView" ref="675379878"/>
 						<reference key="NSHeaderClipView" ref="98843995"/>
+						<reference key="NSCornerView" ref="600510097"/>
 						<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
 					</object>
 					<object class="NSPopUpButton" id="633744190">
 						<reference key="NSNextResponder" ref="610373624"/>
-						<int key="NSvFlags">289</int>
-						<string key="NSFrame">{{295, 297}, {105, 22}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{301, 297}, {105, 22}}</string>
 						<reference key="NSSuperview" ref="610373624"/>
 						<reference key="NSWindow"/>
 						<int key="NSTag">2</int>
@@ -464,8 +462,8 @@
 					</object>
 					<object class="NSTextField" id="21744521">
 						<reference key="NSNextResponder" ref="610373624"/>
-						<int key="NSvFlags">291</int>
-						<string key="NSFrame">{{259, 302}, {34, 14}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{265, 302}, {34, 14}}</string>
 						<reference key="NSSuperview" ref="610373624"/>
 						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
@@ -481,8 +479,8 @@
 					</object>
 					<object class="NSTextField" id="1037715050">
 						<reference key="NSNextResponder" ref="610373624"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{17, 20}, {383, 14}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{23, 20}, {383, 14}}</string>
 						<reference key="NSSuperview" ref="610373624"/>
 						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
@@ -501,8 +499,8 @@
 					</object>
 					<object class="NSPopUpButton" id="123438231">
 						<reference key="NSNextResponder" ref="610373624"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{62, 297}, {195, 22}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{68, 297}, {195, 22}}</string>
 						<reference key="NSSuperview" ref="610373624"/>
 						<reference key="NSWindow"/>
 						<int key="NSTag">1</int>
@@ -550,8 +548,8 @@
 					</object>
 					<object class="NSTextField" id="297546866">
 						<reference key="NSNextResponder" ref="610373624"/>
-						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{17, 299}, {43, 17}}</string>
+						<int key="NSvFlags">303</int>
+						<string key="NSFrame">{{20, 299}, {48, 19}}</string>
 						<reference key="NSSuperview" ref="610373624"/>
 						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
@@ -566,7 +564,7 @@
 						</object>
 					</object>
 				</array>
-				<string key="NSFrameSize">{417, 336}</string>
+				<string key="NSFrameSize">{423, 336}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
 				<string key="NSClassName">NetPcsxrHIDInputPluginPadView</string>
@@ -1035,6 +1033,14 @@
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
+					<string key="className">NetPcsxrHIDInputPluginMappingCell</string>
+					<string key="superclassName">NSTextFieldCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NetPcsxrHIDInputPluginMappingCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NetPcsxrHIDInputPluginPadController</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1058,15 +1064,11 @@
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
 			<real value="1060" key="NS.object.0"/>
 		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<real value="1060" key="NS.object.0"/>
-		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSMenuCheckmark">{9, 8}</string>
-			<string key="NSMenuMixedState">{7, 2}</string>
+			<string key="NSMenuCheckmark">{11, 11}</string>
+			<string key="NSMenuMixedState">{10, 3}</string>
 		</dictionary>
 	</data>
 </archive>