Rebranding.

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

16 files changed, 25 insertions, 79 deletions

diff --git a/macosx/plugins/DFCdrom/Info.plist b/macosx/plugins/DFCdrom/Info.plist
index ee25402f..6556485a 100644
--- a/macosx/plugins/DFCdrom/Info.plist
+++ b/macosx/plugins/DFCdrom/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
-	<string>net.pcsx.DFCdrom</string>
+	<string>net.pcsxr.DFCdrom</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
index 3b288fa8..86146a24 100644
--- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
@@ -22,7 +22,7 @@
 #import "PluginConfigController.h"
 #include "cdr.h"
 
-#define APP_ID @"net.pcsx.DFCdrom"
+#define APP_ID @"net.pcsxr.DFCdrom"
 #define PrefsKey APP_ID @" Settings"
 
 static PluginConfigController *windowController;
diff --git a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
index 9af9d261..61c11670 100644
--- a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
@@ -63,7 +63,7 @@
 		71D88862130F032700F150FF /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71D8882C130F032700F150FF /* SDL_error_c.h */; };
 		71E861B611FF75AC001C1826 /* PadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861AC11FF75AC001C1826 /* PadView.h */; };
 		71E861B711FF75AC001C1826 /* PadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861AD11FF75AC001C1826 /* PadView.m */; };
-		71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */; };
+		71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */; };
 		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
 		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
 /* End PBXBuildFile section */
@@ -127,7 +127,7 @@
 		71E861AB11FF75AC001C1826 /* PadController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadController.m; path = macsrc/PadController.m; sourceTree = "<group>"; };
 		71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = "<group>"; };
 		71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = "<group>"; };
-		71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxHIDInputPluginMain.nib; sourceTree = "<group>"; };
+		71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.nib; sourceTree = "<group>"; };
 		8D576316048677EA00EA77CD /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
 		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -177,7 +177,7 @@
 			isa = PBXGroup;
 			children = (
 				7136F51812011BB4001973D9 /* Credits.rtf */,
-				71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */,
+				71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */,
 				8D576317048677EA00EA77CD /* Info.plist */,
 				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
 			);
@@ -431,7 +431,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
-				71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */,
+				71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */,
 				7136F51A12011BB4001973D9 /* Credits.rtf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -487,12 +487,12 @@
 			name = Credits.rtf;
 			sourceTree = "<group>";
 		};
-		71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */ = {
+		71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				71E861BB11FF75BA001C1826 /* English */,
 			);
-			name = NetPcsxHIDInputPluginMain.nib;
+			name = NetPcsxrHIDInputPluginMain.nib;
 			sourceTree = "<group>";
 		};
 		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib
