Add a new 'Filter Content...' menu item to the 'Table' menu that switches to the content view and places the focus on the filter field.

6 files changed, 168 insertions, 50 deletions

diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index ada856a1..8825dd84 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="29"/>
+			<integer value="758"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1617,6 +1617,25 @@
 							<string key="NSTitle">Table</string>
 							<object class="NSMutableArray" key="NSMenuItems">
 								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="759561673">
+									<reference key="NSMenu" ref="1056168652"/>
+									<string key="NSTitle">Filter Content...</string>
+									<string key="NSKeyEquiv">f</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="625762401"/>
+									<reference key="NSMixedImage" ref="315854375"/>
+								</object>
+								<object class="NSMenuItem" id="126273117">
+									<reference key="NSMenu" ref="1056168652"/>
+									<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="449401330">
 									<reference key="NSMenu" ref="1056168652"/>
 									<string key="NSTitle">Copy Create Table Syntax</string>
@@ -2862,6 +2881,14 @@
 					</object>
 					<int key="connectionID">1040</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">focusOnTableContentFilter:</string>
+						<reference key="source" ref="63651044"/>
+						<reference key="destination" ref="759561673"/>
+					</object>
+					<int key="connectionID">1044</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -3957,11 +3984,13 @@
 							<reference ref="712078058"/>
 							<reference ref="638185532"/>
 							<reference ref="336993056"/>
-							<reference ref="309258449"/>
 							<reference ref="384546710"/>
 							<reference ref="587676764"/>
 							<reference ref="785987636"/>
 							<reference ref="449401330"/>
+							<reference ref="759561673"/>
+							<reference ref="126273117"/>
+							<reference ref="309258449"/>
 						</object>
 						<reference key="parent" ref="228261277"/>
 					</object>
@@ -4233,6 +4262,16 @@
 						<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"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1042</int>
+						<reference key="object" ref="126273117"/>
+						<reference key="parent" ref="1056168652"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -4255,6 +4294,8 @@
 					<string>1033.IBPluginDependency</string>
 					<string>1038.IBPluginDependency</string>
 					<string>1038.ImportedFromIB2</string>
+					<string>1041.IBPluginDependency</string>
+					<string>1042.IBPluginDependency</string>
 					<string>106.IBEditorWindowLastContentRect</string>
 					<string>106.IBPluginDependency</string>
 					<string>106.ImportedFromIB2</string>
