- Rework the Add Index indexes menu and the auto_increment index required menu to use tag-based values when generating queries, allowing localisation of menu contents without using those localised values in queries. This addresses I$

 - Remove the ability to specify a FULLTEXT auto_increment index, as I believe this isn't possible.
 - Prevent sheet reuse from specifying invalid storage types for PRIMARY KEYs
 - Fix exceptions when adding indexes to a table where every field is already indexed
 - Fix initialField/indexedFieldNames check to improve on r3061
 - Fix toggling advanced index view after closing the sheet with the view open
 - Update localisable strings

1 files changed, 255 insertions, 94 deletions

diff --git a/Interfaces/English.lproj/IndexesView.xib b/Interfaces/English.lproj/IndexesView.xib
index 524fa1b7..2489b11c 100644
--- a/Interfaces/English.lproj/IndexesView.xib
+++ b/Interfaces/English.lproj/IndexesView.xib
@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">10F569</string>
-		<string key="IBDocument.InterfaceBuilderVersion">804</string>
-		<string key="IBDocument.AppKitVersion">1038.29</string>
+		<string key="IBDocument.SystemVersion">10H574</string>
+		<string key="IBDocument.InterfaceBuilderVersion">788</string>
+		<string key="IBDocument.AppKitVersion">1038.35</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15,18 +15,17 @@
 			</object>
 			<object class="NSMutableArray" key="dict.values">
 				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>804</string>
+				<string>788</string>
 				<string>1.2.5</string>
 			</object>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="4"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.brandonwalkin.BWToolkit</string>
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string>com.brandonwalkin.BWToolkit</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -53,7 +52,7 @@
 				<object class="NSMutableString" key="NSViewClass">
 					<characters key="NS.bytes">View</characters>
 				</object>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
 				<string key="NSWindowContentMinSize">{267, 274}</string>
 				<object class="NSView" key="NSWindowView" id="762677578">
 					<reference key="NSNextResponder"/>
@@ -65,6 +64,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{83, 233}, {167, 22}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="431781347">
 								<int key="NSCellFlags">-2076049856</int>
@@ -84,22 +84,23 @@
 								</object>
 								<int key="NSPeriodicDelay">400</int>
 								<int key="NSPeriodicInterval">75</int>
-								<object class="NSMenuItem" key="NSMenuItem" id="262306657">
+								<object class="NSMenuItem" key="NSMenuItem" id="71932948">
 									<reference key="NSMenu" ref="71441725"/>
-									<string key="NSTitle">INDEX</string>
+									<string key="NSTitle">FULLTEXT</string>
 									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
 									<int key="NSState">1</int>
-									<object class="NSCustomResource" key="NSOnImage" id="195240984">
+									<object class="NSCustomResource" key="NSOnImage" id="600203078">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">NSMenuCheckmark</string>
 									</object>
-									<object class="NSCustomResource" key="NSMixedImage" id="81373676">
+									<object class="NSCustomResource" key="NSMixedImage" id="752378347">
 										<string key="NSClassName">NSImage</string>
 										<string key="NSResourceName">NSMenuMixedState</string>
 									</object>
 									<string key="NSAction">_popUpItemAction:</string>
+									<int key="NSTag">3</int>
 									<reference key="NSTarget" ref="431781347"/>
 								</object>
 								<bool key="NSMenuItemRespectAlignment">YES</bool>
@@ -109,31 +110,45 @@
 									</object>
 									<object class="NSMutableArray" key="NSMenuItems">
 										<bool key="EncodedWithXMLCoder">YES</bool>
-										<reference ref="262306657"/>
-										<object class="NSMenuItem" id="453090810">
+										<object class="NSMenuItem" id="262306657">
 											<reference key="NSMenu" ref="71441725"/>
