eric: comparison Project/ProjectTranslationsBrowser.py

-:34ef4eccdf6c
+:6593aab36403
 self.lreleaseProc = None
 self.lreleaseProcRunning = False
 self.pylupdateProc = None
 self.pylupdateProcRunning = False
+self.tmpProject = []
 def _createPopupMenus(self):
 """
 Protected overloaded method to generate the popup menu.
 """
 if s.startswith(transExcept):
 addIt = False
 break
 if addIt:
 sources.append(s)
-sections = [("SOURCES", sources)]
 _forms = [f for f in self.project.pdata["FORMS"] if f.endswith('.ui')]
 forms = []
 for f in _forms:
 addIt = True
 if f.startswith(transExcept):
 addIt = False
 break
 if addIt:
 forms.append(f)
-sections.append(("FORMS", forms))
 if langs:
-l = [self.project.getRelativePath(lang.fileName()) \
+langs = [self.project.getRelativePath(lang.fileName()) \
 for lang in langs if lang.fileName().endswith('.ts')]
 else:
 try:
 pattern = self.project.pdata["TRANSLATIONPATTERN"][0]\
 .replace("%language%", "*")
-l = [lang for lang in self.project.pdata["TRANSLATIONS"] \
+langs = [lang for lang in self.project.pdata["TRANSLATIONS"] \
 if fnmatch.fnmatch(lang, pattern)]
 except IndexError:
-l = []
+langs = []
-if l:
+if not langs:
-sections.append(("TRANSLATIONS", l))
-else:
 E5MessageBox.warning(self,
 self.trUtf8("Write temporary project file"),
 self.trUtf8("""No translation files (*.ts) selected."""))
 return False
-try:
+# create a prefix relative from the *.ts down to the project path
-pf = open(pfile, "w", encoding="utf-8")
+langLevel = {}
-for key, list in sections:
+for lang in langs:
-if len(list) > 0:
+level = lang.count(os.sep)
-pf.write('{0} = '.format(key))
+lst = langLevel.get(level, [])
-last = len(list) - 1
+lst.append(lang)
-if last > 0:
+langLevel[level] = lst
-pf.write('{0} \\{1}'.format(
-list[0].replace(os.sep, '/'), "\n"))
+for level, langs in langLevel.items():
-for i in range(1, last):
+prefix = '../' * level
-pf.write('\t{0} \\{1}'.format(
+sections = [("SOURCES",
-list[i].replace(os.sep, '/'), "\n"))
+[prefix + src for src in sources])]
-pf.write('\t{0} {1}{2}'.format(
+sections.append(("FORMS",
-list[last].replace(os.sep, '/'), "\n", "\n"))
+[prefix + form for form in forms]))
-else:
+sections.append(("TRANSLATIONS",
-pf.write('{0} {1}{2}'.format(
+[prefix + lang for lang in langs]))
-list[0].replace(os.sep, '/'), "\n", "\n"))
+dir, name = os.path.split(pfile)
-pf.close()
+outFile = os.path.join(dir, os.path.dirname(langs[0]), name)
-self.tmpProject = pfile
+try:
-return True
+pf = open(outFile, "w", encoding="utf-8")
-except IOError:
+for key, list in sections:
-E5MessageBox.critical(self,
+if len(list) > 0:
-self.trUtf8("Write temporary project file"),
+pf.write('{0} = '.format(key))
-self.trUtf8("<p>The temporary project file <b>{0}</b> could not"
+last = len(list) - 1
-" be written.</p>").format(pfile))
+if last > 0:
-self.tmpProject = None
+pf.write('{0} \\{1}'.format(
-return False
+list[0].replace(os.sep, '/'), "\n"))
+for i in range(1, last):
+pf.write('\t{0} \\{1}'.format(
+list[i].replace(os.sep, '/'), "\n"))
+pf.write('\t{0} {1}{2}'.format(
+list[last].replace(os.sep, '/'), "\n", "\n"))
+else:
+pf.write('{0} {1}{2}'.format(
+list[0].replace(os.sep, '/'), "\n", "\n"))
+pf.close()
+self.tmpProject.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
+return True
 def __readStdoutLupdate(self):
 """
 Private slot to handle the readyReadStandardOutput signal of the
 pylupdate process.
 else:
 E5MessageBox.critical(self,
 self.trUtf8("Translation file generation"),
 self.trUtf8("The generation of the translation files (*.ts) has failed."))
 self.pylupdateProc = None
-self.pylupdate = ""
-try:
-os.remove(self.tmpProject)
-except EnvironmentError:
-pass
-self.tmpProject = None
 def __generateTSFile(self, noobsolete=False, generateAll=True):
 """
 Private method used to run pylupdate/pylupdate4 to generate the .ts files.
 else:
 ok = False
 if not ok:
 return
-self.pylupdateProc = QProcess()
-args = []
 if self.project.getProjectType() in ["Qt4", "Qt4C", "E4Plugin"]:
 self.pylupdate = 'pylupdate4'
 if Utilities.isWindowsPlatform():
 self.pylupdate = self.pylupdate + '.exe'
 elif self.project.getProjectType() in ["PySide", "PySideC"]:
 self.pylupdate = Utilities.generatePySideToolPath('pyside-lupdate')
 else:
 return
-if noobsolete:
+for tempProjectFile in self.tmpProject:
-args.append('-noobsolete')
+self.pylupdateProc = QProcess()
+args = []
-args.append('-verbose')
-args.append(self.tmpProject)
+if noobsolete:
-self.pylupdateProc.setWorkingDirectory(self.project.ppath)
+args.append('-noobsolete')
-self.pylupdateProc.finished.connect(self.__generateTSFileDone)
-self.pylupdateProc.readyReadStandardOutput.connect(self.__readStdoutLupdate)
+args.append('-verbose')
-self.pylupdateProc.readyReadStandardError.connect(self.__readStderrLupdate)
+path, filename = os.path.split(tempProjectFile)
+args.append(filename)
-self.pylupdateProc.start(self.pylupdate, args)
+self.pylupdateProc.setWorkingDirectory(os.path.join(self.project.ppath, path))
-procStarted = self.pylupdateProc.waitForStarted()
+self.pylupdateProc.finished.connect(self.__generateTSFileDone)
-if procStarted:
+self.pylupdateProc.readyReadStandardOutput.connect(self.__readStdoutLupdate)
-self.pylupdateProcRunning = True
+self.pylupdateProc.readyReadStandardError.connect(self.__readStderrLupdate)
-else:
-E5MessageBox.critical(self,
+self.pylupdateProc.start(self.pylupdate, args)
-self.trUtf8('Process Generation Error'),
+procStarted = self.pylupdateProc.waitForStarted()
-self.trUtf8(
+if procStarted:
-'Could not start {0}.<br>'
+self.pylupdateProcRunning = True
-'Ensure that it is in the search path.'
+self.pylupdateProc.waitForFinished(10000)
-).format(self.pylupdate))
+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:
+os.remove(fn)
+except EnvironmentError:
+pass
+self.tmpProject = []
 def __generateAll(self):
 """
 Private method to generate all translation files (.ts) for Qt Linguist.

Mercurial Repositories > eric / file comparison

comparison: Project/ProjectTranslationsBrowser.py

Project/ProjectTranslationsBrowser.py