X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=English.lproj%2FMainMenu.xib;h=cd9a1b9281fd43bab4a315520c297133a3616d2b;hp=402d345839306c869d64ca1516210c352d8c2d94;hb=56d825ba259066d847a9fc3f9c8c0c0a362a1507;hpb=ce24f5cc4eb879f248f3363663c5330a06b1046f

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 402d345..cd9a1b9 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -27,6 +27,8 @@
 			<string>NSScroller</string>
 			<string>NSSegmentedCell</string>
 			<string>NSSegmentedControl</string>
+			<string>NSSlider</string>
+			<string>NSSliderCell</string>
 			<string>NSSplitView</string>
 			<string>NSTableColumn</string>
 			<string>NSTableView</string>
@@ -329,7 +331,7 @@
 			<object class="NSWindowTemplate" id="808667431">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{355, 59}, {640, 300}}</string>
+				<string key="NSWindowRect">{{355, 59}, {640, 320}}</string>
 				<int key="NSWTFlags">1685585920</int>
 				<string key="NSWindowTitle">Enjoyable</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -353,12 +355,9 @@
 							<string key="NSToolbarItemPaletteLabel">Enabled</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="385218002">
-								<reference key="NSNextResponder"/>
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<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="422366518">
@@ -404,12 +403,9 @@
 							<string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="227597319">
-								<reference key="NSNextResponder"/>
+								<nil key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<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="NSButtonCell" key="NSCell" id="850080795">
@@ -484,7 +480,7 @@
 					<array key="NSToolbarIBSelectableItems" id="0"/>
 				</object>
 				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{640, 300}</string>
+				<string key="NSWindowContentMinSize">{640, 320}</string>
 				<object class="NSView" key="NSWindowView" id="177223957">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -508,7 +504,7 @@
 														<object class="NSOutlineView" id="365506042">
 															<reference key="NSNextResponder" ref="698362889"/>
 															<int key="NSvFlags">256</int>
-															<string key="NSFrameSize">{200, 298}</string>
+															<string key="NSFrameSize">{200, 318}</string>
 															<reference key="NSSuperview" ref="698362889"/>
 															<reference key="NSWindow"/>
 															<reference key="NSNextKeyView" ref="1036252745"/>
@@ -604,7 +600,7 @@
 															<bool key="NSOutlineViewAutoresizesOutlineColumnKey">NO</bool>
 														</object>
 													</array>
-													<string key="NSFrame">{{1, 1}, {200, 298}}</string>
+													<string key="NSFrame">{{1, 1}, {200, 318}}</string>
 													<reference key="NSSuperview" ref="364857164"/>
 													<reference key="NSWindow"/>
 													<reference key="NSNextKeyView" ref="365506042"/>
@@ -638,7 +634,7 @@
 													<double key="NSPercent">0.99789030000000001</double>
 												</object>
 											</array>
-											<string key="NSFrameSize">{202, 300}</string>
+											<string key="NSFrameSize">{202, 320}</string>
 											<reference key="NSSuperview" ref="977242492"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="892486973"/>
@@ -652,7 +648,7 @@
 											<double key="NSMagnification">1</double>
 										</object>
 									</array>
-									<string key="NSFrameSize">{202, 300}</string>
+									<string key="NSFrameSize">{202, 320}</string>
 									<reference key="NSSuperview" ref="206489479"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="364857164"/>
@@ -662,38 +658,96 @@
 									<reference key="NSNextResponder" ref="206489479"/>
 									<int key="NSvFlags">256</int>
 									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSSegmentedControl" id="875916470">
