Support magic @Application token for automatic mapping names. Fall back to the bundle...

[enjoyable.git] / NJDeviceController.m

diff --git a/NJDeviceController.m b/NJDeviceController.m
index f5da6dd..d553d7d 100644 (file)
--- a/NJDeviceController.m
+++ b/NJDeviceController.m
@@ -64,9 +64,9 @@
     NSArray *children = mainInput.children ? mainInput.children : mainInput ? @[mainInput] : @[];
     for (NJInput *subInput in children) {
         NJOutput *output = mappingsController.currentMapping[subInput];
-        output.magnitude = mainInput.magnitude;
+        output.magnitude = subInput.magnitude;
         output.running = subInput.active;
-        if (output.running && output.isContinuous)
+        if ((output.running || output.magnitude) && output.isContinuous)
             [self addRunningOutput:output];
     }
 }
@@ -224,7 +224,9 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
 - (void)setTranslatingEvents:(BOOL)translatingEvents {
     if (translatingEvents != _translatingEvents) {
         _translatingEvents = translatingEvents;
-        translatingEventsSetting.selectedSegment = !!translatingEvents;
+        NSInteger state = translatingEvents ? NSOnState : NSOffState;
+        translatingEventsButton.state = state;
+        translatingEventsMenu.title = translatingEvents ? @"Disable" : @"Enable";
         NSString *name = translatingEvents
             ? NJEventTranslationActivated
             : NJEventTranslationDeactivated;
@@ -233,8 +235,8 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
     }
 }
 
-- (IBAction)translatingEventsChanged:(id)sender {
-    self.translatingEvents = translatingEventsSetting.selectedSegment;
+- (IBAction)translatingEventsChanged:(NSButton *)sender {
+    self.translatingEvents = sender.state == NSOnState;
 }