replaced task window with answer placeholder in some string literals
authorLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 29 Oct 2014 15:16:23 +0000 (18:16 +0300)
committerLiana Bakradze <liana.bakradze@jetbrains.com>
Wed, 29 Oct 2014 15:16:23 +0000 (18:16 +0300)
12 files changed:
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCDeleteTaskWindow.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
python/edu/learn-python/resources/META-INF/plugin.xml
python/edu/learn-python/src/com/jetbrains/python/edu/StudyEditorFactoryListener.java
python/edu/learn-python/src/com/jetbrains/python/edu/StudyInstructionPainter.java
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyNextWindowAction.java
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyPrevWindowAction.java
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java

index 24688c4b2709f3895552400e7cac9376de404df0..c61ab10d7332bee25d3362e5a393ee0eb4914ec2 100644 (file)
@@ -88,7 +88,7 @@ public class CCEditorFactoryListener implements EditorFactoryListener {
 
     @Override
     public void handle(ReadOnlyFragmentModificationException e) {
-      HintManager.getInstance().showErrorHint(myEditor, "Delete task window before editing its borders");
+      HintManager.getInstance().showErrorHint(myEditor, "Delete answer placeholder before editing its borders");
     }
   }
 }
index 3df30b7a4608661770f31359e53bc3de4002caaf..244de123a33d22060ed91686e7c56b4c9a591582 100644 (file)
@@ -24,7 +24,7 @@ public class CCAddTaskWindow extends DumbAwareAction {
   private static final Logger LOG = Logger.getInstance(CCAddTaskWindow.class);
 
   public CCAddTaskWindow() {
-    super("Add Problem to Solve", "Add problem to solve", null);
+    super("Add Answer Placeholder", "Add answer placeholder", null);
   }
 
 
index b5a0292db68496700498121ca6bebca270449e9d..de76d5d287de33ee3af1113086e92a6c413b483a 100644 (file)
@@ -204,7 +204,7 @@ public class CCCreateCourseArchive extends DumbAwareAction {
           @Override
           public boolean accept(File pathname) {
             String name = pathname.getName();
-            return !name.contains(".answer") && !name.contains("__pycache__") && !name.contains("_windows");
+            return !name.contains(".answer") && !name.contains("__pycache__") && !name.contains("_windows") && !name.contains(".pyc");
           }
         }, null);
       }
