Mercurial Repositories > eric / file diff

--- a/eric6/Project/ProjectTranslationsBrowser.py	Sat Jun 20 17:36:20 2020 +0200
+++ b/eric6/Project/ProjectTranslationsBrowser.py	Sun Jun 21 18:26:12 2020 +0200
@@ -102,8 +102,7 @@
         
         self.menu = QMenu(self)
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             act = self.menu.addAction(
                 self.tr('Generate translation'), self.__generateSelected)
@@ -230,8 +229,7 @@
         
         self.backMenu = QMenu(self)
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             act = self.backMenu.addAction(
                 self.tr('Generate all translations'),
@@ -292,8 +290,7 @@
         # create the menu for multiple selected files
         self.multiMenu = QMenu(self)
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             act = self.multiMenu.addAction(
                 self.tr('Generate translations'),
@@ -377,8 +374,7 @@
 
         self.dirMenu = QMenu(self)
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             act = self.dirMenu.addAction(
                 self.tr('Generate all translations'),
@@ -496,8 +492,7 @@
         Private slot called by the menu aboutToShow signal.
         """
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             tsFiles = 0
             qmFiles = 0
@@ -541,8 +536,7 @@
         Private slot called by the multiMenu aboutToShow signal.
         """
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             tsFiles = 0
             qmFiles = 0
@@ -584,8 +578,7 @@
         Private slot called by the dirMenu aboutToShow signal.
         """
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocDirMenuActions:
@@ -605,8 +598,7 @@
         Private slot called by the backMenu aboutToShow signal.
         """
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocBackMenuActions:
@@ -880,7 +872,7 @@
     def __readStderrLupdate(self, proc):
         """
         Private slot to handle the readyReadStandardError signal of the
-        pylupdate4/pylupdate5/pyside-lupdate/pyside2-lupdate process.
+        pylupdate5/pyside2-lupdate process.
         
         @param proc reference to the process
         @type QProcess
@@ -979,7 +971,7 @@
         
     def __generateTSFile(self, noobsolete=False, generateAll=True):
         """
-        Private method used to run pylupdate4/pylupdate5/pyside-lupdate to
+        Private method used to run pylupdate5/pyside2-lupdate to
         generate the .ts files.
         
         @param noobsolete flag indicating whether obsolete entries should be
@@ -1021,7 +1013,7 @@
         # generate a minimal temporary projectfile suitable for pylupdate
         self.__tmpProjects = []
         if self.project.getProjectLanguage() in [
-            "Python", "Python2", "Python3"
+            "Python", "Python3"
         ]:
             ok = self.__writeTempProjectFile(langs, [".py"])
         else:
@@ -1029,18 +1021,13 @@
         if not ok:
             return
         
-        if self.project.getProjectType() in ["Qt4", "Qt4C"]:
-            self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4')
-        elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
+        if self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
             self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
         elif self.project.getProjectType() in ["E6Plugin"]:
             self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
-        elif self.project.getProjectType() in ["PySide", "PySideC"]:
-            self.pylupdate = Utilities.generatePySideToolPath(
-                'pyside-lupdate', "1")
         elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
             self.pylupdate = Utilities.generatePySideToolPath(
-                'pyside2-lupdate', "2")
+                'pyside2-lupdate')
         else:
             return
 
@@ -1197,8 +1184,7 @@
                 return
         
         if self.project.getProjectType() in [
-            "Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-            "PySide", "PySideC", "PySide2", "PySideC2"
+            "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C"
         ]:
             lrelease = os.path.join(
                 Utilities.getQtBinariesPath(),