From 56f7fff48433a069c1d54ad202a90a344645591a Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sun, 21 Feb 2010 04:40:51 +0000 Subject: [PATCH] bug 303416: Preference tab Multiple Configurations Edit is different --- .../ui/preferences/PropertyMultiCfgTab.java | 86 +++++++++---------- .../cdt/ui/newui/PluginResources.properties | 14 +-- 2 files changed, 47 insertions(+), 53 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java index 2ce39ed10fc..9e998c9f5a7 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyMultiCfgTab.java @@ -11,12 +11,10 @@ package org.eclipse.cdt.managedbuilder.ui.preferences; import org.eclipse.cdt.core.settings.model.ICResourceDescription; -import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.cdt.ui.newui.UIMessages; import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -34,17 +32,15 @@ import org.eclipse.swt.widgets.Label; public class PropertyMultiCfgTab extends AbstractCPropertyTab { private static final int SPACING = 5; // for radio buttons layout - private static final Color BLUE = CUIPlugin.getStandardDisplay().getSystemColor(SWT.COLOR_BLUE); - private Group dGrp; - private Group wGrp; - private Button d_1; - private Button d_2; + private Group dGrp; + private Group wGrp; + private Button d_1; + private Button d_2; + + private Button w_0; + private Button w_1; - private Button w_0; - private Button w_1; - - @Override public void createControls(Composite parent) { super.createControls(parent); @@ -52,42 +48,40 @@ public class PropertyMultiCfgTab extends AbstractCPropertyTab { g.verticalSpacing = SPACING; usercomp.setLayout(g); - dGrp = new Group(usercomp, SWT.NONE); - dGrp.setText(UIMessages.getString("PropertyMultiCfgTab.3")); //$NON-NLS-1$ - dGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - FillLayout fl = new FillLayout(SWT.VERTICAL); - fl.spacing = SPACING; - fl.marginWidth = SPACING; - dGrp.setLayout(fl); - - Label l = new Label(dGrp, SWT.WRAP | SWT.CENTER); - l.setText( - UIMessages.getString("PropertyMultiCfgTab.4") //$NON-NLS-1$ - ); - l.setForeground(BLUE); - d_1 = new Button(dGrp, SWT.RADIO); - d_1.setText(UIMessages.getString("PropertyMultiCfgTab.6")); //$NON-NLS-1$ - d_2 = new Button(dGrp, SWT.RADIO); - d_2.setText(UIMessages.getString("PropertyMultiCfgTab.7")); //$NON-NLS-1$ - - wGrp = new Group(usercomp, SWT.NONE); - wGrp.setText(UIMessages.getString("PropertyMultiCfgTab.8")); //$NON-NLS-1$ - wGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - fl = new FillLayout(SWT.VERTICAL); - fl.spacing = SPACING; - fl.marginWidth = SPACING; - wGrp.setLayout(fl); + dGrp = new Group(usercomp, SWT.NONE); + dGrp.setText(UIMessages.getString("PropertyMultiCfgTab.3")); //$NON-NLS-1$ + dGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + FillLayout fl = new FillLayout(SWT.VERTICAL); + fl.spacing = SPACING; + fl.marginHeight = SPACING; + fl.marginWidth = SPACING; + dGrp.setLayout(fl); + + Label l = new Label(dGrp, SWT.WRAP); + l.setText(UIMessages.getString("PropertyMultiCfgTab.4")); //$NON-NLS-1$ + + d_1 = new Button(dGrp, SWT.RADIO); + d_1.setText(UIMessages.getString("PropertyMultiCfgTab.6")); //$NON-NLS-1$ + d_2 = new Button(dGrp, SWT.RADIO); + d_2.setText(UIMessages.getString("PropertyMultiCfgTab.7")); //$NON-NLS-1$ + + wGrp = new Group(usercomp, SWT.NONE); + wGrp.setText(UIMessages.getString("PropertyMultiCfgTab.8")); //$NON-NLS-1$ + wGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + fl = new FillLayout(SWT.VERTICAL); + fl.spacing = SPACING; + fl.marginHeight = SPACING; + fl.marginWidth = SPACING; + wGrp.setLayout(fl); + + l = new Label(wGrp, SWT.WRAP); + l.setText(UIMessages.getString("PropertyMultiCfgTab.9")); //$NON-NLS-1$ + + w_0 = new Button(wGrp, SWT.RADIO); + w_0.setText(UIMessages.getString("PropertyMultiCfgTab.10")); //$NON-NLS-1$ + w_1 = new Button(wGrp, SWT.RADIO); + w_1.setText(UIMessages.getString("PropertyMultiCfgTab.11")); //$NON-NLS-1$ - l = new Label(wGrp, SWT.WRAP | SWT.CENTER); - l.setText( - UIMessages.getString("PropertyMultiCfgTab.9") //$NON-NLS-1$ - ); - l.setForeground(BLUE); - w_0 = new Button(wGrp, SWT.RADIO); - w_0.setText(UIMessages.getString("PropertyMultiCfgTab.10")); //$NON-NLS-1$ - w_1 = new Button(wGrp, SWT.RADIO); - w_1.setText(UIMessages.getString("PropertyMultiCfgTab.11")); //$NON-NLS-1$ - switch (CDTPrefUtil.getInt(CDTPrefUtil.KEY_DMODE)) { case CDTPrefUtil.DMODE_CONJUNCTION: d_1.setSelection(true); break; case CDTPrefUtil.DMODE_DISJUNCTION: d_2.setSelection(true); break; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties index 93630f139a1..aca99403e3c 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties @@ -275,29 +275,29 @@ PropertyMultiCfgTab.0=* This functionality is experimental * PropertyMultiCfgTab.1=Enable multiple configurations setting PropertyMultiCfgTab.10=Add/remove/change affected elements, do not touch others PropertyMultiCfgTab.11=Replace existing string lists with string list shown to user -PropertyMultiCfgTab.3=String list Display mode -PropertyMultiCfgTab.4=Define how string lists from different configurations\nshould be combined for display, when lists are not equal +PropertyMultiCfgTab.3=String List Display Mode +PropertyMultiCfgTab.4=Define how string lists from different configurations should be combined for display when lists are not equal: PropertyMultiCfgTab.6=Show common elements (conjunction) PropertyMultiCfgTab.7=Show all elements except doubles (disjunction) -PropertyMultiCfgTab.8=String list Write mode -PropertyMultiCfgTab.9=Define how to save changes in string lists \nfor different configurations +PropertyMultiCfgTab.8=String List Write Mode +PropertyMultiCfgTab.9=Define how to save changes in string lists for different configurations: PropertyPageDefsTab.0=Show "Manage Configurations..." button PropertyPageDefsTab.1=Display "Data Hierarchy" tab PropertyPageDefsTab.10=Display "Export Settings" tab -PropertyPageDefsTab.11=Save property dialog bounds +PropertyPageDefsTab.11=Save Property Dialog Bounds PropertyPageDefsTab.12=Save size and position PropertyPageDefsTab.13=Save size only PropertyPageDefsTab.14=Do not save at all PropertyPageDefsTab.15=Center dialogs on screen PropertyPageDefsTab.16=Display tool option tips at a fixed location PropertyPageDefsTab.4=Display "Tool Chain Editor" tab -PropertyPageDefsTab.5=Discovery profiles naming rule +PropertyPageDefsTab.5=Discovery Profiles Naming Rule PropertyPageDefsTab.6=Show disc. page names if they are unique. Else names + profile IDs. PropertyPageDefsTab.7=Show disc. page names if they are unique. Else show profile IDs. PropertyPageDefsTab.8=Always show names + profile IDs PropertyPageDefsTab.9=Always show profile IDs only ProjectConvert.convertersList=Converters List - + ScannerConfigOptionsDialog.title=Discovery Options ScannerConfigOptionsDialog.description=Set the scanner configuration discovery options for this project ScannerConfigOptionsDialog.scGroup.label=Automated discovery of paths and symbols