The default toolbar is identified by the path 'Normal',
and we use the default group, named by 'additions'.
The menu entry was not used, and was causing an extra
empty space in the menu bar.
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@xxxxxxxxx>
---
org.spearce.egit.ui/plugin.properties | 2 +-
org.spearce.egit.ui/plugin.xml | 18 ++++--------------
2 files changed, 5 insertions(+), 15 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 393121f..97eb2a6 100644
--- a/org.spearce.egit.ui/plugin.xml
+++ b/org.spearce.egit.ui/plugin.xml
@@ -243,12 +243,6 @@
label="%GitActions_label"
visible="true"
>
- <menu
- id="org.spearce.egit.ui.gitmenu"
- label="%GitMenu_label"
- path="org.spearce.egit.ui.gitmenu"
- >
- </menu>
<action
class="org.spearce.egit.ui.internal.actions.BranchAction"
disabledIcon="icons/toolbar/checkoutd.png"
@@ -256,8 +250,7 @@
id="org.spearce.egit.ui.actionbranch"
label="%BranchAction_label"
style="push"
- menubarPath="org.spearce.egit.ui.gitmenu/repo"
- toolbarPath="org.spearce.egit.ui"
+ toolbarPath="Normal/additions"
tooltip="%BranchAction_tooltip">
</action>
<action
@@ -267,8 +260,7 @@
id="org.spearce.egit.ui.actioncommit"
label="%CommitAction_label"
style="push"
- menubarPath="org.spearce.egit.ui.gitmenu/repo"
- toolbarPath="org.spearce.egit.ui"
+ toolbarPath="Normal/additions"
tooltip="%CommitAction_tooltip">
</action>
<action
@@ -278,8 +270,7 @@
id="org.spearce.egit.ui.actionreset"
label="%ResetAction_label"
style="push"
- menubarPath="org.spearce.egit.ui.gitmenu/repo"
- toolbarPath="org.spearce.egit.ui"
+ toolbarPath="Normal/additions"
tooltip="%ResetAction_tooltip">
</action>
<action
@@ -288,9 +279,8 @@
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"
+ toolbarPath="Normal/additions"
tooltip="Start tracking the selected resources">
</action>
</actionSet>
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
