180 projectType = self.project.getProjectType() |
180 projectType = self.project.getProjectType() |
181 |
181 |
182 venvName = self.project.getProjectVenv(resolveDebugger=False) |
182 venvName = self.project.getProjectVenv(resolveDebugger=False) |
183 if not venvName: |
183 if not venvName: |
184 # no project specific environment, try a type specific one |
184 # no project specific environment, try a type specific one |
185 if projectType in ("PyQt5", "PySide2"): |
185 if projectType in ("PyQt5"): |
186 venvName = Preferences.getQt("PyQtVenvName") |
186 venvName = Preferences.getQt("PyQtVenvName") |
187 elif projectType in ("PyQt6", "E7Plugin", "PySide6"): |
187 elif projectType in ("PyQt6", "E7Plugin", "PySide6"): |
188 venvName = Preferences.getQt("PyQt6VenvName") |
188 venvName = Preferences.getQt("PyQt6VenvName") |
189 interpreter = venvManager.getVirtualenvInterpreter(venvName) |
189 interpreter = venvManager.getVirtualenvInterpreter(venvName) |
190 execPath = venvManager.getVirtualenvExecPath(venvName) |
190 execPath = venvManager.getVirtualenvExecPath(venvName) |
197 if env.contains("PATH"): |
197 if env.contains("PATH"): |
198 env.insert("PATH", os.pathsep.join([execPath, env.value("PATH")])) |
198 env.insert("PATH", os.pathsep.join([execPath, env.value("PATH")])) |
199 else: |
199 else: |
200 env.insert("PATH", execPath) |
200 env.insert("PATH", execPath) |
201 |
201 |
202 if projectType in ("PyQt5", "PySide2"): |
202 if projectType in ("PyQt5",): |
203 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi5.py") |
203 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi5.py") |
204 elif projectType in ("PyQt6", "E7Plugin", "PySide6"): |
204 elif projectType in ("PyQt6", "E7Plugin", "PySide6"): |
205 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi6.py") |
205 loadUi = os.path.join(os.path.dirname(__file__), "UicLoadUi6.py") |
206 args = [ |
206 args = [ |
207 loadUi, |
207 loadUi, |
431 slotsCode = [] |
431 slotsCode = [] |
432 |
432 |
433 if self.__module is None: |
433 if self.__module is None: |
434 # new file |
434 # new file |
435 try: |
435 try: |
436 if self.project.getProjectType() == "PySide2": |
436 if self.project.getProjectType() == "PySide6": |
437 tmplName = os.path.join( |
|
438 getConfig("ericCodeTemplatesDir"), "impl_pyside2.py.tmpl" |
|
439 ) |
|
440 elif self.project.getProjectType() == "PySide6": |
|
441 tmplName = os.path.join( |
437 tmplName = os.path.join( |
442 getConfig("ericCodeTemplatesDir"), "impl_pyside6.py.tmpl" |
438 getConfig("ericCodeTemplatesDir"), "impl_pyside6.py.tmpl" |
443 ) |
439 ) |
444 elif self.project.getProjectType() == "PyQt5": |
440 elif self.project.getProjectType() == "PyQt5": |
445 tmplName = os.path.join( |
441 tmplName = os.path.join( |
529 break |
525 break |
530 |
526 |
531 # do the coding stuff |
527 # do the coding stuff |
532 pyqtSignatureFormat = ( |
528 pyqtSignatureFormat = ( |
533 "@Slot({0})" |
529 "@Slot({0})" |
534 if self.project.getProjectType() in ("PySide2", "PySide6") |
530 if self.project.getProjectType() in ("PySide6",) |
535 else "@pyqtSlot({0})" |
531 else "@pyqtSlot({0})" |
536 ) |
532 ) |
537 for row in range(self.slotsModel.rowCount()): |
533 for row in range(self.slotsModel.rowCount()): |
538 topItem = self.slotsModel.item(row) |
534 topItem = self.slotsModel.item(row) |
539 for childRow in range(topItem.rowCount()): |
535 for childRow in range(topItem.rowCount()): |