Revent menu item change that shouldn't have been committed.

1 files changed, 90 insertions, 196 deletions

diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 61390f70..0dcd0af4 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1053"/>
+			<integer value="498"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1209,56 +1209,6 @@
 									<reference key="NSOnImage" ref="625762401"/>
 									<reference key="NSMixedImage" ref="315854375"/>
 								</object>
-								<object class="NSMenuItem" id="718502827">
-									<reference key="NSMenu" ref="466354362"/>
-									<string key="NSTitle">Favorites</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="625762401"/>
-									<reference key="NSMixedImage" ref="315854375"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="762202519">
-										<string key="NSTitle">Favorites</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="518910568">
-												<reference key="NSMenu" ref="762202519"/>
-												<bool key="NSIsDisabled">YES</bool>
-												<string key="NSTitle">Sort By</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="625762401"/>
-												<reference key="NSMixedImage" ref="315854375"/>
-											</object>
-											<object class="NSMenuItem" id="140524426">
-												<reference key="NSMenu" ref="762202519"/>
-												<string key="NSTitle">Name</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="625762401"/>
-												<reference key="NSMixedImage" ref="315854375"/>
-											</object>
-											<object class="NSMenuItem" id="281907004">
-												<reference key="NSMenu" ref="762202519"/>
-												<string key="NSTitle">Host</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="625762401"/>
-												<reference key="NSMixedImage" ref="315854375"/>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="38833747">
-									<reference key="NSMenu" ref="466354362"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="625762401"/>
-									<reference key="NSMixedImage" ref="315854375"/>
-								</object>
 								<object class="NSMenuItem" id="358795349">
 									<reference key="NSMenu" ref="466354362"/>
 									<string key="NSTitle">Hide Toolbar</string>
@@ -3422,52 +3372,6 @@
 						<reference key="parent" ref="171386461"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">498</int>
-						<reference key="object" ref="466354362"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="417888240"/>
-							<reference ref="388367969"/>
-							<reference ref="438779812"/>
-							<reference ref="510805568"/>
-							<reference ref="551338335"/>
-							<reference ref="924530602"/>
-							<reference ref="761247690"/>
-							<reference ref="173454563"/>
-							<reference ref="358795349"/>
-							<reference ref="998300902"/>
-							<reference ref="1058233714"/>
-							<reference ref="232357803"/>
-							<reference ref="937303212"/>
-							<reference ref="165449785"/>
-							<reference ref="756783652"/>
-							<reference ref="986291195"/>
-							<reference ref="718502827"/>
-							<reference ref="38833747"/>
-						</object>
-						<reference key="parent" ref="401969940"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">497</int>
-						<reference key="object" ref="417888240"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">499</int>
-						<reference key="object" ref="388367969"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">500</int>
-						<reference key="object" ref="438779812"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">504</int>
-						<reference key="object" ref="1058233714"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">627</int>
 						<reference key="object" ref="693420496"/>
 						<object class="NSMutableArray" key="children">
@@ -3703,21 +3607,6 @@
 						<reference key="parent" ref="172963563"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">789</int>
-						<reference key="object" ref="510805568"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">790</int>
-						<reference key="object" ref="551338335"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">791</int>
-						<reference key="object" ref="924530602"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">794</int>
 						<reference key="object" ref="615940863"/>
 						<reference key="parent" ref="90185757"/>
@@ -3728,21 +3617,6 @@
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">805</int>
-						<reference key="object" ref="761247690"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">806</int>
-						<reference key="object" ref="173454563"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">807</int>
-						<reference key="object" ref="358795349"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">386</int>
 						<reference key="object" ref="933751314"/>
 						<object class="NSMutableArray" key="children">
@@ -4192,11 +4066,6 @@
 						<reference key="parent" ref="71086556"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">928</int>
-						<reference key="object" ref="998300902"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">930</int>
 						<reference key="object" ref="536279428"/>
 						<reference key="parent" ref="277457689"/>
@@ -4297,21 +4166,6 @@
 						<reference key="parent" ref="850647710"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">990</int>
-						<reference key="object" ref="232357803"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">991</int>
-						<reference key="object" ref="937303212"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">992</int>
-						<reference key="object" ref="165449785"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">996</int>
 						<reference key="object" ref="718573983"/>
 						<reference key="parent" ref="172963563"/>
@@ -4375,11 +4229,6 @@
 						<reference key="parent" ref="172963563"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1038</int>
-						<reference key="object" ref="756783652"/>
-						<reference key="parent" ref="466354362"/>
-					</object>
-					<object class="IBObjectRecord">
 						<int key="objectID">1041</int>
 						<reference key="object" ref="759561673"/>
 						<reference key="parent" ref="1056168652"/>
