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
numero de version
[tools/eficas.git]
/
InterfaceQT4
/
compocomm.py
diff --git
a/InterfaceQT4/compocomm.py
b/InterfaceQT4/compocomm.py
index a0c803728f9a05947633b89087a63d08b4a36426..118d13c664b903c86bf25ece014cc1328c4c4a04 100644
(file)
--- a/
InterfaceQT4/compocomm.py
+++ b/
InterfaceQT4/compocomm.py
@@
-18,10
+18,15
@@
# 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 PyQt4.QtGui import *
-from PyQt4.QtCore import *
import string
import string
+from determine import monEnvQT5
+if monEnvQT5 :
+ from PyQt5.QtWidgets import QAction
+else :
+ from PyQt4.QtGui import *
+ from PyQt4.QtCore import *
+
from Editeur import Objecttreeitem
import browser
import typeNode
from Editeur import Objecttreeitem
import browser
import typeNode
@@
-39,7
+44,8
@@
class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
def createPopUpMenu(self):
typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
self.Decommente = QAction(tr("Decommenter"),self.tree)
def createPopUpMenu(self):
typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
self.Decommente = QAction(tr("Decommenter"),self.tree)
- self.tree.connect(self.Decommente,SIGNAL("triggered()"),self.Decommenter)
+ if monEnvQT5 : self.Decommente.triggered(self.Decommenter)
+ else : self.tree.connect(self.Decommente,SIGNAL("triggered()"),self.Decommenter)
self.Decommente.setStatusTip(tr("Decommente la commande "))
if hasattr(self.item,'uncomment'):
self.Decommente.setStatusTip(tr("Decommente la commande "))
if hasattr(self.item,'uncomment'):
@@
-77,7
+83,7
@@
class COMMTreeItem(Objecttreeitem.ObjectTreeItem):
- la fonte dans laquelle afficher ce texte
- la couleur du texte
"""
- la fonte dans laquelle afficher ce texte
- la couleur du texte
"""
- return
'c'
,None,None
+ return
tr('Commentaire')
,None,None
def get_valeur(self):
"""
def get_valeur(self):
"""