diff options
author | rowanbeentje <rowan@beent.je> | 2012-12-23 20:59:18 +0000 |
---|---|---|
committer | rowanbeentje <rowan@beent.je> | 2012-12-23 20:59:18 +0000 |
commit | 714a06ae49c50e89638d67dcb39efbee630d3325 (patch) | |
tree | 79e3a5cd54e197f15f87d1d9ec36921fd3efff51 /Resources | |
parent | c65704f3a87c14b9dbe16c976d7afcb0f175a63f (diff) | |
download | sequelpro-714a06ae49c50e89638d67dcb39efbee630d3325.tar.gz sequelpro-714a06ae49c50e89638d67dcb39efbee630d3325.tar.bz2 sequelpro-714a06ae49c50e89638d67dcb39efbee630d3325.zip |
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
Diffstat (limited to 'Resources')
-rw-r--r-- | Resources/English.lproj/ContentFilters.plist | 762 |
1 files changed, 389 insertions, 373 deletions
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 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE plist PUBLIC '-//Apple//DTD PLIST 1.0//EN' 'http://www.apple.com/DTDs/PropertyList-1.0.dtd'> -<plist version='1.0'> - <dict> - <key>number</key> - <array> - <dict> - <key>MenuLabel</key> - <string>=</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>≠</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>!= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>></string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>> '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string><</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>< '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>≥</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>>= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>≤</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string><= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IN</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>IN (${})</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>LIKE</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>LIKE '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>BETWEEN</string> - <key>NumberOfArguments</key> - <integer>2</integer> - <key>ConjunctionLabels</key> - <array> - <string>AND</string> - </array> - <key>Clause</key> - <string>BETWEEN '${}' AND '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NULL</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NOT NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NOT NULL</string> - </dict> - </array> - <key>string</key> - <array> - <dict> - <key>MenuLabel</key> - <string>is</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>LIKE $BINARY '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is not</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>NOT LIKE $BINARY '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>contains</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>LIKE $BINARY '%${}%'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>contains not</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>NOT LIKE $BINARY '%${}%'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>LIKE</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>LIKE $BINARY '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>NOT LIKE</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>NOT LIKE $BINARY '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IN</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>IN (${})</string> - <key>Tooltip</key> - <string>IN ([arg]) +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>number</key> + <array> + <dict> + <key>MenuLabel</key> + <string>=</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>≠</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>!= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>></string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>> '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string><</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>< '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>≥</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>>= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>≤</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string><= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IN</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>IN (${})</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>LIKE</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>LIKE '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>BETWEEN</string> + <key>NumberOfArguments</key> + <integer>2</integer> + <key>ConjunctionLabels</key> + <array> + <string>AND</string> + </array> + <key>Clause</key> + <string>BETWEEN '${}' AND '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NULL</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NOT NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NOT NULL</string> + </dict> + </array> + <key>string</key> + <array> + <dict> + <key>MenuLabel</key> + <string>=</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>= BINARY '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>≠</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>!= BINARY '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>LIKE</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>LIKE $BINARY '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>NOT LIKE</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>NOT LIKE $BINARY '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>contains</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>LIKE $BINARY '%${}%'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>does not contain</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>NOT LIKE $BINARY '%${}%'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>matches RegExp</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>REGEXP $BINARY '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>does not match RegExp</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>NOT REGEXP $BINARY '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IN</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>IN (${})</string> + <key>Tooltip</key> + <string>IN ([arg]) Do quote strings manually.</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>BETWEEN</string> - <key>NumberOfArguments</key> - <integer>2</integer> - <key>ConjunctionLabels</key> - <array> - <string>AND</string> - </array> - <key>Clause</key> - <string>BETWEEN $BINARY '${}' AND '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NULL</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NOT NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NOT NULL</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is empty</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>LIKE ''</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is not empty</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>NOT LIKE ''</string> - </dict> - </array> - <key>date</key> - <array> - <dict> - <key>MenuLabel</key> - <string>is</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is not</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>!= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is after</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>> '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is before</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>< '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is after or equal to</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string>>= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>is before or equal to</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>Clause</key> - <string><= '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>BETWEEN</string> - <key>NumberOfArguments</key> - <integer>2</integer> - <key>ConjunctionLabels</key> - <array> - <string>AND</string> - </array> - <key>Clause</key> - <string>BETWEEN '${}' AND '${}'</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NULL</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NOT NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NOT NULL</string> - </dict> - </array> - <key>spatial</key> - <array> - <dict> - <key>MenuLabel</key> - <string>contains</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBRContains(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>within</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBRWithin(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>disjoint</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBRDisjoint(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>equal</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBREqual(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>intersects</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBRIntersects(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>overlaps</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBROverlaps(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>touches</string> - <key>NumberOfArguments</key> - <integer>1</integer> - <key>SuppressLeadingFieldPlaceholder</key> - <true/> - <key>Clause</key> - <string>MBRTouches(GeomFromText('${}'),$CURRENT_FIELD)</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NULL</string> - </dict> - <dict> - <key>MenuLabel</key> - <string>IS NOT NULL</string> - <key>NumberOfArguments</key> - <integer>0</integer> - <key>Clause</key> - <string>IS NOT NULL</string> - </dict> - </array> - </dict> + </dict> + <dict> + <key>MenuLabel</key> + <string>BETWEEN</string> + <key>NumberOfArguments</key> + <integer>2</integer> + <key>ConjunctionLabels</key> + <array> + <string>AND</string> + </array> + <key>Clause</key> + <string>BETWEEN $BINARY '${}' AND '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NULL</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NOT NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NOT NULL</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>is empty</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>LIKE ''</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>is not empty</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>NOT LIKE ''</string> + </dict> + </array> + <key>date</key> + <array> + <dict> + <key>MenuLabel</key> + <string>=</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>≠</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>!= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>is after</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>> '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>is before</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>< '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>is after or equal to</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string>>= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>is before or equal to</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>Clause</key> + <string><= '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>BETWEEN</string> + <key>NumberOfArguments</key> + <integer>2</integer> + <key>ConjunctionLabels</key> + <array> + <string>AND</string> + </array> + <key>Clause</key> + <string>BETWEEN '${}' AND '${}'</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NULL</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NOT NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NOT NULL</string> + </dict> + </array> + <key>spatial</key> + <array> + <dict> + <key>MenuLabel</key> + <string>contains</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBRContains(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>within</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBRWithin(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>disjoint</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBRDisjoint(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>equal</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBREqual(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>intersects</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBRIntersects(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>overlaps</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBROverlaps(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>touches</string> + <key>NumberOfArguments</key> + <integer>1</integer> + <key>SuppressLeadingFieldPlaceholder</key> + <true/> + <key>Clause</key> + <string>MBRTouches(GeomFromText('${}'),$CURRENT_FIELD)</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NULL</string> + </dict> + <dict> + <key>MenuLabel</key> + <string>IS NOT NULL</string> + <key>NumberOfArguments</key> + <integer>0</integer> + <key>Clause</key> + <string>IS NOT NULL</string> + </dict> + </array> +</dict> </plist> |