onItem=Deplie

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

diff --git a/InterfaceQT4/compooper.py b/InterfaceQT4/compooper.py
index c2abae395f1a93454d6a5af37a21e90b86ba4b93..fb3020de9ee937fcd0cb5681c0fb3413bb52af57 100644 (file)
--- a/InterfaceQT4/compooper.py
+++ b/InterfaceQT4/compooper.py
@@ -31,16 +31,14 @@ import typeNode
 
 class Node(browser.JDCNode, typeNode.PopUpMenuNode):
 
-    def __init__(self,treeParent, item):
-        browser.JDCNode.__init__( self, treeParent, item)
 
     def select(self):
         browser.JDCNode.select(self)
-        self.treeParent.tree.openPersistentEditor(self,1)
-        self.monWidgetNom=self.treeParent.tree.itemWidget(self,1)
-        self.treeParent.tree.connect(self.monWidgetNom,SIGNAL("returnPressed()"), self.nomme)
-        if self.item.GetIconName() == "ast-red-square" : self.monWidgetNom.setDisabled(True)
-        else : self.monWidgetNom.setFocus()  ;self.monWidgetNom.setDisabled(False)
+        #self.treeParent.tree.openPersistentEditor(self,1)
+        #self.monWidgetNom=self.treeParent.tree.itemWidget(self,1)
+        #self.treeParent.tree.connect(self.monWidgetNom,SIGNAL("returnPressed()"), self.nomme)
+        #if self.item.GetIconName() == "ast-red-square" : self.monWidgetNom.setDisabled(True)
+        #else : self.monWidgetNom.setFocus()  ;self.monWidgetNom.setDisabled(False)
 
     def nomme(self):
         nom=str(self.monWidgetNom.text())
@@ -51,20 +49,15 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode):
            old=self.item.GetText()
            self.monWidgetNom.setText(old)
         else :
-           self.editor.affiche_infos(tr("Nommage du concept effectue"))
+           self.editor.affiche_commentaire(tr("Nommage du concept effectue"))
            self.onValid()
            try :
               self.editor.panel.LENomConcept.setText(nom)
            except :
                pass
 
-    def getPanel( self ):
-        """
-        """
-        from monCommandePanel import MonCommandePanel
-        return MonCommandePanel(self,parent=self.editor)
 
-    def getPanel2(self):
+    def getPanel(self):
         from monWidgetCommande import MonWidgetCommande
         return MonWidgetCommande(self,self.editor,self.item.object)
 
@@ -72,7 +65,7 @@ class Node(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("activated()"),self.view3D)
+           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() :
@@ -81,7 +74,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode):
              self.ViewElt.setEnabled(0)
         if  self.item.get_nom() == "DISTRIBUTION" :
            self.Graphe = QAction(tr('Graphique'),self.tree)
-           self.tree.connect(self.Graphe,SIGNAL("activated()"),self.viewPng)
+           self.tree.connect(self.Graphe,SIGNAL("triggered()"),self.viewPng)
            self.Graphe.setStatusTip(tr("affiche la distribution "))
            self.menu.addAction(self.Graphe)
            if self.item.isvalid() :
@@ -172,11 +165,12 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       - la fonte dans laquelle afficher ce texte
       - la couleur du texte
       """
-      if self.object.isactif():
+      return self.labeltext,None,None
+      #if self.object.isactif():
         # None --> fonte et couleur par défaut
-        return self.labeltext,None,None
-      else:
-        return self.labeltext, None, None #CS_pbruno todo
+      #  return self.labeltext,None,None
+      #else:
+      #  return self.labeltext, None, None #CS_pbruno todo
       
   def get_objet(self,name) :
       for v in self.object.mc_liste:
@@ -203,15 +197,15 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       # item.getObject() = MCSIMP, MCFACT, MCBLOC ou MCList 
       itemobject=item.getObject()
       if itemobject.isoblig() :
-          self.appli.affiche_infos(tr('Impossible de supprimer un mot-clef obligatoire '),Qt.red)
-          return 0
+          #self.editor.affiche_infos(tr('Impossible de supprimer un mot-clef obligatoire '),Qt.red)
+          return (0,tr('Impossible de supprimer un mot-clef obligatoire '))
       if self.object.suppentite(itemobject):
           message = tr("Mot-clef %s supprime " , itemobject.nom)
-          self.appli.affiche_infos(message)
-          return 1
+          #self.editor.affiche_commentaire(message)
+          return (1,message)
       else :
-          self.appli.affiche_infos(tr('Pb interne : impossible de supprimer ce mot-clef'),Qt.red)
-          return 0
+          #self.editor.affiche_commentaire(tr('Pb interne : impossible de supprimer ce mot-clef'),Qt.red)
+          return (0,tr('Pb interne : impossible de supprimer ce mot-clef'))
 
   def GetText(self):
       try: