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

2005-02-24 Alain Magloire

Browse source 
Fix PR 86655: adds a link to the Text Editor preference
	Remove some warning, WorkbenchHelp was deprecated.
	* src/org/eclipse/cdt/internal/ui/editor/CEditor.java
	* src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java
	* src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java
	* src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java
	* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
	* src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java
	* src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java
	* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessage.properties
This commit is contained in:
Alain Magloire 2005-02-25 16:58:29 +00:00
parent 1f40d385a6
commit 8edeb9629e
10 changed files with 70 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,4 +1,16 @@
2005-02-15 Alain Magloire 2005-02-24 Alain Magloire
Fix PR 86655: adds a link to the Text Editor preference
Remove some warning, WorkbenchHelp was deprecated.
* src/org/eclipse/cdt/internal/ui/editor/CEditor.java
* src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java
* src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java
* src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java
* src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
* src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java
* src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java
* src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessage.properties
2005-02-24 Alain Magloire
Fix for 85633, Moving out all the CEditorPreference Text setting Fix for 85633, Moving out all the CEditorPreference Text setting
to eclipse EditorsUI preference page. to eclipse EditorsUI preference page.
* src/org/eclipse/cdt/internal/ui/editore/CEditor.java * src/org/eclipse/cdt/internal/ui/editore/CEditor.java

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
View file

@ -86,10 +86,10 @@ import org.eclipse.ui.IPartService;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionGroup; import org.eclipse.ui.actions.ActionGroup;
import org.eclipse.ui.editors.text.EditorsUI; import org.eclipse.ui.editors.text.EditorsUI;
import org.eclipse.ui.editors.text.TextEditor; import org.eclipse.ui.editors.text.TextEditor;
import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.ui.part.EditorActionBarContributor; import org.eclipse.ui.part.EditorActionBarContributor;
import org.eclipse.ui.part.IShowInSource; import org.eclipse.ui.part.IShowInSource;
import org.eclipse.ui.part.IShowInTargetList; import org.eclipse.ui.part.IShowInTargetList;
@ -809,7 +809,7 @@ public class CEditor extends TextEditor implements ISelectionChangedListener, IS
projectionViewer.doOperation(ProjectionViewer.TOGGLE); projectionViewer.doOperation(ProjectionViewer.TOGGLE);
WorkbenchHelp.setHelp(parent, ICHelpContextIds.CEDITOR_VIEW); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.CEDITOR_VIEW);
fEditorSelectionChangedListener= new EditorSelectionChangedListener(); fEditorSelectionChangedListener= new EditorSelectionChangedListener();
fEditorSelectionChangedListener.install(getSelectionProvider()); fEditorSelectionChangedListener.install(getSelectionProvider());

16
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AbstractPreferencePage.java
View file