+										<object class="NSSlider" id="792189805">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{227, 123}, {180, 24}}</string>
+											<string key="NSFrame">{{228, 21}, {130, 12}}</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="NSSliderCell" key="NSCell" id="423057230">
+												<int key="NSCellFlags">-2080374784</int>
+												<int key="NSCellFlags2">262144</int>
+												<string key="NSContents"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="792189805"/>
+												<double key="NSMaxValue">30</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">15</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">0</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSlider" id="385416822">
+											<reference key="NSNextResponder" ref="606740242"/>
+											<int key="NSvFlags">265</int>
+											<string key="NSFrame">{{228, 107}, {176, 12}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="125828224"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
+											<object class="NSSliderCell" key="NSCell" id="5417367">
+												<int key="NSCellFlags">-2080374784</int>
+												<int key="NSCellFlags2">262144</int>
+												<string key="NSContents"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="385416822"/>
+												<double key="NSMaxValue">20</double>
+												<double key="NSMinValue">0.0</double>
+												<double key="NSValue">4</double>
+												<double key="NSAltIncValue">0.0</double>
+												<int key="NSNumberOfTickMarks">0</int>
+												<int key="NSTickMarkPosition">1</int>
+												<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
+												<bool key="NSVertical">NO</bool>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSSegmentedControl" id="875916470">
+											<reference key="NSNextResponder" ref="606740242"/>
+											<int key="NSvFlags">265</int>
+											<string key="NSFrame">{{226, 117}, {180, 20}}</string>
+											<reference key="NSSuperview" ref="606740242"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="385416822"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
 											<object class="NSSegmentedCell" key="NSCell" id="241270212">
 												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">0</int>
-												<object class="NSFont" key="NSSupport" id="515740949">
-													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">13</double>
-													<int key="NSfFlags">16</int>
-												</object>
+												<int key="NSCellFlags2">131072</int>
+												<reference key="NSSupport" ref="26"/>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="875916470"/>
 												<array class="NSMutableArray" key="NSSegmentImages">
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">87</double>
-														<string key="NSSegmentItemLabel">Horizontal</string>
+														<double key="NSSegmentItemWidth">44</double>
+														<string key="NSSegmentItemLabel">←</string>
 														<bool key="NSSegmentItemSelected">YES</bool>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">86</double>
-														<string key="NSSegmentItemLabel">Vertical</string>
+														<double key="NSSegmentItemWidth">44</double>
+														<string key="NSSegmentItemLabel">→</string>
 														<int key="NSSegmentItemTag">1</int>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
+													<object class="NSSegmentItem">
+														<double key="NSSegmentItemWidth">42</double>
+														<string key="NSSegmentItemLabel">↑</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
+													<object class="NSSegmentItem">
+														<double key="NSSegmentItemWidth">41</double>
+														<string key="NSSegmentItemLabel">↓</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
 												</array>
 												<int key="NSSegmentStyle">1</int>
 											</object>
@@ -702,31 +756,43 @@
 										<object class="NSSegmentedControl" id="921829691">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{227, 55}, {180, 24}}</string>
+											<string key="NSFrame">{{226, 31}, {180, 20}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView"/>
+											<reference key="NSNextKeyView" ref="792189805"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSSegmentedCell" key="NSCell" id="301345285">
 												<int key="NSCellFlags">67108864</int>
-												<int key="NSCellFlags2">0</int>
-												<reference key="NSSupport" ref="515740949"/>
+												<int key="NSCellFlags2">131072</int>
+												<reference key="NSSupport" ref="26"/>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="921829691"/>
 												<array class="NSMutableArray" key="NSSegmentImages">
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">87</double>
-														<string key="NSSegmentItemLabel">Up</string>
+														<double key="NSSegmentItemWidth">64</double>
+														<string key="NSSegmentItemLabel">↑</string>
+														<string key="NSSegmentItemTooltip">Scroll up continuously</string>
 														<bool key="NSSegmentItemSelected">YES</bool>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
 													<object class="NSSegmentItem">
-														<double key="NSSegmentItemWidth">86</double>
-														<string key="NSSegmentItemLabel">Down</string>
+														<double key="NSSegmentItemWidth">63</double>
+														<string key="NSSegmentItemLabel">↓</string>
+														<string key="NSSegmentItemTooltip">Scroll down continuously</string>
 														<int key="NSSegmentItemTag">1</int>
 														<int key="NSSegmentItemImageScaling">0</int>
 													</object>
+													<object class="NSSegmentItem">
+														<string key="NSSegmentItemLabel">⤒</string>
+														<string key="NSSegmentItemTooltip">Scroll up one step</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
+													<object class="NSSegmentItem">
+														<string key="NSSegmentItemLabel">⤓</string>
+														<string key="NSSegmentItemTooltip">Scroll down one step</string>
+														<int key="NSSegmentItemImageScaling">0</int>
+													</object>
 												</array>
 												<int key="NSSegmentStyle">1</int>
 											</object>
@@ -735,7 +801,7 @@
 										<object class="NSSegmentedControl" id="125828224">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{227, 89}, {180, 24}}</string>
