From 1446cdecb64dbdab038de34820e453c4a8a98d6b Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <aleksey.pivovarov@jetbrains.com>
Date: Mon, 14 Mar 2016 12:37:46 +0300
Subject: [PATCH] IDEA-140446 vcs: fix actions in "Unversioned Files" dialog

* set icon for ChangesView.Ignore action
* do not hide actions, mark them disabled instead
---
 platform/platform-resources/src/idea/VcsActions.xml             | 2 +-
 .../vcs/changes/actions/DeleteUnversionedFilesAction.java       | 2 +-
 .../openapi/vcs/changes/actions/IgnoreUnversionedAction.java    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 26416d899996..4249bc8d4998 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -110,7 +110,7 @@
       <action id="ChangesView.AddUnversioned" class="com.intellij.openapi.vcs.changes.actions.ScheduleForAdditionAction">
         <keyboard-shortcut first-keystroke="control alt A" keymap="$default"/>
       </action>
-      <action id="ChangesView.Ignore" class="com.intellij.openapi.vcs.changes.actions.IgnoreUnversionedAction"/>
+      <action id="ChangesView.Ignore" class="com.intellij.openapi.vcs.changes.actions.IgnoreUnversionedAction" icon="AllIcons.Actions.Properties"/>
       <action id="ChangesView.RemoveDeleted" class="com.intellij.openapi.vcs.changes.actions.ScheduleForRemovalAction"
               icon="AllIcons.Actions.Exclude"/>
       <action id="ChangesView.Edit" class="com.intellij.openapi.vcs.changes.actions.EditAction"/>
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/DeleteUnversionedFilesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/DeleteUnversionedFilesAction.java
index a58febee2f1d..e44bea6bee4f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/DeleteUnversionedFilesAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/DeleteUnversionedFilesAction.java
@@ -49,6 +49,6 @@ public class DeleteUnversionedFilesAction extends DumbAwareAction {
   @Override
   public void update(AnActionEvent e) {
     DeleteProvider deleteProvider = e.getData(PlatformDataKeys.DELETE_ELEMENT_PROVIDER);
-    e.getPresentation().setVisible(deleteProvider != null && deleteProvider.canDeleteElement(e.getDataContext()));
+    e.getPresentation().setEnabled(deleteProvider != null && deleteProvider.canDeleteElement(e.getDataContext()));
   }
 }
\ No newline at end of file
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java
index 0fbc3439550d..a135639242cc 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoreUnversionedAction.java
@@ -65,6 +65,5 @@ public class IgnoreUnversionedAction extends AnAction {
     }
     boolean enabled = files != null && !files.isEmpty();
     e.getPresentation().setEnabled(enabled);
-    e.getPresentation().setVisible(enabled);
   }
 }
\ No newline at end of file