Mercurial Repositories > eric / file diff

diff -r bf4624957d2d -r 94e0e688dcad Project/Project.py
--- a/Project/Project.py	Tue May 15 18:25:26 2018 +0200
+++ b/Project/Project.py	Tue May 15 19:39:46 2018 +0200
@@ -284,17 +284,28 @@
             "JavaScript": ["Other"],
         }
         
-        pyside2, pyside3 = Utilities.checkPyside()
-        if pyside2 or pyside3:
+        pyside_py2, pyside_py3 = Utilities.checkPyside("1")
+        if pyside_py2 or pyside_py3:
             self.__projectTypes["PySide"] = self.tr("PySide GUI")
             self.__projectTypes["PySideC"] = self.tr("PySide Console")
-            if pyside2:
+            if pyside_py2:
                 self.__projectProgLanguages["Python2"].extend(
                     ["PySide", "PySideC"])
-            if pyside3:
+            if pyside_py3:
                 self.__projectProgLanguages["Python3"].extend(
                     ["PySide", "PySideC"])
         
+        pyside2_py2, pyside2_py3 = Utilities.checkPyside("2")
+        if pyside2_py2 or pyside2_py3:
+            self.__projectTypes["PySide2"] = self.tr("PySide2 GUI")
+            self.__projectTypes["PySide2C"] = self.tr("PySide2 Console")
+            if pyside2_py2:
+                self.__projectProgLanguages["Python2"].extend(
+                    ["PySide2", "PySide2C"])
+            if pyside2_py3:
+                self.__projectProgLanguages["Python3"].extend(
+                    ["PySide2", "PySide2C"])
+        
     def getProjectTypes(self, progLanguage=""):
         """
         Public method to get the list of supported project types.
@@ -575,21 +586,24 @@
         
         # Forms
         if self.pdata["PROJECTTYPE"] in ["Qt4", "PyQt5",
-                                         "E6Plugin", "PySide"]:
+                                         "E6Plugin", "PySide",
+                                         "PySide2"]:
             self.pdata["FILETYPES"]["*.ui"] = "FORMS"
         
         # Resources
         if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C",
                                          "E6Plugin",
                                          "PyQt5", "PyQt5C",
-                                         "PySide", "PySideC"]:
+                                         "PySide", "PySideC",
+                                         "PySide2", "PySide2C"]:
             self.pdata["FILETYPES"]["*.qrc"] = "RESOURCES"
         
         # Translations
         if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C",
                                          "E6Plugin",
                                          "PyQt5", "PyQt5C",
-                                         "PySide", "PySideC"]:
+                                         "PySide", "PySideC",
+                                         "PySide2", "PySide2C"]:
             self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
             self.pdata["FILETYPES"]["*.qm"] = "TRANSLATIONS"
         
@@ -613,7 +627,8 @@
         if self.pdata["PROJECTTYPE"] in ["Qt4", "Qt4C",
                                          "E6Plugin",
                                          "PyQt5", "PyQt5C",
-                                         "PySide", "PySideC"]:
+                                         "PySide", "PySideC",
+                                         "PySide2", "PySide2C"]:
             if "*.ts" not in self.pdata["FILETYPES"]:
                 self.pdata["FILETYPES"]["*.ts"] = "TRANSLATIONS"
             if "*.qm" not in self.pdata["FILETYPES"]:
@@ -1337,7 +1352,7 @@
             lang = dlg.getSelectedLanguage()
             if self.pdata["PROJECTTYPE"] in \
                     ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                     "PySide", "PySideC"]:
+                     "PySide", "PySideC", "PySide2", "PySide2C"]:
                 langFile = self.pdata["TRANSLATIONPATTERN"]\
                     .replace("%language%", lang)
                 self.appendFile(langFile)