Mercurial Repositories > eric / file diff

--- a/Preferences/ProgramsDialog.py	Tue May 15 18:25:26 2018 +0200
+++ b/Preferences/ProgramsDialog.py	Tue May 15 19:39:46 2018 +0200
@@ -169,21 +169,38 @@
             Utilities.generatePyQtToolPath("pyrcc5"),
             '-version', '', -1, versionRe='Resource Compiler|pyrcc5')
         
-        # 3. do the PySide programs
-        # 3a. Translation Extractor PySide
+        # 3.1 do the PySide programs
+        # 3.1a. Translation Extractor PySide
         self.__createProgramEntry(
             self.tr("Translation Extractor (Python, PySide)"),
-            Utilities.generatePySideToolPath("pyside-lupdate"),
+            Utilities.generatePySideToolPath("pyside-lupdate", "1"),
             '-version', '', -1, versionRe='lupdate')
-        # 3b. Forms Compiler PySide
+        # 3.1b. Forms Compiler PySide
         self.__createProgramEntry(
             self.tr("Forms Compiler (Python, PySide)"),
-            Utilities.generatePySideToolPath("pyside-uic"),
+            Utilities.generatePySideToolPath("pyside-uic", "1"),
             '--version', 'PySide User', 5, versionCleanup=(0, -1))
-        # 3.c Resource Compiler PySide
+        # 3.1c Resource Compiler PySide
         self.__createProgramEntry(
             self.tr("Resource Compiler (Python, PySide)"),
-            Utilities.generatePySideToolPath("pyside-rcc"),
+            Utilities.generatePySideToolPath("pyside-rcc", "1"),
+            '-version', 'Resource Compiler', -1)
+        
+        # 3.2 do the PySide2 programs
+        # 3.2a. Translation Extractor PySide2
+        self.__createProgramEntry(
+            self.tr("Translation Extractor (Python, PySide2)"),
+            Utilities.generatePySideToolPath("pyside2-lupdate", "2"),
+            '-version', '', -1, versionRe='lupdate')
+        # 3.2b. Forms Compiler PySide2
+        self.__createProgramEntry(
+            self.tr("Forms Compiler (Python, PySide2)"),
+            Utilities.generatePySideToolPath("pyside2-uic", "2"),
+            '--version', 'PySide2 User', -1, versionCleanup=(0, -1))
+        # 3.2c Resource Compiler PySide2
+        self.__createProgramEntry(
+            self.tr("Resource Compiler (Python, PySide2)"),
+            Utilities.generatePySideToolPath("pyside2-rcc", "2"),
             '-version', 'Resource Compiler', -1)
         
         # 4. do the Ruby programs