MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: notify about configurable option in popup

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-07-06 17:44:05 +03:00
parent 024f917277
commit 73f91cf201
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
+7 -2
View File
@@ -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) {
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+5
View File
@@ -284,6 +284,11 @@ public class DiffUtil {
group.addAll(actions);
}
@NotNull
public static String getSettingsConfigurablePath() {
return "Settings | Tools | Diff";
}
// Titles
@NotNull