sauve du 9 mai

[tools/eficas.git] / InterfaceQT4 / monWidgetSimpTuple.py

diff --git a/InterfaceQT4/monWidgetSimpTuple.py b/InterfaceQT4/monWidgetSimpTuple.py
index e77c084fce49b75669f288cc0c36bcb91e287a64..21212528400c48203035c296e5bc5b60852503ed 100644 (file)
--- a/InterfaceQT4/monWidgetSimpTuple.py
+++ b/InterfaceQT4/monWidgetSimpTuple.py
@@ -20,9 +20,14 @@
 # Modules Python
 import string,types,os
 
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtCore import Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -45,7 +50,8 @@ class MonWidgetSimpTuple(Feuille):
            courant=getattr(self,nomLineEdit)
            if valeur !=None: courant.setText(str(valeur[i]))
            setattr(self,nomLineEdit,courant)
-           self.connect(courant,SIGNAL("returnPressed()"),self.valeursPressed)
+           if monEnvQT5: courant.returnPressed.connect(self.valeursPressed)
+           else : self.connect(courant,SIGNAL("returnPressed()"),self.valeursPressed)
 
   def valeursPressed(self):
       aLeFocus=self.focusWidget()