eric: comparison eric6/UI/UserInterface.py

-:39e3db2b4936
+:eefe954f01e8
 #
 """
 Module implementing the main user interface.
 """
 import os
 import sys
 import logging
 self.debuggerUI.compileResources.connect(
 self.projectBrowser.prBrowser.compileChangedResources)
 self.debuggerUI.executeMake.connect(self.project.executeMake)
 self.debuggerUI.appendStdout.connect(self.appendToStdout)
+debugServer.clientDisassembly.connect(
+self.debugViewer.disassemblyViewer.showDisassembly)
 debugServer.clientProcessStdout.connect(self.appendToStdout)
 debugServer.clientProcessStderr.connect(self.appendToStderr)
 debugServer.appendStdout.connect(self.appendToStdout)
 self.stdout.appendStdout.connect(self.appendToStdout)
 self.preferencesChanged.connect(debugServer.preferencesChanged)
 self.preferencesChanged.connect(self.debugViewer.preferencesChanged)
 self.preferencesChanged.connect(
 self.backgroundService.preferencesOrProjectChanged)
 self.preferencesChanged.connect(self.__previewer.preferencesChanged)
+self.preferencesChanged.connect(self.__astViewer.preferencesChanged)
+self.preferencesChanged.connect(self.__disViewer.preferencesChanged)
 if self.browser is not None:
 self.browser.sourceFile[str].connect(
 self.viewmanager.openSourceFile)
 self.browser.sourceFile[str, int].connect(
 # now activate the initial view profile
 splash.showMessage(self.tr("Setting View Profile..."))
 self.__setEditProfile()
+# special treatment for the VCS toolbars
+for tb in self.getToolbarsByCategory("vcs"):
+tb.setVisible(False)
+tb.setEnabled(False)
+tb = self.getToolbar("vcs")[1]
+tb.setEnabled(True)
+if Preferences.getVCS("ShowVcsToolbar"):
+tb.setVisible(True)
 # now read the saved tasks
 splash.showMessage(self.tr("Reading Tasks..."))
 self.__readTasks()
 if self.templateViewer is not None:
 # Create AST viewer
 logging.debug("Creating Python AST Viewer")
 from .PythonAstViewer import PythonAstViewer
 self.__astViewer = PythonAstViewer(self.viewmanager, splitter)
 splitter.addWidget(self.__astViewer)
+# Create DIS viewer
+logging.debug("Creating Python Disassembly Viewer")
+from .PythonDisViewer import PythonDisViewer
+self.__disViewer = PythonDisViewer(self.viewmanager, parent=splitter)
+splitter.addWidget(self.__disViewer)
 # Create layout with toolbox windows embedded in dock windows
 if self.__layoutType == "Toolboxes":
 logging.debug("Creating toolboxes...")
 self.__createToolboxesLayout(debugServer)
 unittesttb.hide()
 pluginstb.hide()
 # just add new toolbars to the end of the list
 self.__toolbars = {}
-self.__toolbars["file"] = [filetb.windowTitle(), filetb]
+self.__toolbars["file"] = [filetb.windowTitle(), filetb, ""]
-self.__toolbars["edit"] = [edittb.windowTitle(), edittb]
+self.__toolbars["edit"] = [edittb.windowTitle(), edittb, ""]
-self.__toolbars["search"] = [searchtb.windowTitle(), searchtb]
+self.__toolbars["search"] = [searchtb.windowTitle(), searchtb, ""]
-self.__toolbars["view"] = [viewtb.windowTitle(), viewtb]
+self.__toolbars["view"] = [viewtb.windowTitle(), viewtb, ""]
-self.__toolbars["start"] = [starttb.windowTitle(), starttb]
+self.__toolbars["start"] = [starttb.windowTitle(), starttb, ""]
-self.__toolbars["debug"] = [debugtb.windowTitle(), debugtb]
+self.__toolbars["debug"] = [debugtb.windowTitle(), debugtb, ""]
-self.__toolbars["project"] = [projecttb.windowTitle(), projecttb]
+self.__toolbars["project"] = [projecttb.windowTitle(), projecttb, ""]
-self.__toolbars["tools"] = [toolstb.windowTitle(), toolstb]
+self.__toolbars["tools"] = [toolstb.windowTitle(), toolstb, ""]
-self.__toolbars["help"] = [helptb.windowTitle(), helptb]
+self.__toolbars["help"] = [helptb.windowTitle(), helptb, ""]
-self.__toolbars["settings"] = [settingstb.windowTitle(), settingstb]
+self.__toolbars["settings"] = [settingstb.windowTitle(), settingstb,
-self.__toolbars["bookmarks"] = [bookmarktb.windowTitle(), bookmarktb]
+""]
-self.__toolbars["unittest"] = [unittesttb.windowTitle(), unittesttb]
+self.__toolbars["bookmarks"] = [bookmarktb.windowTitle(), bookmarktb,
+""]
+self.__toolbars["unittest"] = [unittesttb.windowTitle(), unittesttb,
+""]
 self.__toolbars["view_profiles"] = [profilestb.windowTitle(),
-profilestb]
+profilestb, ""]
-self.__toolbars["plugins"] = [pluginstb.windowTitle(), pluginstb]
+self.__toolbars["plugins"] = [pluginstb.windowTitle(), pluginstb, ""]
 self.__toolbars["quicksearch"] = [quicksearchtb.windowTitle(),
-quicksearchtb]
+quicksearchtb, ""]
 self.__toolbars["multiproject"] = [multiprojecttb.windowTitle(),
-multiprojecttb]
+multiprojecttb, ""]
-self.__toolbars["spelling"] = [spellingtb.windowTitle(), spellingtb]
+self.__toolbars["spelling"] = [spellingtb.windowTitle(), spellingtb,
-self.__toolbars["vcs"] = [vcstb.windowTitle(), vcstb]
+""]
+self.__toolbars["vcs"] = [vcstb.windowTitle(), vcstb, "vcs"]
 def __initDebugToolbarsLayout(self):
 """
 Private slot to initialize the toolbars layout for the debug profile.
 """
 address = FeatureAddress
 else:
 address = BugAddress
 subject = "[eric6] "
 if attachFile is not None:
