X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Resources%2FEnglish.lproj%2FMainMenu.xib;h=1c95840fe2abff9dc4206c798750c25f2b13433e;hp=0c068fcde2a303464564ac534602af10f0e527b5;hb=0a8d6333a3ac4684b70ab7f3581a93bf96638d6f;hpb=93d9951d6bd16b37e88b8fb6c38bc4afd6c9401e diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index 0c068fc..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 @@ -361,10 +358,9 @@ Enabled - + 268 {{7, 14}, {36, 25}} - _NS:9 YES @@ -372,7 +368,7 @@ 134217728 - LucidaGrande + YES 13 1044 @@ -410,10 +406,9 @@ Mapping Selector - + 268 {{0, 14}, {140, 25}} - _NS:9 YES @@ -490,7 +485,7 @@ {664, 323} - + 256 @@ -502,7 +497,6 @@ -2147483374 {{20, 20}, {194, 283}} - _NS:22 YES @@ -511,10 +505,10 @@ 134217728 SW5wdXQgaXMgY3VycmVudGx5IGRpc2FibGVkLgoKU3dpdGNoIGJhY2sgdG8gcmUtZW5hYmxlIGlucHV0 Lg - - LucidaGrande-Bold + + YES 14 - 16 + 2072 _NS:22 @@ -532,7 +526,6 @@ Lg 274 {{20, 20}, {194, 283}} - _NS:22 YES @@ -541,7 +534,11 @@ Lg 134217728 Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw aW5nLg - + + YES + 14 + 2072 + _NS:22 -2041823232 @@ -567,7 +564,6 @@ aW5nLg {232, 321} - YES NO @@ -587,7 +583,7 @@ aW5nLg 2048 - LucidaGrande + YES 11 3100 @@ -647,7 +643,7 @@ aW5nLg MC41AA - 20 + 22 306184192 @@ -663,20 +659,21 @@ aW5nLg {{1, 1}, {232, 321}} - 4 + YES -2147483392 {{1, 1}, {8, 298}} - NO + _doScroller: + _doScroller: 0.4210526 @@ -686,9 +683,10 @@ aW5nLg -2147483392 {{-100, -100}, {473, 15}} - NO + _doScroller: + 1 _doScroller: @@ -697,13 +695,12 @@ aW5nLg {234, 323} - 150034 - QSAAAEEgAABBsAAAQbAAAA + QSAAAEEgAABBwAAAQcAAAA 0.25 4 1 @@ -711,7 +708,6 @@ aW5nLg {234, 323} - _NS:9 NSView @@ -725,7 +721,6 @@ aW5nLg 268 {{197, 157}, {193, 21}} - _NS:9 YES @@ -750,12 +745,11 @@ aW5nLg 265 {{189, 117}, {224, 20}} - _NS:9 YES - 67108864 + 75497472 131072 _NS:9 @@ -792,7 +786,6 @@ aW5nLg 268 {{343, 31}, {70, 18}} - _NS:9 YES @@ -823,12 +816,11 @@ aW5nLg 265 {{189, 33}, {150, 20}} - _NS:9 YES - 67108864 + 75497472 131072 _NS:9 @@ -868,7 +860,6 @@ aW5nLg 265 {{191, 24}, {146, 16}} - _NS:9 YES @@ -894,18 +885,13 @@ aW5nLg 265 {{189, 70}, {224, 24}} - _NS:9 YES - 67108864 + 75497472 0 - - LucidaGrande - 13 - 16 - + _NS:9 @@ -948,7 +934,6 @@ aW5nLg 265 {{191, 108}, {220, 16}} - _NS:9 YES @@ -974,7 +959,6 @@ aW5nLg 265 {{191, 196}, {220, 23}} - _NS:9 NJKeyInputField @@ -984,7 +968,6 @@ aW5nLg 265 {{188, 153}, {226, 26}} - YES @@ -1017,7 +1000,6 @@ aW5nLg 268 {{24, 20}, {163, 250}} - NO 6 @@ -1148,7 +1130,6 @@ aW5nLg 266 {{9, 286}, {412, 17}} - YES @@ -1156,9 +1137,9 @@ aW5nLg 138414656 - LucidaGrande-Bold + YES 13 - 16 + 2072 No input selected @@ -1166,13 +1147,13 @@ aW5nLg NO + 1 10 {{12, 276}, {406, 5}} - {0, 0} @@ -1187,8 +1168,10 @@ aW5nLg - 3 - MCAwLjgwMDAwMDAxAA + 6 + System + labelColor + 3 @@ -1199,18 +1182,15 @@ aW5nLg {{233, 0}, {431, 323}} - _NS:9 NSView {664, 323} - - - {{0, 0}, {1440, 878}} + {{0, 0}, {1440, 877}} {664, 378} {10000000000000, 10000000000000} Enjoyable @@ -1295,7 +1275,7 @@ aW5nLg NJInputController - NJOutputController + NJOutputViewController NJDeviceViewController @@ -1312,7 +1292,7 @@ aW5nLg YES - + 256 @@ -1328,7 +1308,6 @@ aW5nLg 256 {198, 198} - YES NO @@ -1371,7 +1350,7 @@ aW5nLg 2 - 20 + 22 44072960 @@ -1386,20 +1365,21 @@ aW5nLg {{1, 1}, {198, 198}} - 4 + YES -2147483392 {{306, 1}, {15, 403}} - NO + _doScroller: + _doScroller: 0.99766359999999998 @@ -1409,9 +1389,10 @@ aW5nLg -2147483392 {{-100, -100}, {366, 16}} - NO + _doScroller: + 1 _doScroller: @@ -1420,13 +1401,12 @@ aW5nLg {{0, 20}, {200, 200}} - 150034 - QSAAAEEgAABBsAAAQbAAAA + QSAAAEEgAABBwAAAQcAAAA 0.25 4 1 @@ -1436,7 +1416,6 @@ aW5nLg 268 {{66, -1}, {68, 23}} - _NS:22 YES @@ -1445,7 +1424,7 @@ aW5nLg 168034304 - LucidaGrande + YES 9 3614 @@ -1465,7 +1444,6 @@ aW5nLg 292 {{0, -1}, {34, 23}} - YES @@ -1492,7 +1470,6 @@ aW5nLg 292 {{166, -1}, {34, 23}} - YES 67108864 @@ -1514,7 +1491,6 @@ aW5nLg 292 {{133, -1}, {34, 23}} - YES @@ -1537,7 +1513,6 @@ aW5nLg 292 {{33, -1}, {34, 23}} - YES @@ -1561,8 +1536,6 @@ aW5nLg {200, 220} - - NSView @@ -1575,12 +1548,9 @@ aW5nLg NJMappingMenuController - - SUUpdater - - + terminate: @@ -1765,14 +1735,6 @@ aW5nLg 1025 - - - outputController - - - - 1027 - simulatingEventsChanged: @@ -1791,11 +1753,19 @@ aW5nLg - inputController + ic - 1032 + 1036 + + + + oc + + + + 1037 @@ -1837,22 +1807,6 @@ aW5nLg 823 - - - mdirChanged: - - - - 757 - - - - sdirChanged: - - - - 752 - scrollSpeedSlider @@ -1861,14 +1815,6 @@ aW5nLg 891 - - - radioChanged: - - - - 731 - keyInput @@ -1877,14 +1823,6 @@ aW5nLg 781 - - - mbtnChanged: - - - - 747 - mouseSpeedChanged: @@ -1967,11 +1905,43 @@ aW5nLg - inputController + delegate - + - 1034 + 1035 + + + + scrollDirectionChanged: + + + + 1038 + + + + mouseButtonChanged: + + + + 1039 + + + + mouseDirectionChanged: + + + + 1040 + + + + outputTypeChanged: + + + + 1041 @@ -2101,14 +2071,6 @@ aW5nLg 981 - - - checkForUpdates: - - - - 969 - hidStoppedNotice @@ -2335,7 +2297,6 @@ aW5nLg - @@ -3037,16 +2998,6 @@ aW5nLg Status Bar Menu Controller - - 967 - - - - - 968 - - - 970 @@ -3334,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 @@ -3346,7 +3295,7 @@ aW5nLg - 1034 + 1041 @@ -3380,9 +3329,9 @@ aW5nLg NSMenu NJDeviceViewController - NJInputController + NJInputController NJMappingsViewController - NJOutputController + NJOutputViewController NSButton NSMenu NSWindow @@ -3396,17 +3345,17 @@ aW5nLg dvc NJDeviceViewController - - inputController + + ic NJInputController mvc NJMappingsViewController - - outputController - NJOutputController + + oc + NJOutputViewController simulatingEventsButton @@ -3423,7 +3372,25 @@ aW5nLg IBProjectSource - ./Classes/EnjoyableApplicationDelegate.h + ../Classes/EnjoyableApplicationDelegate.h + + + + EnjoyableApplicationDelegate + + simulatingEventsChanged: + NSButton + + + simulatingEventsChanged: + + simulatingEventsChanged: + NSButton + + + + IBProjectSource + ../Classes/EnjoyableApplicationDelegate.m @@ -3455,7 +3422,7 @@ aW5nLg IBProjectSource - ./Classes/NJDeviceViewController.h + ../Classes/NJDeviceViewController.h @@ -3474,7 +3441,7 @@ aW5nLg IBProjectSource - ./Classes/NJInputController.h + ../Classes/NJInputController.h @@ -3493,7 +3460,7 @@ aW5nLg IBProjectSource - ./Classes/NJKeyInputField.h + ../Classes/NJKeyInputField.h @@ -3520,7 +3487,7 @@ aW5nLg IBProjectSource - ./Classes/NJMappingMenuController.h + ../Classes/NJMappingMenuController.h @@ -3596,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 @@ -3636,13 +3643,9 @@ aW5nLg scrollTypeChanged: id - - sdirChanged: - id - - NJInputController + id NJKeyInputField NSPopUpButton NSSegmentedControl @@ -3656,9 +3659,9 @@ aW5nLg NSButton - - inputController - NJInputController + + delegate + id keyInput @@ -3707,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 + + + + NSBox + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSBox.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h - SUUpdater + 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}