X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=6e87fb02440bdad0d36971862161b6b324042b33;hp=ac82d630cf0899b475f10c788be83b41b149b027;hb=4a490c57151dd4ba9cb27cc34a0e33fc68fc4d24;hpb=3090f311c3406d9c157630bc9744b9b14aa42311
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index ac82d63..6e87fb0 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -35,8 +35,6 @@
NSToolbar
NSToolbarFlexibleSpaceItem
NSToolbarItem
- NSToolbarSeparatorItem
- NSToolbarSpaceItem
NSView
NSWindowTemplate
@@ -62,7 +60,7 @@
submenuAction:
- 17
- -767557632
+ 20
+ 306184192
4
@@ -547,6 +527,8 @@
YES
0
1
+ -1
+ NO
{{1, 1}, {200, 298}}
@@ -586,12 +568,12 @@
{202, 300}
-
- 133650
+
+ 150034
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -609,7 +591,7 @@
NO
+
+
@@ -981,7 +816,9 @@ ZSwgSW5jLiwgMjAwOQA
1211912448
0
+
+
400
75
@@ -993,26 +830,30 @@ ZSwgSW5jLiwgMjAwOQA
1211912448
0
+
+
400
75
603979776
0
- Toggle mouse scope
+ Switch mouse mode
1211912448
0
+
+
400
75
{201, 32}
{4, 2}
- 1151868928
+ 1353195520
NSActionCell
603979776
@@ -1021,50 +862,14 @@ ZSwgSW5jLiwgMjAwOQA
1211912448
0
-
- 549453824
- {18, 18}
-
-
-
-
-
- TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
-IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
-29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
-dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
-AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
-AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
-0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
-7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
-5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
-3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
-AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
-AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
-6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
-/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
-///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
-YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
-AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
-AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
-AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
-AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
-AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
-AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
-
-
-
-
-
-
+
+
400
75
-
+ -1
+ -1
6
System
@@ -1074,39 +879,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
-
266
@@ -1116,8 +888,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
YES
- 68157504
- 138413056
+ 67108928
+ 138414656
LucidaGrande-Bold
@@ -1133,8 +905,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- 12
- {{0, 258}, {465, 5}}
+ 10
+ {{12, 258}, {405, 5}}
@@ -1160,15 +932,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
0
NO
-
-
- 265
- {{229, 190}, {176, 24}}
-
-
- _NS:9
- KeyInputTextView
-
{{211, 0}, {429, 300}}
@@ -1192,10 +955,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
{{0, 0}, {1440, 878}}
{640, 369}
{10000000000000, 10000000000000}
+ Enjoyable
YES
-
+
256
@@ -1211,6 +975,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
256
{320, 418}
+
YES
NO
@@ -1255,7 +1020,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
2
- 17
+ 20
46170112
@@ -1265,10 +1030,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
NO
0
1
+ 1
{{1, 1}, {320, 418}}
+
@@ -1279,6 +1046,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
-2147483392
{{306, 1}, {15, 403}}
+
NO
@@ -1290,6 +1058,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
-2147483392
{{1, 404}, {305, 15}}
+
NO
1
@@ -1300,12 +1069,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
{{0, 34}, {322, 420}}
+
133682
- QSAAAEEgAABBmAAAQZgAAA
+ QSAAAEEgAABBsAAAQbAAAA
0.25
4
1
@@ -1315,6 +1085,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
260
{{10, 4}, {39, 28}}
+
YES
@@ -1341,6 +1112,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
260
{{57, 4}, {39, 28}}
+
YES
603979776
@@ -1363,14 +1135,16 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
{322, 454}
+
+
NSView
{200, 100}
- {150, 0}
- {300, 10000}
+ {100, 0}
+ {400, 10000}
2
0.0
15
@@ -1389,28 +1163,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
TargetController
-
-
- 268
- {82, 32}
- _NS:9
- YES
-
- 67108864
- 134217728
- Button
-
- _NS:9
-
- -2038284288
- 129
-
-
- 200
- 25
-
- NO
-
@@ -1518,6 +1270,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
498
+
+
+ toggle:
+
+
+
+ 811
+
delegate
@@ -1678,6 +1438,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
697
+
+
+ exportPressed:
+
+
+
+ 815
+
+
+
+ importPressed:
+
+
+
+ 816
+
dataSource
@@ -1808,19 +1584,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- targetController
+ keyDelegate
- 779
-
-
-
- window
-
-
-
- 780
+ 818
@@ -1890,6 +1658,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
+
+
+
+
@@ -2083,29 +1855,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
487
-
-
-
+
-
- 490
-
-
-
-
- 492
-
-
-
-
- 493
-
-
-
495
@@ -2226,8 +1981,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
-
+
@@ -2377,22 +2132,34 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- 765
-
-
-
-
-
+ 778
+
+
- 766
-
-
+ 790
+
+
- 778
-
-
+ 810
+
+
+
+
+ 812
+
+
+
+
+ 813
+
+
+
+
+ 814
+
+
@@ -2432,9 +2199,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
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
@@ -2482,10 +2246,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
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
@@ -2493,7 +2260,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- 781
+ 818
@@ -2565,6 +2332,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
NSObject
id
+ id
+ id
id
@@ -2572,6 +2341,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
addPressed:
id
+
+ exportPressed:
+ id
+
+
+ importPressed:
+ id
+
removePressed:
id
@@ -2629,25 +2406,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
- KeyInputTextView
+ NJKeyInputField
NSTextField
-
- TargetController
- NSWindow
-
-
-
- targetController
- TargetController
-
-
- window
- NSWindow
+
+ keyDelegate
+ id
+
+
+ keyDelegate
+
+ keyDelegate
+ id
-
+
IBProjectSource
- ./Classes/KeyInputTextView.h
+ ./Classes/NJKeyInputField.h
@@ -2686,7 +2460,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
NSPopUpButton
ConfigsController
JoystickController
- KeyInputTextView
+ NJKeyInputField
NSSegmentedControl
NSSegmentedControl
NSMatrix
@@ -2708,7 +2482,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
keyInput
- KeyInputTextView
+ NJKeyInputField
mouseBtnSelect
@@ -2745,9 +2519,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA
{8, 8}
{9, 9}
+ {11, 10}
{11, 11}
{10, 3}
- {32, 32}
+ {16, 15}
{8, 8}