diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java')
| -rw-r--r-- | python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java b/python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java index a553978c416a..0f8c5a53511a 100644 --- a/python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java +++ b/python/edu/learn-python/src/com/jetbrains/python/edu/ui/StudyToolWindowFactory.java @@ -9,6 +9,7 @@ import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentFactory; import com.intellij.util.ui.UIUtil; import com.jetbrains.python.edu.StudyTaskManager; +import com.jetbrains.python.edu.actions.StudyReloadCourseAction; import com.jetbrains.python.edu.course.Course; import com.jetbrains.python.edu.course.Lesson; import com.jetbrains.python.edu.course.LessonInfo; @@ -17,6 +18,8 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.awt.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.util.List; public class StudyToolWindowFactory implements ToolWindowFactory, DumbAware { @@ -41,7 +44,15 @@ public class StudyToolWindowFactory implements ToolWindowFactory, DumbAware { contentPanel.add(new JLabel(authorLabel)); contentPanel.add(Box.createRigidArea(new Dimension(0, 10))); contentPanel.add(new JLabel(description)); + contentPanel.add(Box.createRigidArea(new Dimension(0, 10))); + JButton reloadCourseButton = new JButton("reload course"); + reloadCourseButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + StudyReloadCourseAction.reloadCourse(project); + } + }); + contentPanel.add(reloadCourseButton); int taskNum = 0; int taskSolved = 0; int lessonsCompleted = 0; |