Mercurial Mercurial > oss > FCL > sftools > dev > ide > carbidecpp / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge commit
authorEd Swartz <ed.swartz@nokia.com>
Fri, 04 Dec 2009 16:32:30 -0600
changeset 640 5ff506b20613
parent 639 d20fd8892aa1 (current diff)
parent 625 a3707b05d8d2 (diff)
child 642 20fd716f8eaa
child 644 404bbc8b47b4
Merge commit
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/DebuggerTab.java	Fri Dec 04 16:27:12 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/DebuggerTab.java	Fri Dec 04 16:32:30 2009 -0600
@@ -76,6 +76,7 @@
 		breakAtMain.setLayoutData(data);
 		breakAtMain.setFont(parent.getFont());
 		breakAtMain.setToolTipText(Messages.getString("DebuggerTab.7")); //$NON-NLS-1$
+		breakAtMain.setData(".uid", "DebuggerTab.breakAtMain");  //$NON-NLS-1$ //$NON-NLS-2$
 		breakAtMain.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
@@ -88,6 +89,7 @@
 		data.horizontalSpan = 1;
 		mainBreakSymbol.setLayoutData(data);
 		mainBreakSymbol.setToolTipText(Messages.getString("DebuggerTab.7")); //$NON-NLS-1$
+		mainBreakSymbol.setData(".uid", "DebuggerTab.mainBreakSymbol");  //$NON-NLS-1$ //$NON-NLS-2$
 		mainBreakSymbol.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
@@ -100,6 +102,7 @@
 		viewOutput.setLayoutData(data);
 		viewOutput.setFont(parent.getFont());
 		viewOutput.setToolTipText(Messages.getString("DebuggerTab.10")); //$NON-NLS-1$
+		viewOutput.setData(".uid", "DebuggerTab.viewOutput");  //$NON-NLS-1$ //$NON-NLS-2$
 		viewOutput.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
@@ -112,6 +115,7 @@
 		viewDebugTrace.setLayoutData(data);
 		viewDebugTrace.setFont(parent.getFont());
 		viewDebugTrace.setToolTipText(Messages.getString("DebuggerTab.17")); //$NON-NLS-1$
+		viewDebugTrace.setData(".uid", "DebuggerTab.viewDebugTrace");  //$NON-NLS-1$ //$NON-NLS-2$
 		viewDebugTrace.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
@@ -124,6 +128,7 @@
 		viewMessages.setLayoutData(data);
 		viewMessages.setFont(parent.getFont());
 		viewMessages.setToolTipText(Messages.getString("DebuggerTab.12")); //$NON-NLS-1$
+		viewMessages.setData(".uid", "DebuggerTab.viewMessages");  //$NON-NLS-1$ //$NON-NLS-2$
 		viewMessages.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java	Fri Dec 04 16:27:12 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/EmulationMainTab.java	Fri Dec 04 16:32:30 2009 -0600
@@ -109,13 +109,13 @@
 		gd.horizontalSpan = 2;
 		hostLabel.setLayoutData(gd);
 		hostLabel.setToolTipText(Messages.getString("EmulationMainTab.3")); //$NON-NLS-1$
-		hostLabel.setData(".uid", "EmulationMainTab.hostLabel");
+		hostLabel.setData(".uid", "EmulationMainTab.hostLabel");  //$NON-NLS-1$ //$NON-NLS-2$
 
 		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.setData(".uid", "EmulationMainTab.hostText");  //$NON-NLS-1$ //$NON-NLS-2$
 		hostText.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent evt) {
@@ -124,7 +124,7 @@
 		});
 
 		hostBrowse = createPushButton(projComp, Messages.getString("EmulationMainTab.4"), null); //$NON-NLS-1$
-		hostBrowse.setData(".uid", "EmulationMainTab.hostBrowse");
+		hostBrowse.setData(".uid", "EmulationMainTab.hostBrowse");  //$NON-NLS-1$ //$NON-NLS-2$
 		hostBrowse.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent evt) {
 				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Fri Dec 04 16:27:12 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/ExecutablesTab.java	Fri Dec 04 16:32:30 2009 -0600
@@ -95,6 +95,7 @@
 				targetingRulesCombo.add(Messages.getString("ExecutablesTab.4")); //$NON-NLS-1$
 			}
 			targetingRulesCombo.setText(Messages.getString("ExecutablesTab.5")); //$NON-NLS-1$