@@ -4617,6 +4658,8 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{733, 644}, {190, 123}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
@@ -4653,7 +4696,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{596, 538}, {238, 103}}</string>
+					<string>{{669, 199}, {238, 103}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4668,7 +4711,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{316, 598}, {280, 283}}</string>
+					<string>{{389, 259}, {280, 283}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{654, 613}, {157, 223}}</string>
@@ -4700,7 +4743,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{449, 1007}, {197, 53}}</string>
-					<string>{{133, 736}, {511, 20}}</string>
+					<string>{{322, 548}, {511, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{506, 836}, {511, 20}}</string>
@@ -4753,7 +4796,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{858, 83}, {237, 273}}</string>
+					<string>{{325, 463}, {237, 273}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{698, 703}, {184, 133}}</string>
@@ -4779,7 +4822,7 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{600, 317}, {255, 203}}</string>
+					<string>{{375, 533}, {255, 203}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{312, 683}, {231, 153}}</string>
@@ -4848,7 +4891,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{606, 584}, {265, 183}}</string>
+					<string>{{645, 335}, {265, 213}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{829, 663}, {268, 173}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -5027,7 +5070,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1040</int>
+			<int key="maxID">1044</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5536,11 +5579,14 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addHost:</string>
+							<string>addSchemaPriv:</string>
 							<string>addUser:</string>
 							<string>checkAllPrivileges:</string>
 							<string>doApply:</string>
 							<string>doCancel:</string>
+							<string>refresh:</string>
 							<string>removeHost:</string>
+							<string>removeSchemaPriv:</string>
 							<string>removeUser:</string>
 							<string>uncheckAllPrivileges:</string>
 						</object>
@@ -5554,23 +5600,44 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addSchemaPrivButton</string>
+							<string>availableController</string>
+							<string>availableTableView</string>
+							<string>grantedController</string>
+							<string>grantedTableView</string>
 							<string>outlineView</string>
 							<string>privsSupportedByServer</string>
+							<string>removeSchemaPrivButton</string>
+							<string>schemaController</string>
+							<string>schemasTableView</string>
 							<string>tabView</string>
 							<string>treeController</string>
+							<string>userNameTextField</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSButton</string>
+							<string>NSArrayController</string>
+							<string>NSTableView</string>
+							<string>NSArrayController</string>
+							<string>NSTableView</string>
 							<string>NSOutlineView</string>
 							<string>NSMutableDictionary</string>
+							<string>NSButton</string>
+							<string>NSArrayController</string>
+							<string>NSTableView</string>
 							<string>NSTabView</string>
 							<string>NSTreeController</string>
+							<string>NSTextField</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -5605,6 +5672,7 @@
 							<string>closePanelSheet:</string>
 							<string>closePasswordSheet:</string>
 							<string>closeSheet:</string>
+							<string>copyChecksumFromSheet:</string>
 							<string>copyCreateTableSyntax:</string>
 							<string>copyCreateTableSyntaxFromSheet:</string>
 							<string>export:</string>
@@ -5612,6 +5680,7 @@
 							<string>exportTable:</string>
 							<string>flushPrivileges:</string>
 							<string>flushTable:</string>
+							<string>focusOnTableContentFilter:</string>
 							<string>import:</string>
 							<string>openCurrentConnectionInNewWindow:</string>
 							<string>optimizeTable:</string>
@@ -5620,6 +5689,7 @@
 							<string>saveConnectionSheet:</string>
 							<string>saveCreateSyntax:</string>
 							<string>setDatabases:</string>
+							<string>showConsole:</string>
 							<string>showCreateTableSyntax:</string>
 							<string>showMySQLHelp:</string>
 							<string>showServerProcesses:</string>
@@ -5675,6 +5745,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="outlets">
@@ -5716,6 +5789,10 @@
 							<string>saveConnectionSavePasswordAlert</string>
 							<string>sidebarGrabber</string>
 							<string>spHistoryControllerInstance</string>
+							<string>statusTableAccessoryView</string>
+							<string>statusTableCopyChecksum</string>
+							<string>statusTableView</string>
+							<string>statusValues</string>
 							<string>tableContentInstance</string>
 							<string>tableDataInstance</string>
 							<string>tableDumpInstance</string>
@@ -5725,6 +5802,7 @@
 							<string>tableRelationsInstance</string>
 							<string>tableSourceInstance</string>
 							<string>tableTabView</string>
+							<string>tableTriggersInstance</string>
 							<string>tableWindow</string>
 							<string>tablesListInstance</string>
 							<string>taskCancelButton</string>
@@ -5777,6 +5855,10 @@
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
 							<string>NSButton</string>
 							<string>NSTableView</string>
 							<string>NSSplitView</string>
@@ -5785,6 +5867,7 @@
 							<string>NSTabView</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 							<string>NSButton</string>
 							<string>id</string>
 							<string>id</string>
@@ -5886,6 +5969,14 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
+					<string key="className">NSArrayController</string>
+					<string key="superclassName">NSObjectController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSArrayController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
 					<string key="className">NSBox</string>
 					<string key="superclassName">NSView</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Source/TableContent.h b/Source/TableContent.h
index b4941912..d6fbf422 100644
--- a/Source/TableContent.h
+++ b/Source/TableContent.h
@@ -169,5 +169,6 @@
 
 - (NSString *)escapeFilterArgument:(NSString *)argument againstClause:(NSString *)clause;
 - (void)openContentFilterManager;
+- (void)makeContentFilterHaveFocus;
 
 @end
diff --git a/Source/TableContent.m b/Source/TableContent.m
index 4a69e67a..9dd7f983 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -3225,6 +3225,16 @@
 	return YES;
 }
 
