Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2016-09-19 21:36:04 +0000
committerThomas Wolf2016-09-19 22:07:33 +0000
commitd4a9be808decaee72119ba6f0d21f6f0c8c6cf54 (patch)
tree4c51809bbad9aa04c63669fe2104b7b44af6d8a7
parent5acbf04e927d8d5e2475964c277efa2fcec451f8 (diff)
downloadegit-d4a9be808decaee72119ba6f0d21f6f0c8c6cf54.tar.gz
egit-d4a9be808decaee72119ba6f0d21f6f0c8c6cf54.tar.xz
egit-d4a9be808decaee72119ba6f0d21f6f0c8c6cf54.zip
Clean up text editors' ruler context menu
EGit mistakenly contributed the Team menu also to the context menu in the ruler of the active text editor. Since we do want to use the locationURI "popup:org.eclipse.ui.popup.any" for the Team menu, the only way to ensure it isn't displayed in a ruler's context menu I see is to explicitly exclude it from the "#AbstractTextEditorRulerContext" menu. Also apply the same fix to gitflow's "Compare with develop" and "Replace with develop" contributions, and also restrict those to gitflow-enabled repositories. Bug: 469610 Change-Id: I19c843076adb7a4c3dc83980b44866d8b2c6de0d Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.egit.gitflow.ui/plugin.xml32
-rw-r--r--org.eclipse.egit.ui/plugin.xml12
2 files changed, 44 insertions, 0 deletions
diff --git a/org.eclipse.egit.gitflow.ui/plugin.xml b/org.eclipse.egit.gitflow.ui/plugin.xml
index b603ade427..55fa92d4c7 100644
--- a/org.eclipse.egit.gitflow.ui/plugin.xml
+++ b/org.eclipse.egit.gitflow.ui/plugin.xml
@@ -707,6 +707,22 @@
<visibleWhen
checkEnabled="false">
<and>
+ <with variable="activeMenu">
+ <not>
+ <iterate operator="or">
+ <or>
+ <equals value="#AbstractTextEditorRulerContext" />
+ <equals value="#OverviewRulerContext" />
+ </or>
+ </iterate>
+ </not>
+ </with>
+ <with variable="org.eclipse.egit.ui.currentRepository">
+ <test
+ forcePluginActivation="true"
+ property="GitFlowRepository.isInitialized">
+ </test>
+ </with>
<reference
definitionId="org.eclipse.egit.ui.resourcesSingleRepository">
</reference>
@@ -728,6 +744,22 @@
<visibleWhen
checkEnabled="false">
<and>
+ <with variable="activeMenu">
+ <not>
+ <iterate operator="or">
+ <or>
+ <equals value="#AbstractTextEditorRulerContext" />
+ <equals value="#OverviewRulerContext" />
+ </or>
+ </iterate>
+ </not>
+ </with>
+ <with variable="org.eclipse.egit.ui.currentRepository">
+ <test
+ forcePluginActivation="true"
+ property="GitFlowRepository.isInitialized">
+ </test>
+ </with>
<reference
definitionId="org.eclipse.egit.ui.resourcesSingleRepository">
</reference>
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index a466f9a82e..fdedf272b1 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -4513,6 +4513,18 @@
</test>
</visibleWhen>
</command>
+ <visibleWhen>
+ <with variable="activeMenu">
+ <not>
+ <iterate operator="or">
+ <or>
+ <equals value="#AbstractTextEditorRulerContext" />
+ <equals value="#OverviewRulerContext" />
+ </or>
+ </iterate>
+ </not>
+ </with>
+ </visibleWhen>
</menu>
</menuContribution>
<menuContribution

Back to the top