From 43277ae33935e14932f220224e86f2d3da8cb59b Mon Sep 17 00:00:00 2001
From: Nick Loose <nick@flabs.org>
Date: Sun, 21 Nov 2010 15:39:57 +0100
Subject: [PATCH] Reorganized Tools Menu in Time and Inventory

---
 English.lproj/MainMenu.xib | 257 ++++++++++++++++++++++++-------------
 1 file changed, 168 insertions(+), 89 deletions(-)

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index c32fdc3..d53f893 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -13,7 +13,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="372"/>
-			<integer value="701"/>
+			<integer value="724"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -393,31 +393,47 @@
 							<string key="NSTitle">Tools</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="816451080">
+								<object class="NSMenuItem" id="649999378">
 									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Save Inventory</string>
-									<string key="NSKeyEquiv">S</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="241177871">
-									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Load Inventory</string>
+									<string key="NSTitle">Inventory</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="946595032">
-									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Clear Inventory</string>
-									<string key="NSKeyEquiv">C</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<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="1052334567">
+										<string key="NSTitle">Inventory</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="816451080">
+												<reference key="NSMenu" ref="1052334567"/>
+												<string key="NSTitle">Save Inventory</string>
+												<string key="NSKeyEquiv">S</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="1012698671">
+												<reference key="NSMenu" ref="1052334567"/>
+												<string key="NSTitle">Load Inventory</string>
+												<string key="NSKeyEquiv">L</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="946595032">
+												<reference key="NSMenu" ref="1052334567"/>
+												<string key="NSTitle">Clear Inventory</string>
+												<string key="NSKeyEquiv">C</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</object>
+									</object>
 								</object>
 								<object class="NSMenuItem" id="864243634">
 									<reference key="NSMenu" ref="500439511"/>
@@ -429,41 +445,56 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
-								<object class="NSMenuItem" id="195507455">
+								<object class="NSMenuItem" id="115229138">
 									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Next Sunrise</string>
-									<string key="NSKeyEquiv">R</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="234384199">
-									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Next Noon</string>
-									<string key="NSKeyEquiv">N</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="431631770">
-									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Next Nightfall</string>
-									<string key="NSKeyEquiv">F</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="19459331">
-									<reference key="NSMenu" ref="500439511"/>
-									<string key="NSTitle">Next Midnight</string>
-									<string key="NSKeyEquiv">M</string>
-									<int key="NSKeyEquivModMask">1048576</int>
+									<string key="NSTitle">Time</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="433773752">
+										<string key="NSTitle">Time</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="195507455">
+												<reference key="NSMenu" ref="433773752"/>
+												<string key="NSTitle">Next Sunrise</string>
+												<string key="NSKeyEquiv">R</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="234384199">
+												<reference key="NSMenu" ref="433773752"/>
+												<string key="NSTitle">Next Noon</string>
+												<string key="NSKeyEquiv">N</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="431631770">
+												<reference key="NSMenu" ref="433773752"/>
+												<string key="NSTitle">Next Nightfall</string>
+												<string key="NSKeyEquiv">F</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+											<object class="NSMenuItem" id="19459331">
+												<reference key="NSMenu" ref="433773752"/>
+												<string key="NSTitle">Next Midnight</string>
+												<string key="NSKeyEquiv">M</string>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</object>
+									</object>
 								</object>
 							</object>
 						</object>
@@ -1508,7 +1539,7 @@
 					<object class="IBActionConnection" key="connection">
 						<string key="label">loadInventoryItems:</string>
 						<reference key="source" ref="760161335"/>
-						<reference key="destination" ref="241177871"/>
+						<reference key="destination" ref="1012698671"/>
 					</object>
 					<int key="connectionID">722</int>
 				</object>
@@ -2105,56 +2136,92 @@
 						<reference key="object" ref="500439511"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="195507455"/>
-							<reference ref="431631770"/>
-							<reference ref="19459331"/>
-							<reference ref="234384199"/>
-							<reference ref="946595032"/>
 							<reference ref="864243634"/>
