From fd50192e041cba33546a1ee5452c9641102b21e4 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 26 Aug 2019 10:38:21 -0400 Subject: [PATCH] screenshot plugin: add screenshot to clipboard Co-authored-by: Alexsuperfly --- .../plugins/screenshot/ScreenshotConfig.java | 9 ++- .../plugins/screenshot/ScreenshotPlugin.java | 14 +++- .../screenshot/TransferableBufferedImage.java | 66 +++++++++++++++++++ .../plugins/screenshot/UploadStyle.java | 33 ++++++++++ 4 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java create mode 100644 runelite-client/src/main/java/net/runelite/client/plugins/screenshot/UploadStyle.java diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java index 1a37938501..164fe7dbdd 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotConfig.java @@ -111,16 +111,15 @@ public interface ScreenshotConfig extends Config @ConfigItem( keyName = "uploadScreenshot", - name = "Upload To Imgur", - description = "Configures whether or not screenshots are uploaded to Imgur and copied into your clipboard", + name = "Upload", + description = "Configures whether or not screenshots are uploaded to Imgur, or placed on your clipboard", position = 7 ) - default boolean uploadScreenshot() + default UploadStyle uploadScreenshot() { - return false; + return UploadStyle.NEITHER; } - @ConfigItem( keyName = "kills", name = "Screenshot PvP Kills", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 9b19f8bf26..27a78a59d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -648,11 +648,23 @@ public class ScreenshotPlugin extends Plugin } ImageIO.write(screenshot, "PNG", screenshotFile); + UploadStyle uploadStyle = config.uploadScreenshot(); - if (config.uploadScreenshot()) + if (uploadStyle == UploadStyle.IMGUR) { uploadScreenshot(screenshotFile); } + else if (uploadStyle == UploadStyle.CLIPBOARD) + { + Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); + TransferableBufferedImage transferableBufferedImage = new TransferableBufferedImage(screenshot); + clipboard.setContents(transferableBufferedImage, null); + + if (config.notifyWhenTaken()) + { + notifier.notify("A screenshot was saved and inserted into your clipboard!", TrayIcon.MessageType.INFO); + } + } else if (config.notifyWhenTaken()) { notifier.notify("A screenshot was saved to " + screenshotFile, TrayIcon.MessageType.INFO); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java new file mode 100644 index 0000000000..27b4ddd154 --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/TransferableBufferedImage.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2019, Alexsuperfly + * Copyright (c) 2019, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.client.plugins.screenshot; + +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.image.BufferedImage; +import lombok.AllArgsConstructor; +import lombok.NonNull; + +@AllArgsConstructor +class TransferableBufferedImage implements Transferable +{ + @NonNull + private final BufferedImage image; + + @Override + public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException + { + if (flavor.equals(DataFlavor.imageFlavor)) + { + return image; + } + else + { + throw new UnsupportedFlavorException(flavor); + } + } + + @Override + public DataFlavor[] getTransferDataFlavors() + { + return new DataFlavor[]{DataFlavor.imageFlavor}; + } + + @Override + public boolean isDataFlavorSupported(DataFlavor flavor) + { + return flavor.equals(DataFlavor.imageFlavor); + } +} \ No newline at end of file diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/UploadStyle.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/UploadStyle.java new file mode 100644 index 0000000000..fd0594e7ba --- /dev/null +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/UploadStyle.java @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2019, Alexsuperfly + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package net.runelite.client.plugins.screenshot; + +public enum UploadStyle +{ + NEITHER, + IMGUR, + CLIPBOARD +}