PN

diff --git a/InterfaceQT/browser.py b/InterfaceQT/browser.py
index 13a3dbb6bf2e8d148debd1198fb1fc019fe6a0a6..509ce88ee26536228918e868d3454a97833536a4 100644 (file)
--- a/InterfaceQT/browser.py
+++ b/InterfaceQT/browser.py
@@ -21,8 +21,8 @@ class JDCTree( QListView ):
         self.setCaption(self.trUtf8('Browser'))
         self.setRootIsDecorated(1)
         self.setSorting(-1)
-        self.addColumn(self.trUtf8('Name'))
-        self.addColumn(self.trUtf8('Value'))
+        self.addColumn(self.trUtf8('Commande'))
+        self.addColumn(self.trUtf8('Concept/Valeur'))
                 
         self.setMinimumSize(QSize(400,500))
         self.connect(self,SIGNAL('contextMenuRequested(QListViewItem *, const QPoint &, int)'),

diff --git a/InterfaceQT/compocomm.py b/InterfaceQT/compocomm.py
index 4ff1e58c1e7e5467c2e5a2660116c3dfbfcab592..fda1ab4e8db979647de4df939ad1b8357a5872ea 100644 (file)
--- a/InterfaceQT/compocomm.py
+++ b/InterfaceQT/compocomm.py
@@ -36,7 +36,7 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
 
     def createPopUpMenu(self):
         typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
-        self.menu.insertItem( qApp.translate('Browser','Uncomment'), self.unCommentIt )
+        self.menu.insertItem( qApp.translate('Browser','Decommenter'), self.unCommentIt )
 
     def update_node_label(self) :
         """

diff --git a/InterfaceQT/compoformule.py b/InterfaceQT/compoformule.py
index c9b1bd82e0fd8ca2c534323d575f706cad5b4304..196218a653170bc551035e49d4e35588debe395e 100644 (file)
--- a/InterfaceQT/compoformule.py
+++ b/InterfaceQT/compoformule.py
@@ -68,7 +68,8 @@ class FORMULETreeItem(compooper.EtapeTreeItem):
         # None --> fonte et couleur par défaut
         return self.labeltext,None,None
       else:
-        return self.labeltext,fontes.standard_italique,None
+        return self.labeltext,None,None
+        #return self.labeltext,fontes.standard_italique,None
     
 # ---------------------------------------------------------------------------
 #       Méthodes permettant la modification et la lecture des attributs

diff --git a/InterfaceQT/compooper.py b/InterfaceQT/compooper.py
index 61d73e78b9412e11cd004674efae30e7335e7c6b..4f4a9b7700e8d2f257544bf7ebb0b17a95e2f10a 100644 (file)
--- a/InterfaceQT/compooper.py
+++ b/InterfaceQT/compooper.py
@@ -202,7 +202,7 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
           représentatif de self.object
       """
       # Format de fichier utilisé
-      format=self.appli.format_fichier.get()
+      format=self.appli.format_fichier
       return self.object.get_objet_commentarise(format)
 
   def get_objet_commentarise_BAK(self):
@@ -212,7 +212,7 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       """
       import generator,string,Accas
       # Format de fichier utilisé
-      format=self.appli.format_fichier.get()
+      format=self.appli.format_fichier
       g=generator.plugins[format]()
       texte_commande = g.gener(self.object,format='beautifie')
       # Il faut enlever la première ligne vide de texte_commande que 

diff --git a/InterfaceQT/typeNode.py b/InterfaceQT/typeNode.py
index 9f111468f89c31d782d03a7c8a72356d4372395c..71e22c22da8c681cd4899f68017b4db7053115ac 100644 (file)
--- a/InterfaceQT/typeNode.py
+++ b/InterfaceQT/typeNode.py
@@ -10,18 +10,18 @@ class PopUpMenuNodePartiel :
 
         #ss-menu Comment:
         self.commentMenu = QPopupMenu( self.menu )
-        self.menu.insertItem( qApp.translate('Browser','Comment'), self.commentMenu ) 
-        self.commentMenu.insertItem( 'after', self.addCommentAfter )
-        self.commentMenu.insertItem( 'before', self.addCommentBefore )
+        self.menu.insertItem( qApp.translate('Browser','Commentaire'), self.commentMenu ) 
+        self.commentMenu.insertItem( 'après', self.addCommentAfter )
+        self.commentMenu.insertItem( 'avant', self.addCommentBefore )
 
         #ss-menu Parameters:
         self.parametersMenu = QPopupMenu( self.menu )
-        self.parametersMenu.insertItem( 'after', self.addParametersAfter )
-        self.parametersMenu.insertItem( 'before', self.addParametersBefore )
+        self.parametersMenu.insertItem( 'après', self.addParametersAfter )
+        self.parametersMenu.insertItem( 'avant', self.addParametersBefore )
 
         #items du menu
-        self.menu.insertItem( qApp.translate('Browser','Delete'), self.delete )
-        self.menu.insertItem( qApp.translate('Browser','Parameters'), self.parametersMenu )
+        self.menu.insertItem( qApp.translate('Browser','Supprimer'), self.delete )
+        self.menu.insertItem( qApp.translate('Browser','Parametres'), self.parametersMenu )
 
     
     def addCommentAfter(self):
@@ -51,4 +51,4 @@ class PopUpMenuNode(PopUpMenuNodePartiel) :
     def createPopUpMenu(self):
         PopUpMenuNodePartiel.createPopUpMenu(self)
 
-        self.commentMenu.insertItem( 'it', self.commentIt )
+        self.commentMenu.insertItem( 'ce noeud', self.commentIt )