EDU-614 Update icons for study actions for Python
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 20 Jun 2016 10:02:59 +0000 (13:02 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Mon, 20 Jun 2016 10:05:11 +0000 (13:05 +0300)
python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png [new file with mode: 0644]
python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png [new file with mode: 0644]
python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png [new file with mode: 0644]
python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png [new file with mode: 0644]
python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve.png [deleted file]
python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve_dark.png [deleted file]
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyCheckAction.java
python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
python/educational-core/student/src/icons/InteractiveLearningIcons.java

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 (file)
index 0000000..c9305d1
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 (file)
index 0000000..781218a
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 (file)
index 0000000..9b28963
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 (file)
index 0000000..2f1bf55
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 (file)
index 78290f9..0000000
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 (file)
index df25176..0000000
Binary files a/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve_dark.png and /dev/null differ
index 623c7326972a2c9fec64785b2bcd65ccd0ba472c..3abc02f7c53337c240605b5f66c1f1a40b347b66 100644 (file)
@@ -23,7 +23,7 @@ public abstract class StudyCheckAction extends StudyActionWithShortcut {
   protected Ref<Boolean> 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);
index cb47386d2a4bf3c61f5d8bfd0faff8b50201159d..83ba428b17adf8f31a6d8df091bfeb7a45c96e10 100644 (file)
@@ -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) {
index bf4b34b1c8048182277a566cd23e4c76acff872c..2b4a362b7eca3cd16145156ab38d906cb0137179 100644 (file)
@@ -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