Mercurial Repositories > eric / changeset

--- a/Project/ProjectFormsBrowser.py	Tue May 15 19:39:46 2018 +0200
+++ b/Project/ProjectFormsBrowser.py	Wed May 16 19:35:41 2018 +0200
@@ -760,7 +760,9 @@
             elif self.project.getProjectType() == "PySide":
                 self.uicompiler = \
                     Utilities.generatePySideToolPath('pyside-uic', "1")
-            # TODO: add entry for PySide2
+            elif self.project.getProjectType() == "PySide2":
+                self.uicompiler = \
+                    Utilities.generatePySideToolPath('pyside2-uic', "2")
             else:
                 return None
         elif self.project.getProjectLanguage() == "Ruby":

--- a/Project/ProjectResourcesBrowser.py	Tue May 15 19:39:46 2018 +0200
+++ b/Project/ProjectResourcesBrowser.py	Wed May 16 19:35:41 2018 +0200
@@ -657,7 +657,14 @@
                     args.append("-py2")
                 else:
                     args.append("-py3")
-            # TODO: add entry for PySide2
+            elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
+                self.rccCompiler = Utilities.generatePySideToolPath(
+                    'pyside2-rcc', "2")
+                if self.project.getProjectLanguage() in \
+                        ["Python", "Python2"]:
+                    args.append("-py2")
+                else:
+                    args.append("-py3")
             else:
                 return None
         elif self.project.getProjectLanguage() == "Ruby":

--- a/Project/ProjectTranslationsBrowser.py	Tue May 15 19:39:46 2018 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Wed May 16 19:35:41 2018 +0200
@@ -1029,7 +1029,9 @@
         elif self.project.getProjectType() in ["PySide", "PySideC"]:
             self.pylupdate = Utilities.generatePySideToolPath(
                 'pyside-lupdate', "1")
-        # TODO: add entry for PySide2
+        elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
+            self.pylupdate = Utilities.generatePySideToolPath(
+                'pyside2-lupdate', "2")
         else:
             return
 

--- a/Project/PropertiesDialog.py	Tue May 15 19:39:46 2018 +0200
+++ b/Project/PropertiesDialog.py	Wed May 16 19:35:41 2018 +0200
@@ -63,11 +63,13 @@
         
         self.languageComboBox.addItems(project.getProgrammingLanguages())
         
-        projectTypes = project.getProjectTypes()
+        projectTypes = []
+        for projectTypeItem in project.getProjectTypes().items():
+            projectTypes.append((projectTypeItem[1], projectTypeItem[0]))
         self.projectTypeComboBox.clear()
-        for projectType in sorted(projectTypes.keys()):
+        for projectType in sorted(projectTypes):
             self.projectTypeComboBox.addItem(
-                projectTypes[projectType], projectType)
+                projectType[0], projectType[1])
         
         ipath = Preferences.getMultiProject("Workspace") or \
             Utilities.getHomeDir()
@@ -143,11 +145,13 @@
         """
         curProjectType = self.getProjectType()
         
+        projectTypes = []
+        for projectTypeItem in self.project.getProjectTypes().items():
+            projectTypes.append((projectTypeItem[1], projectTypeItem[0]))
         self.projectTypeComboBox.clear()
-        projectTypes = self.project.getProjectTypes(language)
-        for projectType in sorted(projectTypes.keys()):
+        for projectType in sorted(projectTypes):
             self.projectTypeComboBox.addItem(
-                projectTypes[projectType], projectType)
+                projectType[0], projectType[1])
         
         index = self.projectTypeComboBox.findData(curProjectType)
         if index == -1:

--- a/Utilities/__init__.py	Tue May 15 19:39:46 2018 +0200
+++ b/Utilities/__init__.py	Wed May 16 19:35:41 2018 +0200
@@ -1778,7 +1778,6 @@
         else:
             prefix = os.path.dirname(
                 Preferences.getDebugger("PythonInterpreter"))
-        # TODO: check this on Windows
         if toolname in ["pyside-uic", "pyside2-uic"]:
             return os.path.join(prefix, "Scripts", toolname + '.exe')
         else: