# HG changeset patch
# User Ed Swartz <ed.swartz@nokia.com>
# Date 1259863482 21600
# Node ID c43ac80c8d32c757bd2182e03f449f0da88fbe65
# Parent  5d967503c15067a73823f109a8ce787e0a0f4857# Parent  0936494b27b575587389cd0855c5e0970c3e6c65
Merge commit

diff -r 5d967503c150 -r c43ac80c8d32 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Wed Dec 02 15:23:23 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/CarbideMainTab.java	Thu Dec 03 12:04:42 2009 -0600
@@ -20,10 +20,16 @@
 import org.eclipse.cdt.launch.ui.CMainTab;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 public class CarbideMainTab extends CMainTab {
 
@@ -47,12 +53,14 @@
 		mainComp.setLayoutData(gd);
 		fProgLabel = new Label(mainComp, SWT.NONE);
 		fProgLabel.setText(LaunchMessages.getString("CMainTab.C/C++_Application")); //$NON-NLS-1$
+		fProgLabel.setData(".uid", "CarbideMainTab.ProgramLabel");
 		gd = new GridData();
 		gd.horizontalSpan = 3;
 		fProgLabel.setLayoutData(gd);
 		fProgText = new Text(mainComp, SWT.SINGLE | SWT.BORDER);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		fProgText.setLayoutData(gd);
+		fProgText.setData(".uid", "CarbideMainTab.ProgramText");
 		fProgText.addModifyListener(new ModifyListener() {
 	
 			public void modifyText(ModifyEvent evt) {
@@ -62,6 +70,7 @@
 	
 		Button fBrowseForBinaryButton;
 		fBrowseForBinaryButton = createPushButton(mainComp, LaunchMessages.getString("Launch.common.Browse_2"), null); //$NON-NLS-1$
+		fBrowseForBinaryButton.setData(".uid", "CarbideMainTab.BrowseForBinaryButton");
 		fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() {
 	
 			public void widgetSelected(SelectionEvent evt) {
@@ -78,4 +87,13 @@
 		// forces page to get focus so that help works without having to select some control first.
 		getControl().setFocus();
 	}
+
+	@Override
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+		fEnableBuildButton.setData(".uid", "CMainTab.EnableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
+		fDisableBuildButton.setData(".uid", "CMainTab.DisableBuildButton"); //$NON-NLS-1$ //$NON-NLS-2$
+		fWorkspaceSettingsButton.setData(".uid", "CMainTab.WorkspaceSettingsButton"); //$NON-NLS-1$ //$NON-NLS-2$ 
+		fWorkpsaceSettingsLink.setData(".uid", "CMainTab.WorkspaceSettingsLink"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
 }
\ No newline at end of file
diff -r 5d967503c150 -r c43ac80c8d32 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java	Wed Dec 02 15:23:23 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java	Thu Dec 03 12:04:42 2009 -0600
@@ -109,11 +109,13 @@
 		gd.horizontalSpan = 2;
 		hostLabel.setLayoutData(gd);
 		hostLabel.setToolTipText(Messages.getString("EmulationMainTab.3")); //$NON-NLS-1$
+		hostLabel.setData(".uid", "EmulationMainTab.hostLabel");
 
 		hostText = new Text(projComp, SWT.SINGLE | SWT.BORDER);
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		hostText.setLayoutData(gd);
 		hostText.setToolTipText(Messages.getString("EmulationMainTab.3")); //$NON-NLS-1$
+		hostText.setData(".uid", "EmulationMainTab.hostText");
 		hostText.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent evt) {
@@ -122,8 +124,8 @@
 		});
 
 		hostBrowse = createPushButton(projComp, Messages.getString("EmulationMainTab.4"), null); //$NON-NLS-1$
+		hostBrowse.setData(".uid", "EmulationMainTab.hostBrowse");
 		hostBrowse.addSelectionListener(new SelectionAdapter() {
-
 			public void widgetSelected(SelectionEvent evt) {
 				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);