@ -18,6 +18,7 @@ import java.util.Map;
import org.eclipse.cdt.internal.ui.dialogs.StatusInfo; import org.eclipse.cdt.internal.ui.dialogs.StatusInfo;
import org.eclipse.cdt.internal.ui.dialogs.StatusUtil; import org.eclipse.cdt.internal.ui.dialogs.StatusUtil;
import org.eclipse.cdt.internal.ui.util.PixelConverter;
import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.PreferenceConstants;
import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.preference.PreferenceConverter;
@ -147,6 +148,15 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
return textControl; return textControl;
} }
protected void addFiller(Composite composite) {
PixelConverter pixelConverter= new PixelConverter(composite);
Label filler= new Label(composite, SWT.LEFT );
GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_FILL);
gd.horizontalSpan= 2;
gd.heightHint= pixelConverter.convertHeightInCharsToPixels(1) / 2;
filler.setLayoutData(gd);
}
protected void numberFieldChanged(Text textControl) { protected void numberFieldChanged(Text textControl) {
String number = textControl.getText(); String number = textControl.getText();
IStatus status = validatePositiveNumber(number); IStatus status = validatePositiveNumber(number);
@ -184,6 +194,12 @@ public abstract class AbstractPreferencePage extends PreferencePage implements I
StatusUtil.applyToStatusLine(this, status); StatusUtil.applyToStatusLine(this, status);
} }
protected void indent(Control control) {
GridData gridData= new GridData();
gridData.horizontalIndent= 20;
control.setLayoutData(gridData);
}
protected Control addColorButton(Composite parent, String label, String key, int indentation) { protected Control addColorButton(Composite parent, String label, String key, int indentation) {
Composite composite = new Composite(parent, SWT.NONE); Composite composite = new Composite(parent, SWT.NONE);

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/AppearancePreferencePage.java
View file

@ -26,7 +26,7 @@ import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.PlatformUI;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.ui.PreferenceConstants; import org.eclipse.cdt.ui.PreferenceConstants;
@ -92,7 +92,7 @@ public class AppearancePreferencePage extends PreferencePage implements IWorkben
*/ */
public void createControl(Composite parent) { public void createControl(Composite parent) {
super.createControl(parent); super.createControl(parent);
WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.APPEARANCE_PREFERENCE_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.APPEARANCE_PREFERENCE_PAGE);
} }
/* /*

41
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorHoverConfigurationBlock.java
View file

@ -13,8 +13,6 @@ package org.eclipse.cdt.internal.ui.preferences;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import org.eclipse.cdt.internal.ui.ICHelpContextIds; import org.eclipse.cdt.internal.ui.ICHelpContextIds;
@ -59,7 +57,7 @@ import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.PlatformUI;
/** /**
* CEditorHoverConfigurationBlock * CEditorHoverConfigurationBlock
@ -157,19 +155,6 @@ public class CEditorHoverConfigurationBlock {
private StatusInfo fStatus; private StatusInfo fStatus;
Map fCheckBoxes= new HashMap();
private SelectionListener fCheckBoxListener= new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
Button button= (Button) e.widget;
fStore.setValue((String) fCheckBoxes.get(button), button.getSelection());
}
public void widgetSelected(SelectionEvent e) {
Button button= (Button) e.widget;
fStore.setValue((String) fCheckBoxes.get(button), button.getSelection());
}
};
public CEditorHoverConfigurationBlock(CEditorPreferencePage mainPreferencePage, OverlayPreferenceStore store) { public CEditorHoverConfigurationBlock(CEditorPreferencePage mainPreferencePage, OverlayPreferenceStore store) {
Assert.isNotNull(mainPreferencePage); Assert.isNotNull(mainPreferencePage);
Assert.isNotNull(store); Assert.isNotNull(store);
@ -361,7 +346,8 @@ public class CEditorHoverConfigurationBlock {
Dialog.applyDialogFont(hoverComposite); Dialog.applyDialogFont(hoverComposite);
WorkbenchHelp.setHelp(hoverComposite, ICHelpContextIds.C_EDITOR_HOVERS_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(hoverComposite, ICHelpContextIds.C_EDITOR_HOVERS_PAGE);
return hoverComposite; return hoverComposite;
} }
@ -408,13 +394,6 @@ public class CEditorHoverConfigurationBlock {
fShowEditorAnnotationCheckbox.setSelection(fStore.getBoolean(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS)); fShowEditorAnnotationCheckbox.setSelection(fStore.getBoolean(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS));
fModifierEditor.setEnabled(false); fModifierEditor.setEnabled(false);
Iterator e= fCheckBoxes.keySet().iterator();
while (e.hasNext()) {
Button b= (Button) e.next();
String key= (String) fCheckBoxes.get(b);
b.setSelection(fStore.getBoolean(key));
}
CEditorTextHoverDescriptor[] hoverDescs= getContributedHovers(); CEditorTextHoverDescriptor[] hoverDescs= getContributedHovers();
for (int i= 0; i < hoverDescs.length; i++) for (int i= 0; i < hoverDescs.length; i++)
fHoverTable.getItem(i).setChecked(hoverDescs[i].isEnabled()); fHoverTable.getItem(i).setChecked(hoverDescs[i].isEnabled());
@ -574,20 +553,6 @@ public class CEditorHoverConfigurationBlock {
} }
} }
private Button addCheckBox(Composite parent, String label, String key, int indentation) {
Button checkBox= new Button(parent, SWT.CHECK);
checkBox.setText(label);
GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
gd.horizontalIndent= indentation;
gd.horizontalSpan= 2;
checkBox.setLayoutData(gd);
checkBox.addSelectionListener(fCheckBoxListener);
fCheckBoxes.put(checkBox, key);
return checkBox;
}
private void addFiller(Composite composite) { private void addFiller(Composite composite) {
PixelConverter pixelConverter= new PixelConverter(composite); PixelConverter pixelConverter= new PixelConverter(composite);

35
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CEditorPreferencePage.java
View file

@ -36,12 +36,16 @@ import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Link;
import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.TabItem;
import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.PreferencesUtil;
/* /*
* The page for setting the editor options. * The page for setting the editor options.
@ -174,7 +178,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo
*/ */
public void createControl(Composite parent) { public void createControl(Composite parent) {
super.createControl(parent); super.createControl(parent);
WorkbenchHelp.setHelp(parent, ICHelpContextIds.C_EDITOR_PREF_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, ICHelpContextIds.C_EDITOR_PREF_PAGE);
} }
protected void handleListSelection() { protected void handleListSelection() {
@ -277,7 +281,8 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo
} }
}); });
WorkbenchHelp.setHelp(colorComposite, ICHelpContextIds.C_EDITOR_COLORS_PREF_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(colorComposite, ICHelpContextIds.C_EDITOR_COLORS_PREF_PAGE);
return colorComposite; return colorComposite;
} }
@ -334,10 +339,22 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo
return behaviorComposite; return behaviorComposite;
} }
private static void indent(Control control) { private Control createHeader(Composite parent) {
GridData gridData= new GridData(); String text = PreferencesMessages.getString("CEditorPreferencePage.link"); //$NON-NLS-1$
gridData.horizontalIndent= 20; Link link = new Link(parent, SWT.NONE);
control.setLayoutData(gridData); link.setText(text);
link.addListener (SWT.Selection, new Listener () {
public void handleEvent(Event event) {
String u = event.text;
System.out.println("Selection: " + u);
PreferencesUtil.createPreferenceDialogOn(getShell(), u, null, null);
}
});
GridData gridData= new GridData(SWT.FILL, SWT.BEGINNING, true, false);
gridData.widthHint= 150; // only expand further if anyone else requires it
link.setLayoutData(gridData);
return link;
} }
private void createDependency(final Button master, String masterKey, final Control slave) { private void createDependency(final Button master, String masterKey, final Control slave) {
@ -363,6 +380,8 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo
fCEditorHoverConfigurationBlock= new CEditorHoverConfigurationBlock(this, fOverlayStore); fCEditorHoverConfigurationBlock= new CEditorHoverConfigurationBlock(this, fOverlayStore);
fFoldingConfigurationBlock= new FoldingConfigurationBlock(fOverlayStore); fFoldingConfigurationBlock= new FoldingConfigurationBlock(fOverlayStore);
createHeader(parent);
TabFolder folder = new TabFolder(parent, SWT.NONE); TabFolder folder = new TabFolder(parent, SWT.NONE);
folder.setLayout(new TabFolderLayout()); folder.setLayout(new TabFolderLayout());
folder.setLayoutData(new GridData(GridData.FILL_BOTH)); folder.setLayoutData(new GridData(GridData.FILL_BOTH));
@ -405,7 +424,7 @@ public class CEditorPreferencePage extends AbstractPreferencePage implements IWo
String label = PreferencesMessages.getString("CEditorPreferencePage.Enable_Hyperlink_Navigation"); //$NON-NLS-1$ String label = PreferencesMessages.getString("CEditorPreferencePage.Enable_Hyperlink_Navigation"); //$NON-NLS-1$
addCheckBox(navComposite, label, CEditor.HYPERLINK_ENABLED, 0); addCheckBox(navComposite, label, CEditor.HYPERLINK_ENABLED, 0);
WorkbenchHelp.setHelp(navComposite, ICHelpContextIds.C_EDITOR_NAVIGATION_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(navComposite, ICHelpContextIds.C_EDITOR_NAVIGATION_PAGE);
return navComposite; return navComposite;
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CTemplatePreferencePage.java
View file

@ -27,7 +27,7 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.texteditor.templates.TemplatePreferencePage; import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
/** /**
@ -46,7 +46,7 @@ public class CTemplatePreferencePage extends TemplatePreferencePage {
*/ */
public void createControl(Composite parent) { public void createControl(Composite parent) {
super.createControl(parent); super.createControl(parent);
WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.TEMPLATE_PREFERENCE_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.TEMPLATE_PREFERENCE_PAGE);
} }
/* /*

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java
View file

@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Group;
import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.PlatformUI;
/** /**
* CodeAssistPreferencePage * CodeAssistPreferencePage
@ -138,7 +138,7 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage {
// label= PreferencesMessages.getString("CEditorPreferencePage.ContentAssistPage.parameterForegroundColor"); // label= PreferencesMessages.getString("CEditorPreferencePage.ContentAssistPage.parameterForegroundColor");
// addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_FOREGROUND, 0); // addColorButton(contentAssistComposite, label, ContentAssistPreference.PARAMETERS_FOREGROUND, 0);
WorkbenchHelp.setHelp(contentAssistComposite, ICHelpContextIds.C_EDITOR_CONTENT_ASSIST_PREF_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(contentAssistComposite, ICHelpContextIds.C_EDITOR_CONTENT_ASSIST_PREF_PAGE);
return contentAssistComposite; return contentAssistComposite;
} }

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeFormatterPreferencePage.java
View file

@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage; import org.eclipse.ui.IWorkbenchPreferencePage;
import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.PlatformUI;
/** /**
* *
@ -60,7 +60,7 @@ public class CodeFormatterPreferencePage extends PreferencePage implements IWork
applyDialogFont(parent); applyDialogFont(parent);
WorkbenchHelp.setHelp(getControl(), ICHelpContextIds.CODEFORMATTER_PREFERENCE_PAGE); PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.CODEFORMATTER_PREFERENCE_PAGE);
return fCodeFormatterBlock.createControl(topPane); return fCodeFormatterBlock.createControl(topPane);
} }

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
View file

@ -61,6 +61,7 @@ TodoTaskInputDialog.error.noSpace=Name can not start or end with a whitespace.
CEditorPreferencePage.cCommentTaskTags=Task Tags CEditorPreferencePage.cCommentTaskTags=Task Tags
CEditorPreferencePage.link=Note that some preferences may be set on the <a href="org.eclipse.ui.preferencePages.GeneralTextEditor">General Text</a> preference page.
CEditorPreferencePage.generalTabTitle=Appeara&nce CEditorPreferencePage.generalTabTitle=Appeara&nce
CEditorPreferencePage.annotationTabTitle= &Annotations CEditorPreferencePage.annotationTabTitle= &Annotations
CEditorPreferencePage.colorsTabTitle=Synta&x CEditorPreferencePage.colorsTabTitle=Synta&x