sauve du 9 mai

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

diff --git a/InterfaceQT4/compomacro.py b/InterfaceQT4/compomacro.py
index 2d8e030a15d298ffc8b1295db4155c94e17e7024..e5e6162e3ba759a026ff51efba6214288c025c9c 100644 (file)
--- a/InterfaceQT4/compomacro.py
+++ b/InterfaceQT4/compomacro.py
@@ -29,16 +29,19 @@ from Extensions.i18n import tr
 import compooper
 import browser
 import typeNode
-from PyQt4.QtGui import QAction
-from PyQt4.QtCore import Qt, SIGNAL, QVariant
+from determine import monEnvQT5
+if monEnvQT5:
+   from PyQt5.QtWidgets import QAction
+   from PyQt5.QtCore import Qt
+else :
+   from PyQt4.QtGui  import *
+   from PyQt4.QtCore import *
+
 
 
 class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):         
-    def getPanel(self):
-      from   monMacroPanel import MonMacroPanel
-      return MonMacroPanel (self,parent=self.editor )
     
-    def getPanel2(self):
+    def getPanel(self):
       from   monWidgetCommande import MonWidgetCommande
       return MonWidgetCommande (self,self.editor ,self.item.object)
 
@@ -47,7 +50,10 @@ class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):
       typeNode.PopUpMenuNode.createPopUpMenu(self)
       if ("AFFE_CARA_ELEM" in self.item.get_genealogie()) and self.editor.salome:
            self.ViewElt = QAction(tr('View3D'),self.tree)
-           self.tree.connect(self.ViewElt,SIGNAL("triggered()"),self.view3D)
+           if monEnvQT5:
+              self.ViewElt.triggered.connect(self.View3D)
+           else :
+              self.tree.connect(self.ViewElt,SIGNAL("triggered()"),self.view3D)
            self.ViewElt.setStatusTip(tr("affiche dans Geom les elements de structure"))
            self.menu.addAction(self.ViewElt)
            if self.item.isvalid() :
@@ -83,11 +89,8 @@ class INCLUDETreeItemBase(MACROTreeItem):
 
 
 class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode):    
-    def getPanel(self):
-      from   monIncludePanel import MonIncludePanel
-      return MonIncludePanel (self,parent=self.editor )
 
-    def getPanel2(self):
+    def getPanel(self):
       from   monWidgetCommande import MonWidgetCommande
       return MonWidgetCommande (self,self.editor ,self.item.object)
 
@@ -118,11 +121,8 @@ class INCLUDETreeItem(INCLUDETreeItemBase):
 # ------------------------------------
     
 class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode):    
-    def getPanel(self):
-      from   monPoursuitePanel import MonPoursuitePanel
-      return MonPoursuitePanel (self,parent=self.editor )
 
-    def getPanel2(self):
+    def getPanel(self):
       from   monWidgetCommande import MonWidgetCommande
       return MonWidgetCommande (self,self.editor ,self.item.object)
 
@@ -155,8 +155,8 @@ class POURSUITETreeItem(INCLUDETreeItemBase):
 class MATERIAUNode(MACRONode):
 
     def getPanel(self):
-      from   monMacroPanel import MonMacroPanel
-      return MonMacroPanel (self,parent=self.editor )
+      from   monWidgetCommande import MonWidgetCommande
+      return MonWidgetCommande (self,self.editor ,self.item.object)
 
     def createPopUpMenu(self):
       typeNode.PopUpMenuNode.createPopUpMenu(self)