Mercurial Repositories > eric / file diff

--- a/Debugger/DebugViewer.py	Sun Jul 08 17:33:25 2018 +0200
+++ b/Debugger/DebugViewer.py	Sun Jul 08 18:55:21 2018 +0200
@@ -48,8 +48,7 @@
     """
     sourceFile = pyqtSignal(str, int)
     
-    def __init__(self, debugServer, docked, vm, parent=None,
-                 embeddedShell=True, embeddedBrowser=True):
+    def __init__(self, debugServer, docked, vm, parent=None):
         """
         Constructor
         
@@ -57,13 +56,6 @@
         @param docked flag indicating a dock window
         @param vm reference to the viewmanager object
         @param parent parent widget (QWidget)
-        @param embeddedShell flag indicating whether the shell should be
-            included. This flag is set to False by those layouts, that have
-            the interpreter shell in a separate window.
-        @param embeddedBrowser flag indicating whether the file browser should
-            be included. This flag is set to False by those layouts, that
-            have the file browser in a separate window or embedded
-            in the project browser instead.
         """
         super(DebugViewer, self).__init__(parent)
         
@@ -79,27 +71,6 @@
         self.__tabWidget = E5TabWidget()
         self.__mainLayout.addWidget(self.__tabWidget)
         
-        self.embeddedShell = embeddedShell
-        if embeddedShell:
-            from QScintilla.Shell import ShellAssembly
-            # add the interpreter shell
-            self.shellAssembly = ShellAssembly(debugServer, vm, False)
-            self.shell = self.shellAssembly.shell()
-            index = self.__tabWidget.addTab(
-                self.shellAssembly,
-                UI.PixmapCache.getIcon("shell.png"), '')
-            self.__tabWidget.setTabToolTip(index, self.shell.windowTitle())
-        
-        self.embeddedBrowser = embeddedBrowser
-        if embeddedBrowser:
-            from UI.Browser import Browser
-            # add the browser
-            self.browser = Browser()
-            index = self.__tabWidget.addTab(
-                self.browser,
-                UI.PixmapCache.getIcon("browser.png"), '')
-            self.__tabWidget.setTabToolTip(index, self.browser.windowTitle())
-        
         from .VariablesViewer import VariablesViewer
         # add the global variables viewer
         self.glvWidget = QWidget()
@@ -249,13 +220,7 @@
         self.__tabWidget.setTabToolTip(
             index, self.exceptionLogger.windowTitle())
         
-        if self.embeddedShell:
-            self.__tabWidget.setCurrentWidget(self.shellAssembly)
-        else:
-            if self.embeddedBrowser:
-                self.__tabWidget.setCurrentWidget(self.browser)
-            else:
-                self.__tabWidget.setCurrentWidget(self.glvWidget)
+        self.__tabWidget.setCurrentWidget(self.glvWidget)
         
         # add the threads viewer
         self.__mainLayout.addWidget(QLabel(self.tr("Threads:")))
@@ -273,7 +238,6 @@
         self.__mainLayout.setStretchFactor(self.__tabWidget, 5)
         self.__mainLayout.setStretchFactor(self.__threadList, 1)
         
-        self.currPage = None
         self.currentStack = None
         self.framenr = 0
         
@@ -311,23 +275,9 @@
         self.currentStack = None
         self.stackComboBox.clear()
         self.__threadList.clear()
-        if self.embeddedShell:
-            self.__tabWidget.setCurrentWidget(self.shellAssembly)
-        else:
-            if self.embeddedBrowser:
-                self.__tabWidget.setCurrentWidget(self.browser)
-            else:
-                self.__tabWidget.setCurrentWidget(self.glvWidget)
+        self.__tabWidget.setCurrentWidget(self.glvWidget)
         self.breakpointViewer.handleResetUI()
         
-    def handleRawInput(self):
-        """
-        Public slot to handle the switch to the shell in raw input mode.
-        """
-        if self.embeddedShell:
-            self.saveCurrentPage()
-            self.__tabWidget.setCurrentWidget(self.shellAssembly)
-        
     def initCallStackViewer(self, projectMode):
         """
         Public method to initialize the call stack viewer.
@@ -397,19 +347,6 @@
         else:
             self.__tabWidget.setCurrentWidget(self.lvWidget)
         
-    def saveCurrentPage(self):
-        """
-        Public slot to save the current page.
-        """
-        self.currPage = self.__tabWidget.currentWidget()
-        
-    def restoreCurrentPage(self):
-        """
-        Public slot to restore the previously saved page.
-        """
-        if self.currPage is not None:
-            self.__tabWidget.setCurrentWidget(self.currPage)
-            
     def handleClientStack(self, stack):
         """
         Public slot to show the call stack of the program being debugged.