Changeset 6456 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-07T23:32:40+01:00 (11 years ago)

Author:

simon04

Message:

fix #5256 - geoimage: select first/last image with Home/End key

Location:

trunk/src/org/openstreetmap/josm/gui/layer/geoimage

Files:

• GeoImageLayer.java (modified) (1 diff)
• ImageViewerDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -677 +677 @@
     }
 
+    public void showFirstPhoto() {
+        if (data != null && data.size() > 0) {
+            currentPhoto = 0;
+            ImageViewerDialog.showImage(this, data.get(currentPhoto));
+        } else {
+            currentPhoto = -1;
+        }
+        Main.map.repaint();
+    }
+
+    public void showLastPhoto() {
+        if (data != null && data.size() > 0) {
+            currentPhoto = data.size() - 1;
+            ImageViewerDialog.showImage(this, data.get(currentPhoto));
+        } else {
+            currentPhoto = -1;
+        }
+        Main.map.repaint();
+    }
+
     public void checkPreviousNextButtons() {
         ImageViewerDialog.setNextEnabled(currentPhoto < data.size() - 1);

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -37 +37 @@
     private static final String COMMAND_PREVIOUS = "previous";
     private static final String COMMAND_COLLAPSE = "collapse";
+    private static final String COMMAND_FIRST = "first";
+    private static final String COMMAND_LAST = "last";
 
     private ImageDisplay imgDisplay = new ImageDisplay();
@@ -116 +118 @@
         btnNext.getActionMap().put(ANEXT, nextAction);
 
+        Main.registerActionShortcut(
+                new ImageAction(COMMAND_FIRST, null, null),
+                Shortcut.registerShortcut(
+                        "geoimage:first", tr("Geoimage: {0}", tr("Show first Image")), KeyEvent.VK_HOME, Shortcut.DIRECT)
+        );
+        Main.registerActionShortcut(
+                new ImageAction(COMMAND_LAST, null, null),
+                Shortcut.registerShortcut(
+                        "geoimage:last", tr("Geoimage: {0}", tr("Show last Image")), KeyEvent.VK_END, Shortcut.DIRECT)
+        );
+
         JToggleButton tbCentre = new JToggleButton(new ImageAction(COMMAND_CENTERVIEW, ImageProvider.get("dialogs", "centreview"), tr("Center view")));
         tbCentre.setPreferredSize(buttonDim);
@@ -174 +187 @@
                     currentLayer.showPreviousPhoto();
                 }
+            } else if (COMMAND_FIRST.equals(action) && currentLayer != null) {
+                currentLayer.showFirstPhoto();
+            } else if (COMMAND_LAST.equals(action) && currentLayer != null) {
+                currentLayer.showLastPhoto();
 
             } else if (COMMAND_CENTERVIEW.equals(action)) {