From 2dbae24c7735ead0524bd9847af6ea99d8654ec6 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 14 May 2011 17:26:18 +0000 Subject: Bring outline view branch up to date with trunk (r3279:r3306). --- Interfaces/English.lproj/DBView.xib | 266 +++++++++++++++-------- Interfaces/English.lproj/DatabaseProcessList.xib | 90 ++++++-- Interfaces/English.lproj/ExportDialog.xib | 144 +++++++++++- Interfaces/English.lproj/Preferences.xib | 265 ++++++++++++++++++---- 4 files changed, 608 insertions(+), 157 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index bf23722f..50a93a3f 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,10 +2,10 @@ 1050 - 10J567 + 10J869 851 1038.35 - 462.00 + 461.00 YES @@ -23,7 +23,6 @@ YES - YES @@ -47,7 +46,7 @@ NSApplication - + 274 YES @@ -195,7 +194,7 @@ _popUpItemAction: - + YES YES @@ -217,6 +216,18 @@ _popUpItemAction: + + + YES + YES + + + 2147483647 + + + _popUpItemAction: + + Export @@ -553,7 +564,6 @@ {{1, 1}, {218, 38}} - 6 @@ -585,7 +595,6 @@ {{-1, -13}, {220, 40}} - 2 @@ -683,7 +692,6 @@ {214, 352} - 4 @@ -711,7 +719,6 @@ {214, 352} - 528 @@ -847,7 +854,6 @@ {216, 145} - 6 @@ -874,7 +880,6 @@ {{-1, 0}, {216, 145}} - 528 @@ -962,7 +967,6 @@ {214, 145} - 6 @@ -990,7 +994,6 @@ {214, 145} - 512 @@ -2623,7 +2626,6 @@ {{1, 17}, {694, 454}} - 2 @@ -2657,7 +2659,6 @@ {{1, 0}, {694, 17}} - 4 @@ -2666,7 +2667,6 @@ {{6, 33}, {696, 472}} - 562 @@ -6476,7 +6476,6 @@ {943, 549} - NSView @@ -11750,6 +11749,24 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 2003 + + + YES + YES + + + 2147483647 + + + + + + Add New Row + + 2147483647 + + + YES @@ -16552,6 +16569,30 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7790 + + + separatorTableContextMenuItem3 + + + + 7792 + + + + separatorTableMenuItem3 + + + + 7793 + + + + addRow: + + + + 7797 + @@ -18145,6 +18186,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + Table Content Menu @@ -22843,7 +22886,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES - @@ -22853,6 +22895,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + @@ -23123,6 +23167,21 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA + + 7794 + + + + + 7795 + + + + + 7796 + + + @@ -24055,6 +24114,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 6879.IBPluginDependency 6885.IBEditorWindowLastContentRect 6885.IBPluginDependency + 6885.IBViewBoundsToFrameTransform 6886.IBPluginDependency 6887.IBPluginDependency 6888.IBPluginDependency @@ -24455,6 +24515,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA 7778.IBPluginDependency 7779.IBPluginDependency 7783.IBPluginDependency + 7794.IBPluginDependency + 7795.IBPluginDependency + 7796.IBPluginDependency 858.IBPluginDependency 858.ImportedFromIB2 959.IBEditorWindowLastContentRect @@ -25290,7 +25353,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{100, 37}, {208, 169}} + {{57, 38}, {208, 179}} com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -25352,7 +25415,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit - {{574, 379}, {241, 183}} + {{458, 379}, {241, 183}} com.apple.InterfaceBuilder.CocoaPlugin ToolTip @@ -25398,7 +25461,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA {{769, 777}, {233, 53}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{774, 501}, {228, 113}} + {{471, 471}, {228, 143}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25751,6 +25814,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin {{79, 571}, {360, 157}} com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25815,7 +25879,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{45, 286}, {943, 549}} + {{38, 193}, {943, 549}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -25826,7 +25890,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{285, 61}, {157, 63}} + {{564, 42}, {157, 63}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -26312,6 +26376,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{265, 489}, {405, 267}} com.apple.InterfaceBuilder.CocoaPlugin @@ -26349,7 +26416,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - 7790 + 7797 @@ -26671,35 +26738,14 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA - YES - - YES - mySQLConnection - tableInstance - - - YES - id - id - + mySQLConnection + id - YES - - YES - mySQLConnection - tableInstance - - - YES - - mySQLConnection - id - - - tableInstance - id - + mySQLConnection + + mySQLConnection + id @@ -26995,7 +27041,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id NSMenuItem NSButton - BWSplitView + NSSplitView id NSMenuItem id @@ -27226,7 +27272,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA queryInfoPaneSplitView - BWSplitView + NSSplitView runAllButton @@ -27993,6 +28039,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA databaseRenameSheet databaseSheet dbTablesTableView + delegate documentActivityScrollView encodingPopUp exportControllerInstance @@ -28066,6 +28113,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id NSTableView + id NSScrollView NSPopUpButton id @@ -28095,18 +28143,18 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id - id + SPTableContent + SPTableData id NSButton NSScrollView NSTableView NSSplitView id - id + SPTableStructure NSTabView id - id + SPTablesList NSButton id id @@ -28142,6 +28190,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA databaseRenameSheet databaseSheet dbTablesTableView + delegate documentActivityScrollView encodingPopUp exportControllerInstance @@ -28278,6 +28327,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA dbTablesTableView NSTableView + + delegate + id + documentActivityScrollView NSScrollView @@ -28396,11 +28449,11 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableContentInstance - id + SPTableContent tableDataInstance - id + SPTableData tableDumpInstance @@ -28428,7 +28481,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableSourceInstance - id + SPTableStructure tableTabView @@ -28440,7 +28493,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tablesListInstance - id + SPTablesList taskCancelButton @@ -28595,6 +28648,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA switchInput: toggleAdvancedExportOptionsView: toggleCustomFilenameFormatView: + toggleNewFilePerTable: toggleSQLIncludeContent: toggleSQLIncludeDropSyntax: toggleSQLIncludeStructure: @@ -28617,6 +28671,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id + id @@ -28634,6 +28689,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA switchInput: toggleAdvancedExportOptionsView: toggleCustomFilenameFormatView: + toggleNewFilePerTable: toggleSQLIncludeContent: toggleSQLIncludeDropSyntax: toggleSQLIncludeStructure: @@ -28685,6 +28741,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA toggleCustomFilenameFormatView: id + + toggleNewFilePerTable: + id + toggleSQLIncludeContent: id @@ -28730,6 +28790,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox + exportFormatInfoText exportInputPopUpButton exportOptionsTabBar exportOutputCompressionFormatPopupButton @@ -28788,6 +28849,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSMatrix NSButton NSBox + NSTextField NSPopUpButton NSTabView NSPopUpButton @@ -28849,6 +28911,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox + exportFormatInfoText exportInputPopUpButton exportOptionsTabBar exportOutputCompressionFormatPopupButton @@ -28976,6 +29039,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA exportFilenameDividerBox NSBox + + exportFormatInfoText + NSTextField + exportInputPopUpButton NSPopUpButton @@ -29568,7 +29635,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSPopUpButton NSScrollView NSTableView - NSTableView + SPTableView NSButton NSButton SPTableData @@ -29676,7 +29743,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA indexesTableView - NSTableView + SPTableView removeIndexButton @@ -29720,6 +29787,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA saveServerProcesses: setAutoRefreshInterval: setCustomAutoRefreshInterval: + toggeleShowFullProcessList: toggleProcessListAutoRefresh: toggleShowProcessID: @@ -29735,6 +29803,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id + id @@ -29749,6 +29818,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA saveServerProcesses: setAutoRefreshInterval: setCustomAutoRefreshInterval: + toggeleShowFullProcessList: toggleProcessListAutoRefresh: toggleShowProcessID: @@ -29786,6 +29856,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA setCustomAutoRefreshInterval: id + + toggeleShowFullProcessList: + id + toggleProcessListAutoRefresh: id @@ -30385,7 +30459,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id SPHistoryController SPCopyTable - id + SPTableData SPDatabaseDocument SPTableInfo id @@ -30591,7 +30665,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableDataInstance - id + SPTableData tableDocumentInstance @@ -30628,8 +30702,8 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES - id - id + SPDatabaseDocument + SPTablesList @@ -30643,11 +30717,11 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA YES tableDocumentInstance - id + SPDatabaseDocument tableListInstance - id + SPTablesList @@ -30843,7 +30917,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSPopUpButton NSPopUpButton NSButton - NSTableView + SPTableView NSButton id id @@ -30921,7 +30995,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA relationsTableView - NSTableView + SPTableView removeRelationButton @@ -31072,12 +31146,13 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id + SPDatabaseData id NSPopUpButtonCell id - id + SPIndexesController NSButton + SPTableView id id id @@ -31087,13 +31162,12 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id - id + SPTableData SPDatabaseDocument id - id + SPTableView NSSplitView - id + SPTablesList id @@ -31149,7 +31223,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA databaseDataInstance - id + SPDatabaseData editTableButton @@ -31165,7 +31239,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA indexesController - id + SPIndexesController indexesShowButton @@ -31173,7 +31247,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA indexesTableView - id + SPTableView keySheet @@ -31213,7 +31287,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableDataInstance - id + SPTableData tableDocumentInstance @@ -31225,7 +31299,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableSourceView - id + SPTableView tablesIndexesSplitView @@ -31233,7 +31307,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tablesListInstance - id + SPTablesList viewColumnsMenu @@ -31370,7 +31444,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSPopUpButton NSTextField NSTextView - NSTableView + SPTableView @@ -31458,7 +31532,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA triggersTableView - NSTableView + SPTableView @@ -31590,8 +31664,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA renameTableMenuItem separatorTableContextMenuItem separatorTableContextMenuItem2 + separatorTableContextMenuItem3 separatorTableMenuItem separatorTableMenuItem2 + separatorTableMenuItem3 showCreateSyntaxContextMenuItem showCreateSyntaxMenuItem spHistoryControllerInstance @@ -31642,10 +31718,12 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA NSMenuItem NSMenuItem NSMenuItem + NSMenuItem + NSMenuItem SPHistoryController id id - id + SPDatabaseDocument id id NSButton @@ -31657,7 +31735,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA id id id - id + SPTableView id id id @@ -31689,8 +31767,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA renameTableMenuItem separatorTableContextMenuItem separatorTableContextMenuItem2 + separatorTableContextMenuItem3 separatorTableMenuItem separatorTableMenuItem2 + separatorTableMenuItem3 showCreateSyntaxContextMenuItem showCreateSyntaxMenuItem spHistoryControllerInstance @@ -31797,6 +31877,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA separatorTableContextMenuItem2 NSMenuItem + + separatorTableContextMenuItem3 + NSMenuItem + separatorTableMenuItem NSMenuItem @@ -31805,6 +31889,10 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA separatorTableMenuItem2 NSMenuItem + + separatorTableMenuItem3 + NSMenuItem + showCreateSyntaxContextMenuItem NSMenuItem @@ -31827,7 +31915,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tableDocumentInstance - id + SPDatabaseDocument tableDumpInstance @@ -31875,7 +31963,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA tablesListView - id + SPTableView toolbarActionsButton diff --git a/Interfaces/English.lproj/DatabaseProcessList.xib b/Interfaces/English.lproj/DatabaseProcessList.xib index 95a80875..fd761e49 100644 --- a/Interfaces/English.lproj/DatabaseProcessList.xib +++ b/Interfaces/English.lproj/DatabaseProcessList.xib @@ -2,17 +2,17 @@ 1050 - 10J567 - 804 + 10J869 + 851 1038.35 - 462.00 + 461.00 com.apple.InterfaceBuilder.CocoaPlugin - 804 + 851 YES - + @@ -44,7 +44,7 @@ View - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} {640, 200} @@ -197,7 +197,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2NjY3AA + MC42NjY2NjY2ODY1AA @@ -655,6 +655,16 @@ _popUpItemAction: + + + Show FULL Process List + + 2147483647 + + + _popUpItemAction: + + YES @@ -761,7 +771,7 @@ - 1 + 2 YES 1 YES @@ -822,7 +832,7 @@ {{0, 0}, {1680, 1028}} {640, 222} - {1.79769e+308, 1.79769e+308} + {3.40282e+38, 3.40282e+38} @@ -865,6 +875,10 @@ + + YES + ProcessListShowFullProcessList + YES @@ -1376,6 +1390,30 @@ 185 + + + toggeleShowFullProcessList: + + + + 187 + + + + value: values.ProcessListShowFullProcessList + + + + + + value: values.ProcessListShowFullProcessList + value + values.ProcessListShowFullProcessList + 2 + + + 188 + @@ -1683,6 +1721,7 @@ + @@ -1919,6 +1958,11 @@ + + 186 + + + @@ -1982,6 +2026,7 @@ 178.IBPluginDependency 18.IBPluginDependency 18.ImportedFromIB2 + 186.IBPluginDependency 19.IBPluginDependency 19.ImportedFromIB2 20.IBPluginDependency @@ -2064,9 +2109,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{852, 726}, {229, 93}} + {{470, 726}, {229, 93}} com.apple.InterfaceBuilder.CocoaPlugin - {{852, 726}, {229, 93}} + {{470, 726}, {229, 93}} @@ -2122,6 +2167,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2130,9 +2176,9 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{394, 380}, {640, 203}} + {{626, 333}, {640, 203}} com.apple.InterfaceBuilder.CocoaPlugin - {{394, 380}, {640, 203}} + {{626, 333}, {640, 203}} {{321, 508}, {411, 341}} @@ -2173,7 +2219,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{365, 386}, {209, 78}} + {{605, 260}, {223, 98}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2210,7 +2256,7 @@ - 185 + 188 @@ -2250,6 +2296,13 @@ Frameworks/PSMTabBar/PSMTabBarControl.h + + NSObject + + IBProjectSource + Frameworks/PSMTabBar/PSMTabBarController.h + + NSObject @@ -2332,6 +2385,7 @@ saveServerProcesses: setAutoRefreshInterval: setCustomAutoRefreshInterval: + toggeleShowFullProcessList: toggleProcessListAutoRefresh: toggleShowProcessID: @@ -2347,6 +2401,7 @@ id id id + id @@ -2361,6 +2416,7 @@ saveServerProcesses: setAutoRefreshInterval: setCustomAutoRefreshInterval: + toggeleShowFullProcessList: toggleProcessListAutoRefresh: toggleShowProcessID: @@ -2398,6 +2454,10 @@ setCustomAutoRefreshInterval: id + + toggeleShowFullProcessList: + id + toggleProcessListAutoRefresh: id diff --git a/Interfaces/English.lproj/ExportDialog.xib b/Interfaces/English.lproj/ExportDialog.xib index 50a42201..dc47424b 100644 --- a/Interfaces/English.lproj/ExportDialog.xib +++ b/Interfaces/English.lproj/ExportDialog.xib @@ -3,7 +3,7 @@ 1050 10J567 - 804 + 851 1038.35 462.00 @@ -15,14 +15,14 @@ YES - 804 - 1.2.2 + 851 + 1.2.5 YES + - YES @@ -49,7 +49,7 @@ 2 {{610, 291}, {517, 480}} 611845120 - Export + Export Window NSWindow {1.79769e+308, 1.79769e+308} @@ -424,6 +424,25 @@ 75 + + + 290 + {{17, 20}, {274, 14}} + + YES + + 68288064 + 272765952 + + + + + + 3 + MC41MDQwMzIyNTQyAA + + + {517, 480} @@ -1096,7 +1115,7 @@ - {{20, 20}, {201, 24}} + {{21, 20}, {201, 24}} NO NO @@ -2790,6 +2809,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSView + + YES + @@ -3410,6 +3432,54 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1377 + + + exportFormatInfoText + + + + 1380 + + + + toggleNewFilePerTable: + + + + 1381 + + + + selectedIndex: values.SPExportCompressionLastValue + + + + + + selectedIndex: values.SPExportCompressionLastValue + selectedIndex + values.SPExportCompressionLastValue + 2 + + + 1387 + + + + value: values.SPExportMemoryModeLastValue + + + + + + value: values.SPExportMemoryModeLastValue + value + values.SPExportMemoryModeLastValue + 2 + + + 1389 + @@ -3459,6 +3529,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + @@ -4976,6 +5047,25 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 1378 + + + YES + + + + + + 1379 + + + + + 1385 + + + @@ -5206,6 +5296,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1375.ImportedFromIB2 1375.notes 1376.IBPluginDependency + 1378.IBPluginDependency + 1379.IBPluginDependency 2.IBPluginDependency 2.IBUserGuides 294.IBEditorWindowLastContentRect @@ -5271,15 +5363,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES com.apple.InterfaceBuilder.CocoaPlugin - {{354, 248}, {517, 480}} + {{329, 286}, {517, 480}} com.apple.InterfaceBuilder.CocoaPlugin - {{354, 248}, {517, 480}} + {{329, 286}, {517, 480}} {517, 480} - {{872, 645}, {517, 359}} + {{333, 497}, {517, 359}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -5643,6 +5735,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin YES @@ -5730,7 +5824,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 1377 + 1389 @@ -6013,6 +6107,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA switchInput: toggleAdvancedExportOptionsView: toggleCustomFilenameFormatView: + toggleNewFilePerTable: toggleSQLIncludeContent: toggleSQLIncludeDropSyntax: toggleSQLIncludeStructure: @@ -6035,6 +6130,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id @@ -6052,6 +6148,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA switchInput: toggleAdvancedExportOptionsView: toggleCustomFilenameFormatView: + toggleNewFilePerTable: toggleSQLIncludeContent: toggleSQLIncludeDropSyntax: toggleSQLIncludeStructure: @@ -6103,6 +6200,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA toggleCustomFilenameFormatView: id + + toggleNewFilePerTable: + id + toggleSQLIncludeContent: id @@ -6148,6 +6249,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox + exportFormatInfoText exportInputPopUpButton exportOptionsTabBar exportOutputCompressionFormatPopupButton @@ -6206,6 +6308,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSMatrix NSButton NSBox + NSTextField NSPopUpButton NSTabView NSPopUpButton @@ -6267,6 +6370,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportExcelSheetOrFilePerTableMatrix exportFilePerTableCheck exportFilenameDividerBox + exportFormatInfoText exportInputPopUpButton exportOptionsTabBar exportOutputCompressionFormatPopupButton @@ -6394,6 +6498,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA exportFilenameDividerBox NSBox + + exportFormatInfoText + NSTextField + exportInputPopUpButton NSPopUpButton @@ -6726,6 +6834,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSControl.h + + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + NSFormatter NSObject @@ -7314,6 +7430,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA AppKit.framework/Headers/NSTokenField.h + + NSUserDefaultsController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSUserDefaultsController.h + + NSView diff --git a/Interfaces/English.lproj/Preferences.xib b/Interfaces/English.lproj/Preferences.xib index 5180d95e..ba0f7e68 100644 --- a/Interfaces/English.lproj/Preferences.xib +++ b/Interfaces/English.lproj/Preferences.xib @@ -2,10 +2,10 @@ 1050 - 10J567 - 823 + 10J869 + 851 1038.35 - 462.00 + 461.00 YES @@ -15,13 +15,15 @@ YES - 823 + 851 1.2.5 YES - + + + YES @@ -67,6 +69,44 @@ YES + + + YES + name + fav + host + user + database + socket + port + useSSH + sshHost + sshUser + sshPort + + selectedFavoritePassword + + DisplayTableViewVerticalGridlines + type + TableRowCountQueryLevel + sshKeyLocationEnabled + sshKeyLocation + useSSL + sslKeyFileLocation + sslKeyFileLocationEnabled + sslCertificateFileLocation + sslCertificateFileLocationEnabled + sslCACertFileLocation + sslCACertFileLocationEnabled + CustomQuerySoftIndentWidth + + YES + YES + + YES + YES + YES + 4107 2 @@ -499,7 +539,7 @@ {264, 296} - + 268 YES @@ -910,7 +950,7 @@ YES - 71433792 + -2076049856 2048 @@ -920,24 +960,13 @@ 400 75 - - YES - - - 1048576 - 2147483647 - - - _popUpItemAction: - - + YES OtherViews YES - YES -1 1 @@ -1357,7 +1386,6 @@ {580, 280} - NSView @@ -2089,7 +2117,7 @@ NSView - + 268 YES @@ -2231,18 +2259,18 @@ AQAAAAA YES YES - dateFormat_10_0 + dateStyle formatterBehavior - lenient + timeStyle YES - %a, %B %e, %Y %H:%M:%S - - + + + - %a, %B %e, %Y %H:%M:%S + EEEE, d MMMM yyyy HH:mm:ss NO @@ -2359,10 +2387,11 @@ AQAAAAA {580, 180} + NSView - + 268 YES @@ -2506,10 +2535,11 @@ AQAAAAA {580, 93} + NSView - + 268 YES @@ -3514,6 +3544,7 @@ AQAAAAA {580, 360} + NSView @@ -3616,6 +3647,46 @@ AQAAAAA {579, 51} NSView + + + + YES + + + Remove + + 2147483647 + + + + + + Duplicate + + 2147483647 + + + + + + YES + YES + + + 2147483647 + + + + + + Make Default + + 2147483647 + + + + + @@ -3940,6 +4011,35 @@ AQAAAAA 680 + + + contentArray: values.favorites + + + + + + contentArray: values.favorites + contentArray + values.favorites + + YES + + YES + NSDeletesObjectsOnRemove + NSHandlesContentAsCompoundValue + + + YES + + + + + 2 + + + 782 + value: values.CustomQueryMaxHistoryItems @@ -4580,6 +4680,14 @@ AQAAAAA 1545 + + + delegate + + + + 1555 + value: values.SUSendProfileInfo @@ -4770,6 +4878,14 @@ AQAAAAA 2076 + + + updateDefaultFavorite: + + + + 2077 + defaultFavoritePopup @@ -5174,14 +5290,6 @@ AQAAAAA 2214 - - - updateDefaultFavorite: - - - - 2217 - @@ -5541,6 +5649,12 @@ AQAAAAA + + 254 + + + Favorites + 331 @@ -6764,6 +6878,34 @@ AQAAAAA + + 1547 + + + YES + + + + + + + Context Menu + + + 1548 + + + + + 1549 + + + + + 1551 + + + 1615 @@ -6788,6 +6930,11 @@ AQAAAAA + + 1640 + + + 1669 @@ -7372,6 +7519,7 @@ AQAAAAA 100.IBPluginDependency 100.ImportedFromIB2 101.IBPluginDependency + 102.IBDateFormatterBehaviorMetadataKey 102.IBPluginDependency 102.ImportedFromIB2 1034.IBPluginDependency @@ -7492,11 +7640,17 @@ AQAAAAA 1542.IBPluginDependency 1543.IBPluginDependency 1546.IBPluginDependency + 1547.IBEditorWindowLastContentRect + 1547.IBPluginDependency + 1548.IBPluginDependency + 1549.IBPluginDependency + 1551.IBPluginDependency 1615.IBPluginDependency 1615.ImportedFromIB2 1616.IBPluginDependency 1618.IBPluginDependency 1620.IBPluginDependency + 1640.IBPluginDependency 1669.IBAttributePlaceholdersKey 1669.IBPluginDependency 1670.IBPluginDependency @@ -7616,6 +7770,7 @@ AQAAAAA 24.IBPluginDependency 24.ImportedFromIB2 25.IBPluginDependency + 254.IBPluginDependency 26.IBEditorWindowLastContentRect 26.IBPluginDependency 26.ImportedFromIB2 @@ -7787,6 +7942,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -7907,11 +8063,17 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + {{508, 537}, {142, 73}} + 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 ToolTip @@ -7951,7 +8113,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{93, 644}, {580, 280}} + {{549, 529}, {580, 280}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8075,6 +8237,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{646, 14}, {276, 433}} com.apple.InterfaceBuilder.CocoaPlugin @@ -8180,7 +8343,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{283, 900}, {254, 6}} + {{646, 556}, {254, 6}} com.apple.InterfaceBuilder.CocoaPlugin {{381, 612}, {175, 53}} com.apple.InterfaceBuilder.CocoaPlugin @@ -8200,7 +8363,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{243, 481}, {580, 180}} + {{270, 481}, {580, 180}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8210,7 +8373,7 @@ AQAAAAA 0 - {{314, 726}, {580, 93}} + {{525, 913}, {580, 93}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8278,7 +8441,7 @@ AQAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{406, 257}, {580, 360}} + {{270, 496}, {580, 360}} com.apple.InterfaceBuilder.CocoaPlugin YES @@ -8331,7 +8494,7 @@ AQAAAAA - 2217 + 2226 @@ -9047,6 +9210,14 @@ AQAAAAA BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h + + NSArrayController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSArrayController.h + + NSBox NSView @@ -9513,6 +9684,14 @@ AQAAAAA WebKit.framework/Headers/WebUIDelegate.h + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + NSPopUpButton NSButton -- cgit v1.2.3