X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=44865f459f4b26f5de302dcc779be63f9bbf8338;hp=48ed439d01ef6562da09255357fb596ea720dbcd;hb=1d10a45acf54217e765614cd2b4667297c1f7083;hpb=58ce8f7f50f382f18e7b416eca737803af284868
diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index 48ed439..44865f4 100644
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -37,7 +37,6 @@
NSToolbarFlexibleSpaceItem
NSToolbarItem
NSView
- NSViewController
NSWindowTemplate
@@ -489,7 +488,7 @@
{664, 323}
{234, 323}
-
-
+
150034
@@ -710,7 +702,6 @@ aW5nLg
{234, 323}
-
_NS:9
NSView
@@ -719,12 +710,35 @@ aW5nLg
285
+
+
+ 268
+ {{197, 157}, {193, 21}}
+
+
+ _NS:9
+ YES
+
+ 603979776
+ 33554432
+ Unknown Mapping
+
+ _NS:9
+
+ -2046672896
+ 129
+
+
+ 200
+ 25
+
+ NO
+
265
{{189, 117}, {224, 20}}
-
_NS:9
YES
@@ -766,8 +780,6 @@ aW5nLg
268
{{343, 31}, {70, 18}}
-
-
_NS:9
YES
@@ -798,7 +810,6 @@ aW5nLg
265
{{189, 33}, {150, 20}}
-
_NS:9
YES
@@ -843,7 +854,6 @@ aW5nLg
265
{{191, 24}, {146, 16}}
-
_NS:9
YES
@@ -869,7 +879,6 @@ aW5nLg
265
{{189, 70}, {224, 24}}
-
_NS:9
YES
@@ -923,7 +932,6 @@ aW5nLg
265
{{191, 108}, {220, 16}}
-
_NS:9
YES
@@ -949,7 +957,6 @@ aW5nLg
265
{{191, 196}, {220, 23}}
-
_NS:9
NJKeyInputField
@@ -959,8 +966,7 @@ aW5nLg
265
{{188, 153}, {226, 26}}
-
-
+
YES
{{233, 0}, {431, 323}}
-
_NS:9
NSView
{664, 323}
-
-
{{0, 0}, {1440, 878}}
@@ -1191,6 +1191,101 @@ aW5nLg
Enjoyable
YES
+
+
+
+ EnjoyableApplicationDelegate
+
+
+ NJInputController
+
+
+ NJOutputViewController
+
+
+ NJDeviceViewController
+
+
+ NJMappingsViewController
+
+
+
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
+
256
@@ -1434,99 +1529,6 @@ aW5nLg
NSView
-
- EnjoyableApplicationDelegate
-
-
- NJMappingsController
-
-
- NJDeviceController
-
-
- NJOutputController
-
-
-
-
- 0
- 1
- 0.0
- 0.0
- YES
-
-
-
NJMappingMenuController
@@ -1539,9 +1541,6 @@ aW5nLg
SUUpdater
-
- NJDeviceViewController
-
@@ -1641,85 +1640,29 @@ aW5nLg
977
-
-
- delegate
-
-
-
- 517
-
dataSource
-
-
- 518
-
-
-
- mappingsController
-
-
-
- 822
-
-
-
- outputController
-
-
-
- 826
-
-
-
- connectDevicePrompt
-
-
-
- 915
-
-
-
- hidSleepingPrompt
-
-
-
- 976
-
-
-
- simulatingEventsChanged:
-
-
+
- 978
+ 1001
- simulatingEventsButton
-
-
+ delegate
+
+
- 982
+ 1002
- devicesViewController
+ delegate
-
-
- 992
-
-
-
- mappingsController
-
-
+
- 820
+ 1029
@@ -1745,14 +1688,6 @@ aW5nLg
930
-
-
- mappingsMenu
-
-
-
- 931
-
restoreToForeground:
@@ -1763,115 +1698,75 @@ aW5nLg
- removePressed:
-
-
-
- 516
-
-
-
- removeButton
-
-
-
- 519
-
-
-
- tableView
-
-
-
- 520
-
-
-
- exportPressed:
-
+ exportMappingClicked:
+
- 815
+ 1015
- importPressed:
-
+ importMappingClicked:
+
- 816
-
-
-
- mappingPressed:
-
-
-
- 855
-
-
-
- popover
-
-
-
- 856
+ 1016
- popoverActivate
-
-
+ mvc
+
+
- 857
+ 1024
-
-
- addPressed:
-
-
+
+
+ dvc
+
+
- 515
+ 1025
-
- moveUpPressed:
-
-
+
+ outputController
+
+
- 899
+ 1027
- moveDownPressed:
-
-
+ simulatingEventsChanged:
+
+
- 900
+ 1030
- moveUp
-
-
+ simulatingEventsButton
+
+
- 901
+ 1031
- moveDown
-
-
+ inputController
+
+
- 902
+ 1032
- addPressed:
-
+ performClick:
+
- 971
+ 1012
@@ -1889,22 +1784,6 @@ aW5nLg
991
-
-
- mappingsController
-
-
-
- 821
-
-
-
- inputController
-
-
-
- 828
-
mouseDirSelect
@@ -2041,6 +1920,22 @@ aW5nLg
949
+
+
+ unknownMapping
+
+
+
+ 1022
+
+
+
+ inputController
+
+
+
+ 1034
+
delegate
@@ -2057,29 +1952,21 @@ aW5nLg
871
-
-
- view
-
-
-
- 854
-
contentViewController
-
+
- 852
+ 996
delegate
-
+
- 853
+ 1004
@@ -2185,14 +2072,6 @@ aW5nLg
969
-
-
- delegate
-
-
-
- 984
-
hidStoppedNotice
@@ -2217,6 +2096,118 @@ aW5nLg
989
+
+
+ delegate
+
+
+
+ 1028
+
+
+
+ view
+
+
+
+ 997
+
+
+
+ mappingTriggerClicked:
+
+
+
+ 998
+
+
+
+ mappingListTrigger
+
+
+
+ 999
+
+
+
+ mappingListPopover
+
+
+
+ 1000
+
+
+
+ mappingList
+
+
+
+ 1003
+
+
+
+ removeClicked:
+
+
+
+ 1005
+
+
+
+ removeMapping
+
+
+
+ 1006
+
+
+
+ addClicked:
+
+
+
+ 1007
+
+
+
+ moveDownClicked:
+
+
+
+ 1008
+
+
+
+ moveUpClicked:
+
+
+
+ 1009
+
+
+
+ moveDown
+
+
+
+ 1010
+
+
+
+ moveUp
+
+
+
+ 1011
+
+
+
+ delegate
+
+
+
+ 1023
+
@@ -2488,11 +2479,6 @@ aW5nLg
-
- 514
-
-
-
479
@@ -2555,12 +2541,6 @@ aW5nLg
-
- 850
-
-
- Popover View Controller
-
851
@@ -2708,6 +2688,7 @@ aW5nLg
+
@@ -3052,12 +3033,32 @@ aW5nLg
+
+ 993
+
+
+
+
+ 1020
+
+
+
+
+
+
+
+ 1021
+
+
+
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
@@ -3107,7 +3108,6 @@ aW5nLg
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -3163,7 +3163,6 @@ aW5nLg
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -3304,32 +3303,50 @@ aW5nLg
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
- 992
+ 1034
EnjoyableApplicationDelegate
NSObject
-
- restoreToForeground:
- id
-
-
- restoreToForeground:
-
+
+ id
+ id
+ id
+ NSButton
+
+
+
+ exportMappingClicked:
+ id
+
+
+ importMappingClicked:
+ id
+
+
restoreToForeground:
id
-
+
+ simulatingEventsChanged:
+ NSButton
+
+
NSMenu
- NJMappingsController
+ NJDeviceViewController
+ NJInputController
+ NJMappingsViewController
+ NJOutputController
+ NSButton
NSMenu
NSWindow
@@ -3338,52 +3355,17 @@ aW5nLg
dockMenu
NSMenu
-
- mappingsController
- NJMappingsController
-
-
- statusItemMenu
- NSMenu
-
-
- window
- NSWindow
-
-
-
- IBProjectSource
- ./Classes/EnjoyableApplicationDelegate.h
-
-
-
- NJDeviceController
- NSObject
-
- simulatingEventsChanged:
- NSButton
-
-
- simulatingEventsChanged:
-
- simulatingEventsChanged:
- NSButton
-
-
-
- NJDeviceViewController
- NJMappingsController
- NJOutputController
- NSButton
-
-
-
- devicesViewController
+
+ dvc
NJDeviceViewController
-
- mappingsController
- NJMappingsController
+
+ inputController
+ NJInputController
+
+
+ mvc
+ NJMappingsViewController
outputController
@@ -3393,10 +3375,18 @@ aW5nLg
simulatingEventsButton
NSButton
+
+ statusItemMenu
+ NSMenu
+
+
+ window
+ NSWindow
+
IBProjectSource
- ./Classes/NJDeviceController.h
+ ./Classes/EnjoyableApplicationDelegate.h
@@ -3431,6 +3421,25 @@ aW5nLg
./Classes/NJDeviceViewController.h
+
+ NJInputController
+ NSObject
+
+ delegate
+ id
+
+
+ delegate
+
+ delegate
+ id
+
+
+
+ IBProjectSource
+ ./Classes/NJInputController.h
+
+
NJKeyInputField
NSControl
@@ -3478,56 +3487,63 @@ aW5nLg
- NJMappingsController
- NSObject
+ NJMappingsViewController
+ NSViewController
- id
- id
- id
- id
- id
- id
- id
+ id
+ id
+ id
+ id
+ id
-
- addPressed:
+
+ addClicked:
id
-
- exportPressed:
+
+ mappingTriggerClicked:
id
-
- importPressed:
+
+ moveDownClicked:
id
-
- mappingPressed:
+
+ moveUpClicked:
id
-
- moveDownPressed:
- id
-
-
- moveUpPressed:
- id
-
-
- removePressed:
+
+ removeClicked:
id
+ id
+ NSTableView
+ NSPopover
+ NSButton
NSButton
NSButton
- NSPopover
- NSButton
- NSButton
- NSTableView
+ NSButton
+
+ delegate
+ id
+
+
+ mappingList
+ NSTableView
+
+
+ mappingListPopover
+ NSPopover
+
+
+ mappingListTrigger
+ NSButton
+
moveDown
NSButton
@@ -3536,26 +3552,14 @@ aW5nLg
moveUp
NSButton
-
- popover
- NSPopover
-
-
- popoverActivate
- NSButton
-
-
- removeButton
+
+ removeMapping
NSButton
-
- tableView
- NSTableView
-
IBProjectSource
- ./Classes/NJMappingsController.h
+ ./Classes/NJMappingsViewController.h
@@ -3601,10 +3605,9 @@ aW5nLg
- NJDeviceController
+ NJInputController
NJKeyInputField
NSPopUpButton
- NJMappingsController
NSSegmentedControl
NSSegmentedControl
NSSlider
@@ -3613,11 +3616,12 @@ aW5nLg
NSSlider
NSButton
NSTextField
+ NSButton
inputController
- NJDeviceController
+ NJInputController
keyInput
@@ -3627,10 +3631,6 @@ aW5nLg
mappingPopup
NSPopUpButton
-
- mappingsController
- NJMappingsController
-
mouseBtnSelect
NSSegmentedControl
@@ -3663,6 +3663,10 @@ aW5nLg
title
NSTextField
+
+ unknownMapping
+ NSButton
+
IBProjectSource