From 9ca5ae11e97744a2023a61ffd495fd6da94b0b93 Mon Sep 17 00:00:00 2001
From: Tomasz Zarna <tomasz.zarna@tasktop.com>
Date: Tue, 19 Mar 2013 19:27:17 +0100
Subject: [PATCH] Move 'Untrack' to Advanced Menu

Bug: 345777
Change-Id: Icc5951f1b8967368e04a07fcbec47abdf798059e
---
 org.eclipse.egit.ui/plugin.properties |  1 +
 org.eclipse.egit.ui/plugin.xml        | 48 ++++++++++++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index 2e5847113..3220b86cf 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -154,6 +154,7 @@ DeleteFileCommand = Delete
 OpenCommand = Open
 LinkWithSelectionCommand = Link with Selection
 SynchronizeCommand = Synchronize...
+UntrackCommand.name = Untrack
 
 ConfigurationPage.name = Configuration
 CreateTagCommand = Create Tag...
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 5c8f22970..20c43b6e4 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -101,12 +101,6 @@
                value="org.eclipse.team.core.repository=org.eclipse.egit.core.GitProvider">
          </filter>
          <action
-               class="org.eclipse.egit.ui.internal.actions.UntrackAction"
-               icon="$nl$/icons/obj16/untrack.gif"
-               id="org.eclipse.egit.ui.internal.actions.Untrack"
-               label="%UntrackAction_label"
-               menubarPath="team.main/group8"/>
-         <action
                class="org.eclipse.egit.ui.internal.actions.CommitAction"
                definitionId="org.eclipse.egit.ui.team.Commit"
                icon="$nl$/icons/obj16/commit.gif"
@@ -1786,6 +1780,22 @@
                </and>
          </activeWhen>
       </handler>
+      <handler
+            commandId="org.eclipse.egit.ui.team.Untrack">
+         <activeWhen>
+            <iterate>
+               <and>
+                  <or>
+                     <instanceof value="org.eclipse.core.resources.IResource" />
+		             <adapt type="org.eclipse.core.resources.IResource" />
+	              </or>
+                    <test
+                          property="projectPersistentProperty"
+                          value="org.eclipse.team.core.repository=org.eclipse.egit.core.GitProvider"/>
+               </and>
+               </iterate>
+         </activeWhen>
+      </handler>
    </extension>
    <extension
          point="org.eclipse.ui.views">
@@ -3818,6 +3828,26 @@
                      </and>
                   </visibleWhen>
                </command>
+               <command
+                     commandId="org.eclipse.egit.ui.team.Untrack"
+                     icon="$nl$/icons/obj16/untrack.gif"
+                     label="%UntrackAction_label"
+                     style="push">
+                 <visibleWhen checkEnabled="false">
+                  <and>
+                     <count value="+" />
+                     <iterate>
+                        <and>
+                           <adapt type="org.eclipse.core.resources.IResource">
+                              <and>
+                                 <test property="GitResource.isShared" />
+                              </and>
+                           </adapt>
+                        </and>
+                     </iterate>
+                  </and>
+               </visibleWhen>
+               </command>
             </menu>
             <separator
                   name="applyPatchGroup"
@@ -4707,6 +4737,12 @@
             id="org.eclipse.egit.ui.team.NoAssumeUnchanged"
             name="%NoAssumeUnchangedCommand">
       </command>
+      <command
+            categoryId="org.eclipse.egit.ui.commandCategory"
+            defaultHandler="org.eclipse.egit.ui.internal.actions.UntrackActionHandler"
+            id="org.eclipse.egit.ui.team.Untrack"
+            name="%UntrackCommand.name">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
-- 
2.11.4.GIT