From 1d10a45acf54217e765614cd2b4667297c1f7083 Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Wed, 20 Mar 2013 21:01:34 +0100 Subject: [PATCH] Correct some names. NJOutputController should be NJOutputViewController as it doesn't actually control the outputs. Xcode groups. --- Classes/EnjoyableApplicationDelegate.h | 6 +- Classes/EnjoyableApplicationDelegate.m | 18 +-- Classes/NJInputController.h | 19 ++- Classes/NJInputController.m | 18 ++- ...tController.h => NJOutputViewController.h} | 2 +- ...tController.m => NJOutputViewController.m} | 6 +- Enjoyable.xcodeproj/project.pbxproj | 120 +++++++++++------- Info.plist | 2 +- Resources/English.lproj/MainMenu.xib | 47 +------ 9 files changed, 113 insertions(+), 125 deletions(-) rename Classes/{NJOutputController.h => NJOutputViewController.h} (93%) rename Classes/{NJOutputController.m => NJOutputViewController.m} (98%) diff --git a/Classes/EnjoyableApplicationDelegate.h b/Classes/EnjoyableApplicationDelegate.h index ddc6acf..d9408aa 100644 --- a/Classes/EnjoyableApplicationDelegate.h +++ b/Classes/EnjoyableApplicationDelegate.h @@ -6,12 +6,10 @@ // Copyright 2009 University of Otago. All rights reserved. // -@class NJMappingsController; - #import "NJMappingMenuController.h" #import "NJMappingsViewController.h" #import "NJDeviceViewController.h" -#import "NJOutputController.h" +#import "NJOutputViewController.h" #import "NJInputController.h" @interface EnjoyableApplicationDelegate : NSObject @property (nonatomic, strong) IBOutlet NJInputController *inputController; -@property (nonatomic, strong) IBOutlet NJOutputController *outputController; +@property (nonatomic, strong) IBOutlet NJOutputViewController *outputController; @property (nonatomic, strong) IBOutlet NJMappingsViewController *mvc; @property (nonatomic, strong) IBOutlet NJDeviceViewController *dvc; diff --git a/Classes/EnjoyableApplicationDelegate.m b/Classes/EnjoyableApplicationDelegate.m index 96aa8dd..83d0771 100644 --- a/Classes/EnjoyableApplicationDelegate.m +++ b/Classes/EnjoyableApplicationDelegate.m @@ -412,31 +412,31 @@ [self.outputController loadInput:dvc.selectedHandler]; } -- (void)deviceController:(NJInputController *)dc - didAddDevice:(NJDevice *)device { - [self.dvc addedDevice:device atIndex:dc.devices.count - 1]; +- (void)inputController:(NJInputController *)ic + didAddDevice:(NJDevice *)device { + [self.dvc addedDevice:device atIndex:ic.devices.count - 1]; } -- (void)deviceController:(NJInputController *)dc - didRemoveDeviceAtIndex:(NSInteger)idx { +- (void)inputController:(NJInputController *)ic + didRemoveDeviceAtIndex:(NSInteger)idx { [self.dvc removedDeviceAtIndex:idx]; } -- (void)deviceControllerDidStartHID:(NJInputController *)dc { +- (void)inputControllerDidStartHID:(NJInputController *)ic { [self.dvc hidStarted]; } -- (void)deviceControllerDidStopHID:(NJInputController *)dc { +- (void)inputControllerDidStopHID:(NJInputController *)ic { [self.dvc hidStopped]; } -- (void)deviceController:(NJInputController *)dc didInput:(NJInput *)input { +- (void)inputController:(NJInputController *)ic didInput:(NJInput *)input { [self.dvc expandAndSelectItem:input]; [self.outputController loadInput:input]; [self.outputController focusKey]; } -- (void)deviceController:(NJInputController *)dc didError:(NSError *)error { +- (void)inputController:(NJInputController *)ic didError:(NSError *)error { // Since the error shows the window, it can trigger another attempt // to re-open the HID manager, which will also probably fail and error, // so don't bother repeating ourselves. diff --git a/Classes/NJInputController.h b/Classes/NJInputController.h index 06852f2..a77a18d 100644 --- a/Classes/NJInputController.h +++ b/Classes/NJInputController.h @@ -1,9 +1,6 @@ // -// NJDeviceController.h -// Enjoy -// -// Created by Sam McCall on 4/05/09. -// Copyright 2009 University of Otago. All rights reserved. +// NJInputController.h +// Enjoyable // #import "NJHIDManager.h" @@ -48,11 +45,11 @@ @protocol NJInputControllerDelegate -- (void)deviceController:(NJInputController *)dc didAddDevice:(NJDevice *)device; -- (void)deviceController:(NJInputController *)dc didRemoveDeviceAtIndex:(NSInteger)idx; -- (void)deviceController:(NJInputController *)dc didInput:(NJInput *)input; -- (void)deviceControllerDidStartHID:(NJInputController *)dc; -- (void)deviceControllerDidStopHID:(NJInputController *)dc; -- (void)deviceController:(NJInputController *)dc didError:(NSError *)error; +- (void)inputController:(NJInputController *)ic didAddDevice:(NJDevice *)device; +- (void)inputController:(NJInputController *)ic didRemoveDeviceAtIndex:(NSInteger)idx; +- (void)inputController:(NJInputController *)ic didInput:(NJInput *)input; +- (void)inputControllerDidStartHID:(NJInputController *)ic; +- (void)inputControllerDidStopHID:(NJInputController *)ic; +- (void)inputController:(NJInputController *)ic didError:(NSError *)error; @end diff --git a/Classes/NJInputController.m b/Classes/NJInputController.m index 4ca33e1..9ff9d26 100644 --- a/Classes/NJInputController.m +++ b/Classes/NJInputController.m @@ -1,8 +1,6 @@ // -// NJDeviceController.m -// Enjoy -// -// Created by Sam McCall on 4/05/09. +// NJInputController.m +// Enjoyable // #import "NJInputController.h" @@ -108,7 +106,7 @@ if (!handler) return; - [self.delegate deviceController:self didInput:handler]; + [self.delegate inputController:self didInput:handler]; } - (void)hidManager:(NJHIDManager *)manager @@ -140,7 +138,7 @@ - (void)hidManager:(NJHIDManager *)manager deviceAdded:(IOHIDDeviceRef)device { NJDevice *match = [[NJDevice alloc] initWithDevice:device]; [self addDevice:match]; - [self.delegate deviceController:self didAddDevice:match]; + [self.delegate inputController:self didAddDevice:match]; } - (NJDevice *)findDeviceByRef:(IOHIDDeviceRef)device { @@ -155,7 +153,7 @@ if (match) { NSInteger idx = [_devices indexOfObjectIdenticalTo:match]; [_devices removeObjectAtIndex:idx]; - [self.delegate deviceController:self didRemoveDeviceAtIndex:idx]; + [self.delegate inputController:self didRemoveDeviceAtIndex:idx]; } } @@ -173,17 +171,17 @@ } - (void)hidManager:(NJHIDManager *)manager didError:(NSError *)error { - [self.delegate deviceController:self didError:error]; + [self.delegate inputController:self didError:error]; self.simulatingEvents = NO; } - (void)hidManagerDidStart:(NJHIDManager *)manager { - [self.delegate deviceControllerDidStartHID:self]; + [self.delegate inputControllerDidStartHID:self]; } - (void)hidManagerDidStop:(NJHIDManager *)manager { [_devices removeAllObjects]; - [self.delegate deviceControllerDidStopHID:self]; + [self.delegate inputControllerDidStopHID:self]; } - (void)startHid { diff --git a/Classes/NJOutputController.h b/Classes/NJOutputViewController.h similarity index 93% rename from Classes/NJOutputController.h rename to Classes/NJOutputViewController.h index b22afdb..2f50ef8 100644 --- a/Classes/NJOutputController.h +++ b/Classes/NJOutputViewController.h @@ -12,7 +12,7 @@ @class NJOutput; @class NJInput; -@interface NJOutputController : NSObject { +@interface NJOutputViewController : NSObject { IBOutlet NJKeyInputField *keyInput; IBOutlet NSMatrix *radioButtons; IBOutlet NSSegmentedControl *mouseDirSelect; diff --git a/Classes/NJOutputController.m b/Classes/NJOutputViewController.m similarity index 98% rename from Classes/NJOutputController.m rename to Classes/NJOutputViewController.m index f8ed2ea..a0f356f 100644 --- a/Classes/NJOutputController.m +++ b/Classes/NJOutputViewController.m @@ -5,7 +5,7 @@ // Created by Sam McCall on 5/05/09. // -#import "NJOutputController.h" +#import "NJOutputViewController.h" #import "NJMapping.h" #import "NJInput.h" @@ -13,13 +13,13 @@ #import "NJInputController.h" #import "NJKeyInputField.h" #import "NJOutputMapping.h" -#import "NJOutputController.h" +#import "NJOutputViewController.h" #import "NJOutputKeyPress.h" #import "NJOutputMouseButton.h" #import "NJOutputMouseMove.h" #import "NJOutputMouseScroll.h" -@implementation NJOutputController { +@implementation NJOutputViewController { NJInput *_input; } diff --git a/Enjoyable.xcodeproj/project.pbxproj b/Enjoyable.xcodeproj/project.pbxproj index c19007b..8e9a213 100644 --- a/Enjoyable.xcodeproj/project.pbxproj +++ b/Enjoyable.xcodeproj/project.pbxproj @@ -47,7 +47,7 @@ EEF17D6316E8E2EF00D7DC4D /* NJKeyInputField.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D4916E8E2EF00D7DC4D /* NJKeyInputField.m */; }; EEF17D6416E8E2EF00D7DC4D /* NJMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D4B16E8E2EF00D7DC4D /* NJMapping.m */; }; EEF17D6616E8E2EF00D7DC4D /* NJOutput.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D4F16E8E2EF00D7DC4D /* NJOutput.m */; }; - EEF17D6716E8E2EF00D7DC4D /* NJOutputController.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5116E8E2EF00D7DC4D /* NJOutputController.m */; }; + EEF17D6716E8E2EF00D7DC4D /* NJOutputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5116E8E2EF00D7DC4D /* NJOutputViewController.m */; }; EEF17D6816E8E2EF00D7DC4D /* NJOutputKeyPress.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5316E8E2EF00D7DC4D /* NJOutputKeyPress.m */; }; EEF17D6916E8E2EF00D7DC4D /* NJOutputMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5516E8E2EF00D7DC4D /* NJOutputMapping.m */; }; EEF17D6A16E8E2EF00D7DC4D /* NJOutputMouseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = EEF17D5716E8E2EF00D7DC4D /* NJOutputMouseButton.m */; }; @@ -140,8 +140,8 @@ EEF17D4B16E8E2EF00D7DC4D /* NJMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJMapping.m; path = Classes/NJMapping.m; sourceTree = ""; }; EEF17D4E16E8E2EF00D7DC4D /* NJOutput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NJOutput.h; path = Classes/NJOutput.h; sourceTree = ""; }; EEF17D4F16E8E2EF00D7DC4D /* NJOutput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutput.m; path = Classes/NJOutput.m; sourceTree = ""; }; - EEF17D5016E8E2EF00D7DC4D /* NJOutputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NJOutputController.h; path = Classes/NJOutputController.h; sourceTree = ""; }; - EEF17D5116E8E2EF00D7DC4D /* NJOutputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutputController.m; path = Classes/NJOutputController.m; sourceTree = ""; }; + EEF17D5016E8E2EF00D7DC4D /* NJOutputViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NJOutputViewController.h; path = Classes/NJOutputViewController.h; sourceTree = ""; }; + EEF17D5116E8E2EF00D7DC4D /* NJOutputViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutputViewController.m; path = Classes/NJOutputViewController.m; sourceTree = ""; }; EEF17D5216E8E2EF00D7DC4D /* NJOutputKeyPress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NJOutputKeyPress.h; path = Classes/NJOutputKeyPress.h; sourceTree = ""; }; EEF17D5316E8E2EF00D7DC4D /* NJOutputKeyPress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NJOutputKeyPress.m; path = Classes/NJOutputKeyPress.m; sourceTree = ""; }; EEF17D5416E8E2EF00D7DC4D /* NJOutputMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NJOutputMapping.h; path = Classes/NJOutputMapping.h; sourceTree = ""; }; @@ -173,46 +173,10 @@ children = ( EEF17D3916E8E2EF00D7DC4D /* EnjoyableApplicationDelegate.h */, EEF17D3A16E8E2EF00D7DC4D /* EnjoyableApplicationDelegate.m */, - EEF17D3D16E8E2EF00D7DC4D /* NJInputController.h */, - EEF17D3E16E8E2EF00D7DC4D /* NJInputController.m */, - EEF17D5016E8E2EF00D7DC4D /* NJOutputController.h */, - EEF17D5116E8E2EF00D7DC4D /* NJOutputController.m */, - EEF17D4816E8E2EF00D7DC4D /* NJKeyInputField.h */, - EEF17D4916E8E2EF00D7DC4D /* NJKeyInputField.m */, - EEF17D4A16E8E2EF00D7DC4D /* NJMapping.h */, - EEF17D4B16E8E2EF00D7DC4D /* NJMapping.m */, - EEF17D4716E8E2EF00D7DC4D /* NJInputPathElement.h */, - EEE703DD16F0B3F6002FDD69 /* NJInputPathElement.m */, - EEF17D3B16E8E2EF00D7DC4D /* NJDevice.h */, - EEF17D3C16E8E2EF00D7DC4D /* NJDevice.m */, - EEF17D3F16E8E2EF00D7DC4D /* NJInput.h */, - EEF17D4016E8E2EF00D7DC4D /* NJInput.m */, - EEF17D4116E8E2EF00D7DC4D /* NJInputAnalog.h */, - EEF17D4216E8E2EF00D7DC4D /* NJInputAnalog.m */, - EEF17D4316E8E2EF00D7DC4D /* NJInputButton.h */, - EEF17D4416E8E2EF00D7DC4D /* NJInputButton.m */, - EEF17D4516E8E2EF00D7DC4D /* NJInputHat.h */, - EEF17D4616E8E2EF00D7DC4D /* NJInputHat.m */, - EEF17D4E16E8E2EF00D7DC4D /* NJOutput.h */, - EEF17D4F16E8E2EF00D7DC4D /* NJOutput.m */, - EEF17D5216E8E2EF00D7DC4D /* NJOutputKeyPress.h */, - EEF17D5316E8E2EF00D7DC4D /* NJOutputKeyPress.m */, - EEF17D5416E8E2EF00D7DC4D /* NJOutputMapping.h */, - EEF17D5516E8E2EF00D7DC4D /* NJOutputMapping.m */, - EEF17D5616E8E2EF00D7DC4D /* NJOutputMouseButton.h */, - EEF17D5716E8E2EF00D7DC4D /* NJOutputMouseButton.m */, - EEF17D5816E8E2EF00D7DC4D /* NJOutputMouseMove.h */, - EEF17D5916E8E2EF00D7DC4D /* NJOutputMouseMove.m */, - EEF17D5A16E8E2EF00D7DC4D /* NJOutputMouseScroll.h */, - EEF17D5B16E8E2EF00D7DC4D /* NJOutputMouseScroll.m */, - EED4CE6C16ED692400C65AA8 /* NJMappingMenuController.h */, - EED4CE6D16ED692400C65AA8 /* NJMappingMenuController.m */, - EEE703DA16F089FE002FDD69 /* NJHIDManager.h */, - EEE703DB16F089FE002FDD69 /* NJHIDManager.m */, - EE52145D16F404D500E3C574 /* NJDeviceViewController.h */, - EE52145E16F404D500E3C574 /* NJDeviceViewController.m */, - EE83ACEA16F545EA00083E94 /* NJMappingsViewController.h */, - EE83ACEB16F545EA00083E94 /* NJMappingsViewController.m */, + EEDB86A216FA4C42000E91C3 /* Input */, + EEDB86A316FA4C5C000E91C3 /* Output */, + EEDB86A516FA4CE4000E91C3 /* Views */, + EEDB86A416FA4CD1000E91C3 /* View Controllers */, ); name = Classes; sourceTree = ""; @@ -321,6 +285,74 @@ name = Categories; sourceTree = ""; }; + EEDB86A216FA4C42000E91C3 /* Input */ = { + isa = PBXGroup; + children = ( + EEE703DA16F089FE002FDD69 /* NJHIDManager.h */, + EEE703DB16F089FE002FDD69 /* NJHIDManager.m */, + EEF17D3D16E8E2EF00D7DC4D /* NJInputController.h */, + EEF17D3E16E8E2EF00D7DC4D /* NJInputController.m */, + EEF17D4716E8E2EF00D7DC4D /* NJInputPathElement.h */, + EEE703DD16F0B3F6002FDD69 /* NJInputPathElement.m */, + EEF17D4A16E8E2EF00D7DC4D /* NJMapping.h */, + EEF17D4B16E8E2EF00D7DC4D /* NJMapping.m */, + EEF17D3B16E8E2EF00D7DC4D /* NJDevice.h */, + EEF17D3C16E8E2EF00D7DC4D /* NJDevice.m */, + EEF17D3F16E8E2EF00D7DC4D /* NJInput.h */, + EEF17D4016E8E2EF00D7DC4D /* NJInput.m */, + EEF17D4116E8E2EF00D7DC4D /* NJInputAnalog.h */, + EEF17D4216E8E2EF00D7DC4D /* NJInputAnalog.m */, + EEF17D4316E8E2EF00D7DC4D /* NJInputButton.h */, + EEF17D4416E8E2EF00D7DC4D /* NJInputButton.m */, + EEF17D4516E8E2EF00D7DC4D /* NJInputHat.h */, + EEF17D4616E8E2EF00D7DC4D /* NJInputHat.m */, + ); + name = Input; + sourceTree = ""; + }; + EEDB86A316FA4C5C000E91C3 /* Output */ = { + isa = PBXGroup; + children = ( + EEF17D4E16E8E2EF00D7DC4D /* NJOutput.h */, + EEF17D4F16E8E2EF00D7DC4D /* NJOutput.m */, + EEF17D5216E8E2EF00D7DC4D /* NJOutputKeyPress.h */, + EEF17D5316E8E2EF00D7DC4D /* NJOutputKeyPress.m */, + EEF17D5416E8E2EF00D7DC4D /* NJOutputMapping.h */, + EEF17D5516E8E2EF00D7DC4D /* NJOutputMapping.m */, + EEF17D5616E8E2EF00D7DC4D /* NJOutputMouseButton.h */, + EEF17D5716E8E2EF00D7DC4D /* NJOutputMouseButton.m */, + EEF17D5816E8E2EF00D7DC4D /* NJOutputMouseMove.h */, + EEF17D5916E8E2EF00D7DC4D /* NJOutputMouseMove.m */, + EEF17D5A16E8E2EF00D7DC4D /* NJOutputMouseScroll.h */, + EEF17D5B16E8E2EF00D7DC4D /* NJOutputMouseScroll.m */, + ); + name = Output; + sourceTree = ""; + }; + EEDB86A416FA4CD1000E91C3 /* View Controllers */ = { + isa = PBXGroup; + children = ( + EEF17D5016E8E2EF00D7DC4D /* NJOutputViewController.h */, + EEF17D5116E8E2EF00D7DC4D /* NJOutputViewController.m */, + EED4CE6C16ED692400C65AA8 /* NJMappingMenuController.h */, + EED4CE6D16ED692400C65AA8 /* NJMappingMenuController.m */, + EE52145D16F404D500E3C574 /* NJDeviceViewController.h */, + EE52145E16F404D500E3C574 /* NJDeviceViewController.m */, + EE83ACEA16F545EA00083E94 /* NJMappingsViewController.h */, + EE83ACEB16F545EA00083E94 /* NJMappingsViewController.m */, + ); + name = "View Controllers"; + sourceTree = ""; + }; + EEDB86A516FA4CE4000E91C3 /* Views */ = { + isa = PBXGroup; + children = ( + EEF17D4816E8E2EF00D7DC4D /* NJKeyInputField.h */, + EEF17D4916E8E2EF00D7DC4D /* NJKeyInputField.m */, + ); + name = Views; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -445,7 +477,7 @@ EEF17D6316E8E2EF00D7DC4D /* NJKeyInputField.m in Sources */, EEF17D6416E8E2EF00D7DC4D /* NJMapping.m in Sources */, EEF17D6616E8E2EF00D7DC4D /* NJOutput.m in Sources */, - EEF17D6716E8E2EF00D7DC4D /* NJOutputController.m in Sources */, + EEF17D6716E8E2EF00D7DC4D /* NJOutputViewController.m in Sources */, EEF17D6816E8E2EF00D7DC4D /* NJOutputKeyPress.m in Sources */, EEF17D6916E8E2EF00D7DC4D /* NJOutputMapping.m in Sources */, EEF17D6A16E8E2EF00D7DC4D /* NJOutputMouseButton.m in Sources */, diff --git a/Info.plist b/Info.plist index 3114a8b..93dd01a 100644 --- a/Info.plist +++ b/Info.plist @@ -46,7 +46,7 @@ CFBundleSignature ???? CFBundleVersion - 559 + 565 LSApplicationCategoryType public.app-category.utilities NSHumanReadableCopyright diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 0c068fc..44865f4 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -361,10 +361,9 @@ Enabled - + 268 {{7, 14}, {36, 25}} - _NS:9 YES @@ -410,10 +409,9 @@ Mapping Selector - + 268 {{0, 14}, {140, 25}} - _NS:9 YES @@ -490,7 +488,7 @@ {664, 323} - + 256 @@ -502,7 +500,6 @@ -2147483374 {{20, 20}, {194, 283}} - _NS:22 YES @@ -532,7 +529,6 @@ Lg 274 {{20, 20}, {194, 283}} - _NS:22 YES @@ -567,7 +563,6 @@ aW5nLg {232, 321} - YES NO @@ -663,7 +658,6 @@ aW5nLg {{1, 1}, {232, 321}} - @@ -674,7 +668,6 @@ aW5nLg -2147483392 {{1, 1}, {8, 298}} - NO @@ -686,7 +679,6 @@ aW5nLg -2147483392 {{-100, -100}, {473, 15}} - NO 1 @@ -697,7 +689,6 @@ aW5nLg {234, 323} - 150034 @@ -711,7 +702,6 @@ aW5nLg {234, 323} - _NS:9 NSView @@ -725,7 +715,6 @@ aW5nLg 268 {{197, 157}, {193, 21}} - _NS:9 YES @@ -750,7 +739,6 @@ aW5nLg 265 {{189, 117}, {224, 20}} - _NS:9 YES @@ -792,7 +780,6 @@ aW5nLg 268 {{343, 31}, {70, 18}} - _NS:9 YES @@ -823,7 +810,6 @@ aW5nLg 265 {{189, 33}, {150, 20}} - _NS:9 YES @@ -868,7 +854,6 @@ aW5nLg 265 {{191, 24}, {146, 16}} - _NS:9 YES @@ -894,7 +879,6 @@ aW5nLg 265 {{189, 70}, {224, 24}} - _NS:9 YES @@ -948,7 +932,6 @@ aW5nLg 265 {{191, 108}, {220, 16}} - _NS:9 YES @@ -974,7 +957,6 @@ aW5nLg 265 {{191, 196}, {220, 23}} - _NS:9 NJKeyInputField @@ -984,7 +966,6 @@ aW5nLg 265 {{188, 153}, {226, 26}} - YES @@ -1017,7 +998,6 @@ aW5nLg 268 {{24, 20}, {163, 250}} - NO 6 @@ -1148,7 +1128,6 @@ aW5nLg 266 {{9, 286}, {412, 17}} - YES @@ -1172,7 +1151,6 @@ aW5nLg 10 {{12, 276}, {406, 5}} - {0, 0} @@ -1199,15 +1177,12 @@ aW5nLg {{233, 0}, {431, 323}} - _NS:9 NSView {664, 323} - - {{0, 0}, {1440, 878}} @@ -1295,7 +1270,7 @@ aW5nLg NJInputController - NJOutputController + NJOutputViewController NJDeviceViewController @@ -1312,7 +1287,7 @@ aW5nLg YES - + 256 @@ -1328,7 +1303,6 @@ aW5nLg 256 {198, 198} - YES NO @@ -1386,7 +1360,6 @@ aW5nLg {{1, 1}, {198, 198}} - @@ -1397,7 +1370,6 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} - NO @@ -1409,7 +1381,6 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} - NO 1 @@ -1420,7 +1391,6 @@ aW5nLg {{0, 20}, {200, 200}} - 150034 @@ -1436,7 +1406,6 @@ aW5nLg 268 {{66, -1}, {68, 23}} - _NS:22 YES @@ -1465,7 +1434,6 @@ aW5nLg 292 {{0, -1}, {34, 23}} - YES @@ -1492,7 +1460,6 @@ aW5nLg 292 {{166, -1}, {34, 23}} - YES 67108864 @@ -1514,7 +1481,6 @@ aW5nLg 292 {{133, -1}, {34, 23}} - YES @@ -1537,7 +1503,6 @@ aW5nLg 292 {{33, -1}, {34, 23}} - YES @@ -1561,8 +1526,6 @@ aW5nLg {200, 220} - - NSView -- 2.20.1