index c7d8cd91cf4b19555158353f6b8da51559b97ae0..f7245a05fe9f546eddd866c1f6a7ad5a2d87b702 100644 (file)
@@ -18,7 +18,7 @@ public class CCDeleteTaskWindow extends CCTaskWindowAction {
   private static final Logger LOG = Logger.getInstance(CCDeleteTaskWindow.class);
 
   public CCDeleteTaskWindow() {
-    super("Delete Problem","Delete problem", null);
+    super("Delete Answer Placeholder","Delete answer placeholder", null);
   }
 
   @Override
index 30ba802dbedc18bb5ec1d5531a2058893a52beb7..62baf7c7399f20bc4432829e5bc961adce0969b1 100644 (file)
@@ -11,7 +11,7 @@ import org.jetbrains.plugins.coursecreator.ui.CreateTaskWindowDialog;
 public class CCShowTaskWindowDetails extends CCTaskWindowAction {
 
   public CCShowTaskWindowDetails() {
-    super("Show Problem Details", "Show problem details", null);
+    super("Edit Answer Placeholder", "Edit answer placeholder", null);
   }
 
   @Override
index 213fc55e2cb773140b778080dd6d75476a10c21c..3595e2c28a7babe1d8fd173e552f3366aefdbad8 100644 (file)
@@ -18,7 +18,7 @@ import java.io.*;
 
 public class CreateTaskWindowDialog extends DialogWrapper {
 
-  public static final String TITLE = "Add Problem to Solve";
+  public static final String TITLE = "Add Answer Placeholder";
   private static final Logger LOG = Logger.getInstance(CreateTaskWindowDialog.class.getName());
   private final TaskWindow myTaskWindow;
   private final CreateTaskWindowPanel myPanel;
index 62f5bdc6ef85499521fd18591084652af776e219..f3a52d5ab9d27f753a248e77ef0db4f0203abb85 100644 (file)
     <action id="CheckAction" class="com.jetbrains.python.edu.actions.StudyCheckAction"  text="Check Task"
             description="Check current task">
     </action>
-    <action id="PrevWindowAction" class="com.jetbrains.python.edu.actions.StudyPrevWindowAction" text="Previous Task Window"
-            description="Navigate to previous task window">
+    <action id="PrevWindowAction" class="com.jetbrains.python.edu.actions.StudyPrevWindowAction" text="Previous Answer Placeholder"
+            description="Navigate to the previous answer placeholder">
     </action>
-    <action id="NextWindow" class="com.jetbrains.python.edu.actions.StudyNextWindowAction" text="Next Task Window"
-            description="Navigate to next task window">
+    <action id="NextWindow" class="com.jetbrains.python.edu.actions.StudyNextWindowAction" text="Next Answer Placeholder"
+            description="Navigate to the next answer holder">
     </action>
     <action id="PreviousTaskAction" class="com.jetbrains.python.edu.actions.StudyPreviousStudyTaskAction" text="Previous Task"
             description="Navigate to previous task"/>
@@ -55,8 +55,8 @@
             description="Refresh current task"/>
     <action id="WatchInputAction" class="com.jetbrains.python.edu.actions.StudyEditInputAction" text="Watch Test Input"
             description="Watch test input "/>
-    <action id="ShowHintAction" class="com.jetbrains.python.edu.actions.StudyShowHintAction" text="Show Hint for Task Window"
-            description="Show hint for task window"/>
+    <action id="ShowHintAction" class="com.jetbrains.python.edu.actions.StudyShowHintAction" text="Show Hint for Answer Placeholder"
+            description="Show hint for answer placeholder"/>
     <action id="StudyRunAction" class="com.jetbrains.python.edu.actions.StudyRunAction" text="Run File With Tests"
             description="Run your code with tests"/>
     <action id="WelcomeScreen.PythonIntro" class="com.jetbrains.python.edu.actions.StudyIntroductionCourseAction" icon="StudyIcons.EducationalProjectType">
index 30a04dd2f1364ba4f9526490cb5bfeb6cc67dec5..fb3fc5f3c6f199965b0be7ace2c86c576f8e6180 100644 (file)
@@ -117,7 +117,7 @@ class StudyEditorFactoryListener implements EditorFactoryListener {
 
     @Override
     public void handle(ReadOnlyFragmentModificationException e) {
-      HintManager.getInstance().showErrorHint(myEditor, "It's not allowed to delete task windows");
+      HintManager.getInstance().showErrorHint(myEditor, "It's not allowed to delete answer placeholders");
     }
   }
 }
index 87f1f7a3545453313694b7f30b489aa6c715f1ab..95ecfb49651fb25e9966cba45c7a2c86f1f4278a 100644 (file)
@@ -33,10 +33,10 @@ public class StudyInstructionPainter extends EditorEmptyTextPainter {
     UIUtil.TextPainter painter = new UIUtil.TextPainter().withLineSpacing(1.5f);
 
     painter.appendLine("PyCharm Educational Edition").underlined(new JBColor(Gray._150, Gray._180));
-    addAction(painter, "Navigate to the next task window", StudyNextWindowAction.ACTION_ID, StudyNextWindowAction.SHORTCUT2, true);
+    addAction(painter, "Navigate to the next answer placeholder", StudyNextWindowAction.ACTION_ID, StudyNextWindowAction.SHORTCUT2, true);
     String shortcut1 = getShortcutText(StudyPrevWindowAction.ACTION_ID, StudyPrevWindowAction.SHORTCUT, false, false);
     String shortcut2 = getShortcutText(StudyNextWindowAction.ACTION_ID, StudyNextWindowAction.SHORTCUT, false, false);
-    String text = "Navigate between task windows with " + shortcut1 +
+    String text = "Navigate between answer placeholders with " + shortcut1 +
                   " and " + shortcut2;
     painter.appendLine(text).smaller().withBullet();
     shortcut1 = getShortcutText(StudyPreviousStudyTaskAction.ACTION_ID, StudyPreviousStudyTaskAction.SHORTCUT, false, false);
@@ -44,7 +44,7 @@ public class StudyInstructionPainter extends EditorEmptyTextPainter {
     painter.appendLine("Navigate between tasks with " + shortcut1 + " and " + shortcut2).smaller().withBullet();
     addAction(painter, "Reset current task file", StudyRefreshTaskFileAction.ACTION_ID, StudyRefreshTaskFileAction.SHORTCUT, false);
     addAction(painter, "Check task", StudyCheckAction.ACTION_ID, StudyCheckAction.SHORTCUT, false);
-    addAction(painter, "Get hint for the task window", StudyShowHintAction.ACTION_ID, StudyShowHintAction.SHORTCUT, false);
+    addAction(painter, "Get hint for the answer placeholder", StudyShowHintAction.ACTION_ID, StudyShowHintAction.SHORTCUT, false);
     painter.appendLine("To see your progress open the 'Course Description' panel").smaller().withBullet();
                        painter.draw(g, new PairFunction<Integer, Integer, Couple<Integer>>() {
                          @Override
index 16036a7ba91b758e1a422f95f2f22d3db3531066..e4d3bb79d7a360a13611b45ceb19eb77fc761821 100644 (file)
@@ -16,7 +16,7 @@ public class StudyNextWindowAction extends StudyWindowNavigationAction {
   public static final String SHORTCUT2 = "ctrl pressed ENTER";
 
   public StudyNextWindowAction() {
-    super("NextWindowAction", "Select next window", AllIcons.Actions.Forward);
+    super("Navigate to the Next Answer Placeholder", "Navigate to the next answer placeholder", AllIcons.Actions.Forward);
   }
 
   @Override
index 1e602bd059ffd50902bf369dc7991f9352d2f9ff..01f6e1688b02355b570f9c9a753fc72193ca8ca3 100644 (file)
@@ -17,7 +17,7 @@ public class StudyPrevWindowAction extends StudyWindowNavigationAction {
   public static final String SHORTCUT = "ctrl shift pressed COMMA";
 
   public StudyPrevWindowAction() {
-    super("PrevWindowAction", "Select previous window", StudyIcons.Prev);
+    super("Navigate to the Previous Answer Placeholder", "Navigate to the previous answer placeholder", StudyIcons.Prev);
   }
 
 
index 7a7c4408f7953f12f2c0845ff9e8c80361e72b94..c07888519d153d3cd41003c63926379c187bde62 100644 (file)
@@ -28,8 +28,8 @@ import java.io.File;
 public class StudyShowHintAction extends DumbAwareAction {
   public static final String ACTION_ID = "ShowHintAction";
   public static final String SHORTCUT = "ctrl pressed 7";
-  public static final String OUTSIDE_TASK_WINDOW_MESSAGE = "Put caret to the task window to get hint.";
-  public static final String HINT_NOT_AVAILABLE = "There is no hint for this task window";
+  public static final String OUTSIDE_TASK_WINDOW_MESSAGE = "Put caret to answer placeholder to get hint";
+  public static final String HINT_NOT_AVAILABLE = "There is no hint for this answer placeholder";
 
   public StudyShowHintAction() {
     super("Show hint", "Show hint", StudyIcons.ShowHint);