Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 1833
- f7cd855680f1
- parent 1830
- f2fccb8c2ab4
- child 1843
- 0c00516e0403
equal
deleted
inserted
replaced
| 1831:2dd263d670ca | 1833:f7cd855680f1 |
|---|---|
| 28 from Debugger.DebugUI import DebugUI | 28 from Debugger.DebugUI import DebugUI |
| 29 from Debugger.DebugServer import DebugServer | 29 from Debugger.DebugServer import DebugServer |
| 30 from Debugger.DebugViewer import DebugViewer | 30 from Debugger.DebugViewer import DebugViewer |
| 31 from Debugger.DebugClientCapabilities import HasUnittest | 31 from Debugger.DebugClientCapabilities import HasUnittest |
| 32 | 32 |
| 33 from QScintilla.Shell import Shell | 33 from QScintilla.Shell import ShellAssembly |
| 34 from QScintilla.Terminal import TerminalAssembly | 34 from QScintilla.Terminal import TerminalAssembly |
| 35 from QScintilla.MiniEditor import MiniEditor | 35 from QScintilla.MiniEditor import MiniEditor |
| 36 from QScintilla.SpellChecker import SpellChecker | 36 from QScintilla.SpellChecker import SpellChecker |
| 37 | 37 |
| 38 from PyUnit.UnittestDialog import UnittestDialog | 38 from PyUnit.UnittestDialog import UnittestDialog |
| 708 | 708 |
| 709 if self.embeddedShell: | 709 if self.embeddedShell: |
| 710 self.shell = self.debugViewer.shell | 710 self.shell = self.debugViewer.shell |
| 711 else: | 711 else: |
| 712 # Create the shell | 712 # Create the shell |
| 713 self.shell = Shell(debugServer, self.viewmanager, None) | 713 self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True) |
| 714 self.windows[3] = self.shell | 714 self.shell = self.shellAssembly.shell() |
| 715 self.windows[3] = self.shellAssembly | |
| 715 | 716 |
| 716 if self.embeddedFileBrowser == 0: # separate window | 717 if self.embeddedFileBrowser == 0: # separate window |
| 717 # Create the file browser | 718 # Create the file browser |
| 718 self.browser = Browser(None) | 719 self.browser = Browser(None) |
| 719 self.browser.setWindowTitle(self.trUtf8("File-Browser")) | 720 self.browser.setWindowTitle(self.trUtf8("File-Browser")) |
| 792 if self.embeddedShell: | 793 if self.embeddedShell: |
| 793 self.shell = self.debugViewer.shell | 794 self.shell = self.debugViewer.shell |
| 794 else: | 795 else: |
| 795 # Create the shell | 796 # Create the shell |
| 796 self.shellDock = self.__createDockWindow("ShellDock") | 797 self.shellDock = self.__createDockWindow("ShellDock") |
| 797 self.shell = Shell(debugServer, self.viewmanager, self.shellDock) | 798 self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True, |
| 799 self.shellDock) | |
| 800 self.shell = self.shellAssembly.shell() | |
| 798 self.__setupDockWindow(self.shellDock, Qt.BottomDockWidgetArea, | 801 self.__setupDockWindow(self.shellDock, Qt.BottomDockWidgetArea, |
| 799 self.shell, self.trUtf8("Shell")) | 802 self.shellAssembly, self.trUtf8("Shell")) |
| 800 self.windows[3] = self.shellDock | 803 self.windows[3] = self.shellDock |
| 801 | 804 |
| 802 if self.embeddedFileBrowser == 0: # separate window | 805 if self.embeddedFileBrowser == 0: # separate window |
| 803 # Create the file browser | 806 # Create the file browser |
| 804 self.browserDock = self.__createDockWindow("BrowserDock") | 807 self.browserDock = self.__createDockWindow("BrowserDock") |
| 902 | 905 |
| 903 if self.embeddedShell: | 906 if self.embeddedShell: |
| 904 self.shell = self.debugViewer.shell | 907 self.shell = self.debugViewer.shell |
| 905 else: | 908 else: |
| 906 # Create the shell | 909 # Create the shell |
| 907 self.shell = Shell(debugServer, self.viewmanager) | 910 self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True) |
| 908 self.hToolbox.insertItem(0, self.shell, | 911 self.shell = self.shellAssembly.shell() |
| 912 self.hToolbox.insertItem(0, self.shellAssembly, | |
| 909 UI.PixmapCache.getIcon("shell.png"), | 913 UI.PixmapCache.getIcon("shell.png"), |
| 910 self.trUtf8("Shell")) | 914 self.trUtf8("Shell")) |
| 911 | 915 |
| 912 if self.embeddedFileBrowser == 0: # separate window | 916 if self.embeddedFileBrowser == 0: # separate window |
| 913 # Create the file browser | 917 # Create the file browser |
| 1013 if self.embeddedShell: | 1017 if self.embeddedShell: |
| 1014 self.shell = self.debugViewer.shell | 1018 self.shell = self.debugViewer.shell |
| 1015 else: | 1019 else: |
| 1016 # Create the shell | 1020 # Create the shell |
| 1017 logging.debug("Creating Shell...") | 1021 logging.debug("Creating Shell...") |
| 1018 self.shell = Shell(debugServer, self.viewmanager) | 1022 self.shellAssembly = ShellAssembly(debugServer, self.viewmanager, True) |
| 1019 self.bottomSidebar.insertTab(0, self.shell, | 1023 self.shell = self.shellAssembly.shell() |
| 1024 self.bottomSidebar.insertTab(0, self.shellAssembly, | |
| 1020 UI.PixmapCache.getIcon("shell.png"), | 1025 UI.PixmapCache.getIcon("shell.png"), |
| 1021 self.trUtf8("Shell")) | 1026 self.trUtf8("Shell")) |
| 1022 | 1027 |
| 1023 if self.embeddedFileBrowser == 0: # separate window | 1028 if self.embeddedFileBrowser == 0: # separate window |
| 1024 # Create the file browser | 1029 # Create the file browser |
