eric: comparison Project/ProjectTranslationsBrowser.py

-:b852fe4d153a
+:1843ef6e2656
 """<b>Project Translations Browser</b>"""
 """<p>This allows to easily see all translations contained in the current"""
 """ project. Several actions can be executed via the context menu.</p>"""
 ))
-self.lreleaseProc = None
+self.__lreleaseProcesses = []
+self.__pylupdateProcesses = []
 self.lreleaseProcRunning = False
-self.pylupdateProc = None
 self.pylupdateProcRunning = False
-self.tmpProject = []
+self.__tmpProjects = []
 def _createPopupMenus(self):
 """
 Protected overloaded method to generate the popup menu.
 """
 else:
 pf.write('{0} {1}{2}'.format(
 list[0].replace(os.sep, '/'), "\n", "\n"))
 pf.close()
-self.tmpProject.append(outFile)
+self.__tmpProjects.append(outFile)
 except IOError:
 E5MessageBox.critical(self,
 self.trUtf8("Write temporary project file"),
 self.trUtf8("<p>The temporary project file <b>{0}</b> could not"
 " be written.</p>").format(outFile))
-self.tmpProject = []
-return False
+if len(self.__tmpProjects) == 0:
+return False
 return True
 def __readStdoutLupdate(self):
 """
 Private slot to handle the readyReadStandardOutput signal of the
 pylupdate process.
 """
-if self.pylupdateProc is not None:
+proc = self.sender()
-self.__readStdout(self.pylupdateProc, '{0}: '.format(self.pylupdate))
+if proc is not None:
+self.__readStdout(proc, '{0}: '.format(self.pylupdate))
 else:
 return
 def __readStdoutLrelease(self):
 """
 Private slot to handle the readyReadStandardOutput signal of the
 lrelease process.
 """
-if self.lreleaseProc is not None:
+proc = self.sender()
-self.__readStdout(self.lreleaseProc, 'lrelease: ')
+if proc is not None:
+self.__readStdout(proc, 'lrelease: ')
 else:
 return
 def __readStdout(self, proc, ps):
 """
 def __readStderrLupdate(self):
 """
 Private slot to handle the readyReadStandardError signal of the
 pylupdate process.
 """
-if self.pylupdateProc is not None:
+proc = self.sender()
-self.__readStderr(self.pylupdateProc, '{0}: '.format(self.pylupdate))
+if proc is not None:
+self.__readStderr(proc, '{0}: '.format(self.pylupdate))
 else:
 return
 def __readStderrLrelease(self):
 """
 Private slot to handle the readyReadStandardError signal of the
 lrelease process.
 """
-if self.lreleaseProc is not None:
+proc = self.sender()
-self.__readStderr(self.lreleaseProc, 'lrelease: ')
+if proc is not None:
+self.__readStderr(proc, 'lrelease: ')
 else:
 return
 def __readStderr(self, proc, ps):
 """
 Private slot to handle the finished signal of the pylupdate process.
 @param exitCode exit code of the process (integer)
 @param exitStatus exit status of the process (QProcess.ExitStatus)
 """
-self.pylupdateProcRunning = False
 if exitStatus == QProcess.NormalExit and exitCode == 0:
 ui = e5App().getObject("UserInterface")
 if ui.notificationsEnabled():
 ui.showNotification(UI.PixmapCache.getPixmap("linguist48.png"),
 self.trUtf8("Translation file generation"),
 " was successful."))
 else:
 E5MessageBox.critical(self,
 self.trUtf8("Translation file generation"),
 self.trUtf8("The generation of the translation files (*.ts) has failed."))
-self.pylupdateProc = None
+proc = self.sender()
+for index in range(len(self.__pylupdateProcesses)):
+if proc == self.__pylupdateProcesses[index][0]:
+try:
+self.__tmpProjects.remove(self.__pylupdateProcesses[index][1])
+os.remove(self.__pylupdateProcesses[index][1])
+except EnvironmentError:
+pass
+del self.__pylupdateProcesses[index]
+break
+if not self.__pylupdateProcesses:
+# all done
+self.pylupdateProcRunning = False
 def __generateTSFile(self, noobsolete=False, generateAll=True):
 """
 Private method used to run pylupdate/pylupdate4 to generate the .ts files.
 for lang in langs]
 self.hooks["generateSelectedWithObsolete"](l)
 return
 # generate a minimal temporary projectfile suitable for pylupdate
+self.__tmpProjects = []
 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]:
 ok = self.__writeTempProjectFile(langs, [".py"])
 else:
 ok = False
 if not ok:
 elif self.project.getProjectType() in ["PySide", "PySideC"]:
 self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate')
 else:
 return
-for tempProjectFile in self.tmpProject:
+self.__pylupdateProcesses = []
-self.pylupdateProc = QProcess()
+for tempProjectFile in self.__tmpProjects[:]:
+proc = QProcess()
 args = []
 if noobsolete:
 args.append('-noobsolete')
 args.append('-verbose')
 path, filename = os.path.split(tempProjectFile)
 args.append(filename)
