Move simulation toggle out of device controller.

[enjoyable.git] / Resources / English.lproj / MainMenu.xib

diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib
index e045c4d..b3d81ba 100644 (file)
--- a/Resources/English.lproj/MainMenu.xib
+++ b/Resources/English.lproj/MainMenu.xib
@@ -361,9 +361,11 @@
                                                        <string key="NSToolbarItemPaletteLabel">Enabled</string>
                                                        <nil key="NSToolbarItemToolTip"/>
                                                        <object class="NSButton" key="NSToolbarItemView" id="385218002">
-                                                               <nil key="NSNextResponder"/>
+                                                               <reference key="NSNextResponder"/>
                                                                <int key="NSvFlags">268</int>
                                                                <string key="NSFrame">{{7, 14}, {36, 25}}</string>
+                                                               <reference key="NSSuperview"/>
+                                                               <reference key="NSWindow"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="NSEnabled">YES</bool>
                                                                <object class="NSButtonCell" key="NSCell" id="422366518">
@@ -409,9 +411,11 @@
                                                        <string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
                                                        <nil key="NSToolbarItemToolTip"/>
                                                        <object class="NSButton" key="NSToolbarItemView" id="227597319">
-                                                               <nil key="NSNextResponder"/>
+                                                               <reference key="NSNextResponder"/>
                                                                <int key="NSvFlags">268</int>
                                                                <string key="NSFrame">{{0, 14}, {140, 25}}</string>
+                                                               <reference key="NSSuperview"/>
+                                                               <reference key="NSWindow"/>
                                                                <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                <bool key="NSEnabled">YES</bool>
                                                                <object class="NSButtonCell" key="NSCell" id="850080795">
@@ -791,7 +795,6 @@ aW5nLg</string>
                                                                        <string key="NSFrame">{{343, 31}, {70, 18}}</string>
                                                                        <reference key="NSSuperview" ref="471332453"/>
                                                                        <reference key="NSWindow"/>
-                                                                       <reference key="NSNextKeyView"/>
                                                                        <string key="NSReuseIdentifierKey">_NS:9</string>
                                                                        <bool key="NSEnabled">YES</bool>
                                                                        <object class="NSButtonCell" key="NSCell" id="868379451">
@@ -1397,7 +1400,6 @@ aW5nLg</string>
                                                <string key="NSFrame">{{166, -1}, {34, 23}}</string>
                                                <reference key="NSSuperview" ref="671181514"/>
                                                <reference key="NSWindow"/>
-                                               <reference key="NSNextKeyView"/>
                                                <bool key="NSEnabled">YES</bool>
                                                <object class="NSButtonCell" key="NSCell" id="828611353">
                                                        <int key="NSCellFlags">67108864</int>
@@ -1471,26 +1473,6 @@ aW5nLg</string>
                                <reference key="NSNextKeyView" ref="443618264"/>
                                <string key="NSClassName">NSView</string>
                        </object>
-                       <object class="NSCustomObject" id="207406104">
-                               <string key="NSClassName">EnjoyableApplicationDelegate</string>
-                       </object>
-                       <object class="NSCustomObject" id="468285243">
-                               <string key="NSClassName">NJMappingsController</string>
-                       </object>
-                       <object class="NSCustomObject" id="1007832501">
-                               <string key="NSClassName">NJDeviceController</string>
-                       </object>
-                       <object class="NSCustomObject" id="801536542">
-                               <string key="NSClassName">NJOutputController</string>
-                       </object>
-                       <object class="NSPopover" id="586993839">
-                               <nil key="NSNextResponder"/>
-                               <int key="NSAppearance">0</int>
-                               <int key="NSBehavior">1</int>
-                               <double key="NSContentWidth">0.0</double>
-                               <double key="NSContentHeight">0.0</double>
-                               <bool key="NSAnimates">YES</bool>
-                       </object>
                        <object class="NSMenu" id="388664617">
                                <string key="NSTitle"/>
                                <array class="NSMutableArray" key="NSMenuItems">
@@ -1563,6 +1545,32 @@ aW5nLg</string>
                                        </object>
                                </array>
                        </object>
