Start help book. Tweak UI to deal with issues discovered trying to explain it.

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index cc6ba0138b08dd1791e501e08e482c2f776f8e82..402d345839306c869d64ca1516210c352d8c2d94 100644 (file)
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -62,7 +62,7 @@
                                        <object class="NSMenuItem" id="694149608">
                                                <reference key="NSMenu" ref="649796088"/>
                                                <string key="NSTitle">Enjoyable</string>
-                                               <string key="NSKeyEquiv"/>
+                                               <string type="base64-UTF8" key="NSKeyEquiv">CA</string>
                                                <int key="NSKeyEquivModMask">1048576</int>
                                                <int key="NSMnemonicLoc">2147483647</int>
                                                <object class="NSCustomResource" key="NSOnImage" id="35465992">
@@ -299,6 +299,30 @@
                                                        <string key="NSName">_NSWindowsMenu</string>
                                                </object>
                                        </object>
+                                       <object class="NSMenuItem" id="693056251">
+                                               <reference key="NSMenu" ref="649796088"/>
+                                               <string key="NSTitle">Help</string>
+                                               <string key="NSKeyEquiv"/>
+                                               <int key="NSMnemonicLoc">2147483647</int>
+                                               <reference key="NSOnImage" ref="35465992"/>
+                                               <reference key="NSMixedImage" ref="502551668"/>
+                                               <string key="NSAction">submenuAction:</string>
+                                               <object class="NSMenu" key="NSSubmenu" id="997802319">
+                                                       <string key="NSTitle">Help</string>
+                                                       <array class="NSMutableArray" key="NSMenuItems">
+                                                               <object class="NSMenuItem" id="842970531">
+                                                                       <reference key="NSMenu" ref="997802319"/>
+                                                                       <string key="NSTitle">Enjoyable Help</string>
+                                                                       <string key="NSKeyEquiv">?</string>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                       </array>
+                                                       <string key="NSName">_NSHelpMenu</string>
+                                               </object>
+                                       </object>
                                </array>
                                <string key="NSName">_NSMainMenu</string>
                        </object>
@@ -321,106 +345,100 @@
                                        <int key="NSToolbarDisplayMode">2</int>
                                        <int key="NSToolbarSizeMode">1</int>
                                        <dictionary class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
-                                               <object class="NSToolbarItem" key="4AC66688-76E8-47ED-AC0A-7462220A4019" id="496378711">
+                                               <object class="NSToolbarItem" key="2CB21E35-9CF1-4C67-9670-31139C914D10" id="985167622">
                                                        <object class="NSMutableString" key="NSToolbarItemIdentifier">
-                                                               <characters key="NS.bytes">4AC66688-76E8-47ED-AC0A-7462220A4019</characters>
+                                                               <characters key="NS.bytes">2CB21E35-9CF1-4C67-9670-31139C914D10</characters>
                                                        </object>
-                                                       <string key="NSToolbarItemLabel">Mapping Selector</string>
-                                                       <string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
+                                                       <string key="NSToolbarItemLabel">Enabled</string>
+                                                       <string key="NSToolbarItemPaletteLabel">Enabled</string>
                                                        <nil key="NSToolbarItemToolTip"/>
-                                                       <object class="NSButton" key="NSToolbarItemView" id="227597319">
-                                                               <nil key="NSNextResponder"/>
+                                                       <object class="NSButton" key="NSToolbarItemView" id="385218002">
+                                                               <reference key="NSNextResponder"/>
                                                                <int key="NSvFlags">268</int>
-                                                               <string key="NSFrame">{{0, 14}, {140, 25}}</string>
+                                                               <string key="NSFrame">{{7, 14}, {36, 25}}</string>
+                                                               <reference key="NSSuperview"/>
+                                                               <reference key="NSWindow"/>
+                                                               <reference key="NSNextKeyView"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="NSEnabled">YES</bool>
-                                                               <object class="NSButtonCell" key="NSCell" id="850080795">
+                                                               <object class="NSButtonCell" key="NSCell" id="422366518">
                                                                        <int key="NSCellFlags">67108864</int>
                                                                        <int key="NSCellFlags2">134217728</int>
-                                                                       <string key="NSContents">(default)</string>
+                                                                       <string key="NSContents"/>
                                                                        <object class="NSFont" key="NSSupport" id="45863614">
                                                                                <string key="NSName">LucidaGrande</string>
                                                                                <double key="NSSize">13</double>
                                                                                <int key="NSfFlags">1044</int>
                                                                        </object>
                                                                        <string key="NSCellIdentifier">_NS:9</string>
-                                                                       <reference key="NSControlView" ref="227597319"/>
-                                                                       <int key="NSButtonFlags">918306816</int>
+                                                                       <reference key="NSControlView" ref="385218002"/>
+                                                                       <int key="NSButtonFlags">-1228128256</int>
                                                                        <int key="NSButtonFlags2">163</int>
-                                                                       <object class="NSCustomResource" key="NSNormalImage" id="13197350">
+                                                                       <object class="NSCustomResource" key="NSNormalImage" id="80448349">
                                                                                <string key="NSClassName">NSImage</string>
-                                                                               <string key="NSResourceName">NSListViewTemplate</string>
+                                                                               <string key="NSResourceName">NSRightFacingTriangleTemplate</string>
                                                                        </object>
                                                                        <string key="NSAlternateContents"/>
                                                                        <string key="NSKeyEquivalent"/>
-                                                                       <int key="NSPeriodicDelay">400</int>
-                                                                       <int key="NSPeriodicInterval">75</int>
+                                                                       <int key="NSPeriodicDelay">200</int>
+                                                                       <int key="NSPeriodicInterval">25</int>
                                                                </object>
                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                        </object>
