Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmayworm2008-01-05 20:32:32 +0000
committermmayworm2008-01-05 20:32:32 +0000
commit36a7bbbdfd2aeed8b2d5b3b6cf50f2b219f55508 (patch)
treeb3691fbc7c834d07a7dc649578c056cf7b0fb973 /framework/bundles/org.eclipse.ecf.presence.collab.ui
parentea82f85479d05a40bbb2d6f8ee8b0544f15e8649 (diff)
downloadorg.eclipse.ecf-36a7bbbdfd2aeed8b2d5b3b6cf50f2b219f55508.tar.gz
org.eclipse.ecf-36a7bbbdfd2aeed8b2d5b3b6cf50f2b219f55508.tar.xz
org.eclipse.ecf-36a7bbbdfd2aeed8b2d5b3b6cf50f2b219f55508.zip
Adding titles and user name on dialogs
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.presence.collab.ui')
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties4
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java7
2 files changed, 6 insertions, 5 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties
index f24778631..9fb021d37 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties
@@ -20,8 +20,8 @@ URLShare_EXCEPTION_LOG_BROWSER=Exception in createBrowser
URLShare_RECEIVED_URL_TITLE=Received URL
ScreenCaptureShare_SCREEN_CAPTURE_RECEIVE_TITLE=Screen capture from {0}
ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MENU=Send Screen Capture
-ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE=To initiate screen capture, click OK, wait 5 seconds,\nand then select capture region with arrow cursor.
-ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE=Screen Capture
+ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE=To initiate screen capture, click on "Send", after that wait 5 seconds,\nand then select capture region with arrow cursor.
+ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE=Send Screen Capture Confirmation
URLShare_RECEIVED_URL_MESSAGE=Received URL from {0}:\n\n{1}\n\nDo you want to display in browser?
Share_EXCEPTION_LOG_SEND=Exception in send message
Share_EXCEPTION_LOG_MESSAGE=Exception in URLShare.handleMessage
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java
index 7ae5402dc..5db13a5c2 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterEntryContributionItem.java
@@ -21,6 +21,7 @@ import org.eclipse.ecf.ui.screencapture.ScreenCaptureJob;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.ISharedImages;
@@ -53,8 +54,9 @@ public class ScreenCaptureShareRosterEntryContributionItem extends AbstractRoste
final ScreenCaptureShare screencaptureshare = tmp;
final IAction action = new Action() {
public void run() {
- if (MessageDialog.openQuestion(null, Messages.ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE, Messages.ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE)) {
- ScreenCaptureJob screenCaptureJob = new ScreenCaptureJob(Display.getCurrent(), entry.getUser().getID(), new IImageSender() {
+ MessageDialog dialog = new MessageDialog(null, Messages.ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE, MessageDialog.getDefaultImage(), Messages.ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE, MessageDialog.QUESTION, new String[] {" Send to " + entry.getName() + " ", "Cancel"}, 0);
+ if (dialog.open() == Window.OK) {
+ ScreenCaptureJob screenCaptureJob = new ScreenCaptureJob(Display.getCurrent(), entry.getUser().getID(), entry.getUser().getName(), new IImageSender() {
public void sendImage(ID targetID, ImageData imageData) {
screencaptureshare.sendImage(entry.getRoster().getUser().getID(), entry.getRoster().getUser().getName(), targetID, imageData);
}
@@ -71,5 +73,4 @@ public class ScreenCaptureShareRosterEntryContributionItem extends AbstractRoste
}
return null;
}
-
}

Back to the top