#import "ConfigsController.h"
#import "Config.h"
-#import "JSAction.h"
-#import "JoystickController.h"
-#import "KeyInputTextView.h"
+#import "NJInput.h"
+#import "NJInputController.h"
+#import "NJKeyInputField.h"
#import "TargetConfig.h"
#import "TargetController.h"
#import "TargetKeyboard.h"
NSInteger row = radioButtons.selectedRow;
if (row != 1) {
- keyInput.vk = -1;
+ keyInput.keyCode = -1;
[keyInput resignIfFirstResponder];
}
[self commit];
}
-- (void)keyChanged {
+- (void)keyInputField:(NJKeyInputField *)keyInput didChangeKey:(CGKeyCode)keyCode {
[radioButtons selectCellAtRow:1 column:0];
[radioButtons.window makeFirstResponder:radioButtons];
[self commit];
}
+- (void)keyInputFieldDidClear:(NJKeyInputField *)keyInput {
+ [radioButtons selectCellAtRow:0 column:0];
+ [self commit];
+}
+
- (void)configChosen:(id)sender {
[radioButtons selectCellAtRow:2 column:0];
[configPopup.window makeFirstResponder:configPopup];
}
- (Target *)currentTarget {
- return configsController.currentConfig[joystickController.selectedAction];
+ return configsController.currentConfig[joystickController.selectedInput];
}
- (Target *)makeTarget {
case 0:
return nil;
case 1:
- if (keyInput.hasKey) {
+ if (keyInput.hasKeyCode) {
TargetKeyboard *k = [[TargetKeyboard alloc] init];
- k.vk = keyInput.vk;
+ k.vk = keyInput.keyCode;
return k;
} else {
return nil;
- (void)commit {
[self cleanUpInterface];
- configsController.currentConfig[joystickController.selectedAction] = [self makeTarget];
+ configsController.currentConfig[joystickController.selectedInput] = [self makeTarget];
[configsController save];
}
[scrollDirSelect setEnabled:enabled];
}
-- (void)loadTarget:(Target *)target forAction:(JSAction *)action {
- if (!action) {
+- (void)loadTarget:(Target *)target forInput:(NJInput *)input {
+ if (!input) {
self.enabled = NO;
title.stringValue = @"";
} else {
self.enabled = YES;
- NSString *actFullName = action.name;
- for (id <NJActionPathElement> cur = action.base; cur; cur = cur.base) {
- actFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, actFullName];
+ NSString *inpFullName = input.name;
+ for (id <NJInputPathElement> cur = input.base; cur; cur = cur.base) {
+ inpFullName = [[NSString alloc] initWithFormat:@"%@ > %@", cur.name, inpFullName];
}
- title.stringValue = [[NSString alloc] initWithFormat:@"%@ > %@", configsController.currentConfig.name, actFullName];
+ title.stringValue = [[NSString alloc] initWithFormat:@"%@ > %@", configsController.currentConfig.name, inpFullName];
}
if ([target isKindOfClass:TargetKeyboard.class]) {
[radioButtons selectCellAtRow:1 column:0];
- keyInput.vk = [(TargetKeyboard*)target vk];
+ keyInput.keyCode = [(TargetKeyboard*)target vk];
} else if ([target isKindOfClass:TargetConfig.class]) {
[radioButtons selectCellAtRow:2 column:0];
NSUInteger idx = [configsController.configs
}
- (void)loadCurrent {
- [self loadTarget:self.currentTarget forAction:joystickController.selectedAction];
+ [self loadTarget:self.currentTarget forInput:joystickController.selectedInput];
}
- (void)focusKey {