-                                                       <reference key="NSToolbarItemImage" ref="13197350"/>
+                                                       <reference key="NSToolbarItemImage" ref="80448349"/>
                                                        <nil key="NSToolbarItemTarget"/>
                                                        <nil key="NSToolbarItemAction"/>
-                                                       <string key="NSToolbarItemMinSize">{13, 25}</string>
-                                                       <string key="NSToolbarItemMaxSize">{141, 25}</string>
+                                                       <string key="NSToolbarItemMinSize">{36, 25}</string>
+                                                       <string key="NSToolbarItemMaxSize">{36, 25}</string>
                                                        <bool key="NSToolbarItemEnabled">YES</bool>
-                                                       <bool key="NSToolbarItemAutovalidates">NO</bool>
+                                                       <bool key="NSToolbarItemAutovalidates">YES</bool>
                                                        <int key="NSToolbarItemTag">0</int>
                                                        <bool key="NSToolbarIsUserRemovable">YES</bool>
                                                        <int key="NSToolbarItemVisibilityPriority">0</int>
                                                </object>
-                                               <object class="NSToolbarItem" key="94389EFE-310F-4DB5-95F6-D4AEE8839979" id="981531896">
+                                               <object class="NSToolbarItem" key="4AC66688-76E8-47ED-AC0A-7462220A4019" id="496378711">
                                                        <object class="NSMutableString" key="NSToolbarItemIdentifier">
-                                                               <characters key="NS.bytes">94389EFE-310F-4DB5-95F6-D4AEE8839979</characters>
+                                                               <characters key="NS.bytes">4AC66688-76E8-47ED-AC0A-7462220A4019</characters>
                                                        </object>
-                                                       <string key="NSToolbarItemLabel">Translation Switch</string>
-                                                       <string key="NSToolbarItemPaletteLabel">Translation Switch</string>
+                                                       <string key="NSToolbarItemLabel">Mapping Selector</string>
+                                                       <string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
                                                        <nil key="NSToolbarItemToolTip"/>
-                                                       <object class="NSSegmentedControl" key="NSToolbarItemView" id="679083346">
-                                                               <nil key="NSNextResponder"/>
+                                                       <object class="NSButton" key="NSToolbarItemView" id="227597319">
+                                                               <reference key="NSNextResponder"/>
                                                                <int key="NSvFlags">268</int>
-                                                               <string key="NSFrame">{{19, 14}, {67, 25}}</string>
+                                                               <string key="NSFrame">{{0, 14}, {140, 25}}</string>
+                                                               <reference key="NSSuperview"/>
+                                                               <reference key="NSWindow"/>
+                                                               <reference key="NSNextKeyView"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="NSEnabled">YES</bool>
-                                                               <object class="NSSegmentedCell" key="NSCell" id="594076765">
+                                                               <object class="NSButtonCell" key="NSCell" id="850080795">
                                                                        <int key="NSCellFlags">67108864</int>
-                                                                       <int key="NSCellFlags2">0</int>
+                                                                       <int key="NSCellFlags2">134217728</int>
+                                                                       <string key="NSContents">(default)</string>
                                                                        <reference key="NSSupport" ref="45863614"/>
                                                                        <string key="NSCellIdentifier">_NS:9</string>
-                                                                       <reference key="NSControlView" ref="679083346"/>
-                                                                       <array class="NSMutableArray" key="NSSegmentImages">
-                                                                               <object class="NSSegmentItem">
-                                                                                       <double key="NSSegmentItemWidth">32</double>
-                                                                                       <object class="NSCustomResource" key="NSSegmentItemImage">
-                                                                                               <string key="NSClassName">NSImage</string>
-                                                                                               <string key="NSResourceName">NSActionTemplate</string>
-                                                                                       </object>
-                                                                                       <string key="NSSegmentItemTooltip">Show and remap inputs</string>
-                                                                                       <bool key="NSSegmentItemSelected">YES</bool>
-                                                                                       <int key="NSSegmentItemImageScaling">0</int>
-                                                                               </object>
-                                                                               <object class="NSSegmentItem">
-                                                                                       <double key="NSSegmentItemWidth">32</double>
-                                                                                       <object class="NSCustomResource" key="NSSegmentItemImage">
-                                                                                               <string key="NSClassName">NSImage</string>
-                                                                                               <string key="NSResourceName">NSRightFacingTriangleTemplate</string>
-                                                                                       </object>
-                                                                                       <string key="NSSegmentItemTooltip">Run mapped actions</string>
-                                                                                       <int key="NSSegmentItemTag">1</int>
-                                                                                       <int key="NSSegmentItemImageScaling">0</int>
-                                                                               </object>
-                                                                       </array>
-                                                                       <int key="NSSegmentStyle">4</int>
+                                                                       <reference key="NSControlView" ref="227597319"/>
+                                                                       <int key="NSButtonFlags">918306816</int>
+                                                                       <int key="NSButtonFlags2">163</int>
+                                                                       <object class="NSCustomResource" key="NSNormalImage" id="13197350">
+                                                                               <string key="NSClassName">NSImage</string>
+                                                                               <string key="NSResourceName">NSListViewTemplate</string>
+                                                                       </object>
+                                                                       <string key="NSAlternateContents"/>
+                                                                       <string key="NSKeyEquivalent"/>
+                                                                       <int key="NSPeriodicDelay">400</int>
+                                                                       <int key="NSPeriodicInterval">75</int>
                                                                </object>
                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                        </object>
-                                                       <nil key="NSToolbarItemImage"/>
+                                                       <reference key="NSToolbarItemImage" ref="13197350"/>
                                                        <nil key="NSToolbarItemTarget"/>
                                                        <nil key="NSToolbarItemAction"/>