+			targetingRulesCombo.setData(".uid", "ExecutablesTab.targetingRulesCombo");  //$NON-NLS-1$ //$NON-NLS-2$
 			final GridData gd_targetingRulesCombo = new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1);
 			targetingRulesCombo.setLayoutData(gd_targetingRulesCombo);
 			targetingRulesCombo.addListener(SWT.Selection, new Listener() {
@@ -156,6 +157,7 @@
 
 		addButton = new Button(buttonComp, SWT.PUSH);
 		addButton.setText(Messages.getString("ExecutablesTab.6")); //$NON-NLS-1$
+		addButton.setData(".uid", "ExecutablesTab.addButton");  //$NON-NLS-1$ //$NON-NLS-2$
 		addButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
@@ -177,6 +179,7 @@
 
 		selectAllButton = new Button(buttonComp, SWT.PUSH);
 		selectAllButton.setText(Messages.getString("ExecutablesTab.9")); //$NON-NLS-1$
+		selectAllButton.setData(".uid", "ExecutablesTab.selectAllButton");  //$NON-NLS-1$ //$NON-NLS-2$
 		selectAllButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				executablesBlock.setAllChecked(true);
@@ -185,6 +188,7 @@
 
 		unselectAllButton = new Button(buttonComp, SWT.PUSH);
 		unselectAllButton.setText(Messages.getString("ExecutablesTab.10")); //$NON-NLS-1$
+		unselectAllButton.setData(".uid", "ExecutablesTab.unselectAllButton");  //$NON-NLS-1$ //$NON-NLS-2$
 		unselectAllButton.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				executablesBlock.setAllChecked(false);
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/InstallationTab.java	Fri Dec 04 16:27:12 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/InstallationTab.java	Fri Dec 04 16:32:30 2009 -0600
@@ -119,11 +119,13 @@
 		data.horizontalSpan = 2;
 		hostLabel.setLayoutData(data);
 		hostLabel.setToolTipText(Messages.getString("InstallationTab.2")); //$NON-NLS-1$
+		hostLabel.setData(".uid", "InstallationTab.hostLabel");  //$NON-NLS-1$ //$NON-NLS-2$
 
 		hostPath = new Text(projComp, SWT.BORDER);
 		data = new GridData(GridData.FILL_HORIZONTAL);
 		hostPath.setLayoutData(data);
 		hostPath.setToolTipText(Messages.getString("InstallationTab.2")); //$NON-NLS-1$
+		hostPath.setData(".uid", "InstallationTab.hostPath");  //$NON-NLS-1$ //$NON-NLS-2$
 		hostPath.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updatePULabel();
@@ -132,6 +134,7 @@
 		});
 
 		hostBrowse = createPushButton(projComp, Messages.getString("InstallationTab.3"), null); //$NON-NLS-1$
+		hostBrowse.setData(".uid", "InstallationTab.hostBrowse");  //$NON-NLS-1$ //$NON-NLS-2$
 		hostBrowse.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent evt) {
@@ -156,11 +159,13 @@
 		data.horizontalSpan = 2;
 		targetLabel.setLayoutData(data);
 		targetLabel.setToolTipText(Messages.getString("InstallationTab.6")); //$NON-NLS-1$
+		targetLabel.setData(".uid", "InstallationTab.targetLabel");  //$NON-NLS-1$ //$NON-NLS-2$
 
 		targetPath = new Text(projComp, SWT.BORDER);
 		data = new GridData(GridData.FILL_HORIZONTAL);
 		targetPath.setLayoutData(data);
 		targetPath.setToolTipText(Messages.getString("InstallationTab.6")); //$NON-NLS-1$
+		targetPath.setData(".uid", "InstallationTab.targetPath");  //$NON-NLS-1$ //$NON-NLS-2$
 		targetPath.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
@@ -174,6 +179,7 @@
 		data.horizontalSpan = 2;
 		forceInstall.setLayoutData(data);
 		forceInstall.setToolTipText(Messages.getString("InstallationTab.8")); //$NON-NLS-1$
+		forceInstall.setData(".uid", "InstallationTab.forceInstall");  //$NON-NLS-1$ //$NON-NLS-2$
 		forceInstall.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
@@ -211,7 +217,7 @@
 		data.horizontalSpan = 1;
 		driveLabel.setLayoutData(data);
 		driveLabel.setToolTipText(Messages.getString("InstallationTab.12")); //$NON-NLS-1$
-
+		driveLabel.setData(".uid", "InstallationTab.driveLabel");  //$NON-NLS-1$ //$NON-NLS-2$
 		drive = new Combo(installerUIGroup.getGroup(), SWT.READ_ONLY);
 		for (int i=0; i<driveLetterArray.length; i++) {
 			drive.add(driveLetterArray[i]);
@@ -220,6 +226,7 @@
 		data.horizontalSpan = 1;
 		drive.setLayoutData(data);
 		drive.setToolTipText(Messages.getString("InstallationTab.12")); //$NON-NLS-1$
+		
 		drive.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomLogFileTab.java	Fri Dec 04 16:27:12 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RomLogFileTab.java	Fri Dec 04 16:32:30 2009 -0600
@@ -100,6 +100,7 @@
 		parseRomLogGroup.setText(Messages.getString("RomLogFileTab.1")); //$NON-NLS-1$
 		parseRomLogGroup.setFont(parent.getFont());
 		parseRomLogGroup.setToolTipText(Messages.getString("RomLogFileTab.2")); //$NON-NLS-1$
+		parseRomLogGroup.setData(".uid", "RomLogFileTab.parseRomLogGroup");  //$NON-NLS-1$ //$NON-NLS-2$
 		parseRomLogGroup.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
@@ -111,12 +112,15 @@
 		data.horizontalSpan = 2;
 		romLogFileLabel.setLayoutData(data);
 		romLogFileLabel.setToolTipText(Messages.getString("RomLogFileTab.4")); //$NON-NLS-1$
+		romLogFileLabel.setData(".uid", "RomLogFileTab.romLogFileLabel");  //$NON-NLS-1$ //$NON-NLS-2$
+
 
 		romLogFilePath = new Text(parseRomLogGroup.getGroup(), SWT.BORDER);
 		data = new GridData(GridData.FILL_HORIZONTAL);
 		data.horizontalSpan = 1;
 		romLogFilePath.setLayoutData(data);
 		romLogFilePath.setToolTipText(Messages.getString("RomLogFileTab.4")); //$NON-NLS-1$
+		romLogFilePath.setData(".uid", "RomLogFileTab.romLogFilePath");  //$NON-NLS-1$ //$NON-NLS-2$
 		romLogFilePath.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
@@ -124,6 +128,7 @@
 		});
 
 		romLogFileBrowse = createPushButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.5"), null); //$NON-NLS-1$
