eric: comparison UI/UserInterface.py

-:3f1df0fca60a
+:0e14bef0b47b
 self.maxEditorPathLen = Preferences.getUI("CaptionFilenameLength")
 self.locale = locale
 self.__noOpenAtStartup = noOpenAtStartup
-self.layout, self.embeddedShell, self.embeddedFileBrowser = \
+self.layoutType, self.embeddedShell, self.embeddedFileBrowser = \
 Preferences.getUILayout()
 self.passiveMode = Preferences.getDebugger("PassiveDbgEnabled")
 g = Preferences.getGeometry("MainGeometry")
 from .Previewer import Previewer
 self.__previewer = Previewer(self.viewmanager, splitter)
 splitter.addWidget(self.__previewer)
 # Create layout with toolbox windows embedded in dock windows
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 logging.debug("Creating toolboxes...")
 self.__createToolboxesLayout(debugServer)
 # Create layout with sidebar windows embedded in dock windows
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 logging.debug("Creating sidebars...")
 self.__createSidebarsLayout(debugServer)
 else:
 raise ValueError("Wrong layout type given ({0})".format(
-self.layout))
+self.layoutType))
 logging.debug("Created Layout")
 def __createToolboxesLayout(self, debugServer):
 """
 Private method to create the Toolboxes layout.
 @param icon icon to be used (QIcon)
 @param label label text to be shown (string)
 """
 assert side in [UserInterface.LeftSide, UserInterface.BottomSide]
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 if side == UserInterface.LeftSide:
 self.lToolbox.addItem(widget, icon, label)
 elif side == UserInterface.BottomSide:
 self.hToolbox.addItem(widget, icon, label)
 elif side == UserInterface.RightSide:
 self.rToolbox.addItem(widget, icon, label)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 if side == UserInterface.LeftSide:
 self.leftSidebar.addTab(widget, icon, label)
 elif side == UserInterface.BottomSide:
 self.bottomSidebar.addTab(widget, icon, label)
 elif side == UserInterface.RightSide:
 """
 Public method to remove a widget added using addSideWidget().
 @param widget reference to the widget to remove (QWidget)
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 for container in [self.lToolbox, self.hToolbox, self.rToolbox]:
 index = container.indexOf(widget)
 if index != -1:
 container.removeItem(index)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 for container in [self.leftSidebar, self.bottomSidebar,
 self.rightSidebar]:
 index = container.indexOf(widget)
 if index != -1:
 container.removeTab(index)
 Public method to show a particular Log-Viewer tab.
 @param tabname string naming the tab to be shown (string)
 """
 if Preferences.getUI("LogViewerAutoRaise"):
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.logViewer)
 self.hToolboxDock.raise_()
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.logViewer)
 self.bottomSidebar.raise_()
 if self.bottomSidebar.isAutoHiding():
 self.bottomSidebar.setFocus()
 self.__menus["window"].clear()
 self.__menus["window"].addActions(self.viewProfileActGrp.actions())
 self.__menus["window"].addSeparator()
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.__menus["window"].addAction(self.ltAct)
 self.ltAct.setChecked(not self.lToolboxDock.isHidden())
 self.__menus["window"].addAction(self.rtAct)
 self.rtAct.setChecked(not self.lToolboxDock.isHidden())
 self.__menus["window"].addAction(self.htAct)
 self.htAct.setChecked(not self.hToolboxDock.isHidden())
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.__menus["window"].addAction(self.lsbAct)
 self.lsbAct.setChecked(not self.leftSidebar.isHidden())
 self.__menus["window"].addAction(self.rsbAct)
 self.rsbAct.setChecked(not self.rightSidebar.isHidden())
 self.__menus["window"].addAction(self.bsbAct)
 @param save flag indicating that the current profile should
 be saved (boolean)
 """
 if self.currentProfile and save:
 # step 1: save the window geometries of the active profile
-if self.layout in ["Toolboxes", "Sidebars"]:
+if self.layoutType in ["Toolboxes", "Sidebars"]:
 state = self.saveState()
 self.profiles[self.currentProfile][0] = state
-if self.layout == "Sidebars":
+if self.layoutType == "Sidebars":
 state = self.leftSplitter.saveState()
 self.profiles[self.currentProfile][2][0] = state
 state = self.verticalSplitter.saveState()
 self.profiles[self.currentProfile][2][1] = state
 state = self.leftSidebar.saveState()
 state = self.rightSplitter.saveState()
 self.profiles[self.currentProfile][2][4] = state
 state = self.rightSidebar.saveState()
 self.profiles[self.currentProfile][2][5] = state
 # step 2: save the visibility of the windows of the active profile
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.profiles[self.currentProfile][1][0] = \
 self.lToolboxDock.isVisible()
 self.profiles[self.currentProfile][1][1] = \
 self.hToolboxDock.isVisible()
 self.profiles[self.currentProfile][1][2] = \
 self.rToolboxDock.isVisible()
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.profiles[self.currentProfile][1][0] = \
 self.leftSidebar.isVisible()
 self.profiles[self.currentProfile][1][1] = \
 self.bottomSidebar.isVisible()
 self.profiles[self.currentProfile][1][2] = \
 if self.currentProfile != name or not save:
 # step 1: save the active profile
 self.__saveCurrentViewProfile(save)
 # step 2: set the window geometries of the new profile
-if self.layout in ["Toolboxes", "Sidebars"]:
+if self.layoutType in ["Toolboxes", "Sidebars"]:
 state = self.profiles[name][0]
 if not state.isEmpty():
 self.restoreState(state)
-if self.layout == "Sidebars":
+if self.layoutType == "Sidebars":
 state = self.profiles[name][2][0]
 if not state.isEmpty():
 self.leftSplitter.restoreState(state)
 state = self.profiles[name][2][1]
 if not state.isEmpty():
 if not state.isEmpty():
 self.rightSidebar.restoreState(state)
 self.__configureDockareaCornerUsage()
 # step 3: activate the windows of the new profile
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.setVisible(self.profiles[name][1][0])
 self.hToolboxDock.setVisible(self.profiles[name][1][1])
 self.rToolboxDock.setVisible(self.profiles[name][1][2])
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.leftSidebar.setVisible(self.profiles[name][1][0])
 self.bottomSidebar.setVisible(self.profiles[name][1][1])
 self.rightSidebar.setVisible(self.profiles[name][1][2])
 # step 4: remember the new profile
 def __debuggingStarted(self):
 """
 Private slot to handle the start of a debugging session.
 """
 self.setDebugProfile()
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.__currentRightWidget = self.rToolbox.currentWidget()
 self.rToolbox.setCurrentWidget(self.debugViewer)
 if not self.embeddedShell:
 self.__currentBottomWidget = self.hToolbox.currentWidget()
 self.hToolbox.setCurrentWidget(self.shellAssembly)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.__currentRightWidget = self.rightSidebar.currentWidget()
 self.rightSidebar.setCurrentWidget(self.debugViewer)
 if not self.embeddedShell:
 self.__currentBottomWidget = self.bottomSidebar.currentWidget()
 self.bottomSidebar.setCurrentWidget(self.shellAssembly)
 def __debuggingDone(self):
 """
 Private slot to handle the end of a debugging session.
 """
 self.__setEditProfile()
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 if self.__currentRightWidget:
 self.rToolbox.setCurrentWidget(self.__currentRightWidget)
 if self.__currentBottomWidget:
 self.hToolbox.setCurrentWidget(self.__currentBottomWidget)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 if self.__currentRightWidget:
 self.rightSidebar.setCurrentWidget(self.__currentRightWidget)
 if self.__currentBottomWidget:
 self.bottomSidebar.setCurrentWidget(self.__currentBottomWidget)
 self.__currentRightWidget = None
 def __activateProjectBrowser(self):
 """
 Private slot to handle the activation of the project browser.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.projectBrowser)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.projectBrowser)
 else:
 self.projectBrowser.show()
 self.projectBrowser.currentWidget().setFocus(
 def __activateMultiProjectBrowser(self):
 """
 Private slot to handle the activation of the project browser.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.multiProjectBrowser)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.multiProjectBrowser)
 else:
 self.multiProjectBrowser.show()
 self.multiProjectBrowser.setFocus(Qt.ActiveWindowFocusReason)
 def __activateDebugViewer(self):
 """
 Private slot to handle the activation of the debug viewer.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.debugViewer)
