Changeset 18300 in josm

Timestamp:

2021-11-01T18:30:38+01:00 (3 years ago)

Author:

Don-vip

Message:

see #16472 - allow to open geoimages into external viewer, useful for 360 images until we can display them in full resolution

Location:

trunk

Files:

• resources/images/external-link.svg (added)
• src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (modified) (11 diffs)

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

@@ -14 +14 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
+import java.io.IOException;
 import java.io.Serializable;
 import java.time.ZoneOffset;
@@ -58 +59 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.PlatformManager;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -80 +82 @@
     private final ImageLastAction imageLastAction = new ImageLastAction();
     private final ImageCopyPathAction imageCopyPathAction = new ImageCopyPathAction();
+    private final ImageOpenExternalAction imageOpenExternalAction = new ImageOpenExternalAction();
     private final LayerVisibilityAction visibilityAction = new LayerVisibilityAction(Collections::emptyList,
             () -> Collections.singleton(imageryFilterSettings));
@@ -115 +118 @@
     private JButton btnDelete;
     private JButton btnCopyPath;
+    private JButton btnOpenExternal;
     private JButton btnDeleteFromDisk;
     private JToggleButton tbCentre;
@@ -160 +164 @@
         btnDeleteFromDisk = createButton(imageRemoveFromDiskAction, buttonDim);
         btnCopyPath = createButton(imageCopyPathAction, buttonDim);
+        btnOpenExternal = createButton(imageOpenExternalAction, buttonDim);
 
         btnNext = createNavigationButton(imageNextAction, buttonDim);
@@ -186 +191 @@
         buttons.add(Box.createRigidArea(new Dimension(7, 0)));
         buttons.add(btnCopyPath);
+        buttons.add(btnOpenExternal);
         buttons.add(Box.createRigidArea(new Dimension(7, 0)));
         buttons.add(createButton(visibilityAction, buttonDim));
@@ -220 +226 @@
         imageCollapseAction.destroy();
         imageCopyPathAction.destroy();
+        imageOpenExternalAction.destroy();
         imageRemoveAction.destroy();
         imageRemoveFromDiskAction.destroy();
@@ -230 +237 @@
     /**
      * This literally exists to silence sonarlint complaints.
+     * @param <I> the type of the operand and result of the operator
      */
     @FunctionalInterface
@@ -494 +502 @@
     }
 
+    private class ImageOpenExternalAction extends JosmAction {
+        ImageOpenExternalAction() {
+            super(null, new ImageProvider("external-link"), tr("Open image in external viewer"), null, false, null, false);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            if (currentEntry != null) {
+                try {
+                    PlatformManager.getPlatform().openUrl(currentEntry.getFile().toURI().toURL().toExternalForm());
+                } catch (IOException ex) {
+                    Logging.error(ex);
+                }
+            }
+        }
+    }
+
     /**
      * Enables (or disables) the "Previous" button.
@@ -605 +630 @@
         btnDeleteFromDisk.setEnabled(hasMultipleImages);
         btnCopyPath.setEnabled(false);
+        btnOpenExternal.setEnabled(false);
         if (hasMultipleImages) {
             imgDisplay.setEmptyText(tr("Multiple images selected"));
@@ -633 +659 @@
         btnDeleteFromDisk.setEnabled(entry.isDeleteSupported() && entry.isRemoveSupported());
         btnCopyPath.setEnabled(true);
+        btnOpenExternal.setEnabled(true);
 
         setTitle(tr("Geotagged Images") + (!entry.getDisplayName().isEmpty() ? " - " + entry.getDisplayName() : ""));