X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetController.h;h=da7974c4684c9df6e9d55333c3e8e3bde14a69e2;hp=7e24cc460d1effbb444d420e15ec44b7d110adfd;hb=e2a4d830dd9817f6a515a3b1b6aa152d3bb98c2b;hpb=9480992fac2c0b71851db8e4906e77e2128d8919

diff --git a/TargetController.h b/TargetController.h
index 7e24cc4..da7974c 100644
--- a/TargetController.h
+++ b/TargetController.h
@@ -6,31 +6,29 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-@class KeyInputTextView;
-@class ConfigsController;
-@class JoystickController;
+#import "NJKeyInputField.h"
+
+@class NJMappingsController;
+@class NJInputController;
 @class Target;
 @class TargetMouseMove;
 
-@interface TargetController : NSObject {
-    IBOutlet KeyInputTextView *keyInput;
+@interface TargetController : NSObject <NJKeyInputFieldDelegate> {
+    IBOutlet NJKeyInputField *keyInput;
     IBOutlet NSMatrix *radioButtons;
     IBOutlet NSSegmentedControl *mouseDirSelect;
     IBOutlet NSSegmentedControl *mouseBtnSelect;
     IBOutlet NSSegmentedControl *scrollDirSelect;
     IBOutlet NSTextField *title;
-    IBOutlet NSPopUpButton *configPopup;
-    IBOutlet ConfigsController *configsController;
-    IBOutlet JoystickController *joystickController;
+    IBOutlet NSPopUpButton *mappingPopup;
+    IBOutlet NJMappingsController *mappingsController;
+    IBOutlet NJInputController *joystickController;
 }
 
 @property (assign) BOOL enabled;
 
-- (void)keyChanged;
-- (void)load;
-- (void)reset;
-- (void)refreshConfigsPreservingSelection:(BOOL)preserve;
-- (IBAction)configChosen:(id)sender;
+- (void)loadCurrent;
+- (void)refreshMappings;
 - (IBAction)radioChanged:(id)sender;
 - (IBAction)mdirChanged:(id)sender;
 - (IBAction)mbtnChanged:(id)sender;