sauve du 9 mai

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

diff --git a/InterfaceQT4/monWidgetFact.py b/InterfaceQT4/monWidgetFact.py
index 28d17ddfb5891a64cf1682827cb3fabe6afd4308..7b60cf8ffaf19ba72b021ecbff5cd22b1c84aa01 100644 (file)
--- a/InterfaceQT4/monWidgetFact.py
+++ b/InterfaceQT4/monWidgetFact.py
@@ -17,12 +17,19 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 # Modules Python
+from determine import monEnvQT5
+if monEnvQT5:
+   from PyQt5.QtCore import Qt
+   from PyQt5.QtWidgets import QWidget
+else :
+   from PyQt4.QtCore import *
+   from PyQt4.QtGui import *
+
+
 # Modules Eficas
 
-from desWidgetFact import Ui_WidgetFact
 from groupe import Groupe
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from desWidgetFact import Ui_WidgetFact
 from Extensions.i18n import tr
 # Import des panels
 
@@ -37,7 +44,8 @@ class MonWidgetFact(Ui_WidgetFact,Groupe):
       self.GroupBox.setTextInteractionFlags(Qt.TextSelectableByMouse)
       self.parentQt.commandesLayout.insertWidget(-1,self)
 
-  #def focusInEvent(self,event):
-      #print "je passe dans focusInEvent"
-  #    if self.editor.code != "CARMELCND" :self.afficheOptionnel()
+  def focusInEvent(self,event):
+     # print "je passe dans focusInEvent"
+      if self.editor.code != "CARMELCND" :self.afficheOptionnel()
+      QWidget.focusInEvent(self,event)