From 7dd79800668e68338c2793a572b6f90ed10328b5 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Thu, 6 Aug 2009 17:08:04 +0000 Subject: New shortcuts: - Shift+Cmd+A to add the current connection to your favourites if it doesn't already exist - Shift+Cmd+I to invoke importing - Shift+Cmd+S to display the create table syntax panel --- Interfaces/English.lproj/MainMenu.xib | 435 +++++++++++++--------------------- Source/SPPrintAccessory.m | 5 +- 2 files changed, 163 insertions(+), 277 deletions(-) diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib index 750018c4..9b75a6fe 100644 --- a/Interfaces/English.lproj/MainMenu.xib +++ b/Interfaces/English.lproj/MainMenu.xib @@ -8,6 +8,7 @@ 353.00 YES + YES @@ -239,6 +240,15 @@ + + + Add To Favorites + A + 1048576 + 2147483647 + + + Open @@ -258,14 +268,6 @@ - - - Add To Favorites - - 2147483647 - - - YES @@ -300,7 +302,7 @@ SW1wb3J04oCmA - + I 1048576 2147483647 @@ -309,9 +311,9 @@ YES - YES RXhwb3J04oCmA - + e + 1048576 2147483647 @@ -1428,7 +1430,6 @@ Flush Privileges - 1048576 2147483647 @@ -1473,7 +1474,8 @@ Show Create Table Syntax - + S + 1048576 2147483647 @@ -2740,9 +2742,9 @@ - + @@ -4093,7 +4095,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{614, 626}, {181, 93}} + {{836, 500}, {181, 93}} com.apple.InterfaceBuilder.CocoaPlugin {{561, 605}, {181, 43}} @@ -4144,7 +4146,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{312, 436}, {283, 283}} + {{534, 310}, {283, 283}} com.apple.InterfaceBuilder.CocoaPlugin {{654, 613}, {157, 223}} @@ -4173,11 +4175,11 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{928, 484}, {197, 73}} + {{765, 520}, {197, 73}} com.apple.InterfaceBuilder.CocoaPlugin {{449, 1007}, {197, 53}} - {{311, 851}, {511, 20}} + {{710, 675}, {511, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{506, 836}, {511, 20}} @@ -4187,7 +4189,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{390, 483}, {213, 133}} + {{701, 300}, {213, 133}} com.apple.InterfaceBuilder.CocoaPlugin {{399, 465}, {213, 93}} @@ -4197,17 +4199,17 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{603, 634}, {136, 43}} + {{914, 340}, {136, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{768, 231}, {136, 43}} + {{914, 300}, {136, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{603, 574}, {136, 43}} + {{914, 280}, {136, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4230,7 +4232,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{267, 624}, {235, 203}} + {{578, 390}, {235, 203}} com.apple.InterfaceBuilder.CocoaPlugin {{698, 703}, {184, 133}} @@ -4248,7 +4250,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{176, 466}, {218, 253}} + {{398, 340}, {218, 253}} com.apple.InterfaceBuilder.CocoaPlugin {{518, 583}, {218, 253}} @@ -4256,7 +4258,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{406, 566}, {254, 153}} + {{628, 440}, {254, 153}} com.apple.InterfaceBuilder.CocoaPlugin {{312, 683}, {231, 153}} @@ -4325,7 +4327,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{651, 517}, {268, 213}} + {{709, 410}, {268, 183}} com.apple.InterfaceBuilder.CocoaPlugin {{829, 663}, {268, 173}} com.apple.InterfaceBuilder.CocoaPlugin @@ -4354,7 +4356,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{417, 618}, {209, 233}} + {{816, 442}, {209, 233}} com.apple.InterfaceBuilder.CocoaPlugin {{180, 535}, {182, 253}} @@ -4362,7 +4364,7 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{768, 251}, {136, 43}} + {{914, 320}, {136, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -4388,7 +4390,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{580, 506}, {221, 83}} + {{817, 360}, {221, 83}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -4495,7 +4497,7 @@ w6gg4oaSIGZhY2FkZV0 YES CMCopyTable - NSTableView + SPTableView copy: id @@ -4600,6 +4602,7 @@ w6gg4oaSIGZhY2FkZV0 YES donate: openPreferences: + visitFAQWebsite: visitHelpWebsite: visitWebsite: @@ -4609,6 +4612,7 @@ w6gg4oaSIGZhY2FkZV0 id id id + id @@ -4632,6 +4636,20 @@ w6gg4oaSIGZhY2FkZV0 + + NSObject + + IBProjectSource + Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h + + + + NSObject + + IBProjectSource + Frameworks/MCPKit/MCPFoundationKit/MCPNull.h + + NSObject @@ -4641,9 +4659,20 @@ w6gg4oaSIGZhY2FkZV0 NSObject + + IBProjectSource + Source/SPConnectionController.h + + + + NSObject + + toggleCollapse: + id + IBProjectSource - Source/CMMCPConnection.h + Source/TablesList.h @@ -4661,6 +4690,7 @@ w6gg4oaSIGZhY2FkZV0 doSelectionTitleCase: doSelectionUpperCase: doTranspose: + insertNULLvalue: selectCurrentLine: selectCurrentWord: selectEnclosingBrackets: @@ -4679,6 +4709,7 @@ w6gg4oaSIGZhY2FkZV0 id id id + id @@ -4693,6 +4724,79 @@ w6gg4oaSIGZhY2FkZV0 Source/SPWindowAdditions.h + + SPConnectionController + NSObject + + YES + + YES + addFavorite: + editFavorites: + initiateConnection: + showHelp: + updateFavoriteSelection: + + + YES + id + id + id + id + id + + + + YES + + YES + addToFavoritesButton + connectButton + connectionResizeContainer + connectionSplitView + connectionSplitViewButtonBar + connectionView + errorDetailText + errorDetailWindow + favoritesTable + progressIndicator + progressIndicatorText + socketConnectionFormContainer + socketPasswordField + sshConnectionFormContainer + sshPasswordField + sshSQLHostField + sshSSHPasswordField + standardConnectionFormContainer + standardPasswordField + standardSQLHostField + + + YES + NSButton + NSButton + NSView + NSSplitView + BWAnchoredButtonBar + NSView + NSTextView + NSWindow + NSTableView + NSProgressIndicator + NSTextField + NSView + NSSecureTextField + NSView + NSSecureTextField + NSTextField + NSSecureTextField + NSView + NSSecureTextField + NSTextField + + + + SPQueryConsole NSWindowController @@ -4753,6 +4857,14 @@ w6gg4oaSIGZhY2FkZV0 Source/SPQueryConsole.h + + SPTableView + NSTableView + + IBProjectSource + Source/SPTableView.h + + TableDocument NSDocument @@ -4763,35 +4875,30 @@ w6gg4oaSIGZhY2FkZV0 addConnectionToFavorites: addDatabase: analyzeTable: - cancelConnectSheet: checkTable: checksumTable: chooseDatabase: chooseEncoding: - chooseFavorite: closeDatabaseSheet: + closeErrorConnectionSheet: closeSheet: - connectSheetAddToFavorites: - connectSheetShowHelp: - connectToDB: copyCreateTableSyntax: - editFavorites: export: exportMultipleTables: exportTable: flushPrivileges: flushTable: import: - initiateConnection: + openConnectionSheet: optimizeTable: removeDatabase: repairTable: + saveConnectionSheet: saveServerVariables: setDatabases: showCreateTableSyntax: showMySQLHelp: showVariables: - toggleUseSSH: viewContent: viewQuery: viewRelations: @@ -4832,11 +4939,6 @@ w6gg4oaSIGZhY2FkZV0 id id id - id - id - id - id - id @@ -4845,42 +4947,33 @@ w6gg4oaSIGZhY2FkZV0 YES addDatabaseButton chooseDatabaseButton - connectFavoritesTableView - connectProgressBar - connectProgressStatusText - connectSheet + connectionErrorDialog contentViewSplitter createTableSyntaxWindow customQueryInstance customQueryTextView databaseDataInstance databaseEncodingButton - databaseField databaseNameField databaseSheet dbTablesTableView + encodingAccessoryView + encodingPopUp extendedTableInfoInstance favoritesButton - favoritesController - hostField - keyChainInstance - nameField - passwordField - portField + historyControl + listFilterField queryProgressBar + saveVariablesButton sidebarGrabber - socketField spExportControllerInstance - sshCheckbox - sshHostField - sshPasswordField - sshPortField - sshUserField + spHistoryControllerInstance syntaxView syntaxViewContent tableContentInstance tableDataInstance tableDumpInstance + tableInfoCollapseButton tableInfoTable tableListSplitter tableRelationsInstance @@ -4890,7 +4983,8 @@ w6gg4oaSIGZhY2FkZV0 tablesListInstance titleAccessoryView titleImageView - userField + titleStringView + variablesSearchField variablesSheet variablesTableView @@ -4898,10 +4992,7 @@ w6gg4oaSIGZhY2FkZV0 YES id id - NSTableView - NSProgressIndicator - NSTextField - id + NSWindow NSSplitView NSWindow id @@ -4910,22 +5001,15 @@ w6gg4oaSIGZhY2FkZV0 id id id - id NSTableView id - id - NSArrayController - id - id - id - id - id - id - id + NSPopUpButton id id id + NSSearchField id + NSButton id id id @@ -4934,6 +5018,7 @@ w6gg4oaSIGZhY2FkZV0 id id id + NSButton NSTableView NSSplitView id @@ -4944,6 +5029,7 @@ w6gg4oaSIGZhY2FkZV0 id id id + NSSearchField id id @@ -4956,33 +5042,6 @@ w6gg4oaSIGZhY2FkZV0 YES - - MainController - NSObject - - YES - - YES - donate: - openPreferences: - visitFAQWebsite: - visitHelpWebsite: - visitWebsite: - - - YES - id - id - id - id - id - - - - IBDocumentRelativeSource - ../../Source/MainController.h - - NSObject @@ -5003,176 +5062,6 @@ w6gg4oaSIGZhY2FkZV0 - - TableDocument - NSDocument - - YES - - YES - addConnectionToFavorites: - addDatabase: - analyzeTable: - checkTable: - checksumTable: - chooseDatabase: - chooseEncoding: - closeDatabaseSheet: - closeErrorConnectionSheet: - closeSheet: - copyCreateTableSyntax: - export: - exportMultipleTables: - exportTable: - flushPrivileges: - flushTable: - import: - openConnectionSheet: - optimizeTable: - removeDatabase: - repairTable: - saveConnectionSheet: - saveServerVariables: - setDatabases: - showCreateTableSyntax: - showMySQLHelp: - showVariables: - viewContent: - viewQuery: - viewRelations: - viewStatus: - viewStructure: - - - 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 - - - - YES - - YES - addDatabaseButton - chooseDatabaseButton - connectionErrorDialog - contentViewSplitter - createTableSyntaxWindow - customQueryInstance - customQueryTextView - databaseDataInstance - databaseEncodingButton - databaseNameField - databaseSheet - dbTablesTableView - extendedTableInfoInstance - favoritesButton - historyControl - listFilterField - queryProgressBar - saveVariablesButton - sidebarGrabber - spExportControllerInstance - spHistoryControllerInstance - syntaxView - syntaxViewContent - tableContentInstance - tableDataInstance - tableDumpInstance - tableInfoCollapseButton - tableInfoTable - tableListSplitter - tableRelationsInstance - tableSourceInstance - tableTabView - tableWindow - tablesListInstance - titleAccessoryView - titleImageView - titleStringView - variablesSearchField - variablesSheet - variablesTableView - - - YES - id - id - NSWindow - NSSplitView - NSWindow - id - NSTextView - id - id - id - id - NSTableView - id - id - id - NSSearchField - id - NSButton - id - id - id - id - id - id - id - id - NSButton - NSTableView - NSSplitView - id - id - NSTabView - id - id - id - id - id - NSSearchField - id - id - - - - IBDocumentRelativeSource - ../../Source/TableDocument.h - - 0 diff --git a/Source/SPPrintAccessory.m b/Source/SPPrintAccessory.m index 0ec18b26..4237acbf 100644 --- a/Source/SPPrintAccessory.m +++ b/Source/SPPrintAccessory.m @@ -47,10 +47,7 @@ - (NSSet *)keyPathsForValuesAffectingPreview { - return [NSSet setWithObjects: - @"defaultsController.values.PrintBackground", -// @"defaultsController.values.PrintGrid", - nil]; + return [NSSet setWithObjects:@"defaultsController.values.PrintBackground", nil]; } - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context -- cgit v1.2.3