mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 00:36:16 +02:00
Code Issues Wiki Activity

bug 407087: Hide old "Scanner Discovery" page in project properties by default

Browse source
This commit is contained in:
Andrew Gvozdev 2013-05-03 18:32:52 -04:00
parent c4bbdc9076
commit e35e32e8b0
3 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
View file

@ -584,10 +584,7 @@
<adapt type="org.eclipse.core.resources.IProject"> <adapt type="org.eclipse.core.resources.IProject">
<and> <and>
<test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/> <test property="org.eclipse.core.resources.projectNature" value="org.eclipse.cdt.managedbuilder.core.managedBuildNature"/>
<or>
<test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.sd.page.enable="/>
<test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.sd.page.enable=true"/> <test property="org.eclipse.cdt.ui.checkPreference" value="org.eclipse.cdt.ui:properties.sd.page.enable=true"/>
</or>
</and> </and>
</adapt> </adapt>
</enabledWhen> </enabledWhen>

12
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/Messages.properties
View file

@ -262,22 +262,22 @@ PropertyMultiCfgTab_7=Show all elements except doubles (disjunction)
PropertyMultiCfgTab_8=String List Write Mode PropertyMultiCfgTab_8=String List Write Mode
PropertyMultiCfgTab_9=Define how to save changes in string lists for different configurations: PropertyMultiCfgTab_9=Define how to save changes in string lists for different configurations:
PropertyPageDefsTab_0=Show "Manage Configurations..." button PropertyPageDefsTab_0=Show "Manage Configurations..." button
PropertyPageDefsTab_1=Display "Data Hierarchy" tab PropertyPageDefsTab_1=Display "Data Hierarchy" tab on Paths and Symbols page
PropertyPageDefsTab_10=Display "Export Settings" tab PropertyPageDefsTab_10=Display "Export Settings" page
PropertyPageDefsTab_11=Save Property Dialog Bounds PropertyPageDefsTab_11=Save Property Dialog Bounds
PropertyPageDefsTab_12=Save size and position PropertyPageDefsTab_12=Save size and position
PropertyPageDefsTab_13=Save size only PropertyPageDefsTab_13=Save size only
PropertyPageDefsTab_14=Do not save at all PropertyPageDefsTab_14=Do not save at all
PropertyPageDefsTab_16=Display tool option tips of "Tool Settings" tab at fixed location PropertyPageDefsTab_16=Display tool option tips of "Tool Settings" tab at fixed location
PropertyPageDefsTab_4=Display "Tool Chain Editor" tab PropertyPageDefsTab_4=Display "Tool Chain Editor" page
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_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_7=Show disc. page names if they are unique. Else show profile IDs.
PropertyPageDefsTab_8=Always show names + profile IDs PropertyPageDefsTab_8=Always show names + profile IDs
PropertyPageDefsTab_9=Always show profile IDs only PropertyPageDefsTab_9=Always show profile IDs only
PropertyPageDefsTab_showIncludeFileTab=Display "Include Files" tab PropertyPageDefsTab_showIncludeFileTab=Display "Include Files" tab on Paths and Symbols page
PropertyPageDefsTab_showProvidersTab=Display "Preprocessor Include Paths" tab and enable language settings providers PropertyPageDefsTab_showProvidersTab=Display "Preprocessor Include Paths" page
PropertyPageDefsTab_showScannerDiscoveryTab=Display "Scanner Discovery" tab PropertyPageDefsTab_showScannerDiscoveryTab=Display "Discovery Options" page
ProjectConvert_convertersList=Converters List ProjectConvert_convertersList=Converters List
AbstractPrefPage_0=\ Preference settings will be applied to new projects \n only when there were no toolchains selected. AbstractPrefPage_0=\ Preference settings will be applied to new projects \n only when there were no toolchains selected.

31
build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/preferences/PropertyPageDefsTab.java
View file

