Implement some of the points suggested in issue #309:

- All menu items which show a panel of some kind before completing the action need to have "..." after the menu item name.
- All menu items which do something destructive (drop table, truncate table) need to default to the CANCEL button in their alert message.

2 files changed, 23 insertions, 20 deletions

diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 1d2b3455..c72f587c 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -8,7 +8,7 @@
 		<string key="IBDocument.HIToolboxVersion">353.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="672"/>
+			<integer value="4814"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -129,7 +129,7 @@
 														<reference ref="486381768"/>
 														<object class="NSMenuItem" id="938900701">
 															<reference key="NSMenu" ref="23713489"/>
-															<string key="NSTitle">Rename Table</string>
+															<string key="NSTitle">Rename Table...</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
 															<object class="NSCustomResource" key="NSOnImage" id="285877316">
@@ -145,7 +145,7 @@
 														</object>
 														<object class="NSMenuItem" id="924446696">
 															<reference key="NSMenu" ref="23713489"/>
-															<string key="NSTitle">Duplicate Table</string>
+															<string key="NSTitle">Duplicate Table...</string>
 															<string key="NSKeyEquiv"/>
 															<int key="NSMnemonicLoc">2147483647</int>
 															<reference key="NSOnImage" ref="285877316"/>
@@ -187,6 +187,7 @@
 														</object>
 													</object>
 												</object>
+												<int key="NSSelectedIndex">2</int>
 												<bool key="NSPullDown">YES</bool>
 												<int key="NSPreferredEdge">1</int>
 												<bool key="NSUsesItemFromMenu">YES</bool>
@@ -5726,6 +5727,7 @@
 									</object>
 									<string key="NSFrameSize">{574, 310}</string>
 									<reference key="NSSuperview" ref="175919909"/>
+									<reference key="NSNextKeyView" ref="101244177"/>
 									<reference key="NSDocView" ref="101244177"/>
 									<reference key="NSBGColor" ref="449903125"/>
 									<reference key="NSCursor" ref="32917531"/>
@@ -5756,6 +5758,7 @@
 							</object>
 							<string key="NSFrame">{{1, 34}, {586, 310}}</string>
 							<reference key="NSSuperview" ref="661948784"/>
+							<reference key="NSNextKeyView" ref="297779328"/>
 							<int key="NSsFlags">16</int>
 							<reference key="NSVScroller" ref="939193757"/>
 							<reference key="NSHScroller" ref="330171019"/>
@@ -25743,7 +25746,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{188, -4}, {175, 113}}</string>
+					<string>{{147, 140}, {188, 113}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<object class="NSMutableDictionary">
@@ -25765,8 +25768,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
 					</object>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{59, 306}, {944, 550}}</string>
-					<string>{{59, 306}, {944, 550}}</string>
+					<string>{{138, 228}, {944, 550}}</string>
+					<string>{{138, 228}, {944, 550}}</string>
 					<reference ref="9"/>
 					<reference ref="9"/>
 					<string>{{62, 352}, {845, 504}}</string>
diff --git a/Source/TablesList.m b/Source/TablesList.m
index a5333eac..bf8976c2 100644
--- a/Source/TablesList.m
+++ b/Source/TablesList.m
@@ -329,7 +329,7 @@
 	
 	[tableWindow endEditingFor:nil];
 	
-	NSAlert *alert = [NSAlert alertWithMessageText:@"" defaultButton:NSLocalizedString(@"Delete", @"delete button") alternateButton:NSLocalizedString(@"Cancel", @"cancel button") otherButton:nil informativeTextWithFormat:@""];
+	NSAlert *alert = [NSAlert alertWithMessageText:@"" defaultButton:NSLocalizedString(@"Cancel", @"cancel button") alternateButton:NSLocalizedString(@"Delete", @"delete button") otherButton:nil informativeTextWithFormat:@""];
 
 	[alert setAlertStyle:NSCriticalAlertStyle];
 
@@ -680,17 +680,17 @@
 	
 	[tableWindow endEditingFor:nil];
 	
