eric: comparison eric6/UI/UserInterface.py

-:24eabcea4c59
+:a63ca2373f44
 self.findFilesDialog = None
 self.replaceFilesDialog = None
 self.__notification = None
 self.__readingSession = False
 self.__versionsDialog = None
+self.__configurationDialog = None
 # now setup the connections
 splash.showMessage(self.tr("Setting up connections..."))
 self.debugViewer.exceptionLogger.sourceFile.connect(
 self.rToolboxDock = self.__createDockWindow("rToolboxDock")
 self.rToolbox = E5VerticalToolBox(self.rToolboxDock)
 self.__setupDockWindow(self.rToolboxDock, Qt.RightDockWidgetArea,
 self.rToolbox, self.tr("Right Toolbox"))
+####################################################
+## Populate the left toolbox
+####################################################
 # Create the project browser
 logging.debug("Creating Project Browser...")
 from Project.ProjectBrowser import ProjectBrowser
 self.projectBrowser = ProjectBrowser(self.project)
 self.lToolbox.addItem(self.projectBrowser,
 self.viewmanager)
 self.lToolbox.addItem(self.templateViewer,
 UI.PixmapCache.getIcon("templateViewer.png"),
 self.tr("Template-Viewer"))
+####################################################
+## Populate the right toolbox
+####################################################
 if Preferences.getUI("ShowCodeDocumentationViewer"):
 # Create the code documentation viewer
 logging.debug("Creating Code Documentation Viewer...")
 from .CodeDocumentationViewer import CodeDocumentationViewer
 self.codeDocumentationViewer = CodeDocumentationViewer(self)
 self.irc = IrcWidget(self)
 self.rToolbox.addItem(self.irc,
 UI.PixmapCache.getIcon("irc.png"),
 self.tr("IRC"))
+####################################################
+## Populate the bottom toolbox
+####################################################
 # 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,
 self.logViewer = LogViewer(self)
 self.hToolbox.addItem(self.logViewer,
 UI.PixmapCache.getIcon("logViewer.png"),
 self.tr("Log-Viewer"))
-# Create the shell
-# TODO: shell should be available in left or right toolbox
-#       alternatively
-logging.debug("Creating Shell...")
-from QScintilla.Shell import ShellAssembly
-self.shellAssembly = \
-ShellAssembly(debugServer, self.viewmanager, self.project, True)
-self.shell = self.shellAssembly.shell()
-self.hToolbox.insertItem(0, self.shellAssembly,
-UI.PixmapCache.getIcon("shell.png"),
-self.tr("Shell"))
 if Preferences.getUI("ShowFileBrowser"):
 # Create the file browser
 logging.debug("Creating File Browser...")
 from .Browser import Browser
 self.browser = Browser()
 self.numbersViewer = NumbersWidget()
 self.hToolbox.addItem(self.numbersViewer,
 UI.PixmapCache.getIcon("numbers.png"),
 self.tr("Numbers"))
+####################################################
+## Populate the configurable widgets
+####################################################
+# Create the shell
+logging.debug("Creating Shell...")
+self.__shellPosition = Preferences.getUI("ShellPosition")
+if self.__shellPosition == "left":
+self.__shellParent = self.lToolboxDock
+elif self.__shellPosition == "right":
+self.__shellParent = self.rToolboxDock
+else:
+self.__shellParent = self.hToolboxDock
+from QScintilla.Shell import ShellAssembly
+self.shellAssembly = \
+ShellAssembly(debugServer, self.viewmanager, self.project, True)
+self.shell = self.shellAssembly.shell()
+self.__shellParent.widget().insertItem(
+0, self.shellAssembly, UI.PixmapCache.getIcon("shell.png"),
+self.tr("Shell"))
+####################################################
+## Set the start index of each toolbox
+####################################################
+self.lToolbox.setCurrentIndex(0)
+self.rToolbox.setCurrentIndex(0)
 self.hToolbox.setCurrentIndex(0)
 def __createSidebarsLayout(self, debugServer):
 """
 Private method to create the Sidebars layout.
 # Create the bottom sidebar
 self.bottomSidebar = E5SideBar(E5SideBar.South, delay)
 # Create the right sidebar
 self.rightSidebar = E5SideBar(E5SideBar.East, delay)
+####################################################
+## Populate the left side bar
+####################################################
 # Create the project browser
 logging.debug("Creating Project Browser...")
 from Project.ProjectBrowser import ProjectBrowser
 self.projectBrowser = ProjectBrowser(self.project)
 self.leftSidebar.addTab(
 self.templateViewer,
 UI.PixmapCache.getIcon("templateViewer.png"),
 self.tr("Template-Viewer"))
+####################################################
+## Populate the right side bar
+####################################################
 if Preferences.getUI("ShowCodeDocumentationViewer"):
 # Create the code documentation viewer
 logging.debug("Creating Code Documentation Viewer...")
 from .CodeDocumentationViewer import CodeDocumentationViewer
 self.codeDocumentationViewer = CodeDocumentationViewer(self)
 self.irc = IrcWidget(self)
 self.rightSidebar.addTab(
 self.irc, UI.PixmapCache.getIcon("irc.png"),
 self.tr("IRC"))
+####################################################
+## Populate the bottom side bar
+####################################################
 # 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.bottomSidebar.addTab(self.taskViewer,
 from .LogView import LogViewer
 self.logViewer = LogViewer(self)
 self.bottomSidebar.addTab(self.logViewer,
 UI.PixmapCache.getIcon("logViewer.png"),
 self.tr("Log-Viewer"))
-# Create the shell
-# TODO: shell should be available in left or right sidebar
-#       alternatively
-logging.debug("Creating Shell...")
-from QScintilla.Shell import ShellAssembly
-self.shellAssembly = \
-ShellAssembly(debugServer, self.viewmanager, self.project, True)
-self.shell = self.shellAssembly.shell()
-self.bottomSidebar.insertTab(0, self.shellAssembly,
-UI.PixmapCache.getIcon("shell.png"),
-self.tr("Shell"))
 if Preferences.getUI("ShowFileBrowser"):
 # Create the file browser
 logging.debug("Creating File Browser...")
 from .Browser import Browser
 self.numbersViewer = NumbersWidget()
 self.bottomSidebar.addTab(self.numbersViewer,
 UI.PixmapCache.getIcon("numbers.png"),
 self.tr("Numbers"))
+####################################################
+## Populate the configurable widgets
+####################################################
+# Create the shell
+logging.debug("Creating Shell...")
+self.__shellPosition = Preferences.getUI("ShellPosition")
+if self.__shellPosition == "left":
+self.__shellParent = self.leftSidebar
+elif self.__shellPosition == "right":
+self.__shellParent = self.rightSidebar
+else:
+self.__shellParent = self.bottomSidebar
+from QScintilla.Shell import ShellAssembly
+self.shellAssembly = \
+ShellAssembly(debugServer, self.viewmanager, self.project, True)
+self.shell = self.shellAssembly.shell()
+self.__shellParent.insertTab(0, self.shellAssembly,
+UI.PixmapCache.getIcon("shell.png"),
+self.tr("Shell"))
+####################################################
+## Set the start index of each side bar
+####################################################
+self.leftSidebar.setCurrentIndex(0)
+self.rightSidebar.setCurrentIndex(0)
 self.bottomSidebar.setCurrentIndex(0)
 # create the central widget
 logging.debug("Creating central widget...")
 cw = self.centralWidget()   # save the current central widget
 try:
 self.__menus["subwindow"].addSection(self.tr("Left Side"))
 except AttributeError:
 # Qt4
 pass
+if self.__shellPosition == "left":
+self.__menus["subwindow"].addAction(self.shellActivateAct)
 self.__menus["subwindow"].addAction(self.pbActivateAct)
 self.__menus["subwindow"].addAction(self.mpbActivateAct)
 if self.templateViewer is not None:
 self.__menus["subwindow"].addAction(self.templateViewerActivateAct)
 if self.browser is not None:
 try:
 self.__menus["subwindow"].addSection(self.tr("Bottom Side"))
 except AttributeError:
 # Qt4
 self.__menus["subwindow"].addSeparator()
-self.__menus["subwindow"].addAction(self.shellActivateAct)
+if self.__shellPosition == "bottom":
+self.__menus["subwindow"].addAction(self.shellActivateAct)
 self.__menus["subwindow"].addAction(self.taskViewerActivateAct)
 self.__menus["subwindow"].addAction(self.logViewerActivateAct)
 if self.numbersViewer is not None:
 self.__menus["subwindow"].addAction(self.numbersViewerActivateAct)
 try:
 self.__menus["subwindow"].addSection(self.tr("Right Side"))
 except AttributeError:
 # Qt4
 self.__menus["subwindow"].addSeparator()
 # right side
+if self.__shellPosition == "right":
+self.__menus["subwindow"].addAction(self.shellActivateAct)
 if self.codeDocumentationViewer is not None:
 self.__menus["subwindow"].addAction(
 self.tr("Code Documentation Viewer"),
 self.activateCodeDocumentationViewer)
 self.__menus["subwindow"].addAction(self.debugViewerActivateAct)
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.projectBrowser)
 elif self.__layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.projectBrowser)
-else:
-self.projectBrowser.show()
 self.projectBrowser.currentWidget().setFocus(
 Qt.ActiveWindowFocusReason)
 def __activateMultiProjectBrowser(self):
 """
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.multiProjectBrowser)
 elif self.__layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.multiProjectBrowser)
