Changeset 3906 in josm


Ignore:
Timestamp:
2011-02-15T20:19:07+01:00 (10 years ago)
Author:
bastiK
Message:

add Potlatch 2 style to the default selection and make map style dialog available

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MapFrame.java

    r3855 r3906  
    186186        addToggleDialog(filterDialog = new FilterDialog());
    187187        addToggleDialog(new ChangesetDialog(this));
    188         if (Main.pref.getBoolean("mappaintdialog.show", false)) {
    189             addToggleDialog(new MapPaintDialog());
    190         }
     188        addToggleDialog(new MapPaintDialog());
    191189
    192190        // status line below the map
  • trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

    r3894 r3906  
    88import java.util.Arrays;
    99import java.util.Collection;
    10 import java.util.Collections;
    1110import java.util.List;
    1211import java.util.TreeSet;
     
    224223                    changed = true;
    225224                } else {
    226                     if (i > insertionIdx) {
     225                    if (i >= insertionIdx) {
    227226                        insertionIdx = i + 1;
    228227                    }
     
    240239        @Override
    241240        public Collection<ExtendedSourceEntry> getDefault() {
    242             ExtendedSourceEntry i = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
    243             i.name = "standard";
    244             i.title = tr("JOSM Internal Style");
    245             i.description = tr("Internal style to be used as base for runtime switchable overlay styles");
    246             return Collections.singletonList(i);
     241            ExtendedSourceEntry defJOSM = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
     242            defJOSM.active = true;
     243            defJOSM.name = "standard";
     244            defJOSM.title = tr("JOSM Internal Style");
     245            defJOSM.description = tr("Internal style to be used as base for runtime switchable overlay styles");
     246            ExtendedSourceEntry defPL2 = new ExtendedSourceEntry("potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss");
     247            defPL2.active = false;
     248            defPL2.name = "standard";
     249            defPL2.title = tr("Potlatch 2");
     250            defPL2.description = tr("the main Potlatch 2 style");
     251
     252            return Arrays.asList(new ExtendedSourceEntry[] { defJOSM, defPL2 });
    247253        }
    248254
Note: See TracChangeset for help on using the changeset viewer.