diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png new file mode 100644 index 000000000000..c9305d1f5141 Binary files /dev/null and b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png differ diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png new file mode 100644 index 000000000000..781218a56aad Binary files /dev/null and b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png differ diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png new file mode 100644 index 000000000000..9b28963b25fa Binary files /dev/null and b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png differ diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png new file mode 100644 index 000000000000..2f1bf55dce14 Binary files /dev/null and b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png differ diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve.png deleted file mode 100644 index 78290f936f68..000000000000 Binary files a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve.png and /dev/null differ diff --git a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve_dark.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve_dark.png deleted file mode 100644 index df25176bde99..000000000000 Binary files a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve_dark.png and /dev/null differ diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java index 623c7326972a..3abc02f7c533 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java @@ -23,7 +23,7 @@ public abstract class StudyCheckAction extends StudyActionWithShortcut { protected Ref myCheckInProgress = new Ref<>(false); public StudyCheckAction() { - super("Check Task (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Check current task", InteractiveLearningIcons.Resolve); + super("Check Task (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Check current task", InteractiveLearningIcons.CheckTask); } public abstract void check(@NotNull final Project project); diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java index cb47386d2a4b..83ba428b17ad 100644 --- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java +++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java @@ -1,6 +1,5 @@ package com.jetbrains.edu.learning.actions; -import com.intellij.icons.AllIcons; import com.intellij.ide.projectView.ProjectView; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.KeyboardShortcut; @@ -33,6 +32,7 @@ import com.jetbrains.edu.learning.courseFormat.StudyStatus; import com.jetbrains.edu.learning.courseFormat.TaskFile; import com.jetbrains.edu.learning.editor.StudyEditor; import com.jetbrains.edu.learning.navigation.StudyNavigator; +import icons.InteractiveLearningIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -44,7 +44,8 @@ public class StudyRefreshTaskFileAction extends StudyActionWithShortcut { private static final Logger LOG = Logger.getInstance(StudyRefreshTaskFileAction.class.getName()); public StudyRefreshTaskFileAction() { - super("Reset Task File (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Refresh current task", AllIcons.Actions.Refresh); + super("Reset Task File (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Refresh current task", + InteractiveLearningIcons.ResetTaskFile); } public static void refresh(@NotNull final Project project) { diff --git a/python/educational-core/student/src/icons/InteractiveLearningIcons.java b/python/educational-core/student/src/icons/InteractiveLearningIcons.java index bf4b34b1c804..2b4a362b7eca 100644 --- a/python/educational-core/student/src/icons/InteractiveLearningIcons.java +++ b/python/educational-core/student/src/icons/InteractiveLearningIcons.java @@ -13,13 +13,14 @@ public class InteractiveLearningIcons { return IconLoader.getIcon(path, InteractiveLearningIcons.class); } + public static final Icon CheckTask = load("/icons/com/jetbrains/edu/learning/CheckTask.png"); // 16x16 public static final Icon Course = load("/icons/com/jetbrains/edu/learning/Course.png"); // 16x16 public static final Icon CourseProgress = load("/icons/com/jetbrains/edu/learning/CourseProgress.png"); // 13x13 public static final Icon InterpreterGear = load("/icons/com/jetbrains/edu/learning/interpreterGear.png"); // 16x16 public static final Icon Lesson = load("/icons/com/jetbrains/edu/learning/Lesson.png"); // 16x16 public static final Icon LessonCompl = load("/icons/com/jetbrains/edu/learning/LessonCompl.png"); // 16x16 public static final Icon Prev = load("/icons/com/jetbrains/edu/learning/prev.png"); // 16x16 - public static final Icon Resolve = load("/icons/com/jetbrains/edu/learning/resolve.png"); // 16x16 + public static final Icon ResetTaskFile = load("/icons/com/jetbrains/edu/learning/ResetTaskFile.png"); // 16x16 public static final Icon Sandbox = load("/icons/com/jetbrains/edu/learning/Sandbox.png"); // 16x16 public static final Icon ShowHint = load("/icons/com/jetbrains/edu/learning/showHint.png"); // 16x16 public static final Icon Task = load("/icons/com/jetbrains/edu/learning/Task.png"); // 16x16