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 ++++++++++++++++++++++++------------ 1 file changed, 177 insertions(+), 89 deletions(-) (limited to 'Interfaces/English.lproj/DBView.xib') 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 -- cgit v1.2.3