Rework toolbar UI. No more drawer, use a popover. No more weird toggle button, use...

[enjoyable.git] / NJOutputController.m

diff --git a/NJOutputController.m b/NJOutputController.m
index f05c615..8f942c6 100644 (file)
--- a/NJOutputController.m
+++ b/NJOutputController.m
@@ -10,7 +10,7 @@
 #import "NJMappingsController.h"
 #import "NJMapping.h"
 #import "NJInput.h"
-#import "NJInputController.h"
+#import "NJDeviceController.h"
 #import "NJKeyInputField.h"
 #import "NJOutputMapping.h"
 #import "NJOutputController.h"
@@ -116,7 +116,7 @@
             break;
         case 2: {
             NJOutputMapping *c = [[NJOutputMapping alloc] init];
-            c.mapping = mappingsController.mappings[mappingPopup.indexOfSelectedItem];
+            c.mapping = mappingsController[mappingPopup.indexOfSelectedItem];
             return c;
         }
         case 3: {
@@ -222,7 +222,7 @@
 - (void)refreshMappings {
     NSInteger initialIndex = mappingPopup.indexOfSelectedItem;
     [mappingPopup.menu removeAllItems];
-    for (NJMapping *mapping in mappingsController.mappings) {
+    for (NJMapping *mapping in mappingsController) {
         NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:mapping.name
                                                       action:@selector(mappingChosen:)
                                                keyEquivalent:@""];