sauve du 9 mai

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

diff --git a/InterfaceQT4/monWidgetSimpBase.py b/InterfaceQT4/monWidgetSimpBase.py
index e2d75ae6db1223737e122ae46e5db84038f4a145..9022095f21cfaac6a383edf56111ca5078d153a8 100644 (file)
--- a/InterfaceQT4/monWidgetSimpBase.py
+++ b/InterfaceQT4/monWidgetSimpBase.py
@@ -21,8 +21,12 @@
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtCore import  Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille
@@ -38,7 +42,8 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
         #print "MonWidgetSimpBase", nom
         self.parentQt.commandesLayout.insertWidget(-1,self,1)
         self.setFocusPolicy(Qt.StrongFocus)
-        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        if monEnvQT5 : self.lineEditVal.returnPressed.connect(self.LEValeurPressed)
+        else :         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
         self.AAfficher=self.lineEditVal
         self.maCommande.listeAffichageWidget.append(self.lineEditVal)
 
@@ -54,20 +59,20 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
        self.politique=PolitiqueUnique(self.node,self.editor)
        valeur=self.node.item.get_valeur()
        valeurTexte=self.politique.GetValeurTexte(valeur)
-       chaine=QString("")
+       chaine=""
 
        if valeurTexte != None :
           from decimal import Decimal
           if isinstance(valeurTexte,Decimal):
              chaine=str(valeurTexte)
           elif repr(valeurTexte.__class__).find("PARAMETRE") > 0:
-             chaine = QString(repr(valeur))
+             chaine = repr(valeur)
           else :
              #PN ????
              #try :
              #  chaine=QString("").setNum(valeurTexte)
              #except :
-             chaine=QString(str(valeurTexte))
+             chaine=str(valeurTexte)
        self.lineEditVal.setText(chaine)