From 9c06d1219c66acc043b5f13ab29379f60eb00350 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Tue, 28 Jul 2009 01:02:40 +0000 Subject: Improve TablesList significantly: - If there are twenty or more tables, show a table quicksearch/filter at the top of the list, and update the rest of the code to match. This addresses issue #178. - Select tables and views alphabetically by user's current locale (instead of default MySQL "A B C a b c") - When adding or duplicating tables, insert them at the correct point - Fix a number of minor display bugs caused by incorrect interaction with the tables list caches --- Interfaces/English.lproj/DBView.xib | 772 +++++++++++++++++++++++------------- 1 file changed, 490 insertions(+), 282 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 77286596..14b44c40 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -8,6 +8,7 @@ 353.00 YES + YES @@ -70,95 +71,124 @@ 274 YES - + 274 YES - - - 4370 + + + 288 YES - - - 2304 + + + 4370 YES - - - 4352 - {212, 381} - - - YES - - - -2147483392 - {{-26, 0}, {16, 17}} - - + + + 2304 + YES - - tables - 2.090000e+02 - 4.286900e+01 - 1.000000e+03 - - 75628032 - 0 - Tables - - LucidaGrande - 1.100000e+01 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 337772096 - 272761856 - Text Cell - - - YES - - 6 - System - controlColor - - 3 - MC42NjY2NjY2OQA + + + 274 + + YES + + + 266 + {{5, 2}, {202, 19}} + + YES + + 343014976 + 268567552 + + + LucidaGrande + 1.100000e+01 + 3100 + + + 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 - - 6 - System - controlTextColor - - - 3 - YES - YES - + {212, 26} + + NSView - 3.000000e+00 - 2.000000e+00 - + {212, 26} + + + + 6 System _sourceListBackgroundColor @@ -167,78 +197,218 @@ MC44MzkyMTU3IDAuODY2NjY2NjcgMC44OTgwMzkyMgA - + 4 + + + + 256 + {{-100, -100}, {15, 94}} + + + _doScroller: + 1.000000e+00 + 9.636363e-01 + + + + 256 + {{-100, -100}, {166, 15}} + + 1 + + _doScroller: + 5.060241e-01 + + + {212, 26} + + + 0 + + + + + + {212, 26} + + NSView + + + + 272 + + YES + + + 4370 + + YES + + + 2304 + + YES + + + 4352 + {212, 354} + + YES + + + -2147483392 + {{-26, 0}, {16, 17}} + + + YES + + tables + 2.090000e+02 + 4.286900e+01 + 1.000000e+03 + + 75628032 + 0 + Tables + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + + + + 337772096 + 272761856 + Text Cell + + + YES + + 6 + System + controlColor + + 3 + MC42NjY2NjY2OQA + + + + + 3 + YES + YES + + + + 3.000000e+00 + 2.000000e+00 + + 6 + System + _sourceListBackgroundColor + + 1 + MC44MzkyMTU3IDAuODY2NjY2NjcgMC44OTgwMzkyMgA + + + + 6 + System + gridColor + + 3 + MC41AA + + + 1.700000e+01 + 1514143744 + 2 + 15 + 0 + YES + 1 + + + {212, 354} + + + + 6 System - gridColor - - 3 - MC41AA - + controlBackgroundColor + - 1.700000e+01 - 1514143744 - 2 - 15 - 0 - YES - 1 + 4 + + + + -2147483392 + {{197, 0}, {15, 292}} + + + _doScroller: + 9.965870e-01 + + + + 256 + {{-100, -100}, {141, 11}} + + 257 + + _doScroller: + 9.904762e-01 - {212, 381} - - - - - - 6 - System - controlBackgroundColor - - - 4 - - - - -2147483392 - {{175, 1}, {15, 481}} - - - - _doScroller: - 9.979253e-01 - - - - 256 - {{-100, -100}, {141, 11}} - - - 257 - - _doScroller: - 9.904762e-01 + {212, 354} + + + 528 + + + + QSAAAEEgAABBmAAAQZgAAA - {212, 381} - - - - 528 - - - - QSAAAEEgAABBmAAAQZgAAA + {{0, 27}, {212, 354}} + + NSView {212, 381} - + 2 + + YES + + + + + + + + + + + + + + + + + 1 + NO {212, 381} - NSView @@ -261,7 +431,6 @@ 4352 {212, 145} - YES @@ -325,7 +494,6 @@ {212, 145} - @@ -336,7 +504,6 @@ -2147483392 {{-100, -100}, {15, 20}} - _doScroller: 9.473684e-01 @@ -346,7 +513,6 @@ 256 {{-100, -100}, {141, 11}} - 257 _doScroller: @@ -355,7 +521,6 @@ {212, 145} - 528 @@ -366,19 +531,17 @@ {{0, 382}, {212, 145}} - NSView {{0, 23}, {212, 527}} - 2 NO - - + + @@ -423,7 +586,6 @@ 268 {{-1, -1}, {32, 24}} - YES 67239424 @@ -448,7 +610,6 @@ 268 {{30, -1}, {32, 24}} - YES 71433792 @@ -558,7 +719,6 @@ 268 {{61, -1}, {32, 24}} - YES 67239424 @@ -583,7 +743,6 @@ 268 {{92, -1}, {32, 24}} - YES -2080244224 @@ -610,7 +769,6 @@ {212, 23} - YES YES NO @@ -619,7 +777,6 @@ {212, 550} - NSView @@ -632,7 +789,6 @@ 274 {{-7, -10}, {735, 564}} - YES @@ -702,15 +858,7 @@ Text Cell - - 6 - System - textBackgroundColor - - 3 - MQA - - + 3 @@ -3982,14 +4130,12 @@ 4352 {688, 454} - YES 256 {688, 17} - @@ -3997,7 +4143,6 @@ -2147483392 {{-26, 0}, {16, 17}} - YES @@ -4181,7 +4326,6 @@ {{1, 17}, {688, 454}} - @@ -4192,7 +4336,6 @@ -2147483392 {{674, 17}, {15, 453}} - _doScroller: 9.679487e-01 @@ -4202,7 +4345,6 @@ -2147483392 {{1, 470}, {688, 15}} - 1 _doScroller: @@ -4217,7 +4359,6 @@ {{1, 0}, {688, 17}} - @@ -4227,7 +4368,6 @@ {{6, 32}, {690, 472}} - 562 @@ -4242,7 +4382,6 @@ 292 {{6, 9}, {32, 25}} - YES -1543373312 @@ -4264,7 +4403,6 @@ 292 {{68, 9}, {32, 25}} - YES -2080244224 @@ -4286,7 +4424,6 @@ 292 {{37, 9}, {32, 25}} - YES -1543373312 @@ -4320,7 +4457,6 @@ {{100, 10}, {596, 23}} - YES 130560 @@ -4338,7 +4474,6 @@ 268 {{14, 515}, {347, 14}} - YES 68288064 @@ -4353,7 +4488,6 @@ {{10, 7}, {700, 544}} - Relations @@ -4373,20 +4507,17 @@ {{221, 0}, {723, 550}} - NSView {944, 550} - YES DBViewSplitter {944, 550} - {{0, 0}, {1920, 1178}} {780, 502} @@ -6019,7 +6150,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {3.40282e+38, 3.40282e+38} - + 256 YES @@ -6038,7 +6169,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{80, 10}, {171, 22}} - YES -2076049856 @@ -6104,7 +6234,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{29, 15}, {49, 14}} - YES 68288064 @@ -6119,12 +6248,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {266, 40}} - {{17, 231}, {268, 56}} - {0, 0} 67239424 @@ -6158,7 +6285,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{81, 40}, {170, 22}} - YES -2076049856 @@ -6244,7 +6370,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{81, 10}, {170, 22}} - YES -2076049856 @@ -6330,7 +6455,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{15, 45}, {64, 14}} - YES 68288064 @@ -6347,7 +6471,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{19, 15}, {59, 14}} - YES 68288064 @@ -6362,12 +6485,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {266, 71}} - {{17, 49}, {268, 87}} - {0, 0} 67239424 @@ -6401,7 +6522,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{80, 40}, {171, 22}} - YES -2076049856 @@ -6467,7 +6587,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{80, 10}, {171, 22}} - YES -2076049856 @@ -6533,7 +6652,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{41, 45}, {37, 14}} - YES 68288064 @@ -6550,7 +6668,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{29, 15}, {49, 14}} - YES 68288064 @@ -6565,12 +6682,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {266, 71}} - {{17, 140}, {268, 87}} - {0, 0} 67239424 @@ -6594,7 +6709,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{191, 13}, {96, 28}} - 1 YES @@ -6616,7 +6730,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 268 {{97, 13}, {96, 28}} - YES 67239424 @@ -6634,8 +6747,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {302, 307} - - {{0, 0}, {1440, 878}} {3.40282e+38, 3.40282e+38} @@ -12381,14 +12492,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 4681 - - - tableListView - - - - 4683 - toggleFilterField: @@ -13813,22 +13916,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 5938 - - - tableListSplitter - - - - 5939 - - - - delegate - - - - 5940 - tableInfoTable @@ -14353,6 +14440,46 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6259 + + + tableListSplitter + + + + 6269 + + + + tableListFilterSplitView + + + + 6280 + + + + delegate + + + + 6283 + + + + listFilterField + + + + 6284 + + + + updateFilter: + + + + 6285 + @@ -19727,63 +19854,10 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES - + - - 4487 - - - YES - - - - - - 21 - - - YES - - - - - - - - 3916 - - - - - 3915 - - - - - 22 - - - YES - - - - - - 23 - - - YES - - - - - - 4015 - - - 6067 @@ -20266,6 +20340,122 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 6265 + + + YES + + + + + + + 6266 + + + YES + + + + + + 6267 + + + YES + + + + + + 21 + + + YES + + + + + + + + 22 + + + YES + + + + + + 3915 + + + + + 3916 + + + + + 23 + + + YES + + + + + + 4015 + + + + + 6274 + + + YES + + + + + + + + 6277 + + + YES + + + + + + 6276 + + + + + 6275 + + + + + 6278 + + + YES + + + + + + 6279 + + + @@ -20791,8 +20981,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 4485.ImportedFromIB2 4486.CustomClassName 4486.IBPluginDependency - 4487.CustomClassName - 4487.IBPluginDependency 4488.IBPluginDependency 4503.IBPluginDependency 4504.IBPluginDependency @@ -21487,6 +21675,15 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6242.IBPluginDependency 6249.IBPluginDependency 6253.IBPluginDependency + 6265.IBPluginDependency + 6266.IBPluginDependency + 6267.IBPluginDependency + 6274.IBPluginDependency + 6275.IBPluginDependency + 6276.IBPluginDependency + 6277.IBPluginDependency + 6278.IBPluginDependency + 6279.IBPluginDependency 654.IBPluginDependency 654.ImportedFromIB2 655.IBPluginDependency @@ -22322,8 +22519,6 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 ImageAndTextCell com.apple.InterfaceBuilder.CocoaPlugin - BWSplitView - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -22516,8 +22711,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{177, 306}, {944, 550}} - {{177, 306}, {944, 550}} + {{60, 298}, {944, 550}} + {{60, 298}, {944, 550}} {{62, 352}, {845, 504}} @@ -23256,6 +23451,15 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + com.brandonwalkin.BWToolkit + 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 @@ -23476,7 +23680,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 6259 + 6285 @@ -24429,7 +24633,6 @@ Y2hhbmdlIHRoZSBvcmRlcg tableContentInstance tableDataInstance tableDocumentInstance - tableListView tableSourceInstance tableWindow tablesListInstance @@ -24488,7 +24691,6 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id - id @@ -24609,6 +24811,7 @@ Y2hhbmdlIHRoZSBvcmRlcg renameTable: togglePaneCollapse: truncateTable: + updateFilter: updateTables: @@ -24622,6 +24825,7 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id + id @@ -24639,6 +24843,7 @@ Y2hhbmdlIHRoZSBvcmRlcg duplicateTableContextMenuItem duplicateTableMenuItem extendedTableInfoInstance + listFilterField removeTableContextMenuItem removeTableMenuItem renameTableButton @@ -24653,6 +24858,7 @@ Y2hhbmdlIHRoZSBvcmRlcg tableDumpInstance tableEncodingButton tableInfoCollapseButton + tableListFilterSplitView tableListSplitView tableNameField tableRenameField @@ -24679,6 +24885,7 @@ Y2hhbmdlIHRoZSBvcmRlcg NSMenuItem NSMenuItem id + NSSearchField NSMenuItem NSMenuItem id @@ -24694,6 +24901,7 @@ Y2hhbmdlIHRoZSBvcmRlcg id NSButton NSSplitView + NSSplitView id id id -- cgit v1.2.3