Salome HOME
projects
/
tools
/
eficas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pb de check box
[tools/eficas.git]
/
InterfaceQT4
/
monBoutonValide.py
diff --git
a/InterfaceQT4/monBoutonValide.py
b/InterfaceQT4/monBoutonValide.py
index 504184349206067e4c5530e88b1a19b1f81e758f..146b2dfda0f69a6464443d89764b7808c1eeb3ae 100644
(file)
--- a/
InterfaceQT4/monBoutonValide.py
+++ b/
InterfaceQT4/monBoutonValide.py
@@
-19,13
+19,14
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+from __future__ import absolute_import
import re
import re
-from determine import monEnvQT5
-if monEnvQT5:
- from PyQt5.QtWidgets import QToolButton, QToolTip
-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) :
from Extensions.i18n import tr
class MonBoutonValide(QToolButton) :
@@
-38,7
+39,7
@@
class MonBoutonValide(QToolButton) :
def mouseDoubleClickEvent(self, event):
#print "dans mouseDoubleClickEvent"
def mouseDoubleClickEvent(self, event):
#print "dans mouseDoubleClickEvent"
- strRapport=
unicod
e(self.parent.node.item.object.report())
+ strRapport=
six.text_typ
e(self.parent.node.item.object.report())
self.parent.editor._viewText(strRapport, "JDC_RAPPORT")
def mousePressEvent(self, event):
self.parent.editor._viewText(strRapport, "JDC_RAPPORT")
def mousePressEvent(self, event):
@@
-48,7
+49,7
@@
class MonBoutonValide(QToolButton) :
QToolTip.showText(event.globalPos(),myToolTip )
else :
t=""
QToolTip.showText(event.globalPos(),myToolTip )
else :
t=""
- texte=
unicod
e(self.parent.node.item.object.report())
+ texte=
six.text_typ
e(self.parent.node.item.object.report())
deb=1
for l in texte.split('\n')[2:-2]:
if re.match('^[\t !]*$',l) : continue
deb=1
for l in texte.split('\n')[2:-2]:
if re.match('^[\t !]*$',l) : continue