Give DCC Sends a UI.

Issue 373


git-svn-id: http://svn.dmdirc.com/trunk@4042 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/dcc/DCCFrame.java

@@ -34,6 +34,9 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.swing.components.InputTextFrame;
+import com.dmdirc.ui.swing.components.TextFrame;
+
+import java.awt.Container;
 
 import javax.swing.JPopupMenu;
 
@@ -57,9 +60,9 @@ public abstract class DCCFrame extends WritableFrameContainer {
 			 * @param owner The frame container that owns this frame
 			 */
 			public EmptyFrame(final WritableFrameContainer owner) {
-					super(owner);
-					setTextPane(null);
-					pack();
+				super(owner);
+				setTextPane(null);
+				pack();
 			}
 			
 			/**
@@ -221,6 +224,15 @@ public abstract class DCCFrame extends WritableFrameContainer {
 		return myWindow;
 	}
 	
+	/**
+	 * Returns the content pane of the internal frame associated with this object.
+	 *
+	 * @return The content pane of the internal frame associated with this object
+	 */
+	public Container getContentPane() {
+		return ((TextFrame)getFrame()).getContentPane();
+	}
+	
 	/**
 	 * Returns a string identifier for this object/its frame.
 	 *

src/com/dmdirc/addons/dcc/DCCSend.java

@@ -244,6 +244,15 @@ public class DCCSend extends DCC {
 		return -1;
 	}
 	
+	/**
+	 * Get the starting position of the file
+	 *
+	 * @return starting position of file.
+	 */
+	public int getFileStart() {
+		return this.startpos;
+	}
+	
 	/**
 	 * Change the handler for this DCC Send
 	 *
@@ -351,6 +360,7 @@ public class DCCSend extends DCC {
 			readSize = readSize + bytesRead;
 			
 			if (bytesRead > 0) {
+				if (handler != null) { handler.dataTransfered(this, bytesRead); }
 				out.write(data, 0, bytesRead);
 				out.flush();
 				

src/com/dmdirc/addons/dcc/DCCSendInterface.java

@@ -42,4 +42,12 @@ public interface DCCSendInterface {
 	 * @param dcc The DCCSend that this message is from
 	 */
 	void socketOpened(final DCCSend dcc);
+	
+	/**
+	 * Called when data is sent/recieved
+	 *
+	 * @param dcc The DCCSend that this message is from
+	 * @param bytes The number of new bytes that were transfered
+	 */
+	void dataTransfered(final DCCSend dcc, final int bytes);
 }

src/com/dmdirc/addons/dcc/DCCSendWindow.java

@@ -23,16 +23,25 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.ui.swing.components.TextFrame;
-
 import com.dmdirc.ui.swing.components.TextLabel;
 
+import javax.swing.JPanel;
+import javax.swing.JLabel;
+import javax.swing.JProgressBar;
+import javax.swing.JButton;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import net.miginfocom.swing.MigLayout;
+
 /**
  * This class links DCC Send objects to a window.
  *
  * @author Shane 'Dataforce' McCormack
  * @version $Id: DCC.java 969 2007-04-30 18:38:20Z ShaneMcC $
  */
-public class DCCSendWindow extends DCCFrame implements DCCSendInterface {
+public class DCCSendWindow extends DCCFrame implements DCCSendInterface, ActionListener {
 	/** The DCCSend object we are a window for */
 	private final DCCSend dcc;
 	
@@ -42,6 +51,15 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface {
 	/** Other Nickname */
 	private final String otherNickname;
 	
+	/** Total data transfered */
+	private long transferCount = 0;
+	
+	/** Progress Bar */
+	private final JProgressBar progress = new JProgressBar();
+	
+	/** Status Label */
+	private final JLabel status = new JLabel("Status: Waiting");
+	
 	/**
 	 * Creates a new instance of DCCSendWindow with a given DCCSend object.
 	 *
@@ -58,12 +76,62 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface {
 		nickname = nick;
 		otherNickname = targetNick;
 		
-		final TextLabel label = new TextLabel("This is a placeholder dcc send window.");
+		getContentPane().setLayout(new MigLayout());
+		
+		transferCount = dcc.getFileStart();
+		
+		progress.setMinimum(0);
+		progress.setMaximum(100);
+		progress.setStringPainted(true);
+		progress.setValue(0);
+		
+		if (dcc.getType() == DCCSend.TransferType.SEND) {
+			getContentPane().add(new JLabel("Sending: "+dcc.getFileName()), "wrap");
+			getContentPane().add(new JLabel("To: "+targetNick), "wrap");
+		} else {
+			getContentPane().add(new JLabel("Recieving: "+dcc.getFileName()), "wrap");
+			getContentPane().add(new JLabel("From: "+targetNick), "wrap");
+		}
+		getContentPane().add(status, "wrap");
+		getContentPane().add(progress, "growx, wrap");
+		
+		final JButton button = new JButton("Cancel");
+		button.addActionListener(this);
+		
+		getContentPane().add(button, "wrap, align right");
 		
-		((TextFrame)getFrame()).getContentPane().add(label);
 		plugin.addWindow(this);
 	}
 	
+	/** {@inheritDoc} */
+	public void actionPerformed(final ActionEvent e) {
+		if (e.getActionCommand().equals("Cancel")) {
+			((JButton)e.getSource()).setEnabled(false);
+			dcc.close();
+		}
+	}
+	
+	/**
+	 * Called when data is sent/recieved
+	 *
+	 * @param dcc The DCCSend that this message is from
+	 * @param bytes The number of new bytes that were transfered
+	 */
+	public void dataTransfered(final DCCSend dcc, final int bytes) {
+		transferCount += bytes;
+		final double percent = (100.00 / dcc.getFileSize()) * transferCount;
+		
+		if (dcc.getType() == DCCSend.TransferType.SEND) {
+			status.setText("Status: Sending");
+		} else {
+			status.setText("Status: Recieving");
+		}
+		
+		System.out.printf("Data Transfered. [ %d / %f ]\n", bytes, percent);
+		
+		progress.setValue((int)Math.floor(percent));
+	}
+	
 	/**
 	 * Called when the socket is closed
 	 *
@@ -71,7 +139,11 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface {
 	 */
 	@Override
 	public void socketClosed(final DCCSend dcc) {
-
+		if (transferCount == dcc.getFileSize()) {
+			status.setText("Status: Transfer Compelete.");
+		} else {
+			status.setText("Status: Transfer Failed.");
+		}
 	}
 	
 	/**
@@ -81,7 +153,7 @@ public class DCCSendWindow extends DCCFrame implements DCCSendInterface {
 	 */
 	@Override
 	public void socketOpened(final DCCSend dcc) {
-
+		status.setText("Status: Socket Opened");
 	}
 	
 	/**