Adding titles and user name on dialogs

2 files changed, 32 insertions, 6 deletions

diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java
index 4940ce6e9..49efcb06c 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureConfirmationDialog.java
@@ -12,8 +12,10 @@
 package org.eclipse.ecf.ui.screencapture;
 
 import org.eclipse.ecf.core.identity.ID;
+import org.eclipse.ecf.internal.ui.Messages;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
@@ -31,16 +33,19 @@ public class ScreenCaptureConfirmationDialog extends Dialog {
 
 	private final int height;
 
+	private final IImageSender imageSender;
+
 	private final ID targetID;
 
-	private final IImageSender imageSender;
+	private final String nickName;
 
-	public ScreenCaptureConfirmationDialog(Shell shell, ID targetID, Image image, int width, int height, IImageSender imageSender) {
+	public ScreenCaptureConfirmationDialog(Shell shell, ID targetID, String nickName, Image image, int width, int height, IImageSender imageSender) {
 		super(shell);
+		this.targetID = targetID;
+		this.nickName = nickName;
 		this.image = image;
 		this.width = width;
 		this.height = height;
-		this.targetID = targetID;
 		this.imageSender = imageSender;
 	}
 
@@ -51,6 +56,11 @@ public class ScreenCaptureConfirmationDialog extends Dialog {
 		super.buttonPressed(buttonId);
 	}
 
+	protected void configureShell(Shell shell) {
+		super.configureShell(shell);
+		shell.setText(NLS.bind(Messages.ScreenCaptureScreenCaptureConfirmationDialog, nickName));
+	}
+
 	protected Control createDialogArea(Composite parent) {
 		parent = (Composite) super.createDialogArea(parent);
 		final Composite composite = new Composite(parent, SWT.NONE);
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java
index c2d0842aa..b51da970e 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/screencapture/ScreenCaptureJob.java
@@ -34,15 +34,18 @@ public class ScreenCaptureJob extends UIJob {
 
 	int downY = -1;
 
+	final IImageSender imageSender;
+
 	final ID targetID;
 
-	final IImageSender imageSender;
+	final String nickName;
 
-	public ScreenCaptureJob(Display display, ID targetID, IImageSender imageSender) {
+	public ScreenCaptureJob(Display display, ID targetID, String nickName, IImageSender imageSender) {
 		super(display, "Capturing screen..."); //$NON-NLS-1$
 		blackColor = new Color(display, 0, 0, 0);
 		whiteColor = new Color(display, 255, 255, 255);
 		this.targetID = targetID;
+		this.nickName = nickName;
 		this.imageSender = imageSender;
 	}
 
@@ -63,6 +66,18 @@ public class ScreenCaptureJob extends UIJob {
 			}
 		});
 
+		shell.addKeyListener(new KeyListener() {
+			public void keyPressed(KeyEvent e) {
+				if (e.character == SWT.ESC)
+					shell.close();
+
+			}
+
+			public void keyReleased(KeyEvent e) {
+				if (e.character == SWT.ESC)
+					shell.close();
+			}
+		});
 		shell.addMouseListener(new MouseAdapter() {
 			public void mouseDown(MouseEvent e) {
 				isDragging = true;
@@ -79,7 +94,7 @@ public class ScreenCaptureJob extends UIJob {
 					gc.copyArea(copy, Math.min(downX, e.x), Math.min(downY, e.y));
 					blackColor.dispose();
 					whiteColor.dispose();
-					final Dialog dialog = new ScreenCaptureConfirmationDialog(shell, targetID, copy, width, height, imageSender);
+					final Dialog dialog = new ScreenCaptureConfirmationDialog(shell, targetID, nickName, copy, width, height, imageSender);
 					dialog.open();
 					shell.close();
 					image.dispose();
@@ -107,4 +122,5 @@ public class ScreenCaptureJob extends UIJob {
 		}
 		return Status.OK_STATUS;
 	}
+
 }
\ No newline at end of file