From ed4401b6f8f16a6e4cee0db6e203f2feda792c60 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sun, 23 Nov 2014 02:02:19 +0100
Subject: [PATCH] don't wrap actions in extra group for new welcome screen

---
 .../actions/PyCharmNewProjectStep.java        | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java b/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
index ab768d15fdcb..cd8d1a986190 100644
--- a/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
+++ b/python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
@@ -43,7 +43,11 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa
     final NullableConsumer<AbstractProjectSettingsStep> callback = new GenerateProjectCallback(runnable);
 
     final ProjectSpecificAction action = new ProjectSpecificAction(callback, new PythonBaseProjectGenerator(), isWelcomeScreen);
-    add(action);
+    if (isWelcomeScreen) {
+      addAll(action.getChildren(null));
+    } else {
+      add(action);
+    }
 
     final DirectoryProjectGenerator[] generators = Extensions.getExtensions(DirectoryProjectGenerator.EP_NAME);
     if (generators.length == 0) {
@@ -60,14 +64,25 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa
 
     List<DirectoryProjectGenerator> pluginSpecificGenerators = Lists.newArrayList();
     for (DirectoryProjectGenerator generator : generators) {
-      if (generator instanceof PythonProjectGenerator)
-        add(new ProjectSpecificAction(callback, generator, isWelcomeScreen));
+      if (generator instanceof PythonProjectGenerator) {
+        ProjectSpecificAction group = new ProjectSpecificAction(callback, generator, isWelcomeScreen);
+        if (isWelcomeScreen) {
+          addAll(group.getChildren(null));
+        } else {
+          add(group);
+        }
+      }
       else
         pluginSpecificGenerators.add(generator);
     }
 
     if (!pluginSpecificGenerators.isEmpty()) {
-      add(new PluginSpecificProjectsStep(callback, pluginSpecificGenerators, isWelcomeScreen));
+      PluginSpecificProjectsStep step = new PluginSpecificProjectsStep(callback, pluginSpecificGenerators, isWelcomeScreen);
+      if (isWelcomeScreen){
+        addAll(step.getChildren(null));
+      } else {
+        add(step);
+      }
     }
   }