From 93b72e60979d264e6e2a4b48ee2ced5a13e749ba Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Mon, 28 Jan 2008 18:35:28 +0000 Subject: [PATCH] Temporary disabled Button.setGrayed/getGrayed --- .../ui/properties/BuildOptionSettingsUI.java | 8 +++++--- .../ui/properties/BuilderSettingsTab.java | 19 +++++++++++++------ .../cdt/ui/newui/AbstractCPropertyTab.java | 10 ++++++---- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java index 7b33b1945a3..63c90fb9639 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionSettingsUI.java @@ -627,8 +627,9 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI { } protected void valueChanged(boolean oldValue, boolean newValue) { - if (button.getGrayed()) - button.setGrayed(false); + // TODO: uncomment before M5 + //if (button.getGrayed()) + // button.setGrayed(false); super.valueChanged(!newValue, newValue); } protected void doLoad() { @@ -653,7 +654,8 @@ public class BuildOptionSettingsUI extends AbstractToolSettingUI { if (vals[0] > 0) gray = true; } - button.setGrayed(gray); + // TODO: uncomment before M5 + // button.setGrayed(gray); button.setSelection(value); return; } 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 3e31862d6f7..32a10bd9967 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 @@ -130,16 +130,23 @@ public class BuilderSettingsTab extends AbstractCBuildPropertyTab { b_genMakefileAuto.setEnabled(icfg.supportsBuild(true)); if (extStates == null) { // no extended states available - b_genMakefileAuto.setGrayed(false); - b_genMakefileAuto.setSelection(bldr.isManagedBuildOn()); - b_useDefault.setGrayed(false); - b_useDefault.setSelection(bldr.isDefaultBuildCmd()); - b_expandVars.setGrayed(false); + BuildBehaviourTab.setTriSelection(b_genMakefileAuto, + bldr.isManagedBuildOn() ? + BuildBehaviourTab.TRI_YES : + BuildBehaviourTab.TRI_NO); + BuildBehaviourTab.setTriSelection(b_useDefault, + bldr.isDefaultBuildCmd() ? + BuildBehaviourTab.TRI_YES : + BuildBehaviourTab.TRI_NO); + // b_expandVars.setGrayed(false); if(!bldr.canKeepEnvironmentVariablesInBuildfile()) b_expandVars.setEnabled(false); else { b_expandVars.setEnabled(true); - b_expandVars.setSelection(!bldr.keepEnvironmentVariablesInBuildfile()); + BuildBehaviourTab.setTriSelection(b_expandVars, + !bldr.keepEnvironmentVariablesInBuildfile() ? + BuildBehaviourTab.TRI_YES : + BuildBehaviourTab.TRI_NO); } } else { BuildBehaviourTab.setTriSelection(b_genMakefileAuto, extStates[0]); diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java index 2258f818178..355769584b9 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractCPropertyTab.java @@ -322,7 +322,8 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab { setupControl(b, span, mode); b.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { - ((Button)event.widget).setGrayed(false); + // TODO: uncomment before M5 + //((Button)event.widget).setGrayed(false); checkPressed(event); }}); return b; @@ -534,17 +535,18 @@ public abstract class AbstractCPropertyTab implements ICPropertyTab { */ public static void setTriSelection(Button b, int state) { switch (state) { + // TODO: uncomment before M5 case TRI_NO: - b.setGrayed(false); + // b.setGrayed(false); b.setSelection(false); break; case TRI_YES: - b.setGrayed(false); + // b.setGrayed(false); b.setSelection(true); break; case TRI_UNKNOWN: b.setSelection(true); - b.setGrayed(true); + // b.setGrayed(true); break; } }