[EGIT PATCH v2] Fix invalid menubar and toolbar entries in plugin.xml
- From
Tor Arne Vestbø <torarnv@gmail.com>
- Date
- Aug 14, 2008, 22:07 UTC
- Message-ID
- <48A4AC99.7080303@gmail.com>
- In-Reply-To
- <200808142242.20476.robin.rosenberg.lists@dewire.com>
The default toolbar is identified by the path 'Normal', and we use the default group, named by 'additions'.
Also, renamed the action set label to be consistent with what the other platform plugins do (no 'actions' postfix).
Signed-off-by: Tor Arne Vestbø <torarnv@gmail.com> --- org.spearce.egit.ui/plugin.properties | 2 +- org.spearce.egit.ui/plugin.xml | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/org.spearce.egit.ui/plugin.properties b/org.spearce.egit.ui/plugin.properties index 3240ec0..ce3b058 100644 --- a/org.spearce.egit.ui/plugin.properties +++ b/org.spearce.egit.ui/plugin.properties @@ -41,7 +41,7 @@ ResetAction_tooltip=Reset the current branch to the same or another commit BranchAction_label=&Branch... BranchAction_tooltip=Switch to another branch -GitActions_label=Git actions +GitActions_label=Git GitMenu_label=&Git diff --git a/org.spearce.egit.ui/plugin.xml b/org.spearce.egit.ui/plugin.xml index b809300..0b59a6e 100644 --- a/org.spearce.egit.ui/plugin.xml +++ b/org.spearce.egit.ui/plugin.xml @@ -241,13 +241,16 @@ description="Common things to do with Git" id="org.spearce.egit.ui.gitaction" label="%GitActions_label" - visible="true" + visible="false" > <menu id="org.spearce.egit.ui.gitmenu" label="%GitMenu_label" - path="org.spearce.egit.ui.gitmenu" + path="additions" > + <separator + name="repositoryGroup"> + </separator> </menu> <action class="org.spearce.egit.ui.internal.actions.BranchAction" @@ -256,8 +259,8 @@ id="org.spearce.egit.ui.actionbranch" label="%BranchAction_label" style="push" - menubarPath="org.spearce.egit.ui.gitmenu/repo" - toolbarPath="org.spearce.egit.ui" + menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup" + toolbarPath="Normal/additions" tooltip="%BranchAction_tooltip"> </action> <action @@ -267,8 +270,8 @@ id="org.spearce.egit.ui.actioncommit" label="%CommitAction_label" style="push" - menubarPath="org.spearce.egit.ui.gitmenu/repo" - toolbarPath="org.spearce.egit.ui" + menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup" + toolbarPath="Normal/additions" tooltip="%CommitAction_tooltip"> </action> <action @@ -278,8 +281,8 @@ id="org.spearce.egit.ui.actionreset" label="%ResetAction_label" style="push" - menubarPath="org.spearce.egit.ui.gitmenu/repo" - toolbarPath="org.spearce.egit.ui" + menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup" + toolbarPath="Normal/additions" tooltip="%ResetAction_tooltip"> </action> <action @@ -288,9 +291,9 @@ icon="icons/toolbar/tracke.png" id="org.spearce.egit.ui.trackaction" label="%TrackAction_label" - menubarPath="org.spearce.egit.ui.gitmenu/repo" style="push" - toolbarPath="org.spearce.egit.ui" + menubarPath="org.spearce.egit.ui.gitmenu/repositoryGroup" + toolbarPath="Normal/additions" tooltip="Start tracking the selected resources"> </action> </actionSet>
-- 1.5.6.5