From 714a06ae49c50e89638d67dcb39efbee630d3325 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sun, 23 Dec 2012 20:59:18 +0000 Subject: Make some improvements to the Table Content Filter, particularly for text fields: - Rename all "IS" entries to "=", to make the intended purpose clearer, and switch the underlying command to use "= BINARY" instead of "LIKE", producing an exact match instead of replicating LIKE functionality. Move LIKE p to just below the = options. This addresses Issue #1441. - Add entries for "matches RegExp" and "does not match RegExp", implementing Issue #1508. - When adding custom filters, add them by default to the Global group if the favourite isn't an on-disk document, addressing filter loss between sessions; this addresses Issue #1381 --- Resources/English.lproj/ContentFilters.plist | 762 ++++++++++++++------------- 1 file changed, 389 insertions(+), 373 deletions(-) (limited to 'Resources') diff --git a/Resources/English.lproj/ContentFilters.plist b/Resources/English.lproj/ContentFilters.plist index ce2710bd..98522409 100644 --- a/Resources/English.lproj/ContentFilters.plist +++ b/Resources/English.lproj/ContentFilters.plist @@ -1,376 +1,392 @@ - - - - - number - - - MenuLabel - = - NumberOfArguments - 1 - Clause - = '${}' - - - MenuLabel - ≠ - NumberOfArguments - 1 - Clause - != '${}' - - - MenuLabel - > - NumberOfArguments - 1 - Clause - > '${}' - - - MenuLabel - < - NumberOfArguments - 1 - Clause - < '${}' - - - MenuLabel - ≥ - NumberOfArguments - 1 - Clause - >= '${}' - - - MenuLabel - ≤ - NumberOfArguments - 1 - Clause - <= '${}' - - - MenuLabel - IN - NumberOfArguments - 1 - Clause - IN (${}) - - - MenuLabel - LIKE - NumberOfArguments - 1 - Clause - LIKE '${}' - - - MenuLabel - BETWEEN - NumberOfArguments - 2 - ConjunctionLabels - - AND - - Clause - BETWEEN '${}' AND '${}' - - - MenuLabel - IS NULL - NumberOfArguments - 0 - Clause - IS NULL - - - MenuLabel - IS NOT NULL - NumberOfArguments - 0 - Clause - IS NOT NULL - - - string - - - MenuLabel - is - NumberOfArguments - 1 - Clause - LIKE $BINARY '${}' - - - MenuLabel - is not - NumberOfArguments - 1 - Clause - NOT LIKE $BINARY '${}' - - - MenuLabel - contains - NumberOfArguments - 1 - Clause - LIKE $BINARY '%${}%' - - - MenuLabel - contains not - NumberOfArguments - 1 - Clause - NOT LIKE $BINARY '%${}%' - - - MenuLabel - LIKE - NumberOfArguments - 1 - Clause - LIKE $BINARY '${}' - - - MenuLabel - NOT LIKE - NumberOfArguments - 1 - Clause - NOT LIKE $BINARY '${}' - - - MenuLabel - IN - NumberOfArguments - 1 - Clause - IN (${}) - Tooltip - IN ([arg]) + + + + + number + + + MenuLabel + = + NumberOfArguments + 1 + Clause + = '${}' + + + MenuLabel + ≠ + NumberOfArguments + 1 + Clause + != '${}' + + + MenuLabel + > + NumberOfArguments + 1 + Clause + > '${}' + + + MenuLabel + < + NumberOfArguments + 1 + Clause + < '${}' + + + MenuLabel + ≥ + NumberOfArguments + 1 + Clause + >= '${}' + + + MenuLabel + ≤ + NumberOfArguments + 1 + Clause + <= '${}' + + + MenuLabel + IN + NumberOfArguments + 1 + Clause + IN (${}) + + + MenuLabel + LIKE + NumberOfArguments + 1 + Clause + LIKE '${}' + + + MenuLabel + BETWEEN + NumberOfArguments + 2 + ConjunctionLabels + + AND + + Clause + BETWEEN '${}' AND '${}' + + + MenuLabel + IS NULL + NumberOfArguments + 0 + Clause + IS NULL + + + MenuLabel + IS NOT NULL + NumberOfArguments + 0 + Clause + IS NOT NULL + + + string + + + MenuLabel + = + NumberOfArguments + 1 + Clause + = BINARY '${}' + + + MenuLabel + ≠ + NumberOfArguments + 1 + Clause + != BINARY '${}' + + + MenuLabel + LIKE + NumberOfArguments + 1 + Clause + LIKE $BINARY '${}' + + + MenuLabel + NOT LIKE + NumberOfArguments + 1 + Clause + NOT LIKE $BINARY '${}' + + + MenuLabel + contains + NumberOfArguments + 1 + Clause + LIKE $BINARY '%${}%' + + + MenuLabel + does not contain + NumberOfArguments + 1 + Clause + NOT LIKE $BINARY '%${}%' + + + MenuLabel + matches RegExp + NumberOfArguments + 1 + Clause + REGEXP $BINARY '${}' + + + MenuLabel + does not match RegExp + NumberOfArguments + 1 + Clause + NOT REGEXP $BINARY '${}' + + + MenuLabel + IN + NumberOfArguments + 1 + Clause + IN (${}) + Tooltip + IN ([arg]) Do quote strings manually. - - - MenuLabel - BETWEEN - NumberOfArguments - 2 - ConjunctionLabels - - AND - - Clause - BETWEEN $BINARY '${}' AND '${}' - - - MenuLabel - IS NULL - NumberOfArguments - 0 - Clause - IS NULL - - - MenuLabel - IS NOT NULL - NumberOfArguments - 0 - Clause - IS NOT NULL - - - MenuLabel - is empty - NumberOfArguments - 0 - Clause - LIKE '' - - - MenuLabel - is not empty - NumberOfArguments - 0 - Clause - NOT LIKE '' - - - date - - - MenuLabel - is - NumberOfArguments - 1 - Clause - = '${}' - - - MenuLabel - is not - NumberOfArguments - 1 - Clause - != '${}' - - - MenuLabel - is after - NumberOfArguments - 1 - Clause - > '${}' - - - MenuLabel - is before - NumberOfArguments - 1 - Clause - < '${}' - - - MenuLabel - is after or equal to - NumberOfArguments - 1 - Clause - >= '${}' - - - MenuLabel - is before or equal to - NumberOfArguments - 1 - Clause - <= '${}' - - - MenuLabel - BETWEEN - NumberOfArguments - 2 - ConjunctionLabels - - AND - - Clause - BETWEEN '${}' AND '${}' - - - MenuLabel - IS NULL - NumberOfArguments - 0 - Clause - IS NULL - - - MenuLabel - IS NOT NULL - NumberOfArguments - 0 - Clause - IS NOT NULL - - - spatial - - - MenuLabel - contains - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBRContains(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - within - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBRWithin(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - disjoint - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBRDisjoint(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - equal - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBREqual(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - intersects - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBRIntersects(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - overlaps - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBROverlaps(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - touches - NumberOfArguments - 1 - SuppressLeadingFieldPlaceholder - - Clause - MBRTouches(GeomFromText('${}'),$CURRENT_FIELD) - - - MenuLabel - IS NULL - NumberOfArguments - 0 - Clause - IS NULL - - - MenuLabel - IS NOT NULL - NumberOfArguments - 0 - Clause - IS NOT NULL - - - + + + MenuLabel + BETWEEN + NumberOfArguments + 2 + ConjunctionLabels + + AND + + Clause + BETWEEN $BINARY '${}' AND '${}' + + + MenuLabel + IS NULL + NumberOfArguments + 0 + Clause + IS NULL + + + MenuLabel + IS NOT NULL + NumberOfArguments + 0 + Clause + IS NOT NULL + + + MenuLabel + is empty + NumberOfArguments + 0 + Clause + LIKE '' + + + MenuLabel + is not empty + NumberOfArguments + 0 + Clause + NOT LIKE '' + + + date + + + MenuLabel + = + NumberOfArguments + 1 + Clause + = '${}' + + + MenuLabel + ≠ + NumberOfArguments + 1 + Clause + != '${}' + + + MenuLabel + is after + NumberOfArguments + 1 + Clause + > '${}' + + + MenuLabel + is before + NumberOfArguments + 1 + Clause + < '${}' + + + MenuLabel + is after or equal to + NumberOfArguments + 1 + Clause + >= '${}' + + + MenuLabel + is before or equal to + NumberOfArguments + 1 + Clause + <= '${}' + + + MenuLabel + BETWEEN + NumberOfArguments + 2 + ConjunctionLabels + + AND + + Clause + BETWEEN '${}' AND '${}' + + + MenuLabel + IS NULL + NumberOfArguments + 0 + Clause + IS NULL + + + MenuLabel + IS NOT NULL + NumberOfArguments + 0 + Clause + IS NOT NULL + + + spatial + + + MenuLabel + contains + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBRContains(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + within + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBRWithin(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + disjoint + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBRDisjoint(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + equal + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBREqual(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + intersects + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBRIntersects(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + overlaps + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBROverlaps(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + touches + NumberOfArguments + 1 + SuppressLeadingFieldPlaceholder + + Clause + MBRTouches(GeomFromText('${}'),$CURRENT_FIELD) + + + MenuLabel + IS NULL + NumberOfArguments + 0 + Clause + IS NULL + + + MenuLabel + IS NOT NULL + NumberOfArguments + 0 + Clause + IS NOT NULL + + + -- cgit v1.2.3