-                                                       <string key="NSToolbarItemMinSize">{67, 25}</string>
-                                                       <string key="NSToolbarItemMaxSize">{67, 25}</string>
+                                                       <string key="NSToolbarItemMinSize">{13, 25}</string>
+                                                       <string key="NSToolbarItemMaxSize">{141, 25}</string>
                                                        <bool key="NSToolbarItemEnabled">YES</bool>
-                                                       <bool key="NSToolbarItemAutovalidates">YES</bool>
+                                                       <bool key="NSToolbarItemAutovalidates">NO</bool>
                                                        <int key="NSToolbarItemTag">0</int>
                                                        <bool key="NSToolbarIsUserRemovable">YES</bool>
                                                        <int key="NSToolbarItemVisibilityPriority">0</int>
@@ -455,13 +473,13 @@
                                        </dictionary>
                                        <array key="NSToolbarIBAllowedItems">
                                                <reference ref="496378711"/>
-                                               <reference ref="981531896"/>
                                                <reference ref="658903347"/>
+                                               <reference ref="985167622"/>
                                        </array>
                                        <array key="NSToolbarIBDefaultItems">
                                                <reference ref="496378711"/>
                                                <reference ref="658903347"/>
-                                               <reference ref="981531896"/>
+                                               <reference ref="985167622"/>
                                        </array>
                                        <array key="NSToolbarIBSelectableItems" id="0"/>
                                </object>
@@ -493,7 +511,7 @@
                                                                                                                        <string key="NSFrameSize">{200, 298}</string>
                                                                                                                        <reference key="NSSuperview" ref="698362889"/>
                                                                                                                        <reference key="NSWindow"/>
-                                                                                                                       <reference key="NSNextKeyView" ref="892486973"/>
+                                                                                                                       <reference key="NSNextKeyView" ref="1036252745"/>
                                                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                                                        <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                                                                        <bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -623,7 +641,7 @@
                                                                                        <string key="NSFrameSize">{202, 300}</string>
                                                                                        <reference key="NSSuperview" ref="977242492"/>
                                                                                        <reference key="NSWindow"/>
-                                                                                       <reference key="NSNextKeyView" ref="698362889"/>
+                                                                                       <reference key="NSNextKeyView" ref="892486973"/>
                                                                                        <int key="NSsFlags">150034</int>
                                                                                        <reference key="NSVScroller" ref="1036252745"/>
                                                                                        <reference key="NSHScroller" ref="892486973"/>
@@ -687,6 +705,7 @@
                                                                                        <string key="NSFrame">{{227, 55}, {180, 24}}</string>
                                                                                        <reference key="NSSuperview" ref="606740242"/>
                                                                                        <reference key="NSWindow"/>
+                                                                                       <reference key="NSNextKeyView"/>
                                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                                        <bool key="NSEnabled">YES</bool>
                                                                                        <object class="NSSegmentedCell" key="NSCell" id="301345285">
@@ -824,7 +843,7 @@
                                                                                                <object class="NSButtonCell" id="387494389">
                                                                                                        <int key="NSCellFlags">603979776</int>
                                                                                                        <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents">Press a key:</string>
+                                                                                                       <string key="NSContents">Press a key</string>
                                                                                                        <reference key="NSSupport" ref="45863614"/>
                                                                                                        <reference key="NSControlView" ref="120408205"/>
                                                                                                        <int key="NSButtonFlags">1211912448</int>
@@ -852,7 +871,7 @@
                                                                                                <object class="NSButtonCell" id="820968178">
                                                                                                        <int key="NSCellFlags">603979776</int>
                                                                                                        <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents">Mouse movement</string>
+                                                                                                       <string key="NSContents">Move the mouse</string>
                                                                                                        <reference key="NSSupport" ref="45863614"/>
                                                                                                        <reference key="NSControlView" ref="120408205"/>
                                                                                                        <int key="NSButtonFlags">1211912448</int>
@@ -866,7 +885,7 @@
                                                                                                <object class="NSButtonCell" id="275466816">
                                                                                                        <int key="NSCellFlags">603979776</int>
                                                                                                        <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents">Mouse button</string>
+                                                                                                       <string key="NSContents">Press a mouse button</string>
                                                                                                        <reference key="NSSupport" ref="45863614"/>
                                                                                                        <reference key="NSControlView" ref="120408205"/>
                                                                                                        <int key="NSButtonFlags">1211912448</int>
@@ -880,7 +899,7 @@
                                                                                                <object class="NSButtonCell" id="134694197">
                                                                                                        <int key="NSCellFlags">603979776</int>
                                                                                                        <int key="NSCellFlags2">0</int>
-                                                                                                       <string key="NSContents">Mouse scroll</string>
+                                                                                                       <string key="NSContents">Scroll the mouse</string>
                                                                                                        <reference key="NSSupport" ref="45863614"/>
                                                                                                        <reference key="NSControlView" ref="120408205"/>
                                                                                                        <int key="NSButtonFlags">1211912448</int>
@@ -1031,7 +1050,7 @@
                                                                                <string key="NSFrameSize">{198, 198}</string>
                                                                                <reference key="NSSuperview" ref="947403733"/>
                                                                                <reference key="NSWindow"/>
