Changeset 4733 in josm

Timestamp:

Dec 28, 2011 6:59:27 PM (17 months ago)

Author:

bastiK

Message:

fixed #7174 - identifier for toolbar actions is icon name

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (4 diffs)
• actions/SessionLoadAction.java (modified) (1 diff)
• actions/SessionSaveAsAction.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (2 diffs)

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

@@ -53 +53 @@
      * The new super for all actions.
      *
-     * Use this super constructor to setup your action. It takes 5 parameters:
+     * Use this super constructor to setup your action.
      *
      * @param name the action's text as displayed on the menu (if it is added to a menu)
@@ -64 +64 @@
      *            the user CANNOT configure a shortcut for your action.
      * @param register register this action for the toolbar preferences?
-     */
-    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
-        this(name, iconName, tooltip, shortcut, register, true);
-    }
-
-    /**
-     * Even newer super for all actions. Use if you don't want to install layer changed and selection changed adapters
-     * @param name
-     * @param iconName
-     * @param tooltip
-     * @param shortcut
-     * @param register
-     * @param installAdapters
-     */
-    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, boolean installAdapters) {
+     * @param toolbarId identifier for the toolbar preferences. The iconName is used, if this parameter is null
+     * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
+     */
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, String toolbarId, boolean installAdapters) {
         super(name, iconName == null ? null : ImageProvider.get(iconName));
         setHelpId();
@@ -87 +76 @@
         putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
         if (getValue("toolbar") == null) {
-            putValue("toolbar", iconName);
+            putValue("toolbar", toolbarId == null ? iconName : toolbarId);
         }
         if (register) {
@@ -95 +84 @@
             installAdapters();
         }
+    }
+
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, boolean installAdapters) {
+        this(name, iconName, tooltip, shortcut, register, null, installAdapters);
+    }
+
+    public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
+        this(name, iconName, tooltip, shortcut, register, null, true);
     }
 

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

@@ -26 +26 @@
 public class SessionLoadAction extends JosmAction {
     public SessionLoadAction() {
-        super(tr("Load Session"), "open", tr("Load a session from file."), null, false);
+        super(tr("Load Session"), "open", tr("Load a session from file."), null, true, "load-session", true);
         putValue("help", ht("/Action/SessionLoad"));
     }

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

@@ -42 +42 @@
 import org.openstreetmap.josm.tools.WindowGeometry;
 
-public class SessionSaveAsAction extends DiskAccessAction {
+public class SessionSaveAsAction extends JosmAction {
 
     private List<Layer> layers;
@@ -55 +55 @@
      */
     public SessionSaveAsAction() {
-        super(tr("Save Session As..."), "save_as", tr("Save the current session to a new file."), null);
+        super(tr("Save Session As..."), "save_as", tr("Save the current session to a new file."), null, true, "save_as-session", true);
         putValue("help", ht("/Action/SessionSaveAs"));
     }

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

@@ -120 +120 @@
     public final JosmAction save = new SaveAction();
     public final JosmAction saveAs = new SaveAsAction();
-    public final JosmAction sessionLoad = new SessionLoadAction();
-    public final JosmAction sessionSaveAs = new SessionSaveAsAction();
+    public JosmAction sessionLoad;
+    public JosmAction sessionSaveAs;
     public final JosmAction gpxExport = new GpxExportAction();
     public final DownloadAction download = new DownloadAction();
@@ -367 +367 @@
             sessionMenu.setToolTipText(tr("Save and load the current session (list of layers, etc.)"));
             sessionMenu.setIcon(ImageProvider.get("session"));
+            sessionSaveAs = new SessionSaveAsAction();
+            sessionLoad = new SessionLoadAction();
             add(sessionMenu, sessionSaveAs);
             add(sessionMenu, sessionLoad);