+                       <object class="NSCustomObject" id="207406104">
+                               <string key="NSClassName">EnjoyableApplicationDelegate</string>
+                       </object>
+                       <object class="NSPopover" id="586993839">
+                               <nil key="NSNextResponder"/>
+                               <int key="NSAppearance">0</int>
+                               <int key="NSBehavior">1</int>
+                               <double key="NSContentWidth">0.0</double>
+                               <double key="NSContentHeight">0.0</double>
+                               <bool key="NSAnimates">YES</bool>
+                       </object>
+                       <object class="NSCustomObject" id="468285243">
+                               <string key="NSClassName">NJMappingsController</string>
+                       </object>
+                       <object class="NSCustomObject" id="1007832501">
+                               <string key="NSClassName">NJDeviceController</string>
+                       </object>
+                       <object class="NSCustomObject" id="801536542">
+                               <string key="NSClassName">NJOutputController</string>
+                       </object>
+                       <object class="NSCustomObject" id="647344717">
+                               <string key="NSClassName">NJDeviceViewController</string>
+                       </object>
+                       <object class="NSCustomObject" id="70919963">
+                               <string key="NSClassName">NJMappingsViewController</string>
+                       </object>
                        <object class="NSCustomObject" id="9563326">
                                <string key="NSClassName">NJMappingMenuController</string>
                        </object>
@@ -1575,12 +1583,6 @@ aW5nLg</string>
                        <object class="NSCustomObject" id="665704974">
                                <string key="NSClassName">SUUpdater</string>
                        </object>
-                       <object class="NSCustomObject" id="647344717">
-                               <string key="NSClassName">NJDeviceViewController</string>
-                       </object>
-                       <object class="NSCustomObject" id="70919963">
-                               <string key="NSClassName">NJMappingsViewController</string>
-                       </object>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <array class="NSMutableArray" key="connectionRecords">
@@ -1706,51 +1708,11 @@ aW5nLg</string>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">outputController</string>
-                                               <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="801536542"/>
-                                       </object>
-                                       <int key="connectionID">826</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">connectDevicePrompt</string>
-                                               <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="12898323"/>
-                                       </object>
-                                       <int key="connectionID">915</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">hidSleepingPrompt</string>
-                                               <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="918286878"/>
-                                       </object>
-                                       <int key="connectionID">976</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">simulatingEventsChanged:</string>
-                                               <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="385218002"/>
-                                       </object>
-                                       <int key="connectionID">978</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">simulatingEventsButton</string>
-                                               <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="385218002"/>
-                                       </object>
-                                       <int key="connectionID">982</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">devicesViewController</string>
+                                               <string key="label">delegate</string>
                                                <reference key="source" ref="1007832501"/>
-                                               <reference key="destination" ref="647344717"/>
+                                               <reference key="destination" ref="207406104"/>
                                        </object>
-                                       <int key="connectionID">992</int>
+                                       <int key="connectionID">1029</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
@@ -1784,14 +1746,6 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">930</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">mappingsMenu</string>
-                                               <reference key="source" ref="207406104"/>
-                                               <reference key="destination" ref="720053764"/>
-                                       </object>
-                                       <int key="connectionID">931</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">restoreToForeground:</string>
@@ -1816,21 +1770,61 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">1016</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">mvc</string>
+                                               <reference key="source" ref="207406104"/>
+                                               <reference key="destination" ref="70919963"/>
+                                       </object>
+                                       <int key="connectionID">1024</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">dvc</string>
+                                               <reference key="source" ref="207406104"/>
+                                               <reference key="destination" ref="647344717"/>
+                                       </object>
+                                       <int key="connectionID">1025</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">deviceController</string>
+                                               <reference key="source" ref="207406104"/>
+                                               <reference key="destination" ref="1007832501"/>
+                                       </object>
+                                       <int key="connectionID">1026</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">outputController</string>
+                                               <reference key="source" ref="207406104"/>
+                                               <reference key="destination" ref="801536542"/>
+                                       </object>
+                                       <int key="connectionID">1027</int>
+                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
-                                               <string key="label">performClick:</string>
-                                               <reference key="source" ref="861276216"/>
-                                               <reference key="destination" ref="331930027"/>
+                                               <string key="label">simulatingEventsChanged:</string>
+                                               <reference key="source" ref="207406104"/>
+                                               <reference key="destination" ref="385218002"/>
                                        </object>
-                                       <int key="connectionID">1012</int>
+                                       <int key="connectionID">1030</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">mvc</string>
-                                               <reference key="source" ref="468285243"/>
-                                               <reference key="destination" ref="70919963"/>
+                                               <string key="label">simulatingEventsButton</string>
+                                               <reference key="source" ref="207406104"/>
+                                               <reference key="destination" ref="385218002"/>
                                        </object>
