projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9a400b5
)
Remove event translation menu item, it's not managed here anymore. Change NJKeyInputT...
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Mon, 11 Mar 2013 11:17:26 +0000
(12:17 +0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Mon, 11 Mar 2013 11:17:26 +0000
(12:17 +0100)
Classes/NJDeviceController.h
patch
|
blob
|
history
Classes/NJDeviceController.m
patch
|
blob
|
history
Classes/NJKeyInputField.h
patch
|
blob
|
history
Classes/NJKeyInputField.m
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
e668b0f
..
c0002e8
100644
(file)
--- a/
Classes/NJDeviceController.h
+++ b/
Classes/NJDeviceController.h
@@
-16,7
+16,6
@@
IBOutlet NJOutputController *outputController;
IBOutlet NJMappingsController *mappingsController;
IBOutlet NSButton *translatingEventsButton;
IBOutlet NJOutputController *outputController;
IBOutlet NJMappingsController *mappingsController;
IBOutlet NSButton *translatingEventsButton;
- IBOutlet NSMenuItem *translatingEventsMenu;
IBOutlet NSView *connectDevicePrompt;
}
IBOutlet NSView *connectDevicePrompt;
}
@@
-24,6
+23,6
@@
@property (nonatomic, assign) NSPoint mouseLoc;
@property (nonatomic, assign) BOOL translatingEvents;
@property (nonatomic, assign) NSPoint mouseLoc;
@property (nonatomic, assign) BOOL translatingEvents;
-- (IBAction)translatingEventsChanged:(
id
)sender;
+- (IBAction)translatingEventsChanged:(
NSButton *
)sender;
@end
@end
diff --git
a/Classes/NJDeviceController.m
b/Classes/NJDeviceController.m
index
5a6603c
..
3f0c6c8
100644
(file)
--- a/
Classes/NJDeviceController.m
+++ b/
Classes/NJDeviceController.m
@@
-240,7
+240,6
@@
objectValueForTableColumn:(NSTableColumn *)tableColumn
_translatingEvents = translatingEvents;
NSInteger state = translatingEvents ? NSOnState : NSOffState;
translatingEventsButton.state = state;
_translatingEvents = translatingEvents;
NSInteger state = translatingEvents ? NSOnState : NSOffState;
translatingEventsButton.state = state;
- translatingEventsMenu.title = translatingEvents ? @"Disable" : @"Enable";
NSString *name = translatingEvents
? NJEventTranslationActivated
: NJEventTranslationDeactivated;
NSString *name = translatingEvents
? NJEventTranslationActivated
: NJEventTranslationDeactivated;
@@
-253,5
+252,4
@@
objectValueForTableColumn:(NSTableColumn *)tableColumn
self.translatingEvents = sender.state == NSOnState;
}
self.translatingEvents = sender.state == NSOnState;
}
-
@end
@end
diff --git
a/Classes/NJKeyInputField.h
b/Classes/NJKeyInputField.h
index
ad026d3
..
9a7a3af
100644
(file)
--- a/
Classes/NJKeyInputField.h
+++ b/
Classes/NJKeyInputField.h
@@
-20,7
+20,7
@@
extern CGKeyCode NJKeyInputFieldEmpty;
+ (NSString *)stringForKeyCode:(CGKeyCode)keyCode;
// Give the string name for a virtual key code.
+ (NSString *)stringForKeyCode:(CGKeyCode)keyCode;
// Give the string name for a virtual key code.
-@property (nonatomic, weak) IBOutlet id <NJKeyInputFieldDelegate
> keyD
elegate;
+@property (nonatomic, weak) IBOutlet id <NJKeyInputFieldDelegate
, NSTextFieldDelegate> d
elegate;
@property (nonatomic, assign) CGKeyCode keyCode;
// The currently displayed key code, or NJKeyInputFieldEmpty if no
@property (nonatomic, assign) CGKeyCode keyCode;
// The currently displayed key code, or NJKeyInputFieldEmpty if no
@@
-37,6
+37,7
@@
extern CGKeyCode NJKeyInputFieldEmpty;
@protocol NJKeyInputFieldDelegate <NSObject>
@protocol NJKeyInputFieldDelegate <NSObject>
+@optional
- (void)keyInputField:(NJKeyInputField *)keyInput
didChangeKey:(CGKeyCode)keyCode;
- (void)keyInputFieldDidClear:(NJKeyInputField *)keyInput;
- (void)keyInputField:(NJKeyInputField *)keyInput
didChangeKey:(CGKeyCode)keyCode;
- (void)keyInputFieldDidClear:(NJKeyInputField *)keyInput;
diff --git
a/Classes/NJKeyInputField.m
b/Classes/NJKeyInputField.m
index
814fdfe
..
a03f238
100644
(file)
--- a/
Classes/NJKeyInputField.m
+++ b/
Classes/NJKeyInputField.m
@@
-22,7
+22,8
@@
CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
- (void)clear {
self.keyCode = NJKeyInputFieldEmpty;
- (void)clear {
self.keyCode = NJKeyInputFieldEmpty;
- [self.keyDelegate keyInputFieldDidClear:self];
+ if ([self.delegate respondsToSelector:@selector(keyInputFieldDidClear:)])
+ [self.delegate keyInputFieldDidClear:self];
[self resignIfFirstResponder];
}
[self resignIfFirstResponder];
}
@@
-179,10
+180,12
@@
CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
if ((event.modifierFlags & IGNORE) && event.keyCode == 0x33) {
// Allow Alt/Command+Backspace to clear the field.
self.keyCode = NJKeyInputFieldEmpty;
if ((event.modifierFlags & IGNORE) && event.keyCode == 0x33) {
// Allow Alt/Command+Backspace to clear the field.
self.keyCode = NJKeyInputFieldEmpty;
- [self.keyDelegate keyInputFieldDidClear:self];
+ if ([self.delegate respondsToSelector:@selector(keyInputFieldDidClear:)])
+ [self.delegate keyInputFieldDidClear:self];
} else if (!(event.modifierFlags & IGNORE)) {
self.keyCode = event.keyCode;
} else if (!(event.modifierFlags & IGNORE)) {
self.keyCode = event.keyCode;
- [self.keyDelegate keyInputField:self didChangeKey:self.keyCode];
+ if ([self.delegate respondsToSelector:@selector(keyInputField:didChangeKey:)])
+ [self.delegate keyInputField:self didChangeKey:self.keyCode];
}
[self resignIfFirstResponder];
}
}
[self resignIfFirstResponder];
}
@@
-204,8
+207,17
@@
CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
// modifiers are still down.
if (!(theEvent.modifierFlags & NSDeviceIndependentModifierFlagsMask)) {
self.keyCode = theEvent.keyCode;
// modifiers are still down.
if (!(theEvent.modifierFlags & NSDeviceIndependentModifierFlagsMask)) {
self.keyCode = theEvent.keyCode;
- [self.keyDelegate keyInputField:self didChangeKey:_keyCode];
+ if ([self.delegate respondsToSelector:@selector(keyInputField:didChangeKey:)])
+ [self.delegate keyInputField:self didChangeKey:_keyCode];
}
}
}
}
+- (void)setDelegate:(id<NJKeyInputFieldDelegate, NSTextFieldDelegate>)delegate {
+ [super setDelegate:delegate];
+}
+
+- (id <NJKeyInputFieldDelegate, NSTextFieldDelegate>)delegate {
+ return (id)[super delegate];
+}
+
@end
@end
diff --git
a/Info.plist
b/Info.plist
index
74f1265
..
4223333
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>12
4
</string>
+ <string>12
9
</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
0a20186
..
c666565
100644
(file)
--- a/
Resources/English.lproj/MainMenu.xib
+++ b/
Resources/English.lproj/MainMenu.xib
@@
-524,7
+524,7
@@
aW5nLg</string>
<string key="NSFrameSize">{232, 321}</string>
<reference key="NSSuperview" ref="698362889"/>
<reference key="NSWindow"/>
<string key="NSFrameSize">{232, 321}</string>
<reference key="NSSuperview" ref="698362889"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="
1036252745
"/>
+ <reference key="NSNextKeyView" ref="
892486973
"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@
-654,7
+654,7
@@
aW5nLg</string>
<string key="NSFrameSize">{234, 323}</string>
<reference key="NSSuperview" ref="734312853"/>
<reference key="NSWindow"/>
<string key="NSFrameSize">{234, 323}</string>
<reference key="NSSuperview" ref="734312853"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="
892486973
"/>
+ <reference key="NSNextKeyView" ref="
698362889
"/>
<int key="NSsFlags">150034</int>
<reference key="NSVScroller" ref="1036252745"/>
<reference key="NSHScroller" ref="892486973"/>
<int key="NSsFlags">150034</int>
<reference key="NSVScroller" ref="1036252745"/>
<reference key="NSHScroller" ref="892486973"/>
@@
-1615,14
+1615,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">translatingEventsMenu</string>
- <reference key="source" ref="1007832501"/>
- <reference key="destination" ref="632598200"/>
- </object>
- <int key="connectionID">877</int>
- </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">translatingEventsChanged:</string>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">translatingEventsChanged:</string>
@@
-1977,11
+1969,11
@@
aW5nLg</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">
keyD
elegate</string>
+ <string key="label">
d
elegate</string>
<reference key="source" ref="57697638"/>
<reference key="destination" ref="801536542"/>
</object>
<reference key="source" ref="57697638"/>
<reference key="destination" ref="801536542"/>
</object>
- <int key="connectionID">
818
</int>
+ <int key="connectionID">
966
</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@
-3161,7
+3153,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">96
5
</int>
+ <int key="maxID">96
6
</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">
@@
-3228,7
+3220,6
@@
aW5nLg</string>
<string key="outlineView">NSOutlineView</string>
<string key="outputController">NJOutputController</string>
<string key="translatingEventsButton">NSButton</string>
<string key="outlineView">NSOutlineView</string>
<string key="outputController">NJOutputController</string>
<string key="translatingEventsButton">NSButton</string>
- <string key="translatingEventsMenu">NSMenuItem</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="connectDevicePrompt">
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="connectDevicePrompt">
@@
-3251,10
+3242,6
@@
aW5nLg</string>
<string key="name">translatingEventsButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<string key="name">translatingEventsButton</string>
<string key="candidateClassName">NSButton</string>
</object>
- <object class="IBToOneOutletInfo" key="translatingEventsMenu">
- <string key="name">translatingEventsMenu</string>
- <string key="candidateClassName">NSMenuItem</string>
- </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@
-3265,13
+3252,13
@@
aW5nLg</string>
<string key="className">NJKeyInputField</string>
<string key="superclassName">NSTextField</string>
<object class="NSMutableDictionary" key="outlets">
<string key="className">NJKeyInputField</string>
<string key="superclassName">NSTextField</string>
<object class="NSMutableDictionary" key="outlets">
- <string key="NS.key.0">
keyD
elegate</string>
+ <string key="NS.key.0">
d
elegate</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
- <string key="NS.key.0">
keyD
elegate</string>
+ <string key="NS.key.0">
d
elegate</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<object class="IBToOneOutletInfo" key="NS.object.0">
- <string key="name">
keyD
elegate</string>
+ <string key="name">
d
elegate</string>
<string key="candidateClassName">id</string>
</object>
</object>
<string key="candidateClassName">id</string>
</object>
</object>