diff -r 9a71bd9e2e37 -r 6422afc7adc4 Project/ProjectTranslationsBrowser.py
--- a/Project/ProjectTranslationsBrowser.py Sun Apr 09 16:52:55 2017 +0200
+++ b/Project/ProjectTranslationsBrowser.py Sat May 06 13:43:21 2017 +0200
@@ -39,17 +39,10 @@
"""
A class used to display the translations part of the project.
- @signal linguistFile(str) emitted to open a translation file with
- Qt-Linguist
@signal appendStdout(str) emitted after something was received from
a QProcess on stdout
@signal appendStderr(str) emitted after something was received from
a QProcess on stderr
- @signal sourceFile(str) emitted to open a translation file in an editor
- @signal closeSourceWindow(str) emitted after a file has been
- removed/deleted from the project
- @signal trpreview(list of str, bool = False) emitted to preview
- translations in the translations previewer
@signal showMenu(str, QMenu) emitted when a menu is about to be shown.
The name of the menu and a reference to the menu are given.
"""
@@ -888,7 +881,7 @@
def __readStderrLupdate(self):
"""
Private slot to handle the readyReadStandardError signal of the
- pylupdate process.
+ pylupdate4/pylupdate5/pyside-lupdate process.
"""
proc = self.sender()
if proc is not None:
@@ -986,8 +979,8 @@
def __generateTSFile(self, noobsolete=False, generateAll=True):
"""
- Private method used to run pylupdate/pylupdate4 to generate the .ts
- files.
+ Private method used to run pylupdate4/pylupdate5/pyside-lupdate to
+ generate the .ts files.
@param noobsolete flag indicating whether obsolete entries should be
kept (boolean)
@@ -1036,23 +1029,14 @@
return
if self.project.getProjectType() in ["Qt4", "Qt4C"]:
- self.pylupdate = 'pylupdate4'
- if Utilities.isWindowsPlatform():
- self.pylupdate = \
- Utilities.getWindowsExecutablePath(self.pylupdate)
+ self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4')
elif self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
- self.pylupdate = 'pylupdate5'
- if Utilities.isWindowsPlatform():
- self.pylupdate = \
- Utilities.getWindowsExecutablePath(self.pylupdate)
+ self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
elif self.project.getProjectType() in ["E6Plugin"]:
if PYQT_VERSION < 0x050000:
- self.pylupdate = 'pylupdate4'
+ self.pylupdate = Utilities.generatePyQtToolPath('pylupdate4')
else:
- self.pylupdate = 'pylupdate5'
- if Utilities.isWindowsPlatform():
- self.pylupdate = \
- Utilities.getWindowsExecutablePath(self.pylupdate)
+ self.pylupdate = Utilities.generatePyQtToolPath('pylupdate5')
elif self.project.getProjectType() in ["PySide", "PySideC"]:
self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate')
else:
