--- a/eric7/UI/UserInterface.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/UI/UserInterface.py Sat May 22 18:51:46 2021 +0200
@@ -36,15 +36,15 @@
from . import Config
from .NotificationWidget import NotificationTypes
-from E5Gui.E5SingleApplication import E5SingleApplicationServer
-from E5Gui.E5Action import E5Action, createActionGroup
-from E5Gui.E5ToolBarManager import E5ToolBarManager
-from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage
-from E5Gui.E5Application import e5App
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5ZoomWidget import E5ZoomWidget
-from E5Gui.E5ProgressDialog import E5ProgressDialog
-from E5Gui.E5ClickableLabel import E5ClickableLabel
+from E5Gui.EricSingleApplication import EricSingleApplicationServer
+from E5Gui.EricAction import EricAction, createActionGroup
+from E5Gui.EricToolBarManager import EricToolBarManager
+from E5Gui import EricMessageBox, EricFileDialog, EricErrorMessage
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricZoomWidget import EricZoomWidget
+from E5Gui.EricProgressDialog import EricProgressDialog
+from E5Gui.EricClickableLabel import EricClickableLabel
import Preferences
import Utilities
@@ -130,7 +130,7 @@
self.__nWrite(self.__bufferedWrite())
-class UserInterface(E5MainWindow):
+class UserInterface(EricMainWindow):
"""
Class implementing the main user interface.
@@ -166,7 +166,7 @@
Constructor
@param app reference to the application object
- @type E5Application
+ @type EricApplication
@param locale locale to be used by the UI
@type str
@param splash reference to the splashscreen
@@ -242,23 +242,23 @@
# Generate the conda interface
from CondaInterface.Conda import Conda
self.condaInterface = Conda(self)
- e5App().registerObject("Conda", self.condaInterface)
+ ericApp().registerObject("Conda", self.condaInterface)
# Generate the pip interface
from PipInterface.Pip import Pip
self.pipInterface = Pip(self)
- e5App().registerObject("Pip", self.pipInterface)
+ ericApp().registerObject("Pip", self.pipInterface)
# Generate the virtual environment manager
from VirtualEnv.VirtualenvManager import VirtualenvManager
self.virtualenvManager = VirtualenvManager(self)
# register it early because it is needed very soon
- e5App().registerObject("VirtualEnvManager", self.virtualenvManager)
+ ericApp().registerObject("VirtualEnvManager", self.virtualenvManager)
# Generate an empty project object and multi project object
from Project.Project import Project
self.project = Project(self)
- e5App().registerObject("Project", self.project)
+ ericApp().registerObject("Project", self.project)
from MultiProject.MultiProject import MultiProject
self.multiProject = MultiProject(self.project, self)
@@ -572,7 +572,7 @@
self.irc.autoConnected.connect(self.__ircAutoConnected)
# create the toolbar manager object
- self.toolbarManager = E5ToolBarManager(self, self)
+ self.toolbarManager = EricToolBarManager(self, self)
self.toolbarManager.setMainWindow(self)
# Initialize the tool groups and list of started tools
@@ -587,31 +587,31 @@
# register all relevant objects
splash.showMessage(self.tr("Registering Objects..."))
- e5App().registerObject("UserInterface", self)
- e5App().registerObject("DebugUI", self.debuggerUI)
- e5App().registerObject("DebugServer", debugServer)
- e5App().registerObject("BackgroundService", self.backgroundService)
- e5App().registerObject("ViewManager", self.viewmanager)
- e5App().registerObject("ProjectBrowser", self.projectBrowser)
- e5App().registerObject("MultiProject", self.multiProject)
- e5App().registerObject("TaskViewer", self.taskViewer)
+ ericApp().registerObject("UserInterface", self)
+ ericApp().registerObject("DebugUI", self.debuggerUI)
+ ericApp().registerObject("DebugServer", debugServer)
+ ericApp().registerObject("BackgroundService", self.backgroundService)
+ ericApp().registerObject("ViewManager", self.viewmanager)
+ ericApp().registerObject("ProjectBrowser", self.projectBrowser)
+ ericApp().registerObject("MultiProject", self.multiProject)
+ ericApp().registerObject("TaskViewer", self.taskViewer)
if self.templateViewer is not None:
- e5App().registerObject("TemplateViewer", self.templateViewer)
- e5App().registerObject("Shell", self.shell)
- e5App().registerObject("PluginManager", self.pluginManager)
- e5App().registerObject("ToolbarManager", self.toolbarManager)
+ ericApp().registerObject("TemplateViewer", self.templateViewer)
+ ericApp().registerObject("Shell", self.shell)
+ ericApp().registerObject("PluginManager", self.pluginManager)
+ ericApp().registerObject("ToolbarManager", self.toolbarManager)
if self.cooperation is not None:
- e5App().registerObject("Cooperation", self.cooperation)
+ ericApp().registerObject("Cooperation", self.cooperation)
if self.irc is not None:
- e5App().registerObject("IRC", self.irc)
+ ericApp().registerObject("IRC", self.irc)
if self.symbolsViewer is not None:
- e5App().registerObject("Symbols", self.symbolsViewer)
+ ericApp().registerObject("Symbols", self.symbolsViewer)
if self.numbersViewer is not None:
- e5App().registerObject("Numbers", self.numbersViewer)
+ ericApp().registerObject("Numbers", self.numbersViewer)
if self.codeDocumentationViewer is not None:
- e5App().registerObject("DocuViewer", self.codeDocumentationViewer)
+ ericApp().registerObject("DocuViewer", self.codeDocumentationViewer)
if self.microPythonWidget is not None:
- e5App().registerObject("MicroPython", self.microPythonWidget)
+ ericApp().registerObject("MicroPython", self.microPythonWidget)
# list of web addresses serving the versions file
self.__httpAlternatives = Preferences.getUI("VersionsUrls7")
@@ -658,7 +658,7 @@
if Preferences.getUI("SingleApplicationMode"):
splash.showMessage(
self.tr("Initializing Single Application Server..."))
- self.SAServer = E5SingleApplicationServer()
+ self.SAServer = EricSingleApplicationServer()
else:
self.SAServer = None
@@ -823,13 +823,13 @@
@param debugServer reference to the debug server object
"""
- from E5Gui.E5ToolBox import E5VerticalToolBox, E5HorizontalToolBox
+ from E5Gui.EricToolBox import EricVerticalToolBox, EricHorizontalToolBox
logging.debug("Creating Toolboxes Layout...")
# Create the left toolbox
self.lToolboxDock = self.__createDockWindow("lToolboxDock")
- self.lToolbox = E5VerticalToolBox(self.lToolboxDock)
+ self.lToolbox = EricVerticalToolBox(self.lToolboxDock)
self.__setupDockWindow(self.lToolboxDock,
Qt.DockWidgetArea.LeftDockWidgetArea,
self.lToolbox,
@@ -837,7 +837,7 @@
# Create the horizontal toolbox
self.hToolboxDock = self.__createDockWindow("hToolboxDock")
- self.hToolbox = E5HorizontalToolBox(self.hToolboxDock)
+ self.hToolbox = EricHorizontalToolBox(self.hToolboxDock)
self.__setupDockWindow(self.hToolboxDock,
Qt.DockWidgetArea.BottomDockWidgetArea,
self.hToolbox,
@@ -845,7 +845,7 @@
# Create the right toolbox
self.rToolboxDock = self.__createDockWindow("rToolboxDock")
- self.rToolbox = E5VerticalToolBox(self.rToolboxDock)
+ self.rToolbox = EricVerticalToolBox(self.rToolboxDock)
self.__setupDockWindow(self.rToolboxDock,
Qt.DockWidgetArea.RightDockWidgetArea,
self.rToolbox,
@@ -1030,19 +1030,19 @@
@param debugServer reference to the debug server object
"""
- from E5Gui.E5SideBar import E5SideBar, E5SideBarSide
+ from E5Gui.EricSideBar import EricSideBar, EricSideBarSide
logging.debug("Creating Sidebars Layout...")
delay = Preferences.getUI("SidebarDelay")
# Create the left sidebar
- self.leftSidebar = E5SideBar(E5SideBarSide.WEST, delay)
+ self.leftSidebar = EricSideBar(EricSideBarSide.WEST, delay)
# Create the bottom sidebar
- self.bottomSidebar = E5SideBar(E5SideBarSide.SOUTH, delay)
+ self.bottomSidebar = EricSideBar(EricSideBarSide.SOUTH, delay)
# Create the right sidebar
- self.rightSidebar = E5SideBar(E5SideBarSide.EAST, delay)
+ self.rightSidebar = EricSideBar(EricSideBarSide.EAST, delay)
####################################################
## Populate the left side bar
@@ -1633,7 +1633,7 @@
self.actions = []
self.wizardsActions = []
- self.exitAct = E5Action(
+ self.exitAct = EricAction(
self.tr('Quit'),
UI.PixmapCache.getIcon("exit"),
self.tr('&Quit'),
@@ -1650,7 +1650,7 @@
self.exitAct.setMenuRole(QAction.MenuRole.QuitRole)
self.actions.append(self.exitAct)
- self.restartAct = E5Action(
+ self.restartAct = EricAction(
self.tr('Restart'),
UI.PixmapCache.getIcon("restart"),
self.tr('Restart'),
@@ -1666,7 +1666,7 @@
self.restartAct.triggered.connect(self.__restart)
self.actions.append(self.restartAct)
- self.saveSessionAct = E5Action(
+ self.saveSessionAct = EricAction(
self.tr('Save session'),
self.tr('Save session...'),
0, 0, self, 'save_session_to_file')
@@ -1679,7 +1679,7 @@
self.saveSessionAct.triggered.connect(self.__saveSessionToFile)
self.actions.append(self.saveSessionAct)
- self.loadSessionAct = E5Action(
+ self.loadSessionAct = EricAction(
self.tr('Load session'),
self.tr('Load session...'),
0, 0, self, 'load_session_from_file')
@@ -1692,7 +1692,7 @@
self.loadSessionAct.triggered.connect(self.__loadSessionFromFile)
self.actions.append(self.loadSessionAct)
- self.newWindowAct = E5Action(
+ self.newWindowAct = EricAction(
self.tr('New Window'),
UI.PixmapCache.getIcon("newWindow"),
self.tr('New &Window'),
@@ -1711,7 +1711,7 @@
self.viewProfileActGrp = createActionGroup(self, "viewprofiles", True)
- self.setEditProfileAct = E5Action(
+ self.setEditProfileAct = EricAction(
self.tr('Edit Profile'),
UI.PixmapCache.getIcon("viewProfileEdit"),
self.tr('Edit Profile'),
@@ -1728,7 +1728,7 @@
self.setEditProfileAct.triggered.connect(self.__setEditProfile)
self.actions.append(self.setEditProfileAct)
- self.setDebugProfileAct = E5Action(
+ self.setDebugProfileAct = EricAction(
self.tr('Debug Profile'),
UI.PixmapCache.getIcon("viewProfileDebug"),
self.tr('Debug Profile'),
@@ -1745,7 +1745,7 @@
self.setDebugProfileAct.triggered.connect(self.setDebugProfile)
self.actions.append(self.setDebugProfileAct)
- self.pbActivateAct = E5Action(
+ self.pbActivateAct = EricAction(
self.tr('Project-Viewer'),
self.tr('&Project-Viewer'),
QKeySequence(self.tr("Alt+Shift+P")),
@@ -1762,7 +1762,7 @@
self.actions.append(self.pbActivateAct)
self.addAction(self.pbActivateAct)
- self.mpbActivateAct = E5Action(
+ self.mpbActivateAct = EricAction(
self.tr('Multiproject-Viewer'),
self.tr('&Multiproject-Viewer'),
QKeySequence(self.tr("Alt+Shift+M")),
@@ -1780,7 +1780,7 @@
self.actions.append(self.mpbActivateAct)
self.addAction(self.mpbActivateAct)
- self.debugViewerActivateAct = E5Action(
+ self.debugViewerActivateAct = EricAction(
self.tr('Debug-Viewer'),
self.tr('&Debug-Viewer'),
QKeySequence(self.tr("Alt+Shift+D")),
@@ -1798,7 +1798,7 @@
self.actions.append(self.debugViewerActivateAct)
self.addAction(self.debugViewerActivateAct)
- self.shellActivateAct = E5Action(
+ self.shellActivateAct = EricAction(
self.tr('Shell'),
self.tr('&Shell'),
QKeySequence(self.tr("Alt+Shift+S")),
@@ -1815,7 +1815,7 @@
self.addAction(self.shellActivateAct)
if self.browser is not None:
- self.browserActivateAct = E5Action(
+ self.browserActivateAct = EricAction(
self.tr('File-Browser'),
self.tr('&File-Browser'),
QKeySequence(self.tr("Alt+Shift+F")),
@@ -1832,7 +1832,7 @@
self.actions.append(self.browserActivateAct)
self.addAction(self.browserActivateAct)
- self.logViewerActivateAct = E5Action(
+ self.logViewerActivateAct = EricAction(
self.tr('Log-Viewer'),
self.tr('Lo&g-Viewer'),
QKeySequence(self.tr("Alt+Shift+G")),
@@ -1850,7 +1850,7 @@
self.actions.append(self.logViewerActivateAct)
self.addAction(self.logViewerActivateAct)
- self.taskViewerActivateAct = E5Action(
+ self.taskViewerActivateAct = EricAction(
self.tr('Task-Viewer'),
self.tr('&Task-Viewer'),
QKeySequence(self.tr("Alt+Shift+T")),
@@ -1869,7 +1869,7 @@
self.addAction(self.taskViewerActivateAct)
if self.templateViewer is not None:
- self.templateViewerActivateAct = E5Action(
+ self.templateViewerActivateAct = EricAction(
self.tr('Template-Viewer'),
self.tr('Templ&ate-Viewer'),
QKeySequence(self.tr("Alt+Shift+A")),
@@ -1887,7 +1887,7 @@
self.actions.append(self.templateViewerActivateAct)
self.addAction(self.templateViewerActivateAct)
- self.ltAct = E5Action(
+ self.ltAct = EricAction(
self.tr('Left Toolbox'),
self.tr('&Left Toolbox'), 0, 0, self, 'vertical_toolbox', True)
self.ltAct.setStatusTip(self.tr('Toggle the Left Toolbox window'))
@@ -1899,7 +1899,7 @@
self.ltAct.triggered.connect(self.__toggleLeftToolbox)
self.actions.append(self.ltAct)
- self.rtAct = E5Action(
+ self.rtAct = EricAction(
self.tr('Right Toolbox'),
self.tr('&Right Toolbox'),
0, 0, self, 'vertical_toolbox', True)
@@ -1912,7 +1912,7 @@
self.rtAct.triggered.connect(self.__toggleRightToolbox)
self.actions.append(self.rtAct)
- self.htAct = E5Action(
+ self.htAct = EricAction(
self.tr('Horizontal Toolbox'),
self.tr('&Horizontal Toolbox'), 0, 0, self,
'horizontal_toolbox', True)
@@ -1926,7 +1926,7 @@
self.htAct.triggered.connect(self.__toggleHorizontalToolbox)
self.actions.append(self.htAct)
- self.lsbAct = E5Action(
+ self.lsbAct = EricAction(
self.tr('Left Sidebar'),
self.tr('&Left Sidebar'),
0, 0, self, 'left_sidebar', True)
@@ -1939,7 +1939,7 @@
self.lsbAct.triggered.connect(self.__toggleLeftSidebar)
self.actions.append(self.lsbAct)
- self.rsbAct = E5Action(
+ self.rsbAct = EricAction(
self.tr('Right Sidebar'),
self.tr('&Right Sidebar'),
0, 0, self, 'right_sidebar', True)
@@ -1953,7 +1953,7 @@
self.rsbAct.triggered.connect(self.__toggleRightSidebar)
self.actions.append(self.rsbAct)
- self.bsbAct = E5Action(
+ self.bsbAct = EricAction(
self.tr('Bottom Sidebar'),
self.tr('&Bottom Sidebar'), 0, 0, self,
'bottom_sidebar', True)
@@ -1968,7 +1968,7 @@
self.actions.append(self.bsbAct)
if self.cooperation is not None:
- self.cooperationViewerActivateAct = E5Action(
+ self.cooperationViewerActivateAct = EricAction(
self.tr('Cooperation-Viewer'),
self.tr('Co&operation-Viewer'),
QKeySequence(self.tr("Alt+Shift+O")),
@@ -1987,7 +1987,7 @@
self.addAction(self.cooperationViewerActivateAct)
if self.irc is not None:
- self.ircActivateAct = E5Action(
+ self.ircActivateAct = EricAction(
self.tr('IRC'),
self.tr('&IRC'),
QKeySequence(self.tr("Ctrl+Alt+Shift+I")),
@@ -2005,7 +2005,7 @@
self.addAction(self.ircActivateAct)
if self.symbolsViewer is not None:
- self.symbolsViewerActivateAct = E5Action(
+ self.symbolsViewerActivateAct = EricAction(
self.tr('Symbols-Viewer'),
self.tr('S&ymbols-Viewer'),
QKeySequence(self.tr("Alt+Shift+Y")),
@@ -2024,7 +2024,7 @@
self.addAction(self.symbolsViewerActivateAct)
if self.numbersViewer is not None:
- self.numbersViewerActivateAct = E5Action(
+ self.numbersViewerActivateAct = EricAction(
self.tr('Numbers-Viewer'),
self.tr('Num&bers-Viewer'),
QKeySequence(self.tr("Alt+Shift+B")),
@@ -2043,7 +2043,7 @@
self.addAction(self.numbersViewerActivateAct)
if self.codeDocumentationViewer is not None:
- self.codeDocumentationViewerActivateAct = E5Action(
+ self.codeDocumentationViewerActivateAct = EricAction(
self.tr('Code Documentation Viewer'),
self.tr('Code Documentation Viewer'),
QKeySequence(self.tr("Ctrl+Alt+Shift+D")),
@@ -2063,7 +2063,7 @@
self.addAction(self.codeDocumentationViewerActivateAct)
if self.pipWidget is not None:
- self.pipWidgetActivateAct = E5Action(
+ self.pipWidgetActivateAct = EricAction(
self.tr('PyPI'),
self.tr('PyPI'),
QKeySequence(self.tr("Ctrl+Alt+Shift+P")),
@@ -2081,7 +2081,7 @@
self.addAction(self.pipWidgetActivateAct)
if self.condaWidget is not None:
- self.condaWidgetActivateAct = E5Action(
+ self.condaWidgetActivateAct = EricAction(
self.tr('Conda'),
self.tr('Conda'),
QKeySequence(self.tr("Ctrl+Alt+Shift+C")),
@@ -2099,7 +2099,7 @@
self.addAction(self.condaWidgetActivateAct)
if self.microPythonWidget is not None:
- self.microPythonWidgetActivateAct = E5Action(
+ self.microPythonWidgetActivateAct = EricAction(
self.tr('MicroPython'),
self.tr('MicroPython'),
QKeySequence(self.tr("Ctrl+Alt+Shift+M")),
@@ -2117,7 +2117,7 @@
self.actions.append(self.microPythonWidgetActivateAct)
self.addAction(self.microPythonWidgetActivateAct)
- self.whatsThisAct = E5Action(
+ self.whatsThisAct = EricAction(
self.tr('What\'s This?'),
UI.PixmapCache.getIcon("whatsThis"),
self.tr('&What\'s This?'),
@@ -2135,7 +2135,7 @@
self.whatsThisAct.triggered.connect(self.__whatsThis)
self.actions.append(self.whatsThisAct)
- self.helpviewerAct = E5Action(
+ self.helpviewerAct = EricAction(
self.tr('Helpviewer'),
UI.PixmapCache.getIcon("help"),
self.tr('&Helpviewer...'),
@@ -2161,7 +2161,7 @@
self.__initEricDocAction()
self.__initPySideDocActions()
- self.versionAct = E5Action(
+ self.versionAct = EricAction(
self.tr('Show Versions'),
self.tr('Show &Versions'),
0, 0, self, 'show_versions')
@@ -2174,7 +2174,7 @@
self.versionAct.triggered.connect(self.__showVersions)
self.actions.append(self.versionAct)
- self.checkUpdateAct = E5Action(
+ self.checkUpdateAct = EricAction(
self.tr('Check for Updates'),
self.tr('Check for &Updates...'), 0, 0, self, 'check_updates')
self.checkUpdateAct.setStatusTip(self.tr('Check for Updates'))
@@ -2185,7 +2185,7 @@
self.checkUpdateAct.triggered.connect(self.performVersionCheck)
self.actions.append(self.checkUpdateAct)
- self.showVersionsAct = E5Action(
+ self.showVersionsAct = EricAction(
self.tr('Show downloadable versions'),
self.tr('Show &downloadable versions...'),
0, 0, self, 'show_downloadable_versions')
@@ -2200,7 +2200,7 @@
self.showAvailableVersionsInfo)
self.actions.append(self.showVersionsAct)
- self.showErrorLogAct = E5Action(
+ self.showErrorLogAct = EricAction(
self.tr('Show Error Log'),
self.tr('Show Error &Log...'),
0, 0, self, 'show_error_log')
@@ -2212,7 +2212,7 @@
self.showErrorLogAct.triggered.connect(self.__showErrorLog)
self.actions.append(self.showErrorLogAct)
- self.showInstallInfoAct = E5Action(
+ self.showInstallInfoAct = EricAction(
self.tr('Show Install Info'),
self.tr('Show Install &Info...'),
0, 0, self, 'show_install_info')
@@ -2226,7 +2226,7 @@
self.showInstallInfoAct.triggered.connect(self.__showInstallInfo)
self.actions.append(self.showInstallInfoAct)
- self.reportBugAct = E5Action(
+ self.reportBugAct = EricAction(
self.tr('Report Bug'),
self.tr('Report &Bug...'),
0, 0, self, 'report_bug')
@@ -2238,7 +2238,7 @@
self.reportBugAct.triggered.connect(self.__reportBug)
self.actions.append(self.reportBugAct)
- self.requestFeatureAct = E5Action(
+ self.requestFeatureAct = EricAction(
self.tr('Request Feature'),
self.tr('Request &Feature...'),
0, 0, self, 'request_feature')
@@ -2253,7 +2253,7 @@
self.utActGrp = createActionGroup(self)
- self.utDialogAct = E5Action(
+ self.utDialogAct = EricAction(
self.tr('Unittest'),
UI.PixmapCache.getIcon("unittest"),
self.tr('&Unittest...'),
@@ -2267,7 +2267,7 @@
self.utDialogAct.triggered.connect(self.__unittest)
self.actions.append(self.utDialogAct)
- self.utRestartAct = E5Action(
+ self.utRestartAct = EricAction(
self.tr('Unittest Restart'),
UI.PixmapCache.getIcon("unittestRestart"),
self.tr('&Restart Unittest...'),
@@ -2281,7 +2281,7 @@
self.utRestartAct.setEnabled(False)
self.actions.append(self.utRestartAct)
- self.utRerunFailedAct = E5Action(
+ self.utRerunFailedAct = EricAction(
self.tr('Unittest Rerun Failed'),
UI.PixmapCache.getIcon("unittestRerunFailed"),
self.tr('Rerun Failed Tests...'),
@@ -2297,7 +2297,7 @@
self.utRerunFailedAct.setEnabled(False)
self.actions.append(self.utRerunFailedAct)
- self.utScriptAct = E5Action(
+ self.utScriptAct = EricAction(
self.tr('Unittest Script'),
UI.PixmapCache.getIcon("unittestScript"),
self.tr('Unittest &Script...'),
@@ -2312,7 +2312,7 @@
self.utScriptAct.setEnabled(False)
self.actions.append(self.utScriptAct)
- self.utProjectAct = E5Action(
+ self.utProjectAct = EricAction(
self.tr('Unittest Project'),
UI.PixmapCache.getIcon("unittestProject"),
self.tr('Unittest &Project...'),
@@ -2339,7 +2339,7 @@
Utilities.getQtBinariesPath(),
Utilities.generateQtToolName("designer"))
if os.path.exists(designerExe):
- self.designer4Act = E5Action(
+ self.designer4Act = EricAction(
self.tr('Qt-Designer'),
UI.PixmapCache.getIcon("designer4"),
self.tr('Qt-&Designer...'),
@@ -2365,7 +2365,7 @@
Utilities.getQtBinariesPath(),
Utilities.generateQtToolName("linguist"))
if os.path.exists(linguistExe):
- self.linguist4Act = E5Action(
+ self.linguist4Act = EricAction(
self.tr('Qt-Linguist'),
UI.PixmapCache.getIcon("linguist4"),
self.tr('Qt-&Linguist...'),
@@ -2380,7 +2380,7 @@
else:
self.linguist4Act = None
- self.uipreviewerAct = E5Action(
+ self.uipreviewerAct = EricAction(
self.tr('UI Previewer'),
UI.PixmapCache.getIcon("uiPreviewer"),
self.tr('&UI Previewer...'),
@@ -2393,7 +2393,7 @@
self.uipreviewerAct.triggered.connect(self.__UIPreviewer)
self.actions.append(self.uipreviewerAct)
- self.trpreviewerAct = E5Action(
+ self.trpreviewerAct = EricAction(
self.tr('Translations Previewer'),
UI.PixmapCache.getIcon("trPreviewer"),
self.tr('&Translations Previewer...'),
@@ -2407,7 +2407,7 @@
self.trpreviewerAct.triggered.connect(self.__TRPreviewer)
self.actions.append(self.trpreviewerAct)
- self.diffAct = E5Action(
+ self.diffAct = EricAction(
self.tr('Compare Files'),
UI.PixmapCache.getIcon("diffFiles"),
self.tr('&Compare Files...'),
@@ -2420,7 +2420,7 @@
self.diffAct.triggered.connect(self.__compareFiles)
self.actions.append(self.diffAct)
- self.compareAct = E5Action(
+ self.compareAct = EricAction(
self.tr('Compare Files side by side'),
UI.PixmapCache.getIcon("compareFiles"),
self.tr('Compare &Files side by side...'),
@@ -2434,7 +2434,7 @@
self.compareAct.triggered.connect(self.__compareFilesSbs)
self.actions.append(self.compareAct)
- self.sqlBrowserAct = E5Action(
+ self.sqlBrowserAct = EricAction(
self.tr('SQL Browser'),
UI.PixmapCache.getIcon("sqlBrowser"),
self.tr('SQL &Browser...'),
@@ -2447,7 +2447,7 @@
self.sqlBrowserAct.triggered.connect(self.__sqlBrowser)
self.actions.append(self.sqlBrowserAct)
- self.miniEditorAct = E5Action(
+ self.miniEditorAct = EricAction(
self.tr('Mini Editor'),
UI.PixmapCache.getIcon("editor"),
self.tr('Mini &Editor...'),
@@ -2460,7 +2460,7 @@
self.miniEditorAct.triggered.connect(self.__openMiniEditor)
self.actions.append(self.miniEditorAct)
- self.hexEditorAct = E5Action(
+ self.hexEditorAct = EricAction(
self.tr('Hex Editor'),
UI.PixmapCache.getIcon("hexEditor"),
self.tr('&Hex Editor...'),
@@ -2475,7 +2475,7 @@
self.hexEditorAct.triggered.connect(self.__openHexEditor)
self.actions.append(self.hexEditorAct)
- self.webBrowserAct = E5Action(
+ self.webBrowserAct = EricAction(
self.tr('eric Web Browser'),
UI.PixmapCache.getIcon("ericWeb"),
self.tr('eric &Web Browser...'),
@@ -2489,7 +2489,7 @@
self.webBrowserAct.triggered.connect(self.__startWebBrowser)
self.actions.append(self.webBrowserAct)
- self.iconEditorAct = E5Action(
+ self.iconEditorAct = EricAction(
self.tr('Icon Editor'),
UI.PixmapCache.getIcon("iconEditor"),
self.tr('&Icon Editor...'),
@@ -2503,7 +2503,7 @@
self.iconEditorAct.triggered.connect(self.__editPixmap)
self.actions.append(self.iconEditorAct)
- self.snapshotAct = E5Action(
+ self.snapshotAct = EricAction(
self.tr('Snapshot'),
UI.PixmapCache.getIcon("ericSnap"),
self.tr('&Snapshot...'),
@@ -2518,7 +2518,7 @@
self.snapshotAct.triggered.connect(self.__snapshot)
self.actions.append(self.snapshotAct)
- self.prefAct = E5Action(
+ self.prefAct = EricAction(
self.tr('Preferences'),
UI.PixmapCache.getIcon("configure"),
self.tr('&Preferences...'),
@@ -2534,7 +2534,7 @@
self.prefAct.setMenuRole(QAction.MenuRole.PreferencesRole)
self.actions.append(self.prefAct)
- self.prefExportAct = E5Action(
+ self.prefExportAct = EricAction(
self.tr('Export Preferences'),
UI.PixmapCache.getIcon("configureExport"),
self.tr('E&xport Preferences...'),
@@ -2548,7 +2548,7 @@
self.prefExportAct.triggered.connect(self.__exportPreferences)
self.actions.append(self.prefExportAct)
- self.prefImportAct = E5Action(
+ self.prefImportAct = EricAction(
self.tr('Import Preferences'),
UI.PixmapCache.getIcon("configureImport"),
self.tr('I&mport Preferences...'),
@@ -2562,7 +2562,7 @@
self.prefImportAct.triggered.connect(self.__importPreferences)
self.actions.append(self.prefImportAct)
- self.reloadAPIsAct = E5Action(
+ self.reloadAPIsAct = EricAction(
self.tr('Reload APIs'),
self.tr('Reload &APIs'),
0, 0, self, 'reload_apis')
@@ -2575,7 +2575,7 @@
self.reloadAPIsAct.triggered.connect(self.__reloadAPIs)
self.actions.append(self.reloadAPIsAct)
- self.showExternalToolsAct = E5Action(
+ self.showExternalToolsAct = EricAction(
self.tr('Show external tools'),
UI.PixmapCache.getIcon("showPrograms"),
self.tr('Show external &tools'),
@@ -2591,7 +2591,7 @@
self.__showExternalTools)
self.actions.append(self.showExternalToolsAct)
- self.configViewProfilesAct = E5Action(
+ self.configViewProfilesAct = EricAction(
self.tr('View Profiles'),
UI.PixmapCache.getIcon("configureViewProfiles"),
self.tr('&View Profiles...'),
@@ -2608,7 +2608,7 @@
self.__configViewProfiles)
self.actions.append(self.configViewProfilesAct)
- self.configToolBarsAct = E5Action(
+ self.configToolBarsAct = EricAction(
self.tr('Toolbars'),
UI.PixmapCache.getIcon("toolbarsConfigure"),
self.tr('Tool&bars...'),
@@ -2623,7 +2623,7 @@
self.configToolBarsAct.triggered.connect(self.__configToolBars)
self.actions.append(self.configToolBarsAct)
- self.shortcutsAct = E5Action(
+ self.shortcutsAct = EricAction(
self.tr('Keyboard Shortcuts'),
UI.PixmapCache.getIcon("configureShortcuts"),
self.tr('Keyboard &Shortcuts...'),
@@ -2638,7 +2638,7 @@
self.shortcutsAct.triggered.connect(self.__configShortcuts)
self.actions.append(self.shortcutsAct)
- self.exportShortcutsAct = E5Action(
+ self.exportShortcutsAct = EricAction(
self.tr('Export Keyboard Shortcuts'),
UI.PixmapCache.getIcon("exportShortcuts"),
self.tr('&Export Keyboard Shortcuts...'),
@@ -2652,7 +2652,7 @@
self.exportShortcutsAct.triggered.connect(self.__exportShortcuts)
self.actions.append(self.exportShortcutsAct)
- self.importShortcutsAct = E5Action(
+ self.importShortcutsAct = EricAction(
self.tr('Import Keyboard Shortcuts'),
UI.PixmapCache.getIcon("importShortcuts"),
self.tr('&Import Keyboard Shortcuts...'),
@@ -2667,7 +2667,7 @@
self.actions.append(self.importShortcutsAct)
if SSL_AVAILABLE:
- self.certificatesAct = E5Action(
+ self.certificatesAct = EricAction(
self.tr('Manage SSL Certificates'),
UI.PixmapCache.getIcon("certificates"),
self.tr('Manage SSL Certificates...'),
@@ -2683,7 +2683,7 @@
self.__showCertificatesDialog)
self.actions.append(self.certificatesAct)
- self.editMessageFilterAct = E5Action(
+ self.editMessageFilterAct = EricAction(
self.tr('Edit Message Filters'),
UI.PixmapCache.getIcon("warning"),
self.tr('Edit Message Filters...'),
@@ -2697,10 +2697,10 @@
""" window.</p>"""
))
self.editMessageFilterAct.triggered.connect(
- E5ErrorMessage.editMessageFilters)
+ EricErrorMessage.editMessageFilters)
self.actions.append(self.editMessageFilterAct)
- self.clearPrivateDataAct = E5Action(
+ self.clearPrivateDataAct = EricAction(
self.tr('Clear private data'),
UI.PixmapCache.getIcon("clearPrivateData"),
self.tr('Clear private data'),
@@ -2717,7 +2717,7 @@
self.__clearPrivateData)
self.actions.append(self.clearPrivateDataAct)
- self.viewmanagerActivateAct = E5Action(
+ self.viewmanagerActivateAct = EricAction(
self.tr('Activate current editor'),
self.tr('Activate current editor'),
QKeySequence(self.tr("Alt+Shift+E")),
@@ -2727,7 +2727,7 @@
self.actions.append(self.viewmanagerActivateAct)
self.addAction(self.viewmanagerActivateAct)
- self.nextTabAct = E5Action(
+ self.nextTabAct = EricAction(
self.tr('Show next'),
self.tr('Show next'),
QKeySequence(self.tr('Ctrl+Alt+Tab')), 0,
@@ -2736,7 +2736,7 @@
self.actions.append(self.nextTabAct)
self.addAction(self.nextTabAct)
- self.prevTabAct = E5Action(
+ self.prevTabAct = EricAction(
self.tr('Show previous'),
self.tr('Show previous'),
QKeySequence(self.tr('Shift+Ctrl+Alt+Tab')), 0,
@@ -2745,7 +2745,7 @@
self.actions.append(self.prevTabAct)
self.addAction(self.prevTabAct)
- self.switchTabAct = E5Action(
+ self.switchTabAct = EricAction(
self.tr('Switch between tabs'),
self.tr('Switch between tabs'),
QKeySequence(self.tr('Ctrl+1')), 0,
@@ -2754,7 +2754,7 @@
self.actions.append(self.switchTabAct)
self.addAction(self.switchTabAct)
- self.pluginInfoAct = E5Action(
+ self.pluginInfoAct = EricAction(
self.tr('Plugin Infos'),
UI.PixmapCache.getIcon("plugin"),
self.tr('&Plugin Infos...'), 0, 0, self, 'plugin_infos')
@@ -2767,7 +2767,7 @@
self.pluginInfoAct.triggered.connect(self.__showPluginInfo)
self.actions.append(self.pluginInfoAct)
- self.pluginInstallAct = E5Action(
+ self.pluginInstallAct = EricAction(
self.tr('Install Plugins'),
UI.PixmapCache.getIcon("pluginInstall"),
self.tr('&Install Plugins...'),
@@ -2780,7 +2780,7 @@
self.pluginInstallAct.triggered.connect(self.__installPlugins)
self.actions.append(self.pluginInstallAct)
- self.pluginDeinstallAct = E5Action(
+ self.pluginDeinstallAct = EricAction(
self.tr('Uninstall Plugin'),
UI.PixmapCache.getIcon("pluginUninstall"),
self.tr('&Uninstall Plugin...'),
@@ -2793,7 +2793,7 @@
self.pluginDeinstallAct.triggered.connect(self.__deinstallPlugin)
self.actions.append(self.pluginDeinstallAct)
- self.pluginRepoAct = E5Action(
+ self.pluginRepoAct = EricAction(
self.tr('Plugin Repository'),
UI.PixmapCache.getIcon("pluginRepository"),
self.tr('Plugin &Repository...'),
@@ -2808,7 +2808,7 @@
self.pluginRepoAct.triggered.connect(self.showPluginsAvailable)
self.actions.append(self.pluginRepoAct)
- self.virtualenvManagerAct = E5Action(
+ self.virtualenvManagerAct = EricAction(
self.tr('Virtualenv Manager'),
UI.PixmapCache.getIcon("virtualenv"),
self.tr('&Virtualenv Manager...'),
@@ -2825,7 +2825,7 @@
self.virtualenvManager.showVirtualenvManagerDialog)
self.actions.append(self.virtualenvManagerAct)
- self.virtualenvConfigAct = E5Action(
+ self.virtualenvConfigAct = EricAction(
self.tr('Virtualenv Configurator'),
UI.PixmapCache.getIcon("virtualenvConfig"),
self.tr('Virtualenv &Configurator...'),
@@ -2859,7 +2859,7 @@
"""
Private slot to initialize the action to show the Qt documentation.
"""
- self.qt5DocAct = E5Action(
+ self.qt5DocAct = EricAction(
self.tr('Qt5 Documentation'),
self.tr('Qt5 Documentation'),
0, 0, self, 'qt5_documentation')
@@ -2874,7 +2874,7 @@
self.qt5DocAct.triggered.connect(lambda: self.__showQtDoc(5))
self.actions.append(self.qt5DocAct)
- self.qt6DocAct = E5Action(
+ self.qt6DocAct = EricAction(
self.tr('Qt6 Documentation'),
self.tr('Qt6 Documentation'),
0, 0, self, 'qt6_documentation')
@@ -2889,7 +2889,7 @@
self.qt6DocAct.triggered.connect(lambda: self.__showQtDoc(6))
self.actions.append(self.qt6DocAct)
- self.pyqt5DocAct = E5Action(
+ self.pyqt5DocAct = EricAction(
self.tr('PyQt5 Documentation'),
self.tr('PyQt5 Documentation'),
0, 0, self, 'pyqt5_documentation')
@@ -2906,7 +2906,7 @@
lambda: self.__showPyQtDoc(variant=5))
self.actions.append(self.pyqt5DocAct)
- self.pyqt6DocAct = E5Action(
+ self.pyqt6DocAct = EricAction(
self.tr('PyQt6 Documentation'),
self.tr('PyQt6 Documentation'),
0, 0, self, 'pyqt6_documentation')
@@ -2928,7 +2928,7 @@
Private slot to initialize the actions to show the Python
documentation.
"""
- self.pythonDocAct = E5Action(
+ self.pythonDocAct = EricAction(
self.tr('Python 3 Documentation'),
self.tr('Python 3 Documentation'),
0, 0, self, 'python3_documentation')
@@ -2950,7 +2950,7 @@
"""
Private slot to initialize the action to show the eric documentation.
"""
- self.ericDocAct = E5Action(
+ self.ericDocAct = EricAction(
self.tr("Eric API Documentation"),
self.tr('Eric API Documentation'),
0, 0, self, 'eric_documentation')
@@ -2971,7 +2971,7 @@
documentation.
"""
if Utilities.checkPyside(variant=2):
- self.pyside2DocAct = E5Action(
+ self.pyside2DocAct = EricAction(
self.tr('PySide2 Documentation'),
self.tr('PySide2 Documentation'),
0, 0, self, 'pyside2_documentation')
@@ -2991,7 +2991,7 @@
self.pyside2DocAct = None
if Utilities.checkPyside(variant=6):
- self.pyside6DocAct = E5Action(
+ self.pyside6DocAct = EricAction(
self.tr('PySide6 Documentation'),
self.tr('PySide6 Documentation'),
0, 0, self, 'pyside6_documentation')
@@ -3529,21 +3529,21 @@
self.__statusBar = self.statusBar()
self.__statusBar.setSizeGripEnabled(True)
- self.sbLanguage = E5ClickableLabel(self.__statusBar)
+ self.sbLanguage = EricClickableLabel(self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbLanguage)
self.sbLanguage.setWhatsThis(self.tr(
"""<p>This part of the status bar displays the"""
""" current editors language.</p>"""
))
- self.sbEncoding = E5ClickableLabel(self.__statusBar)
+ self.sbEncoding = EricClickableLabel(self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbEncoding)
self.sbEncoding.setWhatsThis(self.tr(
"""<p>This part of the status bar displays the"""
""" current editors encoding.</p>"""
))
- self.sbEol = E5ClickableLabel(self.__statusBar)
+ self.sbEol = EricClickableLabel(self.__statusBar)
self.__statusBar.addPermanentWidget(self.sbEol)
self.sbEol.setWhatsThis(self.tr(
"""<p>This part of the status bar displays the"""
@@ -3571,7 +3571,7 @@
""" of the current editor.</p>"""
))
- self.sbZoom = E5ZoomWidget(
+ self.sbZoom = EricZoomWidget(
UI.PixmapCache.getPixmap("zoomOut"),
UI.PixmapCache.getPixmap("zoomIn"),
UI.PixmapCache.getPixmap("zoomReset"),
@@ -3687,7 +3687,7 @@
Private slot to show the Settings menu.
"""
self.editMessageFilterAct.setEnabled(
- E5ErrorMessage.messageHandlerInstalled())
+ EricErrorMessage.messageHandlerInstalled())
self.showMenu.emit("Settings", self.__menus["settings"])
@@ -3781,7 +3781,7 @@
).format(Program, Version)
versionText += self.tr("""</table>""")
- E5MessageBox.about(self, Program, versionText)
+ EricMessageBox.about(self, Program, versionText)
def __reportBug(self):
"""
@@ -3810,7 +3810,7 @@
if not Preferences.getUser("UseGoogleMailOAuth2") and (
Preferences.getUser("Email") == "" or
Preferences.getUser("MailServer") == ""):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Report Bug"),
self.tr(
@@ -3931,11 +3931,11 @@
editor = MiniEditor(parent=self)
editor.show()
- def addE5Actions(self, actions, actionType):
+ def addEricActions(self, actions, actionType):
"""
Public method to add actions to the list of actions.
- @param actions list of actions to be added (list of E5Action)
+ @param actions list of actions to be added (list of EricAction)
@param actionType string denoting the action set to add to.
It must be one of "ui" or "wizards".
"""
@@ -3944,11 +3944,11 @@
elif actionType == 'wizards':
self.wizardsActions.extend(actions)
- def removeE5Actions(self, actions, actionType='ui'):
+ def removeEricActions(self, actions, actionType='ui'):
"""
Public method to remove actions from the list of actions.
- @param actions list of actions (list of E5Action)
+ @param actions list of actions (list of EricAction)
@param actionType string denoting the action set to remove from.
It must be one of "ui" or "wizards".
"""
@@ -3965,7 +3965,7 @@
@param actionType string denoting the action set to get.
It must be one of "ui" or "wizards".
- @return list of all actions (list of E5Action)
+ @return list of all actions (list of EricAction)
"""
if actionType == 'ui':
return self.actions[:]
@@ -4111,7 +4111,7 @@
Private method to quit the application.
"""
if self.__shutdown():
- e5App().closeAllWindows()
+ ericApp().closeAllWindows()
@pyqtSlot()
def __restart(self, ask=False):
@@ -4122,7 +4122,7 @@
@type bool
"""
res = (
- E5MessageBox.yesNo(
+ EricMessageBox.yesNo(
self,
self.tr("Restart application"),
self.tr(
@@ -4133,7 +4133,7 @@
)
if res and self.__shutdown():
- e5App().closeAllWindows()
+ ericApp().closeAllWindows()
program = sys.executable
eric7 = os.path.join(getConfig("ericDir"), "eric7.py")
args = [eric7]
@@ -5035,7 +5035,7 @@
if os.path.isfile(fn) and os.path.getsize(fn):
args.append(fn)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5044,7 +5044,7 @@
.format(fn))
return
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5066,7 +5066,7 @@
if designer:
proc = QProcess()
if not proc.startDetached(designer, args):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5075,7 +5075,7 @@
).format(designer)
)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5105,7 +5105,7 @@
):
args.append(fn)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5114,7 +5114,7 @@
.format(fn))
return
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5136,7 +5136,7 @@
if linguist:
proc = QProcess()
if not proc.startDetached(linguist, args):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5145,7 +5145,7 @@
).format(linguist)
)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5180,7 +5180,7 @@
if assistant:
proc = QProcess()
if not proc.startDetached(assistant, args):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5189,7 +5189,7 @@
).format(assistant)
)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5213,7 +5213,7 @@
"""
customViewer = Preferences.getHelp("CustomViewer")
if not customViewer:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Help"),
self.tr(
@@ -5227,7 +5227,7 @@
args.append(home)
if not proc.startDetached(customViewer, args):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5247,7 +5247,7 @@
args.append(home)
if not proc.startDetached("hh", args):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5275,7 +5275,7 @@
if os.path.isfile(fn) and os.path.getsize(fn):
args.append(fn)
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5284,7 +5284,7 @@
.format(fn))
return
except OSError:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5297,7 +5297,7 @@
not os.path.isfile(viewer) or
not proc.startDetached(sys.executable, args)
):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5331,7 +5331,7 @@
args.append(fn)
else:
if not ignore:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5341,7 +5341,7 @@
return
except OSError:
if not ignore:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Problem'),
self.tr(
@@ -5354,7 +5354,7 @@
not os.path.isfile(viewer) or
not proc.startDetached(sys.executable, args)
):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5377,7 +5377,7 @@
not os.path.isfile(browser) or
not proc.startDetached(sys.executable, args)
):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5462,7 +5462,7 @@
not os.path.isfile(snap) or
not proc.startDetached(sys.executable, args)
):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5485,7 +5485,7 @@
self.__startToolProcess(tool)
return
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("External Tools"),
self.tr(
@@ -5494,7 +5494,7 @@
.format(toolMenuText, toolGroupName))
return
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("External Tools"),
self.tr("""No toolgroup entry '{0}' found.""")
@@ -5549,7 +5549,7 @@
proc.start(program, args)
if not proc.waitForStarted():
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Process Generation Error'),
self.tr(
@@ -5639,7 +5639,7 @@
if Utilities.isWindowsPlatform():
venvName = Preferences.getDebugger("Python3VirtualEnv")
interpreter = (
- e5App().getObject("VirtualEnvManager")
+ ericApp().getObject("VirtualEnvManager")
.getVirtualenvInterpreter(venvName)
)
if interpreter:
@@ -5668,7 +5668,7 @@
home = pythonDocDir
if not os.path.exists(home):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation Missing"),
self.tr("""<p>The documentation starting point"""
@@ -5728,7 +5728,7 @@
home = qtDocDir
if not os.path.exists(home):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation Missing"),
self.tr("""<p>The documentation starting point"""
@@ -5767,7 +5767,7 @@
"PYQT{0}DOCDIR".format(variant), None)
if not pyqtDocDir:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation"),
self.tr("""<p>The PyQt{0} documentation starting point"""
@@ -5794,7 +5794,7 @@
home = pyqtDocDir
if not home or not os.path.exists(home):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation Missing"),
self.tr("""<p>The documentation starting point"""
@@ -5833,7 +5833,7 @@
if not home.startswith(("http://", "https://", "qthelp://")):
if not os.path.exists(home):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation Missing"),
self.tr("""<p>The documentation starting point"""
@@ -5872,7 +5872,7 @@
"PYSIDE{0}DOCDIR".format(variant), None)
if not pysideDocDir:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation"),
self.tr("""<p>The PySide{0} documentation starting point"""
@@ -5889,7 +5889,7 @@
else:
home = pysideDocDir
if not os.path.exists(home):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Documentation Missing"),
self.tr("""<p>The documentation starting point"""
@@ -5985,7 +5985,7 @@
]
process.start(sys.executable, args)
if not process.waitForStarted():
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Start Web Browser"),
self.tr("""The eric web browser could not be"""
@@ -6049,7 +6049,7 @@
# Process exited prematurely due to missing pre-requisites
return -1
if res <= 0:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Start Web Browser"),
self.tr("""<p>The eric web browser is not started.</p>"""
@@ -6092,7 +6092,7 @@
"""
started = QDesktopServices.openUrl(QUrl(home))
if not started:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr('Open Browser'),
self.tr('Could not start a web browser'))
@@ -6166,7 +6166,7 @@
if Preferences.getUI("SingleApplicationMode"):
if self.SAServer is None:
- self.SAServer = E5SingleApplicationServer()
+ self.SAServer = EricSingleApplicationServer()
else:
if self.SAServer is not None:
self.SAServer.shutdown()
@@ -6283,8 +6283,8 @@
"""
Private slot to configure the various toolbars.
"""
- from E5Gui.E5ToolBarDialog import E5ToolBarDialog
- dlg = E5ToolBarDialog(self.toolbarManager)
+ from E5Gui.EricToolBarDialog import EricToolBarDialog
+ dlg = EricToolBarDialog(self.toolbarManager)
if dlg.exec() == QDialog.DialogCode.Accepted:
Preferences.setUI(
"ToolbarManagerState", self.toolbarManager.saveState())
@@ -6303,13 +6303,13 @@
"""
Private slot to export the keyboard shortcuts.
"""
- fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ fn, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
None,
self.tr("Export Keyboard Shortcuts"),
"",
self.tr("Keyboard Shortcuts File (*.ekj)"),
"",
- E5FileDialog.DontConfirmOverwrite)
+ EricFileDialog.DontConfirmOverwrite)
if not fn:
return
@@ -6321,7 +6321,7 @@
fn += ex
ok = (
- E5MessageBox.yesNo(
+ EricMessageBox.yesNo(
self,
self.tr("Export Keyboard Shortcuts"),
self.tr("""<p>The keyboard shortcuts file <b>{0}</b> exists"""
@@ -6338,7 +6338,7 @@
"""
Private slot to import the keyboard shortcuts.
"""
- fn = E5FileDialog.getOpenFileName(
+ fn = EricFileDialog.getOpenFileName(
None,
self.tr("Import Keyboard Shortcuts"),
"",
@@ -6406,7 +6406,7 @@
"""
from Debugger.DebugClientCapabilities import HasUnittest
self.__setWindowCaption(project=self.project.name)
- cap = e5App().getObject("DebugServer").getClientCapabilities(
+ cap = ericApp().getObject("DebugServer").getClientCapabilities(
self.project.getProjectLanguage())
self.utProjectAct.setEnabled(cap & HasUnittest)
self.utProjectOpen = cap & HasUnittest
@@ -6458,7 +6458,7 @@
len(self.__menus["wizards"].actions()) > 0)
if fn and str(fn) != "None":
- dbs = e5App().getObject("DebugServer")
+ dbs = ericApp().getObject("DebugServer")
for language in dbs.getSupportedLanguages():
exts = dbs.getExtensions(language)
if fn.endswith(exts):
@@ -6481,7 +6481,7 @@
fn = editor.getFileName() if editor else None
if fn:
- dbs = e5App().getObject("DebugServer")
+ dbs = ericApp().getObject("DebugServer")
for language in dbs.getSupportedLanguages():
exts = dbs.getExtensions(language)
if fn.endswith(exts):
@@ -6524,7 +6524,7 @@
reader.readXML()
f.close()
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Read Tasks"),
self.tr(
@@ -6572,7 +6572,7 @@
fn = os.path.join(Utilities.getConfigDir(),
"eric7session.e5s")
if not os.path.exists(fn):
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Read Session"),
self.tr("<p>The session file <b>{0}</b> could not"
@@ -6599,7 +6599,7 @@
f.close()
res = True
else:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Read session"),
self.tr("<p>The session file <b>{0}</b> could not be"
@@ -6615,7 +6615,7 @@
"""
Private slot to save a session to disk.
"""
- sessionFile, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+ sessionFile, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
self,
self.tr("Save Session"),
Utilities.getHomeDir(),
@@ -6637,7 +6637,7 @@
"""
Private slot to load a session from disk.
"""
- sessionFile = E5FileDialog.getOpenFileName(
+ sessionFile = EricFileDialog.getOpenFileName(
self,
self.tr("Load session"),
Utilities.getHomeDir(),
@@ -6687,7 +6687,7 @@
fn = os.path.join(Utilities.getConfigDir(),
"eric7_crash_session.esj")
if os.path.exists(fn):
- yes = E5MessageBox.yesNo(
+ yes = EricMessageBox.yesNo(
self,
self.tr("Crash Session found!"),
self.tr("""A session file of a crashed session was"""
@@ -6892,7 +6892,7 @@
if QFileInfo(fname).isFile():
self.viewmanager.openSourceFile(fname)
else:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Drop Error"),
self.tr("""<p><b>{0}</b> is not a file.</p>""")
@@ -6916,7 +6916,7 @@
event.accept()
if not self.inCloseEvent:
self.inCloseEvent = True
- QTimer.singleShot(0, e5App().closeAllWindows)
+ QTimer.singleShot(0, ericApp().closeAllWindows)
else:
event.ignore()
@@ -7054,7 +7054,7 @@
self.__versionCheckCanceled = False
if manual:
if self.__versionCheckProgress is None:
- self.__versionCheckProgress = E5ProgressDialog(
+ self.__versionCheckProgress = EricProgressDialog(
"", self.tr("&Cancel"),
0, len(self.__httpAlternatives),
self.tr("%v/%m"), self)
@@ -7115,14 +7115,14 @@
Preferences.Prefs.settings.setValue(
"Updates/FirstFailedCheckDate", firstFailure)
if self.manualUpdatesCheck:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Error getting versions information"),
self.tr("""The versions information could not be"""
""" downloaded."""
""" Please go online and try again."""))
elif failedDuration > 7:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Error getting versions information"),
self.tr("""The versions information could not be"""
@@ -7180,7 +7180,7 @@
installedSnapshotDate = VersionOnly.rsplit("-", 1)[-1]
availableSnapshotDate = versions[2].rsplit("-", 1)[-1]
if availableSnapshotDate > installedSnapshotDate:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self,
self.tr("Update available"),
self.tr(
@@ -7192,7 +7192,7 @@
url = res and versions[3] or ''
else:
if self.manualUpdatesCheck:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Update Check"),
self.tr(
@@ -7202,7 +7202,7 @@
elif VersionOnly.startswith(("rev_", "@@")):
# check installation from source
if self.manualUpdatesCheck:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("Update Check"),
self.tr(
@@ -7214,7 +7214,7 @@
installedVersionTuple = self.__versionToTuple(VersionOnly)
availableVersionTuple = self.__versionToTuple(versions[0])
if availableVersionTuple > installedVersionTuple:
- res = E5MessageBox.yesNo(
+ res = EricMessageBox.yesNo(
self,
self.tr("Update available"),
self.tr(
@@ -7226,14 +7226,14 @@
url = res and versions[1] or ''
else:
if self.manualUpdatesCheck:
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("eric is up to date"),
self.tr(
"""You are using the latest version of"""
""" eric"""))
except (IndexError, TypeError):
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Error during updates check"),
self.tr("""Could not perform updates check."""))
@@ -7274,12 +7274,12 @@
line += 2
versionText += self.tr("""</table>""")
- self.__versionsDialog = E5MessageBox.E5MessageBox(
- E5MessageBox.NoIcon,
+ self.__versionsDialog = EricMessageBox.EricMessageBox(
+ EricMessageBox.NoIcon,
Program,
versionText,
modal=False,
- buttons=E5MessageBox.Ok,
+ buttons=EricMessageBox.Ok,
parent=self
)
self.__versionsDialog.setIconPixmap(
@@ -7309,7 +7309,7 @@
if not Preferences.isConfigured():
self.__initDebugToolbarsLayout()
- E5MessageBox.information(
+ EricMessageBox.information(
self,
self.tr("First time usage"),
self.tr("""eric has not been configured yet. """
@@ -7328,11 +7328,11 @@
workspace = Preferences.getMultiProject("Workspace")
if workspace == "":
default = Utilities.getHomeDir()
- workspace = E5FileDialog.getExistingDirectory(
+ workspace = EricFileDialog.getExistingDirectory(
None,
self.tr("Select Workspace Directory"),
default,
- E5FileDialog.Option(0))
+ EricFileDialog.Option(0))
Preferences.setMultiProject("Workspace", workspace)
def versionIsNewer(self, required, snapshot=None):
