Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-02-04 18:48:02 +0000
committerjames2002-02-04 18:48:02 +0000
commit18caaa714c1faff83624fda3f40eba2e6f108c97 (patch)
tree03e8eb4a6d28d2cc899aa0d4775767962fd8c700
parent32bbe8040ad833604bfc38ed3accc26c37de7fea (diff)
downloadeclipse.platform.team-18caaa714c1faff83624fda3f40eba2e6f108c97.tar.gz
eclipse.platform.team-18caaa714c1faff83624fda3f40eba2e6f108c97.tar.xz
eclipse.platform.team-18caaa714c1faff83624fda3f40eba2e6f108c97.zip
9048: Put team menu back in
-rw-r--r--bundles/org.eclipse.team.cvs.ui/plugin.xml.off36
-rw-r--r--bundles/org.eclipse.team.ui/plugin.properties4
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml.off22
3 files changed, 38 insertions, 24 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
index 6155cf478..2c710b452 100644
--- a/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
+++ b/bundles/org.eclipse.team.cvs.ui/plugin.xml.off
@@ -57,25 +57,17 @@
id="org.eclipse.team.ccvs.ui.ResourceContributions"
objectClass="org.eclipse.core.resources.IResource" adaptable="true">
<filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
- <menu
- id="cvs.main"
- path="additions"
- label="%CVSGroupMenu.label">
- <separator name="nativeGroup"/>
- <separator name="enhancedGroup"/>
- <separator name="disconnectGroup"/>
- </menu>
<action
id="org.eclipse.team.ccvs.ui.tag"
label="%TagAction.label"
tooltip="%TagAction.tooltip"
- menubarPath="cvs.main/enhancedGroup"
+ menubarPath="team.main/group2"
class="org.eclipse.team.internal.ccvs.ui.actions.TagAction"/>
<action
id="org.eclipse.team.ccvs.ui.add"
label="%AddAction.label"
tooltip="%AddAction.tooltip"
- menubarPath="cvs.main/enhancedGroup"
+ menubarPath="team.main/group2"
class="org.eclipse.team.internal.ccvs.ui.actions.AddAction"/>
<action
id="org.eclipse.team.ccvs.ui.compareWithRemote"
@@ -87,7 +79,7 @@
id="org.eclipse.team.ccvs.ui.update"
label="%UpdateAction.label"
tooltip="%UpdateAction.tooltip"
- menubarPath="cvs.main/enhancedGroup"
+ menubarPath="team.main/group2"
class="org.eclipse.team.internal.ccvs.ui.actions.UpdateAction"/>
<action
id="org.eclipse.team.ccvs.ui.replace"
@@ -99,31 +91,31 @@
id="org.eclipse.team.ccvs.ui.commit"
label="%CommitAction.label"
tooltip="%CommitAction.tooltip"
- menubarPath="cvs.main/enhancedGroup"
+ menubarPath="team.main/group2"
class="org.eclipse.team.internal.ccvs.ui.actions.CommitAction"/>
<action
id="org.eclipse.team.ccvs.ui.branch"
label="%BranchAction.label"
tooltip="%BranchAction.tooltip"
- menubarPath="cvs.main/nativeGroup"
+ menubarPath="team.main/group1"
class="org.eclipse.team.internal.ccvs.ui.actions.BranchAction"/>
<action
id="org.eclipse.team.ccvs.ui.GenerateDiff"
label="%GenerateDiff.label"
tooltip="%GenerateDiff.tooltip"
- menubarPath="cvs.main/nativeGroup"
+ menubarPath="team.main/group1"
class="org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction"/>
<action
id="org.eclipse.team.ccvs.ui.showHistory"
label="%ShowHistoryAction.label"
tooltip="%ShowHistoryAction.tooltip"
- menubarPath="cvs.main/nativeGroup"
+ menubarPath="team.main/group1"
class="org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction"/>
<action
id="org.eclipse.team.ccvs.ui.sync"
label="%Synchronize.label"
tooltip="%Synchronize.tooltip"
- menubarPath="cvs.main/nativeGroup"
+ menubarPath="team.main/group1"
class="org.eclipse.team.internal.ccvs.ui.actions.SyncAction"/>
</objectContribution>
<objectContribution
@@ -140,7 +132,7 @@
id="org.eclipse.team.ccvs.ui.merge"
label="%MergeAction.label"
tooltip="%MergeAction.tooltip"
- menubarPath="cvs.main/nativeGroup"
+ menubarPath="team.main/group1"
class="org.eclipse.team.internal.ccvs.ui.actions.MergeAction"/>
</objectContribution>
<objectContribution
@@ -157,7 +149,7 @@
id="org.eclipse.team.ccvs.ui.unmanage"
label="%UnmanageFolder.label"
tooltip="%UnmanageFolder.tooltip"
- menubarPath="cvs.main/disconnectGroup"
+ menubarPath="team.main/projectGroup"
class="org.eclipse.team.internal.ccvs.ui.actions.UnmanageAction"/>
</objectContribution>
<objectContribution
@@ -165,17 +157,17 @@
objectClass="org.eclipse.core.resources.IFile" adaptable="true">
<filter name="projectNature" value="org.eclipse.team.cvs.core.cvsnature"/>
<menu
- id="cvs.main"
+ id="team.main"
path="additions"
label="%CVSGroupMenu.label">
- <separator name="nativeGroup"/>
- <separator name="enhancedGroup"/>
+ <separator name="group1"/>
+ <separator name="group2"/>
</menu>
<action
id="org.eclipse.team.ccvs.ui.delete"
label="%Delete.label"
tooltip="%Delete.tooltip"
- menubarPath="cvs.main/enhancedGroup"
+ menubarPath="team.main/group2"
class="org.eclipse.team.ui.actions.DeleteAction"/>
<action
id="org.eclipse.team.ccvs.ui.compareWithRevision"
diff --git a/bundles/org.eclipse.team.ui/plugin.properties b/bundles/org.eclipse.team.ui/plugin.properties
index 4eeeedb30..b69fa8f06 100644
--- a/bundles/org.eclipse.team.ui/plugin.properties
+++ b/bundles/org.eclipse.team.ui/plugin.properties
@@ -3,4 +3,6 @@ pluginName=Team Support UI
ASCIIPreferencePage.name=ASCII Resources
ConfigureProject.label=&Share Project...
-ConfigureProject.tooltip=Share the project with others using a version and configuration management plug-in. \ No newline at end of file
+ConfigureProject.tooltip=Share the project with others using a version and configuration management plug-in.
+
+TeamGroupMenu.label=Team \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/plugin.xml.off b/bundles/org.eclipse.team.ui/plugin.xml.off
index b330b49a6..efe75e795 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml.off
+++ b/bundles/org.eclipse.team.ui/plugin.xml.off
@@ -46,13 +46,33 @@
<extension
point="org.eclipse.ui.popupMenus">
<objectContribution
+ id="org.eclipse.team.ui.ResourceContributions"
+ objectClass="org.eclipse.core.resources.IResource" adaptable="true">
+ <menu
+ id="team.main"
+ path="additions"
+ label="%TeamGroupMenu.label">
+ <separator name="group1"/>
+ <separator name="group2"/>
+ <separator name="group3"/>
+ <separator name="group4"/>
+ <separator name="group5"/>
+ <separator name="group6"/>
+ <separator name="group7"/>
+ <separator name="group8"/>
+ <separator name="group9"/>
+ <separator name="group10"/>
+ <separator name="projectGroup"/>
+ </menu>
+ </objectContribution>
+ <objectContribution
id="org.eclipse.team.ui.ProjectContributions"
objectClass="org.eclipse.core.resources.IProject" adaptable="true">
<action
id="org.eclipse.team.ui.ConfigureProject"
label="%ConfigureProject.label"
tooltip="%ConfigureProject.tooltip"
- menubarPath="additions"
+ menubarPath="team.main/projectGroup"
enablesFor="1"
class="org.eclipse.team.ui.actions.ConfigureProjectAction">
</action>

Back to the top