Big rename part 2: 'config' etc. to 'mapping.

[enjoyable.git] / TargetController.h

diff --git a/TargetController.h b/TargetController.h
index f264210..da7974c 100644 (file)
--- a/TargetController.h
+++ b/TargetController.h
@@ -6,36 +6,33 @@
 //  Copyright 2009 University of Otago. All rights reserved.
 //
 
-#import <Cocoa/Cocoa.h>
-@class KeyInputTextView;
-@class ConfigsController;
-@class JoystickController;
-@class Target;
+#import "NJKeyInputField.h"
 
+@class NJMappingsController;
+@class NJInputController;
+@class Target;
 @class TargetMouseMove;
 
-@interface TargetController : NSObject {
-       IBOutlet KeyInputTextView* keyInput;
-       IBOutlet NSButtonCell *radioNoAction, *radioKey, *radioConfig;
-       IBOutlet NSMatrix* radioButtons;
-    IBOutlet NSMatrix* mouseBtnRadio;
-       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 *mappingPopup;
+    IBOutlet NJMappingsController *mappingsController;
+    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;
--(void) focusKey;
+@property (assign) BOOL enabled;
 
-@property(readwrite) BOOL enabled;
+- (void)loadCurrent;
+- (void)refreshMappings;
+- (IBAction)radioChanged:(id)sender;
+- (IBAction)mdirChanged:(id)sender;
+- (IBAction)mbtnChanged:(id)sender;
+- (IBAction)sdirChanged:(id)sender;
+- (void)focusKey;
 
 @end