MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-05 16:36:56 +07:00
Code Issues Packages Projects Releases Wiki Activity

[IFT] Add end lesson dialog for onboarding tour

Browse Source 
IDEA-CR-70872

GitOrigin-RevId: 67ba0af9626a22e6c71c555df1350883fd3613d8
This commit is contained in:
Alexey Merkulov
2021-03-10 16:11:10 +03:00
committed by intellij-monorepo-bot
parent 64a5e99c64
commit 4536f36359
5 changed files with 69 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/python-features-trainer/resources/messages/PythonLessonsBundle.properties
View File

@@ -37,7 +37,15 @@ python.onboarding.case.changed=The case has changed.
python.onboarding.epilog=Congratulations! You have completed the onboarding tour. At this point you can:\
\n - <callback id="{0}">Close</callback> the learning project{1}\
\n - <callback id="{2}">Show</callback> more lessons
python.onboarding.return.to.welcome=\ and return to the welcome screen
python.onboarding.return.to.welcome=\ and return to the Welcome screen
python.onboarding.finish.title=Congratulations
python.onboarding.finish.text=You have just completed the PyCharm Onboarding tour.\n\
Now you can close the Learning project{0}.\n\
You can also continue your study and try other lessons.
python.onboarding.finish.exit=Close demo project
python.onboarding.finish.modules=Show more lessons
python.f.string.completion.lesson.name=F-string completion
python.f.string.completion.type.prefix=<ide/> supports automatic f-string conversion. Just start typing {0}.

49
python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTour.kt
View File

@@ -22,6 +22,8 @@ import com.intellij.openapi.editor.LogicalPosition
import com.intellij.openapi.fileEditor.FileEditorManager
import com.intellij.openapi.project.ProjectManager
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.ui.MessageDialogBuilder
import com.intellij.openapi.ui.Messages
import com.intellij.openapi.ui.popup.Balloon
import com.intellij.openapi.wm.ToolWindowManager
import com.intellij.openapi.wm.impl.FocusManagerImpl
@@ -33,6 +35,7 @@ import com.intellij.xdebugger.XDebuggerBundle
import com.jetbrains.python.PyBundle
import com.jetbrains.python.PyPsiBundle
import com.jetbrains.python.ift.PythonLessonsBundle
import icons.FeaturesTrainerIcons
import org.intellij.lang.annotations.Language
import org.jetbrains.annotations.Nls
import training.dsl.*
@@ -42,7 +45,10 @@ import training.dsl.LessonUtil.restoreIfModifiedOrMoved
import training.learn.LearnBundle
import training.learn.LessonsBundle
import training.learn.course.KLesson
import training.learn.course.Lesson
import training.learn.course.LessonProperties
import training.learn.lesson.LessonListener
import training.learn.lesson.LessonManager
import training.learn.lesson.general.run.toggleBreakpointTask
import training.ui.LearningUiHighlightingManager
import training.ui.LearningUiManager
@@ -82,6 +88,7 @@ class PythonOnboardingTour :
override val lessonContent: LessonContext.() -> Unit = {
prepareRuntimeTask {
addEndLessonListener()
configurations().forEach { runManager().removeConfiguration(it) }
val root = ProjectRootManager.getInstance(project).contentRoots[0]
@@ -111,15 +118,51 @@ class PythonOnboardingTour :
searchEverywhereTasks()
task {
val isSingleProject = ProjectManager.getInstance().openProjects.size == 1
val welcomeScreenRemark = if (isSingleProject) PythonLessonsBundle.message("python.onboarding.return.to.welcome") else ""
text(PythonLessonsBundle.message("python.onboarding.epilog",
getCallBackActionId("CloseProject"),
welcomeScreenRemark,
returnToWelcomeScreenRemark(),
LearningUiManager.addCallback { LearningUiManager.resetModulesView() }))
}
}
private fun returnToWelcomeScreenRemark(): String {
val isSingleProject = ProjectManager.getInstance().openProjects.size == 1
return if (isSingleProject) PythonLessonsBundle.message("python.onboarding.return.to.welcome") else ""
}
private fun TaskRuntimeContext.addEndLessonListener() {
val listener = object : LessonListener {
override fun lessonPassed(lesson: Lesson) {
invokeLater {
val result = MessageDialogBuilder.yesNoCancel(PythonLessonsBundle.message("python.onboarding.finish.title"),
PythonLessonsBundle.message("python.onboarding.finish.text", returnToWelcomeScreenRemark()))
.yesText(PythonLessonsBundle.message("python.onboarding.finish.exit"))
.noText(PythonLessonsBundle.message("python.onboarding.finish.modules"))
.icon(FeaturesTrainerIcons.Img.PluginIcon)
.show(project)
when (result) {
Messages.YES -> invokeLater {
LessonManager.instance.stopLesson()
val closeAction = ActionManager.getInstance().getAction("CloseProject") ?: error("No close project action found")
invokeActionForFocusContext(closeAction)
}
Messages.NO -> invokeLater {
LearningUiManager.resetModulesView()
}
}
}
}
override fun lessonStopped(lesson: Lesson) {
invokeLater {
removeLessonListener(this)
}
}
}
addLessonListener(listener)
}
private fun getCallBackActionId(@Suppress("SameParameterValue") actionId: String): Int {
val action = ActionManager.getInstance().getAction(actionId) ?: error("No action with Id $actionId")
return LearningUiManager.addCallback { invokeActionForFocusContext(action) }