diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:28:18 -0700 |
| commit | d76e3920c56d37c942092b7dca20fcaded81c0a5 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /python/src/META-INF/pycharm-core.xml | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (diff) | |
| download | idea-d76e3920c56d37c942092b7dca20fcaded81c0a5.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java
Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f
Diffstat (limited to 'python/src/META-INF/pycharm-core.xml')
| -rw-r--r-- | python/src/META-INF/pycharm-core.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/python/src/META-INF/pycharm-core.xml b/python/src/META-INF/pycharm-core.xml index 13ba05db63f0..4732ad084b32 100644 --- a/python/src/META-INF/pycharm-core.xml +++ b/python/src/META-INF/pycharm-core.xml @@ -24,6 +24,12 @@ </component> </project-components> + <project-components> + <component> + <implementation-class>com.jetbrains.python.console.PythonConsoleToolWindow</implementation-class> + </component> + </project-components> + <module value="com.intellij.modules.xml"/> <extensions defaultExtensionNs="com.intellij"> @@ -75,6 +81,10 @@ <renameHandler implementation="com.intellij.platform.renameProject.RenameProjectHandler"/> <renameHandler implementation="com.intellij.platform.renameProject.ProjectFolderRenameHandler"/> + + <!-- Console --> + <toolWindow id="Python Console" anchor="bottom" icon="PythonIcons.Python.PythonConsoleToolWindow" + factoryClass="com.jetbrains.python.console.PythonConsoleToolWindowFactory" secondary="false"/> </extensions> <actions> |