diff options
| author | Anton Leherbauer | 2008-04-03 08:57:57 +0000 |
|---|---|---|
| committer | Anton Leherbauer | 2008-04-03 08:57:57 +0000 |
| commit | 0ba4cad18dea3415787a448f27902ea747605514 (patch) | |
| tree | 8f617e61adeaa16009f92db05c51f906e8e22a9c | |
| parent | fdff1402b290634bb8c869a31c9406eabbef755e (diff) | |
| download | org.eclipse.cdt-0ba4cad18dea3415787a448f27902ea747605514.tar.gz org.eclipse.cdt-0ba4cad18dea3415787a448f27902ea747605514.tar.xz org.eclipse.cdt-0ba4cad18dea3415787a448f27902ea747605514.zip | |
Fix for 224567: Makefile compare editor uses non fixed width font
| -rw-r--r-- | build/org.eclipse.cdt.make.ui/plugin.properties | 9 | ||||
| -rw-r--r-- | build/org.eclipse.cdt.make.ui/plugin.xml | 13 |
2 files changed, 20 insertions, 2 deletions
diff --git a/build/org.eclipse.cdt.make.ui/plugin.properties b/build/org.eclipse.cdt.make.ui/plugin.properties index 93b31e7807d..7522f31c9fc 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.properties +++ b/build/org.eclipse.cdt.make.ui/plugin.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2007 QNX Software Systems and others. +# Copyright (c) 2003, 2008 QNX Software Systems and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ # # Contributors: # QNX Software Systems - initial API and implementation +# Anton Leherbauer (Wind River Systems) ############################################################################### pluginName=C/C++ Standard make Build UI @@ -78,4 +79,8 @@ CDTPathSymbolsProperty.name=C/C++ Project paths and symbols Includes=Includes Symbols=Symbols # menu label -Make.targets.menu=Make targets
\ No newline at end of file +Make.targets.menu=Make targets + +# Makefile compare font +makeCompareFontDefinition.label= Makefile compare text font +makeCompareFontDefinition.description= The Makefile compare text font is used by Makefile compare/merge tools. diff --git a/build/org.eclipse.cdt.make.ui/plugin.xml b/build/org.eclipse.cdt.make.ui/plugin.xml index 4e006e1bf32..979559724ab 100644 --- a/build/org.eclipse.cdt.make.ui/plugin.xml +++ b/build/org.eclipse.cdt.make.ui/plugin.xml @@ -489,4 +489,17 @@ contentMergeViewerId="org.eclipse.cdt.make.ui.compare.MakefileContentViewerCreator"> </contentTypeBinding> </extension> + <!-- compare font --> + <extension + point="org.eclipse.ui.themes"> + <fontDefinition + label="%makeCompareFontDefinition.label" + defaultsTo="org.eclipse.jface.textfont" + categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer" + id="org.eclipse.cdt.make.internal.ui.compare.MakefileMergeViewer"> + <description> + %makeCompareFontDefinition.description + </description> + </fontDefinition> + </extension> </plugin> |