X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=32c3a8641edd368c3350758ffc7e83c29c11a6e4;hp=056a907b7256a6ecc3bc700a2d720118edb2487b;hb=b46786face17680799d7fd9795dead8a801ae9c1;hpb=9584becb2e5469e8f482d73e6f0c9c3bf879e0db
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 056a907..32c3a86 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -16,13 +16,13 @@
NSButtonCell
NSCustomObject
NSCustomView
- NSDrawer
NSMatrix
NSMenu
NSMenuItem
NSOutlineView
NSPopUpButton
NSPopUpButtonCell
+ NSPopover
NSScrollView
NSScroller
NSSegmentedCell
@@ -35,9 +35,8 @@
NSToolbar
NSToolbarFlexibleSpaceItem
NSToolbarItem
- NSToolbarSeparatorItem
- NSToolbarSpaceItem
NSView
+ NSViewController
NSWindowTemplate
@@ -176,7 +175,7 @@
_NSMainMenu
-
@@ -493,14 +535,10 @@
- 337641536
- 2048
+ 67108928
+ 2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -518,7 +556,7 @@
- 3
+ 1
YES
@@ -538,8 +576,8 @@
MC41AA
- 17
- -767557632
+ 20
+ 306184192
4
@@ -548,6 +586,8 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
@@ -588,11 +628,11 @@
- 133650
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -610,7 +650,7 @@
- 268
+ 265
{{227, 123}, {180, 24}}
@@ -647,7 +687,7 @@
- 268
+ 265
{{227, 55}, {180, 24}}
@@ -680,7 +720,7 @@
- 268
+ 265
{{227, 89}, {180, 24}}
@@ -711,6 +751,49 @@
NO
+
+
+ 265
+ {{229, 190}, {176, 24}}
+
+
+
+ _NS:9
+ NJKeyInputField
+
+
268
@@ -760,7 +843,7 @@
603979776
0
- Switch to configuration
+ Switch to mapping
1211912448
@@ -816,7 +899,7 @@
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
@@ -856,39 +939,6 @@
-
266
@@ -898,15 +948,15 @@
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
13
16
- No action selected
+ No input selected
@@ -915,8 +965,8 @@
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
@@ -942,16 +992,6 @@
0
NO
-
-
- 265
- {{229, 190}, {176, 24}}
-
-
-
- _NS:9
- KeyInputTextView
-
{{211, 0}, {429, 300}}
@@ -973,39 +1013,15 @@
{{0, 0}, {1440, 878}}
- {640, 369}
+ {640, 355}
{10000000000000, 10000000000000}
+ Enjoyable
YES
256
-
-
- 297
- {{226, 1}, {82, 32}}
-
-
-
- _NS:9
- YES
-
- -2080374784
- 134217728
- Export
-
- _NS:9
-
- -2034876416
- 129
-
-
- 400
- 75
-
- NO
-
274
@@ -1017,7 +1033,7 @@
256
- {320, 418}
+ {198, 198}
@@ -1031,9 +1047,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1064,8 +1078,8 @@
2
- 17
- 46170112
+ 20
+ 44072960
1
@@ -1074,9 +1088,10 @@
NO
0
1
+ -1
- {{1, 1}, {320, 418}}
+ {{1, 1}, {198, 198}}
@@ -1090,7 +1105,7 @@
{{306, 1}, {15, 403}}
-
+
NO
_doScroller:
@@ -1099,52 +1114,81 @@
-2147483392
- {{1, 404}, {305, 15}}
+ {{-100, -100}, {366, 16}}
-
+
NO
1
_doScroller:
- 0.99688480000000002
+ 0.98123324396782841
- {{0, 34}, {322, 420}}
+ {{0, 20}, {200, 200}}
-
- 133682
+
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
+
+
+ 268
+ {{66, -1}, {134, 23}}
+
+
+
+ _NS:22
+ YES
+
+ -2080374784
+ 168034304
+
+
+ LucidaGrande
+ 9
+ 3614
+
+ _NS:22
+
+ 1221349376
+ 162
+
+
+ 400
+ 75
+
+ NO
+
- 260
- {{10, 4}, {39, 28}}
+ 292
+ {{0, -1}, {34, 23}}
YES
67108864
- 134217728
+ 134479872
-
+
-2033958912
- 162
+ 268435618
NSImage
NSAddTemplate
-
+ n
400
75
@@ -1152,60 +1196,58 @@
- 260
- {{57, 4}, {39, 28}}
+ 292
+ {{33, -1}, {34, 23}}
-
+
YES
- 603979776
- 134217728
+ 67108864
+ 134479872
-
+
-2033958912
- 162
+ 268435618
NSImage
NSRemoveTemplate
-
+ CA
400
75
NO
- {322, 454}
+ {200, 220}
NSView
-
-
- {200, 100}
- {200, 0}
- {300, 10000}
- 2
- 0.0
- 15
-
-
-
- ApplicationController
+ EnjoyableApplicationDelegate
- ConfigsController
+ NJMappingsController
- JoystickController
+ NJDeviceController
- TargetController
+ NJOutputController
+
+
+
+
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
@@ -1290,30 +1332,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
delegate
@@ -1340,155 +1358,147 @@
- targetController
+ mappingsController
-
+
- 695
+ 822
- configsController
+ outputController
-
+
- 717
+ 826
-
- jsController
-
-
+
+ translatingEventsChanged:
+
+
- 484
+ 858
- drawer
-
-
+ translatingEventsSetting
+
+
- 486
+ 859
- mainWindow
+ dockMenuBase
-
+
- 500
+ 726
- activeMenuItem
+ inputController
-
+
- 607
+ 819
- activeButton
+ mappingsController
-
+
- 609
+ 820
-
- toggleActivity:
+
+ outputController
-
+
- 610
+ 825
- toggleActivity:
-
-
-
- 611
-
-
-
- targetController
-
-
+ removePressed:
+
+
- 712
+ 516
- configsController
-
-
+ removeButton
+
+
- 716
+ 519
- dockMenuBase
-
-
+ tableView
+
+
- 726
+ 520
- addPressed:
+ exportPressed:
-
+
- 515
+ 815
- removePressed:
+ importPressed:
-
+
- 516
+ 816
- removeButton
+ outputController
-
+
- 519
+ 827
-
- tableView
+
+ mappingPressed:
-
+
- 520
+ 855
- targetController
+ popover
-
+
- 697
+ 856
-
- exportPressed:
+
+ popoverActivate
-
+
- 784
+ 857
-
- exportButton
+
+ addPressed:
-
+
- 785
+ 515
@@ -1514,22 +1524,6 @@
692
-
-
- configsController
-
-
-
- 693
-
-
-
- joystickController
-
-
-
- 694
-
title
@@ -1538,22 +1532,6 @@
709
-
-
- configPopup
-
-
-
- 713
-
-
-
- configChosen:
-
-
-
- 714
-
radioChanged:
@@ -1620,19 +1598,59 @@
- targetController
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ inputController
+
+
+
+ 828
+
+
+
+ keyDelegate
- 779
+ 818
- window
-
-
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
- 780
+ 852
+
+
+
+ delegate
+
+
+
+ 853
@@ -1670,7 +1688,7 @@
- MainMenu
+ Main Menu
19
@@ -1702,6 +1720,10 @@
+
+
+
+
@@ -1806,11 +1828,6 @@
-
- 420
-
-
-
450
@@ -1824,18 +1841,13 @@
451
-
-
-
+
+
+
- Drawer Content View
-
-
- 452
-
-
+ Mapping List Popover Content
453
@@ -1872,6 +1884,7 @@
+ Mapping List
461
@@ -1890,53 +1903,17 @@
482
- ApplicationController
487
-
-
+
+
-
-
-
- 490
-
-
-
-
- 492
-
-
-
-
- 493
-
-
-
-
- 495
-
-
-
-
- 507
-
-
-
-
-
-
-
- 508
-
-
-
511
@@ -1944,6 +1921,7 @@
+ Remove Mapping
512
@@ -1954,24 +1932,17 @@
514
- ConfigsController
479
- JoystickController
606
-
- 608
-
-
-
652
@@ -1988,6 +1959,7 @@
+ Input Devices Pane
634
@@ -2006,6 +1978,7 @@
+ Input Device List
636
@@ -2024,6 +1997,7 @@
+ Device/Input Name
642
@@ -2039,11 +2013,12 @@
-
+
+ Output Editor Pane
686
@@ -2064,21 +2039,25 @@
+ Output Types
657
+ Disabled
658
+ Key Press
699
+ Switch Mapping
700
@@ -2087,6 +2066,7 @@
+ Mapping Choice List
701
@@ -2109,6 +2089,7 @@
+ Input Name
707
@@ -2129,16 +2110,19 @@
733
+ Mouse Movement
734
+ Mouse Button
735
+ Mouse Scroll
659
@@ -2152,6 +2136,7 @@
+ Mouse Button Selector
745
@@ -2162,6 +2147,7 @@
748
+ Switch Mouse Mode
749
@@ -2170,6 +2156,7 @@
+ Mouse Scroll Selector
750
@@ -2183,6 +2170,7 @@
+ Mouse Motion Selector
755
@@ -2195,17 +2183,113 @@
- 782
-
+ 812
+
+
+
+
+ 813
+
+
+
+
+ 814
+
+
+
+
+ 837
+
-
+
+
+
+ Mapping Selector
+
+
+ 835
+
+
+
+
+
+
+
+ 836
+
+
+
+
+ 842
+
+
+
+
+
+ Translation Switch
+
+
+ 840
+
+
+
+
+
+
+
+ 841
+
+
+
+
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+ Mapping List Popover
+
+
+ 507
+
+
+
+
+
+ Add Mapping
+
+
+ 508
+
+
+
+
+ 862
+
+
+
+ Gradient Space
- 783
-
-
+ 863
+
+
+
+
+ 810
+
+
@@ -2227,14 +2311,12 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
{{114, 276}, {770, 487}}
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2245,10 +2327,6 @@
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
@@ -2259,7 +2337,6 @@
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
@@ -2296,89 +2373,137 @@
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
+
+ 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
- 785
+ 864
- ApplicationController
+ EnjoyableApplicationDelegate
+ NSObject
+
+ NSMenu
+ NJDeviceController
+ NJMappingsController
+ NJOutputController
+
+
+
+ dockMenuBase
+ NSMenu
+
+
+ inputController
+ NJDeviceController
+
+
+ mappingsController
+ NJMappingsController
+
+
+ outputController
+ NJOutputController
+
+
+
+ IBProjectSource
+ ./Classes/EnjoyableApplicationDelegate.h
+
+
+
+ NJDeviceController
NSObject
- toggleActivity:
+ translatingEventsChanged:
id
- toggleActivity:
+ translatingEventsChanged:
- toggleActivity:
+ translatingEventsChanged:
id
- NSToolbarItem
- NSMenuItem
- ConfigsController
- NSMenu
- NSDrawer
- JoystickController
- NSWindow
- TargetController
+ NJMappingsController
+ NSOutlineView
+ NJOutputController
+ NSSegmentedControl
-
- activeButton
- NSToolbarItem
-
-
- activeMenuItem
- NSMenuItem
+
+ mappingsController
+ NJMappingsController
-
- configsController
- ConfigsController
-
-
- dockMenuBase
- NSMenu
-
-
- drawer
- NSDrawer
-
-
- jsController
- JoystickController
+
+ outlineView
+ NSOutlineView
-
- mainWindow
- NSWindow
+
+ outputController
+ NJOutputController
-
- targetController
- TargetController
+
+ translatingEventsSetting
+ NSSegmentedControl
IBProjectSource
- ./Classes/ApplicationController.h
+ ./Classes/NJDeviceController.h
- ConfigsController
+ NJKeyInputField
+ NSTextField
+
+ keyDelegate
+ id
+
+
+ keyDelegate
+
+ keyDelegate
+ id
+
+
+
+ IBProjectSource
+ ./Classes/NJKeyInputField.h
+
+
+
+ NJMappingsController
NSObject
id
id
+ id
+ id
id
@@ -2390,20 +2515,37 @@
exportPressed:
id
+
+ importPressed:
+ id
+
+
+ mappingPressed:
+ id
+
removePressed:
id
- NSButton
+ NJOutputController
+ NSPopover
+ NSButton
NSButton
NSTableView
- TargetController
-
- exportButton
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
NSButton
@@ -2414,80 +2556,22 @@
tableView
NSTableView
-
- targetController
- TargetController
-
IBProjectSource
- ./Classes/ConfigsController.h
+ ./Classes/NJMappingsController.h
- JoystickController
- NSObject
-
- ConfigsController
- NSOutlineView
- TargetController
-
-
-
- configsController
- ConfigsController
-
-
- outlineView
- NSOutlineView
-
-
- targetController
- TargetController
-
-
-
- IBProjectSource
- ./Classes/JoystickController.h
-
-
-
- KeyInputTextView
- NSTextField
-
- TargetController
- NSWindow
-
-
-
- targetController
- TargetController
-
-
- window
- NSWindow
-
-
-
- IBProjectSource
- ./Classes/KeyInputTextView.h
-
-
-
- TargetController
+ NJOutputController
NSObject
- id
id
id
id
id
-
- configChosen:
- id
-
mbtnChanged:
id
@@ -2506,10 +2590,10 @@
- NSPopUpButton
- ConfigsController
- JoystickController
- KeyInputTextView
+ NJDeviceController
+ NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
NSSegmentedControl
NSSegmentedControl
NSMatrix
@@ -2517,21 +2601,21 @@
NSTextField
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
+
+ inputController
+ NJDeviceController
keyInput
- KeyInputTextView
+ NJKeyInputField
+
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
mouseBtnSelect
@@ -2556,7 +2640,7 @@
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJOutputController.h
@@ -2566,13 +2650,14 @@
YES
3
+ {15, 15}
{8, 8}
- {9, 9}
+ {11, 10}
{11, 11}
{10, 3}
- {32, 32}
{16, 15}
{8, 8}
+ {9, 9}