-                                       <int key="connectionID">995</int>
+                                       <int key="connectionID">1031</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">performClick:</string>
+                                               <reference key="source" ref="861276216"/>
+                                               <reference key="destination" ref="331930027"/>
+                                       </object>
+                                       <int key="connectionID">1012</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
@@ -1856,14 +1850,6 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">821</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">inputController</string>
-                                               <reference key="source" ref="801536542"/>
-                                               <reference key="destination" ref="1007832501"/>
-                                       </object>
-                                       <int key="connectionID">828</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">mouseDirSelect</string>
@@ -2144,14 +2130,6 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">969</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">delegate</string>
-                                               <reference key="source" ref="647344717"/>
-                                               <reference key="destination" ref="1007832501"/>
-                                       </object>
-                                       <int key="connectionID">984</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">hidStoppedNotice</string>
@@ -2179,10 +2157,10 @@ aW5nLg</string>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
                                                <string key="label">delegate</string>
-                                               <reference key="source" ref="70919963"/>
-                                               <reference key="destination" ref="468285243"/>
+                                               <reference key="source" ref="647344717"/>
+                                               <reference key="destination" ref="207406104"/>
                                        </object>
-                                       <int key="connectionID">994</int>
+                                       <int key="connectionID">1028</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
@@ -2280,6 +2258,14 @@ aW5nLg</string>
                                        </object>
                                        <int key="connectionID">1011</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBOutletConnection" key="connection">
+                                               <string key="label">delegate</string>
+                                               <reference key="source" ref="70919963"/>
+                                               <reference key="destination" ref="207406104"/>
+                                       </object>
+                                       <int key="connectionID">1023</int>
+                               </object>
                        </array>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <array key="orderedObjects">
@@ -3387,7 +3373,7 @@ aW5nLg</string>
                        <nil key="activeLocalization"/>
                        <dictionary class="NSMutableDictionary" key="localizations"/>
                        <nil key="sourceID"/>
-                       <int key="maxID">1022</int>
+                       <int key="maxID">1031</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3398,6 +3384,7 @@ aW5nLg</string>
                                                <string key="exportMappingClicked:">id</string>
                                                <string key="importMappingClicked:">id</string>
                                                <string key="restoreToForeground:">id</string>
+                                               <string key="simulatingEventsChanged:">NSButton</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="actionInfosByName">
                                                <object class="IBActionInfo" key="exportMappingClicked:">
@@ -3412,22 +3399,51 @@ aW5nLg</string>
                                                        <string key="name">restoreToForeground:</string>
                                                        <string key="candidateClassName">id</string>
                                                </object>
+                                               <object class="IBActionInfo" key="simulatingEventsChanged:">
+                                                       <string key="name">simulatingEventsChanged:</string>
+                                                       <string key="candidateClassName">NSButton</string>
+                                               </object>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="outlets">
+                                               <string key="deviceController">NJDeviceController</string>
                                                <string key="dockMenu">NSMenu</string>
+                                               <string key="dvc">NJDeviceViewController</string>
                                                <string key="mappingsController">NJMappingsController</string>
+                                               <string key="mvc">NJMappingsViewController</string>
+                                               <string key="outputController">NJOutputController</string>
+                                               <string key="simulatingEventsButton">NSButton</string>
                                                <string key="statusItemMenu">NSMenu</string>
                                                <string key="window">NSWindow</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <object class="IBToOneOutletInfo" key="deviceController">
+                                                       <string key="name">deviceController</string>
+                                                       <string key="candidateClassName">NJDeviceController</string>
+                                               </object>
                                                <object class="IBToOneOutletInfo" key="dockMenu">
                                                        <string key="name">dockMenu</string>
                                                        <string key="candidateClassName">NSMenu</string>
                                                </object>
+                                               <object class="IBToOneOutletInfo" key="dvc">
+                                                       <string key="name">dvc</string>
+                                                       <string key="candidateClassName">NJDeviceViewController</string>
+                                               </object>
                                                <object class="IBToOneOutletInfo" key="mappingsController">
                                                        <string key="name">mappingsController</string>
                                                        <string key="candidateClassName">NJMappingsController</string>
                                                </object>