-else:
-self.multiProjectBrowser.show()
 self.multiProjectBrowser.setFocus(Qt.ActiveWindowFocusReason)
 def activateDebugViewer(self):
 """
 Public slot to handle the activation of the debug viewer.
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.debugViewer)
 elif self.__layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.debugViewer)
-else:
-self.debugViewer.show()
 self.debugViewer.currentWidget().setFocus(Qt.ActiveWindowFocusReason)
 def __activateShell(self):
 """
 Private slot to handle the activation of the Shell window.
 """
 if self.__layoutType == "Toolboxes":
-self.hToolboxDock.show()
+self.__shellParent.show()
-self.hToolbox.setCurrentWidget(self.shellAssembly)
+self.__shellParent.widget().setCurrentWidget(self.shellAssembly)
 elif self.__layoutType == "Sidebars":
-self.bottomSidebar.show()
+self.__shellParent.show()
-self.bottomSidebar.setCurrentWidget(self.shellAssembly)
+self.__shellParent.setCurrentWidget(self.shellAssembly)
-else:
-self.shell.show()
 self.shell.setFocus(Qt.ActiveWindowFocusReason)
 def __activateLogViewer(self):
 """
 Private slot to handle the activation of the Log Viewer.
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.logViewer)
 elif self.__layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.logViewer)
