- Hide the User Manager from the 0.9.7 branch so it can be released in fully polished and tested form

Author: rowanbeentje

Interfaces/English.lproj/MainMenu.xib

@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="57"/>
+			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1275,6 +1275,7 @@
 									<reference key="NSMenu" ref="172963563"/>
 									<bool key="NSIsDisabled">YES</bool>
 									<bool key="NSIsSeparator">YES</bool>
+									<bool key="NSIsHidden">YES</bool>
 									<string key="NSTitle"/>
 									<string key="NSKeyEquiv"/>
 									<int key="NSKeyEquivModMask">1048576</int>
@@ -1284,6 +1285,8 @@
 								</object>
 								<object class="NSMenuItem" id="718573983">
 									<reference key="NSMenu" ref="172963563"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsHidden">YES</bool>
 									<string key="NSTitle">User Accounts...</string>
 									<string key="NSKeyEquiv">u</string>
 									<int key="NSKeyEquivModMask">1048576</int>
@@ -4673,7 +4676,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{449, 1007}, {197, 53}}</string>
-					<string>{{666, 356}, {511, 20}}</string>
+					<string>{{491, 356}, {511, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{506, 836}, {511, 20}}</string>
@@ -4744,15 +4747,15 @@
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{678, 103}, {215, 253}}</string>
+					<string>{{503, 103}, {215, 253}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{518, 583}, {218, 253}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
-					<string>{{600, 317}, {255, 203}}</string>
+					<string>{{733, 153}, {255, 203}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<integer value="1"/>
 					<string>{{312, 683}, {231, 153}}</string>

Source/TableDocument.m

@@ -3248,15 +3248,6 @@ - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString
 		[toolbarItem setTarget:self];
 		[toolbarItem setAction:@selector(viewRelations:)];
 
-	} else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_USER_MANAGER]) {
-		[toolbarItem setLabel:NSLocalizedString(@"Users", @"toolbar item label for switching to the User Manager tab")];
-		[toolbarItem setPaletteLabel:NSLocalizedString(@"Users", @"toolbar item label for switching to the User Manager tab")];
-		//set up tooltip and image
-		[toolbarItem setToolTip:NSLocalizedString(@"Switch to the User Manager tab", @"tooltip for toolbar item for switching to the User Manager tab")];
-		[toolbarItem setImage:[NSImage imageNamed:NSImageNameEveryone]];
-		//set up the target action
-		[toolbarItem setTarget:self];
-		[toolbarItem setAction:@selector(showUserManager:)];
 	} else {
 		//itemIdentifier refered to a toolbar item that is not provided or supported by us or cocoa 
 		toolbarItem = nil;
@@ -3281,7 +3272,6 @@ - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
 			MAIN_TOOLBAR_CUSTOM_QUERY,
 			MAIN_TOOLBAR_TABLE_INFO,
 			MAIN_TOOLBAR_TABLE_RELATIONS,
-			MAIN_TOOLBAR_USER_MANAGER,
 			NSToolbarCustomizeToolbarItemIdentifier,
 			NSToolbarFlexibleSpaceItemIdentifier,
 			NSToolbarSpaceItemIdentifier,
@@ -3303,7 +3293,6 @@ - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
 			MAIN_TOOLBAR_CUSTOM_QUERY,
 			NSToolbarFlexibleSpaceItemIdentifier,
 			MAIN_TOOLBAR_HISTORY_NAVIGATION,
-			MAIN_TOOLBAR_USER_MANAGER,
 			MAIN_TOOLBAR_SHOW_CONSOLE,
 			nil];
 }