projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
561fa17
)
Some more renames.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Thu, 14 Mar 2013 19:05:05 +0000
(20:05 +0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Thu, 14 Mar 2013 19:05:05 +0000
(20:05 +0100)
13 files changed:
Classes/EnjoyableApplicationDelegate.m
patch
|
blob
|
history
Classes/NJDevice.m
patch
|
blob
|
history
Classes/NJDeviceController.h
patch
|
blob
|
history
Classes/NJDeviceController.m
patch
|
blob
|
history
Classes/NJInput.h
patch
|
blob
|
history
Classes/NJInput.m
patch
|
blob
|
history
Classes/NJInputAnalog.m
patch
|
blob
|
history
Classes/NJMappingMenuController.h
patch
|
blob
|
history
Classes/NJMappingMenuController.m
patch
|
blob
|
history
Info.plist
patch
|
blob
|
history
Other Sources/NJEvents.h
patch
|
blob
|
history
Resources/English.lproj/Localizable.strings
patch
|
blob
|
history
Resources/English.lproj/MainMenu.xib
patch
|
blob
|
history
diff --git
a/Classes/EnjoyableApplicationDelegate.m
b/Classes/EnjoyableApplicationDelegate.m
index
b1d9907
..
db62f53
100644
(file)
--- a/
Classes/EnjoyableApplicationDelegate.m
+++ b/
Classes/EnjoyableApplicationDelegate.m
@@
-31,13
+31,13
@@
object:nil];
[NSNotificationCenter.defaultCenter
addObserver:self
object:nil];
[NSNotificationCenter.defaultCenter
addObserver:self
- selector:@selector(event
TranslationActiva
ted:)
- name:NJEvent
TranslationActiva
ted
+ selector:@selector(event
SimulationStar
ted:)
+ name:NJEvent
SimulationStar
ted
object:nil];
[NSNotificationCenter.defaultCenter
addObserver:self
object:nil];
[NSNotificationCenter.defaultCenter
addObserver:self
- selector:@selector(event
TranslationDeactivat
ed:)
- name:NJEvent
TranslationDeactivat
ed
+ selector:@selector(event
SimulationStopp
ed:)
+ name:NJEvent
SimulationStopp
ed
object:nil];
[self.mappingsController load];
object:nil];
[self.mappingsController load];
@@
-104,7
+104,7
@@
return NO;
}
return NO;
}
-- (void)event
TranslationActiva
ted:(NSNotification *)note {
+- (void)event
SimulationStar
ted:(NSNotification *)note {
statusItem.image = [NSImage imageNamed:@"Status Menu Icon"];
[NSWorkspace.sharedWorkspace.notificationCenter
addObserver:self
statusItem.image = [NSImage imageNamed:@"Status Menu Icon"];
[NSWorkspace.sharedWorkspace.notificationCenter
addObserver:self
@@
-113,7
+113,7
@@
object:nil];
}
object:nil];
}
-- (void)event
TranslationDeactivat
ed:(NSNotification *)note {
+- (void)event
SimulationStopp
ed:(NSNotification *)note {
statusItem.image = [NSImage imageNamed:@"Status Menu Icon Disabled"];
[NSWorkspace.sharedWorkspace.notificationCenter
removeObserver:self
statusItem.image = [NSImage imageNamed:@"Status Menu Icon Disabled"];
[NSWorkspace.sharedWorkspace.notificationCenter
removeObserver:self
diff --git
a/Classes/NJDevice.m
b/Classes/NJDevice.m
index
e4c6b3d
..
b03898f
100644
(file)
--- a/
Classes/NJDevice.m
+++ b/
Classes/NJDevice.m
@@
-81,7
+81,7
@@
static NSArray *InputsForElement(IOHIDDeviceRef device, id parent) {
}
- (NSString *)uid {
}
- (NSString *)uid {
- return [NSString stringWithFormat:
@"%d:%d:%d", _vendorId, _productId, _index];
+ return [NSString stringWithFormat:@"%d:%d:%d", _vendorId, _productId, _index];
}
- (NJInput *)findInputByCookie:(IOHIDElementCookie)cookie {
}
- (NJInput *)findInputByCookie:(IOHIDElementCookie)cookie {
diff --git
a/Classes/NJDeviceController.h
b/Classes/NJDeviceController.h
index
f49d647
..
1391121
100644
(file)
--- a/
Classes/NJDeviceController.h
+++ b/
Classes/NJDeviceController.h
@@
-26,8
+26,8
@@
@property (nonatomic, readonly) NJInput *selectedInput;
@property (nonatomic, assign) NSPoint mouseLoc;
@property (nonatomic, readonly) NJInput *selectedInput;
@property (nonatomic, assign) NSPoint mouseLoc;
-@property (nonatomic, assign) BOOL
trans
latingEvents;
+@property (nonatomic, assign) BOOL
simu
latingEvents;
-- (IBAction)
trans
latingEventsChanged:(NSButton *)sender;
+- (IBAction)
simu
latingEventsChanged:(NSButton *)sender;
@end
@end
diff --git
a/Classes/NJDeviceController.m
b/Classes/NJDeviceController.m
index
8cc5f2a
..
39ec389
100644
(file)
--- a/
Classes/NJDeviceController.m
+++ b/
Classes/NJDeviceController.m
@@
-144,7
+144,7
@@
- (void)hidManager:(NJHIDManager *)manager
valueChanged:(IOHIDValueRef)value
fromDevice:(IOHIDDeviceRef)device {
- (void)hidManager:(NJHIDManager *)manager
valueChanged:(IOHIDValueRef)value
fromDevice:(IOHIDDeviceRef)device {
- if (self.
trans
latingEvents) {
+ if (self.
simu
latingEvents) {
[self runOutputForDevice:device value:value];
} else {
[self showOutputForDevice:device value:value];
[self runOutputForDevice:device value:value];
} else {
[self showOutputForDevice:device value:value];
@@
-222,7
+222,7
@@
static int findAvailableIndex(NSArray *list, NJDevice *dev) {
didPresentSelector:nil
contextInfo:nil];
}
didPresentSelector:nil
contextInfo:nil];
}
- self.
trans
latingEvents = NO;
+ self.
simu
latingEvents = NO;
if (manager.running)
[self hidManagerDidStart:manager];
else
if (manager.running)
[self hidManagerDidStart:manager];
else
@@
-312,18
+312,18
@@
objectValueForTableColumn:(NSTableColumn *)tableColumn
forKey:@"expanded rows"];
}
forKey:@"expanded rows"];
}
-- (void)set
TranslatingEvents:(BOOL)trans
latingEvents {
- if (
translatingEvents != _trans
latingEvents) {
- _
translatingEvents = trans
latingEvents;
- NSInteger state =
trans
latingEvents ? NSOnState : NSOffState;
+- (void)set
SimulatingEvents:(BOOL)simu
latingEvents {
+ if (
simulatingEvents != _simu
latingEvents) {
+ _
simulatingEvents = simu
latingEvents;
+ NSInteger state =
simu
latingEvents ? NSOnState : NSOffState;
translatingEventsButton.state = state;
translatingEventsButton.state = state;
- NSString *name =
trans
latingEvents
- ? NJEvent
TranslationActiva
ted
- : NJEvent
TranslationDeactivat
ed;
+ NSString *name =
simu
latingEvents
+ ? NJEvent
SimulationStar
ted
+ : NJEvent
SimulationStopp
ed;
[NSNotificationCenter.defaultCenter postNotificationName:name
object:self];
[NSNotificationCenter.defaultCenter postNotificationName:name
object:self];
- if (!
trans
latingEvents && !NSApplication.sharedApplication.isActive)
+ if (!
simu
latingEvents && !NSApplication.sharedApplication.isActive)
[self stopHid];
else
[self startHid];
[self stopHid];
else
[self startHid];
@@
-343,12
+343,12
@@
objectValueForTableColumn:(NSTableColumn *)tableColumn
}
- (void)stopHidIfDisabled:(NSNotification *)application {
}
- (void)stopHidIfDisabled:(NSNotification *)application {
- if (!self.
trans
latingEvents)
+ if (!self.
simu
latingEvents)
[self stopHid];
}
[self stopHid];
}
-- (IBAction)
trans
latingEventsChanged:(NSButton *)sender {
- self.
trans
latingEvents = sender.state == NSOnState;
+- (IBAction)
simu
latingEventsChanged:(NSButton *)sender {
+ self.
simu
latingEvents = sender.state == NSOnState;
}
@end
}
@end
diff --git
a/Classes/NJInput.h
b/Classes/NJInput.h
index
db47121
..
b530c37
100644
(file)
--- a/
Classes/NJInput.h
+++ b/
Classes/NJInput.h
@@
-18,7
+18,7
@@
element:(IOHIDElementRef)element
parent:(NJInputPathElement *)parent;
element:(IOHIDElementRef)element
parent:(NJInputPathElement *)parent;
-@property (nonatomic,
assign
) IOHIDElementCookie cookie;
+@property (nonatomic,
readonly
) IOHIDElementCookie cookie;
@property (nonatomic, assign) BOOL active;
@property (nonatomic, assign) float magnitude;
@property (nonatomic, assign) BOOL active;
@property (nonatomic, assign) float magnitude;
diff --git
a/Classes/NJInput.m
b/Classes/NJInput.m
index
82d5993
..
d7144a0
100644
(file)
--- a/
Classes/NJInput.m
+++ b/
Classes/NJInput.m
@@
-14,11
+14,11
@@
element:(IOHIDElementRef)element
parent:(NJInputPathElement *)parent
{
element:(IOHIDElementRef)element
parent:(NJInputPathElement *)parent
{
- NSString *elementName = (__bridge NSString *)
(IOHIDElementGetName(element)
);
+ NSString *elementName = (__bridge NSString *)
IOHIDElementGetName(element
);
if (elementName.length)
name = [name stringByAppendingFormat:@"- %@", elementName];
if ((self = [super initWithName:name eid:eid parent:parent])) {
if (elementName.length)
name = [name stringByAppendingFormat:@"- %@", elementName];
if ((self = [super initWithName:name eid:eid parent:parent])) {
-
self.
cookie = IOHIDElementGetCookie(element);
+
_
cookie = IOHIDElementGetCookie(element);
}
return self;
}
}
return self;
}
diff --git
a/Classes/NJInputAnalog.m
b/Classes/NJInputAnalog.m
index
3746c11
..
1f65f48
100644
(file)
--- a/
Classes/NJInputAnalog.m
+++ b/
Classes/NJInputAnalog.m
@@
-25,7
+25,7
@@
static float normalize(CFIndex p, CFIndex min, CFIndex max) {
if ((self = [super initWithName:NJINPUT_NAME(NSLocalizedString(@"axis %d", @"axis name"), index)
eid:NJINPUT_DID("Axis", index)
element:element
if ((self = [super initWithName:NJINPUT_NAME(NSLocalizedString(@"axis %d", @"axis name"), index)
eid:NJINPUT_DID("Axis", index)
element:element
- parent:
nil
])) {
+ parent:
parent
])) {
self.children = @[[[NJInput alloc] initWithName:NSLocalizedString(@"axis low", @"axis low trigger")
eid:@"Low"
parent:self],
self.children = @[[[NJInput alloc] initWithName:NSLocalizedString(@"axis low", @"axis low trigger")
eid:@"Low"
parent:self],
diff --git
a/Classes/NJMappingMenuController.h
b/Classes/NJMappingMenuController.h
index
9c9432a
..
a2de7e9
100644
(file)
--- a/
Classes/NJMappingMenuController.h
+++ b/
Classes/NJMappingMenuController.h
@@
-42,8
+42,8
@@
@property (nonatomic, assign) BOOL hasKeyEquivalents;
// Whether or not to add key equivalents to the menu items.
@property (nonatomic, assign) BOOL hasKeyEquivalents;
// Whether or not to add key equivalents to the menu items.
-@property (nonatomic, strong) IBOutlet NSMenuItem *event
Trans
lationToggle;
- // A menu item representing the current event
trans
lation state.
+@property (nonatomic, strong) IBOutlet NSMenuItem *event
Simu
lationToggle;
+ // A menu item representing the current event
simu
lation state.
// This outlet is optional.
// This outlet is optional.
diff --git
a/Classes/NJMappingMenuController.m
b/Classes/NJMappingMenuController.m
index
03ce31d
..
6d9250f
100644
(file)
--- a/
Classes/NJMappingMenuController.m
+++ b/
Classes/NJMappingMenuController.m
@@
-27,12
+27,12
@@
name:NJEventMappingChanged
object:nil];
[center addObserver:self
name:NJEventMappingChanged
object:nil];
[center addObserver:self
- selector:@selector(event
TranslationActiva
ted:)
- name:NJEvent
TranslationActiva
ted
+ selector:@selector(event
SimulationStar
ted:)
+ name:NJEvent
SimulationStar
ted
object:nil];
[center addObserver:self
object:nil];
[center addObserver:self
- selector:@selector(event
TranslationDeactivat
ed:)
- name:NJEvent
TranslationDeactivat
ed
+ selector:@selector(event
SimulationStopp
ed:)
+ name:NJEvent
SimulationStopp
ed
object:nil];
}
return self;
object:nil];
}
return self;
@@
-99,14
+99,14
@@
item.state = mapping == item.representedObject;
}
item.state = mapping == item.representedObject;
}
-- (void)event
TranslationActiva
ted:(NSNotification *)note {
- self.event
Trans
lationToggle.title = NSLocalizedString(@"Disable",
- @"menu item text to disable event
trans
lation");
+- (void)event
SimulationStar
ted:(NSNotification *)note {
+ self.event
Simu
lationToggle.title = NSLocalizedString(@"Disable",
+ @"menu item text to disable event
simu
lation");
}
}
-- (void)event
TranslationDeactivat
ed:(NSNotification *)note {
- self.event
Trans
lationToggle.title = NSLocalizedString(@"Enable",
- @"menu item text to enable event
trans
lation");
+- (void)event
SimulationStopp
ed:(NSNotification *)note {
+ self.event
Simu
lationToggle.title = NSLocalizedString(@"Enable",
+ @"menu item text to enable event
simu
lation");
}
@end
}
@end
diff --git
a/Info.plist
b/Info.plist
index
bc56ad4
..
0ea7a95
100644
(file)
--- a/
Info.plist
+++ b/
Info.plist
@@
-46,7
+46,7
@@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>29
6
</string>
+ <string>29
8
</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>NSHumanReadableCopyright</key>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>NSHumanReadableCopyright</key>
diff --git
a/Other Sources/NJEvents.h
b/Other Sources/NJEvents.h
index
5485154
..
204a270
100644
(file)
--- a/
Other Sources/NJEvents.h
+++ b/
Other Sources/NJEvents.h
@@
-8,8
+8,8
@@
#define NJEventMappingChanged @"com.yukkurigames.Enjoyable.MappingChanged"
#define NJEventMappingListChanged @"com.yukkurigames.Enjoyable.MappingListChanged"
#define NJEventMappingChanged @"com.yukkurigames.Enjoyable.MappingChanged"
#define NJEventMappingListChanged @"com.yukkurigames.Enjoyable.MappingListChanged"
-#define NJEvent
TranslationActivated @"com.yukkurigames.Enjoyable.EventTranslationActiva
ted"
-#define NJEvent
TranslationDeactivated @"com.yukkurigames.Enjoyable.EventTranslationDeactivat
ed"
+#define NJEvent
SimulationStarted @"com.yukkurigames.Enjoyable.EventSimulationStar
ted"
+#define NJEvent
SimulationStopped @"com.yukkurigames.Enjoyable.EventSimulationStopp
ed"
#define NJMappingKey @"com.yukkurigames.Enjoyable.Mapping"
#define NJMappingListKey @"com.yukkurigames.Enjoyable.MappingList"
#define NJMappingKey @"com.yukkurigames.Enjoyable.Mapping"
#define NJMappingListKey @"com.yukkurigames.Enjoyable.MappingList"
diff --git
a/Resources/English.lproj/Localizable.strings
b/Resources/English.lproj/Localizable.strings
index
8b9a717
..
0e30ce1
100644
(file)
Binary files a/Resources/English.lproj/Localizable.strings and b/Resources/English.lproj/Localizable.strings differ
diff --git
a/Resources/English.lproj/MainMenu.xib
b/Resources/English.lproj/MainMenu.xib
index
2a95667
..
39b227e
100644
(file)
--- a/
Resources/English.lproj/MainMenu.xib
+++ b/
Resources/English.lproj/MainMenu.xib
@@
-489,7
+489,7
@@
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMinSize">{664, 323}</string>
<object class="NSView" key="NSWindowView" id="177223957">
<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">
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSCustomView" id="734312853">
@@
-501,7
+501,6
@@
<int key="NSvFlags">-2147483374</int>
<string key="NSFrame">{{20, 20}, {194, 283}}</string>
<reference key="NSSuperview" ref="734312853"/>
<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>
<reference key="NSNextKeyView" ref="471332453"/>
<string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool>
@@
-531,7
+530,6
@@
Lg</string>
<int key="NSvFlags">274</int>
<string key="NSFrame">{{20, 20}, {194, 283}}</string>
<reference key="NSSuperview" ref="734312853"/>
<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>
<reference key="NSNextKeyView" ref="918286878"/>
<string key="NSReuseIdentifierKey">_NS:22</string>
<bool key="NSEnabled">YES</bool>
@@
-566,7
+564,6
@@
aW5nLg</string>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{232, 321}</string>
<reference key="NSSuperview" ref="698362889"/>
<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>
<reference key="NSNextKeyView" ref="892486973"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@
-662,7
+659,6
@@
aW5nLg</string>
</array>
<string key="NSFrame">{{1, 1}, {232, 321}}</string>
<reference key="NSSuperview" ref="364857164"/>
</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"/>
<reference key="NSNextKeyView" ref="365506042"/>
<reference key="NSDocView" ref="365506042"/>
<reference key="NSBGColor" ref="834857663"/>
@@
-673,7
+669,6
@@
aW5nLg</string>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 1}, {8, 298}}</string>
<reference key="NSSuperview" ref="364857164"/>
<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"/>
<reference key="NSNextKeyView" ref="12898323"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="364857164"/>
@@
-685,7
+680,6
@@
aW5nLg</string>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {473, 15}}</string>
<reference key="NSSuperview" ref="364857164"/>
<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>
<reference key="NSNextKeyView" ref="698362889"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@
-696,7
+690,6
@@
aW5nLg</string>
</array>
<string key="NSFrameSize">{234, 323}</string>
<reference key="NSSuperview" ref="734312853"/>
</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"/>
<reference key="NSNextKeyView" ref="698362889"/>
<int key="NSsFlags">150034</int>
<reference key="NSVScroller" ref="1036252745"/>
@@
-710,7
+703,6
@@
aW5nLg</string>
</array>
<string key="NSFrameSize">{234, 323}</string>
<reference key="NSSuperview" ref="177223957"/>
</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>
<reference key="NSNextKeyView" ref="364857164"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
@@
-724,7
+716,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{189, 117}, {224, 20}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="385416822"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@
-766,7
+757,6
@@
aW5nLg</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{343, 31}, {70, 18}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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">
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="868379451">
@@
-797,7
+787,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{189, 33}, {150, 20}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="792189805"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@
-842,7
+831,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{191, 24}, {146, 16}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="20704797"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@
-868,7
+856,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{189, 70}, {224, 24}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="921829691"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@
-922,7
+909,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{191, 108}, {220, 16}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="125828224"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@
-948,7
+934,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{191, 196}, {220, 23}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="194275224"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NJKeyInputField</string>
@@
-958,7
+943,6
@@
aW5nLg</string>
<int key="NSvFlags">265</int>
<string key="NSFrame">{{188, 153}, {226, 26}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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="875916470"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="74311158">
<reference key="NSNextKeyView" ref="875916470"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="74311158">
@@
-991,7
+975,6
@@
aW5nLg</string>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{24, 20}, {163, 250}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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>
<reference key="NSNextKeyView" ref="57697638"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSNumRows">6</int>
@@
-1122,7
+1105,6
@@
aW5nLg</string>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{9, 286}, {412, 17}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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">
<reference key="NSNextKeyView" ref="497528019"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="853503577">
@@
-1146,7
+1128,6
@@
aW5nLg</string>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{12, 276}, {406, 5}}</string>
<reference key="NSSuperview" ref="471332453"/>
<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">
<reference key="NSNextKeyView" ref="120408205"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
@@
-1173,15
+1154,12
@@
aW5nLg</string>
</array>
<string key="NSFrame">{{233, 0}, {431, 323}}</string>
<reference key="NSSuperview" ref="177223957"/>
</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="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>
<reference key="NSNextKeyView" ref="734312853"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@
-1669,14
+1647,6
@@
aW5nLg</string>
</object>
<int key="connectionID">826</int>
</object>
</object>
<int key="connectionID">826</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">translatingEventsChanged:</string>
- <reference key="source" ref="1007832501"/>
- <reference key="destination" ref="385218002"/>
- </object>
- <int key="connectionID">878</int>
- </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">translatingEventsButton</string>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">translatingEventsButton</string>
@@
-1709,6
+1679,14
@@
aW5nLg</string>
</object>
<int key="connectionID">976</int>
</object>
</object>
<int key="connectionID">976</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">simulatingEventsChanged:</string>
+ <reference key="source" ref="1007832501"/>
+ <reference key="destination" ref="385218002"/>
+ </object>
+ <int key="connectionID">978</int>
+ </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">mappingsController</string>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">mappingsController</string>
@@
-2101,14
+2079,6
@@
aW5nLg</string>
</object>
<int key="connectionID">933</int>
</object>
</object>
<int key="connectionID">933</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">eventTranslationToggle</string>
- <reference key="source" ref="9563326"/>
- <reference key="destination" ref="632598200"/>
- </object>
- <int key="connectionID">951</int>
- </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menu</string>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menu</string>
@@
-2125,6
+2095,14
@@
aW5nLg</string>
</object>
<int key="connectionID">956</int>
</object>
</object>
<int key="connectionID">956</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">eventSimulationToggle</string>
+ <reference key="source" ref="9563326"/>
+ <reference key="destination" ref="632598200"/>
+ </object>
+ <int key="connectionID">980</int>
+ </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menu</string>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">menu</string>
@@
-2143,11
+2121,11
@@
aW5nLg</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">event
Trans
lationToggle</string>
+ <string key="label">event
Simu
lationToggle</string>
<reference key="source" ref="427912652"/>
<reference key="destination" ref="803553950"/>
</object>
<reference key="source" ref="427912652"/>
<reference key="destination" ref="803553950"/>
</object>
- <int key="connectionID">9
5
9</int>
+ <int key="connectionID">9
7
9</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@
-2167,11
+2145,11
@@
aW5nLg</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">event
Trans
lationToggle</string>
+ <string key="label">event
Simu
lationToggle</string>
<reference key="source" ref="452957078"/>
<reference key="destination" ref="679462300"/>
</object>
<reference key="source" ref="452957078"/>
<reference key="destination" ref="679462300"/>
</object>
- <int key="connectionID">9
65
</int>
+ <int key="connectionID">9
81
</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@
-3267,7
+3245,7
@@
aW5nLg</string>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">9
77
</int>
+ <int key="maxID">9
81
</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">