-elif self.layout == "Sidebars":
+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.embeddedShell:              # embedded in debug browser
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.debugViewer)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.debugViewer)
 else:
 self.debugViewer.show()
 self.debugViewer.setCurrentWidget(self.shellAssembly)
 else:                               # separate window
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.shellAssembly)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.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.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.logViewer)
-elif self.layout == "Sidebars":
+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.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.hToolboxDock.show()
 self.hToolbox.setCurrentWidget(self.taskViewer)
-elif self.layout == "Sidebars":
+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.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.templateViewer)
-elif self.layout == "Sidebars":
+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.
 """
 if self.embeddedFileBrowser == 0:   # separate window
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.browser)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.browser)
 else:
 self.browser.show()
 elif self.embeddedFileBrowser == 1:  # embedded in debug browser
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.debugViewer)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.rightSidebar.show()
 self.rightSidebar.setCurrentWidget(self.debugViewer)
 else:
 self.debugViewer.show()
 self.debugViewer.setCurrentWidget(self.browser)
 else:                               # embedded in project browser
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.projectBrowser)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.leftSidebar.show()
 self.leftSidebar.setCurrentWidget(self.projectBrowser)
 else:
 self.projectBrowser.show()
 self.projectBrowser.setCurrentWidget(self.browser)
 def activateCooperationViewer(self):
 """
 Public slot to handle the activation of the cooperation window.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.cooperation)
