except et print

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

diff --git a/InterfaceQT4/monSelectVal.py b/InterfaceQT4/monSelectVal.py
index 5dd7e0d80df7e0e0ec6845cbc57278a5a629e198..8a6a2fbeb1fa5586b6feb09903e9d49891c9e9f9 100644 (file)
--- a/InterfaceQT4/monSelectVal.py
+++ b/InterfaceQT4/monSelectVal.py
@@ -21,8 +21,17 @@
 # Modules Eficas
 
 from desSelectVal import Ui_DSelVal
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from Extensions.i18n import tr
+
+from determine import monEnvQT5
+if monEnvQT5:
+    from PyQt5.QtWidgets import QDialog, QFileDialog
+    from PyQt5.QtCore import QTimer, Qt
+    from PyQt5.QtGui import QPalette
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+    from PyQt4.QtGui import QPalette
 
 class DSelVal(Ui_DSelVal,QDialog):
    def __init__(self,parent ,modal ) :
@@ -37,7 +46,7 @@ class MonSelectVal(DSelVal):
   """
   def __init__(self,file,parent,name = None,fl = 0):
         #print "MonSelectVal"
-        self.FonctPanel=parent
+        self.parent=parent
         DSelVal.__init__(self,parent,0)
         self.separateur=" "
         self.texte=" "
@@ -45,14 +54,35 @@ class MonSelectVal(DSelVal):
         self.file=str(file)
         self.readVal()
         self.initVal()
-        self.connecterSignaux()
+        if monEnvQT5: self.connecterSignaux()
+        else : self.connecterSignauxQT4()
 
   def connecterSignaux(self) :
+        self.Bespace.clicked.connect(self.SelectEsp)
+        self.BpointVirgule.clicked.connect(self.SelectPoint)
+        self.Bvirgule.clicked.connect(self.SelectVir)
+        self.BImportSel.clicked.connect(self.BImportSelPressed)
+        self.BImportTout.clicked.connect(self.BImportToutPressed)
+        self.parent.editor.sb.messageChanged.connect(self.messageAChanger)
+
+  def connecterSignauxQT4(self) :
         self.connect(self.Bespace,SIGNAL("clicked()"),self.SelectEsp)
         self.connect(self.BpointVirgule,SIGNAL("clicked()"),self.SelectPoint)
         self.connect(self.Bvirgule,SIGNAL("clicked()"),self.SelectVir)
         self.connect(self.BImportSel,SIGNAL("clicked()"),self.BImportSelPressed)
         self.connect(self.BImportTout,SIGNAL("clicked()"),self.BImportToutPressed)
+        self.connect(self.parent.editor.sb,SIGNAL("messageChanged(QString)"),self.messageAChanger)
+
+  def messageAChanger(self):
+      message=self.parent.editor.sb.currentMessage()
+      mapalette=self.sb.palette()
+      mapalette.setColor( QPalette.Text,Qt.red )
+      self.sb.setPalette( mapalette )
+      self.sb.setText(message)
+      QTimer.singleShot(3000, self.efface)
+      
+  def efface(self):
+      self.sb.setText("")
 
   def readVal(self):
         if self.file == "" : return
@@ -99,5 +129,6 @@ class MonSelectVal(DSelVal):
                liste.append(val2)
             except :
               pass
-        #print self.FonctPanel.AjoutNValeur 
-        self.FonctPanel.AjoutNValeur(liste) 
+        self.parent.ajoutNValeur(liste) 
+        
+