eric: comparison UI/UserInterface.py

-:cc296ba99a3f
+:6f958d5765f4
 self.preferencesChanged.connect(debugServer.preferencesChanged)
 self.preferencesChanged.connect(self.debugViewer.preferencesChanged)
 self.preferencesChanged.connect(self.cooperation.preferencesChanged)
 self.preferencesChanged.connect(
 self.backgroundService.preferencesOrProjectChanged)
+self.preferencesChanged.connect(
+self.codeDocumentationViewer.preferencesChanged)
 self.viewmanager.editorSaved.connect(self.project.repopulateItem)
 self.viewmanager.lastEditorClosed.connect(self.__lastEditorClosed)
 self.viewmanager.editorOpened.connect(self.__editorOpened)
 self.viewmanager.changeCaption.connect(self.__setWindowCaption)
 e5App().registerObject("ToolbarManager", self.toolbarManager)
 e5App().registerObject("Cooperation", self.cooperation)
 e5App().registerObject("IRC", self.irc)
 e5App().registerObject("Symbols", self.symbolsViewer)
 e5App().registerObject("Numbers", self.numbersViewer)
+e5App().registerObject("DocuViewer", self.codeDocumentationViewer)
 # list of web addresses serving the versions file
 self.__httpAlternatives = Preferences.getUI("VersionsUrls6")
 self.__inVersionCheck = False
 self.__versionCheckProgress = None
 # set the keyboard input interval
 interval = Preferences.getUI("KeyboardInputInterval")
 if interval > 0:
 QApplication.setKeyboardInputInterval(interval)
+# finalize the initialization of the code documentation viewer
+self.codeDocumentationViewer.finalizeSetup()
 def __createLayout(self, debugServer):
 """
 Private method to create the layout of the various windows.
 @param debugServer reference to the debug server object
 """
 from E5Gui.E5ToolBox import E5VerticalToolBox, E5HorizontalToolBox
+logging.debug("Creating Toolboxes Layout...")
 # Create the left toolbox
 self.lToolboxDock = self.__createDockWindow("lToolboxDock")
 self.lToolbox = E5VerticalToolBox(self.lToolboxDock)
 self.__setupDockWindow(self.lToolboxDock, Qt.LeftDockWidgetArea,
 self.lToolbox, self.tr("Left Toolbox"))
 self.rToolbox = E5VerticalToolBox(self.rToolboxDock)
 self.__setupDockWindow(self.rToolboxDock, Qt.RightDockWidgetArea,
 self.rToolbox, self.tr("Right Toolbox"))
 # Create the project browser
+logging.debug("Creating Project Browser...")
 from Project.ProjectBrowser import ProjectBrowser
 self.projectBrowser = ProjectBrowser(
 self.project, None,
 embeddedBrowser=(self.embeddedFileBrowser == 2))
 self.lToolbox.addItem(self.projectBrowser,
 UI.PixmapCache.getIcon("projectViewer.png"),
 self.tr("Project-Viewer"))
 # Create the multi project browser
+logging.debug("Creating Multiproject Browser...")
 from MultiProject.MultiProjectBrowser import MultiProjectBrowser
 self.multiProjectBrowser = MultiProjectBrowser(self.multiProject,
 self.project)
 self.lToolbox.addItem(self.multiProjectBrowser,
 UI.PixmapCache.getIcon("multiProjectViewer.png"),
 self.tr("Multiproject-Viewer"))
 # Create the template viewer part of the user interface
+logging.debug("Creating Template Viewer...")
 from Templates.TemplateViewer import TemplateViewer
 self.templateViewer = TemplateViewer(None,
 self.viewmanager)
 self.lToolbox.addItem(self.templateViewer,
 UI.PixmapCache.getIcon("templateViewer.png"),
 self.tr("Template-Viewer"))
+# Create the code documentation viewer
+logging.debug("Creating Code Documentation Viewer...")
+from .CodeDocumentationViewer import CodeDocumentationViewer
+self.codeDocumentationViewer = CodeDocumentationViewer(self)
+self.rToolbox.addItem(self.codeDocumentationViewer,
+UI.PixmapCache.getIcon("codeDocuViewer.png"),
+self.tr("Code Documentation Viewer"))
 # Create the debug viewer maybe without the embedded shell
+logging.debug("Creating Debug Viewer...")
 from Debugger.DebugViewer import DebugViewer
 self.debugViewer = DebugViewer(
 debugServer, True, self.viewmanager, None,
 embeddedShell=self.embeddedShell,
 embeddedBrowser=(self.embeddedFileBrowser == 1))
 self.rToolbox.addItem(self.debugViewer,
 UI.PixmapCache.getIcon("debugViewer.png"),
 self.tr("Debug-Viewer"))
 # Create the chat part of the user interface
+logging.debug("Creating Chat Widget...")
 from Cooperation.ChatWidget import ChatWidget
 self.cooperation = ChatWidget(self)
 self.rToolbox.addItem(self.cooperation,
 UI.PixmapCache.getIcon("cooperation.png"),
 self.tr("Cooperation"))
 # Create the IRC part of the user interface
+logging.debug("Creating IRC Widget...")
 from Network.IRC.IrcWidget import IrcWidget
 self.irc = IrcWidget(self)
 self.rToolbox.addItem(self.irc,
 UI.PixmapCache.getIcon("irc.png"),
 self.tr("IRC"))
 # Create the task viewer part of the user interface