-											<string key="NSTitle">UNIQUE</string>
+											<string key="NSTitle">PRIMARY KEY</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="195240984"/>
-											<reference key="NSMixedImage" ref="81373676"/>
+											<reference key="NSOnImage" ref="600203078"/>
+											<reference key="NSMixedImage" ref="752378347"/>
 											<string key="NSAction">_popUpItemAction:</string>
 											<reference key="NSTarget" ref="431781347"/>
 										</object>
-										<object class="NSMenuItem" id="71932948">
+										<object class="NSMenuItem" id="828450159">
 											<reference key="NSMenu" ref="71441725"/>
-											<string key="NSTitle">FULLTEXT</string>
+											<string key="NSTitle">INDEX</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="600203078"/>
+											<reference key="NSMixedImage" ref="752378347"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">1</int>
+											<reference key="NSTarget" ref="431781347"/>
+										</object>
+										<object class="NSMenuItem" id="453090810">
+											<reference key="NSMenu" ref="71441725"/>
+											<string key="NSTitle">UNIQUE</string>
 											<string key="NSKeyEquiv"/>
 											<int key="NSKeyEquivModMask">1048576</int>
 											<int key="NSMnemonicLoc">2147483647</int>
-											<reference key="NSOnImage" ref="195240984"/>
-											<reference key="NSMixedImage" ref="81373676"/>
+											<reference key="NSOnImage" ref="600203078"/>
+											<reference key="NSMixedImage" ref="752378347"/>
 											<string key="NSAction">_popUpItemAction:</string>
+											<int key="NSTag">2</int>
 											<reference key="NSTarget" ref="431781347"/>
 										</object>
+										<reference ref="71932948"/>
 									</object>
 								</object>
+								<int key="NSSelectedIndex">3</int>
 								<int key="NSPreferredEdge">3</int>
 								<bool key="NSUsesItemFromMenu">YES</bool>
 								<bool key="NSAltersState">YES</bool>
@@ -145,6 +160,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{86, 211}, {161, 19}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="1000744513">
 								<int key="NSCellFlags">-1267597759</int>
@@ -179,6 +195,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 213}, {64, 14}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="568966163">
 								<int key="NSCellFlags">67239424</int>
@@ -192,7 +209,7 @@
 									<string key="NSColorName">controlColor</string>
 									<object class="NSColor" key="NSColor" id="1009303974">
 										<int key="NSColorSpace">3</int>
-										<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
 									</object>
 								</object>
 								<object class="NSColor" key="NSTextColor" id="723855329">
@@ -208,6 +225,7 @@
 							<int key="NSvFlags">268</int>
 							<string key="NSFrame">{{17, 238}, {64, 14}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="217993475">
 								<int key="NSCellFlags">67239424</int>
@@ -234,12 +252,14 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrameSize">{267, 80}</string>
 											<reference key="NSSuperview" ref="726923866"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTableHeaderView" key="NSHeaderView" id="1016340205">
 												<reference key="NSNextResponder" ref="218049294"/>
 												<int key="NSvFlags">256</int>
 												<string key="NSFrameSize">{267, 17}</string>
 												<reference key="NSSuperview" ref="218049294"/>
+												<reference key="NSWindow"/>
 												<reference key="NSTableView" ref="633969417"/>
 											</object>
 											<object class="_NSCornerView" key="NSCornerView" id="310534340">
@@ -247,6 +267,7 @@
 												<int key="NSvFlags">-2147483392</int>
 												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
 												<reference key="NSSuperview" ref="561916229"/>
+												<reference key="NSWindow"/>
 											</object>
 											<object class="NSMutableArray" key="NSTableColumns">
 												<bool key="EncodedWithXMLCoder">YES</bool>
@@ -406,6 +427,7 @@
 									</object>
 									<string key="NSFrame">{{1, 17}, {267, 80}}</string>
 									<reference key="NSSuperview" ref="561916229"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="633969417"/>
 									<reference key="NSDocView" ref="633969417"/>
 									<reference key="NSBGColor" ref="433719363"/>
@@ -416,6 +438,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
 									<reference key="NSSuperview" ref="561916229"/>
+									<reference key="NSWindow"/>
 									<reference key="NSTarget" ref="561916229"/>
 									<string key="NSAction">_doScroller:</string>
 									<double key="NSPercent">0.80263155698776245</double>
@@ -425,6 +448,7 @@
 									<int key="NSvFlags">-2147483392</int>
 									<string key="NSFrame">{{-100, -100}, {225, 11}}</string>
 									<reference key="NSSuperview" ref="561916229"/>
+									<reference key="NSWindow"/>
 									<int key="NSsFlags">257</int>
 									<reference key="NSTarget" ref="561916229"/>
 									<string key="NSAction">_doScroller:</string>
@@ -439,6 +463,7 @@
 									</object>
 									<string key="NSFrame">{{1, 0}, {267, 17}}</string>
 									<reference key="NSSuperview" ref="561916229"/>
+									<reference key="NSWindow"/>
 									<reference key="NSNextKeyView" ref="1016340205"/>
 									<reference key="NSDocView" ref="1016340205"/>
 									<reference key="NSBGColor" ref="433719363"/>
@@ -448,6 +473,7 @@
 							</object>
 							<string key="NSFrame">{{-1, 97}, {269, 98}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="726923866"/>
 							<int key="NSsFlags">530</int>
 							<reference key="NSVScroller" ref="181568637"/>
@@ -477,6 +503,7 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{21, 42}, {78, 14}}</string>
 													<reference key="NSSuperview" ref="361997881"/>
+													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="971022587">
 														<int key="NSCellFlags">68288064</int>
@@ -493,6 +520,7 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{101, 37}, {162, 22}}</string>
 													<reference key="NSSuperview" ref="361997881"/>
