mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

fixed bug# 25886

Browse source
This commit is contained in:
David Inglis 2002-11-21 18:29:30 +00:00
parent 190184e79a
commit 70bf422a16
3 changed files with 10 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,8 @@
2002-11-21 David Inglis
* plugin.xml
* plugin.properties
fixed bug #25886 - duplicate menu entries for compare and replace
2002-11-20 Alain Magloire
Move the Index property page in the C/C++ project category.

30
core/org.eclipse.cdt.ui/plugin.properties
View file

@ -58,35 +58,5 @@ CFolderActionSet.description=C Folder Action Set
Editors.DefaultTextEditor = Default Text Editor
AsmEditor.name = Assembly Editor
#VCM
CompareWithMenu.label=Comp&are With
CompareWithEachOtherAction.label=&Each Other
CompareWithEachOtherAction.tooltip=Compare the Selected Resources with Each Other
CompareWithHistoryAction.label= &Local History...
CompareWithHistoryAction.tooltip= Compare the Selected Resource with Local History
ReplaceWithMenu.label=Rep&lace With
ReplaceFromHistoryAction.label=&Local History...
ReplaceFromHistoryAction.tooltip=Replace the Selected Resource with Local History
Editors.DefaultTextEditor = Default Text Editor
#VCM
CompareWithMenu.label=Comp&are With
CompareWithEachOtherAction.label=&Each Other
CompareWithEachOtherAction.tooltip=Compare the Selected Resources with Each Other
CompareWithHistoryAction.label= &Local History...
CompareWithHistoryAction.tooltip= Compare the Selected Resource with Local History
ReplaceWithMenu.label=Rep&lace With
ReplaceFromHistoryAction.label=&Local History...
ReplaceFromHistoryAction.tooltip=Replace the Selected Resource with Local History
# Task Action
DeleteTaskAction.label=Delete C/C++ Markers

58
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -29,9 +29,9 @@
<extension-point id="CCompletionContributor" name="%completionContributorName"/>
<extension-point id="CElementFilters" name="%elementFiltersName"/>
<!-- =========================================================================== -->
<!-- Extension point: org.eclipse.cdt.ui.textHovers -->
<!-- Purpose: Provide a perspective specific text hovering for CEditor files -->
<!-- Extension Implementation: must implement org.eclipse.jface.text.ITextHover -->
<!-- Purpose: Provide a perspective specific text hovering for CEditor files -->
<!-- Extension point: org.eclipse.cdt.ui.textHovers -->
<!-- =========================================================================== -->
<extension-point id="textHovers" name="%textHoversName"/>
@ -139,8 +139,8 @@
id="org.eclipse.cdt.ui.MakeView">
</view>
</extension>
<!-- For C Wizards -->
<!-- The wizards -->
<!-- For C Wizards -->
<extension
point="org.eclipse.ui.newWizards">
<category
@ -189,7 +189,7 @@
%StdCCWizard.description
</description>
</wizard>
<!-- For C++ Conversion Wizard -->
<!-- For C++ Conversion Wizard -->
<wizard
name="%StdMakeConversionWizard.name"
icon="icons/full/ctool16/newcc_app.gif"
@ -254,8 +254,8 @@
point="org.eclipse.ui.propertyPages">
<page
objectClass="org.eclipse.core.resources.IProject"
name="%CProjectPropertyPage.name"
adaptable="true"
name="%CProjectPropertyPage.name"
class="org.eclipse.cdt.internal.ui.preferences.CProjectPropertyPage"
id="org.eclipse.cdt.ui.preferences.CProjectPropertyPage">
<filter
@ -280,54 +280,6 @@
</extension>
<extension
point="org.eclipse.ui.popupMenus">
<objectContribution
objectClass="org.eclipse.cdt.core.model.ICElement"
id="org.eclipse.cdt.ui.compare.CElementContributions">
<menu
label="%CompareWithMenu.label"
path="additions"
id="compareWithMenu">
<separator
name="compareWithGroup">
</separator>
</menu>
<action
label="%CompareWithEachOtherAction.label"
tooltip="%CompareWithEachOtherAction.tooltip"
class="org.eclipse.compare.internal.CompareAction"
menubarPath="compareWithMenu/compareWithGroup"
enablesFor="2+"
id="org.eclipse.cdt.ui.actions.CompareWithEachOther">
</action>
</objectContribution>
<objectContribution
objectClass="org.eclipse.cdt.core.model.ICElement"
id="org.eclipse.cdt.ui.compare.CompilationUnitContributions">
<menu
label="%ReplaceWithMenu.label"
path="additions"
id="replaceWithMenu">
<separator
name="replaceWithGroup">
</separator>
</menu>
<action
label="%ReplaceFromHistoryAction.label"
tooltip="%ReplaceFromHistoryAction.tooltip"
class="org.eclipse.compare.internal.ReplaceWithEditionAction"
menubarPath="replaceWithMenu/replaceWithGroup"
enablesFor="1"
id="org.eclipse.cdt.ui.actions.ReplaceFromHistory">
</action>
<action
label="%CompareWithHistoryAction.label"
tooltip="%CompareWithHistoryAction.tooltip"
class="org.eclipse.compare.internal.CompareWithEditionAction"
menubarPath="compareWithMenu/compareWithGroup"
enablesFor="1"
id="compareWithHistory">
</action>
</objectContribution>
<objectContribution
objectClass="org.eclipse.core.resources.IMarker"
id="org.eclipse.cdt.ui.action.DeleteTaskAction">