MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

replaced task window with answer placeholder in some string literals

Browse Source
This commit is contained in:
Liana Bakradze
2014-10-29 18:16:23 +03:00
parent 9ecf230e60
commit 50f7c796e0
12 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/CCEditorFactoryListener.java
+1 -1
View 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");
}
}
}
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCAddTaskWindow.java
+1 -1
View 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);
}
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCCreateCourseArchive.java
+1 -1
View 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);
}
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCDeleteTaskWindow.java
+1 -1
View 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
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/actions/CCShowTaskWindowDetails.java
+1 -1
View 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
python/edu/course-creator/src/org/jetbrains/plugins/coursecreator/ui/CreateTaskWindowDialog.java
+1 -1
View 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;
python/edu/learn-python/resources/META-INF/plugin.xml
+6 -6
View File
@@ -41,11 +41,11 @@
<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">
python/edu/learn-python/src/com/jetbrains/python/edu/StudyEditorFactoryListener.java
+1 -1
View 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");
}
}
}
python/edu/learn-python/src/com/jetbrains/python/edu/StudyInstructionPainter.java
+3 -3
View 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
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyNextWindowAction.java
+1 -1
View 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
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyPrevWindowAction.java
+1 -1
View 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);
}
python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyShowHintAction.java
+2 -2
View 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);