@ -17,6 +17,8 @@ import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
import org.eclipse.cdt.ui.newui.AbstractCPropertyTab; import org.eclipse.cdt.ui.newui.AbstractCPropertyTab;
import org.eclipse.cdt.ui.newui.CDTPrefUtil; import org.eclipse.cdt.ui.newui.CDTPrefUtil;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.GridLayout;
@ -52,6 +54,8 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
private Button s_1; private Button s_1;
private Button s_2; private Button s_2;
private Group discGrp;
@Override @Override
public void createControls(Composite parent) { public void createControls(Composite parent) {
super.createControls(parent); super.createControls(parent);
@ -80,6 +84,16 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
show_sd = new Button(usercomp, SWT.CHECK); show_sd = new Button(usercomp, SWT.CHECK);
show_sd.setText(Messages.PropertyPageDefsTab_showScannerDiscoveryTab); show_sd.setText(Messages.PropertyPageDefsTab_showScannerDiscoveryTab);
show_sd.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); show_sd.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
show_sd.addSelectionListener(new SelectionListener() {
@Override
public void widgetSelected(SelectionEvent e) {
showDiscoveryProfiles(show_sd.getSelection());
}
@Override
public void widgetDefaultSelected(SelectionEvent e) {
showDiscoveryProfiles(show_sd.getSelection());
}
});
show_providers_tab = new Button(usercomp, SWT.CHECK); show_providers_tab = new Button(usercomp, SWT.CHECK);
show_providers_tab.setText(Messages.PropertyPageDefsTab_showProvidersTab); show_providers_tab.setText(Messages.PropertyPageDefsTab_showProvidersTab);
@ -105,7 +119,7 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
s_2 = new Button(saveGrp, SWT.RADIO); s_2 = new Button(saveGrp, SWT.RADIO);
s_2.setText(Messages.PropertyPageDefsTab_14); s_2.setText(Messages.PropertyPageDefsTab_14);
Group discGrp = new Group(usercomp, SWT.NONE); discGrp = new Group(usercomp, SWT.NONE);
discGrp.setText(Messages.PropertyPageDefsTab_5); discGrp.setText(Messages.PropertyPageDefsTab_5);
discGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); discGrp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
fl = new FillLayout(SWT.VERTICAL); fl = new FillLayout(SWT.VERTICAL);
@ -122,14 +136,14 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
b_2.setText(Messages.PropertyPageDefsTab_8); b_2.setText(Messages.PropertyPageDefsTab_8);
b_3 = new Button(discGrp, SWT.RADIO); b_3 = new Button(discGrp, SWT.RADIO);
b_3.setText(Messages.PropertyPageDefsTab_9); b_3.setText(Messages.PropertyPageDefsTab_9);
showDiscoveryProfiles(show_sd.getSelection());
show_inc_files.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_SHOW_INC_FILES)); show_inc_files.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_SHOW_INC_FILES));
show_tree.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_DTREE)); show_tree.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_DTREE));
show_mng.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOMNG)); show_mng.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOMNG));
show_tool.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOTOOLM)); show_tool.setSelection(!CDTPrefUtil.getBool(CDTPrefUtil.KEY_NOTOOLM));
show_exp.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_EXPORT)); show_exp.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_EXPORT));
// ensure default is "true" for scanner discovery tab show_sd.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_SHOW_SD));
show_sd.setSelection(!CDTPrefUtil.getStr(CDTPrefUtil.KEY_SHOW_SD).equals(Boolean.FALSE.toString()));
show_providers_tab.setSelection(ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(null)); show_providers_tab.setSelection(ScannerDiscoveryLegacySupport.isLanguageSettingsProvidersFunctionalityEnabled(null));
show_tipbox.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_TIPBOX)); show_tipbox.setSelection(CDTPrefUtil.getBool(CDTPrefUtil.KEY_TIPBOX));
@ -147,6 +161,14 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
} }
} }
private void showDiscoveryProfiles(boolean visible) {
discGrp.setVisible(visible);
b_0.setVisible(visible);
b_1.setVisible(visible);
b_2.setVisible(visible);
b_3.setVisible(visible);
}
@Override @Override
protected void performOK() { protected void performOK() {
CDTPrefUtil.setBool(CDTPrefUtil.KEY_SHOW_INC_FILES, show_inc_files.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_SHOW_INC_FILES, show_inc_files.getSelection());
@ -154,8 +176,7 @@ public class PropertyPageDefsTab extends AbstractCPropertyTab {
CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOMNG, !show_mng.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOMNG, !show_mng.getSelection());
CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOTOOLM, !show_tool.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_NOTOOLM, !show_tool.getSelection());
CDTPrefUtil.setBool(CDTPrefUtil.KEY_EXPORT, show_exp.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_EXPORT, show_exp.getSelection());
// ensure default is "true" for scanner discovery tab CDTPrefUtil.setBool(CDTPrefUtil.KEY_SHOW_SD, show_sd.getSelection());
CDTPrefUtil.setStr(CDTPrefUtil.KEY_SHOW_SD, Boolean.toString(show_sd.getSelection()));
ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(null, show_providers_tab.getSelection()); ScannerDiscoveryLegacySupport.setLanguageSettingsProvidersFunctionalityEnabled(null, show_providers_tab.getSelection());
CDTPrefUtil.setBool(CDTPrefUtil.KEY_TIPBOX, show_tipbox.getSelection()); CDTPrefUtil.setBool(CDTPrefUtil.KEY_TIPBOX, show_tipbox.getSelection());
int x = 0; int x = 0;