Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Wed May 02 19:10:17 2012 +0200
+++ b/UI/UserInterface.py	Fri May 04 20:06:17 2012 +0200
@@ -30,7 +30,7 @@
 from Debugger.DebugViewer import DebugViewer
 from Debugger.DebugClientCapabilities import HasUnittest
 
-from QScintilla.Shell import Shell
+from QScintilla.Shell import ShellAssembly
 from QScintilla.Terminal import TerminalAssembly
 from QScintilla.MiniEditor import MiniEditor
 from QScintilla.SpellChecker import SpellChecker
@@ -710,8 +710,9 @@
             self.shell = self.debugViewer.shell
         else:
             # Create the shell
-            self.shell = Shell(debugServer, self.viewmanager, None)
-            self.windows[3] = self.shell
+            self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True)
+            self.shell = self.shellAssembly.shell()
+            self.windows[3] = self.shellAssembly
 
         if self.embeddedFileBrowser == 0:   # separate window
             # Create the file browser
@@ -794,9 +795,11 @@
         else:
             # Create the shell
             self.shellDock = self.__createDockWindow("ShellDock")
-            self.shell = Shell(debugServer, self.viewmanager, self.shellDock)
+            self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True,
+                                               self.shellDock)
+            self.shell = self.shellAssembly.shell()
             self.__setupDockWindow(self.shellDock, Qt.BottomDockWidgetArea,
-                                 self.shell, self.trUtf8("Shell"))
+                                   self.shellAssembly, self.trUtf8("Shell"))
             self.windows[3] = self.shellDock
 
         if self.embeddedFileBrowser == 0:   # separate window
@@ -904,8 +907,9 @@
             self.shell = self.debugViewer.shell
         else:
             # Create the shell
-            self.shell = Shell(debugServer, self.viewmanager)
-            self.hToolbox.insertItem(0, self.shell,
+            self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True)
+            self.shell = self.shellAssembly.shell()
+            self.hToolbox.insertItem(0, self.shellAssembly,
                                      UI.PixmapCache.getIcon("shell.png"),
                                      self.trUtf8("Shell"))
 
@@ -1015,8 +1019,9 @@
         else:
             # Create the shell
             logging.debug("Creating Shell...")
-            self.shell = Shell(debugServer, self.viewmanager)
-            self.bottomSidebar.insertTab(0, self.shell,
+            self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True)
+            self.shell = self.shellAssembly.shell()
+            self.bottomSidebar.insertTab(0, self.shellAssembly,
                                      UI.PixmapCache.getIcon("shell.png"),
                                      self.trUtf8("Shell"))