Changeset 1023 in josm for trunk/src/org/openstreetmap/josm/actions/audio

Timestamp:

2008-10-05T17:06:27+02:00 (16 years ago)

Author:

stoecker

Message:

close bug #1622. Keyboard shortcuts and specific OS handling

Location:

trunk/src/org/openstreetmap/josm/actions/audio

Files:

• AudioBackAction.java (modified) (1 diff)
• AudioFastSlowAction.java (modified) (3 diffs)
• AudioFasterAction.java (modified) (1 diff)
• AudioFwdAction.java (modified) (1 diff)
• AudioNextAction.java (modified) (1 diff)
• AudioPlayPauseAction.java (modified) (2 diffs)
• AudioPrevAction.java (modified) (1 diff)
• AudioSlowerAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.tools.AudioPlayer;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class AudioBackAction extends JosmAction {
 
         private double amount; // note, normally negative, i.e. jump backwards in time
-        
+
         public AudioBackAction() {
-                super(tr("Back"), "audio-back", tr("Jump back."), KeyEvent.VK_F6, 0, true);
+                super(tr("Back"), "audio-back", tr("Jump back."),
+                ShortCut.registerShortCut("audio:back", tr("Audio: Back"), KeyEvent.VK_F6, ShortCut.GROUP_DIRECT), true);
                 try {
                         amount = - Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0"));

trunk/src/org/openstreetmap/josm/actions/audio/AudioFastSlowAction.java

@@ -7 +7 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.tools.AudioPlayer;
+import org.openstreetmap.josm.tools.ShortCut;
 
 abstract public class AudioFastSlowAction extends JosmAction {
 
         private double multiplier;
-        
+
+        public AudioFastSlowAction(String name, String iconName, String tooltip, ShortCut shortcut, boolean fast) {
+                super(name, iconName, tooltip, shortcut, true);
+                try {
+                        multiplier = Double.parseDouble(Main.pref.get("audio.fastfwdmultiplier","1.3"));
+                } catch (NumberFormatException e) {
+                        multiplier = 1.3;
+                }
+                if (! fast)
+                        multiplier = 1.0 / multiplier;
+        }
+
+        @Deprecated
         public AudioFastSlowAction(String name, String iconName, String tooltip, int shortcut, int modifier, boolean fast) {
                 super(name, iconName, tooltip, shortcut, modifier, true);
@@ -19 +32 @@
                         multiplier = 1.3;
                 }
-                if (! fast) 
+                if (! fast)
                         multiplier = 1.0 / multiplier;
         }
@@ -25 +38 @@
         public void actionPerformed(ActionEvent e) {
                 double speed = AudioPlayer.speed();
-                if (speed * multiplier <= 0.1) 
+                if (speed * multiplier <= 0.1)
                         return;
                 try {

trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import org.openstreetmap.josm.tools.ShortCut;
 
 import java.awt.event.KeyEvent;
 
 public class AudioFasterAction extends AudioFastSlowAction {
-        
+
         public AudioFasterAction() {
-                super(tr("Faster"), "audio-faster", tr("Faster Forward"), KeyEvent.VK_F9, 0, true);
+                super(tr("Faster"), "audio-faster", tr("Faster Forward"),
+                ShortCut.registerShortCut("audio:faster", tr("Audio: Faster"), KeyEvent.VK_F9, ShortCut.GROUP_DIRECT), true);
         }
 }

trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.tools.AudioPlayer;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class AudioFwdAction extends JosmAction {
 
         private double amount;
-        
+
         public AudioFwdAction() {
-                super(tr("Forward"), "audio-fwd", tr("Jump forward"), KeyEvent.VK_F7, 0, true);
+                super(tr("Forward"), "audio-fwd", tr("Jump forward"),
+                ShortCut.registerShortCut("audio:forward", tr("Audio: Forward"), KeyEvent.VK_F7, ShortCut.GROUP_DIRECT), true);
                 try {
                         amount = Double.parseDouble(Main.pref.get("audio.forwardbackamount","10.0"));

trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java

@@ -9 +9 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class AudioNextAction extends JosmAction {
 
         public AudioNextAction() {
-                super(tr("Next Marker"), "audio-next", tr("Play next marker."), KeyEvent.VK_F8, 0, true);
+                super(tr("Next Marker"), "audio-next", tr("Play next marker."),
+                ShortCut.registerShortCut("audio:next", tr("Audio: Next"), KeyEvent.VK_F8, ShortCut.GROUP_DIRECT), true);
         }
 

trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

@@ -11 +11 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.tools.AudioPlayer;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class AudioPlayPauseAction extends JosmAction {
 
         public AudioPlayPauseAction() {
-                super(tr("Play/pause"), "audio-playpause", tr("Play/pause audio."), KeyEvent.VK_PERIOD, 0, true);
+                super(tr("Play/pause"), "audio-playpause", tr("Play/pause audio."),
+                ShortCut.registerShortCut("audio:pause", tr("Audio: Play/Pause"), KeyEvent.VK_PERIOD, ShortCut.GROUP_DIRECT), true);
         }
 
@@ -35 +37 @@
                         AudioPlayer.audioMalfunction(ex);
                 }
-        }       
+        }
 }

trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java

@@ -9 +9 @@
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class AudioPrevAction extends JosmAction {
 
         public AudioPrevAction() {
-                super(tr("Previous Marker"), "audio-prev", tr("Play previous marker."), KeyEvent.VK_F5, 0, true);
+                super(tr("Previous Marker"), "audio-prev", tr("Play previous marker."),
+                ShortCut.registerShortCut("audio:prev", tr("Audio: Previous"), KeyEvent.VK_F5, ShortCut.GROUP_DIRECT), true);
         }
 

trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java

@@ -5 +5 @@
 
 import java.awt.event.KeyEvent;
+import org.openstreetmap.josm.tools.ShortCut;
 
 public class AudioSlowerAction extends AudioFastSlowAction {
-        
+
         public AudioSlowerAction() {
-                super(tr("Slower"), "audio-slower", tr("Slower Forward"), KeyEvent.VK_F9, KeyEvent.SHIFT_MASK, false);
+                super(tr("Slower"), "audio-slower", tr("Slower Forward"),
+                ShortCut.registerShortCut("audio:slower", tr("Audio: Slower"), KeyEvent.VK_F9, ShortCut.GROUP_DIRECT), true);
         }
 }