Mercurial Repositories > eric / file comparison
comparison: eric6/Project/ProjectFormsBrowser.py
eric6/Project/ProjectFormsBrowser.py
- branch
- without_py2_and_pyqt4
- changeset 7201
- 6b42677d7043
- parent 7192
- a22eee00b052
- child 7229
- 53054eb5b15a
equal
deleted
inserted
replaced
| 7200:ebab8ba287e6 | 7201:6b42677d7043 |
|---|---|
| 11 | 11 |
| 12 import os | 12 import os |
| 13 import sys | 13 import sys |
| 14 import shutil | 14 import shutil |
| 15 | 15 |
| 16 from PyQt5.QtCore import PYQT_VERSION, QThread, QFileInfo, pyqtSignal, QProcess | 16 from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess |
| 17 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu | 17 from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu |
| 18 | 18 |
| 19 from E5Gui.E5Application import e5App | 19 from E5Gui.E5Application import e5App |
| 20 from E5Gui import E5MessageBox, E5FileDialog | 20 from E5Gui import E5MessageBox, E5FileDialog |
| 21 from E5Gui.E5ProgressDialog import E5ProgressDialog | 21 from E5Gui.E5ProgressDialog import E5ProgressDialog |
| 673 'pyuic4', ["py3uic4"]) | 673 'pyuic4', ["py3uic4"]) |
| 674 elif self.project.getProjectType() in ["PyQt5"]: | 674 elif self.project.getProjectType() in ["PyQt5"]: |
| 675 self.__uicompiler = Utilities.generatePyQtToolPath( | 675 self.__uicompiler = Utilities.generatePyQtToolPath( |
| 676 'pyuic5', ["py3uic5"]) | 676 'pyuic5', ["py3uic5"]) |
| 677 elif self.project.getProjectType() in ["E6Plugin"]: | 677 elif self.project.getProjectType() in ["E6Plugin"]: |
| 678 if PYQT_VERSION < 0x050000: | 678 self.__uicompiler = Utilities.generatePyQtToolPath( |
| 679 self.__uicompiler = Utilities.generatePyQtToolPath( | 679 'pyuic5', ["py3uic5"]) |
| 680 'pyuic4', ["py3uic4"]) | |
| 681 else: | |
| 682 self.__uicompiler = Utilities.generatePyQtToolPath( | |
| 683 'pyuic5', ["py3uic5"]) | |
| 684 elif self.project.getProjectType() == "PySide": | 680 elif self.project.getProjectType() == "PySide": |
| 685 self.__uicompiler = \ | 681 self.__uicompiler = \ |
| 686 Utilities.generatePySideToolPath('pyside-uic', "1") | 682 Utilities.generatePySideToolPath('pyside-uic', "1") |
| 687 elif self.project.getProjectType() == "PySide2": | 683 elif self.project.getProjectType() == "PySide2": |
| 688 self.__uicompiler = \ | 684 self.__uicompiler = \ |
| 835 if Preferences.getQt("PyuicFromImports"): | 831 if Preferences.getQt("PyuicFromImports"): |
| 836 args.append("--from-imports") | 832 args.append("--from-imports") |
| 837 else: | 833 else: |
| 838 # PyQt4 and PyQt5 | 834 # PyQt4 and PyQt5 |
| 839 if 'uic5' in uicompiler and \ | 835 if 'uic5' in uicompiler and \ |
| 840 PYQT_VERSION >= 0x050600 and \ | |
| 841 self.project.pdata["UICPARAMS"]["Package"]: | 836 self.project.pdata["UICPARAMS"]["Package"]: |
| 842 # only supported for PyQt5 >= 5.6 (April 2016) | |
| 843 args.append("--import-from={0}".format( | 837 args.append("--import-from={0}".format( |
| 844 self.project.pdata["UICPARAMS"]["Package"])) | 838 self.project.pdata["UICPARAMS"]["Package"])) |
| 845 elif Preferences.getQt("PyuicFromImports"): | 839 elif Preferences.getQt("PyuicFromImports"): |
| 846 args.append("--from-imports") | 840 args.append("--from-imports") |
| 847 if self.project.pdata["UICPARAMS"]["RcSuffix"]: | 841 if self.project.pdata["UICPARAMS"]["RcSuffix"]: |