+													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSPopUpButtonCell" key="NSCell" id="747441327">
 														<int key="NSCellFlags">-2076049856</int>
@@ -512,8 +540,8 @@
 															<int key="NSKeyEquivModMask">1048576</int>
 															<int key="NSMnemonicLoc">2147483647</int>
 															<int key="NSState">1</int>
-															<reference key="NSOnImage" ref="195240984"/>
-															<reference key="NSMixedImage" ref="81373676"/>
+															<reference key="NSOnImage" ref="600203078"/>
+															<reference key="NSMixedImage" ref="752378347"/>
 															<string key="NSAction">_popUpItemAction:</string>
 															<reference key="NSTarget" ref="747441327"/>
 														</object>
@@ -530,8 +558,8 @@
 																	<string key="NSTitle"/>
 																	<string key="NSKeyEquiv"/>
 																	<int key="NSMnemonicLoc">2147483647</int>
-																	<reference key="NSOnImage" ref="195240984"/>
-																	<reference key="NSMixedImage" ref="81373676"/>
+																	<reference key="NSOnImage" ref="600203078"/>
+																	<reference key="NSMixedImage" ref="752378347"/>
 																	<string key="NSAction">_popUpItemAction:</string>
 																	<reference key="NSTarget" ref="747441327"/>
 																</object>
@@ -541,8 +569,8 @@
 																	<string key="NSKeyEquiv"/>
 																	<int key="NSKeyEquivModMask">1048576</int>
 																	<int key="NSMnemonicLoc">2147483647</int>
-																	<reference key="NSOnImage" ref="195240984"/>
-																	<reference key="NSMixedImage" ref="81373676"/>
+																	<reference key="NSOnImage" ref="600203078"/>
+																	<reference key="NSMixedImage" ref="752378347"/>
 																	<string key="NSAction">_popUpItemAction:</string>
 																	<reference key="NSTarget" ref="747441327"/>
 																</object>
@@ -552,8 +580,8 @@
 																	<string key="NSKeyEquiv"/>
 																	<int key="NSKeyEquivModMask">1048576</int>
 																	<int key="NSMnemonicLoc">2147483647</int>
