sauve du 9 mai

diff --git a/InterfaceQT4/groupe.py b/InterfaceQT4/groupe.py
index 86b304ecbfc424d059785f7f7830300f415154f6..f0ccc9067079eb6b2d29cf28d45b568cd1f67547 100644 (file)
--- 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 33820ef6057798d5223aad302c51495e6af88af7..43e416aa965d84ce1a86c1a28b378f47870e7dd0 100644 (file)
--- 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 614a82c77cf76be5fec51f0b68e5f8fc27147f17..78b5ccd3937a298cdb66480d0c0e7e08249b3f50 100644 (file)
--- 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 5f18ef860ad2be4dd62607f933faf4002f3c3075..4c8e61f2e201ea38d2e837bd6ce1f1208d77e0dd 100644 (file)
--- 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