-							<reference ref="816451080"/>
-							<reference ref="241177871"/>
+							<reference ref="649999378"/>
+							<reference ref="115229138"/>
 						</object>
 						<reference key="parent" ref="1003822312"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">702</int>
-						<reference key="object" ref="195507455"/>
-						<reference key="parent" ref="500439511"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">706</int>
-						<reference key="object" ref="431631770"/>
-						<reference key="parent" ref="500439511"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">709</int>
-						<reference key="object" ref="19459331"/>
-						<reference key="parent" ref="500439511"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">711</int>
-						<reference key="object" ref="234384199"/>
-						<reference key="parent" ref="500439511"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">713</int>
 						<reference key="object" ref="864243634"/>
 						<reference key="parent" ref="500439511"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">723</int>
+						<reference key="object" ref="649999378"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1052334567"/>
+						</object>
+						<reference key="parent" ref="500439511"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">724</int>
+						<reference key="object" ref="1052334567"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="946595032"/>
+							<reference ref="1012698671"/>
+							<reference ref="816451080"/>
+						</object>
+						<reference key="parent" ref="649999378"/>
+					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">714</int>
 						<reference key="object" ref="946595032"/>
-						<reference key="parent" ref="500439511"/>
+						<reference key="parent" ref="1052334567"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">721</int>
+						<reference key="object" ref="1012698671"/>
+						<reference key="parent" ref="1052334567"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">717</int>
 						<reference key="object" ref="816451080"/>
+						<reference key="parent" ref="1052334567"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">726</int>
+						<reference key="object" ref="115229138"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="433773752"/>
+						</object>
 						<reference key="parent" ref="500439511"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">721</int>
-						<reference key="object" ref="241177871"/>
-						<reference key="parent" ref="500439511"/>
+						<int key="objectID">727</int>
+						<reference key="object" ref="433773752"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="195507455"/>
+							<reference ref="234384199"/>
+							<reference ref="431631770"/>
+							<reference ref="19459331"/>
+						</object>
+						<reference key="parent" ref="115229138"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">702</int>
+						<reference key="object" ref="195507455"/>
+						<reference key="parent" ref="433773752"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">711</int>
+						<reference key="object" ref="234384199"/>
+						<reference key="parent" ref="433773752"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">706</int>
+						<reference key="object" ref="431631770"/>
+						<reference key="parent" ref="433773752"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">709</int>
+						<reference key="object" ref="19459331"/>
+						<reference key="parent" ref="433773752"/>
 					</object>
 				</object>
 			</object>
@@ -2307,6 +2374,12 @@
 					<string>714.IBPluginDependency</string>
 					<string>717.IBPluginDependency</string>
 					<string>721.IBPluginDependency</string>
+					<string>723.IBPluginDependency</string>
+					<string>724.IBEditorWindowLastContentRect</string>
+					<string>724.IBPluginDependency</string>
+					<string>726.IBPluginDependency</string>
+					<string>727.IBEditorWindowLastContentRect</string>
+					<string>727.IBPluginDependency</string>
 					<string>75.IBPluginDependency</string>
 					<string>75.ImportedFromIB2</string>
 					<string>81.IBEditorWindowLastContentRect</string>
@@ -2378,14 +2451,14 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{525, 802}, {197, 73}}</string>
-					<string>{{380, 836}, {393, 20}}</string>
+					<string>{{380, 1136}, {393, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{74, 862}</string>
 					<string>{{6, 978}, {478, 20}}</string>
-					<string>{{855, 52}, {585, 396}}</string>
+					<string>{{855, 83}, {585, 396}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{855, 52}, {585, 396}}</string>
+					<string>{{855, 83}, {585, 396}}</string>
 					<integer value="1"/>
 					<string>{{33, 99}, {480, 360}}</string>
 					<string>{3.40282e+38, 3.40282e+38}</string>
@@ -2478,7 +2551,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{585, 683}, {195, 153}}</string>
+					<string>{{585, 1083}, {193, 53}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2489,6 +2562,12 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{778, 1073}, {192, 63}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{778, 1023}, {189, 83}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{483, 773}, {178, 63}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2516,7 +2595,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">722</int>
+			<int key="maxID">728</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">