From db7342140ae6eb567bc7cc0c30d447c7edf194f7 Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Wed, 17 Dec 2014 18:21:22 +0100
Subject: [PATCH] Create new console tab toolbar button (PY-14513).

---
 .../python/console/PydevConsoleRunner.java    | 36 +++++++++++++++++--
 .../console/PythonConsoleToolWindow.java      |  4 +--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index f662cc5963a2..4a8e1e60b7c6 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -280,6 +280,9 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     toolbarActions.add(myHistoryController.getBrowseHistory());
 
     toolbarActions.add(new ConnectDebuggerAction());
+
+    toolbarActions.add(new NewConsoleAction());
+
     return actions;
   }
 
@@ -307,10 +310,21 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     });
   }
 
+  /**
+   * Opens console
+   */
   public void open() {
     run();
   }
 
+
+  /**
+   * Creates new console tab
+   */
+  public void createNewConsole() {
+    run();
+  }
+
   public void run() {
     UIUtil.invokeAndWaitIfNeeded(new Runnable() {
       @Override
@@ -393,7 +407,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
 
       @Override
       public Map<String, String> getAdditionalEnvs() {
-        return addDefaultEnvironments(sdk, environmentVariables,getProject());
+        return addDefaultEnvironments(sdk, environmentVariables, getProject());
       }
     };
   }
@@ -494,7 +508,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
         String line = s.nextLine();
         sb.append(line).append("\n");
         try {
-          int i =  Integer.parseInt(line);
+          int i = Integer.parseInt(line);
           if (flag) {
             LOG.warn("Unexpected strings in output:\n" + sb.toString());
           }
@@ -990,6 +1004,24 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     }
   }
 
+
+  private static class NewConsoleAction extends AnAction implements DumbAware {
+    public NewConsoleAction() {
+      super("New Console", "Creates new python console", AllIcons.General.Add);
+    }
+
+    @Override
+    public void update(AnActionEvent e) {
+      e.getPresentation().setEnabled(true);
+    }
+
+    @Override
+    public void actionPerformed(AnActionEvent e) {
+      PydevConsoleRunner runner = PythonConsoleRunnerFactory.getInstance().createConsoleRunner(e.getData(CommonDataKeys.PROJECT), e.getData(LangDataKeys.MODULE));
+      runner.createNewConsole();
+    }
+  }
+
   private XDebugSession connectToDebugger() throws ExecutionException {
     final ServerSocket serverSocket = PythonCommandLineState.createServerSocket();
 
diff --git a/python/src/com/jetbrains/python/console/PythonConsoleToolWindow.java b/python/src/com/jetbrains/python/console/PythonConsoleToolWindow.java
index e6ad3f3363a8..c5cac180ed1a 100644
--- a/python/src/com/jetbrains/python/console/PythonConsoleToolWindow.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleToolWindow.java
@@ -72,7 +72,7 @@ public class PythonConsoleToolWindow {
 
 
   public void init(final @NotNull ToolWindow toolWindow, final @NotNull RunContentDescriptor contentDescriptor) {
-    addContent(toolWindow, contentDescriptor);
+    setContent(toolWindow, contentDescriptor);
 
     if (!myInitialized) {
       doInit(toolWindow);
@@ -103,7 +103,7 @@ public class PythonConsoleToolWindow {
     });
   }
 
-  private static void addContent(ToolWindow toolWindow, RunContentDescriptor contentDescriptor) {
+  private static void setContent(ToolWindow toolWindow, RunContentDescriptor contentDescriptor) {
     toolWindow.getComponent().putClientProperty(ToolWindowContentUi.HIDE_ID_LABEL, "true");
 
     Content content = toolWindow.getContentManager().findContent(contentDescriptor.getDisplayName());