+											<string key="NSFrame">{{226, 67}, {180, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="921829691"/>
@@ -744,7 +810,11 @@
 											<object class="NSSegmentedCell" key="NSCell" id="514491330">
 												<int key="NSCellFlags">67108864</int>
 												<int key="NSCellFlags2">0</int>
-												<reference key="NSSupport" ref="515740949"/>
+												<object class="NSFont" key="NSSupport">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">16</int>
+												</object>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="125828224"/>
 												<array class="NSMutableArray" key="NSSegmentImages">
@@ -768,7 +838,7 @@
 										<object class="NSCustomView" id="57697638">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{229, 190}, {176, 24}}</string>
+											<string key="NSFrame">{{228, 197}, {176, 24}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="194275224"/>
@@ -778,7 +848,7 @@
 										<object class="NSPopUpButton" id="194275224">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">265</int>
-											<string key="NSFrame">{{226, 156}, {182, 26}}</string>
+											<string key="NSFrame">{{225, 152}, {182, 26}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="875916470"/>
@@ -811,12 +881,12 @@
 										<object class="NSMatrix" id="120408205">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{20, 16}, {201, 236}}</string>
+											<string key="NSFrame">{{20, 16}, {200, 256}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="57697638"/>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-											<int key="NSNumRows">7</int>
+											<int key="NSNumRows">6</int>
 											<int key="NSNumCols">1</int>
 											<array class="NSMutableArray" key="NSCells">
 												<object class="NSButtonCell" id="177186415">
@@ -910,22 +980,8 @@
 													<int key="NSPeriodicDelay">400</int>
 													<int key="NSPeriodicInterval">75</int>
 												</object>
-												<object class="NSButtonCell" id="211076068">
-													<int key="NSCellFlags">603979776</int>
-													<int key="NSCellFlags2">0</int>
-													<string key="NSContents">Switch mouse mode</string>
-													<reference key="NSSupport" ref="45863614"/>
-													<reference key="NSControlView" ref="120408205"/>
-													<int key="NSButtonFlags">1211912448</int>
-													<int key="NSButtonFlags2">0</int>
-													<reference key="NSNormalImage" ref="421587711"/>
-													<reference key="NSAlternateImage" ref="68833793"/>
-													<string key="NSAlternateContents"/>
-													<int key="NSPeriodicDelay">400</int>
-													<int key="NSPeriodicInterval">75</int>
-												</object>
 											</array>
-											<string key="NSCellSize">{201, 32}</string>
+											<string key="NSCellSize">{200, 41}</string>
 											<string key="NSIntercellSpacing">{4, 2}</string>
 											<int key="NSMatrixFlags">1353195520</int>
 											<string key="NSCellClass">NSActionCell</string>
@@ -956,7 +1012,7 @@
 										<object class="NSTextField" id="1016088174">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">266</int>
-											<string key="NSFrame">{{0, 269}, {429, 17}}</string>
+											<string key="NSFrame">{{0, 289}, {429, 17}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="497528019"/>
@@ -980,7 +1036,7 @@
 										<object class="NSBox" id="497528019">
 											<reference key="NSNextResponder" ref="606740242"/>
 											<int key="NSvFlags">10</int>
-											<string key="NSFrame">{{12, 258}, {405, 5}}</string>
+											<string key="NSFrame">{{12, 278}, {405, 5}}</string>
 											<reference key="NSSuperview" ref="606740242"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="120408205"/>
@@ -1007,27 +1063,39 @@
 											<bool key="NSTransparent">NO</bool>
 										</object>
 									</array>
-									<string key="NSFrame">{{211, 0}, {429, 300}}</string>
+									<string key="NSFrame">{{211, 0}, {429, 320}}</string>
 									<reference key="NSSuperview" ref="206489479"/>
 									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1016088174"/>
 									<string key="NSClassName">NSView</string>
 								</object>
 							</array>
-							<string key="NSFrameSize">{640, 300}</string>
+							<string key="NSFrameSize">{640, 320}</string>
 							<reference key="NSSuperview" ref="177223957"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="977242492"/>
 							<bool key="NSIsVertical">YES</bool>
+							<string key="NSAutosaveName">Main Split</string>
+							<object class="NSMutableDictionary" key="NSHoldingPriorities">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<array key="dict.sortedKeys">
+									<integer value="0"/>
+									<integer value="1"/>
+								</array>
+								<array key="dict.values">
+									<real value="250"/>
+									<real value="250"/>
+								</array>
+							</object>
 						</object>
 					</array>
-					<string key="NSFrameSize">{640, 300}</string>
+					<string key="NSFrameSize">{640, 320}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="206489479"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
-				<string key="NSMinSize">{640, 355}</string>
+				<string key="NSMinSize">{640, 375}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
 				<string key="NSFrameAutosaveName">Enjoyable</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
@@ -1155,10 +1223,10 @@
 					<object class="NSButton" id="149148392">
 						<reference key="NSNextResponder" ref="671181514"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{66, -1}, {134, 23}}</string>
+						<string key="NSFrame">{{66, -1}, {68, 23}}</string>
 						<reference key="NSSuperview" ref="671181514"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="1023366520"/>
 						<string key="NSReuseIdentifierKey">_NS:22</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="517346822">
@@ -1208,6 +1276,52 @@
 						</object>
 						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 					</object>
+					<object class="NSButton" id="1043784903">
+						<reference key="NSNextResponder" ref="671181514"/>
+						<int key="NSvFlags">292</int>
+						<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>
+							<int key="NSCellFlags2">134479872</int>
+							<string key="NSContents">⬇</string>
+							<reference key="NSSupport" ref="22"/>
+							<reference key="NSControlView" ref="1043784903"/>
+							<int key="NSButtonFlags">-2033434624</int>
+							<int key="NSButtonFlags2">268435618</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"></string>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
+					<object class="NSButton" id="1023366520">
+						<reference key="NSNextResponder" ref="671181514"/>
+						<int key="NSvFlags">292</int>
+						<string key="NSFrame">{{133, -1}, {34, 23}}</string>
+						<reference key="NSSuperview" ref="671181514"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1043784903"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="57592747">
+							<int key="NSCellFlags">67108864</int>
+							<int key="NSCellFlags2">134479872</int>
+							<string key="NSContents">⬆</string>
+							<reference key="NSSupport" ref="22"/>
+							<reference key="NSControlView" ref="1023366520"/>
+							<int key="NSButtonFlags">-2033434624</int>
+							<int key="NSButtonFlags2">268435618</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"></string>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+						<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+					</object>
 					<object class="NSButton" id="456935010">
 						<reference key="NSNextResponder" ref="671181514"/>
 						<int key="NSvFlags">292</int>
@@ -1530,6 +1644,38 @@
 					</object>
 					<int key="connectionID">515</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveUpPressed:</string>
+						<reference key="source" ref="468285243"/>
+						<reference key="destination" ref="1023366520"/>
+					</object>
+					<int key="connectionID">899</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">moveDownPressed:</string>
+						<reference key="source" ref="468285243"/>
+						<reference key="destination" ref="1043784903"/>
+					</object>
+					<int key="connectionID">900</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">moveUp</string>
+						<reference key="source" ref="468285243"/>
+						<reference key="destination" ref="1023366520"/>
+					</object>
+					<int key="connectionID">901</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">moveDown</string>
+						<reference key="source" ref="468285243"/>
+						<reference key="destination" ref="1043784903"/>
+					</object>
+					<int key="connectionID">902</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -1546,6 +1692,14 @@
 					</object>
 					<int key="connectionID">696</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="206489479"/>
+						<reference key="destination" ref="207406104"/>
+					</object>
+					<int key="connectionID">892</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">radioButtons</string>
@@ -1650,6 +1804,38 @@
 					</object>
 					<int key="connectionID">828</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">mouseSpeedChanged:</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="385416822"/>
+					</object>
+					<int key="connectionID">885</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">mouseSpeedSlider</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="385416822"/>
+					</object>
+					<int key="connectionID">886</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">scrollSpeedChanged:</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="792189805"/>
+					</object>
+					<int key="connectionID">890</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">scrollSpeedSlider</string>
+						<reference key="source" ref="801536542"/>
+						<reference key="destination" ref="792189805"/>
+					</object>
+					<int key="connectionID">891</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">keyDelegate</string>
@@ -1892,6 +2078,8 @@
 							<reference ref="456935010"/>
 							<reference ref="149148392"/>
 							<reference ref="861276216"/>
+							<reference ref="1023366520"/>
+							<reference ref="1043784903"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Mapping List Popover Content</string>
@@ -2056,13 +2244,15 @@
 						<reference key="object" ref="606740242"/>
 						<array class="NSMutableArray" key="children">
 							<reference ref="497528019"/>
-							<reference ref="120408205"/>
 							<reference ref="921829691"/>
 							<reference ref="125828224"/>
 							<reference ref="875916470"/>
 							<reference ref="1016088174"/>
 							<reference ref="194275224"/>
 							<reference ref="57697638"/>
+							<reference ref="792189805"/>
+							<reference ref="385416822"/>
+							<reference ref="120408205"/>
 						</array>
 						<reference key="parent" ref="206489479"/>
 						<string key="objectName">Output Editor Pane</string>
@@ -2083,7 +2273,6 @@
 							<reference ref="820968178"/>
 							<reference ref="275466816"/>
 							<reference ref="134694197"/>
-							<reference ref="211076068"/>
 						</array>
 						<reference key="parent" ref="606740242"/>
 						<string key="objectName">Output Types</string>
@@ -2190,12 +2379,6 @@
 						<reference key="object" ref="514491330"/>
 						<reference key="parent" ref="125828224"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">748</int>
-						<reference key="object" ref="211076068"/>
-						<reference key="parent" ref="120408205"/>
-						<string key="objectName">Switch Mouse Mode</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">749</int>
 						<reference key="object" ref="921829691"/>
@@ -2358,6 +2541,60 @@
 						<reference key="object" ref="422366518"/>
 						<reference key="parent" ref="385218002"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">883</int>
+						<reference key="object" ref="385416822"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="5417367"/>
+						</array>
+						<reference key="parent" ref="606740242"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">884</int>
+						<reference key="object" ref="5417367"/>
+						<reference key="parent" ref="385416822"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">887</int>
+						<reference key="object" ref="792189805"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="423057230"/>
+						</array>
+						<reference key="parent" ref="606740242"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">888</int>
+						<reference key="object" ref="423057230"/>
+						<reference key="parent" ref="792189805"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">893</int>
+						<reference key="object" ref="1023366520"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="57592747"/>
+						</array>
+						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Move Mapping Up</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">894</int>
+						<reference key="object" ref="57592747"/>
+						<reference key="parent" ref="1023366520"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">896</int>
+						<reference key="object" ref="1043784903"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="828611353"/>
+						</array>
+						<reference key="parent" ref="671181514"/>
+						<string key="objectName">Move Mapping Down</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">897</int>
+						<reference key="object" ref="828611353"/>
+						<reference key="parent" ref="1043784903"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2446,11 +2683,10 @@
 				<string key="734.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="735.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="744.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="745.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<integer value="1" key="745.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="745.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="748.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="749.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<integer value="0" key="750.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
+				<integer value="1" key="750.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
 				<string key="750.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="754.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<integer value="1" key="755.IBNSSegmentedControlInspectorSelectedSegmentMetadataKey"/>
@@ -2493,13 +2729,53 @@
 				<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>
+				<object class="NSMutableDictionary" key="883.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="385416822"/>
+						<string key="toolTip">Maximum mouse speed</string>
+					</object>
+				</object>
+				<string key="883.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="884.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="887.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="792189805"/>
+						<string key="toolTip">Mouse scroll speed</string>
+					</object>
+				</object>
+				<string key="887.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="888.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="893.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1023366520"/>
+						<string key="toolTip">Move the selected mapping up the list</string>
+					</object>
+				</object>
+				<string key="893.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="894.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="896.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="1043784903"/>
+						<string key="toolTip">Move the selected mapping down the list</string>
+					</object>
+				</object>
+				<string key="896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="897.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">880</int>
+			<int key="maxID">902</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2610,6 +2886,8 @@
 						<string key="exportPressed:">id</string>
 						<string key="importPressed:">id</string>
 						<string key="mappingPressed:">id</string>
+						<string key="moveDownPressed:">id</string>
+						<string key="moveUpPressed:">id</string>
 						<string key="removePressed:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -2629,12 +2907,22 @@
 							<string key="name">mappingPressed:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="moveDownPressed:">
+							<string key="name">moveDownPressed:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="moveUpPressed:">
+							<string key="name">moveUpPressed:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="removePressed:">
 							<string key="name">removePressed:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="moveDown">NSButton</string>
+						<string key="moveUp">NSButton</string>
 						<string key="outputController">NJOutputController</string>
 						<string key="popover">NSPopover</string>
 						<string key="popoverActivate">NSButton</string>
@@ -2642,6 +2930,14 @@
 						<string key="tableView">NSTableView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="moveDown">
+							<string key="name">moveDown</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="moveUp">
+							<string key="name">moveUp</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="outputController">
 							<string key="name">outputController</string>
 							<string key="candidateClassName">NJOutputController</string>
@@ -2674,7 +2970,9 @@
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="mbtnChanged:">id</string>
 						<string key="mdirChanged:">id</string>
+						<string key="mouseSpeedChanged:">id</string>
 						<string key="radioChanged:">id</string>
+						<string key="scrollSpeedChanged:">id</string>
 						<string key="sdirChanged:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -2686,10 +2984,18 @@
 							<string key="name">mdirChanged:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="mouseSpeedChanged:">
+							<string key="name">mouseSpeedChanged:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="radioChanged:">
 							<string key="name">radioChanged:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="scrollSpeedChanged:">
+							<string key="name">scrollSpeedChanged:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="sdirChanged:">
 							<string key="name">sdirChanged:</string>
 							<string key="candidateClassName">id</string>
@@ -2702,8 +3008,10 @@
 						<string key="mappingsController">NJMappingsController</string>
 						<string key="mouseBtnSelect">NSSegmentedControl</string>
 						<string key="mouseDirSelect">NSSegmentedControl</string>
+						<string key="mouseSpeedSlider">NSSlider</string>
 						<string key="radioButtons">NSMatrix</string>
 						<string key="scrollDirSelect">NSSegmentedControl</string>
+						<string key="scrollSpeedSlider">NSSlider</string>
 						<string key="title">NSTextField</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -2731,6 +3039,10 @@
 							<string key="name">mouseDirSelect</string>
 							<string key="candidateClassName">NSSegmentedControl</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="mouseSpeedSlider">
+							<string key="name">mouseSpeedSlider</string>
+							<string key="candidateClassName">NSSlider</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="radioButtons">
 							<string key="name">radioButtons</string>
 							<string key="candidateClassName">NSMatrix</string>
@@ -2739,6 +3051,10 @@
 							<string key="name">scrollDirSelect</string>
 							<string key="candidateClassName">NSSegmentedControl</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="scrollSpeedSlider">
+							<string key="name">scrollSpeedSlider</string>
+							<string key="candidateClassName">NSSlider</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="title">
 							<string key="name">title</string>
 							<string key="candidateClassName">NSTextField</string>