[client] UploadPanel: Add checkbox to toggle server side copying

1 files changed, 13 insertions, 4 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java
index 2b26b397..131a5a07 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/BlockProgressBar.java
@@ -18,7 +18,7 @@ public class BlockProgressBar extends JPanel {
 
 	private final Color[] blockColors = new Color[6];
 	
-	private static final Color potentialCompleteColor = new Color(200, 220, 255, 255);
+	private static final Color potentialCompleteColor = new Color(215, 230, 255, 255);
 
 	private final TransferStatusWrapper blocks = new TransferStatusWrapper(null);
 	
@@ -26,6 +26,8 @@ public class BlockProgressBar extends JPanel {
 
 	private boolean simpleMode = true;
 
+	private boolean showEstimatedComplete = false;
+
 	public BlockProgressBar(byte[] blocks) {
 		super();
 		setPreferredSize(Gui.getScaledDimension(100, 32));
@@ -85,11 +87,14 @@ public class BlockProgressBar extends JPanel {
 		blocks.getCompleteEx(progress);
 		final int doneWidth = (int) ((float) width * progress.done);
 		final int potentialWidth = (int) ((float) width * progress.potentiallyDone);
-		final int sumWidth = doneWidth + potentialWidth;
+		int sumWidth = doneWidth;
 		g.setColor(Color.BLUE);
 		g.fillRect(0, 0, doneWidth, height);
-		g.setColor(potentialCompleteColor);
-		g.fillRect(doneWidth, 0, potentialWidth, height);
+		if (showEstimatedComplete) {
+			g.setColor(potentialCompleteColor);
+			g.fillRect(doneWidth, 0, potentialWidth, height);
+			sumWidth += potentialWidth;
+		}
 		g.setColor(Color.WHITE);
 		g.fillRect(sumWidth, 0, width - sumWidth, height);
 		final String percentDisplay = (int) (progress.done * 100) + "%";
@@ -149,4 +154,8 @@ public class BlockProgressBar extends JPanel {
 		}
 	}
 
+	public void showOptimisticComplete(boolean b) {
+		this.showEstimatedComplete  = b;
+	}
+
 }