-																	<reference key="NSOnImage" ref="195240984"/>
-																	<reference key="NSMixedImage" ref="81373676"/>
+																	<reference key="NSOnImage" ref="600203078"/>
+																	<reference key="NSMixedImage" ref="752378347"/>
 																	<string key="NSAction">_popUpItemAction:</string>
 																	<reference key="NSTarget" ref="747441327"/>
 																</object>
@@ -575,6 +603,7 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{15, 16}, {84, 14}}</string>
 													<reference key="NSSuperview" ref="361997881"/>
+													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="408249519">
 														<int key="NSCellFlags">68288064</int>
@@ -591,6 +620,7 @@
 													<int key="NSvFlags">268</int>
 													<string key="NSFrame">{{104, 14}, {63, 19}}</string>
 													<reference key="NSSuperview" ref="361997881"/>
+													<reference key="NSWindow"/>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTextFieldCell" key="NSCell" id="659211423">
 														<int key="NSCellFlags">-1804468671</int>
@@ -670,10 +700,12 @@
 											</object>
 											<string key="NSFrame">{{1, 1}, {278, 71}}</string>
 											<reference key="NSSuperview" ref="197030792"/>
+											<reference key="NSWindow"/>
 										</object>
 									</object>
 									<string key="NSFrame">{{-5, -4}, {280, 73}}</string>
 									<reference key="NSSuperview" ref="30022357"/>
+									<reference key="NSWindow"/>
 									<string key="NSOffsets">{0, 0}</string>
 									<object class="NSTextFieldCell" key="NSTitleCell">
 										<int key="NSCellFlags">67239424</int>
@@ -697,6 +729,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{-83, 41}, {100, 18}}</string>
 									<reference key="NSSuperview" ref="30022357"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="NSButtonCell" key="NSCell" id="708153532">
 										<int key="NSCellFlags">67239424</int>
