From 1731b69f79c38ab931b8a4349f4ea8ab3aaf37bc Mon Sep 17 00:00:00 2001 From: Oleg Krasilnikov Date: Tue, 8 May 2007 12:51:03 +0000 Subject: [PATCH] Made "Toolchain editor" page enabled by default. --- .../managedbuilder/ui/preferences/PropertyPageDefsTab.java | 4 ++-- .../src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java | 2 +- .../src/org/eclipse/cdt/ui/newui/PropertyTester.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java index 5aa823e6009..6b15754c650 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java @@ -87,7 +87,7 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab { // show_mul.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_MULTI)); show_mng.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOMNG)); show_sav.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOSAVE)); - show_tool.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_TOOLM)); + show_tool.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOTOOLM)); show_exp.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_EXPORT)); switch (CDTPrefUtil.getInt(CDTPrefUtil.KEY_DISC_NAMES)) { @@ -103,7 +103,7 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab { // CDTPrefUtil.setBool(CDTPrefUtil.KEY_MULTI, show_mul.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOMNG, !show_mng.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOSAVE, !show_sav.getSelection()); - CDTPrefUtil.setBool(CDTPrefUtil.KEY_TOOLM, show_tool.getSelection()); + CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOTOOLM, !show_tool.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_EXPORT, show_exp.getSelection()); int x = 0; if (b_1.getSelection()) x = 1; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java index c59a65f3893..4330eb9d2d6 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/CDTPrefUtil.java @@ -26,7 +26,7 @@ public class CDTPrefUtil { public static final String KEY_MULTI = "properties.multi.config.enable"; //$NON-NLS-1$ public static final String KEY_DTREE = "properties.data.hierarchy.enable"; //$NON-NLS-1$ public static final String KEY_NOSAVE = "properties.save.position.disable"; //$NON-NLS-1$ - public static final String KEY_TOOLM = "properties.toolchain.modification.enable"; //$NON-NLS-1$ + public static final String KEY_NOTOOLM = "properties.toolchain.modification.disable"; //$NON-NLS-1$ public static final String KEY_EXPORT = "properties.export.page.enable"; //$NON-NLS-1$ // string keys public static final String KEY_PREFTC = "wizard.preferred.toolchains"; //$NON-NLS-1$ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PropertyTester.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PropertyTester.java index 34b9b350f59..fc23b73f8e0 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PropertyTester.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PropertyTester.java @@ -40,7 +40,7 @@ public class PropertyTester extends org.eclipse.core.expressions.PropertyTester if (VAL_EXP.equalsIgnoreCase(s)) return CDTPrefUtil.getBool(CDTPrefUtil.KEY_EXPORT); if (VAL_TOOL.equalsIgnoreCase(s)) - return CDTPrefUtil.getBool(CDTPrefUtil.KEY_TOOLM); + return !CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOTOOLM); } return false; }