From fd51bbbc13253322a0f0c2e6bf849e1c030146f5 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 26 Nov 2015 13:23:11 +0300 Subject: [PATCH] DSGN-2319 Run and test result icons for left gutter: double triangle for classes --- .../TestRunLineMarkerProvider.java | 12 ++++++------ .../src/runConfigurations/testState/run_run.png | Bin 0 -> 163 bytes .../runConfigurations/testState/run_run@2x.png | Bin 0 -> 270 bytes .../util/src/com/intellij/icons/AllIcons.java | 2 ++ 4 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 platform/icons/src/runConfigurations/testState/run_run.png create mode 100644 platform/icons/src/runConfigurations/testState/run_run@2x.png diff --git a/java/java-impl/src/com/intellij/testIntegration/TestRunLineMarkerProvider.java b/java/java-impl/src/com/intellij/testIntegration/TestRunLineMarkerProvider.java index cb7fe6e2efca..bb9509be49f4 100644 --- a/java/java-impl/src/com/intellij/testIntegration/TestRunLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/testIntegration/TestRunLineMarkerProvider.java @@ -55,7 +55,7 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor { TestFramework framework = TestFrameworks.detectFramework((PsiClass)element); if (framework != null && framework.isTestClass(element)) { String url = "java:suite://" + ((PsiClass)element).getQualifiedName(); - return getInfo(url, e.getProject()); + return getInfo(url, e.getProject(), true); } } if (element instanceof PsiMethod) { @@ -64,7 +64,7 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor { TestFramework framework = TestFrameworks.detectFramework(psiClass); if (framework != null && framework.isTestMethod(element)) { String url = "java:test://" + psiClass.getQualifiedName() + "." + ((PsiMethod)element).getName(); - return getInfo(url, e.getProject()); + return getInfo(url, e.getProject(), false); } } } @@ -73,8 +73,8 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor { } @NotNull - private static Info getInfo(String url, Project project) { - Icon icon = getTestStateIcon(url, project); + private static Info getInfo(String url, Project project, boolean isClass) { + Icon icon = getTestStateIcon(url, project, isClass); return new Info(icon, TOOLTIP_PROVIDER, ExecutorAction.getActions(1)); } @@ -82,7 +82,7 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor { return e instanceof PsiIdentifier; } - private static Icon getTestStateIcon(String url, Project project) { + private static Icon getTestStateIcon(String url, Project project, boolean isClass) { TestStateStorage.Record state = TestStateStorage.getInstance(project).getState(url); if (state != null) { TestStateInfo.Magnitude magnitude = TestIconMapper.getMagnitude(state.magnitude); @@ -97,6 +97,6 @@ public class TestRunLineMarkerProvider extends RunLineMarkerContributor { } } - return AllIcons.RunConfigurations.TestState.Run; + return isClass ? AllIcons.RunConfigurations.TestState.Run_run : AllIcons.RunConfigurations.TestState.Run; } } diff --git a/platform/icons/src/runConfigurations/testState/run_run.png b/platform/icons/src/runConfigurations/testState/run_run.png new file mode 100644 index 0000000000000000000000000000000000000000..43c29bd6dc7046af6504a88652d0f5f14c995c72 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a)4EKe85kcwN$KmPx>XV#SPvH14$ zJbO~4LRv#oiJgRU_6?pRryC-ewK~roU&YuG&b-l3Abios!Yqb|Umf0X9GRI>Ge^py zLRf&EsZhmeewLIO!$xC)^aUR`T4nMI%w{T-l$!r3K~?vW$3ccAky3}6LLFFvwla9S L`njxgN@xNA5Z^W) literal 0 HcmV?d00001 diff --git a/platform/icons/src/runConfigurations/testState/run_run@2x.png b/platform/icons/src/runConfigurations/testState/run_run@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6c9025aa853622bf00816af235e26137107b6486 GIT binary patch literal 270 zcmV+p0rCEcP)}Gm7FVpc!QFgu9DoO176_3 z-F#A;&KGUp?mUUFL#;|L>!;U(2sf=sM4PH3WSUAzMaPqCpzx=EC0CUZQ Ua8K~oi2wiq07*qoM6N<$g0yaNo&W#< literal 0 HcmV?d00001 diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index ff87154f8b0e..ef3ea0112618 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -1089,6 +1089,7 @@ public class AllIcons { public static final Icon Green2 = IconLoader.getIcon("/runConfigurations/testState/green2.png"); // 12x12 public static final Icon Red2 = IconLoader.getIcon("/runConfigurations/testState/red2.png"); // 12x12 public static final Icon Run = IconLoader.getIcon("/runConfigurations/testState/run.png"); // 12x12 + public static final Icon Run_run = IconLoader.getIcon("/runConfigurations/testState/run_run.png"); // 12x12 public static final Icon Yellow2 = IconLoader.getIcon("/runConfigurations/testState/yellow2.png"); // 12x12 } @@ -1220,6 +1221,7 @@ public class AllIcons { } public static class Windows { + public static final Icon AppIconOk512 = IconLoader.getIcon("/windows/appIconOk512.png"); // 55x55 public static final Icon Close = IconLoader.getIcon("/windows/close.png"); // 16x16 public static final Icon Iconify = IconLoader.getIcon("/windows/iconify.png"); // 16x16 public static final Icon Maximize = IconLoader.getIcon("/windows/maximize.png"); // 16x16