Changeset 8821 in josm for trunk/src/org


Ignore:
Timestamp:
2015-10-04T17:53:03+02:00 (4 years ago)
Author:
simon04
Message:

see #11916 - Allow to unselect regexp/MapCSS search mode

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r8812 r8821  
    249249        JCheckBox allElements = new JCheckBox(tr("all objects"), initialValues.allElements);
    250250        allElements.setToolTipText(tr("Also include incomplete and deleted objects in search."));
    251         final JCheckBox regexSearch = new JCheckBox(tr("regular expression"), initialValues.regexSearch);
    252         final JCheckBox mapCSSSearch = new JCheckBox(tr("MapCSS selector"), initialValues.mapCSSSearch);
     251        final JRadioButton standardSearch = new JRadioButton(tr("standard"), !initialValues.regexSearch && !initialValues.mapCSSSearch);
     252        final JRadioButton regexSearch = new JRadioButton(tr("regular expression"), initialValues.regexSearch);
     253        final JRadioButton mapCSSSearch = new JRadioButton(tr("MapCSS selector"), initialValues.mapCSSSearch);
    253254        final JCheckBox addOnToolbar = new JCheckBox(tr("add toolbar button"), false);
    254255        final ButtonGroup bg2 = new ButtonGroup();
     256        bg2.add(standardSearch);
    255257        bg2.add(regexSearch);
    256258        bg2.add(mapCSSSearch);
     
    267269        if (Main.pref.getBoolean("expert", false)) {
    268270            left.add(allElements, GBC.eol());
     271            left.add(addOnToolbar, GBC.eop());
     272            left.add(standardSearch, GBC.eol());
    269273            left.add(regexSearch, GBC.eol());
    270274            left.add(mapCSSSearch, GBC.eol());
    271             left.add(addOnToolbar, GBC.eol());
    272275        }
    273276
Note: See TracChangeset for help on using the changeset viewer.