From 39b7b166eb606b80c9ac427811651b20db79bde2 Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Mon, 9 May 2016 17:39:39 +0200 Subject: [PATCH] sauve du 9 mai --- InterfaceQT4/groupe.py | 3 ++- InterfaceQT4/monWidgetPlusieursBase.py | 2 +- generator/generator_TELEMAC.py | 7 +++++-- generator/generator_python.py | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/InterfaceQT4/groupe.py b/InterfaceQT4/groupe.py index 86b304ec..f0ccc906 100644 --- a/InterfaceQT4/groupe.py +++ b/InterfaceQT4/groupe.py @@ -22,6 +22,7 @@ from determine import monEnvQT5 if monEnvQT5: from PyQt5.QtWidgets import QWidget + from PyQt5.QtCore import Qt else : from PyQt4.QtGui import * from PyQt4.QtCore import * @@ -174,7 +175,7 @@ class Groupe(QWidget,FacultatifOuOptionnel): nouveau=widget.node.append_child(nom) if firstNode==None : firstNode=nouveau if nouveau == None or nouveau == 0 : - self.editor.affiche_infos(str('insertion impossible a cet endroit pour '+nom),Qt.red) + self.editor.affiche_infos(tr('insertion impossible a cet endroit pour '+nom),Qt.red) self.reaffiche(firstNode) if firstNode!=None and firstNode.item!=None : firstNode.select() diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py index 33820ef6..43e416aa 100644 --- a/InterfaceQT4/monWidgetPlusieursBase.py +++ b/InterfaceQT4/monWidgetPlusieursBase.py @@ -22,7 +22,7 @@ import string,types,os,sys from determine import monEnvQT5 if monEnvQT5: - from PyQt5.QtGui import Qicon + from PyQt5.QtGui import QIcon from PyQt5.QtWidgets import QApplication from PyQt5.QtCore import QTimer, QSize, Qt else : diff --git a/generator/generator_TELEMAC.py b/generator/generator_TELEMAC.py index 614a82c7..78b5ccd3 100644 --- a/generator/generator_TELEMAC.py +++ b/generator/generator_TELEMAC.py @@ -26,8 +26,11 @@ from Extensions.i18n import tr from generator_python import PythonGenerator extensions=('.comm',) -from aideAuxConvertisseurs import listeSupprime, DicoAglomere, DicoEficasToCas -from enumDicoTelemac import DicoEnumCasEnInverse +try : + from aideAuxConvertisseurs import listeSupprime, DicoAglomere, DicoEficasToCas + from enumDicoTelemac import DicoEnumCasEnInverse +except : + pass def entryPoint(): diff --git a/generator/generator_python.py b/generator/generator_python.py index 5f18ef86..4c8e61f2 100644 --- a/generator/generator_python.py +++ b/generator/generator_python.py @@ -96,7 +96,7 @@ class PythonGenerator: """ self.appli=obj.get_jdc_root().appli #self.appli=obj.appli - print format + #print format liste= self.generator(obj) if format == 'brut': self.text=liste -- 2.39.2