sauve du 9 mai

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

diff --git a/InterfaceQT4/monWidgetParam.py b/InterfaceQT4/monWidgetParam.py
index fff4cea4cc1ed0f2a4490c7424a90c2e8e734433..0190e530e7275b5bb9cf34e48cffe60e40f0e04b 100644 (file)
--- a/InterfaceQT4/monWidgetParam.py
+++ b/InterfaceQT4/monWidgetParam.py
@@ -21,8 +21,13 @@
 
 from desWidgetParam import Ui_WidgetParam
 from gereIcones import FacultatifOuOptionnel
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtWidgets import QWidget, QMessageBox
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
 from Extensions.i18n import tr
 from Extensions.eficas_exception import EficasException
 import Accas 
@@ -44,21 +49,30 @@ class MonWidgetParam(QWidget,Ui_WidgetParam,FacultatifOuOptionnel):
       self.node.fenetre=self
       self.setupUi(self)
       self.editor=editor
+      self.appliEficas=self.editor.appliEficas
+      self.repIcon=self.appliEficas.repIcon
+
       self.setIconePoubelle()
       self.remplit()
       if self.editor.code in ['MAP','CARMELCND'] : self.bCatalogue.close()
+      elif monEnvQT5 : self.bCatalogue.clicked.connect(self.afficheCatalogue)
       else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
-      self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
-      self.connect(self.lineEditNom,SIGNAL("returnPressed()"),self.LENomPressed)
-      self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
-      self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
-      self.connect(self.bVerifie,SIGNAL("clicked()"), self.verifiePressed)
-      self.editor.affiche_infos("")
-      if self.editor.widgetOptionnel!= None :
-         self.editor.widgetOptionnel.close()
-         self.editor.widgetOptionnel=None
-
 
+      if monEnvQT5 :
+        self.lineEditVal.returnPressed.connect(self.LEValeurPressed)
+        self.lineEditNom.returnPressed.connect(self.LENomPressed)
+        self.bAvant.clicked.connect(self.afficheAvant)
+        self.bApres.clicked.connect(self.afficheApres)
+        self.bVerifie.clicked.connect(self.verifiePressed)
+      else :
+        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        self.connect(self.lineEditNom,SIGNAL("returnPressed()"),self.LENomPressed)
+        self.connect(self.bAvant,SIGNAL("clicked()"), self.afficheAvant)
+        self.connect(self.bApres,SIGNAL("clicked()"), self.afficheApres)
+        self.connect(self.bVerifie,SIGNAL("clicked()"), self.verifiePressed)
+        self.editor.affiche_infos("")
+
+      self.editor.fermeOptionnel()
 
        
   def afficheCatalogue(self):