X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=9cce48b7d2d880cea6fafbb4a9fec59b34cc19c3;hp=a110b51f3da664c0fa388e99a41e2103d50d615c;hb=48186896d41ccb345e4678c53ab1480059c12d3d;hpb=04a5164fec6b5d856b4ab181a2b7c870c2dc679a
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index a110b51..9cce48b 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 @@
+
_NSMainMenu
-
@@ -504,7 +507,7 @@
{200, 298}
-
+
YES
NO
YES
@@ -634,7 +637,7 @@
{202, 300}
-
+
150034
@@ -655,38 +658,99 @@
256
+
+
+ 268
+ {{228, 52}, {140, 12}}
+
+
+ _NS:9
+ YES
+
+ -2080374784
+ 262144
+
+ _NS:9
+
+ 30
+ 0.0
+ 15
+ 0.0
+ 0
+ 1
+ NO
+ NO
+
+ NO
+
+
+
+ 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}}
+ {{227, 132}, {178, 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
+
+
+ 41
+ â
+ 0
+
1
@@ -695,31 +759,43 @@
265
- {{227, 55}, {180, 24}}
+ {{227, 64}, {178, 15}}
-
+
_NS:9
YES
67108864
- 0
-
+ 262144
+
_NS:9
- 87
- Up
+ 68
+ â
+ Scroll up continuously
YES
0
- 86
- Down
+ 67
+ â
+ Scroll down continuously
1
0
+
+ â¤
+ Scroll up one step
+ 0
+
+
+ â¤
+ Scroll down one step
+ 0
+
1
@@ -728,7 +804,7 @@
265
- {{227, 89}, {180, 24}}
+ {{226, 89}, {180, 24}}
@@ -737,7 +813,11 @@
67108864
0
-
+
+ LucidaGrande
+ 13
+ 16
+
_NS:9
@@ -761,7 +841,7 @@
265
- {{229, 190}, {176, 24}}
+ {{228, 190}, {176, 24}}
@@ -771,7 +851,7 @@
- {201, 32}
+ {200, 32}
{4, 2}
1353195520
NSActionCell
@@ -963,7 +1043,7 @@
13
16
- No action selected
+ No input selected
@@ -1040,10 +1120,10 @@
256
- {196, 256}
+ {198, 198}
-
+
YES
NO
YES
@@ -1086,7 +1166,7 @@
20
- 48267264
+ 44072960
1
@@ -1098,7 +1178,7 @@
-1
- {{2, 2}, {196, 256}}
+ {{1, 1}, {198, 198}}
@@ -1132,11 +1212,11 @@
0.98123324396782841
- {{0, 54}, {200, 260}}
+ {{0, 20}, {200, 200}}
-
- 150035
+
+ 150034
@@ -1145,28 +1225,52 @@
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
@@ -1175,32 +1279,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 +1358,14 @@
732
+
+
+ showHelp:
+
+
+
+ 870
+
orderFrontStandardAboutPanel:
@@ -1350,45 +1462,29 @@
826
-
-
- translatingEventsChanged:
-
-
-
- 858
-
- translatingEventsSetting
+ translatingEventsMenu
-
+
- 859
+ 877
-
- mainWindow
-
-
+
+ translatingEventsChanged:
+
+
- 500
+ 878
- activeMenuItem
-
-
-
- 607
-
-
-
- toggleActivity:
-
-
+ translatingEventsButton
+
+
- 610
+ 879
@@ -1416,19 +1512,11 @@
- outputController
+ window
-
-
- 825
-
-
-
- addPressed:
-
-
+
- 515
+ 865
@@ -1502,6 +1590,14 @@
857
+
+
+ addPressed:
+
+
+
+ 515
+
dataSource
@@ -1614,21 +1710,45 @@
823
+
+
+ inputController
+
+
+
+ 828
+
- mappingChosen:
+ mouseSpeedChanged:
-
+
- 824
+ 885
- inputController
+ mouseSpeedSlider
-
+
- 828
+ 886
+
+
+
+ scrollSpeedChanged:
+
+
+
+ 890
+
+
+
+ scrollSpeedSlider
+
+
+
+ 891
@@ -1638,6 +1758,14 @@
818
+
+
+ performClick:
+
+
+
+ 871
+
view
@@ -1662,6 +1790,14 @@
853
+
+
+ performClick:
+
+
+
+ 880
+
@@ -1696,9 +1832,10 @@
+
- MainMenu
+ Main Menu
19
@@ -1838,11 +1975,6 @@
-
- 420
-
-
-
450
@@ -1857,11 +1989,12 @@
-
+
+
- Drawer Content View
+ Mapping List Popover Content
453
@@ -1898,6 +2031,7 @@
+ Mapping List
461
@@ -1916,31 +2050,17 @@
482
- ApplicationController
487
-
+
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1948,6 +2068,7 @@
+ Remove Mapping
512
@@ -1958,13 +2079,11 @@
514
- ConfigsController
479
- JoystickController
606
@@ -1987,6 +2106,7 @@
+ Input Devices Pane
634
@@ -2005,6 +2125,7 @@
+ Input Device List
636
@@ -2023,6 +2144,7 @@
+ Device/Input Name
642
@@ -2041,8 +2163,11 @@
+
+
+ Output Editor Pane
686
@@ -2063,21 +2188,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2086,6 +2215,7 @@
+ Mapping Choice List
701
@@ -2108,6 +2238,7 @@
+ Input Name
707
@@ -2128,16 +2259,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2151,6 +2285,7 @@
+ Mouse Button Selector
745
@@ -2161,6 +2296,7 @@
748
+ Switch Mouse Mode
749
@@ -2169,6 +2305,7 @@
+ Mouse Scroll Selector
750
@@ -2182,6 +2319,7 @@
+ Mouse Motion Selector
755
@@ -2193,11 +2331,6 @@
-
- 810
-
-
-
812
@@ -2220,6 +2353,7 @@
+ Mapping Selector
835
@@ -2235,41 +2369,122 @@
- 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
+
+
+
+
+ 883
+
+
+
+
+
+
+
+ 884
+
+
+
+
+ 887
+
+
+
+
+
+
+
+ 888
+
+
@@ -2291,7 +2506,6 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2309,8 +2523,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
@@ -2344,14 +2574,14 @@
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
@@ -2360,46 +2590,75 @@
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
+
+ ToolTip
+
+ ToolTip
+
+ Mouse scroll speed
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 859
+ 891
EnjoyableApplicationDelegate
NSObject
-
- toggleActivity:
- id
-
-
- toggleActivity:
-
- toggleActivity:
- id
-
-
NSMenu
NJDeviceController
NJMappingsController
- NJOutputController
+ NSWindow
@@ -2414,9 +2673,9 @@
mappingsController
NJMappingsController
-
- outputController
- NJOutputController
+
+ window
+ NSWindow
@@ -2442,7 +2701,8 @@
NJMappingsController
NSOutlineView
NJOutputController
- NSSegmentedControl
+ NSButton
+ NSMenuItem
@@ -2457,9 +2717,13 @@
outputController
NJOutputController
-
- translatingEventsSetting
- NSSegmentedControl
+
+ translatingEventsButton
+ NSButton
+
+
+ translatingEventsMenu
+ NSMenuItem
@@ -2558,7 +2822,9 @@
id
id
+ id
id
+ id
id
@@ -2570,10 +2836,18 @@
mdirChanged:
id
+
+ mouseSpeedChanged:
+ id
+
radioChanged:
id
+
+ scrollSpeedChanged:
+ id
+
sdirChanged:
id
@@ -2586,8 +2860,10 @@
NJMappingsController
NSSegmentedControl
NSSegmentedControl
+ NSSlider
NSMatrix
NSSegmentedControl
+ NSSlider
NSTextField
@@ -2615,6 +2891,10 @@
mouseDirSelect
NSSegmentedControl
+
+ mouseSpeedSlider
+ NSSlider
+
radioButtons
NSMatrix
@@ -2623,6 +2903,10 @@
scrollDirSelect
NSSegmentedControl
+
+ scrollSpeedSlider
+ NSSlider
+
title
NSTextField
@@ -2640,14 +2924,13 @@
YES
3
- {15, 15}
{8, 8}
{11, 10}
{11, 11}
{10, 3}
- {13, 10}
{16, 15}
{8, 8}
+ {9, 9}