X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;fp=Resources%2FEnglish.lproj%2FMainMenu.xib;h=6afbc500001fc4167eac36516866c3d4426e8bc6;hp=48ed439d01ef6562da09255357fb596ea720dbcd;hb=b14d8429658dd6f3f7b4904301031addb502b22c;hpb=58ce8f7f50f382f18e7b416eca737803af284868 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 48ed439..6afbc50 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -37,7 +37,6 @@ NSToolbarFlexibleSpaceItem NSToolbarItem NSView - NSViewController NSWindowTemplate @@ -567,7 +566,7 @@ aW5nLg {232, 321} - + YES NO YES @@ -697,7 +696,7 @@ aW5nLg {234, 323} - + 150034 @@ -767,7 +766,6 @@ aW5nLg {{343, 31}, {70, 18}} - _NS:9 YES @@ -1192,7 +1190,7 @@ aW5nLg YES - + 256 @@ -1208,6 +1206,7 @@ aW5nLg 256 {198, 198} + YES NO @@ -1265,6 +1264,7 @@ aW5nLg {{1, 1}, {198, 198}} + @@ -1275,6 +1275,7 @@ aW5nLg -2147483392 {{306, 1}, {15, 403}} + NO @@ -1286,6 +1287,7 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} + NO 1 @@ -1296,6 +1298,7 @@ aW5nLg {{0, 20}, {200, 200}} + 150034 @@ -1311,6 +1314,7 @@ aW5nLg 268 {{66, -1}, {68, 23}} + _NS:22 YES @@ -1339,6 +1343,7 @@ aW5nLg 292 {{0, -1}, {34, 23}} + YES @@ -1365,6 +1370,7 @@ aW5nLg 292 {{166, -1}, {34, 23}} + YES 67108864 @@ -1386,6 +1392,7 @@ aW5nLg 292 {{133, -1}, {34, 23}} + YES @@ -1408,6 +1415,7 @@ aW5nLg 292 {{33, -1}, {34, 23}} + YES @@ -1431,6 +1439,8 @@ aW5nLg {200, 220} + + NSView @@ -1446,7 +1456,6 @@ aW5nLg NJOutputController - 0 @@ -1542,6 +1551,9 @@ aW5nLg NJDeviceViewController + + NJMappingsViewController + @@ -1643,19 +1655,19 @@ aW5nLg - delegate + dataSource - + - 517 + 1001 - dataSource + delegate - + - 518 + 1002 @@ -1763,115 +1775,35 @@ aW5nLg - removePressed: - - - - 516 - - - - removeButton - - - - 519 - - - - tableView - - - - 520 - - - - exportPressed: - + exportMappingClicked: + - 815 + 1015 - importPressed: - + importMappingClicked: + - 816 - - - - mappingPressed: - - - - 855 - - - - popover - - - - 856 - - - - popoverActivate - - - - 857 - - - - addPressed: - - - - 515 + 1016 - moveUpPressed: - - - - 899 - - - - moveDownPressed: - - - - 900 - - - - moveUp - - + performClick: + + - 901 + 1012 - moveDown - - - - 902 - - - - addPressed: + mvc - + - 971 + 995 @@ -2057,29 +1989,21 @@ aW5nLg 871 - - - view - - - - 854 - contentViewController - + - 852 + 996 delegate - + - 853 + 1004 @@ -2217,6 +2141,110 @@ aW5nLg 989 + + + delegate + + + + 994 + + + + view + + + + 997 + + + + mappingTriggerClicked: + + + + 998 + + + + mappingListTrigger + + + + 999 + + + + mappingListPopover + + + + 1000 + + + + mappingList + + + + 1003 + + + + removeClicked: + + + + 1005 + + + + removeMapping + + + + 1006 + + + + addClicked: + + + + 1007 + + + + moveDownClicked: + + + + 1008 + + + + moveUpClicked: + + + + 1009 + + + + moveDown + + + + 1010 + + + + moveUp + + + + 1011 + @@ -2555,12 +2583,6 @@ aW5nLg - - 850 - - - Popover View Controller - 851 @@ -3052,6 +3074,11 @@ aW5nLg + + 993 + + + @@ -3163,7 +3190,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,29 +3330,38 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 992 + 1016 EnjoyableApplicationDelegate NSObject - - restoreToForeground: - id - - - restoreToForeground: - + + id + id + id + + + + exportMappingClicked: + id + + + importMappingClicked: + id + + restoreToForeground: id - + NSMenu NJMappingsController @@ -3480,54 +3515,80 @@ aW5nLg NJMappingsController NSObject + + mvc + NJMappingsViewController + + + mvc + + mvc + NJMappingsViewController + + + + IBProjectSource + ./Classes/NJMappingsController.h + + + + 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 +3597,14 @@ aW5nLg moveUp NSButton - - popover - NSPopover - - - popoverActivate - NSButton - - - removeButton + + removeMapping NSButton - - tableView - NSTableView - IBProjectSource - ./Classes/NJMappingsController.h + ./Classes/NJMappingsViewController.h