-self.pylupdateProc.setWorkingDirectory(os.path.join(self.project.ppath, path))
+proc.setWorkingDirectory(os.path.join(self.project.ppath, path))
-self.pylupdateProc.finished.connect(self.__generateTSFileDone)
+proc.finished.connect(self.__generateTSFileDone)
-self.pylupdateProc.readyReadStandardOutput.connect(self.__readStdoutLupdate)
+proc.readyReadStandardOutput.connect(self.__readStdoutLupdate)
-self.pylupdateProc.readyReadStandardError.connect(self.__readStderrLupdate)
+proc.readyReadStandardError.connect(self.__readStderrLupdate)
-self.pylupdateProc.start(self.pylupdate, args)
+proc.start(self.pylupdate, args)
-procStarted = self.pylupdateProc.waitForStarted(5000)
+procStarted = proc.waitForStarted()
 if procStarted:
 self.pylupdateProcRunning = True
-self.pylupdateProc.waitForFinished(10000)
+self.__pylupdateProcesses.append((proc, tempProjectFile))
 else:
 E5MessageBox.critical(self,
 self.trUtf8('Process Generation Error'),
 self.trUtf8(
 'Could not start {0}.<br>'
 'Ensure that it is in the search path.'
 ).format(self.pylupdate))
 # cleanup
 try:
-for fn in self.tmpProject:
+self.__tmpProjects.remove(tempProjectFile)
-os.remove(fn)
+os.remove(tempProjectFile)
 except EnvironmentError:
 pass
-self.tmpProject = []
 def __generateAll(self):
 """
 Private method to generate all translation files (.ts) for Qt Linguist.
 shutil.move(qmFile, target)
 else:
 E5MessageBox.critical(self,
 self.trUtf8("Translation file release"),
 self.trUtf8("The release of the translation files (*.qm) has failed."))
-self.lreleaseProc = None
-try:
+proc = self.sender()
-os.remove(self.tmpProject)
+for index in range(len(self.__lreleaseProcesses)):
-except EnvironmentError:
+if proc == self.__lreleaseProcesses[index][0]:
-pass
+try:
-self.tmpProject = None
+self.__tmpProjects.remove(self.__lreleaseProcesses[index][1])
-self.project.checkLanguageFiles()
+os.remove(self.__lreleaseProcesses[index][1])
+except EnvironmentError:
+pass
+del self.__lreleaseProcesses[index]
+break
+if not self.__lreleaseProcesses:
+# all done
+self.lreleaseProcRunning = False
+self.project.checkLanguageFiles()
 def __releaseTSFile(self, generateAll=False):
 """
 Private method to run lrelease to release the translation files (.qm).
 for lang in langs]
 self.hooks["releaseSelected"](l)
 return
 # generate a minimal temporary projectfile suitable for lrelease
+self.__tmpProjects = []
 if self.project.pdata["PROGLANGUAGE"][0] in ["Python", "Python2", "Python3"]:
 ok = self.__writeTempProjectFile(langs, [".py"])
 else:
 ok = False
 if not ok:
 return
-self.lreleaseProc = QProcess()
-args = []
 if self.project.getProjectType() in \
 ["Qt4", "Qt4C", "PyQt5", "PyQt5C", "E4Plugin", "PySide", "PySideC"]:
 lrelease = os.path.join(
 Utilities.getQtBinariesPath(),
 else:
 return
 if Utilities.isWindowsPlatform():
 lrelease = lrelease + '.exe'
-args.append('-verbose')
+self.__lreleaseProcesses = []
-args.append(self.tmpProject)
+for tempProjectFile in self.__tmpProjects[:]:
-self.lreleaseProc.setWorkingDirectory(self.project.ppath)
+proc = QProcess()
-self.lreleaseProc.finished.connect(self.__releaseTSFileDone)
+args = []
-self.lreleaseProc.readyReadStandardOutput.connect(self.__readStdoutLrelease)
-self.lreleaseProc.readyReadStandardError.connect(self.__readStderrLrelease)
+args.append('-verbose')
+path, filename = os.path.split(tempProjectFile)
-self.lreleaseProc.start(lrelease, args)
+args.append(filename)
-procStarted = self.lreleaseProc.waitForStarted(5000)
+proc.setWorkingDirectory(os.path.join(self.project.ppath, path))
-if procStarted:
+proc.finished.connect(self.__releaseTSFileDone)
-self.lreleaseProcRunning = True
+proc.readyReadStandardOutput.connect(self.__readStdoutLrelease)
-else:
+proc.readyReadStandardError.connect(self.__readStderrLrelease)
-E5MessageBox.critical(self,
-self.trUtf8('Process Generation Error'),
+proc.start(lrelease, args)
-self.trUtf8(
+procStarted = proc.waitForStarted()
-'<p>Could not start lrelease.<br>'
+if procStarted:
-'Ensure that it is available as <b>{0}</b>.</p>'
+self.lreleaseProcRunning = True
-).format(lrelease))
+self.__lreleaseProcesses.append((proc, tempProjectFile))
+else:
+E5MessageBox.critical(self,
+self.trUtf8('Process Generation Error'),
+self.trUtf8(
+'<p>Could not start lrelease.<br>'
+'Ensure that it is available as <b>{0}</b>.</p>'
+).format(lrelease))
+# cleanup
+try:
+self.__tmpProjects.remove(tempProjectFile)
+os.remove(tempProjectFile)
+except EnvironmentError:
+pass
 def __releaseSelected(self):
 """
 Private method to release the translation files (.qm).
 """

Mercurial Repositories > eric / file comparison

comparison: Project/ProjectTranslationsBrowser.py

Project/ProjectTranslationsBrowser.py