X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=TargetController.h;h=7f9e1590c88259cacac70a9603c997c2a8cb983e;hp=589023b4574634bf2c7bc789c5f5bb21192c323e;hb=f864d363128de19fc6591b77ae9226b34166d715;hpb=c6fb77859e508aaef686b7a5a6a12abe29178708

diff --git a/TargetController.h b/TargetController.h
index 589023b..7f9e159 100644
--- a/TargetController.h
+++ b/TargetController.h
@@ -6,39 +6,34 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-@class KeyInputTextView;
+#import "NJKeyInputField.h"
+
 @class ConfigsController;
-@class JoystickController;
+@class NJInputController;
 @class Target;
 @class TargetMouseMove;
 
-@interface TargetController : NSObject {
-	IBOutlet KeyInputTextView* keyInput;
-	IBOutlet NSButtonCell *radioNoAction, *radioKey, *radioConfig;
-	IBOutlet NSMatrix* radioButtons;
-    IBOutlet NSSegmentedControl* mouseDirSelect;
-    IBOutlet NSSegmentedControl* mouseBtnSelect;
-    IBOutlet NSSegmentedControl* scrollDirSelect;
-	IBOutlet NSTextField* title;
-	IBOutlet NSPopUpButton* configPopup;
-	IBOutlet ConfigsController* configsController;
-	IBOutlet JoystickController* joystickController;
-	id currentJsaction;
+@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 NJInputController *joystickController;
 }
 
--(void) keyChanged;
--(void) load;
--(void) commit;
--(void) reset;
--(Target*) state;
--(void) refreshConfigsPreservingSelection: (BOOL) preserve;
--(IBAction)configChosen:(id)sender;
--(IBAction)radioChanged:(id)sender;
--(IBAction)mdirChanged:(id)sender;
--(IBAction)mbtnChanged:(id)sender;
--(IBAction)sdirChanged:(id)sender;
--(void) focusKey;
+@property (assign) BOOL enabled;
 
-@property(readwrite) BOOL enabled;
+- (void)loadCurrent;
+- (void)refreshConfigs;
+- (IBAction)configChosen:(id)sender;
+- (IBAction)radioChanged:(id)sender;
+- (IBAction)mdirChanged:(id)sender;
+- (IBAction)mbtnChanged:(id)sender;
+- (IBAction)sdirChanged:(id)sender;
+- (void)focusKey;
 
 @end