Changeset 7788 in josm for trunk/src/org

Timestamp:

2014-12-11T14:43:25+01:00 (10 years ago)

Author:

bastiK

Message:

applied #10812 - new copy path feature for geotagged image dialog (patch by alex.menk, slighly modified)

Location:

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

Files:

• GeoImageLayer.java (modified) (2 diffs)
• ImageViewerDialog.java (modified) (4 diffs)

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

@@ -16 +16 @@
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.Toolkit;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -757 +760 @@
     }
 
+    public void copyCurrentPhotoPath() {
+        ImageEntry toCopy = null;
+        if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) {
+            toCopy = data.get(currentPhoto);
+            String copyString = toCopy.getFile().toString();
+            Utils.copyToClipboard(copyString);
+        }
+    }
+
     /**
      * Removes a photo from the list of images by index.

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

@@ -43 +43 @@
     private static final String COMMAND_FIRST = "first";
     private static final String COMMAND_LAST = "last";
+    private static final String COMMAND_COPY_PATH = "copypath";
 
     private ImageDisplay imgDisplay = new ImageDisplay();
@@ -112 +113 @@
         btnDeleteFromDisk.getActionMap().put(ADELFROMDISK, delFromDiskAction);
 
+        ImageAction copyPathAction = new ImageAction(COMMAND_COPY_PATH, ImageProvider.get("copy"), tr("Copy image path"));
+        JButton btnCopyPath = new JButton(copyPathAction);
+        btnCopyPath.setPreferredSize(buttonDim);
+        final String ACOPYPATH = "Copy image path";
+        btnCopyPath.getActionMap().put(ACOPYPATH, copyPathAction);
+
         ImageAction nextAction = new ImageAction(COMMAND_NEXT, ImageProvider.get("dialogs", "next"), tr("Next"));
         btnNext = new JButton(nextAction);
@@ -147 +154 @@
         buttons.add(btnPrevious);
         buttons.add(btnNext);
-        buttons.add(Box.createRigidArea(new Dimension(14, 0)));
+        buttons.add(Box.createRigidArea(new Dimension(7, 0)));
         buttons.add(tbCentre);
         buttons.add(btnZoomBestFit);
-        buttons.add(Box.createRigidArea(new Dimension(14, 0)));
+        buttons.add(Box.createRigidArea(new Dimension(7, 0)));
         buttons.add(btnDelete);
         buttons.add(btnDeleteFromDisk);
+        buttons.add(Box.createRigidArea(new Dimension(7, 0)));
+        buttons.add(btnCopyPath);
 
         JPanel bottomPane = new JPanel();
@@ -222 +231 @@
                     currentLayer.removeCurrentPhotoFromDisk();
                 }
+            } else if (COMMAND_COPY_PATH.equals(action)) {
+                if (currentLayer != null) {
+                    currentLayer.copyCurrentPhotoPath();
+                }
             } else if (COMMAND_COLLAPSE.equals(action)) {
                 collapseButtonClicked = true;