@@ -4405,49 +4254,108 @@
 						<reference key="parent" ref="1021151289"/>
 					</object>
 					<object class="IBObjectRecord">
+						<int key="objectID">498</int>
+						<reference key="object" ref="466354362"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="986291195"/>
+							<reference ref="756783652"/>
+							<reference ref="165449785"/>
+							<reference ref="937303212"/>
+							<reference ref="232357803"/>
+							<reference ref="1058233714"/>
+							<reference ref="998300902"/>
+							<reference ref="358795349"/>
+							<reference ref="173454563"/>
+							<reference ref="761247690"/>
+							<reference ref="924530602"/>
+							<reference ref="551338335"/>
+							<reference ref="510805568"/>
+							<reference ref="438779812"/>
+							<reference ref="388367969"/>
+							<reference ref="417888240"/>
+						</object>
+						<reference key="parent" ref="401969940"/>
+					</object>
+					<object class="IBObjectRecord">
 						<int key="objectID">1050</int>
 						<reference key="object" ref="986291195"/>
 						<reference key="parent" ref="466354362"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1052</int>
-						<reference key="object" ref="718502827"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="762202519"/>
-						</object>
+						<int key="objectID">1038</int>
+						<reference key="object" ref="756783652"/>
 						<reference key="parent" ref="466354362"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1053</int>
-						<reference key="object" ref="762202519"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="518910568"/>
-							<reference ref="140524426"/>
-							<reference ref="281907004"/>
-						</object>
-						<reference key="parent" ref="718502827"/>
+						<int key="objectID">992</int>
+						<reference key="object" ref="165449785"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">991</int>
+						<reference key="object" ref="937303212"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">990</int>
+						<reference key="object" ref="232357803"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">504</int>
+						<reference key="object" ref="1058233714"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">928</int>
+						<reference key="object" ref="998300902"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">807</int>
+						<reference key="object" ref="358795349"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">806</int>
+						<reference key="object" ref="173454563"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">805</int>
+						<reference key="object" ref="761247690"/>
+						<reference key="parent" ref="466354362"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1054</int>
-						<reference key="object" ref="518910568"/>
-						<reference key="parent" ref="762202519"/>
+						<int key="objectID">791</int>
+						<reference key="object" ref="924530602"/>
+						<reference key="parent" ref="466354362"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1055</int>
-						<reference key="object" ref="38833747"/>
+						<int key="objectID">790</int>
+						<reference key="object" ref="551338335"/>
 						<reference key="parent" ref="466354362"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1056</int>
-						<reference key="object" ref="140524426"/>
-						<reference key="parent" ref="762202519"/>
+						<int key="objectID">789</int>
+						<reference key="object" ref="510805568"/>
+						<reference key="parent" ref="466354362"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">1057</int>
-						<reference key="object" ref="281907004"/>
-						<reference key="parent" ref="762202519"/>
+						<int key="objectID">500</int>
+						<reference key="object" ref="438779812"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">499</int>
+						<reference key="object" ref="388367969"/>
+						<reference key="parent" ref="466354362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="417888240"/>
+						<reference key="parent" ref="466354362"/>
 					</object>
 				</object>
 			</object>
@@ -4477,13 +4385,6 @@
 					<string>1047.IBPluginDependency</string>
 					<string>1048.IBPluginDependency</string>
 					<string>1050.IBPluginDependency</string>
-					<string>1052.IBPluginDependency</string>
-					<string>1053.IBEditorWindowLastContentRect</string>
-					<string>1053.IBPluginDependency</string>
-					<string>1054.IBPluginDependency</string>
-					<string>1055.IBPluginDependency</string>
-					<string>1056.IBPluginDependency</string>
-					<string>1057.IBPluginDependency</string>
 					<string>106.IBEditorWindowLastContentRect</string>
 					<string>106.IBPluginDependency</string>
 					<string>106.ImportedFromIB2</string>
@@ -4852,13 +4753,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{765, 511}, {99, 63}}</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{824, 199}, {204, 153}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -4910,7 +4804,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{387, 375}, {280, 283}}</string>
+					<string>{{470, 541}, {280, 283}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{654, 613}, {157, 223}}</string>
@@ -4995,7 +4889,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{514, 501}, {251, 323}}</string>
+					<string>{{514, 531}, {251, 293}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{698, 703}, {184, 133}}</string>
@@ -5452,7 +5346,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="422703120">
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="472462125">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Source/SPQueryFavoriteManager.h</string>
 					</object>
@@ -5802,7 +5696,7 @@
 							<string>BWAnchoredButtonBar</string>
 						</object>
 					</object>
-					<reference key="sourceIdentifier" ref="422703120"/>
+					<reference key="sourceIdentifier" ref="472462125"/>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">SPServerVariablesController</string>