+                                               <object class="IBToOneOutletInfo" key="mvc">
+                                                       <string key="name">mvc</string>
+                                                       <string key="candidateClassName">NJMappingsViewController</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="outputController">
+                                                       <string key="name">outputController</string>
+                                                       <string key="candidateClassName">NJOutputController</string>
+                                               </object>
+                                               <object class="IBToOneOutletInfo" key="simulatingEventsButton">
+                                                       <string key="name">simulatingEventsButton</string>
+                                                       <string key="candidateClassName">NSButton</string>
+                                               </object>
                                                <object class="IBToOneOutletInfo" key="statusItemMenu">
                                                        <string key="name">statusItemMenu</string>
                                                        <string key="candidateClassName">NSMenu</string>
@@ -3445,40 +3461,19 @@ aW5nLg</string>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NJDeviceController</string>
                                        <string key="superclassName">NSObject</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <string key="NS.key.0">simulatingEventsChanged:</string>
-                                               <string key="NS.object.0">NSButton</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <string key="NS.key.0">simulatingEventsChanged:</string>
-                                               <object class="IBActionInfo" key="NS.object.0">
-                                                       <string key="name">simulatingEventsChanged:</string>
-                                                       <string key="candidateClassName">NSButton</string>
-                                               </object>
-                                       </object>
                                        <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="devicesViewController">NJDeviceViewController</string>
+                                               <string key="delegate">id</string>
                                                <string key="mappingsController">NJMappingsController</string>
-                                               <string key="outputController">NJOutputController</string>
-                                               <string key="simulatingEventsButton">NSButton</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="devicesViewController">
-                                                       <string key="name">devicesViewController</string>
-                                                       <string key="candidateClassName">NJDeviceViewController</string>
+                                               <object class="IBToOneOutletInfo" key="delegate">
+                                                       <string key="name">delegate</string>
+                                                       <string key="candidateClassName">id</string>
                                                </object>
                                                <object class="IBToOneOutletInfo" key="mappingsController">
                                                        <string key="name">mappingsController</string>
                                                        <string key="candidateClassName">NJMappingsController</string>
                                                </object>
-                                               <object class="IBToOneOutletInfo" key="outputController">
-                                                       <string key="name">outputController</string>
-                                                       <string key="candidateClassName">NJOutputController</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="simulatingEventsButton">
-                                                       <string key="name">simulatingEventsButton</string>
-                                                       <string key="candidateClassName">NSButton</string>
-                                               </object>
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
@@ -3566,17 +3561,6 @@ aW5nLg</string>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NJMappingsController</string>
                                        <string key="superclassName">NSObject</string>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <string key="NS.key.0">mvc</string>
-                                               <string key="NS.object.0">NJMappingsViewController</string>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <string key="NS.key.0">mvc</string>
-                                               <object class="IBToOneOutletInfo" key="NS.object.0">
-                                                       <string key="name">mvc</string>
-                                                       <string key="candidateClassName">NJMappingsViewController</string>
-                                               </object>
-                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">./Classes/NJMappingsController.h</string>
@@ -3701,7 +3685,6 @@ aW5nLg</string>
                                                </object>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="inputController">NJDeviceController</string>
                                                <string key="keyInput">NJKeyInputField</string>
                                                <string key="mappingPopup">NSPopUpButton</string>
                                                <string key="mappingsController">NJMappingsController</string>
@@ -3713,13 +3696,9 @@ aW5nLg</string>
                                                <string key="scrollSpeedSlider">NSSlider</string>
                                                <string key="smoothCheck">NSButton</string>
                                                <string key="title">NSTextField</string>
-                                               <string key="unknownMapping">NSBUtton</string>
+                                               <string key="unknownMapping">NSButton</string>
                                        </dictionary>
                                        <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="inputController">
-                                                       <string key="name">inputController</string>
-                                                       <string key="candidateClassName">NJDeviceController</string>
-                                               </object>
                                                <object class="IBToOneOutletInfo" key="keyInput">
                                                        <string key="name">keyInput</string>
                                                        <string key="candidateClassName">NJKeyInputField</string>
@@ -3766,7 +3745,7 @@ aW5nLg</string>
                                                </object>
                                                <object class="IBToOneOutletInfo" key="unknownMapping">
                                                        <string key="name">unknownMapping</string>
-                                                       <string key="candidateClassName">NSBUtton</string>
+                                                       <string key="candidateClassName">NSButton</string>
                                                </object>
                                        </dictionary>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">