From 73f91cf201b8f7223383643a02d45f82dfcdd7d9 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Mon, 6 Jul 2015 17:12:56 +0300
Subject: [PATCH] diff: notify about configurable option in popup

---
 .../src/com/intellij/diff/impl/DiffRequestProcessor.java | 9 +++++++--
 .../diff-impl/src/com/intellij/diff/util/DiffUtil.java   | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
index c4dee802b3da..e962f7acfda0 100644
--- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
@@ -53,7 +53,9 @@ import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
+import com.intellij.ui.ColorUtil;
 import com.intellij.ui.HintHint;
+import com.intellij.ui.JBColor;
 import com.intellij.ui.LightweightHint;
 import com.intellij.ui.components.panels.Wrapper;
 import com.intellij.util.containers.ContainerUtil;
@@ -717,9 +719,12 @@ public abstract class DiffRequestProcessor implements Disposable {
     Editor editor = e.getData(DiffDataKeys.CURRENT_EDITOR);
 
     // TODO: provide "change" word in chain UserData - for tests/etc
-    String message = next ? "Press again to go to the next file" : "Press again to go to the previous file";
+    StringBuffer message = new StringBuffer(next ? "Press again to go to the next file" : "Press again to go to the previous file")
+      .append("<br>").append("<span style='color:#").append(ColorUtil.toHex(JBColor.gray)).append("'>").append("<small>")
+      .append("You can disable this feature in ").append(DiffUtil.getSettingsConfigurablePath())
+      .append("</small>").append("</span>");
 
-    final LightweightHint hint = new LightweightHint(HintUtil.createInformationLabel(message));
+    final LightweightHint hint = new LightweightHint(HintUtil.createInformationLabel(message.toString()));
     Point point = new Point(myContentPanel.getWidth() / 2, next ? myContentPanel.getHeight() - JBUI.scale(40) : JBUI.scale(40));
 
     if (editor == null) {
diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
index 1d14498c31bd..34b125b8c6bc 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
@@ -284,6 +284,11 @@ public class DiffUtil {
     group.addAll(actions);
   }
 
+  @NotNull
+  public static String getSettingsConfigurablePath() {
+    return "Settings | Tools | Diff";
+  }
+
   // Titles
 
   @NotNull