aboutsummaryrefslogtreecommitdiffstats
path: root/Source/TableDocument.m
diff options
context:
space:
mode:
Diffstat (limited to 'Source/TableDocument.m')
-rw-r--r--Source/TableDocument.m101
1 files changed, 50 insertions, 51 deletions
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 7da74a07..e8ad22bf 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -2931,12 +2931,12 @@
// Cancel the selection if currently editing a content row and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 1
&& ![tableContentInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_CONTENT];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableContent];
return;
}
[tableTabView selectTabViewItemAtIndex:0];
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_STRUCTURE];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableStructure];
[spHistoryControllerInstance updateHistoryEntries];
[prefs setInteger:SPStructureViewMode forKey:SPLastViewMode];
@@ -2947,12 +2947,12 @@
// Cancel the selection if currently editing structure/a field and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 0
&& ![tableSourceInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_STRUCTURE];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableStructure];
return;
}
[tableTabView selectTabViewItemAtIndex:1];
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_CONTENT];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableContent];
[spHistoryControllerInstance updateHistoryEntries];
[prefs setInteger:SPContentViewMode forKey:SPLastViewMode];
@@ -2963,19 +2963,19 @@
// Cancel the selection if currently editing structure/a field and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 0
&& ![tableSourceInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_STRUCTURE];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableStructure];
return;
}
// Cancel the selection if currently editing a content row and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 1
&& ![tableContentInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_CONTENT];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableContent];
return;
}
[tableTabView selectTabViewItemAtIndex:2];
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_CUSTOM_QUERY];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarCustomQuery];
[spHistoryControllerInstance updateHistoryEntries];
// Set the focus on the text field if no query has been run
@@ -2989,19 +2989,19 @@
// Cancel the selection if currently editing structure/a field and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 0
&& ![tableSourceInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_STRUCTURE];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableStructure];
return;
}
// Cancel the selection if currently editing a content row and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 1
&& ![tableContentInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_CONTENT];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableContent];
return;
}
[tableTabView selectTabViewItemAtIndex:3];
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_INFO];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableInfo];
[spHistoryControllerInstance updateHistoryEntries];
[prefs setInteger:SPTableInfoViewMode forKey:SPLastViewMode];
@@ -3012,19 +3012,19 @@
// Cancel the selection if currently editing structure/a field and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 0
&& ![tableSourceInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_STRUCTURE];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableStructure];
return;
}
// Cancel the selection if currently editing a content row and unable to save
if ([tableTabView indexOfTabViewItem:[tableTabView selectedTabViewItem]] == 1
&& ![tableContentInstance saveRowOnDeselect]) {
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_CONTENT];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableContent];
return;
}
[tableTabView selectTabViewItemAtIndex:4];
- [mainToolbar setSelectedItemIdentifier:MAIN_TOOLBAR_TABLE_RELATIONS];
+ [mainToolbar setSelectedItemIdentifier:SPMainToolbarTableRelations];
[spHistoryControllerInstance updateHistoryEntries];
[prefs setInteger:SPRelationsViewMode forKey:SPLastViewMode];
@@ -3157,7 +3157,7 @@
{
NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];
- if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_DATABASE_SELECTION]) {
+ if ([itemIdentifier isEqualToString:SPMainToolbarDatabaseSelection]) {
[toolbarItem setLabel:NSLocalizedString(@"Select Database", @"toolbar item for selecting a db")];
[toolbarItem setPaletteLabel:[toolbarItem label]];
[toolbarItem setView:chooseDatabaseButton];
@@ -3171,12 +3171,12 @@
[self updateChooseDatabaseToolbarItemWidth];
}
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_HISTORY_NAVIGATION]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarHistoryNavigation]) {
[toolbarItem setLabel:NSLocalizedString(@"Table History", @"toolbar item for navigation history")];
[toolbarItem setPaletteLabel:[toolbarItem label]];
[toolbarItem setView:historyControl];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_SHOW_CONSOLE]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarShowConsole]) {
[toolbarItem setPaletteLabel:NSLocalizedString(@"Show Console", @"show console")];
[toolbarItem setToolTip:NSLocalizedString(@"Show the console which shows all MySQL commands performed by Sequel Pro", @"tooltip for toolbar item for show console")];
@@ -3187,7 +3187,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(showConsole:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_CLEAR_CONSOLE]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarClearConsole]) {
//set the text label to be displayed in the toolbar and customization palette
[toolbarItem setLabel:NSLocalizedString(@"Clear Console", @"toolbar item for clear console")];
[toolbarItem setPaletteLabel:NSLocalizedString(@"Clear Console", @"toolbar item for clear console")];
@@ -3198,7 +3198,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(clearConsole:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_TABLE_STRUCTURE]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarTableStructure]) {
[toolbarItem setLabel:NSLocalizedString(@"Structure", @"toolbar item label for switching to the Table Structure tab")];
[toolbarItem setPaletteLabel:NSLocalizedString(@"Edit Table Structure", @"toolbar item label for switching to the Table Structure tab")];
//set up tooltip and image
@@ -3208,7 +3208,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(viewStructure:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_TABLE_CONTENT]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarTableContent]) {
[toolbarItem setLabel:NSLocalizedString(@"Content", @"toolbar item label for switching to the Table Content tab")];
[toolbarItem setPaletteLabel:NSLocalizedString(@"Browse & Edit Table Content", @"toolbar item label for switching to the Table Content tab")];
//set up tooltip and image
@@ -3218,7 +3218,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(viewContent:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_CUSTOM_QUERY]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarCustomQuery]) {
[toolbarItem setLabel:NSLocalizedString(@"Query", @"toolbar item label for switching to the Run Query tab")];
[toolbarItem setPaletteLabel:NSLocalizedString(@"Run Custom Query", @"toolbar item label for switching to the Run Query tab")];
//set up tooltip and image
@@ -3228,7 +3228,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(viewQuery:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_TABLE_INFO]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarTableInfo]) {
[toolbarItem setLabel:NSLocalizedString(@"Table Info", @"toolbar item label for switching to the Table Info tab")];
[toolbarItem setPaletteLabel:NSLocalizedString(@"Table Info", @"toolbar item label for switching to the Table Info tab")];
//set up tooltip and image
@@ -3238,7 +3238,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(viewStatus:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_TABLE_RELATIONS]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarTableRelations]) {
[toolbarItem setLabel:NSLocalizedString(@"Relations", @"toolbar item label for switching to the Table Relations tab")];
[toolbarItem setPaletteLabel:NSLocalizedString(@"Table Relations", @"toolbar item label for switching to the Table Relations tab")];
//set up tooltip and image
@@ -3248,7 +3248,7 @@
[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(viewRelations:)];
- } else if ([itemIdentifier isEqualToString:MAIN_TOOLBAR_USER_MANAGER]) {
+ } else if ([itemIdentifier isEqualToString:SPMainToolbarUserManager]) {
[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
@@ -3271,17 +3271,16 @@
- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar
{
return [NSArray arrayWithObjects:
- MAIN_TOOLBAR_DATABASE_SELECTION,
- MAIN_TOOLBAR_HISTORY_NAVIGATION,
- MAIN_TOOLBAR_SHOW_CONSOLE,
- MAIN_TOOLBAR_CLEAR_CONSOLE,
- MAIN_TOOLBAR_FLUSH_PRIVILEGES,
- MAIN_TOOLBAR_TABLE_STRUCTURE,
- MAIN_TOOLBAR_TABLE_CONTENT,
- MAIN_TOOLBAR_CUSTOM_QUERY,
- MAIN_TOOLBAR_TABLE_INFO,
- MAIN_TOOLBAR_TABLE_RELATIONS,
- MAIN_TOOLBAR_USER_MANAGER,
+ SPMainToolbarDatabaseSelection,
+ SPMainToolbarHistoryNavigation,
+ SPMainToolbarShowConsole,
+ SPMainToolbarClearConsole,
+ SPMainToolbarTableStructure,
+ SPMainToolbarTableContent,
+ SPMainToolbarCustomQuery,
+ SPMainToolbarTableInfo,
+ SPMainToolbarTableRelations,
+ SPMainToolbarUserManager,
NSToolbarCustomizeToolbarItemIdentifier,
NSToolbarFlexibleSpaceItemIdentifier,
NSToolbarSpaceItemIdentifier,
@@ -3295,16 +3294,16 @@
- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar
{
return [NSArray arrayWithObjects:
- MAIN_TOOLBAR_DATABASE_SELECTION,
- MAIN_TOOLBAR_TABLE_STRUCTURE,
- MAIN_TOOLBAR_TABLE_CONTENT,
- MAIN_TOOLBAR_TABLE_RELATIONS,
- MAIN_TOOLBAR_TABLE_INFO,
- MAIN_TOOLBAR_CUSTOM_QUERY,
+ SPMainToolbarDatabaseSelection,
+ SPMainToolbarTableStructure,
+ SPMainToolbarTableContent,
+ SPMainToolbarTableRelations,
+ SPMainToolbarTableInfo,
+ SPMainToolbarCustomQuery,
NSToolbarFlexibleSpaceItemIdentifier,
- MAIN_TOOLBAR_HISTORY_NAVIGATION,
- MAIN_TOOLBAR_USER_MANAGER,
- MAIN_TOOLBAR_SHOW_CONSOLE,
+ SPMainToolbarHistoryNavigation,
+ SPMainToolbarUserManager,
+ SPMainToolbarShowConsole,
nil];
}
@@ -3314,11 +3313,11 @@
- (NSArray *)toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
{
return [NSArray arrayWithObjects:
- MAIN_TOOLBAR_TABLE_STRUCTURE,
- MAIN_TOOLBAR_TABLE_CONTENT,
- MAIN_TOOLBAR_CUSTOM_QUERY,
- MAIN_TOOLBAR_TABLE_INFO,
- MAIN_TOOLBAR_TABLE_RELATIONS,
+ SPMainToolbarTableStructure,
+ SPMainToolbarTableContent,
+ SPMainToolbarCustomQuery,
+ SPMainToolbarTableInfo,
+ SPMainToolbarTableRelations,
nil];
}
@@ -3333,7 +3332,7 @@
NSString *identifier = [toolbarItem itemIdentifier];
// Show console item
- if ([identifier isEqualToString:MAIN_TOOLBAR_SHOW_CONSOLE]) {
+ if ([identifier isEqualToString:SPMainToolbarShowConsole]) {
if ([[[SPQueryController sharedQueryController] window] isVisible]) {
[toolbarItem setImage:[NSImage imageNamed:@"showconsole"]];
} else {
@@ -3347,11 +3346,11 @@
}
// Clear console item
- if ([identifier isEqualToString:MAIN_TOOLBAR_CLEAR_CONSOLE]) {
+ if ([identifier isEqualToString:SPMainToolbarClearConsole]) {
return ([[SPQueryController sharedQueryController] consoleMessageCount] > 0);
}
- if (![identifier isEqualToString:MAIN_TOOLBAR_CUSTOM_QUERY]) {
+ if (![identifier isEqualToString:SPMainToolbarCustomQuery]) {
return (([tablesListInstance tableType] == SP_TABLETYPE_TABLE) ||
([tablesListInstance tableType] == SP_TABLETYPE_VIEW));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 12:53:31 +0000