Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 1830
- f2fccb8c2ab4
- parent 1770
- c17e67e69ef5
- child 1833
- f7cd855680f1
equal
deleted
inserted
replaced
| 1829:fa72a573967f | 1830:f2fccb8c2ab4 |
|---|---|
| 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 Shell |
| 34 from QScintilla.Terminal import Terminal | 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 |
| 39 | 39 |
| 691 # Create the template viewer part of the user interface | 691 # Create the template viewer part of the user interface |
| 692 self.templateViewer = TemplateViewer(None, self.viewmanager) | 692 self.templateViewer = TemplateViewer(None, self.viewmanager) |
| 693 self.templateViewer.setWindowTitle(self.trUtf8("Template-Viewer")) | 693 self.templateViewer.setWindowTitle(self.trUtf8("Template-Viewer")) |
| 694 | 694 |
| 695 # Create the terminal | 695 # Create the terminal |
| 696 self.terminal = Terminal(self.viewmanager) | 696 self.terminalAssembly = TerminalAssembly(self.viewmanager) |
| 697 self.terminal.setWindowTitle(self.trUtf8("Terminal")) | 697 self.terminal = self.terminalAssembly.termina() |
| 698 self.terminalAssembly.setWindowTitle(self.trUtf8("Terminal")) | |
| 698 | 699 |
| 699 # Create the numbers viewer | 700 # Create the numbers viewer |
| 700 self.numbersViewer = NumbersWidget() | 701 self.numbersViewer = NumbersWidget() |
| 701 self.numbersViewer.setWindowTitle(self.trUtf8("Numbers")) | 702 self.numbersViewer.setWindowTitle(self.trUtf8("Numbers")) |
| 702 | 703 |
| 703 self.windows = [self.projectBrowser, None, self.debugViewer, | 704 self.windows = [self.projectBrowser, None, self.debugViewer, |
| 704 None, self.logViewer, self.taskViewer, self.templateViewer, | 705 None, self.logViewer, self.taskViewer, self.templateViewer, |
| 705 self.multiProjectBrowser, self.terminal, self.cooperation, | 706 self.multiProjectBrowser, self.terminalAssembly, self.cooperation, |
| 706 self.symbolsViewer, self.numbersViewer] | 707 self.symbolsViewer, self.numbersViewer] |
| 707 | 708 |
| 708 if self.embeddedShell: | 709 if self.embeddedShell: |
| 709 self.shell = self.debugViewer.shell | 710 self.shell = self.debugViewer.shell |
| 710 else: | 711 else: |
| 777 self.__setupDockWindow(self.templateViewerDock, Qt.RightDockWidgetArea, | 778 self.__setupDockWindow(self.templateViewerDock, Qt.RightDockWidgetArea, |
| 778 self.templateViewer, self.trUtf8("Template-Viewer")) | 779 self.templateViewer, self.trUtf8("Template-Viewer")) |
| 779 | 780 |
| 780 # Create the terminal | 781 # Create the terminal |
| 781 self.terminalDock = self.__createDockWindow("TerminalDock") | 782 self.terminalDock = self.__createDockWindow("TerminalDock") |
| 782 self.terminal = Terminal(self.viewmanager, self.terminalDock) | 783 self.terminalAssembly = TerminalAssembly(self.viewmanager, self.terminalDock) |
| 784 self.terminal = self.terminalAssembly.termina() | |
| 783 self.__setupDockWindow(self.terminalDock, Qt.BottomDockWidgetArea, | 785 self.__setupDockWindow(self.terminalDock, Qt.BottomDockWidgetArea, |
| 784 self.terminal, self.trUtf8("Terminal")) | 786 self.terminalAssembly, self.trUtf8("Terminal")) |
| 785 | 787 |
| 786 self.windows = [self.projectBrowserDock, None, self.debugViewerDock, | 788 self.windows = [self.projectBrowserDock, None, self.debugViewerDock, |
| 787 None, self.logViewerDock, self.taskViewerDock, self.templateViewerDock, | 789 None, self.logViewerDock, self.taskViewerDock, self.templateViewerDock, |
| 788 self.multiProjectBrowserDock, self.terminalDock, self.cooperationDock] | 790 self.multiProjectBrowserDock, self.terminalDock, self.cooperationDock] |
| 789 | 791 |
| 875 self.cooperation = ChatWidget(parent=self.cooperationDock) | 877 self.cooperation = ChatWidget(parent=self.cooperationDock) |
| 876 self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, | 878 self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, |
| 877 self.cooperation, self.trUtf8("Cooperation")) | 879 self.cooperation, self.trUtf8("Cooperation")) |
| 878 | 880 |
| 879 # Create the terminal part of the user interface | 881 # Create the terminal part of the user interface |
| 880 self.terminal = Terminal(self.viewmanager) | 882 self.terminalAssembly = TerminalAssembly(self.viewmanager) |
| 881 self.hToolbox.addItem(self.terminal, | 883 self.terminal = self.terminalAssembly.termina() |
| 884 self.hToolbox.addItem(self.terminalAssembly, | |
| 882 UI.PixmapCache.getIcon("terminal.png"), | 885 UI.PixmapCache.getIcon("terminal.png"), |
| 883 self.trUtf8("Terminal")) | 886 self.trUtf8("Terminal")) |
| 884 | 887 |
| 885 # Create the task viewer part of the user interface | 888 # Create the task viewer part of the user interface |
| 886 self.taskViewer = TaskViewer(None, self.project) | 889 self.taskViewer = TaskViewer(None, self.project) |
| 982 self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, | 985 self.__setupDockWindow(self.cooperationDock, Qt.RightDockWidgetArea, |
| 983 self.cooperation, self.trUtf8("Cooperation")) | 986 self.cooperation, self.trUtf8("Cooperation")) |
| 984 | 987 |
| 985 # Create the terminal part of the user interface | 988 # Create the terminal part of the user interface |
| 986 logging.debug("Creating Terminal...") | 989 logging.debug("Creating Terminal...") |
| 987 self.terminal = Terminal(self.viewmanager) | 990 self.terminalAssembly = TerminalAssembly(self.viewmanager) |
| 988 self.bottomSidebar.addTab(self.terminal, | 991 self.terminal = self.terminalAssembly.terminal() |
| 992 self.bottomSidebar.addTab(self.terminalAssembly, | |
| 989 UI.PixmapCache.getIcon("terminal.png"), | 993 UI.PixmapCache.getIcon("terminal.png"), |
| 990 self.trUtf8("Terminal")) | 994 self.trUtf8("Terminal")) |
| 991 | 995 |
| 992 # Create the task viewer part of the user interface | 996 # Create the task viewer part of the user interface |
| 993 logging.debug("Creating Task Viewer...") | 997 logging.debug("Creating Task Viewer...") |
