From: "Tor Arne Vestbø" <torarnv@gmail.com>
To: git@vger.kernel.org
Cc: Robin Rosenberg <robin.rosenberg@dewire.com>,
"Shawn O. Pearce" <spearce@spearce.org>
Subject: [EGIT PATCH v2] Fix invalid menubar and toolbar entries in plugin.xml
Date: Fri, 15 Aug 2008 00:07:21 +0200 [thread overview]
Message-ID: <48A4AC99.7080303@gmail.com> (raw)
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
prev parent reply other threads:[~2008-08-14 22:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-13 19:07 [PATCH] Fix invalid menubar and toolbar entries in plugin.xml Tor Arne Vestbø
2008-08-14 5:47 ` [EGIT PATCH] " Robin Rosenberg
2008-08-14 17:42 ` Robin Rosenberg
2008-08-14 19:13 ` Tor Arne Vestbø
2008-08-14 20:42 ` Robin Rosenberg
2008-08-14 20:45 ` [EGIT PATCH] Hide the Git menu and toolbars by default and fix the path of the Git menu Robin Rosenberg
2008-08-14 21:43 ` [EGIT PATCH] Fix invalid menubar and toolbar entries in plugin.xml Tor Arne Vestbø
2008-08-14 22:07 ` Tor Arne Vestbø [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48A4AC99.7080303@gmail.com \
--to=torarnv@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).