16 |
16 |
17 from PyQt6.QtCore import QEventLoop, QProcess, Qt, pyqtSignal |
17 from PyQt6.QtCore import QEventLoop, QProcess, Qt, pyqtSignal |
18 from PyQt6.QtGui import QCursor, QGuiApplication |
18 from PyQt6.QtGui import QCursor, QGuiApplication |
19 from PyQt6.QtWidgets import QDialog, QMenu |
19 from PyQt6.QtWidgets import QDialog, QMenu |
20 |
20 |
21 from eric7 import Preferences, Utilities |
21 from eric7 import Preferences |
22 from eric7.EricGui import EricPixmapCache |
22 from eric7.EricGui import EricPixmapCache |
23 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor |
23 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor |
24 from eric7.EricWidgets import EricMessageBox |
24 from eric7.EricWidgets import EricMessageBox |
25 from eric7.EricWidgets.EricApplication import ericApp |
25 from eric7.EricWidgets.EricApplication import ericApp |
|
26 from eric7.SystemUtilities import OSUtilities, QtUtilities |
26 from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog |
27 from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog |
27 from eric7.UI.NotificationWidget import NotificationTypes |
28 from eric7.UI.NotificationWidget import NotificationTypes |
28 |
29 |
29 from .FileCategoryRepositoryItem import FileCategoryRepositoryItem |
30 from .FileCategoryRepositoryItem import FileCategoryRepositoryItem |
30 from .ProjectBaseBrowser import ProjectBaseBrowser |
31 from .ProjectBaseBrowser import ProjectBaseBrowser |
1196 return |
1197 return |
1197 else: |
1198 else: |
1198 return |
1199 return |
1199 |
1200 |
1200 if self.project.getProjectType() in ["PyQt5", "PyQt5C"]: |
1201 if self.project.getProjectType() in ["PyQt5", "PyQt5C"]: |
1201 self.pylupdate = Utilities.generatePyQtToolPath("pylupdate5") |
1202 self.pylupdate = QtUtilities.generatePyQtToolPath("pylupdate5") |
1202 elif self.project.getProjectType() in ["PyQt6", "PyQt6C", "E7Plugin"]: |
1203 elif self.project.getProjectType() in ["PyQt6", "PyQt6C", "E7Plugin"]: |
1203 self.pylupdate = Utilities.generatePyQtToolPath("pylupdate6") |
1204 self.pylupdate = QtUtilities.generatePyQtToolPath("pylupdate6") |
1204 elif self.project.getProjectType() in ["PySide2", "PySide2C"]: |
1205 elif self.project.getProjectType() in ["PySide2", "PySide2C"]: |
1205 self.pylupdate = Utilities.generatePySideToolPath( |
1206 self.pylupdate = QtUtilities.generatePySideToolPath( |
1206 "pyside2-lupdate", variant=2 |
1207 "pyside2-lupdate", variant=2 |
1207 ) |
1208 ) |
1208 elif self.project.getProjectType() in ["PySide6", "PySide6C"]: |
1209 elif self.project.getProjectType() in ["PySide6", "PySide6C"]: |
1209 self.pylupdate = Utilities.generatePySideToolPath( |
1210 self.pylupdate = QtUtilities.generatePySideToolPath( |
1210 "pyside6-lupdate", variant=6 |
1211 "pyside6-lupdate", variant=6 |
1211 ) |
1212 ) |
1212 else: |
1213 else: |
1213 return |
1214 return |
1214 |
1215 |
1467 "PySide2C", |
1468 "PySide2C", |
1468 "PySide6", |
1469 "PySide6", |
1469 "PySide6C", |
1470 "PySide6C", |
1470 ]: |
1471 ]: |
1471 lrelease = os.path.join( |
1472 lrelease = os.path.join( |
1472 Utilities.getQtBinariesPath(), Utilities.generateQtToolName("lrelease") |
1473 QtUtilities.getQtBinariesPath(), |
|
1474 QtUtilities.generateQtToolName("lrelease"), |
1473 ) |
1475 ) |
1474 else: |
1476 else: |
1475 return |
1477 return |
1476 if Utilities.isWindowsPlatform(): |
1478 if OSUtilities.isWindowsPlatform(): |
1477 lrelease += ".exe" |
1479 lrelease += ".exe" |
1478 |
1480 |
1479 if langs: |
1481 if langs: |
1480 langs = [ |
1482 langs = [ |
1481 self.project.getRelativePath(lang.fileName()) |
1483 self.project.getRelativePath(lang.fileName()) |