Preference changes in OS X plug-ins.

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

1 files changed, 40 insertions, 34 deletions

diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.m b/macosx/plugins/DFInput/macsrc/ControllerList.m
index a3c934ac..01116c2d 100755
--- a/macosx/plugins/DFInput/macsrc/ControllerList.m
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.m
@@ -28,41 +28,47 @@ static int currentController;
 static NSArray *labelText;
 
 @implementation ControllerList
+
++ (void)initialize
+{
+	if (!labelText) {
+		NSBundle *plugBundle = [NSBundle bundleForClass:[ControllerList class]];
+		labelText = @[[plugBundle localizedStringForKey:@"D-Pad Up" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"D-Pad Down" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"D-Pad Left" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"D-Pad Right" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Cross" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Circle" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Square" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Triangle" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"L1" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"R1" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"L2" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"R2" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Select" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Start" value:@"" table:nil],
+				
+				[plugBundle localizedStringForKey:@"L3" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"R3" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"Analog" value:@"" table:nil],
+				
+				[plugBundle localizedStringForKey:@"L-Stick Right" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"L-Stick Left" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"L-Stick Down" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"L-Stick Up" value:@"" table:nil],
+				
+				[plugBundle localizedStringForKey:@"R-Stick Right" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"R-Stick Left" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"R-Stick Down" value:@"" table:nil],
+				[plugBundle localizedStringForKey:@"R-Stick Up" value:@"" table:nil]];
+		RETAINOBJ(labelText);
+	}
+}
+
 - (id)initWithConfig
 {
 	if (self = [super init]) {
-		NSBundle *plugBundle = [NSBundle bundleForClass:[self class]];
-		if (!labelText) {
-			labelText = @[[plugBundle localizedStringForKey:@"D-Pad Up" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"D-Pad Down" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"D-Pad Left" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"D-Pad Right" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Cross" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Circle" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Square" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Triangle" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"L1" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"R1" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"L2" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"R2" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Select" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Start" value:@"" table:nil],
-				 
-				 [plugBundle localizedStringForKey:@"L3" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"R3" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"Analog" value:@"" table:nil],
-				 
-				 [plugBundle localizedStringForKey:@"L-Stick Right" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"L-Stick Left" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"L-Stick Down" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"L-Stick Up" value:@"" table:nil],
-				 
-				 [plugBundle localizedStringForKey:@"R-Stick Right" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"R-Stick Left" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"R-Stick Down" value:@"" table:nil],
-				 [plugBundle localizedStringForKey:@"R-Stick Up" value:@"" table:nil]];
-			RETAINOBJ(labelText);
-		}
+		
 	}
 	return self;
 }
@@ -120,11 +126,11 @@ static const int DPad[DKEY_TOTAL] = {
 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn 
 		row:(NSInteger)rowIndex
 {
-	char buf[256] = {0};
-	
 	if ([[aTableColumn identifier] isEqualToString:@"key"]) {
 		return [labelText objectAtIndex:rowIndex];
 	} else {
+		char buf[256] = {0};
+		
 		// actual keys
 		if (rowIndex < DKEY_TOTAL) {
 			GetKeyDescription(buf, currentController, DPad[rowIndex]);