+logging.debug("Creating Task Viewer...")
 from Tasks.TaskViewer import TaskViewer
 self.taskViewer = TaskViewer(None, self.project)
 self.hToolbox.addItem(self.taskViewer,
 UI.PixmapCache.getIcon("task.png"),
 self.tr("Task-Viewer"))
 # Create the log viewer part of the user interface
+logging.debug("Creating Log Viewer...")
 from .LogView import LogViewer
 self.logViewer = LogViewer(self)
 self.hToolbox.addItem(self.logViewer,
 UI.PixmapCache.getIcon("logViewer.png"),
 self.tr("Log-Viewer"))
 if self.embeddedShell:
 self.shell = self.debugViewer.shell
 else:
 # Create the shell
+logging.debug("Creating Shell...")
 from QScintilla.Shell import ShellAssembly
 self.shellAssembly = \
 ShellAssembly(debugServer, self.viewmanager, True)
 self.shell = self.shellAssembly.shell()
 self.hToolbox.insertItem(0, self.shellAssembly,
 UI.PixmapCache.getIcon("shell.png"),
 self.tr("Shell"))
 if self.embeddedFileBrowser == 0:   # separate window
 # Create the file browser
+logging.debug("Creating File Browser...")
 from .Browser import Browser
 self.browser = Browser()
 self.lToolbox.addItem(self.browser,
 UI.PixmapCache.getIcon("browser.png"),
 self.tr("File-Browser"))
 self.browser = self.debugViewer.browser
 else:                               # embedded in project browser
 self.browser = self.projectBrowser.fileBrowser
 # Create the symbols viewer
+logging.debug("Creating Symbols Viewer...")
 from .SymbolsWidget import SymbolsWidget
 self.symbolsViewer = SymbolsWidget()
 self.lToolbox.addItem(self.symbolsViewer,
 UI.PixmapCache.getIcon("symbols.png"),
 self.tr("Symbols"))
 # Create the numbers viewer
+logging.debug("Creating Numbers Viewer...")
 from .NumbersWidget import NumbersWidget
 self.numbersViewer = NumbersWidget()
 self.hToolbox.addItem(self.numbersViewer,
 UI.PixmapCache.getIcon("numbers.png"),
 self.tr("Numbers"))
 Private method to create the Sidebars layout.
 @param debugServer reference to the debug server object
 """
 from E5Gui.E5SideBar import E5SideBar
+logging.debug("Creating Sidebars Layout...")
 delay = Preferences.getUI("SidebarDelay")
 # Create the left sidebar
 self.leftSidebar = E5SideBar(E5SideBar.West, delay)
 self.leftSidebar.addTab(
 self.templateViewer,
 UI.PixmapCache.getIcon("templateViewer.png"),
 self.tr("Template-Viewer"))
+# Create the code documentation viewer
+logging.debug("Creating Code Documentation Viewer...")
+from .CodeDocumentationViewer import CodeDocumentationViewer
+self.codeDocumentationViewer = CodeDocumentationViewer(self)
+self.rightSidebar.addTab(
+self.codeDocumentationViewer,
+UI.PixmapCache.getIcon("codeDocuViewer.png"),
+self.tr("Code Documentation Viewer"))
 # Create the debug viewer maybe without the embedded shell
 logging.debug("Creating Debug Viewer...")
 from Debugger.DebugViewer import DebugViewer
 self.debugViewer = DebugViewer(
 debugServer, True, self.viewmanager, None,
 self.shellActivateAct = E5Action(
 self.tr('Shell'),
 self.tr('&Shell'),
 QKeySequence(self.tr("Alt+Shift+S")),
 0, self,
-'interprter_shell_activate')
+'interpreter_shell_activate')
 self.shellActivateAct.setStatusTip(self.tr(
 "Switch the input focus to the Shell window."))
 self.shellActivateAct.setWhatsThis(self.tr(
 """<b>Activate Shell</b>"""
 """<p>This switches the input focus to the Shell window.</p>"""
 """
 aw = self.viewmanager.activeWindow()
 if aw is not None:
 aw.setFocus(Qt.ActiveWindowFocusReason)
+def activateCodeDocumentationViewer(self, switchFocus=True):
+"""
+Public slot to handle the activation of the Code Documentation Viewer.
+@param switchFocus flag indicating to transfer the input focus
+@type bool
+"""
+if self.layoutType == "Toolboxes":
+self.rToolboxDock.show()
+self.rToolbox.setCurrentWidget(self.codeDocumentationViewer)
+elif self.layoutType == "Sidebars":
+self.rightSidebar.show()
+self.rightSidebar.setCurrentWidget(self.codeDocumentationViewer)
+else:
+self.codeDocumentationViewer.show()
+if switchFocus:
+self.codeDocumentationViewer.setFocus(Qt.ActiveWindowFocusReason)
 def __toggleWindow(self, w):
 """
 Private method to toggle a workspace editor window.
 @param w reference to the workspace editor window
 if not self.viewmanager.closeViewManager():
 return False
 if sessionCreated and not self.__disableCrashSession:
 self.__deleteCrashSession()
+self.codeDocumentationViewer.shutdown()
 self.__previewer.shutdown()
 self.shell.closeShell()
 def __ircAutoConnected(self):
 """
 Private slot handling the automatic connection of the IRC client.
 """
 self.__activateIRC()
+###############################################
+## Support for Code Documentation Viewer  below
+###############################################
+def documentationViewer(self):
+"""
+Public method to provide a reference to the code documentation viewer.
+@return reference to the code documentation viewer
+@rtype CodeDocumentationViewer
+"""
+return self.codeDocumentationViewer

Mercurial Repositories > eric / file comparison

comparison: UI/UserInterface.py

UI/UserInterface.py