+		romLogFileBrowse.setData(".uid", "RomLogFileTab.romLogFileBrowse");  //$NON-NLS-1$ //$NON-NLS-2$
 		romLogFileBrowse.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent evt) {
@@ -147,11 +152,13 @@
 		data.horizontalSpan = 2;
 		epoc32DirLabel.setLayoutData(data);
 		epoc32DirLabel.setToolTipText(Messages.getString("RomLogFileTab.10")); //$NON-NLS-1$
+		epoc32DirLabel.setData(".uid", "RomLogFileTab.epoc32DirLabel");  //$NON-NLS-1$ //$NON-NLS-2$
 
 		epoc32DirPath = new Text(parseRomLogGroup.getGroup(), SWT.BORDER);
 		data = new GridData(GridData.FILL_HORIZONTAL);
 		epoc32DirPath.setLayoutData(data);
 		epoc32DirPath.setToolTipText(Messages.getString("RomLogFileTab.10")); //$NON-NLS-1$
+		epoc32DirPath.setData(".uid", "RomLogFileTab.epoc32DirPath");  //$NON-NLS-1$ //$NON-NLS-2$
 		epoc32DirPath.addModifyListener(new ModifyListener() {
 			public void modifyText(ModifyEvent e) {
 				updateLaunchConfigurationDialog();
@@ -159,6 +166,7 @@
 		});
 
 		epoc32DirBrowse = createPushButton(parseRomLogGroup.getGroup(), Messages.getString("RomLogFileTab.5"), null); //$NON-NLS-1$
+		epoc32DirBrowse.setData(".uid", "RomLogFileTab.epoc32DirBrowse");  //$NON-NLS-1$ //$NON-NLS-2$
 		epoc32DirBrowse.addSelectionListener(new SelectionAdapter() {
 
 			public void widgetSelected(SelectionEvent evt) {
@@ -181,6 +189,7 @@
 		data.horizontalSpan = 2;
 		logUnresolvedModules.setLayoutData(data);
 		logUnresolvedModules.setToolTipText(Messages.getString("RomLogFileTab.14")); //$NON-NLS-1$
+		logUnresolvedModules.setData(".uid", "RomLogFileTab.logUnresolvedModules");  //$NON-NLS-1$ //$NON-NLS-2$
 		logUnresolvedModules.addSelectionListener(new SelectionAdapter() {
 			public void widgetSelected(SelectionEvent e) {
 				updateLaunchConfigurationDialog();
--- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java	Fri Dec 04 16:27:12 2009 -0600
+++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/RunModeMainTab.java	Fri Dec 04 16:32:30 2009 -0600
@@ -119,6 +119,7 @@
 
 		remoteLabel = new Label(projComp, SWT.NONE);
 		remoteLabel.setText(Messages.getString("RunModeMainTab.2")); //$NON-NLS-1$
+		remoteLabel.setData(".uid", "RunModeMainTab.remoteLabel");  //$NON-NLS-1$ //$NON-NLS-2$
 		gd = new GridData();
 		gd.horizontalSpan = 2;
 		remoteLabel.setLayoutData(gd);
@@ -128,6 +129,7 @@
 		gd = new GridData(GridData.FILL_HORIZONTAL);
 		remoteText.setLayoutData(gd);
 		remoteText.setToolTipText(Messages.getString("RunModeMainTab.3")); //$NON-NLS-1$
+		remoteText.setData(".uid", "RunModeMainTab.remoteText");  //$NON-NLS-1$ //$NON-NLS-2$
 		remoteText.addModifyListener(new ModifyListener() {
 
 			public void modifyText(ModifyEvent evt) {
FCL/sftools/dev/ide/carbidecpp