-else:
-self.logViewer.show()
 self.logViewer.setFocus(Qt.ActiveWindowFocusReason)
 def __activateTaskViewer(self):
 """
 Private slot to handle the activation of the Task Viewer.
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.taskViewer)
 elif self.__layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.taskViewer)
-else:
-self.taskViewer.show()
 self.taskViewer.setFocus(Qt.ActiveWindowFocusReason)
 def __activateTemplateViewer(self):
 """
 Private slot to handle the activation of the Template Viewer.
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.templateViewer)
 elif self.__layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.templateViewer)
-else:
-self.templateViewer.show()
 self.templateViewer.setFocus(Qt.ActiveWindowFocusReason)
 def __activateBrowser(self):
 """
 Private slot to handle the activation of the file browser.
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.browser)
 elif self.__layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.browser)
-else:
-self.browser.show()
 self.browser.setFocus(Qt.ActiveWindowFocusReason)
 def __toggleLeftToolbox(self):
 """
 Private slot to handle the toggle of the Left Toolbox window.
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.cooperation)
 elif self.__layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.cooperation)
-else:
-self.cooperation.show()
 self.cooperation.setFocus(Qt.ActiveWindowFocusReason)
 def __activateIRC(self):
 """
 Private slot to handle the activation of the IRC window.
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.irc)
 elif self.__layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.irc)
-else:
-self.irc.show()
 self.irc.setFocus(Qt.ActiveWindowFocusReason)
 def __activateSymbolsViewer(self):
 """
 Private slot to handle the activation of the Symbols Viewer.
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.symbolsViewer)
 elif self.__layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.symbolsViewer)
