projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85a4f20
)
Have device controller setup itself rather than relying on the application delegate...
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Sun, 10 Mar 2013 21:54:07 +0000
(22:54 +0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Sun, 10 Mar 2013 21:54:07 +0000
(22:54 +0100)
Classes/EnjoyableApplicationDelegate.h
patch
|
blob
|
history
Classes/EnjoyableApplicationDelegate.m
patch
|
blob
|
history
Classes/NJDeviceController.h
patch
|
blob
|
history
Classes/NJDeviceController.m
patch
|
blob
|
history
Info.plist
patch
|
blob
|
history
Resources/English.lproj/MainMenu.xib
patch
|
blob
|
history
diff --git
a/Classes/EnjoyableApplicationDelegate.h
b/Classes/EnjoyableApplicationDelegate.h
index
c4d8e3b
..
36374d3
100644
(file)
--- a/
Classes/EnjoyableApplicationDelegate.h
+++ b/
Classes/EnjoyableApplicationDelegate.h
@@
-16,7
+16,6
@@
IBOutlet NSWindow *window;
}
IBOutlet NSWindow *window;
}
-@property (nonatomic, strong) IBOutlet NJDeviceController *inputController;
@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
- (IBAction)restoreToForeground:(id)sender;
@property (nonatomic, strong) IBOutlet NJMappingsController *mappingsController;
- (IBAction)restoreToForeground:(id)sender;
diff --git
a/Classes/EnjoyableApplicationDelegate.m
b/Classes/EnjoyableApplicationDelegate.m
index
2710e3a
..
634f362
100644
(file)
--- a/
Classes/EnjoyableApplicationDelegate.m
+++ b/
Classes/EnjoyableApplicationDelegate.m
@@
-55,7
+55,6
@@
}
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
}
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
- [self.inputController setup];
[window makeKeyAndOrderFront:nil];
}
[window makeKeyAndOrderFront:nil];
}
diff --git
a/Classes/NJDeviceController.h
b/Classes/NJDeviceController.h
index
ce05cee
..
e668b0f
100644
(file)
--- a/
Classes/NJDeviceController.h
+++ b/
Classes/NJDeviceController.h
@@
-24,7
+24,6
@@
@property (nonatomic, assign) NSPoint mouseLoc;
@property (nonatomic, assign) BOOL translatingEvents;
@property (nonatomic, assign) NSPoint mouseLoc;
@property (nonatomic, assign) BOOL translatingEvents;
-- (void)setup;
- (IBAction)translatingEventsChanged:(id)sender;
@end
- (IBAction)translatingEventsChanged:(id)sender;
@end
diff --git
a/Classes/NJDeviceController.m
b/Classes/NJDeviceController.m
index
8417927
..
5a6603c
100644
(file)
--- a/
Classes/NJDeviceController.m
+++ b/
Classes/NJDeviceController.m
@@
-26,6
+26,11
@@
if ((self = [super init])) {
_devices = [[NSMutableArray alloc] initWithCapacity:16];
_continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
if ((self = [super init])) {
_devices = [[NSMutableArray alloc] initWithCapacity:16];
_continousOutputs = [[NSMutableArray alloc] initWithCapacity:32];
+ [NSNotificationCenter.defaultCenter
+ addObserver:self
+ selector:@selector(setup)
+ name:NSApplicationDidFinishLaunchingNotification
+ object:nil];
}
return self;
}
}
return self;
}
diff --git
a/Info.plist
b/Info.plist
index
e875f02
..
be682f8
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>
97
</string>
+ <string>
106
</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
c8a38ed
..
2cf1266
100644
(file)
--- a/
Resources/English.lproj/MainMenu.xib
+++ b/
Resources/English.lproj/MainMenu.xib
@@
-472,7
+472,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">
- <
nil
key="NSNextResponder"/>
+ <
reference
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">
@@
-484,6
+484,7
@@
<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="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>
@@
-522,6
+523,7
@@
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>
@@
-617,6
+619,7
@@
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"/>
@@
-627,6
+630,7
@@
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"/>
@@
-638,6
+642,7
@@
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>
@@
-648,6
+653,7
@@
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"/>
@@
-661,6
+667,7
@@
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>
@@
-674,6
+681,7
@@
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>
@@
-715,6
+723,7
@@
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">
@@
-745,6
+754,7
@@
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>
@@
-789,6
+799,7
@@
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>
@@
-814,6
+825,7
@@
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>
@@
-867,6
+879,7
@@
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>
@@
-892,6
+905,7
@@
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>
@@
-901,6
+915,7
@@
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">
@@
-933,6
+948,7
@@
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>
@@
-1063,6
+1079,7
@@
aW5nLg</string>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{9, 286}, {369, 17}}</string>
<reference key="NSSuperview" ref="471332453"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{9, 286}, {369, 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">
@@
-1086,6
+1103,7
@@
aW5nLg</string>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{12, 276}, {363, 5}}</string>
<reference key="NSSuperview" ref="471332453"/>
<int key="NSvFlags">10</int>
<string key="NSFrame">{{12, 276}, {363, 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">
@@
-1112,12
+1130,15
@@
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>
@@
-1625,14
+1646,6
@@
aW5nLg</string>
</object>
<int key="connectionID">915</int>
</object>
</object>
<int key="connectionID">915</int>
</object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">inputController</string>
- <reference key="source" ref="207406104"/>
- <reference key="destination" ref="1007832501"/>
- </object>
- <int key="connectionID">819</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>
@@
-3009,7
+3022,6
@@
aW5nLg</string>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="dockMenu">NSMenu</string>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="dockMenu">NSMenu</string>
- <string key="inputController">NJDeviceController</string>
<string key="mappingsController">NJMappingsController</string>
<string key="mappingsMenu">NSMenu</string>
<string key="statusItemMenu">NSMenu</string>
<string key="mappingsController">NJMappingsController</string>
<string key="mappingsMenu">NSMenu</string>
<string key="statusItemMenu">NSMenu</string>
@@
-3020,10
+3032,6
@@
aW5nLg</string>
<string key="name">dockMenu</string>
<string key="candidateClassName">NSMenu</string>
</object>
<string key="name">dockMenu</string>
<string key="candidateClassName">NSMenu</string>
</object>
- <object class="IBToOneOutletInfo" key="inputController">
- <string key="name">inputController</string>
- <string key="candidateClassName">NJDeviceController</string>
- </object>
<object class="IBToOneOutletInfo" key="mappingsController">
<string key="name">mappingsController</string>
<string key="candidateClassName">NJMappingsController</string>
<object class="IBToOneOutletInfo" key="mappingsController">
<string key="name">mappingsController</string>
<string key="candidateClassName">NJMappingsController</string>