mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-29 19:45:01 +02:00
Fix for 186115: Remove Link with Editor preference option
This commit is contained in:
parent
d660f20353
commit
b61e9f2170
4 changed files with 13 additions and 15 deletions
|
@ -32,12 +32,10 @@ import org.eclipse.cdt.internal.ui.ICHelpContextIds;
|
||||||
import org.eclipse.cdt.internal.ui.util.PixelConverter;
|
import org.eclipse.cdt.internal.ui.util.PixelConverter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The page for setting c plugin preferences.
|
* The page for general C/C++ preferences.
|
||||||
*/
|
*/
|
||||||
public class CPluginPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
|
public class CPluginPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
|
||||||
|
|
||||||
|
|
||||||
private static final String LINK_TO_EDITOR_LABEL= PreferencesMessages.CPluginPreferencePage_linkToEditor_label;
|
|
||||||
private static final String USE_STRUCTURAL_PARSE_MODE_LABEL= PreferencesMessages.CPluginPreferencePage_structuralParseMode_label;
|
private static final String USE_STRUCTURAL_PARSE_MODE_LABEL= PreferencesMessages.CPluginPreferencePage_structuralParseMode_label;
|
||||||
|
|
||||||
public CPluginPreferencePage() {
|
public CPluginPreferencePage() {
|
||||||
|
@ -56,10 +54,12 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements
|
||||||
protected void createFieldEditors() {
|
protected void createFieldEditors() {
|
||||||
Composite parent= getFieldEditorParent();
|
Composite parent= getFieldEditorParent();
|
||||||
|
|
||||||
BooleanFieldEditor linkEditor= new BooleanFieldEditor(PreferenceConstants.PREF_LINK_TO_EDITOR, LINK_TO_EDITOR_LABEL, parent);
|
Label caption= new Label(parent, SWT.NULL);
|
||||||
addField(linkEditor);
|
caption.setText(PreferencesMessages.CPluginPreferencePage_caption);
|
||||||
|
GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
|
||||||
|
gd.horizontalSpan= 1;
|
||||||
|
caption.setLayoutData(gd);
|
||||||
|
|
||||||
// blank space
|
|
||||||
addFiller(parent);
|
addFiller(parent);
|
||||||
|
|
||||||
BooleanFieldEditor useStructuralParseMode= new BooleanFieldEditor(PreferenceConstants.PREF_USE_STRUCTURAL_PARSE_MODE, USE_STRUCTURAL_PARSE_MODE_LABEL, parent);
|
BooleanFieldEditor useStructuralParseMode= new BooleanFieldEditor(PreferenceConstants.PREF_USE_STRUCTURAL_PARSE_MODE, USE_STRUCTURAL_PARSE_MODE_LABEL, parent);
|
||||||
|
@ -68,8 +68,8 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements
|
||||||
String noteTitle= PreferencesMessages.CPluginPreferencePage_note;
|
String noteTitle= PreferencesMessages.CPluginPreferencePage_note;
|
||||||
String noteMessage= PreferencesMessages.CPluginPreferencePage_performanceHint;
|
String noteMessage= PreferencesMessages.CPluginPreferencePage_performanceHint;
|
||||||
Composite noteControl= createNoteComposite(JFaceResources.getDialogFont(), parent, noteTitle, noteMessage);
|
Composite noteControl= createNoteComposite(JFaceResources.getDialogFont(), parent, noteTitle, noteMessage);
|
||||||
GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
|
gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
|
||||||
gd.horizontalSpan= 2;
|
gd.horizontalSpan= 1;
|
||||||
noteControl.setLayoutData(gd);
|
noteControl.setLayoutData(gd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements
|
||||||
PixelConverter pixelConverter= new PixelConverter(composite);
|
PixelConverter pixelConverter= new PixelConverter(composite);
|
||||||
Label filler= new Label(composite, SWT.LEFT );
|
Label filler= new Label(composite, SWT.LEFT );
|
||||||
GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
|
GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
|
||||||
gd.horizontalSpan= 2;
|
gd.horizontalSpan= 1;
|
||||||
gd.heightHint= pixelConverter.convertHeightInCharsToPixels(1) / 2;
|
gd.heightHint= pixelConverter.convertHeightInCharsToPixels(1) / 2;
|
||||||
filler.setLayoutData(gd);
|
filler.setLayoutData(gd);
|
||||||
}
|
}
|
||||||
|
@ -98,7 +98,6 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements
|
||||||
* @see IWorkbenchPreferencePage#init
|
* @see IWorkbenchPreferencePage#init
|
||||||
*/
|
*/
|
||||||
public void init(IWorkbench workbench) {
|
public void init(IWorkbench workbench) {
|
||||||
CUIPlugin.getDefault().getPreferenceStore().setValue(CCorePlugin.PREF_USE_STRUCTURAL_PARSE_MODE, CCorePlugin.getDefault().useStructuralParseMode());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -106,10 +105,7 @@ public class CPluginPreferencePage extends FieldEditorPreferencePage implements
|
||||||
*/
|
*/
|
||||||
public static void initDefaults(IPreferenceStore prefs) {
|
public static void initDefaults(IPreferenceStore prefs) {
|
||||||
prefs.setDefault(PreferenceConstants.PREF_LINK_TO_EDITOR, false);
|
prefs.setDefault(PreferenceConstants.PREF_LINK_TO_EDITOR, false);
|
||||||
// The field is under Appearance page/preference
|
|
||||||
prefs.setDefault(PreferenceConstants.PREF_SHOW_CU_CHILDREN, true);
|
|
||||||
prefs.setDefault(PreferenceConstants.PREF_USE_STRUCTURAL_PARSE_MODE, false);
|
prefs.setDefault(PreferenceConstants.PREF_USE_STRUCTURAL_PARSE_MODE, false);
|
||||||
prefs.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* (non-Javadoc)
|
/* (non-Javadoc)
|
||||||
|
|
|
@ -221,7 +221,7 @@ public final class PreferencesMessages extends NLS {
|
||||||
public static String FileLanguagesPropertyPage_configurationColumn;
|
public static String FileLanguagesPropertyPage_configurationColumn;
|
||||||
public static String FileLanguagesPropertyPage_defaultMapping;
|
public static String FileLanguagesPropertyPage_defaultMapping;
|
||||||
|
|
||||||
public static String CPluginPreferencePage_linkToEditor_label;
|
public static String CPluginPreferencePage_caption;
|
||||||
public static String CPluginPreferencePage_structuralParseMode_label;
|
public static String CPluginPreferencePage_structuralParseMode_label;
|
||||||
public static String CPluginPreferencePage_note;
|
public static String CPluginPreferencePage_note;
|
||||||
public static String CPluginPreferencePage_performanceHint;
|
public static String CPluginPreferencePage_performanceHint;
|
||||||
|
|
|
@ -259,7 +259,7 @@ FileLanguagesPropertyPage_defaultMapping = (Default)
|
||||||
ProposalFilterPreferencesUtil_defaultFilterName=<Default Filter>
|
ProposalFilterPreferencesUtil_defaultFilterName=<Default Filter>
|
||||||
|
|
||||||
# C/C++ Preferences
|
# C/C++ Preferences
|
||||||
CPluginPreferencePage_linkToEditor_label= Link view selection to active editor
|
CPluginPreferencePage_caption= General settings for C/C++ Development:
|
||||||
CPluginPreferencePage_structuralParseMode_label= Follow unindexed header files when producing the outline view
|
CPluginPreferencePage_structuralParseMode_label= Follow unindexed header files when producing the outline view
|
||||||
CPluginPreferencePage_note= Note:
|
CPluginPreferencePage_note= Note:
|
||||||
CPluginPreferencePage_performanceHint= Enabling this preference may have negative impact on performance.
|
CPluginPreferencePage_performanceHint= Enabling this preference may have negative impact on performance.
|
||||||
|
|
|
@ -923,6 +923,8 @@ public class PreferenceConstants {
|
||||||
public static void initializeDefaultValues(IPreferenceStore store) {
|
public static void initializeDefaultValues(IPreferenceStore store) {
|
||||||
|
|
||||||
store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, false);
|
store.setDefault(PreferenceConstants.EDITOR_CORRECTION_INDICATION, false);
|
||||||
|
store.setDefault(PreferenceConstants.EDITOR_SHOW_SEGMENTS, false);
|
||||||
|
store.setDefault(PreferenceConstants.PREF_SHOW_CU_CHILDREN, true);
|
||||||
|
|
||||||
// Turned off by default since there are too many false reports right now
|
// Turned off by default since there are too many false reports right now
|
||||||
store.setDefault(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, false);
|
store.setDefault(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, false);
|
||||||
|
|
Loading…
Add table
Reference in a new issue