+/**
+ * Makes the content filter field have focus by making it the first responder.
+ */
+- (void)makeContentFilterHaveFocus
+{
+	[tableWindow makeFirstResponder:argumentField];
+}
+
+#pragma mark -
+
 // Last but not least
 - (void)dealloc
 {
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index e897ed36..bb91fa5a 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -226,6 +226,7 @@
 - (IBAction)checksumTable:(id)sender;
 - (IBAction)saveCreateSyntax:(id)sender;
 - (IBAction)copyCreateTableSyntaxFromSheet:(id)sender;
+- (IBAction)focusOnTableContentFilter:(id)sender;
 
 // Other methods
 - (void) setQueryMode:(NSInteger)theQueryMode;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index c74264c4..69fe4a0c 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -2330,6 +2330,16 @@
 	}
 }
 
+/**
+ * Switches to the content view and makes the filter field the first responder (has focus).
+ */
+- (IBAction)focusOnTableContentFilter:(id)sender
+{
+	[self viewContent:self];
+	
+	[tableContentInstance makeContentFilterHaveFocus];
+}
+
 #pragma mark -
 #pragma mark Other Methods
 
@@ -3171,6 +3181,11 @@
 	if ([menuItem action] == @selector(clearConsole:)) {
 		return ([[SPQueryController sharedQueryController] consoleMessageCount] > 0);
 	}
+	
+	// Focus on table content filter
+	if ([menuItem action] == @selector(focusOnTableContentFilter:)) {
+		return ([self table] != nil && [[self table] isNotEqualTo:@""]); 
+	}
 
 	return [super validateMenuItem:menuItem];
 }
