Changeset 25717 in osm for applications/editors

Timestamp:

2011-03-25T20:02:44+01:00 (13 years ago)

Author:

zverik

Message:

keyboard shortcuts for add, find, role (reltoolbox plugin)

Location:

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

Files:

• RelContextDialog.java (modified) (4 diffs)
• actions/AddRemoveMemberAction.java (modified) (3 diffs)
• actions/FindRelationAction.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package relcontext;
 
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -67 +68 @@
 
     public RelContextDialog() {
-        super(tr("Relation Toolbox"), PREF_PREFIX,
-                tr("Open relation/multipolygon editor panel"),
-                Shortcut.registerShortcut("subwindow:reltoolbox", tr("Toggle: {0}", tr("Relation Toolbox")),
-                KeyEvent.VK_R, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 150, true);
+        super(tr("Relation Toolbox"), PREF_PREFIX, tr("Open relation/multipolygon editor panel"), null, 150, true);
 
         chosenRelation = new ChosenRelation();
@@ -103 +101 @@
         });
         roleBox.setVisible(false);
+        final Action enterRoleAction = new EnterRoleAction(); // just for the shorcut
 
         // [±][X] relation U [AZ][Down][Edit]
@@ -513 +512 @@
     }
 
+    private class EnterRoleAction extends JosmAction implements ChosenRelationListener {
+
+        public EnterRoleAction() {
+            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);
+            chosenRelation.addChosenRelationListener(this);
+            updateEnabledState();
+        }
+
+        public void actionPerformed( ActionEvent e ) {
+            if( roleBoxModel.membersRole != null ) {
+                String role = askForRoleName();
+                if( role != null )
+                    applyRoleToSelection(role);
+            }
+        }
+
+        public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) {
+            setEnabled(newRelation != null);
+        }
+    }
+
     private class RoleComboBoxModel extends AbstractListModel implements ComboBoxModel {
         private List<String> roles = new ArrayList<String>();

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

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -14 +15 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Shortcut;
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;
@@ -29 +31 @@
 
     public AddRemoveMemberAction( ChosenRelation rel ) {
-        super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"), null, false);
+        super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
+                Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
+                KeyEvent.VK_EQUALS, Shortcut.GROUP_EDIT), true);
         this.rel = rel;
         rel.addChosenRelationListener(this);

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

@@ -15 +15 @@
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.tools.Shortcut;
 import relcontext.ChosenRelation;
 
@@ -26 +27 @@
 
     public FindRelationAction( ChosenRelation chRel ) {
-        super("Find", "relcontext/find", "Find a relation", null, false);
+        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);
         this.chRel = chRel;
     }