X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=1c95840fe2abff9dc4206c798750c25f2b13433e;hp=7306c41536691d3ff2687fce7ba0796a09056587;hb=0a8d6333a3ac4684b70ab7f3581a93bf96638d6f;hpb=5bf06d6aca4bf51b0a347021d69c90dd198c7cf8 diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 7306c41..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 @@ -74,6 +74,7 @@ NSMenuMixedState submenuAction: + Enjoyable @@ -85,14 +86,6 @@ - - - Check for Updates... - - 2147483647 - - - YES @@ -113,6 +106,7 @@ submenuAction: + Services @@ -190,6 +184,7 @@ submenuAction: + Mappings @@ -271,6 +266,7 @@ submenuAction: + Window @@ -315,6 +311,7 @@ submenuAction: + Help @@ -371,7 +368,7 @@ 134217728 - LucidaGrande + YES 13 1044 @@ -488,7 +485,7 @@ {664, 323} - + 256 @@ -500,7 +497,6 @@ -2147483374 {{20, 20}, {194, 283}} - _NS:22 YES @@ -509,10 +505,10 @@ 134217728 SW5wdXQgaXMgY3VycmVudGx5IGRpc2FibGVkLgoKU3dpdGNoIGJhY2sgdG8gcmUtZW5hYmxlIGlucHV0 Lg - - LucidaGrande-Bold + + YES 14 - 16 + 2072 _NS:22 @@ -530,7 +526,6 @@ Lg 274 {{20, 20}, {194, 283}} - _NS:22 YES @@ -539,7 +534,11 @@ Lg 134217728 Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw aW5nLg - + + YES + 14 + 2072 + _NS:22 -2041823232 @@ -565,7 +564,6 @@ aW5nLg {232, 321} - YES NO @@ -585,7 +583,7 @@ aW5nLg 2048 - LucidaGrande + YES 11 3100 @@ -645,7 +643,7 @@ aW5nLg MC41AA - 20 + 22 306184192 @@ -661,20 +659,21 @@ aW5nLg {{1, 1}, {232, 321}} - 4 + YES -2147483392 {{1, 1}, {8, 298}} - NO + _doScroller: + _doScroller: 0.4210526 @@ -684,9 +683,10 @@ aW5nLg -2147483392 {{-100, -100}, {473, 15}} - NO + _doScroller: + 1 _doScroller: @@ -695,13 +695,12 @@ aW5nLg {234, 323} - 150034 - QSAAAEEgAABBsAAAQbAAAA + QSAAAEEgAABBwAAAQcAAAA 0.25 4 1 @@ -709,7 +708,6 @@ aW5nLg {234, 323} - _NS:9 NSView @@ -723,7 +721,6 @@ aW5nLg 268 {{197, 157}, {193, 21}} - _NS:9 YES @@ -748,12 +745,11 @@ aW5nLg 265 {{189, 117}, {224, 20}} - _NS:9 YES - 67108864 + 75497472 131072 _NS:9 @@ -790,7 +786,6 @@ aW5nLg 268 {{343, 31}, {70, 18}} - _NS:9 YES @@ -821,12 +816,11 @@ aW5nLg 265 {{189, 33}, {150, 20}} - _NS:9 YES - 67108864 + 75497472 131072 _NS:9 @@ -866,7 +860,6 @@ aW5nLg 265 {{191, 24}, {146, 16}} - _NS:9 YES @@ -892,18 +885,13 @@ aW5nLg 265 {{189, 70}, {224, 24}} - _NS:9 YES - 67108864 + 75497472 0 - - LucidaGrande - 13 - 16 - + _NS:9 @@ -946,7 +934,6 @@ aW5nLg 265 {{191, 108}, {220, 16}} - _NS:9 YES @@ -972,7 +959,6 @@ aW5nLg 265 {{191, 196}, {220, 23}} - _NS:9 NJKeyInputField @@ -982,7 +968,6 @@ aW5nLg 265 {{188, 153}, {226, 26}} - YES @@ -1015,7 +1000,6 @@ aW5nLg 268 {{24, 20}, {163, 250}} - NO 6 @@ -1146,7 +1130,6 @@ aW5nLg 266 {{9, 286}, {412, 17}} - YES @@ -1154,9 +1137,9 @@ aW5nLg 138414656 - LucidaGrande-Bold + YES 13 - 16 + 2072 No input selected @@ -1164,13 +1147,13 @@ aW5nLg NO + 1 10 {{12, 276}, {406, 5}} - {0, 0} @@ -1185,8 +1168,10 @@ aW5nLg - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + 3 @@ -1197,25 +1182,117 @@ 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 @@ -1231,7 +1308,6 @@ aW5nLg 256 {198, 198} - YES NO @@ -1274,7 +1350,7 @@ aW5nLg 2 - 20 + 22 44072960 @@ -1289,20 +1365,21 @@ aW5nLg {{1, 1}, {198, 198}} - 4 + YES -2147483392 {{306, 1}, {15, 403}} - NO + _doScroller: + _doScroller: 0.99766359999999998 @@ -1312,9 +1389,10 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} - NO + _doScroller: + 1 _doScroller: @@ -1323,13 +1401,12 @@ aW5nLg {{0, 20}, {200, 200}} - 150034 - QSAAAEEgAABBsAAAQbAAAA + QSAAAEEgAABBwAAAQcAAAA 0.25 4 1 @@ -1339,7 +1416,6 @@ aW5nLg 268 {{66, -1}, {68, 23}} - _NS:22 YES @@ -1348,7 +1424,7 @@ aW5nLg 168034304 - LucidaGrande + YES 9 3614 @@ -1368,7 +1444,6 @@ aW5nLg 292 {{0, -1}, {34, 23}} - YES @@ -1395,7 +1470,6 @@ aW5nLg 292 {{166, -1}, {34, 23}} - YES 67108864 @@ -1417,7 +1491,6 @@ aW5nLg 292 {{133, -1}, {34, 23}} - YES @@ -1440,7 +1513,6 @@ aW5nLg 292 {{33, -1}, {34, 23}} - YES @@ -1464,103 +1536,9 @@ aW5nLg {200, 220} - - 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 @@ -1570,18 +1548,9 @@ aW5nLg NJMappingMenuController - - SUUpdater - - - NJDeviceViewController - - - NJMappingsViewController - - + terminate: @@ -1696,51 +1665,11 @@ aW5nLg - mappingsController - - - - 822 - - - - outputController - - - - 826 - - - - simulatingEventsChanged: - - - - 978 - - - - simulatingEventsButton - - - - 982 - - - - devicesViewController + delegate - - - 992 - - - - mappingsController - - + - 820 + 1029 @@ -1798,77 +1727,85 @@ aW5nLg 1024 - - - performClick: - - - - 1012 - - dataSource - + dvc + - 990 + 1025 - - delegate - - + + simulatingEventsChanged: + + - 991 + 1030 - mappingsController - - + simulatingEventsButton + + - 821 + 1031 - inputController - + ic + - 828 + 1036 - mouseDirSelect - - + oc + + - 756 + 1037 + + + + performClick: + + + + 1012 - mappingPopup - - + dataSource + + - 823 + 990 - - mdirChanged: + + delegate + + + + 991 + + + + mouseDirSelect - 757 + 756 - - sdirChanged: + + mappingPopup - + - 752 + 823 @@ -1878,14 +1815,6 @@ aW5nLg 891 - - - radioChanged: - - - - 731 - keyInput @@ -1894,14 +1823,6 @@ aW5nLg 781 - - - mbtnChanged: - - - - 747 - mouseSpeedChanged: @@ -1982,6 +1903,46 @@ aW5nLg 1022 + + + delegate + + + + 1035 + + + + scrollDirectionChanged: + + + + 1038 + + + + mouseButtonChanged: + + + + 1039 + + + + mouseDirectionChanged: + + + + 1040 + + + + outputTypeChanged: + + + + 1041 + delegate @@ -2110,22 +2071,6 @@ aW5nLg 981 - - - checkForUpdates: - - - - 969 - - - - delegate - - - - 984 - hidStoppedNotice @@ -2150,6 +2095,14 @@ aW5nLg 989 + + + delegate + + + + 1028 + view @@ -2344,7 +2297,6 @@ aW5nLg - @@ -2525,11 +2477,6 @@ aW5nLg - - 514 - - - 479 @@ -3051,16 +2998,6 @@ aW5nLg Status Bar Menu Controller - - 967 - - - - - 968 - - - 970 @@ -3159,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 @@ -3349,8 +3285,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 @@ -3361,7 +3295,7 @@ aW5nLg - 1024 + 1041 @@ -3372,6 +3306,7 @@ aW5nLg id id id + NSButton @@ -3386,11 +3321,18 @@ aW5nLg restoreToForeground: id + + simulatingEventsChanged: + NSButton + NSMenu - NJMappingsController + NJDeviceViewController + NJInputController NJMappingsViewController + NJOutputViewController + NSButton NSMenu NSWindow @@ -3399,14 +3341,26 @@ aW5nLg dockMenu NSMenu - - mappingsController - NJMappingsController + + dvc + NJDeviceViewController + + + ic + NJInputController mvc NJMappingsViewController + + oc + NJOutputViewController + + + simulatingEventsButton + NSButton + statusItemMenu NSMenu @@ -3418,12 +3372,11 @@ aW5nLg IBProjectSource - ./Classes/EnjoyableApplicationDelegate.h + ../Classes/EnjoyableApplicationDelegate.h - NJDeviceController - NSObject + EnjoyableApplicationDelegate simulatingEventsChanged: NSButton @@ -3435,33 +3388,9 @@ aW5nLg NSButton - - NJDeviceViewController - NJMappingsController - NJOutputController - NSButton - - - - devicesViewController - NJDeviceViewController - - - mappingsController - NJMappingsController - - - outputController - NJOutputController - - - simulatingEventsButton - NSButton - - IBProjectSource - ./Classes/NJDeviceController.h + ../Classes/EnjoyableApplicationDelegate.m @@ -3493,7 +3422,26 @@ aW5nLg IBProjectSource - ./Classes/NJDeviceViewController.h + ../Classes/NJDeviceViewController.h + + + + NJInputController + NSObject + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + ../Classes/NJInputController.h @@ -3512,7 +3460,7 @@ aW5nLg IBProjectSource - ./Classes/NJKeyInputField.h + ../Classes/NJKeyInputField.h @@ -3539,15 +3487,7 @@ aW5nLg IBProjectSource - ./Classes/NJMappingMenuController.h - - - - NJMappingsController - NSObject - - IBProjectSource - ./Classes/NJMappingsController.h + ../Classes/NJMappingMenuController.h @@ -3623,36 +3563,76 @@ aW5nLg IBProjectSource - ./Classes/NJMappingsViewController.h + ../Classes/NJMappingsViewController.h - NJOutputController + NJMappingsViewController + + id + id + id + id + id + + + + addClicked: + id + + + mappingTriggerClicked: + id + + + moveDownClicked: + id + + + moveUpClicked: + id + + + removeClicked: + id + + + + IBProjectSource + ../Classes/NJMappingsViewController.m + + + + 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 @@ -3663,16 +3643,11 @@ aW5nLg scrollTypeChanged: id - - sdirChanged: - id - - NJDeviceController + id NJKeyInputField NSPopUpButton - NJMappingsController NSSegmentedControl NSSegmentedControl NSSlider @@ -3684,9 +3659,9 @@ aW5nLg NSButton - - inputController - NJDeviceController + + delegate + id keyInput @@ -3696,10 +3671,6 @@ aW5nLg mappingPopup NSPopUpButton - - mappingsController - NJMappingsController - mouseBtnSelect NSSegmentedControl @@ -3739,53 +3710,318 @@ aW5nLg IBProjectSource - ./Classes/NJOutputController.h + ../Classes/NJOutputViewController.h + + + + NJOutputViewController + + NSView + NSButton + + + + outputTypeChanged: + NSView + + + scrollTypeChanged: + NSButton + + + + IBProjectSource + ../Classes/NJOutputViewController.m + + + + + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h - SUUpdater + 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}