Changeset 25727 in osm for applications/editors/josm

Timestamp:

2011-03-26T08:29:44+01:00 (14 years ago)

Author:

zverik

Message:

replaced some shortcuts, added ones for create relation and multipolygon (reltoolbox plugin)

Location:

applications/editors/josm/plugins/relcontext/src/relcontext

Files:

• RelContextDialog.java (modified) (1 diff)
• actions/CreateMultipolygonAction.java (modified) (3 diffs)
• actions/CreateRelationAction.java (modified) (3 diffs)
• actions/FindRelationAction.java (modified) (1 diff)

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -517 +517 @@
             super("…", null, tr("Enter role for selected members"),
                     Shortcut.registerShortcut("reltoolbox:changerole", tr("Relation Toolbox: {0}", tr("Enter role for selected members")),
-                    KeyEvent.VK_R, Shortcut.GROUP_EDIT), true);
+                    KeyEvent.VK_R, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
             chosenRelation.addChosenRelationListener(this);
             updateEnabledState();

applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateMultipolygonAction.java

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
 import java.util.*;
 import javax.swing.*;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.osm.*;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
 import relcontext.ChosenRelation;
 
@@ -27 +29 @@
 
     public CreateMultipolygonAction( ChosenRelation chRel ) {
-        super("Multi", "data/multipolygon", tr("Create a multipolygon from selected objects"), null, false);
+        super("Multi", "data/multipolygon", tr("Create a multipolygon from selected objects"),
+                Shortcut.registerShortcut("reltoolbox:multipolygon", tr("Relation Toolbox: {0}", tr("Create multipolygon")),
+                KeyEvent.VK_B, Shortcut.GROUP_HOTKEY), true);
         this.chRel = chRel;
         updateEnabledState();

applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java

@@ -8 +8 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
 import java.util.Arrays;
 import java.util.List;
@@ -22 +23 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
 import relcontext.ChosenRelation;
-import relcontext.RelContextDialog;
 
 /**
@@ -36 +37 @@
 
     public CreateRelationAction( ChosenRelation chRel ) {
-        super(tr("New"), "data/relation", tr("Create a relation from selected objects"), null, false);
+        super(tr("New"), "data/relation", tr("Create a relation from selected objects"),
+                Shortcut.registerShortcut("reltoolbox:create", tr("Relation Toolbox: {0}", tr("Create a new relation")),
+                KeyEvent.VK_C, Shortcut.GROUP_HOTKEY, Shortcut.SHIFT_DEFAULT), true);
         this.chRel = chRel;
         updateEnabledState();

applications/editors/josm/plugins/relcontext/src/relcontext/actions/FindRelationAction.java

@@ -29 +29 @@
         super("Find", "relcontext/find", tr("Find a relation"),
                 Shortcut.registerShortcut("reltoolbox:find", tr("Relation Toolbox: {0}", tr("Find a relation")),
-                KeyEvent.VK_F, Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_F, Shortcut.GROUP_HOTKEY), true);
         this.chRel = chRel;
     }