From 24dc4d4ce7ff455be899c62e55c27e6e0ff03d4b Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Fri, 21 Aug 2009 16:27:34 +0000 Subject: Add support for the BETWEEN operator when filtering a table's content. Implements issue #361. Note the sizing of the new controls still needs fine tuned. --- Interfaces/English.lproj/DBView.xib | 254 ++++++++++++++++++++++++++++++++++-- 1 file changed, 241 insertions(+), 13 deletions(-) (limited to 'Interfaces/English.lproj') diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib index 48775ba0..38e8b39d 100644 --- a/Interfaces/English.lproj/DBView.xib +++ b/Interfaces/English.lproj/DBView.xib @@ -2,12 +2,13 @@ 1050 - 9J61 + 9L30 677 - 949.46 + 949.54 353.00 YES + YES @@ -46,7 +47,7 @@ {3.40282e+38, 3.40282e+38} {780, 480} - + 256 YES @@ -2051,7 +2052,7 @@ content - + 256 YES @@ -2596,7 +2597,6 @@ - -1 3 YES YES @@ -2676,6 +2676,144 @@ CAAAAA + + + -2147483379 + {{93, 6}, {28, 14}} + + YES + + 68288064 + 272761856 + AND + + + + + + + + + -2147483378 + {{5, 4}, {83, 19}} + + YES + + 343014976 + 268567552 + + + + YES + 1 + + + + 130560 + 0 + search + _searchFieldSearch: + + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + _searchFieldCancel: + + + 138690815 + 0 + + 400 + 75 + + 255 + + + + + -2147483381 + {{127, 4}, {83, 19}} + + YES + + 343014976 + 268567552 + + + + YES + 1 + + + + 130560 + 0 + search + _searchFieldSearch: + + + 138690815 + 0 + + 400 + 75 + + + 130560 + 0 + clear + + YES + + YES + + YES + AXDescription + NSAccessibilityEncodedAttributesValueType + + + YES + cancel + + + + + _searchFieldCancel: + + + 138690815 + 0 + + 400 + 75 + + 255 + + {{264, 0}, {211, 27}} @@ -2689,6 +2827,7 @@ {{10, 7}, {700, 544}} + Content @@ -2697,7 +2836,7 @@ customQuery - + 256 YES @@ -3489,7 +3628,6 @@ {{10, 7}, {700, 544}} - Custom Query @@ -4529,14 +4667,14 @@ - + 134217731 YES YES YES - + @@ -4552,6 +4690,7 @@ {944, 550} + {{0, 0}, {1920, 1178}} {780, 502} @@ -9447,6 +9586,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{1, 1}, {198, 107}} + 4 @@ -9474,6 +9614,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 {{20, 20}, {211, 109}} + 18 @@ -14991,6 +15132,30 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6357 + + + betweenTextField + + + + 6368 + + + + firstBetweenField + + + + 6373 + + + + secondBetweenField + + + + 6374 + @@ -20928,6 +21093,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 YES + + + @@ -21168,6 +21336,48 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 + + 6364 + + + YES + + + + + + 6365 + + + + + 6369 + + + YES + + + + + + 6370 + + + + + 6371 + + + YES + + + + + + 6372 + + + @@ -22433,6 +22643,12 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 6356.IBPluginDependency 6358.IBPluginDependency 6359.IBPluginDependency + 6364.IBPluginDependency + 6365.IBPluginDependency + 6369.IBPluginDependency + 6370.IBPluginDependency + 6371.IBPluginDependency + 6372.IBPluginDependency 654.IBPluginDependency 654.ImportedFromIB2 655.IBPluginDependency @@ -22895,7 +23111,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin - {{618, 746}, {92, 20}} + {{710, 843}, {89, 20}} com.apple.InterfaceBuilder.CocoaPlugin {{535, 926}, {92, 23}} @@ -23461,9 +23677,9 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{219, 267}, {944, 550}} + {{280, 178}, {944, 550}} - {{219, 267}, {944, 550}} + {{280, 178}, {944, 550}} {{62, 352}, {845, 504}} @@ -24253,6 +24469,12 @@ aGUgYWN0aXZlIHNlbGVjdGlvbiAo4oyl4oyYUik 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 @@ -24472,7 +24694,7 @@ Y2hhbmdlIHRoZSBvcmRlcg - 6359 + 6374 @@ -25147,16 +25369,19 @@ Y2hhbmdlIHRoZSBvcmRlcg YES addButton argumentField + betweenTextField compareField copyButton countText fieldField filterButton + firstBetweenField limitRowsButton limitRowsField limitRowsStepper multipleLineEditingButton removeButton + secondBetweenField spHistoryControllerInstance tableContentView tableDataInstance @@ -25179,6 +25404,9 @@ Y2hhbmdlIHRoZSBvcmRlcg id id id + id + id + id SPHistoryController CMCopyTable id -- cgit v1.2.3