Changeset 12347 in josm

Timestamp:

2017-06-08T23:22:59+02:00 (7 years ago)

Author:

michael2402

Message:

Use preferences to store modeless setting and toggle dialog widht

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (12 diffs)
• preferences/display/LafPreference.java (modified) (3 diffs)

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

@@ -54 +54 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.ViewportData;
+import org.openstreetmap.josm.data.preferences.BooleanProperty;
+import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.dialogs.ChangesetDialog;
 import org.openstreetmap.josm.gui.dialogs.CommandStackDialog;
@@ -83 +85 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
-
 /**
  * One Map frame with one dataset behind. This is the container gui class whose
@@ -91 +92 @@
  */
 public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeListener, LayerChangeListener {
-
+    /**
+     * Default width of the toggle dialog area.
+     */
+    public static final int DEF_TOGGLE_DLG_WIDTH = 330;
+
+    private final static IntegerProperty TOGGLE_DIALOGS_WIDTH = new IntegerProperty("toggleDialogs.width", DEF_TOGGLE_DLG_WIDTH);
+    /**
+     * Do not require to switch modes (potlatch style workflow) for drawing/selecting map modes.
+     * @since 12347
+     */
+    public final static BooleanProperty MODELESS = new BooleanProperty("modeless", false);
     /**
      * The current mode, this frame operates.
@@ -177 +188 @@
 
     /**
-     * Default width of the toggle dialog area.
-     */
-    public static final int DEF_TOGGLE_DLG_WIDTH = 330;
-
-    /**
      * Constructs a new {@code MapFrame}.
      * @param viewportData the initial viewport of the map. Can be null, then
@@ -221 +227 @@
 
         dialogsPanel.setLayout(new BoxLayout(dialogsPanel, BoxLayout.Y_AXIS));
-        dialogsPanel.setPreferredSize(new Dimension(Main.pref.getInteger("toggleDialogs.width", DEF_TOGGLE_DLG_WIDTH), 0));
+        dialogsPanel.setPreferredSize(new Dimension(TOGGLE_DIALOGS_WIDTH.get(), 0));
         dialogsPanel.setMinimumSize(new Dimension(24, 0));
         mapView.setMinimumSize(new Dimension(10, 0));
@@ -289 +295 @@
 
     public boolean selectSelectTool(boolean onlyIfModeless) {
-        if (onlyIfModeless && !Main.pref.getBoolean("modeless", false))
+        if (onlyIfModeless && !MODELESS.get())
             return false;
 
@@ -296 +302 @@
 
     public boolean selectDrawTool(boolean onlyIfModeless) {
-        if (onlyIfModeless && !Main.pref.getBoolean("modeless", false))
+        if (onlyIfModeless && !MODELESS.get())
             return false;
 
@@ -303 +309 @@
 
     public boolean selectZoomTool(boolean onlyIfModeless) {
-        if (onlyIfModeless && !Main.pref.getBoolean("modeless", false))
+        if (onlyIfModeless && !MODELESS.get())
             return false;
 
@@ -335 +341 @@
     }
 
+    /**
+     * Gets the action of the default (first) map mode
+     * @return That action
+     */
     public Action getDefaultButtonAction() {
         return ((AbstractButton) toolBarActions.getComponent(0)).getAction();
@@ -346 +356 @@
     }
 
+    /**
+     * Adds a new toggle dialog to the left button list. It is displayed in expert and normal mode
+     * @param dlg The dialog
+     * @return The button
+     */
     public IconToggleButton addToggleDialog(final ToggleDialog dlg) {
         return addToggleDialog(dlg, false);
@@ -663 +678 @@
     }
 
+    /**
+     * Shows or hides the side dialog panel
+     * @param visible The new visibility
+     */
     public void setDialogsPanelVisible(boolean visible) {
         rememberToggleDialogWidth();
         dialogsPanel.setVisible(visible);
-        splitPane.setDividerLocation(visible ? splitPane.getWidth()-Main.pref.getInteger("toggleDialogs.width", DEF_TOGGLE_DLG_WIDTH) : 0);
+        splitPane.setDividerLocation(visible ? splitPane.getWidth() - TOGGLE_DIALOGS_WIDTH.get() : 0);
         splitPane.setDividerSize(visible ? 5 : 0);
     }
@@ -675 +694 @@
     public void rememberToggleDialogWidth() {
         if (dialogsPanel.isVisible()) {
-            Main.pref.putInteger("toggleDialogs.width", splitPane.getWidth()-splitPane.getDividerLocation());
+            TOGGLE_DIALOGS_WIDTH.put(splitPane.getWidth() - splitPane.getDividerLocation());
         }
     }

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

@@ -27 +27 @@
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.data.preferences.StringProperty;
+import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapMover;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -135 +136 @@
 
         modeless.setToolTipText(tr("Do not require to switch modes (potlatch style workflow)"));
-        modeless.setSelected(Main.pref.getBoolean("modeless", false));
+        modeless.setSelected(MapFrame.MODELESS.get());
         ExpertToggleAction.addVisibilitySwitcher(modeless);
 
@@ -203 +204 @@
         Main.pref.put("osm-primitives.showid", showID.isSelected());
         Main.pref.put("osm-primitives.localize-name", showLocalizedName.isSelected());
-        Main.pref.put("modeless", modeless.isSelected());
+        MapFrame.MODELESS.put(modeless.isSelected());
         Main.pref.put(ToggleDialog.PROP_DYNAMIC_BUTTONS.getKey(), dynamicButtons.isSelected());
         Main.pref.put(DateUtils.PROP_ISO_DATES.getKey(), isoDates.isSelected());