From c33e846074da1b016f997084928224a7bcd41439 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Thu, 24 Jun 2004 19:59:28 +0000 Subject: [PATCH] patch from Tanya Wolff - This patch switches the Binary Parser Options group with its child composite. This gets rid of an unnamed composite between the controls and the group so that a screen reader can read the name of the group before the control. Now you can't see the Binary Parser Options group unless you select a parser that has some options. Also externalized some dialog titles accessed by Browse buttons. --- core/org.eclipse.cdt.ui/ChangeLog | 10 ++++++++++ .../eclipse/cdt/ui/dialogs/BinaryParserBlock.java | 6 +++--- .../cdt/ui/dialogs/CygwinPEBinaryParserPage.java | 15 ++++++++++----- .../cdt/ui/dialogs/GNUElfBinaryParserPage.java | 12 ++++++++---- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index b7b3b84b7e6..73efa486428 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,13 @@ +2004-06-24 Tanya Wolff + Fix for PR 60299: Accessibility: Lost children in Binary Parser properties dialog + Switched the binary parsers Options group with its child composite so the + group is read before the controls in the group. + Externalized a few dialog titles. + * src/org/eclipse/cdt/ui/dialogs/BinaryParserBock.java + * src/org/eclipse/cdt/ui/dialogs/CygwinBinaryParserPage.java + * src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java + * src/org/eclipse/cdt/ui/dialogs/BinaryParserBock.java + 2004-06-24 Hoda Amer A small fix to the New Class Wizard "link to file" option. Fix for PR# 47570 : [New Class Wizard] Use of internal Eclipse classes in CDT(LinkToFileGroup) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java index 451c7a63252..50072e31a21 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/BinaryParserBlock.java @@ -189,9 +189,9 @@ public class BinaryParserBlock extends AbstractBinaryParserPage { binaryList.setButtonsMinWidth(buttonBarWidth); // Add the Parser UI contribution. - Group parserGroup = new Group(composite, SWT.SHADOW_ETCHED_IN); - parserGroup.setText(CUIMessages.getString("BinaryParserBlock.binaryParserOptions")); //$NON-NLS-1$ - + + Composite parserGroup = new Composite(composite, SWT.NULL); + GridData gd = new GridData(); gd.heightHint = converter.convertHorizontalDLUsToPixels(150); gd.horizontalAlignment = GridData.FILL; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java index ae2ee694389..3804071449e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/CygwinPEBinaryParserPage.java @@ -37,6 +37,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; @@ -143,8 +144,12 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { * * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ - public void createControl(Composite parent) { - Composite comp = ControlFactory.createCompositeEx(parent, 2, GridData.FILL_HORIZONTAL); + public void createControl(Composite composite) { + Group comp = new Group(composite, SWT.SHADOW_ETCHED_IN); + comp.setText(CUIMessages.getString("BinaryParserBlock.binaryParserOptions")); //$NON-NLS-1$ + + comp.setLayout(new GridLayout(2, true)); + comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); ((GridLayout) comp.getLayout()).makeColumnsEqualWidth = false; Label label = ControlFactory.createLabel(comp, CUIMessages.getString("BinaryParserPage.label.addr2lineCommand")); //$NON-NLS-1$ @@ -170,7 +175,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { private void handleAddr2LineButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText("addr2line Command"); //$NON-NLS-1$ + dialog.setText(CUIMessages.getString("BinaryParserPage.label.addr2lineCommand")); //$NON-NLS-1$ String command = fAddr2LineCommandText.getText().trim(); int lastSeparatorIndex = command.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) { @@ -208,7 +213,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { private void handleCPPFiltButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText("c++filt Command"); //$NON-NLS-1$ + dialog.setText(CUIMessages.getString("BinaryParserPage.label.cppfiltCommand")); //$NON-NLS-1$ String command = fCPPFiltCommandText.getText().trim(); int lastSeparatorIndex = command.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) { @@ -246,7 +251,7 @@ public class CygwinPEBinaryParserPage extends AbstractCOptionPage { private void handleCygPathButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText("cygpath Command"); //$NON-NLS-1$ + dialog.setText(CUIMessages.getString("BinaryParserPage.label.cygpathCommand")); //$NON-NLS-1$ String command = fCygPathCommandText.getText().trim(); int lastSeparatorIndex = command.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java index 7e77f635546..4d56fe6467a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/GNUElfBinaryParserPage.java @@ -37,6 +37,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; @@ -141,9 +142,12 @@ public class GNUElfBinaryParserPage extends AbstractCOptionPage { * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite) */ public void createControl(Composite parent) { - Composite comp = ControlFactory.createCompositeEx(parent, 2, GridData.FILL_HORIZONTAL); + Group comp = new Group(parent, SWT.SHADOW_ETCHED_IN); + comp.setText(CUIMessages.getString("BinaryParserBlock.binaryParserOptions")); //$NON-NLS-1$ + comp.setLayout(new GridLayout(2, true)); + comp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); ((GridLayout) comp.getLayout()).makeColumnsEqualWidth = false; - + Label label = ControlFactory.createLabel(comp, CUIMessages.getString("BinaryParserPage.label.addr2lineCommand")); //$NON-NLS-1$ GridData gd = new GridData(); gd.horizontalSpan = 2; @@ -167,7 +171,7 @@ public class GNUElfBinaryParserPage extends AbstractCOptionPage { private void handleAddr2LineButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText("addr2line Command"); //$NON-NLS-1$ + dialog.setText(CUIMessages.getString("BinaryParserPage.label.addr2lineCommand")); //$NON-NLS-1$ String command = fAddr2LineCommandText.getText().trim(); int lastSeparatorIndex = command.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) { @@ -205,7 +209,7 @@ public class GNUElfBinaryParserPage extends AbstractCOptionPage { private void handleCPPFiltButtonSelected() { FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - dialog.setText("c++filt Command"); //$NON-NLS-1$ + dialog.setText(CUIMessages.getString("BinaryParserPage.label.cppfiltCommand")); //$NON-NLS-1$ String command = fCPPFiltCommandText.getText().trim(); int lastSeparatorIndex = command.lastIndexOf(File.separator); if (lastSeparatorIndex != -1) {