More better names.

diff --git a/Classes/NJDevice.h b/Classes/NJDevice.h
index 9f2cb979b130c4123f35b8155cd7a934f3cebbc0..d6e5dc25267793157d1c54e3513e58ccbaf41707 100644 (file)
--- a/Classes/NJDevice.h
+++ b/Classes/NJDevice.h
@@ -15,7 +15,6 @@
 - (id)initWithDevice:(IOHIDDeviceRef)device;
 
 @property (nonatomic, assign) int index;
-@property (nonatomic, copy) NSString *productName;
 @property (nonatomic, assign) IOHIDDeviceRef device;
 
 - (NJInput *)handlerForEvent:(IOHIDValueRef)value;

diff --git a/Classes/NJDevice.m b/Classes/NJDevice.m
index bf3925132189f868949e018599ecfe190f8db043..c6cc201a119b27bd672437038d4d15ec20d85a74 100644 (file)
--- a/Classes/NJDevice.m
+++ b/Classes/NJDevice.m
@@ -66,9 +66,9 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id parent) {
 }
 
 - (id)initWithDevice:(IOHIDDeviceRef)dev {
-    if ((self = [super initWithName:nil eid:nil parent:nil])) {
+    NSString *name = (__bridge NSString *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductKey));
+    if ((self = [super initWithName:name eid:nil parent:nil])) {
         self.device = dev;
-        self.productName = (__bridge NSString *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductKey));
         _vendorId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDVendorIDKey)) intValue];
         _productId = [(__bridge NSNumber *)IOHIDDeviceGetProperty(dev, CFSTR(kIOHIDProductIDKey)) intValue];
         self.children = InputsForElement(dev, self);