deleted file mode 100644
index ac067a68..00000000
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            CLASS = NetPcsxHIDInputPluginMappingCell; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSTextFieldCell; 
-        }, 
-        {
-            ACTIONS = {cancel = id; ok = id; setKey = id; }; 
-            CLASS = NetPcsxHIDInputPluginPadController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                controllerView = NetPcsxHIDInputPluginPadView; 
-                controllerView1 = id; 
-                controllerView2 = id; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {
-            ACTIONS = {setDevice = id; setType = id; }; 
-            CLASS = NetPcsxHIDInputPluginPadView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                deviceMenu = NSPopUpButton; 
-                tableView = NSTableView; 
-                typeMenu = NSPopUpButton; 
-            }; 
-            SUPERCLASS = NSView; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib
deleted file mode 100644
index 27f6df15..00000000
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>54 67 576 240 0 0 1024 746 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>16</key>
-		<string>293 323 437 378 0 0 1024 746 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>446.1</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>16</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8P2137</string>
-</dict>
-</plist>
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib
deleted file mode 100644
index 793f3948..00000000
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib
+++ /dev/null
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h
index 176d403b..af0d0407 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.h
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.h
@@ -19,7 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses>.
  */
 
-#define ControllerList NetPcsxHIDInputPluginControllerList
+#define ControllerList NetPcsxrHIDInputPluginControllerList
 
 #import <Foundation/Foundation.h>
 #import <AppKit/NSTableView.h>
diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.h b/macosx/plugins/DFInput/macsrc/MappingCell.h
index f803696a..311d0c46 100644
--- a/macosx/plugins/DFInput/macsrc/MappingCell.h
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.h
@@ -19,7 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses>.
  */
 
-#define MappingCell NetPcsxHIDInputPluginMappingCell
+#define MappingCell NetPcsxrHIDInputPluginMappingCell
 
 #import <AppKit/AppKit.h>
 
diff --git a/macosx/plugins/DFInput/macsrc/PadController.h b/macosx/plugins/DFInput/macsrc/PadController.h
index 26a5a152..63a1b1d2 100644
--- a/macosx/plugins/DFInput/macsrc/PadController.h
+++ b/macosx/plugins/DFInput/macsrc/PadController.h
@@ -19,7 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses>.
  */
 
-#define PadController NetPcsxHIDInputPluginPadController
+#define PadController NetPcsxrHIDInputPluginPadController
 
 #import <Cocoa/Cocoa.h>
 #import "PadView.h"
diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m
index 06bce2eb..49edcf21 100644
--- a/macosx/plugins/DFInput/macsrc/PadController.m
+++ b/macosx/plugins/DFInput/macsrc/PadController.m
@@ -26,7 +26,7 @@
 static NSWindow *padWindow;
 static PadController *padController;
 
-#define APP_ID @"net.pcsx.DFInputPlugin"
+#define APP_ID @"net.pcsxr.DFInputPlugin"
 
 void DoAbout() {
 	// Get parent application instance
@@ -63,7 +63,7 @@ long DoConfiguration() {
 
 	if (padWindow == nil) {
 		if (padController == nil) {
-			padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxHIDInputPluginMain"];
+			padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"];
 		}
 		padWindow = [padController window];
 	}
diff --git a/macosx/plugins/DFInput/macsrc/PadView.h b/macosx/plugins/DFInput/macsrc/PadView.h
index f99686c9..1d8d4a09 100644
--- a/macosx/plugins/DFInput/macsrc/PadView.h
+++ b/macosx/plugins/DFInput/macsrc/PadView.h
@@ -19,7 +19,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses>.
  */
 
-#define PadView NetPcsxHIDInputPluginPadView
+#define PadView NetPcsxrHIDInputPluginPadView
 
 #import <Cocoa/Cocoa.h>
 #import "ControllerList.h"
diff --git a/macosx/plugins/DFInput/macsrc/cfg.c b/macosx/plugins/DFInput/macsrc/cfg.c
index 9465426c..dec4ff3f 100644
--- a/macosx/plugins/DFInput/macsrc/cfg.c
+++ b/macosx/plugins/DFInput/macsrc/cfg.c
@@ -118,7 +118,7 @@ void LoadPADConfig() {
 
 	SetDefaultConfig();
 
-	sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
+	sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
 
 	fp = fopen(buf, "r");
 	if (fp == NULL) {
@@ -272,7 +272,7 @@ void SavePADConfig() {
 	int			i;
 	char		buf[256];
 
-	sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
+	sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
 
 	fp = fopen(buf, "w");
 	if (fp == NULL) {
diff --git a/macosx/plugins/DFSound/English.lproj/InfoPlist.strings b/macosx/plugins/DFSound/English.lproj/InfoPlist.strings
index d4f51d87..e29789b1 100755
--- a/macosx/plugins/DFSound/English.lproj/InfoPlist.strings
+++ b/macosx/plugins/DFSound/English.lproj/InfoPlist.strings
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index 781508be..73c85711 100644
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -1,7 +1,7 @@
 
 /* All the various stuff needed for configuration is done here, 
    including reading the Config file and displaying a dialog box
-   AboutDlgProc() is a plug-in function called from the PCSX app, as is
+   AboutDlgProc() is a plug-in function called from the PCSXR app, as is
    DlgProc()
 */
 
@@ -74,7 +74,7 @@ void PrepFactoryDefaultPreferences(void)
     // THE place to find the names of settings.
     // If it's not here, you can't set it.
 
-    // create or read a sub-dictionary beneath the main PCSX app prefs.
+    // create or read a sub-dictionary beneath the main PCSXR app prefs.
     // dictionary is named "net.sf.GpuOpenGLPlugin Settings"
     // and contains all our key/values
     // the prefs .plist will store this dictionary ("net.sf...") as an object
@@ -125,12 +125,12 @@ void PrepFactoryDefaultPreferences(void)
 
 void ReadConfig(void)
 {
-    // set up PCSX GPU plug's global variables according to user preferences.
-    // this is called from the PCSX GPU plugin thread via GPUOpen.
+    // set up PCSXR GPU plug's global variables according to user preferences.
+    // this is called from the PCSXR GPU plugin thread via GPUOpen.
     
     // has nothing to do with the Configuration dialog box, btw., other than the
     // fact that the config dialog writes to user prefs. This only reads, which
-    // is important because PCSX will change its globals on the fly
+    // is important because PCSXR will change its globals on the fly
     // and saving those new ad hoc changes is Bad for the user.
     
     PrepFactoryDefaultPreferences(); // in case user deletes, or on new startup
@@ -139,7 +139,7 @@ void ReadConfig(void)
     NSDictionary* keyValues = [[NSUserDefaults standardUserDefaults] dictionaryForKey:PrefsKey];
 
 
-    // bind all prefs settings to their PCSX counterparts
+    // bind all prefs settings to their PCSXR counterparts
     // with a little finagling to make it work as expected
 	iShowFPS = [[keyValues objectForKey:@"FPS Counter"] boolValue];
     
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
index 9322a01f..a60a4b81 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
@@ -1,7 +1,7 @@
 /***************************************************************************
     PluginWindowController.h
     The big bad boy that controls/creates the game window, the openGLView, and
-    communicates with PCSX itself
+    communicates with PCSXR itself
     PeopsOpenGPU
   
     Created by Gil Pedersen on Mon April 11 2004.
@@ -20,7 +20,7 @@
 
 /*
     In truth, this controller should be the ONLY place that glues between the 
-    running PCSX gpu and the mac interface. 
+    running PCSXR gpu and the mac interface. 
     ATM, some of the glue is here, some of it in drawgl.m, and a couple
     of bits are in the config controller...
 */
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
index 88bfa7db..0636490a 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
@@ -1,7 +1,7 @@
 /***************************************************************************
     PluginWindowController.m
     The big bad boy that controls/creates the game window, the openGLView, and
-    communicates with PCSX itself
+    communicates with PCSXR itself
     
     PeopsOpenGPU