]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
PN pour sauvegarde
authorPascale Noyret <pascale.noyret@edf.fr>
Tue, 28 Aug 2007 10:02:25 +0000 (10:02 +0000)
committerPascale Noyret <pascale.noyret@edf.fr>
Tue, 28 Aug 2007 10:02:25 +0000 (10:02 +0000)
18 files changed:
InterfaceQT/compocommandecomm.py
InterfaceQT/compomacro.py
InterfaceQT/compooper.py
InterfaceQT/compoparam.py
InterfaceQT/compoproc.py
InterfaceQT/editor.py
InterfaceQT/eficas.py
InterfaceQT/monIncludePanel.py [new file with mode: 0644]
InterfaceQT/monParamPanel.py [new file with mode: 0644]
InterfaceQT/monRacinePanel.py
InterfaceQT/qtCommun.py
InterfaceQT/qtEficas.py
InterfaceQT/qtSaisie.py
InterfaceQT/readercata.py
Ui/desInclude.py [new file with mode: 0644]
Ui/desInclude.ui [new file with mode: 0644]
Ui/desParam.py
Ui/desParam.ui [new file with mode: 0644]

index bd17f0bf704bcacf188e8d58478e8b7bb55a27a9..c28756a964435e6435e3b16bccd0d666f84ed3d2 100644 (file)
@@ -47,7 +47,7 @@ class COMMANDE_COMMTreeItem(Objecttreeitem.ObjectTreeItem):
         - la fonte dans laquelle afficher ce texte
         - la couleur du texte
         """
-        return 'commantaire'
+        return 'commentaire'
 
     def get_valeur(self):
       """
@@ -83,7 +83,6 @@ class COMMANDE_COMMTreeItem(Objecttreeitem.ObjectTreeItem):
       """
       try:
         commande,nom = self.object.uncomment()
-        print "uuuuuuuuuuuuuuuu"
         #self.parent.children[pos].select()
       except Exception,e:
         traceback.print_exc()
index e59138f16587015cf5b40c15ef75282e6ec7d9e2..9e0c23212aed64a6be79b4bedddc3e9db5a25935 100644 (file)
@@ -24,29 +24,38 @@ class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):
         
     
 class MACROTreeItem(compooper.EtapeTreeItem):
-  """ Cette classe hérite d'une grande partie des comportements
-      de la classe compooper.EtapeTreeItem
-  """
-  itemNode=MACRONode
+#  """ Cette classe hérite d'une grande partie des comportements
+#      de la classe compooper.EtapeTreeItem
+#  """
+    itemNode=MACRONode
+
+# ------------------------------------
+#  Classes necessaires à INCLUDE
+# ------------------------------------
 
 class INCLUDETreeItemBase(MACROTreeItem):
 
-  def __init__(self,appli, labeltext, object, setfunction):    
-    MACROTreeItem.__init__(self,appli, labeltext, object, setfunction)
+    def __init__(self,appli, labeltext, object, setfunction):    
+       MACROTreeItem.__init__(self,appli, labeltext, object, setfunction)
 
-  def iscopiable(self):
-      """
-      Retourne 1 si l'objet est copiable, 0 sinon
-      """
-      return 0
+    def iscopiable(self):
+       """
+       Retourne 1 si l'objet est copiable, 0 sinon
+       """
+       return 0
 
 
 class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode):    
-##    def getPanel(self):
-##        """
-##        """
-##        return INCLUDEPanel( self, self.editor )
-    
+    def getPanel(self):
+      from   monIncludePanel import MonIncludePanel
+      return MonIncludePanel (self,parent=self.editor )
+
+    def createPopUpMenu(self):
+      typeNode.PopUpMenuNode.createPopUpMenu(self)
+      self.menu.insertItem( qApp.translate('Browser','Edit'), self.makeEdit )
+      self.menu.insertItem( qApp.translate('Browser','View'), self.makeView )
+      
+
     def makeEdit(self):    #,appli,node
         if self.item.object.text_converted == 0:
                 # Le texte du fichier inclus n'a pas pu etre converti par le module convert
@@ -59,10 +68,6 @@ class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode):
                self.item.object.build_include(None,"")
     
         # On cree un nouvel onglet dans le bureau
-##        appli.bureau.ShowJDC(   self.item.object.jdc_aux,
-##                                self.item.object.jdc_aux.nom,
-##                                label_onglet=None,
-##                                JDCDISPLAY=macrodisplay.MACRODISPLAY)                            
         self.editor.vm.displayJDC( self.item.object.jdc_aux ) #, self.item.object.jdc_aux.nom )                                
     
     def makeView(self):#,appli,node):
@@ -71,10 +76,12 @@ class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode):
 
 
 class INCLUDETreeItem(INCLUDETreeItemBase):
-##   panel=INCLUDEPanel
     itemNode=INCLUDENode
     
 
+# ------------------------------------
+#  Classes necessaires à POURSUITE
+# ------------------------------------
     
 class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode):    
 ##    def getPanel(self):
@@ -168,3 +175,4 @@ import Accas
 objet=Accas.MACRO_ETAPE
     
 #import macrodisplay
+
index 5e84c7362c5c9fec75f3ce7382ccbccc125914ad..1611cea128494f8a158f68e8ba428a646b38a701 100644 (file)
@@ -55,11 +55,10 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       Cette classe a entre autres deux attributs importants :
         - _object qui est un pointeur vers l'objet du noyau
         - object qui pointe vers l'objet auquel sont délégués les
-          appels de méthode et les accès aux attributs
+          appels de méthode et les acces aux attributs
       Dans le cas d'une ETAPE, _object et object pointent vers le 
       meme objet.
   """
-##  panel = OPERPanel
   itemNode=Node
   
   def IsExpandable(self):
@@ -88,7 +87,6 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
         return self.labeltext,None,None
       else:
         return self.labeltext, None, None #CS_pbruno todo
-##        return self.labeltext,fontes.standard_italique,None 
       
   def get_objet(self,name) :
       for v in self.object.mc_liste:
@@ -113,7 +111,7 @@ class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
       
 
   def suppitem(self,item) :
-      # item : item du MOCLE de l'ETAPE à supprimer
+      # item : item du MOCLE de l'ETAPE a supprimer
       # item.getObject() = MCSIMP, MCFACT, MCBLOC ou MCList 
       itemobject=item.getObject()
       if itemobject.isoblig() :
index d48b5e6671b69d7085d61327f652dada6f041559..cfdf276a6f2dd0fa26b90dea3041d46d8f7222e5 100644 (file)
@@ -12,12 +12,20 @@ from qt import *
 # import modules EFICAS
 from Editeur     import Objecttreeitem
 from InterfaceQT import browser
+from InterfaceQT import typeNode
+
+
+class Node(browser.JDCNode,typeNode.PopUpMenuNode): 
+    def getPanel(self):
+        """        
+        """    
+        from monParamPanel  import MonParamPanel
+        return MonParamPanel(self, parent=self.editor )
+
+    def createPopUpMenu(self):
+        typeNode.PopUpMenuNode.createPopUpMenu(self)
+
 
-class Node(browser.JDCNode): pass
-##    def getPanel(self):
-##        """        
-##        """    
-##        return PARAMPanel( self, self.editor )
 
 
 class PARAMTreeItem(Objecttreeitem.ObjectTreeItem):
@@ -26,7 +34,6 @@ class PARAMTreeItem(Objecttreeitem.ObjectTreeItem):
     qui représente le PARAMETRE
     """
     itemNode=Node
-##    panel = PARAMPanel
 
     def init(self):      
       self.setfunction = self.set_valeur
index 862795f45ff340f18d7f3bc90ab04aad872af176..c128496aa20e3c641d1b05828b24d04d9e4925b3 100644 (file)
@@ -2,19 +2,21 @@
 from Editeur     import Objecttreeitem
 from InterfaceQT import compooper
 from InterfaceQT import browser
+from InterfaceQT import typeNode
 
 from qt import *
 
-class Node(browser.JDCNode): pass
-##    def getPanel(self):
-##        """        
-##        """    
-##        return PROCPanel( self, self.editor )
+class Node(browser.JDCNode,typeNode.PopUpMenuNode):
+    def getPanel(self):
+        from monMacroPanel import MonMacroPanel
+        return MonMacroPanel(self,parent=self.editor)
+
+    def createPopUpMenu(self):
+        typeNode.PopUpMenuNode.createPopUpMenu(self)
+
 
 class ProcEtapeTreeItem(compooper.EtapeTreeItem):
     itemNode=Node
-##  panel = PROCPanel
-    pass
   
 import Accas
 treeitem = ProcEtapeTreeItem
index 9d25046f8e5874cc3e25c27327de4f327af6782d..450f1c29e45eb79843ae5e4f73b5393b83cbf005 100644 (file)
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: iso-8859-1 -*-
 
 # Modules Python
 import types,sys,os
@@ -150,7 +150,7 @@ class JDCEditor(QSplitter):
                 self.resize(bnd)
         
         self.panel = QWidget(self)        
