Changeset 3906 in josm for trunk/src

Timestamp:

2011-02-15T20:19:07+01:00 (14 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:

• MapFrame.java (modified) (1 diff)
• preferences/MapPaintPreference.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -186 +186 @@
         addToggleDialog(filterDialog = new FilterDialog());
         addToggleDialog(new ChangesetDialog(this));
-        if (Main.pref.getBoolean("mappaintdialog.show", false)) {
-            addToggleDialog(new MapPaintDialog());
-        }
+        addToggleDialog(new MapPaintDialog());
 
         // status line below the map

trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.TreeSet;
@@ -224 +223 @@
                     changed = true;
                 } else {
-                    if (i > insertionIdx) {
+                    if (i >= insertionIdx) {
                         insertionIdx = i + 1;
                     }
@@ -240 +239 @@
         @Override
         public Collection<ExtendedSourceEntry> getDefault() {
-            ExtendedSourceEntry i = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
-            i.name = "standard";
-            i.title = tr("JOSM Internal Style");
-            i.description = tr("Internal style to be used as base for runtime switchable overlay styles");
-            return Collections.singletonList(i);
+            ExtendedSourceEntry defJOSM = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
+            defJOSM.active = true;
+            defJOSM.name = "standard";
+            defJOSM.title = tr("JOSM Internal Style");
+            defJOSM.description = tr("Internal style to be used as base for runtime switchable overlay styles");
+            ExtendedSourceEntry defPL2 = new ExtendedSourceEntry("potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss");
+            defPL2.active = false;
+            defPL2.name = "standard";
+            defPL2.title = tr("Potlatch 2");
+            defPL2.description = tr("the main Potlatch 2 style");
+
+            return Arrays.asList(new ExtendedSourceEntry[] { defJOSM, defPL2 });
         }