Changeset 4658 in josm for trunk/src/org

Timestamp:

2011-12-12T14:00:07+01:00 (13 years ago)

Author:

bastiK

Message:

expert mode: fixed bug that sets draw.helper-line=false without asking the user

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java (modified) (1 diff)

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

@@ -83 +83 @@
         panel.add(showSplashScreen, GBC.eop().insets(20, 0, 0, 0));
 
-        if(Main.pref.getBoolean("expert", false)) {
-            // Show ID in selection
-            showID.setToolTipText(tr("Show object ID in selection lists"));
-            showID.setSelected(Main.pref.getBoolean("osm-primitives.showid", false));
+        // Show ID in selection
+        showID.setToolTipText(tr("Show object ID in selection lists"));
+        showID.setSelected(Main.pref.getBoolean("osm-primitives.showid", false));
+
+        // Show localized names
+        showLocalizedName.setToolTipText(tr("Show localized name in selection lists, if available"));
+        showLocalizedName.setSelected(Main.pref.getBoolean("osm-primitives.localize-name", true));
+
+        drawHelperLine.setToolTipText(tr("Draw rubber-band helper line"));
+        drawHelperLine.setSelected(Main.pref.getBoolean("draw.helper-line", true));
+
+        modeless.setToolTipText(tr("Do not require to switch modes (potlatch style workflow)"));
+        modeless.setSelected(Main.pref.getBoolean("modeless", false));
+
+        if (Main.pref.getBoolean("expert", false)) {
             panel.add(showID, GBC.eop().insets(20, 0, 0, 0));
-
-            // Show localized names
-            showLocalizedName.setToolTipText(tr("Show localized name in selection lists, if available"));
-            showLocalizedName.setSelected(Main.pref.getBoolean("osm-primitives.localize-name", true));
             panel.add(showLocalizedName, GBC.eop().insets(20, 0, 0, 0));
-
-            drawHelperLine.setToolTipText(tr("Draw rubber-band helper line"));
-            drawHelperLine.setSelected(Main.pref.getBoolean("draw.helper-line", true));
             panel.add(drawHelperLine, GBC.eop().insets(20, 0, 0, 0));
-
-            modeless.setToolTipText(tr("Do not require to switch modes (potlatch style workflow)"));
-            modeless.setSelected(Main.pref.getBoolean("modeless", false));
             panel.add(modeless, GBC.eop().insets(20, 0, 0, 0));
         }