Mercurial Repositories > eric / changeset

--- a/Debugger/DebugViewer.py	Sat May 05 15:47:22 2012 +0200
+++ b/Debugger/DebugViewer.py	Sat May 05 16:55:21 2012 +0200
@@ -204,7 +204,7 @@
         self.__tabWidget.setTabToolTip(index, self.exceptionLogger.windowTitle())
         
         if self.embeddedShell:
-            self.__tabWidget.setCurrentWidget(self.shell)
+            self.__tabWidget.setCurrentWidget(self.shellAssembly)
         else:
             if self.embeddedBrowser:
                 self.__tabWidget.setCurrentWidget(self.browser)
@@ -252,7 +252,7 @@
         self.currentStack = None
         self.__threadList.clear()
         if self.embeddedShell:
-            self.__tabWidget.setCurrentWidget(self.shell)
+            self.__tabWidget.setCurrentWidget(self.shellAssembly)
         else:
             if self.embeddedBrowser:
                 self.__tabWidget.setCurrentWidget(self.browser)
@@ -266,7 +266,7 @@
         """
         if self.embeddedShell:
             self.saveCurrentPage()
-            self.__tabWidget.setCurrentWidget(self.shell)
+            self.__tabWidget.setCurrentWidget(self.shellAssembly)
             
     def showVariables(self, vlist, globals):
         """

--- a/UI/UserInterface.py	Sat May 05 15:47:22 2012 +0200
+++ b/UI/UserInterface.py	Sat May 05 16:55:21 2012 +0200
@@ -3482,10 +3482,10 @@
         self.setDebugProfile()
         if self.layout == "Toolboxes":
             if not self.embeddedShell:
-                self.hToolbox.setCurrentWidget(self.shell)
+                self.hToolbox.setCurrentWidget(self.shellAssembly)
         elif self.layout == "Sidebars":
             if not self.embeddedShell:
-                self.bottomSidebar.setCurrentWidget(self.shell)
+                self.bottomSidebar.setCurrentWidget(self.shellAssembly)
         
     def setDebugProfile(self, save=True):
         """
@@ -3622,17 +3622,17 @@
                 self.debugViewerDock.raise_()
             else:
                 self.debugViewer.show()
-            self.debugViewer.setCurrentWidget(self.shell)
+            self.debugViewer.setCurrentWidget(self.shellAssembly)
         else:                               # separate window
             if self.layout == "DockWindows":
                 self.shellDock.show()
                 self.shellDock.raise_()
             elif self.layout == "Toolboxes":
                 self.hToolboxDock.show()
-                self.hToolbox.setCurrentWidget(self.shell)
+                self.hToolbox.setCurrentWidget(self.shellAssembly)
             elif self.layout == "Sidebars":
                 self.bottomSidebar.show()
-                self.bottomSidebar.setCurrentWidget(self.shell)
+                self.bottomSidebar.setCurrentWidget(self.shellAssembly)
             else:
                 self.shell.show()
         self.shell.setFocus(Qt.ActiveWindowFocusReason)
@@ -3661,10 +3661,10 @@
             self.terminalDock.raise_()
         elif self.layout == "Toolboxes":
             self.hToolboxDock.show()
-            self.hToolbox.setCurrentWidget(self.terminal)
+            self.hToolbox.setCurrentWidget(self.terminalAssembly)
         elif self.layout == "Sidebars":
             self.bottomSidebar.show()
-            self.bottomSidebar.setCurrentWidget(self.terminal)
+            self.bottomSidebar.setCurrentWidget(self.terminalAssembly)
         else:
             self.terminal.show()
         self.terminal.setFocus(Qt.ActiveWindowFocusReason)