From 61da74a2d0638408150239361ae346d3bda966ee Mon Sep 17 00:00:00 2001 From: Hoda Amer Date: Tue, 8 Jun 2004 18:40:30 +0000 Subject: [PATCH] Bug Fixing --- core/org.eclipse.cdt.ui/ChangeLog | 5 +++++ .../cdt/internal/ui/preferences/ColorEditor.java | 11 +++++++++-- .../ui/preferences/TemplatePreferencePage.java | 16 ++++++++-------- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 9c8b91dbfdc..1ac4e4d694a 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,3 +1,8 @@ +2004-06-08 Hoda Amer + Fix for bug 51482, 61039 + * src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java + * src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java + 2004-06-08 Hoda Amer Fixes for bugs 62780, 62783, 62784 * refactor/org/eclipse/cdt/internal/corext/refactoring/rename/RenameElementProcessor.java diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java index c10fe8c8956..b7554984407 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/ColorEditor.java @@ -5,7 +5,10 @@ package org.eclipse.cdt.internal.ui.preferences; * All Rights Reserved. */ +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; +import org.eclipse.swt.accessibility.AccessibleAdapter; +import org.eclipse.swt.accessibility.AccessibleEvent; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; import org.eclipse.swt.events.SelectionAdapter; @@ -22,8 +25,6 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Display; -import org.eclipse.jface.resource.JFaceResources; - /** * A "button" of a certain color determined by the color picker. */ @@ -46,6 +47,12 @@ public class ColorEditor { gc.fillRectangle(0, 0, fExtent.x, fExtent.y); gc.dispose(); + fButton.getAccessible().addAccessibleListener( + new AccessibleAdapter() { + public void getName(AccessibleEvent e) { + e.result = "Color selector"; //$NON-NLS-1$ + }}); + fButton.setImage(fImage); fButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java index 619b87aa37e..c38ae293e17 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/TemplatePreferencePage.java @@ -179,8 +179,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench buttons.setLayout(layout); fAddButton= new Button(buttons, SWT.PUSH); - fAddButton.setLayoutData(getButtonGridData(fAddButton)); fAddButton.setText(TemplateMessages.getString("TemplatePreferencePage.new")); //$NON-NLS-1$ + fAddButton.setLayoutData(getButtonGridData(fAddButton)); fAddButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { add(); @@ -188,8 +188,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench }); fEditButton= new Button(buttons, SWT.PUSH); - fEditButton.setLayoutData(getButtonGridData(fEditButton)); fEditButton.setText(TemplateMessages.getString("TemplatePreferencePage.edit")); //$NON-NLS-1$ + fEditButton.setLayoutData(getButtonGridData(fEditButton)); fEditButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { edit(); @@ -197,8 +197,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench }); fRemoveButton= new Button(buttons, SWT.PUSH); - fRemoveButton.setLayoutData(getButtonGridData(fRemoveButton)); fRemoveButton.setText(TemplateMessages.getString("TemplatePreferencePage.remove")); //$NON-NLS-1$ + fRemoveButton.setLayoutData(getButtonGridData(fRemoveButton)); fRemoveButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { remove(); @@ -208,8 +208,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench createSpacer(buttons); fImportButton= new Button(buttons, SWT.PUSH); - fImportButton.setLayoutData(getButtonGridData(fImportButton)); fImportButton.setText(TemplateMessages.getString("TemplatePreferencePage.import")); //$NON-NLS-1$ + fImportButton.setLayoutData(getButtonGridData(fImportButton)); fImportButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { import_(); @@ -217,8 +217,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench }); fExportButton= new Button(buttons, SWT.PUSH); - fExportButton.setLayoutData(getButtonGridData(fExportButton)); fExportButton.setText(TemplateMessages.getString("TemplatePreferencePage.export")); //$NON-NLS-1$ + fExportButton.setLayoutData(getButtonGridData(fExportButton)); fExportButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { export(); @@ -226,8 +226,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench }); fExportAllButton= new Button(buttons, SWT.PUSH); - fExportAllButton.setLayoutData(getButtonGridData(fExportAllButton)); fExportAllButton.setText(TemplateMessages.getString("TemplatePreferencePage.export.all")); //$NON-NLS-1$ + fExportAllButton.setLayoutData(getButtonGridData(fExportAllButton)); fExportAllButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { exportAll(); @@ -237,8 +237,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench createSpacer(buttons); fEnableAllButton= new Button(buttons, SWT.PUSH); - fEnableAllButton.setLayoutData(getButtonGridData(fEnableAllButton)); fEnableAllButton.setText(TemplateMessages.getString("TemplatePreferencePage.enable.all")); //$NON-NLS-1$ + fEnableAllButton.setLayoutData(getButtonGridData(fEnableAllButton)); fEnableAllButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { enableAll(true); @@ -246,8 +246,8 @@ public class TemplatePreferencePage extends PreferencePage implements IWorkbench }); fDisableAllButton= new Button(buttons, SWT.PUSH); - fDisableAllButton.setLayoutData(getButtonGridData(fDisableAllButton)); fDisableAllButton.setText(TemplateMessages.getString("TemplatePreferencePage.disable.all")); //$NON-NLS-1$ + fDisableAllButton.setLayoutData(getButtonGridData(fDisableAllButton)); fDisableAllButton.addListener(SWT.Selection, new Listener() { public void handleEvent(Event e) { enableAll(false);