From c93d4583c7539e762dd60c1910bca77e74f3a2c7 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sun, 30 Jun 2013 22:47:29 -0400 Subject: [PATCH] Bug 411970: Default colors in Makefile Editor consistent with C/C++ editor --- .../ui/preferences/MakefileEditorPreferencePage.java | 4 ++++ .../MakefilePreferencesMessages.properties | 2 +- .../cdt/make/internal/ui/text/ColorManager.java | 12 ++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java index 418bc055349..2afa91e3b5b 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefileEditorPreferencePage.java @@ -449,6 +449,10 @@ public class MakefileEditorPreferencePage extends AbstractMakefileEditorPreferen PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MACRO_DEF_COLOR, ColorManager.MAKE_MACRO_DEF_RGB); PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MACRO_REF_COLOR, ColorManager.MAKE_MACRO_REF_RGB); PreferenceConverter.setDefault(prefs, ColorManager.MAKE_MATCHING_BRACKETS_COLOR, ColorManager.MAKE_MATCHING_BRACKETS_RGB); + + prefs.setDefault(ColorManager.MAKE_KEYWORD_COLOR + MakefileEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, true); + prefs.setDefault(ColorManager.MAKE_FUNCTION_COLOR + MakefileEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, true); + prefs.setDefault(ColorManager.MAKE_MACRO_DEF_COLOR + MakefileEditorPreferenceConstants.EDITOR_BOLD_SUFFIX, true); } } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefilePreferencesMessages.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefilePreferencesMessages.properties index e3ccfc80fad..1db393ab6f5 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefilePreferencesMessages.properties +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/preferences/MakefilePreferencesMessages.properties @@ -54,7 +54,7 @@ MakefileEditorPreferencePage.makefile_editor_function=Function MakefileEditorPreferencePage.makefile_editor_keyword=Keyword MakefileEditorPreferencePage.makefile_editor_target=Target MakefileEditorPreferencePage.makefile_editor_matching_bracket=Matching brackets highlight -MakefileEditorPreferencePage.makefile_editor_default=Default +MakefileEditorPreferencePage.makefile_editor_default=Others MakefileSettingsPreferencePage.style=Style of Makefile MakefileSettingsPreferencePage.path.label=Makefile include directories diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/ColorManager.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/ColorManager.java index 58eea75eda1..a36bc103780 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/ColorManager.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/ColorManager.java @@ -28,13 +28,13 @@ public class ColorManager implements ISharedTextColors { public static final String MAKE_DEFAULT_COLOR = "org.eclipse.cdt.make.ui.editor.default"; //$NON-NLS-1$ public static final String MAKE_MATCHING_BRACKETS_COLOR = "org.eclipse.cdt.make.ui.editor.matching.brackets.color"; //$NON-NLS-1$ - public static final RGB MAKE_COMMENT_RGB = new RGB(128, 0, 0); - public static final RGB MAKE_KEYWORD_RGB = new RGB(128, 255, 0); - public static final RGB MAKE_FUNCTION_RGB = new RGB(128, 0, 128); - public static final RGB MAKE_MACRO_DEF_RGB = new RGB(0, 0, 128); - public static final RGB MAKE_MACRO_REF_RGB = new RGB(0, 128, 0); + public static final RGB MAKE_COMMENT_RGB = new RGB(63, 127, 95); + public static final RGB MAKE_KEYWORD_RGB = new RGB(127, 0, 85); + public static final RGB MAKE_FUNCTION_RGB = new RGB(208, 15, 63); + public static final RGB MAKE_MACRO_DEF_RGB = new RGB(78,118,214); + public static final RGB MAKE_MACRO_REF_RGB = new RGB(0, 0, 192); public static final RGB MAKE_DEFAULT_RGB = new RGB(0, 0, 0); - public static final RGB MAKE_MATCHING_BRACKETS_RGB = new RGB(170,170,170); + public static final RGB MAKE_MATCHING_BRACKETS_RGB = new RGB(170, 170, 170); private static ColorManager fgColorManager;