Mercurial Repositories > eric / file diff

--- a/Preferences/ProgramsDialog.py	Sun Apr 09 16:46:35 2017 +0200
+++ b/Preferences/ProgramsDialog.py	Sun Apr 09 19:41:35 2017 +0200
@@ -134,41 +134,38 @@
             self.tr("Qt Assistant"), exe, version=version)
         
         # 2. do the PyQt programs
-        # 2a. Translation Extractor PyQt4
+        # 2.1 do the PyQt4 programs
+        # 2.1a. Translation Extractor PyQt4
         self.__createProgramEntry(
             self.tr("Translation Extractor (Python, PyQt4)"),
-            Utilities.isWindowsPlatform() and
-            Utilities.getWindowsExecutablePath("pylupdate4") or "pylupdate4",
+            Utilities.generatePyQtToolPath("pylupdate4"),
             '-version', 'pylupdate', -1)
-        # 2b. Forms Compiler PyQt4
+        # 2.1b. Forms Compiler PyQt4
         self.__createProgramEntry(
             self.tr("Forms Compiler (Python, PyQt4)"),
-            Utilities.isWindowsPlatform() and
-            Utilities.getWindowsExecutablePath("pyuic4") or "pyuic4",
+            Utilities.generatePyQtToolPath("pyuic4"),
             '--version', 'Python User', 4)
-        # 2c. Resource Compiler PyQt4
+        # 2.1c. Resource Compiler PyQt4
         self.__createProgramEntry(
             self.tr("Resource Compiler (Python, PyQt4)"),
-            Utilities.isWindowsPlatform() and
-            Utilities.getWindowsExecutablePath("pyrcc4") or "pyrcc4",
+            Utilities.generatePyQtToolPath("pyrcc4"),
             '-version', 'Resource Compiler', -1)
-        # 2d. Translation Extractor PyQt5
+        
+        # 2.2 do the PyQt5 programs
+        # 2.2a. Translation Extractor PyQt5
         self.__createProgramEntry(
             self.tr("Translation Extractor (Python, PyQt5)"),
-            Utilities.isWindowsPlatform() and
-            Utilities.getWindowsExecutablePath("pylupdate5") or "pylupdate5",
+            Utilities.generatePyQtToolPath("pylupdate5"),
             '-version', 'pylupdate', -1)
-        # 2e. Forms Compiler PyQt5
+        # 2.2b. Forms Compiler PyQt5
         self.__createProgramEntry(
             self.tr("Forms Compiler (Python, PyQt5)"),
-            Utilities.isWindowsPlatform() and
-            Utilities.getWindowsExecutablePath("pyuic5") or "pyuic5",
+            Utilities.generatePyQtToolPath("pyuic5"),
             '--version', 'Python User', 4)
-        # 2f. Resource Compiler PyQt5
+        # 2.2c. Resource Compiler PyQt5
         self.__createProgramEntry(
             self.tr("Resource Compiler (Python, PyQt5)"),
-            Utilities.isWindowsPlatform() and
-            Utilities.getWindowsExecutablePath("pyrcc5") or "pyrcc5",
+            Utilities.generatePyQtToolPath("pyrcc5"),
             '-version', '', -1, versionRe='Resource Compiler|pyrcc5')
         
         # 3. do the PySide programs