X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java index 569458b..902a866 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java @@ -1507,6 +1507,7 @@ public class PHPEditorPreferencePage extends PreferencePage PreferenceConstants.EDITOR_CLOSE_BRACKETS_HTML, 1); return composite; } + private static void indent(Control control) { GridData gridData = new GridData(); gridData.horizontalIndent = 20; @@ -1635,6 +1636,7 @@ public class PHPEditorPreferencePage extends PreferencePage * @see PreferencePage#createContents(Composite) */ protected Control createContents(Composite parent) { + initializeDefaultColors(); fOverlayStore.load(); fOverlayStore.start(); TabFolder folder = new TabFolder(parent, SWT.NONE); @@ -1657,12 +1659,12 @@ public class PHPEditorPreferencePage extends PreferencePage item.setText(PHPUIMessages .getString("PHPEditorPreferencePage.behaviourTab.title")); //$NON-NLS-1$ item.setControl(createBehaviourPage(folder)); - // item= new TabItem(folder, SWT.NONE); - // item.setText(PHPUIMessages.getString("PHPEditorPreferencePage.hoverTab.title")); - // //$NON-NLS-1$ - // fJavaEditorHoverConfigurationBlock= new - // JavaEditorHoverConfigurationBlock(fOverlayStore); - // item.setControl(fJavaEditorHoverConfigurationBlock.createControl(folder)); + item= new TabItem(folder, SWT.NONE); + item.setText(PHPUIMessages.getString("PHPEditorPreferencePage.hoverTab.title")); + //$NON-NLS-1$ +// fJavaEditorHoverConfigurationBlock= new +// JavaEditorHoverConfigurationBlock(fOverlayStore); +// item.setControl(fJavaEditorHoverConfigurationBlock.createControl(folder)); initialize(); return folder; } @@ -1750,6 +1752,20 @@ public class PHPEditorPreferencePage extends PreferencePage updateAutoactivationControls(); // fJavaEditorHoverConfigurationBlock.initializeFields(); } + + private void initializeDefaultColors() { + if (!getPreferenceStore().contains(PreferenceConstants.EDITOR_BACKGROUND_COLOR)) { + RGB rgb= getControl().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB(); + PreferenceConverter.setDefault(fOverlayStore, PreferenceConstants.EDITOR_BACKGROUND_COLOR, rgb); + PreferenceConverter.setDefault(getPreferenceStore(), PreferenceConstants.EDITOR_BACKGROUND_COLOR, rgb); + } + if (!getPreferenceStore().contains(PreferenceConstants.EDITOR_FOREGROUND_COLOR)) { + RGB rgb= getControl().getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND).getRGB(); + PreferenceConverter.setDefault(fOverlayStore, PreferenceConstants.EDITOR_FOREGROUND_COLOR, rgb); + PreferenceConverter.setDefault(getPreferenceStore(), PreferenceConstants.EDITOR_FOREGROUND_COLOR, rgb); + } + } + private void updateAutoactivationControls() { boolean autoactivation = fOverlayStore .getBoolean(PreferenceConstants.CODEASSIST_AUTOACTIVATION);