Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- branch
- 5_3_x
- changeset 2475
- c74e1cff7f3f
- parent 2302
- f29e9405c851
- child 2558
- bc79bae54496
equal
deleted
inserted
replaced
| 2473:c9f484ea061b | 2475:c74e1cff7f3f |
|---|---|
| 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 ShellAssembly | 33 from QScintilla.Shell import ShellAssembly |
| 34 from QScintilla.Terminal import TerminalAssembly | |
| 35 from QScintilla.MiniEditor import MiniEditor | 34 from QScintilla.MiniEditor import MiniEditor |
| 36 from QScintilla.SpellChecker import SpellChecker | 35 from QScintilla.SpellChecker import SpellChecker |
| 37 | 36 |
| 38 from PyUnit.UnittestDialog import UnittestDialog | 37 from PyUnit.UnittestDialog import UnittestDialog |
| 39 | 38 |
| 418 self.reloadAPIs.connect(self.viewmanager.getAPIsManager().reloadAPIs) | 417 self.reloadAPIs.connect(self.viewmanager.getAPIsManager().reloadAPIs) |
| 419 self.preferencesChanged.connect(self.logViewer.preferencesChanged) | 418 self.preferencesChanged.connect(self.logViewer.preferencesChanged) |
| 420 self.appendStdout.connect(self.logViewer.appendToStdout) | 419 self.appendStdout.connect(self.logViewer.appendToStdout) |
| 421 self.appendStderr.connect(self.logViewer.appendToStderr) | 420 self.appendStderr.connect(self.logViewer.appendToStderr) |
| 422 self.preferencesChanged.connect(self.shell.handlePreferencesChanged) | 421 self.preferencesChanged.connect(self.shell.handlePreferencesChanged) |
| 423 self.preferencesChanged.connect(self.terminal.handlePreferencesChanged) | |
| 424 self.preferencesChanged.connect(self.project.handlePreferencesChanged) | 422 self.preferencesChanged.connect(self.project.handlePreferencesChanged) |
| 425 self.preferencesChanged.connect(self.projectBrowser.handlePreferencesChanged) | 423 self.preferencesChanged.connect(self.projectBrowser.handlePreferencesChanged) |
| 426 self.preferencesChanged.connect( | 424 self.preferencesChanged.connect( |
| 427 self.projectBrowser.psBrowser.handlePreferencesChanged) | 425 self.projectBrowser.psBrowser.handlePreferencesChanged) |
| 428 self.preferencesChanged.connect( | 426 self.preferencesChanged.connect( |
| 490 e5App().registerObject("TemplateViewer", self.templateViewer) | 488 e5App().registerObject("TemplateViewer", self.templateViewer) |
| 491 e5App().registerObject("Shell", self.shell) | 489 e5App().registerObject("Shell", self.shell) |
| 492 e5App().registerObject("DummyHelpViewer", self.dummyHelpViewer) | 490 e5App().registerObject("DummyHelpViewer", self.dummyHelpViewer) |
| 493 e5App().registerObject("PluginManager", self.pluginManager) | 491 e5App().registerObject("PluginManager", self.pluginManager) |
| 494 e5App().registerObject("ToolbarManager", self.toolbarManager) | 492 e5App().registerObject("ToolbarManager", self.toolbarManager) |
| 495 e5App().registerObject("Terminal", self.terminal) | |
| 496 e5App().registerObject("Cooperation", self.cooperation) | 493 e5App().registerObject("Cooperation", self.cooperation) |
| 497 e5App().registerObject("IRC", self.irc) | 494 e5App().registerObject("IRC", self.irc) |
| 498 e5App().registerObject("Symbols", self.symbolsViewer) | 495 e5App().registerObject("Symbols", self.symbolsViewer) |
| 499 e5App().registerObject("Numbers", self.numbersViewer) | 496 e5App().registerObject("Numbers", self.numbersViewer) |
| 500 | 497 |
| 685 self.irc = IrcWidget(self) | 682 self.irc = IrcWidget(self) |
| 686 self.rToolbox.addItem(self.irc, | 683 self.rToolbox.addItem(self.irc, |
| 687 UI.PixmapCache.getIcon("irc.png"), | 684 UI.PixmapCache.getIcon("irc.png"), |
| 688 self.trUtf8("IRC")) | 685 self.trUtf8("IRC")) |
| 689 | 686 |
| 690 # Create the terminal part of the user interface | |
| 691 self.terminalAssembly = TerminalAssembly(self.viewmanager) | |
| 692 self.terminal = self.terminalAssembly.terminal() | |
| 693 self.hToolbox.addItem(self.terminalAssembly, | |
| 694 UI.PixmapCache.getIcon("terminal.png"), | |
| 695 self.trUtf8("Terminal")) | |
| 696 | |
| 697 # Create the task viewer part of the user interface | 687 # Create the task viewer part of the user interface |
| 698 self.taskViewer = TaskViewer(None, self.project) | 688 self.taskViewer = TaskViewer(None, self.project) |
| 699 self.hToolbox.addItem(self.taskViewer, | 689 self.hToolbox.addItem(self.taskViewer, |
| 700 UI.PixmapCache.getIcon("task.png"), | 690 UI.PixmapCache.getIcon("task.png"), |
| 701 self.trUtf8("Task-Viewer")) | 691 self.trUtf8("Task-Viewer")) |
| 798 logging.debug("Creating IRC Widget...") | 788 logging.debug("Creating IRC Widget...") |
| 799 self.irc = IrcWidget(self) | 789 self.irc = IrcWidget(self) |
| 800 self.rightSidebar.addTab(self.irc, | 790 self.rightSidebar.addTab(self.irc, |
| 801 UI.PixmapCache.getIcon("irc.png"), self.trUtf8("IRC")) | 791 UI.PixmapCache.getIcon("irc.png"), self.trUtf8("IRC")) |
| 802 | 792 |
| 803 # Create the terminal part of the user interface | |
| 804 logging.debug("Creating Terminal...") | |
| 805 self.terminalAssembly = TerminalAssembly(self.viewmanager) | |
| 806 self.terminal = self.terminalAssembly.terminal() | |
| 807 self.bottomSidebar.addTab(self.terminalAssembly, | |
| 808 UI.PixmapCache.getIcon("terminal.png"), | |
| 809 self.trUtf8("Terminal")) | |
| 810 | |
| 811 # Create the task viewer part of the user interface | 793 # Create the task viewer part of the user interface |
| 812 logging.debug("Creating Task Viewer...") | 794 logging.debug("Creating Task Viewer...") |
| 813 self.taskViewer = TaskViewer(None, self.project) | 795 self.taskViewer = TaskViewer(None, self.project) |
| 814 self.bottomSidebar.addTab(self.taskViewer, | 796 self.bottomSidebar.addTab(self.taskViewer, |
| 815 UI.PixmapCache.getIcon("task.png"), | 797 UI.PixmapCache.getIcon("task.png"), |
| 1268 )) | 1250 )) |
| 1269 self.shellActivateAct.triggered[()].connect(self.__activateShell) | 1251 self.shellActivateAct.triggered[()].connect(self.__activateShell) |
| 1270 self.actions.append(self.shellActivateAct) | 1252 self.actions.append(self.shellActivateAct) |
| 1271 self.addAction(self.shellActivateAct) | 1253 self.addAction(self.shellActivateAct) |
| 1272 | 1254 |
| 1273 self.terminalActivateAct = E5Action(self.trUtf8('Terminal'), | |
| 1274 self.trUtf8('Te&rminal'), | |
| 1275 QKeySequence(self.trUtf8("Alt+Shift+R")), | |
| 1276 0, self, | |
| 1277 'terminal_activate') | |
| 1278 self.terminalActivateAct.setStatusTip(self.trUtf8( | |
| 1279 "Switch the input focus to the Terminal window.")) | |
| 1280 self.terminalActivateAct.setWhatsThis(self.trUtf8( | |
| 1281 """<b>Activate Terminal</b>""" | |
| 1282 """<p>This switches the input focus to the Terminal window.</p>""" | |
| 1283 )) | |
| 1284 self.terminalActivateAct.triggered[()].connect(self.__activateTerminal) | |
| 1285 self.actions.append(self.terminalActivateAct) | |
| 1286 self.addAction(self.terminalActivateAct) | |
| 1287 | |
| 1288 self.browserActivateAct = E5Action(self.trUtf8('File-Browser'), | 1255 self.browserActivateAct = E5Action(self.trUtf8('File-Browser'), |
| 1289 self.trUtf8('&File-Browser'), | 1256 self.trUtf8('&File-Browser'), |
| 1290 QKeySequence(self.trUtf8("Alt+Shift+F")), | 1257 QKeySequence(self.trUtf8("Alt+Shift+F")), |
| 1291 0, self, | 1258 0, self, |
| 1292 'file_browser_activate') | 1259 'file_browser_activate') |
| 2206 self.__menus["subwindow"].addAction(self.templateViewerActivateAct) | 2173 self.__menus["subwindow"].addAction(self.templateViewerActivateAct) |
| 2207 self.__menus["subwindow"].addAction(self.browserActivateAct) | 2174 self.__menus["subwindow"].addAction(self.browserActivateAct) |
| 2208 self.__menus["subwindow"].addAction(self.symbolsViewerActivateAct) | 2175 self.__menus["subwindow"].addAction(self.symbolsViewerActivateAct) |
| 2209 # bottom side | 2176 # bottom side |
| 2210 self.__menus["subwindow"].addAction(self.shellActivateAct) | 2177 self.__menus["subwindow"].addAction(self.shellActivateAct) |
| 2211 self.__menus["subwindow"].addAction(self.terminalActivateAct) | |
| 2212 self.__menus["subwindow"].addAction(self.taskViewerActivateAct) | 2178 self.__menus["subwindow"].addAction(self.taskViewerActivateAct) |
| 2213 self.__menus["subwindow"].addAction(self.logViewerActivateAct) | 2179 self.__menus["subwindow"].addAction(self.logViewerActivateAct) |
| 2214 self.__menus["subwindow"].addAction(self.numbersViewerActivateAct) | 2180 self.__menus["subwindow"].addAction(self.numbersViewerActivateAct) |
| 2215 # right side | 2181 # right side |
| 2216 self.__menus["subwindow"].addAction(self.debugViewerActivateAct) | 2182 self.__menus["subwindow"].addAction(self.debugViewerActivateAct) |
| 3376 self.bottomSidebar.setCurrentWidget(self.shellAssembly) | 3342 self.bottomSidebar.setCurrentWidget(self.shellAssembly) |
| 3377 else: | 3343 else: |
| 3378 self.shell.show() | 3344 self.shell.show() |
| 3379 self.shell.setFocus(Qt.ActiveWindowFocusReason) | 3345 self.shell.setFocus(Qt.ActiveWindowFocusReason) |
| 3380 | 3346 |
| 3381 def __activateTerminal(self): | |
| 3382 """ | |
| 3383 Private slot to handle the activation of the Terminal window. | |
| 3384 """ | |
| 3385 if self.layout == "Toolboxes": | |
| 3386 self.hToolboxDock.show() | |
| 3387 self.hToolbox.setCurrentWidget(self.terminalAssembly) | |
| 3388 elif self.layout == "Sidebars": | |
| 3389 self.bottomSidebar.show() | |
| 3390 self.bottomSidebar.setCurrentWidget(self.terminalAssembly) | |
| 3391 else: | |
| 3392 self.terminal.show() | |
| 3393 self.terminal.setFocus(Qt.ActiveWindowFocusReason) | |
| 3394 | |
| 3395 def __activateLogViewer(self): | 3347 def __activateLogViewer(self): |
| 3396 """ | 3348 """ |
| 3397 Private slot to handle the activation of the Log Viewer. | 3349 Private slot to handle the activation of the Log Viewer. |
| 3398 """ | 3350 """ |
| 3399 if self.layout == "Toolboxes": | 3351 if self.layout == "Toolboxes": |
| 5218 | 5170 |
| 5219 if not self.viewmanager.closeViewManager(): | 5171 if not self.viewmanager.closeViewManager(): |
| 5220 return False | 5172 return False |
| 5221 | 5173 |
| 5222 self.shell.closeShell() | 5174 self.shell.closeShell() |
| 5223 self.terminal.closeTerminal() | |
| 5224 | 5175 |
| 5225 self.__writeTasks() | 5176 self.__writeTasks() |
| 5226 self.templateViewer.writeTemplates() | 5177 self.templateViewer.writeTemplates() |
| 5227 | 5178 |
| 5228 if not self.debuggerUI.shutdownServer(): | 5179 if not self.debuggerUI.shutdownServer(): |