diff --git a/Source/TablesList.m b/Source/TablesList.m
index e9c07510..8e4ae268 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -877,18 +877,18 @@
 	if(selectedTableType == SP_TABLETYPE_VIEW)
 	{
 		// Change mainMenu > Table > ... according to table type
-		[[tableSubMenu itemAtIndex:0] setTitle:NSLocalizedString(@"Copy Create View Syntax", @"copy create view syntax menu item")];
-		[[tableSubMenu itemAtIndex:1] setTitle:NSLocalizedString(@"Show Create View Syntax", @"show create view syntax menu item")];
-		[[tableSubMenu itemAtIndex:2] setHidden:NO]; // divider
-		[[tableSubMenu itemAtIndex:3] setHidden:NO];
-		[[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Check View", @"check view menu item")];
-		[[tableSubMenu itemAtIndex:4] setHidden:YES]; // repair
-		[[tableSubMenu itemAtIndex:5] setHidden:YES]; // divider
-		[[tableSubMenu itemAtIndex:6] setHidden:YES]; // analyse
-		[[tableSubMenu itemAtIndex:7] setHidden:YES]; // optimize
-		[[tableSubMenu itemAtIndex:8] setHidden:NO];
-		[[tableSubMenu itemAtIndex:8] setTitle:NSLocalizedString(@"Flush View", @"flush view menu item")];
-		[[tableSubMenu itemAtIndex:9] setHidden:YES]; // checksum
+		[[tableSubMenu itemAtIndex:2] setTitle:NSLocalizedString(@"Copy Create View Syntax", @"copy create view syntax menu item")];
+		[[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Show Create View Syntax", @"show create view syntax menu item")];
+		[[tableSubMenu itemAtIndex:4] setHidden:NO]; // divider
+		[[tableSubMenu itemAtIndex:5] setHidden:NO];
+		[[tableSubMenu itemAtIndex:5] setTitle:NSLocalizedString(@"Check View", @"check view menu item")];
+		[[tableSubMenu itemAtIndex:6] setHidden:YES]; // repair
+		[[tableSubMenu itemAtIndex:7] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:8] setHidden:YES]; // analyse
+		[[tableSubMenu itemAtIndex:9] setHidden:YES]; // optimize
+		[[tableSubMenu itemAtIndex:10] setHidden:NO];
+		[[tableSubMenu itemAtIndex:10] setTitle:NSLocalizedString(@"Flush View", @"flush view menu item")];
+		[[tableSubMenu itemAtIndex:11] setHidden:YES]; // checksum
 
 		[renameTableMenuItem setHidden:NO]; // we don't have to check the mysql version
 		[renameTableMenuItem setTitle:NSLocalizedString(@"Rename View...", @"rename view menu title")];
@@ -905,22 +905,22 @@
 		[removeTableContextMenuItem setTitle:NSLocalizedString(@"Remove View", @"remove view menu title")];
 	} 
 	else if(selectedTableType == SP_TABLETYPE_TABLE) {
-		[[tableSubMenu itemAtIndex:0] setTitle:NSLocalizedString(@"Copy Create Table Syntax", @"copy create table syntax menu item")];
-		[[tableSubMenu itemAtIndex:1] setTitle:NSLocalizedString(@"Show Create Table Syntax", @"show create table syntax menu item")];
-		[[tableSubMenu itemAtIndex:2] setHidden:NO]; // divider
-		[[tableSubMenu itemAtIndex:3] setHidden:NO];
-		[[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Check Table", @"check table menu item")];
-		[[tableSubMenu itemAtIndex:4] setHidden:NO];
-		[[tableSubMenu itemAtIndex:4] setTitle:NSLocalizedString(@"Repair Table", @"repair table menu item")];
-		[[tableSubMenu itemAtIndex:5] setHidden:NO]; // divider
+		[[tableSubMenu itemAtIndex:2] setTitle:NSLocalizedString(@"Copy Create Table Syntax", @"copy create table syntax menu item")];
+		[[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Show Create Table Syntax", @"show create table syntax menu item")];
+		[[tableSubMenu itemAtIndex:4] setHidden:NO]; // divider
+		[[tableSubMenu itemAtIndex:5] setHidden:NO];
+		[[tableSubMenu itemAtIndex:5] setTitle:NSLocalizedString(@"Check Table", @"check table menu item")];
 		[[tableSubMenu itemAtIndex:6] setHidden:NO];
-		[[tableSubMenu itemAtIndex:6] setTitle:NSLocalizedString(@"Analyze Table", @"analyze table menu item")];
-		[[tableSubMenu itemAtIndex:7] setHidden:NO];
-		[[tableSubMenu itemAtIndex:7] setTitle:NSLocalizedString(@"Optimize Table", @"optimize table menu item")];
+		[[tableSubMenu itemAtIndex:6] setTitle:NSLocalizedString(@"Repair Table", @"repair table menu item")];
+		[[tableSubMenu itemAtIndex:7] setHidden:NO]; // divider
 		[[tableSubMenu itemAtIndex:8] setHidden:NO];
-		[[tableSubMenu itemAtIndex:8] setTitle:NSLocalizedString(@"Flush Table", @"flush table menu item")];
+		[[tableSubMenu itemAtIndex:8] setTitle:NSLocalizedString(@"Analyze Table", @"analyze table menu item")];
 		[[tableSubMenu itemAtIndex:9] setHidden:NO];
-		[[tableSubMenu itemAtIndex:9] setTitle:NSLocalizedString(@"Checksum Table", @"checksum table menu item")];
+		[[tableSubMenu itemAtIndex:9] setTitle:NSLocalizedString(@"Optimize Table", @"optimize table menu item")];
+		[[tableSubMenu itemAtIndex:10] setHidden:NO];
+		[[tableSubMenu itemAtIndex:10] setTitle:NSLocalizedString(@"Flush Table", @"flush table menu item")];
+		[[tableSubMenu itemAtIndex:11] setHidden:NO];
+		[[tableSubMenu itemAtIndex:11] setTitle:NSLocalizedString(@"Checksum Table", @"checksum table menu item")];
 
 		[renameTableMenuItem setHidden:NO];
 		[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Table...", @"rename table menu title")];
@@ -940,16 +940,16 @@
 
 	} 
 	else if(selectedTableType == SP_TABLETYPE_PROC) {
-		[[tableSubMenu itemAtIndex:0] setTitle:NSLocalizedString(@"Copy Create Procedure Syntax", @"copy create proc syntax menu item")];
-		[[tableSubMenu itemAtIndex:1] setTitle:NSLocalizedString(@"Show Create Procedure Syntax", @"show create proc syntax menu item")];
-		[[tableSubMenu itemAtIndex:2] setHidden:YES]; // divider
-		[[tableSubMenu itemAtIndex:3] setHidden:YES]; // copy columns
+		[[tableSubMenu itemAtIndex:2] setTitle:NSLocalizedString(@"Copy Create Procedure Syntax", @"copy create proc syntax menu item")];
+		[[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Show Create Procedure Syntax", @"show create proc syntax menu item")];
 		[[tableSubMenu itemAtIndex:4] setHidden:YES]; // divider
-		[[tableSubMenu itemAtIndex:5] setHidden:YES];
-		[[tableSubMenu itemAtIndex:6] setHidden:YES];
-		[[tableSubMenu itemAtIndex:7] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:5] setHidden:YES]; // copy columns
+		[[tableSubMenu itemAtIndex:6] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:7] setHidden:YES];
 		[[tableSubMenu itemAtIndex:8] setHidden:YES];
-		[[tableSubMenu itemAtIndex:9] setHidden:YES];
+		[[tableSubMenu itemAtIndex:9] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:10] setHidden:YES];
+		[[tableSubMenu itemAtIndex:11] setHidden:YES];
 		
 		[renameTableMenuItem setHidden:NO];
 		[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Procedure...", @"rename proc menu title")];
@@ -967,16 +967,16 @@
 
 	}
 	else if(selectedTableType == SP_TABLETYPE_FUNC) {
-		[[tableSubMenu itemAtIndex:0] setTitle:NSLocalizedString(@"Copy Create Function Syntax", @"copy create func syntax menu item")];
-		[[tableSubMenu itemAtIndex:1] setTitle:NSLocalizedString(@"Show Create Function Syntax", @"show create func syntax menu item")];
-		[[tableSubMenu itemAtIndex:2] setHidden:YES]; // divider
-		[[tableSubMenu itemAtIndex:3] setHidden:YES]; // copy columns
+		[[tableSubMenu itemAtIndex:2] setTitle:NSLocalizedString(@"Copy Create Function Syntax", @"copy create func syntax menu item")];
+		[[tableSubMenu itemAtIndex:3] setTitle:NSLocalizedString(@"Show Create Function Syntax", @"show create func syntax menu item")];
 		[[tableSubMenu itemAtIndex:4] setHidden:YES]; // divider
-		[[tableSubMenu itemAtIndex:5] setHidden:YES];
-		[[tableSubMenu itemAtIndex:6] setHidden:YES];
-		[[tableSubMenu itemAtIndex:7] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:5] setHidden:YES]; // copy columns
+		[[tableSubMenu itemAtIndex:6] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:7] setHidden:YES];
 		[[tableSubMenu itemAtIndex:8] setHidden:YES];
-		[[tableSubMenu itemAtIndex:9] setHidden:YES];	
+		[[tableSubMenu itemAtIndex:9] setHidden:YES]; // divider
+		[[tableSubMenu itemAtIndex:10] setHidden:YES];
+		[[tableSubMenu itemAtIndex:11] setHidden:YES];	
 		
 		[renameTableMenuItem setHidden:NO];
 		[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Function...", @"rename func menu title")];