-	NSAlert *alert = [NSAlert alertWithMessageText:@"" defaultButton:NSLocalizedString(@"Truncate", @"truncate button") alternateButton:NSLocalizedString(@"Cancel", @"cancel button") otherButton:nil informativeTextWithFormat:@""];
+	NSAlert *alert = [NSAlert alertWithMessageText:@"" defaultButton:NSLocalizedString(@"Cancel", @"cancel button") alternateButton:NSLocalizedString(@"Truncate", @"truncate button") otherButton:nil informativeTextWithFormat:@""];
 	
 	[alert setAlertStyle:NSCriticalAlertStyle];
 	
 	if ([tablesListView numberOfSelectedRows] == 1) {		
 		[alert setMessageText:[NSString stringWithFormat:NSLocalizedString(@"Truncate table '%@'?", @"truncate table message"), [tables objectAtIndex:[tablesListView selectedRow]]]];
-		[alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete ALL table records in the table '%@'. This operation cannot be undone.", @"truncate table informative message"), [tables objectAtIndex:[tablesListView selectedRow]]]];
+		[alert setInformativeText:[NSString stringWithFormat:NSLocalizedString(@"Are you sure you want to delete ALL records in the table '%@'. This operation cannot be undone.", @"truncate table informative message"), [tables objectAtIndex:[tablesListView selectedRow]]]];
 	} 
 	else {
 		[alert setMessageText:NSLocalizedString(@"Truncate selected tables?", @"truncate tables message")];
-		[alert setInformativeText:NSLocalizedString(@"Are you sure you want to delete ALL table records in the selected tables. This operation cannot be undone.", @"truncate tables informative message")];
+		[alert setInformativeText:NSLocalizedString(@"Are you sure you want to delete ALL records in the selected tables. This operation cannot be undone.", @"truncate tables informative message")];
 	}
 	
 	[alert beginSheetModalForWindow:tableWindow modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:@"truncateTable"];
@@ -709,14 +709,14 @@
 	else if ([contextInfo isEqualToString:@"removeRow"]) {
 		[[sheet window] orderOut:nil];
 		
-		if (returnCode == NSAlertDefaultReturn) {
+		if (returnCode == NSAlertAlternateReturn) {
 			[self removeTable];
 		}
 	}
 	else if ([contextInfo isEqualToString:@"truncateTable"]) {
 		[[sheet window] orderOut:nil];
 		
-		if (returnCode == NSAlertDefaultReturn) {
+		if (returnCode == NSAlertAlternateReturn) {
 			[self truncateTable];
 		}
 	}
@@ -1223,9 +1223,9 @@
 			[[tableSubMenu itemAtIndex:9] setHidden:YES]; // checksum
 
 			[renameTableMenuItem setHidden:NO]; // we don't have to check the mysql version
-			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename View", @"rename view menu title")];
+			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename View...", @"rename view menu title")];
 			[duplicateTableMenuItem setHidden:NO];
-			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate View", @"duplicate view menu title")];
+			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate View...", @"duplicate view menu title")];
 			[truncateTableButton setHidden:YES];
 			[removeTableMenuItem setTitle:NSLocalizedString(@"Remove View", @"remove view menu title")];
 		} 
@@ -1244,9 +1244,9 @@
 			[[tableSubMenu itemAtIndex:9] setHidden:NO];
 
 			[renameTableMenuItem setHidden:NO];
-			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Table", @"rename table menu title")];
+			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Table...", @"rename table menu title")];
 			[duplicateTableMenuItem setHidden:NO];
-			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Table", @"duplicate table menu title")];
+			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Table...", @"duplicate table menu title")];
 			[truncateTableButton setHidden:NO];
 			[truncateTableButton setTitle:NSLocalizedString(@"Truncate Table", @"truncate table menu title")];
 			[removeTableMenuItem setTitle:NSLocalizedString(@"Remove Table", @"remove table menu title")];
@@ -1264,9 +1264,9 @@
 			[[tableSubMenu itemAtIndex:9] setHidden:YES];
 			
 			[renameTableMenuItem setHidden:NO];
-			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Procedure", @"rename proc menu title")];
+			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Procedure...", @"rename proc menu title")];
 			[duplicateTableMenuItem setHidden:NO];
-			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Procedure", @"duplicate proc menu title")];
+			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Procedure...", @"duplicate proc menu title")];
 			[truncateTableButton setHidden:YES];
 			[removeTableMenuItem setTitle:NSLocalizedString(@"Remove Procedure", @"remove proc menu title")];
 		}
@@ -1283,9 +1283,9 @@
 			[[tableSubMenu itemAtIndex:9] setHidden:YES];	
 			
 			[renameTableMenuItem setHidden:NO];
-			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Function", @"rename func menu title")];
+			[renameTableMenuItem setTitle:NSLocalizedString(@"Rename Function...", @"rename func menu title")];
 			[duplicateTableMenuItem setHidden:NO];
-			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Function", @"duplicate func menu title")];
+			[duplicateTableMenuItem setTitle:NSLocalizedString(@"Duplicate Function...", @"duplicate func menu title")];
 			[truncateTableButton setHidden:YES];
 			[removeTableMenuItem setTitle:NSLocalizedString(@"Remove Function", @"remove func menu title")];
 		}