From 5fb82849d7fa24ccbf29aa3f89a52645fbc5d580 Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Mon, 10 Nov 2014 23:38:29 +0000
Subject: OS X: Move the English localization files around.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@92229 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/plugins/DFInput/English.lproj/Credits.rtf       | 17 -----------------
 macosx/plugins/DFInput/English.lproj/InfoPlist.strings |  6 ------
 macosx/plugins/DFInput/en.lproj/Credits.rtf            | 17 +++++++++++++++++
 macosx/plugins/DFInput/en.lproj/InfoPlist.strings      |  6 ++++++
 macosx/plugins/DFInput/macsrc/PadController.h          |  9 ++++-----
 macosx/plugins/DFInput/macsrc/PadController.m          |  3 +++
 6 files changed, 30 insertions(+), 28 deletions(-)
 delete mode 100644 macosx/plugins/DFInput/English.lproj/Credits.rtf
 delete mode 100755 macosx/plugins/DFInput/English.lproj/InfoPlist.strings
 create mode 100644 macosx/plugins/DFInput/en.lproj/Credits.rtf
 create mode 100644 macosx/plugins/DFInput/en.lproj/InfoPlist.strings

(limited to 'macosx/plugins/DFInput')

diff --git a/macosx/plugins/DFInput/English.lproj/Credits.rtf b/macosx/plugins/DFInput/English.lproj/Credits.rtf
deleted file mode 100644
index c03c2bb2..00000000
--- a/macosx/plugins/DFInput/English.lproj/Credits.rtf
+++ /dev/null
@@ -1,17 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
-{\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\pardirnatural
-
-\f0\b\fs24 \cf0 Macintosh Port:
-\b0 \
-	Wei Mingzhi\
-	Gil Pedersen\
-	Nicolas P\'e9pin-Perreault\
-	C.W. \'93Madd the Sane\'94 Betts\
-\
-
-\b Original coder:
-\b0 \
-	Wei Mingzhi}
\ No newline at end of file
diff --git a/macosx/plugins/DFInput/English.lproj/InfoPlist.strings b/macosx/plugins/DFInput/English.lproj/InfoPlist.strings
deleted file mode 100755
index 80f51efb..00000000
--- a/macosx/plugins/DFInput/English.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "DFInput PSX Controller Plugin";
-CFBundleShortVersionString = "DFInput version 1.5";
-CFBundleGetInfoString = "DFInput PSX Controller Plugin version 1.5, Copyright © 2009 Wei Mingzhi.";
-NSHumanReadableCopyright = "Copyright © 2009 Wei Mingzhi.";
diff --git a/macosx/plugins/DFInput/en.lproj/Credits.rtf b/macosx/plugins/DFInput/en.lproj/Credits.rtf
new file mode 100644
index 00000000..c03c2bb2
--- /dev/null
+++ b/macosx/plugins/DFInput/en.lproj/Credits.rtf
@@ -0,0 +1,17 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
+{\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\pardirnatural
+
+\f0\b\fs24 \cf0 Macintosh Port:
+\b0 \
+	Wei Mingzhi\
+	Gil Pedersen\
+	Nicolas P\'e9pin-Perreault\
+	C.W. \'93Madd the Sane\'94 Betts\
+\
+
+\b Original coder:
+\b0 \
+	Wei Mingzhi}
\ No newline at end of file
diff --git a/macosx/plugins/DFInput/en.lproj/InfoPlist.strings b/macosx/plugins/DFInput/en.lproj/InfoPlist.strings
new file mode 100644
index 00000000..80f51efb
--- /dev/null
+++ b/macosx/plugins/DFInput/en.lproj/InfoPlist.strings
@@ -0,0 +1,6 @@
+/* Localized versions of Info.plist keys */
+
+CFBundleName = "DFInput PSX Controller Plugin";
+CFBundleShortVersionString = "DFInput version 1.5";
+CFBundleGetInfoString = "DFInput PSX Controller Plugin version 1.5, Copyright © 2009 Wei Mingzhi.";
+NSHumanReadableCopyright = "Copyright © 2009 Wei Mingzhi.";
diff --git a/macosx/plugins/DFInput/macsrc/PadController.h b/macosx/plugins/DFInput/macsrc/PadController.h
index 4e56a206..62ad66f4 100755
--- a/macosx/plugins/DFInput/macsrc/PadController.h
+++ b/macosx/plugins/DFInput/macsrc/PadController.h
@@ -25,11 +25,10 @@
 #import "PadView.h"
 
 @interface PadController : NSWindowController <NSWindowDelegate>
-{
-    IBOutlet PadView *controllerView;
-    IBOutlet id controllerView1;
-    IBOutlet id controllerView2;
-}
+@property (weak) IBOutlet PadView *controllerView;
+@property (weak) IBOutlet id controllerView1;
+@property (weak) IBOutlet id controllerView2;
+
 
 - (IBAction)cancel:(id)sender;
 - (IBAction)ok:(id)sender;
diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m
index 07030c4c..a848636f 100755
--- a/macosx/plugins/DFInput/macsrc/PadController.m
+++ b/macosx/plugins/DFInput/macsrc/PadController.m
@@ -394,6 +394,9 @@ long DoConfiguration()
 }
 
 @implementation PadController
+@synthesize controllerView;
+@synthesize controllerView1;
+@synthesize controllerView2;
 
 - (IBAction)cancel:(id)sender
 {
-- 
cgit v1.2.3