X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=402d345839306c869d64ca1516210c352d8c2d94;hp=a110b51f3da664c0fa388e99a41e2103d50d615c;hb=ce24f5cc4eb879f248f3363663c5330a06b1046f;hpb=04a5164fec6b5d856b4ab181a2b7c870c2dc679a
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index a110b51..402d345 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -62,7 +62,7 @@
+
_NSMainMenu
-
@@ -836,7 +843,7 @@
603979776
0
- Press a key:
+ Press a key
1211912448
@@ -864,7 +871,7 @@
603979776
0
- Mouse movement
+ Move the mouse
1211912448
@@ -878,7 +885,7 @@
603979776
0
- Mouse button
+ Press a mouse button
1211912448
@@ -892,7 +899,7 @@
603979776
0
- Mouse scroll
+ Scroll the mouse
1211912448
@@ -963,7 +970,7 @@
13
16
- No action selected
+ No input selected
@@ -1040,7 +1047,7 @@
256
- {196, 256}
+ {198, 198}
@@ -1086,7 +1093,7 @@
20
- 48267264
+ 44072960
1
@@ -1098,7 +1105,7 @@
-1
- {{2, 2}, {196, 256}}
+ {{1, 1}, {198, 198}}
@@ -1132,11 +1139,11 @@
0.98123324396782841
- {{0, 54}, {200, 260}}
+ {{0, 20}, {200, 200}}
- 150035
+ 150034
@@ -1145,28 +1152,57 @@
4
1
+
+
+ 268
+ {{66, -1}, {134, 23}}
+
+
+
+ _NS:22
+ YES
+
+ -2080374784
+ 168034304
+
+
+ LucidaGrande
+ 9
+ 3614
+
+ _NS:22
+
+ 1221349376
+ 162
+
+
+ 400
+ 75
+
+ NO
+
292
- {{20, 19}, {39, 28}}
+ {{0, -1}, {34, 23}}
YES
67108864
- 134217728
+ 134479872
-
+
-2033958912
- 162
+ 268435618
NSImage
NSAddTemplate
-
+ n
400
75
@@ -1175,32 +1211,32 @@
292
- {{67, 19}, {39, 28}}
+ {{33, -1}, {34, 23}}
-
+
YES
- 603979776
- 134217728
+ 67108864
+ 134479872
-
+
-2033958912
- 162
+ 268435618
NSImage
NSRemoveTemplate
-
+ CA
400
75
NO
- {200, 314}
+ {200, 220}
@@ -1254,6 +1290,14 @@
732
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1350,45 +1394,29 @@
826
-
-
- translatingEventsChanged:
-
-
-
- 858
-
- translatingEventsSetting
+ translatingEventsMenu
-
+
- 859
+ 877
-
- mainWindow
-
-
+
+ translatingEventsChanged:
+
+
- 500
+ 878
- activeMenuItem
-
-
-
- 607
-
-
-
- toggleActivity:
-
-
+ translatingEventsButton
+
+
- 610
+ 879
@@ -1416,19 +1444,11 @@
- outputController
+ window
-
-
- 825
-
-
-
- addPressed:
-
-
+
- 515
+ 865
@@ -1502,6 +1522,14 @@
857
+
+
+ addPressed:
+
+
+
+ 515
+
dataSource
@@ -1614,14 +1642,6 @@
823
-
-
- mappingChosen:
-
-
-
- 824
-
inputController
@@ -1638,6 +1658,14 @@
818
+
+
+ performClick:
+
+
+
+ 871
+
view
@@ -1662,6 +1690,14 @@
853
+
+
+ performClick:
+
+
+
+ 880
+
@@ -1696,9 +1732,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1838,11 +1875,6 @@
-
- 420
-
-
-
450
@@ -1857,11 +1889,12 @@
-
+
+
- Drawer Content View
+ Mapping List Popover Content
453
@@ -1898,6 +1931,7 @@
+ Mapping List
461
@@ -1916,31 +1950,17 @@
482
- ApplicationController
487
-
+
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1948,6 +1968,7 @@
+ Remove Mapping
512
@@ -1958,13 +1979,11 @@
514
- ConfigsController
479
- JoystickController
606
@@ -1987,6 +2006,7 @@
+ Input Devices Pane
634
@@ -2005,6 +2025,7 @@
+ Input Device List
636
@@ -2023,6 +2044,7 @@
+ Device/Input Name
642
@@ -2043,6 +2065,7 @@
+ Output Editor Pane
686
@@ -2063,21 +2086,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2086,6 +2113,7 @@
+ Mapping Choice List
701
@@ -2108,6 +2136,7 @@
+ Input Name
707
@@ -2128,16 +2157,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2151,6 +2183,7 @@
+ Mouse Button Selector
745
@@ -2161,6 +2194,7 @@
748
+ Switch Mouse Mode
749
@@ -2169,6 +2203,7 @@
+ Mouse Scroll Selector
750
@@ -2182,6 +2217,7 @@
+ Mouse Motion Selector
755
@@ -2193,11 +2229,6 @@
-
- 810
-
-
-
812
@@ -2220,6 +2251,7 @@
+ Mapping Selector
835
@@ -2235,41 +2267,96 @@
- 842
-
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+ Mapping List Popover
+
+
+ 507
+
-
+
-
+
+ Add Mapping
+
+
+ 508
+
+
- 840
-
+ 862
+
-
+
-
+
+ Gradient Space
- 841
-
-
+ 863
+
+
- 849
-
+ 810
+
+
+
+
+ 866
+
+
+
+
+
+
+
+ 867
+
+
+
+
+
+
+
+ 868
+
+
+
+
+ 874
+
+
+
+
- 850
-
-
- Popover View Controller
+ 872
+
+
+
+
+
- 851
-
-
+ 873
+
+
@@ -2291,7 +2378,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2309,8 +2395,24 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Create a new mapping
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Remove the selected mapping
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2360,46 +2462,55 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Change the active mapping
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
-
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ ToolTip
+
+ ToolTip
+
+ Enable mapped actions
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 859
+ 880
EnjoyableApplicationDelegate
NSObject
-
- toggleActivity:
- id
-
-
- toggleActivity:
-
- toggleActivity:
- id
-
-
NSMenu
NJDeviceController
NJMappingsController
- NJOutputController
+ NSWindow
@@ -2414,9 +2525,9 @@
mappingsController
NJMappingsController
-
- outputController
- NJOutputController
+
+ window
+ NSWindow
@@ -2442,7 +2553,8 @@
NJMappingsController
NSOutlineView
NJOutputController
- NSSegmentedControl
+ NSButton
+ NSMenuItem
@@ -2457,9 +2569,13 @@
outputController
NJOutputController
-
- translatingEventsSetting
- NSSegmentedControl
+
+ translatingEventsButton
+ NSButton
+
+
+ translatingEventsMenu
+ NSMenuItem
@@ -2640,14 +2756,13 @@
YES
3
- {15, 15}
{8, 8}
{11, 10}
{11, 11}
{10, 3}
- {13, 10}
{16, 15}
{8, 8}
+ {9, 9}