From: Joe Wreschnig Date: Fri, 15 Mar 2013 00:36:46 +0000 (+0100) Subject: Missed a translating -> simulating. X-Git-Tag: version-1.1~23 X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=91ea24909c2c38d9f3d319e6440b362222fdfd87;p=enjoyable.git Missed a translating -> simulating. --- diff --git a/Classes/NJDeviceController.h b/Classes/NJDeviceController.h index 1391121..1d13a98 100644 --- a/Classes/NJDeviceController.h +++ b/Classes/NJDeviceController.h @@ -19,7 +19,7 @@ IBOutlet NSOutlineView *outlineView; IBOutlet NJOutputController *outputController; IBOutlet NJMappingsController *mappingsController; - IBOutlet NSButton *translatingEventsButton; + IBOutlet NSButton *simulatingEventsButton; IBOutlet NSView *connectDevicePrompt; IBOutlet NSView *hidSleepingPrompt; } diff --git a/Classes/NJDeviceController.m b/Classes/NJDeviceController.m index 0b0fe92..4a6d3dc 100644 --- a/Classes/NJDeviceController.m +++ b/Classes/NJDeviceController.m @@ -57,7 +57,7 @@ // nothing if a noisy device is plugged in (the % of that // spent in input_callback is negligible, so it's not // something we can make faster). I don't really think that's - // acceptable, CPU/power wise. So if translation is disabled + // acceptable, CPU/power wise. So if simulation is disabled // and the window is closed, just switch off the HID manager // entirely. This probably also has some marginal benefits for // compatibility with other applications that want exclusive @@ -318,7 +318,7 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn if (simulatingEvents != _simulatingEvents) { _simulatingEvents = simulatingEvents; NSInteger state = simulatingEvents ? NSOnState : NSOffState; - translatingEventsButton.state = state; + simulatingEventsButton.state = state; NSString *name = simulatingEvents ? NJEventSimulationStarted : NJEventSimulationStopped; diff --git a/Classes/NJMappingMenuController.h b/Classes/NJMappingMenuController.h index a2de7e9..33c06bb 100644 --- a/Classes/NJMappingMenuController.h +++ b/Classes/NJMappingMenuController.h @@ -24,7 +24,7 @@ @interface NJMappingMenuController : NSObject // Mapping menu controllers manage the contents of a menu that // shows a list of all available mappings, as well as the current - // event translation state. The menu may have other items in it as + // event simulation state. The menu may have other items in it as // well, but none at an adjacent index that also have NJMappings // as represented objects. diff --git a/Info.plist b/Info.plist index 1ddd7ca..6dba917 100644 --- a/Info.plist +++ b/Info.plist @@ -46,7 +46,7 @@ CFBundleSignature ???? CFBundleVersion - 303 + 305 LSApplicationCategoryType public.app-category.utilities NSHumanReadableCopyright diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 39b227e..be18595 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -1647,14 +1647,6 @@ aW5nLg 826 - - - translatingEventsButton - - - - 879 - outlineView @@ -1687,6 +1679,14 @@ aW5nLg 978 + + + simulatingEventsButton + + + + 982 + mappingsController @@ -3245,7 +3245,7 @@ aW5nLg - 981 + 982