-else:
-self.symbolsViewer.show()
 self.symbolsViewer.setFocus(Qt.ActiveWindowFocusReason)
 def __activateNumbersViewer(self):
 """
 Private slot to handle the activation of the Numbers Viewer.
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.numbersViewer)
 elif self.__layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.numbersViewer)
-else:
-self.numbersViewer.show()
 self.numbersViewer.setFocus(Qt.ActiveWindowFocusReason)
 def __activateViewmanager(self):
 """
 Private slot to handle the activation of the current editor.
 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 __activatePipWidget(self):
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.pipWidget)
 elif self.__layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.pipWidget)
-else:
-self.pipWidget.show()
 self.pipWidget.setFocus(Qt.ActiveWindowFocusReason)
 def __activateCondaWidget(self):
 """
 Private slot to handle the activation of the Conda manager widget.
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.condaWidget)
 elif self.__layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.condaWidget)
-else:
-self.condaWidget.show()
 self.condaWidget.setFocus(Qt.ActiveWindowFocusReason)
 def __toggleWindow(self, w):
 """
 Private method to toggle a workspace editor window.
 """
 Public slot to set the preferences.
 @param pageName name of the configuration page to show (string)
 """
-from Preferences.ConfigurationDialog import ConfigurationDialog
+if self.__configurationDialog is None:
-dlg = ConfigurationDialog(
+# only one invocation at a time is allowed
-self, 'Configuration',
+from Preferences.ConfigurationDialog import ConfigurationDialog
-expandedEntries=self.__expandedConfigurationEntries,
+self.__configurationDialog = ConfigurationDialog(
-)
+self, 'Configuration',
-dlg.preferencesChanged.connect(self.__preferencesChanged)
+expandedEntries=self.__expandedConfigurationEntries,
-dlg.masterPasswordChanged.connect(self.__masterPasswordChanged)
+)
-dlg.show()
+self.__configurationDialog.preferencesChanged.connect(
-if pageName is not None:
+self.__preferencesChanged)
-dlg.showConfigurationPageByName(pageName)
+self.__configurationDialog.masterPasswordChanged.connect(
-elif self.__lastConfigurationPageName:
+self.__masterPasswordChanged)
-dlg.showConfigurationPageByName(self.__lastConfigurationPageName)
+self.__configurationDialog.show()
-else:
+if pageName is not None:
-dlg.showConfigurationPageByName("empty")
+self.__configurationDialog.showConfigurationPageByName(
-dlg.exec_()
+pageName)
-QApplication.processEvents()
+elif self.__lastConfigurationPageName:
-if dlg.result() == QDialog.Accepted:
+self.__configurationDialog.showConfigurationPageByName(
-dlg.setPreferences()
+self.__lastConfigurationPageName)
-Preferences.syncPreferences()
+else:
-self.__preferencesChanged()
+self.__configurationDialog.showConfigurationPageByName("empty")
-self.__lastConfigurationPageName = dlg.getConfigurationPageName()
+self.__configurationDialog.exec_()
-self.__expandedConfigurationEntries = dlg.getExpandedEntries()
+QApplication.processEvents()
+if self.__configurationDialog.result() == QDialog.Accepted:
+self.__configurationDialog.setPreferences()
+Preferences.syncPreferences()
+self.__preferencesChanged()
+self.__lastConfigurationPageName = \
+self.__configurationDialog.getConfigurationPageName()
+self.__expandedConfigurationEntries = \
+self.__configurationDialog.getExpandedEntries()
+self.__configurationDialog.deleteLater()
+self.__configurationDialog = None
 def __exportPreferences(self):
 """
 Private slot to export the current preferences.
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py