diff options
author | slewis | 2008-01-06 23:48:47 +0000 |
---|---|---|
committer | slewis | 2008-01-06 23:48:47 +0000 |
commit | 545a4ed9ca9157773f7bb1f274ec894bebb6d86e (patch) | |
tree | d68ef08e8f3276c61fabe0a64844750a20c5c308 | |
parent | 8e505216feb7aac7f96a0c7b61b86d9317e710a7 (diff) | |
download | org.eclipse.ecf-545a4ed9ca9157773f7bb1f274ec894bebb6d86e.tar.gz org.eclipse.ecf-545a4ed9ca9157773f7bb1f274ec894bebb6d86e.tar.xz org.eclipse.ecf-545a4ed9ca9157773f7bb1f274ec894bebb6d86e.zip |
Label fixesv20080107-1038
4 files changed, 12 insertions, 3 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java index eb4b58038..ec4a39420 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/Messages.java @@ -21,9 +21,13 @@ public class Messages extends NLS { public static String URLShare_ENTER_URL_DEFAULT_URL; public static String URLShare_ENTER_URL_DIALOG_TEXT; public static String ScreenCaptureShare_SCREEN_CAPTURE_RECEIVE_TITLE; + public static String ScreenCaptureShareRosterContributionItem_SCREENCAPTURESHARE_LISTENER_MENU_ADD_TEXT; + public static String ScreenCaptureShareRosterContributionItem_SCREENCAPTURESHARE_LISTENER_MENU_REMOVE_TEXT; public static String ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MENU; public static String ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE; public static String ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE; + public static String ScreenCaptureShareRosterEntryContributionItem_VERIFY_CANCEL_BUTTON_TEXT; + public static String ScreenCaptureShareRosterEntryContributionItem_VERIFY_SEND_BUTTON_TEXT; public static String URLShare_EXCEPTION_LOG_BROWSER; public static String Share_EXCEPTION_LOG_MESSAGE; public static String Share_EXCEPTION_LOG_SEND; 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 9fb021d37..0bbf02ebb 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 @@ -19,9 +19,13 @@ URLShare_ENTER_URL_DEFAULT_URL=http://www.eclipse.org/ecf URLShare_EXCEPTION_LOG_BROWSER=Exception in createBrowser URLShare_RECEIVED_URL_TITLE=Received URL ScreenCaptureShare_SCREEN_CAPTURE_RECEIVE_TITLE=Screen capture from {0} +ScreenCaptureShareRosterContributionItem_SCREENCAPTURESHARE_LISTENER_MENU_ADD_TEXT=Add Screen Capture Listener +ScreenCaptureShareRosterContributionItem_SCREENCAPTURESHARE_LISTENER_MENU_REMOVE_TEXT=Remove Screen Capture Listener ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MENU=Send 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 +ScreenCaptureShareRosterEntryContributionItem_VERIFY_CANCEL_BUTTON_TEXT=Cancel +ScreenCaptureShareRosterEntryContributionItem_VERIFY_SEND_BUTTON_TEXT=\ Send to {0} 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/ScreenCaptureShareRosterContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java index 5eac2aabe..e74b64426 100644 --- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java +++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/screencapture/ScreenCaptureShareRosterContributionItem.java @@ -43,7 +43,7 @@ public class ScreenCaptureShareRosterContributionItem extends AbstractRosterCont } } }; - action.setText(Messages.ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_ADD_TEXT); + action.setText(Messages.ScreenCaptureShareRosterContributionItem_SCREENCAPTURESHARE_LISTENER_MENU_ADD_TEXT); action.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_DEF_VIEW)); return new IAction[] {action}; } @@ -55,7 +55,7 @@ public class ScreenCaptureShareRosterContributionItem extends AbstractRosterCont screenCaptureShare.dispose(); } }; - action.setText(Messages.ViewShareRosterContributionItem_VIEWSHARE_LISTENER_MENU_REMOVE_TEXT); + action.setText(Messages.ScreenCaptureShareRosterContributionItem_SCREENCAPTURESHARE_LISTENER_MENU_REMOVE_TEXT); return new IAction[] {action}; } 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 5db13a5c2..8c8a9bee2 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 @@ -22,6 +22,7 @@ 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.osgi.util.NLS; import org.eclipse.swt.graphics.ImageData; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.ISharedImages; @@ -54,7 +55,7 @@ public class ScreenCaptureShareRosterEntryContributionItem extends AbstractRoste final ScreenCaptureShare screencaptureshare = tmp; final IAction action = new Action() { public void run() { - 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); + MessageDialog dialog = new MessageDialog(null, Messages.ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_TITLE, Window.getDefaultImage(), Messages.ScreenCaptureShareRosterEntryContributionItem_SCREEN_CAPTURE_MESSAGEBOX_MESSAGE, MessageDialog.QUESTION, new String[] {NLS.bind(Messages.ScreenCaptureShareRosterEntryContributionItem_VERIFY_SEND_BUTTON_TEXT, entry.getName()), Messages.ScreenCaptureShareRosterEntryContributionItem_VERIFY_CANCEL_BUTTON_TEXT}, 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) { |