Changeset 6426 in josm for trunk

Timestamp:

2013-11-29T23:01:35+01:00 (11 years ago)

Author:

simon04

Message:

see #9309 - provide direct menu items to preset/imagery preferences

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PreferencesAction.java (modified) (4 diffs)
• gui/MainMenu.java (modified) (2 diffs)
• gui/dialogs/MapPaintDialog.java (modified) (5 diffs)
• gui/mappaint/MapPaintMenu.java (modified) (3 diffs)
• gui/preferences/PreferenceDialog.java (modified) (2 diffs)

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

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -19 +23 @@
 public class PreferencesAction extends JosmAction implements Runnable {
 
+    private final Class<? extends TabPreferenceSetting> tab;
+    private final Class<? extends SubPreferenceSetting> subTab;
+
+    private PreferencesAction(String name, String tooltip,
+                              Class<? extends TabPreferenceSetting> tab, Class<? extends SubPreferenceSetting> subTab) {
+        super(name, "preference", tooltip, null, false, "preference_" + Utils.<Class>firstNonNull(tab, subTab).getName(), false);
+        this.tab = tab;
+        this.subTab = subTab;
+    }
+
+    public static PreferencesAction forPreferenceTab(String name, String tooltip, Class<? extends TabPreferenceSetting> tab) {
+        CheckParameterUtil.ensureParameterNotNull(tab);
+        return new PreferencesAction(name, tooltip, tab, null);
+    }
+
+    public static PreferencesAction forPreferenceSubTab(String name, String tooltip, Class<? extends SubPreferenceSetting> subTab) {
+        CheckParameterUtil.ensureParameterNotNull(subTab);
+        return new PreferencesAction(name, tooltip, null, subTab);
+    }
+
     /**
      * Create the preference action with "&Preferences" as label.
@@ -26 +50 @@
                 Shortcut.registerShortcut("system:preferences", tr("Preferences"), KeyEvent.VK_F12, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/Preferences"));
+        this.tab = null;
+        this.subTab = null;
     }
 
@@ -38 +64 @@
     @Override
     public void run() {
+        final PreferenceDialog p = new PreferenceDialog(Main.parent);
+        if (tab != null) {
+            p.selectPreferencesTabByClass(tab);
+        } else if( subTab != null) {
+            p.selectSubPreferencesTabByClass(subTab);
+        }
+        p.setVisible(true);
         new PreferenceDialog(Main.parent).setVisible(true);
     }

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

@@ -110 +110 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.mappaint.MapPaintMenu;
+import org.openstreetmap.josm.gui.preferences.imagery.ImageryPreference;
+import org.openstreetmap.josm.gui.preferences.map.TaggingPresetPreference;
 import org.openstreetmap.josm.gui.tagging.TaggingPresetSearchAction;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -693 +695 @@
 
         add(presetsMenu, presetSearchAction);
+        add(presetsMenu, PreferencesAction.forPreferenceSubTab(tr("Preset preferences"),
+                tr("Click to open the tagging presets tab in the preferences"), TaggingPresetPreference.class));
         presetsMenu.addSeparator();
+
+        add(imageryMenu, PreferencesAction.forPreferenceTab(tr("Imagery preferences"),
+                tr("Click to open the imagery tab in the preferences"), ImageryPreference.class));
         
         add(selectionMenu, selectAll);

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -58 +58 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.PreferencesAction;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
@@ -66 +68 @@
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
-import org.openstreetmap.josm.gui.preferences.PreferenceDialog;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
+import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
 import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -90 +92 @@
     protected MoveUpDownAction downAction;
     protected JCheckBox cbWireframe;
+
+    public static final JosmAction PREFERENCE_ACTION = PreferencesAction.forPreferenceSubTab(
+            tr("Map paint preferences"), null, MapPaintPreference.class);
 
     /**
@@ -158 +163 @@
         InputMapUtils.addSpacebarAction(tblStyles, onoffAction);
 
-        createLayout(p, true, Arrays.asList(new SideButton[] {
+        createLayout(p, true, Arrays.asList(
                 new SideButton(onoffAction, false),
                 new SideButton(upAction, false),
                 new SideButton(downAction, false),
-                new SideButton(new LaunchMapPaintPreferencesAction(), false)
-        }));
+                new SideButton(PREFERENCE_ACTION, false)
+        ));
     }
 
@@ -405 +410 @@
         public void valueChanged(ListSelectionEvent e) {
             updateEnabledState();
-        }
-    }
-
-    /**
-     * Opens preferences window and selects the mappaint tab.
-     */
-    public static class LaunchMapPaintPreferencesAction extends AbstractAction {
-        /**
-         * Constructs a new {@code LaunchMapPaintPreferencesAction}.
-         */
-        public LaunchMapPaintPreferencesAction() {
-            putValue(NAME, tr("Preferences"));
-            putValue(SMALL_ICON, ImageProvider.get("dialogs", "mappaintpreference"));
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            final PreferenceDialog p =new PreferenceDialog(Main.parent);
-            p.selectMapPaintPreferenceTab();
-            p.setVisible(true);
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java

@@ -14 +14 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
-import org.openstreetmap.josm.gui.dialogs.MapPaintDialog.LaunchMapPaintPreferencesAction;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -78 +77 @@
     }
     private final Map<String, MapPaintAction> actions = new HashMap<String, MapPaintAction>();
-    private final LaunchMapPaintPreferencesAction mapPaintPreferencesAction = new MapPaintDialog.LaunchMapPaintPreferencesAction() {
-
-        {
-            putValue("toolbar", "mappaintpreference");
-        }
-    };
 
     /**
@@ -110 +103 @@
         }
         addSeparator();
-        add(mapPaintPreferencesAction);
+        add(MapPaintDialog.PREFERENCE_ACTION);
     }
 

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

@@ -32 +32 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane.ValidationListener;
-import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -186 +185 @@
         }
     }
-
-    public void selectMapPaintPreferenceTab() {
-        tpPreferences.selectSubTabByPref(MapPaintPreference.class);
-    }
 }