X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=bd4f12a66c93ad6130e097565e6454add83fe691;hp=2e2b440547bda0ba63ccaa264acddef2a7f92ce3;hb=4f449987e5296701d1da9963789c4817935ab6c8;hpb=ca998dd950f0b1900b21dc05cf57987d09b4e70e
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 2e2b440..bd4f12a 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -27,6 +27,8 @@
NSScroller
NSSegmentedCell
NSSegmentedControl
+ NSSlider
+ NSSliderCell
NSSplitView
NSTableColumn
NSTableView
@@ -62,7 +64,7 @@
@@ -298,12 +301,33 @@
_NSWindowsMenu
+
_NSMainMenu
-
@@ -652,38 +658,74 @@
256
+
+
+ 268
+ {{228, 120}, {176, 12}}
+
+
+
+ _NS:9
+ YES
+
+ -2080374784
+ 262144
+
+ _NS:9
+
+ 20
+ 0.0
+ 4
+ 0.0
+ 0
+ 1
+ NO
+ NO
+
+ NO
+
265
- {{227, 123}, {180, 24}}
+ {{226, 132}, {179, 15}}
-
+
_NS:9
YES
67108864
- 0
-
+ 262144
+
LucidaGrande
- 13
- 16
+ 9
+ 3614
_NS:9
- 87
- Horizontal
+ 43
+ â
YES
0
- 86
- Vertical
+ 43
+ â
1
0
+
+ 42
+ â
+ 0
+
+
+ 42
+ â
+ 0
+
1
@@ -692,15 +734,20 @@
265
- {{227, 55}, {180, 24}}
+ {{226, 55}, {180, 24}}
+
_NS:9
YES
67108864
0
-
+
+ LucidaGrande
+ 13
+ 16
+
_NS:9
@@ -724,7 +771,7 @@
265
- {{227, 89}, {180, 24}}
+ {{226, 89}, {180, 24}}
@@ -757,7 +804,7 @@
265
- {{229, 190}, {176, 24}}
+ {{228, 190}, {176, 24}}
@@ -767,7 +814,7 @@
- {201, 32}
+ {200, 32}
{4, 2}
1353195520
NSActionCell
@@ -959,7 +1006,7 @@
13
16
- No action selected
+ No input selected
@@ -1036,7 +1083,7 @@
256
- {196, 256}
+ {198, 198}
@@ -1082,7 +1129,7 @@
20
- 48267264
+ 44072960
1
@@ -1094,7 +1141,7 @@
-1
- {{2, 2}, {196, 256}}
+ {{1, 1}, {198, 198}}
@@ -1128,11 +1175,11 @@
0.98123324396782841
- {{0, 54}, {200, 260}}
+ {{0, 20}, {200, 200}}
- 150035
+ 150034
@@ -1141,28 +1188,53 @@
4
1
+
+
+ 268
+ {{66, -1}, {134, 23}}
+
+
+
+ _NS:22
+ YES
+
+ -2080374784
+ 168034304
+
+
+ _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
@@ -1171,31 +1243,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}
@@ -1249,6 +1322,14 @@
732
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1345,45 +1426,29 @@
826
-
-
- translatingEventsChanged:
-
-
-
- 858
-
- translatingEventsSetting
+ translatingEventsMenu
-
+
- 859
+ 877
-
- mainWindow
-
-
+
+ translatingEventsChanged:
+
+
- 500
+ 878
- activeMenuItem
-
-
-
- 607
-
-
-
- toggleActivity:
-
-
+ translatingEventsButton
+
+
- 610
+ 879
@@ -1411,19 +1476,11 @@
- outputController
+ window
-
-
- 825
-
-
-
- addPressed:
-
-
+
- 515
+ 865
@@ -1497,6 +1554,14 @@
857
+
+
+ addPressed:
+
+
+
+ 515
+
dataSource
@@ -1609,21 +1674,29 @@
823
+
+
+ inputController
+
+
+
+ 828
+
- mappingChosen:
+ mouseSpeedChanged:
-
+
- 824
+ 885
- inputController
+ mouseSpeedSlider
-
+
- 828
+ 886
@@ -1633,6 +1706,14 @@
818
+
+
+ performClick:
+
+
+
+ 871
+
view
@@ -1657,6 +1738,14 @@
853
+
+
+ performClick:
+
+
+
+ 880
+
@@ -1691,9 +1780,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1833,11 +1923,6 @@
-
- 420
-
-
-
450
@@ -1852,11 +1937,12 @@
-
+
+
- Drawer Content View
+ Mapping List Popover Content
453
@@ -1893,6 +1979,7 @@
+ Mapping List
461
@@ -1911,31 +1998,17 @@
482
- ApplicationController
487
-
+
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1943,6 +2016,7 @@
+ Remove Mapping
512
@@ -1953,13 +2027,11 @@
514
- ConfigsController
479
- JoystickController
606
@@ -1982,6 +2054,7 @@
+ Input Devices Pane
634
@@ -2000,6 +2073,7 @@
+ Input Device List
636
@@ -2018,6 +2092,7 @@
+ Device/Input Name
642
@@ -2036,8 +2111,10 @@
+
+ Output Editor Pane
686
@@ -2058,21 +2135,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2081,6 +2162,7 @@
+ Mapping Choice List
701
@@ -2103,6 +2185,7 @@
+ Input Name
707
@@ -2123,16 +2206,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2146,6 +2232,7 @@
+ Mouse Button Selector
745
@@ -2156,6 +2243,7 @@
748
+ Switch Mouse Mode
749
@@ -2164,6 +2252,7 @@
+ Mouse Scroll Selector
750
@@ -2177,6 +2266,7 @@
+ Mouse Motion Selector
755
@@ -2188,11 +2278,6 @@
-
- 810
-
-
-
812
@@ -2215,6 +2300,7 @@
+ Mapping Selector
835
@@ -2230,41 +2316,109 @@
- 842
-
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+ Mapping List Popover
+
+
+ 507
+
+
+
+
+
+ Add Mapping
+
+
+ 508
+
+
+
+
+ 862
+
-
+
-
+
+ Gradient Space
- 840
-
+ 863
+
+
+
+
+ 810
+
+
+
+
+ 866
+
-
+
-
+
- 841
-
-
+ 867
+
+
+
+
+
- 849
-
+ 868
+
+
+
+
+ 874
+
+
+
+
- 850
-
-
- Popover View Controller
+ 872
+
+
+
+
+
- 851
-
-
+ 873
+
+
+
+
+ 883
+
+
+
+
+
+
+
+ 884
+
+
@@ -2286,7 +2440,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2304,8 +2457,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
@@ -2346,7 +2515,7 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
-
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2355,24 +2524,54 @@
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
+
+ ToolTip
+
+ ToolTip
+
+ Maximum mouse speed
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 859
+ 886
@@ -2380,26 +2579,16 @@
EnjoyableApplicationDelegate
NSObject
- NSMenuItem
NSMenu
- NSDrawer
NJDeviceController
NJMappingsController
- NJOutputController
+ NSWindow
-
- activeMenuItem
- NSMenuItem
-
dockMenuBase
NSMenu
-
- drawer
- NSDrawer
-
inputController
NJDeviceController
@@ -2408,9 +2597,9 @@
mappingsController
NJMappingsController
-
- outputController
- NJOutputController
+
+ window
+ NSWindow
@@ -2436,7 +2625,8 @@
NJMappingsController
NSOutlineView
NJOutputController
- NSSegmentedControl
+ NSButton
+ NSMenuItem
@@ -2451,9 +2641,13 @@
outputController
NJOutputController
-
- translatingEventsSetting
- NSSegmentedControl
+
+ translatingEventsButton
+ NSButton
+
+
+ translatingEventsMenu
+ NSMenuItem
@@ -2552,6 +2746,7 @@
id
id
+ id
id
id
@@ -2564,6 +2759,10 @@
mdirChanged:
id
+
+ mouseSpeedChanged:
+ id
+
radioChanged:
id
@@ -2580,6 +2779,7 @@
NJMappingsController
NSSegmentedControl
NSSegmentedControl
+ NSSlider
NSMatrix
NSSegmentedControl
NSTextField
@@ -2609,6 +2809,10 @@
mouseDirSelect
NSSegmentedControl
+
+ mouseSpeedSlider
+ NSSlider
+
radioButtons
NSMatrix
@@ -2634,14 +2838,13 @@
YES
3
- {15, 15}
{8, 8}
{11, 10}
{11, 11}
{10, 3}
- {13, 10}
{16, 15}
{8, 8}
+ {9, 9}