--- a/src/eric7/Preferences/ProgramsDialog.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Preferences/ProgramsDialog.py Sun Dec 18 19:33:46 2022 +0100
@@ -19,9 +19,15 @@
QTreeWidgetItem,
)
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences
from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
from eric7.EricWidgets.EricApplication import ericApp
+from eric7.SystemUtilities import (
+ FileSystemUtilities,
+ OSUtilities,
+ PythonUtilities,
+ QtUtilities,
+)
from .Ui_ProgramsDialog import Ui_ProgramsDialog
@@ -92,54 +98,54 @@
# 1. do the Qt programs
# 1a. Translation Converter
exe = (
- Utilities.isWindowsPlatform()
- and "{0}.exe".format(Utilities.generateQtToolName("lrelease"))
- or Utilities.generateQtToolName("lrelease")
+ OSUtilities.isWindowsPlatform()
+ and "{0}.exe".format(QtUtilities.generateQtToolName("lrelease"))
+ or QtUtilities.generateQtToolName("lrelease")
)
- exe = os.path.join(Utilities.getQtBinariesPath(), exe)
+ exe = os.path.join(QtUtilities.getQtBinariesPath(), exe)
version = self.__createProgramEntry(
self.tr("Translation Converter (Qt)"), exe, "-version", "lrelease", -1
)
# 1b. Qt Designer
- if Utilities.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
exe = os.path.join(
- Utilities.getQtBinariesPath(),
- "{0}.exe".format(Utilities.generateQtToolName("designer")),
+ QtUtilities.getQtBinariesPath(),
+ "{0}.exe".format(QtUtilities.generateQtToolName("designer")),
)
- elif Utilities.isMacPlatform():
- exe = Utilities.getQtMacBundle("designer")
+ elif OSUtilities.isMacPlatform():
+ exe = QtUtilities.getQtMacBundle("designer")
else:
exe = os.path.join(
- Utilities.getQtBinariesPath(),
- Utilities.generateQtToolName("designer"),
+ QtUtilities.getQtBinariesPath(),
+ QtUtilities.generateQtToolName("designer"),
)
self.__createProgramEntry(self.tr("Qt Designer"), exe, version=version)
# 1c. Qt Linguist
- if Utilities.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
exe = os.path.join(
- Utilities.getQtBinariesPath(),
- "{0}.exe".format(Utilities.generateQtToolName("linguist")),
+ QtUtilities.getQtBinariesPath(),
+ "{0}.exe".format(QtUtilities.generateQtToolName("linguist")),
)
- elif Utilities.isMacPlatform():
- exe = Utilities.getQtMacBundle("linguist")
+ elif OSUtilities.isMacPlatform():
+ exe = QtUtilities.getQtMacBundle("linguist")
else:
exe = os.path.join(
- Utilities.getQtBinariesPath(),
- Utilities.generateQtToolName("linguist"),
+ QtUtilities.getQtBinariesPath(),
+ QtUtilities.generateQtToolName("linguist"),
)
self.__createProgramEntry(self.tr("Qt Linguist"), exe, version=version)
# 1d. Qt Assistant
- if Utilities.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
exe = os.path.join(
- Utilities.getQtBinariesPath(),
- "{0}.exe".format(Utilities.generateQtToolName("assistant")),
+ QtUtilities.getQtBinariesPath(),
+ "{0}.exe".format(QtUtilities.generateQtToolName("assistant")),
)
- elif Utilities.isMacPlatform():
- exe = Utilities.getQtMacBundle("assistant")
+ elif OSUtilities.isMacPlatform():
+ exe = QtUtilities.getQtMacBundle("assistant")
else:
exe = os.path.join(
- Utilities.getQtBinariesPath(),
- Utilities.generateQtToolName("assistant"),
+ QtUtilities.getQtBinariesPath(),
+ QtUtilities.generateQtToolName("assistant"),
)
self.__createProgramEntry(self.tr("Qt Assistant"), exe, version=version)
@@ -148,7 +154,7 @@
# 2.1a. Translation Extractor PyQt5
self.__createProgramEntry(
self.tr("Translation Extractor (Python, PyQt5)"),
- Utilities.generatePyQtToolPath("pylupdate5"),
+ QtUtilities.generatePyQtToolPath("pylupdate5"),
"-version",
"pylupdate",
-1,
@@ -156,7 +162,7 @@
# 2.1b. Forms Compiler PyQt5
self.__createProgramEntry(
self.tr("Forms Compiler (Python, PyQt5)"),
- Utilities.generatePyQtToolPath("pyuic5", ["py3uic5"]),
+ QtUtilities.generatePyQtToolPath("pyuic5", ["py3uic5"]),
"--version",
"Python User",
4,
@@ -164,7 +170,7 @@
# 2.1c. Resource Compiler PyQt5
self.__createProgramEntry(
self.tr("Resource Compiler (Python, PyQt5)"),
- Utilities.generatePyQtToolPath("pyrcc5"),
+ QtUtilities.generatePyQtToolPath("pyrcc5"),
"-version",
"",
-1,
@@ -175,14 +181,14 @@
# 2.2a. Translation Extractor PyQt6
self.__createProgramEntry(
self.tr("Translation Extractor (Python, PyQt6)"),
- Utilities.generatePyQtToolPath("pylupdate6"),
+ QtUtilities.generatePyQtToolPath("pylupdate6"),
"--version",
versionPosition=0,
)
# 2.2b. Forms Compiler PyQt6
self.__createProgramEntry(
self.tr("Forms Compiler (Python, PyQt6)"),
- Utilities.generatePyQtToolPath("pyuic6"),
+ QtUtilities.generatePyQtToolPath("pyuic6"),
"--version",
versionPosition=0,
)
@@ -192,7 +198,7 @@
# 3.1a. Translation Extractor PySide2
self.__createProgramEntry(
self.tr("Translation Extractor (Python, PySide2)"),
- Utilities.generatePySideToolPath("pyside2-lupdate", variant=2),
+ QtUtilities.generatePySideToolPath("pyside2-lupdate", variant=2),
"-version",
"",
-1,
@@ -201,7 +207,7 @@
# 3.1b. Forms Compiler PySide2
self.__createProgramEntry(
self.tr("Forms Compiler (Python, PySide2)"),
- Utilities.generatePySideToolPath("pyside2-uic", variant=2),
+ QtUtilities.generatePySideToolPath("pyside2-uic", variant=2),
"--version",
"",
-1,
@@ -210,7 +216,7 @@
# 3.1c Resource Compiler PySide2
self.__createProgramEntry(
self.tr("Resource Compiler (Python, PySide2)"),
- Utilities.generatePySideToolPath("pyside2-rcc", variant=2),
+ QtUtilities.generatePySideToolPath("pyside2-rcc", variant=2),
"-version",
"",
-1,
@@ -220,7 +226,7 @@
# 3.2a. Translation Extractor PySide6
self.__createProgramEntry(
self.tr("Translation Extractor (Python, PySide6)"),
- Utilities.generatePySideToolPath("pyside6-lupdate", variant=6),
+ QtUtilities.generatePySideToolPath("pyside6-lupdate", variant=6),
"-version",
"",
-1,
@@ -229,7 +235,7 @@
# 3.2b. Forms Compiler PySide6
self.__createProgramEntry(
self.tr("Forms Compiler (Python, PySide6)"),
- Utilities.generatePySideToolPath("pyside6-uic", variant=6),
+ QtUtilities.generatePySideToolPath("pyside6-uic", variant=6),
"--version",
"",
-1,
@@ -238,7 +244,7 @@
# 3.2c Resource Compiler PySide6
self.__createProgramEntry(
self.tr("Resource Compiler (Python, PySide6)"),
- Utilities.generatePySideToolPath("pyside6-rcc", variant=6),
+ QtUtilities.generatePySideToolPath("pyside6-rcc", variant=6),
"--version",
"",
-1,
@@ -249,7 +255,7 @@
exe = Preferences.getConda("CondaExecutable")
if not exe:
exe = "conda"
- if Utilities.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
exe += ".exe"
self.__createProgramEntry(
self.tr("conda Manager"), exe, "--version", "conda", -1
@@ -315,7 +321,7 @@
)
self.__createProgramEntry(
self.tr("MicroPython - ESP Tool"),
- Globals.getPythonExecutable(),
+ PythonUtilities.getPythonExecutable(),
"version",
"esptool",
-1,
@@ -423,10 +429,10 @@
itm.setText(1, self.tr("(not configured)"))
else:
if os.path.isabs(exe):
- if not Utilities.isExecutable(exe):
+ if not FileSystemUtilities.isExecutable(exe):
exe = ""
else:
- exe = Utilities.getExecutablePath(exe)
+ exe = FileSystemUtilities.getExecutablePath(exe)
if exe:
available = True
if versionCommand and versionPosition is not None:
