X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=1c95840fe2abff9dc4206c798750c25f2b13433e;hp=48ed439d01ef6562da09255357fb596ea720dbcd;hb=0a8d6333a3ac4684b70ab7f3581a93bf96638d6f;hpb=58ce8f7f50f382f18e7b416eca737803af284868 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 48ed439..1c95840 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -1,14 +1,14 @@ - 1080 - 12D78 - 3084 - 1187.37 - 626.00 + 1070 + 14A388b + 6250 + 1343.14 + 755.00 com.apple.InterfaceBuilder.CocoaPlugin - 3084 + 6250 NSBox @@ -37,7 +37,6 @@ NSToolbarFlexibleSpaceItem NSToolbarItem NSView - NSViewController NSWindowTemplate @@ -75,6 +74,7 @@ NSMenuMixedState submenuAction: + Enjoyable @@ -86,14 +86,6 @@ - - - Check for Updates... - - 2147483647 - - - YES @@ -114,6 +106,7 @@ submenuAction: + Services @@ -191,6 +184,7 @@ submenuAction: + Mappings @@ -272,6 +266,7 @@ submenuAction: + Window @@ -316,6 +311,7 @@ submenuAction: + Help @@ -372,7 +368,7 @@ 134217728 - LucidaGrande + YES 13 1044 @@ -489,7 +485,7 @@ {664, 323} - + 256 @@ -501,7 +497,6 @@ -2147483374 {{20, 20}, {194, 283}} - _NS:22 YES @@ -510,10 +505,10 @@ 134217728 SW5wdXQgaXMgY3VycmVudGx5IGRpc2FibGVkLgoKU3dpdGNoIGJhY2sgdG8gcmUtZW5hYmxlIGlucHV0 Lg - - LucidaGrande-Bold + + YES 14 - 16 + 2072 _NS:22 @@ -531,7 +526,6 @@ Lg 274 {{20, 20}, {194, 283}} - _NS:22 YES @@ -540,7 +534,11 @@ Lg 134217728 Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw aW5nLg - + + YES + 14 + 2072 + _NS:22 -2041823232 @@ -566,8 +564,7 @@ aW5nLg {232, 321} - - + YES NO YES @@ -586,7 +583,7 @@ aW5nLg 2048 - LucidaGrande + YES 11 3100 @@ -646,7 +643,7 @@ aW5nLg MC41AA - 20 + 22 306184192 @@ -662,20 +659,21 @@ aW5nLg {{1, 1}, {232, 321}} - 4 + YES -2147483392 {{1, 1}, {8, 298}} - NO + _doScroller: + _doScroller: 0.4210526 @@ -685,9 +683,10 @@ aW5nLg -2147483392 {{-100, -100}, {473, 15}} - NO + _doScroller: + 1 _doScroller: @@ -696,13 +695,12 @@ aW5nLg {234, 323} - - + 150034 - QSAAAEEgAABBsAAAQbAAAA + QSAAAEEgAABBwAAAQcAAAA 0.25 4 1 @@ -710,7 +708,6 @@ aW5nLg {234, 323} - _NS:9 NSView @@ -719,17 +716,40 @@ 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 - 67108864 + 75497472 131072 _NS:9 @@ -766,8 +786,6 @@ aW5nLg 268 {{343, 31}, {70, 18}} - - _NS:9 YES @@ -798,12 +816,11 @@ aW5nLg 265 {{189, 33}, {150, 20}} - _NS:9 YES - 67108864 + 75497472 131072 _NS:9 @@ -843,7 +860,6 @@ aW5nLg 265 {{191, 24}, {146, 16}} - _NS:9 YES @@ -869,18 +885,13 @@ aW5nLg 265 {{189, 70}, {224, 24}} - _NS:9 YES - 67108864 + 75497472 0 - - LucidaGrande - 13 - 16 - + _NS:9 @@ -923,7 +934,6 @@ aW5nLg 265 {{191, 108}, {220, 16}} - _NS:9 YES @@ -949,7 +959,6 @@ aW5nLg 265 {{191, 196}, {220, 23}} - _NS:9 NJKeyInputField @@ -959,8 +968,7 @@ aW5nLg 265 {{188, 153}, {226, 26}} - - + YES -2076180416 @@ -992,7 +1000,6 @@ aW5nLg 268 {{24, 20}, {163, 250}} - NO 6 @@ -1123,7 +1130,6 @@ aW5nLg 266 {{9, 286}, {412, 17}} - YES @@ -1131,9 +1137,9 @@ aW5nLg 138414656 - LucidaGrande-Bold + YES 13 - 16 + 2072 No input selected @@ -1141,13 +1147,13 @@ aW5nLg NO + 1 10 {{12, 276}, {406, 5}} - {0, 0} @@ -1162,8 +1168,10 @@ aW5nLg - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + 3 @@ -1174,23 +1182,115 @@ aW5nLg {{233, 0}, {431, 323}} - _NS:9 NSView {664, 323} - - - {{0, 0}, {1440, 878}} + {{0, 0}, {1440, 877}} {664, 378} {10000000000000, 10000000000000} Enjoyable YES + + + + + + Enable + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + Show Enjoyable + + 2147483647 + + + + + + Quit Enjoyable + + 2147483647 + + + + + + + + + + + Enable + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + + EnjoyableApplicationDelegate + + + NJInputController + + + NJOutputViewController + + + NJDeviceViewController + + + NJMappingsViewController + + + + 0 + 1 + 0.0 + 0.0 + YES + 256 @@ -1250,7 +1350,7 @@ aW5nLg 2 - 20 + 22 44072960 @@ -1269,6 +1369,7 @@ aW5nLg 4 + YES @@ -1277,6 +1378,8 @@ aW5nLg NO + _doScroller: + _doScroller: 0.99766359999999998 @@ -1288,6 +1391,8 @@ aW5nLg NO + _doScroller: + 1 _doScroller: @@ -1301,7 +1406,7 @@ aW5nLg - QSAAAEEgAABBsAAAQbAAAA + QSAAAEEgAABBwAAAQcAAAA 0.25 4 1 @@ -1319,7 +1424,7 @@ aW5nLg 168034304 - LucidaGrande + YES 9 3614 @@ -1434,99 +1539,6 @@ aW5nLg NSView - - EnjoyableApplicationDelegate - - - NJMappingsController - - - NJDeviceController - - - NJOutputController - - - - - 0 - 1 - 0.0 - 0.0 - YES - - - - - - - Enable - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Show Enjoyable - - 2147483647 - - - - - - Quit Enjoyable - - 2147483647 - - - - - - - - - - - Enable - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - NJMappingMenuController @@ -1536,15 +1548,9 @@ aW5nLg NJMappingMenuController - - SUUpdater - - - NJDeviceViewController - - + terminate: @@ -1643,235 +1649,131 @@ aW5nLg - delegate + dataSource - + - 517 + 1001 - dataSource + delegate - + - 518 + 1002 - mappingsController + delegate - + - 822 + 1029 - outputController - - + window + + - 826 + 865 - connectDevicePrompt - - + statusItemMenu + + - 915 + 928 - hidSleepingPrompt - - + dockMenu + + - 976 + 930 - simulatingEventsChanged: - - + restoreToForeground: + + - 978 + 939 - - simulatingEventsButton - - - - 982 - - - - devicesViewController - - - - 992 - - - - mappingsController - - - - 820 - - - - window + + exportMappingClicked: - + - 865 + 1015 - - statusItemMenu + + importMappingClicked: - + - 928 + 1016 - dockMenu + mvc - + - 930 + 1024 - mappingsMenu + dvc - + - 931 + 1025 - restoreToForeground: + simulatingEventsChanged: - - - 939 - - - - removePressed: - - - - 516 - - - - removeButton - - - - 519 - - - - tableView - - - - 520 - - - - exportPressed: - - - - 815 - - - - importPressed: - - - - 816 - - - - mappingPressed: - - - - 855 - - - - popover - - + - 856 + 1030 - popoverActivate - - - - 857 - - - - addPressed: - - - - 515 - - - - moveUpPressed: - - - - 899 - - - - moveDownPressed: - - + simulatingEventsButton + + - 900 + 1031 - moveUp - - + ic + + - 901 + 1036 - moveDown - - + oc + + - 902 + 1037 - addPressed: - + performClick: + - 971 + 1012 @@ -1889,22 +1791,6 @@ aW5nLg 991 - - - mappingsController - - - - 821 - - - - inputController - - - - 828 - mouseDirSelect @@ -1921,22 +1807,6 @@ aW5nLg 823 - - - mdirChanged: - - - - 757 - - - - sdirChanged: - - - - 752 - scrollSpeedSlider @@ -1945,14 +1815,6 @@ aW5nLg 891 - - - radioChanged: - - - - 731 - keyInput @@ -1961,14 +1823,6 @@ aW5nLg 781 - - - mbtnChanged: - - - - 747 - mouseSpeedChanged: @@ -2041,6 +1895,54 @@ aW5nLg 949 + + + unknownMapping + + + + 1022 + + + + delegate + + + + 1035 + + + + scrollDirectionChanged: + + + + 1038 + + + + mouseButtonChanged: + + + + 1039 + + + + mouseDirectionChanged: + + + + 1040 + + + + outputTypeChanged: + + + + 1041 + delegate @@ -2057,29 +1959,21 @@ aW5nLg 871 - - - view - - - - 854 - contentViewController - + - 852 + 996 delegate - + - 853 + 1004 @@ -2177,22 +2071,6 @@ aW5nLg 981 - - - checkForUpdates: - - - - 969 - - - - delegate - - - - 984 - hidStoppedNotice @@ -2217,57 +2095,169 @@ aW5nLg 989 - - - - - 0 - - - + + + delegate + + - - -2 - - - File's Owner + 1028 + + + + view + + - - -1 - - - First Responder + 997 + + + + mappingTriggerClicked: + + - - -3 - - - Application + 998 + + + + mappingListTrigger + + - - 29 - - - - - - - - - Main Menu + 999 + + + + mappingListPopover + + - - 19 - - - - - + 1000 + + + + mappingList + + - - 56 - - + 1003 + + + + removeClicked: + + + + 1005 + + + + removeMapping + + + + 1006 + + + + addClicked: + + + + 1007 + + + + moveDownClicked: + + + + 1008 + + + + moveUpClicked: + + + + 1009 + + + + moveDown + + + + 1010 + + + + moveUp + + + + 1011 + + + + delegate + + + + 1023 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + -3 + + + Application + + + 29 + + + + + + + + + Main Menu + + + 19 + + + + + + + + 56 + + @@ -2307,7 +2297,6 @@ aW5nLg - @@ -2488,11 +2477,6 @@ aW5nLg - - 514 - - - 479 @@ -2555,12 +2539,6 @@ aW5nLg - - 850 - - - Popover View Controller - 851 @@ -2708,6 +2686,7 @@ aW5nLg + @@ -3019,16 +2998,6 @@ aW5nLg Status Bar Menu Controller - - 967 - - - - - 968 - - - 970 @@ -3052,12 +3021,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 +3096,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 +3151,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 @@ -3298,38 +3285,54 @@ 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 com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin - 992 + 1041 EnjoyableApplicationDelegate NSObject - - restoreToForeground: - id - - - restoreToForeground: - + + id + id + id + NSButton + + + + exportMappingClicked: + id + + + importMappingClicked: + id + + restoreToForeground: id - + + simulatingEventsChanged: + NSButton + + NSMenu - NJMappingsController + NJDeviceViewController + NJInputController + NJMappingsViewController + NJOutputViewController + NSButton NSMenu NSWindow @@ -3338,9 +3341,25 @@ aW5nLg dockMenu NSMenu - - mappingsController - NJMappingsController + + dvc + NJDeviceViewController + + + ic + NJInputController + + + mvc + NJMappingsViewController + + + oc + NJOutputViewController + + + simulatingEventsButton + NSButton statusItemMenu @@ -3353,12 +3372,11 @@ aW5nLg IBProjectSource - ./Classes/EnjoyableApplicationDelegate.h + ../Classes/EnjoyableApplicationDelegate.h - NJDeviceController - NSObject + EnjoyableApplicationDelegate simulatingEventsChanged: NSButton @@ -3370,33 +3388,9 @@ aW5nLg NSButton - - NJDeviceViewController - NJMappingsController - NJOutputController - NSButton - - - - devicesViewController - NJDeviceViewController - - - mappingsController - NJMappingsController - - - outputController - NJOutputController - - - simulatingEventsButton - NSButton - - IBProjectSource - ./Classes/NJDeviceController.h + ../Classes/EnjoyableApplicationDelegate.m @@ -3428,7 +3422,26 @@ aW5nLg IBProjectSource - ./Classes/NJDeviceViewController.h + ../Classes/NJDeviceViewController.h + + + + NJInputController + NSObject + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ../Classes/NJInputController.h @@ -3447,7 +3460,7 @@ aW5nLg IBProjectSource - ./Classes/NJKeyInputField.h + ../Classes/NJKeyInputField.h @@ -3474,60 +3487,67 @@ aW5nLg IBProjectSource - ./Classes/NJMappingMenuController.h + ../Classes/NJMappingMenuController.h - NJMappingsController - NSObject + NJMappingsViewController + NSViewController - id - id - id - id - id - id - id + id + id + id + id + id - - addPressed: - id - - - exportPressed: - id - - - importPressed: + + addClicked: id - - mappingPressed: + + mappingTriggerClicked: id - - moveDownPressed: + + moveDownClicked: id - - moveUpPressed: + + moveUpClicked: 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,55 +3556,83 @@ aW5nLg moveUp NSButton - - popover - NSPopover - - - popoverActivate + + removeMapping NSButton - - removeButton - NSButton + + + IBProjectSource + ../Classes/NJMappingsViewController.h + + + + NJMappingsViewController + + id + id + id + id + id + + + + addClicked: + id - - tableView - NSTableView + + mappingTriggerClicked: + id + + + moveDownClicked: + id + + + moveUpClicked: + id + + + removeClicked: + id IBProjectSource - ./Classes/NJMappingsController.h + ../Classes/NJMappingsViewController.m - NJOutputController + NJOutputViewController NSObject - id - id + id + id id - id + id + id id id - id - - mbtnChanged: + + mouseButtonChanged: id - - mdirChanged: + + mouseDirectionChanged: id mouseSpeedChanged: id - - radioChanged: + + outputTypeChanged: + id + + + scrollDirectionChanged: id @@ -3595,16 +3643,11 @@ aW5nLg scrollTypeChanged: id - - sdirChanged: - id - - NJDeviceController + id NJKeyInputField NSPopUpButton - NJMappingsController NSSegmentedControl NSSegmentedControl NSSlider @@ -3613,11 +3656,12 @@ aW5nLg NSSlider NSButton NSTextField + NSButton - - inputController - NJDeviceController + + delegate + id keyInput @@ -3627,10 +3671,6 @@ aW5nLg mappingPopup NSPopUpButton - - mappingsController - NJMappingsController - mouseBtnSelect NSSegmentedControl @@ -3663,56 +3703,325 @@ aW5nLg title NSTextField + + unknownMapping + NSButton + + + + IBProjectSource + ../Classes/NJOutputViewController.h + + + + NJOutputViewController + + NSView + NSButton + + + + outputTypeChanged: + NSView + + + scrollTypeChanged: + NSButton + IBProjectSource - ./Classes/NJOutputController.h + ../Classes/NJOutputViewController.m + + + + + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h - SUUpdater + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell NSObject - - checkForUpdates: - id + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h - - checkForUpdates: - - checkForUpdates: - id - + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSMenuItemCell + NSButtonCell + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItemCell.h + + + NSOutlineView + NSTableView + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSPopUpButton + NSButton + + IBFrameworkSource + AppKit.framework/Headers/NSPopUpButton.h + + + + NSPopUpButtonCell + NSMenuItemCell + + IBFrameworkSource + AppKit.framework/Headers/NSPopUpButtonCell.h + + + + NSPopover + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSPopover.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSSegmentedCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSSegmentedCell.h + + + + NSSegmentedControl + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSSegmentedControl.h + + + + NSSlider + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSSlider.h + + + + NSSliderCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSSliderCell.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableView + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSToolbar + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbar.h + + + + NSToolbarItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSView + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSViewController + NSResponder - delegate - id + view + NSView - delegate + view - delegate - id + view + NSView - IBProjectSource - ./Classes/SUUpdater.h + IBFrameworkSource + AppKit.framework/Headers/NSViewController.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h 0 IBCocoaFramework + NO + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + YES 3 - {8, 8} - {11, 10} - {11, 11} - {10, 3} + {11, 11} + {14, 10} + {12, 12} + {10, 2} {16, 15} - {8, 8} - {9, 9} + {11, 11} + {9, 12} {15, 15}