From 5f868fa161d5827e45a060a0b17b44a997625315 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Wed, 8 Jun 2011 09:27:25 +0000 Subject: Rebranding. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67621 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- .../DFInput/DFInput.xcodeproj/project.pbxproj | 12 ++++---- .../NetPcsxHIDInputPluginMain.nib/classes.nib | 33 --------------------- .../NetPcsxHIDInputPluginMain.nib/info.nib | 21 ------------- .../NetPcsxHIDInputPluginMain.nib/keyedobjects.nib | Bin 12060 -> 0 bytes macosx/plugins/DFInput/macsrc/ControllerList.h | 2 +- macosx/plugins/DFInput/macsrc/MappingCell.h | 2 +- macosx/plugins/DFInput/macsrc/PadController.h | 2 +- macosx/plugins/DFInput/macsrc/PadController.m | 4 +-- macosx/plugins/DFInput/macsrc/PadView.h | 2 +- macosx/plugins/DFInput/macsrc/cfg.c | 4 +-- 10 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib delete mode 100644 macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib delete mode 100644 macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib (limited to 'macosx/plugins/DFInput') 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 = ""; }; 71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = ""; }; 71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = ""; }; - 71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxHIDInputPluginMain.nib; sourceTree = ""; }; + 71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.nib; sourceTree = ""; }; 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 = ""; }; /* 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 = ""; }; - 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */ = { + 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */ = { isa = PBXVariantGroup; children = ( 71E861BB11FF75BA001C1826 /* English */, ); - name = NetPcsxHIDInputPluginMain.nib; + name = NetPcsxrHIDInputPluginMain.nib; sourceTree = ""; }; 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 @@ - - - - - IBDocumentLocation - 54 67 576 240 0 0 1024 746 - IBEditorPositions - - 16 - 293 323 437 378 0 0 1024 746 - - IBFramework Version - 446.1 - IBOpenObjects - - 16 - - IBSystem Version - 8P2137 - - 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 Binary files a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib and /dev/null differ 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 . */ -#define ControllerList NetPcsxHIDInputPluginControllerList +#define ControllerList NetPcsxrHIDInputPluginControllerList #import #import 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 . */ -#define MappingCell NetPcsxHIDInputPluginMappingCell +#define MappingCell NetPcsxrHIDInputPluginMappingCell #import 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 . */ -#define PadController NetPcsxHIDInputPluginPadController +#define PadController NetPcsxrHIDInputPluginPadController #import #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 . */ -#define PadView NetPcsxHIDInputPluginPadView +#define PadView NetPcsxrHIDInputPluginPadView #import #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) { -- cgit v1.2.3