From ea5e1bc9f2b15a033838cb1291617fc869685a33 Mon Sep 17 00:00:00 2001 From: Liana Bakradze Date: Mon, 20 Jun 2016 13:02:59 +0300 Subject: [PATCH] EDU-614 Update icons for study actions for Python --- .../com/jetbrains/edu/learning/CheckTask.png | Bin 0 -> 411 bytes .../com/jetbrains/edu/learning/CheckTask@2x.png | Bin 0 -> 1064 bytes .../com/jetbrains/edu/learning/ResetTaskFile.png | Bin 0 -> 474 bytes .../jetbrains/edu/learning/ResetTaskFile@2x.png | Bin 0 -> 1042 bytes .../icons/com/jetbrains/edu/learning/resolve.png | Bin 393 -> 0 bytes .../com/jetbrains/edu/learning/resolve_dark.png | Bin 421 -> 0 bytes .../edu/learning/actions/StudyCheckAction.java | 2 +- .../actions/StudyRefreshTaskFileAction.java | 5 +++-- .../src/icons/InteractiveLearningIcons.java | 3 ++- 9 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask.png create mode 100644 python/educational-core/student/resources/icons/com/jetbrains/edu/learning/CheckTask@2x.png create mode 100644 python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile.png create mode 100644 python/educational-core/student/resources/icons/com/jetbrains/edu/learning/ResetTaskFile@2x.png delete mode 100644 python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve.png delete mode 100644 python/educational-core/student/resources/icons/com/jetbrains/edu/learning/resolve_dark.png 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 0000000000000000000000000000000000000000..c9305d1f5141d50f322000499cbad7828a2477e2 GIT binary patch literal 411 zcmV;M0c8G(P)JMuE&3@F3_3c za6)UMEf+2q=uLO7w^$nR-)edAf2=MrnCto9YMTGWj;@YbXmX3Sra0CcFY^6wvmxrg z)tWHu1{g2(|8KO|_rKl5fP+B(2AF1-2_c*H=X?FPSR4M|W^>Gcvz5UYu^M2sJmA0S znvnmx^F981^+hZLiuF771#Q-u>;B(lb?|?SjS>IN)`wlxTj(W<)c}hHLAQ<9hWs~J z?)P6~mh)e;iC$+kXE}rU#%qKB8?6q!sI$OB6ge7Eu=;FAe!Uew=L}Z+{nuUQ^qn%W(~L(u=xN0002ovPDHLk FV1nN^%JTpK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..781218a56aad49f0e4f6a31cdbed63aa6edd3669 GIT binary patch literal 1064 zcmV+@1lRkCP)rY!{9LFEyAK_q2fQ;TRw6yeg+MdzExVBslY-Jl$=ZiJQ7-M{~#Ar7+9F)-(SP+mx z7_^j2xvZPhSH9Rkp#Ok>z}}iIIY#~ZJC$N(z)tBFo$63>6VE-iS zUn3BWM)8XHU*Po>V8`UYBk)qtk9%HUfxXu%HIYjx0<;#9C7?~XWwXDJ6gz0RZo(Te zO!APs1&@m;X$v$52x#e-o2Hv!Nw&%s_#iZPWkz}uKa?V%j&pw-u1R;@J!8 zmTK=fnPSWp(cW!@lZu0ZH2&p^ES>rdMA%_K5AJ$exG$!5};jFYiG;McD$@)n0H9F2S)Kf_W(b)!j32jkbR;tr6S% zhx5^{oMPMq<9r)z8~t$QF6Qft5UHmi{~O5kz?r)M=lucLHv3^*Y=>gPgO+H2dROA{ z-tduNt~S9zpKO73owkl@^0j{>UZ@C`b-b zW4e{ruzt1ecLIkXQjQ?ymM;*|{0WJiyk%h32^&+*^Gus+zNT9_ivtj8O;9Fz%55lL z;H}S9dz^@=$PRgX6?<-C_^mi@!pbQ6jYDJCfAJgh2iWtF#dFION>L1Ka=7QAn$ zQ@&|U+7CihFZ%?=oSTMQSOpE2a?2O^Oz}JsB}r&W!a{F?dsDs4FRGV#LGiVVRmIG# i;--dVmHFJGdjA1w{ArG>SuBkJ0000RSpK&{7&QLWdaOJj*Wh<_i5 zFA(j5_O6ahn~B~>b*4Fh_)$RI1jOw`xj?zglv87p%|^rd?*EMzdH&a$YM18H9XQ3Q z+pkxp+tf?B(}WkF3tCMkxSiLV@Altxb>M%~RRRC?fCg#LbOK||Y4-osCR)E&>Nbl- zHvksOwHf^drDn?lUYM>A{%^W2=)dK%;4|h+15TPP^*?5~%;&b=B9H$X)9wE$_L#ZC z4ETu@%2$Cnro68v(sF6gd4mBK}!&fo3sU`T6DlPnBS-+BHgO%tT@U1hQS{CnWr?(ToR-Q04hu~Wszz` QeEgQ&X; z{-pv;!n?0U^Q~BB{D3XJep&$g%2CS^e2W~PRHxqZXgyzW^X z(C}j?)bV!(t?NEF-vRE`5O~r9B?U|vQjV&Rz;wo=V>Ib5-MP3H0(m;i_bV>p&QaQzSjZjAf}y>@TB0?xI*$64(I$4W2QQ$esUb^%tq8cYgTSMV1uJOOq@VS1 zF`%zP;73HGzx2rZSXR0g{RM$y!kMwHy}+@v$k)vFg3%ng8$9|Q-smZh$pVu6~mEOipSCX)S=_L4Nk1Y*7*57{%l z;M^Jj$7VlRmz76#`L;JCy`(YbB)SP(Ng7V^qrDh|<|w0de}2n9Bq;?5oOMH#qE57@IWgDn&M zp82@-g~|mcIM7X2$9~F`4I1MPFrJryUFibbMi6XQ4gkBVyxDwCs{FrUQ^E-^&A6*V zpLBy^&I6{!09aN!!HT=*t^{eDFfX;@nnL9QrUf6gEVorjI|g?Eo9@EWE5L1Ze`n1o zV>m_(vv}7`ag__0mt-_os$~axh}=d#K#}K}OBg}w1IdV(10J| z;o-G#2_Q!qC|C!SbOqUhO*6>JK=~%1x-UTd9;hc4+2mB9;AbG-4s@ap7X6Gs@d%*& z6CnNv#Jhk7s3E%`0VwzpWI9k`3wi*BhK6c^G=Ve&EqegOAs|DM6{rIRcK{Xq1=#}R zN5Z@UWOD-L>Ve|lf%H3|Wfj1f;J|PqP{JRm=nmAD-5^^*h5*IGfntw9h6BZy0L2xt zhA>cq4XCyVsOUA+wtAqL87N$$qN4r->C-^(S)(`|9YjY*%K$ab1}gpoq#pz6{m@W< z0Sa}Xfy@L`3Q(gV5FY?}1#0szAb*CxzrO$}sVx{3+E9P*2o4U`CMmr_6HONop9kVV nvN8=Q!vOv54D>e-O>-vz{acsAX&U*x00000NkvXXu0mjfmJ*)B 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 df25176bde99bd95eebda5671a573bfaea2f10c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fvP)f++!D2^hcpdADkzkrjA2E@rvAh7sWIo6bgkA0yzw7phC8+ zq9|`$3B$0Pn1c8L+%Vq=f}rbDi3I0>_g> 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