X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=2e2b440547bda0ba63ccaa264acddef2a7f92ce3;hp=1a87bd74e4dee4e83603236f19111e32363b238f;hb=ca998dd950f0b1900b21dc05cf57987d09b4e70e;hpb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 1a87bd7..2e2b440 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -16,13 +16,13 @@
NSButtonCell
NSCustomObject
NSCustomView
- NSDrawer
NSMatrix
NSMenu
NSMenuItem
NSOutlineView
NSPopUpButton
NSPopUpButtonCell
+ NSPopover
NSScrollView
NSScroller
NSSegmentedCell
@@ -36,6 +36,7 @@
NSToolbarFlexibleSpaceItem
NSToolbarItem
NSView
+ NSViewController
NSWindowTemplate
@@ -319,50 +320,116 @@
YES
NO
YES
- 1
- 2
+ 2
+ 1
-
-
-
-
+
+
+
-
+
-
+
{640, 300}
-
+
256
@@ -433,7 +500,8 @@
256
{200, 298}
-
+
+
YES
NO
YES
@@ -474,11 +542,7 @@
67108928
2624
Text Cell
-
- LucidaGrande
- 13
- 1044
-
+
6
@@ -532,6 +596,7 @@
{{1, 1}, {200, 298}}
+
@@ -542,6 +607,7 @@
-2147483392
{{1, 1}, {8, 298}}
+
NO
@@ -553,6 +619,7 @@
-2147483392
{{-100, -100}, {473, 15}}
+
NO
1
@@ -563,7 +630,8 @@
{202, 300}
-
+
+
150034
@@ -576,6 +644,7 @@
{202, 300}
+
NSView
@@ -588,6 +657,7 @@
265
{{227, 123}, {180, 24}}
+
_NS:9
YES
@@ -624,6 +694,7 @@
265
{{227, 55}, {180, 24}}
+
_NS:9
YES
@@ -655,6 +726,7 @@
265
{{227, 89}, {180, 24}}
+
_NS:9
YES
@@ -687,6 +759,7 @@
265
{{229, 190}, {176, 24}}
+
_NS:9
NJKeyInputField
@@ -696,6 +769,7 @@
265
{{226, 156}, {182, 26}}
+
YES
{{0, 0}, {1440, 878}}
- {640, 369}
+ {640, 355}
{10000000000000, 10000000000000}
Enjoyable
YES
-
+
256
@@ -955,8 +1036,9 @@
256
- {320, 418}
+ {196, 256}
+
YES
NO
@@ -968,9 +1050,9 @@
- 317
- 40
- 1000
+ 190
+ 190
+ 190
- 3
- YES
YES
@@ -1002,7 +1082,7 @@
20
- 46170112
+ 48267264
1
@@ -1011,11 +1091,12 @@
NO
0
1
- 1
+ -1
- {{1, 1}, {320, 418}}
+ {{2, 2}, {196, 256}}
+
@@ -1026,7 +1107,8 @@
-2147483392
{{306, 1}, {15, 403}}
-
+
+
NO
_doScroller:
@@ -1035,20 +1117,22 @@
-2147483392
- {{1, 404}, {305, 15}}
+ {{-100, -100}, {366, 16}}
-
+
+
NO
1
_doScroller:
- 0.99688480000000002
+ 0.98123324396782841
- {{0, 34}, {322, 420}}
+ {{0, 54}, {200, 260}}
-
- 133682
+
+
+ 150035
@@ -1059,9 +1143,10 @@
- 260
- {{10, 4}, {39, 28}}
+ 292
+ {{20, 19}, {39, 28}}
+
YES
@@ -1085,9 +1170,10 @@
- 260
- {{57, 4}, {39, 28}}
+ 292
+ {{67, 19}, {39, 28}}
+
YES
603979776
@@ -1109,21 +1195,12 @@
NO
- {322, 454}
+ {200, 314}
+
+
NSView
-
-
- {200, 100}
- {100, 0}
- {400, 10000}
- 2
- 0.0
- 15
-
-
-
EnjoyableApplicationDelegate
@@ -1136,6 +1213,15 @@
NJOutputController
+
+
+
+ 0
+ 1
+ 0.0
+ 0.0
+ YES
+
@@ -1219,38 +1305,6 @@
370
-
-
- parentWindow
-
-
-
- 454
-
-
-
- contentView
-
-
-
- 455
-
-
-
- toggle:
-
-
-
- 498
-
-
-
- toggle:
-
-
-
- 811
-
delegate
@@ -1291,13 +1345,21 @@
826
+
+
+ translatingEventsChanged:
+
+
+
+ 858
+
- drawer
-
-
+ translatingEventsSetting
+
+
- 486
+ 859
@@ -1315,14 +1377,6 @@
607
-
-
- activeButton
-
-
-
- 609
-
toggleActivity:
@@ -1331,14 +1385,6 @@
610
-
-
- toggleActivity:
-
-
-
- 611
-
dockMenuBase
@@ -1427,6 +1473,30 @@
827
+
+
+ mappingPressed:
+
+
+
+ 855
+
+
+
+ popover
+
+
+
+ 856
+
+
+
+ popoverActivate
+
+
+
+ 857
+
dataSource
@@ -1563,6 +1633,30 @@
818
+
+
+ view
+
+
+
+ 854
+
+
+
+ contentViewController
+
+
+
+ 852
+
+
+
+ delegate
+
+
+
+ 853
+
@@ -1757,18 +1851,13 @@
451
+
-
Drawer Content View
-
- 452
-
-
-
453
@@ -1828,17 +1917,12 @@
487
-
-
+
+
-
- 495
-
-
-
507
@@ -1882,11 +1966,6 @@
-
- 608
-
-
-
652
@@ -2109,11 +2188,6 @@
-
- 790
-
-
-
810
@@ -2134,6 +2208,64 @@
+
+ 837
+
+
+
+
+
+
+
+ 835
+
+
+
+
+
+
+
+ 836
+
+
+
+
+ 842
+
+
+
+
+
+
+
+ 840
+
+
+
+
+
+
+
+ 841
+
+
+
+
+ 849
+
+
+
+
+ 850
+
+
+ Popover View Controller
+
+
+ 851
+
+
+
@@ -2161,7 +2293,6 @@
{{114, 276}, {770, 487}}
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2172,7 +2303,6 @@
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
@@ -2183,7 +2313,6 @@
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
@@ -2220,23 +2349,118 @@
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
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
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- 828
+ 859
+
+ EnjoyableApplicationDelegate
+ NSObject
+
+ NSMenuItem
+ NSMenu
+ NSDrawer
+ NJDeviceController
+ NJMappingsController
+ NJOutputController
+
+
+
+ activeMenuItem
+ NSMenuItem
+
+
+ dockMenuBase
+ NSMenu
+
+
+ drawer
+ NSDrawer
+
+
+ inputController
+ NJDeviceController
+
+
+ mappingsController
+ NJMappingsController
+
+
+ outputController
+ NJOutputController
+
+
+
+ IBProjectSource
+ ./Classes/EnjoyableApplicationDelegate.h
+
+
+
+ NJDeviceController
+ NSObject
+
+ translatingEventsChanged:
+ id
+
+
+ translatingEventsChanged:
+
+ translatingEventsChanged:
+ id
+
+
+
+ NJMappingsController
+ NSOutlineView
+ NJOutputController
+ NSSegmentedControl
+
+
+
+ mappingsController
+ NJMappingsController
+
+
+ outlineView
+ NSOutlineView
+
+
+ outputController
+ NJOutputController
+
+
+ translatingEventsSetting
+ NSSegmentedControl
+
+
+
+ IBProjectSource
+ ./Classes/NJDeviceController.h
+
+
NJKeyInputField
NSTextField
@@ -2256,6 +2480,153 @@
./Classes/NJKeyInputField.h
+
+ NJMappingsController
+ NSObject
+
+ id
+ id
+ id
+ id
+ id
+
+
+
+ addPressed:
+ id
+
+
+ exportPressed:
+ id
+
+
+ importPressed:
+ id
+
+
+ mappingPressed:
+ id
+
+
+ removePressed:
+ id
+
+
+
+ NJOutputController
+ NSPopover
+ NSButton
+ NSButton
+ NSTableView
+
+
+
+ outputController
+ NJOutputController
+
+
+ popover
+ NSPopover
+
+
+ popoverActivate
+ NSButton
+
+
+ removeButton
+ NSButton
+
+
+ tableView
+ NSTableView
+
+
+
+ IBProjectSource
+ ./Classes/NJMappingsController.h
+
+
+
+ NJOutputController
+ NSObject
+
+ id
+ id
+ id
+ id
+
+
+
+ mbtnChanged:
+ id
+
+
+ mdirChanged:
+ id
+
+
+ radioChanged:
+ id
+
+
+ sdirChanged:
+ id
+
+
+
+ NJDeviceController
+ NJKeyInputField
+ NSPopUpButton
+ NJMappingsController
+ NSSegmentedControl
+ NSSegmentedControl
+ NSMatrix
+ NSSegmentedControl
+ NSTextField
+
+
+
+ inputController
+ NJDeviceController
+
+
+ keyInput
+ NJKeyInputField
+
+
+ mappingPopup
+ NSPopUpButton
+
+
+ mappingsController
+ NJMappingsController
+
+
+ mouseBtnSelect
+ NSSegmentedControl
+
+
+ mouseDirSelect
+ NSSegmentedControl
+
+
+ radioButtons
+ NSMatrix
+
+
+ scrollDirSelect
+ NSSegmentedControl
+
+
+ title
+ NSTextField
+
+
+
+ IBProjectSource
+ ./Classes/NJOutputController.h
+
+
0
@@ -2263,11 +2634,12 @@
YES
3
+ {15, 15}
{8, 8}
- {9, 9}
{11, 10}
{11, 11}
{10, 3}
+ {13, 10}
{16, 15}
{8, 8}