projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7646679
)
Missed a translating -> simulating.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Fri, 15 Mar 2013 00:36:46 +0000
(
01:36
+0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Fri, 15 Mar 2013 00:36:46 +0000
(
01:36
+0100)
Classes/NJDeviceController.h
patch
|
blob
|
history
Classes/NJDeviceController.m
patch
|
blob
|
history
Classes/NJMappingMenuController.h
patch
|
blob
|
history
Info.plist
patch
|
blob
|
history
Resources/English.lproj/MainMenu.xib
patch
|
blob
|
history
diff --git
a/Classes/NJDeviceController.h
b/Classes/NJDeviceController.h
index
1391121
..
1d13a98
100644
(file)
--- a/
Classes/NJDeviceController.h
+++ b/
Classes/NJDeviceController.h
@@
-19,7
+19,7
@@
IBOutlet NSOutlineView *outlineView;
IBOutlet NJOutputController *outputController;
IBOutlet NJMappingsController *mappingsController;
IBOutlet NSOutlineView *outlineView;
IBOutlet NJOutputController *outputController;
IBOutlet NJMappingsController *mappingsController;
- IBOutlet NSButton *
trans
latingEventsButton;
+ IBOutlet NSButton *
simu
latingEventsButton;
IBOutlet NSView *connectDevicePrompt;
IBOutlet NSView *hidSleepingPrompt;
}
IBOutlet NSView *connectDevicePrompt;
IBOutlet NSView *hidSleepingPrompt;
}
diff --git
a/Classes/NJDeviceController.m
b/Classes/NJDeviceController.m
index
0b0fe92
..
4a6d3dc
100644
(file)
--- 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
// 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
trans
lation is disabled
+ // acceptable, CPU/power wise. So if
simu
lation 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
// 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;
if (simulatingEvents != _simulatingEvents) {
_simulatingEvents = simulatingEvents;
NSInteger state = simulatingEvents ? NSOnState : NSOffState;
-
trans
latingEventsButton.state = state;
+
simu
latingEventsButton.state = state;
NSString *name = simulatingEvents
? NJEventSimulationStarted
: NJEventSimulationStopped;
NSString *name = simulatingEvents
? NJEventSimulationStarted
: NJEventSimulationStopped;
diff --git
a/Classes/NJMappingMenuController.h
b/Classes/NJMappingMenuController.h
index
a2de7e9
..
33c06bb
100644
(file)
--- 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
@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
trans
lation state. The menu may have other items in it as
+ // event
simu
lation state. The menu may have other items in it as
// well, but none at an adjacent index that also have NJMappings
// as represented objects.
// 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
(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>30
3
</string>
+ <string>30
5
</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/Resources/English.lproj/MainMenu.xib
b/Resources/English.lproj/MainMenu.xib
index
39b227e
..
be18595
100644
(file)
--- a/
Resources/English.lproj/MainMenu.xib
+++ b/
Resources/English.lproj/MainMenu.xib
@@
-1647,14
+1647,6
@@
aW5nLg</string>
</object>
<int key="connectionID">826</int>
</object>
</object>
<int key="connectionID">826</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">translatingEventsButton</string>
- <reference key="source" ref="1007832501"/>
- <reference key="destination" ref="385218002"/>
- </object>
- <int key="connectionID">879</int>
- </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">outlineView</string>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">outlineView</string>
@@
-1687,6
+1679,14
@@
aW5nLg</string>
</object>
<int key="connectionID">978</int>
</object>
</object>
<int key="connectionID">978</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">simulatingEventsButton</string>
+ <reference key="source" ref="1007832501"/>
+ <reference key="destination" ref="385218002"/>
+ </object>
+ <int key="connectionID">982</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>
@@
-3245,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">98
1
</int>
+ <int key="maxID">98
2
</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">