-                                                                               <reference key="NSNextKeyView" ref="553414014"/>
+                                                                               <reference key="NSNextKeyView" ref="968378655"/>
                                                                                <bool key="NSEnabled">YES</bool>
                                                                                <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
                                                                                <bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1123,7 +1142,7 @@
                                                <string key="NSFrame">{{0, 20}, {200, 200}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView" ref="947403733"/>
+                                               <reference key="NSNextKeyView" ref="553414014"/>
                                                <int key="NSsFlags">150034</int>
                                                <reference key="NSVScroller" ref="968378655"/>
                                                <reference key="NSHScroller" ref="553414014"/>
@@ -1139,6 +1158,7 @@
                                                <string key="NSFrame">{{66, -1}, {134, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
                                                <reference key="NSWindow"/>
+                                               <reference key="NSNextKeyView"/>
                                                <string key="NSReuseIdentifierKey">_NS:22</string>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="517346822">
@@ -1270,6 +1290,14 @@
                                        </object>
                                        <int key="connectionID">732</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">showHelp:</string>
+                                               <reference key="source" ref="1050"/>
+                                               <reference key="destination" ref="842970531"/>
+                                       </object>
+                                       <int key="connectionID">870</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">orderFrontStandardAboutPanel:</string>
@@ -1366,21 +1394,29 @@
                                        </object>
                                        <int key="connectionID">826</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">translatingEventsMenu</string>
+                                               <reference key="source" ref="1007832501"/>
+                                               <reference key="destination" ref="632598200"/>
+                                       </object>
+                                       <int key="connectionID">877</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">translatingEventsChanged:</string>
                                                <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="679083346"/>
+                                               <reference key="destination" ref="385218002"/>
                                        </object>
-                                       <int key="connectionID">858</int>
+                                       <int key="connectionID">878</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">translatingEventsSetting</string>
+                                               <string key="label">translatingEventsButton</string>
                                                <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="679083346"/>
+                                               <reference key="destination" ref="385218002"/>
                                        </object>
-                                       <int key="connectionID">859</int>
+                                       <int key="connectionID">879</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
@@ -1622,6 +1658,14 @@
                                        </object>
                                        <int key="connectionID">818</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">performClick:</string>
+                                               <reference key="source" ref="227597319"/>
+                                               <reference key="destination" ref="914355947"/>
+                                       </object>
+                                       <int key="connectionID">871</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">view</string>
@@ -1646,6 +1690,14 @@
                                        </object>
                                        <int key="connectionID">853</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">performClick:</string>
+                                               <reference key="source" ref="385218002"/>
+                                               <reference key="destination" ref="632598200"/>
+                                       </object>
+                                       <int key="connectionID">880</int>
+                               </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
@@ -1680,6 +1732,7 @@
                                                        <reference ref="713487014"/>
                                                        <reference ref="694149608"/>
                                                        <reference ref="379814623"/>
+                                                       <reference ref="693056251"/>
                                                </array>
                                                <reference key="parent" ref="0"/>
                                                <string key="objectName">Main Menu</string>
@@ -1903,8 +1956,8 @@
                                                <reference key="object" ref="1043384830"/>
                                                <array class="NSMutableArray" key="children">
                                                        <reference ref="496378711"/>
-                                                       <reference ref="981531896"/>
                                                        <reference ref="658903347"/>
+                                                       <reference ref="985167622"/>
                                                </array>
                                                <reference key="parent" ref="808667431"/>
                                        </object>
@@ -2213,28 +2266,6 @@
                                                <reference key="object" ref="850080795"/>
                                                <reference key="parent" ref="227597319"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">842</int>
-                                               <reference key="object" ref="981531896"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="679083346"/>
-                                               </array>
-                                               <reference key="parent" ref="1043384830"/>
-                                               <string key="objectName">Translation Switch</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">840</int>
-                                               <reference key="object" ref="679083346"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="594076765"/>
-                                               </array>
-                                               <reference key="parent" ref="981531896"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">841</int>
-                                               <reference key="object" ref="594076765"/>
-                                               <reference key="parent" ref="679083346"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">849</int>
                                                <reference key="object" ref="658903347"/>
@@ -2285,6 +2316,48 @@
                                                <reference key="object" ref="914355947"/>
                                                <reference key="parent" ref="720053764"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">866</int>
+                                               <reference key="object" ref="693056251"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="997802319"/>
+                                               </array>
+                                               <reference key="parent" ref="649796088"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">867</int>
+                                               <reference key="object" ref="997802319"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="842970531"/>
+                                               </array>
+                                               <reference key="parent" ref="693056251"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">868</int>
+                                               <reference key="object" ref="842970531"/>
+                                               <reference key="parent" ref="997802319"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">874</int>
+                                               <reference key="object" ref="985167622"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="385218002"/>
+                                               </array>
+                                               <reference key="parent" ref="1043384830"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">872</int>
+                                               <reference key="object" ref="385218002"/>
+                                               <array class="NSMutableArray" key="children">
+                                                       <reference ref="422366518"/>
+                                               </array>
+                                               <reference key="parent" ref="985167622"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">873</int>
+                                               <reference key="object" ref="422366518"/>
+                                               <reference key="parent" ref="385218002"/>
+                                       </object>
                                </array>
                        </object>
                        <dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2322,8 +2395,24 @@
                                <string key="482.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="487.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <object class="NSMutableDictionary" key="507.IBAttributePlaceholdersKey">
+                                       <string key="NS.key.0">ToolTip</string>
+                                       <object class="IBToolTipAttribute" key="NS.object.0">
+                                               <string key="name">ToolTip</string>
+                                               <reference key="object" ref="861276216"/>
+                                               <string key="toolTip">Create a new mapping</string>
+                                       </object>
+                               </object>
                                <string key="507.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="508.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <object class="NSMutableDictionary" key="511.IBAttributePlaceholdersKey">
+                                       <string key="NS.key.0">ToolTip</string>
+                                       <object class="IBToolTipAttribute" key="NS.object.0">
+                                               <string key="name">ToolTip</string>
+                                               <reference key="object" ref="456935010"/>
+                                               <string key="toolTip">Remove the selected mapping</string>
+                                       </object>
+                               </object>
                                <string key="511.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="512.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="514.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2373,26 +2462,44 @@
                                <string key="813.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="814.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <object class="NSMutableDictionary" key="835.IBAttributePlaceholdersKey">
+                                       <string key="NS.key.0">ToolTip</string>
+                                       <object class="IBToolTipAttribute" key="NS.object.0">
+                                               <string key="name">ToolTip</string>
+                                               <reference key="object" ref="227597319"/>
+                                               <string key="toolTip">Change the active mapping</string>
+                                       </object>
+                               </object>
                                <string key="835.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="836.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="837.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <boolean value="NO" key="837.toolbarItem.selectable"/>
-                               <string key="840.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <integer value="1" key="841.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
-                               <string key="841.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="842.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="849.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="850.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="851.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="862.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="863.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="866.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="868.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <object class="NSMutableDictionary" key="872.IBAttributePlaceholdersKey">
+                                       <string key="NS.key.0">ToolTip</string>
+                                       <object class="IBToolTipAttribute" key="NS.object.0">
+                                               <string key="name">ToolTip</string>
+                                               <reference key="object" ref="385218002"/>
+                                               <string key="toolTip">Enable mapped actions</string>
+                                       </object>
+                               </object>
+                               <string key="872.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="873.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+                               <string key="874.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                        </dictionary>
                        <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">865</int>
+                       <int key="maxID">880</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2446,7 +2553,8 @@
                                                <string key="mappingsController">NJMappingsController</string>
                                                <string key="outlineView">NSOutlineView</string>
                                                <string key="outputController">NJOutputController</string>
-                                               <string key="translatingEventsSetting">NSSegmentedControl</string>
+                                               <string key="translatingEventsButton">NSButton</string>
+                                               <string key="translatingEventsMenu">NSMenuItem</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
                                                <object class="IBToOneOutletInfo" key="mappingsController">
@@ -2461,9 +2569,13 @@
                                                        <string key="name">outputController</string>
                                                        <string key="candidateClassName">NJOutputController</string>
                                                </object>
-                                               <object class="IBToOneOutletInfo" key="translatingEventsSetting">
-                                                       <string key="name">translatingEventsSetting</string>
-                                                       <string key="candidateClassName">NSSegmentedControl</string>
+                                               <object class="IBToOneOutletInfo" key="translatingEventsButton">
+                                                       <string key="name">translatingEventsButton</string>
+                                                       <string key="candidateClassName">NSButton</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="translatingEventsMenu">
+                                                       <string key="name">translatingEventsMenu</string>
+                                                       <string key="candidateClassName">NSMenuItem</string>
                                                </object>
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -2644,7 +2756,6 @@
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
                <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-                       <string key="NSActionTemplate">{15, 15}</string>
                        <string key="NSAddTemplate">{8, 8}</string>
                        <string key="NSListViewTemplate">{11, 10}</string>
                        <string key="NSMenuCheckmark">{11, 11}</string>

diff --git a/Enjoyable Help/Enjoyable Help.helpindex b/Enjoyable Help/Enjoyable Help.helpindex
new file mode 100644 (file)
index 0000000..54568b5
Binary files /dev/null and b/Enjoyable Help/Enjoyable Help.helpindex differ

diff --git a/Enjoyable Help/Enjoyable Help.html b/Enjoyable Help/Enjoyable Help.html
new file mode 100644 (file)
index 0000000..6a78ca4
--- /dev/null
+++ b/Enjoyable Help/Enjoyable Help.html
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Enjoyable Help</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="AppleTitle" content="Enjoyable Help" />
+    <meta name="AppleIcon" content="Enjoyable Help/gfx/Icon.png" />
+    <meta name="robots" content="anchors" />
+    <link href="sty/default.css" rel="stylesheet" type="text/css" media="all"/>
+  </head>
+  
+  <body id="apple-pd">
+    <a name="home"></a>
+    
+    <div id="navbox">
+      <div id="navrightbox">
+      </div>
+    </div>
+    
+    <div id="headerbox">
+      <div id="iconbox">
+        <img id="iconimg" src="gfx/Icon.png" alt="Enjoyable Icon" height="32" width="32"/>
+      </div>
+      <div id="pagetitlebox">
+        <h1>Enjoyable Help</h1>
+      </div>
+    </div>
+    
+    <p style="margin-bottom: 2em">
+      Enjoyable helps you use a joystick or gamepad to control
+      applications which normally require a keyboard and mouse.
+    </p>
+
+    <div style="display: table-cell; width: 40%; padding-right: 1em">
+      <h3 class="ostopic">Quick Start</h3>
+      <ul>
+        <li>Connect a joystick or gamepad.</li>
+        <li>Press a button on it, then the keyboard key you want to use.</li>
+        <li>Press the ▶ button in the upper-right.</li>
+        <li>Start up your game and use your gamepad!</li>
+      </ol>
+    </div>
+
+    <div style="display: table-cell; width: 60%; border-left: solid #333 1px; padding-left: 1em; margin-top: 1em">
+      <p>
+        <a href="help:anchor='keyboard' bookID='Enjoyable Help'">
+          Keyboard Events
+        </a><br />
+        Map buttons to keys on a keyboard.
+      </p>
+      <p>
+        <a href="help:anchor='mouse' bookID='Enjoyable Help'">
+          Mouse Events
+        </a><br />
+        Use analog axes and buttons to simulate a mouse.
+      </p>
+      <p>
+        <a href="help:anchor='mappings' bookID='Enjoyable Help'">
+          Application Mappings
+        </a><br />
+        Create and share mappings for different applications.
+      </p>
+    </div>
+
+    <p style="border-top: #777 solid 1px; text-align: center; margin-top: 2em">
+      <a class="weblink" href="http://yukkurigames.com/enjoyable">
+        Visit the Enjoyable website.
+      </a>
+    </p>
+
+  </body>
+</html>

diff --git a/Enjoyable Help/gfx/Icon.png b/Enjoyable Help/gfx/Icon.png
new file mode 100644 (file)
index 0000000..36c4254
Binary files /dev/null and b/Enjoyable Help/gfx/Icon.png differ

diff --git a/Enjoyable Help/pgs/keyboard.html b/Enjoyable Help/pgs/keyboard.html
new file mode 100644 (file)
index 0000000..99c414d
--- /dev/null
+++ b/Enjoyable Help/pgs/keyboard.html
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Keyboard Events</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="robots" content="anchors" />
+    <link href="../sty/default.css" rel="stylesheet" type="text/css" media="all"/>
+  </head>
+  
+  <body>
+    <a name="keyboard"></a>
+    
+    <div id="navbox">
+      <div id="navleftbox">
+        <a class="navlink_left"
+           href="help:anchor='home' bookID='Enjoyable Help'">
+          Home
+        </a>
+      </div>
+    </div>
+    
+    <div id="headerbox">
+      <div id="iconbox">
+        <img id="iconimg"
+             src="../gfx/Icon.png"
+             alt="Enjoyable Icon"
+             height="32" width="32"/>
+      </div>
+      <h1>Keyboard Events</h1>
+    </div>
+
+    <p>
+      Enjoyable supports mapping joystick buttons, hat switches, and
+      axis thresholds to simulate keyboard keys. To do this, first
+      press the button on the joystick you want to map. This will
+      select it on the left-hand side of the screen.
+    </p>
+
+    <p>
+      If the button wasn't mapped, or was mapped to a key press
+      already, the key input field activates and you can simply press
+      the key you want to use. Otherwise, click on the <b>Press a
+      key</b> label or input field, then press the key.
+    </p>
+
+    <h3><a name="clear_key"></a>Clearing the Selection</h3>
+    <p>
+      To clear a mapped key, either select the <b>Do nothing</b>
+      option, or press ⌥⌫ when the key input field is selected.
+    </p>
+
+    <h3><a name="cancel_key"></a>Cancelling the Selection</h3>
+    <p>
+      If you select the key input field by mistake, you can press ⌥⎋
+      to cancel the selection without changing the current setting.
+    </p>
+  </body>
+</html>

diff --git a/Enjoyable Help/pgs/mappings.html b/Enjoyable Help/pgs/mappings.html
new file mode 100644 (file)
index 0000000..c6d8af4
--- /dev/null
+++ b/Enjoyable Help/pgs/mappings.html
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+       <title>Discover Sample App</title>
+       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+       <link href="../sty/ref.css" rel="stylesheet" type="text/css"/>
+       <link href="../sty/task_bulleted.css" rel="stylesheet" type="text/css"/>
+</head>
+
+<body id="apple-pd">
+               
+<div id="navbox">
+<a name="mappings"></a>
+
+<div id="navleftbox">
+<a class="navlink_left" href="help:anchor='access' bookID='Enjoyable Help'">Home</a>
+</div>
+</div>
+
+<div id="headerbox">
+<div id="iconbox">
+<img id="iconimg"
+     src="../gfx/AppIcon32.png"
+     alt="$APPNAME$$ Icon"
+     height="32" width="32"/>
+</div>
+<div id="pagetitle">
+  <h1>Manage Application Mappings</h1>
+</div>
+</div>
+
+<h3><a name="dynamic"></a>Changing Dynamically</h3>
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas auctor leo in lorem dapibus eu tincidunt lacus viverra. Integer auctor tortor vel mauris pellentesque ultricies. Nulla lobortis, leo in facilisis cursus, elit felis viverra orci, ac luctus tellus sapien vel lectus. Aliquam ac accumsan risus. Nullam posuere, lectus commodo vestibulum luctus, mauris quam porta velit, ut pretium purus quam eu lacus. Nam in dui a sapien viverra euismod. Proin vel mauris nisi, sed tincidunt mi. Phasellus id ligula vitae mauris dapibus suscipit. Sed id erat nunc, in ultricies arcu.
+
+Nulla semper, magna non aliquam fringilla, turpis est convallis tortor, ut blandit elit orci nec elit. Phasellus id urna justo, a tristique mauris. Morbi sed nulla et lacus facilisis posuere et a purus. Morbi a dui quam. Nunc luctus ipsum ut purus sollicitudin cursus. Nulla facilisi. In vestibulum orci eu nunc euismod ut iaculis lacus commodo. Sed leo dolor, sagittis eu vulputate eget, accumsan eu leo.
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas auctor leo in lorem dapibus eu tincidunt lacus viverra. Integer auctor tortor vel mauris pellentesque ultricies. Nulla lobortis, leo in facilisis cursus, elit felis viverra orci, ac luctus tellus sapien vel lectus. Aliquam ac accumsan risus. Nullam posuere, lectus commodo vestibulum luctus, mauris quam porta velit, ut pretium purus quam eu lacus. Nam in dui a sapien viverra euismod. Proin vel mauris nisi, sed tincidunt mi. Phasellus id ligula vitae mauris dapibus suscipit. Sed id erat nunc, in ultricies arcu.
+
+Nulla semper, magna non aliquam fringilla, turpis est convallis tortor, ut blandit elit orci nec elit. Phasellus id urna justo, a tristique mauris. Morbi sed nulla et lacus facilisis posuere et a purus. Morbi a dui quam. Nunc luctus ipsum ut purus sollicitudin cursus. Nulla facilisi. In vestibulum orci eu nunc euismod ut iaculis lacus commodo. Sed leo dolor, sagittis eu vulputate eget, accumsan eu leo.
+
+
+
+<h3><a name="automatic"></a>Automatic Switching</h3>
+
+<h3><a name="sharing"></a>Sharing Mappings</h3>
+
+</body>
+</html>

diff --git a/Enjoyable Help/pgs/template.html b/Enjoyable Help/pgs/template.html
new file mode 100644 (file)
index 0000000..daba5e5
--- /dev/null
+++ b/Enjoyable Help/pgs/template.html
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Title</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta name="robots" content="anchors" />
+    <link href="../sty/default.css"
+          rel="stylesheet"
+          type="text/css"
+          media="all"/>
+  </head>
+  
+  <body>
+    <a name="primary anchor"></a>
+    
+    <div id="navbox">
+      <div id="navleftbox">
+        <a class="navlink_left"
+           href="help:anchor='home' bookID='Enjoyable Help'">
+          Home
+        </a>
+      </div>
+    </div>
+    
+    <div id="headerbox">
+      <div id="iconbox">
+        <img id="iconimg"
+             src="../gfx/Icon.png"
+             alt="Icon"
+             height="32" width="32"/>
+      </div>
+      <h1>Title</h1>
+    </div>
+
+    <p>
+      Content starts here.
+    </p>
+  </body>
+</html>

diff --git a/Enjoyable Help/sty/default.css b/Enjoyable Help/sty/default.css
new file mode 100644 (file)
index 0000000..58b7747
--- /dev/null
+++ b/Enjoyable Help/sty/default.css
@@ -0,0 +1 @@
+body {\r    font-size: 8pt;\r    font-family: "Lucida Grande", Arial, sans-serif;\r    line-height: 12pt;\r    text-decoration: none;\r    margin-right: 1em;\r    margin-left: 1em;\r}\r\r#navbox { \r    background-color: #f2f2f2; \r    position: fixed;\r    top: 0; \r    left: 0; \r    width: 100%; \r    height: 1.5em; \r    float: left; \r    border-bottom: 1px solid #bfbfbf\r}\r\r#navleftbox { \r    position: absolute; \r    top: 1px; \r    left: 15px \r}\r\r#navrightbox { \r    background-color: #f2f2f2; \r    padding-right: 25px; \r    float: right; \r    padding-bottom: 1px; \r    border-left: 1px solid #bfbfbf\r}\r\r#navbox a {\r    font-size: 8pt;\r    color: #666;\r    font-weight: normal;\r    margin: -9px 0 -6px;\r}\r\r#headerbox {\r    margin-top: 36px;\r    padding-right: 6px;\r    margin-bottom: 2em;\r}\r\r#iconbox {\r    float: left;\r}\r\rh1 {\r    margin-left: 40px;\r    width: 88%;\r    font-size: 15pt;\r    line-height: 15pt;\r    font-weight: bold;\r    padding-top: 6px;\r    margin-bottom: 0;\r}\r\rh2 {\r    font-size: 11pt;\r    line-height: 12pt;\r    font-weight: bold;\r    color: black;\r    margin-top: 0;\r    margin-bottom: 11px;\r}\r\rh3 {\r    font-size: 8pt;\r    font-weight: bold;\r    letter-spacing: 0.1em;\r    line-height: 8pt;\r    color: #666;\r    margin-top: 1em;\r    margin-bottom: 0px;\r    padding-bottom: 0.5em;\r}\r\rp {\r    margin-left: 0px;\r    margin-top: 0px;\r    margin-bottom: 0.5em;\r}\r\rul {\r    margin-left: 2em;\r    margin-top: 6px;\r    margin-bottom: 0px;\r    padding-left: 0px;\r}\r\rli {\r    margin-left: 0px;\r}\r\ra {\r    color: #778fbd;\r    font-size: 9pt;\r    font-weight: bold;\r    text-decoration: none;\r}\r\ra:hover {\r    text-decoration: underline;\r}\r\r.weblink {\r    color: #666;\r    font-weight: normal;\r}\r
\ No newline at end of file

diff --git a/Enjoyable.xcodeproj/project.pbxproj b/Enjoyable.xcodeproj/project.pbxproj
index c2f3246b5003d44b60f2b5589c0b0bced6f8fcdc..45376882585b7fe79e6418ba2c0db016bd3afb5c 100644 (file)
--- a/Enjoyable.xcodeproj/project.pbxproj
+++ b/Enjoyable.xcodeproj/project.pbxproj
@@ -32,6 +32,7 @@
                D594BF830FAE9661007A85F2 /* EnjoyableApplicationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BF820FAE9661007A85F2 /* EnjoyableApplicationDelegate.m */; };
                D5F809710FB093400006A4DE /* NJOutputMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = D5F809700FB093400006A4DE /* NJOutputMapping.m */; };
                D5F80A9D0FB0A2FF0006A4DE /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D5617A080FAEAF8300928B3A /* icon.icns */; };
