X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fde%2Ftodesbaum%2Fjsite%2Fgui%2FProjectInsertPage.java;h=2cedd5b567167bf25d11fb2e5ae223a75c144028;hb=56b5bbc99fc0179022aba3c7a847b71122963801;hp=843499a3d44ab487f42b79169367346cb7b11622;hpb=5a876370ec1864ae54db22301aaa5cd2b0e44bf5;p=jSite.git

diff --git a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
index 843499a..2cedd5b 100644
--- a/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
+++ b/src/de/todesbaum/jsite/gui/ProjectInsertPage.java
@@ -83,6 +83,9 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	/** The number of inserted blocks. */
 	private volatile int insertedBlocks;
 
+	/** Whether the “copy URI to clipboard” button was used. */
+	private boolean uriCopied;
+
 	/**
 	 * Creates a new progress insert wizard page.
 	 *
@@ -250,6 +253,16 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 		projectInserter.setTempDirectory(tempDirectory);
 	}
 
+	/**
+	 * Returns whether the “copy URI to clipboard” button was used.
+	 *
+	 * @return {@code true} if an URI was copied to clipboard, {@code false}
+	 *         otherwise
+	 */
+	public boolean wasUriCopied() {
+		return uriCopied;
+	}
+
 	//
 	// INTERFACE InsertListener
 	//
@@ -321,8 +334,8 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	public void projectInsertFinished(Project project, boolean success, Throwable cause) {
 		if (success) {
 			String copyURILabel = I18n.getMessage("jsite.insert.okay-copy-uri");
-			String selectedValue = (String) JOptionPane.showInputDialog(this, I18n.getMessage("jsite.insert.inserted"), I18n.getMessage("jsite.insert.done.title"), JOptionPane.INFORMATION_MESSAGE, null, new Object[] { I18n.getMessage("jsite.insert.okay"), copyURILabel }, copyURILabel);
-			if (copyURILabel.equals(selectedValue)) {
+			int selectedValue = JOptionPane.showOptionDialog(this, I18n.getMessage("jsite.insert.inserted"), I18n.getMessage("jsite.insert.done.title"), 0, JOptionPane.INFORMATION_MESSAGE, null, new Object[] { I18n.getMessage("jsite.insert.okay"), copyURILabel }, copyURILabel);
+			if (selectedValue == 1) {
 				actionCopyURI();
 			}
 		} else {
@@ -337,7 +350,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 			@SuppressWarnings("synthetic-access")
 			public void run() {
 				progressBar.setValue(progressBar.getMaximum());
-				progressBar.setString(I18n.getMessage("jsite.insert.done"));
+				progressBar.setString(I18n.getMessage("jsite.insert.done") + " (" + getTransferRate() + " " + I18n.getMessage("jsite.insert.k-per-s") + ")");
 				wizard.setNextEnabled(true);
 				wizard.setQuitEnabled(true);
 			}
@@ -352,6 +365,7 @@ public class ProjectInsertPage extends TWizardPage implements InsertListener, Cl
 	 * Copies the request URI of the project to the clipboard.
 	 */
 	private void actionCopyURI() {
+		uriCopied = true;
 		Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
 		clipboard.setContents(new StringSelection(requestURITextField.getText()), this);
 	}