-elif self.layout == "Sidebars":
+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.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.rToolboxDock.show()
 self.rToolbox.setCurrentWidget(self.irc)
-elif self.layout == "Sidebars":
+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.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.lToolboxDock.show()
 self.lToolbox.setCurrentWidget(self.symbolsViewer)
-elif self.layout == "Sidebars":
+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.
 """
-if self.layout == "Toolboxes":
+if self.layoutType == "Toolboxes":
 self.hToolboxDock.show()
 self.hToolboxDock.setCurrentWidget(self.numbersViewer)
-elif self.layout == "Sidebars":
+elif self.layoutType == "Sidebars":
 self.bottomSidebar.show()
 self.bottomSidebar.setCurrentWidget(self.numbersViewer)
 else:
 self.numbersViewer.show()
 self.numbersViewer.setFocus(Qt.ActiveWindowFocusReason)
 from QScintilla.SpellChecker import SpellChecker
 SpellChecker.setDefaultLanguage(
 Preferences.getEditor("SpellCheckingDefaultLanguage"))
-if self.layout == "Sidebars":
+if self.layoutType == "Sidebars":
 delay = Preferences.getUI("SidebarDelay")
 self.leftSidebar.setDelay(delay)
 self.bottomSidebar.setDelay(delay)
 self.rightSidebar.setDelay(delay)
 """
 Private slot to configure the various view profiles.
 """
 from Preferences.ViewProfileDialog import ViewProfileDialog
 dlg = ViewProfileDialog(
-self.layout, self.profiles['edit'][1], self.profiles['debug'][1])
+self.layoutType, self.profiles['edit'][1], self.profiles['debug'][1])
 if dlg.exec_() == QDialog.Accepted:
 edit, debug = dlg.getVisibilities()
 self.profiles['edit'][1] = edit
 self.profiles['debug'][1] = debug
 Preferences.setUI("ViewProfiles2", self.profiles)
 self.cooperation.shutdown()
 self.pluginManager.doShutdown()
-if self.layout == "Sidebars":
+if self.layoutType == "Sidebars":
 self.leftSidebar.shutdown()
 self.bottomSidebar.shutdown()
 self.rightSidebar.shutdown()
 if self.SAServer is not None:

Mercurial Repositories > eric / file comparison

comparison: UI/UserInterface.py

UI/UserInterface.py