From 3dcc5c98d1ed58f2a196968de54ad927b11f5240 Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Mon, 9 Apr 2007 07:15:13 +0000 Subject: [PATCH] Bug #180985: Property pages combo boxes are not read-only --- .../eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java | 2 +- .../cdt/managedbuilder/ui/properties/BuildStepsTab.java | 2 +- .../cdt/managedbuilder/ui/properties/BuilderSettingsTab.java | 2 +- .../cdt/managedbuilder/ui/properties/DiscoveryTab.java | 4 ++-- .../cdt/managedbuilder/ui/properties/NewVarDialog.java | 2 +- .../cdt/managedbuilder/ui/properties/ToolChainEditTab.java | 4 ++-- .../src/org/eclipse/cdt/ui/newui/StructureTreeTab.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java index 49941507df7..b61ffab2a84 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ArtifactTab.java @@ -47,7 +47,7 @@ public class ArtifactTab extends AbstractCBuildPropertyTab { Label l1 = new Label(usercomp, SWT.NONE); l1.setLayoutData(new GridData(GridData.BEGINNING)); l1.setText(Messages.getString("ArtifactTab.0")); //$NON-NLS-1$ - c1 = new Combo(usercomp, SWT.DROP_DOWN); + c1 = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); c1.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); c1.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java index 92cf41918ff..0fe03e71321 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildStepsTab.java @@ -126,7 +126,7 @@ public class BuildStepsTab extends AbstractCBuildPropertyTab { Group g1 = setupGroup (usercomp, Messages.getString("BuildStepsTab.4"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$ setupLabel(g1, UIMessages.getString(RCBS_APPLICABILITY), 1, GridData.BEGINNING); - combo = new Combo(g1, SWT.BORDER); + combo = new Combo(g1, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); combo.setItems(rcbsApplicabilityRules); combo.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java index ce43166ee12..4d896e8b18a 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuilderSettingsTab.java @@ -81,7 +81,7 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { // Builder group Group g1 = setupGroup(usercomp, Messages.getString("BuilderSettingsTab.0"), 3, GridData.FILL_HORIZONTAL); //$NON-NLS-1$ setupLabel(g1, Messages.getString("BuilderSettingsTab.1"), 1, GridData.BEGINNING); //$NON-NLS-1$ - c_builderType = new Combo(g1, SWT.DROP_DOWN | SWT.BORDER); + c_builderType = new Combo(g1, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); setupControl(c_builderType, 2, GridData.FILL_HORIZONTAL); c_builderType.add(Messages.getString("BuilderSettingsTab.2")); //$NON-NLS-1$ c_builderType.add(Messages.getString("BuilderSettingsTab.3")); //$NON-NLS-1$ diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java index d3dfd72bf86..0686f87dfab 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/DiscoveryTab.java @@ -103,7 +103,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf if (page.isForProject() || page.isForPrefs()) { Group scopeGroup = setupGroup(usercomp, Messages.getString("DiscoveryTab.0"), 1, GridData.FILL_HORIZONTAL); //$NON-NLS-1$ scopeGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - scopeComboBox = new Combo(scopeGroup, SWT.DROP_DOWN | SWT.READ_ONLY); + scopeComboBox = new Combo(scopeGroup, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER); scopeComboBox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); scopeComboBox.add(Messages.getString("DiscoveryTab.1")); //$NON-NLS-1$ scopeComboBox.add(Messages.getString("DiscoveryTab.2")); //$NON-NLS-1$ @@ -167,7 +167,7 @@ public class DiscoveryTab extends AbstractCBuildPropertyTab implements IBuildInf // Add profile combo box setupLabel(scGroup,UIMessages.getString(SC_SELECTED_PROFILE_COMBO), 1, GridData.BEGINNING); - profileComboBox = new Combo(scGroup, SWT.DROP_DOWN | SWT.READ_ONLY); + profileComboBox = new Combo(scGroup, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER); profileComboBox.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); profileComboBox.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java index 5fc01146752..80228d40f9b 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/NewVarDialog.java @@ -170,7 +170,7 @@ public class NewVarDialog extends Dialog { gd = new GridData(); typeLabel.setLayoutData(gd); - fTypeSelector = new Combo(comp, SWT.READ_ONLY|SWT.DROP_DOWN); + fTypeSelector = new Combo(comp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan = 2; // gd.widthHint = 100; diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java index d37357566d2..8cde3fee772 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/ToolChainEditTab.java @@ -57,7 +57,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab { b_dispCompatible = setupCheck(usercomp, Messages.getString("ToolChainEditTab.0"), 2, GridData.BEGINNING); //$NON-NLS-1$ setupLabel(usercomp, Messages.getString("ToolChainEditTab.1"), 2, GridData.BEGINNING); //$NON-NLS-1$ - c_toolchain = new Combo(usercomp, SWT.BORDER); + c_toolchain = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; c_toolchain.setLayoutData(gd); @@ -80,7 +80,7 @@ public class ToolChainEditTab extends AbstractCBuildPropertyTab { c_toolchain.setEnabled(!page.isForFile()); setupLabel(usercomp, Messages.getString("ToolChainEditTab.2"), 2, GridData.BEGINNING); //$NON-NLS-1$ - c_builder = new Combo(usercomp, SWT.BORDER); + c_builder = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); gd = new GridData(GridData.FILL_HORIZONTAL); gd.horizontalSpan = 2; c_builder.setLayoutData(gd); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java index e8c8cea2532..f53290c194b 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/StructureTreeTab.java @@ -168,7 +168,7 @@ public class StructureTreeTab extends AbstractCPropertyTab { lb.setText(UIMessages.getString("StructureTreeTab.4")); //$NON-NLS-1$ lb.setLayoutData(new GridData(GridData.BEGINNING)); - combo = new Combo(usercomp, SWT.BORDER); + combo = new Combo(usercomp, SWT.READ_ONLY | SWT.DROP_DOWN | SWT.BORDER); combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); combo.add(UIMessages.getString("ConfigDescriptionTab.0")); //$NON-NLS-1$ combo.add(UIMessages.getString("ConfigDescriptionTab.1")); //$NON-NLS-1$