Changeset 17021 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-09-12T20:48:56+02:00 (4 years ago)

Author:

stoecker

Message:

fix #19786, Add missing icons to View menu

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DrawBoundariesOfDownloadedDataAction.java (modified) (2 diffs)
• actions/PreferenceToggleAction.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/DrawBoundariesOfDownloadedDataAction.java

@@ -8 +8 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.preferences.display.DrawingPreference;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -21 +22 @@
     public DrawBoundariesOfDownloadedDataAction() {
         super(tr("Draw boundaries of downloaded data"),
+                new ImageProvider("hatched.svg"),
                 tr("Enable/disable hatched background rendering of areas outside of the downloaded areas."),
                 DrawingPreference.SOURCE_BOUNDS_PROP

trunk/src/org/openstreetmap/josm/actions/PreferenceToggleAction.java

@@ -10 +10 @@
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -29 +30 @@
      */
     public PreferenceToggleAction(String name, String tooltip, BooleanProperty pref) {
-        super(name, null, tooltip, null, false);
+        this(name, null, tooltip, pref);
+    }
+
+    /**
+     * Create a new PreferenceToggleAction.
+     * @param name the (translated) title
+     * @param icon icon to display e.g. in menu
+     * @param tooltip tooltip text
+     * @param pref the preference to toggle
+     * @since 17021
+     */
+    public PreferenceToggleAction(String name, ImageProvider icon, String tooltip, BooleanProperty pref) {
+        super(name, icon, tooltip, null, false, null, true);
         setToolbarId("toggle-" + pref.getKey());
         this.pref = pref;

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

@@ -133 +133 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetSearchPrimitiveDialog;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -828 +829 @@
         viewMenu.addSeparator();
         viewMenu.add(new PreferenceToggleAction(tr("Main toolbar"),
+                new ImageProvider("dialogs/main_toolbar.svg"),
                 tr("Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"),
                 MapFrame.TOOLBAR_VISIBLE).getCheckbox());
         viewMenu.add(new PreferenceToggleAction(tr("Edit toolbar"),
+                new ImageProvider("dialogs/edit_toolbar.svg"),
                 tr("Toggles the visibility of the edit toolbar (i.e., the vertical tool)"),
                 MapFrame.SIDE_TOOLBAR_VISIBLE).getCheckbox());