Ticket #17526: 17526SearchDialog_ver3-examples.patch

File 17526SearchDialog_ver3-examples.patch, 3.4 KB (added by Hb---, 6 years ago)

Third version of patch, second part: Examples

  • .java

    ==============================================================
    old new  
    273273                .addKeyword(tr("Baker Street"), null, tr("''Baker'' and ''Street'' in any key"))
    274274                .addKeyword(tr("\"Baker Street\""), "\"\"", tr("''Baker Street'' in any key"))
    275275                .addKeyword("<i>key</i>:<i>valuefragment</i>", null,
    276                         tr("''valuefragment'' anywhere in ''key''"), "name:str matches name=Bakerstreet")
     276                        tr("''valuefragment'' anywhere in ''key''"), tr("name:str matches name=Bakerstreet"))
    277277                .addKeyword("-<i>key</i>:<i>valuefragment</i>", null, tr("''valuefragment'' nowhere in ''key''")),
    278278                GBC.eol());
    279279        hintPanel.add(new SearchKeywordRow(hcbSearchString)
     
    286286                .addKeyword("\"key\"=\"value\"", "\"\"=\"\"",
    287287                        tr("to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped " +
    288288                                "by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."),
     289                        tr("name=\"Baker Street\""),
    289290                        "\"addr:street\""),
    290291                GBC.eol().anchor(GBC.CENTER));
    291292        hintPanel.add(new SearchKeywordRow(hcbSearchString)
    292293                .addTitle(tr("combinators"))
    293                 .addKeyword("<i>expr</i> <i>expr</i>", null, tr("logical and (both expressions have to be satisfied)"))
     294                .addKeyword("<i>expr</i> <i>expr</i>", null,
     295                        tr("logical and (both expressions have to be satisfied)"),
     296                        tr("Baker Street"))
    294297                .addKeyword("<i>expr</i> | <i>expr</i>", "| ", tr("logical or (at least one expression has to be satisfied)"))
    295298                .addKeyword("<i>expr</i> OR <i>expr</i>", "OR ", tr("logical or (at least one expression has to be satisfied)"))
    296299                .addKeyword("-<i>expr</i>", null, tr("logical not"))
     
    314317                    GBC.eol().anchor(GBC.CENTER));
    315318            hintPanel.add(new SearchKeywordRow(hcbSearchString)
    316319                .addTitle(tr("metadata"))
    317                 .addKeyword("user:", "user:", tr("objects changed by user", "user:anonymous"))
    318                 .addKeyword("id:", "id:", tr("objects with given ID"), "id:0 (new objects)")
    319                 .addKeyword("version:", "version:", tr("objects with given version"), "version:0 (objects without an assigned version)")
     320                .addKeyword("user:", "user:", tr("objects changed by user"), tr("user:anonymous"))
     321                .addKeyword("id:", "id:", tr("objects with given ID"), tr("id:0 (new objects)"))
     322                .addKeyword("version:", "version:", tr("objects with given version"), tr("version:0 (objects without an assigned version)"))
    320323                .addKeyword("changeset:", "changeset:", tr("objects with given changeset ID"),
    321                         "changeset:0 (objects without an assigned changeset)")
     324                        tr("changeset:0 (objects without an assigned changeset)"))
    322325                .addKeyword("timestamp:", "timestamp:", tr("objects with last modification timestamp within range"), "timestamp:2012/",
    323326                        "timestamp:2008/2011-02-04T12"),
    324327                GBC.eol());