-f = open(attachFile, "r", encoding="utf-8")
+with open(attachFile, "r", encoding="utf-8") as f:
 body = f.read()
-f.close()
 if deleteAttachFile:
 os.remove(attachFile)
 else:
-body = "\r\n----\r\n{0}----\r\n{1}----\r\n{2}".format(
+body = "\r\n----\r\n{0}\r\n----\r\n{1}\r\n----\r\n{2}".format(
 Utilities.generateVersionInfo("\r\n"),
 Utilities.generatePluginsVersionInfo("\r\n"),
 Utilities.generateDistroInfo("\r\n"))
 url = QUrl("mailto:{0}".format(address))
 logFile = os.path.join(Utilities.getConfigDir(),
 self.ErrorLogFileName)
 if os.path.exists(logFile):
 from .ErrorLogDialog import ErrorLogDialog
 dlg = ErrorLogDialog(logFile, False, self)
-dlg.exec_()
+dlg.exec()
 def __hasErrorLog(self):
 """
 Private method to check, if an error log file exists.
 try:
 return self.__menus[name]
 except KeyError:
 return None
-def registerToolbar(self, name, text, toolbar):
+def registerToolbar(self, name, text, toolbar, category=""):
 """
 Public method to register a toolbar.
 This method must be called in order to make a toolbar manageable by the
 UserInterface object.
-@param name name of the toolbar (string). This is used as the key into
+@param name name of the toolbar. This is used as the key into
 the dictionary of toolbar references.
-@param text user visible text for the toolbar entry (string)
+@type str
-@param toolbar reference to the toolbar to be registered (QToolBar)
+@param text user visible text for the toolbar entry
+@type str
+@param toolbar reference to the toolbar to be registered
+@type QToolBar
+@param category toolbar category
+@type str
 @exception KeyError raised, if a toolbar with the given name was
 already registered
 """
 if name in self.__toolbars:
 raise KeyError("Toolbar '{0}' already registered.".format(name))
-self.__toolbars[name] = [text, toolbar]
+self.__toolbars[name] = [text, toolbar, category]
-def reregisterToolbar(self, name, text):
+def reregisterToolbar(self, name, text, category=""):
 """
 Public method to change the visible text for the named toolbar.
-@param name name of the toolbar to be changed (string)
+@param name name of the toolbar to be changed
-@param text new user visible text for the toolbar entry (string)
+@type str
+@param text new user visible text for the toolbar entry
+@type str
+@param category new toolbar category for the toolbar entry
+@type str
 """
 if name in self.__toolbars:
 self.__toolbars[name][0] = text
+self.__toolbars[name][2] = category
 def unregisterToolbar(self, name):
 """
 Public method to unregister a toolbar.
 """
 try:
 return self.__toolbars[name]
 except KeyError:
 return None
+def getToolbarsByCategory(self, category):
+"""
+Public method to get a list of toolbars belonging to a given toolbar
+category.
+@param category toolbar category
+@type str
+@return list of toolbars
+@rtype list of QToolBar
+"""
+toolbars = []
+for tbName in self.__toolbars:
+try:
+if self.__toolbars[tbName][2] == category:
+toolbars.append(self.__toolbars[tbName][1])
+except IndexError:
+# backward compatibility; category is not yet supported
+pass
+return toolbars
 def getLocale(self):
 """
 Public method to get the locale of the IDE.
 @return locale of the IDE (string or None)
 @param menu reference to the menu to be populated (QMenu)
 """
 menu.clear()
-for name, (text, tb) in sorted(self.__toolbars.items(),
+for name, (text, tb, _category) in sorted(
-key=lambda t: t[1][0]):
+self.__toolbars.items(), key=lambda t: t[1][0]
+):
 act = menu.addAction(text)
 act.setCheckable(True)
 act.setChecked(not tb.isHidden())
 act.setData(name)
 menu.addSeparator()
 @param act reference to the action that was triggered (QAction)
 """
 name = act.data()
 if name:
 if name == "__SHOW__":
-for _text, tb in self.__toolbars.values():
+for _text, tb, _category in self.__toolbars.values():
 tb.show()
 if self.__menus["toolbars"].isTearOffMenuVisible():
 self.__menus["toolbars"].hideTearOffMenu()
 elif name == "__HIDE__":
-for _text, tb in self.__toolbars.values():
+for _text, tb, _category in self.__toolbars.values():
 tb.hide()
 if self.__menus["toolbars"].isTearOffMenuVisible():
 self.__menus["toolbars"].hideTearOffMenu()
 else:
 tb = self.__toolbars[name][1]
 if act.isChecked():
 tb.show()
+tb.setEnabled(True)
 else:
 tb.hide()
 def __TBPopupMenuTriggered(self, act):
 """
 @param act reference to the action that was triggered (QAction)
 """
 name = act.data()
 if name:
 if name == "__SHOW__":
-for _text, tb in self.__toolbars.values():
+for _text, tb, _category in self.__toolbars.values():
 tb.show()
 elif name == "__HIDE__":
-for _text, tb in self.__toolbars.values():
+for _text, tb, _category in self.__toolbars.values():
 tb.hide()
 else:
 tb = self.__toolbars[name][1]
 if act.isChecked():
 tb.show()
+tb.setEnabled(True)
 else:
 tb.hide()
 if self.__menus["toolbars"].isTearOffMenuVisible():
 self.__menus["toolbars"].hideTearOffMenu()
 Private slot to handle the tools configuration menu entry.
 """
 from Preferences.ToolConfigurationDialog import ToolConfigurationDialog
 dlg = ToolConfigurationDialog(
 self.toolGroups[self.currentToolGroup][1], self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 self.toolGroups[self.currentToolGroup][1] = dlg.getToollist()
 self.__updateExternalToolsActions()
 def __toolGroupsConfiguration(self):
 """
 from Preferences.ToolGroupConfigurationDialog import (
 ToolGroupConfigurationDialog
 )
 dlg = ToolGroupConfigurationDialog(
 self.toolGroups, self.currentToolGroup, self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 self.toolGroups, self.currentToolGroup = dlg.getToolGroups()
 def __createUnitTestDialog(self):
 """
 Private slot to generate the unit test dialog on demand.
 elif self.__lastConfigurationPageName:
 self.__configurationDialog.showConfigurationPageByName(
 self.__lastConfigurationPageName)
 else:
 self.__configurationDialog.showConfigurationPageByName("empty")
-self.__configurationDialog.exec_()
+self.__configurationDialog.exec()
 QApplication.processEvents()
 if self.__configurationDialog.result() == QDialog.Accepted:
 self.__configurationDialog.setPreferences()
 Preferences.syncPreferences()
 self.__preferencesChanged()
 Private slot to configure the various view profiles.
 """
 from Preferences.ViewProfileDialog import ViewProfileDialog
 dlg = ViewProfileDialog(self.__layoutType, self.profiles['edit'][1],
 self.profiles['debug'][1])
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 edit, debug = dlg.getVisibilities()
 self.profiles['edit'][1] = edit
 self.profiles['debug'][1] = debug
 Preferences.setUI("ViewProfiles2", self.profiles)
 if self.currentProfile == "edit":
 """
 Private slot to configure the various toolbars.
 """
 from E5Gui.E5ToolBarDialog import E5ToolBarDialog
 dlg = E5ToolBarDialog(self.toolbarManager)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 Preferences.setUI(
 "ToolbarManagerState", self.toolbarManager.saveState())
 def __configShortcuts(self):
 """
 Private slot to show the certificates management dialog.
 """
 from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog
 dlg = E5SslCertificatesDialog(self)
-dlg.exec_()
+dlg.exec()
 def __clearPrivateData(self):
 """
 Private slot to clear the private data lists.
 """
 from .ClearPrivateDataDialog import ClearPrivateDataDialog
 dlg = ClearPrivateDataDialog(self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 # recent files, recent projects, recent multi  projects,
 # debug histories, shell histories
 (files, projects, multiProjects, debug, shell, vcs, plugins) = (
 dlg.getData()
 )
 from PluginManager.PluginInstallDialog import PluginInstallDialog
 dlg = PluginInstallDialog(
 self.pluginManager,
 [] if pluginFileNames is None else pluginFileNames[:],
 self)
-dlg.exec_()
+dlg.exec()
 if dlg.restartNeeded():
 self.__restart(ask=True)
 def __deinstallPlugin(self):
 """
 Private slot to show a dialog to uninstall a plugin.
 """
 from PluginManager.PluginUninstallDialog import PluginUninstallDialog
 dlg = PluginUninstallDialog(self.pluginManager, self)
-dlg.exec_()
+dlg.exec()
 def showPluginsAvailable(self):
 """
 Public slot to show the plugins available for download.
 """
 from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog
 dlg = PluginRepositoryDialog(self.pluginManager, self)
-res = dlg.exec_()
+res = dlg.exec()
 if res == (QDialog.Accepted + 1):
 self.__installPlugins(dlg.getDownloadedPlugins())
 def __pluginsConfigure(self):
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/UI/UserInterface.py

eric6/UI/UserInterface.py