From ea1516eeb991cedd2ea8d86d65fef4b102996b2b Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 23 Jul 2012 00:35:01 +0000 Subject: - Add a new SPSplitView class, intended to replace all BWSplitViews and so allow us to remove BWToolKit. Supports constraints and animated collapsible subviews configured in code, fixes crashes and exceptions if a window is closed while animations are taking place or scheduled to take place. - Replace the two vertical splitters in the table list (the filter splitter, and the table info splitter) with SPSplitView implementations as a test - Add a helper method in the new SPDateAdditions --- Interfaces/English.lproj/DBView.xib | 443 ++++++++++++++++-------------------- 1 file changed, 196 insertions(+), 247 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 1d553921..155a42f8 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -23,8 +23,8 @@ YES + - YES @@ -57,7 +57,7 @@ 274 YES - + 272 @@ -348,20 +348,20 @@ YES - -2080244224 + 67239424 134348800 -926662401 163 - + NSImage - button_pane_show_icon + button_pane_hide_icon - + NSImage - button_pane_hide_icon + button_pane_show_icon @@ -377,104 +377,26 @@ NO 0 - + 274 YES - + 274 YES - + 274 YES - + - 288 + 258 YES - - - 290 - {{5, 2}, {204, 19}} - - YES - - 343014976 - 268567552 - - - - 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 - CAAAAA - - 4386 @@ -515,7 +437,10 @@ 6 System headerTextColor - + + 3 + MAA + @@ -533,7 +458,12 @@ MC42NjY2NjY2NjY3AA - + + 6 + System + controlTextColor + + 3 YES @@ -620,14 +550,83 @@ QSAAAEEgAABBmAAAQZgAAA + + + 290 + {{5, 2}, {204, 19}} + + YES + + 343014976 + 268567552 + + + + YES + 1 + + 6 + System + textBackgroundColor + + 3 + MQA + + + + + 130560 + 0 + search + + _searchFieldSearch: + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + + _searchFieldCancel: + + 138690815 + 0 + + 400 + 75 + + 255 + CAAAAA + + {214, 26} - NSView - + - 272 + 274 YES @@ -747,44 +746,17 @@ {{0, 27}, {214, 352}} - NSView {214, 379} 2 - - 6 - System - _sourceListBackgroundColor - - - YES - - - - - - - - - - - - - - - - - 1 - NO {214, 379} - NSView - + 258 @@ -1019,57 +991,17 @@ {{0, 380}, {214, 145}} - NSView {{0, 24}, {214, 525}} 2 - - NO - - - - - - - - - - YES - - YES - - - - - YES - - - - - - YES - - YES - - - - - YES - - - - - 2 - NO {214, 549} - NSView - + 274 @@ -3335,8 +3267,8 @@ -926662401 163 - - + + 200 @@ -3475,7 +3407,7 @@ 274 YES - + 272 @@ -4413,9 +4345,8 @@ {696, 395} - NSView - + 274 @@ -4611,7 +4542,6 @@ {{0, 396}, {696, 111}} - NSView {{6, 34}, {696, 507}} @@ -6464,7 +6394,6 @@ {{215, 0}, {728, 549}} - NSView {943, 549} @@ -10054,7 +9983,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 274 YES - + 272 @@ -10198,9 +10127,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {482, 106} - NSView - + 272 @@ -10347,7 +10275,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{0, 107}, {482, 108}} - NSView {{-1, 55}, {482, 215}} @@ -13669,22 +13596,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6258 - - - tableInfoCollapseButton - - - - 6259 - - - - tableListSplitter - - - - 6269 - tableListFilterSplitView @@ -13693,14 +13604,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6280 - - - delegate - - - - 6283 - listFilterField @@ -16526,14 +16429,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7713 - - - containerView - - - - 7714 - delegate @@ -16742,6 +16637,22 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 7839 + + + collapseToggleButton + + + + 7840 + + + + delegate + + + + 7841 + @@ -24039,6 +23950,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6024.IBPluginDependency 6027.IBPluginDependency 6028.IBPluginDependency + 6032.CustomClassName 6032.IBPluginDependency 6033.IBPluginDependency 6034.IBPluginDependency @@ -24120,6 +24032,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6240.IBPluginDependency 6241.IBPluginDependency 6242.IBPluginDependency + 6265.CustomClassName 6265.IBPluginDependency 6266.IBPluginDependency 6267.IBPluginDependency @@ -25614,6 +25527,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit + SPSplitView com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -25774,6 +25688,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + SPSplitView com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit com.brandonwalkin.BWToolkit @@ -26780,7 +26695,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 - 7839 + 7841 @@ -28435,10 +28350,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableContentInstance tableDataInstance tableDumpInstance - tableInfoCollapseButton tableInfoScrollView tableInfoTable - tableListSplitter tableRelationsInstance tableSourceInstance tableTabView @@ -28508,10 +28421,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPTableContent SPTableData id - NSButton NSScrollView NSTableView - NSSplitView id SPTableStructure NSTabView @@ -28584,10 +28495,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableContentInstance tableDataInstance tableDumpInstance - tableInfoCollapseButton tableInfoScrollView tableInfoTable - tableListSplitter tableRelationsInstance tableSourceInstance tableTabView @@ -28816,10 +28725,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableDumpInstance id - - tableInfoCollapseButton - NSButton - tableInfoScrollView NSScrollView @@ -28828,10 +28733,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableInfoTable NSTableView - - tableListSplitter - NSSplitView - tableRelationsInstance id @@ -30618,6 +30519,57 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Source/SPServerVariablesController.h + + SPSplitView + NSSplitView + + toggleCollapse: + id + + + toggleCollapse: + + toggleCollapse: + id + + + + YES + + YES + additionalDragHandleView + collapseToggleButton + + + YES + NSView + NSButton + + + + YES + + YES + additionalDragHandleView + collapseToggleButton + + + YES + + additionalDragHandleView + NSView + + + collapseToggleButton + NSButton + + + + + IBProjectSource + Source/SPSplitView.h + + SPTableContent NSObject @@ -31137,7 +31089,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES activitiesTable - containerView infoTable tableDataInstance tableDocumentInstance @@ -31148,7 +31099,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES NSTableView - NSView id id id @@ -31162,7 +31112,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES activitiesTable - containerView infoTable tableDataInstance tableDocumentInstance @@ -31176,10 +31125,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 activitiesTable NSTableView - - containerView - NSView - infoTable id @@ -31461,7 +31406,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 addField: closeSheet: duplicateField: - reloadTable: removeField: resetAutoIncrement: showOptimizedFieldType: @@ -31476,7 +31420,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 id id id - id NSMenuItem id @@ -31488,7 +31431,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 addField: closeSheet: duplicateField: - reloadTable: removeField: resetAutoIncrement: showOptimizedFieldType: @@ -31509,10 +31451,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 duplicateField: id - - reloadTable: - id - removeField: id @@ -31754,6 +31692,24 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 Source/SPTableStructureDelegate.h + + SPTableStructure + + reloadTable: + id + + + reloadTable: + + reloadTable: + id + + + + IBProjectSource + Source/SPTableStructureLoading.h + + SPTableStructure NSObject @@ -32105,7 +32061,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableDocumentInstance tableDumpInstance tableEncodingButton - tableInfoCollapseButton tableInfoInstance tableListFilterSplitView tableListSplitView @@ -32158,10 +32113,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 SPDatabaseDocument id id - NSButton id - NSSplitView - NSSplitView + SPSplitView + SPSplitView id id SPTableStructure @@ -32214,7 +32168,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableDocumentInstance tableDumpInstance tableEncodingButton - tableInfoCollapseButton tableInfoInstance tableListFilterSplitView tableListSplitView @@ -32369,21 +32322,17 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 tableEncodingButton id - - tableInfoCollapseButton - NSButton - tableInfoInstance id tableListFilterSplitView - NSSplitView + SPSplitView tableListSplitView - NSSplitView + SPSplitView tableNameField -- cgit v1.2.3