[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[595] trunk/fuse/fusepb/controllers/ JoystickConfigurationController.m

[<fr...@us...>]

Revision: 595
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=595&view=rev
Author:   fredm
Date:     2009-03-15 11:34:01 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Fix Joystick configurator dialog.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/JoystickConfigurationController.m

Modified: trunk/fuse/fusepb/controllers/JoystickConfigurationController.m
===================================================================
--- trunk/fuse/fusepb/controllers/JoystickConfigurationController.m	2009-02-04 11:40:57 UTC (rev 594)
+++ trunk/fuse/fusepb/controllers/JoystickConfigurationController.m	2009-03-15 11:34:01 UTC (rev 595)
@@ -105,34 +105,36 @@
 
 - (IBAction)apply:(id)sender;
 {
+  NSUserDefaults *currentValues = [NSUserDefaults standardUserDefaults];
+
   switch(joyNum) {
   case 1:
-    settings_current.joystick_1_fire_1 = [[joyFire1 selectedItem] tag];
-    settings_current.joystick_1_fire_2 = [[joyFire2 selectedItem] tag];
-    settings_current.joystick_1_fire_3 = [[joyFire3 selectedItem] tag];
-    settings_current.joystick_1_fire_4 = [[joyFire4 selectedItem] tag];
-    settings_current.joystick_1_fire_5 = [[joyFire5 selectedItem] tag];
-    settings_current.joystick_1_fire_6 = [[joyFire6 selectedItem] tag];
-    settings_current.joystick_1_fire_7 = [[joyFire7 selectedItem] tag];
-    settings_current.joystick_1_fire_8 = [[joyFire8 selectedItem] tag];
-    settings_current.joystick_1_fire_9 = [[joyFire9 selectedItem] tag];
-    settings_current.joystick_1_fire_10 = [[joyFire10 selectedItem] tag];
-    settings_current.joy1_xaxis = [[joyXAxis selectedItem] tag];
-    settings_current.joy1_yaxis = [[joyYAxis selectedItem] tag];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire1 selectedItem] tag]] forKey:@"joystick1fire1"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire2 selectedItem] tag]] forKey:@"joystick1fire2"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire3 selectedItem] tag]] forKey:@"joystick1fire3"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire4 selectedItem] tag]] forKey:@"joystick1fire4"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire5 selectedItem] tag]] forKey:@"joystick1fire5"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire6 selectedItem] tag]] forKey:@"joystick1fire6"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire7 selectedItem] tag]] forKey:@"joystick1fire7"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire8 selectedItem] tag]] forKey:@"joystick1fire8"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire9 selectedItem] tag]] forKey:@"joystick1fire9"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire10 selectedItem] tag]] forKey:@"joystick1fire10"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyXAxis selectedItem] tag]] forKey:@"joy1x"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyYAxis selectedItem] tag]] forKey:@"joy1y"];
     break;
   case 2:
-    settings_current.joystick_2_fire_1 = [[joyFire1 selectedItem] tag];
-    settings_current.joystick_2_fire_2 = [[joyFire2 selectedItem] tag];
-    settings_current.joystick_2_fire_3 = [[joyFire3 selectedItem] tag];
-    settings_current.joystick_2_fire_4 = [[joyFire4 selectedItem] tag];
-    settings_current.joystick_2_fire_5 = [[joyFire5 selectedItem] tag];
-    settings_current.joystick_2_fire_6 = [[joyFire6 selectedItem] tag];
-    settings_current.joystick_2_fire_7 = [[joyFire7 selectedItem] tag];
-    settings_current.joystick_2_fire_8 = [[joyFire8 selectedItem] tag];
-    settings_current.joystick_2_fire_9 = [[joyFire9 selectedItem] tag];
-    settings_current.joystick_2_fire_10 = [[joyFire10 selectedItem] tag];
-    settings_current.joy2_xaxis = [[joyXAxis selectedItem] tag];
-    settings_current.joy2_yaxis = [[joyYAxis selectedItem] tag];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire1 selectedItem] tag]] forKey:@"joystick2fire1"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire2 selectedItem] tag]] forKey:@"joystick2fire2"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire3 selectedItem] tag]] forKey:@"joystick2fire3"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire4 selectedItem] tag]] forKey:@"joystick2fire4"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire5 selectedItem] tag]] forKey:@"joystick2fire5"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire6 selectedItem] tag]] forKey:@"joystick2fire6"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire7 selectedItem] tag]] forKey:@"joystick2fire7"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire8 selectedItem] tag]] forKey:@"joystick2fire8"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire9 selectedItem] tag]] forKey:@"joystick2fire9"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyFire10 selectedItem] tag]] forKey:@"joystick2fire10"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyXAxis selectedItem] tag]] forKey:@"joy2x"];
+    [currentValues setObject:[NSNumber numberWithInteger:[[joyYAxis selectedItem] tag]] forKey:@"joy2y"];
     break;
   default:
     assert(0);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.