X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonBoutonValide.py;h=146b2dfda0f69a6464443d89764b7808c1eeb3ae;hb=9bf98fc1cb51814c31679120598dc309e0802e31;hp=0027be39e30f02d110e29b8d72ff69c15b305e7b;hpb=42895950e564e837c445896b5bac263370bdf37b;p=tools%2Feficas.git

diff --git a/InterfaceQT4/monBoutonValide.py b/InterfaceQT4/monBoutonValide.py
index 0027be39..146b2dfd 100644
--- a/InterfaceQT4/monBoutonValide.py
+++ b/InterfaceQT4/monBoutonValide.py
@@ -19,13 +19,14 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+from __future__ import absolute_import
 import re
-from determine import monEnvQT5
-if monEnvQT5:
-   from PyQt5.QtWidgets import QToolButton
-else :
-   from PyQt4.QtGui import *
-   from PyQt4.QtCore import *
+import six
+
+import os
+
+
+from PyQt5.QtWidgets import QToolButton, QToolTip
 from Extensions.i18n import tr
 
 class MonBoutonValide(QToolButton) :
@@ -38,17 +39,17 @@ class MonBoutonValide(QToolButton) :
 
      def mouseDoubleClickEvent(self, event):
         #print "dans mouseDoubleClickEvent"
-        strRapport=unicode(self.parent.node.item.object.report())
+        strRapport=six.text_type(self.parent.node.item.object.report())
         self.parent.editor._viewText(strRapport, "JDC_RAPPORT")
 
      def mousePressEvent(self, event):
        #print "dans mousePressEvent"
        if self.parent.node.item.object.isvalid() :
-          myToolTip=QString(tr("objet valide"))
+          myToolTip=tr("objet valide")
           QToolTip.showText(event.globalPos(),myToolTip )
        else :
           t=""
-          texte=unicode(self.parent.node.item.object.report())
+          texte=six.text_type(self.parent.node.item.object.report())
           deb=1
           for l in texte.split('\n')[2:-2]:
               if re.match('^[\t !]*$',l) : continue
@@ -61,7 +62,7 @@ class MonBoutonValide(QToolButton) :
                  t=l
               else :
                  t=t+'\n'+l
-          myToolTip=QString(t)
+          myToolTip=tr(t)
        QToolTip.showText(event.globalPos(),myToolTip )