added separate "Introduction to Python" action to the welcome screen

python/edu/learn-python/resources/META-INF/plugin.xml

@@ -60,10 +60,14 @@
       <add-to-group group-id="MainToolBar" anchor="last"/>
     </action>
 
-    <action id="WelcomeScreen.LearnPython" class="com.jetbrains.python.edu.actions.StudyNewProject" icon="StudyIcons.EducationalProjectType">
+    <action id="WelcomeScreen.PythonIntro" class="com.jetbrains.python.edu.actions.StudyIntroductionCourse" icon="StudyIcons.EducationalProjectType">
       <add-to-group group-id="WelcomeScreen.QuickStart" anchor="first"/>
     </action>
 
+    <action id="WelcomeScreen.LearnPython" class="com.jetbrains.python.edu.actions.StudyNewProject" icon="StudyIcons.EducationalProjectType">
+      <add-to-group group-id="WelcomeScreen.QuickStart" relative-to-action="WelcomeScreen.PythonIntro" anchor="after"/>
+    </action>
+
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">

python/edu/learn-python/src/com/jetbrains/python/edu/StudyDirectoryProjectGenerator.java

@@ -53,7 +53,7 @@ public class StudyDirectoryProjectGenerator extends PythonProjectGenerator imple
   @NotNull
   @Override
   public String getName() {
-    return "Learn Python";
+    return "Educational";
   }
 
 

python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyIntroductionCourse.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.jetbrains.python.edu.actions;
+
+import com.intellij.ide.impl.ProjectUtil;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.projectRoots.Sdk;
+import com.jetbrains.python.configuration.PyConfigurableInterpreterList;
+import com.jetbrains.python.edu.StudyDirectoryProjectGenerator;
+import com.jetbrains.python.edu.StudyUtils;
+import com.jetbrains.python.edu.course.CourseInfo;
+import com.jetbrains.python.newProject.actions.GenerateProjectCallback;
+import com.jetbrains.python.newProject.actions.ProjectSpecificSettingsStep;
+import icons.StudyIcons;
+import org.jetbrains.annotations.NotNull;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+public class StudyIntroductionCourse extends AnAction {
+
+  public StudyIntroductionCourse() {
+    super("Introduction to Python", "Introduction to Python", StudyIcons.EducationalProjectType);
+  }
+
+  @Override
+  public void actionPerformed(@NotNull AnActionEvent e) {
+    final File projectDir = new File(ProjectUtil.getBaseDir(), "PythonIntroduction");
+    if (projectDir.exists()) {
+      ProjectUtil.openProject(projectDir.getPath(), null, false);
+    }
+    else {
+      final GenerateProjectCallback callback = new GenerateProjectCallback(null);
+      final StudyDirectoryProjectGenerator generator = new StudyDirectoryProjectGenerator();
+      final Map<CourseInfo, File> courses = generator.getCourses();
+      CourseInfo introCourse = null;
+      for (CourseInfo info : courses.keySet()) {
+        if ("Introduction to Python".equals(info.getName())) {
+          introCourse = info;
+        }
+      }
+      if (introCourse == null) {
+        introCourse = StudyUtils.getFirst(courses.keySet());
+      }
+      generator.setSelectedCourse(introCourse);
+      final ProjectSpecificSettingsStep step = new ProjectSpecificSettingsStep(generator, callback, true);
+
+      step.createPanel(); // initialize panel to set location
+      step.setLocation(projectDir.toString());
+
+      final Project project = ProjectManager.getInstance().getDefaultProject();
+      final List<Sdk> sdks = PyConfigurableInterpreterList.getInstance(project).getAllPythonSdks();
+      Sdk sdk = sdks.isEmpty() ? null : sdks.iterator().next();
+      step.setSdk(sdk);
+      callback.consume(step);
+    }
+  }
+}

python/edu/learn-python/src/com/jetbrains/python/edu/actions/StudyNewProject.java

@@ -28,7 +28,7 @@ public class StudyNewProject extends ProjectSpecificAction {
   }
 
   public StudyNewProject() {
-    this("Learn Python", null);
+    this("Explore courses", null);
   }
 
 }

python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java

@@ -42,6 +42,7 @@ import com.jetbrains.python.sdk.flavors.JythonSdkFlavor;
 import com.jetbrains.python.sdk.flavors.PyPySdkFlavor;
 import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
 import icons.PythonIcons;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -454,6 +455,10 @@ abstract public class AbstractProjectSettingsStep extends AbstractActionWithPane
     return myLocationField.getText();
   }
 
+  public void setLocation(@NotNull final String location) {
+    myLocationField.setText(location);
+  }
+
   public boolean installFramework() {
     return myInstallFramework;
   }

python/ide/src/com/jetbrains/python/newProject/actions/GenerateProjectCallback.java

@@ -104,7 +104,7 @@ public class GenerateProjectCallback implements NullableConsumer<AbstractProject
   }
 
   @Nullable
-  private Project generateProject(@NotNull final Project project, @NotNull final AbstractProjectSettingsStep settings) {
+  private static Project generateProject(@NotNull final Project project, @NotNull final AbstractProjectSettingsStep settings) {
     final DirectoryProjectGenerator generator = settings.getProjectGenerator();
     final File location = new File(settings.getProjectLocation());
     if (!location.exists() && !location.mkdirs()) {