From 37fadd868cd6bc80cafac2645d33a69e38d6741b Mon Sep 17 00:00:00 2001 From: dmoagx Date: Sun, 26 Sep 2010 23:55:32 +0000 Subject: * One label was too short in Content Filter Manager * Changed some NSLocalizedString() comments to be more descriptive - keep in mind that the comment is the only thing that can provide context here. --- Interfaces/English.lproj/ContentFilterManager.xib | 2478 +++++++++++++++++++-- Source/SPContentFilterManager.m | 23 +- Source/SPDataImport.m | 10 +- Source/SPNavigatorController.m | 24 +- Source/SPPreferenceController.m | 24 +- 5 files changed, 2395 insertions(+), 164 deletions(-) diff --git a/Interfaces/English.lproj/ContentFilterManager.xib b/Interfaces/English.lproj/ContentFilterManager.xib index 5aff83d8..4b4ff6e5 100644 --- a/Interfaces/English.lproj/ContentFilterManager.xib +++ b/Interfaces/English.lproj/ContentFilterManager.xib @@ -16,17 +16,17 @@ YES 788 - 1.2.5 + 1.2.2 YES - + YES - com.brandonwalkin.BWToolkit com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit YES @@ -56,7 +56,7 @@ Content Filter Manager NSWindow - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} {500, 371} @@ -347,7 +347,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2ODY1AA + MC42NjY2NjY2NjY3AA @@ -633,7 +633,7 @@ -2147483360 - {{17, 149}, {104, 14}} + {{17, 149}, {252, 14}} YES @@ -929,7 +929,7 @@ SPContentFilterSplitView 1 - MC42NjY2NjY2ODY1IDAuNjY2NjY2Njg2NSAwLjY2NjY2NjY4NjUAA + MC42NjY2NjY2NjY3IDAuNjY2NjY2NjY2NyAwLjY2NjY2NjY2NjcAA YES @@ -984,7 +984,7 @@ {{0, 0}, {1680, 1028}} {500, 393} - {3.40282e+38, 3.40282e+38} + {1.79769e+308, 1.79769e+308} SPContentFilterManagerWindow @@ -2003,9 +2003,9 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - {{252, 385}, {500, 371}} + {{329, 385}, {500, 371}} com.apple.InterfaceBuilder.CocoaPlugin - {{252, 385}, {500, 371}} + {{329, 385}, {500, 371}} {196, 240} {{357, 418}, {480, 270}} @@ -2207,6 +2207,13 @@ Source/ImageAndTextCell.h + + NSApplication + + IBProjectSource + Frameworks/PSMTabBar/PSMTabDragAssistant.h + + NSObject @@ -2225,7 +2232,14 @@ NSObject IBProjectSource - Source/CMImageView.h + Frameworks/PSMTabBar/PSMTabBarCell.h + + + + NSObject + + IBProjectSource + Frameworks/PSMTabBar/PSMTabBarControl.h @@ -2246,12 +2260,26 @@ NSObject IBProjectSource - Source/SPNotLoaded.h + Source/SPImageView.h + + + + NSObject + + IBProjectSource + Source/SPMainThreadTrampoline.h NSObject + IBProjectSource + Source/SPNotLoaded.h + + + + NSObject + IBProjectSource Source/SPQueryFavoriteManager.h @@ -2269,9 +2297,9 @@ id - + IBProjectSource - Source/TablesList.h + Source/SPTablesList.h @@ -2411,6 +2439,7 @@ importContentFilterByAdding: insertPlaceholder: removeContentFilter: + suppressLeadingFiledPlaceholderWasChanged: YES @@ -2421,6 +2450,7 @@ id id id + id @@ -2434,6 +2464,7 @@ importContentFilterByAdding: insertPlaceholder: removeContentFilter: + suppressLeadingFiledPlaceholderWasChanged: YES @@ -2465,6 +2496,10 @@ removeContentFilter: id + + suppressLeadingFiledPlaceholderWasChanged: + id + @@ -2484,6 +2519,7 @@ resultingClauseContentLabel resultingClauseLabel splitViewButtonBar + suppressLeadingFiledPlaceholderCheckbox YES @@ -2500,6 +2536,7 @@ id id BWAnchoredButtonBar + id @@ -2519,6 +2556,7 @@ resultingClauseContentLabel resultingClauseLabel splitViewButtonBar + suppressLeadingFiledPlaceholderCheckbox YES @@ -2574,73 +2612,95 @@ splitViewButtonBar BWAnchoredButtonBar + + suppressLeadingFiledPlaceholderCheckbox + id + - SPTableView - NSTableView - - IBProjectSource - Source/SPTableView.h - - - - SPTextView - NSTextView + SPCopyTable + SPTableView - showMySQLHelpForCurrentWord: + copy: id - showMySQLHelpForCurrentWord: + copy: - showMySQLHelpForCurrentWord: + copy: id - scrollView - NSScrollView + YES + + YES + mySQLConnection + tableInstance + + + YES + id + id + - scrollView - - scrollView - NSScrollView + YES + + YES + mySQLConnection + tableInstance + + + YES + + mySQLConnection + id + + + tableInstance + id + - IBUserSource - - - - - - YES - - NSObject - - IBDocumentRelativeSource - ../../Source/SPContentFilterManager.h + IBProjectSource + Source/SPCopyTable.h - SPContentFilterManager - NSWindowController + SPCustomQuery + NSObject YES YES - addContentFilter: - closeContentFilterManagerSheet: - duplicateContentFilter: - exportContentFilter: - importContentFilterByAdding: - insertPlaceholder: - removeContentFilter: - suppressLeadingFiledPlaceholderWasChanged: + chooseQueryFavorite: + chooseQueryHistory: + clearQueryHistory: + closeSheet: + copyQueryHistory: + filterQueryFavorites: + filterQueryHistory: + gearMenuItemSelected: + helpSearchFindNextInPage: + helpSearchFindPreviousInPage: + helpSegmentDispatcher: + helpSelectHelpTargetMySQL: + helpSelectHelpTargetPage: + helpSelectHelpTargetWeb: + helpTargetDispatcher: + runAllQueries: + runSelectedQueries: + saveQueryHistory: + showAutoHelpForCurrentWord: + showCompletionList: + showHelpForCurrentWord: + showHelpForSearchString: + toggleQueryInfoPaneCollapse: YES @@ -2652,53 +2712,143 @@ id id id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id YES YES - addContentFilter: - closeContentFilterManagerSheet: - duplicateContentFilter: - exportContentFilter: - importContentFilterByAdding: - insertPlaceholder: - removeContentFilter: - suppressLeadingFiledPlaceholderWasChanged: + chooseQueryFavorite: + chooseQueryHistory: + clearQueryHistory: + closeSheet: + copyQueryHistory: + filterQueryFavorites: + filterQueryHistory: + gearMenuItemSelected: + helpSearchFindNextInPage: + helpSearchFindPreviousInPage: + helpSegmentDispatcher: + helpSelectHelpTargetMySQL: + helpSelectHelpTargetPage: + helpSelectHelpTargetWeb: + helpTargetDispatcher: + runAllQueries: + runSelectedQueries: + saveQueryHistory: + showAutoHelpForCurrentWord: + showCompletionList: + showHelpForCurrentWord: + showHelpForSearchString: + toggleQueryInfoPaneCollapse: YES - addContentFilter: + chooseQueryFavorite: id - closeContentFilterManagerSheet: + chooseQueryHistory: id - duplicateContentFilter: + clearQueryHistory: id - exportContentFilter: + closeSheet: id - importContentFilterByAdding: + copyQueryHistory: id - insertPlaceholder: + filterQueryFavorites: id - removeContentFilter: + filterQueryHistory: id - suppressLeadingFiledPlaceholderWasChanged: + gearMenuItemSelected: + id + + + helpSearchFindNextInPage: + id + + + helpSearchFindPreviousInPage: + id + + + helpSegmentDispatcher: + id + + + helpSelectHelpTargetMySQL: + id + + + helpSelectHelpTargetPage: + id + + + helpSelectHelpTargetWeb: + id + + + helpTargetDispatcher: + id + + + runAllQueries: + id + + + runSelectedQueries: + id + + + saveQueryHistory: + id + + + showAutoHelpForCurrentWord: + id + + + showCompletionList: + id + + + showHelpForCurrentWord: + id + + + showHelpForSearchString: + id + + + toggleQueryInfoPaneCollapse: id @@ -2707,36 +2857,112 @@ YES YES - contentFilterArrayController - contentFilterConjunctionLabel - contentFilterConjunctionTextField - contentFilterNameTextField - contentFilterTableView - contentFilterTextView + affectedRowsText + autohelpMenuItem + autoindentMenuItem + autopairMenuItem + autouppercaseKeywordsMenuItem + clearHistoryMenuItem + commentCurrentQueryMenuItem + commentLineOrSelectionMenuItem + completionListMenuItem + copyHistoryMenuItem + customQueryScrollView + customQueryView + editorFontMenuItem encodingPopUp - insertPlaceholderButton - numberOfArgsLabel - removeButton - resultingClauseContentLabel - resultingClauseLabel - splitViewButtonBar - suppressLeadingFiledPlaceholderCheckbox + errorText + helpNavigator + helpSearchField + helpSearchFieldCell + helpTargetSelector + helpWebView + helpWebViewWindow + multipleLineEditingButton + nextHistoryMenuItem + previousHistoryMenuItem + queryFavoriteNameTextField + queryFavoritesButton + queryFavoritesSaveAllMenuItem + queryFavoritesSaveAsMenuItem + queryFavoritesSearchField + queryFavoritesSearchFieldView + queryFavoritesSearchMenuItem + queryFavoritesSheet + queryHistoryButton + queryHistorySearchField + queryHistorySearchFieldView + queryHistorySearchMenuItem + queryInfoButton + queryInfoPaneSplitView + runAllButton + runAllMenuItem + runSelectionButton + runSelectionMenuItem + saveHistoryMenuItem + saveQueryFavoriteButton + saveQueryFavoriteGlobal + shiftLeftMenuItem + shiftRightMenuItem + tableDocumentInstance + tablesListInstance + textView + valueSheet + valueTextField YES id + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSScrollView + SPCopyTable + NSMenuItem + NSPopUpButton id + NSSegmentedControl + NSSearchField + NSSearchFieldCell + NSSegmentedControl + WebView + NSWindow id + NSMenuItem + NSMenuItem + NSTextField id + NSMenuItem + NSMenuItem + NSSearchField id + NSMenuItem + NSWindow id + NSSearchField id + NSMenuItem + NSButton + BWSplitView id + NSMenuItem id + NSMenuItem + NSMenuItem + NSButton id + NSMenuItem + NSMenuItem id id - BWAnchoredButtonBar + SPTextView + id id @@ -2744,86 +2970,1910 @@ YES YES - contentFilterArrayController - contentFilterConjunctionLabel - contentFilterConjunctionTextField - contentFilterNameTextField - contentFilterTableView - contentFilterTextView + affectedRowsText + autohelpMenuItem + autoindentMenuItem + autopairMenuItem + autouppercaseKeywordsMenuItem + clearHistoryMenuItem + commentCurrentQueryMenuItem + commentLineOrSelectionMenuItem + completionListMenuItem + copyHistoryMenuItem + customQueryScrollView + customQueryView + editorFontMenuItem encodingPopUp - insertPlaceholderButton - numberOfArgsLabel - removeButton - resultingClauseContentLabel - resultingClauseLabel - splitViewButtonBar - suppressLeadingFiledPlaceholderCheckbox + errorText + helpNavigator + helpSearchField + helpSearchFieldCell + helpTargetSelector + helpWebView + helpWebViewWindow + multipleLineEditingButton + nextHistoryMenuItem + previousHistoryMenuItem + queryFavoriteNameTextField + queryFavoritesButton + queryFavoritesSaveAllMenuItem + queryFavoritesSaveAsMenuItem + queryFavoritesSearchField + queryFavoritesSearchFieldView + queryFavoritesSearchMenuItem + queryFavoritesSheet + queryHistoryButton + queryHistorySearchField + queryHistorySearchFieldView + queryHistorySearchMenuItem + queryInfoButton + queryInfoPaneSplitView + runAllButton + runAllMenuItem + runSelectionButton + runSelectionMenuItem + saveHistoryMenuItem + saveQueryFavoriteButton + saveQueryFavoriteGlobal + shiftLeftMenuItem + shiftRightMenuItem + tableDocumentInstance + tablesListInstance + textView + valueSheet + valueTextField YES - contentFilterArrayController + affectedRowsText id - contentFilterConjunctionLabel - id + autohelpMenuItem + NSMenuItem - contentFilterConjunctionTextField - id + autoindentMenuItem + NSMenuItem - contentFilterNameTextField - id + autopairMenuItem + NSMenuItem - contentFilterTableView - id + autouppercaseKeywordsMenuItem + NSMenuItem - contentFilterTextView - id + clearHistoryMenuItem + NSMenuItem + + + commentCurrentQueryMenuItem + NSMenuItem + + + commentLineOrSelectionMenuItem + NSMenuItem + + + completionListMenuItem + NSMenuItem + + + copyHistoryMenuItem + NSMenuItem + + + customQueryScrollView + NSScrollView + + + customQueryView + SPCopyTable + + + editorFontMenuItem + NSMenuItem encodingPopUp - id + NSPopUpButton - insertPlaceholderButton + errorText id - numberOfArgsLabel - id + helpNavigator + NSSegmentedControl - removeButton - id + helpSearchField + NSSearchField - resultingClauseContentLabel + helpSearchFieldCell + NSSearchFieldCell + + + helpTargetSelector + NSSegmentedControl + + + helpWebView + WebView + + + helpWebViewWindow + NSWindow + + + multipleLineEditingButton id - resultingClauseLabel + nextHistoryMenuItem + NSMenuItem + + + previousHistoryMenuItem + NSMenuItem + + + queryFavoriteNameTextField + NSTextField + + + queryFavoritesButton id - splitViewButtonBar - BWAnchoredButtonBar + queryFavoritesSaveAllMenuItem + NSMenuItem - suppressLeadingFiledPlaceholderCheckbox + queryFavoritesSaveAsMenuItem + NSMenuItem + + + queryFavoritesSearchField + NSSearchField + + + queryFavoritesSearchFieldView id - - - + + queryFavoritesSearchMenuItem + NSMenuItem + + + queryFavoritesSheet + NSWindow + + + queryHistoryButton + id + + + queryHistorySearchField + NSSearchField + + + queryHistorySearchFieldView + id + + + queryHistorySearchMenuItem + NSMenuItem + + + queryInfoButton + NSButton + + + queryInfoPaneSplitView + BWSplitView + + + runAllButton + id + + + runAllMenuItem + NSMenuItem + + + runSelectionButton + id + + + runSelectionMenuItem + NSMenuItem + + + saveHistoryMenuItem + NSMenuItem + + + saveQueryFavoriteButton + NSButton + + + saveQueryFavoriteGlobal + id + + + shiftLeftMenuItem + NSMenuItem + + + shiftRightMenuItem + NSMenuItem + + + tableDocumentInstance + id + + + tablesListInstance + id + + + textView + SPTextView + + + valueSheet + id + + + valueTextField + id + + + + + IBProjectSource + Source/SPCustomQuery.h + + + + SPDatabaseDocument + + IBProjectSource + Source/SPConnectionDelegate.h + + + + SPDatabaseDocument + NSObject + + YES + + YES + addConnectionToFavorites: + addDatabase: + analyzeTable: + backForwardInHistory: + cancelTask: + checkTable: + checksumTable: + chooseDatabase: + chooseEncoding: + closePanelSheet: + closePasswordSheet: + closeSheet: + copyChecksumFromSheet: + copyCreateTableSyntax: + copyCreateTableSyntaxFromSheet: + copyDatabase: + export: + exportSelectedTablesAs: + flushPrivileges: + flushTable: + focusOnTableContentFilter: + focusOnTableListFilter: + import: + importFromClipboard: + openCurrentConnectionInNewWindow: + optimizeTable: + removeDatabase: + renameDatabase: + repairTable: + saveConnectionSheet: + saveCreateSyntax: + setDatabases: + showConsole: + showCreateTableSyntax: + showMySQLHelp: + showNavigator: + showServerProcesses: + showServerVariables: + showUserManager: + toggleNavigator: + updateWindowTitle: + validateSaveConnectionAccessory: + viewContent: + viewQuery: + viewRelations: + viewStatus: + viewStructure: + viewTriggers: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + addConnectionToFavorites: + addDatabase: + analyzeTable: + backForwardInHistory: + cancelTask: + checkTable: + checksumTable: + chooseDatabase: + chooseEncoding: + closePanelSheet: + closePasswordSheet: + closeSheet: + copyChecksumFromSheet: + copyCreateTableSyntax: + copyCreateTableSyntaxFromSheet: + copyDatabase: + export: + exportSelectedTablesAs: + flushPrivileges: + flushTable: + focusOnTableContentFilter: + focusOnTableListFilter: + import: + importFromClipboard: + openCurrentConnectionInNewWindow: + optimizeTable: + removeDatabase: + renameDatabase: + repairTable: + saveConnectionSheet: + saveCreateSyntax: + setDatabases: + showConsole: + showCreateTableSyntax: + showMySQLHelp: + showNavigator: + showServerProcesses: + showServerVariables: + showUserManager: + toggleNavigator: + updateWindowTitle: + validateSaveConnectionAccessory: + viewContent: + viewQuery: + viewRelations: + viewStatus: + viewStructure: + viewTriggers: + + + YES + + addConnectionToFavorites: + id + + + addDatabase: + id + + + analyzeTable: + id + + + backForwardInHistory: + id + + + cancelTask: + id + + + checkTable: + id + + + checksumTable: + id + + + chooseDatabase: + id + + + chooseEncoding: + id + + + closePanelSheet: + id + + + closePasswordSheet: + id + + + closeSheet: + id + + + copyChecksumFromSheet: + id + + + copyCreateTableSyntax: + id + + + copyCreateTableSyntaxFromSheet: + id + + + copyDatabase: + id + + + export: + id + + + exportSelectedTablesAs: + id + + + flushPrivileges: + id + + + flushTable: + id + + + focusOnTableContentFilter: + id + + + focusOnTableListFilter: + id + + + import: + id + + + importFromClipboard: + id + + + openCurrentConnectionInNewWindow: + id + + + optimizeTable: + id + + + removeDatabase: + id + + + renameDatabase: + id + + + repairTable: + id + + + saveConnectionSheet: + id + + + saveCreateSyntax: + id + + + setDatabases: + id + + + showConsole: + id + + + showCreateTableSyntax: + id + + + showMySQLHelp: + id + + + showNavigator: + id + + + showServerProcesses: + id + + + showServerVariables: + id + + + showUserManager: + id + + + toggleNavigator: + id + + + updateWindowTitle: + id + + + validateSaveConnectionAccessory: + id + + + viewContent: + id + + + viewQuery: + id + + + viewRelations: + id + + + viewStatus: + id + + + viewStructure: + id + + + viewTriggers: + id + + + + + YES + + YES + addDatabaseButton + chooseDatabaseButton + connectionErrorDialog + contentViewSplitter + copyDatabaseButton + copyDatabaseDataButton + copyDatabaseMessageField + createTableSyntaxTextField + createTableSyntaxTextView + createTableSyntaxWindow + customQueryInstance + customQueryTextView + databaseCopyNameField + databaseCopySheet + databaseDataInstance + databaseEncodingButton + databaseNameField + databaseRenameNameField + databaseRenameSheet + databaseSheet + dbTablesTableView + encodingPopUp + exportControllerInstance + extendedTableInfoInstance + favoritesButton + historyControl + inputTextWindow + inputTextWindowHeader + inputTextWindowMessage + inputTextWindowSecureTextField + listFilterField + parentView + queryProgressBar + renameDatabaseButton + renameDatabaseMessageField + saveConnectionAccessory + saveConnectionAutoConnect + saveConnectionEncrypt + saveConnectionEncryptString + saveConnectionIncludeData + saveConnectionIncludeQuery + saveConnectionSavePassword + saveConnectionSavePasswordAlert + sidebarGrabber + spHistoryControllerInstance + statusTableAccessoryView + statusTableCopyChecksum + statusTableView + statusValues + tableContentInstance + tableDataInstance + tableDumpInstance + tableInfoCollapseButton + tableInfoTable + tableListSplitter + tableRelationsInstance + tableSourceInstance + tableTabView + tableTriggersInstance + tablesListInstance + taskCancelButton + taskCancellationCallbackObject + taskDescriptionText + taskProgressIndicator + taskProgressLayer + titleAccessoryView + titleImageView + titleStringView + + + YES + id + id + NSWindow + NSSplitView + id + id + id + NSTextField + NSTextView + NSWindow + id + NSTextView + id + id + id + id + id + id + id + id + NSTableView + NSPopUpButton + id + id + id + id + id + id + id + id + NSSearchField + NSView + id + id + id + id + id + id + NSSecureTextField + id + id + id + id + id + id + id + id + id + id + id + id + id + NSButton + NSTableView + NSSplitView + id + id + NSTabView + id + id + NSButton + id + id + id + NSBox + id + id + id + + + + YES + + YES + addDatabaseButton + chooseDatabaseButton + connectionErrorDialog + contentViewSplitter + copyDatabaseButton + copyDatabaseDataButton + copyDatabaseMessageField + createTableSyntaxTextField + createTableSyntaxTextView + createTableSyntaxWindow + customQueryInstance + customQueryTextView + databaseCopyNameField + databaseCopySheet + databaseDataInstance + databaseEncodingButton + databaseNameField + databaseRenameNameField + databaseRenameSheet + databaseSheet + dbTablesTableView + encodingPopUp + exportControllerInstance + extendedTableInfoInstance + favoritesButton + historyControl + inputTextWindow + inputTextWindowHeader + inputTextWindowMessage + inputTextWindowSecureTextField + listFilterField + parentView + queryProgressBar + renameDatabaseButton + renameDatabaseMessageField + saveConnectionAccessory + saveConnectionAutoConnect + saveConnectionEncrypt + saveConnectionEncryptString + saveConnectionIncludeData + saveConnectionIncludeQuery + saveConnectionSavePassword + saveConnectionSavePasswordAlert + sidebarGrabber + spHistoryControllerInstance + statusTableAccessoryView + statusTableCopyChecksum + statusTableView + statusValues + tableContentInstance + tableDataInstance + tableDumpInstance + tableInfoCollapseButton + tableInfoTable + tableListSplitter + tableRelationsInstance + tableSourceInstance + tableTabView + tableTriggersInstance + tablesListInstance + taskCancelButton + taskCancellationCallbackObject + taskDescriptionText + taskProgressIndicator + taskProgressLayer + titleAccessoryView + titleImageView + titleStringView + + + YES + + addDatabaseButton + id + + + chooseDatabaseButton + id + + + connectionErrorDialog + NSWindow + + + contentViewSplitter + NSSplitView + + + copyDatabaseButton + id + + + copyDatabaseDataButton + id + + + copyDatabaseMessageField + id + + + createTableSyntaxTextField + NSTextField + + + createTableSyntaxTextView + NSTextView + + + createTableSyntaxWindow + NSWindow + + + customQueryInstance + id + + + customQueryTextView + NSTextView + + + databaseCopyNameField + id + + + databaseCopySheet + id + + + databaseDataInstance + id + + + databaseEncodingButton + id + + + databaseNameField + id + + + databaseRenameNameField + id + + + databaseRenameSheet + id + + + databaseSheet + id + + + dbTablesTableView + NSTableView + + + encodingPopUp + NSPopUpButton + + + exportControllerInstance + id + + + extendedTableInfoInstance + id + + + favoritesButton + id + + + historyControl + id + + + inputTextWindow + id + + + inputTextWindowHeader + id + + + inputTextWindowMessage + id + + + inputTextWindowSecureTextField + id + + + listFilterField + NSSearchField + + + parentView + NSView + + + queryProgressBar + id + + + renameDatabaseButton + id + + + renameDatabaseMessageField + id + + + saveConnectionAccessory + id + + + saveConnectionAutoConnect + id + + + saveConnectionEncrypt + id + + + saveConnectionEncryptString + NSSecureTextField + + + saveConnectionIncludeData + id + + + saveConnectionIncludeQuery + id + + + saveConnectionSavePassword + id + + + saveConnectionSavePasswordAlert + id + + + sidebarGrabber + id + + + spHistoryControllerInstance + id + + + statusTableAccessoryView + id + + + statusTableCopyChecksum + id + + + statusTableView + id + + + statusValues + id + + + tableContentInstance + id + + + tableDataInstance + id + + + tableDumpInstance + id + + + tableInfoCollapseButton + NSButton + + + tableInfoTable + NSTableView + + + tableListSplitter + NSSplitView + + + tableRelationsInstance + id + + + tableSourceInstance + id + + + tableTabView + NSTabView + + + tableTriggersInstance + id + + + tablesListInstance + id + + + taskCancelButton + NSButton + + + taskCancellationCallbackObject + id + + + taskDescriptionText + id + + + taskProgressIndicator + id + + + taskProgressLayer + NSBox + + + titleAccessoryView + id + + + titleImageView + id + + + titleStringView + id + + + + + IBProjectSource + Source/SPDatabaseDocument.h + + + + SPDatabaseDocument + + IBProjectSource + Source/SPPrintController.h + + + + SPHistoryController + NSObject + + historyControlClicked: + NSSegmentedControl + + + historyControlClicked: + + historyControlClicked: + NSSegmentedControl + + + + YES + + YES + historyControl + theDocument + + + YES + NSSegmentedControl + SPDatabaseDocument + + + + YES + + YES + historyControl + theDocument + + + YES + + historyControl + NSSegmentedControl + + + theDocument + SPDatabaseDocument + + + + + IBProjectSource + Source/SPHistoryController.h + + + + SPQueryFavoriteManager + NSWindowController + + YES + + YES + addQueryFavorite: + closeQueryManagerSheet: + duplicateQueryFavorite: + exportFavorites: + importFavoritesByAdding: + importFavoritesByReplacing: + insertPlaceholder: + removeAllQueryFavorites: + removeQueryFavorite: + saveFavoriteToFile: + showHelp: + + + YES + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + addQueryFavorite: + closeQueryManagerSheet: + duplicateQueryFavorite: + exportFavorites: + importFavoritesByAdding: + importFavoritesByReplacing: + insertPlaceholder: + removeAllQueryFavorites: + removeQueryFavorite: + saveFavoriteToFile: + showHelp: + + + YES + + addQueryFavorite: + id + + + closeQueryManagerSheet: + id + + + duplicateQueryFavorite: + id + + + exportFavorites: + id + + + importFavoritesByAdding: + id + + + importFavoritesByReplacing: + id + + + insertPlaceholder: + id + + + removeAllQueryFavorites: + id + + + removeQueryFavorite: + id + + + saveFavoriteToFile: + id + + + showHelp: + id + + + + + YES + + YES + encodingPopUp + favoriteNameTextField + favoriteQueryTextView + favoriteTabTriggerTextField + favoritesArrayController + favoritesTableView + removeButton + splitViewButtonBar + + + YES + NSPopUpButton + NSTextField + SPTextView + NSTextField + NSArrayController + NSTableView + NSButton + BWAnchoredButtonBar + + + + YES + + YES + encodingPopUp + favoriteNameTextField + favoriteQueryTextView + favoriteTabTriggerTextField + favoritesArrayController + favoritesTableView + removeButton + splitViewButtonBar + + + YES + + encodingPopUp + NSPopUpButton + + + favoriteNameTextField + NSTextField + + + favoriteQueryTextView + SPTextView + + + favoriteTabTriggerTextField + NSTextField + + + favoritesArrayController + NSArrayController + + + favoritesTableView + NSTableView + + + removeButton + NSButton + + + splitViewButtonBar + BWAnchoredButtonBar + + + + + + + SPTableView + NSTableView + + IBProjectSource + Source/SPTableView.h + + + + SPTablesList + NSObject + + YES + + YES + addTable: + closeSheet: + copyTable: + removeTable: + renameTable: + togglePaneCollapse: + truncateTable: + updateFilter: + updateTables: + + + YES + id + id + id + id + id + id + id + id + id + + + + YES + + YES + addTable: + closeSheet: + copyTable: + removeTable: + renameTable: + togglePaneCollapse: + truncateTable: + updateFilter: + updateTables: + + + YES + + addTable: + id + + + closeSheet: + id + + + copyTable: + id + + + removeTable: + id + + + renameTable: + id + + + togglePaneCollapse: + id + + + truncateTable: + id + + + updateFilter: + id + + + updateTables: + id + + + + + YES + + YES + addTableButton + copyTableButton + copyTableContentSwitch + copyTableMessageField + copyTableNameField + copyTableSheet + customQueryInstance + databaseDataInstance + duplicateTableContextMenuItem + duplicateTableMenuItem + extendedTableInfoInstance + listFilterField + removeTableContextMenuItem + removeTableMenuItem + renameTableContextMenuItem + renameTableMenuItem + separatorTableContextMenuItem + separatorTableContextMenuItem2 + separatorTableMenuItem + separatorTableMenuItem2 + showCreateSyntaxContextMenuItem + showCreateSyntaxMenuItem + spHistoryControllerInstance + tabView + tableContentInstance + tableDataInstance + tableDocumentInstance + tableDumpInstance + tableEncodingButton + tableInfoCollapseButton + tableInfoInstance + tableListFilterSplitView + tableListSplitView + tableNameField + tableSheet + tableSourceInstance + tableTriggersInstance + tableTypeButton + tablesListView + toolbarActionsButton + toolbarAddButton + toolbarReloadButton + truncateTableButton + truncateTableContextButton + + + YES + id + id + id + id + id + id + id + id + NSMenuItem + NSMenuItem + id + NSSearchField + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem + SPHistoryController + id + id + id + id + id + id + NSButton + id + NSSplitView + NSSplitView + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + addTableButton + copyTableButton + copyTableContentSwitch + copyTableMessageField + copyTableNameField + copyTableSheet + customQueryInstance + databaseDataInstance + duplicateTableContextMenuItem + duplicateTableMenuItem + extendedTableInfoInstance + listFilterField + removeTableContextMenuItem + removeTableMenuItem + renameTableContextMenuItem + renameTableMenuItem + separatorTableContextMenuItem + separatorTableContextMenuItem2 + separatorTableMenuItem + separatorTableMenuItem2 + showCreateSyntaxContextMenuItem + showCreateSyntaxMenuItem + spHistoryControllerInstance + tabView + tableContentInstance + tableDataInstance + tableDocumentInstance + tableDumpInstance + tableEncodingButton + tableInfoCollapseButton + tableInfoInstance + tableListFilterSplitView + tableListSplitView + tableNameField + tableSheet + tableSourceInstance + tableTriggersInstance + tableTypeButton + tablesListView + toolbarActionsButton + toolbarAddButton + toolbarReloadButton + truncateTableButton + truncateTableContextButton + + + YES + + addTableButton + id + + + copyTableButton + id + + + copyTableContentSwitch + id + + + copyTableMessageField + id + + + copyTableNameField + id + + + copyTableSheet + id + + + customQueryInstance + id + + + databaseDataInstance + id + + + duplicateTableContextMenuItem + NSMenuItem + + + duplicateTableMenuItem + NSMenuItem + + + extendedTableInfoInstance + id + + + listFilterField + NSSearchField + + + removeTableContextMenuItem + NSMenuItem + + + removeTableMenuItem + NSMenuItem + + + renameTableContextMenuItem + NSMenuItem + + + renameTableMenuItem + NSMenuItem + + + separatorTableContextMenuItem + NSMenuItem + + + separatorTableContextMenuItem2 + NSMenuItem + + + separatorTableMenuItem + NSMenuItem + + + separatorTableMenuItem2 + NSMenuItem + + + showCreateSyntaxContextMenuItem + NSMenuItem + + + showCreateSyntaxMenuItem + NSMenuItem + + + spHistoryControllerInstance + SPHistoryController + + + tabView + id + + + tableContentInstance + id + + + tableDataInstance + id + + + tableDocumentInstance + id + + + tableDumpInstance + id + + + tableEncodingButton + id + + + tableInfoCollapseButton + NSButton + + + tableInfoInstance + id + + + tableListFilterSplitView + NSSplitView + + + tableListSplitView + NSSplitView + + + tableNameField + id + + + tableSheet + id + + + tableSourceInstance + id + + + tableTriggersInstance + id + + + tableTypeButton + id + + + tablesListView + id + + + toolbarActionsButton + id + + + toolbarAddButton + id + + + toolbarReloadButton + id + + + truncateTableButton + id + + + truncateTableContextButton + id + + + + + + + SPTextView + NSTextView + + showMySQLHelpForCurrentWord: + id + + + showMySQLHelpForCurrentWord: + + showMySQLHelpForCurrentWord: + id + + + + YES + + YES + customQueryInstance + scrollView + tableDocumentInstance + tablesListInstance + + + YES + SPCustomQuery + NSScrollView + SPDatabaseDocument + SPTablesList + + + + YES + + YES + customQueryInstance + scrollView + tableDocumentInstance + tablesListInstance + + + YES + + customQueryInstance + SPCustomQuery + + + scrollView + NSScrollView + + + tableDocumentInstance + SPDatabaseDocument + + + tablesListInstance + SPTablesList + + + + + IBProjectSource + Source/SPTextView.h + + + + SPTextView + NSTextView + + IBUserSource + + YES + + BWAnchoredButtonBar + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredButtonBar.h + + + + BWAnchoredPopUpButton + NSPopUpButton + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredPopUpButton.h + + + + BWAnchoredPopUpButtonCell + NSPopUpButtonCell + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWAnchoredPopUpButtonCell.h + + + + BWSplitView + NSSplitView + + toggleCollapse: + id + + + toggleCollapse: + + toggleCollapse: + id + + + + IBFrameworkSource + BWToolkitFramework.framework/Headers/BWSplitView.h + + NSActionCell NSCell @@ -2875,6 +4925,13 @@ AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + NSApplication + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h + + NSArrayController NSObjectController @@ -3214,6 +5271,20 @@ Growl.framework/Headers/GrowlApplicationBridge.h + + NSObject + + IBFrameworkSource + Print.framework/Headers/PDEPluginInterface.h + + + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + NSObject @@ -3353,6 +5424,38 @@ AppKit.framework/Headers/NSScroller.h + + NSSearchField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSSearchField.h + + + + NSSearchFieldCell + NSTextFieldCell + + IBFrameworkSource + AppKit.framework/Headers/NSSearchFieldCell.h + + + + NSSecureTextField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSSecureTextField.h + + + + NSSegmentedControl + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSSegmentedControl.h + + NSSplitView NSView @@ -3361,6 +5464,14 @@ AppKit.framework/Headers/NSSplitView.h + + NSTabView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTabView.h + + NSTableColumn NSObject @@ -3445,6 +5556,13 @@ NSResponder + + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSView+BWAdditions.h + + NSWindow @@ -3467,6 +5585,13 @@ AppKit.framework/Headers/NSWindowScripting.h + + NSWindow + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h + + NSWindowController NSResponder @@ -3486,6 +5611,109 @@ AppKit.framework/Headers/NSWindowController.h + + WebView + NSView + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + id + id + id + id + id + id + id + id + id + id + id + + + + YES + + YES + goBack: + goForward: + makeTextLarger: + makeTextSmaller: + makeTextStandardSize: + reload: + reloadFromOrigin: + stopLoading: + takeStringURLFrom: + toggleContinuousSpellChecking: + toggleSmartInsertDelete: + + + YES + + goBack: + id + + + goForward: + id + + + makeTextLarger: + id + + + makeTextSmaller: + id + + + makeTextStandardSize: + id + + + reload: + id + + + reloadFromOrigin: + id + + + stopLoading: + id + + + takeStringURLFrom: + id + + + toggleContinuousSpellChecking: + id + + + toggleSmartInsertDelete: + id + + + + + IBFrameworkSource + WebKit.framework/Headers/WebView.h + + 0 @@ -3522,8 +5750,8 @@ {9, 8} {7, 2} {15, 15} - {128, 128} - {128, 128} + {32, 23} + {32, 23} diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m index a3f95fa2..8d1c0713 100644 --- a/Source/SPContentFilterManager.m +++ b/Source/SPContentFilterManager.m @@ -31,9 +31,10 @@ #import "SPConstants.h" #import "SPConnectionController.h" -#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"[multiple selection]") -#define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"[no selection]") -#define SP_NAME_REQUIRED_PLACEHOLDER_STRING NSLocalizedString(@"[name required]", @"[name required]") +#define SP_MULTIPLE_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[multiple selection]", @"displayed when multiple content filters are selected in ContentFilterManager") +#define SP_NO_SELECTION_PLACEHOLDER_STRING NSLocalizedString(@"[no selection]", @"displayed if there is no content filter selected in ContentFilterManager") +#define SP_NAME_REQUIRED_PLACEHOLDER_STRING NSLocalizedString(@"[name required]", @"displayed when new content filter has empty Name field (ContentFilterManager)") +#define SP_FILE_PARSER_ERROR_TITLE_STRING NSLocalizedString(@"Error while reading data file", @"File with content filters could not be parsed - message title (ContentFilterManager)") @interface SPContentFilterManager (PrivateAPI) @@ -136,7 +137,7 @@ [removeButton setEnabled:([contentFilterTableView numberOfSelectedRows] > 0)]; // Set column header - [[[contentFilterTableView tableColumnWithIdentifier:@"MenuLabel"] headerCell] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"‘%@’ Fields Content Filters", @"content filter for field type ‘%@’"), filterType]]; + [[[contentFilterTableView tableColumnWithIdentifier:@"MenuLabel"] headerCell] setStringValue:[NSString stringWithFormat:NSLocalizedString(@"‘%@’ Fields Content Filters", @"table column header. Read: 'Showing all content filters for fields of type %@' (ContentFilterManager)"), filterType]]; // Set the button delegate [splitViewButtonBar setSplitViewDelegate:self]; @@ -725,14 +726,14 @@ [numberOfArgsLabel setHidden:(![[contentFilterTextView string] length])]; NSUInteger numOfArgs = [[[contentFilterTextView string] componentsMatchedByRegex:@"(? 2) { [resultingClauseLabel setStringValue:NSLocalizedString(@"Error", @"error")]; - [resultingClauseContentLabel setStringValue:NSLocalizedString(@"Maximum number of arguments is 2!", @"Maximum number of arguments is 2!")]; + [resultingClauseContentLabel setStringValue:NSLocalizedString(@"Maximum number of arguments is 2!", @"Shown when user inserts too many arguments (ContentFilterManager)")]; } else { [resultingClauseLabel setStringValue:@"SELECT * FROM WHERE"]; NSMutableString *c = [[NSMutableString alloc] init]; @@ -836,11 +837,11 @@ mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; if(!spf || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while reading data file", @"error while reading data file")] + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:SP_FILE_PARSER_ERROR_TITLE_STRING] defaultButton:NSLocalizedString(@"OK", @"OK button") alternateButton:nil otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"File couldn't be read.", @"error while reading data file")]; + informativeTextWithFormat:NSLocalizedString(@"File couldn't be read.", @"file with content filters could not be parsed - message text (ContentFilterManager)")]; [alert setAlertStyle:NSCriticalAlertStyle]; [alert runModal]; @@ -864,11 +865,11 @@ [contentFilterTableView reloadData]; [spf release]; } else { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while reading data file", @"error while reading data file")] + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:SP_FILE_PARSER_ERROR_TITLE_STRING] defaultButton:NSLocalizedString(@"OK", @"OK button") alternateButton:nil otherButton:nil - informativeTextWithFormat:NSLocalizedString(@"No content filters found.", @"error that no content filters found")]; + informativeTextWithFormat:NSLocalizedString(@"No content filters found.", @"No content filters were found in file to import (ContentFilterManager)")]; [alert setAlertStyle:NSInformationalAlertStyle]; [alert runModal]; @@ -916,7 +917,7 @@ errorDescription:&err]; if(err != nil) { - NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while converting content filter data", @"error while converting content filter data")] + NSAlert *alert = [NSAlert alertWithMessageText:[NSString stringWithFormat:NSLocalizedString(@"Error while converting content filter data", @"Content filters could not be converted to plist upon export - message title (ContentFilterManager)")] defaultButton:NSLocalizedString(@"OK", @"OK button") alternateButton:nil otherButton:nil diff --git a/Source/SPDataImport.m b/Source/SPDataImport.m index 11113a58..f0d1a853 100644 --- a/Source/SPDataImport.m +++ b/Source/SPDataImport.m @@ -45,6 +45,8 @@ #import "SPEncodingPopupAccessory.h" #import +#define SP_FILE_READ_ERROR_STRING NSLocalizedString(@"File read error", @"File read error title (Import Dialog)") + @interface SPDataImport (PrivateAPI) - (void) _importBackgroundProcess:(NSString *)filename; @@ -436,7 +438,7 @@ [mySQLConnection queryString:[NSString stringWithFormat:@"SET NAMES '%@'", connectionEncodingToRestore]]; } [self closeAndStopProgressSheet]; - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file.\n\nOnly %ld queries were executed.\n\n(%@)", @"SQL read error, including detail from system"), (long)queriesPerformed, [exception reason]]); @@ -486,7 +488,7 @@ } else { displayEncoding = [NSString localizedNameOfStringEncoding:sqlEncoding]; } - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file, as it could not be read in the encoding you selected (%@).\n\nOnly %ld queries were executed.", @"SQL encoding read error"), displayEncoding, (long)queriesPerformed]); @@ -763,7 +765,7 @@ // Report file read errors, and bail @catch (NSException *exception) { [self closeAndStopProgressSheet]; - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file.\n\nOnly %ld rows were imported.\n\n(%@)", @"CSV read error, including detail string from system"), (long)rowsImported, [exception reason]]); @@ -812,7 +814,7 @@ } else { displayEncoding = [NSString localizedNameOfStringEncoding:csvEncoding]; } - SPBeginAlertSheet(NSLocalizedString(@"File read error", @"File read error title"), + SPBeginAlertSheet(SP_FILE_READ_ERROR_STRING, NSLocalizedString(@"OK", @"OK button"), nil, nil, [tableDocumentInstance parentWindow], self, nil, nil, [NSString stringWithFormat:NSLocalizedString(@"An error occurred when reading the file, as it could not be read using the encoding you selected (%@).\n\nOnly %ld rows were imported.", @"CSV encoding read error"), displayEncoding, (long)rowsImported]); diff --git a/Source/SPNavigatorController.m b/Source/SPNavigatorController.m index 76d77e7e..ec42b092 100644 --- a/Source/SPNavigatorController.m +++ b/Source/SPNavigatorController.m @@ -1196,23 +1196,23 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte if(type == 0 || type == 1) // TABLE / VIEW switch(index) { case 0: - return NSLocalizedString(@"Type", @"type label"); + return NSLocalizedString(@"Type", @"type label (Navigator)"); case 1: - return NSLocalizedString(@"Default", @"default label"); + return NSLocalizedString(@"Default", @"default label (Navigator)"); case 2: - return NSLocalizedString(@"Is Nullable", @"is nullable label"); + return NSLocalizedString(@"Is Nullable", @"is nullable label (Navigator)"); case 3: - return NSLocalizedString(@"Encoding", @"encoding label"); + return NSLocalizedString(@"Encoding", @"encoding label (Navigator)"); case 4: - return NSLocalizedString(@"Collation", @"collation label"); + return NSLocalizedString(@"Collation", @"collation label (Navigator)"); case 5: - return NSLocalizedString(@"Key", @"key label"); + return NSLocalizedString(@"Key", @"key label (Navigator)"); case 6: - return NSLocalizedString(@"Extra", @"extra label"); + return NSLocalizedString(@"Extra", @"extra label (Navigator)"); case 7: - return NSLocalizedString(@"Privileges", @"privileges label"); + return NSLocalizedString(@"Privileges", @"privileges label (Navigator)"); case 8: - return NSLocalizedString(@"Comment", @"comment label"); + return NSLocalizedString(@"Comment", @"comment label (Navigator)"); } if(type == 2) // PROCEDURE @@ -1224,20 +1224,20 @@ static NSComparisonResult compareStrings(NSString *s1, NSString *s2, void* conte case 2: return @"Is Deterministic"; case 3: - return NSLocalizedString(@"Execution Privilege", @"execution privilege label"); + return NSLocalizedString(@"Execution Privilege", @"execution privilege label (Navigator)"); case 4: return @"Definer"; } if(type == 3) // FUNCTION switch(index) { case 0: - return NSLocalizedString(@"Return Type", @"return type label"); + return NSLocalizedString(@"Return Type", @"return type label (Navigator)"); case 1: return @"SQL Data Access"; case 2: return @"Is Deterministic"; case 3: - return NSLocalizedString(@"Execution Privilege", @"execution privilege label"); + return NSLocalizedString(@"Execution Privilege", @"execution privilege label (Navigator)"); case 4: return @"Definer"; } diff --git a/Source/SPPreferenceController.m b/Source/SPPreferenceController.m index 932bed9c..838d48e5 100644 --- a/Source/SPPreferenceController.m +++ b/Source/SPPreferenceController.m @@ -140,17 +140,17 @@ nil ] retain]; editorNameForColors = [[NSArray arrayWithObjects: - NSLocalizedString(@"Text",@"text label for color table"), - NSLocalizedString(@"Background",@"background label for color table"), - NSLocalizedString(@"Caret",@"caret label for color table"), - NSLocalizedString(@"Comment",@"comment label"), - NSLocalizedString(@"Keyword",@"keyword label for color table"), - NSLocalizedString(@"Numeric",@"numeric label for color table"), - NSLocalizedString(@"Quote",@"quote label for color table"), - NSLocalizedString(@"Backtick Quote",@"backtick quote label for color table"), - NSLocalizedString(@"Variable",@"variable label for color table"), - NSLocalizedString(@"Query Background",@"query background label for color table"), - NSLocalizedString(@"Selection",@"selection label for color table"), + NSLocalizedString(@"Text",@"text label for color table (Prefs > Editor)"), + NSLocalizedString(@"Background",@"background label for color table (Prefs > Editor)"), + NSLocalizedString(@"Caret",@"caret label for color table (Prefs > Editor)"), + NSLocalizedString(@"Comment",@"comment label for color table (Prefs > Editor)"), + NSLocalizedString(@"Keyword",@"keyword label for color table (Prefs > Editor)"), + NSLocalizedString(@"Numeric",@"numeric label for color table (Prefs > Editor)"), + NSLocalizedString(@"Quote",@"quote label for color table (Prefs > Editor)"), + NSLocalizedString(@"Backtick Quote",@"backtick quote label for color table (Prefs > Editor)"), + NSLocalizedString(@"Variable",@"variable label for color table (Prefs > Editor)"), + NSLocalizedString(@"Query Background",@"query background label for color table (Prefs > Editor)"), + NSLocalizedString(@"Selection",@"selection label for color table (Prefs > Editor)"), nil ] retain]; @@ -1620,7 +1620,7 @@ [themeSelectionMenu removeAllItems]; [themeSelectionMenu setAutoenablesItems:YES]; [themeSelectionMenu setShowsStateColumn:YES]; - [themeSelectionMenu addItemWithTitle:NSLocalizedString(@"Default", @"default label") action:@selector(setDefaultColors:) keyEquivalent:@""]; + [themeSelectionMenu addItemWithTitle:NSLocalizedString(@"Default", @"Name of 'Default' color theme (Prefs > Editor)") action:@selector(setDefaultColors:) keyEquivalent:@""]; [themeSelectionMenu addItem:[NSMenuItem separatorItem]]; NSArray *foundThemes = [self getAvailableThemes]; -- cgit v1.2.3