-        self.connect(self, SIGNAL('modificationChanged(bool)'), self.handleModificationChanged)
+        #self.connect(self, SIGNAL('modificationChanged(bool)'), self.handleModificationChanged)
                 
         
     #-------------------------------------------------------------------#
index 0a9c2a99a547faa905bc784d9724c390ca8c984e..731589d0f2bf663f5e9b83a9265e9c2b51440759 100644 (file)
@@ -18,7 +18,6 @@ class UserInterface(Eficas):
         # Generate the debug server object
         dbs = DebugServer()
         
-        
         # Create main layout type 4 (floating windows)
         
         # Create the view manager depending on the configuration setting
diff --git a/InterfaceQT/monIncludePanel.py b/InterfaceQT/monIncludePanel.py
new file mode 100644 (file)
index 0000000..2033433
--- /dev/null
@@ -0,0 +1,142 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+# Modules Python
+# Modules Eficas
+
+import os
+from qt import *
+from desMacro import DMacro
+
+from monMacroPanel import MonMacroPanel
+
+
+# Import des panels
+
+class MonIncludePanel(MonMacroPanel):
+  """
+  Classe définissant le panel associé aux mots-clés qui demandent
+  à l'utilisateur de choisir une seule valeur parmi une liste de valeurs
+  discrètes
+  """
+  def __init__(self,node, parent = None,name = None,fl = 0):
+        MonMacroPanel.__init__(self,node,parent,name,fl)
+        if not hasattr(self.node.item.object,'fichier_ini'):
+           self.ajoutPageBad()
+        else:
+           self.ajoutPageOk()
+
+  def ajoutPageOk(self):
+        self.TabPage = QWidget(self.TWChoix,"TabPage")
+        self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier")
+        self.LENomFichier.setGeometry(QRect(18,127,450,30))
+        self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3")
+        self.textLabel1_3.setGeometry(QRect(70,50,350,41))
+        self.BBrowse = QPushButton(self.TabPage,"BBrowse")
+        self.BBrowse.setGeometry(QRect(288,306,161,41))
+        self.TWChoix.insertTab(self.TabPage,QString(""))
+        self.textLabel1_3.setText(self._DMacro__tr("<font size=\"+1\">La commande INCLUDE requiert un nom de Fichier :</font>"))
+        self.BBrowse.setText(self._DMacro__tr("Browse"))
+        self.TWChoix.changeTab(self.TabPage,self._DMacro__tr("Fichier Include"))
+        self.TWChoix.setCurrentPage(2)
+
+        self.LENomFichier.setText(self.node.item.object.fichier_ini)
+
+        self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed)
+        self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed)
+
+
+  def ajoutPageBad(self) :
+        self.TabPage = QWidget(self.TWChoix,"TabPage")
+        self.textLabel1_5 = QLabel(self.TabPage,"textLabel1_5")
+        self.textLabel1_5.setGeometry(QRect(88,96,290,131))
+        self.TWChoix.insertTab(self.TabPage,QString(""))
+        self.textLabel1_5.setText(self._DMacro__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x49\x4e\x43\x4c\x55\x44\x45\x20\x6e\x27\x61\x20\x70\x61\x73\x20\x64\x65\x20\x66\x69\x63\x68\x69\x65\x72\x20\x61\x73\x73\x6f\x63\x69\xc3\xa9\x2e\x0a\x49\x6c\x20\x66\x61\x75\x74\x20\x64\x27\x61\x62\x6f\x72\x64\x20\x63\x68\x6f\x69\x73\x69\x72\x20\x75\x6e\x20\x6e\x75\x6d\xc3\xa9\x72\x6f\x20\x64\x27\x75\x6e\x69\x74\xc3\xa9\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e"))
+        self.TWChoix.changeTab(self.TabPage,self._DMacro__tr("Fichier Include"))
+        self.TWChoix.setCurrentPage(2)
+
+
+  def BBrowsePressed(self):
+      pass
+
+  def BOkIncPressed (self):
+      self.LENomFichReturnPressed()
+
+  def LENomFichReturnPressed(self):
+        nomFichier=str(self.LENomFichier.text())
+        if not os.path.isfile(nomFichier) :
+           commentaire = "Fichier introuvable"
+           self.Commentaire.setText(QString(commentaire))
+           return
+
+        text=self.convert_file(nomFichier)
+        print text
+"""
+    # Si probleme a la lecture-conversion on arrete le traitement
+    if not text:
+       return
+
+    try:
+      self.node.item.object.change_fichier_init(new_fic,text)
+      self.parent.appli.affiche_infos("Fichier %s modifié" %self.node.item.get_nom())
+    except:
+      # Erreurs lors de l'evaluation de text dans un JDC auxiliaire
+      self.parent.appli.affiche_infos("Fichier invalide")
+      l=traceback.format_exception_only("Fichier invalide",sys.exc_info()[1])
+      f=FenetreYesNo(self.parent.appli,titre="Fichier invalide : voulez vous retablir l ancien fichi
+er ?",
+                             texte="Erreur dans l'interprétation du nouveau fichier ...\n\n"+string.
+join(l),
+                             yes="Retablir",no="Changer")
+      f.wait()
+      reponse=f.result
+      if reponse:
+         # On retablit l'ancien fichier
+         self.entry.delete(0,Tkinter.END)
+         self.node.item.object.restore_fichier_init()
+         self.parent.appli.affiche_infos("Fichier invalide ... Ancien fichier restauré")
+
+
+"""
+
+   def convert_file(self,file):
+     """
+         Methode pour convertir le fichier file dans le format courant
+     """
+     format=self.parent.appli.format_fichier.get()
+     if convert.plugins.has_key(format):
+         # Le convertisseur existe on l'utilise
+         p=convert.plugins[format]()
+         p.readfile(file)
+         text=p.convert('execnoparseur')
+         if not p.cr.estvide():
+            self.parent.appli.affiche_infos("Erreur à la conversion")
+            Fenetre(self,
+                    titre="compte-rendu d'erreurs, EFICAS ne sait pas convertir ce fichier",
+                    texte = str(p.cr))
+            return None
+         return text
+     else:
+         # Il n'existe pas c'est une erreur
+         self.parent.appli.affiche_infos("Type de fichier non reconnu")
+         showerror("Type de fichier non reconnu","EFICAS ne sait pas ouvrir ce type de fichier")
+         return None
+
+
diff --git a/InterfaceQT/monParamPanel.py b/InterfaceQT/monParamPanel.py
new file mode 100644 (file)
index 0000000..2abe274
--- /dev/null
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+#            CONFIGURATION MANAGEMENT OF EDF VERSION
+# ======================================================================
+# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
+# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
+# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
+# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
+# (AT YOUR OPTION) ANY LATER VERSION.
+#
+# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
+# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
+# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
+# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+#
+# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
+# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
+#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+#
+#
+# ======================================================================
+# Modules Python
+import string,types,os,re
+
+# Modules Eficas
+from Aster import prefs 
+
+from qt import *
+
+from desParam import DParam
+from qtCommun      import QTPanel
+from qtCommun      import QTPanelTBW2
+
+# Import des panels
+
+class MonParamPanel(DParam,QTPanelTBW2,QTPanel):
+  """
+  Classe définissant le panel associé aux mots-clés qui demandent
+  à l'utilisateur de choisir une seule valeur parmi une liste de valeurs
+  discrètes
+  """
+  def __init__(self,node, parent = None,name = None,fl = 0):
+        DParam.__init__(self,parent,name,fl)
+        QTPanel.__init__(self,node,parent)
+        QTPanelTBW2.__init__(self,node,parent)
+        self.InitLEs()
+
+  def InitLEs(self):
+        nom=self.node.item.get_nom()
+        self.lineEditNom.setText(nom)
+        valeur=self.node.item.get_valeur()
+        if valeur != None:
+           try :
+               str=QString("").setNum(valeur)
+           except :
+               str=QString(valeur)
+           self.lineEditVal.setText(str)
+        else :
+           self.lineEditVal.clear()
+
+  def BOkParamPressed(self):
+        val=self.LEValeurPressed() 
+        nom=self.LENomPressed()
+        if not nom :
+           commentaire="Entrer un nom de parametre"
+           self.Commentaire.setText(QString(commentaire))
+           return
+        self.node.item.set_nom(nom)
+        self.node.item.set_valeur(val)
+        self.node.update_texte()
+        self.node.update_valid()
+        self.editor.init_modif()
+        self.InitLEs()
+
+  def BSupPressed(self):
+        QTPanel.BSupPressed(self)
+
+  def LEValeurPressed(self):
+        self.Commentaire.setText(QString(""))
+        commentaire="Valeur incorrecte"
+        qtVal=self.lineEditVal.text()
+        try :
+            val,boul=QString.toFloat(qtVal)
+        except :
+            try :
+                val,boul=QString.toInt(qtVal)
+            except :
+                val=str(qtVal)
+                boul=1
+        if boul: commentaire="Valeur correcte"
+        self.Commentaire.setText(QString(commentaire))
+        return val
+
+  def LENomPressed(self):
+        self.Commentaire.setText(QString(""))
+        qtNom=self.lineEditNom.text()
+        nom=str(qtNom)
+        numDebutPattern=re.compile('[a-zA-Z]')
+        if numDebutPattern.match(nom) :
+           return nom
+        else :
+           commentaire="Les noms de parametre doivent commencer par une lettre"
+           self.Commentaire.setText(QString(commentaire))
+           return None
+
+  def BuildTabCommand(self):
+      QTPanelTBW2.BuildLBNouvCommande(self)
+
+  def LEFiltreTextChanged(self):
+      QTPanelTBW2.LEFiltreTextChanged(self)
+
+  def LEfiltreReturnPressed(self):
+      QTPanelTBW2.LEfiltreReturnPressed(self)
+
+  def LBNouvCommandeClicked(self):
+      QTPanelTBW2.LBNouvCommandeClicked(self)
+
+  def AppelleBuildLBRegles(self):
+      listeRegles=self.node.item.get_regles()
+      listeNomsEtapes = self.node.item.get_l_noms_etapes()
+      self.BuildLBRegles(listeRegles,listeNomsEtapes)
+
+  def BOkPressed(self):
+      QTPanel.BOkPressed(self)
+
+
index c36411ac66d9989f942139123b18a5a3727af52f..e7b0aeb88ea910b505c25ed328a19628aa6af201 100644 (file)
@@ -39,7 +39,7 @@ class MonRacinePanel(DRac,QTPanelTBW2):
   def __init__(self,node, parent = None,name = None,fl = 0):
         DRac.__init__(self,parent,name,fl)
         QTPanel.__init__(self,node,parent)
-        QTPanelTBW2.__init__(self,node,parent)
+        QTPanelTBW2.__init__(self,node,parent,racine=1)
 
   def BSupPressed(self):
       QTPanel.BSupPressed(self)
index d05026059ef94de2be6f0e1b848d8641e8904ac5..7a376c8f114fa920c38368cdeceb71fe5dcf33e3 100644 (file)
@@ -57,6 +57,10 @@ class QTPanel:
            self.DefMC()
         if label==QString("Définition Formule"):
            self.BOkPressedFormule()
+        if label==QString("Valeur Parametre"):
+           self.BOkParamPressed()
+        if label==QString("Fichier Include"):
+           self.BOkIncPressed()
 
   def AppelleBuildLBRegles(self):
         listeRegles     = self.node.item.get_regles()
@@ -127,11 +131,11 @@ class QTPanelTBW2(QTPanel):
   Gére plus précisement :
   """
 
-  def __init__(self,node, parent = None):
+  def __init__(self,node, parent = None, racine = 0):
         self.editor    = parent
         self.node      = node
         self.BuildLBNouvCommande()
-        self.AppelleBuildLBRegles()
+        if racine == 1 : self.AppelleBuildLBRegles()
 
       
   def BuildLBNouvCommande(self):
@@ -162,6 +166,7 @@ class QTPanelTBW2(QTPanel):
         QObject.connect( self.LBNouvCommande, SIGNAL("doubleClicked(QListBoxItem*)"),self.DefCmd )
 
   def DefCmd(self):
+        if self.LBNouvCommande.selectedItem()== 0 : return
         name=str(self.LBNouvCommande.selectedItem().text())
         if name==QString(" "):
           return
index a94621b379bc61170fb28d232701af15e788495f..199e82b46a71b5b4c415fc5effb2714fb1e52b69 100644 (file)
@@ -1,6 +1,5 @@
-"""
+# -*- coding: iso-8859-1 -*-
 
-"""
 import os, sys
 REPINI=os.path.dirname(os.path.abspath(__file__))
 INSTALLDIR=os.path.join(REPINI,'..')
@@ -39,8 +38,6 @@ class Appli(Eficas):
         self.recentMenu = QPopupMenu(self.Fichier)
         self.Fichier.insertItem(self.trUtf8('Open &Recent Files'), self.recentMenu)
         self.connect(self.recentMenu,SIGNAL('aboutToShow()'),self.handleShowRecentMenu)
-        
-
         self.connect(self,PYSIGNAL('preferencesChanged'),
                      self.viewmanager.handlePreferencesChanged)
         
@@ -61,9 +58,21 @@ class Appli(Eficas):
         self.ficPatrons={}
         self.initPatrons()
         self.ihm="QT"
+        #self.ouvreFichers()
+        
         
+    def ouvreFichiers(self) :
+    # Ouverture des fichiers de commandes donnes sur la ligne de commande
+        cwd=os.getcwd()
+        self.dir=cwd
+        for study in session.d_env.studies:
+            os.chdir(cwd)
+            d=session.get_unit(study,self)
+            self.viewmanager.handleOpen(fn=study["comm"])
+
         
     def initPatrons(self) :
+    # Mise à jour du menu des fichiers recemment ouverts
         from Editeur import listePatrons
         self.listePatrons = listePatrons.listePatrons()
         idx = 0
@@ -110,7 +119,6 @@ class Appli(Eficas):
         """
         Private method to clear the recent files menu.
         """
-##        self.recent = QStringList()
         self.viewmanager.recent = QStringList()
 
         
@@ -171,9 +179,6 @@ class Appli(Eficas):
     def jdcRapport(self):
         self.viewmanager.handleViewJdcRapport()
         
-
-  
-        
     
 if __name__=='__main__':
 
@@ -187,8 +192,6 @@ if __name__=='__main__':
        del sys.setdefaultencoding
        # Fin hack
 
-    #CS_pbruno note: fait implicitement des trucs ces imports (grr)
-    #import styles
     from Editeur import import_code
     from Editeur import session
 
@@ -200,6 +203,7 @@ if __name__=='__main__':
     mw = Appli()
     app.setMainWidget(mw)
     app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()"))
+    mw.ouvreFichiers()
     mw.show()
             
     res = app.exec_loop()
index 3ec98d3d2b6cdd66eca5e4e71752abcdc17acc6e..d8ddcecd10f7ea57790971040fae592356c59a9f 100644 (file)
@@ -56,7 +56,7 @@ class SaisieValeur:
         self.listBoxVal.clear()
         lChoix=self.node.item.get_liste_possible(listeDejaLa)
         for valeur in lChoix :
-            self.listBoxVal.insertItem( valeur ) 
+            self.listBoxVal.insertItem( str(valeur) ) 
 
   def ClicASSD(self):
          valeurQstring=self.listBoxASSD.selectedItem().text()
index 2fbe686bf260cb4da29dfec9af1dbdf4f4f05c97..55e34210d9c0e15f2bc08029faf9565f2c25617c 100644 (file)
@@ -302,18 +302,12 @@ class READERCATA:
           QMessageBox.critical( self.parent, "", "Aucun catalogue déclaré pour %s" %self.code)
           self.appli.quit()
           sys.exit(1)
-      #elif len(liste_choix) == 1:
-      #    self.fic_cata = self.dico_catalogues[liste_choix[0]][2]
-      #    self.version_code = liste_choix[0]
-      lab=QString("Eficas V1.12 pour ASTER avec le catalogue ")
-      #    lab+=self.version_code
-      #    qApp.mainWidget().setCaption(lab)
-      #    return          
           
       # création d'une boite de dialogue modale
       widgetChoix=MonChoixCata(liste_choix,self, self.parent, "", True )
       ret=widgetChoix.exec_loop()
       
+      lab=QString("Eficas V1.12 pour ASTER avec le catalogue ")
       if ret == QDialog.Accepted:
           self.version_cata=str(self.version_cata)
           self.fic_cata = self.dico_catalogues[self.version_cata][2]
@@ -321,6 +315,8 @@ class READERCATA:
           self.appli.format_fichier.set( self.dico_catalogues[self.version_cata][3] )
           lab+=self.version_cata
           qApp.mainWidget().setCaption(lab)
+      else :
+          sys.exit(0)
 
 
 
diff --git a/Ui/desInclude.py b/Ui/desInclude.py
new file mode 100644 (file)
index 0000000..a28c5e5
--- /dev/null
@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'desInclude.ui'
+#
+# Created: mar aoû 28 09:57:43 2007
+#      by: The PyQt User Interface Compiler (pyuic) 3.13
+#
+# WARNING! All changes made in this file will be lost!
+
+
+from qt import *
+
+image0_data = \
+    "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \
+    "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \
+    "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \
+    "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \
+    "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \
+    "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \
+    "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \
+    "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \
+    "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \
+    "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \
+    "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \
+    "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \
+    "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \
+    "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \
+    "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \
+    "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \
+    "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \
+    "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \
+    "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \
+    "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \
+    "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \
+    "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82"
+
+class DInc1(QWidget):
+    def __init__(self,parent = None,name = None,fl = 0):
+        QWidget.__init__(self,parent,name,fl)
+
+        self.image0 = QPixmap()
+        self.image0.loadFromData(image0_data,"PNG")
+        if not name:
+            self.setName("DInc1")
+
+        self.setMinimumSize(QSize(505,0))
+
+
+        self.Commentaire = QLabel(self,"Commentaire")
+        self.Commentaire.setGeometry(QRect(10,410,490,20))
+
+        self.bSup = QPushButton(self,"bSup")
+        self.bSup.setGeometry(QRect(320,440,142,30))
+        self.bSup.setAutoDefault(1)
+
+        self.bOk = QPushButton(self,"bOk")
+        self.bOk.setGeometry(QRect(170,440,142,30))
+        self.bOk.setAutoDefault(1)
+        self.bOk.setDefault(1)
+
+        self.bHelp = QPushButton(self,"bHelp")
+        self.bHelp.setGeometry(QRect(10,440,142,30))
+        self.bHelp.setAutoDefault(1)
+
+        self.TWChoix = QTabWidget(self,"TWChoix")
+        self.TWChoix.setGeometry(QRect(0,0,500,400))
+
+        self.MotClef = QWidget(self.TWChoix,"MotClef")
+
+        self.textLabel1_2 = QLabel(self.MotClef,"textLabel1_2")
+        self.textLabel1_2.setGeometry(QRect(360,0,50,37))
+
+        self.LBMCPermis = QListBox(self.MotClef,"LBMCPermis")
+        self.LBMCPermis.setGeometry(QRect(10,40,220,290))
+        self.LBMCPermis.setMinimumSize(QSize(0,0))
+
+        self.LBRegles = QListBox(self.MotClef,"LBRegles")
+        self.LBRegles.setGeometry(QRect(260,40,230,290))
+
+        self.textLabel1 = QLabel(self.MotClef,"textLabel1")
+        self.textLabel1.setGeometry(QRect(50,10,120,20))
+        self.textLabel1.setMinimumSize(QSize(0,0))
+        self.TWChoix.insertTab(self.MotClef,QString(""))
+
+        self.Commande = QWidget(self.TWChoix,"Commande")
+
+        self.textLabel6 = QLabel(self.Commande,"textLabel6")
+        self.textLabel6.setGeometry(QRect(10,60,60,30))
+
+        self.textLabel4 = QLabel(self.Commande,"textLabel4")
+        self.textLabel4.setGeometry(QRect(90,340,300,30))
+
+        self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande")
+        self.LBNouvCommande.setGeometry(QRect(50,100,410,240))
+
+        self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1")
+        self.buttonGroup1.setGeometry(QRect(300,20,151,70))
+
+        self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe")
+        self.RBGroupe.setGeometry(QRect(20,40,101,20))
+
+        self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha")
+        self.RBalpha.setGeometry(QRect(20,20,101,20))
+        self.RBalpha.setChecked(1)
+
+        self.LEFiltre = QLineEdit(self.Commande,"LEFiltre")
+        self.LEFiltre.setGeometry(QRect(50,60,160,30))
+
+        self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4")
+        self.textLabel1_4.setGeometry(QRect(50,20,171,21))
+
+        self.BNext = QToolButton(self.Commande,"BNext")
+        self.BNext.setGeometry(QRect(220,60,30,31))
+        self.BNext.setIconSet(QIconSet(self.image0))
+        self.TWChoix.insertTab(self.Commande,QString(""))
+
+        self.TabPage = QWidget(self.TWChoix,"TabPage")
+
+        self.BBrowse = QPushButton(self.TabPage,"BBrowse")
+        self.BBrowse.setGeometry(QRect(288,306,161,41))
+
+        self.textLabel1_3 = QLabel(self.TabPage,"textLabel1_3")
+        self.textLabel1_3.setGeometry(QRect(70,50,350,41))
+
+        self.LENomFichier = QLineEdit(self.TabPage,"LENomFichier")
+        self.LENomFichier.setGeometry(QRect(18,127,450,30))
+        self.TWChoix.insertTab(self.TabPage,QString(""))
+
+        self.TabPage_2 = QWidget(self.TWChoix,"TabPage_2")
+
+        self.textLabel1_5 = QLabel(self.TabPage_2,"textLabel1_5")
+        self.textLabel1_5.setGeometry(QRect(88,96,290,131))
+        self.TWChoix.insertTab(self.TabPage_2,QString(""))
+
+        self.languageChange()
+
+        self.resize(QSize(521,499).expandedTo(self.minimumSizeHint()))
+        self.clearWState(Qt.WState_Polished)
+
+        self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.BNext,SIGNAL("clicked()"),self.BNextPressed)
+        self.connect(self.BBrowse,SIGNAL("clicked()"),self.BBrowsePressed)
+        self.connect(self.LENomFichier,SIGNAL("returnPressed()"),self.LENomFichReturnPressed)
+
+
+    def languageChange(self):
+        self.setCaption(self.__tr("DMacro"))
+        self.Commentaire.setText(QString.null)
+        self.bSup.setText(self.__tr("&Supprimer"))
+        self.bSup.setAccel(self.__tr("Alt+S"))
+        QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
+        self.bOk.setText(self.__tr("&Valider"))
+        self.bOk.setAccel(self.__tr("Shift+A, Alt+A, Alt+A, Alt+A"))
+        QToolTip.add(self.bOk,self.__tr("validation de la saisie"))
+        self.bHelp.setText(self.__tr("&Documentation"))
+        self.bHelp.setAccel(self.__tr("Alt+D"))
+        QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
+        self.textLabel1_2.setText(self.__trUtf8("\x3c\x68\x33\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x3c\x75\x3e\x3c\x62\x3e\x52\xc3\xa9\x67\x6c\x65\x73\x3c\x2f\x62\x3e\x3c\x2f\x75\x3e\x3c\x2f\x70\x3e\x3c\x2f\x68\x33\x3e"))
+        self.textLabel1.setText(self.__tr("<h3><p align=\"center\"><u><b>Mots Clefs Permis</b></u></p></h3>"))
+        self.TWChoix.changeTab(self.MotClef,self.__tr("Ajouter Mot-Clef"))
+        self.textLabel6.setText(self.__tr("Filtre"))
+        self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65"))
+        self.buttonGroup1.setTitle(self.__tr("Affichage"))
+        self.RBGroupe.setText(self.__tr("par groupe"))
+        self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65"))
+        self.textLabel1_4.setText(self.__tr("<b><u>Commandes :</u></b>"))
+        self.BNext.setText(QString.null)
+        QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence"))
+        self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande"))
+        self.BBrowse.setText(self.__tr("Browse"))
+        self.textLabel1_3.setText(self.__tr("<font size=\"+1\">La commande INCLUDE requiert un nom de Fichier :</font>"))
+        self.TWChoix.changeTab(self.TabPage,self.__tr("Fichier Include"))
+        self.textLabel1_5.setText(self.__trUtf8("\x3c\x66\x6f\x6e\x74\x20\x73\x69\x7a\x65\x3d\x22\x2b\x31\x22\x3e\x3c\x70\x20\x61\x6c\x69\x67\x6e\x3d\x22\x63\x65\x6e\x74\x65\x72\x22\x3e\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x49\x4e\x43\x4c\x55\x44\x45\x20\x6e\x27\x61\x20\x70\x61\x73\x20\x64\x65\x20\x66\x69\x63\x68\x69\x65\x72\x20\x61\x73\x73\x6f\x63\x69\xc3\xa9\x2e\x0a\x49\x6c\x20\x66\x61\x75\x74\x20\x64\x27\x61\x62\x6f\x72\x64\x20\x63\x68\x6f\x69\x73\x69\x72\x20\x75\x6e\x20\x6e\x75\x6d\xc3\xa9\x72\x6f\x20\x64\x27\x75\x6e\x69\x74\xc3\xa9\x3c\x2f\x70\x3e\x3c\x2f\x66\x6f\x6e\x74\x3e"))
+        self.TWChoix.changeTab(self.TabPage_2,self.__tr("Fichier Inc"))
+
+
+    def LBNouvCommandeClicked(self):
+        print "DInc1.LBNouvCommandeClicked(): Not implemented yet"
+
+    def LEFiltreTextChanged(self):
+        print "DInc1.LEFiltreTextChanged(): Not implemented yet"
+
+    def LEfiltreReturnPressed(self):
+        print "DInc1.LEfiltreReturnPressed(): Not implemented yet"
+
+    def BSupPressed(self):
+        print "DInc1.BSupPressed(): Not implemented yet"
+
+    def BOkPressed(self):
+        print "DInc1.BOkPressed(): Not implemented yet"
+
+    def BuildTabCommand(self):
+        print "DInc1.BuildTabCommand(): Not implemented yet"
+
+    def BNextPressed(self):
+        print "DInc1.BNextPressed(): Not implemented yet"
+
+    def BBrowsePressed(self):
+        print "DInc1.BBrowsePressed(): Not implemented yet"
+
+    def LENomFichReturnPressed(self):
+        print "DInc1.LENomFichReturnPressed(): Not implemented yet"
+
+    def __tr(self,s,c = None):
+        return qApp.translate("DInc1",s,c)
+
+    def __trUtf8(self,s,c = None):
+        return qApp.translate("DInc1",s,c,QApplication.UnicodeUTF8)
diff --git a/Ui/desInclude.ui b/Ui/desInclude.ui
new file mode 100644 (file)
index 0000000..9bbaa39
--- /dev/null
@@ -0,0 +1,522 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>DInc1</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>DInc1</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>521</width>
+            <height>499</height>
+        </rect>
+    </property>
+    <property name="minimumSize">
+        <size>
+            <width>505</width>
+            <height>0</height>
+        </size>
+    </property>
+    <property name="caption">
+        <string>DMacro</string>
+    </property>
+    <widget class="QLabel">
+        <property name="name">
+            <cstring>Commentaire</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>10</x>
+                <y>410</y>
+                <width>490</width>
+                <height>20</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string></string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>bSup</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>320</x>
+                <y>440</y>
+                <width>142</width>
+                <height>30</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Supprimer</string>
+        </property>
+        <property name="accel">
+            <string>Alt+S</string>
+        </property>
+        <property name="autoDefault">
+            <bool>true</bool>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>suppression du mot clef</string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>bOk</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>170</x>
+                <y>440</y>
+                <width>142</width>
+                <height>30</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Valider</string>
+        </property>
+        <property name="accel">
+            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+        </property>
+        <property name="autoDefault">
+            <bool>true</bool>
+        </property>
+        <property name="default">
+            <bool>true</bool>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>validation de la saisie</string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>bHelp</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>10</x>
+                <y>440</y>
+                <width>142</width>
+                <height>30</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Documentation</string>
+        </property>
+        <property name="accel">
+            <string>Alt+D</string>
+        </property>
+        <property name="autoDefault">
+            <bool>true</bool>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>affichage documentation aster</string>
+        </property>
+    </widget>
+    <widget class="QTabWidget">
+        <property name="name">
+            <cstring>TWChoix</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>500</width>
+                <height>400</height>
+            </rect>
+        </property>
+        <widget class="QWidget">
+            <property name="name">
+                <cstring>MotClef</cstring>
+            </property>
+            <attribute name="title">
+                <string>Ajouter Mot-Clef</string>
+            </attribute>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel1_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>360</x>
+                        <y>0</y>
+                        <width>50</width>
+                        <height>37</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Régles&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+                </property>
+            </widget>
+            <widget class="QListBox">
+                <property name="name">
+                    <cstring>LBMCPermis</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>40</y>
+                        <width>220</width>
+                        <height>290</height>
+                    </rect>
+                </property>
+                <property name="minimumSize">
+                    <size>
+                        <width>0</width>
+                        <height>0</height>
+                    </size>
+                </property>
+            </widget>
+            <widget class="QListBox">
+                <property name="name">
+                    <cstring>LBRegles</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>260</x>
+                        <y>40</y>
+                        <width>230</width>
+                        <height>290</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel1</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>10</y>
+                        <width>120</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="minimumSize">
+                    <size>
+                        <width>0</width>
+                        <height>0</height>
+                    </size>
+                </property>
+                <property name="text">
+                    <string>&lt;h3&gt;&lt;p align="center"&gt;&lt;u&gt;&lt;b&gt;Mots Clefs Permis&lt;/b&gt;&lt;/u&gt;&lt;/p&gt;&lt;/h3&gt;</string>
+                </property>
+            </widget>
+        </widget>
+        <widget class="QWidget">
+            <property name="name">
+                <cstring>Commande</cstring>
+            </property>
+            <attribute name="title">
+                <string>Nouvelle Commande</string>
+            </attribute>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel6</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>60</y>
+                        <width>60</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Filtre</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel4</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>90</x>
+                        <y>340</y>
+                        <width>300</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>La commande choisie sera ajoutée APRES la commande courante</string>
+                </property>
+            </widget>
+            <widget class="QListBox">
+                <property name="name">
+                    <cstring>LBNouvCommande</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>100</y>
+                        <width>410</width>
+                        <height>240</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QButtonGroup">
+                <property name="name">
+                    <cstring>buttonGroup1</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>300</x>
+                        <y>20</y>
+                        <width>151</width>
+                        <height>70</height>
+                    </rect>
+                </property>
+                <property name="title">
+                    <string>Affichage</string>
+                </property>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>RBGroupe</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>20</x>
+                            <y>40</y>
+                            <width>101</width>
+                            <height>20</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>par groupe</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>RBalpha</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>20</x>
+                            <y>20</y>
+                            <width>101</width>
+                            <height>20</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>alphabétique</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </widget>
+            <widget class="QLineEdit">
+                <property name="name">
+                    <cstring>LEFiltre</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>60</y>
+                        <width>160</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel1_4</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>20</y>
+                        <width>171</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
+                </property>
+            </widget>
+            <widget class="QToolButton">
+                <property name="name">
+                    <cstring>BNext</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>220</x>
+                        <y>60</y>
+                        <width>30</width>
+                        <height>31</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="iconSet">
+                    <iconset>image0</iconset>
+                </property>
+                <property name="toolTip" stdset="0">
+                    <string>affiche la prochaine occurence</string>
+                </property>
+            </widget>
+        </widget>
+        <widget class="QWidget">
+            <property name="name">
+                <cstring>TabPage</cstring>
+            </property>
+            <attribute name="title">
+                <string>Fichier Include</string>
+            </attribute>
+            <widget class="QPushButton">
+                <property name="name">
+                    <cstring>BBrowse</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>288</x>
+                        <y>306</y>
+                        <width>161</width>
+                        <height>41</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Browse</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel1_3</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>70</x>
+                        <y>50</y>
+                        <width>350</width>
+                        <height>41</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;font size="+1"&gt;La commande INCLUDE requiert un nom de Fichier :&lt;/font&gt;</string>
+                </property>
+            </widget>
+            <widget class="QLineEdit">
+                <property name="name">
+                    <cstring>LENomFichier</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>18</x>
+                        <y>127</y>
+                        <width>450</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+            </widget>
+        </widget>
+        <widget class="QWidget">
+            <property name="name">
+                <cstring>TabPage</cstring>
+            </property>
+            <attribute name="title">
+                <string>Fichier Inc</string>
+            </attribute>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel1_5</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>88</x>
+                        <y>96</y>
+                        <width>290</width>
+                        <height>131</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;font size="+1"&gt;&lt;p align="center"&gt;La commande INCLUDE n'a pas de fichier associé.
+Il faut d'abord choisir un numéro d'unité&lt;/p&gt;&lt;/font&gt;</string>
+                </property>
+            </widget>
+        </widget>
+    </widget>
+</widget>
+<images>
+    <image name="image0">
+        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
+    </image>
+</images>
+<connections>
+    <connection>
+        <sender>LBNouvCommande</sender>
+        <signal>clicked(QListBoxItem*)</signal>
+        <receiver>DInc1</receiver>
+        <slot>LBNouvCommandeClicked()</slot>
+    </connection>
+    <connection>
+        <sender>LEFiltre</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>DInc1</receiver>
+        <slot>LEFiltreTextChanged()</slot>
+    </connection>
+    <connection>
+        <sender>LEFiltre</sender>
+        <signal>returnPressed()</signal>
+        <receiver>DInc1</receiver>
+        <slot>LEfiltreReturnPressed()</slot>
+    </connection>
+    <connection>
+        <sender>bSup</sender>
+        <signal>pressed()</signal>
+        <receiver>DInc1</receiver>
+        <slot>BSupPressed()</slot>
+    </connection>
+    <connection>
+        <sender>bOk</sender>
+        <signal>clicked()</signal>
+        <receiver>DInc1</receiver>
+        <slot>BOkPressed()</slot>
+    </connection>
+    <connection>
+        <sender>RBalpha</sender>
+        <signal>clicked()</signal>
+        <receiver>DInc1</receiver>
+        <slot>BuildTabCommand()</slot>
+    </connection>
+    <connection>
+        <sender>RBGroupe</sender>
+        <signal>clicked()</signal>
+        <receiver>DInc1</receiver>
+        <slot>BuildTabCommand()</slot>
+    </connection>
+    <connection>
+        <sender>BNext</sender>
+        <signal>clicked()</signal>
+        <receiver>DInc1</receiver>
+        <slot>BNextPressed()</slot>
+    </connection>
+    <connection>
+        <sender>BBrowse</sender>
+        <signal>clicked()</signal>
+        <receiver>DInc1</receiver>
+        <slot>BBrowsePressed()</slot>
+    </connection>
+    <connection>
+        <sender>LENomFichier</sender>
+        <signal>returnPressed()</signal>
+        <receiver>DInc1</receiver>
+        <slot>LENomFichReturnPressed()</slot>
+    </connection>
+</connections>
+<slots>
+    <slot>LBNouvCommandeClicked()</slot>
+    <slot>LEFiltreTextChanged()</slot>
+    <slot>LEfiltreReturnPressed()</slot>
+    <slot>BSupPressed()</slot>
+    <slot>BOkPressed()</slot>
+    <slot>BuildTabCommand()</slot>
+    <slot>BNextPressed()</slot>
+    <slot>BBrowsePressed()</slot>
+    <slot>LENomFichReturnPressed()</slot>
+</slots>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>
index 185c7df1a5e7d1234b313dc5c1fe99012c90f6b4..307a8421c8d65405ea57d2e9f21a0a0948d28d84 100644 (file)
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'desParam.ui'
+# Form implementation generated from reading ui file '../Ui/desParam.ui'
 #
-# Created: mar aoû 21 15:48:22 2007
+# Created: ven aoû 24 10:19:53 2007
 #      by: The PyQt User Interface Compiler (pyuic) 3.13
 #
 # WARNING! All changes made in this file will be lost!
 
 from qt import *
 
+image0_data = \
+    "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d" \
+    "\x49\x48\x44\x52\x00\x00\x00\x21\x00\x00\x00\x0e" \
+    "\x08\x06\x00\x00\x00\xa1\x1e\x75\x8c\x00\x00\x00" \
+    "\xcf\x49\x44\x41\x54\x38\x8d\xd5\x94\xdb\x0e\xc3" \
+    "\x20\x0c\x43\xed\xfd\xf8\xd8\x97\xbb\x0f\x34\x5b" \
+    "\x48\x08\x45\xd5\x1e\xb6\x48\x88\xf4\x12\xe7\x60" \
+    "\x01\xc0\x0f\x04\x6f\xd6\xe9\x9b\xba\x77\x20\x04" \
+    "\x80\x92\x4a\x10\x32\xc9\x2e\xfb\xd8\xc7\xd5\xca" \
+    "\xbc\xc0\x25\x40\x00\x99\xe9\x57\x84\x95\x68\xfe" \
+    "\x7f\x06\xc0\xde\xd1\xde\xb3\x2b\x4a\x1e\xc4\xea" \
+    "\x82\x4b\x9e\x74\x09\x71\x65\xbd\x01\xf8\x55\x27" \
+    "\xf7\x8a\x72\x01\xe0\xa3\x12\x9f\x34\x5a\x01\x7c" \
+    "\x54\x3b\xaf\xdc\x98\x3d\x0f\x71\x09\xd1\x5a\x33" \
+    "\x1b\x47\x1f\x47\x07\x2c\x17\x49\x4a\x82\x33\x8f" \
+    "\x61\x78\x20\x3a\x88\x17\xe6\x73\x06\xb1\xf0\x8b" \
+    "\x07\xba\x03\xe6\x02\xc9\xb8\x31\x07\x7e\x37\xe0" \
+    "\x20\x9e\x67\xe3\x38\x67\x10\x97\x7b\x17\xde\x80" \
+    "\xc1\x85\xad\x38\x69\x5a\x51\xd5\x22\xc8\x2c\xe7" \
+    "\x79\x12\xe2\xfe\xd8\xbe\x83\x76\x20\x92\xf5\x2b" \
+    "\x18\x20\xdd\x11\xbb\x10\xe5\x65\xb5\x3a\x5a\x3b" \
+    "\xba\xff\x13\x07\x13\xd6\x6f\xa6\x98\x18\x57\x06" \
+    "\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82"
 
 class DParam(QWidget):
     def __init__(self,parent = None,name = None,fl = 0):
         QWidget.__init__(self,parent,name,fl)
 
+        self.image0 = QPixmap()
+        self.image0.loadFromData(image0_data,"PNG")
         if not name:
             self.setName("DParam")
 
-        self.setMinimumSize(QSize(350,0))
+        self.setMinimumSize(QSize(505,0))
 
 
-        self.tabuniqueinto = QTabWidget(self,"tabuniqueinto")
-        self.tabuniqueinto.setGeometry(QRect(10,20,460,440))
+        self.Commentaire = QLabel(self,"Commentaire")
+        self.Commentaire.setGeometry(QRect(10,410,490,20))
+        self.Commentaire.setFrameShape(QLabel.NoFrame)
+        self.Commentaire.setFrameShadow(QLabel.Plain)
 
-        self.Widget8 = QWidget(self.tabuniqueinto,"Widget8")
-
-        self.bSup = QPushButton(self.Widget8,"bSup")
-        self.bSup.setGeometry(QRect(310,370,142,30))
+        self.bSup = QPushButton(self,"bSup")
+        self.bSup.setGeometry(QRect(320,440,142,30))
         self.bSup.setAutoDefault(1)
 
-        self.bOk = QPushButton(self.Widget8,"bOk")
-        self.bOk.setGeometry(QRect(160,370,142,30))
+        self.bOk = QPushButton(self,"bOk")
+        self.bOk.setGeometry(QRect(170,440,142,30))
         self.bOk.setAutoDefault(1)
         self.bOk.setDefault(1)
 
-        self.bHelp = QPushButton(self.Widget8,"bHelp")
-        self.bHelp.setGeometry(QRect(10,370,142,30))
+        self.bHelp = QPushButton(self,"bHelp")
+        self.bHelp.setGeometry(QRect(10,440,142,30))
         self.bHelp.setAutoDefault(1)
 
-        self.textLabel2 = QLabel(self.Widget8,"textLabel2")
-        self.textLabel2.setGeometry(QRect(40,160,50,21))
+        self.TWChoix = QTabWidget(self,"TWChoix")
+        self.TWChoix.setGeometry(QRect(0,0,500,400))
+
+        self.Valeur_Parametre = QWidget(self.TWChoix,"Valeur_Parametre")
 
-        self.lineEditVal = QLineEdit(self.Widget8,"lineEditVal")
-        self.lineEditVal.setGeometry(QRect(120,150,231,31))
+        self.textLabel2_2_2 = QLabel(self.Valeur_Parametre,"textLabel2_2_2")
+        self.textLabel2_2_2.setGeometry(QRect(180,20,90,21))
 
-        self.lineEditNom = QLineEdit(self.Widget8,"lineEditNom")
-        self.lineEditNom.setGeometry(QRect(118,86,231,31))
+        self.textLabel2_2 = QLabel(self.Valeur_Parametre,"textLabel2_2")
+        self.textLabel2_2.setGeometry(QRect(50,60,50,21))
 
-        self.textLabel2_2 = QLabel(self.Widget8,"textLabel2_2")
-        self.textLabel2_2.setGeometry(QRect(40,90,50,21))
+        self.lineEditNom = QLineEdit(self.Valeur_Parametre,"lineEditNom")
+        self.lineEditNom.setGeometry(QRect(120,60,231,31))
 
-        self.textLabel2_2_2 = QLabel(self.Widget8,"textLabel2_2_2")
-        self.textLabel2_2_2.setGeometry(QRect(180,20,90,21))
+        self.lineEditVal = QLineEdit(self.Valeur_Parametre,"lineEditVal")
+        self.lineEditVal.setGeometry(QRect(120,100,231,31))
+
+        self.textLabel2 = QLabel(self.Valeur_Parametre,"textLabel2")
+        self.textLabel2.setGeometry(QRect(50,100,50,21))
+
+        self.Commentaire2 = QLabel(self.Valeur_Parametre,"Commentaire2")
+        self.Commentaire2.setGeometry(QRect(40,160,400,100))
+
+        self.Commentaire_2 = QLabel(self.Valeur_Parametre,"Commentaire_2")
+        self.Commentaire_2.setGeometry(QRect(30,280,410,41))
+        self.TWChoix.insertTab(self.Valeur_Parametre,QString(""))
+
+        self.Commande = QWidget(self.TWChoix,"Commande")
+
+        self.textLabel6 = QLabel(self.Commande,"textLabel6")
+        self.textLabel6.setGeometry(QRect(10,60,60,30))
+
+        self.textLabel4 = QLabel(self.Commande,"textLabel4")
+        self.textLabel4.setGeometry(QRect(90,340,300,30))
+
+        self.LBNouvCommande = QListBox(self.Commande,"LBNouvCommande")
+        self.LBNouvCommande.setGeometry(QRect(50,100,410,240))
+
+        self.buttonGroup1 = QButtonGroup(self.Commande,"buttonGroup1")
+        self.buttonGroup1.setGeometry(QRect(298,17,151,70))
+
+        self.RBGroupe = QRadioButton(self.buttonGroup1,"RBGroupe")
+        self.RBGroupe.setGeometry(QRect(20,40,101,20))
 
-        self.Commentaire = QLabel(self.Widget8,"Commentaire")
-        self.Commentaire.setGeometry(QRect(30,230,400,100))
-        self.tabuniqueinto.insertTab(self.Widget8,QString(""))
+        self.RBalpha = QRadioButton(self.buttonGroup1,"RBalpha")
+        self.RBalpha.setGeometry(QRect(20,20,101,20))
+        self.RBalpha.setChecked(1)
+
+        self.LEFiltre = QLineEdit(self.Commande,"LEFiltre")
+        self.LEFiltre.setGeometry(QRect(50,60,160,30))
+
+        self.BNext = QToolButton(self.Commande,"BNext")
+        self.BNext.setGeometry(QRect(220,60,30,31))
+        self.BNext.setIconSet(QIconSet(self.image0))
+
+        self.textLabel1_4 = QLabel(self.Commande,"textLabel1_4")
+        self.textLabel1_4.setGeometry(QRect(50,20,171,21))
+        self.TWChoix.insertTab(self.Commande,QString(""))
 
         self.languageChange()
 
-        self.resize(QSize(482,480).expandedTo(self.minimumSizeHint()))
+        self.resize(QSize(505,483).expandedTo(self.minimumSizeHint()))
         self.clearWState(Qt.WState_Polished)
 
-        self.connect(self.bHelp,SIGNAL("clicked()"),self.ViewDoc)
-        self.connect(self.bOk,SIGNAL("clicked()"),self.BOk2Pressed)
-        self.connect(self.bSup,SIGNAL("clicked()"),self.BSupPressed)
-        self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        self.connect(self.LBNouvCommande,SIGNAL("clicked(QListBoxItem*)"),self.LBNouvCommandeClicked)
+        self.connect(self.LEFiltre,SIGNAL("textChanged(const QString&)"),self.LEFiltreTextChanged)
+        self.connect(self.LEFiltre,SIGNAL("returnPressed()"),self.LEfiltreReturnPressed)
+        self.connect(self.bSup,SIGNAL("pressed()"),self.BSupPressed)
+        self.connect(self.bOk,SIGNAL("clicked()"),self.BOkPressed)
+        self.connect(self.RBGroupe,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.RBalpha,SIGNAL("clicked()"),self.BuildTabCommand)
+        self.connect(self.bHelp,SIGNAL("clicked()"),self.BHelpPressed)
+        self.connect(self.BNext,SIGNAL("pressed()"),self.BNextPressed)
 
 
     def languageChange(self):
-        self.setCaption(self.__tr("DUnIn"))
+        self.setCaption(self.__tr("DComm"))
+        self.Commentaire.setText(QString.null)
         self.bSup.setText(self.__tr("&Supprimer"))
         self.bSup.setAccel(self.__tr("Alt+S"))
         QToolTip.add(self.bSup,self.__tr("suppression du mot clef"))
@@ -80,24 +151,49 @@ class DParam(QWidget):
         self.bHelp.setText(self.__tr("&Documentation"))
         self.bHelp.setAccel(self.__tr("Alt+D"))
         QToolTip.add(self.bHelp,self.__tr("affichage documentation aster"))
-        self.textLabel2.setText(self.__tr("<b><p align=\"center\">Valeur: </p></b>"))
-        self.textLabel2_2.setText(self.__tr("<b><p align=\"center\">Nom: </p></b>"))
         self.textLabel2_2_2.setText(self.__tr("<u><b><p align=\"center\">Parametre</p></b></u>"))
-        self.Commentaire.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x20\x43\x68\x61\x72\x69\x6f\x74\x20\x64\x61\x6e\x73\x20\x75\x6e\x65\x20\x73\x6f\x6e\x65\x20\x64\x65\x20\x73\x61\x69\x73\x69\x65\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x6c\x61\x20\x76\x61\x6c\x69\x64\x69\x74\xc3\xa9\x20\x64\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x2e\x0a\x0a\x4c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x73\x6f\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x65\x66\x66\x65\x63\x74\x69\x76\x65\x6d\x65\x6e\x74\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65\x20\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x0a\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x2e"))
-        self.tabuniqueinto.changeTab(self.Widget8,self.__tr("Valeur Parametre"))
+        self.textLabel2_2.setText(self.__tr("<b><p align=\"center\">Nom: </p></b>"))
+        self.textLabel2.setText(self.__tr("<b><p align=\"center\">Valeur: </p></b>"))
+        self.Commentaire2.setText(self.__trUtf8("\x52\x65\x74\x6f\x75\x72\x20\x43\x68\x61\x72\x69\x6f\x74\x20\x64\x61\x6e\x73\x20\x75\x6e\x65\x20\x73\x6f\x6e\x65\x20\x64\x65\x20\x73\x61\x69\x73\x69\x65\x20\x70\x65\x72\x6d\x65\x74\x20\x64\x65\x20\x76\xc3\xa9\x72\x69\x66\x69\x65\x72\x20\x6c\x61\x20\x76\x61\x6c\x69\x64\x69\x74\xc3\xa9\x20\x64\x65\x20\x6c\x61\x20\x76\x61\x6c\x65\x75\x72\x20\x73\x61\x69\x73\x69\x65\x2e\x0a\x0a\x4c\x65\x73\x20\x6e\x6f\x75\x76\x65\x6c\x6c\x65\x73\x20\x76\x61\x6c\x65\x75\x72\x73\x20\x6e\x65\x20\x73\x65\x72\x6f\x6e\x74\x20\x70\x72\x69\x73\x65\x73\x20\x20\x65\x6e\x20\x63\x6f\x6d\x70\x74\x65\x20\x71\x75\x27\x61\x70\x72\xc3\xa8\x73\x20\x61\x76\x6f\x69\x72\x20\x61\x70\x70\x75\x79\xc3\xa9\x20\x73\x75\x72\x20\x0a\x20\x6c\x65\x20\x62\x6f\x75\x74\x6f\x6e\x20\x56\x61\x6c\x69\x64\x65\x72\x2e"))
+        self.Commentaire_2.setText(QString.null)
+        self.TWChoix.changeTab(self.Valeur_Parametre,self.__tr("Valeur Parametre"))
+        self.textLabel6.setText(self.__tr("Filtre"))
+        self.textLabel4.setText(self.__trUtf8("\x4c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x68\x6f\x69\x73\x69\x65\x20\x73\x65\x72\x61\x20\x61\x6a\x6f\x75\x74\xc3\xa9\x65\x20\x41\x50\x52\x45\x53\x20\x6c\x61\x20\x63\x6f\x6d\x6d\x61\x6e\x64\x65\x20\x63\x6f\x75\x72\x61\x6e\x74\x65"))
+        self.buttonGroup1.setTitle(self.__tr("Affichage"))
+        self.RBGroupe.setText(self.__tr("par groupe"))
+        self.RBalpha.setText(self.__trUtf8("\x61\x6c\x70\x68\x61\x62\xc3\xa9\x74\x69\x71\x75\x65"))
+        self.BNext.setText(QString.null)
+        QToolTip.add(self.BNext,self.__tr("affiche la prochaine occurence"))
+        self.textLabel1_4.setText(self.__tr("<b><u>Commandes :</u></b>"))
+        self.TWChoix.changeTab(self.Commande,self.__tr("Nouvelle Commande"))
+
+
+    def LBNouvCommandeClicked(self):
+        print "DParam.LBNouvCommandeClicked(): Not implemented yet"
 
+    def LEFiltreTextChanged(self):
+        print "DParam.LEFiltreTextChanged(): Not implemented yet"
+
+    def LEfiltreReturnPressed(self):
+        print "DParam.LEfiltreReturnPressed(): Not implemented yet"
 
     def BSupPressed(self):
         print "DParam.BSupPressed(): Not implemented yet"
 
-    def ViewDoc(self):
-        print "DParam.ViewDoc(): Not implemented yet"
+    def LENomConceptReturnPressed(self):
+        print "DParam.LENomConceptReturnPressed(): Not implemented yet"
+
+    def BOkPressed(self):
+        print "DParam.BOkPressed(): Not implemented yet"
+
+    def BuildTabCommand(self):
+        print "DParam.BuildTabCommand(): Not implemented yet"
 
-    def BOk2Pressed(self):
-        print "DParam.BOk2Pressed(): Not implemented yet"
+    def BHelpPressed(self):
+        print "DParam.BHelpPressed(): Not implemented yet"
 
-    def LEValeurPressed(self):
-        print "DParam.LEValeurPressed(): Not implemented yet"
+    def BNextPressed(self):
+        print "DParam.BNextPressed(): Not implemented yet"
 
     def __tr(self,s,c = None):
         return qApp.translate("DParam",s,c)
diff --git a/Ui/desParam.ui b/Ui/desParam.ui
new file mode 100644 (file)
index 0000000..756ceeb
--- /dev/null
@@ -0,0 +1,483 @@
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
+<class>DParam</class>
+<widget class="QWidget">
+    <property name="name">
+        <cstring>DParam</cstring>
+    </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>505</width>
+            <height>483</height>
+        </rect>
+    </property>
+    <property name="minimumSize">
+        <size>
+            <width>505</width>
+            <height>0</height>
+        </size>
+    </property>
+    <property name="caption">
+        <string>DComm</string>
+    </property>
+    <widget class="QLabel">
+        <property name="name">
+            <cstring>Commentaire</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>10</x>
+                <y>410</y>
+                <width>490</width>
+                <height>20</height>
+            </rect>
+        </property>
+        <property name="frameShape">
+            <enum>NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+            <enum>Plain</enum>
+        </property>
+        <property name="text">
+            <string></string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>bSup</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>320</x>
+                <y>440</y>
+                <width>142</width>
+                <height>30</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Supprimer</string>
+        </property>
+        <property name="accel">
+            <string>Alt+S</string>
+        </property>
+        <property name="autoDefault">
+            <bool>true</bool>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>suppression du mot clef</string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>bOk</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>170</x>
+                <y>440</y>
+                <width>142</width>
+                <height>30</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Valider</string>
+        </property>
+        <property name="accel">
+            <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+        </property>
+        <property name="autoDefault">
+            <bool>true</bool>
+        </property>
+        <property name="default">
+            <bool>true</bool>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>validation de la saisie</string>
+        </property>
+    </widget>
+    <widget class="QPushButton">
+        <property name="name">
+            <cstring>bHelp</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>10</x>
+                <y>440</y>
+                <width>142</width>
+                <height>30</height>
+            </rect>
+        </property>
+        <property name="text">
+            <string>&amp;Documentation</string>
+        </property>
+        <property name="accel">
+            <string>Alt+D</string>
+        </property>
+        <property name="autoDefault">
+            <bool>true</bool>
+        </property>
+        <property name="toolTip" stdset="0">
+            <string>affichage documentation aster</string>
+        </property>
+    </widget>
+    <widget class="QTabWidget">
+        <property name="name">
+            <cstring>TWChoix</cstring>
+        </property>
+        <property name="geometry">
+            <rect>
+                <x>0</x>
+                <y>0</y>
+                <width>500</width>
+                <height>400</height>
+            </rect>
+        </property>
+        <widget class="QWidget">
+            <property name="name">
+                <cstring>Valeur_Parametre</cstring>
+            </property>
+            <attribute name="title">
+                <string>Valeur Parametre</string>
+            </attribute>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel2_2_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>180</x>
+                        <y>20</y>
+                        <width>90</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;u&gt;&lt;b&gt;&lt;p align="center"&gt;Parametre&lt;/p&gt;&lt;/b&gt;&lt;/u&gt;</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel2_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>60</y>
+                        <width>50</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;b&gt;&lt;p align="center"&gt;Nom: &lt;/p&gt;&lt;/b&gt;</string>
+                </property>
+            </widget>
+            <widget class="QLineEdit">
+                <property name="name">
+                    <cstring>lineEditNom</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>120</x>
+                        <y>60</y>
+                        <width>231</width>
+                        <height>31</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QLineEdit">
+                <property name="name">
+                    <cstring>lineEditVal</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>120</x>
+                        <y>100</y>
+                        <width>231</width>
+                        <height>31</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>100</y>
+                        <width>50</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;b&gt;&lt;p align="center"&gt;Valeur: &lt;/p&gt;&lt;/b&gt;</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>Commentaire2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>40</x>
+                        <y>160</y>
+                        <width>400</width>
+                        <height>100</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Retour Chariot dans une sone de saisie permet de vérifier la validité de la valeur saisie.
+
+Les nouvelles valeurs ne seront prises  en compte qu'après avoir appuyé sur 
+ le bouton Valider.</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>Commentaire_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>30</x>
+                        <y>280</y>
+                        <width>410</width>
+                        <height>41</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+            </widget>
+        </widget>
+        <widget class="QWidget">
+            <property name="name">
+                <cstring>Commande</cstring>
+            </property>
+            <attribute name="title">
+                <string>Nouvelle Commande</string>
+            </attribute>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel6</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>60</y>
+                        <width>60</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Filtre</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel4</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>90</x>
+                        <y>340</y>
+                        <width>300</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>La commande choisie sera ajoutée APRES la commande courante</string>
+                </property>
+            </widget>
+            <widget class="QListBox">
+                <property name="name">
+                    <cstring>LBNouvCommande</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>100</y>
+                        <width>410</width>
+                        <height>240</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QButtonGroup">
+                <property name="name">
+                    <cstring>buttonGroup1</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>298</x>
+                        <y>17</y>
+                        <width>151</width>
+                        <height>70</height>
+                    </rect>
+                </property>
+                <property name="title">
+                    <string>Affichage</string>
+                </property>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>RBGroupe</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>20</x>
+                            <y>40</y>
+                            <width>101</width>
+                            <height>20</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>par groupe</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
+                        <cstring>RBalpha</cstring>
+                    </property>
+                    <property name="geometry">
+                        <rect>
+                            <x>20</x>
+                            <y>20</y>
+                            <width>101</width>
+                            <height>20</height>
+                        </rect>
+                    </property>
+                    <property name="text">
+                        <string>alphabétique</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+            </widget>
+            <widget class="QLineEdit">
+                <property name="name">
+                    <cstring>LEFiltre</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>60</y>
+                        <width>160</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="QToolButton">
+                <property name="name">
+                    <cstring>BNext</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>220</x>
+                        <y>60</y>
+                        <width>30</width>
+                        <height>31</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="iconSet">
+                    <iconset>image0</iconset>
+                </property>
+                <property name="toolTip" stdset="0">
+                    <string>affiche la prochaine occurence</string>
+                </property>
+            </widget>
+            <widget class="QLabel">
+                <property name="name">
+                    <cstring>textLabel1_4</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>50</x>
+                        <y>20</y>
+                        <width>171</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&lt;b&gt;&lt;u&gt;Commandes :&lt;/u&gt;&lt;/b&gt;</string>
+                </property>
+            </widget>
+        </widget>
+    </widget>
+</widget>
+<images>
+    <image name="image0">
+        <data format="PNG" length="264">89504e470d0a1a0a0000000d49484452000000210000000e0806000000a11e758c000000cf49444154388dd594db0ec3200c43edfdf8d897bb0f345b480845d51eb64888f412e76001c00f046fd6e99bba77200480924a1032c92efbd8c7d5cabcc025400099e957849568fe7f06c0ded1deb32b4a1ec4ea824b9e74097165bd01f85527f78a7201e0a3129f345a017c543bafdc983d0f7109d15a331b471f47072c17494a82338f6178203a8817e67306b1f08b07ba03e602c9b831077e37e0209e67e3386710977b17de80c185ad38695a51d522c82ce77912e2fed8be83762092f52b1820dd11bb10e565b53a5a3bbaff130713d66fa6981857060000000049454e44ae426082</data>
+    </image>
+</images>
+<connections>
+    <connection>
+        <sender>LBNouvCommande</sender>
+        <signal>clicked(QListBoxItem*)</signal>
+        <receiver>DParam</receiver>
+        <slot>LBNouvCommandeClicked()</slot>
+    </connection>
+    <connection>
+        <sender>LEFiltre</sender>
+        <signal>textChanged(const QString&amp;)</signal>
+        <receiver>DParam</receiver>
+        <slot>LEFiltreTextChanged()</slot>
+    </connection>
+    <connection>
+        <sender>LEFiltre</sender>
+        <signal>returnPressed()</signal>
+        <receiver>DParam</receiver>
+        <slot>LEfiltreReturnPressed()</slot>
+    </connection>
+    <connection>
+        <sender>bSup</sender>
+        <signal>pressed()</signal>
+        <receiver>DParam</receiver>
+        <slot>BSupPressed()</slot>
+    </connection>
+    <connection>
+        <sender>bOk</sender>
+        <signal>clicked()</signal>
+        <receiver>DParam</receiver>
+        <slot>BOkPressed()</slot>
+    </connection>
+    <connection>
+        <sender>RBGroupe</sender>
+        <signal>clicked()</signal>
+        <receiver>DParam</receiver>
+        <slot>BuildTabCommand()</slot>
+    </connection>
+    <connection>
+        <sender>RBalpha</sender>
+        <signal>clicked()</signal>
+        <receiver>DParam</receiver>
+        <slot>BuildTabCommand()</slot>
+    </connection>
+    <connection>
+        <sender>bHelp</sender>
+        <signal>clicked()</signal>
+        <receiver>DParam</receiver>
+        <slot>BHelpPressed()</slot>
+    </connection>
+    <connection>
+        <sender>BNext</sender>
+        <signal>pressed()</signal>
+        <receiver>DParam</receiver>
+        <slot>BNextPressed()</slot>
+    </connection>
+</connections>
+<slots>
+    <slot>LBNouvCommandeClicked()</slot>
+    <slot>LEFiltreTextChanged()</slot>
+    <slot>LEfiltreReturnPressed()</slot>
+    <slot>BSupPressed()</slot>
+    <slot>LENomConceptReturnPressed()</slot>
+    <slot>BOkPressed()</slot>
+    <slot>BuildTabCommand()</slot>
+    <slot>BHelpPressed()</slot>
+    <slot>BNextPressed()</slot>
+</slots>
+<layoutdefaults spacing="6" margin="11"/>
+</UI>