@@ -79,12 +79,11 @@ static NSArray *InputsForElement(IOHIDDeviceRef device, id parent) {
 
 - (BOOL)isEqual:(id)object {
     return [object isKindOfClass:NJDevice.class]
-        && [[(NJDevice *)object productName] isEqualToString:self.productName]
-        && [(NJDevice *)object index] == self.index;
+        && [[(NJDevice *)object name] isEqualToString:self.name];
 }
 
 - (NSString *)name {
-    return [NSString stringWithFormat:@"%@ #%d", _productName, _index];
+    return [NSString stringWithFormat:@"%@ #%d", super.name, _index];
 }
 
 - (NSString *)uid {

diff --git a/Classes/NJKeyInputField.h b/Classes/NJKeyInputField.h
index c32e16c50d16a6b6c304423c6d55afcd9294c0f3..bc1876c129ac02b7666887ef4212b68dc1388f65 100644 (file)
--- a/Classes/NJKeyInputField.h
+++ b/Classes/NJKeyInputField.h
@@ -11,14 +11,13 @@ extern const CGKeyCode NJKeyInputFieldEmpty;
 
 @protocol NJKeyInputFieldDelegate;
 
-@interface NJKeyInputField : NSControl <NSTextFieldDelegate>
+@interface NJKeyInputField : NSControl
     // An NJKeyInputField is a NSTextField-like widget that receives
     // exactly one key press, and displays the name of that key, then
     // resigns its first responder status. It can also inform a
     // special delegate when its content changes.
 
-+ (NSString *)stringForKeyCode:(CGKeyCode)keyCode;
-    // Give the string name for a virtual key code.
++ (NSString *)displayNameForKeyCode:(CGKeyCode)keyCode;
 
 @property (nonatomic, weak) IBOutlet id <NJKeyInputFieldDelegate> delegate;
 
@@ -28,14 +27,14 @@ extern const CGKeyCode NJKeyInputFieldEmpty;
     // inform the delegate.
 
 @property (nonatomic, readonly) BOOL hasKeyCode;
-    // True if any key is active, false otherwise.
+    // YES if any key is set, NO otherwise.
 
 - (void)clear;
     // Clear the currently active key and call the delegate.
 
 @end
 
-@protocol NJKeyInputFieldDelegate <NSObject>
+@protocol NJKeyInputFieldDelegate
 
 - (void)keyInputField:(NJKeyInputField *)keyInput
          didChangeKey:(CGKeyCode)keyCode;

diff --git a/Classes/NJKeyInputField.m b/Classes/NJKeyInputField.m
index 791911bc044c985d0a8cf3cc0cb60b30f11eb388..36435f00b870b55e00f43aad0f2dfcda8b8ffe78 100644 (file)
--- a/Classes/NJKeyInputField.m
+++ b/Classes/NJKeyInputField.m
@@ -20,6 +20,9 @@ enum {
 
 const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
 
+@interface NJKeyInputField () <NSTextFieldDelegate>
+@end
+
 @implementation NJKeyInputField {
     NSTextField *field;
     NSImageView *warning;
@@ -52,7 +55,7 @@ const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
 
 - (void)clear {
     self.keyCode = NJKeyInputFieldEmpty;
-        [self.delegate keyInputFieldDidClear:self];
+    [self.delegate keyInputFieldDidClear:self];
     [self resignIfFirstResponder];
 }
 
@@ -60,7 +63,7 @@ const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
     return self.keyCode != NJKeyInputFieldEmpty;
 }
 
-+ (NSString *)stringForKeyCode:(CGKeyCode)keyCode {
++ (NSString *)displayNameForKeyCode:(CGKeyCode)keyCode {
     switch (keyCode) {
         case kVK_F1: return @"F1";
         case kVK_F2: return @"F2";
@@ -204,7 +207,6 @@ const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
         case kVK_ApplicationMenu:
             return NSLocalizedString(@"Menu", "keyboard key");
 
-            
         case kVK_MAX: // NJKeyInputFieldEmpty
             return @"";
         default:
@@ -230,7 +232,7 @@ const CGKeyCode NJKeyInputFieldEmpty = kVK_MAX;
 
 - (void)setKeyCode:(CGKeyCode)keyCode {
     _keyCode = keyCode;
-    field.stringValue = [NJKeyInputField stringForKeyCode:keyCode];
+    field.stringValue = [NJKeyInputField displayNameForKeyCode:keyCode];
 }
 
 - (void)keyDown:(NSEvent *)event {

diff --git a/Classes/NJMapping.m b/Classes/NJMapping.m
index 3d5cd67f5a7470c4d143f8e6173404861444c16d..bcd2a8d405680a4c66c4ad8046b7681d5e0df23e 100644 (file)
--- a/Classes/NJMapping.m
+++ b/Classes/NJMapping.m
@@ -39,7 +39,7 @@
         if ([entries isKindOfClass:NSDictionary.class]) {
             for (id key in entries) {
                 if ([key isKindOfClass:NSString.class]) {
-                    NJOutput *output = [NJOutput outputDeserialize:entries[key]];
+                    NJOutput *output = [NJOutput outputWithSerialization:entries[key]];
                     if (output)
                         _entries[key] = output;
                 }

diff --git a/Classes/NJMappingMenuController.h b/Classes/NJMappingMenuController.h
index 33c06bb3c64f699f1c17b063ef6d2dc01d8b52db..ff62d41d1a45621c9444c34e33446877ba9761e5 100644 (file)
--- a/Classes/NJMappingMenuController.h
+++ b/Classes/NJMappingMenuController.h
@@ -46,5 +46,4 @@
     // A menu item representing the current event simulation state.
     // This outlet is optional.
 
-
 @end

diff --git a/Classes/NJMappingsViewController.h b/Classes/NJMappingsViewController.h
index 8e1055aca86709955a0fd7a09d2fd6991bc00b96..d1cdb1f79b8f317fedfc9e54ad9e7667b6a22b10 100644 (file)
--- a/Classes/NJMappingsViewController.h
+++ b/Classes/NJMappingsViewController.h
@@ -37,7 +37,6 @@
 - (void)beginUpdates;
 - (void)endUpdates;
 
-
 @end
 
 @protocol NJMappingsViewControllerDelegate

diff --git a/Classes/NJOutput.h b/Classes/NJOutput.h
index 52c03201058f537f4554fe70d72d4405e9d481bb..1c57d45d1cbed16a4bf847a2058ffeb82cb60a78 100644 (file)
--- a/Classes/NJOutput.h
+++ b/Classes/NJOutput.h
@@ -16,10 +16,10 @@
 
 - (void)trigger;
 - (void)untrigger;
-- (BOOL)update:(NJInputController *)jc;
+- (BOOL)update:(NJInputController *)ic;
 
 - (NSDictionary *)serialize;
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization;
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization;
 + (NSString *)serializationCode;
 
 - (void)postLoadProcess:(id <NSFastEnumeration>)allMappings;

diff --git a/Classes/NJOutput.m b/Classes/NJOutput.m
index 8b21164886e668fa31196b84fbbd7326a1116892..bf9e2e8897e41a0e8a6aca4ebb50490b31a99f7e 100644 (file)
--- a/Classes/NJOutput.m
+++ b/Classes/NJOutput.m
@@ -36,7 +36,7 @@
     return [[self serialize] hash];
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
     // Don't crash loading old/bad mappings (but don't load them either).
     if (![serialization isKindOfClass:NSDictionary.class])
         return nil;
@@ -48,7 +48,7 @@
                         NJOutputMouseScroll.class
          ]) {
         if ([type isEqualToString:cls.serializationCode])
-            return [cls outputDeserialize:serialization];
+            return [cls outputWithSerialization:serialization];
     }
     
     return nil;
@@ -60,7 +60,7 @@
 - (void)untrigger {
 }
 
-- (BOOL)update:(NJInputController *)jc {
+- (BOOL)update:(NJInputController *)ic {
     return NO;
 }
 

diff --git a/Classes/NJOutputKeyPress.m b/Classes/NJOutputKeyPress.m
index 7b8c63106d54d2f928ca7e9621223d822aac9f6a..a69d8f3e3ba2fc14528576bea618ed3e35cc31a6 100644 (file)
--- a/Classes/NJOutputKeyPress.m
+++ b/Classes/NJOutputKeyPress.m
@@ -21,7 +21,7 @@
         : nil;
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
     NJOutputKeyPress *output = [[NJOutputKeyPress alloc] init];
     output.keyCode = [serialization[@"key"] intValue];
     return output;

diff --git a/Classes/NJOutputMapping.m b/Classes/NJOutputMapping.m
index 2ee6a844bf93b4a2f946d9c1178114498e2d316b..124c8a39f0d58277dbf3742cfed9e0189522718b 100644 (file)
--- a/Classes/NJOutputMapping.m
+++ b/Classes/NJOutputMapping.m
@@ -23,7 +23,7 @@
         : nil;
 }
 
-+ (NJOutputMapping *)outputDeserialize:(NSDictionary *)serialization {
++ (NJOutputMapping *)outputWithSerialization:(NSDictionary *)serialization {
     NSString *name = serialization[@"name"];
     NJOutputMapping *output = [[NJOutputMapping alloc] init];
     output.mappingName = name;

diff --git a/Classes/NJOutputMouseButton.m b/Classes/NJOutputMouseButton.m
index 0b039d108d2eaef2821eb6e2ba94b9cff6e28cb0..068a5ddd2949e8fa86fb8751280ce2fa539f8c9a 100644 (file)
--- a/Classes/NJOutputMouseButton.m
+++ b/Classes/NJOutputMouseButton.m
@@ -36,7 +36,7 @@
     return @{ @"type": self.class.serializationCode, @"button": @(_button) };
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
     NJOutputMouseButton *output = [[NJOutputMouseButton alloc] init];
     output.button = [serialization[@"button"] intValue];
     return output;

diff --git a/Classes/NJOutputMouseMove.m b/Classes/NJOutputMouseMove.m
index f9435460644dd01199b07440e89f734816cfdb6d..09185932a057d7632af42dd1d8296c4472377346 100644 (file)
--- a/Classes/NJOutputMouseMove.m
+++ b/Classes/NJOutputMouseMove.m
@@ -22,7 +22,7 @@
               };
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
     NJOutputMouseMove *output = [[NJOutputMouseMove alloc] init];
     output.axis = [serialization[@"axis"] intValue];
     output.speed = [serialization[@"speed"] floatValue];
@@ -37,7 +37,7 @@
 
 #define CLAMP(a, l, h) MIN(h, MAX(a, l))
 
-- (BOOL)update:(NJInputController *)jc {
+- (BOOL)update:(NJInputController *)ic {
     if (self.magnitude < 0.05)
         return NO; // dead zone
     
@@ -58,10 +58,10 @@
             dy = self.magnitude * _speed;
             break;
     }
-    NSPoint mouseLoc = jc.mouseLoc;
+    NSPoint mouseLoc = ic.mouseLoc;
     mouseLoc.x = CLAMP(mouseLoc.x + dx, 0, size.width - 1);
     mouseLoc.y = CLAMP(mouseLoc.y - dy, 0, size.height - 1);
-    jc.mouseLoc = mouseLoc;
+    ic.mouseLoc = mouseLoc;
     
     CGEventRef move = CGEventCreateMouseEvent(NULL, kCGEventMouseMoved,
                                               CGPointMake(mouseLoc.x, size.height - mouseLoc.y),

diff --git a/Classes/NJOutputMouseScroll.m b/Classes/NJOutputMouseScroll.m
index b2775a8017a6e21e3b39ad910c26de0f67dfb0bd..1ae08cc18ff8a8b8a9049f0cee875ff1cc49d377 100644 (file)
--- a/Classes/NJOutputMouseScroll.m
+++ b/Classes/NJOutputMouseScroll.m
@@ -21,7 +21,7 @@
               };
 }
 
-+ (NJOutput *)outputDeserialize:(NSDictionary *)serialization {
++ (NJOutput *)outputWithSerialization:(NSDictionary *)serialization {
     NJOutputMouseScroll *output = [[NJOutputMouseScroll alloc] init];
     output.direction = [serialization[@"direction"] intValue];
     output.speed = [serialization[@"speed"] floatValue];
@@ -52,7 +52,7 @@
     }
 }
 
-- (BOOL)update:(NJInputController *)jc {
+- (BOOL)update:(NJInputController *)ic {
     if (self.magnitude < 0.05f)
         return NO; // dead zone
     

diff --git a/Classes/NJOutputViewController.h b/Classes/NJOutputViewController.h
index fe251cd0d3ec1f563f9d14cad0ce3365b92b35e3..7e35b7082c1619691c3f1319dc7222612f525f70 100644 (file)
--- a/Classes/NJOutputViewController.h
+++ b/Classes/NJOutputViewController.h
@@ -33,10 +33,10 @@
 - (void)loadOutput:(NJOutput *)output forInput:(NJInput *)input;
 - (void)focusKey;
 
-- (IBAction)radioChanged:(id)sender;
-- (IBAction)mdirChanged:(id)sender;
-- (IBAction)mbtnChanged:(id)sender;
-- (IBAction)sdirChanged:(id)sender;
+- (IBAction)outputTypeChanged:(id)sender;
+- (IBAction)mouseDirectionChanged:(id)sender;
+- (IBAction)mouseButtonChanged:(id)sender;
+- (IBAction)scrollDirectionChanged:(id)sender;
 - (IBAction)mouseSpeedChanged:(id)sender;
 - (IBAction)scrollSpeedChanged:(id)sender;
 - (IBAction)scrollTypeChanged:(id)sender;

diff --git a/Classes/NJOutputViewController.m b/Classes/NJOutputViewController.m
index 0ca3938b80b6276562c6b0fce5d41f118f59ece1..9bd723b8810cafbfac7e24647ebe21ce8c04a5da 100644 (file)
--- a/Classes/NJOutputViewController.m
+++ b/Classes/NJOutputViewController.m
@@ -83,7 +83,7 @@
         
 }
 
-- (IBAction)radioChanged:(NSView *)sender {
+- (IBAction)outputTypeChanged:(NSView *)sender {
     [sender.window makeFirstResponder:sender];
     if (self.radioButtons.selectedRow == 1)
         [self.keyInput.window makeFirstResponder:self.keyInput];
@@ -108,7 +108,7 @@
     [self commit];
 }
 
-- (void)mdirChanged:(NSView *)sender {
+- (void)mouseDirectionChanged:(NSView *)sender {
     [self.radioButtons selectCellAtRow:3 column:0];
     [sender.window makeFirstResponder:sender];
     [self commit];
@@ -120,13 +120,13 @@
     [self commit];
 }
 
-- (void)mbtnChanged:(NSView *)sender {
+- (void)mouseButtonChanged:(NSView *)sender {
     [self.radioButtons selectCellAtRow:4 column:0];
     [sender.window makeFirstResponder:sender];
     [self commit];
 }
 
-- (void)sdirChanged:(NSView *)sender {
+- (void)scrollDirectionChanged:(NSView *)sender {
     [self.radioButtons selectCellAtRow:5 column:0];
     [sender.window makeFirstResponder:sender];
     [self commit];

diff --git a/Info.plist b/Info.plist
index 3f58f546f80f69b07e24c4179c1986a1e7b7eb63..b48d847fea278f9a569e2f92c79731edcc5f47f5 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>579</string>
+       <string>582</string>
        <key>LSApplicationCategoryType</key>
        <string>public.app-category.utilities</string>
        <key>NSHumanReadableCopyright</key>

diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index 7a2e668d755eee9521cc0a20056333208083eac1..60e65bd56f9aadfe979ead7d9efac151a70a009e 100644 (file)
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -488,7 +488,7 @@
                                <nil key="NSUserInterfaceItemIdentifier"/>
                                <string key="NSWindowContentMinSize">{664, 323}</string>
                                <object class="NSView" key="NSWindowView" id="177223957">
-                                       <reference key="NSNextResponder"/>
+                                       <nil key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <array class="NSMutableArray" key="NSSubviews">
                                                <object class="NSCustomView" id="734312853">
@@ -500,7 +500,6 @@
                                                                        <int key="NSvFlags">-2147483374</int>
                                                                        <string key="NSFrame">{{20, 20}, {194, 283}}</string>
                                                                        <reference key="NSSuperview" ref="734312853"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="471332453"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:22</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -530,7 +529,6 @@ Lg</string>
                                                                        <int key="NSvFlags">274</int>
                                                                        <string key="NSFrame">{{20, 20}, {194, 283}}</string>
                                                                        <reference key="NSSuperview" ref="734312853"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="918286878"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:22</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -565,7 +563,6 @@ aW5nLg</string>
                                                                                                        <array class="NSMutableArray" key="NSSubviews"/>
                                                                                                        <string key="NSFrameSize">{232, 321}</string>
                                                                                                        <reference key="NSSuperview" ref="698362889"/>
-                                                                                                       <reference key="NSWindow"/>
                                                                                                        <reference key="NSNextKeyView" ref="892486973"/>
                                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -661,7 +658,6 @@ aW5nLg</string>
                                                                                        </array>
                                                                                        <string key="NSFrame">{{1, 1}, {232, 321}}</string>
                                                                                        <reference key="NSSuperview" ref="364857164"/>
-                                                                                       <reference key="NSWindow"/>
                                                                                        <reference key="NSNextKeyView" ref="365506042"/>
                                                                                        <reference key="NSDocView" ref="365506042"/>
                                                                                        <reference key="NSBGColor" ref="834857663"/>
@@ -672,7 +668,6 @@ aW5nLg</string>
                                                                                        <int key="NSvFlags">-2147483392</int>
                                                                                        <string key="NSFrame">{{1, 1}, {8, 298}}</string>
                                                                                        <reference key="NSSuperview" ref="364857164"/>
-                                                                                       <reference key="NSWindow"/>
                                                                                        <reference key="NSNextKeyView" ref="12898323"/>
                                                                                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                                        <reference key="NSTarget" ref="364857164"/>
@@ -684,7 +679,6 @@ aW5nLg</string>
                                                                                        <int key="NSvFlags">-2147483392</int>
                                                                                        <string key="NSFrame">{{-100, -100}, {473, 15}}</string>
                                                                                        <reference key="NSSuperview" ref="364857164"/>
-                                                                                       <reference key="NSWindow"/>
                                                                                        <reference key="NSNextKeyView" ref="698362889"/>
                                                                                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                                        <int key="NSsFlags">1</int>
@@ -695,7 +689,6 @@ aW5nLg</string>
                                                                        </array>
                                                                        <string key="NSFrameSize">{234, 323}</string>
                                                                        <reference key="NSSuperview" ref="734312853"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="698362889"/>
                                                                        <int key="NSsFlags">150034</int>
                                                                        <reference key="NSVScroller" ref="1036252745"/>
@@ -709,7 +702,6 @@ aW5nLg</string>
                                                        </array>
                                                        <string key="NSFrameSize">{234, 323}</string>
                                                        <reference key="NSSuperview" ref="177223957"/>
-                                                       <reference key="NSWindow"/>
                                                        <reference key="NSNextKeyView" ref="364857164"/>
                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                        <string key="NSClassName">NSView</string>
@@ -723,7 +715,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">268</int>
                                                                        <string key="NSFrame">{{197, 157}, {193, 21}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="875916470"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -748,7 +739,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{189, 117}, {224, 20}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="385416822"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -790,7 +780,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">268</int>
                                                                        <string key="NSFrame">{{343, 31}, {70, 18}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
                                                                        <object class="NSButtonCell" key="NSCell" id="868379451">
@@ -821,7 +810,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{189, 33}, {150, 20}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="792189805"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -866,7 +854,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{191, 24}, {146, 16}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="20704797"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -892,7 +879,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{189, 70}, {224, 24}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="921829691"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -946,7 +932,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{191, 108}, {220, 16}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="125828224"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
@@ -972,7 +957,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{191, 196}, {220, 23}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="194275224"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <string key="NSClassName">NJKeyInputField</string>
@@ -982,7 +966,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">265</int>
                                                                        <string key="NSFrame">{{188, 153}, {226, 26}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="529992855"/>
                                                                        <bool key="NSEnabled">YES</bool>
                                                                        <object class="NSPopUpButtonCell" key="NSCell" id="74311158">
@@ -1015,7 +998,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">268</int>
                                                                        <string key="NSFrame">{{24, 20}, {163, 250}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="57697638"/>
                                                                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                        <int key="NSNumRows">6</int>
@@ -1146,7 +1128,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">266</int>
                                                                        <string key="NSFrame">{{9, 286}, {412, 17}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="497528019"/>
                                                                        <bool key="NSEnabled">YES</bool>
                                                                        <object class="NSTextFieldCell" key="NSCell" id="853503577">
@@ -1170,7 +1151,6 @@ aW5nLg</string>
                                                                        <int key="NSvFlags">10</int>
                                                                        <string key="NSFrame">{{12, 276}, {406, 5}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
-                                                                       <reference key="NSWindow"/>
                                                                        <reference key="NSNextKeyView" ref="120408205"/>
                                                                        <string key="NSOffsets">{0, 0}</string>
                                                                        <object class="NSTextFieldCell" key="NSTitleCell">
@@ -1197,15 +1177,12 @@ aW5nLg</string>
                                                        </array>
                                                        <string key="NSFrame">{{233, 0}, {431, 323}}</string>
                                                        <reference key="NSSuperview" ref="177223957"/>
-                                                       <reference key="NSWindow"/>
                                                        <reference key="NSNextKeyView" ref="1016088174"/>
                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                        <string key="NSClassName">NSView</string>
                                                </object>
                                        </array>
                                        <string key="NSFrameSize">{664, 323}</string>
-                                       <reference key="NSSuperview"/>
-                                       <reference key="NSWindow"/>
                                        <reference key="NSNextKeyView" ref="734312853"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -1310,7 +1287,7 @@ aW5nLg</string>
                                <bool key="NSAnimates">YES</bool>
                        </object>
                        <object class="NSCustomView" id="671181514">
-                               <reference key="NSNextResponder"/>
+                               <nil key="NSNextResponder"/>
                                <int key="NSvFlags">256</int>
                                <array class="NSMutableArray" key="NSSubviews">
                                        <object class="NSScrollView" id="443618264">
@@ -1326,7 +1303,6 @@ aW5nLg</string>
                                                                                <int key="NSvFlags">256</int>
                                                                                <string key="NSFrameSize">{198, 198}</string>
                                                                                <reference key="NSSuperview" ref="947403733"/>
-                                                                               <reference key="NSWindow"/>
                                                                                <reference key="NSNextKeyView" ref="553414014"/>
                                                                                <bool key="NSEnabled">YES</bool>
                                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -1384,7 +1360,6 @@ aW5nLg</string>
                                                                </array>
                                                                <string key="NSFrame">{{1, 1}, {198, 198}}</string>
                                                                <reference key="NSSuperview" ref="443618264"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="762432499"/>
                                                                <reference key="NSDocView" ref="762432499"/>
                                                                <reference key="NSBGColor" ref="834857663"/>
@@ -1395,7 +1370,6 @@ aW5nLg</string>
                                                                <int key="NSvFlags">-2147483392</int>
                                                                <string key="NSFrame">{{306, 1}, {15, 403}}</string>
                                                                <reference key="NSSuperview" ref="443618264"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="861276216"/>
                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                <reference key="NSTarget" ref="443618264"/>
@@ -1407,7 +1381,6 @@ aW5nLg</string>
                                                                <int key="NSvFlags">-2147483392</int>
                                                                <string key="NSFrame">{{-100, -100}, {366, 16}}</string>
                                                                <reference key="NSSuperview" ref="443618264"/>
-                                                               <reference key="NSWindow"/>
                                                                <reference key="NSNextKeyView" ref="947403733"/>
                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                <int key="NSsFlags">1</int>
@@ -1418,7 +1391,6 @@ aW5nLg</string>
                                                </array>
                                                <string key="NSFrame">{{0, 20}, {200, 200}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="947403733"/>
                                                <int key="NSsFlags">150034</int>
                                                <reference key="NSVScroller" ref="968378655"/>
@@ -1434,7 +1406,6 @@ aW5nLg</string>
                                                <int key="NSvFlags">268</int>
                                                <string key="NSFrame">{{66, -1}, {68, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1023366520"/>
                                                <string key="NSReuseIdentifierKey">_NS:22</string>
                                                <bool key="NSEnabled">YES</bool>
@@ -1463,7 +1434,6 @@ aW5nLg</string>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{0, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="456935010"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="867532725">
@@ -1490,7 +1460,6 @@ aW5nLg</string>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{166, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="828611353">
                                                        <int key="NSCellFlags">67108864</int>
@@ -1512,7 +1481,6 @@ aW5nLg</string>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{133, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="1043784903"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="57592747">
@@ -1535,7 +1503,6 @@ aW5nLg</string>
                                                <int key="NSvFlags">292</int>
                                                <string key="NSFrame">{{33, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
-                                               <reference key="NSWindow"/>
                                                <reference key="NSNextKeyView" ref="149148392"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="1008023024">
@@ -1559,8 +1526,6 @@ aW5nLg</string>
                                        </object>
                                </array>
                                <string key="NSFrameSize">{200, 220}</string>
-                               <reference key="NSSuperview"/>
-                               <reference key="NSWindow"/>
                                <reference key="NSNextKeyView" ref="443618264"/>
                                <string key="NSClassName">NSView</string>
                        </object>
@@ -1835,22 +1800,6 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">823</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">mdirChanged:</string>
-                                               <reference key="source" ref="801536542"/>
-                                               <reference key="destination" ref="875916470"/>
-                                       </object>
-                                       <int key="connectionID">757</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">sdirChanged:</string>
-                                               <reference key="source" ref="801536542"/>
-                                               <reference key="destination" ref="921829691"/>
-                                       </object>
-                                       <int key="connectionID">752</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">scrollSpeedSlider</string>
@@ -1859,14 +1808,6 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">891</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">radioChanged:</string>
-                                               <reference key="source" ref="801536542"/>
-                                               <reference key="destination" ref="120408205"/>
-                                       </object>
-                                       <int key="connectionID">731</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">keyInput</string>
@@ -1875,14 +1816,6 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">781</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">mbtnChanged:</string>
-                                               <reference key="source" ref="801536542"/>
-                                               <reference key="destination" ref="125828224"/>
-                                       </object>
-                                       <int key="connectionID">747</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">mouseSpeedChanged:</string>
@@ -1971,6 +1904,38 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">1035</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">scrollDirectionChanged:</string>
+                                               <reference key="source" ref="801536542"/>
+                                               <reference key="destination" ref="921829691"/>
+                                       </object>
+                                       <int key="connectionID">1038</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">mouseButtonChanged:</string>
+                                               <reference key="source" ref="801536542"/>
+                                               <reference key="destination" ref="125828224"/>
+                                       </object>
+                                       <int key="connectionID">1039</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">mouseDirectionChanged:</string>
+                                               <reference key="source" ref="801536542"/>
+                                               <reference key="destination" ref="875916470"/>
+                                       </object>
+                                       <int key="connectionID">1040</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">outputTypeChanged:</string>
+                                               <reference key="source" ref="801536542"/>
+                                               <reference key="destination" ref="120408205"/>
+                                       </object>
+                                       <int key="connectionID">1041</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">delegate</string>
@@ -3344,7 +3309,7 @@ aW5nLg</string>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">1037</int>
+                       <int key="maxID">1041</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">