X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=a110b51f3da664c0fa388e99a41e2103d50d615c;hp=056a907b7256a6ecc3bc700a2d720118edb2487b;hb=04a5164fec6b5d856b4ab181a2b7c870c2dc679a;hpb=9584becb2e5469e8f482d73e6f0c9c3bf879e0db
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 056a907..a110b51 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 @@
@@ -493,14 +542,10 @@
- 3
+ 1
YES
@@ -538,8 +583,8 @@
MC41AA
- 17
- -767557632
+ 20
+ 306184192
4
@@ -548,6 +593,8 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
@@ -588,11 +635,11 @@
- 133650
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -610,7 +657,7 @@
- 268
+ 265
{{227, 123}, {180, 24}}
@@ -647,7 +694,7 @@
- 268
+ 265
{{227, 55}, {180, 24}}
@@ -680,7 +727,7 @@
- 268
+ 265
{{227, 89}, {180, 24}}
@@ -711,6 +758,49 @@
NO
+
+
+ 265
+ {{229, 190}, {176, 24}}
+
+
+
+ _NS:9
+ NJKeyInputField
+
+
268
@@ -760,7 +850,7 @@
603979776
0
- Switch to configuration
+ Switch to mapping
1211912448
@@ -816,7 +906,7 @@
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
@@ -856,39 +946,6 @@
-
266
@@ -898,8 +955,8 @@
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
@@ -915,8 +972,8 @@
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
@@ -942,16 +999,6 @@
0
NO
-
-
- 265
- {{229, 190}, {176, 24}}
-
-
-
- _NS:9
- KeyInputTextView
-
{{211, 0}, {429, 300}}
@@ -973,39 +1020,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 +1040,7 @@
256
- {320, 418}
+ {196, 256}
@@ -1031,9 +1054,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1064,8 +1085,8 @@
2
- 17
- 46170112
+ 20
+ 48267264
1
@@ -1074,9 +1095,10 @@
NO
0
1
+ -1
- {{1, 1}, {320, 418}}
+ {{2, 2}, {196, 256}}
@@ -1090,7 +1112,7 @@
{{306, 1}, {15, 403}}
-
+
NO
_doScroller:
@@ -1099,34 +1121,34 @@
-2147483392
- {{1, 404}, {305, 15}}
+ {{-100, -100}, {366, 16}}
-
+
NO
1
_doScroller:
- 0.99688480000000002
+ 0.98123324396782841
- {{0, 34}, {322, 420}}
+ {{0, 54}, {200, 260}}
-
- 133682
+
+ 150035
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
- 260
- {{10, 4}, {39, 28}}
+ 292
+ {{20, 19}, {39, 28}}
@@ -1152,11 +1174,11 @@
- 260
- {{57, 4}, {39, 28}}
+ 292
+ {{67, 19}, {39, 28}}
-
+
YES
603979776
@@ -1178,34 +1200,32 @@
NO
- {322, 454}
+ {200, 314}
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 +1310,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
delegate
@@ -1340,35 +1336,35 @@
- targetController
+ mappingsController
-
+
- 695
+ 822
- configsController
+ outputController
-
+
- 717
+ 826
-
- jsController
-
-
+
+ translatingEventsChanged:
+
+
- 484
+ 858
- drawer
-
-
+ translatingEventsSetting
+
+
- 486
+ 859
@@ -1386,14 +1382,6 @@
607
-
-
- activeButton
-
-
-
- 609
-
toggleActivity:
@@ -1403,36 +1391,36 @@
610
-
- toggleActivity:
+
+ dockMenuBase
-
+
- 611
+ 726
- targetController
+ inputController
-
+
- 712
+ 819
- configsController
+ mappingsController
- 716
+ 820
- dockMenuBase
+ outputController
-
+
- 726
+ 825
@@ -1466,29 +1454,53 @@
520
+
+
+ exportPressed:
+
+
+
+ 815
+
+
+
+ importPressed:
+
+
+
+ 816
+
- targetController
+ outputController
- 697
+ 827
- exportPressed:
+ mappingPressed:
+
+
+
+ 855
+
+
+
+ popover
-
+
- 784
+ 856
- exportButton
+ popoverActivate
-
+
- 785
+ 857
@@ -1514,22 +1526,6 @@
692
-
-
- configsController
-
-
-
- 693
-
-
-
- joystickController
-
-
-
- 694
-
title
@@ -1538,22 +1534,6 @@
709
-
-
- configPopup
-
-
-
- 713
-
-
-
- configChosen:
-
-
-
- 714
-
radioChanged:
@@ -1620,19 +1600,67 @@
- targetController
+ mappingsController
+
+
+
+ 821
+
+
+
+ mappingPopup
+
+
+
+ 823
+
+
+
+ mappingChosen:
+
+
+
+ 824
+
+
+
+ inputController
+
+
+
+ 828
+
+
+
+ keyDelegate
- 779
+ 818
- window
-
-
+ view
+
+
- 780
+ 854
+
+
+
+ contentViewController
+
+
+
+ 852
+
+
+
+ delegate
+
+
+
+ 853
@@ -1702,6 +1730,10 @@
+
+
+
+
@@ -1824,19 +1856,13 @@
451
+
-
-
Drawer Content View
-
- 452
-
-
-
453
@@ -1896,34 +1922,12 @@
487
-
-
+
+
-
-
-
- 490
-
-
-
-
- 492
-
-
-
-
- 493
-
-
-
-
- 495
-
-
-
507
@@ -1967,11 +1971,6 @@
-
- 608
-
-
-
652
@@ -2039,8 +2038,8 @@
-
+
@@ -2195,17 +2194,82 @@
- 782
-
+ 810
+
+
+
+
+ 812
+
+
+
+
+ 813
+
+
+
+
+ 814
+
+
+
+
+ 837
+
-
+
-
+
+
+
+ 835
+
+
+
+
+
+
+
+ 836
+
+
- 783
-
-
+ 842
+
+
+
+
+
+
+
+ 840
+
+
+
+
+
+
+
+ 841
+
+
+
+
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
@@ -2234,7 +2298,6 @@
{{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 +2308,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 +2318,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,22 +2354,35 @@
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
+ 859
- ApplicationController
+ EnjoyableApplicationDelegate
NSObject
toggleActivity:
@@ -2325,60 +2396,104 @@
- NSToolbarItem
- NSMenuItem
- ConfigsController
NSMenu
- NSDrawer
- JoystickController
- NSWindow
- TargetController
+ NJDeviceController
+ NJMappingsController
+ NJOutputController
-
- activeButton
- NSToolbarItem
-
-
- activeMenuItem
- NSMenuItem
-
-
- configsController
- ConfigsController
-
dockMenuBase
NSMenu
-
- drawer
- NSDrawer
+
+ inputController
+ NJDeviceController
+
+
+ mappingsController
+ NJMappingsController
+
+
+ outputController
+ NJOutputController
+
+
+
+ IBProjectSource
+ ./Classes/EnjoyableApplicationDelegate.h
+
+
+
+ NJDeviceController
+ NSObject
+
+ translatingEventsChanged:
+ id
+
+
+ translatingEventsChanged:
+
+ translatingEventsChanged:
+ id
+
+
+
+ NJMappingsController
+ NSOutlineView
+ NJOutputController
+ NSSegmentedControl
+
+
+
+ mappingsController
+ NJMappingsController
-
- jsController
- JoystickController
+
+ outlineView
+ NSOutlineView
-
- mainWindow
- NSWindow
+
+ outputController
+ NJOutputController
-
- targetController
- TargetController
+
+ translatingEventsSetting
+ NSSegmentedControl
IBProjectSource
- ./Classes/ApplicationController.h
+ ./Classes/NJDeviceController.h
+
+
+
+ NJKeyInputField
+ NSTextField
+
+ keyDelegate
+ id
+
+
+ keyDelegate
+
+ keyDelegate
+ id
+
+
+
+ IBProjectSource
+ ./Classes/NJKeyInputField.h
- ConfigsController
+ NJMappingsController
NSObject
id
id
+ id
+ id
id
@@ -2390,20 +2505,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 +2546,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 +2580,10 @@
- NSPopUpButton
- ConfigsController
- JoystickController
- KeyInputTextView
+ NJDeviceController
+ NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
NSSegmentedControl
NSSegmentedControl
NSMatrix
@@ -2517,21 +2591,21 @@
NSTextField
-
- configPopup
- NSPopUpButton
-
-
- configsController
- ConfigsController
-
-
- joystickController
- JoystickController
+
+ inputController
+ NJDeviceController
keyInput
- KeyInputTextView
+ NJKeyInputField
+
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
mouseBtnSelect
@@ -2556,7 +2630,7 @@
IBProjectSource
- ./Classes/TargetController.h
+ ./Classes/NJOutputController.h
@@ -2566,11 +2640,12 @@
YES
3
+ {15, 15}
{8, 8}
- {9, 9}
+ {11, 10}
{11, 11}
{10, 3}
- {32, 32}
+ {13, 10}
{16, 15}
{8, 8}