projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge device and mapping controllers into NJInputController.
[enjoyable.git]
/
Classes
/
NJOutputController.h
diff --git
a/Classes/NJOutputController.h
b/Classes/NJOutputController.h
index
c18275f
..
b22afdb
100644
(file)
--- a/
Classes/NJOutputController.h
+++ b/
Classes/NJOutputController.h
@@
-8,8
+8,7
@@
#import "NJKeyInputField.h"
#import "NJKeyInputField.h"
-@class NJMappingsController;
-@class NJDeviceController;
+@class NJInputController;
@class NJOutput;
@class NJInput;
@class NJOutput;
@class NJInput;
@@
-23,7
+22,7
@@
IBOutlet NSSlider *scrollSpeedSlider;
IBOutlet NSTextField *title;
IBOutlet NSPopUpButton *mappingPopup;
IBOutlet NSSlider *scrollSpeedSlider;
IBOutlet NSTextField *title;
IBOutlet NSPopUpButton *mappingPopup;
- IBOutlet NJ
MappingsController *mappings
Controller;
+ IBOutlet NJ
InputController *input
Controller;
IBOutlet NSButton *smoothCheck;
IBOutlet NSButton *unknownMapping;
}
IBOutlet NSButton *smoothCheck;
IBOutlet NSButton *unknownMapping;
}