Mercurial Repositories > eric / file diff

--- a/Project/ProjectTranslationsBrowser.py	Tue May 15 18:25:26 2018 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Tue May 15 19:39:46 2018 +0200
@@ -107,7 +107,7 @@
         self.menu = QMenu(self)
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             act = self.menu.addAction(
                 self.tr('Generate translation'), self.__generateSelected)
             self.tsMenuActions.append(act)
@@ -234,7 +234,7 @@
         self.backMenu = QMenu(self)
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             act = self.backMenu.addAction(
                 self.tr('Generate all translations'),
                 self.__generateAll)
@@ -295,7 +295,7 @@
         self.multiMenu = QMenu(self)
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             act = self.multiMenu.addAction(
                 self.tr('Generate translations'),
                 self.__generateSelected)
@@ -379,7 +379,7 @@
         self.dirMenu = QMenu(self)
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             act = self.dirMenu.addAction(
                 self.tr('Generate all translations'),
                 self.__generateAll)
@@ -497,7 +497,7 @@
         """
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             tsFiles = 0
             qmFiles = 0
             itmList = self.getSelectedItems()
@@ -539,7 +539,7 @@
         """
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             tsFiles = 0
             qmFiles = 0
             itmList = self.getSelectedItems()
@@ -579,7 +579,7 @@
         """
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocDirMenuActions:
                     act.setEnabled(False)
@@ -599,7 +599,7 @@
         """
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             if self.pylupdateProcRunning:
                 for act in self.tsprocBackMenuActions:
                     act.setEnabled(False)
@@ -869,7 +869,7 @@
     def __readStderrLupdate(self, proc):
         """
         Private slot to handle the readyReadStandardError signal of the
-        pylupdate4/pylupdate5/pyside-lupdate process.
+        pylupdate4/pylupdate5/pyside-lupdate/pyside2-lupdate process.
         
         @param proc reference to the process
         @type QProcess
@@ -1027,7 +1027,9 @@
             else:
                 self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
         elif self.project.getProjectType() in ["PySide", "PySideC"]:
-            self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate')
+            self.pylupdate = Utilities.generatePySideToolPath(
+                'pyside-lupdate', "1")
+        # TODO: add entry for PySide2
         else:
             return
 
@@ -1201,7 +1203,7 @@
         
         if self.project.getProjectType() in \
                 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E6Plugin",
-                 "PySide", "PySideC"]:
+                 "PySide", "PySideC", "PySide2", "PySideC2"]:
             lrelease = os.path.join(
                 Utilities.getQtBinariesPath(),
                 Utilities.generateQtToolName("lrelease"))