@@ -722,6 +755,7 @@
 							</object>
 							<string key="NSFrame">{{-2, -30}, {272, 67}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<string key="NSClassName">NSView</string>
 						</object>
 						<object class="NSButton" id="1003402112">
@@ -729,6 +763,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{0, 40}, {29, 26}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="782137189">
 								<int key="NSCellFlags">67239424</int>
@@ -750,6 +785,7 @@
 							<int key="NSvFlags">292</int>
 							<string key="NSFrame">{{24, 41}, {214, 22}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="958218934">
 								<int key="NSCellFlags">-2080244224</int>
@@ -775,6 +811,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{152, 13}, {100, 28}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<int key="NSTag">1</int>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="289434200">
@@ -801,6 +838,7 @@
 							<int key="NSvFlags">289</int>
 							<string key="NSFrame">{{54, 13}, {100, 28}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="758521208">
 								<int key="NSCellFlags">67239424</int>
@@ -827,6 +865,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{1, 0}, {32, 24}}</string>
 									<reference key="NSSuperview" ref="797179406"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="BWAnchoredButtonCell" key="NSCell" id="78847401">
 										<int key="NSCellFlags">67239424</int>
@@ -851,6 +890,7 @@
 									<int key="NSvFlags">268</int>
 									<string key="NSFrame">{{32, 0}, {32, 24}}</string>
 									<reference key="NSSuperview" ref="797179406"/>
+									<reference key="NSWindow"/>
 									<bool key="NSEnabled">YES</bool>
 									<object class="BWAnchoredButtonCell" key="NSCell" id="88287488">
 										<int key="NSCellFlags">604110336</int>
@@ -873,6 +913,7 @@
 							</object>
 							<string key="NSFrame">{{-2, 74}, {270, 24}}</string>
 							<reference key="NSSuperview" ref="762677578"/>
+							<reference key="NSWindow"/>
 							<bool key="BWABBIsResizable">NO</bool>
 							<bool key="BWABBIsAtBottom">NO</bool>
 							<bool key="BWABBHandleIsRightAligned">NO</bool>
@@ -881,10 +922,11 @@
 					</object>
 					<string key="NSFrameSize">{267, 274}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
 				<string key="NSMinSize">{267, 296}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
 			</object>
 			<object class="NSMenu" id="644710844">
 				<string key="NSTitle"/>
@@ -895,8 +937,8 @@
 						<string key="NSTitle">Remove Field</string>
 						<string key="NSKeyEquiv"/>
 						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="195240984"/>
-						<reference key="NSMixedImage" ref="81373676"/>
+						<reference key="NSOnImage" ref="600203078"/>
+						<reference key="NSMixedImage" ref="752378347"/>
 					</object>
 				</object>
 			</object>
@@ -1270,6 +1312,7 @@
 							<reference ref="453090810"/>
 							<reference ref="71932948"/>
 							<reference ref="262306657"/>
+							<reference ref="828450159"/>
 						</object>
 						<reference key="parent" ref="431781347"/>
 					</object>
@@ -1615,6 +1658,11 @@
 						<reference key="object" ref="299133641"/>
 						<reference key="parent" ref="659211423"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">138</int>
+						<reference key="object" ref="828450159"/>
+						<reference key="parent" ref="71441725"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1649,6 +1697,8 @@
 					<string>136.IBNumberFormatterBehaviorMetadataKey</string>
 					<string>136.IBNumberFormatterLocalizesFormatMetadataKey</string>
 					<string>136.IBPluginDependency</string>
+					<string>138.IBPluginDependency</string>
+					<string>138.ImportedFromIB2</string>
 					<string>14.IBEditorWindowLastContentRect</string>
 					<string>14.IBPluginDependency</string>
 					<string>14.ImportedFromIB2</string>
@@ -1774,7 +1824,9 @@
 					<integer value="1041"/>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{631, 783}, {167, 54}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<integer value="1"/>
+					<string>{{683, 655}, {167, 71}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1870,7 +1922,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">137</int>
+			<int key="maxID">138</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1883,10 +1935,10 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">NSObject</string>
+					<string key="className">NSMenu</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string>
+						<string key="minorKey">Source/SPMenuAdditions.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@@ -1985,7 +2037,10 @@
 							<string>doSelectionTitleCase:</string>
 							<string>doSelectionUpperCase:</string>
 							<string>doTranspose:</string>
+							<string>executeBundleItemForInputField:</string>
 							<string>insertNULLvalue:</string>
+							<string>moveSelectionLineDown:</string>
+							<string>moveSelectionLineUp:</string>
 							<string>selectCurrentLine:</string>
 							<string>selectCurrentWord:</string>
 							<string>selectEnclosingBrackets:</string>
@@ -2005,6 +2060,9 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2020,7 +2078,10 @@
 							<string>doSelectionTitleCase:</string>
 							<string>doSelectionUpperCase:</string>
 							<string>doTranspose:</string>
+							<string>executeBundleItemForInputField:</string>
 							<string>insertNULLvalue:</string>
+							<string>moveSelectionLineDown:</string>
+							<string>moveSelectionLineUp:</string>
 							<string>selectCurrentLine:</string>
 							<string>selectCurrentWord:</string>
 							<string>selectEnclosingBrackets:</string>
@@ -2064,10 +2125,22 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">executeBundleItemForInputField:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">insertNULLvalue:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">moveSelectionLineDown:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">moveSelectionLineUp:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">selectCurrentLine:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -2132,7 +2205,9 @@
 							<string>import:</string>
 							<string>importFromClipboard:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
+							<string>openDatabaseInNewTab:</string>
 							<string>optimizeTable:</string>
+							<string>refreshTables:</string>
 							<string>removeDatabase:</string>
 							<string>renameDatabase:</string>
 							<string>repairTable:</string>
@@ -2149,12 +2224,6 @@
 							<string>toggleNavigator:</string>
 							<string>updateWindowTitle:</string>
 							<string>validateSaveConnectionAccessory:</string>
-							<string>viewContent:</string>
-							<string>viewQuery:</string>
-							<string>viewRelations:</string>
-							<string>viewStatus:</string>
-							<string>viewStructure:</string>
-							<string>viewTriggers:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2202,10 +2271,6 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2237,7 +2302,9 @@
 							<string>import:</string>
 							<string>importFromClipboard:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
+							<string>openDatabaseInNewTab:</string>
 							<string>optimizeTable:</string>
+							<string>refreshTables:</string>
 							<string>removeDatabase:</string>
 							<string>renameDatabase:</string>
 							<string>repairTable:</string>
@@ -2254,12 +2321,6 @@
 							<string>toggleNavigator:</string>
 							<string>updateWindowTitle:</string>
 							<string>validateSaveConnectionAccessory:</string>
-							<string>viewContent:</string>
-							<string>viewQuery:</string>
-							<string>viewRelations:</string>
-							<string>viewStatus:</string>
-							<string>viewStructure:</string>
-							<string>viewTriggers:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2364,10 +2425,18 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">openDatabaseInNewTab:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">optimizeTable:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">refreshTables:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">removeDatabase:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -2431,30 +2500,6 @@
 								<string key="name">validateSaveConnectionAccessory:</string>
 								<string key="candidateClassName">id</string>
 							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewContent:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewQuery:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewRelations:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewStatus:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewStructure:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">viewTriggers:</string>
-								<string key="candidateClassName">id</string>
-							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -2958,6 +3003,73 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">SPDatabaseDocument</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>viewContent:</string>
+							<string>viewQuery:</string>
+							<string>viewRelations:</string>
+							<string>viewStatus:</string>
+							<string>viewStructure:</string>
+							<string>viewTriggers:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>viewContent:</string>
+							<string>viewQuery:</string>
+							<string>viewRelations:</string>
+							<string>viewStatus:</string>
+							<string>viewStructure:</string>
+							<string>viewTriggers:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">viewContent:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewQuery:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewRelations:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewStatus:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewStructure:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">viewTriggers:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPDatabaseViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SPDatabaseDocument</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">Source/SPPrintController.h</string>
@@ -3316,13 +3428,13 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addField:</string>
-							<string>closeKeySheet:</string>
 							<string>closeSheet:</string>
 							<string>copyField:</string>
 							<string>reloadTable:</string>
 							<string>removeField:</string>
 							<string>resetAutoIncrement:</string>
 							<string>showOptimizedFieldType:</string>
+							<string>toggleColumnView:</string>
 							<string>unhideIndexesView:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -3343,13 +3455,13 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addField:</string>
-							<string>closeKeySheet:</string>
 							<string>closeSheet:</string>
 							<string>copyField:</string>
 							<string>reloadTable:</string>
 							<string>removeField:</string>
 							<string>resetAutoIncrement:</string>
 							<string>showOptimizedFieldType:</string>
+							<string>toggleColumnView:</string>
 							<string>unhideIndexesView:</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
@@ -3359,10 +3471,6 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">closeKeySheet:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
 								<string key="name">closeSheet:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -3387,6 +3495,10 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">toggleColumnView:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">unhideIndexesView:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -3422,6 +3534,7 @@
 							<string>tableSourceView</string>
 							<string>tablesIndexesSplitView</string>
 							<string>tablesListInstance</string>
+							<string>viewColumnsMenu</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3451,6 +3564,7 @@
 							<string>id</string>
 							<string>NSSplitView</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -3483,6 +3597,7 @@
 							<string>tableSourceView</string>
 							<string>tablesIndexesSplitView</string>
 							<string>tablesListInstance</string>
+							<string>viewColumnsMenu</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3590,6 +3705,10 @@
 								<string key="name">tablesListInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">viewColumnsMenu</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3598,6 +3717,13 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">SPTableStructure</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Source/SPTableStructureDelegate.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">SPTablesList</string>
 					<string key="superclassName">NSObject</string>
 					<object class="NSMutableDictionary" key="actions">
@@ -3607,6 +3733,7 @@
 							<string>addTable:</string>
 							<string>closeSheet:</string>
 							<string>copyTable:</string>
+							<string>openTableInNewTab:</string>
 							<string>removeTable:</string>
 							<string>renameTable:</string>
 							<string>togglePaneCollapse:</string>
@@ -3625,6 +3752,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -3634,6 +3762,7 @@
 							<string>addTable:</string>
 							<string>closeSheet:</string>
 							<string>copyTable:</string>
+							<string>openTableInNewTab:</string>
 							<string>removeTable:</string>
 							<string>renameTable:</string>
 							<string>togglePaneCollapse:</string>
@@ -3656,6 +3785,10 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
+								<string key="name">openTableInNewTab:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
 								<string key="name">removeTable:</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -3697,6 +3830,8 @@
 							<string>duplicateTableMenuItem</string>
 							<string>extendedTableInfoInstance</string>
 							<string>listFilterField</string>
+							<string>openTableInNewTabContextMenuItem</string>
+							<string>openTableInNewTabMenuItem</string>
 							<string>removeTableContextMenuItem</string>
 							<string>removeTableMenuItem</string>
 							<string>renameTableContextMenuItem</string>
@@ -3708,7 +3843,6 @@
 							<string>showCreateSyntaxContextMenuItem</string>
 							<string>showCreateSyntaxMenuItem</string>
 							<string>spHistoryControllerInstance</string>
-							<string>tabView</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
 							<string>tableDocumentInstance</string>
@@ -3728,7 +3862,7 @@
 							<string>toolbarAddButton</string>
 							<string>toolbarReloadButton</string>
 							<string>truncateTableButton</string>
-							<string>truncateTableContextButton</string>
+							<string>truncateTableContextMenuItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3754,13 +3888,14 @@
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
 							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
+							<string>NSMenuItem</string>
 							<string>SPHistoryController</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
 							<string>NSButton</string>
 							<string>id</string>
 							<string>NSSplitView</string>
@@ -3775,7 +3910,7 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
-							<string>id</string>
+							<string>NSMenuItem</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -3794,6 +3929,8 @@
 							<string>duplicateTableMenuItem</string>
 							<string>extendedTableInfoInstance</string>
 							<string>listFilterField</string>
+							<string>openTableInNewTabContextMenuItem</string>
+							<string>openTableInNewTabMenuItem</string>
 							<string>removeTableContextMenuItem</string>
 							<string>removeTableMenuItem</string>
 							<string>renameTableContextMenuItem</string>
@@ -3805,7 +3942,6 @@
 							<string>showCreateSyntaxContextMenuItem</string>
 							<string>showCreateSyntaxMenuItem</string>
 							<string>spHistoryControllerInstance</string>
-							<string>tabView</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
 							<string>tableDocumentInstance</string>
@@ -3825,7 +3961,7 @@
 							<string>toolbarAddButton</string>
 							<string>toolbarReloadButton</string>
 							<string>truncateTableButton</string>
-							<string>truncateTableContextButton</string>
+							<string>truncateTableContextMenuItem</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3878,6 +4014,14 @@
 								<string key="candidateClassName">NSSearchField</string>
 							</object>
 							<object class="IBToOneOutletInfo">
+								<string key="name">openTableInNewTabContextMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">openTableInNewTabMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
 								<string key="name">removeTableContextMenuItem</string>
 								<string key="candidateClassName">NSMenuItem</string>
 							</object>
@@ -3922,10 +4066,6 @@
 								<string key="candidateClassName">SPHistoryController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">tabView</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBToOneOutletInfo">
 								<string key="name">tableContentInstance</string>
 								<string key="candidateClassName">id</string>
 							</object>
@@ -4002,8 +4142,8 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">truncateTableContextButton</string>
-								<string key="candidateClassName">id</string>
+								<string key="name">truncateTableContextMenuItem</string>
+								<string key="candidateClassName">NSMenuItem</string>
 							</object>
 						</object>
 					</object>
@@ -4451,6 +4591,27 @@
 					<string key="className">NSObject</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
 						<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
 					</object>
 				</object>