except et print

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

diff --git a/InterfaceQT4/monWidgetCreeParam.py b/InterfaceQT4/monWidgetCreeParam.py
index b02351160b5a4676b618b67edea454e4c2883daf..cbd9c6a78e062a88b708b39ef1c2b69ee39c0e32 100644 (file)
--- a/InterfaceQT4/monWidgetCreeParam.py
+++ b/InterfaceQT4/monWidgetCreeParam.py
@@ -23,9 +23,13 @@ pattern_name       = re.compile(r'^[^\d\W]\w*\Z')
 
 # Modules Eficas
 
-from PyQt4 import *
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from determine import monEnvQT5
+if monEnvQT5 :
+   from PyQt5.QtWidgets import QDialog
+   from PyQt5.QtCore import Qt
+else :
+   from PyQt4.QtGui import *
+   from PyQt4.QtCore import *
 from Extensions.i18n import tr
 from desWidgetCreeParam import Ui_desWidgetCreeParam
 
@@ -38,16 +42,20 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
        self.editor.affiche_infos("")
        QDialog.__init__(self,editor)
        self.setupUi(self)
-       self.connecterSignaux()
+       if monEnvQT5 : self.connecterSignaux()
+       else         : self.connecterSignauxQT4()
        self.dejaExistant=0
        self.listeTousParam=self.editor.jdc.params
        self.dictListe={}
        self.initToutesVal()
 
-  def connecterSignaux(self) :
+  def connecterSignauxQT4(self) :
         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.lineEditValReturnPressed)
         self.connect(self.lineEditNom,SIGNAL("returnPressed()"),self.lineEditNomReturnPressed)
 
+  def connecterSignaux(self) :
+        self.lineEditVal.returnPressed.connect(self.lineEditValReturnPressed)
+        self.lineEditNom.returnPressed.connect(self.lineEditNomReturnPressed)
 
   def CreeParametre(self):
         nom=str(self.lineEditNom.text())
@@ -61,10 +69,15 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
         param=itemAvant.addParameters(True)
         param.item.set_nom(nom)
         #PN self.val permet d entrer du texte
-        param.item.set_valeur(val)
+        param.item.set_valeur(self.val)
         param.update_node_texte()
         param.update_node_valid()
-        self.LBParam.addItem(QString(repr(param.item)))
+        self.LBParam.addItem((repr(param.item)))
+        param.select()
+        self.lineEditVal.setText("")
+        self.lineEditNom.setText("")
+        self.lineEditNom.setFocus(True)
+
 
 
   def lineEditValReturnPressed(self):
@@ -117,8 +130,8 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
   def initToutesVal(self):
         self.LBParam.clear()
         for param in self.listeTousParam :
-            self.LBParam.addItem(QString(repr(param)))
-            self.dictListe[QString(repr(param))] = param
+            self.LBParam.addItem((repr(param)))
+            self.dictListe[repr(param)] = param
 
   def valideParam(self):
         if self.LBParam.selectedItems()== None : return
@@ -129,9 +142,9 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam,QDialog):
             lParam.append(param)
 
         try :
-          self.panel.AjoutNValeur(lParam)
+          self.panel.ajoutNValeur(lParam)
         except :
           for p in lParam :
-             self.panel.Ajout1Valeur(p)
+             self.panel.ajout1Valeur(p)
         self.close()