Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Khodjaiants2004-06-21 17:55:20 -0400
committerMikhail Khodjaiants2004-06-21 17:55:20 -0400
commite0cd851712a1b0aa15a064d9436db8690c41d709 (patch)
treef34c413dae1ba1615deb61970af95f8be0e9e38d
parentdbcc3f2792b9018b38cd976bbef15d49cf8bed29 (diff)
downloadorg.eclipse.cdt-e0cd851712a1b0aa15a064d9436db8690c41d709.tar.gz
org.eclipse.cdt-e0cd851712a1b0aa15a064d9436db8690c41d709.tar.xz
org.eclipse.cdt-e0cd851712a1b0aa15a064d9436db8690c41d709.zip
Fix for bug 60872. Accessibility: Run/Debug configuration dialog has duplicate mnemonics.
Warning cleanup.
-rw-r--r--launch/org.eclipse.cdt.launch/ChangeLog7
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties3
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java5
-rw-r--r--launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java11
4 files changed, 18 insertions, 8 deletions
diff --git a/launch/org.eclipse.cdt.launch/ChangeLog b/launch/org.eclipse.cdt.launch/ChangeLog
index 87e8a4337ce..d4641c2d753 100644
--- a/launch/org.eclipse.cdt.launch/ChangeLog
+++ b/launch/org.eclipse.cdt.launch/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-21 Mikhail Khodjaiants
+ Fix for bug 60872. Accessibility: Run/Debug configuration dialog has duplicate mnemonics.
+ Warning cleanup.
+ * LaunchUIPluginResources.properties
+ * CEnvironmentTab.java
+ * CMainTab.java
+
2004-05-09 Mikhail Khodjaiants
Added the rendering method for debugger processes.
* src/org/eclise/cdt/launch/AbstractCLaunchDelegate.java
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties
index aaf51a611e3..9535deae9a4 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchUIPluginResources.properties
@@ -116,5 +116,6 @@ Launch.common.Exception_occurred_reading_configuration_EXCEPTION=Exception occur
Launch.common.DebuggerColon=Debugger:
Launch.common.BinariesColon=Binaries:
Launch.common.QualifierColon=Qualifier:
-Launch.common.B&rowse...=B&rowse...
+Launch.common.Browse_1=&Browse
+Launch.common.Browse_2=B&rowse
Launch.common.Project_does_not_exist=Project does not exist \ No newline at end of file
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
index 4f9674c7782..9a983cf41c4 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CEnvironmentTab.java
@@ -40,6 +40,7 @@ import org.eclipse.jface.viewers.TableLayout;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -342,7 +343,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
protected void newEntry() {
EntryDialog dialog = new EntryDialog(new String(), new String(), false);
- if (dialog.open() == EntryDialog.OK) {
+ if (dialog.open() == Window.OK) {
fElements.setProperty(dialog.getName(), dialog.getValue());
fVariableList.refresh();
}
@@ -413,7 +414,7 @@ public class CEnvironmentTab extends CLaunchConfigurationTab {
protected void doEdit(Map.Entry entry) {
EntryDialog dialog = new EntryDialog(entry.getKey().toString(), entry.getValue().toString(), true);
- if (dialog.open() == EntryDialog.OK) {
+ if (dialog.open() == Window.OK) {
fElements.remove(entry.getKey());
fElements.setProperty(dialog.getName(), dialog.getValue());
fVariableList.refresh();
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
index 1cda4555925..39b70f4d8f5 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java
@@ -38,6 +38,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.events.ModifyEvent;
@@ -127,7 +128,7 @@ public class CMainTab extends CLaunchConfigurationTab {
}
});
- fProjButton = createPushButton(projComp, LaunchUIPlugin.getResourceString("Launch.common.B&rowse..."), null); //$NON-NLS-1$
+ fProjButton = createPushButton(projComp, LaunchUIPlugin.getResourceString("Launch.common.Browse_1"), null); //$NON-NLS-1$
fProjButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
@@ -171,7 +172,7 @@ public class CMainTab extends CLaunchConfigurationTab {
});
Button fBrowseForBinaryButton;
- fBrowseForBinaryButton = createPushButton(mainComp, LaunchUIPlugin.getResourceString("Launch.common.B&rowse..."), null); //$NON-NLS-1$
+ fBrowseForBinaryButton = createPushButton(mainComp, LaunchUIPlugin.getResourceString("Launch.common.Browse_2"), null); //$NON-NLS-1$
fBrowseForBinaryButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent evt) {
@@ -289,7 +290,7 @@ public class CMainTab extends CLaunchConfigurationTab {
dialog.setLowerListLabel(LaunchUIPlugin.getResourceString("Launch.common.QualifierColon")); //$NON-NLS-1$
dialog.setMultipleSelection(false);
//dialog.set
- if (dialog.open() == ElementListSelectionDialog.OK) {
+ if (dialog.open() == Window.OK) {
IBinary binary = (IBinary)dialog.getFirstResult();
fProgText.setText(binary.getResource().getProjectRelativePath().toString());
}
@@ -343,7 +344,7 @@ public class CMainTab extends CLaunchConfigurationTab {
}
});
- if (dialog.open() == ElementTreeSelectionDialog.CANCEL) {
+ if (dialog.open() == Window.CANCEL) {
return;
}
@@ -418,7 +419,7 @@ public class CMainTab extends CLaunchConfigurationTab {
if (cProject != null) {
dialog.setInitialSelections(new Object[]{cProject});
}
- if (dialog.open() == ElementListSelectionDialog.OK) {
+ if (dialog.open() == Window.OK) {
return (ICProject)dialog.getFirstResult();
}
} catch (CModelException e) {

Back to the top