X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputViewController.h;h=fe251cd0d3ec1f563f9d14cad0ce3365b92b35e3;hp=2f50ef8634e2daaa18079849b4397b08e4a7afa8;hb=7c9337b7789b0e940cc71f02c7cb7bd92dd2de70;hpb=1d10a45acf54217e765614cd2b4667297c1f7083

diff --git a/Classes/NJOutputViewController.h b/Classes/NJOutputViewController.h
index 2f50ef8..fe251cd 100644
--- a/Classes/NJOutputViewController.h
+++ b/Classes/NJOutputViewController.h
@@ -8,28 +8,31 @@
 
 #import "NJKeyInputField.h"
 
-@class NJInputController;
-@class NJOutput;
 @class NJInput;
+@class NJOutput;
+@class NJMapping;
+
+@protocol NJOutputViewControllerDelegate;
+
+@interface NJOutputViewController : NSObject <NJKeyInputFieldDelegate>
+
+@property (nonatomic, strong) IBOutlet NJKeyInputField *keyInput;
+@property (nonatomic, strong) IBOutlet NSMatrix *radioButtons;
+@property (nonatomic, strong) IBOutlet NSSegmentedControl *mouseDirSelect;
+@property (nonatomic, strong) IBOutlet NSSlider *mouseSpeedSlider;
+@property (nonatomic, strong) IBOutlet NSSegmentedControl *mouseBtnSelect;
+@property (nonatomic, strong) IBOutlet NSSegmentedControl *scrollDirSelect;
+@property (nonatomic, strong) IBOutlet NSSlider *scrollSpeedSlider;
+@property (nonatomic, strong) IBOutlet NSTextField *title;
+@property (nonatomic, strong) IBOutlet NSPopUpButton *mappingPopup;
+@property (nonatomic, strong) IBOutlet NSButton *smoothCheck;
+@property (nonatomic, strong) IBOutlet NSButton *unknownMapping;
+
+@property (nonatomic, weak) IBOutlet id <NJOutputViewControllerDelegate> delegate;
+
+- (void)loadOutput:(NJOutput *)output forInput:(NJInput *)input;
+- (void)focusKey;
 
-@interface NJOutputViewController : NSObject <NJKeyInputFieldDelegate> {
-    IBOutlet NJKeyInputField *keyInput;
-    IBOutlet NSMatrix *radioButtons;
-    IBOutlet NSSegmentedControl *mouseDirSelect;
-    IBOutlet NSSlider *mouseSpeedSlider;
-    IBOutlet NSSegmentedControl *mouseBtnSelect;
-    IBOutlet NSSegmentedControl *scrollDirSelect;
-    IBOutlet NSSlider *scrollSpeedSlider;
-    IBOutlet NSTextField *title;
-    IBOutlet NSPopUpButton *mappingPopup;
-    IBOutlet NJInputController *inputController;
-    IBOutlet NSButton *smoothCheck;
-    IBOutlet NSButton *unknownMapping;
-}
-
-@property (assign) BOOL enabled;
-
-- (void)loadInput:(NJInput *)input;
 - (IBAction)radioChanged:(id)sender;
 - (IBAction)mdirChanged:(id)sender;
 - (IBAction)mbtnChanged:(id)sender;
@@ -38,6 +41,14 @@
 - (IBAction)scrollSpeedChanged:(id)sender;
 - (IBAction)scrollTypeChanged:(id)sender;
 
-- (void)focusKey;
+@end
+
+@protocol NJOutputViewControllerDelegate
+
+- (NJMapping *)outputViewController:(NJOutputViewController *)ovc
+                    mappingForIndex:(NSUInteger)index;
+- (void)outputViewController:(NJOutputViewController *)ovc
+                   setOutput:(NJOutput *)output
+                    forInput:(NJInput *)input;
 
 @end