Fixed screenshot region lines, single file upload naming.

EsotericSoftware · May 31, 2016 · 53e8d1b · 53e8d1b
1 parent 5186d2d
commit 53e8d1b
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 23 deletions.
diff --git a/src/com/esotericsoftware/clippy/Screenshot.java b/src/com/esotericsoftware/clippy/Screenshot.java
@@ -217,10 +217,6 @@ public void keyReleased (KeyEvent e) {
 					public void windowDeactivated (WindowEvent e) {
 						dispose();
 					};
-
-					public void windowClosed (WindowEvent e) {
-						// robot.mouseMove(x, y);
-					}
 				});
 			}
 
@@ -282,23 +278,25 @@ else if (y + magY + magD > height) //
 				g.drawRect(cx + cw + mag * 3, cy, cw + 1, mag + 1);
 
 				// Dotted guide lines.
-				// g.setColor(Color.black);
-				// g.drawLine(x - crosshair - 1, y, 0, y);
-				// g.drawLine(x + crosshair + 1, y, width, y);
-				// g.drawLine(x, y - crosshair - 1, x, 0);
-				// g.drawLine(x, y + crosshair + 1, x, height);
-				// g.setColor(Color.white);
-				// Stroke solid = g.getStroke();
-				// g.setStroke(dashed);
-				// g.drawLine(x - crosshair, y, 0, y);
-				// g.drawLine(x + crosshair, y, width, y);
-				// g.drawLine(x, y - crosshair, x, 0);
-				// g.drawLine(x, y + crosshair, x, height);
-				// g.setXORMode(Color.white);
-				// g.setColor(Color.black);
-				// g.fillRect(x - 1, y - crosshair, 3, crosshair * 2 + 1);
-				// g.fillRect(x - crosshair, y - 1, crosshair - 1, 3);
-				// g.fillRect(x + 2, y - 1, crosshair - 1, 3);
+				if (!drag) {
+					g.setColor(Color.black);
+					g.drawLine(x - crosshair - 1, y, 0, y);
+					g.drawLine(x + crosshair + 1, y, width, y);
+					g.drawLine(x, y - crosshair - 1, x, 0);
+					g.drawLine(x, y + crosshair + 1, x, height);
+					g.setColor(Color.white);
+					Stroke solid = g.getStroke();
+					g.setStroke(dashed);
+					g.drawLine(x - crosshair, y, 0, y);
+					g.drawLine(x + crosshair, y, width, y);
+					g.drawLine(x, y - crosshair, x, 0);
+					g.drawLine(x, y + crosshair, x, height);
+					g.setXORMode(Color.white);
+					g.setColor(Color.black);
+					g.fillRect(x - 1, y - crosshair, 3, crosshair * 2 + 1);
+					g.fillRect(x - crosshair, y - 1, crosshair - 1, 3);
+					g.fillRect(x + 2, y - 1, crosshair - 1, 3);
+				}
 			}
 		};
 		frame.setType(Frame.Type.UTILITY);

diff --git a/src/com/esotericsoftware/clippy/Upload.java b/src/com/esotericsoftware/clippy/Upload.java
@@ -28,6 +28,7 @@
 import com.esotericsoftware.clippy.util.Util;
 import com.esotericsoftware.minlog.Log;
 import com.esotericsoftware.scar.Scar;
+import com.esotericsoftware.scar.Scar.ProgressMonitor;
 import com.esotericsoftware.wildcard.Paths;
 
 import retrofit.Callback;
@@ -271,15 +272,25 @@ public void complete (String url) {
 		});
 	}
 
-	static public void uploadFile (File file, boolean deleteAfterUpload) {
+	static public void uploadFile (final File file, final boolean deleteAfterUpload) {
 		if (clippy.fileUpload == null) return;
-		clippy.fileUpload.upload(file, deleteAfterUpload, new UploadListener() {
+
+		String path;
+		try {
+			path = copyFile(file.getAbsolutePath(), Util.nextUploadFile(file.getName()).getAbsolutePath());
+		} catch (IOException ex) {
+			if (ERROR) error("Error copying file: " + file.getAbsolutePath(), ex);
+			return;
+		}
+
+		clippy.fileUpload.upload(new File(path), true, new UploadListener() {
 			public void complete (String url) {
 				if (clippy.config.pasteAfterUpload)
 					clippy.paste(url);
 				else
 					clippy.clipboard.setContents(url);
 				clippy.store(url);
+				if (deleteAfterUpload) file.delete();
 			}
 		});
 	}