diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py
--- a/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py Sat May 22 18:51:46 2021 +0200
@@ -16,10 +16,10 @@
)
from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5Completers import E5DirCompleter
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricCompleters import EricDirCompleter
+from E5Gui.EricOverrideCursor import EricOverrideCursor
from .Ui_SetupWizardDialog import Ui_SetupWizardDialog
@@ -33,7 +33,7 @@
Class implementing the setup.py wizard dialog.
It displays a dialog for entering the parameters
- for the E5MessageBox code generator.
+ for the EricMessageBox code generator.
"""
ClassifiersUrl = "https://pypi.org/pypi?%3Aaction=list_classifiers"
@@ -50,9 +50,9 @@
self.dataTabWidget.setCurrentIndex(0)
- self.__packageDirCompleter = E5DirCompleter(self.packageEdit)
- self.__packageRootDirCompleter = E5DirCompleter(self.packageRootEdit)
- self.__sourceDirCompleter = E5DirCompleter(self.sourceDirectoryEdit)
+ self.__packageDirCompleter = EricDirCompleter(self.packageEdit)
+ self.__packageRootDirCompleter = EricDirCompleter(self.packageRootEdit)
+ self.__sourceDirCompleter = EricDirCompleter(self.sourceDirectoryEdit)
self.packageRootDirButton.setIcon(UI.PixmapCache.getIcon("open"))
self.packageDirButton.setIcon(UI.PixmapCache.getIcon("open"))
@@ -75,7 +75,7 @@
QDialogButtonBox.StandardButton.Ok)
self.__okButton.setEnabled(False)
- projectOpen = e5App().getObject("Project").isOpen()
+ projectOpen = ericApp().getObject("Project").isOpen()
self.projectButton.setEnabled(projectOpen)
self.autodiscoverPackagesButton.setEnabled(projectOpen)
@@ -113,7 +113,7 @@
request.setAttribute(
QNetworkRequest.Attribute.CacheLoadControlAttribute,
QNetworkRequest.CacheLoadControl.AlwaysNetwork)
- reply = e5App().getObject("UserInterface").networkAccessManager().get(
+ reply = ericApp().getObject("UserInterface").networkAccessManager().get(
request)
reply.finished.connect(lambda: self.__classifiersDownloadDone(reply))
self.__replies.append(reply)
@@ -152,7 +152,7 @@
with open(filename, "r") as f:
lines = f.readlines()
except OSError as err:
- E5MessageBox.warning(
+ EricMessageBox.warning(
self,
self.tr("Reading Trove Classifiers"),
self.tr("""<p>The Trove Classifiers file <b>{0}</b>"""
@@ -467,7 +467,7 @@
Private slot to populate some fields with data retrieved from the
current project.
"""
- project = e5App().getObject("Project")
+ project = ericApp().getObject("Project")
self.nameEdit.setText(project.getProjectName())
try:
@@ -546,7 +546,7 @@
startDir = self.packageEdit.text()
if not startDir:
startDir = self.packageRootEdit.text() or self.__getStartDir()
- packageDir = E5FileDialog.getExistingDirectory(
+ packageDir = EricFileDialog.getExistingDirectory(
self,
self.tr("Package Directory"),
Utilities.fromNativeSeparators(startDir))
@@ -559,7 +559,7 @@
"""
Private slot to discover packages automatically.
"""
- with E5OverrideCursor():
+ with EricOverrideCursor():
self.autodiscoverPackagesButton.setEnabled(False)
startDir = self.packageRootEdit.text() or self.__getStartDir()
if startDir:
@@ -578,11 +578,11 @@
startDir = self.packageRootEdit.text()
if not startDir:
startDir = self.__getStartDir()
- packagesRootDir = E5FileDialog.getExistingDirectory(
+ packagesRootDir = EricFileDialog.getExistingDirectory(
self,
self.tr("Packages Root Directory"),
Utilities.fromNativeSeparators(startDir),
- E5FileDialog.ShowDirsOnly)
+ EricFileDialog.ShowDirsOnly)
if packagesRootDir:
self.packageRootEdit.setText(
Utilities.toNativeSeparators(packagesRootDir))
@@ -594,7 +594,7 @@
@param txt text of the line edit (string)
"""
- projectOpen = e5App().getObject("Project").isOpen()
+ projectOpen = ericApp().getObject("Project").isOpen()
validPackagesRoot = bool(txt) and os.path.exists(txt)
self.autodiscoverPackagesButton.setEnabled(
projectOpen or validPackagesRoot)
@@ -617,14 +617,14 @@
Utilities.toNativeSeparators(pkgDir),
"__init__.py")
if not os.path.exists(initName):
- res = E5MessageBox.information(
+ res = EricMessageBox.information(
self,
self.tr("Add Package"),
self.tr("""<p>The directory <b>{0}</b> is not"""
""" a Python package.</p>""")
.format(pkgDir),
- E5MessageBox.Ignore | E5MessageBox.Ok)
- if res == E5MessageBox.Ok:
+ EricMessageBox.Ignore | EricMessageBox.Ok)
+ if res == EricMessageBox.Ok:
return
pkg = pkgDir.replace(
@@ -671,7 +671,7 @@
Private slot to add scripts to the list.
"""
startDir = self.packageRootEdit.text() or self.__getStartDir()
- scriptsList = E5FileDialog.getOpenFileNames(
+ scriptsList = EricFileDialog.getOpenFileNames(
self,
self.tr("Add Scripts"),
startDir,
@@ -710,7 +710,7 @@
Private slot to add Python modules to the list.
"""
startDir = self.packageRootEdit.text() or self.__getStartDir()
- modulesList = E5FileDialog.getOpenFileNames(
+ modulesList = EricFileDialog.getOpenFileNames(
self,
self.tr("Add Python Modules"),
startDir,
@@ -791,11 +791,11 @@
directory selection dialog.
"""
startDir = self.sourceDirectoryEdit.text() or self.__getStartDir()
- sourceDirectory = E5FileDialog.getExistingDirectory(
+ sourceDirectory = EricFileDialog.getExistingDirectory(
self,
self.tr("Source Directory"),
Utilities.fromNativeSeparators(startDir),
- E5FileDialog.ShowDirsOnly)
+ EricFileDialog.ShowDirsOnly)
if sourceDirectory:
self.sourceDirectoryEdit.setText(
Utilities.toNativeSeparators(sourceDirectory))