+               EE03150D16E63481002B2DCE /* Enjoyable Help in Resources */ = {isa = PBXBuildFile; fileRef = EE03150C16E63481002B2DCE /* Enjoyable Help */; };
                EE1D7C9216E01E7000B000EB /* NSView+FirstResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */; };
                EE1D7C9616E0ECCF00B000EB /* NSError+Description.m in Sources */ = {isa = PBXBuildFile; fileRef = EE1D7C9516E0ECCF00B000EB /* NSError+Description.m */; };
                EE96929416E54B480054A3C8 /* NSMenu+RepresentedObjectAccessors.m in Sources */ = {isa = PBXBuildFile; fileRef = EE96929316E54B480054A3C8 /* NSMenu+RepresentedObjectAccessors.m */; };
@@ -86,6 +87,7 @@
                D594BF820FAE9661007A85F2 /* EnjoyableApplicationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EnjoyableApplicationDelegate.m; sourceTree = "<group>"; };
                D5F8096F0FB093400006A4DE /* NJOutputMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJOutputMapping.h; sourceTree = "<group>"; };
                D5F809700FB093400006A4DE /* NJOutputMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJOutputMapping.m; sourceTree = "<group>"; };
+               EE03150C16E63481002B2DCE /* Enjoyable Help */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "Enjoyable Help"; sourceTree = "<group>"; };
                EE1D7C9016E01E7000B000EB /* NSView+FirstResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSView+FirstResponder.h"; sourceTree = "<group>"; };
                EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSView+FirstResponder.m"; sourceTree = "<group>"; };
                EE1D7C9416E0ECCF00B000EB /* NSError+Description.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSError+Description.h"; sourceTree = "<group>"; };
@@ -205,6 +207,7 @@
                29B97317FDCFA39411CA2CEA /* Resources */ = {
                        isa = PBXGroup;
                        children = (
+                               EE03150C16E63481002B2DCE /* Enjoyable Help */,
                                D549CA4B0FBB441B00BC8203 /* Credits.rtf */,
                                D5617A080FAEAF8300928B3A /* icon.icns */,
                                8D1107310486CEB800E47090 /* Info.plist */,
@@ -293,6 +296,7 @@
                                1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
                                D5F80A9D0FB0A2FF0006A4DE /* icon.icns in Resources */,
                                D549CA4C0FBB441B00BC8203 /* Credits.rtf in Resources */,
+                               EE03150D16E63481002B2DCE /* Enjoyable Help in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/Info.plist b/Info.plist
index 2940aaf7ebaee21e72ec4e46f96aef91f283c422..4a530d9522b9fd35509d48e0c1cede95366aab9d 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+       <key>CFBundleHelpBookName</key>
+       <string>Enjoyable Help</string>
+       <key>CFBundleHelpBookFolder</key>
+       <string>Enjoyable Help</string>
        <key>NSSupportsAutomaticTermination</key>
        <string>YES</string>
        <key>NSSupportsSuddenTermination</key>

diff --git a/NJDeviceController.h b/NJDeviceController.h
index cfa6d998e0039705e34ef26945dfe256908cbce2..4e50fa40e64114d4e80338d337896bceb7a2896d 100644 (file)
--- a/NJDeviceController.h
+++ b/NJDeviceController.h
@@ -15,7 +15,8 @@
        IBOutlet NSOutlineView *outlineView;
        IBOutlet NJOutputController *outputController;
        IBOutlet NJMappingsController *mappingsController;
-    IBOutlet NSSegmentedControl *translatingEventsSetting;
+    IBOutlet NSButton *translatingEventsButton;
+    IBOutlet NSMenuItem *translatingEventsMenu;
 }
 
 @property (nonatomic, readonly) NJInput *selectedInput;

diff --git a/NJDeviceController.m b/NJDeviceController.m
index f5da6dd38257a809b6b25a7eaf490db9938278cd..79938423c772fd72f1badea9dd64280f3d05664e 100644 (file)
--- a/NJDeviceController.m
+++ b/NJDeviceController.m
@@ -224,7 +224,9 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
 - (void)setTranslatingEvents:(BOOL)translatingEvents {
     if (translatingEvents != _translatingEvents) {
         _translatingEvents = translatingEvents;
-        translatingEventsSetting.selectedSegment = !!translatingEvents;
+        NSInteger state = translatingEvents ? NSOnState : NSOffState;
+        translatingEventsButton.state = state;
+        translatingEventsMenu.title = translatingEvents ? @"Disable" : @"Enable";
         NSString *name = translatingEvents
             ? NJEventTranslationActivated
             : NJEventTranslationDeactivated;
@@ -233,8 +235,8 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn
     }
 }
 
-- (IBAction)translatingEventsChanged:(id)sender {
-    self.translatingEvents = translatingEventsSetting.selectedSegment;
+- (IBAction)translatingEventsChanged:(NSButton *)sender {
+    self.translatingEvents = sender.state == NSOnState;
 }
 
 

diff --git a/NJKeyInputField.m b/NJKeyInputField.m
index b159aa33bb724c5d2e6f9cf01e00159bf2258852..ec081505c13ce92a28b411617d7ac2c479d16aec 100644 (file)
--- a/NJKeyInputField.m
+++ b/NJKeyInputField.m
@@ -176,10 +176,14 @@ CGKeyCode NJKeyInputFieldEmpty = 0xFFFF;
 - (void)keyDown:(NSEvent *)theEvent {
     if (!theEvent.isARepeat) {
         if ((theEvent.modifierFlags & NSAlternateKeyMask)
-            && theEvent.keyCode == 0x35) {
-            // Allow Alt+Escape to clear the field.
+            && theEvent.keyCode == 0x33) {
+            // Allow Alt+Backspace to clear the field.
             self.keyCode = NJKeyInputFieldEmpty;
             [self.keyDelegate keyInputFieldDidClear:self];
+        } else if ((theEvent.modifierFlags & NSAlternateKeyMask)
+                && theEvent.keyCode == 0x35) {
+                // Allow Alt+Escape to cancel.
+            ;
         } else {
             self.keyCode = theEvent.keyCode;
             [self.keyDelegate keyInputField:self didChangeKey:_keyCode];