diff options
author | stuconnolly <stuart02@gmail.com> | 2009-06-24 10:25:56 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2009-06-24 10:25:56 +0000 |
commit | 6f0f5ec932e7a1697ee344be9526829ec8f90007 (patch) | |
tree | 789eab8f51b365d6a1b7fb9f37e5f74599d18bf6 /Source | |
parent | 6b6a49809f314b3771243ace6c6df1294981bb10 (diff) | |
download | sequelpro-6f0f5ec932e7a1697ee344be9526829ec8f90007.tar.gz sequelpro-6f0f5ec932e7a1697ee344be9526829ec8f90007.tar.bz2 sequelpro-6f0f5ec932e7a1697ee344be9526829ec8f90007.zip |
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.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/TablesList.m | 28 |
1 files changed, 14 insertions, 14 deletions
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")]; } |