From 3a7dc0b03bc51f46d762e2bbe6d7afdee59288ef Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Thu, 26 Mar 2009 23:28:27 +0000 Subject: Completely redesigned query console that now uses a table view instead of a text view. This should significantly improve import speed, but most importantly resolves the crashes caused by the drawing that was being performed by the text view. Fixes issue #87 and implements #167. New console provides the following: - Live filtering - Ability to hide message time stamps - Ability to hide SELECT/SHOW statement messages - Ability to copy messages to pasteboard, including multiple messages - Ability to save the current filtered content to a file, with the option to include the message time stamps --- Interfaces/English.lproj/Console.xib | 992 +++++++++++++++++++++++++++++++++++ Interfaces/English.lproj/DBView.xib | 364 ------------- 2 files changed, 992 insertions(+), 364 deletions(-) create mode 100644 Interfaces/English.lproj/Console.xib (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/Console.xib b/Interfaces/English.lproj/Console.xib new file mode 100644 index 00000000..8166f443 --- /dev/null +++ b/Interfaces/English.lproj/Console.xib @@ -0,0 +1,992 @@ + + + + 1050 + 9G55 + 677 + 949.43 + 353.00 + + YES + + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + YES + + + YES + + + + YES + + SPQueryConsole + + + FirstResponder + + + NSApplication + + + 15 + 2 + {{426, 331}, {575, 203}} + 611845120 + Console + NSPanel + + {3.40282e+38, 3.40282e+38} + {575, 130} + + + 256 + + YES + + + 289 + {{353, 5}, {118, 28}} + + YES + + 67239424 + 134348800 + Save As... + + LucidaGrande + 1.100000e+01 + 3100 + + + -2038284033 + 129 + + + 200 + 25 + + + + + 289 + {{469, 5}, {101, 28}} + + YES + + 67239424 + 134348800 + Clear + + + -2038284033 + 129 + + + 200 + 25 + + + + + 266 + {{10, 174}, {555, 19}} + + YES + + 343014976 + 268567552 + + + Filter + + YES + 1 + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + 130560 + 0 + search + _searchFieldSearch: + + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + _searchFieldCancel: + + + 138690815 + 0 + + 400 + 75 + + 255 + + + + + 274 + + YES + + + 2304 + + YES + + + 256 + {553, 124} + + YES + + + -2147483392 + {{-26, 0}, {16, 17}} + + + YES + + messageDate + 1.450000e+02 + 5.000000e+01 + 1.000000e+03 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + + + + 67239488 + 133120 + Text Cell + + + + 6 + System + controlBackgroundColor + + 3 + MC42NjY2NjY2OQA + + + + + + + + message + 4.020000e+02 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 0 + + + + 6 + System + headerColor + + + + + + 67239488 + 133120 + Text Cell + + + + + + 1 + YES + + + + 3.000000e+00 + 2.000000e+00 + + + 6 + System + gridColor + + 3 + MC41AA + + + 1.300000e+01 + 440401920 + 4 + 15 + 0 + YES + + + {{1, 1}, {553, 124}} + + + + + 4 + + + + -2147483392 + {{539, 1}, {15, 124}} + + + _doScroller: + 9.920000e-01 + + + + 256 + {{-100, -100}, {238, 15}} + + 1 + + _doScroller: + 5.714286e-01 + + + {{10, 40}, {555, 126}} + + + 530 + + + + QSAAAEEgAABBcAAAQXAAAA + + + + 292 + {{7, 11}, {120, 18}} + + YES + + -2080244224 + 131072 + Show time stamps + + + 1211912703 + 130 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 292 + {{130, 11}, {192, 18}} + + YES + + -2080244224 + 131072 + Show SELECT/SHOW statements + + + 1211912703 + 130 + + + + + 200 + 25 + + + + + -2147482335 + + {{334, 13}, {16, 16}} + + 20746 + 1.600000e+01 + 1.000000e+02 + + + {575, 203} + + + {{0, 0}, {1440, 878}} + {575, 152} + {3.40282e+38, 3.40282e+38} + QueryConsole + + + + 268 + + YES + + + 268 + {{10, 6}, {150, 18}} + + YES + + -2080244224 + 0 + Include time stamps + + LucidaGrande + 1.300000e+01 + 1044 + + + 1211912703 + 130 + + + + + 200 + 25 + + + + {170, 30} + NSView + + + + + YES + + + Copy + + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + + + + + + + YES + + + window + + + + 23 + + + + clearConsoleButton + + + + 24 + + + + saveConsoleButton + + + + 25 + + + + includeTimeStampsButton + + + + 26 + + + + consoleSearchField + + + + 27 + + + + saveLogView + + + + 52 + + + + clearConsole: + + + + 53 + + + + saveConsoleAs: + + + + 54 + + + + toggleShowTimeStamps: + + + + 56 + + + + toggleShowSelectShowStatements: + + + + 57 + + + + consoleTableView + + + + 58 + + + + dataSource + + + + 59 + + + + delegate + + + + 60 + + + + delegate + + + + 61 + + + + progressIndicator + + + + 63 + + + + menu + + + + 68 + + + + copy: + + + + 69 + + + + + YES + + 0 + + YES + + + + + + -2 + + + RmlsZSdzIE93bmVyA + + + -1 + + + First Responder + + + -3 + + + Application + + + 3 + + + YES + + + + Console + + + 4 + + + YES + + + + + + + + + + + + 5 + + + YES + + + + + + 6 + + + YES + + + + + + 7 + + + YES + + + + + + + + 8 + + + YES + + + + + + 9 + + + YES + + + + + + 10 + + + YES + + + + + + 11 + + + + + 12 + + + + + 13 + + + + + 14 + + + YES + + + + + + + 15 + + + + + 16 + + + + + 17 + + + YES + + + + + + 18 + + + YES + + + + + + 19 + + + + + 20 + + + + + 21 + + + + + 22 + + + + + 49 + + + YES + + + + saveLogView + + + 50 + + + YES + + + + + + 51 + + + + + 62 + + + + + 64 + + + YES + + + + + + 65 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + 10.IBPluginDependency + 11.IBPluginDependency + 12.IBPluginDependency + 13.IBPluginDependency + 14.IBPluginDependency + 15.IBPluginDependency + 16.IBPluginDependency + 17.IBPluginDependency + 18.IBPluginDependency + 19.IBPluginDependency + 20.IBPluginDependency + 21.IBPluginDependency + 22.IBPluginDependency + 3.IBEditorWindowLastContentRect + 3.IBWindowTemplateEditedContentRect + 3.NSWindowTemplate.visibleAtLaunch + 3.windowTemplate.hasMinSize + 3.windowTemplate.minSize + 4.IBPluginDependency + 49.IBEditorWindowLastContentRect + 49.IBPluginDependency + 5.IBPluginDependency + 50.IBPluginDependency + 51.IBPluginDependency + 6.IBPluginDependency + 62.IBPluginDependency + 64.IBEditorWindowLastContentRect + 64.IBPluginDependency + 65.IBPluginDependency + 7.IBPluginDependency + 8.IBPluginDependency + 9.IBPluginDependency + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{486, 501}, {575, 203}} + {{486, 501}, {575, 203}} + + + {575, 130} + com.apple.InterfaceBuilder.CocoaPlugin + {{611, 287}, {170, 30}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{777, 303}, {90, 23}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 69 + + + + YES + + NSObject + + IBProjectSource + Source/CMImageView.h + + + + NSObject + + IBProjectSource + Source/CMMCPConnection.h + + + + SPQueryConsole + NSWindowController + + YES + + YES + clearConsole: + copy: + saveConsoleAs: + toggleShowSelectShowStatements: + toggleShowTimeStamps: + + + YES + id + id + id + id + id + + + + YES + + YES + clearConsoleButton + consoleSearchField + consoleTableView + includeTimeStampsButton + progressIndicator + saveConsoleButton + saveLogView + + + YES + NSButton + NSSearchField + NSTableView + NSButton + NSProgressIndicator + NSButton + NSView + + + + IBProjectSource + Source/SPQueryConsole.h + + + + + 0 + ../../sequel-pro.xcodeproj + 3 + + diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index ba8357de..2fc49b28 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -7110,179 +7110,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {300, 222} {3.40282e+38, 3.40282e+38} - - 15 - 2 - {{426, 361}, {575, 173}} - -1535638528 - Console - NSPanel - - {3.40282e+38, 3.40282e+38} - {300, 130} - - - 256 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 2322 - {553, 14} - - - - - - - - - - - YES - - - 6 - - - - 5.530000e+02 - 1 - - - 2049 - - - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - - - - YES - - YES - NSColor - NSUnderline - - - YES - - - - - - - 6 - {1108, 1e+07} - {223, 0} - - - - {{1, 1}, {553, 124}} - - - - - - 6 - - - - -2147483392 - {{1054, 1}, {15, 230}} - - - _doScroller: - 9.829060e-01 - - - - 256 - {{-100, -100}, {518, 15}} - - 1 - - _doScroller: - 1.000000e+00 - 9.456522e-01 - - - {{10, 37}, {555, 126}} - - - 530 - - - - - - - 289 - {{370, 5}, {101, 28}} - - YES - - 67239424 - 134348800 - Save As... - - - -2038284033 - 129 - - - 200 - 25 - - - - - 289 - {{469, 5}, {101, 28}} - - YES - - 67239424 - 134348800 - Clear - - - -2038284033 - 129 - - - 200 - 25 - - - - {575, 173} - - {{0, 0}, {1440, 878}} - {300, 152} - {3.40282e+38, 3.40282e+38} - QueryConsole - 256 @@ -9479,9 +9306,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPTableData - - SPQueryConsole - @@ -11474,54 +11298,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 4719 - - - queryConsoleInstance - - - - 4721 - - - - queryConsoleInstance - - - - 4722 - - - - window - - - - 4729 - - - - consoleTextView - - - - 4734 - - - - saveConsoleAs: - - - - 4739 - - - - clearConsole: - - - - 4740 - databaseEncodingButton @@ -14657,87 +14433,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPTableData - - 4720 - - - SPQueryConsole - - - 4723 - - - YES - - - - queryConsole - - - 4724 - - - YES - - - - - - - - 4730 - - - YES - - - - - - - - 4731 - - - - - 4732 - - - - - 4733 - - - - - 4735 - - - YES - - - - - - 4736 - - - - - 4737 - - - YES - - - - - - 4738 - - - 4741 @@ -17610,21 +17305,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 47.ImportedFromIB2 4700.IBPluginDependency 4702.IBPluginDependency - 4720.IBPluginDependency - 4723.IBEditorWindowLastContentRect - 4723.IBWindowTemplateEditedContentRect - 4723.NSWindowTemplate.visibleAtLaunch - 4723.windowTemplate.hasMinSize - 4723.windowTemplate.minSize - 4724.IBPluginDependency - 4730.IBPluginDependency - 4731.IBPluginDependency - 4732.IBPluginDependency - 4733.IBPluginDependency - 4735.IBPluginDependency - 4736.IBPluginDependency - 4737.IBPluginDependency - 4738.IBPluginDependency 4741.IBPluginDependency 4741.ImportedFromIB2 4742.IBPluginDependency @@ -19014,21 +18694,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{383, 326}, {575, 173}} - {{383, 326}, {575, 173}} - - - {300, 130} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -19785,31 +19450,6 @@ Y2hhbmdlIHRoZSBvcmRlcg Source/CMMCPConnection.h - - SPQueryConsole - NSWindowController - - YES - - YES - clearConsole: - saveConsoleAs: - - - YES - id - id - - - - consoleTextView - NSTextView - - - IBProjectSource - Source/SPQueryConsole.h - - SPTableData NSObject @@ -19920,7 +19560,6 @@ Y2hhbmdlIHRoZSBvcmRlcg limitRowsStepper limitRowsText multipleLineEditingButton - queryConsoleInstance removeButton tableContentView tableDataInstance @@ -19949,7 +19588,6 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id - id CMCopyTable id id @@ -20067,7 +19705,6 @@ Y2hhbmdlIHRoZSBvcmRlcg keyChainInstance passwordField portField - queryConsoleInstance queryProgressBar sidebarGrabber socketField @@ -20116,7 +19753,6 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id - id NSTabView id id -- cgit v1.2.3